git.iko.soy/unity8

on xenial help sign in

CMakeLists.txt+2−2

@@ -64,13 +64,13 @@ if(SHELL_INSTALL_QML STREQUAL "")

6464 message(FATAL_ERROR "Could not determine plugin installation dir.")

6565endif()

6666

67+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fvisibility=hidden")

68+

6769execute_process(COMMAND ${PKG_CONFIG_EXECUTABLE} --variable=plugindir unity-shell-api OUTPUT_VARIABLE SHELL_PLUGINDIR OUTPUT_STRIP_TRAILING_WHITESPACE)

6870if(SHELL_PLUGINDIR STREQUAL "")

6971 message(FATAL_ERROR "Could not determine plugin import dir.")

7072endif()

7173

72−set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fvisibility=hidden")

73−

7474set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -fno-permissive -pedantic -Wall -Wextra")

7575

7676if ("${CMAKE_BUILD_TYPE}" STREQUAL "release" OR "${CMAKE_BUILD_TYPE}" STREQUAL "relwithdebinfo")

build.sh+1

@@ -51,6 +51,7 @@ install_dependencies() {

5151 qtdeclarative5-ubuntu-settings-components \

5252 qtdeclarative5-ubuntu-telephony0.1 \

5353 qtdeclarative5-ubuntu-thumbnailer0.1 \

54+ qml-module-ubuntu-connectivity \

5455 unity-notifications-impl \

5556 ubuntu-mobile-icons \

5657 unity-scope-home \

cmake/modules/QmlTest.cmake+2−1

@@ -151,7 +151,7 @@ macro(add_qml_test_internal SUBPATH COMPONENT_NAME ITERATIONS)

151151 add_manual_qml_test(${SUBPATH} ${COMPONENT_NAME} ${ARGN})

152152endmacro(add_qml_test_internal)

153153

154−macro(add_binary_qml_test CLASS_NAME LD_PATH DEPS)

154+macro(add_binary_qml_test CLASS_NAME LD_PATH DEPS ENVVAR)

155155 set(testCommand

156156 LD_LIBRARY_PATH=${LD_PATH}

157157 ${CMAKE_CURRENT_BINARY_DIR}/${CLASS_NAME}TestExec

@@ -168,6 +168,7 @@ macro(add_binary_qml_test CLASS_NAME LD_PATH DEPS)

168168 endif()

169169 set(xvfbtestCommand

170170 ${LD_PRELOAD_PATH}

171+ ${ENVVAR}

171172 LD_LIBRARY_PATH=${LD_PATH}

172173 xvfb-run --server-args "-screen 0 1024x768x24" --auto-servernum

173174 ${CMAKE_CURRENT_BINARY_DIR}/${CLASS_NAME}TestExec

debian/changelog+40

@@ -1,3 +1,43 @@

1+unity8 (8.00+14.10.20141006-0ubuntu1) utopic; urgency=low

2+

3+ [ Andrea Cimitan ]

4+ * Tweak card header to match the spec

5+ * Add preview image slideshow (LP: #1351537)

6+

7+ [ Michał Sawicz ]

8+ * Cache more things in memory, so flicking scopes should be faster

9+ (LP: #1336724)

10+ * Tweak card header to match the spec

11+ * Save texture memory by limiting sourceSize (LP: #1338430)

12+

13+ [ Ying-Chun Liu ]

14+ * Add attributes to Preview. (LP: #1282460)

15+

16+ [ Albert Astals ]

17+ * Update pot

18+ * Cache more things in memory, so flicking scopes should be faster

19+ (LP: #1336724)

20+ * Save texture memory by limiting sourceSize (LP: #1338430)

21+ * Clip the settings list

22+ * Fix unlocking from the left again

23+ * Add wait_ makes tests more reliable

24+

25+ [ Michael Zanetti ]

26+ * fix fading out the launcher instead of sliding it out on left-edge

27+ minimizing an app.

28+ * Make the DashCommunicator async and more flexible to handle a

29+ lifecycle-suspended dash (LP: #1339883)

30+

31+ [ Michael Terry ]

32+ * Retry unlock-device script if it fails, as there is always a risk of

33+ a small race with boot-up. (LP: #1370644)

34+ * Add pull-to-refresh functionality to scopes. (LP: #1368336)

35+

36+ [ CI bot ]

37+ * Resync trunk

38+

39+ -- Ubuntu daily release <ps-jenkins@lists.canonical.com> Mon, 06 Oct 2014 08:03:23 +0000

40+

141unity8 (8.00+14.10.20140930.2-0ubuntu1) utopic; urgency=low

242

343 [ Alexandros Frantzis ]

debian/control+2−1

@@ -25,7 +25,7 @@ Build-Depends: cmake,

2525 libpulse-dev,

2626 libqmenumodel-dev (>= 0.2.8),

2727 libqt5xmlpatterns5-dev,

28− libunity-api-dev (>= 7.91),

28+ libunity-api-dev (>= 7.92),

2929 libusermetricsoutput1-dev,

3030 libxcb1-dev,

3131 pkg-config,

@@ -174,6 +174,7 @@ Depends: accountsservice-ubuntu-schemas (>= 0.0.3),

174174 libhardware2,

175175 unity-schemas (>= 7.3.1+14.10.20140915),

176176 pay-service,

177+ qml-module-ubuntu-connectivity,

177178 ${misc:Depends},

178179 ${shlibs:Depends},

179180Provides: unity-launcher-impl,

debian/unity8-private.install+1

@@ -1,3 +1,4 @@

1+usr/lib/*/libunity8-private.*

12usr/lib/*/unity8/qml/AccountsService

23usr/lib/*/unity8/qml/Dash

34usr/lib/*/unity8/qml/HudClient

plugins/Dash/CardAttributes.qml+1−1

@@ -59,7 +59,7 @@ GridLayout {

5959 text: "value" in modelData && modelData["value"] || "";

6060 elide: Text.ElideRight

6161 maximumLineCount: 1

62− font.weight: "style" in modelData && modelData["style"] == "highlighted" ? Font.DemiBold : Font.Light

62+ font.weight: "style" in modelData && modelData["style"] === "highlighted" ? Font.Bold : Font.Light

6363 fontSize: "small"

6464 font.pixelSize: Math.round(FontUtils.sizeToPixels(fontSize) * fontScale)

6565 color: grid.color

plugins/Dash/CardCreator.js+15−16

@@ -82,12 +82,13 @@ var kArtShapeHolderCode = 'Item { \n\

8282 height = Qt.binding(function() { return image.status !== Image.Ready ? 0 : image.height }); \n\

8383 } \n\

8484 } \n\

85− image: Image { \n\

85+ image: CroppedImageMinimumSourceSize { \n\

8686 objectName: "artImage"; \n\

87− source: cardData && cardData["art"] || ""; \n\

87+ property bool doLoadSource: !NetworkingStatus.limitedBandwith; \n\

88+ source: { if (root.visible) doLoadSource = true; return doLoadSource && cardData && cardData["art"] || ""; } \n\

8889 cache: true; \n\

8990 asynchronous: root.asynchronous; \n\

90− fillMode: Image.PreserveAspectCrop; \n\

91+ visible: false; \n\

9192 width: %2; \n\

9293 height: %3; \n\

9394 } \n\

@@ -190,16 +191,14 @@ var kMascotShapeLoaderCode = 'Loader { \n\

190191

191192// %1 is used as anchors of mascotImage

192193// %2 is used as visible of mascotImage

193−var kMascotImageCode = 'Image { \n\

194+var kMascotImageCode = 'CroppedImageMinimumSourceSize { \n\

194195 id: mascotImage; \n\

195196 objectName: "mascotImage"; \n\

196197 anchors { %1 } \n\

197− readonly property int maxSize: Math.max(width, height) * 4; \n\

198− source: cardData && cardData["mascot"] || ""; \n\

198+ property bool doLoadSource: !NetworkingStatus.limitedBandwith; \n\

199+ source: { if (root.visible) doLoadSource = true; return doLoadSource && cardData && cardData["mascot"] || ""; } \n\

199200 width: units.gu(6); \n\

200201 height: units.gu(5.625); \n\

201− sourceSize { width: maxSize; height: maxSize } \n\

202− fillMode: Image.PreserveAspectCrop; \n\

203202 horizontalAlignment: Image.AlignHCenter; \n\

204203 verticalAlignment: Image.AlignVCenter; \n\

205204 visible: %2; \n\

@@ -220,13 +219,13 @@ var kTitleLabelCode = 'Label { \n\

220219 color: %2; \n\

221220 visible: showHeader %3; \n\

222221 text: root.title; \n\

223− font.weight: components && components["subtitle"] ? Font.DemiBold : Font.Normal; \n\

224− horizontalAlignment: root.headerAlignment; \n\

222+ font.weight: cardData && cardData["subtitle"] ? Font.DemiBold : Font.Normal; \n\

223+ horizontalAlignment: root.titleAlignment; \n\

225224 }\n';

226225

227226// %1 is used as extra anchors of emblemIcon

228227// %2 is used as color of emblemIcon

229−var kEmblemIconCode = 'Icon { \n\

228+var kEmblemIconCode = 'StatusIcon { \n\

230229 id: emblemIcon; \n\

231230 objectName: "emblemIcon"; \n\

232231 anchors { \n\

@@ -236,7 +235,6 @@ var kEmblemIconCode = 'Icon { \n\

236235 } \n\

237236 source: cardData && cardData["emblem"] || ""; \n\

238237 color: %2; \n\

239− width: height; \n\

240238 height: source != "" ? titleLabel.font.pixelSize : 0; \n\

241239 }\n';

242240

@@ -258,13 +256,12 @@ var kSubtitleLabelCode = 'Label { \n\

258256 anchors { %1 } \n\

259257 anchors.topMargin: units.dp(2); \n\

260258 elide: Text.ElideRight; \n\

261− fontSize: "small"; \n\

259+ fontSize: "x-small"; \n\

262260 font.pixelSize: Math.round(FontUtils.sizeToPixels(fontSize) * fontScale); \n\

263261 color: %2; \n\

264262 visible: titleLabel.visible && titleLabel.text; \n\

265263 text: cardData && cardData["subtitle"] || ""; \n\

266264 font.weight: Font.Light; \n\

267− horizontalAlignment: root.headerAlignment; \n\

268265 }\n';

269266

270267// %1 is used as anchors of attributesRow

@@ -310,7 +307,7 @@ function cardString(template, components) {

310307 property var artShapeBorderSource: undefined; \n\

311308 property real fontScale: 1.0; \n\

312309 property var scopeStyle: null; \n\

313− property int headerAlignment: Text.AlignLeft; \n\

310+ property int titleAlignment: Text.AlignLeft; \n\

314311 property int fixedHeaderHeight: -1; \n\

315312 property size fixedArtShapeSize: Qt.size(-1, -1); \n\

316313 readonly property string title: cardData && cardData["title"] || ""; \n\

@@ -436,7 +433,7 @@ function cardString(template, components) {

436433 mascotShapeCode = kMascotShapeLoaderCode.arg(mascotAnchors);

437434 }

438435

439− var mascotImageVisible = useMascotShape ? 'false' : 'showHeader';

436+ var mascotImageVisible = useMascotShape ? 'false' : 'showHeader && resized';

440437 mascotCode = kMascotImageCode.arg(mascotAnchors).arg(mascotImageVisible);

441438 }

442439

@@ -655,6 +652,8 @@ function cardString(template, components) {

655652function createCardComponent(parent, template, components) {

656653 var imports = 'import QtQuick 2.2; \n\

657654 import Ubuntu.Components 1.1; \n\

655+ import Ubuntu.Settings.Components 0.1; \n\

656+ import Ubuntu.Connectivity 1.0; \n\

658657 import Dash 0.1;\n\

659658 import Utils 0.1;\n';

660659 var card = cardString(template, components);

plugins/Dash/CroppedImageMinimumSourceSize.qmlnew file+38

@@ -0,0 +1,38 @@

1+/*

2+ * Copyright (C) 2014 Canonical, Ltd.

3+ *

4+ * This program is free software; you can redistribute it and/or modify

5+ * it under the terms of the GNU General Public License as published by

6+ * the Free Software Foundation; version 3.

7+ *

8+ * This program is distributed in the hope that it will be useful,

9+ * but WITHOUT ANY WARRANTY; without even the implied warranty of

10+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

11+ * GNU General Public License for more details.

12+ *

13+ * You should have received a copy of the GNU General Public License

14+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

15+ */

16+

17+import QtQuick 2.3

18+

19+Image {

20+ property bool resized: false

21+ property bool resizing: false

22+ fillMode: Image.PreserveAspectCrop

23+ visible: resized

24+ onSourceSizeChanged: {

25+ if (!resized && !resizing) {

26+ resizing = true;

27+ var ar = width / height;

28+ var ssar = sourceSize.width / sourceSize.height;

29+ if (ar > ssar) {

30+ sourceSize = Qt.size(width, 0);

31+ } else {

32+ sourceSize = Qt.size(0, height);

33+ }

34+ resizing = false;

35+ resized = true;

36+ }

37+ }

38+}

plugins/Dash/listviewwithpageheader.cpp+18−7

@@ -104,8 +104,6 @@

104104#pragma GCC diagnostic pop

105105// #include <private/qquickrectangle_p.h>

106106

107−static const qreal bufferRatio = 0.5;

108−

109107qreal ListViewWithPageHeader::ListItem::height() const

110108{

111109 return m_item->height() + (m_sectionItem ? m_sectionItem->height() : 0);

@@ -158,6 +156,7 @@ ListViewWithPageHeader::ListViewWithPageHeader()

158156 , m_forceNoClip(false)

159157 , m_inLayout(false)

160158 , m_inContentHeightKeepHeaderShown(false)

159+ , m_cacheBuffer(0)

161160{

162161 m_clipItem = new QQuickItem(contentItem());

163162// m_clipItem = new QQuickRectangle(contentItem());

@@ -335,6 +334,20 @@ qreal ListViewWithPageHeader::headerItemShownHeight() const

335334 return m_headerItemShownHeight;

336335}

337336

337+qreal ListViewWithPageHeader::cacheBuffer() const

338+{

339+ return m_cacheBuffer;

340+}

341+

342+void ListViewWithPageHeader::setCacheBuffer(qreal cacheBuffer)

343+{

344+ if (cacheBuffer != m_cacheBuffer) {

345+ m_cacheBuffer = cacheBuffer;

346+ Q_EMIT cacheBufferChanged();

347+ polish();

348+ }

349+}

350+

338351void ListViewWithPageHeader::positionAtBeginning()

339352{

340353 if (m_delegateModel->count() <= 0)

@@ -356,8 +369,7 @@ void ListViewWithPageHeader::positionAtBeginning()

356369 // Create the subsequent items

357370 int modelIndex = 1;

358371 qreal pos = item->y() + item->height();

359− const qreal buffer = height() * bufferRatio;

360− const qreal bufferTo = height() + buffer;

372+ const qreal bufferTo = height() + m_cacheBuffer;

361373 while (modelIndex < m_delegateModel->count() && pos <= bufferTo) {

362374 if (!(item = createItem(modelIndex, false)))

363375 break;

@@ -603,11 +615,10 @@ void ListViewWithPageHeader::refill()

603615 return;

604616 }

605617

606− const qreal buffer = height() * bufferRatio;

607618 const qreal from = contentY();

608619 const qreal to = from + height();

609− const qreal bufferFrom = from - buffer;

610− const qreal bufferTo = to + buffer;

620+ const qreal bufferFrom = from - m_cacheBuffer;

621+ const qreal bufferTo = to + m_cacheBuffer;

611622

612623 bool added = addVisibleItems(from, to, false);

613624 bool removed = removeNonVisibleItems(bufferFrom, bufferTo);

plugins/Dash/listviewwithpageheader.h+6

@@ -54,6 +54,7 @@ class ListViewWithPageHeader : public QQuickFlickable, public QQuickItemChangeLi

5454 Q_PROPERTY(bool forceNoClip READ forceNoClip WRITE setForceNoClip NOTIFY forceNoClipChanged)

5555 Q_PROPERTY(int stickyHeaderHeight READ stickyHeaderHeight NOTIFY stickyHeaderHeightChanged)

5656 Q_PROPERTY(qreal headerItemShownHeight READ headerItemShownHeight NOTIFY headerItemShownHeightChanged)

57+ Q_PROPERTY(qreal cacheBuffer READ cacheBuffer WRITE setCacheBuffer NOTIFY cacheBufferChanged)

5758

5859 friend class ListViewWithPageHeaderTest;

5960 friend class ListViewWithPageHeaderTestSection;

@@ -84,6 +85,9 @@ public:

8485 int stickyHeaderHeight() const;

8586 qreal headerItemShownHeight() const;

8687

88+ qreal cacheBuffer() const;

89+ void setCacheBuffer(qreal cacheBuffer);

90+

8791 Q_INVOKABLE void positionAtBeginning();

8892 Q_INVOKABLE void showHeader();

8993 Q_INVOKABLE int firstCreatedIndex() const;

@@ -105,6 +109,7 @@ Q_SIGNALS:

105109 void forceNoClipChanged();

106110 void stickyHeaderHeightChanged();

107111 void headerItemShownHeightChanged();

112+ void cacheBufferChanged();

108113

109114protected:

110115 void componentComplete() override;

@@ -199,6 +204,7 @@ private:

199204 bool m_forceNoClip;

200205 bool m_inLayout;

201206 bool m_inContentHeightKeepHeaderShown;

207+ qreal m_cacheBuffer;

202208

203209 // Qt 5.0 doesn't like releasing the items just after itemCreated

204210 // so we delay the releasing until the next updatePolish

plugins/Dash/qmldir+2−1

@@ -3,4 +3,5 @@ plugin Dash-qml

33typeinfo Dash.qmltypes

44singleton CardCreatorCache 0.1 CardCreatorCache.qml

55ScopeStyle 0.1 ScopeStyle.qml

6−CardAttributes 0.1 CardAttributes.qml

6+CardAttributes 0.1 CardAttributes.qml

7+CroppedImageMinimumSourceSize 0.1 CroppedImageMinimumSourceSize.qml

plugins/LightDM/DBusGreeter.h−1

@@ -21,7 +21,6 @@

2121#include <QObject>

2222

2323class Greeter;

24−class QDBusInterface;

2524

2625/** This is an internal class used to talk with the indicators.

2726 */

plugins/LightDM/DBusGreeterList.h−1

@@ -21,7 +21,6 @@

2121#include <QObject>

2222

2323class Greeter;

24−class QDBusInterface;

2524

2625/** This is an internal class used to talk with the indicators.

2726 */

plugins/Unity/DashCommunicator/CMakeLists.txt+8−2

@@ -1,5 +1,6 @@

11include_directories(

22 ${CMAKE_CURRENT_SOURCE_DIR}

3+ ${libunity8-private_SOURCE_DIR}

34)

45

56set(QMLDASHCOMMUNICATORPLUGIN_SRC

@@ -7,13 +8,18 @@ set(QMLDASHCOMMUNICATORPLUGIN_SRC

78 dbusdashcommunicatorservice.cpp

89 dashcommunicatorservice.cpp

910 dashcommunicator.cpp

10− )

11+ dashconnection.cpp

12+)

1113

1214add_library(DashCommunicator-qml MODULE

1315 ${QMLDASHCOMMUNICATORPLUGIN_SRC}

14− )

16+)

1517

1618qt5_use_modules(DashCommunicator-qml DBus Qml)

1719

20+target_link_libraries(DashCommunicator-qml

21+ unity8-private

22+)

23+

1824# export the qmldir and qmltypes files

1925add_unity8_plugin(Unity.DashCommunicator 0.1 Unity/DashCommunicator TARGETS DashCommunicator-qml)

plugins/Unity/DashCommunicator/dashcommunicator.cpp+22−13

@@ -15,29 +15,38 @@

1515 */

1616

1717#include "dashcommunicator.h"

18+#include "dashconnection.h"

1819

1920#include <QObject>

20−#include <QDBusConnection>

21−#include <QDBusInterface>

22−#include <QDebug>

2321

2422DashCommunicator::DashCommunicator(QObject *parent):

25− QObject(parent)

23+ QThread(parent),

24+ m_dashConnection(nullptr),

25+ m_created(false)

2626{

27+ start();

2728}

2829

29−DashCommunicator::~DashCommunicator()

30+void DashCommunicator::setCurrentScope(const QString &scopeId, bool animate, bool isSwipe)

3031{

32+ m_mutex.lock();

33+ if (m_created) {

34+ QMetaObject::invokeMethod(m_dashConnection, "setCurrentScope",

35+ Q_ARG(QString, scopeId),

36+ Q_ARG(bool, animate),

37+ Q_ARG(bool, isSwipe));

38+ }

39+ m_mutex.unlock();

3140}

3241

33−

34−void DashCommunicator::setCurrentScope(const QString &scopeId, bool animate, bool isSwipe)

42+void DashCommunicator::run()

3543{

36− QDBusConnection connection = QDBusConnection::sessionBus();

37− QDBusInterface dashIface ("com.canonical.UnityDash",

38− "/com/canonical/UnityDash",

39− "",

40− connection);

44+ m_dashConnection = new DashConnection("com.canonical.UnityDash",

45+ "/com/canonical/UnityDash",

46+ "", this);

47+ m_mutex.lock();

48+ m_created = true;

49+ m_mutex.unlock();

4150

42− dashIface.call("SetCurrentScope", scopeId, animate, isSwipe);

51+ exec();

4352}

plugins/Unity/DashCommunicator/dashcommunicator.h+16−6

@@ -17,19 +17,29 @@

1717#ifndef DASHCOMMUNICATOR_H

1818#define DASHCOMMUNICATOR_H

1919

20−#include <QObject>

20+// Qt

21+#include <QThread>

22+#include <QMutex>

2123

22−class DashCommunicator: public QObject

24+class DashConnection;

25+

26+class DashCommunicator: public QThread

2327{

2428 Q_OBJECT

25− Q_CLASSINFO("D-Bus Interface", "com.canonical.Unity.DashCommunicator")

26−

2729public:

28− DashCommunicator(QObject *parent = 0);

29− ~DashCommunicator();

30+ explicit DashCommunicator(QObject *parent = 0);

31+ ~DashCommunicator() = default;

3032

3133public Q_SLOTS:

3234 void setCurrentScope(const QString &scopeId, bool animate, bool isSwipe);

35+

36+protected:

37+ void run() override;

38+

39+private:

40+ DashConnection *m_dashConnection;

41+ bool m_created;

42+ QMutex m_mutex;

3343};

3444

3545#endif

plugins/Unity/DashCommunicator/dashconnection.cppnew file+33

@@ -0,0 +1,33 @@

1+/*

2+ * Copyright (C) 2014 Canonical, Ltd.

3+ *

4+ * This program is free software: you can redistribute it and/or modify it under

5+ * the terms of the GNU Lesser General Public License version 3, as published by

6+ * the Free Software Foundation.

7+ *

8+ * This program is distributed in the hope that it will be useful, but WITHOUT

9+ * ANY WARRANTY; without even the implied warranties of MERCHANTABILITY,

10+ * SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR PURPOSE. See the GNU

11+ * Lesser General Public License for more details.

12+ *

13+ * You should have received a copy of the GNU Lesser General Public License

14+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

15+ */

16+

17+#include "dashconnection.h"

18+

19+#include <QDBusInterface>

20+#include <QDBusPendingCall>

21+

22+DashConnection::DashConnection(const QString &service, const QString &path, const QString &interface, QObject *parent):

23+ AbstractDBusServiceMonitor(service, path, interface, SessionBus, parent)

24+{

25+

26+}

27+

28+void DashConnection::setCurrentScope(const QString &scopeId, bool animate, bool isSwipe)

29+{

30+ if (dbusInterface()) {

31+ dbusInterface()->asyncCall("SetCurrentScope", scopeId, animate, isSwipe);

32+ }

33+}

plugins/Unity/DashCommunicator/dashconnection.hnew file+34

@@ -0,0 +1,34 @@

1+/*

2+ * Copyright (C) 2014 Canonical, Ltd.

3+ *

4+ * This program is free software: you can redistribute it and/or modify it under

5+ * the terms of the GNU Lesser General Public License version 3, as published by

6+ * the Free Software Foundation.

7+ *

8+ * This program is distributed in the hope that it will be useful, but WITHOUT

9+ * ANY WARRANTY; without even the implied warranties of MERCHANTABILITY,

10+ * SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR PURPOSE. See the GNU

11+ * Lesser General Public License for more details.

12+ *

13+ * You should have received a copy of the GNU Lesser General Public License

14+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

15+ */

16+

17+#ifndef THREADEDDASHCONNECTION_H

18+#define THREADEDDASHCONNECTION_H

19+

20+// local

21+#include "abstractdbusservicemonitor.h"

22+

23+

24+class DashConnection: public AbstractDBusServiceMonitor

25+{

26+ Q_OBJECT

27+public:

28+ DashConnection(const QString &service, const QString &path, const QString &interface, QObject *parent = 0);

29+

30+public Q_SLOTS:

31+ void setCurrentScope(const QString &scopeId, bool animate, bool isSwipe);

32+};

33+

34+#endif

plugins/Unity/Launcher/CMakeLists.txt+1−1

@@ -1,6 +1,6 @@

11include(FindPkgConfig)

22pkg_check_modules(LAUNCHER_API REQUIRED unity-shell-launcher=4)

3−pkg_check_modules(APPLICATION_API REQUIRED unity-shell-application=4)

3+pkg_check_modules(APPLICATION_API REQUIRED unity-shell-application=5)

44pkg_check_modules(GSETTINGS_QT REQUIRED gsettings-qt)

55

66add_definitions(-DSM_BUSNAME=systemBus)

po/am.po+63−33

@@ -7,14 +7,15 @@ msgid ""

77msgstr ""

88"Project-Id-Version: unity8\n"

99"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10−"POT-Creation-Date: 2014-09-24 10:43+0100\n"

11−"PO-Revision-Date: 2014-09-28 14:37+0000\n"

10+"POT-Creation-Date: 2014-10-02 10:35+0200\n"

11+"PO-Revision-Date: 2014-10-04 15:36+0000\n"

1212"Last-Translator: samson <Unknown>\n"

1313"Language-Team: Amharic <am@li.org>\n"

1414"MIME-Version: 1.0\n"

1515"Content-Type: text/plain; charset=UTF-8\n"

1616"Content-Transfer-Encoding: 8bit\n"

17−"X-Launchpad-Export-Date: 2014-09-29 05:19+0000\n"

17+"Plural-Forms: nplurals=2; plural=n > 1;\n"

18+"X-Launchpad-Export-Date: 2014-10-05 06:38+0000\n"

1819"X-Generator: Launchpad (build 17196)\n"

1920

2021#: plugins/LightDM/Greeter.cpp:130

@@ -30,6 +31,25 @@ msgstr "አቋራጭ ማጣበቂያ"

3031msgid "Unpin shortcut"

3132msgstr "አቋራጭ መለያያ"

3233

34+#: qml/Components/DelayedLockscreen.qml:47

35+msgid "Device Locked"

36+msgstr "አካሉ ተቆልፏል"

37+

38+#: qml/Components/DelayedLockscreen.qml:62

39+msgid "You have been locked out due to too many failed passphrase attempts."

40+msgstr "ብዙ ጊዜ የተሳሳተ የ ማለፊያ ሀረግ ለማስገባት በ መሞከር ምክንያት ስልኩ ተቆልፏል"

41+

42+#: qml/Components/DelayedLockscreen.qml:63

43+msgid "You have been locked out due to too many failed passcode attempts."

44+msgstr "ብዙ ጊዜ የተሳሳተ የ ማለፊያ ኮድ ለማስገባት በ መሞከር ምክንያት ስልኩ ተቆልፏል"

45+

46+#: qml/Components/DelayedLockscreen.qml:72

47+#, qt-format

48+msgid "Please wait %1 minute and then try again…"

49+msgid_plural "Please wait %1 minutes and then try again…"

50+msgstr[0] "እባክዎን ይቆዩ %1 ደቂቃ እና ከዛ እንደ ገና ይምክሩ…"

51+msgstr[1] "እባክዎን ይቆዩ %1 ደቂቃዎች እና ከዛ እንደ ገና ይምክሩ…"

52+

3353#: qml/Components/Dialogs.qml:70

3454msgid "Log out"

3555msgstr "መውጫ"

@@ -135,14 +155,6 @@ msgid ""

135155msgstr ""

136156"አሁን የ ጠርዝ እንቅስቃሴን አውቀዋል እና መጀመር ይችላሉ ስልኩን መጠቀም <br><br>መመልከቻውን መታ ያድርጉ ለመጀመር"

137157

138−#: qml/Components/Lockscreen.qml:167

139−msgid "Please wait"

140−msgstr "እባክዎን ይቆዩ"

141−

142−#: qml/Components/Lockscreen.qml:172

143−msgid "Too many incorrect attempts"

144−msgstr "በርካታ የተሳሳቱ ሙከራዎች"

145−

146158#: qml/Components/Lockscreen.qml:206

147159msgid "Emergency Call"

148160msgstr "የ ድንገተኛ ጥሪ"

@@ -151,15 +163,6 @@ msgstr "የ ድንገተኛ ጥሪ"

151163msgid "OK"

152164msgstr "እሺ"

153165

154−#: qml/Components/PassphraseLockscreen.qml:61

155−#, qt-format

156−msgid "Hello %1"

157−msgstr "ሰላም %1"

158−

159−#: qml/Components/PassphraseLockscreen.qml:61

160−msgid "Hello"

161−msgstr "ሰላም"

162−

163166#: qml/Dash/GenericScopeView.qml:411 qml/Dash/GenericScopeView.qml:533

164167msgid "See less"

165168msgstr "አነስተኛ መመልከቻ"

@@ -226,8 +229,8 @@ msgid "All"

226229msgstr "ሁሉንም"

227230

228231#: qml/Greeter/Greeter.qml:157

229−msgid "Swipe to unlock"

230−msgstr "ለመክፈት ይጥረጉ"

232+msgid "Unlock"

233+msgstr "መክፈቻ"

231234

232235#: qml/Hud/HudParametrizedActionsPage.qml:139

233236msgid "Confirm"

@@ -305,26 +308,30 @@ msgstr "ሲም መክፈቻ"

305308msgid "Roaming"

306309msgstr "ማዘዋወሪያ"

307310

308−#: qml/Shell.qml:320

309−msgid "Enter your passphrase"

310−msgstr "የማለፊያ ሐረግ ያስገቡ"

311+#: qml/Shell.qml:340

312+msgid "Enter passphrase"

313+msgstr "የ ማለፊያ ሀረግ ያስገቡ"

311314

312315#: qml/Shell.qml:321

313316msgid "Sorry, incorrect passphrase"

314317msgstr "አዝናለሁ የተሳሳተ የማለፊያ ሐረግ"

315318

316−#: qml/Shell.qml:323

317−msgid "Enter your passcode"

318−msgstr "የ እርስዎን የማለፊያ ኮድ ያስገቡ"

319+#: qml/Shell.qml:342

320+msgid "Please re-enter"

321+msgstr "እባክዎን እንደገና-ያስገቡ"

322+

323+#: qml/Shell.qml:344

324+msgid "Enter passcode"

325+msgstr "የ ማለፊያ ኮድ ያስገቡ"

319326

320327#: qml/Shell.qml:324

321328msgid "Sorry, incorrect passcode"

322329msgstr "አዝናለሁ የተሳሳተ የማለፊያ ኮድ"

323330

324−#: qml/Shell.qml:327

331+#: qml/Shell.qml:348

325332#, qt-format

326−msgid "Enter your %1"

327−msgstr "ያስገቡ የ እርስዎን %1"

333+msgid "Enter %1"

334+msgstr "ማስገቢያ %1"

328335

329336#: qml/Shell.qml:328

330337#, qt-format

@@ -359,5 +366,28 @@ msgstr ""

359366"የተሳሳተ የማለፊያ ኮድ ካስገቡ የ እርስዎ ስልክ ወደ ነበረበት ወደ ፋክቶሪው ዘዴ ይመለሳል: እና የ ግል ዳታ በሙሉ "

360367"ይጠፋል"

361368

362−#~ msgid "Manage Dash"

363−#~ msgstr "የ ዳሽ አስተዳዳሪ"

369+#, qt-format

370+#~ msgid "Hello %1"

371+#~ msgstr "ሰላም %1"

372+

373+#~ msgid "Hello"

374+#~ msgstr "ሰላም"

375+

376+#~ msgid "Swipe to unlock"

377+#~ msgstr "ለመክፈት ይጥረጉ"

378+

379+#~ msgid "Please wait"

380+#~ msgstr "እባክዎን ይቆዩ"

381+

382+#~ msgid "Too many incorrect attempts"

383+#~ msgstr "በርካታ የተሳሳቱ ሙከራዎች"

384+

385+#, qt-format

386+#~ msgid "Enter your %1"

387+#~ msgstr "ያስገቡ የ እርስዎን %1"

388+

389+#~ msgid "Enter your passphrase"

390+#~ msgstr "የማለፊያ ሐረግ ያስገቡ"

391+

392+#~ msgid "Enter your passcode"

393+#~ msgstr "የ እርስዎን የማለፊያ ኮድ ያስገቡ"

po/ar.po+45−27

@@ -7,14 +7,16 @@ msgid ""

77msgstr ""

88"Project-Id-Version: unity\n"

99"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10−"POT-Creation-Date: 2014-09-24 10:43+0100\n"

10+"POT-Creation-Date: 2014-10-02 10:35+0200\n"

1111"PO-Revision-Date: 2014-05-22 08:22+0000\n"

1212"Last-Translator: Ibrahim Saed <ibraheem5000@gmail.com>\n"

1313"Language-Team: Arabic <ar@li.org>\n"

1414"MIME-Version: 1.0\n"

1515"Content-Type: text/plain; charset=UTF-8\n"

1616"Content-Transfer-Encoding: 8bit\n"

17−"X-Launchpad-Export-Date: 2014-09-29 05:19+0000\n"

17+"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n % 100 >= "

18+"3 && n % 100 <= 10 ? 3 : n % 100 >= 11 && n % 100 <= 99 ? 4 : 5;\n"

19+"X-Launchpad-Export-Date: 2014-10-03 06:21+0000\n"

1820"X-Generator: Launchpad (build 17196)\n"

1921

2022#: plugins/LightDM/Greeter.cpp:130

@@ -30,6 +32,25 @@ msgstr ""

3032msgid "Unpin shortcut"

3133msgstr ""

3234

35+#: qml/Components/DelayedLockscreen.qml:47

36+msgid "Device Locked"

37+msgstr ""

38+

39+#: qml/Components/DelayedLockscreen.qml:62

40+msgid "You have been locked out due to too many failed passphrase attempts."

41+msgstr ""

42+

43+#: qml/Components/DelayedLockscreen.qml:63

44+msgid "You have been locked out due to too many failed passcode attempts."

45+msgstr ""

46+

47+#: qml/Components/DelayedLockscreen.qml:72

48+#, qt-format

49+msgid "Please wait %1 minute and then try again…"

50+msgid_plural "Please wait %1 minutes and then try again…"

51+msgstr[0] ""

52+msgstr[1] ""

53+

3354#: qml/Components/Dialogs.qml:70

3455msgid "Log out"

3556msgstr ""

@@ -135,14 +156,6 @@ msgstr ""

135156"أنت الآن بارع في إيماءات الحواف ويمكنك البدء باستخدام هاتفك<br><br>انقر على "

136157"الشاشة للبدء"

137158

138−#: qml/Components/Lockscreen.qml:167

139−msgid "Please wait"

140−msgstr ""

141−

142−#: qml/Components/Lockscreen.qml:172

143−msgid "Too many incorrect attempts"

144−msgstr ""

145−

146159#: qml/Components/Lockscreen.qml:206

147160msgid "Emergency Call"

148161msgstr "مكالمة طوارئ"

@@ -151,15 +164,6 @@ msgstr "مكالمة طوارئ"

151164msgid "OK"

152165msgstr ""

153166

154−#: qml/Components/PassphraseLockscreen.qml:61

155−#, qt-format

156−msgid "Hello %1"

157−msgstr "مرحبا %1"

158−

159−#: qml/Components/PassphraseLockscreen.qml:61

160−msgid "Hello"

161−msgstr "مرحبًا"

162−

163167#: qml/Dash/GenericScopeView.qml:411 qml/Dash/GenericScopeView.qml:533

164168msgid "See less"

165169msgstr "شاهد أقل"

@@ -226,8 +230,8 @@ msgid "All"

226230msgstr ""

227231

228232#: qml/Greeter/Greeter.qml:157

229−msgid "Swipe to unlock"

230−msgstr "اسحب لفتح القفل"

233+msgid "Unlock"

234+msgstr ""

231235

232236#: qml/Hud/HudParametrizedActionsPage.qml:139

233237msgid "Confirm"

@@ -305,25 +309,29 @@ msgstr ""

305309msgid "Roaming"

306310msgstr ""

307311

308−#: qml/Shell.qml:320

309−msgid "Enter your passphrase"

312+#: qml/Shell.qml:340

313+msgid "Enter passphrase"

310314msgstr ""

311315

312316#: qml/Shell.qml:321

313317msgid "Sorry, incorrect passphrase"

314318msgstr ""

315319

316−#: qml/Shell.qml:323

317−msgid "Enter your passcode"

320+#: qml/Shell.qml:342

321+msgid "Please re-enter"

322+msgstr ""

323+

324+#: qml/Shell.qml:344

325+msgid "Enter passcode"

318326msgstr ""

319327

320328#: qml/Shell.qml:324

321329msgid "Sorry, incorrect passcode"

322330msgstr ""

323331

324−#: qml/Shell.qml:327

332+#: qml/Shell.qml:348

325333#, qt-format

326−msgid "Enter your %1"

334+msgid "Enter %1"

327335msgstr ""

328336

329337#: qml/Shell.qml:328

@@ -354,3 +362,13 @@ msgid ""

354362"If passcode is entered incorrectly, your phone will conduct a factory reset "

355363"and all personal data will be deleted."

356364msgstr ""

365+

366+#, qt-format

367+#~ msgid "Hello %1"

368+#~ msgstr "مرحبا %1"

369+

370+#~ msgid "Hello"

371+#~ msgstr "مرحبًا"

372+

373+#~ msgid "Swipe to unlock"

374+#~ msgstr "اسحب لفتح القفل"

po/ast.po+64−34

@@ -7,14 +7,15 @@ msgid ""

77msgstr ""

88"Project-Id-Version: unity8\n"

99"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10−"POT-Creation-Date: 2014-09-24 10:43+0100\n"

11−"PO-Revision-Date: 2014-09-28 09:02+0000\n"

12−"Last-Translator: ivarela <ivarela@ubuntu.com>\n"

10+"POT-Creation-Date: 2014-10-02 10:35+0200\n"

11+"PO-Revision-Date: 2014-10-03 22:20+0000\n"

12+"Last-Translator: Xuacu Saturio <xuacusk8@gmail.com>\n"

1313"Language-Team: Asturian <ast@li.org>\n"

1414"MIME-Version: 1.0\n"

1515"Content-Type: text/plain; charset=UTF-8\n"

1616"Content-Transfer-Encoding: 8bit\n"

17−"X-Launchpad-Export-Date: 2014-09-29 05:19+0000\n"

17+"Plural-Forms: nplurals=2; plural=n != 1;\n"

18+"X-Launchpad-Export-Date: 2014-10-04 06:28+0000\n"

1819"X-Generator: Launchpad (build 17196)\n"

1920

2021#: plugins/LightDM/Greeter.cpp:130

@@ -30,6 +31,25 @@ msgstr "Anclar"

3031msgid "Unpin shortcut"

3132msgstr "Desanclar"

3233

34+#: qml/Components/DelayedLockscreen.qml:47

35+msgid "Device Locked"

36+msgstr "Preséu bloquiáu"

37+

38+#: qml/Components/DelayedLockscreen.qml:62

39+msgid "You have been locked out due to too many failed passphrase attempts."

40+msgstr ""

41+

42+#: qml/Components/DelayedLockscreen.qml:63

43+msgid "You have been locked out due to too many failed passcode attempts."

44+msgstr ""

45+

46+#: qml/Components/DelayedLockscreen.qml:72

47+#, qt-format

48+msgid "Please wait %1 minute and then try again…"

49+msgid_plural "Please wait %1 minutes and then try again…"

50+msgstr[0] "Espera %1 minutu y vuelvi a intentalo…"

51+msgstr[1] "Espera %1 minutos y vuelvi a intentalo…"

52+

3353#: qml/Components/Dialogs.qml:70

3454msgid "Log out"

3555msgstr "Zarrar sesión"

@@ -138,14 +158,6 @@ msgstr ""

138158"Agora yá domines los xestos de los berbesos y pues entamar a usar el "

139159"teléfonu<br><br>Toca la pantalla pa comenzar"

140160

141−#: qml/Components/Lockscreen.qml:167

142−msgid "Please wait"

143−msgstr "Espera un segundu"

144−

145−#: qml/Components/Lockscreen.qml:172

146−msgid "Too many incorrect attempts"

147−msgstr "Munchos intentos incorreutos"

148−

149161#: qml/Components/Lockscreen.qml:206

150162msgid "Emergency Call"

151163msgstr "Llamada d'emerxencia"

@@ -154,15 +166,6 @@ msgstr "Llamada d'emerxencia"

154166msgid "OK"

155167msgstr "Aceutar"

156168

157−#: qml/Components/PassphraseLockscreen.qml:61

158−#, qt-format

159−msgid "Hello %1"

160−msgstr "Hola %1"

161−

162−#: qml/Components/PassphraseLockscreen.qml:61

163−msgid "Hello"

164−msgstr "Hola"

165−

166169#: qml/Dash/GenericScopeView.qml:411 qml/Dash/GenericScopeView.qml:533

167170msgid "See less"

168171msgstr "Ver menos"

@@ -229,8 +232,8 @@ msgid "All"

229232msgstr "Too"

230233

231234#: qml/Greeter/Greeter.qml:157

232−msgid "Swipe to unlock"

233−msgstr "Esliza pa desbloquiar"

235+msgid "Unlock"

236+msgstr "Desbloquiar"

234237

235238#: qml/Hud/HudParametrizedActionsPage.qml:139

236239msgid "Confirm"

@@ -308,26 +311,30 @@ msgstr "Desbloquiar SIM"

308311msgid "Roaming"

309312msgstr "Roaming"

310313

311−#: qml/Shell.qml:320

312−msgid "Enter your passphrase"

313−msgstr "Introduz contraseña"

314+#: qml/Shell.qml:340

315+msgid "Enter passphrase"

316+msgstr ""

314317

315318#: qml/Shell.qml:321

316319msgid "Sorry, incorrect passphrase"

317320msgstr "Sentímoslo, contraseña incorreuta"

318321

319−#: qml/Shell.qml:323

320−msgid "Enter your passcode"

321−msgstr "Introduz códigu de pasu"

322+#: qml/Shell.qml:342

323+msgid "Please re-enter"

324+msgstr "Vuelvi a escribila"

325+

326+#: qml/Shell.qml:344

327+msgid "Enter passcode"

328+msgstr ""

322329

323330#: qml/Shell.qml:324

324331msgid "Sorry, incorrect passcode"

325332msgstr "Sentímoslo, códigu de pasu incorreutu"

326333

327−#: qml/Shell.qml:327

334+#: qml/Shell.qml:348

328335#, qt-format

329−msgid "Enter your %1"

330−msgstr "Introduz %1"

336+msgid "Enter %1"

337+msgstr "Escribi %1"

331338

332339#: qml/Shell.qml:328

333340#, qt-format

@@ -362,5 +369,28 @@ msgstr ""

362369"Si s'inxerta'l códigu incorreutamente, el teléfonu va volver a la "

363370"configuración de fábrica y van perdese tolos datos personales."

364371

365−#~ msgid "Manage Dash"

366−#~ msgstr "Xestionar tableru"

372+#~ msgid "Hello"

373+#~ msgstr "Hola"

374+

375+#, qt-format

376+#~ msgid "Hello %1"

377+#~ msgstr "Hola %1"

378+

379+#~ msgid "Swipe to unlock"

380+#~ msgstr "Esliza pa desbloquiar"

381+

382+#~ msgid "Please wait"

383+#~ msgstr "Espera un segundu"

384+

385+#, qt-format

386+#~ msgid "Enter your %1"

387+#~ msgstr "Introduz %1"

388+

389+#~ msgid "Enter your passphrase"

390+#~ msgstr "Introduz contraseña"

391+

392+#~ msgid "Enter your passcode"

393+#~ msgstr "Introduz códigu de pasu"

394+

395+#~ msgid "Too many incorrect attempts"

396+#~ msgstr "Munchos intentos incorreutos"

po/az.po+59−29

@@ -7,14 +7,15 @@ msgid ""

77msgstr ""

88"Project-Id-Version: unity\n"

99"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10−"POT-Creation-Date: 2014-09-24 10:43+0100\n"

10+"POT-Creation-Date: 2014-10-02 10:35+0200\n"

1111"PO-Revision-Date: 2014-09-03 16:39+0000\n"

1212"Last-Translator: Nicat Məmmədov <n1c4t97@gmail.com>\n"

1313"Language-Team: Azerbaijani <az@li.org>\n"

1414"MIME-Version: 1.0\n"

1515"Content-Type: text/plain; charset=UTF-8\n"

1616"Content-Transfer-Encoding: 8bit\n"

17−"X-Launchpad-Export-Date: 2014-09-29 05:19+0000\n"

17+"Plural-Forms: nplurals=2; plural=n != 1;\n"

18+"X-Launchpad-Export-Date: 2014-10-03 06:21+0000\n"

1819"X-Generator: Launchpad (build 17196)\n"

1920

2021#: plugins/LightDM/Greeter.cpp:130

@@ -30,6 +31,25 @@ msgstr "Pin qısayolu"

3031msgid "Unpin shortcut"

3132msgstr "Açma qısayolu"

3233

34+#: qml/Components/DelayedLockscreen.qml:47

35+msgid "Device Locked"

36+msgstr ""

37+

38+#: qml/Components/DelayedLockscreen.qml:62

39+msgid "You have been locked out due to too many failed passphrase attempts."

40+msgstr ""

41+

42+#: qml/Components/DelayedLockscreen.qml:63

43+msgid "You have been locked out due to too many failed passcode attempts."

44+msgstr ""

45+

46+#: qml/Components/DelayedLockscreen.qml:72

47+#, qt-format

48+msgid "Please wait %1 minute and then try again…"

49+msgid_plural "Please wait %1 minutes and then try again…"

50+msgstr[0] ""

51+msgstr[1] ""

52+

3353#: qml/Components/Dialogs.qml:70

3454msgid "Log out"

3555msgstr "Çıxış"

@@ -135,14 +155,6 @@ msgstr ""

135155"Siz künc hәrәkәtlәrini öyrәndiniz və telefonu istifadə etməyə başlaya "

136156"bilərsiniz.<br><br>Başlamaq üçün ekrana toxunun"

137157

138−#: qml/Components/Lockscreen.qml:167

139−msgid "Please wait"

140−msgstr "Xahiş edirik gözləyin"

141−

142−#: qml/Components/Lockscreen.qml:172

143−msgid "Too many incorrect attempts"

144−msgstr "Çoxlu yanlış cəhdlәr"

145−

146158#: qml/Components/Lockscreen.qml:206

147159msgid "Emergency Call"

148160msgstr "Zərurət zəngi"

@@ -151,15 +163,6 @@ msgstr "Zərurət zəngi"

151163msgid "OK"

152164msgstr "Oldu"

153165

154−#: qml/Components/PassphraseLockscreen.qml:61

155−#, qt-format

156−msgid "Hello %1"

157−msgstr "Salam %1"

158−

159−#: qml/Components/PassphraseLockscreen.qml:61

160−msgid "Hello"

161−msgstr "Salam"

162−

163166#: qml/Dash/GenericScopeView.qml:411 qml/Dash/GenericScopeView.qml:533

164167msgid "See less"

165168msgstr "Daha azını gör"

@@ -226,8 +229,8 @@ msgid "All"

226229msgstr "Hamısı"

227230

228231#: qml/Greeter/Greeter.qml:157

229−msgid "Swipe to unlock"

230−msgstr "Kilidi açmaq üçün sürüşdürün"

232+msgid "Unlock"

233+msgstr ""

231234

232235#: qml/Hud/HudParametrizedActionsPage.qml:139

233236msgid "Confirm"

@@ -305,26 +308,30 @@ msgstr "SIM kilidini aç"

305308msgid "Roaming"

306309msgstr "Rominq"

307310

308−#: qml/Shell.qml:320

309−msgid "Enter your passphrase"

310−msgstr "Açar sözünüzü daxil edin"

311+#: qml/Shell.qml:340

312+msgid "Enter passphrase"

313+msgstr ""

311314

312315#: qml/Shell.qml:321

313316msgid "Sorry, incorrect passphrase"

314317msgstr "Bağışlayın, açar söz yanlışdır"

315318

316−#: qml/Shell.qml:323

317−msgid "Enter your passcode"

319+#: qml/Shell.qml:342

320+msgid "Please re-enter"

321+msgstr ""

322+

323+#: qml/Shell.qml:344

324+msgid "Enter passcode"

318325msgstr ""

319326

320327#: qml/Shell.qml:324

321328msgid "Sorry, incorrect passcode"

322329msgstr ""

323330

324−#: qml/Shell.qml:327

331+#: qml/Shell.qml:348

325332#, qt-format

326−msgid "Enter your %1"

327−msgstr "%1 daxil edin"

333+msgid "Enter %1"

334+msgstr ""

328335

329336#: qml/Shell.qml:328

330337#, qt-format

@@ -358,3 +365,26 @@ msgid ""

358365msgstr ""

359366"Əgər açar kod yanlış daxil edilibsə, onda telefonunuz fabrika parametrlərinə "

360367"geri qayıdacaq və bütün şəxsi məlumatlarınız silinəcək."

368+

369+#~ msgid "Swipe to unlock"

370+#~ msgstr "Kilidi açmaq üçün sürüşdürün"

371+

372+#, qt-format

373+#~ msgid "Enter your %1"

374+#~ msgstr "%1 daxil edin"

375+

376+#~ msgid "Enter your passphrase"

377+#~ msgstr "Açar sözünüzü daxil edin"

378+

379+#~ msgid "Please wait"

380+#~ msgstr "Xahiş edirik gözləyin"

381+

382+#~ msgid "Too many incorrect attempts"

383+#~ msgstr "Çoxlu yanlış cəhdlәr"

384+

385+#, qt-format

386+#~ msgid "Hello %1"

387+#~ msgstr "Salam %1"

388+

389+#~ msgid "Hello"

390+#~ msgstr "Salam"

po/be.po+34−26

@@ -7,14 +7,16 @@ msgid ""

77msgstr ""

88"Project-Id-Version: unity8\n"

99"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10−"POT-Creation-Date: 2014-09-24 10:43+0100\n"

10+"POT-Creation-Date: 2014-10-02 10:35+0200\n"

1111"PO-Revision-Date: 2014-09-24 17:12+0000\n"

1212"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"

1313"Language-Team: Belarusian <be@li.org>\n"

1414"MIME-Version: 1.0\n"

1515"Content-Type: text/plain; charset=UTF-8\n"

1616"Content-Transfer-Encoding: 8bit\n"

17−"X-Launchpad-Export-Date: 2014-09-29 05:19+0000\n"

17+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && "

18+"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"

19+"X-Launchpad-Export-Date: 2014-10-03 06:21+0000\n"

1820"X-Generator: Launchpad (build 17196)\n"

1921

2022#: plugins/LightDM/Greeter.cpp:130

@@ -30,6 +32,25 @@ msgstr ""

3032msgid "Unpin shortcut"

3133msgstr ""

3234

35+#: qml/Components/DelayedLockscreen.qml:47

36+msgid "Device Locked"

37+msgstr ""

38+

39+#: qml/Components/DelayedLockscreen.qml:62

40+msgid "You have been locked out due to too many failed passphrase attempts."

41+msgstr ""

42+

43+#: qml/Components/DelayedLockscreen.qml:63

44+msgid "You have been locked out due to too many failed passcode attempts."

45+msgstr ""

46+

47+#: qml/Components/DelayedLockscreen.qml:72

48+#, qt-format

49+msgid "Please wait %1 minute and then try again…"

50+msgid_plural "Please wait %1 minutes and then try again…"

51+msgstr[0] ""

52+msgstr[1] ""

53+

3354#: qml/Components/Dialogs.qml:70

3455msgid "Log out"

3556msgstr ""

@@ -132,14 +153,6 @@ msgid ""

132153"phone<br><br>Tap on the screen to start"

133154msgstr ""

134155

135−#: qml/Components/Lockscreen.qml:167

136−msgid "Please wait"

137−msgstr ""

138−

139−#: qml/Components/Lockscreen.qml:172

140−msgid "Too many incorrect attempts"

141−msgstr ""

142−

143156#: qml/Components/Lockscreen.qml:206

144157msgid "Emergency Call"

145158msgstr ""

@@ -148,15 +161,6 @@ msgstr ""

148161msgid "OK"

149162msgstr ""

150163

151−#: qml/Components/PassphraseLockscreen.qml:61

152−#, qt-format

153−msgid "Hello %1"

154−msgstr ""

155−

156−#: qml/Components/PassphraseLockscreen.qml:61

157−msgid "Hello"

158−msgstr ""

159−

160164#: qml/Dash/GenericScopeView.qml:411 qml/Dash/GenericScopeView.qml:533

161165msgid "See less"

162166msgstr ""

@@ -223,7 +227,7 @@ msgid "All"

223227msgstr ""

224228

225229#: qml/Greeter/Greeter.qml:157

226−msgid "Swipe to unlock"

230+msgid "Unlock"

227231msgstr ""

228232

229233#: qml/Hud/HudParametrizedActionsPage.qml:139

@@ -302,25 +306,29 @@ msgstr ""

302306msgid "Roaming"

303307msgstr ""

304308

305−#: qml/Shell.qml:320

306−msgid "Enter your passphrase"

309+#: qml/Shell.qml:340

310+msgid "Enter passphrase"

307311msgstr ""

308312

309313#: qml/Shell.qml:321

310314msgid "Sorry, incorrect passphrase"

311315msgstr ""

312316

313−#: qml/Shell.qml:323

314−msgid "Enter your passcode"

317+#: qml/Shell.qml:342

318+msgid "Please re-enter"

319+msgstr ""

320+

321+#: qml/Shell.qml:344

322+msgid "Enter passcode"

315323msgstr ""

316324

317325#: qml/Shell.qml:324

318326msgid "Sorry, incorrect passcode"

319327msgstr ""

320328

321−#: qml/Shell.qml:327

329+#: qml/Shell.qml:348

322330#, qt-format

323−msgid "Enter your %1"

331+msgid "Enter %1"

324332msgstr ""

325333

326334#: qml/Shell.qml:328

po/bg.po+40−26

@@ -7,14 +7,15 @@ msgid ""

77msgstr ""

88"Project-Id-Version: unity\n"

99"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10−"POT-Creation-Date: 2014-09-24 10:43+0100\n"

10+"POT-Creation-Date: 2014-10-02 10:35+0200\n"

1111"PO-Revision-Date: 2014-04-01 14:08+0000\n"

1212"Last-Translator: Atanas Kovachki <Unknown>\n"

1313"Language-Team: Bulgarian <bg@li.org>\n"

1414"MIME-Version: 1.0\n"

1515"Content-Type: text/plain; charset=UTF-8\n"

1616"Content-Transfer-Encoding: 8bit\n"

17−"X-Launchpad-Export-Date: 2014-09-29 05:19+0000\n"

17+"Plural-Forms: nplurals=2; plural=n != 1;\n"

18+"X-Launchpad-Export-Date: 2014-10-03 06:21+0000\n"

1819"X-Generator: Launchpad (build 17196)\n"

1920

2021#: plugins/LightDM/Greeter.cpp:130

@@ -30,6 +31,25 @@ msgstr ""

3031msgid "Unpin shortcut"

3132msgstr ""

3233

34+#: qml/Components/DelayedLockscreen.qml:47

35+msgid "Device Locked"

36+msgstr ""

37+

38+#: qml/Components/DelayedLockscreen.qml:62

39+msgid "You have been locked out due to too many failed passphrase attempts."

40+msgstr ""

41+

42+#: qml/Components/DelayedLockscreen.qml:63

43+msgid "You have been locked out due to too many failed passcode attempts."

44+msgstr ""

45+

46+#: qml/Components/DelayedLockscreen.qml:72

47+#, qt-format

48+msgid "Please wait %1 minute and then try again…"

49+msgid_plural "Please wait %1 minutes and then try again…"

50+msgstr[0] ""

51+msgstr[1] ""

52+

3353#: qml/Components/Dialogs.qml:70

3454msgid "Log out"

3555msgstr ""

@@ -139,14 +159,6 @@ msgid ""

139159"phone<br><br>Tap on the screen to start"

140160msgstr ""

141161

142−#: qml/Components/Lockscreen.qml:167

143−msgid "Please wait"

144−msgstr ""

145−

146−#: qml/Components/Lockscreen.qml:172

147−msgid "Too many incorrect attempts"

148−msgstr ""

149−

150162#: qml/Components/Lockscreen.qml:206

151163msgid "Emergency Call"

152164msgstr "Спешно повикване"

@@ -155,15 +167,6 @@ msgstr "Спешно повикване"

155167msgid "OK"

156168msgstr ""

157169

158−#: qml/Components/PassphraseLockscreen.qml:61

159−#, qt-format

160−msgid "Hello %1"

161−msgstr "Здравей, %1"

162−

163−#: qml/Components/PassphraseLockscreen.qml:61

164−msgid "Hello"

165−msgstr "Здравей"

166−

167170#: qml/Dash/GenericScopeView.qml:411 qml/Dash/GenericScopeView.qml:533

168171msgid "See less"

169172msgstr ""

@@ -230,7 +233,7 @@ msgid "All"

230233msgstr ""

231234

232235#: qml/Greeter/Greeter.qml:157

233−msgid "Swipe to unlock"

236+msgid "Unlock"

234237msgstr ""

235238

236239#: qml/Hud/HudParametrizedActionsPage.qml:139

@@ -309,25 +312,29 @@ msgstr ""

309312msgid "Roaming"

310313msgstr ""

311314

312−#: qml/Shell.qml:320

313−msgid "Enter your passphrase"

315+#: qml/Shell.qml:340

316+msgid "Enter passphrase"

314317msgstr ""

315318

316319#: qml/Shell.qml:321

317320msgid "Sorry, incorrect passphrase"

318321msgstr ""

319322

320−#: qml/Shell.qml:323

321−msgid "Enter your passcode"

323+#: qml/Shell.qml:342

324+msgid "Please re-enter"

325+msgstr ""

326+

327+#: qml/Shell.qml:344

328+msgid "Enter passcode"

322329msgstr ""

323330

324331#: qml/Shell.qml:324

325332msgid "Sorry, incorrect passcode"

326333msgstr ""

327334

328−#: qml/Shell.qml:327

335+#: qml/Shell.qml:348

329336#, qt-format

330−msgid "Enter your %1"

337+msgid "Enter %1"

331338msgstr ""

332339

333340#: qml/Shell.qml:328

@@ -358,3 +365,10 @@ msgid ""

358365"If passcode is entered incorrectly, your phone will conduct a factory reset "

359366"and all personal data will be deleted."

360367msgstr ""

368+

369+#~ msgid "Hello"

370+#~ msgstr "Здравей"

371+

372+#, qt-format

373+#~ msgid "Hello %1"

374+#~ msgstr "Здравей, %1"

po/br.po+67−33

@@ -7,14 +7,15 @@ msgid ""

77msgstr ""

88"Project-Id-Version: unity8\n"

99"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10−"POT-Creation-Date: 2014-09-24 10:43+0100\n"

11−"PO-Revision-Date: 2014-09-30 06:25+0000\n"

10+"POT-Creation-Date: 2014-10-02 10:35+0200\n"

11+"PO-Revision-Date: 2014-10-03 06:52+0000\n"

1212"Last-Translator: Fohanno Thierry <thierry.fohanno@ofis-bzh.org>\n"

1313"Language-Team: Breton <br@li.org>\n"

1414"MIME-Version: 1.0\n"

1515"Content-Type: text/plain; charset=UTF-8\n"

1616"Content-Transfer-Encoding: 8bit\n"

17−"X-Launchpad-Export-Date: 2014-10-02 06:37+0000\n"

17+"Plural-Forms: nplurals=2; plural=n > 1;\n"

18+"X-Launchpad-Export-Date: 2014-10-04 06:28+0000\n"

1819"X-Generator: Launchpad (build 17196)\n"

1920

2021#: plugins/LightDM/Greeter.cpp:130

@@ -30,6 +31,29 @@ msgstr "Spilhennañ ar verradenn"

3031msgid "Unpin shortcut"

3132msgstr "Dispilhennañ ar verradenn"

3233

34+#: qml/Components/DelayedLockscreen.qml:47

35+msgid "Device Locked"

36+msgstr "Benveg prennet"

37+

38+#: qml/Components/DelayedLockscreen.qml:62

39+msgid "You have been locked out due to too many failed passphrase attempts."

40+msgstr ""

41+"Prennet eo bet ho penveg abalamour da re a daolioù-esae c'hwitet evit merkañ "

42+"ho frazenn-dremen."

43+

44+#: qml/Components/DelayedLockscreen.qml:63

45+msgid "You have been locked out due to too many failed passcode attempts."

46+msgstr ""

47+"Prennet eo bet ho penveg abalamour da re a daolioù-esae evit merkañ ho kod-"

48+"tremen."

49+

50+#: qml/Components/DelayedLockscreen.qml:72

51+#, qt-format

52+msgid "Please wait %1 minute and then try again…"

53+msgid_plural "Please wait %1 minutes and then try again…"

54+msgstr[0] "Gortozit %1 vunutenn, mar plij, hag esaeit en-dro..."

55+msgstr[1] "Gortozit %1 a vunutoù, mar plij, hag esaeit en-dro..."

56+

3357#: qml/Components/Dialogs.qml:70

3458msgid "Log out"

3559msgstr "Digevreañ"

@@ -141,14 +165,6 @@ msgstr ""

141165"Mestroniañ a rit ar jestroù ha gallout a rit kregiñ da implijout ar "

142166"pellgomzer<br><br>Touchit d'ar skramm evit kregiñ ganti"

143167

144−#: qml/Components/Lockscreen.qml:167

145−msgid "Please wait"

146−msgstr "Gortozit, mar plij"

147−

148−#: qml/Components/Lockscreen.qml:172

149−msgid "Too many incorrect attempts"

150−msgstr "Re a daolioù-esae direizh"

151−

152168#: qml/Components/Lockscreen.qml:206

153169msgid "Emergency Call"

154170msgstr "Pellgomzadenn vallus"

@@ -157,15 +173,6 @@ msgstr "Pellgomzadenn vallus"

157173msgid "OK"

158174msgstr "Mat eo"

159175

160−#: qml/Components/PassphraseLockscreen.qml:61

161−#, qt-format

162−msgid "Hello %1"

163−msgstr "Demat %1"

164−

165−#: qml/Components/PassphraseLockscreen.qml:61

166−msgid "Hello"

167−msgstr "Demat"

168−

169176#: qml/Dash/GenericScopeView.qml:411 qml/Dash/GenericScopeView.qml:533

170177msgid "See less"

171178msgstr "Gwelet nebeutoc'h"

@@ -232,8 +239,8 @@ msgid "All"

232239msgstr "An holl anezho"

233240

234241#: qml/Greeter/Greeter.qml:157

235−msgid "Swipe to unlock"

236−msgstr "Riklañ evit dibrennañ"

242+msgid "Unlock"

243+msgstr "Dibrennañ"

237244

238245#: qml/Hud/HudParametrizedActionsPage.qml:139

239246msgid "Confirm"

@@ -311,26 +318,30 @@ msgstr "Dibrennañ ar gartenn SIM"

311318msgid "Roaming"

312319msgstr "O kantren"

313320

314−#: qml/Shell.qml:320

315−msgid "Enter your passphrase"

316−msgstr "Ebarzhit ho frazenn-dremen"

321+#: qml/Shell.qml:340

322+msgid "Enter passphrase"

323+msgstr "Merkañ ar frazenn-dremen"

317324

318325#: qml/Shell.qml:321

319326msgid "Sorry, incorrect passphrase"

320327msgstr "Siwazh, frazenn-dremen direizh"

321328

322−#: qml/Shell.qml:323

323−msgid "Enter your passcode"

324−msgstr "Ebarzhit ho kod-tremen"

329+#: qml/Shell.qml:342

330+msgid "Please re-enter"

331+msgstr "Adverkañ, mar plij"

332+

333+#: qml/Shell.qml:344

334+msgid "Enter passcode"

335+msgstr "Merkañ ar c'hod-tremen"

325336

326337#: qml/Shell.qml:324

327338msgid "Sorry, incorrect passcode"

328339msgstr "Digarezit, kod-tremen direizh"

329340

330−#: qml/Shell.qml:327

341+#: qml/Shell.qml:348

331342#, qt-format

332−msgid "Enter your %1"

333−msgstr "Ebarzhit ho %1"

343+msgid "Enter %1"

344+msgstr "Merkañ %1"

334345

335346#: qml/Shell.qml:328

336347#, qt-format

@@ -365,5 +376,28 @@ msgstr ""

365376"Ma vez ebarzhet ur c'hod-tremen direizh, e vo adderaouekaet ho pellgomzer "

366377"gant arventennoù al labouradeg hag e vo diverket an holl roadennoù personel."

367378

368−#~ msgid "Manage Dash"

369−#~ msgstr "Merañ an daolenn-vourzh"

379+#~ msgid "Hello"

380+#~ msgstr "Demat"

381+

382+#, qt-format

383+#~ msgid "Hello %1"

384+#~ msgstr "Demat %1"

385+

386+#~ msgid "Swipe to unlock"

387+#~ msgstr "Riklañ evit dibrennañ"

388+

389+#~ msgid "Please wait"

390+#~ msgstr "Gortozit, mar plij"

391+

392+#~ msgid "Too many incorrect attempts"

393+#~ msgstr "Re a daolioù-esae direizh"

394+

395+#~ msgid "Enter your passphrase"

396+#~ msgstr "Ebarzhit ho frazenn-dremen"

397+

398+#, qt-format

399+#~ msgid "Enter your %1"

400+#~ msgstr "Ebarzhit ho %1"

401+

402+#~ msgid "Enter your passcode"

403+#~ msgstr "Ebarzhit ho kod-tremen"

po/bs.po+34−26

@@ -7,14 +7,16 @@ msgid ""

77msgstr ""

88"Project-Id-Version: unity8\n"

99"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10−"POT-Creation-Date: 2014-09-24 10:43+0100\n"

10+"POT-Creation-Date: 2014-10-02 10:35+0200\n"

1111"PO-Revision-Date: 2014-01-16 22:33+0000\n"

1212"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"

1313"Language-Team: Bosnian <bs@li.org>\n"

1414"MIME-Version: 1.0\n"

1515"Content-Type: text/plain; charset=UTF-8\n"

1616"Content-Transfer-Encoding: 8bit\n"

17−"X-Launchpad-Export-Date: 2014-09-29 05:19+0000\n"

17+"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && "

18+"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"

19+"X-Launchpad-Export-Date: 2014-10-03 06:21+0000\n"

1820"X-Generator: Launchpad (build 17196)\n"

1921

2022#: plugins/LightDM/Greeter.cpp:130

@@ -30,6 +32,25 @@ msgstr ""

3032msgid "Unpin shortcut"

3133msgstr ""

3234

35+#: qml/Components/DelayedLockscreen.qml:47

36+msgid "Device Locked"

37+msgstr ""

38+

39+#: qml/Components/DelayedLockscreen.qml:62

40+msgid "You have been locked out due to too many failed passphrase attempts."

41+msgstr ""

42+

43+#: qml/Components/DelayedLockscreen.qml:63

44+msgid "You have been locked out due to too many failed passcode attempts."

45+msgstr ""

46+

47+#: qml/Components/DelayedLockscreen.qml:72

48+#, qt-format

49+msgid "Please wait %1 minute and then try again…"

50+msgid_plural "Please wait %1 minutes and then try again…"

51+msgstr[0] ""

52+msgstr[1] ""

53+

3354#: qml/Components/Dialogs.qml:70

3455msgid "Log out"

3556msgstr ""

@@ -132,14 +153,6 @@ msgid ""

132153"phone<br><br>Tap on the screen to start"

133154msgstr ""

134155

135−#: qml/Components/Lockscreen.qml:167

136−msgid "Please wait"

137−msgstr ""

138−

139−#: qml/Components/Lockscreen.qml:172

140−msgid "Too many incorrect attempts"

141−msgstr ""

142−

143156#: qml/Components/Lockscreen.qml:206

144157msgid "Emergency Call"

145158msgstr ""

@@ -148,15 +161,6 @@ msgstr ""

148161msgid "OK"

149162msgstr ""

150163

151−#: qml/Components/PassphraseLockscreen.qml:61

152−#, qt-format

153−msgid "Hello %1"

154−msgstr ""

155−

156−#: qml/Components/PassphraseLockscreen.qml:61

157−msgid "Hello"

158−msgstr ""

159−

160164#: qml/Dash/GenericScopeView.qml:411 qml/Dash/GenericScopeView.qml:533

161165msgid "See less"

162166msgstr ""

@@ -223,7 +227,7 @@ msgid "All"

223227msgstr ""

224228

225229#: qml/Greeter/Greeter.qml:157

226−msgid "Swipe to unlock"

230+msgid "Unlock"

227231msgstr ""

228232

229233#: qml/Hud/HudParametrizedActionsPage.qml:139

@@ -302,25 +306,29 @@ msgstr ""

302306msgid "Roaming"

303307msgstr ""

304308

305−#: qml/Shell.qml:320

306−msgid "Enter your passphrase"

309+#: qml/Shell.qml:340

310+msgid "Enter passphrase"

307311msgstr ""

308312

309313#: qml/Shell.qml:321

310314msgid "Sorry, incorrect passphrase"

311315msgstr ""

312316

313−#: qml/Shell.qml:323

314−msgid "Enter your passcode"

317+#: qml/Shell.qml:342

318+msgid "Please re-enter"

319+msgstr ""

320+

321+#: qml/Shell.qml:344

322+msgid "Enter passcode"

315323msgstr ""

316324

317325#: qml/Shell.qml:324

318326msgid "Sorry, incorrect passcode"

319327msgstr ""

320328

321−#: qml/Shell.qml:327

329+#: qml/Shell.qml:348

322330#, qt-format

323−msgid "Enter your %1"

331+msgid "Enter %1"

324332msgstr ""

325333

326334#: qml/Shell.qml:328

po/ca.po+63−30

@@ -7,14 +7,15 @@ msgid ""

77msgstr ""

88"Project-Id-Version: unity\n"

99"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10−"POT-Creation-Date: 2014-09-24 10:43+0100\n"

10+"POT-Creation-Date: 2014-10-02 10:35+0200\n"

1111"PO-Revision-Date: 2014-09-23 06:27+0000\n"

1212"Last-Translator: David Planella <david.planella@ubuntu.com>\n"

1313"Language-Team: Catalan <ca@li.org>\n"

1414"MIME-Version: 1.0\n"

1515"Content-Type: text/plain; charset=UTF-8\n"

1616"Content-Transfer-Encoding: 8bit\n"

17−"X-Launchpad-Export-Date: 2014-09-29 05:19+0000\n"

17+"Plural-Forms: nplurals=2; plural=n != 1;\n"

18+"X-Launchpad-Export-Date: 2014-10-03 06:21+0000\n"

1819"X-Generator: Launchpad (build 17196)\n"

1920

2021#: plugins/LightDM/Greeter.cpp:130

@@ -30,6 +31,25 @@ msgstr "Enganxa la drecera"

3031msgid "Unpin shortcut"

3132msgstr "Desenganxa la drecera"

3233

34+#: qml/Components/DelayedLockscreen.qml:47

35+msgid "Device Locked"

36+msgstr ""

37+

38+#: qml/Components/DelayedLockscreen.qml:62

39+msgid "You have been locked out due to too many failed passphrase attempts."

40+msgstr ""

41+

42+#: qml/Components/DelayedLockscreen.qml:63

43+msgid "You have been locked out due to too many failed passcode attempts."

44+msgstr ""

45+

46+#: qml/Components/DelayedLockscreen.qml:72

47+#, qt-format

48+msgid "Please wait %1 minute and then try again…"

49+msgid_plural "Please wait %1 minutes and then try again…"

50+msgstr[0] ""

51+msgstr[1] ""

52+

3353#: qml/Components/Dialogs.qml:70

3454msgid "Log out"

3555msgstr "Surt"

@@ -142,14 +162,6 @@ msgstr ""

142162"Ja heu après com utilitzar els gestos de les vores per fer servir el "

143163"telèfon<br><br>Feu un toc a la pantalla per començar"

144164

145−#: qml/Components/Lockscreen.qml:167

146−msgid "Please wait"

147−msgstr "Espereu"

148−

149−#: qml/Components/Lockscreen.qml:172

150−msgid "Too many incorrect attempts"

151−msgstr "Massa intents incorrectes"

152−

153165#: qml/Components/Lockscreen.qml:206

154166msgid "Emergency Call"

155167msgstr "Trucada d'emergència"

@@ -158,15 +170,6 @@ msgstr "Trucada d'emergència"

158170msgid "OK"

159171msgstr "D'acord"

160172

161−#: qml/Components/PassphraseLockscreen.qml:61

162−#, qt-format

163−msgid "Hello %1"

164−msgstr "Hola %1"

165−

166−#: qml/Components/PassphraseLockscreen.qml:61

167−msgid "Hello"

168−msgstr "Hola"

169−

170173#: qml/Dash/GenericScopeView.qml:411 qml/Dash/GenericScopeView.qml:533

171174msgid "See less"

172175msgstr "Mostra'n menys"

@@ -233,8 +236,8 @@ msgid "All"

233236msgstr "Totes"

234237

235238#: qml/Greeter/Greeter.qml:157

236−msgid "Swipe to unlock"

237−msgstr "Feu lliscar el dit per desbloquejar"

239+msgid "Unlock"

240+msgstr ""

238241

239242#: qml/Hud/HudParametrizedActionsPage.qml:139

240243msgid "Confirm"

@@ -312,26 +315,30 @@ msgstr "Desbloca la SIM"

312315msgid "Roaming"

313316msgstr "Itinerància"

314317

315−#: qml/Shell.qml:320

316−msgid "Enter your passphrase"

317−msgstr "Escriviu la contrasenya"

318+#: qml/Shell.qml:340

319+msgid "Enter passphrase"

320+msgstr ""

318321

319322#: qml/Shell.qml:321

320323msgid "Sorry, incorrect passphrase"

321324msgstr "La contrasenya no és correcta"

322325

323−#: qml/Shell.qml:323

324−msgid "Enter your passcode"

325−msgstr "Introduïu el codi d'accés"

326+#: qml/Shell.qml:342

327+msgid "Please re-enter"

328+msgstr ""

329+

330+#: qml/Shell.qml:344

331+msgid "Enter passcode"

332+msgstr ""

326333

327334#: qml/Shell.qml:324

328335msgid "Sorry, incorrect passcode"

329336msgstr "El codi d'accés no és correcte"

330337

331−#: qml/Shell.qml:327

338+#: qml/Shell.qml:348

332339#, qt-format

333−msgid "Enter your %1"

334−msgstr "Introduïu la %1"

340+msgid "Enter %1"

341+msgstr ""

335342

336343#: qml/Shell.qml:328

337344#, qt-format

@@ -367,5 +374,31 @@ msgstr ""

367374"Si la clau s'introdueix de manera incorrecta, el telèfon es reinicialitzarà "

368375"a l'estat de fàbrica i se suprimiran totes les dades personals."

369376

377+#~ msgid "Hello"

378+#~ msgstr "Hola"

379+

380+#, qt-format

381+#~ msgid "Hello %1"

382+#~ msgstr "Hola %1"

383+

384+#~ msgid "Swipe to unlock"

385+#~ msgstr "Feu lliscar el dit per desbloquejar"

386+

370387#~ msgid "Manage Dash"

371388#~ msgstr "Gestiona el tauler"

389+

390+#~ msgid "Please wait"

391+#~ msgstr "Espereu"

392+

393+#~ msgid "Too many incorrect attempts"

394+#~ msgstr "Massa intents incorrectes"

395+

396+#, qt-format

397+#~ msgid "Enter your %1"

398+#~ msgstr "Introduïu la %1"

399+

400+#~ msgid "Enter your passphrase"

401+#~ msgstr "Escriviu la contrasenya"

402+

403+#~ msgid "Enter your passcode"

404+#~ msgstr "Introduïu el codi d'accés"

po/ckb.po+40−26

@@ -7,14 +7,15 @@ msgid ""

77msgstr ""

88"Project-Id-Version: unity8\n"

99"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10−"POT-Creation-Date: 2014-09-24 10:43+0100\n"

10+"POT-Creation-Date: 2014-10-02 10:35+0200\n"

1111"PO-Revision-Date: 2014-01-21 11:05+0000\n"

1212"Last-Translator: Aras <aras.noori@gmail.com>\n"

1313"Language-Team: Kurdish (Sorani) <ckb@li.org>\n"

1414"MIME-Version: 1.0\n"

1515"Content-Type: text/plain; charset=UTF-8\n"

1616"Content-Transfer-Encoding: 8bit\n"

17−"X-Launchpad-Export-Date: 2014-09-29 05:20+0000\n"

17+"Plural-Forms: nplurals=2; plural=n != 1;\n"

18+"X-Launchpad-Export-Date: 2014-10-03 06:22+0000\n"

1819"X-Generator: Launchpad (build 17196)\n"

1920

2021#: plugins/LightDM/Greeter.cpp:130

@@ -30,6 +31,25 @@ msgstr ""

3031msgid "Unpin shortcut"

3132msgstr ""

3233

34+#: qml/Components/DelayedLockscreen.qml:47

35+msgid "Device Locked"

36+msgstr ""

37+

38+#: qml/Components/DelayedLockscreen.qml:62

39+msgid "You have been locked out due to too many failed passphrase attempts."

40+msgstr ""

41+

42+#: qml/Components/DelayedLockscreen.qml:63

43+msgid "You have been locked out due to too many failed passcode attempts."

44+msgstr ""

45+

46+#: qml/Components/DelayedLockscreen.qml:72

47+#, qt-format

48+msgid "Please wait %1 minute and then try again…"

49+msgid_plural "Please wait %1 minutes and then try again…"

50+msgstr[0] ""

51+msgstr[1] ""

52+

3353#: qml/Components/Dialogs.qml:70

3454msgid "Log out"

3555msgstr ""

@@ -132,14 +152,6 @@ msgid ""

132152"phone<br><br>Tap on the screen to start"

133153msgstr ""

134154

135−#: qml/Components/Lockscreen.qml:167

136−msgid "Please wait"

137−msgstr ""

138−

139−#: qml/Components/Lockscreen.qml:172

140−msgid "Too many incorrect attempts"

141−msgstr ""

142−

143155#: qml/Components/Lockscreen.qml:206

144156msgid "Emergency Call"

145157msgstr "هێڵی فریاگوزاری"

@@ -148,15 +160,6 @@ msgstr "هێڵی فریاگوزاری"

148160msgid "OK"

149161msgstr ""

150162

151−#: qml/Components/PassphraseLockscreen.qml:61

152−#, qt-format

153−msgid "Hello %1"

154−msgstr "سڵاو %1"

155−

156−#: qml/Components/PassphraseLockscreen.qml:61

157−msgid "Hello"

158−msgstr "سڵاو"

159−

160163#: qml/Dash/GenericScopeView.qml:411 qml/Dash/GenericScopeView.qml:533

161164msgid "See less"

162165msgstr ""

@@ -223,7 +226,7 @@ msgid "All"

223226msgstr ""

224227

225228#: qml/Greeter/Greeter.qml:157

226−msgid "Swipe to unlock"

229+msgid "Unlock"

227230msgstr ""

228231

229232#: qml/Hud/HudParametrizedActionsPage.qml:139

@@ -302,25 +305,29 @@ msgstr ""

302305msgid "Roaming"

303306msgstr ""

304307

305−#: qml/Shell.qml:320

306−msgid "Enter your passphrase"

308+#: qml/Shell.qml:340

309+msgid "Enter passphrase"

307310msgstr ""

308311

309312#: qml/Shell.qml:321

310313msgid "Sorry, incorrect passphrase"

311314msgstr ""

312315

313−#: qml/Shell.qml:323

314−msgid "Enter your passcode"

316+#: qml/Shell.qml:342

317+msgid "Please re-enter"

318+msgstr ""

319+

320+#: qml/Shell.qml:344

321+msgid "Enter passcode"

315322msgstr ""

316323

317324#: qml/Shell.qml:324

318325msgid "Sorry, incorrect passcode"

319326msgstr ""

320327

321−#: qml/Shell.qml:327

328+#: qml/Shell.qml:348

322329#, qt-format

323−msgid "Enter your %1"

330+msgid "Enter %1"

324331msgstr ""

325332

326333#: qml/Shell.qml:328

@@ -351,3 +358,10 @@ msgid ""

351358"If passcode is entered incorrectly, your phone will conduct a factory reset "

352359"and all personal data will be deleted."

353360msgstr ""

361+

362+#, qt-format

363+#~ msgid "Hello %1"

364+#~ msgstr "سڵاو %1"

365+

366+#~ msgid "Hello"

367+#~ msgstr "سڵاو"

po/cs.po+40−26

@@ -7,14 +7,15 @@ msgid ""

77msgstr ""

88"Project-Id-Version: unity8\n"

99"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10−"POT-Creation-Date: 2014-09-24 10:43+0100\n"

10+"POT-Creation-Date: 2014-10-02 10:35+0200\n"

1111"PO-Revision-Date: 2014-01-08 10:11+0000\n"

1212"Last-Translator: Tadeáš Pařík <tadeas.parik@gmail.com>\n"

1313"Language-Team: Czech <cs@li.org>\n"

1414"MIME-Version: 1.0\n"

1515"Content-Type: text/plain; charset=UTF-8\n"

1616"Content-Transfer-Encoding: 8bit\n"

17−"X-Launchpad-Export-Date: 2014-09-29 05:19+0000\n"

17+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"

18+"X-Launchpad-Export-Date: 2014-10-03 06:21+0000\n"

1819"X-Generator: Launchpad (build 17196)\n"

1920

2021#: plugins/LightDM/Greeter.cpp:130

@@ -30,6 +31,25 @@ msgstr ""

3031msgid "Unpin shortcut"

3132msgstr ""

3233

34+#: qml/Components/DelayedLockscreen.qml:47

35+msgid "Device Locked"

36+msgstr ""

37+

38+#: qml/Components/DelayedLockscreen.qml:62

39+msgid "You have been locked out due to too many failed passphrase attempts."

40+msgstr ""

41+

42+#: qml/Components/DelayedLockscreen.qml:63

43+msgid "You have been locked out due to too many failed passcode attempts."

44+msgstr ""

45+

46+#: qml/Components/DelayedLockscreen.qml:72

47+#, qt-format

48+msgid "Please wait %1 minute and then try again…"

49+msgid_plural "Please wait %1 minutes and then try again…"

50+msgstr[0] ""

51+msgstr[1] ""

52+

3353#: qml/Components/Dialogs.qml:70

3454msgid "Log out"

3555msgstr ""

@@ -132,14 +152,6 @@ msgid ""

132152"phone<br><br>Tap on the screen to start"

133153msgstr ""

134154

135−#: qml/Components/Lockscreen.qml:167

136−msgid "Please wait"

137−msgstr ""

138−

139−#: qml/Components/Lockscreen.qml:172

140−msgid "Too many incorrect attempts"

141−msgstr ""

142−

143155#: qml/Components/Lockscreen.qml:206

144156msgid "Emergency Call"

145157msgstr "Tísňové volání"

@@ -148,15 +160,6 @@ msgstr "Tísňové volání"

148160msgid "OK"

149161msgstr ""

150162

151−#: qml/Components/PassphraseLockscreen.qml:61

152−#, qt-format

153−msgid "Hello %1"

154−msgstr "Ahoj %1"

155−

156−#: qml/Components/PassphraseLockscreen.qml:61

157−msgid "Hello"

158−msgstr "Ahoj"

159−

160163#: qml/Dash/GenericScopeView.qml:411 qml/Dash/GenericScopeView.qml:533

161164msgid "See less"

162165msgstr ""

@@ -223,7 +226,7 @@ msgid "All"

223226msgstr ""

224227

225228#: qml/Greeter/Greeter.qml:157

226−msgid "Swipe to unlock"

229+msgid "Unlock"

227230msgstr ""

228231

229232#: qml/Hud/HudParametrizedActionsPage.qml:139

@@ -302,25 +305,29 @@ msgstr ""

302305msgid "Roaming"

303306msgstr ""

304307

305−#: qml/Shell.qml:320

306−msgid "Enter your passphrase"

308+#: qml/Shell.qml:340

309+msgid "Enter passphrase"

307310msgstr ""

308311

309312#: qml/Shell.qml:321

310313msgid "Sorry, incorrect passphrase"

311314msgstr ""

312315

313−#: qml/Shell.qml:323

314−msgid "Enter your passcode"

316+#: qml/Shell.qml:342

317+msgid "Please re-enter"

318+msgstr ""

319+

320+#: qml/Shell.qml:344

321+msgid "Enter passcode"

315322msgstr ""

316323

317324#: qml/Shell.qml:324

318325msgid "Sorry, incorrect passcode"

319326msgstr ""

320327

321−#: qml/Shell.qml:327

328+#: qml/Shell.qml:348

322329#, qt-format

323−msgid "Enter your %1"

330+msgid "Enter %1"

324331msgstr ""

325332

326333#: qml/Shell.qml:328

@@ -351,3 +358,10 @@ msgid ""

351358"If passcode is entered incorrectly, your phone will conduct a factory reset "

352359"and all personal data will be deleted."

353360msgstr ""

361+

362+#~ msgid "Hello"

363+#~ msgstr "Ahoj"

364+

365+#, qt-format

366+#~ msgid "Hello %1"

367+#~ msgstr "Ahoj %1"

po/da.po+44−27

@@ -8,14 +8,15 @@ msgid ""

88msgstr ""

99"Project-Id-Version: unity8\n"

1010"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

11−"POT-Creation-Date: 2014-09-24 10:43+0100\n"

11+"POT-Creation-Date: 2014-10-02 10:35+0200\n"

1212"PO-Revision-Date: 2014-07-30 12:37+0000\n"

1313"Last-Translator: Ask Hjorth Larsen <asklarsen@gmail.com>\n"

1414"Language-Team: Danish <dansk@dansk-gruppen.dk>\n"

1515"MIME-Version: 1.0\n"

1616"Content-Type: text/plain; charset=UTF-8\n"

1717"Content-Transfer-Encoding: 8bit\n"

18−"X-Launchpad-Export-Date: 2014-09-29 05:19+0000\n"

18+"Plural-Forms: nplurals=2; plural=n != 1;\n"

19+"X-Launchpad-Export-Date: 2014-10-03 06:21+0000\n"

1920"X-Generator: Launchpad (build 17196)\n"

2021

2122#: plugins/LightDM/Greeter.cpp:130

@@ -31,6 +32,25 @@ msgstr "Fastgør genvej"

3132msgid "Unpin shortcut"

3233msgstr "Gør genvej flytbar"

3334

35+#: qml/Components/DelayedLockscreen.qml:47

36+msgid "Device Locked"

37+msgstr ""

38+

39+#: qml/Components/DelayedLockscreen.qml:62

40+msgid "You have been locked out due to too many failed passphrase attempts."

41+msgstr ""

42+

43+#: qml/Components/DelayedLockscreen.qml:63

44+msgid "You have been locked out due to too many failed passcode attempts."

45+msgstr ""

46+

47+#: qml/Components/DelayedLockscreen.qml:72

48+#, qt-format

49+msgid "Please wait %1 minute and then try again…"

50+msgid_plural "Please wait %1 minutes and then try again…"

51+msgstr[0] ""

52+msgstr[1] ""

53+

3454#: qml/Components/Dialogs.qml:70

3555msgid "Log out"

3656msgstr ""

@@ -135,14 +155,6 @@ msgstr ""

135155"Du mestrer nu kantbevægelserne og kan begynde at bruge telefonen<br><br>Tryk "

136156"på skærmen for at starte"

137157

138−#: qml/Components/Lockscreen.qml:167

139−msgid "Please wait"

140−msgstr ""

141−

142−#: qml/Components/Lockscreen.qml:172

143−msgid "Too many incorrect attempts"

144−msgstr ""

145−

146158#: qml/Components/Lockscreen.qml:206

147159msgid "Emergency Call"

148160msgstr "Nødopkald"

@@ -151,15 +163,6 @@ msgstr "Nødopkald"

151163msgid "OK"

152164msgstr "O.k."

153165

154−#: qml/Components/PassphraseLockscreen.qml:61

155−#, qt-format

156−msgid "Hello %1"

157−msgstr "Hej %1"

158−

159−#: qml/Components/PassphraseLockscreen.qml:61

160−msgid "Hello"

161−msgstr "Hej"

162−

163166#: qml/Dash/GenericScopeView.qml:411 qml/Dash/GenericScopeView.qml:533

164167msgid "See less"

165168msgstr "Vis mindre"

@@ -226,8 +229,8 @@ msgid "All"

226229msgstr ""

227230

228231#: qml/Greeter/Greeter.qml:157

229−msgid "Swipe to unlock"

230−msgstr "Stryg for at låse op"

232+msgid "Unlock"

233+msgstr ""

231234

232235#: qml/Hud/HudParametrizedActionsPage.qml:139

233236msgid "Confirm"

@@ -305,25 +308,29 @@ msgstr ""

305308msgid "Roaming"

306309msgstr ""

307310

308−#: qml/Shell.qml:320

309−msgid "Enter your passphrase"

311+#: qml/Shell.qml:340

312+msgid "Enter passphrase"

310313msgstr ""

311314

312315#: qml/Shell.qml:321

313316msgid "Sorry, incorrect passphrase"

314317msgstr ""

315318

316−#: qml/Shell.qml:323

317−msgid "Enter your passcode"

319+#: qml/Shell.qml:342

320+msgid "Please re-enter"

321+msgstr ""

322+

323+#: qml/Shell.qml:344

324+msgid "Enter passcode"

318325msgstr ""

319326

320327#: qml/Shell.qml:324

321328msgid "Sorry, incorrect passcode"

322329msgstr ""

323330

324−#: qml/Shell.qml:327

331+#: qml/Shell.qml:348

325332#, qt-format

326−msgid "Enter your %1"

333+msgid "Enter %1"

327334msgstr ""

328335

329336#: qml/Shell.qml:328

@@ -354,3 +361,13 @@ msgid ""

354361"If passcode is entered incorrectly, your phone will conduct a factory reset "

355362"and all personal data will be deleted."

356363msgstr ""

364+

365+#, qt-format

366+#~ msgid "Hello %1"

367+#~ msgstr "Hej %1"

368+

369+#~ msgid "Hello"

370+#~ msgstr "Hej"

371+

372+#~ msgid "Swipe to unlock"

373+#~ msgstr "Stryg for at låse op"

po/de.po+83−50

@@ -7,29 +7,49 @@ msgid ""

77msgstr ""

88"Project-Id-Version: unity\n"

99"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10−"POT-Creation-Date: 2014-09-24 10:43+0100\n"

10+"POT-Creation-Date: 2014-10-02 10:35+0200\n"

1111"PO-Revision-Date: 2014-09-29 06:33+0000\n"

1212"Last-Translator: Niklas Wenzel <nikwen.developer@gmail.com>\n"

1313"Language-Team: German <de@li.org>\n"

1414"MIME-Version: 1.0\n"

1515"Content-Type: text/plain; charset=UTF-8\n"

1616"Content-Transfer-Encoding: 8bit\n"

17−"X-Launchpad-Export-Date: 2014-09-30 07:10+0000\n"

17+"Plural-Forms: nplurals=2; plural=n != 1;\n"

18+"X-Launchpad-Export-Date: 2014-10-03 06:21+0000\n"

1819"X-Generator: Launchpad (build 17196)\n"

1920

2021#: plugins/LightDM/Greeter.cpp:130

2122msgid "Password: "

2223msgstr "Passwort: "

2324

24−#: plugins/Unity/Launcher/launcheritem.cpp:44

25−#: plugins/Unity/Launcher/launcheritem.cpp:74

25+#: plugins/Unity/Launcher/launcheritem.cpp:45

26+#: plugins/Unity/Launcher/launcheritem.cpp:91

2627msgid "Pin shortcut"

2728msgstr "Verknüpfung anheften"

2829

29−#: plugins/Unity/Launcher/launcheritem.cpp:74

30+#: plugins/Unity/Launcher/launcheritem.cpp:91

3031msgid "Unpin shortcut"

3132msgstr "Verknüpfung entfernen"

3233

34+#: qml/Components/DelayedLockscreen.qml:47

35+msgid "Device Locked"

36+msgstr ""

37+

38+#: qml/Components/DelayedLockscreen.qml:62

39+msgid "You have been locked out due to too many failed passphrase attempts."

40+msgstr ""

41+

42+#: qml/Components/DelayedLockscreen.qml:63

43+msgid "You have been locked out due to too many failed passcode attempts."

44+msgstr ""

45+

46+#: qml/Components/DelayedLockscreen.qml:72

47+#, qt-format

48+msgid "Please wait %1 minute and then try again…"

49+msgid_plural "Please wait %1 minutes and then try again…"

50+msgstr[0] ""

51+msgstr[1] ""

52+

3353#: qml/Components/Dialogs.qml:70

3454msgid "Log out"

3555msgstr "Abmelden"

@@ -139,14 +159,6 @@ msgstr ""

139159"Sie haben nun die Kantengesten erfolgreich erlernt und können das Telefon "

140160"nun nutzen<br><br>Zum Starten auf den Bildschirm tippen"

141161

142−#: qml/Components/Lockscreen.qml:167

143−msgid "Please wait"

144−msgstr "Bitte warten"

145−

146−#: qml/Components/Lockscreen.qml:172

147−msgid "Too many incorrect attempts"

148−msgstr "Zu viele falsche Versuche"

149−

150162#: qml/Components/Lockscreen.qml:206

151163msgid "Emergency Call"

152164msgstr "Notruf"

@@ -155,24 +167,15 @@ msgstr "Notruf"

155167msgid "OK"

156168msgstr "OK"

157169

158−#: qml/Components/PassphraseLockscreen.qml:61

159−#, qt-format

160−msgid "Hello %1"

161−msgstr "Hallo %1"

162−

163−#: qml/Components/PassphraseLockscreen.qml:61

164−msgid "Hello"

165−msgstr "Hallo"

166−

167−#: qml/Dash/GenericScopeView.qml:364 qml/Dash/GenericScopeView.qml:483

170+#: qml/Dash/GenericScopeView.qml:411 qml/Dash/GenericScopeView.qml:533

168171msgid "See less"

169172msgstr "Weniger ansehen"

170173

171−#: qml/Dash/GenericScopeView.qml:364

174+#: qml/Dash/GenericScopeView.qml:411

172175msgid "See all"

173176msgstr "Alle anzeigen"

174177

175−#: qml/Dash/GenericScopeView.qml:427 qml/Dash/PageHeader.qml:258

178+#: qml/Dash/GenericScopeView.qml:473 qml/Dash/PageHeader.qml:258

176179#: qml/Panel/SearchIndicator.qml:27

177180msgid "Search"

178181msgstr "Suchen"

@@ -230,8 +233,8 @@ msgid "All"

230233msgstr "Alle"

231234

232235#: qml/Greeter/Greeter.qml:157

233−msgid "Swipe to unlock"

234−msgstr "Wischen zum Entsperren"

236+msgid "Unlock"

237+msgstr ""

235238

236239#: qml/Hud/HudParametrizedActionsPage.qml:139

237240msgid "Confirm"

@@ -277,27 +280,27 @@ msgstr "Konferenz"

277280msgid "Nothing is playing"

278281msgstr "Nichts wird abgespielt"

279282

280−#: qml/Panel/Indicators/MenuItemFactory.qml:651

283+#: qml/Panel/Indicators/MenuItemFactory.qml:748

281284msgid "In queue…"

282285msgstr "In Warteschlange …"

283286

284−#: qml/Panel/Indicators/MenuItemFactory.qml:655

287+#: qml/Panel/Indicators/MenuItemFactory.qml:752

285288msgid "Downloading"

286289msgstr "Wird heruntergeladen"

287290

288−#: qml/Panel/Indicators/MenuItemFactory.qml:657

291+#: qml/Panel/Indicators/MenuItemFactory.qml:754

289292msgid "Paused, tap to resume"

290293msgstr "Pausiert, tippen Sie zum fortsetzen"

291294

292−#: qml/Panel/Indicators/MenuItemFactory.qml:659

295+#: qml/Panel/Indicators/MenuItemFactory.qml:756

293296msgid "Canceled"

294297msgstr "Abgebrochen"

295298

296−#: qml/Panel/Indicators/MenuItemFactory.qml:661

299+#: qml/Panel/Indicators/MenuItemFactory.qml:758

297300msgid "Finished"

298301msgstr "Erledigt"

299302

300−#: qml/Panel/Indicators/MenuItemFactory.qml:663

303+#: qml/Panel/Indicators/MenuItemFactory.qml:760

301304msgid "Failed, tap to retry"

302305msgstr "Fehlgeschlagen, tippen Sie zum Wiederholen"

303306

@@ -309,45 +312,49 @@ msgstr "SIM-Karte entsperren"

309312msgid "Roaming"

310313msgstr "Roaming"

311314

312−#: qml/Shell.qml:292

313−msgid "Enter your passphrase"

314−msgstr "Geben Sie Ihr Passwort ein"

315+#: qml/Shell.qml:340

316+msgid "Enter passphrase"

317+msgstr ""

315318

316−#: qml/Shell.qml:293

319+#: qml/Shell.qml:321

317320msgid "Sorry, incorrect passphrase"

318321msgstr "Das Passwort ist nicht korrekt"

319322

320−#: qml/Shell.qml:295

321−msgid "Enter your passcode"

322−msgstr "Passwort eingeben"

323+#: qml/Shell.qml:342

324+msgid "Please re-enter"

325+msgstr ""

326+

327+#: qml/Shell.qml:344

328+msgid "Enter passcode"

329+msgstr ""

323330

324−#: qml/Shell.qml:296

331+#: qml/Shell.qml:324

325332msgid "Sorry, incorrect passcode"

326333msgstr "Falsches Passwort"

327334

328−#: qml/Shell.qml:299

335+#: qml/Shell.qml:348

329336#, qt-format

330−msgid "Enter your %1"

331−msgstr "%1 eingeben"

337+msgid "Enter %1"

338+msgstr ""

332339

333−#: qml/Shell.qml:300

340+#: qml/Shell.qml:328

334341#, qt-format

335342msgid "Sorry, incorrect %1"

336343msgstr "%1 falsch"

337344

338−#: qml/Shell.qml:335

345+#: qml/Shell.qml:363

339346msgid "Sorry, incorrect passphrase."

340347msgstr "Falsches Passwort."

341348

342−#: qml/Shell.qml:336

349+#: qml/Shell.qml:364

343350msgid "Sorry, incorrect passcode."

344351msgstr "Falsche PIN"

345352

346−#: qml/Shell.qml:337

353+#: qml/Shell.qml:365

347354msgid "This will be your last attempt."

348355msgstr "Dies ist Ihr letzter Versuch."

349356

350−#: qml/Shell.qml:339

357+#: qml/Shell.qml:367

351358msgid ""

352359"If passphrase is entered incorrectly, your phone will conduct a factory "

353360"reset and all personal data will be deleted."

@@ -355,7 +362,7 @@ msgstr ""

355362"Wird das Passwort falsch eingegeben, wird das Telefon auf den Werkszustand "

356363"zurückgesetzt und alle Daten werden gelöscht."

357364

358−#: qml/Shell.qml:340

365+#: qml/Shell.qml:368

359366msgid ""

360367"If passcode is entered incorrectly, your phone will conduct a factory reset "

361368"and all personal data will be deleted."

@@ -363,5 +370,31 @@ msgstr ""

363370"Wird die PIN falsch eingegeben, wird das Telefon auf den Werkszustand "

364371"zurückgesetzt und alle Daten werden gelöscht."

365372

373+#, qt-format

374+#~ msgid "Hello %1"

375+#~ msgstr "Hallo %1"

376+

377+#~ msgid "Hello"

378+#~ msgstr "Hallo"

379+

380+#~ msgid "Swipe to unlock"

381+#~ msgstr "Wischen zum Entsperren"

382+

383+#~ msgid "Please wait"

384+#~ msgstr "Bitte warten"

385+

386+#~ msgid "Too many incorrect attempts"

387+#~ msgstr "Zu viele falsche Versuche"

388+

389+#, qt-format

390+#~ msgid "Enter your %1"

391+#~ msgstr "%1 eingeben"

392+

366393#~ msgid "Manage Dash"

367394#~ msgstr "Dash verwalten"

395+

396+#~ msgid "Enter your passphrase"

397+#~ msgstr "Geben Sie Ihr Passwort ein"

398+

399+#~ msgid "Enter your passcode"

400+#~ msgstr "Passwort eingeben"

po/el.po+55−28

@@ -7,14 +7,15 @@ msgid ""

77msgstr ""

88"Project-Id-Version: unity\n"

99"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10−"POT-Creation-Date: 2014-09-24 10:43+0100\n"

10+"POT-Creation-Date: 2014-10-02 10:35+0200\n"

1111"PO-Revision-Date: 2014-08-21 12:06+0000\n"

1212"Last-Translator: Chris Taklis (aka Kailor) <ctaklis@gmail.com>\n"

1313"Language-Team: Greek <el@li.org>\n"

1414"MIME-Version: 1.0\n"

1515"Content-Type: text/plain; charset=UTF-8\n"

1616"Content-Transfer-Encoding: 8bit\n"

17−"X-Launchpad-Export-Date: 2014-09-29 05:19+0000\n"

17+"Plural-Forms: nplurals=2; plural=n != 1;\n"

18+"X-Launchpad-Export-Date: 2014-10-03 06:21+0000\n"

1819"X-Generator: Launchpad (build 17196)\n"

1920

2021#: plugins/LightDM/Greeter.cpp:130

@@ -30,6 +31,25 @@ msgstr "Καρφίτσωμα συντόμευσης"

3031msgid "Unpin shortcut"

3132msgstr "Ξεκαρφίτσωμα συντόμευσης"

3233

34+#: qml/Components/DelayedLockscreen.qml:47

35+msgid "Device Locked"

36+msgstr ""

37+

38+#: qml/Components/DelayedLockscreen.qml:62

39+msgid "You have been locked out due to too many failed passphrase attempts."

40+msgstr ""

41+

42+#: qml/Components/DelayedLockscreen.qml:63

43+msgid "You have been locked out due to too many failed passcode attempts."

44+msgstr ""

45+

46+#: qml/Components/DelayedLockscreen.qml:72

47+#, qt-format

48+msgid "Please wait %1 minute and then try again…"

49+msgid_plural "Please wait %1 minutes and then try again…"

50+msgstr[0] ""

51+msgstr[1] ""

52+

3353#: qml/Components/Dialogs.qml:70

3454msgid "Log out"

3555msgstr ""

@@ -136,14 +156,6 @@ msgstr ""

136156"Πλέον γνωρίζετε τις χειρονομίες από τα άκρα και μπορείτε να ξεκινήσετε να "

137157"χρησιμοποιείτε το τηλέφωνο<br><br>Αγγίξτε την οθόνη για να ξεκινήσετε"

138158

139−#: qml/Components/Lockscreen.qml:167

140−msgid "Please wait"

141−msgstr "Παρακαλώ περιμένετε"

142−

143−#: qml/Components/Lockscreen.qml:172

144−msgid "Too many incorrect attempts"

145−msgstr "Πολλές άκυρες προσπάθειες"

146−

147159#: qml/Components/Lockscreen.qml:206

148160msgid "Emergency Call"

149161msgstr "Κλήση έκτακτης ανάγκης"

@@ -152,15 +164,6 @@ msgstr "Κλήση έκτακτης ανάγκης"

152164msgid "OK"

153165msgstr "OK"

154166

155−#: qml/Components/PassphraseLockscreen.qml:61

156−#, qt-format

157−msgid "Hello %1"

158−msgstr "Γεια σας %1"

159−

160−#: qml/Components/PassphraseLockscreen.qml:61

161−msgid "Hello"

162−msgstr "Γεια σας"

163−

164167#: qml/Dash/GenericScopeView.qml:411 qml/Dash/GenericScopeView.qml:533

165168msgid "See less"

166169msgstr "Λιγότερα"

@@ -227,8 +230,8 @@ msgid "All"

227230msgstr "Όλα"

228231

229232#: qml/Greeter/Greeter.qml:157

230−msgid "Swipe to unlock"

231−msgstr "Σύρετε για να ξεκλειδώσετε"

233+msgid "Unlock"

234+msgstr ""

232235

233236#: qml/Hud/HudParametrizedActionsPage.qml:139

234237msgid "Confirm"

@@ -306,26 +309,30 @@ msgstr "Ξεκλείδωμα SIM"

306309msgid "Roaming"

307310msgstr "Περιαγωγή"

308311

309−#: qml/Shell.qml:320

310−msgid "Enter your passphrase"

312+#: qml/Shell.qml:340

313+msgid "Enter passphrase"

311314msgstr ""

312315

313316#: qml/Shell.qml:321

314317msgid "Sorry, incorrect passphrase"

315318msgstr ""

316319

317−#: qml/Shell.qml:323

318−msgid "Enter your passcode"

320+#: qml/Shell.qml:342

321+msgid "Please re-enter"

322+msgstr ""

323+

324+#: qml/Shell.qml:344

325+msgid "Enter passcode"

319326msgstr ""

320327

321328#: qml/Shell.qml:324

322329msgid "Sorry, incorrect passcode"

323330msgstr ""

324331

325−#: qml/Shell.qml:327

332+#: qml/Shell.qml:348

326333#, qt-format

327−msgid "Enter your %1"

328−msgstr "Εισάγετε το %1"

334+msgid "Enter %1"

335+msgstr ""

329336

330337#: qml/Shell.qml:328

331338#, qt-format

@@ -355,3 +362,23 @@ msgid ""

355362"If passcode is entered incorrectly, your phone will conduct a factory reset "

356363"and all personal data will be deleted."

357364msgstr ""

365+

366+#~ msgid "Hello"

367+#~ msgstr "Γεια σας"

368+

369+#, qt-format

370+#~ msgid "Hello %1"

371+#~ msgstr "Γεια σας %1"

372+

373+#~ msgid "Swipe to unlock"

374+#~ msgstr "Σύρετε για να ξεκλειδώσετε"

375+

376+#~ msgid "Please wait"

377+#~ msgstr "Παρακαλώ περιμένετε"

378+

379+#~ msgid "Too many incorrect attempts"

380+#~ msgstr "Πολλές άκυρες προσπάθειες"

381+

382+#, qt-format

383+#~ msgid "Enter your %1"

384+#~ msgstr "Εισάγετε το %1"

po/en_AU.po+63−30

@@ -7,14 +7,15 @@ msgid ""

77msgstr ""

88"Project-Id-Version: unity\n"

99"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10−"POT-Creation-Date: 2014-09-24 10:43+0100\n"

10+"POT-Creation-Date: 2014-10-02 10:35+0200\n"

1111"PO-Revision-Date: 2014-09-23 01:24+0000\n"

1212"Last-Translator: Jared Norris <jarednorris@ubuntu.com>\n"

1313"Language-Team: English (Australia) <en_AU@li.org>\n"

1414"MIME-Version: 1.0\n"

1515"Content-Type: text/plain; charset=UTF-8\n"

1616"Content-Transfer-Encoding: 8bit\n"

17−"X-Launchpad-Export-Date: 2014-09-29 05:20+0000\n"

17+"Plural-Forms: nplurals=2; plural=n != 1;\n"

18+"X-Launchpad-Export-Date: 2014-10-03 06:22+0000\n"

1819"X-Generator: Launchpad (build 17196)\n"

1920

2021#: plugins/LightDM/Greeter.cpp:130

@@ -30,6 +31,25 @@ msgstr "Pin shortcut"

3031msgid "Unpin shortcut"

3132msgstr "Unpin shortcut"

3233

34+#: qml/Components/DelayedLockscreen.qml:47

35+msgid "Device Locked"

36+msgstr ""

37+

38+#: qml/Components/DelayedLockscreen.qml:62

39+msgid "You have been locked out due to too many failed passphrase attempts."

40+msgstr ""

41+

42+#: qml/Components/DelayedLockscreen.qml:63

43+msgid "You have been locked out due to too many failed passcode attempts."

44+msgstr ""

45+

46+#: qml/Components/DelayedLockscreen.qml:72

47+#, qt-format

48+msgid "Please wait %1 minute and then try again…"

49+msgid_plural "Please wait %1 minutes and then try again…"

50+msgstr[0] ""

51+msgstr[1] ""

52+

3353#: qml/Components/Dialogs.qml:70

3454msgid "Log out"

3555msgstr "Log out"

@@ -136,14 +156,6 @@ msgstr ""

136156"You have now mastered the edge gestures and can start using the "

137157"phone<br><br>Tap on the screen to start"

138158

139−#: qml/Components/Lockscreen.qml:167

140−msgid "Please wait"

141−msgstr "Please wait"

142−

143−#: qml/Components/Lockscreen.qml:172

144−msgid "Too many incorrect attempts"

145−msgstr "Too many incorrect attempts"

146−

147159#: qml/Components/Lockscreen.qml:206

148160msgid "Emergency Call"

149161msgstr "Emergency Call"

@@ -152,15 +164,6 @@ msgstr "Emergency Call"

152164msgid "OK"

153165msgstr "OK"

154166

155−#: qml/Components/PassphraseLockscreen.qml:61

156−#, qt-format

157−msgid "Hello %1"

158−msgstr "Hello %1"

159−

160−#: qml/Components/PassphraseLockscreen.qml:61

161−msgid "Hello"

162−msgstr "Hello"

163−

164167#: qml/Dash/GenericScopeView.qml:411 qml/Dash/GenericScopeView.qml:533

165168msgid "See less"

166169msgstr "See less"

@@ -227,8 +230,8 @@ msgid "All"

227230msgstr "All"

228231

229232#: qml/Greeter/Greeter.qml:157

230−msgid "Swipe to unlock"

231−msgstr "Swipe to unlock"

233+msgid "Unlock"

234+msgstr ""

232235

233236#: qml/Hud/HudParametrizedActionsPage.qml:139

234237msgid "Confirm"

@@ -306,26 +309,30 @@ msgstr "Unlock SIM"

306309msgid "Roaming"

307310msgstr "Roaming"

308311

309−#: qml/Shell.qml:320

310−msgid "Enter your passphrase"

311−msgstr "Enter your passphrase"

312+#: qml/Shell.qml:340

313+msgid "Enter passphrase"

314+msgstr ""

312315

313316#: qml/Shell.qml:321

314317msgid "Sorry, incorrect passphrase"

315318msgstr "Sorry, incorrect passphrase"

316319

317−#: qml/Shell.qml:323

318−msgid "Enter your passcode"

319−msgstr "Enter your passcode"

320+#: qml/Shell.qml:342

321+msgid "Please re-enter"

322+msgstr ""

323+

324+#: qml/Shell.qml:344

325+msgid "Enter passcode"

326+msgstr ""

320327

321328#: qml/Shell.qml:324

322329msgid "Sorry, incorrect passcode"

323330msgstr "Sorry, incorrect passcode"

324331

325−#: qml/Shell.qml:327

332+#: qml/Shell.qml:348

326333#, qt-format

327−msgid "Enter your %1"

328−msgstr "Enter your %1"

334+msgid "Enter %1"

335+msgstr ""

329336

330337#: qml/Shell.qml:328

331338#, qt-format

@@ -360,5 +367,31 @@ msgstr ""

360367"If passcode is entered incorrectly, your phone will conduct a factory reset "

361368"and all personal data will be deleted."

362369

370+#, qt-format

371+#~ msgid "Hello %1"

372+#~ msgstr "Hello %1"

373+

374+#~ msgid "Hello"

375+#~ msgstr "Hello"

376+

377+#~ msgid "Swipe to unlock"

378+#~ msgstr "Swipe to unlock"

379+

363380#~ msgid "Manage Dash"

364381#~ msgstr "Manage Dash"

382+

383+#~ msgid "Please wait"

384+#~ msgstr "Please wait"

385+

386+#~ msgid "Too many incorrect attempts"

387+#~ msgstr "Too many incorrect attempts"

388+

389+#, qt-format

390+#~ msgid "Enter your %1"

391+#~ msgstr "Enter your %1"

392+

393+#~ msgid "Enter your passphrase"

394+#~ msgstr "Enter your passphrase"

395+

396+#~ msgid "Enter your passcode"

397+#~ msgstr "Enter your passcode"

po/en_GB.po+64−34

@@ -7,14 +7,15 @@ msgid ""

77msgstr ""

88"Project-Id-Version: unity\n"

99"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10−"POT-Creation-Date: 2014-09-24 10:43+0100\n"

11−"PO-Revision-Date: 2014-08-23 13:48+0000\n"

12−"Last-Translator: Alan Pope ( ͡° ͜ʖ ͡°) <alan@ubuntu.com>\n"

10+"POT-Creation-Date: 2014-10-02 10:35+0200\n"

11+"PO-Revision-Date: 2014-10-03 12:46+0000\n"

12+"Last-Translator: Andi Chandler <Unknown>\n"

1313"Language-Team: English (United Kingdom) <en_GB@li.org>\n"

1414"MIME-Version: 1.0\n"

1515"Content-Type: text/plain; charset=UTF-8\n"

1616"Content-Transfer-Encoding: 8bit\n"

17−"X-Launchpad-Export-Date: 2014-09-29 05:20+0000\n"

17+"Plural-Forms: nplurals=2; plural=n != 1;\n"

18+"X-Launchpad-Export-Date: 2014-10-04 06:28+0000\n"

1819"X-Generator: Launchpad (build 17196)\n"

1920

2021#: plugins/LightDM/Greeter.cpp:130

@@ -30,6 +31,25 @@ msgstr "Pin shortcut"

3031msgid "Unpin shortcut"

3132msgstr "Unpin shortcut"

3233

34+#: qml/Components/DelayedLockscreen.qml:47

35+msgid "Device Locked"

36+msgstr "Device Locked"

37+

38+#: qml/Components/DelayedLockscreen.qml:62

39+msgid "You have been locked out due to too many failed passphrase attempts."

40+msgstr "You have been locked out due to too many failed passphrase attempts."

41+

42+#: qml/Components/DelayedLockscreen.qml:63

43+msgid "You have been locked out due to too many failed passcode attempts."

44+msgstr "You have been locked out due to too many failed passcode attempts."

45+

46+#: qml/Components/DelayedLockscreen.qml:72

47+#, qt-format

48+msgid "Please wait %1 minute and then try again…"

49+msgid_plural "Please wait %1 minutes and then try again…"

50+msgstr[0] "Please wait %1 minute and then try again…"

51+msgstr[1] "Please wait %1 minutes and then try again…"

52+

3353#: qml/Components/Dialogs.qml:70

3454msgid "Log out"

3555msgstr "Log out"

@@ -136,14 +156,6 @@ msgstr ""

136156"You have now mastered the edge gestures and can start using the "

137157"phone<br><br>Tap on the screen to start"

138158

139−#: qml/Components/Lockscreen.qml:167

140−msgid "Please wait"

141−msgstr "Please wait"

142−

143−#: qml/Components/Lockscreen.qml:172

144−msgid "Too many incorrect attempts"

145−msgstr "Too many incorrect attempts"

146−

147159#: qml/Components/Lockscreen.qml:206

148160msgid "Emergency Call"

149161msgstr "Emergency Call"

@@ -152,15 +164,6 @@ msgstr "Emergency Call"

152164msgid "OK"

153165msgstr "OK"

154166

155−#: qml/Components/PassphraseLockscreen.qml:61

156−#, qt-format

157−msgid "Hello %1"

158−msgstr "Hello %1"

159−

160−#: qml/Components/PassphraseLockscreen.qml:61

161−msgid "Hello"

162−msgstr "Hello"

163−

164167#: qml/Dash/GenericScopeView.qml:411 qml/Dash/GenericScopeView.qml:533

165168msgid "See less"

166169msgstr "See less"

@@ -227,8 +230,8 @@ msgid "All"

227230msgstr "All"

228231

229232#: qml/Greeter/Greeter.qml:157

230−msgid "Swipe to unlock"

231−msgstr "Swipe to unlock"

233+msgid "Unlock"

234+msgstr "Unlock"

232235

233236#: qml/Hud/HudParametrizedActionsPage.qml:139

234237msgid "Confirm"

@@ -306,26 +309,30 @@ msgstr "Unlock SIM"

306309msgid "Roaming"

307310msgstr "Roaming"

308311

309−#: qml/Shell.qml:320

310−msgid "Enter your passphrase"

311−msgstr "Enter your passphrase"

312+#: qml/Shell.qml:340

313+msgid "Enter passphrase"

314+msgstr "Enter passphrase"

312315

313316#: qml/Shell.qml:321

314317msgid "Sorry, incorrect passphrase"

315318msgstr "Sorry, incorrect passphrase"

316319

317−#: qml/Shell.qml:323

318−msgid "Enter your passcode"

319−msgstr "Enter your passcode"

320+#: qml/Shell.qml:342

321+msgid "Please re-enter"

322+msgstr "Please re-enter"

323+

324+#: qml/Shell.qml:344

325+msgid "Enter passcode"

326+msgstr "Enter passcode"

320327

321328#: qml/Shell.qml:324

322329msgid "Sorry, incorrect passcode"

323330msgstr "Sorry, incorrect passcode"

324331

325−#: qml/Shell.qml:327

332+#: qml/Shell.qml:348

326333#, qt-format

327−msgid "Enter your %1"

328−msgstr "Enter your %1"

334+msgid "Enter %1"

335+msgstr "Enter %1"

329336

330337#: qml/Shell.qml:328

331338#, qt-format

@@ -360,5 +367,28 @@ msgstr ""

360367"If passcode is entered incorrectly, your phone will conduct a factory reset "

361368"and all personal data will be deleted."

362369

363−#~ msgid "Manage Dash"

364−#~ msgstr "Manage Dash"

370+#, qt-format

371+#~ msgid "Hello %1"

372+#~ msgstr "Hello %1"

373+

374+#~ msgid "Hello"

375+#~ msgstr "Hello"

376+

377+#~ msgid "Swipe to unlock"

378+#~ msgstr "Swipe to unlock"

379+

380+#~ msgid "Please wait"

381+#~ msgstr "Please wait"

382+

383+#~ msgid "Too many incorrect attempts"

384+#~ msgstr "Too many incorrect attempts"

385+

386+#, qt-format

387+#~ msgid "Enter your %1"

388+#~ msgstr "Enter your %1"

389+

390+#~ msgid "Enter your passphrase"

391+#~ msgstr "Enter your passphrase"

392+

393+#~ msgid "Enter your passcode"

394+#~ msgstr "Enter your passcode"

po/eo.po+33−26

@@ -7,14 +7,15 @@ msgid ""

77msgstr ""

88"Project-Id-Version: unity\n"

99"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10−"POT-Creation-Date: 2014-09-24 10:43+0100\n"

10+"POT-Creation-Date: 2014-10-02 10:35+0200\n"

1111"PO-Revision-Date: 2013-06-26 22:35+0000\n"

1212"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"

1313"Language-Team: Esperanto <eo@li.org>\n"

1414"MIME-Version: 1.0\n"

1515"Content-Type: text/plain; charset=UTF-8\n"

1616"Content-Transfer-Encoding: 8bit\n"

17−"X-Launchpad-Export-Date: 2014-09-29 05:19+0000\n"

17+"Plural-Forms: nplurals=2; plural=n != 1;\n"

18+"X-Launchpad-Export-Date: 2014-10-03 06:21+0000\n"

1819"X-Generator: Launchpad (build 17196)\n"

1920

2021#: plugins/LightDM/Greeter.cpp:130

@@ -30,6 +31,25 @@ msgstr ""

3031msgid "Unpin shortcut"

3132msgstr ""

3233

34+#: qml/Components/DelayedLockscreen.qml:47

35+msgid "Device Locked"

36+msgstr ""

37+

38+#: qml/Components/DelayedLockscreen.qml:62

39+msgid "You have been locked out due to too many failed passphrase attempts."

40+msgstr ""

41+

42+#: qml/Components/DelayedLockscreen.qml:63

43+msgid "You have been locked out due to too many failed passcode attempts."

44+msgstr ""

45+

46+#: qml/Components/DelayedLockscreen.qml:72

47+#, qt-format

48+msgid "Please wait %1 minute and then try again…"

49+msgid_plural "Please wait %1 minutes and then try again…"

50+msgstr[0] ""

51+msgstr[1] ""

52+

3353#: qml/Components/Dialogs.qml:70

3454msgid "Log out"

3555msgstr ""

@@ -132,14 +152,6 @@ msgid ""

132152"phone<br><br>Tap on the screen to start"

133153msgstr ""

134154

135−#: qml/Components/Lockscreen.qml:167

136−msgid "Please wait"

137−msgstr ""

138−

139−#: qml/Components/Lockscreen.qml:172

140−msgid "Too many incorrect attempts"

141−msgstr ""

142−

143155#: qml/Components/Lockscreen.qml:206

144156msgid "Emergency Call"

145157msgstr ""

@@ -148,15 +160,6 @@ msgstr ""

148160msgid "OK"

149161msgstr ""

150162

151−#: qml/Components/PassphraseLockscreen.qml:61

152−#, qt-format

153−msgid "Hello %1"

154−msgstr ""

155−

156−#: qml/Components/PassphraseLockscreen.qml:61

157−msgid "Hello"

158−msgstr ""

159−

160163#: qml/Dash/GenericScopeView.qml:411 qml/Dash/GenericScopeView.qml:533

161164msgid "See less"

162165msgstr ""

@@ -223,7 +226,7 @@ msgid "All"

223226msgstr ""

224227

225228#: qml/Greeter/Greeter.qml:157

226−msgid "Swipe to unlock"

229+msgid "Unlock"

227230msgstr ""

228231

229232#: qml/Hud/HudParametrizedActionsPage.qml:139

@@ -302,25 +305,29 @@ msgstr ""

302305msgid "Roaming"

303306msgstr ""

304307

305−#: qml/Shell.qml:320

306−msgid "Enter your passphrase"

308+#: qml/Shell.qml:340

309+msgid "Enter passphrase"

307310msgstr ""

308311

309312#: qml/Shell.qml:321

310313msgid "Sorry, incorrect passphrase"

311314msgstr ""

312315

313−#: qml/Shell.qml:323

314−msgid "Enter your passcode"

316+#: qml/Shell.qml:342

317+msgid "Please re-enter"

318+msgstr ""

319+

320+#: qml/Shell.qml:344

321+msgid "Enter passcode"

315322msgstr ""

316323

317324#: qml/Shell.qml:324

318325msgid "Sorry, incorrect passcode"

319326msgstr ""

320327

321−#: qml/Shell.qml:327

328+#: qml/Shell.qml:348

322329#, qt-format

323−msgid "Enter your %1"

330+msgid "Enter %1"

324331msgstr ""

325332

326333#: qml/Shell.qml:328

po/es.po+68−34

@@ -7,14 +7,15 @@ msgid ""

77msgstr ""

88"Project-Id-Version: unity\n"

99"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10−"POT-Creation-Date: 2014-09-24 10:43+0100\n"

11−"PO-Revision-Date: 2014-10-01 15:04+0000\n"

12−"Last-Translator: Leo Arias <leo.arias@canonical.com>\n"

10+"POT-Creation-Date: 2014-10-02 10:35+0200\n"

11+"PO-Revision-Date: 2014-10-05 08:50+0000\n"

12+"Last-Translator: Paco Molinero <paco@byasl.com>\n"

1313"Language-Team: Spanish <es@li.org>\n"

1414"MIME-Version: 1.0\n"

1515"Content-Type: text/plain; charset=UTF-8\n"

1616"Content-Transfer-Encoding: 8bit\n"

17−"X-Launchpad-Export-Date: 2014-10-02 06:38+0000\n"

17+"Plural-Forms: nplurals=2; plural=n != 1;\n"

18+"X-Launchpad-Export-Date: 2014-10-06 07:00+0000\n"

1819"X-Generator: Launchpad (build 17196)\n"

1920

2021#: plugins/LightDM/Greeter.cpp:130

@@ -30,6 +31,29 @@ msgstr "Anclar"

3031msgid "Unpin shortcut"

3132msgstr "Desanclar"

3233

34+#: qml/Components/DelayedLockscreen.qml:47

35+msgid "Device Locked"

36+msgstr "Dispositivo bloqueado"

37+

38+#: qml/Components/DelayedLockscreen.qml:62

39+msgid "You have been locked out due to too many failed passphrase attempts."

40+msgstr ""

41+"Se ha proporcionado una contraseña errónea demasiadas veces. Se ha bloqueado "

42+"el dispositivo."

43+

44+#: qml/Components/DelayedLockscreen.qml:63

45+msgid "You have been locked out due to too many failed passcode attempts."

46+msgstr ""

47+"Se ha bloqueado el dispositivo debido al gran número de intentos fallidos de "

48+"desbloqueo."

49+

50+#: qml/Components/DelayedLockscreen.qml:72

51+#, qt-format

52+msgid "Please wait %1 minute and then try again…"

53+msgid_plural "Please wait %1 minutes and then try again…"

54+msgstr[0] "Espere %1 minuto e inténtelo de nuevo..."

55+msgstr[1] "Espere %1 minutos e inténtelo de nuevo..."

56+

3357#: qml/Components/Dialogs.qml:70

3458msgid "Log out"

3559msgstr "Cerrar la sesión"

@@ -139,14 +163,6 @@ msgstr ""

139163"Ahora domina los gestos de los bordes y puede usar el teléfono<br><br>Toque "

140164"la pantalla para comenzar"

141165

142−#: qml/Components/Lockscreen.qml:167

143−msgid "Please wait"

144−msgstr "Espere un momento"

145−

146−#: qml/Components/Lockscreen.qml:172

147−msgid "Too many incorrect attempts"

148−msgstr "Demasiados intentos incorrectos"

149−

150166#: qml/Components/Lockscreen.qml:206

151167msgid "Emergency Call"

152168msgstr "Llamada de emergencia"

@@ -155,15 +171,6 @@ msgstr "Llamada de emergencia"

155171msgid "OK"

156172msgstr "Aceptar"

157173

158−#: qml/Components/PassphraseLockscreen.qml:61

159−#, qt-format

160−msgid "Hello %1"

161−msgstr "Hola, %1"

162−

163−#: qml/Components/PassphraseLockscreen.qml:61

164−msgid "Hello"

165−msgstr "Hola"

166−

167174#: qml/Dash/GenericScopeView.qml:411 qml/Dash/GenericScopeView.qml:533

168175msgid "See less"

169176msgstr "Ver menos"

@@ -230,8 +237,8 @@ msgid "All"

230237msgstr "Todo"

231238

232239#: qml/Greeter/Greeter.qml:157

233−msgid "Swipe to unlock"

234−msgstr "Deslice para desbloquear"

240+msgid "Unlock"

241+msgstr "Desbloquear"

235242

236243#: qml/Hud/HudParametrizedActionsPage.qml:139

237244msgid "Confirm"

@@ -309,26 +316,30 @@ msgstr "Desbloquear SIM"

309316msgid "Roaming"

310317msgstr "Itinerancia"

311318

312−#: qml/Shell.qml:320

313−msgid "Enter your passphrase"

314−msgstr "Escriba su contraseña"

319+#: qml/Shell.qml:340

320+msgid "Enter passphrase"

321+msgstr "Introduzca la contraseña"

315322

316323#: qml/Shell.qml:321

317324msgid "Sorry, incorrect passphrase"

318325msgstr "La contraseña es incorrecta"

319326

320−#: qml/Shell.qml:323

321−msgid "Enter your passcode"

322−msgstr "Escriba su código de acceso"

327+#: qml/Shell.qml:342

328+msgid "Please re-enter"

329+msgstr "Reintroduzca"

330+

331+#: qml/Shell.qml:344

332+msgid "Enter passcode"

333+msgstr "Introduzca el código"

323334

324335#: qml/Shell.qml:324

325336msgid "Sorry, incorrect passcode"

326337msgstr "El código es incorrecto"

327338

328−#: qml/Shell.qml:327

339+#: qml/Shell.qml:348

329340#, qt-format

330−msgid "Enter your %1"

331−msgstr "Introduzca su %1"

341+msgid "Enter %1"

342+msgstr "Introduzca %1"

332343

333344#: qml/Shell.qml:328

334345#, qt-format

@@ -363,5 +374,28 @@ msgstr ""

363374"Si se introduce el código incorrectamente, el teléfono volverá a la "

364375"configuración de fábrica y se perderán todos los datos personales."

365376

366−#~ msgid "Manage Dash"

367−#~ msgstr "Gestionar tablero"

377+#~ msgid "Hello"

378+#~ msgstr "Hola"

379+

380+#, qt-format

381+#~ msgid "Hello %1"

382+#~ msgstr "Hola, %1"

383+

384+#~ msgid "Swipe to unlock"

385+#~ msgstr "Deslice para desbloquear"

386+

387+#~ msgid "Please wait"

388+#~ msgstr "Espere un momento"

389+

390+#~ msgid "Too many incorrect attempts"

391+#~ msgstr "Demasiados intentos incorrectos"

392+

393+#, qt-format

394+#~ msgid "Enter your %1"

395+#~ msgstr "Introduzca su %1"

396+

397+#~ msgid "Enter your passcode"

398+#~ msgstr "Escriba su código de acceso"

399+

400+#~ msgid "Enter your passphrase"

401+#~ msgstr "Escriba su contraseña"

po/eu.po+63−30

@@ -7,14 +7,15 @@ msgid ""

77msgstr ""

88"Project-Id-Version: unity8\n"

99"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10−"POT-Creation-Date: 2014-09-24 10:43+0100\n"

11−"PO-Revision-Date: 2014-09-27 12:47+0000\n"

10+"POT-Creation-Date: 2014-10-02 10:35+0200\n"

11+"PO-Revision-Date: 2014-10-04 01:50+0000\n"

1212"Last-Translator: Ibai Oihanguren Sala <Unknown>\n"

1313"Language-Team: Basque <eu@li.org>\n"

1414"MIME-Version: 1.0\n"

1515"Content-Type: text/plain; charset=UTF-8\n"

1616"Content-Transfer-Encoding: 8bit\n"

17−"X-Launchpad-Export-Date: 2014-09-29 05:19+0000\n"

17+"Plural-Forms: nplurals=2; plural=n != 1;\n"

18+"X-Launchpad-Export-Date: 2014-10-05 06:38+0000\n"

1819"X-Generator: Launchpad (build 17196)\n"

1920

2021#: plugins/LightDM/Greeter.cpp:130

@@ -30,6 +31,28 @@ msgstr "Ainguratu lasterbidea"

3031msgid "Unpin shortcut"

3132msgstr "Askatu lasterbidea"

3233

34+#: qml/Components/DelayedLockscreen.qml:47

35+msgid "Device Locked"

36+msgstr "Gailua blokeatuta"

37+

38+#: qml/Components/DelayedLockscreen.qml:62

39+msgid "You have been locked out due to too many failed passphrase attempts."

40+msgstr ""

41+"Gailua blokeatu da, pasaesaldia sartzeko saiakera gehiegi hutsegin "

42+"dituzulako."

43+

44+#: qml/Components/DelayedLockscreen.qml:63

45+msgid "You have been locked out due to too many failed passcode attempts."

46+msgstr ""

47+"Gailua blokeatu da, pasakodea sartzeko saiakera gehiegi hutsegin dituzulako."

48+

49+#: qml/Components/DelayedLockscreen.qml:72

50+#, qt-format

51+msgid "Please wait %1 minute and then try again…"

52+msgid_plural "Please wait %1 minutes and then try again…"

53+msgstr[0] "Itxaron minutu %1ez eta saiatu berriro…"

54+msgstr[1] "Itxaron %1 minutuz eta saiatu berriro…"

55+

3356#: qml/Components/Dialogs.qml:70

3457msgid "Log out"

3558msgstr "Amaitu saioa"

@@ -137,14 +160,6 @@ msgstr ""

137160"Jadanik ezagutzen dituzu ertzetako keinuak, eta mugikorra erabiltzen has "

138161"zaitezke<br><br>Sakatu pantailan hasteko"

139162

140−#: qml/Components/Lockscreen.qml:167

141−msgid "Please wait"

142−msgstr "Itxaron"

143−

144−#: qml/Components/Lockscreen.qml:172

145−msgid "Too many incorrect attempts"

146−msgstr "Okerreko saiakera gehiegi"

147−

148163#: qml/Components/Lockscreen.qml:206

149164msgid "Emergency Call"

150165msgstr "Larrialdi-deia"

@@ -153,15 +168,6 @@ msgstr "Larrialdi-deia"

153168msgid "OK"

154169msgstr "Ados"

155170

156−#: qml/Components/PassphraseLockscreen.qml:61

157−#, qt-format

158−msgid "Hello %1"

159−msgstr "Kaixo %1"

160−

161−#: qml/Components/PassphraseLockscreen.qml:61

162−msgid "Hello"

163−msgstr "Kaixo"

164−

165171#: qml/Dash/GenericScopeView.qml:411 qml/Dash/GenericScopeView.qml:533

166172msgid "See less"

167173msgstr "Ikusi gutxiago"

@@ -228,8 +234,8 @@ msgid "All"

228234msgstr "Guztiak"

229235

230236#: qml/Greeter/Greeter.qml:157

231−msgid "Swipe to unlock"

232−msgstr "Pasatu hatza desblokeatzeko"

237+msgid "Unlock"

238+msgstr "Desblokeatu"

233239

234240#: qml/Hud/HudParametrizedActionsPage.qml:139

235241msgid "Confirm"

@@ -307,25 +313,29 @@ msgstr "Desblokeatu SIMa"

307313msgid "Roaming"

308314msgstr "Ibiltaritza"

309315

310−#: qml/Shell.qml:320

311−msgid "Enter your passphrase"

316+#: qml/Shell.qml:340

317+msgid "Enter passphrase"

312318msgstr "Sartu pasaesaldia"

313319

314320#: qml/Shell.qml:321

315321msgid "Sorry, incorrect passphrase"

316322msgstr "Sentitzen dugu, pasaesaldia okerrekoa da"

317323

318−#: qml/Shell.qml:323

319−msgid "Enter your passcode"

324+#: qml/Shell.qml:342

325+msgid "Please re-enter"

326+msgstr "Errepikatu"

327+

328+#: qml/Shell.qml:344

329+msgid "Enter passcode"

320330msgstr "Sartu pasakodea"

321331

322332#: qml/Shell.qml:324

323333msgid "Sorry, incorrect passcode"

324334msgstr "Sentitzen dugu, pasakodea okerrekoa da"

325335

326−#: qml/Shell.qml:327

336+#: qml/Shell.qml:348

327337#, qt-format

328−msgid "Enter your %1"

338+msgid "Enter %1"

329339msgstr "Sartu %1"

330340

331341#: qml/Shell.qml:328

@@ -361,5 +371,28 @@ msgstr ""

361371"Okerreko pasakodea sartzen baduzu, telefonoaren jatorrizko ezarpenak "

362372"berrezarri eta datu pertsonal guztiak ezabatuko dira."

363373

364−#~ msgid "Manage Dash"

365−#~ msgstr "Kudeatu abio-leihoa"

374+#, qt-format

375+#~ msgid "Hello %1"

376+#~ msgstr "Kaixo %1"

377+

378+#~ msgid "Hello"

379+#~ msgstr "Kaixo"

380+

381+#~ msgid "Swipe to unlock"

382+#~ msgstr "Pasatu hatza desblokeatzeko"

383+

384+#~ msgid "Please wait"

385+#~ msgstr "Itxaron"

386+

387+#~ msgid "Too many incorrect attempts"

388+#~ msgstr "Okerreko saiakera gehiegi"

389+

390+#~ msgid "Enter your passphrase"

391+#~ msgstr "Sartu pasaesaldia"

392+

393+#~ msgid "Enter your passcode"

394+#~ msgstr "Sartu pasakodea"

395+

396+#, qt-format

397+#~ msgid "Enter your %1"

398+#~ msgstr "Sartu %1"

po/fa.po+66−33

@@ -7,14 +7,15 @@ msgid ""

77msgstr ""

88"Project-Id-Version: unity8\n"

99"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10−"POT-Creation-Date: 2014-09-24 10:43+0100\n"

11−"PO-Revision-Date: 2014-09-21 10:43+0000\n"

10+"POT-Creation-Date: 2014-10-02 10:35+0200\n"

11+"PO-Revision-Date: 2014-10-02 23:07+0000\n"

1212"Last-Translator: Danial Behzadi <dani.behzi@gmail.com>\n"

1313"Language-Team: Persian <fa@li.org>\n"

1414"MIME-Version: 1.0\n"

1515"Content-Type: text/plain; charset=UTF-8\n"

1616"Content-Transfer-Encoding: 8bit\n"

17−"X-Launchpad-Export-Date: 2014-09-29 05:20+0000\n"

17+"Plural-Forms: nplurals=1; plural=0;\n"

18+"X-Launchpad-Export-Date: 2014-10-03 06:22+0000\n"

1819"X-Generator: Launchpad (build 17196)\n"

1920

2021#: plugins/LightDM/Greeter.cpp:130

@@ -30,6 +31,25 @@ msgstr "سنجاق کردن میانبر"

3031msgid "Unpin shortcut"

3132msgstr "برداشتن سنجاق میانبر"

3233

34+#: qml/Components/DelayedLockscreen.qml:47

35+msgid "Device Locked"

36+msgstr "دستگاه قفل شد"

37+

38+#: qml/Components/DelayedLockscreen.qml:62

39+msgid "You have been locked out due to too many failed passphrase attempts."

40+msgstr ""

41+"شما به دلیل تلاش‌های بسیار زیاد شکست خورده برای عبارت‌عبور قفل شده‌اید."

42+

43+#: qml/Components/DelayedLockscreen.qml:63

44+msgid "You have been locked out due to too many failed passcode attempts."

45+msgstr "شما به دلیل تلاش‌های بسیار زیاد شکست خورده برای رمزعبور قفل شده‌اید."

46+

47+#: qml/Components/DelayedLockscreen.qml:72

48+#, qt-format

49+msgid "Please wait %1 minute and then try again…"

50+msgid_plural "Please wait %1 minutes and then try again…"

51+msgstr[0] "لطفاُ %1 دقیقه صبر نموده و سپس مجدّداً تلاش نمایید…"

52+

3353#: qml/Components/Dialogs.qml:70

3454msgid "Log out"

3555msgstr "خروج از حساب"

@@ -136,14 +156,6 @@ msgstr ""

136156"هم اکنون در استفاده از ژست های حرکتی مهارت لازم را دارید و می‌توانید استفاده "

137157"از تلفن را آغاز کنید<br><br>برای شروع صفحه را لمس کنید"

138158

139−#: qml/Components/Lockscreen.qml:167

140−msgid "Please wait"

141−msgstr "لطفاً صبر کنید"

142−

143−#: qml/Components/Lockscreen.qml:172

144−msgid "Too many incorrect attempts"

145−msgstr "تلاش‌های ناموفّق زیاد"

146−

147159#: qml/Components/Lockscreen.qml:206

148160msgid "Emergency Call"

149161msgstr "تماس اضطراری"

@@ -152,15 +164,6 @@ msgstr "تماس اضطراری"

152164msgid "OK"

153165msgstr "قبول"

154166

155−#: qml/Components/PassphraseLockscreen.qml:61

156−#, qt-format

157−msgid "Hello %1"

158−msgstr "سلام %1"

159−

160−#: qml/Components/PassphraseLockscreen.qml:61

161−msgid "Hello"

162−msgstr "سلام"

163−

164167#: qml/Dash/GenericScopeView.qml:411 qml/Dash/GenericScopeView.qml:533

165168msgid "See less"

166169msgstr "کم‌تر ببینید"

@@ -208,7 +211,7 @@ msgstr "ارسال"

208211

209212#: qml/Dash/ScopesOverview.qml:206

210213msgid "Manage Scopes"

211−msgstr ""

214+msgstr "مدیریت حوزه‌ها"

212215

213216#: qml/Dash/ScopesOverview.qml:428

214217msgid "Done"

@@ -227,8 +230,8 @@ msgid "All"

227230msgstr "همه"

228231

229232#: qml/Greeter/Greeter.qml:157

230−msgid "Swipe to unlock"

231−msgstr "برای باز کردن قفل بکشد"

233+msgid "Unlock"

234+msgstr "بازکردن قفل"

232235

233236#: qml/Hud/HudParametrizedActionsPage.qml:139

234237msgid "Confirm"

@@ -272,7 +275,7 @@ msgstr "کنفرانس"

272275

273276#: qml/Panel/Indicators/MenuItemFactory.qml:600

274277msgid "Nothing is playing"

275−msgstr ""

278+msgstr "هیچ چیزی در حال پخش نیست"

276279

277280#: qml/Panel/Indicators/MenuItemFactory.qml:748

278281msgid "In queue…"

@@ -306,26 +309,30 @@ msgstr "باز کردن قفل سیم‌کارت"

306309msgid "Roaming"

307310msgstr "رومینگ"

308311

309−#: qml/Shell.qml:320

310−msgid "Enter your passphrase"

311−msgstr "عبارت‌عبورتان را وارد کنید"

312+#: qml/Shell.qml:340

313+msgid "Enter passphrase"

314+msgstr "عبارت‌عبور را وارد کنید"

312315

313316#: qml/Shell.qml:321

314317msgid "Sorry, incorrect passphrase"

315318msgstr "متأسّفیم، عبارت‌عبور نادرست بود"

316319

317−#: qml/Shell.qml:323

318−msgid "Enter your passcode"

319−msgstr "رمزعبورتان را وارد کنید"

320+#: qml/Shell.qml:342

321+msgid "Please re-enter"

322+msgstr "لطفاً دوباره وارد کنید"

323+

324+#: qml/Shell.qml:344

325+msgid "Enter passcode"

326+msgstr "رمزعبور را وارد کنید"

320327

321328#: qml/Shell.qml:324

322329msgid "Sorry, incorrect passcode"

323330msgstr "متأسّفیم، رمزعبور نادرست بود"

324331

325−#: qml/Shell.qml:327

332+#: qml/Shell.qml:348

326333#, qt-format

327−msgid "Enter your %1"

328−msgstr "%1 خود را وارد کنید"

334+msgid "Enter %1"

335+msgstr "%1 را وارد کنید"

329336

330337#: qml/Shell.qml:328

331338#, qt-format

@@ -360,5 +367,31 @@ msgstr ""

360367"اگر رمزعبور نادرست وارد شود، تلفن شما بازنشانی کارخانه خواهد شد و تمامی "

361368"اطّلاعات شخصی حذف خواهند شد."

362369

370+#, qt-format

371+#~ msgid "Hello %1"

372+#~ msgstr "سلام %1"

373+

374+#~ msgid "Hello"

375+#~ msgstr "سلام"

376+

377+#~ msgid "Swipe to unlock"

378+#~ msgstr "برای باز کردن قفل بکشد"

379+

363380#~ msgid "Manage Dash"

364381#~ msgstr "مدیریت دش"

382+

383+#~ msgid "Please wait"

384+#~ msgstr "لطفاً صبر کنید"

385+

386+#~ msgid "Too many incorrect attempts"

387+#~ msgstr "تلاش‌های ناموفّق زیاد"

388+

389+#, qt-format

390+#~ msgid "Enter your %1"

391+#~ msgstr "%1 خود را وارد کنید"

392+

393+#~ msgid "Enter your passphrase"

394+#~ msgstr "عبارت‌عبورتان را وارد کنید"

395+

396+#~ msgid "Enter your passcode"

397+#~ msgstr "رمزعبورتان را وارد کنید"

po/fi.po+63−31

@@ -7,14 +7,15 @@ msgid ""

77msgstr ""

88"Project-Id-Version: unity\n"

99"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10−"POT-Creation-Date: 2014-09-24 10:43+0100\n"

11−"PO-Revision-Date: 2014-08-28 13:47+0000\n"

12−"Last-Translator: Timo Jyrinki <timo.jyrinki@canonical.com>\n"

10+"POT-Creation-Date: 2014-10-02 10:35+0200\n"

11+"PO-Revision-Date: 2014-10-04 08:00+0000\n"

12+"Last-Translator: Jiri Grönroos <Unknown>\n"

1313"Language-Team: Finnish <fi@li.org>\n"

1414"MIME-Version: 1.0\n"

1515"Content-Type: text/plain; charset=UTF-8\n"

1616"Content-Transfer-Encoding: 8bit\n"

17−"X-Launchpad-Export-Date: 2014-09-29 05:19+0000\n"

17+"Plural-Forms: nplurals=2; plural=n != 1;\n"

18+"X-Launchpad-Export-Date: 2014-10-05 06:38+0000\n"

1819"X-Generator: Launchpad (build 17196)\n"

1920

2021#: plugins/LightDM/Greeter.cpp:130

@@ -30,6 +31,27 @@ msgstr "Kiinnitä pikakuvake"

3031msgid "Unpin shortcut"

3132msgstr "Poista pikakuvakkeen kiinnitys"

3233

34+#: qml/Components/DelayedLockscreen.qml:47

35+msgid "Device Locked"

36+msgstr "Laite on lukittu"

37+

38+#: qml/Components/DelayedLockscreen.qml:62

39+msgid "You have been locked out due to too many failed passphrase attempts."

40+msgstr ""

41+"Laite on lukittu liian monen virheellisen tunnuslauseyrityksen jälkeen."

42+

43+#: qml/Components/DelayedLockscreen.qml:63

44+msgid "You have been locked out due to too many failed passcode attempts."

45+msgstr ""

46+"Laite on lukittu liian monen virheellisen suojakoodiyrityksen jälkeen."

47+

48+#: qml/Components/DelayedLockscreen.qml:72

49+#, qt-format

50+msgid "Please wait %1 minute and then try again…"

51+msgid_plural "Please wait %1 minutes and then try again…"

52+msgstr[0] "Odota %1 minuutti ja yritä sitten uudelleen…"

53+msgstr[1] "Odota %1 minuuttia ja yritä sitten uudelleen…"

54+

3355#: qml/Components/Dialogs.qml:70

3456msgid "Log out"

3557msgstr "Kirjaudu ulos"

@@ -136,14 +158,6 @@ msgstr ""

136158"Hallitset nyt reunaeleet, joten voit aloittaa puhelimen "

137159"käytön<br><br>Napauta näyttöä aloittaaksesi"

138160

139−#: qml/Components/Lockscreen.qml:167

140−msgid "Please wait"

141−msgstr "Odota hetki"

142−

143−#: qml/Components/Lockscreen.qml:172

144−msgid "Too many incorrect attempts"

145−msgstr "Liian monta virheellistä yritystä"

146−

147161#: qml/Components/Lockscreen.qml:206

148162msgid "Emergency Call"

149163msgstr "Hätäpuhelu"

@@ -152,15 +166,6 @@ msgstr "Hätäpuhelu"

152166msgid "OK"

153167msgstr "OK"

154168

155−#: qml/Components/PassphraseLockscreen.qml:61

156−#, qt-format

157−msgid "Hello %1"

158−msgstr "Hei %1!"

159−

160−#: qml/Components/PassphraseLockscreen.qml:61

161−msgid "Hello"

162−msgstr "Hei"

163−

164169#: qml/Dash/GenericScopeView.qml:411 qml/Dash/GenericScopeView.qml:533

165170msgid "See less"

166171msgstr "Näytä vähemmän"

@@ -227,8 +232,8 @@ msgid "All"

227232msgstr "Kaikki"

228233

229234#: qml/Greeter/Greeter.qml:157

230−msgid "Swipe to unlock"

231−msgstr "Avaa pyyhkäisemällä"

235+msgid "Unlock"

236+msgstr "Avaa lukitus"

232237

233238#: qml/Hud/HudParametrizedActionsPage.qml:139

234239msgid "Confirm"

@@ -306,25 +311,29 @@ msgstr "Avaa SIM-kortin lukitus"

306311msgid "Roaming"

307312msgstr "Verkkovierailu"

308313

309−#: qml/Shell.qml:320

310−msgid "Enter your passphrase"

314+#: qml/Shell.qml:340

315+msgid "Enter passphrase"

311316msgstr "Anna tunnuslause"

312317

313318#: qml/Shell.qml:321

314319msgid "Sorry, incorrect passphrase"

315320msgstr "Virheellinen tunnuslause"

316321

317−#: qml/Shell.qml:323

318−msgid "Enter your passcode"

322+#: qml/Shell.qml:342

323+msgid "Please re-enter"

324+msgstr "Anna uudelleen"

325+

326+#: qml/Shell.qml:344

327+msgid "Enter passcode"

319328msgstr "Anna suojakoodi"

320329

321330#: qml/Shell.qml:324

322331msgid "Sorry, incorrect passcode"

323332msgstr "Väärä suojakoodi"

324333

325−#: qml/Shell.qml:327

334+#: qml/Shell.qml:348

326335#, qt-format

327−msgid "Enter your %1"

336+msgid "Enter %1"

328337msgstr "Anna %1"

329338

330339#: qml/Shell.qml:328

@@ -360,5 +369,28 @@ msgstr ""

360369"Jos kirjoitat suojakoodin virheellisesti, puhelimesi palautetaan "

361370"tehdastilaan ja kaikki henkilökohtaiset tietosi poistetaan."

362371

363−#~ msgid "Manage Dash"

364−#~ msgstr "Unityn hallinta"

372+#~ msgid "Hello"

373+#~ msgstr "Hei"

374+

375+#, qt-format

376+#~ msgid "Hello %1"

377+#~ msgstr "Hei %1!"

378+

379+#~ msgid "Swipe to unlock"

380+#~ msgstr "Avaa pyyhkäisemällä"

381+

382+#~ msgid "Please wait"

383+#~ msgstr "Odota hetki"

384+

385+#~ msgid "Too many incorrect attempts"

386+#~ msgstr "Liian monta virheellistä yritystä"

387+

388+#, qt-format

389+#~ msgid "Enter your %1"

390+#~ msgstr "Anna %1"

391+

392+#~ msgid "Enter your passphrase"

393+#~ msgstr "Anna tunnuslause"

394+

395+#~ msgid "Enter your passcode"

396+#~ msgstr "Anna suojakoodi"

po/fo.po+33−26

@@ -7,14 +7,15 @@ msgid ""

77msgstr ""

88"Project-Id-Version: unity\n"

99"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10−"POT-Creation-Date: 2014-09-24 10:43+0100\n"

10+"POT-Creation-Date: 2014-10-02 10:35+0200\n"

1111"PO-Revision-Date: 2014-01-14 20:08+0000\n"

1212"Last-Translator: Jógvan Olsen <jeggy@jebster.net>\n"

1313"Language-Team: Faroese <fo@li.org>\n"

1414"MIME-Version: 1.0\n"

1515"Content-Type: text/plain; charset=UTF-8\n"

1616"Content-Transfer-Encoding: 8bit\n"

17−"X-Launchpad-Export-Date: 2014-09-29 05:19+0000\n"

17+"Plural-Forms: nplurals=2; plural=n != 1;\n"

18+"X-Launchpad-Export-Date: 2014-10-03 06:21+0000\n"

1819"X-Generator: Launchpad (build 17196)\n"

1920

2021#: plugins/LightDM/Greeter.cpp:130

@@ -30,6 +31,25 @@ msgstr ""

3031msgid "Unpin shortcut"

3132msgstr ""

3233

34+#: qml/Components/DelayedLockscreen.qml:47

35+msgid "Device Locked"

36+msgstr ""

37+

38+#: qml/Components/DelayedLockscreen.qml:62

39+msgid "You have been locked out due to too many failed passphrase attempts."

40+msgstr ""

41+

42+#: qml/Components/DelayedLockscreen.qml:63

43+msgid "You have been locked out due to too many failed passcode attempts."

44+msgstr ""

45+

46+#: qml/Components/DelayedLockscreen.qml:72

47+#, qt-format

48+msgid "Please wait %1 minute and then try again…"

49+msgid_plural "Please wait %1 minutes and then try again…"

50+msgstr[0] ""

51+msgstr[1] ""

52+

3353#: qml/Components/Dialogs.qml:70

3454msgid "Log out"

3555msgstr ""

@@ -132,14 +152,6 @@ msgid ""

132152"phone<br><br>Tap on the screen to start"

133153msgstr ""

134154

135−#: qml/Components/Lockscreen.qml:167

136−msgid "Please wait"

137−msgstr ""

138−

139−#: qml/Components/Lockscreen.qml:172

140−msgid "Too many incorrect attempts"

141−msgstr ""

142−

143155#: qml/Components/Lockscreen.qml:206

144156msgid "Emergency Call"

145157msgstr ""

@@ -148,15 +160,6 @@ msgstr ""

148160msgid "OK"

149161msgstr ""

150162

151−#: qml/Components/PassphraseLockscreen.qml:61

152−#, qt-format

153−msgid "Hello %1"

154−msgstr ""

155−

156−#: qml/Components/PassphraseLockscreen.qml:61

157−msgid "Hello"

158−msgstr ""

159−

160163#: qml/Dash/GenericScopeView.qml:411 qml/Dash/GenericScopeView.qml:533

161164msgid "See less"

162165msgstr ""

@@ -223,7 +226,7 @@ msgid "All"

223226msgstr ""

224227

225228#: qml/Greeter/Greeter.qml:157

226−msgid "Swipe to unlock"

229+msgid "Unlock"

227230msgstr ""

228231

229232#: qml/Hud/HudParametrizedActionsPage.qml:139

@@ -302,25 +305,29 @@ msgstr ""

302305msgid "Roaming"

303306msgstr ""

304307

305−#: qml/Shell.qml:320

306−msgid "Enter your passphrase"

308+#: qml/Shell.qml:340

309+msgid "Enter passphrase"

307310msgstr ""

308311

309312#: qml/Shell.qml:321

310313msgid "Sorry, incorrect passphrase"

311314msgstr ""

312315

313−#: qml/Shell.qml:323

314−msgid "Enter your passcode"

316+#: qml/Shell.qml:342

317+msgid "Please re-enter"

318+msgstr ""

319+

320+#: qml/Shell.qml:344

321+msgid "Enter passcode"

315322msgstr ""

316323

317324#: qml/Shell.qml:324

318325msgid "Sorry, incorrect passcode"

319326msgstr ""

320327

321−#: qml/Shell.qml:327

328+#: qml/Shell.qml:348

322329#, qt-format

323−msgid "Enter your %1"

330+msgid "Enter %1"

324331msgstr ""

325332

326333#: qml/Shell.qml:328

po/fr.po+63−30

@@ -7,14 +7,15 @@ msgid ""

77msgstr ""

88"Project-Id-Version: unity\n"

99"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10−"POT-Creation-Date: 2014-09-24 10:43+0100\n"

10+"POT-Creation-Date: 2014-10-02 10:35+0200\n"

1111"PO-Revision-Date: 2014-08-29 10:31+0000\n"

1212"Last-Translator: Sébastien Maes <nautilussebastien@gmail.com>\n"

1313"Language-Team: French <fr@li.org>\n"

1414"MIME-Version: 1.0\n"

1515"Content-Type: text/plain; charset=UTF-8\n"

1616"Content-Transfer-Encoding: 8bit\n"

17−"X-Launchpad-Export-Date: 2014-09-29 05:19+0000\n"

17+"Plural-Forms: nplurals=2; plural=n > 1;\n"

18+"X-Launchpad-Export-Date: 2014-10-03 06:21+0000\n"

1819"X-Generator: Launchpad (build 17196)\n"

1920

2021#: plugins/LightDM/Greeter.cpp:130

@@ -30,6 +31,25 @@ msgstr "Épingler le raccourci"

3031msgid "Unpin shortcut"

3132msgstr "Détacher le raccourci"

3233

34+#: qml/Components/DelayedLockscreen.qml:47

35+msgid "Device Locked"

36+msgstr ""

37+

38+#: qml/Components/DelayedLockscreen.qml:62

39+msgid "You have been locked out due to too many failed passphrase attempts."

40+msgstr ""

41+

42+#: qml/Components/DelayedLockscreen.qml:63

43+msgid "You have been locked out due to too many failed passcode attempts."

44+msgstr ""

45+

46+#: qml/Components/DelayedLockscreen.qml:72

47+#, qt-format

48+msgid "Please wait %1 minute and then try again…"

49+msgid_plural "Please wait %1 minutes and then try again…"

50+msgstr[0] ""

51+msgstr[1] ""

52+

3353#: qml/Components/Dialogs.qml:70

3454msgid "Log out"

3555msgstr "Se déconnecter"

@@ -143,14 +163,6 @@ msgstr ""

143163"Vous maîtrisez maintenant les différents gestes et pouvez commencer à "

144164"utiliser le téléphone<br><br>Appuyez sur l'écran pour commencer"

145165

146−#: qml/Components/Lockscreen.qml:167

147−msgid "Please wait"

148−msgstr "Veuillez patienter"

149−

150−#: qml/Components/Lockscreen.qml:172

151−msgid "Too many incorrect attempts"

152−msgstr "Trop de tentatives incorrectes"

153−

154166#: qml/Components/Lockscreen.qml:206

155167msgid "Emergency Call"

156168msgstr "Appel d'urgence"

@@ -159,15 +171,6 @@ msgstr "Appel d'urgence"

159171msgid "OK"

160172msgstr "OK"

161173

162−#: qml/Components/PassphraseLockscreen.qml:61

163−#, qt-format

164−msgid "Hello %1"

165−msgstr "Bonjour %1"

166−

167−#: qml/Components/PassphraseLockscreen.qml:61

168−msgid "Hello"

169−msgstr "Bonjour"

170−

171174#: qml/Dash/GenericScopeView.qml:411 qml/Dash/GenericScopeView.qml:533

172175msgid "See less"

173176msgstr "Voir moins"

@@ -234,8 +237,8 @@ msgid "All"

234237msgstr "Toutes"

235238

236239#: qml/Greeter/Greeter.qml:157

237−msgid "Swipe to unlock"

238−msgstr "Faites glisser pour déverrouiller"

240+msgid "Unlock"

241+msgstr ""

239242

240243#: qml/Hud/HudParametrizedActionsPage.qml:139

241244msgid "Confirm"

@@ -313,26 +316,30 @@ msgstr "Déverrouiller la carte SIM"

313316msgid "Roaming"

314317msgstr "Roaming"

315318

316−#: qml/Shell.qml:320

317−msgid "Enter your passphrase"

318−msgstr "Entrez votre phrase secrète"

319+#: qml/Shell.qml:340

320+msgid "Enter passphrase"

321+msgstr ""

319322

320323#: qml/Shell.qml:321

321324msgid "Sorry, incorrect passphrase"

322325msgstr "Désolé, phrase secrète incorrecte"

323326

324−#: qml/Shell.qml:323

325−msgid "Enter your passcode"

326−msgstr "Entrez votre code"

327+#: qml/Shell.qml:342

328+msgid "Please re-enter"

329+msgstr ""

330+

331+#: qml/Shell.qml:344

332+msgid "Enter passcode"

333+msgstr ""

327334

328335#: qml/Shell.qml:324

329336msgid "Sorry, incorrect passcode"

330337msgstr "Désolé, code incorrect"

331338

332−#: qml/Shell.qml:327

339+#: qml/Shell.qml:348

333340#, qt-format

334−msgid "Enter your %1"

335−msgstr "Saisissez votre %1"

341+msgid "Enter %1"

342+msgstr ""

336343

337344#: qml/Shell.qml:328

338345#, qt-format

@@ -369,5 +376,31 @@ msgstr ""

369376"réinitialisation aux paramètres d'usine et toutes les données personnelles "

370377"seront supprimées."

371378

379+#~ msgid "Hello"

380+#~ msgstr "Bonjour"

381+

382+#, qt-format

383+#~ msgid "Hello %1"

384+#~ msgstr "Bonjour %1"

385+

386+#~ msgid "Swipe to unlock"

387+#~ msgstr "Faites glisser pour déverrouiller"

388+

372389#~ msgid "Manage Dash"

373390#~ msgstr "Gérer le tableau de bord"

391+

392+#~ msgid "Please wait"

393+#~ msgstr "Veuillez patienter"

394+

395+#~ msgid "Too many incorrect attempts"

396+#~ msgstr "Trop de tentatives incorrectes"

397+

398+#, qt-format

399+#~ msgid "Enter your %1"

400+#~ msgstr "Saisissez votre %1"

401+

402+#~ msgid "Enter your passphrase"

403+#~ msgstr "Entrez votre phrase secrète"

404+

405+#~ msgid "Enter your passcode"

406+#~ msgstr "Entrez votre code"

po/gd.po+70−33

@@ -7,14 +7,16 @@ msgid ""

77msgstr ""

88"Project-Id-Version: unity8\n"

99"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10−"POT-Creation-Date: 2014-09-24 10:43+0100\n"

11−"PO-Revision-Date: 2014-09-30 11:56+0000\n"

10+"POT-Creation-Date: 2014-10-02 10:35+0200\n"

11+"PO-Revision-Date: 2014-10-03 19:54+0000\n"

1212"Last-Translator: GunChleoc <Unknown>\n"

1313"Language-Team: Fòram na Gàidhlig\n"

1414"MIME-Version: 1.0\n"

1515"Content-Type: text/plain; charset=UTF-8\n"

1616"Content-Transfer-Encoding: 8bit\n"

17−"X-Launchpad-Export-Date: 2014-10-02 06:37+0000\n"

17+"Plural-Forms: nplurals=4; plural=(n==1 || n==11) ? 0 : (n==2 || n==12) ? 1 : "

18+"(n > 2 && n < 20) ? 2 : 3;\n"

19+"X-Launchpad-Export-Date: 2014-10-04 06:28+0000\n"

1820"X-Generator: Launchpad (build 17196)\n"

1921"Language: gd\n"

2022

@@ -31,6 +33,31 @@ msgstr "Prìnich ath-ghoirid"

3133msgid "Unpin shortcut"

3234msgstr "Neo-phrìnich an ath-ghoirid"

3335

36+#: qml/Components/DelayedLockscreen.qml:47

37+msgid "Device Locked"

38+msgstr "Tha glas air an uidheam"

39+

40+#: qml/Components/DelayedLockscreen.qml:62

41+msgid "You have been locked out due to too many failed passphrase attempts."

42+msgstr ""

43+"Chaidh do glasadh a-mach às an uidheam on a chuir thu abairt-fhaire chearr a-"

44+"steach cus tursan."

45+

46+#: qml/Components/DelayedLockscreen.qml:63

47+msgid "You have been locked out due to too many failed passcode attempts."

48+msgstr ""

49+"Chaidh do glasadh a-mach às an uidheam on a chuir thu còd-faire cearr a-"

50+"steach cus tursan."

51+

52+#: qml/Components/DelayedLockscreen.qml:72

53+#, qt-format

54+msgid "Please wait %1 minute and then try again…"

55+msgid_plural "Please wait %1 minutes and then try again…"

56+msgstr[0] "Fuirich ort %1 diog 's feuch ris a-rithist an uairsin…"

57+msgstr[1] "Fuirich ort %1 dhiog 's feuch ris a-rithist an uairsin…"

58+msgstr[2] "Fuirich ort %1 diogan 's feuch ris a-rithist an uairsin…"

59+msgstr[3] "Fuirich ort %1 diog 's feuch ris a-rithist an uairsin…"

60+

3461#: qml/Components/Dialogs.qml:70

3562msgid "Log out"

3663msgstr "Clàraich a-mach"

@@ -143,14 +170,6 @@ msgstr ""

143170"Fhuair thu air na gluasadan oire ceart a dhèanamh a-nis agus is urrainn dhut "

144171"am fòn a chleachdadh<br><br>Thoir gnogag air an sgrìn airson tòiseachadh"

145172

146−#: qml/Components/Lockscreen.qml:167

147−msgid "Please wait"

148−msgstr "Fuirich ort"

149−

150−#: qml/Components/Lockscreen.qml:172

151−msgid "Too many incorrect attempts"

152−msgstr "Cus oidhirpean leis nach do shoirbhich"

153−

154173#: qml/Components/Lockscreen.qml:206

155174msgid "Emergency Call"

156175msgstr "Gairm èiginn"

@@ -159,15 +178,6 @@ msgstr "Gairm èiginn"

159178msgid "OK"

160179msgstr "Ceart ma-thà"

161180

162−#: qml/Components/PassphraseLockscreen.qml:61

163−#, qt-format

164−msgid "Hello %1"

165−msgstr "Shin thu, %1"

166−

167−#: qml/Components/PassphraseLockscreen.qml:61

168−msgid "Hello"

169−msgstr "Shin thu"

170−

171181#: qml/Dash/GenericScopeView.qml:411 qml/Dash/GenericScopeView.qml:533

172182msgid "See less"

173183msgstr "Seall nas lugha"

@@ -234,8 +244,8 @@ msgid "All"

234244msgstr "Na h-uile"

235245

236246#: qml/Greeter/Greeter.qml:157

237−msgid "Swipe to unlock"

238−msgstr "Dèan grad-shlaighdeadh gus a' ghlas a thoirt dheth"

247+msgid "Unlock"

248+msgstr "Thoir a' ghlas dheth"

239249

240250#: qml/Hud/HudParametrizedActionsPage.qml:139

241251msgid "Confirm"

@@ -313,26 +323,30 @@ msgstr "Thoir a' ghlas far an SIM"

313323msgid "Roaming"

314324msgstr "Air fàrsan"

315325

316−#: qml/Shell.qml:320

317−msgid "Enter your passphrase"

318−msgstr "Cuir an abairt-fhaire agad a-steach"

326+#: qml/Shell.qml:340

327+msgid "Enter passphrase"

328+msgstr "Cuir abairt-fhaire a-steach"

319329

320330#: qml/Shell.qml:321

321331msgid "Sorry, incorrect passphrase"

322332msgstr "Duilich ach tha an abairt-fhaire cearr"

323333

324−#: qml/Shell.qml:323

325−msgid "Enter your passcode"

326−msgstr "Cuir an còd-faire agad a-steach"

334+#: qml/Shell.qml:342

335+msgid "Please re-enter"

336+msgstr "Cuir a-steach e a-rithist"

337+

338+#: qml/Shell.qml:344

339+msgid "Enter passcode"

340+msgstr "Cuir còd-faire a-steach"

327341

328342#: qml/Shell.qml:324

329343msgid "Sorry, incorrect passcode"

330344msgstr "Duilich ach tha an còd-faire cearr"

331345

332−#: qml/Shell.qml:327

346+#: qml/Shell.qml:348

333347#, qt-format

334−msgid "Enter your %1"

335−msgstr "Cuir a-steach a' %1 agad"

348+msgid "Enter %1"

349+msgstr "Cuir a-steach %1"

336350

337351#: qml/Shell.qml:328

338352#, qt-format

@@ -369,5 +383,28 @@ msgstr ""

369383"shuidheachadh air roghainnean an fhactaraidh agus thèid gach dàta pearsanta "

370384"a sguabadh às."

371385

372−#~ msgid "Manage Dash"

373−#~ msgstr "Stiùirich an deas-bhòrd"

386+#, qt-format

387+#~ msgid "Hello %1"

388+#~ msgstr "Shin thu, %1"

389+

390+#~ msgid "Hello"

391+#~ msgstr "Shin thu"

392+

393+#~ msgid "Swipe to unlock"

394+#~ msgstr "Dèan grad-shlaighdeadh gus a' ghlas a thoirt dheth"

395+

396+#~ msgid "Please wait"

397+#~ msgstr "Fuirich ort"

398+

399+#~ msgid "Too many incorrect attempts"

400+#~ msgstr "Cus oidhirpean leis nach do shoirbhich"

401+

402+#~ msgid "Enter your passphrase"

403+#~ msgstr "Cuir an abairt-fhaire agad a-steach"

404+

405+#~ msgid "Enter your passcode"

406+#~ msgstr "Cuir an còd-faire agad a-steach"

407+

408+#, qt-format

409+#~ msgid "Enter your %1"

410+#~ msgstr "Cuir a-steach a' %1 agad"

po/gl.po+60−30

@@ -7,14 +7,15 @@ msgid ""

77msgstr ""

88"Project-Id-Version: unity\n"

99"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10−"POT-Creation-Date: 2014-09-24 10:43+0100\n"

11−"PO-Revision-Date: 2014-09-28 13:57+0000\n"

10+"POT-Creation-Date: 2014-10-02 10:35+0200\n"

11+"PO-Revision-Date: 2014-10-03 04:55+0000\n"

1212"Last-Translator: Marcos Lans <Unknown>\n"

1313"Language-Team: Galician <gl@li.org>\n"

1414"MIME-Version: 1.0\n"

1515"Content-Type: text/plain; charset=UTF-8\n"

1616"Content-Transfer-Encoding: 8bit\n"

17−"X-Launchpad-Export-Date: 2014-09-29 05:19+0000\n"

17+"Plural-Forms: nplurals=2; plural=n != 1;\n"

18+"X-Launchpad-Export-Date: 2014-10-04 06:28+0000\n"

1819"X-Generator: Launchpad (build 17196)\n"

1920

2021#: plugins/LightDM/Greeter.cpp:130

@@ -30,6 +31,25 @@ msgstr "Fixar o atallo"

3031msgid "Unpin shortcut"

3132msgstr "Eliminar o atallo"

3233

34+#: qml/Components/DelayedLockscreen.qml:47

35+msgid "Device Locked"

36+msgstr "Dispositivo bloqueado"

37+

38+#: qml/Components/DelayedLockscreen.qml:62

39+msgid "You have been locked out due to too many failed passphrase attempts."

40+msgstr "Bloqueouse o dispositivo polos intentos fallidos da frase secreta."

41+

42+#: qml/Components/DelayedLockscreen.qml:63

43+msgid "You have been locked out due to too many failed passcode attempts."

44+msgstr "Bloqueouse o dispositivo polos intentos fallidos da clave."

45+

46+#: qml/Components/DelayedLockscreen.qml:72

47+#, qt-format

48+msgid "Please wait %1 minute and then try again…"

49+msgid_plural "Please wait %1 minutes and then try again…"

50+msgstr[0] "Agarde %1 minuto e ténteo de novo…"

51+msgstr[1] "Agarde %1 minutos e ténteo de novo…"

52+

3353#: qml/Components/Dialogs.qml:70

3454msgid "Log out"

3555msgstr "Saír da sesión"

@@ -136,14 +156,6 @@ msgstr ""

136156"Agora xa domina os xestos dos bordos e pode comezar a usar o "

137157"teléfono<br><br>Toque na pantalla para comezar"

138158

139−#: qml/Components/Lockscreen.qml:167

140−msgid "Please wait"

141−msgstr "Agarde"

142−

143−#: qml/Components/Lockscreen.qml:172

144−msgid "Too many incorrect attempts"

145−msgstr "Demasiados erros"

146−

147159#: qml/Components/Lockscreen.qml:206

148160msgid "Emergency Call"

149161msgstr "Chamada de emerxencia"

@@ -152,15 +164,6 @@ msgstr "Chamada de emerxencia"

152164msgid "OK"

153165msgstr "Aceptar"

154166

155−#: qml/Components/PassphraseLockscreen.qml:61

156−#, qt-format

157−msgid "Hello %1"

158−msgstr "Ola %1"

159−

160−#: qml/Components/PassphraseLockscreen.qml:61

161−msgid "Hello"

162−msgstr "Ola"

163−

164167#: qml/Dash/GenericScopeView.qml:411 qml/Dash/GenericScopeView.qml:533

165168msgid "See less"

166169msgstr "Ver menos"

@@ -227,8 +230,8 @@ msgid "All"

227230msgstr "Todos"

228231

229232#: qml/Greeter/Greeter.qml:157

230−msgid "Swipe to unlock"

231−msgstr "Esvare o dedo para desbloquear"

233+msgid "Unlock"

234+msgstr "Desbloquear"

232235

233236#: qml/Hud/HudParametrizedActionsPage.qml:139

234237msgid "Confirm"

@@ -306,25 +309,29 @@ msgstr "Desbloquear a SIM"

306309msgid "Roaming"

307310msgstr "Itinerancia"

308311

309−#: qml/Shell.qml:320

310−msgid "Enter your passphrase"

312+#: qml/Shell.qml:340

313+msgid "Enter passphrase"

311314msgstr "Introduza a frase secreta"

312315

313316#: qml/Shell.qml:321

314317msgid "Sorry, incorrect passphrase"

315318msgstr "Sentímolo a frase é incorrecta"

316319

317−#: qml/Shell.qml:323

318−msgid "Enter your passcode"

320+#: qml/Shell.qml:342

321+msgid "Please re-enter"

322+msgstr "Introducir de novo"

323+

324+#: qml/Shell.qml:344

325+msgid "Enter passcode"

319326msgstr "Introduza a clave"

320327

321328#: qml/Shell.qml:324

322329msgid "Sorry, incorrect passcode"

323330msgstr "Sentímolo, a clave é incorrecta"

324331

325−#: qml/Shell.qml:327

332+#: qml/Shell.qml:348

326333#, qt-format

327−msgid "Enter your %1"

334+msgid "Enter %1"

328335msgstr "Introducir %1"

329336

330337#: qml/Shell.qml:328

@@ -360,5 +367,28 @@ msgstr ""

360367"Se a clave introducida é incorrecta, o teléfono restabelecerá os valores de "

361368"fábrica e perderá todos os datos persoais."

362369

363−#~ msgid "Manage Dash"

364−#~ msgstr "Xestión do Panel"

370+#, qt-format

371+#~ msgid "Hello %1"

372+#~ msgstr "Ola %1"

373+

374+#~ msgid "Hello"

375+#~ msgstr "Ola"

376+

377+#~ msgid "Swipe to unlock"

378+#~ msgstr "Esvare o dedo para desbloquear"

379+

380+#~ msgid "Please wait"

381+#~ msgstr "Agarde"

382+

383+#~ msgid "Too many incorrect attempts"

384+#~ msgstr "Demasiados erros"

385+

386+#, qt-format

387+#~ msgid "Enter your %1"

388+#~ msgstr "Introducir %1"

389+

390+#~ msgid "Enter your passcode"

391+#~ msgstr "Introduza a clave"

392+

393+#~ msgid "Enter your passphrase"

394+#~ msgstr "Introduza a frase secreta"

po/he.po+54−28

@@ -7,14 +7,15 @@ msgid ""

77msgstr ""

88"Project-Id-Version: unity\n"

99"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10−"POT-Creation-Date: 2014-09-24 10:43+0100\n"

10+"POT-Creation-Date: 2014-10-02 10:35+0200\n"

1111"PO-Revision-Date: 2014-08-23 14:19+0000\n"

1212"Last-Translator: Yaron <sh.yaron@gmail.com>\n"

1313"Language-Team: Hebrew <he@li.org>\n"

1414"MIME-Version: 1.0\n"

1515"Content-Type: text/plain; charset=UTF-8\n"

1616"Content-Transfer-Encoding: 8bit\n"

17−"X-Launchpad-Export-Date: 2014-09-29 05:19+0000\n"

17+"Plural-Forms: nplurals=2; plural=n != 1;\n"

18+"X-Launchpad-Export-Date: 2014-10-03 06:21+0000\n"

1819"X-Generator: Launchpad (build 17196)\n"

1920

2021#: plugins/LightDM/Greeter.cpp:130

@@ -30,6 +31,25 @@ msgstr "הצמדת קיצור דרך"

3031msgid "Unpin shortcut"

3132msgstr "הפרדת קיצור הדרך"

3233

34+#: qml/Components/DelayedLockscreen.qml:47

35+msgid "Device Locked"

36+msgstr ""

37+

38+#: qml/Components/DelayedLockscreen.qml:62

39+msgid "You have been locked out due to too many failed passphrase attempts."

40+msgstr ""

41+

42+#: qml/Components/DelayedLockscreen.qml:63

43+msgid "You have been locked out due to too many failed passcode attempts."

44+msgstr ""

45+

46+#: qml/Components/DelayedLockscreen.qml:72

47+#, qt-format

48+msgid "Please wait %1 minute and then try again…"

49+msgid_plural "Please wait %1 minutes and then try again…"

50+msgstr[0] ""

51+msgstr[1] ""

52+

3353#: qml/Components/Dialogs.qml:70

3454msgid "Log out"

3555msgstr ""

@@ -134,14 +154,6 @@ msgstr ""

134154"ברגעים אלו סיימת את התמחותך בשימוש במחוות קצה והטלפון פתוח לשימושך<br><br>נא "

135155"לגעת במסך כדי להתחיל"

136156

137−#: qml/Components/Lockscreen.qml:167

138−msgid "Please wait"

139−msgstr "נא להמתין"

140−

141−#: qml/Components/Lockscreen.qml:172

142−msgid "Too many incorrect attempts"

143−msgstr "יותר מדי ניסיונות שגויים"

144−

145157#: qml/Components/Lockscreen.qml:206

146158msgid "Emergency Call"

147159msgstr "שיחת חירום"

@@ -150,15 +162,6 @@ msgstr "שיחת חירום"

150162msgid "OK"

151163msgstr "אישור"

152164

153−#: qml/Components/PassphraseLockscreen.qml:61

154−#, qt-format

155−msgid "Hello %1"

156−msgstr "שלום %1"

157−

158−#: qml/Components/PassphraseLockscreen.qml:61

159−msgid "Hello"

160−msgstr "שלום"

161−

162165#: qml/Dash/GenericScopeView.qml:411 qml/Dash/GenericScopeView.qml:533

163166msgid "See less"

164167msgstr "לראות פחות"

@@ -225,8 +228,8 @@ msgid "All"

225228msgstr "הכול"

226229

227230#: qml/Greeter/Greeter.qml:157

228−msgid "Swipe to unlock"

229−msgstr "יש להחליק לפתיחה"

231+msgid "Unlock"

232+msgstr ""

230233

231234#: qml/Hud/HudParametrizedActionsPage.qml:139

232235msgid "Confirm"

@@ -304,25 +307,29 @@ msgstr ""

304307msgid "Roaming"

305308msgstr "נדידה"

306309

307−#: qml/Shell.qml:320

308−msgid "Enter your passphrase"

309−msgstr "נא להזין את מילת הצופן שלך"

310+#: qml/Shell.qml:340

311+msgid "Enter passphrase"

312+msgstr ""

310313

311314#: qml/Shell.qml:321

312315msgid "Sorry, incorrect passphrase"

313316msgstr "מילת הצופן שגויה, עמך הסליחה."

314317

315−#: qml/Shell.qml:323

316−msgid "Enter your passcode"

318+#: qml/Shell.qml:342

319+msgid "Please re-enter"

320+msgstr ""

321+

322+#: qml/Shell.qml:344

323+msgid "Enter passcode"

317324msgstr ""

318325

319326#: qml/Shell.qml:324

320327msgid "Sorry, incorrect passcode"

321328msgstr ""

322329

323−#: qml/Shell.qml:327

330+#: qml/Shell.qml:348

324331#, qt-format

325−msgid "Enter your %1"

332+msgid "Enter %1"

326333msgstr ""

327334

328335#: qml/Shell.qml:328

@@ -353,3 +360,22 @@ msgid ""

353360"If passcode is entered incorrectly, your phone will conduct a factory reset "

354361"and all personal data will be deleted."

355362msgstr ""

363+

364+#, qt-format

365+#~ msgid "Hello %1"

366+#~ msgstr "שלום %1"

367+

368+#~ msgid "Hello"

369+#~ msgstr "שלום"

370+

371+#~ msgid "Swipe to unlock"

372+#~ msgstr "יש להחליק לפתיחה"

373+

374+#~ msgid "Please wait"

375+#~ msgstr "נא להמתין"

376+

377+#~ msgid "Enter your passphrase"

378+#~ msgstr "נא להזין את מילת הצופן שלך"

379+

380+#~ msgid "Too many incorrect attempts"

381+#~ msgstr "יותר מדי ניסיונות שגויים"

po/hi.po+36−26

@@ -7,14 +7,15 @@ msgid ""

77msgstr ""

88"Project-Id-Version: unity8\n"

99"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10−"POT-Creation-Date: 2014-09-24 10:43+0100\n"

10+"POT-Creation-Date: 2014-10-02 10:35+0200\n"

1111"PO-Revision-Date: 2014-01-15 01:49+0000\n"

1212"Last-Translator: Siddhanathan S. <Unknown>\n"

1313"Language-Team: Hindi <hi@li.org>\n"

1414"MIME-Version: 1.0\n"

1515"Content-Type: text/plain; charset=UTF-8\n"

1616"Content-Transfer-Encoding: 8bit\n"

17−"X-Launchpad-Export-Date: 2014-09-29 05:19+0000\n"

17+"Plural-Forms: nplurals=2; plural=n != 1;\n"

18+"X-Launchpad-Export-Date: 2014-10-03 06:21+0000\n"

1819"X-Generator: Launchpad (build 17196)\n"

1920

2021#: plugins/LightDM/Greeter.cpp:130

@@ -30,6 +31,25 @@ msgstr ""

3031msgid "Unpin shortcut"

3132msgstr ""

3233

34+#: qml/Components/DelayedLockscreen.qml:47

35+msgid "Device Locked"

36+msgstr ""

37+

38+#: qml/Components/DelayedLockscreen.qml:62

39+msgid "You have been locked out due to too many failed passphrase attempts."

40+msgstr ""

41+

42+#: qml/Components/DelayedLockscreen.qml:63

43+msgid "You have been locked out due to too many failed passcode attempts."

44+msgstr ""

45+

46+#: qml/Components/DelayedLockscreen.qml:72

47+#, qt-format

48+msgid "Please wait %1 minute and then try again…"

49+msgid_plural "Please wait %1 minutes and then try again…"

50+msgstr[0] ""

51+msgstr[1] ""

52+

3353#: qml/Components/Dialogs.qml:70

3454msgid "Log out"

3555msgstr ""

@@ -132,14 +152,6 @@ msgid ""

132152"phone<br><br>Tap on the screen to start"

133153msgstr ""

134154

135−#: qml/Components/Lockscreen.qml:167

136−msgid "Please wait"

137−msgstr ""

138−

139−#: qml/Components/Lockscreen.qml:172

140−msgid "Too many incorrect attempts"

141−msgstr ""

142−

143155#: qml/Components/Lockscreen.qml:206

144156msgid "Emergency Call"

145157msgstr "आपातकालीन कॉल"

@@ -148,15 +160,6 @@ msgstr "आपातकालीन कॉल"

148160msgid "OK"

149161msgstr ""

150162

151−#: qml/Components/PassphraseLockscreen.qml:61

152−#, qt-format

153−msgid "Hello %1"

154−msgstr ""

155−

156−#: qml/Components/PassphraseLockscreen.qml:61

157−msgid "Hello"

158−msgstr "नमस्ते"

159−

160163#: qml/Dash/GenericScopeView.qml:411 qml/Dash/GenericScopeView.qml:533

161164msgid "See less"

162165msgstr ""

@@ -223,7 +226,7 @@ msgid "All"

223226msgstr ""

224227

225228#: qml/Greeter/Greeter.qml:157

226−msgid "Swipe to unlock"

229+msgid "Unlock"

227230msgstr ""

228231

229232#: qml/Hud/HudParametrizedActionsPage.qml:139

@@ -302,25 +305,29 @@ msgstr ""

302305msgid "Roaming"

303306msgstr ""

304307

305−#: qml/Shell.qml:320

306−msgid "Enter your passphrase"

308+#: qml/Shell.qml:340

309+msgid "Enter passphrase"

307310msgstr ""

308311

309312#: qml/Shell.qml:321

310313msgid "Sorry, incorrect passphrase"

311314msgstr ""

312315

313−#: qml/Shell.qml:323

314−msgid "Enter your passcode"

316+#: qml/Shell.qml:342

317+msgid "Please re-enter"

318+msgstr ""

319+

320+#: qml/Shell.qml:344

321+msgid "Enter passcode"

315322msgstr ""

316323

317324#: qml/Shell.qml:324

318325msgid "Sorry, incorrect passcode"

319326msgstr ""

320327

321−#: qml/Shell.qml:327

328+#: qml/Shell.qml:348

322329#, qt-format

323−msgid "Enter your %1"

330+msgid "Enter %1"

324331msgstr ""

325332

326333#: qml/Shell.qml:328

@@ -351,3 +358,6 @@ msgid ""

351358"If passcode is entered incorrectly, your phone will conduct a factory reset "

352359"and all personal data will be deleted."

353360msgstr ""

361+

362+#~ msgid "Hello"

363+#~ msgstr "नमस्ते"

po/hr.po+34−26

@@ -7,14 +7,16 @@ msgid ""

77msgstr ""

88"Project-Id-Version: unity\n"

99"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10−"POT-Creation-Date: 2014-09-24 10:43+0100\n"

10+"POT-Creation-Date: 2014-10-02 10:35+0200\n"

1111"PO-Revision-Date: 2013-06-27 04:14+0000\n"

1212"Last-Translator: Michał Sawicz <michal.sawicz@canonical.com>\n"

1313"Language-Team: Croatian <hr@li.org>\n"

1414"MIME-Version: 1.0\n"

1515"Content-Type: text/plain; charset=UTF-8\n"

1616"Content-Transfer-Encoding: 8bit\n"

17−"X-Launchpad-Export-Date: 2014-09-29 05:20+0000\n"

17+"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && "

18+"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"

19+"X-Launchpad-Export-Date: 2014-10-03 06:22+0000\n"

1820"X-Generator: Launchpad (build 17196)\n"

1921

2022#: plugins/LightDM/Greeter.cpp:130

@@ -30,6 +32,25 @@ msgstr ""

3032msgid "Unpin shortcut"

3133msgstr ""

3234

35+#: qml/Components/DelayedLockscreen.qml:47

36+msgid "Device Locked"

37+msgstr ""

38+

39+#: qml/Components/DelayedLockscreen.qml:62

40+msgid "You have been locked out due to too many failed passphrase attempts."

41+msgstr ""

42+

43+#: qml/Components/DelayedLockscreen.qml:63

44+msgid "You have been locked out due to too many failed passcode attempts."

45+msgstr ""

46+

47+#: qml/Components/DelayedLockscreen.qml:72

48+#, qt-format

49+msgid "Please wait %1 minute and then try again…"

50+msgid_plural "Please wait %1 minutes and then try again…"

51+msgstr[0] ""

52+msgstr[1] ""

53+

3354#: qml/Components/Dialogs.qml:70

3455msgid "Log out"

3556msgstr ""

@@ -132,14 +153,6 @@ msgid ""

132153"phone<br><br>Tap on the screen to start"

133154msgstr ""

134155

135−#: qml/Components/Lockscreen.qml:167

136−msgid "Please wait"

137−msgstr ""

138−

139−#: qml/Components/Lockscreen.qml:172

140−msgid "Too many incorrect attempts"

141−msgstr ""

142−

143156#: qml/Components/Lockscreen.qml:206

144157msgid "Emergency Call"

145158msgstr ""

@@ -148,15 +161,6 @@ msgstr ""

148161msgid "OK"

149162msgstr ""

150163

151−#: qml/Components/PassphraseLockscreen.qml:61

152−#, qt-format

153−msgid "Hello %1"

154−msgstr ""

155−

156−#: qml/Components/PassphraseLockscreen.qml:61

157−msgid "Hello"

158−msgstr ""

159−

160164#: qml/Dash/GenericScopeView.qml:411 qml/Dash/GenericScopeView.qml:533

161165msgid "See less"

162166msgstr ""

@@ -223,7 +227,7 @@ msgid "All"

223227msgstr ""

224228

225229#: qml/Greeter/Greeter.qml:157

226−msgid "Swipe to unlock"

230+msgid "Unlock"

227231msgstr ""

228232

229233#: qml/Hud/HudParametrizedActionsPage.qml:139

@@ -302,25 +306,29 @@ msgstr ""

302306msgid "Roaming"

303307msgstr ""

304308

305−#: qml/Shell.qml:320

306−msgid "Enter your passphrase"

309+#: qml/Shell.qml:340

310+msgid "Enter passphrase"

307311msgstr ""

308312

309313#: qml/Shell.qml:321

310314msgid "Sorry, incorrect passphrase"

311315msgstr ""

312316

313−#: qml/Shell.qml:323

314−msgid "Enter your passcode"

317+#: qml/Shell.qml:342

318+msgid "Please re-enter"

319+msgstr ""

320+

321+#: qml/Shell.qml:344

322+msgid "Enter passcode"

315323msgstr ""

316324

317325#: qml/Shell.qml:324

318326msgid "Sorry, incorrect passcode"

319327msgstr ""

320328

321−#: qml/Shell.qml:327

329+#: qml/Shell.qml:348

322330#, qt-format

323−msgid "Enter your %1"

331+msgid "Enter %1"

324332msgstr ""

325333

326334#: qml/Shell.qml:328

po/hu.po+63−33

@@ -7,14 +7,15 @@ msgid ""

77msgstr ""

88"Project-Id-Version: unity\n"

99"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10−"POT-Creation-Date: 2014-09-24 10:43+0100\n"

11−"PO-Revision-Date: 2014-09-28 09:02+0000\n"

10+"POT-Creation-Date: 2014-10-02 10:35+0200\n"

11+"PO-Revision-Date: 2014-10-03 10:57+0000\n"

1212"Last-Translator: Richard Somlói <ricsipontaz@gmail.com>\n"

1313"Language-Team: Hungarian <hu@li.org>\n"

1414"MIME-Version: 1.0\n"

1515"Content-Type: text/plain; charset=UTF-8\n"

1616"Content-Transfer-Encoding: 8bit\n"

17−"X-Launchpad-Export-Date: 2014-09-29 05:19+0000\n"

17+"Plural-Forms: nplurals=2; plural=n != 1;\n"

18+"X-Launchpad-Export-Date: 2014-10-04 06:28+0000\n"

1819"X-Generator: Launchpad (build 17196)\n"

1920

2021#: plugins/LightDM/Greeter.cpp:130

@@ -30,6 +31,25 @@ msgstr "Indító rögzítése"

3031msgid "Unpin shortcut"

3132msgstr "Indító feloldása"

3233

34+#: qml/Components/DelayedLockscreen.qml:47

35+msgid "Device Locked"

36+msgstr "Eszköz lezárva"

37+

38+#: qml/Components/DelayedLockscreen.qml:62

39+msgid "You have been locked out due to too many failed passphrase attempts."

40+msgstr "A túl sok hibás jelmondat próbálkozás miatt le lett zárva az eszköz."

41+

42+#: qml/Components/DelayedLockscreen.qml:63

43+msgid "You have been locked out due to too many failed passcode attempts."

44+msgstr "A túl sok hibás jelkód próbálkozás miatt le lett zárva az eszköz."

45+

46+#: qml/Components/DelayedLockscreen.qml:72

47+#, qt-format

48+msgid "Please wait %1 minute and then try again…"

49+msgid_plural "Please wait %1 minutes and then try again…"

50+msgstr[0] "Kérjük várjon %1 percet és próbálja újra…"

51+msgstr[1] "Kérjük várjon %1 percet és próbálja újra…"

52+

3353#: qml/Components/Dialogs.qml:70

3454msgid "Log out"

3555msgstr "Kijelentkezés"

@@ -138,14 +158,6 @@ msgstr ""

138158"Elsajátította a gesztusokat, és megkezdheti a telefon "

139159"használatát.<br><br>Koppintson a képernyőre a kezdéshez."

140160

141−#: qml/Components/Lockscreen.qml:167

142−msgid "Please wait"

143−msgstr "Kérem várjon"

144−

145−#: qml/Components/Lockscreen.qml:172

146−msgid "Too many incorrect attempts"

147−msgstr "Túl sok sikertelen kísérlet"

148−

149161#: qml/Components/Lockscreen.qml:206

150162msgid "Emergency Call"

151163msgstr "Vészhívás"

@@ -154,15 +166,6 @@ msgstr "Vészhívás"

154166msgid "OK"

155167msgstr "Ok"

156168

157−#: qml/Components/PassphraseLockscreen.qml:61

158−#, qt-format

159−msgid "Hello %1"

160−msgstr "Üdv %1"

161−

162−#: qml/Components/PassphraseLockscreen.qml:61

163−msgid "Hello"

164−msgstr "Üdvözöljük"

165−

166169#: qml/Dash/GenericScopeView.qml:411 qml/Dash/GenericScopeView.qml:533

167170msgid "See less"

168171msgstr "Kevesebb"

@@ -229,8 +232,8 @@ msgid "All"

229232msgstr "Összes"

230233

231234#: qml/Greeter/Greeter.qml:157

232−msgid "Swipe to unlock"

233−msgstr "Csúsztasson a feloldáshoz"

235+msgid "Unlock"

236+msgstr "Feloldás"

234237

235238#: qml/Hud/HudParametrizedActionsPage.qml:139

236239msgid "Confirm"

@@ -308,26 +311,30 @@ msgstr "SIM feloldása"

308311msgid "Roaming"

309312msgstr "Barangolás"

310313

311−#: qml/Shell.qml:320

312−msgid "Enter your passphrase"

313−msgstr "Adja meg a jelmondatot"

314+#: qml/Shell.qml:340

315+msgid "Enter passphrase"

316+msgstr "Jelmondat megadása"

314317

315318#: qml/Shell.qml:321

316319msgid "Sorry, incorrect passphrase"

317320msgstr "Sajnáljuk, helytelen jelmondat"

318321

319−#: qml/Shell.qml:323

320−msgid "Enter your passcode"

321−msgstr "Adja meg a jelkódját"

322+#: qml/Shell.qml:342

323+msgid "Please re-enter"

324+msgstr "Kérjük adja meg újra"

325+

326+#: qml/Shell.qml:344

327+msgid "Enter passcode"

328+msgstr "Jelkód megadása"

322329

323330#: qml/Shell.qml:324

324331msgid "Sorry, incorrect passcode"

325332msgstr "Sajnáljuk, helytelen jelkód"

326333

327−#: qml/Shell.qml:327

334+#: qml/Shell.qml:348

328335#, qt-format

329−msgid "Enter your %1"

330−msgstr "Kérjük adja meg: %1"

336+msgid "Enter %1"

337+msgstr "Adja meg: %1"

331338

332339#: qml/Shell.qml:328

333340#, qt-format

@@ -362,5 +369,28 @@ msgstr ""

362369"Ha helytelen jelkódot ad meg, a telefonja visszaállítja a gyári "

363370"beállításokat és törli minden személyes adatát."

364371

365−#~ msgid "Manage Dash"

366−#~ msgstr "Dash kezelése"

372+#, qt-format

373+#~ msgid "Hello %1"

374+#~ msgstr "Üdv %1"

375+

376+#~ msgid "Swipe to unlock"

377+#~ msgstr "Csúsztasson a feloldáshoz"

378+

379+#~ msgid "Hello"

380+#~ msgstr "Üdvözöljük"

381+

382+#~ msgid "Please wait"

383+#~ msgstr "Kérem várjon"

384+

385+#~ msgid "Too many incorrect attempts"

386+#~ msgstr "Túl sok sikertelen kísérlet"

387+

388+#~ msgid "Enter your passphrase"

389+#~ msgstr "Adja meg a jelmondatot"

390+

391+#, qt-format

392+#~ msgid "Enter your %1"

393+#~ msgstr "Kérjük adja meg: %1"

394+

395+#~ msgid "Enter your passcode"

396+#~ msgstr "Adja meg a jelkódját"

po/hy.po+33−26

@@ -7,14 +7,15 @@ msgid ""

77msgstr ""

88"Project-Id-Version: unity\n"

99"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10−"POT-Creation-Date: 2014-09-24 10:43+0100\n"

10+"POT-Creation-Date: 2014-10-02 10:35+0200\n"

1111"PO-Revision-Date: 2013-06-27 04:43+0000\n"

1212"Last-Translator: iAbaS <sosabazyan@yandex.ru>\n"

1313"Language-Team: Armenian <hy@li.org>\n"

1414"MIME-Version: 1.0\n"

1515"Content-Type: text/plain; charset=UTF-8\n"

1616"Content-Transfer-Encoding: 8bit\n"

17−"X-Launchpad-Export-Date: 2014-09-29 05:19+0000\n"

17+"Plural-Forms: nplurals=1; plural=0;\n"

18+"X-Launchpad-Export-Date: 2014-10-03 06:21+0000\n"

1819"X-Generator: Launchpad (build 17196)\n"

1920

2021#: plugins/LightDM/Greeter.cpp:130

@@ -30,6 +31,25 @@ msgstr ""

3031msgid "Unpin shortcut"

3132msgstr ""

3233

34+#: qml/Components/DelayedLockscreen.qml:47

35+msgid "Device Locked"

36+msgstr ""

37+

38+#: qml/Components/DelayedLockscreen.qml:62

39+msgid "You have been locked out due to too many failed passphrase attempts."

40+msgstr ""

41+

42+#: qml/Components/DelayedLockscreen.qml:63

43+msgid "You have been locked out due to too many failed passcode attempts."

44+msgstr ""

45+

46+#: qml/Components/DelayedLockscreen.qml:72

47+#, qt-format

48+msgid "Please wait %1 minute and then try again…"

49+msgid_plural "Please wait %1 minutes and then try again…"

50+msgstr[0] ""

51+msgstr[1] ""

52+

3353#: qml/Components/Dialogs.qml:70

3454msgid "Log out"

3555msgstr ""

@@ -132,14 +152,6 @@ msgid ""

132152"phone<br><br>Tap on the screen to start"

133153msgstr ""

134154

135−#: qml/Components/Lockscreen.qml:167

136−msgid "Please wait"

137−msgstr ""

138−

139−#: qml/Components/Lockscreen.qml:172

140−msgid "Too many incorrect attempts"

141−msgstr ""

142−

143155#: qml/Components/Lockscreen.qml:206

144156msgid "Emergency Call"

145157msgstr ""

@@ -148,15 +160,6 @@ msgstr ""

148160msgid "OK"

149161msgstr ""

150162

151−#: qml/Components/PassphraseLockscreen.qml:61

152−#, qt-format

153−msgid "Hello %1"

154−msgstr ""

155−

156−#: qml/Components/PassphraseLockscreen.qml:61

157−msgid "Hello"

158−msgstr ""

159−

160163#: qml/Dash/GenericScopeView.qml:411 qml/Dash/GenericScopeView.qml:533

161164msgid "See less"

162165msgstr ""

@@ -223,7 +226,7 @@ msgid "All"

223226msgstr ""

224227

225228#: qml/Greeter/Greeter.qml:157

226−msgid "Swipe to unlock"

229+msgid "Unlock"

227230msgstr ""

228231

229232#: qml/Hud/HudParametrizedActionsPage.qml:139

@@ -302,25 +305,29 @@ msgstr ""

302305msgid "Roaming"

303306msgstr ""

304307

305−#: qml/Shell.qml:320

306−msgid "Enter your passphrase"

308+#: qml/Shell.qml:340

309+msgid "Enter passphrase"

307310msgstr ""

308311

309312#: qml/Shell.qml:321

310313msgid "Sorry, incorrect passphrase"

311314msgstr ""

312315

313−#: qml/Shell.qml:323

314−msgid "Enter your passcode"

316+#: qml/Shell.qml:342

317+msgid "Please re-enter"

318+msgstr ""

319+

320+#: qml/Shell.qml:344

321+msgid "Enter passcode"

315322msgstr ""

316323

317324#: qml/Shell.qml:324

318325msgid "Sorry, incorrect passcode"

319326msgstr ""

320327

321−#: qml/Shell.qml:327

328+#: qml/Shell.qml:348

322329#, qt-format

323−msgid "Enter your %1"

330+msgid "Enter %1"

324331msgstr ""

325332

326333#: qml/Shell.qml:328

po/id.po+33−26

@@ -7,14 +7,15 @@ msgid ""

77msgstr ""

88"Project-Id-Version: unity\n"

99"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10−"POT-Creation-Date: 2014-09-24 10:43+0100\n"

10+"POT-Creation-Date: 2014-10-02 10:35+0200\n"

1111"PO-Revision-Date: 2013-06-26 22:35+0000\n"

1212"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"

1313"Language-Team: Indonesian <id@li.org>\n"

1414"MIME-Version: 1.0\n"

1515"Content-Type: text/plain; charset=UTF-8\n"

1616"Content-Transfer-Encoding: 8bit\n"

17−"X-Launchpad-Export-Date: 2014-09-29 05:19+0000\n"

17+"Plural-Forms: nplurals=1; plural=0;\n"

18+"X-Launchpad-Export-Date: 2014-10-03 06:21+0000\n"

1819"X-Generator: Launchpad (build 17196)\n"

1920

2021#: plugins/LightDM/Greeter.cpp:130

@@ -30,6 +31,25 @@ msgstr ""

3031msgid "Unpin shortcut"

3132msgstr ""

3233

34+#: qml/Components/DelayedLockscreen.qml:47

35+msgid "Device Locked"

36+msgstr ""

37+

38+#: qml/Components/DelayedLockscreen.qml:62

39+msgid "You have been locked out due to too many failed passphrase attempts."

40+msgstr ""

41+

42+#: qml/Components/DelayedLockscreen.qml:63

43+msgid "You have been locked out due to too many failed passcode attempts."

44+msgstr ""

45+

46+#: qml/Components/DelayedLockscreen.qml:72

47+#, qt-format

48+msgid "Please wait %1 minute and then try again…"

49+msgid_plural "Please wait %1 minutes and then try again…"

50+msgstr[0] ""

51+msgstr[1] ""

52+

3353#: qml/Components/Dialogs.qml:70

3454msgid "Log out"

3555msgstr ""

@@ -132,14 +152,6 @@ msgid ""

132152"phone<br><br>Tap on the screen to start"

133153msgstr ""

134154

135−#: qml/Components/Lockscreen.qml:167

136−msgid "Please wait"

137−msgstr ""

138−

139−#: qml/Components/Lockscreen.qml:172

140−msgid "Too many incorrect attempts"

141−msgstr ""

142−

143155#: qml/Components/Lockscreen.qml:206

144156msgid "Emergency Call"

145157msgstr ""

@@ -148,15 +160,6 @@ msgstr ""

148160msgid "OK"

149161msgstr ""

150162

151−#: qml/Components/PassphraseLockscreen.qml:61

152−#, qt-format

153−msgid "Hello %1"

154−msgstr ""

155−

156−#: qml/Components/PassphraseLockscreen.qml:61

157−msgid "Hello"

158−msgstr ""

159−

160163#: qml/Dash/GenericScopeView.qml:411 qml/Dash/GenericScopeView.qml:533

161164msgid "See less"

162165msgstr ""

@@ -223,7 +226,7 @@ msgid "All"

223226msgstr ""

224227

225228#: qml/Greeter/Greeter.qml:157

226−msgid "Swipe to unlock"

229+msgid "Unlock"

227230msgstr ""

228231

229232#: qml/Hud/HudParametrizedActionsPage.qml:139

@@ -302,25 +305,29 @@ msgstr ""

302305msgid "Roaming"

303306msgstr ""

304307

305−#: qml/Shell.qml:320

306−msgid "Enter your passphrase"

308+#: qml/Shell.qml:340

309+msgid "Enter passphrase"

307310msgstr ""

308311

309312#: qml/Shell.qml:321

310313msgid "Sorry, incorrect passphrase"

311314msgstr ""

312315

313−#: qml/Shell.qml:323

314−msgid "Enter your passcode"

316+#: qml/Shell.qml:342

317+msgid "Please re-enter"

318+msgstr ""

319+

320+#: qml/Shell.qml:344

321+msgid "Enter passcode"

315322msgstr ""

316323

317324#: qml/Shell.qml:324

318325msgid "Sorry, incorrect passcode"

319326msgstr ""

320327

321−#: qml/Shell.qml:327

328+#: qml/Shell.qml:348

322329#, qt-format

323−msgid "Enter your %1"

330+msgid "Enter %1"

324331msgstr ""

325332

326333#: qml/Shell.qml:328

po/is.po+76−37

@@ -9,14 +9,15 @@ msgid ""

99msgstr ""

1010"Project-Id-Version: po_unity8-is\n"

1111"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

12−"POT-Creation-Date: 2014-09-24 10:43+0100\n"

13−"PO-Revision-Date: 2014-09-21 12:07+0000\n"

12+"POT-Creation-Date: 2014-10-02 10:35+0200\n"

13+"PO-Revision-Date: 2014-10-05 08:44+0000\n"

1414"Last-Translator: Sveinn í Felli <sv1@fellsnet.is>\n"

1515"Language-Team: Icelandic <translation-team-is@lists.sourceforge.net>\n"

1616"MIME-Version: 1.0\n"

1717"Content-Type: text/plain; charset=UTF-8\n"

1818"Content-Transfer-Encoding: 8bit\n"

19−"X-Launchpad-Export-Date: 2014-09-29 05:19+0000\n"

19+"Plural-Forms: nplurals=2; plural=n != 1;\n"

20+"X-Launchpad-Export-Date: 2014-10-06 07:00+0000\n"

2021"X-Generator: Launchpad (build 17196)\n"

2122"Language: is\n"

2223

@@ -33,13 +34,32 @@ msgstr "Pinna flýtilykil"

3334msgid "Unpin shortcut"

3435msgstr "Losa flýtilykil"

3536

37+#: qml/Components/DelayedLockscreen.qml:47

38+msgid "Device Locked"

39+msgstr ""

40+

41+#: qml/Components/DelayedLockscreen.qml:62

42+msgid "You have been locked out due to too many failed passphrase attempts."

43+msgstr ""

44+

45+#: qml/Components/DelayedLockscreen.qml:63

46+msgid "You have been locked out due to too many failed passcode attempts."

47+msgstr ""

48+

49+#: qml/Components/DelayedLockscreen.qml:72

50+#, qt-format

51+msgid "Please wait %1 minute and then try again…"

52+msgid_plural "Please wait %1 minutes and then try again…"

53+msgstr[0] ""

54+msgstr[1] ""

55+

3656#: qml/Components/Dialogs.qml:70

3757msgid "Log out"

3858msgstr "Útskráning"

3959

4060#: qml/Components/Dialogs.qml:71

4161msgid "Are you sure you want to log out?"

42−msgstr ""

62+msgstr "Ertu viss um að þú viljir skrá þig út?"

4363

4464#: qml/Components/Dialogs.qml:73 qml/Components/Dialogs.qml:97

4565#: qml/Components/Dialogs.qml:122

@@ -57,7 +77,7 @@ msgstr "Slökkva á tölvunni"

5777

5878#: qml/Components/Dialogs.qml:95

5979msgid "Are you sure you want to shut down?"

60−msgstr ""

80+msgstr "Ertu viss um að þú viljir slökkva á símanum?"

6181

6282#: qml/Components/Dialogs.qml:119

6383msgid "Reboot"

@@ -65,7 +85,7 @@ msgstr "Endurræsa"

6585

6686#: qml/Components/Dialogs.qml:120

6787msgid "Are you sure you want to reboot?"

68−msgstr ""

88+msgstr "Ertu viss að þú viljir enduræsa?"

6989

7090#: qml/Components/Dialogs.qml:144

7191msgid "Power"

@@ -76,6 +96,8 @@ msgid ""

7696"Are you sure you would like\n"

7797"to power off?"

7898msgstr ""

99+"Ertu viss um að þú viljir\n"

100+"slökkva á símanum?"

79101

80102#: qml/Components/Dialogs.qml:147

81103msgid "Power off"

@@ -138,14 +160,6 @@ msgstr ""

138160"Þú ert núna með æfingu í að nota skjáhreyfingar og getur því farið að nota "

139161"símann<br><br>Sláðu létt á skjáinn til að byrja"

140162

141−#: qml/Components/Lockscreen.qml:167

142−msgid "Please wait"

143−msgstr "Bíddu aðeins"

144−

145−#: qml/Components/Lockscreen.qml:172

146−msgid "Too many incorrect attempts"

147−msgstr ""

148−

149163#: qml/Components/Lockscreen.qml:206

150164msgid "Emergency Call"

151165msgstr "Neyðarsímtal"

@@ -154,15 +168,6 @@ msgstr "Neyðarsímtal"

154168msgid "OK"

155169msgstr "Í lagi"

156170

157−#: qml/Components/PassphraseLockscreen.qml:61

158−#, qt-format

159−msgid "Hello %1"

160−msgstr "Hæ %1"

161−

162−#: qml/Components/PassphraseLockscreen.qml:61

163−msgid "Hello"

164−msgstr "Hæ"

165−

166171#: qml/Dash/GenericScopeView.qml:411 qml/Dash/GenericScopeView.qml:533

167172msgid "See less"

168173msgstr "Sjá minna"

@@ -229,8 +234,8 @@ msgid "All"

229234msgstr "Allt"

230235

231236#: qml/Greeter/Greeter.qml:157

232−msgid "Swipe to unlock"

233−msgstr "Strjúka til að aflæsa"

237+msgid "Unlock"

238+msgstr ""

234239

235240#: qml/Hud/HudParametrizedActionsPage.qml:139

236241msgid "Confirm"

@@ -306,54 +311,88 @@ msgstr "Aflæsa SIM-korti"

306311

307312#: qml/Panel/Indicators/RoamingIndication.qml:27

308313msgid "Roaming"

309−msgstr ""

314+msgstr "Ráphamur"

310315

311−#: qml/Shell.qml:320

312−msgid "Enter your passphrase"

316+#: qml/Shell.qml:340

317+msgid "Enter passphrase"

313318msgstr ""

314319

315320#: qml/Shell.qml:321

316321msgid "Sorry, incorrect passphrase"

322+msgstr "Því miður, rangt lykilorð"

323+

324+#: qml/Shell.qml:342

325+msgid "Please re-enter"

317326msgstr ""

318327

319−#: qml/Shell.qml:323

320−msgid "Enter your passcode"

328+#: qml/Shell.qml:344

329+msgid "Enter passcode"

321330msgstr ""

322331

323332#: qml/Shell.qml:324

324333msgid "Sorry, incorrect passcode"

325−msgstr ""

334+msgstr "Því miður, rangur aðgangskóði"

326335

327−#: qml/Shell.qml:327

336+#: qml/Shell.qml:348

328337#, qt-format

329−msgid "Enter your %1"

338+msgid "Enter %1"

330339msgstr ""

331340

332341#: qml/Shell.qml:328

333342#, qt-format

334343msgid "Sorry, incorrect %1"

335−msgstr ""

344+msgstr "Því miður, rangt %1"

336345

337346#: qml/Shell.qml:363

338347msgid "Sorry, incorrect passphrase."

339−msgstr ""

348+msgstr "Því miður, rangt lykilorð."

340349

341350#: qml/Shell.qml:364

342351msgid "Sorry, incorrect passcode."

343−msgstr ""

352+msgstr "Því miður, rangur aðgangskóði."

344353

345354#: qml/Shell.qml:365

346355msgid "This will be your last attempt."

347−msgstr ""

356+msgstr "Þetta mun verða síðasta tilraunin þín."

348357

349358#: qml/Shell.qml:367

350359msgid ""

351360"If passphrase is entered incorrectly, your phone will conduct a factory "

352361"reset and all personal data will be deleted."

353362msgstr ""

363+"Ef lykilorð er rangt, mun síminn frumstilla allt á verksmiðjustillingar og "

364+"öllum einkagögnum verður eytt."

354365

355366#: qml/Shell.qml:368

356367msgid ""

357368"If passcode is entered incorrectly, your phone will conduct a factory reset "

358369"and all personal data will be deleted."

359370msgstr ""

371+"Ef aðgangskóði er rangur, mun síminn frumstilla allt á verksmiðjustillingar "

372+"og öllum einkagögnum verður eytt."

373+

374+#, qt-format

375+#~ msgid "Hello %1"

376+#~ msgstr "Hæ %1"

377+

378+#~ msgid "Hello"

379+#~ msgstr "Hæ"

380+

381+#~ msgid "Swipe to unlock"

382+#~ msgstr "Strjúka til að aflæsa"

383+

384+#~ msgid "Please wait"

385+#~ msgstr "Bíddu aðeins"

386+

387+#~ msgid "Too many incorrect attempts"

388+#~ msgstr "Of margar rangar tilraunir"

389+

390+#~ msgid "Enter your passphrase"

391+#~ msgstr "Sláðu inn lykilorðið þitt"

392+

393+#~ msgid "Enter your passcode"

394+#~ msgstr "Settu inn aðgangskóðann þinn"

395+

396+#, qt-format

397+#~ msgid "Enter your %1"

398+#~ msgstr "Settu inn %1"

po/it.po+63−30

@@ -7,14 +7,15 @@ msgid ""

77msgstr ""

88"Project-Id-Version: unity\n"

99"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10−"POT-Creation-Date: 2014-09-24 10:43+0100\n"

10+"POT-Creation-Date: 2014-10-02 10:35+0200\n"

1111"PO-Revision-Date: 2014-09-30 10:56+0000\n"

1212"Last-Translator: Claudio Arseni <claudio.arseni@gmail.com>\n"

1313"Language-Team: Italian <it@li.org>\n"

1414"MIME-Version: 1.0\n"

1515"Content-Type: text/plain; charset=UTF-8\n"

1616"Content-Transfer-Encoding: 8bit\n"

17−"X-Launchpad-Export-Date: 2014-10-02 06:37+0000\n"

17+"Plural-Forms: nplurals=2; plural=n != 1;\n"

18+"X-Launchpad-Export-Date: 2014-10-03 06:21+0000\n"

1819"X-Generator: Launchpad (build 17196)\n"

1920

2021#: plugins/LightDM/Greeter.cpp:130

@@ -30,6 +31,25 @@ msgstr "Blocca scorciatoia"

3031msgid "Unpin shortcut"

3132msgstr "Sblocca scorciatoia"

3233

34+#: qml/Components/DelayedLockscreen.qml:47

35+msgid "Device Locked"

36+msgstr ""

37+

38+#: qml/Components/DelayedLockscreen.qml:62

39+msgid "You have been locked out due to too many failed passphrase attempts."

40+msgstr ""

41+

42+#: qml/Components/DelayedLockscreen.qml:63

43+msgid "You have been locked out due to too many failed passcode attempts."

44+msgstr ""

45+

46+#: qml/Components/DelayedLockscreen.qml:72

47+#, qt-format

48+msgid "Please wait %1 minute and then try again…"

49+msgid_plural "Please wait %1 minutes and then try again…"

50+msgstr[0] ""

51+msgstr[1] ""

52+

3353#: qml/Components/Dialogs.qml:70

3454msgid "Log out"

3555msgstr "Termina sessione"

@@ -141,14 +161,6 @@ msgstr ""

141161"L'apprendimento dei gesti è stato completato. È ora possibile iniziare a "

142162"usare il telefono.<br><br>Toccare lo schermo per iniziare"

143163

144−#: qml/Components/Lockscreen.qml:167

145−msgid "Please wait"

146−msgstr "Attendere"

147−

148−#: qml/Components/Lockscreen.qml:172

149−msgid "Too many incorrect attempts"

150−msgstr "Troppi tentativi errati"

151−

152164#: qml/Components/Lockscreen.qml:206

153165msgid "Emergency Call"

154166msgstr "Chiamata di emergenza"

@@ -157,15 +169,6 @@ msgstr "Chiamata di emergenza"

157169msgid "OK"

158170msgstr "OK"

159171

160−#: qml/Components/PassphraseLockscreen.qml:61

161−#, qt-format

162−msgid "Hello %1"

163−msgstr "Ciao %1"

164−

165−#: qml/Components/PassphraseLockscreen.qml:61

166−msgid "Hello"

167−msgstr "Ciao"

168−

169172#: qml/Dash/GenericScopeView.qml:411 qml/Dash/GenericScopeView.qml:533

170173msgid "See less"

171174msgstr "Mostra meno"

@@ -232,8 +235,8 @@ msgid "All"

232235msgstr "Tutto"

233236

234237#: qml/Greeter/Greeter.qml:157

235−msgid "Swipe to unlock"

236−msgstr "Scorrere per sbloccare"

238+msgid "Unlock"

239+msgstr ""

237240

238241#: qml/Hud/HudParametrizedActionsPage.qml:139

239242msgid "Confirm"

@@ -311,26 +314,30 @@ msgstr "Sblocca SIM"

311314msgid "Roaming"

312315msgstr "Roaming"

313316

314−#: qml/Shell.qml:320

315−msgid "Enter your passphrase"

316−msgstr "Digitare la passphrase"

317+#: qml/Shell.qml:340

318+msgid "Enter passphrase"

319+msgstr ""

317320

318321#: qml/Shell.qml:321

319322msgid "Sorry, incorrect passphrase"

320323msgstr "Passphrase errata"

321324

322−#: qml/Shell.qml:323

323−msgid "Enter your passcode"

324−msgstr "Inserire il passcode"

325+#: qml/Shell.qml:342

326+msgid "Please re-enter"

327+msgstr ""

328+

329+#: qml/Shell.qml:344

330+msgid "Enter passcode"

331+msgstr ""

325332

326333#: qml/Shell.qml:324

327334msgid "Sorry, incorrect passcode"

328335msgstr "Passcode non corretto"

329336

330−#: qml/Shell.qml:327

337+#: qml/Shell.qml:348

331338#, qt-format

332−msgid "Enter your %1"

333−msgstr "Inserire %1"

339+msgid "Enter %1"

340+msgstr ""

334341

335342#: qml/Shell.qml:328

336343#, qt-format

@@ -365,5 +372,31 @@ msgstr ""

365372"Se verrà inserito una passcode errato, il telefono eseguirà un ripristino "

366373"delle impostazioni di fabbrica e tutti i dati personali verranno eliminati."

367374

375+#, qt-format

376+#~ msgid "Hello %1"

377+#~ msgstr "Ciao %1"

378+

379+#~ msgid "Hello"

380+#~ msgstr "Ciao"

381+

382+#~ msgid "Swipe to unlock"

383+#~ msgstr "Scorrere per sbloccare"

384+

368385#~ msgid "Manage Dash"

369386#~ msgstr "Gestione della Dash"

387+

388+#~ msgid "Please wait"

389+#~ msgstr "Attendere"

390+

391+#~ msgid "Too many incorrect attempts"

392+#~ msgstr "Troppi tentativi errati"

393+

394+#, qt-format

395+#~ msgid "Enter your %1"

396+#~ msgstr "Inserire %1"

397+

398+#~ msgid "Enter your passphrase"

399+#~ msgstr "Digitare la passphrase"

400+

401+#~ msgid "Enter your passcode"

402+#~ msgstr "Inserire il passcode"

po/ja.po+63−30

@@ -7,14 +7,15 @@ msgid ""

77msgstr ""

88"Project-Id-Version: unity\n"

99"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10−"POT-Creation-Date: 2014-09-24 10:43+0100\n"

10+"POT-Creation-Date: 2014-10-02 10:35+0200\n"

1111"PO-Revision-Date: 2014-09-18 09:47+0000\n"

1212"Last-Translator: Mitsuya Shibata <mty.shibata@gmail.com>\n"

1313"Language-Team: Japanese <ja@li.org>\n"

1414"MIME-Version: 1.0\n"

1515"Content-Type: text/plain; charset=UTF-8\n"

1616"Content-Transfer-Encoding: 8bit\n"

17−"X-Launchpad-Export-Date: 2014-09-29 05:19+0000\n"

17+"Plural-Forms: nplurals=1; plural=0;\n"

18+"X-Launchpad-Export-Date: 2014-10-03 06:21+0000\n"

1819"X-Generator: Launchpad (build 17196)\n"

1920

2021#: plugins/LightDM/Greeter.cpp:130

@@ -30,6 +31,25 @@ msgstr "ショートカットを追加する"

3031msgid "Unpin shortcut"

3132msgstr "ショートカットを削除する"

3233

34+#: qml/Components/DelayedLockscreen.qml:47

35+msgid "Device Locked"

36+msgstr ""

37+

38+#: qml/Components/DelayedLockscreen.qml:62

39+msgid "You have been locked out due to too many failed passphrase attempts."

40+msgstr ""

41+

42+#: qml/Components/DelayedLockscreen.qml:63

43+msgid "You have been locked out due to too many failed passcode attempts."

44+msgstr ""

45+

46+#: qml/Components/DelayedLockscreen.qml:72

47+#, qt-format

48+msgid "Please wait %1 minute and then try again…"

49+msgid_plural "Please wait %1 minutes and then try again…"

50+msgstr[0] ""

51+msgstr[1] ""

52+

3353#: qml/Components/Dialogs.qml:70

3454msgid "Log out"

3555msgstr "ログアウト"

@@ -133,14 +153,6 @@ msgid ""

133153msgstr ""

134154"これでスマートフォンの操作に必要な、画面端を用いたジェスチャーを習得できました。<br><br>利用を開始するなら画面をタップしてください"

135155

136−#: qml/Components/Lockscreen.qml:167

137−msgid "Please wait"

138−msgstr "お待ちください"

139−

140−#: qml/Components/Lockscreen.qml:172

141−msgid "Too many incorrect attempts"

142−msgstr "失敗回数が上限に達しました"

143−

144156#: qml/Components/Lockscreen.qml:206

145157msgid "Emergency Call"

146158msgstr "緊急通報"

@@ -149,15 +161,6 @@ msgstr "緊急通報"

149161msgid "OK"

150162msgstr "OK"

151163

152−#: qml/Components/PassphraseLockscreen.qml:61

153−#, qt-format

154−msgid "Hello %1"

155−msgstr "こんにちは %1 さん"

156−

157−#: qml/Components/PassphraseLockscreen.qml:61

158−msgid "Hello"

159−msgstr "こんにちは"

160−

161164#: qml/Dash/GenericScopeView.qml:411 qml/Dash/GenericScopeView.qml:533

162165msgid "See less"

163166msgstr "隠す"

@@ -224,8 +227,8 @@ msgid "All"

224227msgstr "すべて"

225228

226229#: qml/Greeter/Greeter.qml:157

227−msgid "Swipe to unlock"

228−msgstr "スワイプしてロック解除"

230+msgid "Unlock"

231+msgstr ""

229232

230233#: qml/Hud/HudParametrizedActionsPage.qml:139

231234msgid "Confirm"

@@ -303,26 +306,30 @@ msgstr "SIMのアンロック"

303306msgid "Roaming"

304307msgstr "ローミング"

305308

306−#: qml/Shell.qml:320

307−msgid "Enter your passphrase"

308−msgstr "パスフレーズの入力"

309+#: qml/Shell.qml:340

310+msgid "Enter passphrase"

311+msgstr ""

309312

310313#: qml/Shell.qml:321

311314msgid "Sorry, incorrect passphrase"

312315msgstr "パスフレーズが違います"

313316

314−#: qml/Shell.qml:323

315−msgid "Enter your passcode"

316−msgstr "パスコードの入力"

317+#: qml/Shell.qml:342

318+msgid "Please re-enter"

319+msgstr ""

320+

321+#: qml/Shell.qml:344

322+msgid "Enter passcode"

323+msgstr ""

317324

318325#: qml/Shell.qml:324

319326msgid "Sorry, incorrect passcode"

320327msgstr "パスコードが違います"

321328

322−#: qml/Shell.qml:327

329+#: qml/Shell.qml:348

323330#, qt-format

324−msgid "Enter your %1"

325−msgstr "%1を入力してください"

331+msgid "Enter %1"

332+msgstr ""

326333

327334#: qml/Shell.qml:328

328335#, qt-format

@@ -353,5 +360,31 @@ msgid ""

353360"and all personal data will be deleted."

354361msgstr "パスコードが間違っている場合、ファクトリーリセットを実施し、すべての個人データは削除されます。"

355362

363+#, qt-format

364+#~ msgid "Hello %1"

365+#~ msgstr "こんにちは %1 さん"

366+

367+#~ msgid "Hello"

368+#~ msgstr "こんにちは"

369+

370+#~ msgid "Swipe to unlock"

371+#~ msgstr "スワイプしてロック解除"

372+

373+#~ msgid "Too many incorrect attempts"

374+#~ msgstr "失敗回数が上限に達しました"

375+

376+#~ msgid "Please wait"

377+#~ msgstr "お待ちください"

378+

356379#~ msgid "Manage Dash"

357380#~ msgstr "Dashの管理"

381+

382+#, qt-format

383+#~ msgid "Enter your %1"

384+#~ msgstr "%1を入力してください"

385+

386+#~ msgid "Enter your passphrase"

387+#~ msgstr "パスフレーズの入力"

388+

389+#~ msgid "Enter your passcode"

390+#~ msgstr "パスコードの入力"

po/km.po+63−30

@@ -7,14 +7,15 @@ msgid ""

77msgstr ""

88"Project-Id-Version: unity8\n"

99"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10−"POT-Creation-Date: 2014-09-24 10:43+0100\n"

10+"POT-Creation-Date: 2014-10-02 10:35+0200\n"

1111"PO-Revision-Date: 2014-08-20 02:48+0000\n"

1212"Last-Translator: Sok Sophea <sksophea@gmail.com>\n"

1313"Language-Team: Khmer <km@li.org>\n"

1414"MIME-Version: 1.0\n"

1515"Content-Type: text/plain; charset=UTF-8\n"

1616"Content-Transfer-Encoding: 8bit\n"

17−"X-Launchpad-Export-Date: 2014-09-29 05:19+0000\n"

17+"Plural-Forms: nplurals=1; plural=0;\n"

18+"X-Launchpad-Export-Date: 2014-10-03 06:22+0000\n"

1819"X-Generator: Launchpad (build 17196)\n"

1920

2021#: plugins/LightDM/Greeter.cpp:130

@@ -30,6 +31,25 @@ msgstr "ភ្ជាប់​ផ្លូវកាត់"

3031msgid "Unpin shortcut"

3132msgstr "មិន​ភ្ជាប់ផ្លូវកាត់"

3233

34+#: qml/Components/DelayedLockscreen.qml:47

35+msgid "Device Locked"

36+msgstr ""

37+

38+#: qml/Components/DelayedLockscreen.qml:62

39+msgid "You have been locked out due to too many failed passphrase attempts."

40+msgstr ""

41+

42+#: qml/Components/DelayedLockscreen.qml:63

43+msgid "You have been locked out due to too many failed passcode attempts."

44+msgstr ""

45+

46+#: qml/Components/DelayedLockscreen.qml:72

47+#, qt-format

48+msgid "Please wait %1 minute and then try again…"

49+msgid_plural "Please wait %1 minutes and then try again…"

50+msgstr[0] ""

51+msgstr[1] ""

52+

3353#: qml/Components/Dialogs.qml:70

3454msgid "Log out"

3555msgstr "ចេញ"

@@ -138,14 +158,6 @@ msgstr ""

138158"ឥឡូវ​អ្នក​បាន​ពិនិត្យ​កាយវិការ​គែម​ "

139159"និង​អាច​ចាប់ផ្ដើម​ប្រើ​ទូរស័ព្ទ<br><br>ប៉ះ លើ​អេក្រង់​ដើម្បី​ចាប់ផ្ដើម"

140160

141−#: qml/Components/Lockscreen.qml:167

142−msgid "Please wait"

143−msgstr "សូមរង់ចាំ"

144−

145−#: qml/Components/Lockscreen.qml:172

146−msgid "Too many incorrect attempts"

147−msgstr "បាន​ព្យាយាម​ខុស​ច្រើន​ដង​ពេក"

148−

149161#: qml/Components/Lockscreen.qml:206

150162msgid "Emergency Call"

151163msgstr "ការ​ហៅ​ពេល​អាសន្ន"

@@ -154,15 +166,6 @@ msgstr "ការ​ហៅ​ពេល​អាសន្ន"

154166msgid "OK"

155167msgstr "យល់ព្រម"

156168

157−#: qml/Components/PassphraseLockscreen.qml:61

158−#, qt-format

159−msgid "Hello %1"

160−msgstr "សួស្ដី %1"

161−

162−#: qml/Components/PassphraseLockscreen.qml:61

163−msgid "Hello"

164−msgstr "សួស្តី"

165−

166169#: qml/Dash/GenericScopeView.qml:411 qml/Dash/GenericScopeView.qml:533

167170msgid "See less"

168171msgstr "មើល​តិច​ជាង"

@@ -229,8 +232,8 @@ msgid "All"

229232msgstr "ទាំងអស់"

230233

231234#: qml/Greeter/Greeter.qml:157

232−msgid "Swipe to unlock"

233−msgstr "អូស​ដើម្បី​ដោះសោ"

235+msgid "Unlock"

236+msgstr ""

234237

235238#: qml/Hud/HudParametrizedActionsPage.qml:139

236239msgid "Confirm"

@@ -308,26 +311,30 @@ msgstr "ដោះ​សោ​ស៊ីម"

308311msgid "Roaming"

309312msgstr "រ៉ូមីង"

310313

311−#: qml/Shell.qml:320

312−msgid "Enter your passphrase"

313−msgstr "បញ្ចូល​ឃ្លា​សម្ងាត់​របស់​អ្នក"

314+#: qml/Shell.qml:340

315+msgid "Enter passphrase"

316+msgstr ""

314317

315318#: qml/Shell.qml:321

316319msgid "Sorry, incorrect passphrase"

317320msgstr "សូមទោស! ឃ្លា​សម្ងាត់​មិន​ត្រឹមត្រូវ"

318321

319−#: qml/Shell.qml:323

320−msgid "Enter your passcode"

321−msgstr "បញ្ចូល​កូដ​សម្ងាត់​របស់​អ្នក"

322+#: qml/Shell.qml:342

323+msgid "Please re-enter"

324+msgstr ""

325+

326+#: qml/Shell.qml:344

327+msgid "Enter passcode"

328+msgstr ""

322329

323330#: qml/Shell.qml:324

324331msgid "Sorry, incorrect passcode"

325332msgstr "សូមទោស! កូដ​សម្ងាត់​មិន​ត្រឹមត្រូវ"

326333

327−#: qml/Shell.qml:327

334+#: qml/Shell.qml:348

328335#, qt-format

329−msgid "Enter your %1"

330−msgstr "បញ្ចូល %1 របស់​អ្នក"

336+msgid "Enter %1"

337+msgstr ""

331338

332339#: qml/Shell.qml:328

333340#, qt-format

@@ -364,5 +371,31 @@ msgstr ""

364371"ទូរស័ព្ទ​របស់​អ្នក​នឹង​កំណត់​ទៅ​ទិន្នន័យ​ពី​រោងចក្រ​វិញ "

365372"ហើយ​ទិន្នន័យ​ផ្ទាល់ខ្លួន​ទាំងអស់​របស់​អ្នក​នឹង​ត្រូវ​បាន​លុប។"

366373

374+#, qt-format

375+#~ msgid "Hello %1"

376+#~ msgstr "សួស្ដី %1"

377+

378+#~ msgid "Hello"

379+#~ msgstr "សួស្តី"

380+

381+#~ msgid "Swipe to unlock"

382+#~ msgstr "អូស​ដើម្បី​ដោះសោ"

383+

367384#~ msgid "Manage Dash"

368385#~ msgstr "គ្រប់គ្រង​ផ្ទាំង"

386+

387+#~ msgid "Please wait"

388+#~ msgstr "សូមរង់ចាំ"

389+

390+#~ msgid "Too many incorrect attempts"

391+#~ msgstr "បាន​ព្យាយាម​ខុស​ច្រើន​ដង​ពេក"

392+

393+#, qt-format

394+#~ msgid "Enter your %1"

395+#~ msgstr "បញ្ចូល %1 របស់​អ្នក"

396+

397+#~ msgid "Enter your passphrase"

398+#~ msgstr "បញ្ចូល​ឃ្លា​សម្ងាត់​របស់​អ្នក"

399+

400+#~ msgid "Enter your passcode"

401+#~ msgstr "បញ្ចូល​កូដ​សម្ងាត់​របស់​អ្នក"

po/kn.po+33−26

@@ -7,14 +7,15 @@ msgid ""

77msgstr ""

88"Project-Id-Version: unity\n"

99"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10−"POT-Creation-Date: 2014-09-24 10:43+0100\n"

10+"POT-Creation-Date: 2014-10-02 10:35+0200\n"

1111"PO-Revision-Date: 2013-06-27 05:43+0000\n"

1212"Last-Translator: Michał Sawicz <michal.sawicz@canonical.com>\n"

1313"Language-Team: Kannada <kn@li.org>\n"

1414"MIME-Version: 1.0\n"

1515"Content-Type: text/plain; charset=UTF-8\n"

1616"Content-Transfer-Encoding: 8bit\n"

17−"X-Launchpad-Export-Date: 2014-09-29 05:19+0000\n"

17+"Plural-Forms: nplurals=2; plural=n != 1;\n"

18+"X-Launchpad-Export-Date: 2014-10-03 06:21+0000\n"

1819"X-Generator: Launchpad (build 17196)\n"

1920

2021#: plugins/LightDM/Greeter.cpp:130

@@ -30,6 +31,25 @@ msgstr ""

3031msgid "Unpin shortcut"

3132msgstr ""

3233

34+#: qml/Components/DelayedLockscreen.qml:47

35+msgid "Device Locked"

36+msgstr ""

37+

38+#: qml/Components/DelayedLockscreen.qml:62

39+msgid "You have been locked out due to too many failed passphrase attempts."

40+msgstr ""

41+

42+#: qml/Components/DelayedLockscreen.qml:63

43+msgid "You have been locked out due to too many failed passcode attempts."

44+msgstr ""

45+

46+#: qml/Components/DelayedLockscreen.qml:72

47+#, qt-format

48+msgid "Please wait %1 minute and then try again…"

49+msgid_plural "Please wait %1 minutes and then try again…"

50+msgstr[0] ""

51+msgstr[1] ""

52+

3353#: qml/Components/Dialogs.qml:70

3454msgid "Log out"

3555msgstr ""

@@ -132,14 +152,6 @@ msgid ""

132152"phone<br><br>Tap on the screen to start"

133153msgstr ""

134154

135−#: qml/Components/Lockscreen.qml:167

136−msgid "Please wait"

137−msgstr ""

138−

139−#: qml/Components/Lockscreen.qml:172

140−msgid "Too many incorrect attempts"

141−msgstr ""

142−

143155#: qml/Components/Lockscreen.qml:206

144156msgid "Emergency Call"

145157msgstr ""

@@ -148,15 +160,6 @@ msgstr ""

148160msgid "OK"

149161msgstr ""

150162

151−#: qml/Components/PassphraseLockscreen.qml:61

152−#, qt-format

153−msgid "Hello %1"

154−msgstr ""

155−

156−#: qml/Components/PassphraseLockscreen.qml:61

157−msgid "Hello"

158−msgstr ""

159−

160163#: qml/Dash/GenericScopeView.qml:411 qml/Dash/GenericScopeView.qml:533

161164msgid "See less"

162165msgstr ""

@@ -223,7 +226,7 @@ msgid "All"

223226msgstr ""

224227

225228#: qml/Greeter/Greeter.qml:157

226−msgid "Swipe to unlock"

229+msgid "Unlock"

227230msgstr ""

228231

229232#: qml/Hud/HudParametrizedActionsPage.qml:139

@@ -302,25 +305,29 @@ msgstr ""

302305msgid "Roaming"

303306msgstr ""

304307

305−#: qml/Shell.qml:320

306−msgid "Enter your passphrase"

308+#: qml/Shell.qml:340

309+msgid "Enter passphrase"

307310msgstr ""

308311

309312#: qml/Shell.qml:321

310313msgid "Sorry, incorrect passphrase"

311314msgstr ""

312315

313−#: qml/Shell.qml:323

314−msgid "Enter your passcode"

316+#: qml/Shell.qml:342

317+msgid "Please re-enter"

318+msgstr ""

319+

320+#: qml/Shell.qml:344

321+msgid "Enter passcode"

315322msgstr ""

316323

317324#: qml/Shell.qml:324

318325msgid "Sorry, incorrect passcode"

319326msgstr ""

320327

321−#: qml/Shell.qml:327

328+#: qml/Shell.qml:348

322329#, qt-format

323−msgid "Enter your %1"

330+msgid "Enter %1"

324331msgstr ""

325332

326333#: qml/Shell.qml:328

po/ko.po+63−30

@@ -7,14 +7,15 @@ msgid ""

77msgstr ""

88"Project-Id-Version: unity\n"

99"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10−"POT-Creation-Date: 2014-09-24 10:43+0100\n"

10+"POT-Creation-Date: 2014-10-02 10:35+0200\n"

1111"PO-Revision-Date: 2014-08-19 13:02+0000\n"

1212"Last-Translator: MinSik CHO <Unknown>\n"

1313"Language-Team: Korean <ko@li.org>\n"

1414"MIME-Version: 1.0\n"

1515"Content-Type: text/plain; charset=UTF-8\n"

1616"Content-Transfer-Encoding: 8bit\n"

17−"X-Launchpad-Export-Date: 2014-09-29 05:19+0000\n"

17+"Plural-Forms: nplurals=1; plural=0;\n"

18+"X-Launchpad-Export-Date: 2014-10-03 06:22+0000\n"

1819"X-Generator: Launchpad (build 17196)\n"

1920

2021#: plugins/LightDM/Greeter.cpp:130

@@ -30,6 +31,25 @@ msgstr "바로 가기를 고정"

3031msgid "Unpin shortcut"

3132msgstr "바로 가기를 고정 해제"

3233

34+#: qml/Components/DelayedLockscreen.qml:47

35+msgid "Device Locked"

36+msgstr ""

37+

38+#: qml/Components/DelayedLockscreen.qml:62

39+msgid "You have been locked out due to too many failed passphrase attempts."

40+msgstr ""

41+

42+#: qml/Components/DelayedLockscreen.qml:63

43+msgid "You have been locked out due to too many failed passcode attempts."

44+msgstr ""

45+

46+#: qml/Components/DelayedLockscreen.qml:72

47+#, qt-format

48+msgid "Please wait %1 minute and then try again…"

49+msgid_plural "Please wait %1 minutes and then try again…"

50+msgstr[0] ""

51+msgstr[1] ""

52+

3353#: qml/Components/Dialogs.qml:70

3454msgid "Log out"

3555msgstr "로그아웃"

@@ -133,14 +153,6 @@ msgid ""

133153msgstr ""

134154"여러분은 가장자리에서 끌어오기 제스쳐를 완벽히 익히셨고 휴대 전화를 사용할 수 있습니다. <br><br> 스크린을 터치해서 시작하세요."

135155

136−#: qml/Components/Lockscreen.qml:167

137−msgid "Please wait"

138−msgstr "기다려주십시오"

139−

140−#: qml/Components/Lockscreen.qml:172

141−msgid "Too many incorrect attempts"

142−msgstr "너무 많이 틀리셨습니다"

143−

144156#: qml/Components/Lockscreen.qml:206

145157msgid "Emergency Call"

146158msgstr "긴급 통화"

@@ -149,15 +161,6 @@ msgstr "긴급 통화"

149161msgid "OK"

150162msgstr "확인"

151163

152−#: qml/Components/PassphraseLockscreen.qml:61

153−#, qt-format

154−msgid "Hello %1"

155−msgstr "안녕하세요 %1"

156−

157−#: qml/Components/PassphraseLockscreen.qml:61

158−msgid "Hello"

159−msgstr "안녕하세요"

160−

161164#: qml/Dash/GenericScopeView.qml:411 qml/Dash/GenericScopeView.qml:533

162165msgid "See less"

163166msgstr "간단히 표시"

@@ -224,8 +227,8 @@ msgid "All"

224227msgstr "모두"

225228

226229#: qml/Greeter/Greeter.qml:157

227−msgid "Swipe to unlock"

228−msgstr "쓸어서 잠금 해제"

230+msgid "Unlock"

231+msgstr ""

229232

230233#: qml/Hud/HudParametrizedActionsPage.qml:139

231234msgid "Confirm"

@@ -303,26 +306,30 @@ msgstr "심 카드 잠금 해제"

303306msgid "Roaming"

304307msgstr "로밍"

305308

306−#: qml/Shell.qml:320

307−msgid "Enter your passphrase"

308−msgstr "패스프레이즈를 입력해주십시오."

309+#: qml/Shell.qml:340

310+msgid "Enter passphrase"

311+msgstr ""

309312

310313#: qml/Shell.qml:321

311314msgid "Sorry, incorrect passphrase"

312315msgstr "죄송합니다. 패스프레이즈가 올바르지 않습니다."

313316

314−#: qml/Shell.qml:323

315−msgid "Enter your passcode"

316−msgstr "패스코드를 입력해주십시오."

317+#: qml/Shell.qml:342

318+msgid "Please re-enter"

319+msgstr ""

320+

321+#: qml/Shell.qml:344

322+msgid "Enter passcode"

323+msgstr ""

317324

318325#: qml/Shell.qml:324

319326msgid "Sorry, incorrect passcode"

320327msgstr "죄송합니다. 패스코드가 올바르지 않습니다."

321328

322−#: qml/Shell.qml:327

329+#: qml/Shell.qml:348

323330#, qt-format

324−msgid "Enter your %1"

325−msgstr "%1을(를) 입력해주십시오."

331+msgid "Enter %1"

332+msgstr ""

326333

327334#: qml/Shell.qml:328

328335#, qt-format

@@ -353,5 +360,31 @@ msgid ""

353360"and all personal data will be deleted."

354361msgstr "이번에도 올바르지 않은 패스코드를 입력하면 휴대 전화를 공장 초기화하여 모든 개인 정보를 삭제합니다."

355362

363+#, qt-format

364+#~ msgid "Hello %1"

365+#~ msgstr "안녕하세요 %1"

366+

367+#~ msgid "Hello"

368+#~ msgstr "안녕하세요"

369+

370+#~ msgid "Please wait"

371+#~ msgstr "기다려주십시오"

372+

373+#~ msgid "Too many incorrect attempts"

374+#~ msgstr "너무 많이 틀리셨습니다"

375+

356376#~ msgid "Manage Dash"

357377#~ msgstr "대시 관리"

378+

379+#~ msgid "Enter your passphrase"

380+#~ msgstr "패스프레이즈를 입력해주십시오."

381+

382+#~ msgid "Enter your passcode"

383+#~ msgstr "패스코드를 입력해주십시오."

384+

385+#~ msgid "Swipe to unlock"

386+#~ msgstr "쓸어서 잠금 해제"

387+

388+#, qt-format

389+#~ msgid "Enter your %1"

390+#~ msgstr "%1을(를) 입력해주십시오."

po/ku.po+63−30

@@ -7,14 +7,15 @@ msgid ""

77msgstr ""

88"Project-Id-Version: unity8\n"

99"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10−"POT-Creation-Date: 2014-09-24 10:43+0100\n"

10+"POT-Creation-Date: 2014-10-02 10:35+0200\n"

1111"PO-Revision-Date: 2014-09-10 13:14+0000\n"

1212"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"

1313"Language-Team: Kurdish <ku@li.org>\n"

1414"MIME-Version: 1.0\n"

1515"Content-Type: text/plain; charset=UTF-8\n"

1616"Content-Transfer-Encoding: 8bit\n"

17−"X-Launchpad-Export-Date: 2014-09-29 05:19+0000\n"

17+"Plural-Forms: nplurals=2; plural=n != 1;\n"

18+"X-Launchpad-Export-Date: 2014-10-03 06:22+0000\n"

1819"X-Generator: Launchpad (build 17196)\n"

1920

2021#: plugins/LightDM/Greeter.cpp:130

@@ -30,6 +31,25 @@ msgstr "Kurteriyê pêveke"

3031msgid "Unpin shortcut"

3132msgstr "Derzîdanka kurteriyê rake"

3233

34+#: qml/Components/DelayedLockscreen.qml:47

35+msgid "Device Locked"

36+msgstr ""

37+

38+#: qml/Components/DelayedLockscreen.qml:62

39+msgid "You have been locked out due to too many failed passphrase attempts."

40+msgstr ""

41+

42+#: qml/Components/DelayedLockscreen.qml:63

43+msgid "You have been locked out due to too many failed passcode attempts."

44+msgstr ""

45+

46+#: qml/Components/DelayedLockscreen.qml:72

47+#, qt-format

48+msgid "Please wait %1 minute and then try again…"

49+msgid_plural "Please wait %1 minutes and then try again…"

50+msgstr[0] ""

51+msgstr[1] ""

52+

3353#: qml/Components/Dialogs.qml:70

3454msgid "Log out"

3555msgstr "Derkeve"

@@ -135,14 +155,6 @@ msgid ""

135155msgstr ""

136156"Tu tevgerên kêlekê fêr bûyî<br><br>Ji bo destpêkirinê ekranê bipelîne"

137157

138−#: qml/Components/Lockscreen.qml:167

139−msgid "Please wait"

140−msgstr "Tika ye li bendê bimîne"

141−

142−#: qml/Components/Lockscreen.qml:172

143−msgid "Too many incorrect attempts"

144−msgstr "Te gelek caran ceribandinên çewt kirin"

145−

146158#: qml/Components/Lockscreen.qml:206

147159msgid "Emergency Call"

148160msgstr "Lêgerîna Lezgîn"

@@ -151,15 +163,6 @@ msgstr "Lêgerîna Lezgîn"

151163msgid "OK"

152164msgstr "BAŞ E"

153165

154−#: qml/Components/PassphraseLockscreen.qml:61

155−#, qt-format

156−msgid "Hello %1"

157−msgstr "Silav %1"

158−

159−#: qml/Components/PassphraseLockscreen.qml:61

160−msgid "Hello"

161−msgstr "Silav"

162−

163166#: qml/Dash/GenericScopeView.qml:411 qml/Dash/GenericScopeView.qml:533

164167msgid "See less"

165168msgstr "Hindiktir bibîne"

@@ -226,8 +229,8 @@ msgid "All"

226229msgstr "Hemû"

227230

228231#: qml/Greeter/Greeter.qml:157

229−msgid "Swipe to unlock"

230−msgstr "Ji bo vekirinê kaş bike"

232+msgid "Unlock"

233+msgstr ""

231234

232235#: qml/Hud/HudParametrizedActionsPage.qml:139

233236msgid "Confirm"

@@ -305,26 +308,30 @@ msgstr "Kilîda SIMê veke"

305308msgid "Roaming"

306309msgstr "Geriyan"

307310

308−#: qml/Shell.qml:320

309−msgid "Enter your passphrase"

310−msgstr "Parolaya xwe binivîse"

311+#: qml/Shell.qml:340

312+msgid "Enter passphrase"

313+msgstr ""

311314

312315#: qml/Shell.qml:321

313316msgid "Sorry, incorrect passphrase"

314317msgstr "Bibore, parola çewt e"

315318

316−#: qml/Shell.qml:323

317−msgid "Enter your passcode"

318−msgstr "Parolaya xwe binivîse"

319+#: qml/Shell.qml:342

320+msgid "Please re-enter"

321+msgstr ""

322+

323+#: qml/Shell.qml:344

324+msgid "Enter passcode"

325+msgstr ""

319326

320327#: qml/Shell.qml:324

321328msgid "Sorry, incorrect passcode"

322329msgstr "Bibore, parola çewrt e"

323330

324−#: qml/Shell.qml:327

331+#: qml/Shell.qml:348

325332#, qt-format

326−msgid "Enter your %1"

327−msgstr "%1a xwe binivîse"

333+msgid "Enter %1"

334+msgstr ""

328335

329336#: qml/Shell.qml:328

330337#, qt-format

@@ -358,3 +365,29 @@ msgid ""

358365msgstr ""

359366"Eger parola çewt bê nivîsandin, telefona te dê vegere eyarên fabrîkayê û "

360367"hemû daneyên te yên taybet dê bên jêbirin."

368+

369+#~ msgid "Please wait"

370+#~ msgstr "Tika ye li bendê bimîne"

371+

372+#, qt-format

373+#~ msgid "Hello %1"

374+#~ msgstr "Silav %1"

375+

376+#~ msgid "Hello"

377+#~ msgstr "Silav"

378+

379+#~ msgid "Too many incorrect attempts"

380+#~ msgstr "Te gelek caran ceribandinên çewt kirin"

381+

382+#~ msgid "Swipe to unlock"

383+#~ msgstr "Ji bo vekirinê kaş bike"

384+

385+#~ msgid "Enter your passphrase"

386+#~ msgstr "Parolaya xwe binivîse"

387+

388+#, qt-format

389+#~ msgid "Enter your %1"

390+#~ msgstr "%1a xwe binivîse"

391+

392+#~ msgid "Enter your passcode"

393+#~ msgstr "Parolaya xwe binivîse"

po/ky.po+33−26

@@ -7,14 +7,15 @@ msgid ""

77msgstr ""

88"Project-Id-Version: unity\n"

99"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10−"POT-Creation-Date: 2014-09-24 10:43+0100\n"

10+"POT-Creation-Date: 2014-10-02 10:35+0200\n"

1111"PO-Revision-Date: 2013-06-27 06:17+0000\n"

1212"Last-Translator: Michał Sawicz <michal.sawicz@canonical.com>\n"

1313"Language-Team: Kirghiz <ky@li.org>\n"

1414"MIME-Version: 1.0\n"

1515"Content-Type: text/plain; charset=UTF-8\n"

1616"Content-Transfer-Encoding: 8bit\n"

17−"X-Launchpad-Export-Date: 2014-09-29 05:19+0000\n"

17+"Plural-Forms: nplurals=1; plural=0;\n"

18+"X-Launchpad-Export-Date: 2014-10-03 06:22+0000\n"

1819"X-Generator: Launchpad (build 17196)\n"

1920

2021#: plugins/LightDM/Greeter.cpp:130

@@ -30,6 +31,25 @@ msgstr ""

3031msgid "Unpin shortcut"

3132msgstr ""

3233

34+#: qml/Components/DelayedLockscreen.qml:47

35+msgid "Device Locked"

36+msgstr ""

37+

38+#: qml/Components/DelayedLockscreen.qml:62

39+msgid "You have been locked out due to too many failed passphrase attempts."

40+msgstr ""

41+

42+#: qml/Components/DelayedLockscreen.qml:63

43+msgid "You have been locked out due to too many failed passcode attempts."

44+msgstr ""

45+

46+#: qml/Components/DelayedLockscreen.qml:72

47+#, qt-format

48+msgid "Please wait %1 minute and then try again…"

49+msgid_plural "Please wait %1 minutes and then try again…"

50+msgstr[0] ""

51+msgstr[1] ""

52+

3353#: qml/Components/Dialogs.qml:70

3454msgid "Log out"

3555msgstr ""

@@ -132,14 +152,6 @@ msgid ""

132152"phone<br><br>Tap on the screen to start"

133153msgstr ""

134154

135−#: qml/Components/Lockscreen.qml:167

136−msgid "Please wait"

137−msgstr ""

138−

139−#: qml/Components/Lockscreen.qml:172

140−msgid "Too many incorrect attempts"

141−msgstr ""

142−

143155#: qml/Components/Lockscreen.qml:206

144156msgid "Emergency Call"

145157msgstr ""

@@ -148,15 +160,6 @@ msgstr ""

148160msgid "OK"

149161msgstr ""

150162

151−#: qml/Components/PassphraseLockscreen.qml:61

152−#, qt-format

153−msgid "Hello %1"

154−msgstr ""

155−

156−#: qml/Components/PassphraseLockscreen.qml:61

157−msgid "Hello"

158−msgstr ""

159−

160163#: qml/Dash/GenericScopeView.qml:411 qml/Dash/GenericScopeView.qml:533

161164msgid "See less"

162165msgstr ""

@@ -223,7 +226,7 @@ msgid "All"

223226msgstr ""

224227

225228#: qml/Greeter/Greeter.qml:157

226−msgid "Swipe to unlock"

229+msgid "Unlock"

227230msgstr ""

228231

229232#: qml/Hud/HudParametrizedActionsPage.qml:139

@@ -302,25 +305,29 @@ msgstr ""

302305msgid "Roaming"

303306msgstr ""

304307

305−#: qml/Shell.qml:320

306−msgid "Enter your passphrase"

308+#: qml/Shell.qml:340

309+msgid "Enter passphrase"

307310msgstr ""

308311

309312#: qml/Shell.qml:321

310313msgid "Sorry, incorrect passphrase"

311314msgstr ""

312315

313−#: qml/Shell.qml:323

314−msgid "Enter your passcode"

316+#: qml/Shell.qml:342

317+msgid "Please re-enter"

318+msgstr ""

319+

320+#: qml/Shell.qml:344

321+msgid "Enter passcode"

315322msgstr ""

316323

317324#: qml/Shell.qml:324

318325msgid "Sorry, incorrect passcode"

319326msgstr ""

320327

321−#: qml/Shell.qml:327

328+#: qml/Shell.qml:348

322329#, qt-format

323−msgid "Enter your %1"

330+msgid "Enter %1"

324331msgstr ""

325332

326333#: qml/Shell.qml:328

po/lo.po+40−26

@@ -7,14 +7,15 @@ msgid ""

77msgstr ""

88"Project-Id-Version: unity8\n"

99"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10−"POT-Creation-Date: 2014-09-24 10:43+0100\n"

10+"POT-Creation-Date: 2014-10-02 10:35+0200\n"

1111"PO-Revision-Date: 2013-10-02 10:00+0000\n"

1212"Last-Translator: Anousak <anousak@gmail.com>\n"

1313"Language-Team: Lao <lo@li.org>\n"

1414"MIME-Version: 1.0\n"

1515"Content-Type: text/plain; charset=UTF-8\n"

1616"Content-Transfer-Encoding: 8bit\n"

17−"X-Launchpad-Export-Date: 2014-09-29 05:19+0000\n"

17+"Plural-Forms: nplurals=1; plural=0;\n"

18+"X-Launchpad-Export-Date: 2014-10-03 06:22+0000\n"

1819"X-Generator: Launchpad (build 17196)\n"

1920

2021#: plugins/LightDM/Greeter.cpp:130

@@ -30,6 +31,25 @@ msgstr ""

3031msgid "Unpin shortcut"

3132msgstr ""

3233

34+#: qml/Components/DelayedLockscreen.qml:47

35+msgid "Device Locked"

36+msgstr ""

37+

38+#: qml/Components/DelayedLockscreen.qml:62

39+msgid "You have been locked out due to too many failed passphrase attempts."

40+msgstr ""

41+

42+#: qml/Components/DelayedLockscreen.qml:63

43+msgid "You have been locked out due to too many failed passcode attempts."

44+msgstr ""

45+

46+#: qml/Components/DelayedLockscreen.qml:72

47+#, qt-format

48+msgid "Please wait %1 minute and then try again…"

49+msgid_plural "Please wait %1 minutes and then try again…"

50+msgstr[0] ""

51+msgstr[1] ""

52+

3353#: qml/Components/Dialogs.qml:70

3454msgid "Log out"

3555msgstr ""

@@ -132,14 +152,6 @@ msgid ""

132152"phone<br><br>Tap on the screen to start"

133153msgstr ""

134154

135−#: qml/Components/Lockscreen.qml:167

136−msgid "Please wait"

137−msgstr ""

138−

139−#: qml/Components/Lockscreen.qml:172

140−msgid "Too many incorrect attempts"

141−msgstr ""

142−

143155#: qml/Components/Lockscreen.qml:206

144156msgid "Emergency Call"

145157msgstr ""

@@ -148,15 +160,6 @@ msgstr ""

148160msgid "OK"

149161msgstr ""

150162

151−#: qml/Components/PassphraseLockscreen.qml:61

152−#, qt-format

153−msgid "Hello %1"

154−msgstr "ສະບາຍດີ %1"

155−

156−#: qml/Components/PassphraseLockscreen.qml:61

157−msgid "Hello"

158−msgstr "ສະບາຍດີ"

159−

160163#: qml/Dash/GenericScopeView.qml:411 qml/Dash/GenericScopeView.qml:533

161164msgid "See less"

162165msgstr ""

@@ -223,7 +226,7 @@ msgid "All"

223226msgstr ""

224227

225228#: qml/Greeter/Greeter.qml:157

226−msgid "Swipe to unlock"

229+msgid "Unlock"

227230msgstr ""

228231

229232#: qml/Hud/HudParametrizedActionsPage.qml:139

@@ -302,25 +305,29 @@ msgstr ""

302305msgid "Roaming"

303306msgstr ""

304307

305−#: qml/Shell.qml:320

306−msgid "Enter your passphrase"

308+#: qml/Shell.qml:340

309+msgid "Enter passphrase"

307310msgstr ""

308311

309312#: qml/Shell.qml:321

310313msgid "Sorry, incorrect passphrase"

311314msgstr ""

312315

313−#: qml/Shell.qml:323

314−msgid "Enter your passcode"

316+#: qml/Shell.qml:342

317+msgid "Please re-enter"

318+msgstr ""

319+

320+#: qml/Shell.qml:344

321+msgid "Enter passcode"

315322msgstr ""

316323

317324#: qml/Shell.qml:324

318325msgid "Sorry, incorrect passcode"

319326msgstr ""

320327

321−#: qml/Shell.qml:327

328+#: qml/Shell.qml:348

322329#, qt-format

323−msgid "Enter your %1"

330+msgid "Enter %1"

324331msgstr ""

325332

326333#: qml/Shell.qml:328

@@ -351,3 +358,10 @@ msgid ""

351358"If passcode is entered incorrectly, your phone will conduct a factory reset "

352359"and all personal data will be deleted."

353360msgstr ""

361+

362+#, qt-format

363+#~ msgid "Hello %1"

364+#~ msgstr "ສະບາຍດີ %1"

365+

366+#~ msgid "Hello"

367+#~ msgstr "ສະບາຍດີ"

po/lt.po+45−27

@@ -7,14 +7,16 @@ msgid ""

77msgstr ""

88"Project-Id-Version: unity8\n"

99"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10−"POT-Creation-Date: 2014-09-24 10:43+0100\n"

10+"POT-Creation-Date: 2014-10-02 10:35+0200\n"

1111"PO-Revision-Date: 2014-05-19 17:15+0000\n"

1212"Last-Translator: Mantas Kriaučiūnas <mantas@akl.lt>\n"

1313"Language-Team: Lithuanian <lt@li.org>\n"

1414"MIME-Version: 1.0\n"

1515"Content-Type: text/plain; charset=UTF-8\n"

1616"Content-Transfer-Encoding: 8bit\n"

17−"X-Launchpad-Export-Date: 2014-09-29 05:19+0000\n"

17+"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && "

18+"(n%100<10 || n%100>=20) ? 1 : 2;\n"

19+"X-Launchpad-Export-Date: 2014-10-03 06:22+0000\n"

1820"X-Generator: Launchpad (build 17196)\n"

1921

2022#: plugins/LightDM/Greeter.cpp:130

@@ -30,6 +32,25 @@ msgstr ""

3032msgid "Unpin shortcut"

3133msgstr ""

3234

35+#: qml/Components/DelayedLockscreen.qml:47

36+msgid "Device Locked"

37+msgstr ""

38+

39+#: qml/Components/DelayedLockscreen.qml:62

40+msgid "You have been locked out due to too many failed passphrase attempts."

41+msgstr ""

42+

43+#: qml/Components/DelayedLockscreen.qml:63

44+msgid "You have been locked out due to too many failed passcode attempts."

45+msgstr ""

46+

47+#: qml/Components/DelayedLockscreen.qml:72

48+#, qt-format

49+msgid "Please wait %1 minute and then try again…"

50+msgid_plural "Please wait %1 minutes and then try again…"

51+msgstr[0] ""

52+msgstr[1] ""

53+

3354#: qml/Components/Dialogs.qml:70

3455msgid "Log out"

3556msgstr ""

@@ -135,14 +156,6 @@ msgid ""

135156"phone<br><br>Tap on the screen to start"

136157msgstr ""

137158

138−#: qml/Components/Lockscreen.qml:167

139−msgid "Please wait"

140−msgstr ""

141−

142−#: qml/Components/Lockscreen.qml:172

143−msgid "Too many incorrect attempts"

144−msgstr ""

145−

146159#: qml/Components/Lockscreen.qml:206

147160msgid "Emergency Call"

148161msgstr "Pagalbos skambutis"

@@ -151,15 +164,6 @@ msgstr "Pagalbos skambutis"

151164msgid "OK"

152165msgstr ""

153166

154−#: qml/Components/PassphraseLockscreen.qml:61

155−#, qt-format

156−msgid "Hello %1"

157−msgstr "Laba diena, %1"

158−

159−#: qml/Components/PassphraseLockscreen.qml:61

160−msgid "Hello"

161−msgstr "Sveiki"

162−

163167#: qml/Dash/GenericScopeView.qml:411 qml/Dash/GenericScopeView.qml:533

164168msgid "See less"

165169msgstr ""

@@ -226,8 +230,8 @@ msgid "All"

226230msgstr ""

227231

228232#: qml/Greeter/Greeter.qml:157

229−msgid "Swipe to unlock"

230−msgstr "Braukite ir atrakinsite"

233+msgid "Unlock"

234+msgstr ""

231235

232236#: qml/Hud/HudParametrizedActionsPage.qml:139

233237msgid "Confirm"

@@ -305,25 +309,29 @@ msgstr ""

305309msgid "Roaming"

306310msgstr ""

307311

308−#: qml/Shell.qml:320

309−msgid "Enter your passphrase"

312+#: qml/Shell.qml:340

313+msgid "Enter passphrase"

310314msgstr ""

311315

312316#: qml/Shell.qml:321

313317msgid "Sorry, incorrect passphrase"

314318msgstr ""

315319

316−#: qml/Shell.qml:323

317−msgid "Enter your passcode"

320+#: qml/Shell.qml:342

321+msgid "Please re-enter"

322+msgstr ""

323+

324+#: qml/Shell.qml:344

325+msgid "Enter passcode"

318326msgstr ""

319327

320328#: qml/Shell.qml:324

321329msgid "Sorry, incorrect passcode"

322330msgstr ""

323331

324−#: qml/Shell.qml:327

332+#: qml/Shell.qml:348

325333#, qt-format

326−msgid "Enter your %1"

334+msgid "Enter %1"

327335msgstr ""

328336

329337#: qml/Shell.qml:328

@@ -354,3 +362,13 @@ msgid ""

354362"If passcode is entered incorrectly, your phone will conduct a factory reset "

355363"and all personal data will be deleted."

356364msgstr ""

365+

366+#, qt-format

367+#~ msgid "Hello %1"

368+#~ msgstr "Laba diena, %1"

369+

370+#~ msgid "Hello"

371+#~ msgstr "Sveiki"

372+

373+#~ msgid "Swipe to unlock"

374+#~ msgstr "Braukite ir atrakinsite"

po/lv.po+48−27

@@ -7,14 +7,15 @@ msgid ""

77msgstr ""

88"Project-Id-Version: unity\n"

99"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10−"POT-Creation-Date: 2014-09-24 10:43+0100\n"

10+"POT-Creation-Date: 2014-10-02 10:35+0200\n"

1111"PO-Revision-Date: 2014-08-21 09:46+0000\n"

1212"Last-Translator: Jānis-Marks Gailis <jm-gailis@fai-vianet.fr>\n"

1313"Language-Team: Latvian <lv@li.org>\n"

1414"MIME-Version: 1.0\n"

1515"Content-Type: text/plain; charset=UTF-8\n"

1616"Content-Transfer-Encoding: 8bit\n"

17−"X-Launchpad-Export-Date: 2014-09-29 05:19+0000\n"

17+"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2;\n"

18+"X-Launchpad-Export-Date: 2014-10-03 06:22+0000\n"

1819"X-Generator: Launchpad (build 17196)\n"

1920

2021#: plugins/LightDM/Greeter.cpp:130

@@ -30,6 +31,25 @@ msgstr ""

3031msgid "Unpin shortcut"

3132msgstr ""

3233

34+#: qml/Components/DelayedLockscreen.qml:47

35+msgid "Device Locked"

36+msgstr ""

37+

38+#: qml/Components/DelayedLockscreen.qml:62

39+msgid "You have been locked out due to too many failed passphrase attempts."

40+msgstr ""

41+

42+#: qml/Components/DelayedLockscreen.qml:63

43+msgid "You have been locked out due to too many failed passcode attempts."

44+msgstr ""

45+

46+#: qml/Components/DelayedLockscreen.qml:72

47+#, qt-format

48+msgid "Please wait %1 minute and then try again…"

49+msgid_plural "Please wait %1 minutes and then try again…"

50+msgstr[0] ""

51+msgstr[1] ""

52+

3353#: qml/Components/Dialogs.qml:70

3454msgid "Log out"

3555msgstr "Iziet"

@@ -132,14 +152,6 @@ msgid ""

132152"phone<br><br>Tap on the screen to start"

133153msgstr ""

134154

135−#: qml/Components/Lockscreen.qml:167

136−msgid "Please wait"

137−msgstr "Lūdzu, uzgaidiet"

138−

139−#: qml/Components/Lockscreen.qml:172

140−msgid "Too many incorrect attempts"

141−msgstr ""

142−

143155#: qml/Components/Lockscreen.qml:206

144156msgid "Emergency Call"

145157msgstr "Neatliekamās Palīdzības zvans"

@@ -148,15 +160,6 @@ msgstr "Neatliekamās Palīdzības zvans"

148160msgid "OK"

149161msgstr "LABI"

150162

151−#: qml/Components/PassphraseLockscreen.qml:61

152−#, qt-format

153−msgid "Hello %1"

154−msgstr "Sveiki, %1"

155−

156−#: qml/Components/PassphraseLockscreen.qml:61

157−msgid "Hello"

158−msgstr "Sveiki"

159−

160163#: qml/Dash/GenericScopeView.qml:411 qml/Dash/GenericScopeView.qml:533

161164msgid "See less"

162165msgstr "Redzēt mazāk"

@@ -223,7 +226,7 @@ msgid "All"

223226msgstr "Visi"

224227

225228#: qml/Greeter/Greeter.qml:157

226−msgid "Swipe to unlock"

229+msgid "Unlock"

227230msgstr ""

228231

229232#: qml/Hud/HudParametrizedActionsPage.qml:139

@@ -302,26 +305,30 @@ msgstr "Atbloķēt SIM"

302305msgid "Roaming"

303306msgstr "Viesabonēšana"

304307

305−#: qml/Shell.qml:320

306−msgid "Enter your passphrase"

308+#: qml/Shell.qml:340

309+msgid "Enter passphrase"

307310msgstr ""

308311

309312#: qml/Shell.qml:321

310313msgid "Sorry, incorrect passphrase"

311314msgstr ""

312315

313−#: qml/Shell.qml:323

314−msgid "Enter your passcode"

316+#: qml/Shell.qml:342

317+msgid "Please re-enter"

318+msgstr ""

319+

320+#: qml/Shell.qml:344

321+msgid "Enter passcode"

315322msgstr ""

316323

317324#: qml/Shell.qml:324

318325msgid "Sorry, incorrect passcode"

319326msgstr ""

320327

321−#: qml/Shell.qml:327

328+#: qml/Shell.qml:348

322329#, qt-format

323−msgid "Enter your %1"

324−msgstr "Ievadiet jūsu %1"

330+msgid "Enter %1"

331+msgstr ""

325332

326333#: qml/Shell.qml:328

327334#, qt-format

@@ -351,3 +358,17 @@ msgid ""

351358"If passcode is entered incorrectly, your phone will conduct a factory reset "

352359"and all personal data will be deleted."

353360msgstr ""

361+

362+#, qt-format

363+#~ msgid "Hello %1"

364+#~ msgstr "Sveiki, %1"

365+

366+#~ msgid "Hello"

367+#~ msgstr "Sveiki"

368+

369+#, qt-format

370+#~ msgid "Enter your %1"

371+#~ msgstr "Ievadiet jūsu %1"

372+

373+#~ msgid "Please wait"

374+#~ msgstr "Lūdzu, uzgaidiet"

po/ml.po+40−26

@@ -7,14 +7,15 @@ msgid ""

77msgstr ""

88"Project-Id-Version: unity8\n"

99"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10−"POT-Creation-Date: 2014-09-24 10:43+0100\n"

10+"POT-Creation-Date: 2014-10-02 10:35+0200\n"

1111"PO-Revision-Date: 2013-11-23 11:44+0000\n"

1212"Last-Translator: ST Alfas <Unknown>\n"

1313"Language-Team: Malayalam <ml@li.org>\n"

1414"MIME-Version: 1.0\n"

1515"Content-Type: text/plain; charset=UTF-8\n"

1616"Content-Transfer-Encoding: 8bit\n"

17−"X-Launchpad-Export-Date: 2014-09-29 05:19+0000\n"

17+"Plural-Forms: nplurals=2; plural=n != 1;\n"

18+"X-Launchpad-Export-Date: 2014-10-03 06:22+0000\n"

1819"X-Generator: Launchpad (build 17196)\n"

1920

2021#: plugins/LightDM/Greeter.cpp:130

@@ -30,6 +31,25 @@ msgstr ""

3031msgid "Unpin shortcut"

3132msgstr ""

3233

34+#: qml/Components/DelayedLockscreen.qml:47

35+msgid "Device Locked"

36+msgstr ""

37+

38+#: qml/Components/DelayedLockscreen.qml:62

39+msgid "You have been locked out due to too many failed passphrase attempts."

40+msgstr ""

41+

42+#: qml/Components/DelayedLockscreen.qml:63

43+msgid "You have been locked out due to too many failed passcode attempts."

44+msgstr ""

45+

46+#: qml/Components/DelayedLockscreen.qml:72

47+#, qt-format

48+msgid "Please wait %1 minute and then try again…"

49+msgid_plural "Please wait %1 minutes and then try again…"

50+msgstr[0] ""

51+msgstr[1] ""

52+

3353#: qml/Components/Dialogs.qml:70

3454msgid "Log out"

3555msgstr ""

@@ -134,14 +154,6 @@ msgid ""

134154"phone<br><br>Tap on the screen to start"

135155msgstr ""

136156

137−#: qml/Components/Lockscreen.qml:167

138−msgid "Please wait"

139−msgstr ""

140−

141−#: qml/Components/Lockscreen.qml:172

142−msgid "Too many incorrect attempts"

143−msgstr ""

144−

145157#: qml/Components/Lockscreen.qml:206

146158msgid "Emergency Call"

147159msgstr "അടിയന്തിര വിളി"

@@ -150,15 +162,6 @@ msgstr "അടിയന്തിര വിളി"

150162msgid "OK"

151163msgstr ""

152164

153−#: qml/Components/PassphraseLockscreen.qml:61

154−#, qt-format

155−msgid "Hello %1"

156−msgstr "ഹലോ %1"

157−

158−#: qml/Components/PassphraseLockscreen.qml:61

159−msgid "Hello"

160−msgstr "ഹലോ"

161−

162165#: qml/Dash/GenericScopeView.qml:411 qml/Dash/GenericScopeView.qml:533

163166msgid "See less"

164167msgstr ""

@@ -225,7 +228,7 @@ msgid "All"

225228msgstr ""

226229

227230#: qml/Greeter/Greeter.qml:157

228−msgid "Swipe to unlock"

231+msgid "Unlock"

229232msgstr ""

230233

231234#: qml/Hud/HudParametrizedActionsPage.qml:139

@@ -304,25 +307,29 @@ msgstr ""

304307msgid "Roaming"

305308msgstr ""

306309

307−#: qml/Shell.qml:320

308−msgid "Enter your passphrase"

310+#: qml/Shell.qml:340

311+msgid "Enter passphrase"

309312msgstr ""

310313

311314#: qml/Shell.qml:321

312315msgid "Sorry, incorrect passphrase"

313316msgstr ""

314317

315−#: qml/Shell.qml:323

316−msgid "Enter your passcode"

318+#: qml/Shell.qml:342

319+msgid "Please re-enter"

320+msgstr ""

321+

322+#: qml/Shell.qml:344

323+msgid "Enter passcode"

317324msgstr ""

318325

319326#: qml/Shell.qml:324

320327msgid "Sorry, incorrect passcode"

321328msgstr ""

322329

323−#: qml/Shell.qml:327

330+#: qml/Shell.qml:348

324331#, qt-format

325−msgid "Enter your %1"

332+msgid "Enter %1"

326333msgstr ""

327334

328335#: qml/Shell.qml:328

@@ -353,3 +360,10 @@ msgid ""

353360"If passcode is entered incorrectly, your phone will conduct a factory reset "

354361"and all personal data will be deleted."

355362msgstr ""

363+

364+#, qt-format

365+#~ msgid "Hello %1"

366+#~ msgstr "ഹലോ %1"

367+

368+#~ msgid "Hello"

369+#~ msgstr "ഹലോ"

po/mr.po+33−26

@@ -7,14 +7,15 @@ msgid ""

77msgstr ""

88"Project-Id-Version: unity8\n"

99"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10−"POT-Creation-Date: 2014-09-24 10:43+0100\n"

10+"POT-Creation-Date: 2014-10-02 10:35+0200\n"

1111"PO-Revision-Date: 2014-01-14 19:54+0000\n"

1212"Last-Translator: Rohan Deshmukh <Unknown>\n"

1313"Language-Team: Marathi <mr@li.org>\n"

1414"MIME-Version: 1.0\n"

1515"Content-Type: text/plain; charset=UTF-8\n"

1616"Content-Transfer-Encoding: 8bit\n"

17−"X-Launchpad-Export-Date: 2014-09-29 05:19+0000\n"

17+"Plural-Forms: nplurals=2; plural=n != 1;\n"

18+"X-Launchpad-Export-Date: 2014-10-03 06:22+0000\n"

1819"X-Generator: Launchpad (build 17196)\n"

1920

2021#: plugins/LightDM/Greeter.cpp:130

@@ -30,6 +31,25 @@ msgstr ""

3031msgid "Unpin shortcut"

3132msgstr ""

3233

34+#: qml/Components/DelayedLockscreen.qml:47

35+msgid "Device Locked"

36+msgstr ""

37+

38+#: qml/Components/DelayedLockscreen.qml:62

39+msgid "You have been locked out due to too many failed passphrase attempts."

40+msgstr ""

41+

42+#: qml/Components/DelayedLockscreen.qml:63

43+msgid "You have been locked out due to too many failed passcode attempts."

44+msgstr ""

45+

46+#: qml/Components/DelayedLockscreen.qml:72

47+#, qt-format

48+msgid "Please wait %1 minute and then try again…"

49+msgid_plural "Please wait %1 minutes and then try again…"

50+msgstr[0] ""

51+msgstr[1] ""

52+

3353#: qml/Components/Dialogs.qml:70

3454msgid "Log out"

3555msgstr ""

@@ -132,14 +152,6 @@ msgid ""

132152"phone<br><br>Tap on the screen to start"

133153msgstr ""

134154

135−#: qml/Components/Lockscreen.qml:167

136−msgid "Please wait"

137−msgstr ""

138−

139−#: qml/Components/Lockscreen.qml:172

140−msgid "Too many incorrect attempts"

141−msgstr ""

142−

143155#: qml/Components/Lockscreen.qml:206

144156msgid "Emergency Call"

145157msgstr ""

@@ -148,15 +160,6 @@ msgstr ""

148160msgid "OK"

149161msgstr ""

150162

151−#: qml/Components/PassphraseLockscreen.qml:61

152−#, qt-format

153−msgid "Hello %1"

154−msgstr ""

155−

156−#: qml/Components/PassphraseLockscreen.qml:61

157−msgid "Hello"

158−msgstr ""

159−

160163#: qml/Dash/GenericScopeView.qml:411 qml/Dash/GenericScopeView.qml:533

161164msgid "See less"

162165msgstr ""

@@ -223,7 +226,7 @@ msgid "All"

223226msgstr ""

224227

225228#: qml/Greeter/Greeter.qml:157

226−msgid "Swipe to unlock"

229+msgid "Unlock"

227230msgstr ""

228231

229232#: qml/Hud/HudParametrizedActionsPage.qml:139

@@ -302,25 +305,29 @@ msgstr ""

302305msgid "Roaming"

303306msgstr ""

304307

305−#: qml/Shell.qml:320

306−msgid "Enter your passphrase"

308+#: qml/Shell.qml:340

309+msgid "Enter passphrase"

307310msgstr ""

308311

309312#: qml/Shell.qml:321

310313msgid "Sorry, incorrect passphrase"

311314msgstr ""

312315

313−#: qml/Shell.qml:323

314−msgid "Enter your passcode"

316+#: qml/Shell.qml:342

317+msgid "Please re-enter"

318+msgstr ""

319+

320+#: qml/Shell.qml:344

321+msgid "Enter passcode"

315322msgstr ""

316323

317324#: qml/Shell.qml:324

318325msgid "Sorry, incorrect passcode"

319326msgstr ""

320327

321−#: qml/Shell.qml:327

328+#: qml/Shell.qml:348

322329#, qt-format

323−msgid "Enter your %1"

330+msgid "Enter %1"

324331msgstr ""

325332

326333#: qml/Shell.qml:328

po/ms.po+40−26

@@ -7,14 +7,15 @@ msgid ""

77msgstr ""

88"Project-Id-Version: unity8\n"

99"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10−"POT-Creation-Date: 2014-09-24 10:43+0100\n"

10+"POT-Creation-Date: 2014-10-02 10:35+0200\n"

1111"PO-Revision-Date: 2014-01-17 09:05+0000\n"

1212"Last-Translator: abuyop <Unknown>\n"

1313"Language-Team: Malay <ms@li.org>\n"

1414"MIME-Version: 1.0\n"

1515"Content-Type: text/plain; charset=UTF-8\n"

1616"Content-Transfer-Encoding: 8bit\n"

17−"X-Launchpad-Export-Date: 2014-09-29 05:19+0000\n"

17+"Plural-Forms: nplurals=2; plural=n != 1;\n"

18+"X-Launchpad-Export-Date: 2014-10-03 06:22+0000\n"

1819"X-Generator: Launchpad (build 17196)\n"

1920

2021#: plugins/LightDM/Greeter.cpp:130

@@ -30,6 +31,25 @@ msgstr ""

3031msgid "Unpin shortcut"

3132msgstr ""

3233

34+#: qml/Components/DelayedLockscreen.qml:47

35+msgid "Device Locked"

36+msgstr ""

37+

38+#: qml/Components/DelayedLockscreen.qml:62

39+msgid "You have been locked out due to too many failed passphrase attempts."

40+msgstr ""

41+

42+#: qml/Components/DelayedLockscreen.qml:63

43+msgid "You have been locked out due to too many failed passcode attempts."

44+msgstr ""

45+

46+#: qml/Components/DelayedLockscreen.qml:72

47+#, qt-format

48+msgid "Please wait %1 minute and then try again…"

49+msgid_plural "Please wait %1 minutes and then try again…"

50+msgstr[0] ""

51+msgstr[1] ""

52+

3353#: qml/Components/Dialogs.qml:70

3454msgid "Log out"

3555msgstr ""

@@ -132,14 +152,6 @@ msgid ""

132152"phone<br><br>Tap on the screen to start"

133153msgstr ""

134154

135−#: qml/Components/Lockscreen.qml:167

136−msgid "Please wait"

137−msgstr ""

138−

139−#: qml/Components/Lockscreen.qml:172

140−msgid "Too many incorrect attempts"

141−msgstr ""

142−

143155#: qml/Components/Lockscreen.qml:206

144156msgid "Emergency Call"

145157msgstr "panggilan Kecemasan"

@@ -148,15 +160,6 @@ msgstr "panggilan Kecemasan"

148160msgid "OK"

149161msgstr ""

150162

151−#: qml/Components/PassphraseLockscreen.qml:61

152−#, qt-format

153−msgid "Hello %1"

154−msgstr "Hai %1"

155−

156−#: qml/Components/PassphraseLockscreen.qml:61

157−msgid "Hello"

158−msgstr "Hello"

159−

160163#: qml/Dash/GenericScopeView.qml:411 qml/Dash/GenericScopeView.qml:533

161164msgid "See less"

162165msgstr ""

@@ -223,7 +226,7 @@ msgid "All"

223226msgstr ""

224227

225228#: qml/Greeter/Greeter.qml:157

226−msgid "Swipe to unlock"

229+msgid "Unlock"

227230msgstr ""

228231

229232#: qml/Hud/HudParametrizedActionsPage.qml:139

@@ -302,25 +305,29 @@ msgstr ""

302305msgid "Roaming"

303306msgstr ""

304307

305−#: qml/Shell.qml:320

306−msgid "Enter your passphrase"

308+#: qml/Shell.qml:340

309+msgid "Enter passphrase"

307310msgstr ""

308311

309312#: qml/Shell.qml:321

310313msgid "Sorry, incorrect passphrase"

311314msgstr ""

312315

313−#: qml/Shell.qml:323

314−msgid "Enter your passcode"

316+#: qml/Shell.qml:342

317+msgid "Please re-enter"

318+msgstr ""

319+

320+#: qml/Shell.qml:344

321+msgid "Enter passcode"

315322msgstr ""

316323

317324#: qml/Shell.qml:324

318325msgid "Sorry, incorrect passcode"

319326msgstr ""

320327

321−#: qml/Shell.qml:327

328+#: qml/Shell.qml:348

322329#, qt-format

323−msgid "Enter your %1"

330+msgid "Enter %1"

324331msgstr ""

325332

326333#: qml/Shell.qml:328

@@ -351,3 +358,10 @@ msgid ""

351358"If passcode is entered incorrectly, your phone will conduct a factory reset "

352359"and all personal data will be deleted."

353360msgstr ""

361+

362+#, qt-format

363+#~ msgid "Hello %1"

364+#~ msgstr "Hai %1"

365+

366+#~ msgid "Hello"

367+#~ msgstr "Hello"

po/my.po+40−26

@@ -7,14 +7,15 @@ msgid ""

77msgstr ""

88"Project-Id-Version: unity\n"

99"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10−"POT-Creation-Date: 2014-09-24 10:43+0100\n"

10+"POT-Creation-Date: 2014-10-02 10:35+0200\n"

1111"PO-Revision-Date: 2013-12-12 11:12+0000\n"

1212"Last-Translator: Pyae Sone <Unknown>\n"

1313"Language-Team: Burmese <my@li.org>\n"

1414"MIME-Version: 1.0\n"

1515"Content-Type: text/plain; charset=UTF-8\n"

1616"Content-Transfer-Encoding: 8bit\n"

17−"X-Launchpad-Export-Date: 2014-09-29 05:19+0000\n"

17+"Plural-Forms: nplurals=1; plural=0;\n"

18+"X-Launchpad-Export-Date: 2014-10-03 06:21+0000\n"

1819"X-Generator: Launchpad (build 17196)\n"

1920

2021#: plugins/LightDM/Greeter.cpp:130

@@ -30,6 +31,25 @@ msgstr ""

3031msgid "Unpin shortcut"

3132msgstr ""

3233

34+#: qml/Components/DelayedLockscreen.qml:47

35+msgid "Device Locked"

36+msgstr ""

37+

38+#: qml/Components/DelayedLockscreen.qml:62

39+msgid "You have been locked out due to too many failed passphrase attempts."

40+msgstr ""

41+

42+#: qml/Components/DelayedLockscreen.qml:63

43+msgid "You have been locked out due to too many failed passcode attempts."

44+msgstr ""

45+

46+#: qml/Components/DelayedLockscreen.qml:72

47+#, qt-format

48+msgid "Please wait %1 minute and then try again…"

49+msgid_plural "Please wait %1 minutes and then try again…"

50+msgstr[0] ""

51+msgstr[1] ""

52+

3353#: qml/Components/Dialogs.qml:70

3454msgid "Log out"

3555msgstr ""

@@ -132,14 +152,6 @@ msgid ""

132152"phone<br><br>Tap on the screen to start"

133153msgstr ""

134154

135−#: qml/Components/Lockscreen.qml:167

136−msgid "Please wait"

137−msgstr ""

138−

139−#: qml/Components/Lockscreen.qml:172

140−msgid "Too many incorrect attempts"

141−msgstr ""

142−

143155#: qml/Components/Lockscreen.qml:206

144156msgid "Emergency Call"

145157msgstr "အရေးပေါ်ခေါ်မည်"

@@ -148,15 +160,6 @@ msgstr "အရေးပေါ်ခေါ်မည်"

148160msgid "OK"

149161msgstr ""

150162

151−#: qml/Components/PassphraseLockscreen.qml:61

152−#, qt-format

153−msgid "Hello %1"

154−msgstr "ဟဲလို %1"

155−

156−#: qml/Components/PassphraseLockscreen.qml:61

157−msgid "Hello"

158−msgstr "ဟဲလို"

159−

160163#: qml/Dash/GenericScopeView.qml:411 qml/Dash/GenericScopeView.qml:533

161164msgid "See less"

162165msgstr ""

@@ -223,7 +226,7 @@ msgid "All"

223226msgstr ""

224227

225228#: qml/Greeter/Greeter.qml:157

226−msgid "Swipe to unlock"

229+msgid "Unlock"

227230msgstr ""

228231

229232#: qml/Hud/HudParametrizedActionsPage.qml:139

@@ -302,25 +305,29 @@ msgstr ""

302305msgid "Roaming"

303306msgstr ""

304307

305−#: qml/Shell.qml:320

306−msgid "Enter your passphrase"

308+#: qml/Shell.qml:340

309+msgid "Enter passphrase"

307310msgstr ""

308311

309312#: qml/Shell.qml:321

310313msgid "Sorry, incorrect passphrase"

311314msgstr ""

312315

313−#: qml/Shell.qml:323

314−msgid "Enter your passcode"

316+#: qml/Shell.qml:342

317+msgid "Please re-enter"

318+msgstr ""

319+

320+#: qml/Shell.qml:344

321+msgid "Enter passcode"

315322msgstr ""

316323

317324#: qml/Shell.qml:324

318325msgid "Sorry, incorrect passcode"

319326msgstr ""

320327

321−#: qml/Shell.qml:327

328+#: qml/Shell.qml:348

322329#, qt-format

323−msgid "Enter your %1"

330+msgid "Enter %1"

324331msgstr ""

325332

326333#: qml/Shell.qml:328

@@ -351,3 +358,10 @@ msgid ""

351358"If passcode is entered incorrectly, your phone will conduct a factory reset "

352359"and all personal data will be deleted."

353360msgstr ""

361+

362+#, qt-format

363+#~ msgid "Hello %1"

364+#~ msgstr "ဟဲလို %1"

365+

366+#~ msgid "Hello"

367+#~ msgstr "ဟဲလို"

po/nb.po+84−52

@@ -7,29 +7,51 @@ msgid ""

77msgstr ""

88"Project-Id-Version: unity\n"

99"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10−"POT-Creation-Date: 2014-09-24 10:43+0100\n"

11−"PO-Revision-Date: 2014-09-29 05:32+0000\n"

10+"POT-Creation-Date: 2014-10-02 10:35+0200\n"

11+"PO-Revision-Date: 2014-10-03 08:44+0000\n"

1212"Last-Translator: Åka Sikrom <Unknown>\n"

1313"Language-Team: Norwegian Bokmal <nb@li.org>\n"

1414"MIME-Version: 1.0\n"

1515"Content-Type: text/plain; charset=UTF-8\n"

1616"Content-Transfer-Encoding: 8bit\n"

17−"X-Launchpad-Export-Date: 2014-09-30 07:10+0000\n"

17+"Plural-Forms: nplurals=2; plural=n != 1;\n"

18+"X-Launchpad-Export-Date: 2014-10-04 06:28+0000\n"

1819"X-Generator: Launchpad (build 17196)\n"

1920

2021#: plugins/LightDM/Greeter.cpp:130

2122msgid "Password: "

2223msgstr "Passord: "

2324

24−#: plugins/Unity/Launcher/launcheritem.cpp:44

25−#: plugins/Unity/Launcher/launcheritem.cpp:74

25+#: plugins/Unity/Launcher/launcheritem.cpp:45

26+#: plugins/Unity/Launcher/launcheritem.cpp:91

2627msgid "Pin shortcut"

2728msgstr "Fest snarvei"

2829

29−#: plugins/Unity/Launcher/launcheritem.cpp:74

30+#: plugins/Unity/Launcher/launcheritem.cpp:91

3031msgid "Unpin shortcut"

3132msgstr "Fjern snarvei"

3233

34+#: qml/Components/DelayedLockscreen.qml:47

35+msgid "Device Locked"

36+msgstr "Enheten er låst"

37+

38+#: qml/Components/DelayedLockscreen.qml:62

39+msgid "You have been locked out due to too many failed passphrase attempts."

40+msgstr ""

41+"Du har skrevet inn feil passordfrase for mange ganger, og er derfor "

42+"utestengt."

43+

44+#: qml/Components/DelayedLockscreen.qml:63

45+msgid "You have been locked out due to too many failed passcode attempts."

46+msgstr "Du har tastet feil kode for mange ganger, og er derfor utestengt."

47+

48+#: qml/Components/DelayedLockscreen.qml:72

49+#, qt-format

50+msgid "Please wait %1 minute and then try again…"

51+msgid_plural "Please wait %1 minutes and then try again…"

52+msgstr[0] "Vent i %1 minutt, og prøv deretter på nytt …"

53+msgstr[1] "Vent i %1 minutter, og prøv deretter på nytt …"

54+

3355#: qml/Components/Dialogs.qml:70

3456msgid "Log out"

3557msgstr "Logg ut"

@@ -136,14 +158,6 @@ msgstr ""

136158"Du har nå mestret kantbevegelsene, og er klar til å bruke "

137159"telefonen<br><br>Trykk på skjermen for å begynne"

138160

139−#: qml/Components/Lockscreen.qml:167

140−msgid "Please wait"

141−msgstr "Vent litt"

142−

143−#: qml/Components/Lockscreen.qml:172

144−msgid "Too many incorrect attempts"

145−msgstr "Du har tastet feil for mange ganger"

146−

147161#: qml/Components/Lockscreen.qml:206

148162msgid "Emergency Call"

149163msgstr "Nødanrop"

@@ -152,24 +166,15 @@ msgstr "Nødanrop"

152166msgid "OK"

153167msgstr "OK"

154168

155−#: qml/Components/PassphraseLockscreen.qml:61

156−#, qt-format

157−msgid "Hello %1"

158−msgstr "Hei, %1"

159−

160−#: qml/Components/PassphraseLockscreen.qml:61

161−msgid "Hello"

162−msgstr "Hei"

163−

164−#: qml/Dash/GenericScopeView.qml:364 qml/Dash/GenericScopeView.qml:483

169+#: qml/Dash/GenericScopeView.qml:411 qml/Dash/GenericScopeView.qml:533

165170msgid "See less"

166171msgstr "Vis mindre"

167172

168−#: qml/Dash/GenericScopeView.qml:364

173+#: qml/Dash/GenericScopeView.qml:411

169174msgid "See all"

170175msgstr "Vis alt"

171176

172−#: qml/Dash/GenericScopeView.qml:427 qml/Dash/PageHeader.qml:258

177+#: qml/Dash/GenericScopeView.qml:473 qml/Dash/PageHeader.qml:258

173178#: qml/Panel/SearchIndicator.qml:27

174179msgid "Search"

175180msgstr "Søk"

@@ -227,8 +232,8 @@ msgid "All"

227232msgstr "Alt"

228233

229234#: qml/Greeter/Greeter.qml:157

230−msgid "Swipe to unlock"

231−msgstr "Skyv for å låse opp"

235+msgid "Unlock"

236+msgstr "Lås opp"

232237

233238#: qml/Hud/HudParametrizedActionsPage.qml:139

234239msgid "Confirm"

@@ -274,27 +279,27 @@ msgstr "Konferanse"

274279msgid "Nothing is playing"

275280msgstr "Ingenting spilles nå"

276281

277−#: qml/Panel/Indicators/MenuItemFactory.qml:651

282+#: qml/Panel/Indicators/MenuItemFactory.qml:748

278283msgid "In queue…"

279284msgstr "I kø …"

280285

281−#: qml/Panel/Indicators/MenuItemFactory.qml:655

286+#: qml/Panel/Indicators/MenuItemFactory.qml:752

282287msgid "Downloading"

283288msgstr "Laster ned"

284289

285−#: qml/Panel/Indicators/MenuItemFactory.qml:657

290+#: qml/Panel/Indicators/MenuItemFactory.qml:754

286291msgid "Paused, tap to resume"

287292msgstr "Satt på pause (trykk for å fortsette)"

288293

289−#: qml/Panel/Indicators/MenuItemFactory.qml:659

294+#: qml/Panel/Indicators/MenuItemFactory.qml:756

290295msgid "Canceled"

291296msgstr "Avbrutt"

292297

293−#: qml/Panel/Indicators/MenuItemFactory.qml:661

298+#: qml/Panel/Indicators/MenuItemFactory.qml:758

294299msgid "Finished"

295300msgstr "Ferdig"

296301

297−#: qml/Panel/Indicators/MenuItemFactory.qml:663

302+#: qml/Panel/Indicators/MenuItemFactory.qml:760

298303msgid "Failed, tap to retry"

299304msgstr "Feilet. Trykk for å prøve på nytt"

300305

@@ -306,45 +311,49 @@ msgstr "Lås opp SIM"

306311msgid "Roaming"

307312msgstr "Fremmednett"

308313

309−#: qml/Shell.qml:292

310−msgid "Enter your passphrase"

311−msgstr "Skriv inn passordfrasen din"

314+#: qml/Shell.qml:340

315+msgid "Enter passphrase"

316+msgstr "Skriv inn passordfrase"

312317

313−#: qml/Shell.qml:293

318+#: qml/Shell.qml:321

314319msgid "Sorry, incorrect passphrase"

315320msgstr "Feil passordfrase"

316321

317−#: qml/Shell.qml:295

318−msgid "Enter your passcode"

319−msgstr "Tast koden din"

322+#: qml/Shell.qml:342

323+msgid "Please re-enter"

324+msgstr "Skriv inn på nytt"

320325

321−#: qml/Shell.qml:296

326+#: qml/Shell.qml:344

327+msgid "Enter passcode"

328+msgstr "Tast kode"

329+

330+#: qml/Shell.qml:324

322331msgid "Sorry, incorrect passcode"

323332msgstr "Feil kode"

324333

325−#: qml/Shell.qml:299

334+#: qml/Shell.qml:348

326335#, qt-format

327−msgid "Enter your %1"

336+msgid "Enter %1"

328337msgstr "Skriv inn %1"

329338

330−#: qml/Shell.qml:300

339+#: qml/Shell.qml:328

331340#, qt-format

332341msgid "Sorry, incorrect %1"

333342msgstr "Feil %1"

334343

335−#: qml/Shell.qml:335

344+#: qml/Shell.qml:363

336345msgid "Sorry, incorrect passphrase."

337346msgstr "Feil passordfrase."

338347

339−#: qml/Shell.qml:336

348+#: qml/Shell.qml:364

340349msgid "Sorry, incorrect passcode."

341350msgstr "Feil kode."

342351

343−#: qml/Shell.qml:337

352+#: qml/Shell.qml:365

344353msgid "This will be your last attempt."

345354msgstr "Dette er ditt siste forsøk."

346355

347−#: qml/Shell.qml:339

356+#: qml/Shell.qml:367

348357msgid ""

349358"If passphrase is entered incorrectly, your phone will conduct a factory "

350359"reset and all personal data will be deleted."

@@ -352,7 +361,7 @@ msgstr ""

352361"Hvis du skriver feil passordfrase en gang til, tilbakestilles telefonen til "

353362"fabrikkinnstillinger, og alle personlige data slettes."

354363

355−#: qml/Shell.qml:340

364+#: qml/Shell.qml:368

356365msgid ""

357366"If passcode is entered incorrectly, your phone will conduct a factory reset "

358367"and all personal data will be deleted."

@@ -360,5 +369,28 @@ msgstr ""

360369"Hvis du skriver feil kode en gang til, tilbakestilles telefonen til "

361370"fabrikkinnstillinger, og alle personlige data slettes."

362371

363−#~ msgid "Manage Dash"

364−#~ msgstr "Håndter dashbord"

372+#~ msgid "Hello"

373+#~ msgstr "Hei"

374+

375+#, qt-format

376+#~ msgid "Hello %1"

377+#~ msgstr "Hei, %1"

378+

379+#~ msgid "Please wait"

380+#~ msgstr "Vent litt"

381+

382+#~ msgid "Too many incorrect attempts"

383+#~ msgstr "Du har tastet feil for mange ganger"

384+

385+#, qt-format

386+#~ msgid "Enter your %1"

387+#~ msgstr "Skriv inn %1"

388+

389+#~ msgid "Enter your passphrase"

390+#~ msgstr "Skriv inn passordfrasen din"

391+

392+#~ msgid "Swipe to unlock"

393+#~ msgstr "Skyv for å låse opp"

394+

395+#~ msgid "Enter your passcode"

396+#~ msgstr "Tast koden din"

po/nl.po+67−33

@@ -7,14 +7,15 @@ msgid ""

77msgstr ""

88"Project-Id-Version: unity\n"

99"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10−"POT-Creation-Date: 2014-09-24 10:43+0100\n"

11−"PO-Revision-Date: 2014-09-28 16:19+0000\n"

10+"POT-Creation-Date: 2014-10-02 10:35+0200\n"

11+"PO-Revision-Date: 2014-10-03 18:53+0000\n"

1212"Last-Translator: rob <linuxned@gmail.com>\n"

1313"Language-Team: Dutch <nl@li.org>\n"

1414"MIME-Version: 1.0\n"

1515"Content-Type: text/plain; charset=UTF-8\n"

1616"Content-Transfer-Encoding: 8bit\n"

17−"X-Launchpad-Export-Date: 2014-09-29 05:19+0000\n"

17+"Plural-Forms: nplurals=2; plural=n != 1;\n"

18+"X-Launchpad-Export-Date: 2014-10-04 06:28+0000\n"

1819"X-Generator: Launchpad (build 17196)\n"

1920

2021#: plugins/LightDM/Greeter.cpp:130

@@ -30,6 +31,29 @@ msgstr "Snelkoppeling vastzetten"

3031msgid "Unpin shortcut"

3132msgstr "Snelkoppeling losmaken"

3233

34+#: qml/Components/DelayedLockscreen.qml:47

35+msgid "Device Locked"

36+msgstr "Apparaat vergrendeld"

37+

38+#: qml/Components/DelayedLockscreen.qml:62

39+msgid "You have been locked out due to too many failed passphrase attempts."

40+msgstr ""

41+"U werd de toegang geweigerd omdat u te vaak een onjuiste wachtwoordzin heeft "

42+"ingevoerd."

43+

44+#: qml/Components/DelayedLockscreen.qml:63

45+msgid "You have been locked out due to too many failed passcode attempts."

46+msgstr ""

47+"U werd de toegang geweigerd omdat u te vaak een onjuiste toegangscode heeft "

48+"ingevoerd."

49+

50+#: qml/Components/DelayedLockscreen.qml:72

51+#, qt-format

52+msgid "Please wait %1 minute and then try again…"

53+msgid_plural "Please wait %1 minutes and then try again…"

54+msgstr[0] "Wacht a.u.b. %1 minuut en probeer het dan opnieuw…"

55+msgstr[1] "Wacht a.u.b. %1 minuten en probeer het dan opnieuw…"

56+

3357#: qml/Components/Dialogs.qml:70

3458msgid "Log out"

3559msgstr "Afmelden"

@@ -136,14 +160,6 @@ msgstr ""

136160"Nu u de bewegingen vanuit de randen onder de knie heeft, kunt u beginnen met "

137161"het gebruiken van de telefoon<br><br>Tik op het scherm om te beginnen"

138162

139−#: qml/Components/Lockscreen.qml:167

140−msgid "Please wait"

141−msgstr "Even geduld a.u.b."

142−

143−#: qml/Components/Lockscreen.qml:172

144−msgid "Too many incorrect attempts"

145−msgstr "Te veel mislukte pogingen"

146−

147163#: qml/Components/Lockscreen.qml:206

148164msgid "Emergency Call"

149165msgstr "Noodoproep"

@@ -152,15 +168,6 @@ msgstr "Noodoproep"

152168msgid "OK"

153169msgstr "Ok"

154170

155−#: qml/Components/PassphraseLockscreen.qml:61

156−#, qt-format

157−msgid "Hello %1"

158−msgstr "Hallo %1"

159−

160−#: qml/Components/PassphraseLockscreen.qml:61

161−msgid "Hello"

162−msgstr "Hallo"

163−

164171#: qml/Dash/GenericScopeView.qml:411 qml/Dash/GenericScopeView.qml:533

165172msgid "See less"

166173msgstr "Minder zien"

@@ -227,8 +234,8 @@ msgid "All"

227234msgstr "Alles"

228235

229236#: qml/Greeter/Greeter.qml:157

230−msgid "Swipe to unlock"

231−msgstr "Veeg om te ontgrendelen"

237+msgid "Unlock"

238+msgstr "Ontgrendelen"

232239

233240#: qml/Hud/HudParametrizedActionsPage.qml:139

234241msgid "Confirm"

@@ -306,26 +313,30 @@ msgstr "Simkaart deblokkeren"

306313msgid "Roaming"

307314msgstr "Roaming"

308315

309−#: qml/Shell.qml:320

310−msgid "Enter your passphrase"

311−msgstr "Voer uw wachtwoordzin in"

316+#: qml/Shell.qml:340

317+msgid "Enter passphrase"

318+msgstr "Voer wachtwoordzin in"

312319

313320#: qml/Shell.qml:321

314321msgid "Sorry, incorrect passphrase"

315322msgstr "Sorry, onjuiste wachtwoordzin"

316323

317−#: qml/Shell.qml:323

318−msgid "Enter your passcode"

319−msgstr "Voer uw toegangscode in"

324+#: qml/Shell.qml:342

325+msgid "Please re-enter"

326+msgstr "Herhaal deze a.u.b."

327+

328+#: qml/Shell.qml:344

329+msgid "Enter passcode"

330+msgstr "Voer toegangscode in"

320331

321332#: qml/Shell.qml:324

322333msgid "Sorry, incorrect passcode"

323334msgstr "Sorry, onjuiste toegangscode"

324335

325−#: qml/Shell.qml:327

336+#: qml/Shell.qml:348

326337#, qt-format

327−msgid "Enter your %1"

328−msgstr "Voer uw %1 in"

338+msgid "Enter %1"

339+msgstr "Voer %1 in"

329340

330341#: qml/Shell.qml:328

331342#, qt-format

@@ -360,5 +371,28 @@ msgstr ""

360371"Wanneer de toegangscode nu opnieuw onjuist wordt ingevoerd, zal uw telefoon "

361372"teruggaan naar de fabrieksinstellingen en zal al uw eigen data verloren gaan."

362373

363−#~ msgid "Manage Dash"

364−#~ msgstr "Snelzoeker-beheer"

374+#, qt-format

375+#~ msgid "Hello %1"

376+#~ msgstr "Hallo %1"

377+

378+#~ msgid "Hello"

379+#~ msgstr "Hallo"

380+

381+#~ msgid "Swipe to unlock"

382+#~ msgstr "Veeg om te ontgrendelen"

383+

384+#~ msgid "Please wait"

385+#~ msgstr "Even geduld a.u.b."

386+

387+#, qt-format

388+#~ msgid "Enter your %1"

389+#~ msgstr "Voer uw %1 in"

390+

391+#~ msgid "Too many incorrect attempts"

392+#~ msgstr "Te veel mislukte pogingen"

393+

394+#~ msgid "Enter your passphrase"

395+#~ msgstr "Voer uw wachtwoordzin in"

396+

397+#~ msgid "Enter your passcode"

398+#~ msgstr "Voer uw toegangscode in"

po/pl.po+45−27

@@ -7,14 +7,16 @@ msgid ""

77msgstr ""

88"Project-Id-Version: unity\n"

99"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10−"POT-Creation-Date: 2014-09-24 10:43+0100\n"

10+"POT-Creation-Date: 2014-10-02 10:35+0200\n"

1111"PO-Revision-Date: 2014-08-18 20:25+0000\n"

1212"Last-Translator: Paweł Stroka <pawstr@gmail.com>\n"

1313"Language-Team: Polish <pl@li.org>\n"

1414"MIME-Version: 1.0\n"

1515"Content-Type: text/plain; charset=UTF-8\n"

1616"Content-Transfer-Encoding: 8bit\n"

17−"X-Launchpad-Export-Date: 2014-09-29 05:20+0000\n"

17+"Plural-Forms: nplurals=3; plural=n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "

18+"|| n%100>=20) ? 1 : 2;\n"

19+"X-Launchpad-Export-Date: 2014-10-03 06:22+0000\n"

1820"X-Generator: Launchpad (build 17196)\n"

1921

2022#: plugins/LightDM/Greeter.cpp:130

@@ -30,6 +32,25 @@ msgstr "Przypnij skrót"

3032msgid "Unpin shortcut"

3133msgstr "Odepnij skrót"

3234

35+#: qml/Components/DelayedLockscreen.qml:47

36+msgid "Device Locked"

37+msgstr ""

38+

39+#: qml/Components/DelayedLockscreen.qml:62

40+msgid "You have been locked out due to too many failed passphrase attempts."

41+msgstr ""

42+

43+#: qml/Components/DelayedLockscreen.qml:63

44+msgid "You have been locked out due to too many failed passcode attempts."

45+msgstr ""

46+

47+#: qml/Components/DelayedLockscreen.qml:72

48+#, qt-format

49+msgid "Please wait %1 minute and then try again…"

50+msgid_plural "Please wait %1 minutes and then try again…"

51+msgstr[0] ""

52+msgstr[1] ""

53+

3354#: qml/Components/Dialogs.qml:70

3455msgid "Log out"

3556msgstr ""

@@ -136,14 +157,6 @@ msgstr ""

136157"Wydawanie poleceń krawędzi zostało opanowane. Urządzenie gotowe do "

137158"pracy.<br><br>Dotknij ekranu by rozpocząć"

138159

139−#: qml/Components/Lockscreen.qml:167

140−msgid "Please wait"

141−msgstr ""

142−

143−#: qml/Components/Lockscreen.qml:172

144−msgid "Too many incorrect attempts"

145−msgstr ""

146−

147160#: qml/Components/Lockscreen.qml:206

148161msgid "Emergency Call"

149162msgstr "Telefon ratunkowy"

@@ -152,15 +165,6 @@ msgstr "Telefon ratunkowy"

152165msgid "OK"

153166msgstr "OK"

154167

155−#: qml/Components/PassphraseLockscreen.qml:61

156−#, qt-format

157−msgid "Hello %1"

158−msgstr "Witaj %1"

159−

160−#: qml/Components/PassphraseLockscreen.qml:61

161−msgid "Hello"

162−msgstr "Witaj"

163−

164168#: qml/Dash/GenericScopeView.qml:411 qml/Dash/GenericScopeView.qml:533

165169msgid "See less"

166170msgstr "Zobacz mniej"

@@ -227,8 +231,8 @@ msgid "All"

227231msgstr ""

228232

229233#: qml/Greeter/Greeter.qml:157

230−msgid "Swipe to unlock"

231−msgstr "Przeciągnij aby odblokować"

234+msgid "Unlock"

235+msgstr ""

232236

233237#: qml/Hud/HudParametrizedActionsPage.qml:139

234238msgid "Confirm"

@@ -306,25 +310,29 @@ msgstr ""

306310msgid "Roaming"

307311msgstr ""

308312

309−#: qml/Shell.qml:320

310−msgid "Enter your passphrase"

313+#: qml/Shell.qml:340

314+msgid "Enter passphrase"

311315msgstr ""

312316

313317#: qml/Shell.qml:321

314318msgid "Sorry, incorrect passphrase"

315319msgstr ""

316320

317−#: qml/Shell.qml:323

318−msgid "Enter your passcode"

321+#: qml/Shell.qml:342

322+msgid "Please re-enter"

323+msgstr ""

324+

325+#: qml/Shell.qml:344

326+msgid "Enter passcode"

319327msgstr ""

320328

321329#: qml/Shell.qml:324

322330msgid "Sorry, incorrect passcode"

323331msgstr ""

324332

325−#: qml/Shell.qml:327

333+#: qml/Shell.qml:348

326334#, qt-format

327−msgid "Enter your %1"

335+msgid "Enter %1"

328336msgstr ""

329337

330338#: qml/Shell.qml:328

@@ -355,3 +363,13 @@ msgid ""

355363"If passcode is entered incorrectly, your phone will conduct a factory reset "

356364"and all personal data will be deleted."

357365msgstr ""

366+

367+#, qt-format

368+#~ msgid "Hello %1"

369+#~ msgstr "Witaj %1"

370+

371+#~ msgid "Hello"

372+#~ msgstr "Witaj"

373+

374+#~ msgid "Swipe to unlock"

375+#~ msgstr "Przeciągnij aby odblokować"

po/pt.po+63−33

@@ -7,14 +7,15 @@ msgid ""

77msgstr ""

88"Project-Id-Version: unity8\n"

99"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10−"POT-Creation-Date: 2014-09-24 10:43+0100\n"

11−"PO-Revision-Date: 2014-09-28 18:52+0000\n"

10+"POT-Creation-Date: 2014-10-02 10:35+0200\n"

11+"PO-Revision-Date: 2014-10-03 16:17+0000\n"

1212"Last-Translator: Ivo Xavier <ivofernandes12@gmail.com>\n"

1313"Language-Team: Portuguese <pt@li.org>\n"

1414"MIME-Version: 1.0\n"

1515"Content-Type: text/plain; charset=UTF-8\n"

1616"Content-Transfer-Encoding: 8bit\n"

17−"X-Launchpad-Export-Date: 2014-09-29 05:20+0000\n"

17+"Plural-Forms: nplurals=2; plural=n != 1;\n"

18+"X-Launchpad-Export-Date: 2014-10-04 06:28+0000\n"

1819"X-Generator: Launchpad (build 17196)\n"

1920

2021#: plugins/LightDM/Greeter.cpp:130

@@ -30,6 +31,25 @@ msgstr "Afixar atalho"

3031msgid "Unpin shortcut"

3132msgstr "Remover atalho"

3233

34+#: qml/Components/DelayedLockscreen.qml:47

35+msgid "Device Locked"

36+msgstr "Dispositivo bloqueado"

37+

38+#: qml/Components/DelayedLockscreen.qml:62

39+msgid "You have been locked out due to too many failed passphrase attempts."

40+msgstr "Foi bloqueado devido a muitas tentativas falhadas da frase-senha."

41+

42+#: qml/Components/DelayedLockscreen.qml:63

43+msgid "You have been locked out due to too many failed passcode attempts."

44+msgstr "Foi bloqueado devido a muitas tentativas falhadas da senha."

45+

46+#: qml/Components/DelayedLockscreen.qml:72

47+#, qt-format

48+msgid "Please wait %1 minute and then try again…"

49+msgid_plural "Please wait %1 minutes and then try again…"

50+msgstr[0] "Por favor, aguarde %1 minuto e tente novamente…"

51+msgstr[1] "Por favor, aguarde %1 minutos e tente novamente…"

52+

3353#: qml/Components/Dialogs.qml:70

3454msgid "Log out"

3555msgstr "Terminar sessão"

@@ -137,14 +157,6 @@ msgstr ""

137157"Já domina os gestos dos limites e pode começar a usar o "

138158"telefone<br><br>Toque no ecrã para começar"

139159

140−#: qml/Components/Lockscreen.qml:167

141−msgid "Please wait"

142−msgstr "Por favor aguarde"

143−

144−#: qml/Components/Lockscreen.qml:172

145−msgid "Too many incorrect attempts"

146−msgstr "Demasiadas tentativas incorrectas"

147−

148160#: qml/Components/Lockscreen.qml:206

149161msgid "Emergency Call"

150162msgstr "Chamada de emergência"

@@ -153,15 +165,6 @@ msgstr "Chamada de emergência"

153165msgid "OK"

154166msgstr "OK"

155167

156−#: qml/Components/PassphraseLockscreen.qml:61

157−#, qt-format

158−msgid "Hello %1"

159−msgstr "Olá %1"

160−

161−#: qml/Components/PassphraseLockscreen.qml:61

162−msgid "Hello"

163−msgstr "Olá"

164−

165168#: qml/Dash/GenericScopeView.qml:411 qml/Dash/GenericScopeView.qml:533

166169msgid "See less"

167170msgstr "Ver menos"

@@ -228,8 +231,8 @@ msgid "All"

228231msgstr "Todos"

229232

230233#: qml/Greeter/Greeter.qml:157

231−msgid "Swipe to unlock"

232−msgstr "Deslize para desbloquear"

234+msgid "Unlock"

235+msgstr "Desbloquear"

233236

234237#: qml/Hud/HudParametrizedActionsPage.qml:139

235238msgid "Confirm"

@@ -307,26 +310,30 @@ msgstr "Desbloquear SIM"

307310msgid "Roaming"

308311msgstr "Roaming"

309312

310−#: qml/Shell.qml:320

311−msgid "Enter your passphrase"

312−msgstr "Introduza a sua frase-senha"

313+#: qml/Shell.qml:340

314+msgid "Enter passphrase"

315+msgstr "Indique a frase-senha"

313316

314317#: qml/Shell.qml:321

315318msgid "Sorry, incorrect passphrase"

316319msgstr "Desculpe, frase-senha incorreta"

317320

318−#: qml/Shell.qml:323

319−msgid "Enter your passcode"

320−msgstr "Introduza a sua senha"

321+#: qml/Shell.qml:342

322+msgid "Please re-enter"

323+msgstr "Por favor, volte a introduzir"

324+

325+#: qml/Shell.qml:344

326+msgid "Enter passcode"

327+msgstr "Introduza senha"

321328

322329#: qml/Shell.qml:324

323330msgid "Sorry, incorrect passcode"

324331msgstr "Desculpe, senha incorreta"

325332

326−#: qml/Shell.qml:327

333+#: qml/Shell.qml:348

327334#, qt-format

328−msgid "Enter your %1"

329−msgstr "Introduza o seu %1"

335+msgid "Enter %1"

336+msgstr "Introduziu %1"

330337

331338#: qml/Shell.qml:328

332339#, qt-format

@@ -361,5 +368,28 @@ msgstr ""

361368"Se a senha for introduzida incorretamente, o seu telemóvel vai apagar todos "

362369"os seus dados pessoais."

363370

364−#~ msgid "Manage Dash"

365−#~ msgstr "Gerir o Dash"

371+#, qt-format

372+#~ msgid "Hello %1"

373+#~ msgstr "Olá %1"

374+

375+#~ msgid "Hello"

376+#~ msgstr "Olá"

377+

378+#~ msgid "Swipe to unlock"

379+#~ msgstr "Deslize para desbloquear"

380+

381+#~ msgid "Please wait"

382+#~ msgstr "Por favor aguarde"

383+

384+#~ msgid "Too many incorrect attempts"

385+#~ msgstr "Demasiadas tentativas incorrectas"

386+

387+#, qt-format

388+#~ msgid "Enter your %1"

389+#~ msgstr "Introduza o seu %1"

390+

391+#~ msgid "Enter your passphrase"

392+#~ msgstr "Introduza a sua frase-senha"

393+

394+#~ msgid "Enter your passcode"

395+#~ msgstr "Introduza a sua senha"

po/pt_BR.po+63−30

@@ -7,14 +7,15 @@ msgid ""

77msgstr ""

88"Project-Id-Version: unity\n"

99"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10−"POT-Creation-Date: 2014-09-24 10:43+0100\n"

10+"POT-Creation-Date: 2014-10-02 10:35+0200\n"

1111"PO-Revision-Date: 2014-09-30 17:37+0000\n"

1212"Last-Translator: Rafael Neri <Unknown>\n"

1313"Language-Team: Brazilian Portuguese <pt_BR@li.org>\n"

1414"MIME-Version: 1.0\n"

1515"Content-Type: text/plain; charset=UTF-8\n"

1616"Content-Transfer-Encoding: 8bit\n"

17−"X-Launchpad-Export-Date: 2014-10-02 06:38+0000\n"

17+"Plural-Forms: nplurals=2; plural=n > 1;\n"

18+"X-Launchpad-Export-Date: 2014-10-03 06:22+0000\n"

1819"X-Generator: Launchpad (build 17196)\n"

1920

2021#: plugins/LightDM/Greeter.cpp:130

@@ -30,6 +31,25 @@ msgstr "Fixar atalho"

3031msgid "Unpin shortcut"

3132msgstr "Desafixar atalho"

3233

34+#: qml/Components/DelayedLockscreen.qml:47

35+msgid "Device Locked"

36+msgstr ""

37+

38+#: qml/Components/DelayedLockscreen.qml:62

39+msgid "You have been locked out due to too many failed passphrase attempts."

40+msgstr ""

41+

42+#: qml/Components/DelayedLockscreen.qml:63

43+msgid "You have been locked out due to too many failed passcode attempts."

44+msgstr ""

45+

46+#: qml/Components/DelayedLockscreen.qml:72

47+#, qt-format

48+msgid "Please wait %1 minute and then try again…"

49+msgid_plural "Please wait %1 minutes and then try again…"

50+msgstr[0] ""

51+msgstr[1] ""

52+

3353#: qml/Components/Dialogs.qml:70

3454msgid "Log out"

3555msgstr "Sair"

@@ -138,14 +158,6 @@ msgstr ""

138158"Agora você já domina os gestos das bordas e pode começar a usar o "

139159"telefone<br><br>Toque na tela para iniciar"

140160

141−#: qml/Components/Lockscreen.qml:167

142−msgid "Please wait"

143−msgstr "Por favor, aguarde"

144−

145−#: qml/Components/Lockscreen.qml:172

146−msgid "Too many incorrect attempts"

147−msgstr "Muitas tentativas incorretas"

148−

149161#: qml/Components/Lockscreen.qml:206

150162msgid "Emergency Call"

151163msgstr "Chamada de emergência"

@@ -154,15 +166,6 @@ msgstr "Chamada de emergência"

154166msgid "OK"

155167msgstr "OK"

156168

157−#: qml/Components/PassphraseLockscreen.qml:61

158−#, qt-format

159−msgid "Hello %1"

160−msgstr "Olá %1"

161−

162−#: qml/Components/PassphraseLockscreen.qml:61

163−msgid "Hello"

164−msgstr "Olá"

165−

166169#: qml/Dash/GenericScopeView.qml:411 qml/Dash/GenericScopeView.qml:533

167170msgid "See less"

168171msgstr "Ver menos"

@@ -229,8 +232,8 @@ msgid "All"

229232msgstr "Tudo"

230233

231234#: qml/Greeter/Greeter.qml:157

232−msgid "Swipe to unlock"

233−msgstr "Deslizar para desbloquear"

235+msgid "Unlock"

236+msgstr ""

234237

235238#: qml/Hud/HudParametrizedActionsPage.qml:139

236239msgid "Confirm"

@@ -308,26 +311,30 @@ msgstr "Desbloquear SIM"

308311msgid "Roaming"

309312msgstr "Roaming"

310313

311−#: qml/Shell.qml:320

312−msgid "Enter your passphrase"

313−msgstr "Digite sua senha"

314+#: qml/Shell.qml:340

315+msgid "Enter passphrase"

316+msgstr ""

314317

315318#: qml/Shell.qml:321

316319msgid "Sorry, incorrect passphrase"

317320msgstr "Desculpe, senha incorreta"

318321

319−#: qml/Shell.qml:323

320−msgid "Enter your passcode"

321−msgstr "Digite sua senha"

322+#: qml/Shell.qml:342

323+msgid "Please re-enter"

324+msgstr ""

325+

326+#: qml/Shell.qml:344

327+msgid "Enter passcode"

328+msgstr ""

322329

323330#: qml/Shell.qml:324

324331msgid "Sorry, incorrect passcode"

325332msgstr "Desculpe, senha incorreta"

326333

327−#: qml/Shell.qml:327

334+#: qml/Shell.qml:348

328335#, qt-format

329−msgid "Enter your %1"

330−msgstr "Digite o seu %1"

336+msgid "Enter %1"

337+msgstr ""

331338

332339#: qml/Shell.qml:328

333340#, qt-format

@@ -362,5 +369,31 @@ msgstr ""

362369"Se o código de acesso for digitado incorretamente, o telefone será "

363370"restaurado aos padrões de fábrica e todos os dados pessoais serão apagados."

364371

372+#, qt-format

373+#~ msgid "Hello %1"

374+#~ msgstr "Olá %1"

375+

376+#~ msgid "Hello"

377+#~ msgstr "Olá"

378+

379+#~ msgid "Swipe to unlock"

380+#~ msgstr "Deslizar para desbloquear"

381+

382+#~ msgid "Too many incorrect attempts"

383+#~ msgstr "Muitas tentativas incorretas"

384+

385+#, qt-format

386+#~ msgid "Enter your %1"

387+#~ msgstr "Digite o seu %1"

388+

389+#~ msgid "Please wait"

390+#~ msgstr "Por favor, aguarde"

391+

365392#~ msgid "Manage Dash"

366393#~ msgstr "Gerencia painel"

394+

395+#~ msgid "Enter your passphrase"

396+#~ msgstr "Digite sua senha"

397+

398+#~ msgid "Enter your passcode"

399+#~ msgstr "Digite sua senha"

po/ro.po+67−32

@@ -7,14 +7,16 @@ msgid ""

77msgstr ""

88"Project-Id-Version: unity\n"

99"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10−"POT-Creation-Date: 2014-09-24 10:43+0100\n"

11−"PO-Revision-Date: 2014-09-28 13:24+0000\n"

10+"POT-Creation-Date: 2014-10-02 10:35+0200\n"

11+"PO-Revision-Date: 2014-10-04 11:36+0000\n"

1212"Last-Translator: Marian Vasile <marianvasile1972@gmail.com>\n"

1313"Language-Team: Romanian <ro@li.org>\n"

1414"MIME-Version: 1.0\n"

1515"Content-Type: text/plain; charset=UTF-8\n"

1616"Content-Transfer-Encoding: 8bit\n"

17−"X-Launchpad-Export-Date: 2014-09-29 05:20+0000\n"

17+"Plural-Forms: nplurals=3; plural=(n == 1 ? 0: (((n % 100 > 19) || ((n % 100 "

18+"== 0) && (n != 0))) ? 2: 1));\n"

19+"X-Launchpad-Export-Date: 2014-10-05 06:38+0000\n"

1820"X-Generator: Launchpad (build 17196)\n"

1921

2022#: plugins/LightDM/Greeter.cpp:130

@@ -30,6 +32,29 @@ msgstr "Fixează scurtătura"

3032msgid "Unpin shortcut"

3133msgstr "Eliberează scurtătura"

3234

35+#: qml/Components/DelayedLockscreen.qml:47

36+msgid "Device Locked"

37+msgstr "Dispozitiv blocat"

38+

39+#: qml/Components/DelayedLockscreen.qml:62

40+msgid "You have been locked out due to too many failed passphrase attempts."

41+msgstr ""

42+"Dispozitivul este blocat din cauza utilizării mai multor fraze parolă "

43+"greșite."

44+

45+#: qml/Components/DelayedLockscreen.qml:63

46+msgid "You have been locked out due to too many failed passcode attempts."

47+msgstr ""

48+"Dispozitivul este blocat din cauza utilizării mai multor parole greșite."

49+

50+#: qml/Components/DelayedLockscreen.qml:72

51+#, qt-format

52+msgid "Please wait %1 minute and then try again…"

53+msgid_plural "Please wait %1 minutes and then try again…"

54+msgstr[0] "Așteptați %1 minut și apoi încercați din nou..."

55+msgstr[1] "Așteptați %1 minute și apoi încercați din nou..."

56+msgstr[2] "Așteptați %1 de minute și apoi încercați din nou..."

57+

3358#: qml/Components/Dialogs.qml:70

3459msgid "Log out"

3560msgstr "Închide sesiunea"

@@ -139,14 +164,6 @@ msgstr ""

139164"De acum stăpâniți gesturile de control și puteți începe să utilizați "

140165"telefonul<br><br>Atingeți ecranul pentru a începe"

141166

142−#: qml/Components/Lockscreen.qml:167

143−msgid "Please wait"

144−msgstr "Așteptați"

145−

146−#: qml/Components/Lockscreen.qml:172

147−msgid "Too many incorrect attempts"

148−msgstr "Prea multe încercări greșite"

149−

150167#: qml/Components/Lockscreen.qml:206

151168msgid "Emergency Call"

152169msgstr "Apel de urgență"

@@ -155,15 +172,6 @@ msgstr "Apel de urgență"

155172msgid "OK"

156173msgstr "În regulă"

157174

158−#: qml/Components/PassphraseLockscreen.qml:61

159−#, qt-format

160−msgid "Hello %1"

161−msgstr "Salutări %1"

162−

163−#: qml/Components/PassphraseLockscreen.qml:61

164−msgid "Hello"

165−msgstr "Salutări"

166−

167175#: qml/Dash/GenericScopeView.qml:411 qml/Dash/GenericScopeView.qml:533

168176msgid "See less"

169177msgstr "Afișează mai puține"

@@ -230,8 +238,8 @@ msgid "All"

230238msgstr "Tot"

231239

232240#: qml/Greeter/Greeter.qml:157

233−msgid "Swipe to unlock"

234−msgstr "Glisați pentru deblocare"

241+msgid "Unlock"

242+msgstr "Deblocare"

235243

236244#: qml/Hud/HudParametrizedActionsPage.qml:139

237245msgid "Confirm"

@@ -309,26 +317,30 @@ msgstr "Deblocare SIM"

309317msgid "Roaming"

310318msgstr "Roaming"

311319

312−#: qml/Shell.qml:320

313−msgid "Enter your passphrase"

314−msgstr "Introduceți fraza dumneavoastră secretă"

320+#: qml/Shell.qml:340

321+msgid "Enter passphrase"

322+msgstr "Introduceți fraza parolă"

315323

316324#: qml/Shell.qml:321

317325msgid "Sorry, incorrect passphrase"

318326msgstr "Frază secretă incorectă"

319327

320−#: qml/Shell.qml:323

321−msgid "Enter your passcode"

328+#: qml/Shell.qml:342

329+msgid "Please re-enter"

330+msgstr "Introduceți din nou"

331+

332+#: qml/Shell.qml:344

333+msgid "Enter passcode"

322334msgstr "Introduceți parola"

323335

324336#: qml/Shell.qml:324

325337msgid "Sorry, incorrect passcode"

326338msgstr "Parolă incorectă"

327339

328−#: qml/Shell.qml:327

340+#: qml/Shell.qml:348

329341#, qt-format

330−msgid "Enter your %1"

331−msgstr "Introduceți %1"

342+msgid "Enter %1"

343+msgstr ""

332344

333345#: qml/Shell.qml:328

334346#, qt-format

@@ -365,5 +377,28 @@ msgstr ""

365377"configurările inițiale, ale fabricantului, iar toate datele personale vor fi "

366378"șterse."

367379

368−#~ msgid "Manage Dash"

369−#~ msgstr "Administrare Panou principal"

380+#, qt-format

381+#~ msgid "Hello %1"

382+#~ msgstr "Salutări %1"

383+

384+#~ msgid "Hello"

385+#~ msgstr "Salutări"

386+

387+#~ msgid "Swipe to unlock"

388+#~ msgstr "Glisați pentru deblocare"

389+

390+#~ msgid "Please wait"

391+#~ msgstr "Așteptați"

392+

393+#~ msgid "Too many incorrect attempts"

394+#~ msgstr "Prea multe încercări greșite"

395+

396+#, qt-format

397+#~ msgid "Enter your %1"

398+#~ msgstr "Introduceți %1"

399+

400+#~ msgid "Enter your passphrase"

401+#~ msgstr "Introduceți fraza dumneavoastră secretă"

402+

403+#~ msgid "Enter your passcode"

404+#~ msgstr "Introduceți parola"

po/ru.po+65−31

@@ -7,14 +7,16 @@ msgid ""

77msgstr ""

88"Project-Id-Version: unity\n"

99"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10−"POT-Creation-Date: 2014-09-24 10:43+0100\n"

10+"POT-Creation-Date: 2014-10-02 10:35+0200\n"

1111"PO-Revision-Date: 2014-08-29 08:06+0000\n"

1212"Last-Translator: Jay ZDLin <Unknown>\n"

1313"Language-Team: Russian <ru@li.org>\n"

1414"MIME-Version: 1.0\n"

1515"Content-Type: text/plain; charset=UTF-8\n"

1616"Content-Transfer-Encoding: 8bit\n"

17−"X-Launchpad-Export-Date: 2014-09-29 05:20+0000\n"

17+"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && "

18+"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"

19+"X-Launchpad-Export-Date: 2014-10-03 06:22+0000\n"

1820"X-Generator: Launchpad (build 17196)\n"

1921

2022#: plugins/LightDM/Greeter.cpp:130

@@ -30,6 +32,25 @@ msgstr "Закрепить ярлык"

3032msgid "Unpin shortcut"

3133msgstr "Изъять ярлык"

3234

35+#: qml/Components/DelayedLockscreen.qml:47

36+msgid "Device Locked"

37+msgstr ""

38+

39+#: qml/Components/DelayedLockscreen.qml:62

40+msgid "You have been locked out due to too many failed passphrase attempts."

41+msgstr ""

42+

43+#: qml/Components/DelayedLockscreen.qml:63

44+msgid "You have been locked out due to too many failed passcode attempts."

45+msgstr ""

46+

47+#: qml/Components/DelayedLockscreen.qml:72

48+#, qt-format

49+msgid "Please wait %1 minute and then try again…"

50+msgid_plural "Please wait %1 minutes and then try again…"

51+msgstr[0] ""

52+msgstr[1] ""

53+

3354#: qml/Components/Dialogs.qml:70

3455msgid "Log out"

3556msgstr "Завершение сеанса"

@@ -80,7 +101,7 @@ msgstr "Отключить"

80101

81102#: qml/Components/Dialogs.qml:157

82103msgid "Restart"

83−msgstr ""

104+msgstr "Перезагрузить"

84105

85106#: qml/Components/Dialogs.qml:167

86107msgid "Cancel"

@@ -139,14 +160,6 @@ msgstr ""

139160"Вы научились пользоваться Ubuntu и можете начать использовать свой "

140161"телефон<br><br>Нажмите на экран"

141162

142−#: qml/Components/Lockscreen.qml:167

143−msgid "Please wait"

144−msgstr "Подождите"

145−

146−#: qml/Components/Lockscreen.qml:172

147−msgid "Too many incorrect attempts"

148−msgstr "Слишком много ошибок ввода"

149−

150163#: qml/Components/Lockscreen.qml:206

151164msgid "Emergency Call"

152165msgstr "Экстренный вызов"

@@ -155,15 +168,6 @@ msgstr "Экстренный вызов"

155168msgid "OK"

156169msgstr "ОК"

157170

158−#: qml/Components/PassphraseLockscreen.qml:61

159−#, qt-format

160−msgid "Hello %1"

161−msgstr "Привет, %1"

162−

163−#: qml/Components/PassphraseLockscreen.qml:61

164−msgid "Hello"

165−msgstr "Привет"

166−

167171#: qml/Dash/GenericScopeView.qml:411 qml/Dash/GenericScopeView.qml:533

168172msgid "See less"

169173msgstr "Вкратце"

@@ -230,8 +234,8 @@ msgid "All"

230234msgstr "Все"

231235

232236#: qml/Greeter/Greeter.qml:157

233−msgid "Swipe to unlock"

234−msgstr "Смахните, чтобы разблокировать"

237+msgid "Unlock"

238+msgstr ""

235239

236240#: qml/Hud/HudParametrizedActionsPage.qml:139

237241msgid "Confirm"

@@ -309,26 +313,30 @@ msgstr "Разблокировать SIM-карту"

309313msgid "Roaming"

310314msgstr "Роуминг"

311315

312−#: qml/Shell.qml:320

313−msgid "Enter your passphrase"

314−msgstr "Введите кодовую фразу"

316+#: qml/Shell.qml:340

317+msgid "Enter passphrase"

318+msgstr ""

315319

316320#: qml/Shell.qml:321

317321msgid "Sorry, incorrect passphrase"

318322msgstr "Введена неверная кодовая фраза"

319323

320−#: qml/Shell.qml:323

321−msgid "Enter your passcode"

322−msgstr "Введите секретный код"

324+#: qml/Shell.qml:342

325+msgid "Please re-enter"

326+msgstr ""

327+

328+#: qml/Shell.qml:344

329+msgid "Enter passcode"

330+msgstr ""

323331

324332#: qml/Shell.qml:324

325333msgid "Sorry, incorrect passcode"

326334msgstr "Секретный код введён неверно"

327335

328−#: qml/Shell.qml:327

336+#: qml/Shell.qml:348

329337#, qt-format

330−msgid "Enter your %1"

331−msgstr "Введите %1"

338+msgid "Enter %1"

339+msgstr ""

332340

333341#: qml/Shell.qml:328

334342#, qt-format

@@ -362,3 +370,29 @@ msgid ""

362370msgstr ""

363371"Если секретный код будет введен неверно, то телефон вернётся к заводским "

364372"настройкам, а все личные данные будут удалены."

373+

374+#, qt-format

375+#~ msgid "Hello %1"

376+#~ msgstr "Привет, %1"

377+

378+#~ msgid "Hello"

379+#~ msgstr "Привет"

380+

381+#~ msgid "Swipe to unlock"

382+#~ msgstr "Смахните, чтобы разблокировать"

383+

384+#, qt-format

385+#~ msgid "Enter your %1"

386+#~ msgstr "Введите %1"

387+

388+#~ msgid "Please wait"

389+#~ msgstr "Подождите"

390+

391+#~ msgid "Too many incorrect attempts"

392+#~ msgstr "Слишком много ошибок ввода"

393+

394+#~ msgid "Enter your passphrase"

395+#~ msgstr "Введите кодовую фразу"

396+

397+#~ msgid "Enter your passcode"

398+#~ msgstr "Введите секретный код"

po/shn.po+33−26

@@ -7,14 +7,15 @@ msgid ""

77msgstr ""

88"Project-Id-Version: unity8\n"

99"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10−"POT-Creation-Date: 2014-09-24 10:43+0100\n"

10+"POT-Creation-Date: 2014-10-02 10:35+0200\n"

1111"PO-Revision-Date: 2013-10-07 11:46+0000\n"

1212"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"

1313"Language-Team: Shan <shn@li.org>\n"

1414"MIME-Version: 1.0\n"

1515"Content-Type: text/plain; charset=UTF-8\n"

1616"Content-Transfer-Encoding: 8bit\n"

17−"X-Launchpad-Export-Date: 2014-09-29 05:20+0000\n"

17+"Plural-Forms: nplurals=2; plural=(n == 1) ? 0 : 1;\n"

18+"X-Launchpad-Export-Date: 2014-10-03 06:22+0000\n"

1819"X-Generator: Launchpad (build 17196)\n"

1920

2021#: plugins/LightDM/Greeter.cpp:130

@@ -30,6 +31,25 @@ msgstr ""

3031msgid "Unpin shortcut"

3132msgstr ""

3233

34+#: qml/Components/DelayedLockscreen.qml:47

35+msgid "Device Locked"

36+msgstr ""

37+

38+#: qml/Components/DelayedLockscreen.qml:62

39+msgid "You have been locked out due to too many failed passphrase attempts."

40+msgstr ""

41+

42+#: qml/Components/DelayedLockscreen.qml:63

43+msgid "You have been locked out due to too many failed passcode attempts."

44+msgstr ""

45+

46+#: qml/Components/DelayedLockscreen.qml:72

47+#, qt-format

48+msgid "Please wait %1 minute and then try again…"

49+msgid_plural "Please wait %1 minutes and then try again…"

50+msgstr[0] ""

51+msgstr[1] ""

52+

3353#: qml/Components/Dialogs.qml:70

3454msgid "Log out"

3555msgstr ""

@@ -132,14 +152,6 @@ msgid ""

132152"phone<br><br>Tap on the screen to start"

133153msgstr ""

134154

135−#: qml/Components/Lockscreen.qml:167

136−msgid "Please wait"

137−msgstr ""

138−

139−#: qml/Components/Lockscreen.qml:172

140−msgid "Too many incorrect attempts"

141−msgstr ""

142−

143155#: qml/Components/Lockscreen.qml:206

144156msgid "Emergency Call"

145157msgstr ""

@@ -148,15 +160,6 @@ msgstr ""

148160msgid "OK"

149161msgstr ""

150162

151−#: qml/Components/PassphraseLockscreen.qml:61

152−#, qt-format

153−msgid "Hello %1"

154−msgstr ""

155−

156−#: qml/Components/PassphraseLockscreen.qml:61

157−msgid "Hello"

158−msgstr ""

159−

160163#: qml/Dash/GenericScopeView.qml:411 qml/Dash/GenericScopeView.qml:533

161164msgid "See less"

162165msgstr ""

@@ -223,7 +226,7 @@ msgid "All"

223226msgstr ""

224227

225228#: qml/Greeter/Greeter.qml:157

226−msgid "Swipe to unlock"

229+msgid "Unlock"

227230msgstr ""

228231

229232#: qml/Hud/HudParametrizedActionsPage.qml:139

@@ -302,25 +305,29 @@ msgstr ""

302305msgid "Roaming"

303306msgstr ""

304307

305−#: qml/Shell.qml:320

306−msgid "Enter your passphrase"

308+#: qml/Shell.qml:340

309+msgid "Enter passphrase"

307310msgstr ""

308311

309312#: qml/Shell.qml:321

310313msgid "Sorry, incorrect passphrase"

311314msgstr ""

312315

313−#: qml/Shell.qml:323

314−msgid "Enter your passcode"

316+#: qml/Shell.qml:342

317+msgid "Please re-enter"

318+msgstr ""

319+

320+#: qml/Shell.qml:344

321+msgid "Enter passcode"

315322msgstr ""

316323

317324#: qml/Shell.qml:324

318325msgid "Sorry, incorrect passcode"

319326msgstr ""

320327

321−#: qml/Shell.qml:327

328+#: qml/Shell.qml:348

322329#, qt-format

323−msgid "Enter your %1"

330+msgid "Enter %1"

324331msgstr ""

325332

326333#: qml/Shell.qml:328

po/si.po+33−26

@@ -7,14 +7,15 @@ msgid ""

77msgstr ""

88"Project-Id-Version: unity\n"

99"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10−"POT-Creation-Date: 2014-09-24 10:43+0100\n"

10+"POT-Creation-Date: 2014-10-02 10:35+0200\n"

1111"PO-Revision-Date: 2013-06-26 22:36+0000\n"

1212"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"

1313"Language-Team: Sinhalese <si@li.org>\n"

1414"MIME-Version: 1.0\n"

1515"Content-Type: text/plain; charset=UTF-8\n"

1616"Content-Transfer-Encoding: 8bit\n"

17−"X-Launchpad-Export-Date: 2014-09-29 05:20+0000\n"

17+"Plural-Forms: nplurals=2; plural=n != 1;\n"

18+"X-Launchpad-Export-Date: 2014-10-03 06:22+0000\n"

1819"X-Generator: Launchpad (build 17196)\n"

1920

2021#: plugins/LightDM/Greeter.cpp:130

@@ -30,6 +31,25 @@ msgstr ""

3031msgid "Unpin shortcut"

3132msgstr ""

3233

34+#: qml/Components/DelayedLockscreen.qml:47

35+msgid "Device Locked"

36+msgstr ""

37+

38+#: qml/Components/DelayedLockscreen.qml:62

39+msgid "You have been locked out due to too many failed passphrase attempts."

40+msgstr ""

41+

42+#: qml/Components/DelayedLockscreen.qml:63

43+msgid "You have been locked out due to too many failed passcode attempts."

44+msgstr ""

45+

46+#: qml/Components/DelayedLockscreen.qml:72

47+#, qt-format

48+msgid "Please wait %1 minute and then try again…"

49+msgid_plural "Please wait %1 minutes and then try again…"

50+msgstr[0] ""

51+msgstr[1] ""

52+

3353#: qml/Components/Dialogs.qml:70

3454msgid "Log out"

3555msgstr ""

@@ -132,14 +152,6 @@ msgid ""

132152"phone<br><br>Tap on the screen to start"

133153msgstr ""

134154

135−#: qml/Components/Lockscreen.qml:167

136−msgid "Please wait"

137−msgstr ""

138−

139−#: qml/Components/Lockscreen.qml:172

140−msgid "Too many incorrect attempts"

141−msgstr ""

142−

143155#: qml/Components/Lockscreen.qml:206

144156msgid "Emergency Call"

145157msgstr ""

@@ -148,15 +160,6 @@ msgstr ""

148160msgid "OK"

149161msgstr ""

150162

151−#: qml/Components/PassphraseLockscreen.qml:61

152−#, qt-format

153−msgid "Hello %1"

154−msgstr ""

155−

156−#: qml/Components/PassphraseLockscreen.qml:61

157−msgid "Hello"

158−msgstr ""

159−

160163#: qml/Dash/GenericScopeView.qml:411 qml/Dash/GenericScopeView.qml:533

161164msgid "See less"

162165msgstr ""

@@ -223,7 +226,7 @@ msgid "All"

223226msgstr ""

224227

225228#: qml/Greeter/Greeter.qml:157

226−msgid "Swipe to unlock"

229+msgid "Unlock"

227230msgstr ""

228231

229232#: qml/Hud/HudParametrizedActionsPage.qml:139

@@ -302,25 +305,29 @@ msgstr ""

302305msgid "Roaming"

303306msgstr ""

304307

305−#: qml/Shell.qml:320

306−msgid "Enter your passphrase"

308+#: qml/Shell.qml:340

309+msgid "Enter passphrase"

307310msgstr ""

308311

309312#: qml/Shell.qml:321

310313msgid "Sorry, incorrect passphrase"

311314msgstr ""

312315

313−#: qml/Shell.qml:323

314−msgid "Enter your passcode"

316+#: qml/Shell.qml:342

317+msgid "Please re-enter"

318+msgstr ""

319+

320+#: qml/Shell.qml:344

321+msgid "Enter passcode"

315322msgstr ""

316323

317324#: qml/Shell.qml:324

318325msgid "Sorry, incorrect passcode"

319326msgstr ""

320327

321−#: qml/Shell.qml:327

328+#: qml/Shell.qml:348

322329#, qt-format

323−msgid "Enter your %1"

330+msgid "Enter %1"

324331msgstr ""

325332

326333#: qml/Shell.qml:328

po/sl.po+67−34

@@ -7,14 +7,16 @@ msgid ""

77msgstr ""

88"Project-Id-Version: unity\n"

99"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10−"POT-Creation-Date: 2014-09-24 10:43+0100\n"

11−"PO-Revision-Date: 2014-09-23 12:35+0000\n"

10+"POT-Creation-Date: 2014-10-02 10:35+0200\n"

11+"PO-Revision-Date: 2014-10-03 17:37+0000\n"

1212"Last-Translator: Damir Jerovšek <Unknown>\n"

1313"Language-Team: Slovenian <sl@li.org>\n"

1414"MIME-Version: 1.0\n"

1515"Content-Type: text/plain; charset=UTF-8\n"

1616"Content-Transfer-Encoding: 8bit\n"

17−"X-Launchpad-Export-Date: 2014-09-29 05:20+0000\n"

17+"Plural-Forms: nplurals=4; plural=(n%100==1 ? 1 : n%100==2 ? 2 : n%100==3 || "

18+"n%100==4 ? 3 : 0);\n"

19+"X-Launchpad-Export-Date: 2014-10-04 06:28+0000\n"

1820"X-Generator: Launchpad (build 17196)\n"

1921

2022#: plugins/LightDM/Greeter.cpp:130

@@ -30,6 +32,27 @@ msgstr "Pripni bližnjico"

3032msgid "Unpin shortcut"

3133msgstr "Odpni bližnjico"

3234

35+#: qml/Components/DelayedLockscreen.qml:47

36+msgid "Device Locked"

37+msgstr "Naprava je zaklenjena"

38+

39+#: qml/Components/DelayedLockscreen.qml:62

40+msgid "You have been locked out due to too many failed passphrase attempts."

41+msgstr "Telefon ste zaklenili zaradi preveč napačnih vnosov šifrirnih rekel."

42+

43+#: qml/Components/DelayedLockscreen.qml:63

44+msgid "You have been locked out due to too many failed passcode attempts."

45+msgstr "Telefon ste zaklenili zaradi preveč napačnih vnosov gesla."

46+

47+#: qml/Components/DelayedLockscreen.qml:72

48+#, qt-format

49+msgid "Please wait %1 minute and then try again…"

50+msgid_plural "Please wait %1 minutes and then try again…"

51+msgstr[0] "Počakajte %1 minut ter poskusite ponovno ..."

52+msgstr[1] "Počakajte %1 minuto ter poskusite ponovno ..."

53+msgstr[2] "Počakajte %1 minuti ter poskusite ponovno ..."

54+msgstr[3] "Počakajte %1 minute ter poskusite ponovno ..."

55+

3356#: qml/Components/Dialogs.qml:70

3457msgid "Log out"

3558msgstr "Odjava"

@@ -138,14 +161,6 @@ msgstr ""

138161"Sedaj, ko ste osvojili poteze robov, lahko začnete uporabljati "

139162"telefon<br><br>Tapnite na zaslon za začetek"

140163

141−#: qml/Components/Lockscreen.qml:167

142−msgid "Please wait"

143−msgstr "Počakajte"

144−

145−#: qml/Components/Lockscreen.qml:172

146−msgid "Too many incorrect attempts"

147−msgstr "Preveč nepravilnih poskusov"

148−

149164#: qml/Components/Lockscreen.qml:206

150165msgid "Emergency Call"

151166msgstr "Klic v sili"

@@ -154,15 +169,6 @@ msgstr "Klic v sili"

154169msgid "OK"

155170msgstr "V REDU"

156171

157−#: qml/Components/PassphraseLockscreen.qml:61

158−#, qt-format

159−msgid "Hello %1"

160−msgstr "Pozdravljeni, %1"

161−

162−#: qml/Components/PassphraseLockscreen.qml:61

163−msgid "Hello"

164−msgstr "Pozdravljeni"

165−

166172#: qml/Dash/GenericScopeView.qml:411 qml/Dash/GenericScopeView.qml:533

167173msgid "See less"

168174msgstr "Pokaži manj"

@@ -229,8 +235,8 @@ msgid "All"

229235msgstr "Vse"

230236

231237#: qml/Greeter/Greeter.qml:157

232−msgid "Swipe to unlock"

233−msgstr "Podrsajte za odklenitev"

238+msgid "Unlock"

239+msgstr "Odkleni"

234240

235241#: qml/Hud/HudParametrizedActionsPage.qml:139

236242msgid "Confirm"

@@ -274,7 +280,7 @@ msgstr "Konferenca"

274280

275281#: qml/Panel/Indicators/MenuItemFactory.qml:600

276282msgid "Nothing is playing"

277−msgstr ""

283+msgstr "Nič se ne predvaja"

278284

279285#: qml/Panel/Indicators/MenuItemFactory.qml:748

280286msgid "In queue…"

@@ -308,26 +314,30 @@ msgstr "Odkleni SIM"

308314msgid "Roaming"

309315msgstr "Gostovanje"

310316

311−#: qml/Shell.qml:320

312−msgid "Enter your passphrase"

313−msgstr "Vnesite svoje šifrirno reklo"

317+#: qml/Shell.qml:340

318+msgid "Enter passphrase"

319+msgstr "Vnesite šifrirno reklo"

314320

315321#: qml/Shell.qml:321

316322msgid "Sorry, incorrect passphrase"

317323msgstr "Oprostite, napačno šifrirno reklo"

318324

319−#: qml/Shell.qml:323

320−msgid "Enter your passcode"

321−msgstr "Vnesite svoje geslo"

325+#: qml/Shell.qml:342

326+msgid "Please re-enter"

327+msgstr "Ponovno vnesite"

328+

329+#: qml/Shell.qml:344

330+msgid "Enter passcode"

331+msgstr "Vnesite geslo"

322332

323333#: qml/Shell.qml:324

324334msgid "Sorry, incorrect passcode"

325335msgstr "Nepravilno geslo"

326336

327−#: qml/Shell.qml:327

337+#: qml/Shell.qml:348

328338#, qt-format

329−msgid "Enter your %1"

330−msgstr "Vnesite vaš %1"

339+msgid "Enter %1"

340+msgstr "Vnesite %1"

331341

332342#: qml/Shell.qml:328

333343#, qt-format

@@ -362,5 +372,28 @@ msgstr ""

362372"Če je vneseno nepravilno geslo, bo telefon ponastavljen na tovarniške "

363373"nastavitve ter vsi osebni podatki bodo izbrisani."

364374

365−#~ msgid "Manage Dash"

366−#~ msgstr "Upravljaj s pregledno ploščo"

375+#, qt-format

376+#~ msgid "Hello %1"

377+#~ msgstr "Pozdravljeni, %1"

378+

379+#~ msgid "Hello"

380+#~ msgstr "Pozdravljeni"

381+

382+#~ msgid "Swipe to unlock"

383+#~ msgstr "Podrsajte za odklenitev"

384+

385+#~ msgid "Please wait"

386+#~ msgstr "Počakajte"

387+

388+#~ msgid "Too many incorrect attempts"

389+#~ msgstr "Preveč nepravilnih poskusov"

390+

391+#, qt-format

392+#~ msgid "Enter your %1"

393+#~ msgstr "Vnesite vaš %1"

394+

395+#~ msgid "Enter your passphrase"

396+#~ msgstr "Vnesite svoje šifrirno reklo"

397+

398+#~ msgid "Enter your passcode"

399+#~ msgstr "Vnesite svoje geslo"

po/sq.po+33−26

@@ -7,14 +7,15 @@ msgid ""

77msgstr ""

88"Project-Id-Version: unity8\n"

99"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10−"POT-Creation-Date: 2014-09-24 10:43+0100\n"

10+"POT-Creation-Date: 2014-10-02 10:35+0200\n"

1111"PO-Revision-Date: 2014-01-15 13:51+0000\n"

1212"Last-Translator: Besmir Zanaj <besmirzanaj@gmail.com>\n"

1313"Language-Team: Albanian <sq@li.org>\n"

1414"MIME-Version: 1.0\n"

1515"Content-Type: text/plain; charset=UTF-8\n"

1616"Content-Transfer-Encoding: 8bit\n"

17−"X-Launchpad-Export-Date: 2014-09-29 05:19+0000\n"

17+"Plural-Forms: nplurals=2; plural=n != 1;\n"

18+"X-Launchpad-Export-Date: 2014-10-03 06:21+0000\n"

1819"X-Generator: Launchpad (build 17196)\n"

1920

2021#: plugins/LightDM/Greeter.cpp:130

@@ -30,6 +31,25 @@ msgstr ""

3031msgid "Unpin shortcut"

3132msgstr ""

3233

34+#: qml/Components/DelayedLockscreen.qml:47

35+msgid "Device Locked"

36+msgstr ""

37+

38+#: qml/Components/DelayedLockscreen.qml:62

39+msgid "You have been locked out due to too many failed passphrase attempts."

40+msgstr ""

41+

42+#: qml/Components/DelayedLockscreen.qml:63

43+msgid "You have been locked out due to too many failed passcode attempts."

44+msgstr ""

45+

46+#: qml/Components/DelayedLockscreen.qml:72

47+#, qt-format

48+msgid "Please wait %1 minute and then try again…"

49+msgid_plural "Please wait %1 minutes and then try again…"

50+msgstr[0] ""

51+msgstr[1] ""

52+

3353#: qml/Components/Dialogs.qml:70

3454msgid "Log out"

3555msgstr ""

@@ -133,14 +153,6 @@ msgid ""

133153"phone<br><br>Tap on the screen to start"

134154msgstr ""

135155

136−#: qml/Components/Lockscreen.qml:167

137−msgid "Please wait"

138−msgstr ""

139−

140−#: qml/Components/Lockscreen.qml:172

141−msgid "Too many incorrect attempts"

142−msgstr ""

143−

144156#: qml/Components/Lockscreen.qml:206

145157msgid "Emergency Call"

146158msgstr ""

@@ -149,15 +161,6 @@ msgstr ""

149161msgid "OK"

150162msgstr ""

151163

152−#: qml/Components/PassphraseLockscreen.qml:61

153−#, qt-format

154−msgid "Hello %1"

155−msgstr ""

156−

157−#: qml/Components/PassphraseLockscreen.qml:61

158−msgid "Hello"

159−msgstr ""

160−

161164#: qml/Dash/GenericScopeView.qml:411 qml/Dash/GenericScopeView.qml:533

162165msgid "See less"

163166msgstr ""

@@ -224,7 +227,7 @@ msgid "All"

224227msgstr ""

225228

226229#: qml/Greeter/Greeter.qml:157

227−msgid "Swipe to unlock"

230+msgid "Unlock"

228231msgstr ""

229232

230233#: qml/Hud/HudParametrizedActionsPage.qml:139

@@ -303,25 +306,29 @@ msgstr ""

303306msgid "Roaming"

304307msgstr ""

305308

306−#: qml/Shell.qml:320

307−msgid "Enter your passphrase"

309+#: qml/Shell.qml:340

310+msgid "Enter passphrase"

308311msgstr ""

309312

310313#: qml/Shell.qml:321

311314msgid "Sorry, incorrect passphrase"

312315msgstr ""

313316

314−#: qml/Shell.qml:323

315−msgid "Enter your passcode"

317+#: qml/Shell.qml:342

318+msgid "Please re-enter"

319+msgstr ""

320+

321+#: qml/Shell.qml:344

322+msgid "Enter passcode"

316323msgstr ""

317324

318325#: qml/Shell.qml:324

319326msgid "Sorry, incorrect passcode"

320327msgstr ""

321328

322−#: qml/Shell.qml:327

329+#: qml/Shell.qml:348

323330#, qt-format

324−msgid "Enter your %1"

331+msgid "Enter %1"

325332msgstr ""

326333

327334#: qml/Shell.qml:328

po/sr.po+64−30

@@ -7,14 +7,16 @@ msgid ""

77msgstr ""

88"Project-Id-Version: unity\n"

99"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10−"POT-Creation-Date: 2014-09-24 10:43+0100\n"

10+"POT-Creation-Date: 2014-10-02 10:35+0200\n"

1111"PO-Revision-Date: 2014-09-24 13:29+0000\n"

1212"Last-Translator: Данило Шеган <Unknown>\n"

1313"Language-Team: Serbian <sr@li.org>\n"

1414"MIME-Version: 1.0\n"

1515"Content-Type: text/plain; charset=UTF-8\n"

1616"Content-Transfer-Encoding: 8bit\n"

17−"X-Launchpad-Export-Date: 2014-09-29 05:20+0000\n"

17+"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && "

18+"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"

19+"X-Launchpad-Export-Date: 2014-10-03 06:22+0000\n"

1820"X-Generator: Launchpad (build 17196)\n"

1921

2022#: plugins/LightDM/Greeter.cpp:130

@@ -30,6 +32,25 @@ msgstr "Прикачи пречицу"

3032msgid "Unpin shortcut"

3133msgstr "Откачи пречицу"

3234

35+#: qml/Components/DelayedLockscreen.qml:47

36+msgid "Device Locked"

37+msgstr ""

38+

39+#: qml/Components/DelayedLockscreen.qml:62

40+msgid "You have been locked out due to too many failed passphrase attempts."

41+msgstr ""

42+

43+#: qml/Components/DelayedLockscreen.qml:63

44+msgid "You have been locked out due to too many failed passcode attempts."

45+msgstr ""

46+

47+#: qml/Components/DelayedLockscreen.qml:72

48+#, qt-format

49+msgid "Please wait %1 minute and then try again…"

50+msgid_plural "Please wait %1 minutes and then try again…"

51+msgstr[0] ""

52+msgstr[1] ""

53+

3354#: qml/Components/Dialogs.qml:70

3455msgid "Log out"

3556msgstr "Одјави се"

@@ -136,14 +157,6 @@ msgstr ""

136157"Сада сте савладали превлачења са ивица и можете да користите "

137158"телефон<br><br>Тапните на екран да почнете"

138159

139−#: qml/Components/Lockscreen.qml:167

140−msgid "Please wait"

141−msgstr "Сачекајте"

142−

143−#: qml/Components/Lockscreen.qml:172

144−msgid "Too many incorrect attempts"

145−msgstr "Превише нетачних покушаја"

146−

147160#: qml/Components/Lockscreen.qml:206

148161msgid "Emergency Call"

149162msgstr "Хитан позив"

@@ -152,15 +165,6 @@ msgstr "Хитан позив"

152165msgid "OK"

153166msgstr "У реду"

154167

155−#: qml/Components/PassphraseLockscreen.qml:61

156−#, qt-format

157−msgid "Hello %1"

158−msgstr "Здраво %1"

159−

160−#: qml/Components/PassphraseLockscreen.qml:61

161−msgid "Hello"

162−msgstr "Здраво"

163−

164168#: qml/Dash/GenericScopeView.qml:411 qml/Dash/GenericScopeView.qml:533

165169msgid "See less"

166170msgstr "Сажетије"

@@ -227,8 +231,8 @@ msgid "All"

227231msgstr "Сви"

228232

229233#: qml/Greeter/Greeter.qml:157

230−msgid "Swipe to unlock"

231−msgstr "Повуците да откључате"

234+msgid "Unlock"

235+msgstr ""

232236

233237#: qml/Hud/HudParametrizedActionsPage.qml:139

234238msgid "Confirm"

@@ -306,26 +310,30 @@ msgstr "Откључај СИМ картицу"

306310msgid "Roaming"

307311msgstr "Роминг"

308312

309−#: qml/Shell.qml:320

310−msgid "Enter your passphrase"

311−msgstr "Унесите вашу лозинку"

313+#: qml/Shell.qml:340

314+msgid "Enter passphrase"

315+msgstr ""

312316

313317#: qml/Shell.qml:321

314318msgid "Sorry, incorrect passphrase"

315319msgstr "Жао ми је, погрешна лозинка"

316320

317−#: qml/Shell.qml:323

318−msgid "Enter your passcode"

319−msgstr "Унесите ваш код"

321+#: qml/Shell.qml:342

322+msgid "Please re-enter"

323+msgstr ""

324+

325+#: qml/Shell.qml:344

326+msgid "Enter passcode"

327+msgstr ""

320328

321329#: qml/Shell.qml:324

322330msgid "Sorry, incorrect passcode"

323331msgstr "Жао ми је, погрешан код"

324332

325−#: qml/Shell.qml:327

333+#: qml/Shell.qml:348

326334#, qt-format

327−msgid "Enter your %1"

328−msgstr "Унесите ваш %1"

335+msgid "Enter %1"

336+msgstr ""

329337

330338#: qml/Shell.qml:328

331339#, qt-format

@@ -360,5 +368,31 @@ msgstr ""

360368"Ако се унесе погрешан код, ваш телефон ће се ресетовати и сви лични подаци "

361369"ће бити обрисани."

362370

371+#, qt-format

372+#~ msgid "Hello %1"

373+#~ msgstr "Здраво %1"

374+

375+#~ msgid "Please wait"

376+#~ msgstr "Сачекајте"

377+

378+#~ msgid "Too many incorrect attempts"

379+#~ msgstr "Превише нетачних покушаја"

380+

381+#~ msgid "Hello"

382+#~ msgstr "Здраво"

383+

363384#~ msgid "Manage Dash"

364385#~ msgstr "Управљај Полицом"

386+

387+#~ msgid "Enter your passphrase"

388+#~ msgstr "Унесите вашу лозинку"

389+

390+#, qt-format

391+#~ msgid "Enter your %1"

392+#~ msgstr "Унесите ваш %1"

393+

394+#~ msgid "Enter your passcode"

395+#~ msgstr "Унесите ваш код"

396+

397+#~ msgid "Swipe to unlock"

398+#~ msgstr "Повуците да откључате"

po/sv.po+63−30

@@ -7,14 +7,15 @@ msgid ""

77msgstr ""

88"Project-Id-Version: unity\n"

99"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10−"POT-Creation-Date: 2014-09-24 10:43+0100\n"

10+"POT-Creation-Date: 2014-10-02 10:35+0200\n"

1111"PO-Revision-Date: 2014-09-23 08:37+0000\n"

1212"Last-Translator: Josef Andersson <Unknown>\n"

1313"Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"

1414"MIME-Version: 1.0\n"

1515"Content-Type: text/plain; charset=UTF-8\n"

1616"Content-Transfer-Encoding: 8bit\n"

17−"X-Launchpad-Export-Date: 2014-09-29 05:20+0000\n"

17+"Plural-Forms: nplurals=2; plural=n != 1;\n"

18+"X-Launchpad-Export-Date: 2014-10-03 06:22+0000\n"

1819"X-Generator: Launchpad (build 17196)\n"

1920"Language: sv\n"

2021

@@ -31,6 +32,25 @@ msgstr "Fäst genväg"

3132msgid "Unpin shortcut"

3233msgstr "Släpp genväg"

3334

35+#: qml/Components/DelayedLockscreen.qml:47

36+msgid "Device Locked"

37+msgstr ""

38+

39+#: qml/Components/DelayedLockscreen.qml:62

40+msgid "You have been locked out due to too many failed passphrase attempts."

41+msgstr ""

42+

43+#: qml/Components/DelayedLockscreen.qml:63

44+msgid "You have been locked out due to too many failed passcode attempts."

45+msgstr ""

46+

47+#: qml/Components/DelayedLockscreen.qml:72

48+#, qt-format

49+msgid "Please wait %1 minute and then try again…"

50+msgid_plural "Please wait %1 minutes and then try again…"

51+msgstr[0] ""

52+msgstr[1] ""

53+

3454#: qml/Components/Dialogs.qml:70

3555msgid "Log out"

3656msgstr "Logga ut"

@@ -137,14 +157,6 @@ msgstr ""

137157"Du har nu bemästrat kantgesterna och kan börja använda "

138158"telefonen<br><br>Tryck på skärmen för att starta"

139159

140−#: qml/Components/Lockscreen.qml:167

141−msgid "Please wait"

142−msgstr "Var god vänta"

143−

144−#: qml/Components/Lockscreen.qml:172

145−msgid "Too many incorrect attempts"

146−msgstr "För många felaktiga försök"

147−

148160#: qml/Components/Lockscreen.qml:206

149161msgid "Emergency Call"

150162msgstr "Nödsamtal"

@@ -153,15 +165,6 @@ msgstr "Nödsamtal"

153165msgid "OK"

154166msgstr "Ok"

155167

156−#: qml/Components/PassphraseLockscreen.qml:61

157−#, qt-format

158−msgid "Hello %1"

159−msgstr "Hej %1"

160−

161−#: qml/Components/PassphraseLockscreen.qml:61

162−msgid "Hello"

163−msgstr "Hej"

164−

165168#: qml/Dash/GenericScopeView.qml:411 qml/Dash/GenericScopeView.qml:533

166169msgid "See less"

167170msgstr "Visa mindre"

@@ -228,8 +231,8 @@ msgid "All"

228231msgstr "Alla"

229232

230233#: qml/Greeter/Greeter.qml:157

231−msgid "Swipe to unlock"

232−msgstr "Svep för att låsa upp"

234+msgid "Unlock"

235+msgstr ""

233236

234237#: qml/Hud/HudParametrizedActionsPage.qml:139

235238msgid "Confirm"

@@ -307,26 +310,30 @@ msgstr "Lås upp SIM-kort"

307310msgid "Roaming"

308311msgstr "Roaming"

309312

310−#: qml/Shell.qml:320

311−msgid "Enter your passphrase"

312−msgstr "Ange din lösenfras"

313+#: qml/Shell.qml:340

314+msgid "Enter passphrase"

315+msgstr ""

313316

314317#: qml/Shell.qml:321

315318msgid "Sorry, incorrect passphrase"

316319msgstr "Felaktig lösenfras"

317320

318−#: qml/Shell.qml:323

319−msgid "Enter your passcode"

320−msgstr "Ange din lösenkod"

321+#: qml/Shell.qml:342

322+msgid "Please re-enter"

323+msgstr ""

324+

325+#: qml/Shell.qml:344

326+msgid "Enter passcode"

327+msgstr ""

321328

322329#: qml/Shell.qml:324

323330msgid "Sorry, incorrect passcode"

324331msgstr "Felaktig lösenkod"

325332

326−#: qml/Shell.qml:327

333+#: qml/Shell.qml:348

327334#, qt-format

328−msgid "Enter your %1"

329−msgstr "Skriv in din %1"

335+msgid "Enter %1"

336+msgstr ""

330337

331338#: qml/Shell.qml:328

332339#, qt-format

@@ -361,5 +368,31 @@ msgstr ""

361368"Om lösenkoden anges felaktigt kommer telefonen att fabrikåterställas och all "

362369"personlig data kommer att tas bort."

363370

371+#, qt-format

372+#~ msgid "Hello %1"

373+#~ msgstr "Hej %1"

374+

375+#~ msgid "Hello"

376+#~ msgstr "Hej"

377+

378+#~ msgid "Swipe to unlock"

379+#~ msgstr "Svep för att låsa upp"

380+

381+#~ msgid "Please wait"

382+#~ msgstr "Var god vänta"

383+

384+#, qt-format

385+#~ msgid "Enter your %1"

386+#~ msgstr "Skriv in din %1"

387+

388+#~ msgid "Too many incorrect attempts"

389+#~ msgstr "För många felaktiga försök"

390+

364391#~ msgid "Manage Dash"

365392#~ msgstr "Hantera Dash"

393+

394+#~ msgid "Enter your passphrase"

395+#~ msgstr "Ange din lösenfras"

396+

397+#~ msgid "Enter your passcode"

398+#~ msgstr "Ange din lösenkod"

po/sw.po+33−26

@@ -7,14 +7,15 @@ msgid ""

77msgstr ""

88"Project-Id-Version: unity8\n"

99"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10−"POT-Creation-Date: 2014-09-24 10:43+0100\n"

10+"POT-Creation-Date: 2014-10-02 10:35+0200\n"

1111"PO-Revision-Date: 2014-01-14 19:28+0000\n"

1212"Last-Translator: Damas <Unknown>\n"

1313"Language-Team: Swahili <sw@li.org>\n"

1414"MIME-Version: 1.0\n"

1515"Content-Type: text/plain; charset=UTF-8\n"

1616"Content-Transfer-Encoding: 8bit\n"

17−"X-Launchpad-Export-Date: 2014-09-29 05:20+0000\n"

17+"Plural-Forms: nplurals=2; plural=n != 1;\n"

18+"X-Launchpad-Export-Date: 2014-10-03 06:22+0000\n"

1819"X-Generator: Launchpad (build 17196)\n"

1920

2021#: plugins/LightDM/Greeter.cpp:130

@@ -30,6 +31,25 @@ msgstr ""

3031msgid "Unpin shortcut"

3132msgstr ""

3233

34+#: qml/Components/DelayedLockscreen.qml:47

35+msgid "Device Locked"

36+msgstr ""

37+

38+#: qml/Components/DelayedLockscreen.qml:62

39+msgid "You have been locked out due to too many failed passphrase attempts."

40+msgstr ""

41+

42+#: qml/Components/DelayedLockscreen.qml:63

43+msgid "You have been locked out due to too many failed passcode attempts."

44+msgstr ""

45+

46+#: qml/Components/DelayedLockscreen.qml:72

47+#, qt-format

48+msgid "Please wait %1 minute and then try again…"

49+msgid_plural "Please wait %1 minutes and then try again…"

50+msgstr[0] ""

51+msgstr[1] ""

52+

3353#: qml/Components/Dialogs.qml:70

3454msgid "Log out"

3555msgstr ""

@@ -132,14 +152,6 @@ msgid ""

132152"phone<br><br>Tap on the screen to start"

133153msgstr ""

134154

135−#: qml/Components/Lockscreen.qml:167

136−msgid "Please wait"

137−msgstr ""

138−

139−#: qml/Components/Lockscreen.qml:172

140−msgid "Too many incorrect attempts"

141−msgstr ""

142−

143155#: qml/Components/Lockscreen.qml:206

144156msgid "Emergency Call"

145157msgstr ""

@@ -148,15 +160,6 @@ msgstr ""

148160msgid "OK"

149161msgstr ""

150162

151−#: qml/Components/PassphraseLockscreen.qml:61

152−#, qt-format

153−msgid "Hello %1"

154−msgstr ""

155−

156−#: qml/Components/PassphraseLockscreen.qml:61

157−msgid "Hello"

158−msgstr ""

159−

160163#: qml/Dash/GenericScopeView.qml:411 qml/Dash/GenericScopeView.qml:533

161164msgid "See less"

162165msgstr ""

@@ -223,7 +226,7 @@ msgid "All"

223226msgstr ""

224227

225228#: qml/Greeter/Greeter.qml:157

226−msgid "Swipe to unlock"

229+msgid "Unlock"

227230msgstr ""

228231

229232#: qml/Hud/HudParametrizedActionsPage.qml:139

@@ -302,25 +305,29 @@ msgstr ""

302305msgid "Roaming"

303306msgstr ""

304307

305−#: qml/Shell.qml:320

306−msgid "Enter your passphrase"

308+#: qml/Shell.qml:340

309+msgid "Enter passphrase"

307310msgstr ""

308311

309312#: qml/Shell.qml:321

310313msgid "Sorry, incorrect passphrase"

311314msgstr ""

312315

313−#: qml/Shell.qml:323

314−msgid "Enter your passcode"

316+#: qml/Shell.qml:342

317+msgid "Please re-enter"

318+msgstr ""

319+

320+#: qml/Shell.qml:344

321+msgid "Enter passcode"

315322msgstr ""

316323

317324#: qml/Shell.qml:324

318325msgid "Sorry, incorrect passcode"

319326msgstr ""

320327

321−#: qml/Shell.qml:327

328+#: qml/Shell.qml:348

322329#, qt-format

323−msgid "Enter your %1"

330+msgid "Enter %1"

324331msgstr ""

325332

326333#: qml/Shell.qml:328

po/ta.po+40−26

@@ -7,14 +7,15 @@ msgid ""

77msgstr ""

88"Project-Id-Version: unity8\n"

99"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10−"POT-Creation-Date: 2014-09-24 10:43+0100\n"

10+"POT-Creation-Date: 2014-10-02 10:35+0200\n"

1111"PO-Revision-Date: 2013-10-24 11:36+0000\n"

1212"Last-Translator: Arun Kumar - அருண் குமார் <thangam.arunx@gmail.com>\n"

1313"Language-Team: Ubuntu Tamil Team/Free Tamil Computing/Thamizha\n"

1414"MIME-Version: 1.0\n"

1515"Content-Type: text/plain; charset=UTF-8\n"

1616"Content-Transfer-Encoding: 8bit\n"

17−"X-Launchpad-Export-Date: 2014-09-29 05:20+0000\n"

17+"Plural-Forms: nplurals=2; plural=n != 1;\n"

18+"X-Launchpad-Export-Date: 2014-10-03 06:22+0000\n"

1819"X-Generator: Launchpad (build 17196)\n"

1920"Language: ta\n"

2021

@@ -31,6 +32,25 @@ msgstr ""

3132msgid "Unpin shortcut"

3233msgstr ""

3334

35+#: qml/Components/DelayedLockscreen.qml:47

36+msgid "Device Locked"

37+msgstr ""

38+

39+#: qml/Components/DelayedLockscreen.qml:62

40+msgid "You have been locked out due to too many failed passphrase attempts."

41+msgstr ""

42+

43+#: qml/Components/DelayedLockscreen.qml:63

44+msgid "You have been locked out due to too many failed passcode attempts."

45+msgstr ""

46+

47+#: qml/Components/DelayedLockscreen.qml:72

48+#, qt-format

49+msgid "Please wait %1 minute and then try again…"

50+msgid_plural "Please wait %1 minutes and then try again…"

51+msgstr[0] ""

52+msgstr[1] ""

53+

3454#: qml/Components/Dialogs.qml:70

3555msgid "Log out"

3656msgstr ""

@@ -135,14 +155,6 @@ msgid ""

135155"phone<br><br>Tap on the screen to start"

136156msgstr ""

137157

138−#: qml/Components/Lockscreen.qml:167

139−msgid "Please wait"

140−msgstr ""

141−

142−#: qml/Components/Lockscreen.qml:172

143−msgid "Too many incorrect attempts"

144−msgstr ""

145−

146158#: qml/Components/Lockscreen.qml:206

147159msgid "Emergency Call"

148160msgstr "அவசர அழைப்பு"

@@ -151,15 +163,6 @@ msgstr "அவசர அழைப்பு"

151163msgid "OK"

152164msgstr ""

153165

154−#: qml/Components/PassphraseLockscreen.qml:61

155−#, qt-format

156−msgid "Hello %1"

157−msgstr "வணக்கம் %1"

158−

159−#: qml/Components/PassphraseLockscreen.qml:61

160−msgid "Hello"

161−msgstr "வணக்கம்"

162−

163166#: qml/Dash/GenericScopeView.qml:411 qml/Dash/GenericScopeView.qml:533

164167msgid "See less"

165168msgstr ""

@@ -226,7 +229,7 @@ msgid "All"

226229msgstr ""

227230

228231#: qml/Greeter/Greeter.qml:157

229−msgid "Swipe to unlock"

232+msgid "Unlock"

230233msgstr ""

231234

232235#: qml/Hud/HudParametrizedActionsPage.qml:139

@@ -305,25 +308,29 @@ msgstr ""

305308msgid "Roaming"

306309msgstr ""

307310

308−#: qml/Shell.qml:320

309−msgid "Enter your passphrase"

311+#: qml/Shell.qml:340

312+msgid "Enter passphrase"

310313msgstr ""

311314

312315#: qml/Shell.qml:321

313316msgid "Sorry, incorrect passphrase"

314317msgstr ""

315318

316−#: qml/Shell.qml:323

317−msgid "Enter your passcode"

319+#: qml/Shell.qml:342

320+msgid "Please re-enter"

321+msgstr ""

322+

323+#: qml/Shell.qml:344

324+msgid "Enter passcode"

318325msgstr ""

319326

320327#: qml/Shell.qml:324

321328msgid "Sorry, incorrect passcode"

322329msgstr ""

323330

324−#: qml/Shell.qml:327

331+#: qml/Shell.qml:348

325332#, qt-format

326−msgid "Enter your %1"

333+msgid "Enter %1"

327334msgstr ""

328335

329336#: qml/Shell.qml:328

@@ -354,3 +361,10 @@ msgid ""

354361"If passcode is entered incorrectly, your phone will conduct a factory reset "

355362"and all personal data will be deleted."

356363msgstr ""

364+

365+#, qt-format

366+#~ msgid "Hello %1"

367+#~ msgstr "வணக்கம் %1"

368+

369+#~ msgid "Hello"

370+#~ msgstr "வணக்கம்"

po/te.po+44−27

@@ -7,14 +7,15 @@ msgid ""

77msgstr ""

88"Project-Id-Version: unity\n"

99"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10−"POT-Creation-Date: 2014-09-24 10:43+0100\n"

10+"POT-Creation-Date: 2014-10-02 10:35+0200\n"

1111"PO-Revision-Date: 2014-07-19 10:04+0000\n"

1212"Last-Translator: Praveen Illa <mail2ipn@gmail.com>\n"

1313"Language-Team: Telugu <te@li.org>\n"

1414"MIME-Version: 1.0\n"

1515"Content-Type: text/plain; charset=UTF-8\n"

1616"Content-Transfer-Encoding: 8bit\n"

17−"X-Launchpad-Export-Date: 2014-09-29 05:20+0000\n"

17+"Plural-Forms: nplurals=2; plural=n != 1;\n"

18+"X-Launchpad-Export-Date: 2014-10-03 06:22+0000\n"

1819"X-Generator: Launchpad (build 17196)\n"

1920

2021#: plugins/LightDM/Greeter.cpp:130

@@ -30,6 +31,25 @@ msgstr ""

3031msgid "Unpin shortcut"

3132msgstr ""

3233

34+#: qml/Components/DelayedLockscreen.qml:47

35+msgid "Device Locked"

36+msgstr ""

37+

38+#: qml/Components/DelayedLockscreen.qml:62

39+msgid "You have been locked out due to too many failed passphrase attempts."

40+msgstr ""

41+

42+#: qml/Components/DelayedLockscreen.qml:63

43+msgid "You have been locked out due to too many failed passcode attempts."

44+msgstr ""

45+

46+#: qml/Components/DelayedLockscreen.qml:72

47+#, qt-format

48+msgid "Please wait %1 minute and then try again…"

49+msgid_plural "Please wait %1 minutes and then try again…"

50+msgstr[0] ""

51+msgstr[1] ""

52+

3353#: qml/Components/Dialogs.qml:70

3454msgid "Log out"

3555msgstr ""

@@ -132,14 +152,6 @@ msgid ""

132152"phone<br><br>Tap on the screen to start"

133153msgstr ""

134154

135−#: qml/Components/Lockscreen.qml:167

136−msgid "Please wait"

137−msgstr ""

138−

139−#: qml/Components/Lockscreen.qml:172

140−msgid "Too many incorrect attempts"

141−msgstr ""

142−

143155#: qml/Components/Lockscreen.qml:206

144156msgid "Emergency Call"

145157msgstr "అత్యవసర పిలుపు"

@@ -148,15 +160,6 @@ msgstr "అత్యవసర పిలుపు"

148160msgid "OK"

149161msgstr "సరే"

150162

151−#: qml/Components/PassphraseLockscreen.qml:61

152−#, qt-format

153−msgid "Hello %1"

154−msgstr "హలో %1"

155−

156−#: qml/Components/PassphraseLockscreen.qml:61

157−msgid "Hello"

158−msgstr "హలో"

159−

160163#: qml/Dash/GenericScopeView.qml:411 qml/Dash/GenericScopeView.qml:533

161164msgid "See less"

162165msgstr ""

@@ -223,8 +226,8 @@ msgid "All"

223226msgstr ""

224227

225228#: qml/Greeter/Greeter.qml:157

226−msgid "Swipe to unlock"

227−msgstr "తాళంతీయుటకు గీకండి"

229+msgid "Unlock"

230+msgstr ""

228231

229232#: qml/Hud/HudParametrizedActionsPage.qml:139

230233msgid "Confirm"

@@ -302,25 +305,29 @@ msgstr ""

302305msgid "Roaming"

303306msgstr ""

304307

305−#: qml/Shell.qml:320

306−msgid "Enter your passphrase"

308+#: qml/Shell.qml:340

309+msgid "Enter passphrase"

307310msgstr ""

308311

309312#: qml/Shell.qml:321

310313msgid "Sorry, incorrect passphrase"

311314msgstr ""

312315

313−#: qml/Shell.qml:323

314−msgid "Enter your passcode"

316+#: qml/Shell.qml:342

317+msgid "Please re-enter"

318+msgstr ""

319+

320+#: qml/Shell.qml:344

321+msgid "Enter passcode"

315322msgstr ""

316323

317324#: qml/Shell.qml:324

318325msgid "Sorry, incorrect passcode"

319326msgstr ""

320327

321−#: qml/Shell.qml:327

328+#: qml/Shell.qml:348

322329#, qt-format

323−msgid "Enter your %1"

330+msgid "Enter %1"

324331msgstr ""

325332

326333#: qml/Shell.qml:328

@@ -351,3 +358,13 @@ msgid ""

351358"If passcode is entered incorrectly, your phone will conduct a factory reset "

352359"and all personal data will be deleted."

353360msgstr ""

361+

362+#, qt-format

363+#~ msgid "Hello %1"

364+#~ msgstr "హలో %1"

365+

366+#~ msgid "Hello"

367+#~ msgstr "హలో"

368+

369+#~ msgid "Swipe to unlock"

370+#~ msgstr "తాళంతీయుటకు గీకండి"

po/th.po+33−26

@@ -7,14 +7,15 @@ msgid ""

77msgstr ""

88"Project-Id-Version: unity8\n"

99"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10−"POT-Creation-Date: 2014-09-24 10:43+0100\n"

10+"POT-Creation-Date: 2014-10-02 10:35+0200\n"

1111"PO-Revision-Date: 2014-10-02 04:55+0000\n"

1212"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"

1313"Language-Team: Thai <th@li.org>\n"

1414"MIME-Version: 1.0\n"

1515"Content-Type: text/plain; charset=UTF-8\n"

1616"Content-Transfer-Encoding: 8bit\n"

17−"X-Launchpad-Export-Date: 2014-10-02 06:38+0000\n"

17+"Plural-Forms: nplurals=1; plural=0;\n"

18+"X-Launchpad-Export-Date: 2014-10-03 06:22+0000\n"

1819"X-Generator: Launchpad (build 17196)\n"

1920

2021#: plugins/LightDM/Greeter.cpp:130

@@ -30,6 +31,25 @@ msgstr ""

3031msgid "Unpin shortcut"

3132msgstr ""

3233

34+#: qml/Components/DelayedLockscreen.qml:47

35+msgid "Device Locked"

36+msgstr ""

37+

38+#: qml/Components/DelayedLockscreen.qml:62

39+msgid "You have been locked out due to too many failed passphrase attempts."

40+msgstr ""

41+

42+#: qml/Components/DelayedLockscreen.qml:63

43+msgid "You have been locked out due to too many failed passcode attempts."

44+msgstr ""

45+

46+#: qml/Components/DelayedLockscreen.qml:72

47+#, qt-format

48+msgid "Please wait %1 minute and then try again…"

49+msgid_plural "Please wait %1 minutes and then try again…"

50+msgstr[0] ""

51+msgstr[1] ""

52+

3353#: qml/Components/Dialogs.qml:70

3454msgid "Log out"

3555msgstr ""

@@ -132,14 +152,6 @@ msgid ""

132152"phone<br><br>Tap on the screen to start"

133153msgstr ""

134154

135−#: qml/Components/Lockscreen.qml:167

136−msgid "Please wait"

137−msgstr ""

138−

139−#: qml/Components/Lockscreen.qml:172

140−msgid "Too many incorrect attempts"

141−msgstr ""

142−

143155#: qml/Components/Lockscreen.qml:206

144156msgid "Emergency Call"

145157msgstr ""

@@ -148,15 +160,6 @@ msgstr ""

148160msgid "OK"

149161msgstr ""

150162

151−#: qml/Components/PassphraseLockscreen.qml:61

152−#, qt-format

153−msgid "Hello %1"

154−msgstr ""

155−

156−#: qml/Components/PassphraseLockscreen.qml:61

157−msgid "Hello"

158−msgstr ""

159−

160163#: qml/Dash/GenericScopeView.qml:411 qml/Dash/GenericScopeView.qml:533

161164msgid "See less"

162165msgstr ""

@@ -223,7 +226,7 @@ msgid "All"

223226msgstr ""

224227

225228#: qml/Greeter/Greeter.qml:157

226−msgid "Swipe to unlock"

229+msgid "Unlock"

227230msgstr ""

228231

229232#: qml/Hud/HudParametrizedActionsPage.qml:139

@@ -302,25 +305,29 @@ msgstr ""

302305msgid "Roaming"

303306msgstr ""

304307

305−#: qml/Shell.qml:320

306−msgid "Enter your passphrase"

308+#: qml/Shell.qml:340

309+msgid "Enter passphrase"

307310msgstr ""

308311

309312#: qml/Shell.qml:321

310313msgid "Sorry, incorrect passphrase"

311314msgstr ""

312315

313−#: qml/Shell.qml:323

314−msgid "Enter your passcode"

316+#: qml/Shell.qml:342

317+msgid "Please re-enter"

318+msgstr ""

319+

320+#: qml/Shell.qml:344

321+msgid "Enter passcode"

315322msgstr ""

316323

317324#: qml/Shell.qml:324

318325msgid "Sorry, incorrect passcode"

319326msgstr ""

320327

321−#: qml/Shell.qml:327

328+#: qml/Shell.qml:348

322329#, qt-format

323−msgid "Enter your %1"

330+msgid "Enter %1"

324331msgstr ""

325332

326333#: qml/Shell.qml:328

po/tr.po+55−29

@@ -7,14 +7,15 @@ msgid ""

77msgstr ""

88"Project-Id-Version: unity\n"

99"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10−"POT-Creation-Date: 2014-09-24 10:43+0100\n"

10+"POT-Creation-Date: 2014-10-02 10:35+0200\n"

1111"PO-Revision-Date: 2014-07-16 17:58+0000\n"

1212"Last-Translator: Volkan Gezer <Unknown>\n"

1313"Language-Team: Turkish <tr@li.org>\n"

1414"MIME-Version: 1.0\n"

1515"Content-Type: text/plain; charset=UTF-8\n"

1616"Content-Transfer-Encoding: 8bit\n"

17−"X-Launchpad-Export-Date: 2014-09-29 05:20+0000\n"

17+"Plural-Forms: nplurals=2; plural=n != 1;\n"

18+"X-Launchpad-Export-Date: 2014-10-03 06:22+0000\n"

1819"X-Generator: Launchpad (build 17196)\n"

1920

2021#: plugins/LightDM/Greeter.cpp:130

@@ -30,6 +31,25 @@ msgstr "Kısayolu iğnele"

3031msgid "Unpin shortcut"

3132msgstr "Kısayol iğnesini kaldır"

3233

34+#: qml/Components/DelayedLockscreen.qml:47

35+msgid "Device Locked"

36+msgstr ""

37+

38+#: qml/Components/DelayedLockscreen.qml:62

39+msgid "You have been locked out due to too many failed passphrase attempts."

40+msgstr ""

41+

42+#: qml/Components/DelayedLockscreen.qml:63

43+msgid "You have been locked out due to too many failed passcode attempts."

44+msgstr ""

45+

46+#: qml/Components/DelayedLockscreen.qml:72

47+#, qt-format

48+msgid "Please wait %1 minute and then try again…"

49+msgid_plural "Please wait %1 minutes and then try again…"

50+msgstr[0] ""

51+msgstr[1] ""

52+

3353#: qml/Components/Dialogs.qml:70

3454msgid "Log out"

3555msgstr ""

@@ -135,14 +155,6 @@ msgstr ""

135155"Kenar haraketlerini öğrendiniz ve telefonu kullanmaya "

136156"başlayabilirsiniz<br><br>Başlamak için ekrana dokunun"

137157

138−#: qml/Components/Lockscreen.qml:167

139−msgid "Please wait"

140−msgstr ""

141−

142−#: qml/Components/Lockscreen.qml:172

143−msgid "Too many incorrect attempts"

144−msgstr "Çok fazla hatalı deneme yaptınız"

145−

146158#: qml/Components/Lockscreen.qml:206

147159msgid "Emergency Call"

148160msgstr "Acil Arama"

@@ -151,15 +163,6 @@ msgstr "Acil Arama"

151163msgid "OK"

152164msgstr "Tamam"

153165

154−#: qml/Components/PassphraseLockscreen.qml:61

155−#, qt-format

156−msgid "Hello %1"

157−msgstr "Merhaba %1"

158−

159−#: qml/Components/PassphraseLockscreen.qml:61

160−msgid "Hello"

161−msgstr "Merhaba"

162−

163166#: qml/Dash/GenericScopeView.qml:411 qml/Dash/GenericScopeView.qml:533

164167msgid "See less"

165168msgstr "Daha azını gör"

@@ -226,8 +229,8 @@ msgid "All"

226229msgstr ""

227230

228231#: qml/Greeter/Greeter.qml:157

229−msgid "Swipe to unlock"

230−msgstr "Açmak için kaydırın"

232+msgid "Unlock"

233+msgstr ""

231234

232235#: qml/Hud/HudParametrizedActionsPage.qml:139

233236msgid "Confirm"

@@ -305,25 +308,29 @@ msgstr "SIM kilidini aç"

305308msgid "Roaming"

306309msgstr ""

307310

308−#: qml/Shell.qml:320

309−msgid "Enter your passphrase"

310−msgstr "Parolanızı girin"

311+#: qml/Shell.qml:340

312+msgid "Enter passphrase"

313+msgstr ""

311314

312315#: qml/Shell.qml:321

313316msgid "Sorry, incorrect passphrase"

314317msgstr "Üzgünüm, hatalı parola"

315318

316−#: qml/Shell.qml:323

317−msgid "Enter your passcode"

318−msgstr "Parolanızı girin"

319+#: qml/Shell.qml:342

320+msgid "Please re-enter"

321+msgstr ""

322+

323+#: qml/Shell.qml:344

324+msgid "Enter passcode"

325+msgstr ""

319326

320327#: qml/Shell.qml:324

321328msgid "Sorry, incorrect passcode"

322329msgstr "Üzgünüm, hatalı parola"

323330

324−#: qml/Shell.qml:327

331+#: qml/Shell.qml:348

325332#, qt-format

326−msgid "Enter your %1"

333+msgid "Enter %1"

327334msgstr ""

328335

329336#: qml/Shell.qml:328

@@ -358,3 +365,22 @@ msgid ""

358365msgstr ""

359366"Eğer hatalı parola girilirse, telefonunuz fabrika ayarlarına dönecek ve tüm "

360367"kişisel verileriniz silinecek."

368+

369+#~ msgid "Hello"

370+#~ msgstr "Merhaba"

371+

372+#, qt-format

373+#~ msgid "Hello %1"

374+#~ msgstr "Merhaba %1"

375+

376+#~ msgid "Swipe to unlock"

377+#~ msgstr "Açmak için kaydırın"

378+

379+#~ msgid "Too many incorrect attempts"

380+#~ msgstr "Çok fazla hatalı deneme yaptınız"

381+

382+#~ msgid "Enter your passphrase"

383+#~ msgstr "Parolanızı girin"

384+

385+#~ msgid "Enter your passcode"

386+#~ msgstr "Parolanızı girin"

po/ug.po+81−52

@@ -7,29 +7,48 @@ msgid ""

77msgstr ""

88"Project-Id-Version: unity\n"

99"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10−"POT-Creation-Date: 2014-09-24 10:43+0100\n"

11−"PO-Revision-Date: 2014-09-29 00:52+0000\n"

10+"POT-Creation-Date: 2014-10-02 10:35+0200\n"

11+"PO-Revision-Date: 2014-10-06 00:47+0000\n"

1212"Last-Translator: Gheyret T.Kenji <Unknown>\n"

1313"Language-Team: Uyghur Computer Science Association <UKIJ@yahoogroups.com>\n"

1414"MIME-Version: 1.0\n"

1515"Content-Type: text/plain; charset=UTF-8\n"

1616"Content-Transfer-Encoding: 8bit\n"

17−"X-Launchpad-Export-Date: 2014-09-30 07:10+0000\n"

17+"Plural-Forms: nplurals=1; plural=0;\n"

18+"X-Launchpad-Export-Date: 2014-10-06 07:00+0000\n"

1819"X-Generator: Launchpad (build 17196)\n"

1920

2021#: plugins/LightDM/Greeter.cpp:130

2122msgid "Password: "

2223msgstr "ئىم: "

2324

24−#: plugins/Unity/Launcher/launcheritem.cpp:44

25−#: plugins/Unity/Launcher/launcheritem.cpp:74

25+#: plugins/Unity/Launcher/launcheritem.cpp:45

26+#: plugins/Unity/Launcher/launcheritem.cpp:91

2627msgid "Pin shortcut"

2728msgstr "تېزلەتمىنى قوي"

2829

29−#: plugins/Unity/Launcher/launcheritem.cpp:74

30+#: plugins/Unity/Launcher/launcheritem.cpp:91

3031msgid "Unpin shortcut"

3132msgstr "تېزلەتمىنى ئېلىۋەت"

3233

34+#: qml/Components/DelayedLockscreen.qml:47

35+msgid "Device Locked"

36+msgstr "ئۈسكۈنە قۇلۇپلانغان"

37+

38+#: qml/Components/DelayedLockscreen.qml:62

39+msgid "You have been locked out due to too many failed passphrase attempts."

40+msgstr "خاتا ئىم جۈملىسى كۆپ قېتىم كىرگۈزۈلگەنلىكى ئۈچۈن قۇلۇپلاندى."

41+

42+#: qml/Components/DelayedLockscreen.qml:63

43+msgid "You have been locked out due to too many failed passcode attempts."

44+msgstr "خاتا ئىم كودى(passcode) كۆپ قېتىم كىرگۈزۈلگەنلىكى ئۈچۈن قۇلۇپلاندى."

45+

46+#: qml/Components/DelayedLockscreen.qml:72

47+#, qt-format

48+msgid "Please wait %1 minute and then try again…"

49+msgid_plural "Please wait %1 minutes and then try again…"

50+msgstr[0] "%1 مىنۇت كۈتۈپ ئاندىن قايتا سىناڭ…"

51+

3352#: qml/Components/Dialogs.qml:70

3453msgid "Log out"

3554msgstr "تىزىمدىن چىق"

@@ -136,14 +155,6 @@ msgstr ""

136155"ئېكراننى چېكىپ باشلاڭ<br><br>سىز ھازىر گىرۋەك بارماق ئىشارەتلىرىنى ئىگىلەپ "

137156"بولدىڭىز،ئەمدى تېلېفوننى ئىشلىتىشنى باشلىسىڭىز بولىدۇ"

138157

139−#: qml/Components/Lockscreen.qml:167

140−msgid "Please wait"

141−msgstr "سەل ساقلاڭ"

142−

143−#: qml/Components/Lockscreen.qml:172

144−msgid "Too many incorrect attempts"

145−msgstr "مەغلۇپ بولۇش سانى چەكتىن ئېشىپ كەتتى"

146−

147158#: qml/Components/Lockscreen.qml:206

148159msgid "Emergency Call"

149160msgstr "جىددىي تېلېفون"

@@ -152,24 +163,15 @@ msgstr "جىددىي تېلېفون"

152163msgid "OK"

153164msgstr "تامام"

154165

155−#: qml/Components/PassphraseLockscreen.qml:61

156−#, qt-format

157−msgid "Hello %1"

158−msgstr "سالام %1"

159−

160−#: qml/Components/PassphraseLockscreen.qml:61

161−msgid "Hello"

162−msgstr "ئەسسالامۇئەلەيكۇم"

163−

164−#: qml/Dash/GenericScopeView.qml:364 qml/Dash/GenericScopeView.qml:483

166+#: qml/Dash/GenericScopeView.qml:411 qml/Dash/GenericScopeView.qml:533

165167msgid "See less"

166168msgstr "ئازراق كۆرۈش"

167169

168−#: qml/Dash/GenericScopeView.qml:364

170+#: qml/Dash/GenericScopeView.qml:411

169171msgid "See all"

170172msgstr "ھەممىنى كۆرۈش…"

171173

172−#: qml/Dash/GenericScopeView.qml:427 qml/Dash/PageHeader.qml:258

174+#: qml/Dash/GenericScopeView.qml:473 qml/Dash/PageHeader.qml:258

173175#: qml/Panel/SearchIndicator.qml:27

174176msgid "Search"

175177msgstr "ئىزدە"

@@ -227,8 +229,8 @@ msgid "All"

227229msgstr "ھەممىسى"

228230

229231#: qml/Greeter/Greeter.qml:157

230−msgid "Swipe to unlock"

231−msgstr "سىيرىسىڭىز قۇلۇپسىزلىنىدۇ"

232+msgid "Unlock"

233+msgstr "قۇلۇپسىزلا"

232234

233235#: qml/Hud/HudParametrizedActionsPage.qml:139

234236msgid "Confirm"

@@ -274,27 +276,27 @@ msgstr "يىغىن"

274276msgid "Nothing is playing"

275277msgstr "ھېچ نېمە قويۇلمايۋاتىدۇ"

276278

277−#: qml/Panel/Indicators/MenuItemFactory.qml:651

279+#: qml/Panel/Indicators/MenuItemFactory.qml:748

278280msgid "In queue…"

279281msgstr "قاتاردا…"

280282

281−#: qml/Panel/Indicators/MenuItemFactory.qml:655

283+#: qml/Panel/Indicators/MenuItemFactory.qml:752

282284msgid "Downloading"

283285msgstr "چۈشۈرۈۋاتىدۇ"

284286

285−#: qml/Panel/Indicators/MenuItemFactory.qml:657

287+#: qml/Panel/Indicators/MenuItemFactory.qml:754

286288msgid "Paused, tap to resume"

287289msgstr "توختىتىلغان، چەكسە داۋاملىشىدۇ"

288290

289−#: qml/Panel/Indicators/MenuItemFactory.qml:659

291+#: qml/Panel/Indicators/MenuItemFactory.qml:756

290292msgid "Canceled"

291293msgstr "قالدۇرۇۋېتىلدى"

292294

293−#: qml/Panel/Indicators/MenuItemFactory.qml:661

295+#: qml/Panel/Indicators/MenuItemFactory.qml:758

294296msgid "Finished"

295297msgstr "تاماملاندى"

296298

297−#: qml/Panel/Indicators/MenuItemFactory.qml:663

299+#: qml/Panel/Indicators/MenuItemFactory.qml:760

298300msgid "Failed, tap to retry"

299301msgstr "مەغلۇپ بولدى، چېكىپ قايتا سىناڭ"

300302

@@ -306,45 +308,49 @@ msgstr "SIM نى قۇلۇپسىزلاش"

306308msgid "Roaming"

307309msgstr "كەزمە"

308310

309−#: qml/Shell.qml:292

310−msgid "Enter your passphrase"

311−msgstr "ئىمىڭىزنى كىرگۈزۈڭ"

311+#: qml/Shell.qml:340

312+msgid "Enter passphrase"

313+msgstr "ئىم كىرگۈزۈڭ"

312314

313−#: qml/Shell.qml:293

315+#: qml/Shell.qml:321

314316msgid "Sorry, incorrect passphrase"

315317msgstr "كەچۈرۈڭ، ئىم توغرا ئەمەس"

316318

317−#: qml/Shell.qml:295

318−msgid "Enter your passcode"

319−msgstr "ئىمىڭىزنى كىرگۈزۈڭ"

319+#: qml/Shell.qml:342

320+msgid "Please re-enter"

321+msgstr "قايتا كىرگۈزۈڭ"

320322

321−#: qml/Shell.qml:296

323+#: qml/Shell.qml:344

324+msgid "Enter passcode"

325+msgstr "ئىم كودى(passcode)نى كىرگۈزۈڭ"

326+

327+#: qml/Shell.qml:324

322328msgid "Sorry, incorrect passcode"

323329msgstr "كەچۈرۈڭ، ئىم توغرا ئەمەس"

324330

325−#: qml/Shell.qml:299

331+#: qml/Shell.qml:348

326332#, qt-format

327−msgid "Enter your %1"

333+msgid "Enter %1"

328334msgstr "%1 نى كىرگۈزۈڭ"

329335

330−#: qml/Shell.qml:300

336+#: qml/Shell.qml:328

331337#, qt-format

332338msgid "Sorry, incorrect %1"

333339msgstr "كەچۈرۈڭ، %1 توغرا ئەمەس"

334340

335−#: qml/Shell.qml:335

341+#: qml/Shell.qml:363

336342msgid "Sorry, incorrect passphrase."

337343msgstr "كەچۈرۈڭ، ئىم توغرا ئەمەس"

338344

339−#: qml/Shell.qml:336

345+#: qml/Shell.qml:364

340346msgid "Sorry, incorrect passcode."

341347msgstr "كەچۈرۈڭ، ئىم كودى ئەمەس"

342348

343−#: qml/Shell.qml:337

349+#: qml/Shell.qml:365

344350msgid "This will be your last attempt."

345351msgstr "بۇ سىزنىڭ ئەڭ ئاخىرقى پۇرسىتىڭىز"

346352

347−#: qml/Shell.qml:339

353+#: qml/Shell.qml:367

348354msgid ""

349355"If passphrase is entered incorrectly, your phone will conduct a factory "

350356"reset and all personal data will be deleted."

@@ -352,7 +358,7 @@ msgstr ""

352358"ئەگەر ئىم توغرا بولمىسا، تېلېفونىڭىز ئەسلىگە قايتۇرۇلۇپ، زاۋۇتتىن چىققان "

353359"ھالەتكە كېلىپ قالىدۇ. بارلىق مەزمۇنلار يوقىلىدۇ."

354360

355−#: qml/Shell.qml:340

361+#: qml/Shell.qml:368

356362msgid ""

357363"If passcode is entered incorrectly, your phone will conduct a factory reset "

358364"and all personal data will be deleted."

@@ -360,5 +366,28 @@ msgstr ""

360366"ئەگەر ئىم كودى توغرا بولمىسا، تېلېفونىڭىز ئەسلىگە قايتۇرۇلۇپ، زاۋۇتتىن "

361367"چىققان ھالەتكە كېلىپ قالىدۇ. بارلىق مەزمۇنلار يوقىلىدۇ."

362368

363−#~ msgid "Manage Dash"

364−#~ msgstr "باش تاختىنى باشقۇرۇش"

369+#, qt-format

370+#~ msgid "Hello %1"

371+#~ msgstr "سالام %1"

372+

373+#~ msgid "Swipe to unlock"

374+#~ msgstr "سىيرىسىڭىز قۇلۇپسىزلىنىدۇ"

375+

376+#~ msgid "Hello"

377+#~ msgstr "ئەسسالامۇئەلەيكۇم"

378+

379+#~ msgid "Please wait"

380+#~ msgstr "سەل ساقلاڭ"

381+

382+#~ msgid "Enter your passphrase"

383+#~ msgstr "ئىمىڭىزنى كىرگۈزۈڭ"

384+

385+#~ msgid "Enter your passcode"

386+#~ msgstr "ئىمىڭىزنى كىرگۈزۈڭ"

387+

388+#~ msgid "Too many incorrect attempts"

389+#~ msgstr "مەغلۇپ بولۇش سانى چەكتىن ئېشىپ كەتتى"

390+

391+#, qt-format

392+#~ msgid "Enter your %1"

393+#~ msgstr "%1 نى كىرگۈزۈڭ"

po/uk.po+69−33

@@ -7,14 +7,16 @@ msgid ""

77msgstr ""

88"Project-Id-Version: unity\n"

99"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10−"POT-Creation-Date: 2014-09-24 10:43+0100\n"

11−"PO-Revision-Date: 2014-08-26 19:06+0000\n"

10+"POT-Creation-Date: 2014-10-02 10:35+0200\n"

11+"PO-Revision-Date: 2014-10-03 12:44+0000\n"

1212"Last-Translator: Yuri Chornoivan <yurchor@gmail.com>\n"

1313"Language-Team: Ukrainian <uk@li.org>\n"

1414"MIME-Version: 1.0\n"

1515"Content-Type: text/plain; charset=UTF-8\n"

1616"Content-Transfer-Encoding: 8bit\n"

17−"X-Launchpad-Export-Date: 2014-09-29 05:20+0000\n"

17+"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && "

18+"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"

19+"X-Launchpad-Export-Date: 2014-10-04 06:28+0000\n"

1820"X-Generator: Launchpad (build 17196)\n"

1921

2022#: plugins/LightDM/Greeter.cpp:130

@@ -30,6 +32,30 @@ msgstr "Заблокувати кнопку"

3032msgid "Unpin shortcut"

3133msgstr "Розблокувати кнопку"

3234

35+#: qml/Components/DelayedLockscreen.qml:47

36+msgid "Device Locked"

37+msgstr "Пристрій заблоковано"

38+

39+#: qml/Components/DelayedLockscreen.qml:62

40+msgid "You have been locked out due to too many failed passphrase attempts."

41+msgstr ""

42+"Ваш пристрій було заблоковано через перевищення граничної кількості спроб "

43+"введення пароля."

44+

45+#: qml/Components/DelayedLockscreen.qml:63

46+msgid "You have been locked out due to too many failed passcode attempts."

47+msgstr ""

48+"Ваш пристрій було заблоковано через перевищення граничної кількості спроб "

49+"введення коду-пароля."

50+

51+#: qml/Components/DelayedLockscreen.qml:72

52+#, qt-format

53+msgid "Please wait %1 minute and then try again…"

54+msgid_plural "Please wait %1 minutes and then try again…"

55+msgstr[0] "Зачекайте %1 хвилину і повторіть спробу…"

56+msgstr[1] "Зачекайте %1 хвилини і повторіть спробу…"

57+msgstr[2] "Зачекайте %1 хвилин і повторіть спробу…"

58+

3359#: qml/Components/Dialogs.qml:70

3460msgid "Log out"

3561msgstr "Вийти"

@@ -139,14 +165,6 @@ msgstr ""

139165"Вами налаштовано дії у відповідь на дотики на краях екрана. Тепер телефоном "

140166"можна користуватися.<br><br>Торкніться екрана, щоб розпочати."

141167

142−#: qml/Components/Lockscreen.qml:167

143−msgid "Please wait"

144−msgstr "Будь ласка, зачекайте"

145−

146−#: qml/Components/Lockscreen.qml:172

147−msgid "Too many incorrect attempts"

148−msgstr "Забагато помилкових спроб"

149−

150168#: qml/Components/Lockscreen.qml:206

151169msgid "Emergency Call"

152170msgstr "Терміновий виклик"

@@ -155,15 +173,6 @@ msgstr "Терміновий виклик"

155173msgid "OK"

156174msgstr "Гаразд"

157175

158−#: qml/Components/PassphraseLockscreen.qml:61

159−#, qt-format

160−msgid "Hello %1"

161−msgstr "Привіт, %1"

162−

163−#: qml/Components/PassphraseLockscreen.qml:61

164−msgid "Hello"

165−msgstr "Привіт!"

166−

167176#: qml/Dash/GenericScopeView.qml:411 qml/Dash/GenericScopeView.qml:533

168177msgid "See less"

169178msgstr "Стисліше"

@@ -230,8 +239,8 @@ msgid "All"

230239msgstr "Все"

231240

232241#: qml/Greeter/Greeter.qml:157

233−msgid "Swipe to unlock"

234−msgstr "Проведіть пальцем, щоб розблокувати"

242+msgid "Unlock"

243+msgstr "Розблокувати"

235244

236245#: qml/Hud/HudParametrizedActionsPage.qml:139

237246msgid "Confirm"

@@ -309,26 +318,30 @@ msgstr "Розблокувати SIM"

309318msgid "Roaming"

310319msgstr "Роумінг"

311320

312−#: qml/Shell.qml:320

313−msgid "Enter your passphrase"

314−msgstr "Введіть ваш пароль"

321+#: qml/Shell.qml:340

322+msgid "Enter passphrase"

323+msgstr "Введіть пароль"

315324

316325#: qml/Shell.qml:321

317326msgid "Sorry, incorrect passphrase"

318327msgstr "Вибачте, помилковий пароль"

319328

320−#: qml/Shell.qml:323

321−msgid "Enter your passcode"

322−msgstr "Введіть ваш код-пароль"

329+#: qml/Shell.qml:342

330+msgid "Please re-enter"

331+msgstr "Ввведіть ще раз"

332+

333+#: qml/Shell.qml:344

334+msgid "Enter passcode"

335+msgstr "Введіть код"

323336

324337#: qml/Shell.qml:324

325338msgid "Sorry, incorrect passcode"

326339msgstr "Вибачте, помилковий код-пароль"

327340

328−#: qml/Shell.qml:327

341+#: qml/Shell.qml:348

329342#, qt-format

330−msgid "Enter your %1"

331−msgstr "Вкажіть ваш %1"

343+msgid "Enter %1"

344+msgstr "Введіть %1"

332345

333346#: qml/Shell.qml:328

334347#, qt-format

@@ -363,5 +376,28 @@ msgstr ""

363376"Якщо код-пароль буде вказано неправильно, телефон повернеться до початкового "

364377"стану, усі особисті дані буде вилучено."

365378

366−#~ msgid "Manage Dash"

367−#~ msgstr "Керування панеллю"

379+#, qt-format

380+#~ msgid "Hello %1"

381+#~ msgstr "Привіт, %1"

382+

383+#~ msgid "Hello"

384+#~ msgstr "Привіт!"

385+

386+#~ msgid "Swipe to unlock"

387+#~ msgstr "Проведіть пальцем, щоб розблокувати"

388+

389+#~ msgid "Please wait"

390+#~ msgstr "Будь ласка, зачекайте"

391+

392+#~ msgid "Too many incorrect attempts"

393+#~ msgstr "Забагато помилкових спроб"

394+

395+#, qt-format

396+#~ msgid "Enter your %1"

397+#~ msgstr "Вкажіть ваш %1"

398+

399+#~ msgid "Enter your passphrase"

400+#~ msgstr "Введіть ваш пароль"

401+

402+#~ msgid "Enter your passcode"

403+#~ msgstr "Введіть ваш код-пароль"

po/unity8.pot+10−2

@@ -8,7 +8,7 @@ msgid ""

88msgstr ""

99"Project-Id-Version: unity8\n"

1010"Report-Msgid-Bugs-To: \n"

11−"POT-Creation-Date: 2014-10-02 10:35+0200\n"

11+"POT-Creation-Date: 2014-10-03 08:13-0400\n"

1212"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"

1313"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"

1414"Language-Team: LANGUAGE <LL@li.org>\n"

@@ -160,7 +160,7 @@ msgstr ""

160160msgid "OK"

161161msgstr ""

162162

163−#: qml/Dash/GenericScopeView.qml:411 qml/Dash/GenericScopeView.qml:533

163+#: qml/Dash/GenericScopeView.qml:411 qml/Dash/GenericScopeView.qml:568

164164msgid "See less"

165165msgstr ""

166166

@@ -205,6 +205,14 @@ msgstr ""

205205msgid "Send"

206206msgstr ""

207207

208+#: qml/Dash/PullToRefreshScopeStyle.qml:55

209+msgid "Pull to refresh…"

210+msgstr ""

211+

212+#: qml/Dash/PullToRefreshScopeStyle.qml:60

213+msgid "Release to refresh…"

214+msgstr ""

215+

208216#: qml/Dash/ScopesOverview.qml:206

209217msgid "Manage Scopes"

210218msgstr ""

po/vi.po+33−26

@@ -7,14 +7,15 @@ msgid ""

77msgstr ""

88"Project-Id-Version: unity8\n"

99"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10−"POT-Creation-Date: 2014-09-24 10:43+0100\n"

10+"POT-Creation-Date: 2014-10-02 10:35+0200\n"

1111"PO-Revision-Date: 2014-01-15 01:19+0000\n"

1212"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"

1313"Language-Team: Vietnamese <vi@li.org>\n"

1414"MIME-Version: 1.0\n"

1515"Content-Type: text/plain; charset=UTF-8\n"

1616"Content-Transfer-Encoding: 8bit\n"

17−"X-Launchpad-Export-Date: 2014-09-29 05:20+0000\n"

17+"Plural-Forms: nplurals=1; plural=0;\n"

18+"X-Launchpad-Export-Date: 2014-10-03 06:22+0000\n"

1819"X-Generator: Launchpad (build 17196)\n"

1920

2021#: plugins/LightDM/Greeter.cpp:130

@@ -30,6 +31,25 @@ msgstr ""

3031msgid "Unpin shortcut"

3132msgstr ""

3233

34+#: qml/Components/DelayedLockscreen.qml:47

35+msgid "Device Locked"

36+msgstr ""

37+

38+#: qml/Components/DelayedLockscreen.qml:62

39+msgid "You have been locked out due to too many failed passphrase attempts."

40+msgstr ""

41+

42+#: qml/Components/DelayedLockscreen.qml:63

43+msgid "You have been locked out due to too many failed passcode attempts."

44+msgstr ""

45+

46+#: qml/Components/DelayedLockscreen.qml:72

47+#, qt-format

48+msgid "Please wait %1 minute and then try again…"

49+msgid_plural "Please wait %1 minutes and then try again…"

50+msgstr[0] ""

51+msgstr[1] ""

52+

3353#: qml/Components/Dialogs.qml:70

3454msgid "Log out"

3555msgstr ""

@@ -132,14 +152,6 @@ msgid ""

132152"phone<br><br>Tap on the screen to start"

133153msgstr ""

134154

135−#: qml/Components/Lockscreen.qml:167

136−msgid "Please wait"

137−msgstr ""

138−

139−#: qml/Components/Lockscreen.qml:172

140−msgid "Too many incorrect attempts"

141−msgstr ""

142−

143155#: qml/Components/Lockscreen.qml:206

144156msgid "Emergency Call"

145157msgstr ""

@@ -148,15 +160,6 @@ msgstr ""

148160msgid "OK"

149161msgstr ""

150162

151−#: qml/Components/PassphraseLockscreen.qml:61

152−#, qt-format

153−msgid "Hello %1"

154−msgstr ""

155−

156−#: qml/Components/PassphraseLockscreen.qml:61

157−msgid "Hello"

158−msgstr ""

159−

160163#: qml/Dash/GenericScopeView.qml:411 qml/Dash/GenericScopeView.qml:533

161164msgid "See less"

162165msgstr ""

@@ -223,7 +226,7 @@ msgid "All"

223226msgstr ""

224227

225228#: qml/Greeter/Greeter.qml:157

226−msgid "Swipe to unlock"

229+msgid "Unlock"

227230msgstr ""

228231

229232#: qml/Hud/HudParametrizedActionsPage.qml:139

@@ -302,25 +305,29 @@ msgstr ""

302305msgid "Roaming"

303306msgstr ""

304307

305−#: qml/Shell.qml:320

306−msgid "Enter your passphrase"

308+#: qml/Shell.qml:340

309+msgid "Enter passphrase"

307310msgstr ""

308311

309312#: qml/Shell.qml:321

310313msgid "Sorry, incorrect passphrase"

311314msgstr ""

312315

313−#: qml/Shell.qml:323

314−msgid "Enter your passcode"

316+#: qml/Shell.qml:342

317+msgid "Please re-enter"

318+msgstr ""

319+

320+#: qml/Shell.qml:344

321+msgid "Enter passcode"

315322msgstr ""

316323

317324#: qml/Shell.qml:324

318325msgid "Sorry, incorrect passcode"

319326msgstr ""

320327

321−#: qml/Shell.qml:327

328+#: qml/Shell.qml:348

322329#, qt-format

323−msgid "Enter your %1"

330+msgid "Enter %1"

324331msgstr ""

325332

326333#: qml/Shell.qml:328

po/xh.po+33−26

@@ -7,14 +7,15 @@ msgid ""

77msgstr ""

88"Project-Id-Version: unity8\n"

99"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10−"POT-Creation-Date: 2014-09-24 10:43+0100\n"

10+"POT-Creation-Date: 2014-10-02 10:35+0200\n"

1111"PO-Revision-Date: 2013-09-28 13:20+0000\n"

1212"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"

1313"Language-Team: Xhosa <xh@li.org>\n"

1414"MIME-Version: 1.0\n"

1515"Content-Type: text/plain; charset=UTF-8\n"

1616"Content-Transfer-Encoding: 8bit\n"

17−"X-Launchpad-Export-Date: 2014-09-29 05:20+0000\n"

17+"Plural-Forms: nplurals=2; plural=n != 1;\n"

18+"X-Launchpad-Export-Date: 2014-10-03 06:22+0000\n"

1819"X-Generator: Launchpad (build 17196)\n"

1920

2021#: plugins/LightDM/Greeter.cpp:130

@@ -30,6 +31,25 @@ msgstr ""

3031msgid "Unpin shortcut"

3132msgstr ""

3233

34+#: qml/Components/DelayedLockscreen.qml:47

35+msgid "Device Locked"

36+msgstr ""

37+

38+#: qml/Components/DelayedLockscreen.qml:62

39+msgid "You have been locked out due to too many failed passphrase attempts."

40+msgstr ""

41+

42+#: qml/Components/DelayedLockscreen.qml:63

43+msgid "You have been locked out due to too many failed passcode attempts."

44+msgstr ""

45+

46+#: qml/Components/DelayedLockscreen.qml:72

47+#, qt-format

48+msgid "Please wait %1 minute and then try again…"

49+msgid_plural "Please wait %1 minutes and then try again…"

50+msgstr[0] ""

51+msgstr[1] ""

52+

3353#: qml/Components/Dialogs.qml:70

3454msgid "Log out"

3555msgstr ""

@@ -132,14 +152,6 @@ msgid ""

132152"phone<br><br>Tap on the screen to start"

133153msgstr ""

134154

135−#: qml/Components/Lockscreen.qml:167

136−msgid "Please wait"

137−msgstr ""

138−

139−#: qml/Components/Lockscreen.qml:172

140−msgid "Too many incorrect attempts"

141−msgstr ""

142−

143155#: qml/Components/Lockscreen.qml:206

144156msgid "Emergency Call"

145157msgstr ""

@@ -148,15 +160,6 @@ msgstr ""

148160msgid "OK"

149161msgstr ""

150162

151−#: qml/Components/PassphraseLockscreen.qml:61

152−#, qt-format

153−msgid "Hello %1"

154−msgstr ""

155−

156−#: qml/Components/PassphraseLockscreen.qml:61

157−msgid "Hello"

158−msgstr ""

159−

160163#: qml/Dash/GenericScopeView.qml:411 qml/Dash/GenericScopeView.qml:533

161164msgid "See less"

162165msgstr ""

@@ -223,7 +226,7 @@ msgid "All"

223226msgstr ""

224227

225228#: qml/Greeter/Greeter.qml:157

226−msgid "Swipe to unlock"

229+msgid "Unlock"

227230msgstr ""

228231

229232#: qml/Hud/HudParametrizedActionsPage.qml:139

@@ -302,25 +305,29 @@ msgstr ""

302305msgid "Roaming"

303306msgstr ""

304307

305−#: qml/Shell.qml:320

306−msgid "Enter your passphrase"

308+#: qml/Shell.qml:340

309+msgid "Enter passphrase"

307310msgstr ""

308311

309312#: qml/Shell.qml:321

310313msgid "Sorry, incorrect passphrase"

311314msgstr ""

312315

313−#: qml/Shell.qml:323

314−msgid "Enter your passcode"

316+#: qml/Shell.qml:342

317+msgid "Please re-enter"

318+msgstr ""

319+

320+#: qml/Shell.qml:344

321+msgid "Enter passcode"

315322msgstr ""

316323

317324#: qml/Shell.qml:324

318325msgid "Sorry, incorrect passcode"

319326msgstr ""

320327

321−#: qml/Shell.qml:327

328+#: qml/Shell.qml:348

322329#, qt-format

323−msgid "Enter your %1"

330+msgid "Enter %1"

324331msgstr ""

325332

326333#: qml/Shell.qml:328

po/zh_CN.po+44−27

@@ -7,14 +7,15 @@ msgid ""

77msgstr ""

88"Project-Id-Version: unity\n"

99"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10−"POT-Creation-Date: 2014-09-24 10:43+0100\n"

10+"POT-Creation-Date: 2014-10-02 10:35+0200\n"

1111"PO-Revision-Date: 2014-08-12 14:09+0000\n"

1212"Last-Translator: Anthony Wong <anthony.wong@ubuntu.com>\n"

1313"Language-Team: Chinese (Simplified) <zh_CN@li.org>\n"

1414"MIME-Version: 1.0\n"

1515"Content-Type: text/plain; charset=UTF-8\n"

1616"Content-Transfer-Encoding: 8bit\n"

17−"X-Launchpad-Export-Date: 2014-09-29 05:20+0000\n"

17+"Plural-Forms: nplurals=1; plural=0;\n"

18+"X-Launchpad-Export-Date: 2014-10-03 06:22+0000\n"

1819"X-Generator: Launchpad (build 17196)\n"

1920

2021#: plugins/LightDM/Greeter.cpp:130

@@ -30,6 +31,25 @@ msgstr "固定快捷方式"

3031msgid "Unpin shortcut"

3132msgstr "取消固定快捷方式"

3233

34+#: qml/Components/DelayedLockscreen.qml:47

35+msgid "Device Locked"

36+msgstr ""

37+

38+#: qml/Components/DelayedLockscreen.qml:62

39+msgid "You have been locked out due to too many failed passphrase attempts."

40+msgstr ""

41+

42+#: qml/Components/DelayedLockscreen.qml:63

43+msgid "You have been locked out due to too many failed passcode attempts."

44+msgstr ""

45+

46+#: qml/Components/DelayedLockscreen.qml:72

47+#, qt-format

48+msgid "Please wait %1 minute and then try again…"

49+msgid_plural "Please wait %1 minutes and then try again…"

50+msgstr[0] ""

51+msgstr[1] ""

52+

3353#: qml/Components/Dialogs.qml:70

3454msgid "Log out"

3555msgstr ""

@@ -132,14 +152,6 @@ msgid ""

132152"phone<br><br>Tap on the screen to start"

133153msgstr "您现在已经掌握了边缘滑动手势，可以开始使用手机了<br><br>请点击屏幕开始使用"

134154

135−#: qml/Components/Lockscreen.qml:167

136−msgid "Please wait"

137−msgstr ""

138−

139−#: qml/Components/Lockscreen.qml:172

140−msgid "Too many incorrect attempts"

141−msgstr ""

142−

143155#: qml/Components/Lockscreen.qml:206

144156msgid "Emergency Call"

145157msgstr "紧急电话"

@@ -148,15 +160,6 @@ msgstr "紧急电话"

148160msgid "OK"

149161msgstr "确定"

150162

151−#: qml/Components/PassphraseLockscreen.qml:61

152−#, qt-format

153−msgid "Hello %1"

154−msgstr "你好，%1"

155−

156−#: qml/Components/PassphraseLockscreen.qml:61

157−msgid "Hello"

158−msgstr "你好"

159−

160163#: qml/Dash/GenericScopeView.qml:411 qml/Dash/GenericScopeView.qml:533

161164msgid "See less"

162165msgstr "显示更少"

@@ -223,8 +226,8 @@ msgid "All"

223226msgstr "所有"

224227

225228#: qml/Greeter/Greeter.qml:157

226−msgid "Swipe to unlock"

227−msgstr "滑动解锁"

229+msgid "Unlock"

230+msgstr ""

228231

229232#: qml/Hud/HudParametrizedActionsPage.qml:139

230233msgid "Confirm"

@@ -302,25 +305,29 @@ msgstr "解开 SIM"

302305msgid "Roaming"

303306msgstr "漫游"

304307

305−#: qml/Shell.qml:320

306−msgid "Enter your passphrase"

308+#: qml/Shell.qml:340

309+msgid "Enter passphrase"

307310msgstr ""

308311

309312#: qml/Shell.qml:321

310313msgid "Sorry, incorrect passphrase"

311314msgstr ""

312315

313−#: qml/Shell.qml:323

314−msgid "Enter your passcode"

316+#: qml/Shell.qml:342

317+msgid "Please re-enter"

318+msgstr ""

319+

320+#: qml/Shell.qml:344

321+msgid "Enter passcode"

315322msgstr ""

316323

317324#: qml/Shell.qml:324

318325msgid "Sorry, incorrect passcode"

319326msgstr ""

320327

321−#: qml/Shell.qml:327

328+#: qml/Shell.qml:348

322329#, qt-format

323−msgid "Enter your %1"

330+msgid "Enter %1"

324331msgstr ""

325332

326333#: qml/Shell.qml:328

@@ -352,5 +359,15 @@ msgid ""

352359"and all personal data will be deleted."

353360msgstr ""

354361

362+#, qt-format

363+#~ msgid "Hello %1"

364+#~ msgstr "你好，%1"

365+

366+#~ msgid "Hello"

367+#~ msgstr "你好"

368+

369+#~ msgid "Swipe to unlock"

370+#~ msgstr "滑动解锁"

371+

355372#~ msgid "Manage Dash"

356373#~ msgstr "管理 Dash"

po/zh_HK.po+44−27

@@ -7,14 +7,15 @@ msgid ""

77msgstr ""

88"Project-Id-Version: unity8\n"

99"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10−"POT-Creation-Date: 2014-09-24 10:43+0100\n"

10+"POT-Creation-Date: 2014-10-02 10:35+0200\n"

1111"PO-Revision-Date: 2014-08-10 11:45+0000\n"

1212"Last-Translator: Daniel Cheung <daniel.2345@hotmail.com>\n"

1313"Language-Team: Chinese (Hong Kong) <zh_HK@li.org>\n"

1414"MIME-Version: 1.0\n"

1515"Content-Type: text/plain; charset=UTF-8\n"

1616"Content-Transfer-Encoding: 8bit\n"

17−"X-Launchpad-Export-Date: 2014-09-29 05:20+0000\n"

17+"Plural-Forms: nplurals=1; plural=0;\n"

18+"X-Launchpad-Export-Date: 2014-10-03 06:22+0000\n"

1819"X-Generator: Launchpad (build 17196)\n"

1920

2021#: plugins/LightDM/Greeter.cpp:130

@@ -30,6 +31,25 @@ msgstr "釘住捷徑"

3031msgid "Unpin shortcut"

3132msgstr "取消捷徑釘選"

3233

34+#: qml/Components/DelayedLockscreen.qml:47

35+msgid "Device Locked"

36+msgstr ""

37+

38+#: qml/Components/DelayedLockscreen.qml:62

39+msgid "You have been locked out due to too many failed passphrase attempts."

40+msgstr ""

41+

42+#: qml/Components/DelayedLockscreen.qml:63

43+msgid "You have been locked out due to too many failed passcode attempts."

44+msgstr ""

45+

46+#: qml/Components/DelayedLockscreen.qml:72

47+#, qt-format

48+msgid "Please wait %1 minute and then try again…"

49+msgid_plural "Please wait %1 minutes and then try again…"

50+msgstr[0] ""

51+msgstr[1] ""

52+

3353#: qml/Components/Dialogs.qml:70

3454msgid "Log out"

3555msgstr ""

@@ -132,14 +152,6 @@ msgid ""

132152"phone<br><br>Tap on the screen to start"

133153msgstr "您現在已熟練邊緣手勢，可以開始使用手機了<br><br>輕觸螢幕開始使用"

134154

135−#: qml/Components/Lockscreen.qml:167

136−msgid "Please wait"

137−msgstr ""

138−

139−#: qml/Components/Lockscreen.qml:172

140−msgid "Too many incorrect attempts"

141−msgstr ""

142−

143155#: qml/Components/Lockscreen.qml:206

144156msgid "Emergency Call"

145157msgstr "緊急電話"

@@ -148,15 +160,6 @@ msgstr "緊急電話"

148160msgid "OK"

149161msgstr "確定"

150162

151−#: qml/Components/PassphraseLockscreen.qml:61

152−#, qt-format

153−msgid "Hello %1"

154−msgstr "您好 %1"

155−

156−#: qml/Components/PassphraseLockscreen.qml:61

157−msgid "Hello"

158−msgstr "您好"

159−

160163#: qml/Dash/GenericScopeView.qml:411 qml/Dash/GenericScopeView.qml:533

161164msgid "See less"

162165msgstr "縮減查看"

@@ -223,8 +226,8 @@ msgid "All"

223226msgstr ""

224227

225228#: qml/Greeter/Greeter.qml:157

226−msgid "Swipe to unlock"

227−msgstr "滑動解除鎖定"

229+msgid "Unlock"

230+msgstr ""

228231

229232#: qml/Hud/HudParametrizedActionsPage.qml:139

230233msgid "Confirm"

@@ -302,25 +305,29 @@ msgstr ""

302305msgid "Roaming"

303306msgstr ""

304307

305−#: qml/Shell.qml:320

306−msgid "Enter your passphrase"

308+#: qml/Shell.qml:340

309+msgid "Enter passphrase"

307310msgstr ""

308311

309312#: qml/Shell.qml:321

310313msgid "Sorry, incorrect passphrase"

311314msgstr ""

312315

313−#: qml/Shell.qml:323

314−msgid "Enter your passcode"

316+#: qml/Shell.qml:342

317+msgid "Please re-enter"

318+msgstr ""

319+

320+#: qml/Shell.qml:344

321+msgid "Enter passcode"

315322msgstr ""

316323

317324#: qml/Shell.qml:324

318325msgid "Sorry, incorrect passcode"

319326msgstr ""

320327

321−#: qml/Shell.qml:327

328+#: qml/Shell.qml:348

322329#, qt-format

323−msgid "Enter your %1"

330+msgid "Enter %1"

324331msgstr ""

325332

326333#: qml/Shell.qml:328

@@ -351,3 +358,13 @@ msgid ""

351358"If passcode is entered incorrectly, your phone will conduct a factory reset "

352359"and all personal data will be deleted."

353360msgstr ""

361+

362+#, qt-format

363+#~ msgid "Hello %1"

364+#~ msgstr "您好 %1"

365+

366+#~ msgid "Hello"

367+#~ msgstr "您好"

368+

369+#~ msgid "Swipe to unlock"

370+#~ msgstr "滑動解除鎖定"

po/zh_TW.po+63−30

@@ -7,14 +7,15 @@ msgid ""

77msgstr ""

88"Project-Id-Version: unity\n"

99"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10−"POT-Creation-Date: 2014-09-24 10:43+0100\n"

10+"POT-Creation-Date: 2014-10-02 10:35+0200\n"

1111"PO-Revision-Date: 2014-07-26 16:21+0000\n"

1212"Last-Translator: Cheng-Chia Tseng <pswo10680@gmail.com>\n"

1313"Language-Team: Chinese (Traditional) <zh_TW@li.org>\n"

1414"MIME-Version: 1.0\n"

1515"Content-Type: text/plain; charset=UTF-8\n"

1616"Content-Transfer-Encoding: 8bit\n"

17−"X-Launchpad-Export-Date: 2014-09-29 05:20+0000\n"

17+"Plural-Forms: nplurals=1; plural=0;\n"

18+"X-Launchpad-Export-Date: 2014-10-03 06:22+0000\n"

1819"X-Generator: Launchpad (build 17196)\n"

1920

2021#: plugins/LightDM/Greeter.cpp:130

@@ -30,6 +31,25 @@ msgstr "釘住捷徑"

3031msgid "Unpin shortcut"

3132msgstr "取消捷徑釘選"

3233

34+#: qml/Components/DelayedLockscreen.qml:47

35+msgid "Device Locked"

36+msgstr ""

37+

38+#: qml/Components/DelayedLockscreen.qml:62

39+msgid "You have been locked out due to too many failed passphrase attempts."

40+msgstr ""

41+

42+#: qml/Components/DelayedLockscreen.qml:63

43+msgid "You have been locked out due to too many failed passcode attempts."

44+msgstr ""

45+

46+#: qml/Components/DelayedLockscreen.qml:72

47+#, qt-format

48+msgid "Please wait %1 minute and then try again…"

49+msgid_plural "Please wait %1 minutes and then try again…"

50+msgstr[0] ""

51+msgstr[1] ""

52+

3353#: qml/Components/Dialogs.qml:70

3454msgid "Log out"

3555msgstr "登出"

@@ -132,14 +152,6 @@ msgid ""

132152"phone<br><br>Tap on the screen to start"

133153msgstr "您現在已熟練邊緣手勢，可以開始使用手機了<br><br>輕觸螢幕開始使用"

134154

135−#: qml/Components/Lockscreen.qml:167

136−msgid "Please wait"

137−msgstr "請稍候"

138−

139−#: qml/Components/Lockscreen.qml:172

140−msgid "Too many incorrect attempts"

141−msgstr "錯得太多次"

142−

143155#: qml/Components/Lockscreen.qml:206

144156msgid "Emergency Call"

145157msgstr "緊急通話"

@@ -148,15 +160,6 @@ msgstr "緊急通話"

148160msgid "OK"

149161msgstr "確定"

150162

151−#: qml/Components/PassphraseLockscreen.qml:61

152−#, qt-format

153−msgid "Hello %1"

154−msgstr "%1 您好"

155−

156−#: qml/Components/PassphraseLockscreen.qml:61

157−msgid "Hello"

158−msgstr "您好"

159−

160163#: qml/Dash/GenericScopeView.qml:411 qml/Dash/GenericScopeView.qml:533

161164msgid "See less"

162165msgstr "縮減查看"

@@ -223,8 +226,8 @@ msgid "All"

223226msgstr "全部"

224227

225228#: qml/Greeter/Greeter.qml:157

226−msgid "Swipe to unlock"

227−msgstr "滑開解除鎖定"

229+msgid "Unlock"

230+msgstr ""

228231

229232#: qml/Hud/HudParametrizedActionsPage.qml:139

230233msgid "Confirm"

@@ -302,26 +305,30 @@ msgstr "為 SIM 卡解鎖"

302305msgid "Roaming"

303306msgstr "漫遊"

304307

305−#: qml/Shell.qml:320

306−msgid "Enter your passphrase"

307−msgstr "輸入密語"

308+#: qml/Shell.qml:340

309+msgid "Enter passphrase"

310+msgstr ""

308311

309312#: qml/Shell.qml:321

310313msgid "Sorry, incorrect passphrase"

311314msgstr "抱歉，密語不對"

312315

313−#: qml/Shell.qml:323

314−msgid "Enter your passcode"

315−msgstr "輸入密碼"

316+#: qml/Shell.qml:342

317+msgid "Please re-enter"

318+msgstr ""

319+

320+#: qml/Shell.qml:344

321+msgid "Enter passcode"

322+msgstr ""

316323

317324#: qml/Shell.qml:324

318325msgid "Sorry, incorrect passcode"

319326msgstr "抱歉，密碼不對"

320327

321−#: qml/Shell.qml:327

328+#: qml/Shell.qml:348

322329#, qt-format

323−msgid "Enter your %1"

324−msgstr "輸入您的 %1"

330+msgid "Enter %1"

331+msgstr ""

325332

326333#: qml/Shell.qml:328

327334#, qt-format

@@ -352,5 +359,31 @@ msgid ""

352359"and all personal data will be deleted."

353360msgstr "如輸入的密碼不對，本電話會進行重設，所有個人資料都會刪除。"

354361

362+#, qt-format

363+#~ msgid "Hello %1"

364+#~ msgstr "%1 您好"

365+

366+#~ msgid "Hello"

367+#~ msgstr "您好"

368+

369+#~ msgid "Swipe to unlock"

370+#~ msgstr "滑開解除鎖定"

371+

372+#~ msgid "Please wait"

373+#~ msgstr "請稍候"

374+

375+#, qt-format

376+#~ msgid "Enter your %1"

377+#~ msgstr "輸入您的 %1"

378+

379+#~ msgid "Too many incorrect attempts"

380+#~ msgstr "錯得太多次"

381+

355382#~ msgid "Manage Dash"

356383#~ msgstr "管理 Dash"

384+

385+#~ msgid "Enter your passphrase"

386+#~ msgstr "輸入密語"

387+

388+#~ msgid "Enter your passcode"

389+#~ msgstr "輸入密碼"

qml/Components/LazyImage.qml+1

@@ -37,6 +37,7 @@ Item {

3737 property alias horizontalAlignment: image.horizontalAlignment

3838 property alias verticalAlignment: image.verticalAlignment

3939 property alias sourceImage: image

40+ property alias borderSource: shape.borderSource

4041

4142 state: "default"

4243

qml/Components/ResponsiveGridView.qml+5−1

@@ -34,7 +34,11 @@ Item {

3434 readonly property int cellWidth: gridView.cellWidth

3535 readonly property int cellHeight: gridView.cellHeight

3636 readonly property int totalContentHeight: {

37− return contentHeightForRows(Math.ceil(gridView.model.count / columns), cellHeight)

37+ if (gridView.model) {

38+ return contentHeightForRows(Math.ceil(gridView.model.count / columns), cellHeight)

39+ } else {

40+ return 0;

41+ }

3842 }

3943 property alias interactive: gridView.interactive

4044 readonly property alias flicking: gridView.flicking

qml/Dash/CardGrid.qml+2−1

@@ -55,6 +55,7 @@ DashRenderer {

5555 delegate: Item {

5656 width: grid.cellWidth

5757 height: grid.cellHeight

58+ visible: y + height >= root.visibleRangeBegin && y <= root.visibleRangeEnd

5859 Loader {

5960 id: loader

6061 sourceComponent: cardTool.cardComponent

@@ -68,7 +69,7 @@ DashRenderer {

6869 item.cardData = Qt.binding(function() { return model; });

6970 item.template = Qt.binding(function() { return cardTool.template; });

7071 item.components = Qt.binding(function() { return cardTool.components; });

71− item.headerAlignment = Qt.binding(function() { return cardTool.headerAlignment; });

72+ item.titleAlignment = Qt.binding(function() { return cardTool.titleAlignment; });

7273 item.scopeStyle = root.scopeStyle;

7374 }

7475 Connections {

qml/Dash/CardHorizontalList.qml+1−1

@@ -49,7 +49,7 @@ DashRenderer {

4949 item.cardData = Qt.binding(function() { return model; });

5050 item.template = Qt.binding(function() { return cardTool.template; });

5151 item.components = Qt.binding(function() { return cardTool.components; });

52− item.headerAlignment = Qt.binding(function() { return cardTool.headerAlignment; });

52+ item.titleAlignment = Qt.binding(function() { return cardTool.titleAlignment; });

5353 item.scopeStyle = root.scopeStyle;

5454 }

5555 Connections {

qml/Dash/CardTool.qml+26−18

@@ -131,21 +131,26 @@ Item {

131131 property size artShapeSize: cardLoader.item ? cardLoader.item.artShapeSize : 0

132132

133133 /*!

134− \brief Desired alignment of header components.

134+ \brief Desired alignment of title

135135 */

136− readonly property int headerAlignment: {

137− var subtitle = components["subtitle"];

138− var price = components["price"];

139− var summary = components["summary"];

140−

141− var hasSubtitle = subtitle && (typeof subtitle === "string" || subtitle["field"])

142− var hasPrice = price && (typeof price === "string" || subtitle["field"]);

143− var hasSummary = summary && (typeof summary === "string" || summary["field"])

144−

145− var isOnlyTextComponent = !hasSubtitle && !hasPrice && !hasSummary;

146− if (!isOnlyTextComponent) return Text.AlignLeft;

136+ readonly property int titleAlignment: {

137+ if (template["card-layout"] === "horizontal"

138+ || (typeof components["title"] !== "object" &&

139+ components["title"]["align"] !== "center")) return Text.AlignLeft;

140+

141+ var keys = ["mascot", "emblem", "subtitle", "attributes", "summary"];

142+

143+ for (var key in keys) {

144+ key = keys[key];

145+ try {

146+ if (typeof components[key] === "string"

147+ || typeof components[key]["field"] === "string") return Text.AlignLeft;

148+ } catch (e) {

149+ continue;

150+ }

151+ }

147152

148− return (template["card-layout"] === "horizontal") ? Text.AlignLeft : Text.AlignHCenter;

153+ return Text.AlignHCenter;

149154 }

150155

151156 QtObject {

@@ -169,16 +174,19 @@ Item {

169174

170175 Item {

171176 id: attributesModel

172− property int numOfAttributes: {

177+ property int numOfAttributes: 0

178+ property var model: []

179+ property bool hasAttributes: {

173180 var attributes = components["attributes"];

174− if ((attributes != undefined) && attributes["field"]) {

181+ var hasAttributesFlag = (attributes != undefined) && attributes["field"];

182+

183+ if (hasAttributesFlag) {

175184 if (attributes["max-count"]) {

176− return attributes["max-count"];

185+ numOfAttributes = attributes["max-count"];

177186 }

178187 }

179− return 0;

188+ return hasAttributesFlag

180189 }

181− property var model: []

182190

183191 onNumOfAttributesChanged: {

184192 model = []

qml/Dash/CardVerticalJournal.qml+2−1

@@ -49,6 +49,7 @@ DashRenderer {

4949 id: loader

5050 sourceComponent: cardTool.cardComponent

5151 width: cardTool.cardWidth

52+ visible: y + height >= root.visibleRangeBegin && y <= root.visibleRangeEnd

5253 onLoaded: {

5354 item.objectName = "delegate" + index;

5455 item.fixedArtShapeSize = Qt.binding(function() { return cardTool.artShapeSize; });

@@ -56,7 +57,7 @@ DashRenderer {

5657 item.cardData = Qt.binding(function() { return model; });

5758 item.template = Qt.binding(function() { return cardTool.template; });

5859 item.components = Qt.binding(function() { return cardTool.components; });

59− item.headerAlignment = Qt.binding(function() { return cardTool.headerAlignment; });

60+ item.titleAlignment = Qt.binding(function() { return cardTool.titleAlignment; });

6061 item.scopeStyle = root.scopeStyle;

6162 }

6263 Connections {

qml/Dash/DashContent.qml+3

@@ -111,6 +111,8 @@ Item {

111111 highlightMoveDuration: 250

112112 highlightRangeMode: ListView.StrictlyEnforceRange

113113 // TODO Investigate if we can switch to a smaller cache buffer when/if UbuntuShape gets more performant

114+ // 1073741823 is s^30 -1. A quite big number so that you have "infinite" cache, but not so

115+ // big so that if you add if with itself you're outside the 2^31 int range

114116 cacheBuffer: 1073741823

115117 onMovementStarted: currentItem.item.showHeader();

116118 clip: parent.x != 0

@@ -177,6 +179,7 @@ Item {

177179 dashContent.scopeLoaded(item.scope.id)

178180 item.paginationCount = Qt.binding(function() { return dashContentList.count } )

179181 item.paginationIndex = Qt.binding(function() { return dashContentList.currentIndex } )

182+ item.holdingList = dashContentList;

180183 }

181184 Connections {

182185 target: isCurrent ? scope : null

qml/Dash/DashNavigation.qml+1

@@ -52,6 +52,7 @@ Item {

5252

5353 Rectangle {

5454 id: blackRect

55+ objectName: "blackRect"

5556 color: "black"

5657 opacity: openList && openList.currentItem && openList.currentItem.visible ? 0.5 : 0

5758 Behavior on opacity { UbuntuNumberAnimation { duration: UbuntuAnimation.SnapDuration } }

qml/Dash/DashRenderer.qml+4

@@ -27,6 +27,10 @@ Item {

2727

2828 property int displayMarginEnd: 0

2929

30+ property int visibleRangeBegin: 0

31+

32+ property int visibleRangeEnd: 0

33+

3034 property real originY: 0

3135

3236 // The model to renderer

qml/Dash/GenericScopeView.qml+71−13

@@ -15,7 +15,7 @@

1515 */

1616

1717import QtQuick 2.0

18−import Ubuntu.Components 0.1

18+import Ubuntu.Components 1.1

1919import Utils 0.1

2020import Unity 0.2

2121import Dash 0.1

@@ -38,6 +38,7 @@ FocusScope {

3838 property int paginationCount: 0

3939 property int paginationIndex: 0

4040 property alias pageHeaderTotallyVisible: categoryView.pageHeaderTotallyVisible

41+ property var holdingList: null

4142

4243 property var scopeStyle: ScopeStyle {

4344 style: scope ? scope.customizations : {}

@@ -251,8 +252,8 @@ FocusScope {

251252 }

252253 }

253254

254− onHeightChanged: rendererLoader.updateDelegateCreationRange();

255− onYChanged: rendererLoader.updateDelegateCreationRange();

255+ onHeightChanged: rendererLoader.updateRanges();

256+ onYChanged: rendererLoader.updateRanges();

256257

257258 Loader {

258259 id: rendererLoader

@@ -314,7 +315,7 @@ FocusScope {

314315 var shouldExpand = baseItem.category === categoryView.expandedCategoryId;

315316 baseItem.expand(shouldExpand, false /*animate*/);

316317 }

317− updateDelegateCreationRange();

318+ updateRanges();

318319 if (scope && scope.id === "clickscope" && (categoryId === "predefined" || categoryId === "local")) {

319320 // Yeah, hackish :/

320321 cardTool.artShapeSize = Qt.size(units.gu(8), units.gu(7.5));

@@ -348,13 +349,25 @@ FocusScope {

348349 }

349350 Connections {

350351 target: categoryView

351− onOriginYChanged: rendererLoader.updateDelegateCreationRange();

352− onContentYChanged: rendererLoader.updateDelegateCreationRange();

353− onHeightChanged: rendererLoader.updateDelegateCreationRange();

354− onContentHeightChanged: rendererLoader.updateDelegateCreationRange();

352+ onOriginYChanged: rendererLoader.updateRanges();

353+ onContentYChanged: rendererLoader.updateRanges();

354+ onHeightChanged: rendererLoader.updateRanges();

355+ onContentHeightChanged: rendererLoader.updateRanges();

356+ }

357+ Connections {

358+ target: scopeView

359+ onIsCurrentChanged: rendererLoader.updateRanges();

360+ }

361+ Connections {

362+ target: holdingList

363+ onMovingChanged: if (!moving) rendererLoader.updateRanges();

355364 }

356365

357− function updateDelegateCreationRange() {

366+ function updateRanges() {

367+ if (holdingList && holdingList.moving) {

368+ return;

369+ }

370+

358371 if (categoryView.moving) {

359372 // Do not update the range if we are overshooting up or down, since we'll come back

360373 // to the stable position and delete/create items without any reason

@@ -366,10 +379,20 @@ FocusScope {

366379 }

367380 }

368381

382+ if (item && item.hasOwnProperty("visibleRangeBegin")) {

383+ item.visibleRangeBegin = Math.max(-baseItem.y, 0)

384+ item.visibleRangeEnd = item.visibleRangeBegin + Math.min(categoryView.height, rendererLoader.height)

385+ }

386+

369387 if (item && item.hasOwnProperty("displayMarginBeginning")) {

370388 // TODO do we need item.originY here, test 1300302 once we have a silo

371389 // and we can run it on the phone

372− if (baseItem.y + baseItem.height <= 0) {

390+ if (scopeView.isCurrent) {

391+ // 1073741823 is s^30 -1. A quite big number so that you have "infinite" display margin, but not so

392+ // big so that if you add if with itself you're outside the 2^31 int range

393+ item.displayMarginBeginning = 1073741823;

394+ item.displayMarginEnd = 1073741823;

395+ } else if (baseItem.y + baseItem.height <= 0) {

373396 // Not visible (item at top of the list viewport)

374397 item.displayMarginBeginning = -baseItem.height;

375398 item.displayMarginEnd = 0;

@@ -378,9 +401,9 @@ FocusScope {

378401 item.displayMarginBeginning = 0;

379402 item.displayMarginEnd = -baseItem.height;

380403 } else {

381− item.displayMarginBeginning = -Math.max(-baseItem.y, 0);

382− item.displayMarginEnd = -Math.max(baseItem.height - seeAll.height

383− - categoryView.height + baseItem.y, 0)

404+ item.displayMarginBeginning = Math.round(-Math.max(-baseItem.y, 0));

405+ item.displayMarginEnd = -Math.round(Math.max(baseItem.height - seeAll.height -

406+ categoryView.height + baseItem.y, 0));

384407 }

385408 }

386409 }

@@ -496,6 +519,41 @@ FocusScope {

496519 }

497520 }

498521

522+ Item {

523+ id: pullToRefreshClippingItem

524+ anchors.left: parent.left

525+ anchors.right: parent.right

526+ anchors.bottom: parent.bottom

527+ height: parent.height - pullToRefresh.contentY + (pageHeaderLoader.item ? pageHeaderLoader.item.bottomItem[0].height - pageHeaderLoader.item.height : 0)

528+ clip: true

529+

530+ PullToRefresh {

531+ id: pullToRefresh

532+ objectName: "pullToRefresh"

533+ target: categoryView

534+

535+ readonly property real contentY: categoryView.contentY - categoryView.originY

536+ y: -contentY - units.gu(5)

537+

538+ onRefresh: {

539+ refreshing = true

540+ scopeView.scope.refresh()

541+ }

542+ anchors.left: parent.left

543+ anchors.right: parent.right

544+

545+ Connections {

546+ target: scopeView

547+ onProcessingChanged: if (!scopeView.processing) pullToRefresh.refreshing = false

548+ }

549+

550+ style: PullToRefreshScopeStyle {

551+ anchors.fill: parent

552+ activationThreshold: units.gu(14)

553+ }

554+ }

555+ }

556+

499557 AbstractButton {

500558 id: floatingSeeLess

501559 objectName: "floatingSeeLess"

qml/Dash/Previews/PreviewHeader.qml+13

@@ -16,12 +16,14 @@

1616

1717import QtQuick 2.0

1818import Ubuntu.Components 0.1

19+import Dash 0.1

1920import "../"

2021

2122/*! This preview widget shows a header

2223 * The title comes in widgetData["title"]

2324 * The mascot comes in widgetData["mascot"]

2425 * The subtitle comes in widgetData["subtitle"]

26+ * The attributes comes in widgetData["attributes"]

2527 */

2628

2729PreviewWidget {

@@ -35,6 +37,7 @@ PreviewWidget {

3537 readonly property url mascot: root.widgetData["mascot"] || ""

3638 readonly property string title: root.widgetData["title"] || ""

3739 readonly property string subtitle: root.widgetData["subtitle"] || ""

40+ readonly property var attributes: root.widgetData["attributes"] || null

3841 readonly property color fontColor: root.scopeStyle ? root.scopeStyle.foreground : Theme.palette.normal.baseText

3942

4043 implicitHeight: row.height + row.margins * 2

@@ -114,6 +117,16 @@ PreviewWidget {

114117 text: headerRoot.subtitle

115118 }

116119 }

120+

121+ Loader {

122+ active: titleLabel.text && headerRoot.attributes

123+ anchors { left: parent.left; right: parent.right }

124+ sourceComponent: CardAttributes {

125+ id: previewAttributes

126+ objectName: "previewAttributes"

127+ model: headerRoot.attributes

128+ }

129+ }

117130 }

118131 }

119132 }

qml/Dash/Previews/PreviewImageGallery.qml+121−18

@@ -26,8 +26,11 @@ PreviewWidget {

2626 id: root

2727 implicitHeight: units.gu(22)

2828

29+ property Item rootItem: QuickUtils.rootItem(root)

30+

2931 ListView {

3032 id: previewImageListView

33+ objectName: "previewImageListView"

3134 spacing: units.gu(1)

3235 anchors.fill: parent

3336 orientation: ListView.Horizontal

@@ -35,24 +38,6 @@ PreviewWidget {

3538 model: root.widgetData["sources"]

3639 clip: true

3740

38− // FIXME: Because of ListViews inside ListViews inside Flickables inside ListViews (and some more)

39− // we finally reached the point where this ListView doesn't correctly get swipe input any more but

40− // instead the parent ListView is the one that is swiped. This MouseArea sort of creates a blocking

41− // layer to make sure this ListView can be swiped, regardless of what's behind it.

42− MouseArea {

43− anchors.fill: parent

44− enabled: parent.contentWidth > parent.width

45− }

46−

47− // FIXME: Because of ListViews inside ListViews inside Flickables inside ListViews (and some more)

48− // we finally reached the point where this ListView doesn't correctly get swipe input any more but

49− // instead the parent ListView is the one that is swiped. This MouseArea sort of creates a blocking

50− // layer to make sure this ListView can be swiped, regardless of what's behind it.

51− MouseArea {

52− anchors.fill: parent

53− enabled: parent.contentWidth > parent.width

54− }

55−

5641 LazyImage {

5742 objectName: "placeholderScreenshot"

5843 anchors {

@@ -66,6 +51,7 @@ PreviewWidget {

6651 }

6752

6853 delegate: LazyImage {

54+ objectName: "previewImage" + index

6955 anchors {

7056 top: parent.top

7157 bottom: parent.bottom

@@ -73,6 +59,123 @@ PreviewWidget {

7359 source: modelData ? modelData : ""

7460 scaleTo: "height"

7561 initialWidth: units.gu(13)

62+ borderSource: mouseArea.pressed ? "radius_pressed.sci" : "radius_idle.sci"

63+

64+ MouseArea {

65+ id: mouseArea

66+ anchors.fill: parent

67+ onClicked: {

68+ slideShowListView.currentIndex = index;

69+ slideShow.initialX = rootItem.mapFromItem(parent, 0, 0).x

70+ slideShow.initialY = rootItem.mapFromItem(parent, 0, 0).y

71+ slideShow.visible = true;

72+ }

73+ }

74+ }

75+ }

76+

77+ Rectangle {

78+ id: slideShow

79+ objectName: "slideShow"

80+

81+ readonly property real initialScale: previewImageListView.height / rootItem.height

82+ readonly property real scaleProgress: (scale - initialScale) / (1.0 - initialScale)

83+ property real initialX: 0

84+ property real initialY: 0

85+

86+ parent: rootItem

87+ width: parent.width

88+ height: parent.height

89+ visible: false

90+ clip: visible && scale < 1.0

91+ scale: visible ? 1.0 : initialScale

92+ transformOrigin: Item.TopLeft

93+ transform: Translate {

94+ x: slideShow.initialX - slideShow.initialX * slideShow.scaleProgress

95+ y: slideShow.initialY - slideShow.initialY * slideShow.scaleProgress

96+ }

97+ color: "black"

98+ radius: units.gu(1) - units.gu(1) * slideShow.scaleProgress

99+

100+ Behavior on scale {

101+ enabled: !slideShow.visible

102+ UbuntuNumberAnimation { duration: UbuntuAnimation.FastDuration }

103+ }

104+

105+ ListView {

106+ id: slideShowListView

107+ objectName: "slideShowListView"

108+ anchors.fill: parent

109+ orientation: ListView.Horizontal

110+ highlightRangeMode: ListView.StrictlyEnforceRange

111+ highlightMoveDuration: 0

112+ snapMode: ListView.SnapOneItem

113+ boundsBehavior: Flickable.DragAndOvershootBounds

114+ model: root.widgetData["sources"]

115+

116+ delegate: Image {

117+ id: screenshot

118+ anchors {

119+ top: parent.top

120+ bottom: parent.bottom

121+ }

122+ width: slideShow.width

123+ source: modelData ? modelData : ""

124+ fillMode: Image.PreserveAspectFit

125+ sourceSize { width: screenshot.width; height: screenshot.height }

126+ }

127+

128+ MouseArea {

129+ anchors.fill: parent

130+ onClicked: slideShowHeader.shown = !slideShowHeader.shown

131+ }

132+ }

133+

134+ Rectangle {

135+ id: slideShowHeader

136+

137+ property bool shown: true

138+

139+ anchors {

140+ left: parent.left

141+ right: parent.right

142+ }

143+ height: units.gu(7)

144+ visible: opacity > 0

145+ opacity: slideShow.scaleProgress > 0.6 && shown ? 0.8 : 0

146+ color: "black"

147+

148+ Behavior on opacity {

149+ UbuntuNumberAnimation { duration: UbuntuAnimation.SnapDuration }

150+ }

151+

152+ AbstractButton {

153+ id: slideShowCloseButton

154+ objectName: "slideShowCloseButton"

155+ anchors {

156+ top: parent.top

157+ bottom: parent.bottom

158+ }

159+ width: units.gu(8)

160+ height: width

161+

162+ onClicked: slideShow.visible = false

163+

164+ Rectangle {

165+ anchors.fill: parent

166+ color: Qt.rgba(1.0, 1.0, 1.0, 0.3)

167+ visible: slideShowCloseButton.pressed

168+ }

169+

170+ Icon {

171+ id: icon

172+ anchors.centerIn: parent

173+ width: units.gu(2.5)

174+ height: width

175+ color: Theme.palette.normal.foregroundText

176+ name: "close"

177+ }

178+ }

76179 }

77180 }

78181}

qml/Dash/PullToRefreshScopeStyle.qmlnew file+82

@@ -0,0 +1,82 @@

1+/*

2+ * Copyright (C) 2014 Canonical, Ltd.

3+ *

4+ * This program is free software; you can redistribute it and/or modify

5+ * it under the terms of the GNU General Public License as published by

6+ * the Free Software Foundation; version 3.

7+ *

8+ * This program is distributed in the hope that it will be useful,

9+ * but WITHOUT ANY WARRANTY; without even the implied warranty of

10+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

11+ * GNU General Public License for more details.

12+ *

13+ * You should have received a copy of the GNU General Public License

14+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

15+ */

16+

17+import QtQuick 2.3

18+import Ubuntu.Components 1.1

19+import Ubuntu.Components.Styles 1.1

20+

21+/**

22+ * TODO: Once the SDK version of PullToRefreshStyle doesn't have bug 1375799

23+ * (https://launchpad.net/bugs/1375799) anymore, we should switch to using a

24+ * a subclass of the Ambiance version with a hidden ActivityIndicator.

25+ */

26+PullToRefreshStyle {

27+ releaseToRefresh: styledItem.target.originY - styledItem.target.contentY > activationThreshold

28+

29+ Connections {

30+ property bool willRefresh: false

31+

32+ target: styledItem.target

33+ onDraggingChanged: {

34+ if (!styledItem.target.dragging && releaseToRefresh) {

35+ willRefresh = true

36+ }

37+ }

38+ onContentYChanged: {

39+ if (styledItem.target.originY - styledItem.target.contentY == 0 && willRefresh) {

40+ styledItem.refresh()

41+ willRefresh = false

42+ }

43+ }

44+ }

45+

46+ Label {

47+ id: pullLabel

48+ anchors.horizontalCenter: parent.horizontalCenter

49+ horizontalAlignment: Text.AlignHCenter

50+ verticalAlignment: Text.AlignVCenter

51+ states: [

52+ State {

53+ name: "pulling"

54+ when: styledItem.target.dragging && !releaseToRefresh

55+ PropertyChanges { target: pullLabel; text: i18n.tr("Pull to refresh…") }

56+ },

57+ State {

58+ name: "releasable"

59+ when: styledItem.target.dragging && releaseToRefresh

60+ PropertyChanges { target: pullLabel; text: i18n.tr("Release to refresh…") }

61+ }

62+ ]

63+ transitions: Transition {

64+ SequentialAnimation {

65+ UbuntuNumberAnimation {

66+ target: pullLabel

67+ property: "opacity"

68+ to: 0.0

69+ }

70+ PropertyAction {

71+ target: pullLabel

72+ property: "text"

73+ }

74+ UbuntuNumberAnimation {

75+ target: pullLabel

76+ property: "opacity"

77+ to: 1.0

78+ }

79+ }

80+ }

81+ }

82+}

qml/Dash/ScopeListView.qml+1

@@ -20,4 +20,5 @@ import Dash 0.1

2020ListViewWithPageHeader {

2121 maximumFlickVelocity: height * 10

2222 flickDeceleration: height * 2

23+ cacheBuffer: Number.MAX_VALUE

2324}

qml/Dash/ScopeSettingsPage.qml+1

@@ -49,6 +49,7 @@ Item {

4949 right: parent.right

5050 }

5151 model: root.scope ? root.scope.settings : null

52+ clip: true

5253

5354 delegate: ScopeSettingsWidgetFactory {

5455 objectName: "scopeSettingItem" + index

qml/Dash/ScopesOverviewAll.qml+2

@@ -43,6 +43,8 @@ Flickable {

4343 id: cardGrid

4444 width: root.width

4545 height: parent.height

46+ visibleRangeBegin: root.contentY

47+ visibleRangeEnd: root.contentY + root.height

4648

4749 onClicked: {

4850 root.clicked(index, result, item, itemModel);

qml/Dash/ScopesOverviewFavorites.qml+1−1

@@ -61,7 +61,7 @@ Flickable {

6161 item.cardData = Qt.binding(function() { return model; });

6262 item.template = Qt.binding(function() { return cardTool.template; });

6363 item.components = Qt.binding(function() { return cardTool.components; });

64− item.headerAlignment = Qt.binding(function() { return cardTool.headerAlignment; });

64+ item.titleAlignment = Qt.binding(function() { return cardTool.titleAlignment; });

6565 }

6666

6767 Connections {

qml/Launcher/Launcher.qml+1

@@ -92,6 +92,7 @@ Item {

9292 // machine and switch to the final state in the next event loop run

9393 Timer {

9494 id: animateTimer

95+ objectName: "animateTimer"

9596 interval: 1

9697 property string nextState: ""

9798 onTriggered: {

qml/Shell.qml+8−6

@@ -128,6 +128,13 @@ Item {

128128 objectName: "dashCommunicator"

129129 }

130130

131+ Binding {

132+ target: ApplicationManager

133+ property: "forceDashActive"

134+ value: launcher.shown || launcher.dashSwipe

135+ }

136+

137+

131138 WindowKeysFilter {

132139 // Handle but do not filter out volume keys

133140 Keys.onVolumeUpPressed: { volumeControl.volumeUp(); event.accepted = false; }

@@ -170,7 +177,6 @@ Item {

170177 lockscreen.show();

171178 }

172179 greeter.hide();

173− launcher.hide();

174180 }

175181

176182 onFocusedApplicationIdChanged: {

@@ -597,11 +603,7 @@ Item {

597603 available: edgeDemo.launcherEnabled && (!shell.locked || AccountsService.enableLauncherWhileLocked) && greeter.fakeActiveForApp === ""

598604

599605 onShowDashHome: showHome()

600− onDash: {

601− if (ApplicationManager.focusedApplicationId != "unity8-dash") {

602− showDash()

603− }

604− }

606+ onDash: showDash()

605607 onDashSwipeChanged: {

606608 if (dashSwipe) {

607609 dash.setCurrentScope("clickscope", false, true)

src/CMakeLists.txt+1

@@ -36,3 +36,4 @@ install(TARGETS ${SHELL_APP}

3636

3737add_subdirectory(Panel)

3838add_subdirectory(Dash)

39+add_subdirectory(libunity8-private)

src/Dash/CMakeLists.txt+2

@@ -9,6 +9,8 @@ add_executable(unity8-dash ${DASH_SRCS})

99

1010qt5_use_modules(unity8-dash Gui Qml Quick Test)

1111

12+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fvisibility=hidden")

13+

1214# install binaries

1315install(TARGETS ${DASH_APP}

1416 RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}

src/Panel/CMakeLists.txt+2

@@ -1 +1,3 @@

11add_subdirectory(Indicators)

2+

3+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fvisibility=hidden")

src/libunity8-private/CMakeLists.txtnew file+25

@@ -0,0 +1,25 @@

1+set(LIB_NAME "unity8-private")

2+set(SOVERSION 0)

3+set(VERSION ${SOVERSION}.0.0)

4+

5+project(lib${LIB_NAME})

6+

7+set(lib${LIB_NAME}_SRCS

8+ abstractdbusservicemonitor.cpp

9+ )

10+

11+add_library(${LIB_NAME} SHARED

12+ ${lib${LIB_NAME}_SRCS}

13+ )

14+

15+set_target_properties(${LIB_NAME} PROPERTIES

16+ VERSION ${VERSION}

17+ SOVERSION ${SOVERSION}

18+ )

19+

20+qt5_use_modules(${LIB_NAME} DBus)

21+

22+# install library

23+install(TARGETS ${LIB_NAME}

24+ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}

25+ )

src/libunity8-private/abstractdbusservicemonitor.cppnew file+87

@@ -0,0 +1,87 @@

1+/*

2+ * Copyright (C) 2011-2014 Canonical, Ltd.

3+ *

4+ * Authors:

5+ * Ugo Riboni <ugo.riboni@canonical.com>

6+ *

7+ * This program is free software; you can redistribute it and/or modify

8+ * it under the terms of the GNU General Public License as published by

9+ * the Free Software Foundation; version 3.

10+ *

11+ * This program is distributed in the hope that it will be useful,

12+ * but WITHOUT ANY WARRANTY; without even the implied warranty of

13+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

14+ * GNU General Public License for more details.

15+ *

16+ * You should have received a copy of the GNU General Public License

17+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

18+ */

19+

20+#include "abstractdbusservicemonitor.h"

21+

22+#include <QDBusInterface>

23+#include <QDBusServiceWatcher>

24+#include <QDBusConnection>

25+#include <QDBusConnectionInterface>

26+#include <QDBusReply>

27+

28+AbstractDBusServiceMonitor::AbstractDBusServiceMonitor(const QString &service, const QString &path,

29+ const QString &interface, const Bus bus,

30+ QObject *parent)

31+ : QObject(parent)

32+ , m_service(service)

33+ , m_path(path)

34+ , m_interface(interface)

35+ , m_watcher(new QDBusServiceWatcher(service,

36+ (bus == SystemBus) ? QDBusConnection::systemBus()

37+ : QDBusConnection::sessionBus()))

38+ , m_dbusInterface(nullptr)

39+{

40+ connect(m_watcher, &QDBusServiceWatcher::serviceRegistered, this, &AbstractDBusServiceMonitor::createInterface);

41+ connect(m_watcher, &QDBusServiceWatcher::serviceUnregistered, this, &AbstractDBusServiceMonitor::destroyInterface);

42+

43+ // Connect to the service if it's up already

44+ QDBusConnectionInterface* sessionBus = QDBusConnection::sessionBus().interface();

45+ QDBusReply<bool> reply = sessionBus->isServiceRegistered(m_service);

46+ if (reply.isValid() && reply.value()) {

47+ createInterface(m_service);

48+ }

49+}

50+

51+AbstractDBusServiceMonitor::~AbstractDBusServiceMonitor()

52+{

53+ delete m_watcher;

54+ delete m_dbusInterface;

55+}

56+

57+void AbstractDBusServiceMonitor::createInterface(const QString &)

58+{

59+ if (m_dbusInterface != nullptr) {

60+ delete m_dbusInterface;

61+ m_dbusInterface = nullptr;

62+ }

63+

64+ m_dbusInterface = new QDBusInterface(m_service, m_path, m_interface,

65+ QDBusConnection::sessionBus());

66+ Q_EMIT serviceAvailableChanged(true);

67+}

68+

69+void AbstractDBusServiceMonitor::destroyInterface(const QString &)

70+{

71+ if (m_dbusInterface != nullptr) {

72+ delete m_dbusInterface;

73+ m_dbusInterface = nullptr;

74+ }

75+

76+ Q_EMIT serviceAvailableChanged(false);

77+}

78+

79+QDBusInterface* AbstractDBusServiceMonitor::dbusInterface() const

80+{

81+ return m_dbusInterface;

82+}

83+

84+bool AbstractDBusServiceMonitor::serviceAvailable() const

85+{

86+ return m_dbusInterface != nullptr;

87+}

src/libunity8-private/abstractdbusservicemonitor.hnew file+66

@@ -0,0 +1,66 @@

1+/*

2+ * Copyright (C) 2011-2014 Canonical, Ltd.

3+ *

4+ * Authors:

5+ * Ugo Riboni <ugo.riboni@canonical.com>

6+ *

7+ * This program is free software; you can redistribute it and/or modify

8+ * it under the terms of the GNU General Public License as published by

9+ * the Free Software Foundation; version 3.

10+ *

11+ * This program is distributed in the hope that it will be useful,

12+ * but WITHOUT ANY WARRANTY; without even the implied warranty of

13+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

14+ * GNU General Public License for more details.

15+ *

16+ * You should have received a copy of the GNU General Public License

17+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

18+ */

19+

20+#ifndef ABSTRACTDBUSSERVICEMONITOR_H

21+#define ABSTRACTDBUSSERVICEMONITOR_H

22+

23+#include <QObject>

24+#include <QString>

25+#include <QDBusConnection>

26+

27+class QDBusInterface;

28+class QDBusServiceWatcher;

29+

30+class Q_DECL_EXPORT AbstractDBusServiceMonitor : public QObject

31+{

32+ Q_OBJECT

33+ Q_ENUMS(Bus)

34+ Q_PROPERTY(bool serviceAvailable READ serviceAvailable NOTIFY serviceAvailableChanged)

35+

36+public:

37+ enum Bus {

38+ SessionBus,

39+ SystemBus,

40+ };

41+

42+ explicit AbstractDBusServiceMonitor(const QString &service, const QString &path, const QString &interface,

43+ const Bus bus = SessionBus,

44+ QObject *parent = 0);

45+ ~AbstractDBusServiceMonitor();

46+

47+ QDBusInterface* dbusInterface() const;

48+

49+ bool serviceAvailable() const;

50+

51+Q_SIGNALS:

52+ void serviceAvailableChanged(bool available);

53+

54+private Q_SLOTS:

55+ void createInterface(const QString &service);

56+ void destroyInterface(const QString &service);

57+

58+protected:

59+ const QString m_service;

60+ const QString m_path;

61+ const QString m_interface;

62+ QDBusServiceWatcher* m_watcher;

63+ QDBusInterface* m_dbusInterface;

64+};

65+

66+#endif // ABSTRACTDBUSSERVICEMONITOR_H

tests/autopilot/unity8/shell/emulators/dash.py+4−4

@@ -66,7 +66,7 @@ class Dash(emulators.UnityEmulatorBase):

6666 return resp_grid.select_single('Tile', text=text)

6767

6868 def get_scope(self, scope_name='clickscope'):

69− return self.dash_content_list.select_single(

69+ return self.dash_content_list.wait_select_single(

7070 'QQuickLoader', scopeId=scope_name)

7171

7272 @autopilot_logging.log_action(logger.info)

@@ -86,14 +86,14 @@ class Dash(emulators.UnityEmulatorBase):

8686

8787 def _get_scope_loader(self, scope_id):

8888 try:

89− return self.dash_content_list.select_single(

89+ return self.dash_content_list.wait_select_single(

9090 'QQuickLoader', scopeId=scope_id)

9191 except dbus.StateNotFoundError:

9292 raise emulators.UnityEmulatorException(

9393 'No scope found with id {0}'.format(scope_id))

9494

9595 def _get_scope_from_loader(self, loader):

96− return loader.get_children()[0]

96+ return loader.wait_select_single('GenericScopeView');

9797

9898 def _open_scope_scrolling(self, scope_loader):

9999 scroll = self._get_scroll_direction(scope_loader)

@@ -102,8 +102,8 @@ class Dash(emulators.UnityEmulatorBase):

102102 scroll()

103103 self.dash_content_list.moving.wait_for(False)

104104

105+ scope_loader.isCurrent.wait_for(True)

105106 scope = self._get_scope_from_loader(scope_loader)

106− scope.isCurrent.wait_for(True)

107107 return scope

108108

109109 def _get_scroll_direction(self, scope_loader):

tests/mocks/Ubuntu/CMakeLists.txt+1

@@ -1,3 +1,4 @@

1+add_subdirectory(Connectivity)

12add_subdirectory(DownloadDaemonListener)

23add_subdirectory(Payments)

34add_subdirectory(SystemImage)

tests/mocks/Ubuntu/Connectivity/CMakeLists.txtnew file+10

@@ -0,0 +1,10 @@

1+add_library(connectivity-qml SHARED

2+ networking-status.cpp

3+ plugin.cpp

4+)

5+qt5_use_modules(connectivity-qml Qml)

6+

7+# copy qmldir file into build directory for shadow builds

8+file(COPY "${CMAKE_CURRENT_SOURCE_DIR}/qmldir"

9+ DESTINATION ${CMAKE_CURRENT_BINARY_DIR}

10+ )

tests/mocks/Ubuntu/Connectivity/networking-status.cppnew file+64

@@ -0,0 +1,64 @@

1+/*

2+ * Copyright © 2014 Canonical Ltd.

3+ *

4+ * This program is free software: you can redistribute it and/or modify it

5+ * under the terms of the GNU Lesser General Public License version 3,

6+ * as published by the Free Software Foundation.

7+ *

8+ * This program is distributed in the hope that it will be useful,

9+ * but WITHOUT ANY WARRANTY; without even the implied warranty of

10+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

11+ * GNU Lesser General Public License for more details.

12+ *

13+ * You should have received a copy of the GNU Lesser General Public License

14+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

15+ *

16+ * Authors:

17+ * Antti Kaijanmäki <antti.kaijanmaki@canonical.com>

18+ */

19+

20+#include "networking-status.h"

21+

22+NetworkingStatus::NetworkingStatus(QObject *parent)

23+ : QObject(parent)

24+{

25+ qRegisterMetaType<NetworkingStatus::Limitations>();

26+ qRegisterMetaType<QVector<NetworkingStatus::Limitations>>();

27+ qRegisterMetaType<NetworkingStatus::Status>();

28+}

29+

30+NetworkingStatus::~NetworkingStatus()

31+{}

32+

33+QVector<NetworkingStatus::Limitations>

34+NetworkingStatus::limitations() const

35+{

36+ return m_limitations;

37+}

38+

39+NetworkingStatus::Status

40+NetworkingStatus::status() const

41+{

42+ return Status::Online;

43+}

44+

45+bool

46+NetworkingStatus::online() const

47+{

48+ return status() == Status::Online;

49+}

50+

51+bool

52+NetworkingStatus::limitedBandwith() const

53+{

54+ return limitations().contains(Limitations::Bandwith);

55+}

56+

57+void NetworkingStatus::setLimitedBandwidth(bool limited)

58+{

59+ if (limited) {

60+ m_limitations << Limitations::Bandwith;

61+ } else if (limitedBandwith()) {

62+ m_limitations.remove(m_limitations.indexOf(Limitations::Bandwith));

63+ }

64+}

tests/mocks/Ubuntu/Connectivity/networking-status.hnew file+73

@@ -0,0 +1,73 @@

1+/*

2+ * Copyright © 2014 Canonical Ltd.

3+ *

4+ * This program is free software: you can redistribute it and/or modify it

5+ * under the terms of the GNU Lesser General Public License version 3,

6+ * as published by the Free Software Foundation.

7+ *

8+ * This program is distributed in the hope that it will be useful,

9+ * but WITHOUT ANY WARRANTY; without even the implied warranty of

10+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

11+ * GNU Lesser General Public License for more details.

12+ *

13+ * You should have received a copy of the GNU Lesser General Public License

14+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

15+ *

16+ */

17+

18+#ifndef FAKE_NETWORKING_STATUS_H

19+#define FAKE_NETWORKING_STATUS_H

20+

21+#include <QObject>

22+#include <QVector>

23+

24+class Q_DECL_EXPORT NetworkingStatus : public QObject

25+{

26+ Q_OBJECT

27+ Q_DISABLE_COPY(NetworkingStatus)

28+

29+ Q_ENUMS(Limitations)

30+ Q_ENUMS(Status)

31+

32+ Q_PROPERTY(QVector<Limitations> limitations READ limitations NOTIFY limitationsChanged)

33+ Q_PROPERTY(Status status READ status NOTIFY statusChanged)

34+ Q_PROPERTY(bool online READ online NOTIFY onlineChanged)

35+ Q_PROPERTY(bool limitedBandwith READ limitedBandwith WRITE setLimitedBandwidth NOTIFY limitedBandwithChanged)

36+

37+public:

38+ explicit NetworkingStatus(QObject *parent = 0);

39+ virtual ~NetworkingStatus();

40+

41+ enum Limitations {

42+ Bandwith

43+ };

44+

45+ enum Status {

46+ Offline,

47+ Connecting,

48+ Online

49+ };

50+

51+ QVector<Limitations> limitations() const;

52+ Status status() const;

53+ bool online() const;

54+ bool limitedBandwith() const;

55+

56+ // Only in the fake one

57+ void setLimitedBandwidth(bool limited);

58+

59+Q_SIGNALS:

60+ void limitationsChanged();

61+ void statusChanged(Status value);

62+ void onlineChanged(bool value);

63+ void limitedBandwithChanged(bool value);

64+

65+private:

66+ QVector<NetworkingStatus::Limitations> m_limitations;

67+};

68+

69+Q_DECLARE_METATYPE(NetworkingStatus::Limitations)

70+Q_DECLARE_METATYPE(QVector<NetworkingStatus::Limitations>)

71+Q_DECLARE_METATYPE(NetworkingStatus::Status)

72+

73+#endif // FAKE_NETWORKING_STATUS_H

tests/mocks/Ubuntu/Connectivity/plugin.cppnew file+46

@@ -0,0 +1,46 @@

1+/*

2+ * Copyright © 2014 Canonical Ltd.

3+ *

4+ * This program is free software: you can redistribute it and/or modify it

5+ * under the terms of the GNU Lesser General Public License version 3,

6+ * as published by the Free Software Foundation.

7+ *

8+ * This program is distributed in the hope that it will be useful,

9+ * but WITHOUT ANY WARRANTY; without even the implied warranty of

10+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

11+ * GNU Lesser General Public License for more details.

12+ *

13+ * You should have received a copy of the GNU Lesser General Public License

14+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

15+ *

16+ * Authors:

17+ * Antti Kaijanmäki <antti.kaijanmaki@canonical.com>

18+ */

19+

20+#include "plugin.h"

21+

22+#include <QtQml>

23+

24+#include "networking-status.h"

25+

26+static QObject *

27+networkingStatusSingletonProvider(QQmlEngine *engine, QJSEngine *scriptEngine)

28+{

29+ Q_UNUSED(scriptEngine)

30+

31+ return new NetworkingStatus(engine);

32+}

33+

34+void

35+QmlConnectivityNetworkingPlugin::registerTypes(const char *uri)

36+{

37+ // @uri Ubuntu.Connectivity

38+ qmlRegisterSingletonType<NetworkingStatus>(uri, 1, 0, "NetworkingStatus", networkingStatusSingletonProvider);

39+}

40+

41+void

42+QmlConnectivityNetworkingPlugin::initializeEngine(QQmlEngine *engine, const char *uri)

43+{

44+ Q_UNUSED(uri);

45+ Q_UNUSED(engine);

46+}

tests/mocks/Ubuntu/Connectivity/plugin.hnew file+35

@@ -0,0 +1,35 @@

1+/*

2+ * Copyright © 2014 Canonical Ltd.

3+ *

4+ * This program is free software: you can redistribute it and/or modify it

5+ * under the terms of the GNU Lesser General Public License version 3,

6+ * as published by the Free Software Foundation.

7+ *

8+ * This program is distributed in the hope that it will be useful,

9+ * but WITHOUT ANY WARRANTY; without even the implied warranty of

10+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

11+ * GNU Lesser General Public License for more details.

12+ *

13+ * You should have received a copy of the GNU Lesser General Public License

14+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

15+ *

16+ * Authors:

17+ * Antti Kaijanmäki <antti.kaijanmaki@canonical.com>

18+ */

19+

20+#ifndef QML_CONNECTIVITY_PLUGIN_H

21+#define QML_CONNECTIVITY_PLUGIN_H

22+

23+#include <QQmlExtensionPlugin>

24+

25+class QmlConnectivityNetworkingPlugin : public QQmlExtensionPlugin {

26+ Q_OBJECT

27+ Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface")

28+ Q_INTERFACES(QQmlExtensionInterface)

29+

30+public:

31+ void registerTypes(const char *uri);

32+ void initializeEngine(QQmlEngine *engine, const char *uri);

33+};

34+

35+#endif // QML_CONNECTIVITY_PLUGIN_H

tests/mocks/Ubuntu/Connectivity/qmldirnew file+2

@@ -0,0 +1,2 @@

1+module Ubuntu.Connectivity

2+plugin connectivity-qml

tests/mocks/Unity/Application/ApplicationManager.cpp+26

@@ -43,6 +43,7 @@ ApplicationManager *ApplicationManager::singleton()

4343ApplicationManager::ApplicationManager(QObject *parent)

4444 : ApplicationManagerInterface(parent)

4545 , m_suspended(false)

46+ , m_forceDashActive(false)

4647{

4748 m_roleNames.insert(RoleSession, "session");

4849 m_roleNames.insert(RoleFullscreen, "fullscreen");

@@ -292,6 +293,31 @@ void ApplicationManager::setSuspended(bool suspended)

292293 Q_EMIT suspendedChanged();

293294}

294295

296+bool ApplicationManager::forceDashActive() const

297+{

298+ return m_forceDashActive;

299+}

300+

301+void ApplicationManager::setForceDashActive(bool forceDashActive)

302+{

303+ if (m_forceDashActive == forceDashActive) {

304+ return;

305+ }

306+

307+ ApplicationInfo *dash = findApplication("unity8-dash");

308+ if (dash) {

309+ if (forceDashActive) {

310+ dash->setState(ApplicationInfo::Running);

311+ } else {

312+ if (!dash->focused()) {

313+ dash->setState(ApplicationInfo::Suspended);

314+ }

315+ }

316+ }

317+ m_forceDashActive = forceDashActive;

318+ Q_EMIT forceDashActiveChanged();

319+}

320+

295321bool ApplicationManager::focusApplication(const QString &appId)

296322{

297323 ApplicationInfo *application = findApplication(appId);

tests/mocks/Unity/Application/ApplicationManager.h+6−2

@@ -99,8 +99,11 @@ class ApplicationManager : public ApplicationManagerInterface {

9999 Q_INVOKABLE bool stopApplication(const QString &appId) override;

100100

101101 QString focusedApplicationId() const override;

102− bool suspended() const;

103− void setSuspended(bool suspended);

102+ bool suspended() const override;

103+ void setSuspended(bool suspended) override;

104+

105+ bool forceDashActive() const override;

106+ void setForceDashActive(bool forceDashActive) override;

104107

105108 // Only for testing

106109 Q_INVOKABLE QStringList availableApplications();

@@ -124,6 +127,7 @@ class ApplicationManager : public ApplicationManagerInterface {

124127 void buildListOfAvailableApplications();

125128 void onWindowCreated();

126129 bool m_suspended;

130+ bool m_forceDashActive;

127131 QList<ApplicationInfo*> m_runningApplications;

128132 QList<ApplicationInfo*> m_availableApplications;

129133 QTimer m_windowCreatedTimer;

tests/mocks/Unity/Application/CMakeLists.txt+1−1

@@ -1,4 +1,4 @@

1−pkg_check_modules(APPLICATION_API REQUIRED unity-shell-application=4)

1+pkg_check_modules(APPLICATION_API REQUIRED unity-shell-application=5)

22

33set(FakeUnityApplicationQml_SOURCES

44 plugin.cpp

tests/mocks/Unity/fake_scope.cpp+1−1

@@ -266,7 +266,7 @@ QVariantMap Scope::customizations() const

266266

267267void Scope::refresh()

268268{

269− qDebug() << "Scope::refresh is currently not implmented in the fake scopes plugin";

269+ Q_EMIT refreshed();

270270}

271271

272272unity::shell::scopes::NavigationInterface* Scope::getNavigation(const QString& id)

tests/mocks/Unity/fake_scope.h+3

@@ -79,6 +79,9 @@ public:

7979

8080 Q_INVOKABLE void refresh() override;

8181

82+Q_SIGNALS:

83+ void refreshed(); // This is not in the Interface, here for testing benefits

84+

8285protected:

8386

8487 QString m_id;

tests/plugins/Dash/CMakeLists.txt+3−3

@@ -32,7 +32,7 @@ macro(add_lvwph_test FILENAME TESTNAME)

3232 qt5_use_modules(${TESTNAME}TestExec Test Core Qml)

3333 target_link_libraries(${TESTNAME}TestExec ${Qt5Gui_LIBRARIES} ${Qt5Quick_LIBRARIES})

3434

35− add_binary_qml_test(${TESTNAME} "" "Dash-qml")

35+ add_binary_qml_test(${TESTNAME} "" "Dash-qml" "")

3636endmacro()

3737

3838add_lvwph_test(listviewwithpageheader ListViewWithPageHeader)

@@ -48,7 +48,7 @@ macro(add_dashview_try_test FILENAME TESTNAME)

4848 qt5_use_modules(${TESTNAME}TestExec Test Core Qml)

4949 target_link_libraries(${TESTNAME}TestExec ${Qt5Gui_LIBRARIES} ${Qt5Quick_LIBRARIES})

5050

51− add_binary_qml_test(${TESTNAME} "" "Dash-qml")

51+ add_binary_qml_test(${TESTNAME} "" "Dash-qml" "")

5252

5353 add_executable(${TESTNAME}tryExec

5454 ${FILENAME}try.cpp

@@ -71,7 +71,7 @@ add_dashview_try_test(organicgrid OrganicGrid)

7171add_executable(CardCreatorTestExec cardcreatortest.cpp)

7272qt5_use_modules(CardCreatorTestExec Test Core Qml)

7373target_link_libraries(CardCreatorTestExec ${Qt5Gui_LIBRARIES} ${Qt5Quick_LIBRARIES})

74−add_binary_qml_test(CardCreator "" "Dash-qml")

74+add_binary_qml_test(CardCreator "" "Dash-qml" "QML2_IMPORT_PATH=${CMAKE_BINARY_DIR}/tests/mocks/")

7575

7676# plain qml test

7777set(qmltest_DEFAULT_TARGETS qmluitests)

tests/plugins/Dash/cardcreator/1.res+7−6

@@ -6,7 +6,7 @@ AbstractButton {

66 property var artShapeBorderSource: undefined;

77 property real fontScale: 1.0;

88 property var scopeStyle: null;

9− property int headerAlignment: Text.AlignLeft;

9+ property int titleAlignment: Text.AlignLeft;

1010 property int fixedHeaderHeight: -1;

1111 property size fixedArtShapeSize: Qt.size(-1, -1);

1212 readonly property string title: cardData && cardData["title"] || "";

@@ -44,12 +44,13 @@ Item {

4444 height = Qt.binding(function() { return image.status !== Image.Ready ? 0 : image.height });

4545 }

4646 }

47− image: Image {

47+ image: CroppedImageMinimumSourceSize {

4848 objectName: "artImage";

49− source: cardData && cardData["art"] || "";

49+ property bool doLoadSource: !NetworkingStatus.limitedBandwith;

50+ source: { if (root.visible) doLoadSource = true; return doLoadSource && cardData && cardData["art"] || ""; }

5051 cache: true;

5152 asynchronous: root.asynchronous;

52− fillMode: Image.PreserveAspectCrop;

53+ visible: false;

5354 width: root.width;

5455 height: width / artShape.aspect;

5556 }

@@ -73,8 +74,8 @@ Label {

7374 color: root.scopeStyle ? root.scopeStyle.foreground : Theme.palette.normal.baseText;

7475 visible: showHeader ;

7576 text: root.title;

76− font.weight: components && components["subtitle"] ? Font.DemiBold : Font.Normal;

77− horizontalAlignment: root.headerAlignment;

77+ font.weight: cardData && cardData["subtitle"] ? Font.DemiBold : Font.Normal;

78+ horizontalAlignment: root.titleAlignment;

7879 }

7980UbuntuShape {

8081 id: touchdown;

tests/plugins/Dash/cardcreator/2.res+8−11

@@ -6,7 +6,7 @@ AbstractButton {

66 property var artShapeBorderSource: undefined;

77 property real fontScale: 1.0;

88 property var scopeStyle: null;

9− property int headerAlignment: Text.AlignLeft;

9+ property int titleAlignment: Text.AlignLeft;

1010 property int fixedHeaderHeight: -1;

1111 property size fixedArtShapeSize: Qt.size(-1, -1);

1212 readonly property string title: cardData && cardData["title"] || "";

@@ -62,19 +62,17 @@ Row {

6262 anchors.margins: margins;

6363 anchors.rightMargin: 0;

6464 data: [

65−Image {

65+CroppedImageMinimumSourceSize {

6666 id: mascotImage;

6767 objectName: "mascotImage";

6868 anchors { verticalCenter: parent.verticalCenter; }

69− readonly property int maxSize: Math.max(width, height) * 4;

70− source: cardData && cardData["mascot"] || "";

69+ property bool doLoadSource: !NetworkingStatus.limitedBandwith;

70+ source: { if (root.visible) doLoadSource = true; return doLoadSource && cardData && cardData["mascot"] || ""; }

7171 width: units.gu(6);

7272 height: units.gu(5.625);

73− sourceSize { width: maxSize; height: maxSize }

74− fillMode: Image.PreserveAspectCrop;

7573 horizontalAlignment: Image.AlignHCenter;

7674 verticalAlignment: Image.AlignVCenter;

77− visible: showHeader;

75+ visible: showHeader && resized;

7876 }

7977,Item {

8078 id: headerTitleContainer;

@@ -97,8 +95,8 @@ Image {

9795 color: backgroundLoader.active && backgroundLoader.item && root.scopeStyle ? root.scopeStyle.getTextColor(backgroundLoader.item.luminance) : (backgroundLoader.item && backgroundLoader.item.luminance > 0.7 ? Theme.palette.normal.baseText : "white");

9896 visible: showHeader ;

9997 text: root.title;

100− font.weight: components && components["subtitle"] ? Font.DemiBold : Font.Normal;

101− horizontalAlignment: root.headerAlignment;

98+ font.weight: cardData && cardData["subtitle"] ? Font.DemiBold : Font.Normal;

99+ horizontalAlignment: root.titleAlignment;

102100 }

103101 ,Label {

104102 id: subtitleLabel;

@@ -110,13 +108,12 @@ Image {

110108 }

111109 anchors.topMargin: units.dp(2);

112110 elide: Text.ElideRight;

113− fontSize: "small";

111+ fontSize: "x-small";

114112 font.pixelSize: Math.round(FontUtils.sizeToPixels(fontSize) * fontScale);

115113 color: backgroundLoader.active && backgroundLoader.item && root.scopeStyle ? root.scopeStyle.getTextColor(backgroundLoader.item.luminance) : (backgroundLoader.item && backgroundLoader.item.luminance > 0.7 ? Theme.palette.normal.baseText : "white");

116114 visible: titleLabel.visible && titleLabel.text;

117115 text: cardData && cardData["subtitle"] || "";

118116 font.weight: Font.Light;

119− horizontalAlignment: root.headerAlignment;

120117 }

121118

122119 ]

tests/plugins/Dash/cardcreator/3.res+9−9

@@ -6,7 +6,7 @@ AbstractButton {

66 property var artShapeBorderSource: undefined;

77 property real fontScale: 1.0;

88 property var scopeStyle: null;

9− property int headerAlignment: Text.AlignLeft;

9+ property int titleAlignment: Text.AlignLeft;

1010 property int fixedHeaderHeight: -1;

1111 property size fixedArtShapeSize: Qt.size(-1, -1);

1212 readonly property string title: cardData && cardData["title"] || "";

@@ -44,12 +44,13 @@ Item {

4444 height = Qt.binding(function() { return image.status !== Image.Ready ? 0 : image.height });

4545 }

4646 }

47− image: Image {

47+ image: CroppedImageMinimumSourceSize {

4848 objectName: "artImage";

49− source: cardData && cardData["art"] || "";

50− cache: true;

49+ property bool doLoadSource: !NetworkingStatus.limitedBandwith;

50+ source: { if (root.visible) doLoadSource = true; return doLoadSource && cardData && cardData["art"] || ""; }

51+ cache: true;

5152 asynchronous: root.asynchronous;

52− fillMode: Image.PreserveAspectCrop;

53+ visible: false;

5354 width: root.width;

5455 height: width / artShape.aspect;

5556 }

@@ -73,8 +74,8 @@ Label {

7374 color: root.scopeStyle ? root.scopeStyle.foreground : Theme.palette.normal.baseText;

7475 visible: showHeader ;

7576 text: root.title;

76− font.weight: components && components["subtitle"] ? Font.DemiBold : Font.Normal;

77− horizontalAlignment: root.headerAlignment;

77+ font.weight: cardData && cardData["subtitle"] ? Font.DemiBold : Font.Normal;

78+ horizontalAlignment: root.titleAlignment;

7879 }

7980Label {

8081 id: subtitleLabel;

@@ -86,13 +87,12 @@ Label {

8687 }

8788 anchors.topMargin: units.dp(2);

8889 elide: Text.ElideRight;

89− fontSize: "small";

90+ fontSize: "x-small";

9091 font.pixelSize: Math.round(FontUtils.sizeToPixels(fontSize) * fontScale);

9192 color: root.scopeStyle ? root.scopeStyle.foreground : Theme.palette.normal.baseText;

9293 visible: titleLabel.visible && titleLabel.text;

9394 text: cardData && cardData["subtitle"] || "";

9495 font.weight: Font.Light;

95− horizontalAlignment: root.headerAlignment;

9696 }

9797UbuntuShape {

9898 id: touchdown;

tests/plugins/Dash/cardcreator/4.res+8−11

@@ -6,7 +6,7 @@ AbstractButton {

66 property var artShapeBorderSource: undefined;

77 property real fontScale: 1.0;

88 property var scopeStyle: null;

9− property int headerAlignment: Text.AlignLeft;

9+ property int titleAlignment: Text.AlignLeft;

1010 property int fixedHeaderHeight: -1;

1111 property size fixedArtShapeSize: Qt.size(-1, -1);

1212 readonly property string title: cardData && cardData["title"] || "";

@@ -41,16 +41,14 @@ Loader {

4141 anchors { verticalCenter: parent.verticalCenter; }

4242 }

4343

44−,Image {

44+,CroppedImageMinimumSourceSize {

4545 id: mascotImage;

4646 objectName: "mascotImage";

4747 anchors { verticalCenter: parent.verticalCenter; }

48− readonly property int maxSize: Math.max(width, height) * 4;

49− source: cardData && cardData["mascot"] || "";

50− width: units.gu(6);

48+ property bool doLoadSource: !NetworkingStatus.limitedBandwith;

49+ source: { if (root.visible) doLoadSource = true; return doLoadSource && cardData && cardData["mascot"] || ""; }

50+ width: units.gu(6);

5151 height: units.gu(5.625);

52− sourceSize { width: maxSize; height: maxSize }

53− fillMode: Image.PreserveAspectCrop;

5452 horizontalAlignment: Image.AlignHCenter;

5553 verticalAlignment: Image.AlignVCenter;

5654 visible: false;

@@ -77,8 +75,8 @@ Label {

7775 color: root.scopeStyle ? root.scopeStyle.foreground : Theme.palette.normal.baseText;

7876 visible: showHeader ;

7977 text: root.title;

80− font.weight: components && components["subtitle"] ? Font.DemiBold : Font.Normal;

81− horizontalAlignment: root.headerAlignment;

78+ font.weight: cardData && cardData["subtitle"] ? Font.DemiBold : Font.Normal;

79+ horizontalAlignment: root.titleAlignment;

8280 }

8381,Label {

8482 id: subtitleLabel;

@@ -90,13 +88,12 @@ Label {

9088 }

9189 anchors.topMargin: units.dp(2);

9290 elide: Text.ElideRight;

93− fontSize: "small";

91+ fontSize: "x-small";

9492 font.pixelSize: Math.round(FontUtils.sizeToPixels(fontSize) * fontScale);

9593 color: root.scopeStyle ? root.scopeStyle.foreground : Theme.palette.normal.baseText;

9694 visible: titleLabel.visible && titleLabel.text;

9795 text: cardData && cardData["subtitle"] || "";

9896 font.weight: Font.Light;

99− horizontalAlignment: root.headerAlignment;

10097 }

10198]

10299}

tests/plugins/Dash/cardcreator/5.res+9−9

@@ -6,7 +6,7 @@ AbstractButton {

66 property var artShapeBorderSource: undefined;

77 property real fontScale: 1.0;

88 property var scopeStyle: null;

9− property int headerAlignment: Text.AlignLeft;

9+ property int titleAlignment: Text.AlignLeft;

1010 property int fixedHeaderHeight: -1;

1111 property size fixedArtShapeSize: Qt.size(-1, -1);

1212 readonly property string title: cardData && cardData["title"] || "";

@@ -44,12 +44,13 @@ Item {

4444 height = Qt.binding(function() { return image.status !== Image.Ready ? 0 : image.height });

4545 }

4646 }

47− image: Image {

47+ image: CroppedImageMinimumSourceSize {

4848 objectName: "artImage";

49− source: cardData && cardData["art"] || "";

50− cache: true;

49+ property bool doLoadSource: !NetworkingStatus.limitedBandwith;

50+ source: { if (root.visible) doLoadSource = true; return doLoadSource && cardData && cardData["art"] || ""; }

51+ cache: true;

5152 asynchronous: root.asynchronous;

52− fillMode: Image.PreserveAspectCrop;

53+ visible: false;

5354 width: root.width;

5455 height: width / artShape.aspect;

5556 }

@@ -117,8 +118,8 @@ Label {

117118 color: root.scopeStyle && overlayLoader.item ? root.scopeStyle.getTextColor(overlayLoader.item.luminance) : (overlayLoader.item && overlayLoader.item.luminance > 0.7 ? Theme.palette.normal.baseText : "white");

118119 visible: showHeader && overlayLoader.active;

119120 text: root.title;

120− font.weight: components && components["subtitle"] ? Font.DemiBold : Font.Normal;

121− horizontalAlignment: root.headerAlignment;

121+ font.weight: cardData && cardData["subtitle"] ? Font.DemiBold : Font.Normal;

122+ horizontalAlignment: root.titleAlignment;

122123 }

123124Label {

124125 id: subtitleLabel;

@@ -131,13 +132,12 @@ Label {

131132 }

132133 anchors.topMargin: units.dp(2);

133134 elide: Text.ElideRight;

134− fontSize: "small";

135+ fontSize: "x-small";

135136 font.pixelSize: Math.round(FontUtils.sizeToPixels(fontSize) * fontScale);

136137 color: root.scopeStyle && overlayLoader.item ? root.scopeStyle.getTextColor(overlayLoader.item.luminance) : (overlayLoader.item && overlayLoader.item.luminance > 0.7 ? Theme.palette.normal.baseText : "white");

137138 visible: titleLabel.visible && titleLabel.text;

138139 text: cardData && cardData["subtitle"] || "";

139140 font.weight: Font.Light;

140− horizontalAlignment: root.headerAlignment;

141141 }

142142UbuntuShape {

143143 id: touchdown;

tests/plugins/Dash/cardcreator/6.res+5−7

@@ -6,7 +6,7 @@ AbstractButton {

66 property var artShapeBorderSource: undefined;

77 property real fontScale: 1.0;

88 property var scopeStyle: null;

9− property int headerAlignment: Text.AlignLeft;

9+ property int titleAlignment: Text.AlignLeft;

1010 property int fixedHeaderHeight: -1;

1111 property size fixedArtShapeSize: Qt.size(-1, -1);

1212 readonly property string title: cardData && cardData["title"] || "";

@@ -73,8 +73,8 @@ Item {

7373 color: backgroundLoader.active && backgroundLoader.item && root.scopeStyle ? root.scopeStyle.getTextColor(backgroundLoader.item.luminance) : (backgroundLoader.item && backgroundLoader.item.luminance > 0.7 ? Theme.palette.normal.baseText : "white");

7474 visible: showHeader ;

7575 text: root.title;

76− font.weight: components && components["subtitle"] ? Font.DemiBold : Font.Normal;

77− horizontalAlignment: root.headerAlignment;

76+ font.weight: cardData && cardData["subtitle"] ? Font.DemiBold : Font.Normal;

77+ horizontalAlignment: root.titleAlignment;

7878 }

7979,Label {

8080 id: subtitleLabel;

@@ -86,15 +86,14 @@ Item {

8686 }

8787 anchors.topMargin: units.dp(2);

8888 elide: Text.ElideRight;

89− fontSize: "small";

89+ fontSize: "x-small";

9090 font.pixelSize: Math.round(FontUtils.sizeToPixels(fontSize) * fontScale);

9191 color: backgroundLoader.active && backgroundLoader.item && root.scopeStyle ? root.scopeStyle.getTextColor(backgroundLoader.item.luminance) : (backgroundLoader.item && backgroundLoader.item.luminance > 0.7 ? Theme.palette.normal.baseText : "white");

9292 visible: titleLabel.visible && titleLabel.text;

9393 text: cardData && cardData["subtitle"] || "";

9494 font.weight: Font.Light;

95− horizontalAlignment: root.headerAlignment;

9695 }

97−,Icon {

96+,StatusIcon {

9897 id: emblemIcon;

9998 objectName: "emblemIcon";

10099 anchors {

@@ -104,7 +103,6 @@ Item {

104103 }

105104 source: cardData && cardData["emblem"] || "";

106105 color: backgroundLoader.active && backgroundLoader.item && root.scopeStyle ? root.scopeStyle.getTextColor(backgroundLoader.item.luminance) : (backgroundLoader.item && backgroundLoader.item.luminance > 0.7 ? Theme.palette.normal.baseText : "white");

107− width: height;

108106 height: source != "" ? titleLabel.font.pixelSize : 0;

109107 }

110108

tests/plugins/Dash/cardcreator/7.res+9−12

@@ -6,7 +6,7 @@ AbstractButton {

66 property var artShapeBorderSource: undefined;

77 property real fontScale: 1.0;

88 property var scopeStyle: null;

9− property int headerAlignment: Text.AlignLeft;

9+ property int titleAlignment: Text.AlignLeft;

1010 property int fixedHeaderHeight: -1;

1111 property size fixedArtShapeSize: Qt.size(-1, -1);

1212 readonly property string title: cardData && cardData["title"] || "";

@@ -62,19 +62,17 @@ Row {

6262 anchors.margins: margins;

6363 anchors.rightMargin: 0;

6464 data: [

65−Image {

65+CroppedImageMinimumSourceSize {

6666 id: mascotImage;

6767 objectName: "mascotImage";

6868 anchors { verticalCenter: parent.verticalCenter; }

69− readonly property int maxSize: Math.max(width, height) * 4;

70− source: cardData && cardData["mascot"] || "";

71− width: units.gu(6);

69+ property bool doLoadSource: !NetworkingStatus.limitedBandwith;

70+ source: { if (root.visible) doLoadSource = true; return doLoadSource && cardData && cardData["mascot"] || ""; }

71+ width: units.gu(6);

7272 height: units.gu(5.625);

73− sourceSize { width: maxSize; height: maxSize }

74− fillMode: Image.PreserveAspectCrop;

7573 horizontalAlignment: Image.AlignHCenter;

7674 verticalAlignment: Image.AlignVCenter;

77− visible: showHeader;

75+ visible: showHeader && resized;

7876 }

7977

8078,Item {

@@ -98,8 +96,8 @@ Image {

9896 color: backgroundLoader.active && backgroundLoader.item && root.scopeStyle ? root.scopeStyle.getTextColor(backgroundLoader.item.luminance) : (backgroundLoader.item && backgroundLoader.item.luminance > 0.7 ? Theme.palette.normal.baseText : "white");

9997 visible: showHeader ;

10098 text: root.title;

101− font.weight: components && components["subtitle"] ? Font.DemiBold : Font.Normal;

102− horizontalAlignment: root.headerAlignment;

99+ font.weight: cardData && cardData["subtitle"] ? Font.DemiBold : Font.Normal;

100+ horizontalAlignment: root.titleAlignment;

103101 }

104102,Label {

105103 id: subtitleLabel;

@@ -111,13 +109,12 @@ Image {

111109 }

112110 anchors.topMargin: units.dp(2);

113111 elide: Text.ElideRight;

114− fontSize: "small";

112+ fontSize: "x-small";

115113 font.pixelSize: Math.round(FontUtils.sizeToPixels(fontSize) * fontScale);

116114 color: backgroundLoader.active && backgroundLoader.item && root.scopeStyle ? root.scopeStyle.getTextColor(backgroundLoader.item.luminance) : (backgroundLoader.item && backgroundLoader.item.luminance > 0.7 ? Theme.palette.normal.baseText : "white");

117115 visible: titleLabel.visible && titleLabel.text;

118116 text: cardData && cardData["subtitle"] || "";

119117 font.weight: Font.Light;

120− horizontalAlignment: root.headerAlignment;

121118 }

122119,CardAttributes {

123120 id: attributesRow;

tests/plugins/Dash/listviewwithpageheadertest.cpp+39

@@ -28,6 +28,8 @@

2828#include <private/qquickitem_p.h>

2929#pragma GCC diagnostic pop

3030

31+#include <limits>

32+

3133// TODO Think on how doing a test for lost items

3234// particullary making sure that lost items are culled

3335// and then removed in the next updatePolish cycle

@@ -1899,6 +1901,43 @@ private Q_SLOTS:

18991901 QTRY_COMPARE(lvwph->m_firstVisibleIndex, 0);

19001902 }

19011903

1904+ void testNoCacheBuffer()

1905+ {

1906+ lvwph->setCacheBuffer(0);

1907+ QTRY_COMPARE(lvwph->m_visibleItems.count(), 3);

1908+ QCOMPARE(lvwph->m_firstVisibleIndex, 0);

1909+ verifyItem(0, 50., 150., false);

1910+ verifyItem(1, 200., 200., false);

1911+ verifyItem(2, 400., 350., false);

1912+ QCOMPARE(lvwph->m_minYExtent, 0.);

1913+ QCOMPARE(lvwph->m_clipItem->y(), 0.);

1914+ QCOMPARE(lvwph->m_clipItem->clip(), false);

1915+ QCOMPARE(lvwph->m_headerItem->y(), 0.);

1916+ QCOMPARE(lvwph->m_headerItem->height(), 50.);

1917+ QCOMPARE(lvwph->contentY(), 0.);

1918+ QCOMPARE(lvwph->m_headerItemShownHeight, 0.);

1919+ }

1920+

1921+ void testAllCacheBuffer()

1922+ {

1923+ lvwph->setCacheBuffer(std::numeric_limits<qreal>::max());

1924+ QTRY_COMPARE(lvwph->m_visibleItems.count(), 6);

1925+ QCOMPARE(lvwph->m_firstVisibleIndex, 0);

1926+ verifyItem(0, 50., 150., false);

1927+ verifyItem(1, 200., 200., false);

1928+ verifyItem(2, 400., 350., false);

1929+ verifyItem(3, 750., 350., true);

1930+ verifyItem(4, 1100., 350., true);

1931+ verifyItem(5, 1450., 350., true);

1932+ QCOMPARE(lvwph->m_minYExtent, 0.);

1933+ QCOMPARE(lvwph->m_clipItem->y(), 0.);

1934+ QCOMPARE(lvwph->m_clipItem->clip(), false);

1935+ QCOMPARE(lvwph->m_headerItem->y(), 0.);

1936+ QCOMPARE(lvwph->m_headerItem->height(), 50.);

1937+ QCOMPARE(lvwph->contentY(), 0.);

1938+ QCOMPARE(lvwph->m_headerItemShownHeight, 0.);

1939+ }

1940+

19021941private:

19031942 QQuickView *view;

19041943 ListViewWithPageHeader *lvwph;

tests/plugins/Dash/listviewwithpageheadertest.qml+1

@@ -60,6 +60,7 @@ Rectangle {

6060 anchors.top: parent.top

6161 anchors.bottom: parent.bottom

6262 model: model

63+ cacheBuffer: height * 0.5

6364 delegate: Rectangle {

6465 property bool timerDone: false

6566 width: parent.width - 20

tests/plugins/Dash/listviewwithpageheadertestsection.qml+1

@@ -60,6 +60,7 @@ Rectangle {

6060 anchors.top: parent.top

6161 anchors.bottom: parent.bottom

6262 model: model

63+ cacheBuffer: height * 0.5

6364 delegate: Rectangle {

6465 property bool timerDone: false

6566 width: parent.width - 20

tests/plugins/Dash/listviewwithpageheadertestsectionexternalmodel.qml+1

@@ -28,6 +28,7 @@ Rectangle {

2828 anchors.top: parent.top

2929 anchors.bottom: parent.bottom

3030 model: model

31+ cacheBuffer: height * 0.5

3132 delegate: Rectangle {

3233 property bool timerDone: false

3334 width: parent.width - 20

tests/plugins/Ubuntu/Gestures/CMakeLists.txt+1−1

@@ -19,7 +19,7 @@ macro(add_gesture_ui_test CLASSNAME)

1919 qt5_use_modules(${CLASSNAME}TestExec Test Core Qml Gui Quick)

2020 target_link_libraries(${CLASSNAME}TestExec UbuntuGestureQml)

2121

22− add_binary_qml_test(${CLASSNAME} ${CMAKE_BINARY_DIR}/plugins/Ubuntu/Gestures UbuntuGesturesTestQmlFiles)

22+ add_binary_qml_test(${CLASSNAME} ${CMAKE_BINARY_DIR}/plugins/Ubuntu/Gestures UbuntuGesturesTestQmlFiles "")

2323 add_manual_qml_test(. ${CLASSNAME} IMPORT_PATHS ${CMAKE_BINARY_DIR}/plugins)

2424endmacro(add_gesture_ui_test)

2525

tests/plugins/Unity/Launcher/CMakeLists.txt+1−1

@@ -1,6 +1,6 @@

11pkg_check_modules(GSETTINGS_QT REQUIRED gsettings-qt)

22pkg_check_modules(LAUNCHER_API REQUIRED unity-shell-launcher=4)

3−pkg_check_modules(APPLICATION_API REQUIRED unity-shell-application=4)

3+pkg_check_modules(APPLICATION_API REQUIRED unity-shell-application=5)

44

55include_directories(

66 ${CMAKE_CURRENT_BINARY_DIR}

tests/plugins/Unity/Launcher/launchermodeltest.cpp+2

@@ -105,6 +105,8 @@ public:

105105 bool requestFocusApplication(const QString &appId) { Q_UNUSED(appId); return true; }

106106 bool suspended() const { return false; }

107107 void setSuspended(bool) {}

108+ bool forceDashActive() const { return false; }

109+ void setForceDashActive(bool) {}

108110

109111private:

110112 QList<MockApp*> m_list;

tests/qmltests/Components/CMakeLists.txt+1−1

@@ -10,7 +10,7 @@ add_executable(DragHandleTestExec tst_DragHandle.cpp)

1010qt5_use_modules(DragHandleTestExec Test Core Qml Gui Quick)

1111target_link_libraries(DragHandleTestExec UbuntuGestureQml)

1212

13−add_binary_qml_test(DragHandle ${CMAKE_BINARY_DIR}/plugins/Ubuntu/Gestures "")

13+add_binary_qml_test(DragHandle ${CMAKE_BINARY_DIR}/plugins/Ubuntu/Gestures "" "")

1414add_manual_qml_test(. DragHandle IMPORT_PATHS ${CMAKE_BINARY_DIR}/plugins)

1515

1616add_definitions(-DUBUNTU_GESTURES_PLUGIN_DIR="${CMAKE_BINARY_DIR}/plugins")

tests/qmltests/Dash/CardHelpers.js+1−12

@@ -16,7 +16,7 @@

1616

1717.pragma library

1818

19−var components = ["title", "art", "subtitle", "mascot", "emblem", "old-price", "price", "alt-price", "rating", "alt-rating", "summary", "attributes", "overlayColor"]

19+var components = ["title", "art", "subtitle", "mascot", "emblem", "summary", "attributes", "overlayColor"]

2020

2121var defaultLayout = ' \

2222{ \

@@ -37,17 +37,6 @@ var defaultLayout = ' \

3737 "overlayColor": null, \

3838 "mascot": null, \

3939 "emblem": null, \

40− "old-price": null, \

41− "price": null, \

42− "alt-price": null, \

43− "rating": { \

44− "type": "stars", \

45− "range": [0, 5], \

46− "full": "image://theme/rating-star-full", \

47− "half": "image://theme/rating-star-half", \

48− "empty": "image://theme/rating-star-empty" \

49− }, \

50− "alt-rating": null, \

5140 "summary": null, \

5241 "attributes": { "max-count": 2 } \

5342 }, \

tests/qmltests/Dash/Previews/tst_PreviewHeader.qml+4−2

@@ -27,13 +27,15 @@ Rectangle {

2727 property var origHeaderjson: {

2828 "title": "THE TITLE",

2929 "subtitle": "Something catchy",

30− "mascot": "../graphics/play_button.png"

30+ "mascot": "../graphics/play_button.png",

31+ "attributes": [{"value":"text1","icon":"image://theme/ok"},{"value":"text2","icon":"image://theme/cancel"}]

3132 }

3233

3334 property var headerjson: {

3435 "title": "THE TITLE",

3536 "subtitle": "Something catchy",

36− "mascot": "../graphics/play_button.png"

37+ "mascot": "../graphics/play_button.png",

38+ "attributes": [{"value":"text1","icon":"image://theme/ok"},{"value":"text2","icon":"image://theme/cancel"}]

3739 }

3840

3941 PreviewHeader {

tests/qmltests/Dash/Previews/tst_PreviewImageGallery.qml+51−1

@@ -21,7 +21,7 @@ import Unity.Test 0.1 as UT

2121

2222Rectangle {

2323 id: root

24− width: units.gu(60)

24+ width: units.gu(80)

2525 height: units.gu(80)

2626 color: "lightgrey"

2727

@@ -44,13 +44,63 @@ Rectangle {

4444 }

4545

4646 UT.UnityTestCase {

47+ id: testCase

4748 name: "PreviewImageGalleryTest"

4849 when: windowShown

4950

51+ property Item slideShow: findChild(imageGallery.rootItem, "slideShow")

52+ property Item slideShowCloseButton: findChild(slideShow, "slideShowCloseButton")

53+ property Item slideShowListView: findChild(slideShow, "slideShowListView")

54+

55+ function cleanup() {

56+ slideShow.visible = false;

57+ imageGallery.widgetData = sourcesModel1;

58+ waitForRendering(imageGallery);

59+ }

60+

5061 function test_changeEmptyModel() {

5162 imageGallery.widgetData = sourcesModel0;

5263 var placeholderScreenshot = findChild(imageGallery, "placeholderScreenshot");

5364 compare(placeholderScreenshot.visible, true);

5465 }

66+

67+ function test_slideShowOpenClose() {

68+ var image0 = findChild(imageGallery, "previewImage0");

69+ mouseClick(image0, image0.width / 2, image0.height / 2);

70+ tryCompare(slideShow, "visible", true);

71+ tryCompare(slideShow, "scale", 1.0);

72+ tryCompare(slideShowCloseButton, "visible", true);

73+ mouseClick(slideShowCloseButton, slideShowCloseButton.width / 2, slideShowCloseButton.height / 2);

74+ tryCompare(slideShow, "visible", false);

75+ }

76+

77+ function test_slideShowShowHideHeader() {

78+ var image0 = findChild(imageGallery, "previewImage0");

79+ mouseClick(image0, image0.width / 2, image0.height / 2);

80+ tryCompare(slideShow, "visible", true);

81+ tryCompare(slideShow, "scale", 1.0);

82+ tryCompare(slideShowCloseButton, "visible", true);

83+ mouseClick(slideShow, slideShow.width / 2, slideShow.height / 2);

84+ tryCompare(slideShowCloseButton, "visible", false);

85+ mouseClick(slideShow, slideShow.width / 2, slideShow.height / 2);

86+ tryCompare(slideShowCloseButton, "visible", true);

87+ }

88+

89+ function test_slideShowOpenCorrectImage_data() {

90+ return [

91+ { tag: "Image 0", index: 0 },

92+ { tag: "Image 1", index: 1 },

93+ { tag: "Image 2", index: 2 },

94+ ];

95+ }

96+

97+ function test_slideShowOpenCorrectImage(data) {

98+ var image = findChild(imageGallery, "previewImage" + data.index);

99+ mouseClick(image, image.width / 2, image.height / 2);

100+ tryCompare(slideShow, "visible", true);

101+ tryCompare(slideShow, "scale", 1.0);

102+ tryCompare(slideShowListView, "currentIndex", data.index);

103+ verify(image.source === slideShowListView.currentItem.source);

104+ }

55105 }

56106}

tests/qmltests/Dash/tst_Card.qml+26

@@ -17,6 +17,7 @@

1717import QtQuick 2.0

1818import QtTest 1.0

1919import Ubuntu.Components 0.1

20+import Ubuntu.Connectivity 1.0

2021import Unity.Test 0.1 as UT

2122import "../../../qml/Dash"

2223import "CardHelpers.js" as Helpers

@@ -205,6 +206,11 @@ Rectangle {

205206 property Item backgroundImage: findChild(card, "backgroundImage")

206207 property Item mascotImage: findChild(card, "mascotImage");

207208

209+ function init() {

210+ loader.visible = true;

211+ NetworkingStatus.limitedBandwith = false;

212+ }

213+

208214 function cleanup() {

209215 selector.selectedIndex = -1;

210216 }

@@ -566,5 +572,25 @@ Rectangle {

566572 verify((card.width - titleToCard.x - titleToCard.width) === units.gu(1));

567573 }

568574 }

575+

576+ function test_load_images_visibility_network_data() {

577+ return [

578+ { tag: "Visible, network", visible: true, limitedBandwith: false },

579+ { tag: "Visible, no network", visible: true, limitedBandwith: true },

580+ { tag: "Not Visible, network", visible: false, limitedBandwith: false },

581+ { tag: "Not Visible, no network", visible: false, limitedBandwith: true }

582+ ];

583+ }

584+

585+ function test_load_images_visibility_network(data) {

586+ loader.visible = data.visible;

587+ NetworkingStatus.limitedBandwith = data.limitedBandwith;

588+

589+ selector.selectedIndex = 0;

590+ waitForRendering(selector);

591+ waitForRendering(card);

592+

593+ verify(data.visible || !data.limitedBandwith || artImage.source == "");

594+ }

569595 }

570596}

tests/qmltests/Dash/tst_CardTool.qml+28−20

@@ -85,8 +85,8 @@ Rectangle {

8585 "layout": { "template": { "card-layout": "vertical" }, "components": { "title": "title", "subtitle": "subtitle" } }

8686 },

8787 {

88− "name": "Title, price - horizontal",

89− "layout": { "template": { "card-layout": "horizontal" }, "components": { "title": "title", "price": "price" } }

88+ "name": "Title, attributes - horizontal",

89+ "layout": { "template": { "card-layout": "horizontal" }, "components": { "title": "title", "attributes": "attributes" } }

9090 },

9191 ]

9292

@@ -100,6 +100,7 @@ Rectangle {

100100 }

101101

102102 Column {

103+ id: column

103104 width: units.gu(38)

104105 anchors { left: parent.left; top: parent.top; margins: units.gu(1) }

105106

@@ -111,7 +112,7 @@ Rectangle {

111112 ]

112113

113114 delegate: Row {

114− anchors { left: parent.left; right: parent.right; margins: units.gu(3) }

115+ anchors { left: column.left; right: column.right; margins: units.gu(3) }

115116

116117 Label {

117118 height: units.gu(5)

@@ -315,28 +316,35 @@ Rectangle {

315316 }

316317 }

317318

318− function test_card_header_component_alignment_data() {

319+ function test_card_title_alignment_data() {

319320 return [

320− { tag: "Title - vertical", component: "titleLabel", property: "headerAlignment",

321− value: Text.AlignHCenter, index: 11, layout_index: 0 },

322− { tag: "Title - horizontal", component: "titleLabel", property: "headerAlignment",

323− value: Text.AlignLeft, index: 12, layout_index: 0},

324− { tag: "Title, subtitle - vertical", component: "titleLabel", property: "headerAlignment",

325− value: Text.AlignLeft, index: 13, layout_index: 0},

326− { tag: "Title, price - horizontal", component: "titleLabel", property: "headerAlignment",

327− value: Text.AlignLeft, index: 14, layout_index: 0},

328− ]

321+ { tag: "Art, header, summary", value: Text.AlignLeft, index: 0 },

322+ { tag: "Header, summary", value: Text.AlignLeft, index: 1 },

323+ { tag: "Art, header", value: Text.AlignLeft, index: 2 },

324+ { tag: "Header only", value: Text.AlignLeft, index: 3 },

325+ { tag: "Header title only", value: Text.AlignHCenter, index: 4 },

326+ { tag: "Header title and subtitle", value: Text.AlignLeft, index: 5 },

327+ { tag: "Header title and mascot", value: Text.AlignLeft, index: 6 },

328+ { tag: "Art, header, summary - small", value: Text.AlignLeft, index: 7 },

329+ { tag: "Art, header, summary - large", value: Text.AlignLeft, index: 8 },

330+ { tag: "Art, header, summary - horizontal", value: Text.AlignLeft, index: 9 },

331+ { tag: "Art, header - portrait", value: Text.AlignLeft, index: 10 },

332+ { tag: "Title - vertical", value: Text.AlignHCenter, index: 11 },

333+ { tag: "Title - horizontal", value: Text.AlignLeft, index: 12 },

334+ { tag: "Title, subtitle - vertical", value: Text.AlignLeft, index: 13 },

335+ { tag: "Title, attributes - horizontal", value: Text.AlignLeft, index: 14 },

336+ ];

329337 }

330338

331− function test_card_header_component_alignment(data) {

339+ function test_card_title_alignment(data) {

332340 selector.selectedIndex = data.index;

333− if (data.hasOwnProperty("layout_index")) {

334− layoutSelector.selectedIndex = data.layout_index;

335− }

336341

337− if (data.hasOwnProperty("property")) {

338− tryCompare(cardTool, data.property, data.value);

339− }

342+ tryCompare(cardTool, "titleAlignment", Text.AlignLeft);

343+

344+ cardTool.components['title'] = { "field": "title", "align": "center" };

345+ cardTool.componentsChanged();

346+

347+ tryCompare(cardTool, "titleAlignment", data.value);

340348 }

341349

342350 function test_categoryLayout_data() {

tests/qmltests/Dash/tst_Dash.qml+16−39

@@ -55,6 +55,16 @@ Item {

5555 scopes.load();

5656 tryCompare(dashContentList, "currentIndex", 0);

5757 tryCompare(dashContentList, "count", 6);

58+ tryCompare(scopes, "loaded", true);

59+ tryCompareFunction(function() {

60+ var mockScope1Loader = findChild(dash, "MockScope1 loader");

61+ return mockScope1Loader && mockScope1Loader.item != null; },

62+ true, 15000);

63+ tryCompareFunction(function() {

64+ var mockScope1Loader = findChild(dash, "MockScope1 loader");

65+ return mockScope1Loader && mockScope1Loader.status === Loader.Ready; },

66+ true, 15000);

67+ waitForRendering(findChild(dash, "MockScope1 loader").item);

5868 }

5969

6070 function get_scope_data() {

@@ -92,15 +102,6 @@ Item {

92102 }

93103

94104 function test_dash_overview_show_select_same_favorite() {

95− // Wait for stuff to be loaded

96− tryCompare(scopes, "loaded", true);

97− var dashContentList = findChild(dash, "dashContentList");

98− tryCompare(dashContentList, "count", 6);

99− tryCompareFunction(function() {

100− var mockScope1Loader = findChild(dash, "MockScope1 loader");

101− return mockScope1Loader && mockScope1Loader.item != null; },

102− true);

103−

104105 // Show the overview

105106 touchFlick(dash, dash.width / 2, dash.height - 1, dash.width / 2, dash.height - units.gu(18));

106107 var overviewController = findInvisibleChild(dash, "overviewController");

@@ -121,18 +122,12 @@ Item {

121122

122123 // Make sure animation went back

123124 tryCompare(overviewController, "progress", 0);

125+

126+ var dashContentList = findChild(dash, "dashContentList");

124127 compare(dashContentList.currentIndex, 0);

125128 }

126129

127130 function test_dash_overview_show_select_different_favorite() {

128− // Wait for stuff to be loaded

129− tryCompare(scopes, "loaded", true);

130− var dashContentList = findChild(dash, "dashContentList");

131− tryCompare(dashContentList, "count", 6);

132− tryCompareFunction(function() { return findChild(dash, "MockScope1 loader") != null; }, true);

133− var mockScope1Loader = findChild(dash, "MockScope1 loader");

134− tryCompare(mockScope1Loader, "status", Loader.Ready);

135−

136131 // Show the overview

137132 touchFlick(dash, dash.width / 2, dash.height - 1, dash.width / 2, dash.height - units.gu(18));

138133 var overviewController = findInvisibleChild(dash, "overviewController");

@@ -153,19 +148,11 @@ Item {

153148

154149 // Make sure animation went back

155150 tryCompare(overviewController, "progress", 0);

151+ var dashContentList = findChild(dash, "dashContentList");

156152 compare(dashContentList.currentIndex, 1);

157153 }

158154

159155 function test_dash_overview_all_temp_scope_done_from_all() {

160− // Wait for stuff to be loaded

161− tryCompare(scopes, "loaded", true);

162− var dashContentList = findChild(dash, "dashContentList");

163− tryCompare(dashContentList, "count", 6);

164− tryCompareFunction(function() {

165− var mockScope1Loader = findChild(dash, "MockScope1 loader");

166− return mockScope1Loader && mockScope1Loader.item != null; },

167− true);

168−

169156 // Show the overview

170157 touchFlick(dash, dash.width / 2, dash.height - 1, dash.width / 2, dash.height - units.gu(18));

171158 var overviewController = findInvisibleChild(dash, "overviewController");

@@ -227,20 +214,13 @@ Item {

227214 tryCompare(overviewController, "progress", 0);

228215

229216 // Original list is still on 0

217+ var dashContentList = findChild(dash, "dashContentList");

230218 compare(dashContentList.currentIndex, 0);

231219 }

232220

233221 function test_temp_scope_dash_overview_all_search_temp_scope_favorite_from_all() {

234− // Wait for stuff to be loaded

235− tryCompare(scopes, "loaded", true);

236− var dashContentList = findChild(dash, "dashContentList");

237− tryCompare(dashContentList, "count", 6);

238− tryCompareFunction(function() {

239− var mockScope1Loader = findChild(dash, "MockScope1 loader");

240− return mockScope1Loader && mockScope1Loader.item != null; },

241− true);

242−

243222 // Swipe right to Apps scope

223+ var dashContentList = findChild(dash, "dashContentList");

244224 touchFlick(dash, dash.width - 1, units.gu(1), dash.width - units.gu(10), units.gu(1));

245225 tryCompare(dashContentList, "contentX", dashContentList.width);

246226 tryCompare(dashContentList, "currentIndex", 1);

@@ -249,8 +229,7 @@ Item {

249229 var categoryListView = findChild(dashContentList.currentItem, "categoryListView");

250230 var dashCategory2 = findChild(categoryListView, "dashCategory2");

251231 tryCompareFunction(function() {

252− var d = findChild(dashCategory2, "delegate2");

253− if (d) return true;

232+ if (dashCategory2.y < 200) return true;

254233 categoryListView.contentY += 100;

255234 return false;

256235 }, true);

@@ -340,8 +319,6 @@ Item {

340319 }

341320

342321 function test_processing_indicator() {

343− tryCompare(scopes, "loaded", true);

344−

345322 var processingIndicator = findChild(dash, "processingIndicator");

346323 verify(processingIndicator, "Can't find the processing indicator.");

347324

tests/qmltests/Dash/tst_DashContent.qml+14−1

@@ -70,7 +70,17 @@ Item {

7070 function loadScopes() {

7171 scopeLoadedSpy.clear();

7272 scopesModel.load();

73− tryCompare(scopeLoadedSpy, "count", 6);

73+ tryCompare(scopeLoadedSpy, "count", 6, 15000);

74+ tryCompare(scopesModel, "loaded", true);

75+ tryCompareFunction(function() {

76+ var mockScope1Loader = findChild(shell, "MockScope1 loader");

77+ return mockScope1Loader && mockScope1Loader.item != null; },

78+ true, 15000);

79+ tryCompareFunction(function() {

80+ var mockScope1Loader = findChild(shell, "MockScope1 loader");

81+ return mockScope1Loader && mockScope1Loader.status === Loader.Ready; },

82+ true, 15000);

83+ waitForRendering(findChild(shell, "MockScope1 loader").item);

7484 }

7585

7686 function init() {

@@ -467,6 +477,9 @@ Item {

467477 var navigationListView = findChild(dashAltNavigationButton, "navigationListView");

468478 tryCompare(navigationListView.currentItem.navigation, "loaded", true);

469479

480+ var blackRect = findChild(dashNavigation, "blackRect");

481+ tryCompare(blackRect, "opacity", 0.5);

482+

470483 mouseClick(dashNavigation, dashNavigationButton.x, 0);

471484 compare(dashNavigationButton.showList, false);

472485 compare(dashAltNavigationButton.showList, false);

tests/qmltests/Dash/tst_GenericScopeView.qml+28−6

@@ -82,18 +82,19 @@ Item {

8282 spy.signalName = "";

8383 }

8484

85− function scrollToCategory(category) {

85+ function scrollToCategory(categoryName) {

8686 var categoryListView = findChild(genericScopeView, "categoryListView");

8787 tryCompareFunction(function() {

88− if (findChild(genericScopeView, category)) return true;

88+ var category = findChild(genericScopeView, categoryName);

89+ if (category && category.y > 0 && category.y < genericScopeView.height) return true;

8990 mouseFlick(genericScopeView, genericScopeView.width/2, genericScopeView.height,

9091 genericScopeView.width/2, genericScopeView.y)

9192 tryCompare(categoryListView, "moving", false);

92− return findChild(genericScopeView, category) !== null;

93+ return false;

9394 }, true);

9495

9596 tryCompareFunction(function() { return findChild(genericScopeView, "delegate0") !== null; }, true);

96− return findChild(genericScopeView, category);

97+ return findChild(genericScopeView, categoryName);

9798 }

9899

99100 function scrollToEnd()

@@ -283,7 +284,7 @@ Item {

283284 if (category === undefined) category = 0;

284285 if (delegate === undefined) delegate = 0;

285286 tryCompareFunction(function() {

286− var cardGrid = findChild(genericScopeView, category);

287+ var cardGrid = findChild(genericScopeView, "dashCategory"+category);

287288 if (cardGrid != null) {

288289 var tile = findChild(cardGrid, "delegate"+delegate);

289290 return tile != null;

@@ -291,7 +292,7 @@ Item {

291292 return false;

292293 },

293294 true);

294− var tile = findChild(findChild(genericScopeView, category), "delegate"+delegate);

295+ var tile = findChild(findChild(genericScopeView, "dashCategory"+category), "delegate"+delegate);

295296 mouseClick(tile, tile.width / 2, tile.height / 2);

296297 tryCompare(testCase.subPageLoader, "open", true);

297298 tryCompare(testCase.subPageLoader, "x", 0);

@@ -581,6 +582,27 @@ Item {

581582

582583 genericScopeView.scope = !genericScopeView.scope;

583584 }

585+

586+ function test_pullToRefresh() {

587+ waitForRendering(genericScopeView)

588+

589+ mouseFlick(genericScopeView,

590+ genericScopeView.width/2, units.gu(10),

591+ genericScopeView.width/2, units.gu(80),

592+ true, false)

593+

594+ var pullToRefresh = findChild(genericScopeView, "pullToRefresh")

595+ tryCompare(pullToRefresh, "releaseToRefresh", true)

596+

597+ spy.target = genericScopeView.scope

598+ spy.signalName = "refreshed"

599+

600+ mouseRelease(genericScopeView)

601+ tryCompare(pullToRefresh, "releaseToRefresh", false)

602+

603+ spy.wait()

604+ compare(spy.count, 1)

605+ }

584606 }

585607 }

586608}

tests/qmltests/tst_Shell.qml+4

@@ -198,6 +198,10 @@ Row {

198198

199199 var launcher = findChild(shell, "launcherPanel");

200200 tryCompare(launcher, "x", data.launcherHides ? -launcher.width : 0)

201+

202+ // Make sure the helper for sliding out the launcher wasn't touched. We want to fade it out here.

203+ var animateTimer = findInvisibleChild(shell, "animateTimer");

204+ compare(animateTimer.nextState, "visible");

201205 }

202206

203207 function test_suspend() {

tests/utils/modules/Unity/Test/UnityTestCase.qml+3−2

@@ -178,9 +178,10 @@ TestCase {

178178 // Keeps executing a given parameter-less function until it returns the given

179179 // expected result or the timemout is reached (in which case a test failure

180180 // is generated)

181− function tryCompareFunction(func, expectedResult) {

181+ function tryCompareFunction(func, expectedResult, timeout) {

182182 var timeSpent = 0

183− var timeout = 5000

183+ if (timeout === undefined)

184+ timeout = 5000;

184185 var success = false

185186 var actualResult

186187 while (timeSpent < timeout && !success) {

tools/unlock-device+14−13

@@ -4,7 +4,7 @@

44# Our goal here is to get an Ubuntu Touch device into a testable unlocked state.

55# This will include a reboot.

66

7−WAIT_COMMAND="adb reboot; sleep 5; adb wait-for-device"

7+WAIT_COMMAND="adb reboot; sleep 5; adb wait-for-device; sleep 20"

88

99while getopts s:w: opt; do

1010 case $opt in

@@ -19,16 +19,17 @@ done

1919

2020eval "$WAIT_COMMAND"

2121

22−# Force a sleep no matter what, since we may need to wait for unity8

23−# to finish coming up (it's hard to tell when the greeter is actually rendered)

24−sleep 30

22+for i in `seq 1 5`; do

23+ # We need to go through sudo to get a proper environment for dbus set up

24+ UNLOCK_OUTPUT=$(adb shell "gdbus call --session --dest com.canonical.UnityGreeter --object-path / --method com.canonical.UnityGreeter.HideGreeter && echo Greeter unlocked" 2>&1)

25+ if echo "$UNLOCK_OUTPUT" | grep 'Greeter unlocked' >/dev/null; then

26+ echo "I: Unlock passed"

27+ exit 0

28+ else

29+ echo "I: Unlock attempt $i failed, script output: '$UNLOCK_OUTPUT'"

30+ sleep 20

31+ fi

32+done

2533

26−# We need to go through sudo to get a proper environment for dbus set up

27−UNLOCK_OUTPUT=$(adb shell "gdbus call --session --dest com.canonical.UnityGreeter --object-path / --method com.canonical.UnityGreeter.HideGreeter && echo Greeter unlocked" 2>&1)

28−if echo "$UNLOCK_OUTPUT" | grep 'Greeter unlocked' >/dev/null; then

29− echo "I: Unlock passed"

30− exit 0

31−else

32− echo "I: Unlock failed, script output: '$UNLOCK_OUTPUT'"

33− exit 1

34−fi

34+echo "I: Too many unlock failures, giving up"

35+exit 1