902b392 · unity8 · git.iko.soy

CMakeLists.txt+2−2

compare with xenial

unifiedsplit

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

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

65endif()

66

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

68+

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

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

68if(SHELL_PLUGINDIR STREQUAL "")

70if(SHELL_PLUGINDIR STREQUAL "")

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

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

70endif()

72endif()

71

73

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

73−

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

75

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

build.sh+1

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

51 qtdeclarative5-ubuntu-settings-components \

52 qtdeclarative5-ubuntu-telephony0.1 \

53 qtdeclarative5-ubuntu-thumbnailer0.1 \

54+ qml-module-ubuntu-connectivity \

54 unity-notifications-impl \

55 unity-notifications-impl \

55 ubuntu-mobile-icons \

56 ubuntu-mobile-icons \

56 unity-scope-home \

57 unity-scope-home \

cmake/modules/QmlTest.cmake+2−1

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

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

152endmacro(add_qml_test_internal)

153

154−macro(add_binary_qml_test CLASS_NAME LD_PATH DEPS)

154+macro(add_binary_qml_test CLASS_NAME LD_PATH DEPS ENVVAR)

155 set(testCommand

156 LD_LIBRARY_PATH=${LD_PATH}

157 ${CMAKE_CURRENT_BINARY_DIR}/${CLASS_NAME}TestExec

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

168 endif()

169 set(xvfbtestCommand

170 ${LD_PRELOAD_PATH}

171+ ${ENVVAR}

171 LD_LIBRARY_PATH=${LD_PATH}

172 LD_LIBRARY_PATH=${LD_PATH}

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

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

173 ${CMAKE_CURRENT_BINARY_DIR}/${CLASS_NAME}TestExec

174 ${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+

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

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

2

42

3 [ Alexandros Frantzis ]

43 [ Alexandros Frantzis ]

debian/control+2−1

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

25 libpulse-dev,

26 libqmenumodel-dev (>= 0.2.8),

27 libqt5xmlpatterns5-dev,

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

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

29 libusermetricsoutput1-dev,

30 libxcb1-dev,

31 pkg-config,

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

174 libhardware2,

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

176 pay-service,

177+ qml-module-ubuntu-connectivity,

177 ${misc:Depends},

178 ${misc:Depends},

178 ${shlibs:Depends},

179 ${shlibs:Depends},

179Provides: unity-launcher-impl,

180Provides: unity-launcher-impl,

debian/unity8-private.install+1

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

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

1usr/lib/*/unity8/qml/AccountsService

2usr/lib/*/unity8/qml/AccountsService

2usr/lib/*/unity8/qml/Dash

3usr/lib/*/unity8/qml/Dash

3usr/lib/*/unity8/qml/HudClient

4usr/lib/*/unity8/qml/HudClient

plugins/Dash/CardAttributes.qml+1−1

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

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

60 elide: Text.ElideRight

61 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

63 fontSize: "small"

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

65 color: grid.color

plugins/Dash/CardCreator.js+15−16

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

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

83 } \n\

84 } \n\

85− image: Image { \n\

85+ image: CroppedImageMinimumSourceSize { \n\

86 objectName: "artImage"; \n\

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

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

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

88 cache: true; \n\

89 cache: true; \n\

89 asynchronous: root.asynchronous; \n\

90 asynchronous: root.asynchronous; \n\

90− fillMode: Image.PreserveAspectCrop; \n\

91+ visible: false; \n\

91 width: %2; \n\

92 width: %2; \n\

92 height: %3; \n\

93 height: %3; \n\

93 } \n\

94 } \n\

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

190

191

191// %1 is used as anchors of mascotImage

192// %1 is used as anchors of mascotImage

192// %2 is used as visible of mascotImage

193// %2 is used as visible of mascotImage

193−var kMascotImageCode = 'Image { \n\

194+var kMascotImageCode = 'CroppedImageMinimumSourceSize { \n\

194 id: mascotImage; \n\

195 id: mascotImage; \n\

195 objectName: "mascotImage"; \n\

196 objectName: "mascotImage"; \n\

196 anchors { %1 } \n\

197 anchors { %1 } \n\

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

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

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

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

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

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

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

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

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

202− fillMode: Image.PreserveAspectCrop; \n\

203 horizontalAlignment: Image.AlignHCenter; \n\

202 horizontalAlignment: Image.AlignHCenter; \n\

204 verticalAlignment: Image.AlignVCenter; \n\

203 verticalAlignment: Image.AlignVCenter; \n\

205 visible: %2; \n\

204 visible: %2; \n\

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

220 color: %2; \n\

219 color: %2; \n\

221 visible: showHeader %3; \n\

220 visible: showHeader %3; \n\

222 text: root.title; \n\

221 text: root.title; \n\

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

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

224− horizontalAlignment: root.headerAlignment; \n\

223+ horizontalAlignment: root.titleAlignment; \n\

225 }\n';

224 }\n';

226

225

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

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

228// %2 is used as color of emblemIcon

227// %2 is used as color of emblemIcon

229−var kEmblemIconCode = 'Icon { \n\

228+var kEmblemIconCode = 'StatusIcon { \n\

230 id: emblemIcon; \n\

229 id: emblemIcon; \n\

231 objectName: "emblemIcon"; \n\

230 objectName: "emblemIcon"; \n\

232 anchors { \n\

231 anchors { \n\

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

236 } \n\

235 } \n\

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

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

238 color: %2; \n\

237 color: %2; \n\

239− width: height; \n\

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

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

241 }\n';

239 }\n';

242

240

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

258 anchors { %1 } \n\

256 anchors { %1 } \n\

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

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

260 elide: Text.ElideRight; \n\

258 elide: Text.ElideRight; \n\

261− fontSize: "small"; \n\

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

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

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

263 color: %2; \n\

261 color: %2; \n\

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

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

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

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

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

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

267− horizontalAlignment: root.headerAlignment; \n\

268 }\n';

265 }\n';

269

266

270// %1 is used as anchors of attributesRow

267// %1 is used as anchors of attributesRow

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

310 property var artShapeBorderSource: undefined; \n\

307 property var artShapeBorderSource: undefined; \n\

311 property real fontScale: 1.0; \n\

308 property real fontScale: 1.0; \n\

312 property var scopeStyle: null; \n\

309 property var scopeStyle: null; \n\

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

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

314 property int fixedHeaderHeight: -1; \n\

311 property int fixedHeaderHeight: -1; \n\

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

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

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

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

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

436 mascotShapeCode = kMascotShapeLoaderCode.arg(mascotAnchors);

433 mascotShapeCode = kMascotShapeLoaderCode.arg(mascotAnchors);

437 }

434 }

438

435

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

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

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

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

441 }

438 }

442

439

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

655function createCardComponent(parent, template, components) {

652function createCardComponent(parent, template, components) {

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

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

657 import Ubuntu.Components 1.1; \n\

654 import Ubuntu.Components 1.1; \n\

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

656+ import Ubuntu.Connectivity 1.0; \n\

658 import Dash 0.1;\n\

657 import Dash 0.1;\n\

659 import Utils 0.1;\n';

658 import Utils 0.1;\n';

660 var card = cardString(template, components);

659 var card = cardString(template, components);

plugins/Dash/CroppedImageMinimumSourceSize.qmlnew file+38

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

1+/*

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 @@

104#pragma GCC diagnostic pop

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

106

107−static const qreal bufferRatio = 0.5;

108−

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

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

110{

108{

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

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

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

158 , m_forceNoClip(false)

156 , m_forceNoClip(false)

159 , m_inLayout(false)

157 , m_inLayout(false)

160 , m_inContentHeightKeepHeaderShown(false)

158 , m_inContentHeightKeepHeaderShown(false)

159+ , m_cacheBuffer(0)

161{

160{

162 m_clipItem = new QQuickItem(contentItem());

161 m_clipItem = new QQuickItem(contentItem());

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

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

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

335 return m_headerItemShownHeight;

334 return m_headerItemShownHeight;

336}

335}

337

336

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+

338void ListViewWithPageHeader::positionAtBeginning()

351void ListViewWithPageHeader::positionAtBeginning()

339{

352{

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

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

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

356 // Create the subsequent items

369 // Create the subsequent items

357 int modelIndex = 1;

370 int modelIndex = 1;

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

371 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;

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

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

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

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

363 break;

375 break;

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

603 return;

615 return;

604 }

616 }

605

617

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

607 const qreal from = contentY();

618 const qreal from = contentY();

608 const qreal to = from + height();

619 const qreal to = from + height();

609− const qreal bufferFrom = from - buffer;

620+ const qreal bufferFrom = from - m_cacheBuffer;

610− const qreal bufferTo = to + buffer;

621+ const qreal bufferTo = to + m_cacheBuffer;

611

622

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

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

613 bool removed = removeNonVisibleItems(bufferFrom, bufferTo);

624 bool removed = removeNonVisibleItems(bufferFrom, bufferTo);

plugins/Dash/listviewwithpageheader.h+6

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

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

55 Q_PROPERTY(int stickyHeaderHeight READ stickyHeaderHeight NOTIFY stickyHeaderHeightChanged)

56 Q_PROPERTY(qreal headerItemShownHeight READ headerItemShownHeight NOTIFY headerItemShownHeightChanged)

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

57

58

58 friend class ListViewWithPageHeaderTest;

59 friend class ListViewWithPageHeaderTest;

59 friend class ListViewWithPageHeaderTestSection;

60 friend class ListViewWithPageHeaderTestSection;

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

84 int stickyHeaderHeight() const;

85 int stickyHeaderHeight() const;

85 qreal headerItemShownHeight() const;

86 qreal headerItemShownHeight() const;

86

87

88+ qreal cacheBuffer() const;

89+ void setCacheBuffer(qreal cacheBuffer);

90+

87 Q_INVOKABLE void positionAtBeginning();

91 Q_INVOKABLE void positionAtBeginning();

88 Q_INVOKABLE void showHeader();

92 Q_INVOKABLE void showHeader();

89 Q_INVOKABLE int firstCreatedIndex() const;

93 Q_INVOKABLE int firstCreatedIndex() const;

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

105 void forceNoClipChanged();

109 void forceNoClipChanged();

106 void stickyHeaderHeightChanged();

110 void stickyHeaderHeightChanged();

107 void headerItemShownHeightChanged();

111 void headerItemShownHeightChanged();

112+ void cacheBufferChanged();

108

113

109protected:

114protected:

110 void componentComplete() override;

115 void componentComplete() override;

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

199 bool m_forceNoClip;

204 bool m_forceNoClip;

200 bool m_inLayout;

205 bool m_inLayout;

201 bool m_inContentHeightKeepHeaderShown;

206 bool m_inContentHeightKeepHeaderShown;

207+ qreal m_cacheBuffer;

202

208

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

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

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

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

plugins/Dash/qmldir+2−1

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

3typeinfo Dash.qmltypes

4singleton CardCreatorCache 0.1 CardCreatorCache.qml

5ScopeStyle 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 @@

21#include <QObject>

22

23class Greeter;

24−class QDBusInterface;

25

24

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

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

27 */

26 */

plugins/LightDM/DBusGreeterList.h−1

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

21#include <QObject>

22

23class Greeter;

24−class QDBusInterface;

25

24

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

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

27 */

26 */

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

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

1include_directories(

2 ${CMAKE_CURRENT_SOURCE_DIR}

3+ ${libunity8-private_SOURCE_DIR}

3)

4)

4

5

5set(QMLDASHCOMMUNICATORPLUGIN_SRC

6set(QMLDASHCOMMUNICATORPLUGIN_SRC

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

7 dbusdashcommunicatorservice.cpp

8 dbusdashcommunicatorservice.cpp

8 dashcommunicatorservice.cpp

9 dashcommunicatorservice.cpp

9 dashcommunicator.cpp

10 dashcommunicator.cpp

11+ dashconnection.cpp

10− )

12+)

11

13

12add_library(DashCommunicator-qml MODULE

14add_library(DashCommunicator-qml MODULE

13 ${QMLDASHCOMMUNICATORPLUGIN_SRC}

15 ${QMLDASHCOMMUNICATORPLUGIN_SRC}

14− )

16+)

15

17

16qt5_use_modules(DashCommunicator-qml DBus Qml)

18qt5_use_modules(DashCommunicator-qml DBus Qml)

17

19

20+target_link_libraries(DashCommunicator-qml

21+ unity8-private

22+)

23+

18# export the qmldir and qmltypes files

24# export the qmldir and qmltypes files

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

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

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

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

15 */

16

17#include "dashcommunicator.h"

18+#include "dashconnection.h"

18

19

19#include <QObject>

20#include <QObject>

20−#include <QDBusConnection>

21−#include <QDBusInterface>

22−#include <QDebug>

23

21

24DashCommunicator::DashCommunicator(QObject *parent):

22DashCommunicator::DashCommunicator(QObject *parent):

25− QObject(parent)

23+ QThread(parent),

24+ m_dashConnection(nullptr),

25+ m_created(false)

26{

27+ start();

27}

28}

28

29

29−DashCommunicator::~DashCommunicator()

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

30{

31{

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();

31}

40}

32

41

33−

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

42+void DashCommunicator::run()

35{

43{

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

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

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

38− "/com/canonical/UnityDash",

45+ "/com/canonical/UnityDash",

39− "",

46+ "", this);

40− connection);

47+ m_mutex.lock();

48+ m_created = true;

49+ m_mutex.unlock();

41

50

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

51+ exec();

43}

52}

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

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

17#ifndef DASHCOMMUNICATOR_H

18#define DASHCOMMUNICATOR_H

19

20+// Qt

20−#include <QObject>

21+#include <QThread>

22+#include <QMutex>

21

23

24+class DashConnection;

25+

22−class DashCommunicator: public QObject

26+class DashCommunicator: public QThread

23{

27{

24 Q_OBJECT

28 Q_OBJECT

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

26−

27public:

29public:

28− DashCommunicator(QObject *parent = 0);

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

29− ~DashCommunicator();

31+ ~DashCommunicator() = default;

30

32

31public Q_SLOTS:

33public Q_SLOTS:

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

34 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;

33};

43};

34

44

35#endif

45#endif

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

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

1+/*

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+/*

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 @@

1include(FindPkgConfig)

2pkg_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)

4pkg_check_modules(GSETTINGS_QT REQUIRED gsettings-qt)

5

6add_definitions(-DSM_BUSNAME=systemBus)

po/am.po+32−27

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

7msgstr ""

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

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

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

10+"POT-Creation-Date: 2014-10-03 08:13-0400\n"

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

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

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

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

14"MIME-Version: 1.0\n"

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

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

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

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

18+"X-Launchpad-Export-Date: 2014-10-07 06:58+0000\n"

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

20

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

@@ -33,22 +33,22 @@ msgstr "አቋራጭ መለያያ"

33

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

35msgid "Device Locked"

36−msgstr ""

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

37

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

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

40−msgstr ""

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

41

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

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

44−msgstr ""

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

45

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

47#, qt-format

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

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

50−msgstr[0] ""

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

51−msgstr[1] ""

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

52

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

54msgid "Log out"

@@ -155,15 +155,15 @@ msgid ""

155msgstr ""

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

157

158−#: qml/Components/Lockscreen.qml:206

158+#: qml/Components/Lockscreen.qml:218

159msgid "Emergency Call"

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

161

162−#: qml/Components/Lockscreen.qml:226

162+#: qml/Components/Lockscreen.qml:250

163msgid "OK"

164msgstr "እሺ"

165

166−#: qml/Dash/GenericScopeView.qml:411 qml/Dash/GenericScopeView.qml:533

166+#: qml/Dash/GenericScopeView.qml:411 qml/Dash/GenericScopeView.qml:568

167msgid "See less"

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

169

@@ -208,6 +208,14 @@ msgstr "ግምገማ መጨመሪያ"

208msgid "Send"

209msgstr "መላኪያ"

210

211+#: qml/Dash/PullToRefreshScopeStyle.qml:55

212+msgid "Pull to refresh…"

213+msgstr ""

214+

215+#: qml/Dash/PullToRefreshScopeStyle.qml:60

216+msgid "Release to refresh…"

217+msgstr ""

218+

211#: qml/Dash/ScopesOverview.qml:206

219#: qml/Dash/ScopesOverview.qml:206

212msgid "Manage Scopes"

220msgid "Manage Scopes"

213msgstr "የ ክልል አስተዳዳሪ"

221msgstr "የ ክልል አስተዳዳሪ"

@@ -230,7 +238,7 @@ msgstr "ሁሉንም"

230

238

231#: qml/Greeter/Greeter.qml:157

239#: qml/Greeter/Greeter.qml:157

232msgid "Unlock"

240msgid "Unlock"

233−msgstr ""

241+msgstr "መክፈቻ"

234

242

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

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

236msgid "Confirm"

244msgid "Confirm"

@@ -310,47 +318,47 @@ msgstr "ማዘዋወሪያ"

310

318

311#: qml/Shell.qml:340

319#: qml/Shell.qml:340

312msgid "Enter passphrase"

320msgid "Enter passphrase"

313−msgstr ""

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

314

322

315−#: qml/Shell.qml:321

323+#: qml/Shell.qml:341

316msgid "Sorry, incorrect passphrase"

324msgid "Sorry, incorrect passphrase"

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

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

318

326

319#: qml/Shell.qml:342

327#: qml/Shell.qml:342

320msgid "Please re-enter"

328msgid "Please re-enter"

321−msgstr ""

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

322

330

323#: qml/Shell.qml:344

331#: qml/Shell.qml:344

324msgid "Enter passcode"

332msgid "Enter passcode"

325−msgstr ""

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

326

334

327−#: qml/Shell.qml:324

335+#: qml/Shell.qml:345

328msgid "Sorry, incorrect passcode"

336msgid "Sorry, incorrect passcode"

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

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

330

338

331#: qml/Shell.qml:348

339#: qml/Shell.qml:348

332#, qt-format

340#, qt-format

333msgid "Enter %1"

341msgid "Enter %1"

334−msgstr ""

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

335

343

336−#: qml/Shell.qml:328

344+#: qml/Shell.qml:349

337#, qt-format

345#, qt-format

338msgid "Sorry, incorrect %1"

346msgid "Sorry, incorrect %1"

339msgstr "አዝናለሁ: የተሳሳተ%1"

347msgstr "አዝናለሁ: የተሳሳተ%1"

340

348

341−#: qml/Shell.qml:363

349+#: qml/Shell.qml:384

342msgid "Sorry, incorrect passphrase."

350msgid "Sorry, incorrect passphrase."

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

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

344

352

345−#: qml/Shell.qml:364

353+#: qml/Shell.qml:385

346msgid "Sorry, incorrect passcode."

354msgid "Sorry, incorrect passcode."

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

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

348

356

349−#: qml/Shell.qml:365

357+#: qml/Shell.qml:386

350msgid "This will be your last attempt."

358msgid "This will be your last attempt."

351msgstr "ይህ የመጨረሻ ሙከራዎ ነው"

359msgstr "ይህ የመጨረሻ ሙከራዎ ነው"

352

360

353−#: qml/Shell.qml:367

361+#: qml/Shell.qml:388

354msgid ""

362msgid ""

355"If passphrase is entered incorrectly, your phone will conduct a factory "

363"If passphrase is entered incorrectly, your phone will conduct a factory "

356"reset and all personal data will be deleted."

364"reset and all personal data will be deleted."

@@ -358,7 +366,7 @@ msgstr ""

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

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

359"ይጠፋል"

367"ይጠፋል"

360

368

361−#: qml/Shell.qml:368

369+#: qml/Shell.qml:389

362msgid ""

370msgid ""

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

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

364"and all personal data will be deleted."

372"and all personal data will be deleted."

@@ -391,6 +399,3 @@ msgstr ""

391

399

392#~ msgid "Enter your passcode"

400#~ msgid "Enter your passcode"

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

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

394−

395−#~ msgid "Manage Dash"

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

po/ar.po+21−13

@@ -7,7 +7,7 @@ msgid ""

7msgstr ""

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

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

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

10+"POT-Creation-Date: 2014-10-03 08:13-0400\n"

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

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

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

@@ -16,7 +16,7 @@ msgstr ""

16"Content-Transfer-Encoding: 8bit\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"

19+"X-Launchpad-Export-Date: 2014-10-07 06:58+0000\n"

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

21

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

@@ -156,15 +156,15 @@ msgstr ""

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

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

158

159−#: qml/Components/Lockscreen.qml:206

159+#: qml/Components/Lockscreen.qml:218

160msgid "Emergency Call"

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

162

163−#: qml/Components/Lockscreen.qml:226

163+#: qml/Components/Lockscreen.qml:250

164msgid "OK"

165msgstr ""

166

167−#: qml/Dash/GenericScopeView.qml:411 qml/Dash/GenericScopeView.qml:533

167+#: qml/Dash/GenericScopeView.qml:411 qml/Dash/GenericScopeView.qml:568

168msgid "See less"

169msgstr "شاهد أقل"

170

@@ -209,6 +209,14 @@ msgstr "أضف تعليق"

209msgid "Send"

210msgstr "أرسل"

211

212+#: qml/Dash/PullToRefreshScopeStyle.qml:55

213+msgid "Pull to refresh…"

214+msgstr ""

215+

216+#: qml/Dash/PullToRefreshScopeStyle.qml:60

217+msgid "Release to refresh…"

218+msgstr ""

219+

212#: qml/Dash/ScopesOverview.qml:206

220#: qml/Dash/ScopesOverview.qml:206

213msgid "Manage Scopes"

221msgid "Manage Scopes"

214msgstr ""

222msgstr ""

@@ -313,7 +321,7 @@ msgstr ""

313msgid "Enter passphrase"

321msgid "Enter passphrase"

314msgstr ""

322msgstr ""

315

323

316−#: qml/Shell.qml:321

324+#: qml/Shell.qml:341

317msgid "Sorry, incorrect passphrase"

325msgid "Sorry, incorrect passphrase"

318msgstr ""

326msgstr ""

319

327

@@ -325,7 +333,7 @@ msgstr ""

325msgid "Enter passcode"

333msgid "Enter passcode"

326msgstr ""

334msgstr ""

327

335

328−#: qml/Shell.qml:324

336+#: qml/Shell.qml:345

329msgid "Sorry, incorrect passcode"

337msgid "Sorry, incorrect passcode"

330msgstr ""

338msgstr ""

331

339

@@ -334,30 +342,30 @@ msgstr ""

334msgid "Enter %1"

342msgid "Enter %1"

335msgstr ""

343msgstr ""

336

344

337−#: qml/Shell.qml:328

345+#: qml/Shell.qml:349

338#, qt-format

346#, qt-format

339msgid "Sorry, incorrect %1"

347msgid "Sorry, incorrect %1"

340msgstr ""

348msgstr ""

341

349

342−#: qml/Shell.qml:363

350+#: qml/Shell.qml:384

343msgid "Sorry, incorrect passphrase."

351msgid "Sorry, incorrect passphrase."

344msgstr ""

352msgstr ""

345

353

346−#: qml/Shell.qml:364

354+#: qml/Shell.qml:385

347msgid "Sorry, incorrect passcode."

355msgid "Sorry, incorrect passcode."

348msgstr ""

356msgstr ""

349

357

350−#: qml/Shell.qml:365

358+#: qml/Shell.qml:386

351msgid "This will be your last attempt."

359msgid "This will be your last attempt."

352msgstr ""

360msgstr ""

353

361

354−#: qml/Shell.qml:367

362+#: qml/Shell.qml:388

355msgid ""

363msgid ""

356"If passphrase is entered incorrectly, your phone will conduct a factory "

364"If passphrase is entered incorrectly, your phone will conduct a factory "

357"reset and all personal data will be deleted."

365"reset and all personal data will be deleted."

358msgstr ""

366msgstr ""

359

367

360−#: qml/Shell.qml:368

368+#: qml/Shell.qml:389

361msgid ""

369msgid ""

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

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

363"and all personal data will be deleted."

371"and all personal data will be deleted."

po/ast.po+29−24

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

7msgstr ""

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

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

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

10+"POT-Creation-Date: 2014-10-03 08:13-0400\n"

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

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

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

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

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

14"MIME-Version: 1.0\n"

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

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

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

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

18+"X-Launchpad-Export-Date: 2014-10-07 06:58+0000\n"

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

20

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

@@ -33,7 +33,7 @@ msgstr "Desanclar"

33

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

35msgid "Device Locked"

36−msgstr ""

36+msgstr "Preséu bloquiáu"

37

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

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

@@ -47,8 +47,8 @@ msgstr ""

47#, qt-format

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

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

50−msgstr[0] ""

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

51−msgstr[1] ""

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

52

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

54msgid "Log out"

@@ -158,15 +158,15 @@ msgstr ""

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

159"teléfonu Toca la pantalla pa comenzar"

160

161−#: qml/Components/Lockscreen.qml:206

161+#: qml/Components/Lockscreen.qml:218

162msgid "Emergency Call"

163msgstr "Llamada d'emerxencia"

164

165−#: qml/Components/Lockscreen.qml:226

165+#: qml/Components/Lockscreen.qml:250

166msgid "OK"

167msgstr "Aceutar"

168

169−#: qml/Dash/GenericScopeView.qml:411 qml/Dash/GenericScopeView.qml:533

169+#: qml/Dash/GenericScopeView.qml:411 qml/Dash/GenericScopeView.qml:568

170msgid "See less"

171msgstr "Ver menos"

172

@@ -211,6 +211,14 @@ msgstr "Amestar una reseña"

211msgid "Send"

212msgstr "Unviar"

213

214+#: qml/Dash/PullToRefreshScopeStyle.qml:55

215+msgid "Pull to refresh…"

216+msgstr ""

217+

218+#: qml/Dash/PullToRefreshScopeStyle.qml:60

219+msgid "Release to refresh…"

220+msgstr ""

221+

214#: qml/Dash/ScopesOverview.qml:206

222#: qml/Dash/ScopesOverview.qml:206

215msgid "Manage Scopes"

223msgid "Manage Scopes"

216msgstr "Xestionar ámbitos"

224msgstr "Xestionar ámbitos"

@@ -233,7 +241,7 @@ msgstr "Too"

233

241

234#: qml/Greeter/Greeter.qml:157

242#: qml/Greeter/Greeter.qml:157

235msgid "Unlock"

243msgid "Unlock"

236−msgstr ""

244+msgstr "Desbloquiar"

237

245

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

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

239msgid "Confirm"

247msgid "Confirm"

@@ -315,45 +323,45 @@ msgstr "Roaming"

315msgid "Enter passphrase"

323msgid "Enter passphrase"

316msgstr ""

324msgstr ""

317

325

318−#: qml/Shell.qml:321

326+#: qml/Shell.qml:341

319msgid "Sorry, incorrect passphrase"

327msgid "Sorry, incorrect passphrase"

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

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

321

329

322#: qml/Shell.qml:342

330#: qml/Shell.qml:342

323msgid "Please re-enter"

331msgid "Please re-enter"

324−msgstr ""

332+msgstr "Vuelvi a escribila"

325

333

326#: qml/Shell.qml:344

334#: qml/Shell.qml:344

327msgid "Enter passcode"

335msgid "Enter passcode"

328msgstr ""

336msgstr ""

329

337

330−#: qml/Shell.qml:324

338+#: qml/Shell.qml:345

331msgid "Sorry, incorrect passcode"

339msgid "Sorry, incorrect passcode"

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

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

333

341

334#: qml/Shell.qml:348

342#: qml/Shell.qml:348

335#, qt-format

343#, qt-format

336msgid "Enter %1"

344msgid "Enter %1"

337−msgstr ""

345+msgstr "Escribi %1"

338

346

339−#: qml/Shell.qml:328

347+#: qml/Shell.qml:349

340#, qt-format

348#, qt-format

341msgid "Sorry, incorrect %1"

349msgid "Sorry, incorrect %1"

342msgstr "Sentímoslo, %1 incorreutu"

350msgstr "Sentímoslo, %1 incorreutu"

343

351

344−#: qml/Shell.qml:363

352+#: qml/Shell.qml:384

345msgid "Sorry, incorrect passphrase."

353msgid "Sorry, incorrect passphrase."

346msgstr "Fras de pasu incorreuta"

354msgstr "Fras de pasu incorreuta"

347

355

348−#: qml/Shell.qml:364

356+#: qml/Shell.qml:385

349msgid "Sorry, incorrect passcode."

357msgid "Sorry, incorrect passcode."

350msgstr "Códigu de pasu incorreutu"

358msgstr "Códigu de pasu incorreutu"

351

359

352−#: qml/Shell.qml:365

360+#: qml/Shell.qml:386

353msgid "This will be your last attempt."

361msgid "This will be your last attempt."

354msgstr "Esti ye'l caberu intentu."

362msgstr "Esti ye'l caberu intentu."

355

363

356−#: qml/Shell.qml:367

364+#: qml/Shell.qml:388

357msgid ""

365msgid ""

358"If passphrase is entered incorrectly, your phone will conduct a factory "

366"If passphrase is entered incorrectly, your phone will conduct a factory "

359"reset and all personal data will be deleted."

367"reset and all personal data will be deleted."

@@ -361,7 +369,7 @@ msgstr ""

361"Si s'inxerta la fras incorreutamente, el teléfonu va volver a la "

369"Si s'inxerta la fras incorreutamente, el teléfonu va volver a la "

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

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

363

371

364−#: qml/Shell.qml:368

372+#: qml/Shell.qml:389

365msgid ""

373msgid ""

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

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

367"and all personal data will be deleted."

375"and all personal data will be deleted."

@@ -392,8 +400,5 @@ msgstr ""

392#~ msgid "Enter your passcode"

400#~ msgid "Enter your passcode"

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

401#~ msgstr "Introduz códigu de pasu"

394

402

395−#~ msgid "Manage Dash"

396−#~ msgstr "Xestionar tableru"

397−

398#~ msgid "Too many incorrect attempts"

403#~ msgid "Too many incorrect attempts"

399#~ msgstr "Munchos intentos incorreutos"

404#~ msgstr "Munchos intentos incorreutos"

po/az.po+21−13

@@ -7,7 +7,7 @@ msgid ""

7msgstr ""

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

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

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

10+"POT-Creation-Date: 2014-10-03 08:13-0400\n"

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

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

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

@@ -15,7 +15,7 @@ msgstr ""

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

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

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

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

18+"X-Launchpad-Export-Date: 2014-10-07 06:58+0000\n"

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

20

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

@@ -155,15 +155,15 @@ msgstr ""

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

156"bilərsiniz. Başlamaq üçün ekrana toxunun"

157

158−#: qml/Components/Lockscreen.qml:206

158+#: qml/Components/Lockscreen.qml:218

159msgid "Emergency Call"

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

161

162−#: qml/Components/Lockscreen.qml:226

162+#: qml/Components/Lockscreen.qml:250

163msgid "OK"

164msgstr "Oldu"

165

166−#: qml/Dash/GenericScopeView.qml:411 qml/Dash/GenericScopeView.qml:533

166+#: qml/Dash/GenericScopeView.qml:411 qml/Dash/GenericScopeView.qml:568

167msgid "See less"

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

169

@@ -208,6 +208,14 @@ msgstr "Rəy yaz"

208msgid "Send"

209msgstr "Göndər"

210

211+#: qml/Dash/PullToRefreshScopeStyle.qml:55

212+msgid "Pull to refresh…"

213+msgstr ""

214+

215+#: qml/Dash/PullToRefreshScopeStyle.qml:60

216+msgid "Release to refresh…"

217+msgstr ""

218+

211#: qml/Dash/ScopesOverview.qml:206

219#: qml/Dash/ScopesOverview.qml:206

212msgid "Manage Scopes"

220msgid "Manage Scopes"

213msgstr ""

221msgstr ""

@@ -312,7 +320,7 @@ msgstr "Rominq"

312msgid "Enter passphrase"

320msgid "Enter passphrase"

313msgstr ""

321msgstr ""

314

322

315−#: qml/Shell.qml:321

323+#: qml/Shell.qml:341

316msgid "Sorry, incorrect passphrase"

324msgid "Sorry, incorrect passphrase"

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

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

318

326

@@ -324,7 +332,7 @@ msgstr ""

324msgid "Enter passcode"

332msgid "Enter passcode"

325msgstr ""

333msgstr ""

326

334

327−#: qml/Shell.qml:324

335+#: qml/Shell.qml:345

328msgid "Sorry, incorrect passcode"

336msgid "Sorry, incorrect passcode"

329msgstr ""

337msgstr ""

330

338

@@ -333,24 +341,24 @@ msgstr ""

333msgid "Enter %1"

341msgid "Enter %1"

334msgstr ""

342msgstr ""

335

343

336−#: qml/Shell.qml:328

344+#: qml/Shell.qml:349

337#, qt-format

345#, qt-format

338msgid "Sorry, incorrect %1"

346msgid "Sorry, incorrect %1"

339msgstr "Bağışlayın, %1 yanlışdır"

347msgstr "Bağışlayın, %1 yanlışdır"

340

348

341−#: qml/Shell.qml:363

349+#: qml/Shell.qml:384

342msgid "Sorry, incorrect passphrase."

350msgid "Sorry, incorrect passphrase."

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

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

344

352

345−#: qml/Shell.qml:364

353+#: qml/Shell.qml:385

346msgid "Sorry, incorrect passcode."

354msgid "Sorry, incorrect passcode."

347msgstr "Təəssüf ki, açar kod yanlışdır."

355msgstr "Təəssüf ki, açar kod yanlışdır."

348

356

349−#: qml/Shell.qml:365

357+#: qml/Shell.qml:386

350msgid "This will be your last attempt."

358msgid "This will be your last attempt."

351msgstr "Bu sizin son cəhdiniz olacaq."

359msgstr "Bu sizin son cəhdiniz olacaq."

352

360

353−#: qml/Shell.qml:367

361+#: qml/Shell.qml:388

354msgid ""

362msgid ""

355"If passphrase is entered incorrectly, your phone will conduct a factory "

363"If passphrase is entered incorrectly, your phone will conduct a factory "

356"reset and all personal data will be deleted."

364"reset and all personal data will be deleted."

@@ -358,7 +366,7 @@ msgstr ""

358"Əgər açar söz yanlış daxil edilibsə, onda telefonunuz fabrika parametrlərinə "

366"Əgər açar söz yanlış daxil edilibsə, onda telefonunuz fabrika parametrlərinə "

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

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

360

368

361−#: qml/Shell.qml:368

369+#: qml/Shell.qml:389

362msgid ""

370msgid ""

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

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

364"and all personal data will be deleted."

372"and all personal data will be deleted."

po/be.po+21−13

@@ -7,7 +7,7 @@ msgid ""

7msgstr ""

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

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

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

10+"POT-Creation-Date: 2014-10-03 08:13-0400\n"

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

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

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

@@ -16,7 +16,7 @@ msgstr ""

16"Content-Transfer-Encoding: 8bit\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"

19+"X-Launchpad-Export-Date: 2014-10-07 06:58+0000\n"

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

21

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

@@ -153,15 +153,15 @@ msgid ""

153"phone Tap on the screen to start"

154msgstr ""

155

156−#: qml/Components/Lockscreen.qml:206

156+#: qml/Components/Lockscreen.qml:218

157msgid "Emergency Call"

158msgstr ""

159

160−#: qml/Components/Lockscreen.qml:226

160+#: qml/Components/Lockscreen.qml:250

161msgid "OK"

162msgstr ""

163

164−#: qml/Dash/GenericScopeView.qml:411 qml/Dash/GenericScopeView.qml:533

164+#: qml/Dash/GenericScopeView.qml:411 qml/Dash/GenericScopeView.qml:568

165msgid "See less"

166msgstr ""

167

@@ -206,6 +206,14 @@ msgstr ""

206msgid "Send"

207msgstr ""

208

209+#: qml/Dash/PullToRefreshScopeStyle.qml:55

210+msgid "Pull to refresh…"

211+msgstr ""

212+

213+#: qml/Dash/PullToRefreshScopeStyle.qml:60

214+msgid "Release to refresh…"

215+msgstr ""

216+

209#: qml/Dash/ScopesOverview.qml:206

217#: qml/Dash/ScopesOverview.qml:206

210msgid "Manage Scopes"

218msgid "Manage Scopes"

211msgstr ""

219msgstr ""

@@ -310,7 +318,7 @@ msgstr ""

310msgid "Enter passphrase"

318msgid "Enter passphrase"

311msgstr ""

319msgstr ""

312

320

313−#: qml/Shell.qml:321

321+#: qml/Shell.qml:341

314msgid "Sorry, incorrect passphrase"

322msgid "Sorry, incorrect passphrase"

315msgstr ""

323msgstr ""

316

324

@@ -322,7 +330,7 @@ msgstr ""

322msgid "Enter passcode"

330msgid "Enter passcode"

323msgstr ""

331msgstr ""

324

332

325−#: qml/Shell.qml:324

333+#: qml/Shell.qml:345

326msgid "Sorry, incorrect passcode"

334msgid "Sorry, incorrect passcode"

327msgstr ""

335msgstr ""

328

336

@@ -331,30 +339,30 @@ msgstr ""

331msgid "Enter %1"

339msgid "Enter %1"

332msgstr ""

340msgstr ""

333

341

334−#: qml/Shell.qml:328

342+#: qml/Shell.qml:349

335#, qt-format

343#, qt-format

336msgid "Sorry, incorrect %1"

344msgid "Sorry, incorrect %1"

337msgstr ""

345msgstr ""

338

346

339−#: qml/Shell.qml:363

347+#: qml/Shell.qml:384

340msgid "Sorry, incorrect passphrase."

348msgid "Sorry, incorrect passphrase."

341msgstr ""

349msgstr ""

342

350

343−#: qml/Shell.qml:364

351+#: qml/Shell.qml:385

344msgid "Sorry, incorrect passcode."

352msgid "Sorry, incorrect passcode."

345msgstr ""

353msgstr ""

346

354

347−#: qml/Shell.qml:365

355+#: qml/Shell.qml:386

348msgid "This will be your last attempt."

356msgid "This will be your last attempt."

349msgstr ""

357msgstr ""

350

358

351−#: qml/Shell.qml:367

359+#: qml/Shell.qml:388

352msgid ""

360msgid ""

353"If passphrase is entered incorrectly, your phone will conduct a factory "

361"If passphrase is entered incorrectly, your phone will conduct a factory "

354"reset and all personal data will be deleted."

362"reset and all personal data will be deleted."

355msgstr ""

363msgstr ""

356

364

357−#: qml/Shell.qml:368

365+#: qml/Shell.qml:389

358msgid ""

366msgid ""

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

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

360"and all personal data will be deleted."

368"and all personal data will be deleted."

po/bg.po+21−13

@@ -7,7 +7,7 @@ msgid ""

7msgstr ""

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

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

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

10+"POT-Creation-Date: 2014-10-03 08:13-0400\n"

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

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

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

@@ -15,7 +15,7 @@ msgstr ""

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

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

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

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

18+"X-Launchpad-Export-Date: 2014-10-07 06:58+0000\n"

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

20

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

@@ -159,15 +159,15 @@ msgid ""

159"phone Tap on the screen to start"

160msgstr ""

161

162−#: qml/Components/Lockscreen.qml:206

162+#: qml/Components/Lockscreen.qml:218

163msgid "Emergency Call"

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

165

166−#: qml/Components/Lockscreen.qml:226

166+#: qml/Components/Lockscreen.qml:250

167msgid "OK"

168msgstr ""

169

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

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

171msgid "See less"

172msgstr ""

173

@@ -212,6 +212,14 @@ msgstr "Добави отзив"

212msgid "Send"

213msgstr "Изпрати"

214

215+#: qml/Dash/PullToRefreshScopeStyle.qml:55

216+msgid "Pull to refresh…"

217+msgstr ""

218+

219+#: qml/Dash/PullToRefreshScopeStyle.qml:60

220+msgid "Release to refresh…"

221+msgstr ""

222+

215#: qml/Dash/ScopesOverview.qml:206

223#: qml/Dash/ScopesOverview.qml:206

216msgid "Manage Scopes"

224msgid "Manage Scopes"

217msgstr ""

225msgstr ""

@@ -316,7 +324,7 @@ msgstr ""

316msgid "Enter passphrase"

324msgid "Enter passphrase"

317msgstr ""

325msgstr ""

318

326

319−#: qml/Shell.qml:321

327+#: qml/Shell.qml:341

320msgid "Sorry, incorrect passphrase"

328msgid "Sorry, incorrect passphrase"

321msgstr ""

329msgstr ""

322

330

@@ -328,7 +336,7 @@ msgstr ""

328msgid "Enter passcode"

336msgid "Enter passcode"

329msgstr ""

337msgstr ""

330

338

331−#: qml/Shell.qml:324

339+#: qml/Shell.qml:345

332msgid "Sorry, incorrect passcode"

340msgid "Sorry, incorrect passcode"

333msgstr ""

341msgstr ""

334

342

@@ -337,30 +345,30 @@ msgstr ""

337msgid "Enter %1"

345msgid "Enter %1"

338msgstr ""

346msgstr ""

339

347

340−#: qml/Shell.qml:328

348+#: qml/Shell.qml:349

341#, qt-format

349#, qt-format

342msgid "Sorry, incorrect %1"

350msgid "Sorry, incorrect %1"

343msgstr ""

351msgstr ""

344

352

345−#: qml/Shell.qml:363

353+#: qml/Shell.qml:384

346msgid "Sorry, incorrect passphrase."

354msgid "Sorry, incorrect passphrase."

347msgstr ""

355msgstr ""

348

356

349−#: qml/Shell.qml:364

357+#: qml/Shell.qml:385

350msgid "Sorry, incorrect passcode."

358msgid "Sorry, incorrect passcode."

351msgstr ""

359msgstr ""

352

360

353−#: qml/Shell.qml:365

361+#: qml/Shell.qml:386

354msgid "This will be your last attempt."

362msgid "This will be your last attempt."

355msgstr ""

363msgstr ""

356

364

357−#: qml/Shell.qml:367

365+#: qml/Shell.qml:388

358msgid ""

366msgid ""

359"If passphrase is entered incorrectly, your phone will conduct a factory "

367"If passphrase is entered incorrectly, your phone will conduct a factory "

360"reset and all personal data will be deleted."

368"reset and all personal data will be deleted."

361msgstr ""

369msgstr ""

362

370

363−#: qml/Shell.qml:368

371+#: qml/Shell.qml:389

364msgid ""

372msgid ""

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

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

366"and all personal data will be deleted."

374"and all personal data will be deleted."

po/br.po+34−25

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

7msgstr ""

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

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

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

10+"POT-Creation-Date: 2014-10-03 08:13-0400\n"

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

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

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

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

14"MIME-Version: 1.0\n"

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

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

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

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

18+"X-Launchpad-Export-Date: 2014-10-07 06:58+0000\n"

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

20

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

@@ -33,22 +33,26 @@ msgstr "Dispilhennañ ar verradenn"

33

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

35msgid "Device Locked"

36−msgstr ""

36+msgstr "Benveg prennet"

37

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

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

40msgstr ""

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

42+"ho frazenn-dremen."

41

43

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

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

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

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

44msgstr ""

46msgstr ""

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

48+"tremen."

45

49

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

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

47#, qt-format

51#, qt-format

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

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

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

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

50−msgstr[0] ""

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

51−msgstr[1] ""

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

52

56

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

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

54msgid "Log out"

58msgid "Log out"

@@ -161,15 +165,15 @@ msgstr ""

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

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

162"pellgomzer Touchit d'ar skramm evit kregiñ ganti"

166"pellgomzer Touchit d'ar skramm evit kregiñ ganti"

163

167

164−#: qml/Components/Lockscreen.qml:206

168+#: qml/Components/Lockscreen.qml:218

165msgid "Emergency Call"

169msgid "Emergency Call"

166msgstr "Pellgomzadenn vallus"

170msgstr "Pellgomzadenn vallus"

167

171

168−#: qml/Components/Lockscreen.qml:226

172+#: qml/Components/Lockscreen.qml:250

169msgid "OK"

173msgid "OK"

170msgstr "Mat eo"

174msgstr "Mat eo"

171

175

172−#: qml/Dash/GenericScopeView.qml:411 qml/Dash/GenericScopeView.qml:533

176+#: qml/Dash/GenericScopeView.qml:411 qml/Dash/GenericScopeView.qml:568

173msgid "See less"

177msgid "See less"

174msgstr "Gwelet nebeutoc'h"

178msgstr "Gwelet nebeutoc'h"

175

179

@@ -214,6 +218,14 @@ msgstr "Ouzhpennañ un ali"

214msgid "Send"

218msgid "Send"

215msgstr "Kas"

219msgstr "Kas"

216

220

221+#: qml/Dash/PullToRefreshScopeStyle.qml:55

222+msgid "Pull to refresh…"

223+msgstr ""

224+

225+#: qml/Dash/PullToRefreshScopeStyle.qml:60

226+msgid "Release to refresh…"

227+msgstr ""

228+

217#: qml/Dash/ScopesOverview.qml:206

229#: qml/Dash/ScopesOverview.qml:206

218msgid "Manage Scopes"

230msgid "Manage Scopes"

219msgstr "Merañ ar c'hefluskerioù enklask"

231msgstr "Merañ ar c'hefluskerioù enklask"

@@ -236,7 +248,7 @@ msgstr "An holl anezho"

236

248

237#: qml/Greeter/Greeter.qml:157

249#: qml/Greeter/Greeter.qml:157

238msgid "Unlock"

250msgid "Unlock"

239−msgstr ""

251+msgstr "Dibrennañ"

240

252

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

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

242msgid "Confirm"

254msgid "Confirm"

@@ -316,47 +328,47 @@ msgstr "O kantren"

316

328

317#: qml/Shell.qml:340

329#: qml/Shell.qml:340

318msgid "Enter passphrase"

330msgid "Enter passphrase"

319−msgstr ""

331+msgstr "Merkañ ar frazenn-dremen"

320

332

321−#: qml/Shell.qml:321

333+#: qml/Shell.qml:341

322msgid "Sorry, incorrect passphrase"

334msgid "Sorry, incorrect passphrase"

323msgstr "Siwazh, frazenn-dremen direizh"

335msgstr "Siwazh, frazenn-dremen direizh"

324

336

325#: qml/Shell.qml:342

337#: qml/Shell.qml:342

326msgid "Please re-enter"

338msgid "Please re-enter"

327−msgstr ""

339+msgstr "Adverkañ, mar plij"

328

340

329#: qml/Shell.qml:344

341#: qml/Shell.qml:344

330msgid "Enter passcode"

342msgid "Enter passcode"

331−msgstr ""

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

332

344

333−#: qml/Shell.qml:324

345+#: qml/Shell.qml:345

334msgid "Sorry, incorrect passcode"

346msgid "Sorry, incorrect passcode"

335msgstr "Digarezit, kod-tremen direizh"

347msgstr "Digarezit, kod-tremen direizh"

336

348

337#: qml/Shell.qml:348

349#: qml/Shell.qml:348

338#, qt-format

350#, qt-format

339msgid "Enter %1"

351msgid "Enter %1"

340−msgstr ""

352+msgstr "Merkañ %1"

341

353

342−#: qml/Shell.qml:328

354+#: qml/Shell.qml:349

343#, qt-format

355#, qt-format

344msgid "Sorry, incorrect %1"

356msgid "Sorry, incorrect %1"

345msgstr "Siwazh, %1 direizh"

357msgstr "Siwazh, %1 direizh"

346

358

347−#: qml/Shell.qml:363

359+#: qml/Shell.qml:384

348msgid "Sorry, incorrect passphrase."

360msgid "Sorry, incorrect passphrase."

349msgstr "Siwazh, frazenn-dremen direizh"

361msgstr "Siwazh, frazenn-dremen direizh"

350

362

351−#: qml/Shell.qml:364

363+#: qml/Shell.qml:385

352msgid "Sorry, incorrect passcode."

364msgid "Sorry, incorrect passcode."

353msgstr "Siwazh, kod-tremen direizh"

365msgstr "Siwazh, kod-tremen direizh"

354

366

355−#: qml/Shell.qml:365

367+#: qml/Shell.qml:386

356msgid "This will be your last attempt."

368msgid "This will be your last attempt."

357msgstr "Ho taol-esae diwezhañ e vo."

369msgstr "Ho taol-esae diwezhañ e vo."

358

370

359−#: qml/Shell.qml:367

371+#: qml/Shell.qml:388

360msgid ""

372msgid ""

361"If passphrase is entered incorrectly, your phone will conduct a factory "

373"If passphrase is entered incorrectly, your phone will conduct a factory "

362"reset and all personal data will be deleted."

374"reset and all personal data will be deleted."

@@ -364,7 +376,7 @@ msgstr ""

364"Ma vez ebarzhet ur frazenn-dremen direizh, e vo adderaouekaet ho pellgomzer "

376"Ma vez ebarzhet ur frazenn-dremen direizh, e vo adderaouekaet ho pellgomzer "

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

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

366

378

367−#: qml/Shell.qml:368

379+#: qml/Shell.qml:389

368msgid ""

380msgid ""

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

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

370"and all personal data will be deleted."

382"and all personal data will be deleted."

@@ -388,9 +400,6 @@ msgstr ""

388#~ msgid "Too many incorrect attempts"

400#~ msgid "Too many incorrect attempts"

389#~ msgstr "Re a daolioù-esae direizh"

401#~ msgstr "Re a daolioù-esae direizh"

390

402

391−#~ msgid "Manage Dash"

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

393−

394#~ msgid "Enter your passphrase"

403#~ msgid "Enter your passphrase"

395#~ msgstr "Ebarzhit ho frazenn-dremen"

404#~ msgstr "Ebarzhit ho frazenn-dremen"

396

405

po/bs.po+21−13

@@ -7,7 +7,7 @@ msgid ""

7msgstr ""

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

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

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

10+"POT-Creation-Date: 2014-10-03 08:13-0400\n"

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

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

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

@@ -16,7 +16,7 @@ msgstr ""

16"Content-Transfer-Encoding: 8bit\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"

19+"X-Launchpad-Export-Date: 2014-10-07 06:58+0000\n"

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

21

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

@@ -153,15 +153,15 @@ msgid ""

153"phone Tap on the screen to start"

154msgstr ""

155

156−#: qml/Components/Lockscreen.qml:206

156+#: qml/Components/Lockscreen.qml:218

157msgid "Emergency Call"

158msgstr ""

159

160−#: qml/Components/Lockscreen.qml:226

160+#: qml/Components/Lockscreen.qml:250

161msgid "OK"

162msgstr ""

163

164−#: qml/Dash/GenericScopeView.qml:411 qml/Dash/GenericScopeView.qml:533

164+#: qml/Dash/GenericScopeView.qml:411 qml/Dash/GenericScopeView.qml:568

165msgid "See less"

166msgstr ""

167

@@ -206,6 +206,14 @@ msgstr ""

206msgid "Send"

207msgstr ""

208

209+#: qml/Dash/PullToRefreshScopeStyle.qml:55

210+msgid "Pull to refresh…"

211+msgstr ""

212+

213+#: qml/Dash/PullToRefreshScopeStyle.qml:60

214+msgid "Release to refresh…"

215+msgstr ""

216+

209#: qml/Dash/ScopesOverview.qml:206

217#: qml/Dash/ScopesOverview.qml:206

210msgid "Manage Scopes"

218msgid "Manage Scopes"

211msgstr ""

219msgstr ""

@@ -310,7 +318,7 @@ msgstr ""

310msgid "Enter passphrase"

318msgid "Enter passphrase"

311msgstr ""

319msgstr ""

312

320

313−#: qml/Shell.qml:321

321+#: qml/Shell.qml:341

314msgid "Sorry, incorrect passphrase"

322msgid "Sorry, incorrect passphrase"

315msgstr ""

323msgstr ""

316

324

@@ -322,7 +330,7 @@ msgstr ""

322msgid "Enter passcode"

330msgid "Enter passcode"

323msgstr ""

331msgstr ""

324

332

325−#: qml/Shell.qml:324

333+#: qml/Shell.qml:345

326msgid "Sorry, incorrect passcode"

334msgid "Sorry, incorrect passcode"

327msgstr ""

335msgstr ""

328

336

@@ -331,30 +339,30 @@ msgstr ""

331msgid "Enter %1"

339msgid "Enter %1"

332msgstr ""

340msgstr ""

333

341

334−#: qml/Shell.qml:328

342+#: qml/Shell.qml:349

335#, qt-format

343#, qt-format

336msgid "Sorry, incorrect %1"

344msgid "Sorry, incorrect %1"

337msgstr ""

345msgstr ""

338

346

339−#: qml/Shell.qml:363

347+#: qml/Shell.qml:384

340msgid "Sorry, incorrect passphrase."

348msgid "Sorry, incorrect passphrase."

341msgstr ""

349msgstr ""

342

350

343−#: qml/Shell.qml:364

351+#: qml/Shell.qml:385

344msgid "Sorry, incorrect passcode."

352msgid "Sorry, incorrect passcode."

345msgstr ""

353msgstr ""

346

354

347−#: qml/Shell.qml:365

355+#: qml/Shell.qml:386

348msgid "This will be your last attempt."

356msgid "This will be your last attempt."

349msgstr ""

357msgstr ""

350

358

351−#: qml/Shell.qml:367

359+#: qml/Shell.qml:388

352msgid ""

360msgid ""

353"If passphrase is entered incorrectly, your phone will conduct a factory "

361"If passphrase is entered incorrectly, your phone will conduct a factory "

354"reset and all personal data will be deleted."

362"reset and all personal data will be deleted."

355msgstr ""

363msgstr ""

356

364

357−#: qml/Shell.qml:368

365+#: qml/Shell.qml:389

358msgid ""

366msgid ""

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

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

360"and all personal data will be deleted."

368"and all personal data will be deleted."

po/ca.po+40−30

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

7msgstr ""

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

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

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

10+"POT-Creation-Date: 2014-10-03 08:13-0400\n"

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

11+"PO-Revision-Date: 2014-10-06 12:16+0000\n"

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

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

14"MIME-Version: 1.0\n"

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

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

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

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

18+"X-Launchpad-Export-Date: 2014-10-07 06:58+0000\n"

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

20

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

@@ -33,22 +33,26 @@ msgstr "Desenganxa la drecera"

33

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

35msgid "Device Locked"

36−msgstr ""

36+msgstr "Dispositiu bloquejat"

37

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

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

40msgstr ""

41+"Se us ha bloquejat l'accés al dispositiu. Heu sobrepassat el nombre "

42+"d'intents d'introducció de la contrasenya."

41

43

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

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

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

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

44msgstr ""

46msgstr ""

47+"Se us ha bloquejat l'accés al dispositiu. Heu sobrepassat el nombre "

48+"d'intents d'introducció del codi d'accés."

45

49

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

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

47#, qt-format

51#, qt-format

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

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

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

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

50−msgstr[0] ""

54+msgstr[0] "Espereu %1 minut i torneu-ho a intentar..."

51−msgstr[1] ""

55+msgstr[1] "Espereu %1 minuts i torneu-ho a intentar..."

52

56

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

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

54msgid "Log out"

58msgid "Log out"

@@ -162,15 +166,15 @@ msgstr ""

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

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

163"telèfon Feu un toc a la pantalla per començar"

167"telèfon Feu un toc a la pantalla per començar"

164

168

165−#: qml/Components/Lockscreen.qml:206

169+#: qml/Components/Lockscreen.qml:218

166msgid "Emergency Call"

170msgid "Emergency Call"

167msgstr "Trucada d'emergència"

171msgstr "Trucada d'emergència"

168

172

169−#: qml/Components/Lockscreen.qml:226

173+#: qml/Components/Lockscreen.qml:250

170msgid "OK"

174msgid "OK"

171msgstr "D'acord"

175msgstr "D'acord"

172

176

173−#: qml/Dash/GenericScopeView.qml:411 qml/Dash/GenericScopeView.qml:533

177+#: qml/Dash/GenericScopeView.qml:411 qml/Dash/GenericScopeView.qml:568

174msgid "See less"

178msgid "See less"

175msgstr "Mostra'n menys"

179msgstr "Mostra'n menys"

176

180

@@ -215,9 +219,17 @@ msgstr "Afegiu una ressenya"

215msgid "Send"

219msgid "Send"

216msgstr "Envia"

220msgstr "Envia"

217

221

222+#: qml/Dash/PullToRefreshScopeStyle.qml:55

223+msgid "Pull to refresh…"

224+msgstr ""

225+

226+#: qml/Dash/PullToRefreshScopeStyle.qml:60

227+msgid "Release to refresh…"

228+msgstr ""

229+

218#: qml/Dash/ScopesOverview.qml:206

230#: qml/Dash/ScopesOverview.qml:206

219msgid "Manage Scopes"

231msgid "Manage Scopes"

220−msgstr ""

232+msgstr "Gestioneu les lents"

221

233

222#: qml/Dash/ScopesOverview.qml:428

234#: qml/Dash/ScopesOverview.qml:428

223msgid "Done"

235msgid "Done"

@@ -237,7 +249,7 @@ msgstr "Totes"

237

249

238#: qml/Greeter/Greeter.qml:157

250#: qml/Greeter/Greeter.qml:157

239msgid "Unlock"

251msgid "Unlock"

240−msgstr ""

252+msgstr "Desbloca"

241

253

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

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

243msgid "Confirm"

255msgid "Confirm"

@@ -281,7 +293,7 @@ msgstr "Conferència"

281

293

282#: qml/Panel/Indicators/MenuItemFactory.qml:600

294#: qml/Panel/Indicators/MenuItemFactory.qml:600

283msgid "Nothing is playing"

295msgid "Nothing is playing"

284−msgstr ""

296+msgstr "No s'està reproduint res"

285

297

286#: qml/Panel/Indicators/MenuItemFactory.qml:748

298#: qml/Panel/Indicators/MenuItemFactory.qml:748

287msgid "In queue…"

299msgid "In queue…"

@@ -317,47 +329,47 @@ msgstr "Itinerància"

317

329

318#: qml/Shell.qml:340

330#: qml/Shell.qml:340

319msgid "Enter passphrase"

331msgid "Enter passphrase"

320−msgstr ""

332+msgstr "Introduïu la contrasenya"

321

333

322−#: qml/Shell.qml:321

334+#: qml/Shell.qml:341

323msgid "Sorry, incorrect passphrase"

335msgid "Sorry, incorrect passphrase"

324msgstr "La contrasenya no és correcta"

336msgstr "La contrasenya no és correcta"

325

337

326#: qml/Shell.qml:342

338#: qml/Shell.qml:342

327msgid "Please re-enter"

339msgid "Please re-enter"

328−msgstr ""

340+msgstr "Torneu-ho a introduir"

329

341

330#: qml/Shell.qml:344

342#: qml/Shell.qml:344

331msgid "Enter passcode"

343msgid "Enter passcode"

332−msgstr ""

344+msgstr "Introduïu el codi d'accés"

333

345

334−#: qml/Shell.qml:324

346+#: qml/Shell.qml:345

335msgid "Sorry, incorrect passcode"

347msgid "Sorry, incorrect passcode"

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

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

337

349

338#: qml/Shell.qml:348

350#: qml/Shell.qml:348

339#, qt-format

351#, qt-format

340msgid "Enter %1"

352msgid "Enter %1"

341−msgstr ""

353+msgstr "Introduïu: %1"

342

354

343−#: qml/Shell.qml:328

355+#: qml/Shell.qml:349

344#, qt-format

356#, qt-format

345msgid "Sorry, incorrect %1"

357msgid "Sorry, incorrect %1"

346msgstr "Incorrecte (%1)"

358msgstr "Incorrecte (%1)"

347

359

348−#: qml/Shell.qml:363

360+#: qml/Shell.qml:384

349msgid "Sorry, incorrect passphrase."

361msgid "Sorry, incorrect passphrase."

350msgstr "La contrasenya és incorrecta"

362msgstr "La contrasenya és incorrecta"

351

363

352−#: qml/Shell.qml:364

364+#: qml/Shell.qml:385

353msgid "Sorry, incorrect passcode."

365msgid "Sorry, incorrect passcode."

354−msgstr "La clau és incorrecta"

366+msgstr "El codi d'accés no és correcte"

355

367

356−#: qml/Shell.qml:365

368+#: qml/Shell.qml:386

357msgid "This will be your last attempt."

369msgid "This will be your last attempt."

358msgstr "Aquest serà el darrer intent."

370msgstr "Aquest serà el darrer intent."

359

371

360−#: qml/Shell.qml:367

372+#: qml/Shell.qml:388

361msgid ""

373msgid ""

362"If passphrase is entered incorrectly, your phone will conduct a factory "

374"If passphrase is entered incorrectly, your phone will conduct a factory "

363"reset and all personal data will be deleted."

375"reset and all personal data will be deleted."

@@ -366,13 +378,14 @@ msgstr ""

366"reinicialitzarà a l'estat de fàbrica i se suprimiran totes les dades "

378"reinicialitzarà a l'estat de fàbrica i se suprimiran totes les dades "

367"personals."

379"personals."

368

380

369−#: qml/Shell.qml:368

381+#: qml/Shell.qml:389

370msgid ""

382msgid ""

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

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

372"and all personal data will be deleted."

384"and all personal data will be deleted."

373msgstr ""

385msgstr ""

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

386+"Si el codi d'accés s'introdueix de manera incorrecta, el telèfon es "

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

387+"reinicialitzarà a l'estat de fàbrica i se suprimiran totes les dades "

388+"personals."

376

389

377#~ msgid "Hello"

390#~ msgid "Hello"

378#~ msgstr "Hola"

391#~ msgstr "Hola"

@@ -384,9 +397,6 @@ msgstr ""

384#~ msgid "Swipe to unlock"

397#~ msgid "Swipe to unlock"

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

398#~ msgstr "Feu lliscar el dit per desbloquejar"

386

399

387−#~ msgid "Manage Dash"

388−#~ msgstr "Gestiona el tauler"

389−

390#~ msgid "Please wait"

400#~ msgid "Please wait"

391#~ msgstr "Espereu"

401#~ msgstr "Espereu"

392

402

po/ckb.po+21−13

@@ -7,7 +7,7 @@ msgid ""

7msgstr ""

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

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

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

10+"POT-Creation-Date: 2014-10-03 08:13-0400\n"

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

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

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

@@ -15,7 +15,7 @@ msgstr ""

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

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

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

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

18+"X-Launchpad-Export-Date: 2014-10-07 06:59+0000\n"

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

20

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

@@ -152,15 +152,15 @@ msgid ""

152"phone Tap on the screen to start"

153msgstr ""

154

155−#: qml/Components/Lockscreen.qml:206

155+#: qml/Components/Lockscreen.qml:218

156msgid "Emergency Call"

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

158

159−#: qml/Components/Lockscreen.qml:226

159+#: qml/Components/Lockscreen.qml:250

160msgid "OK"

161msgstr ""

162

163−#: qml/Dash/GenericScopeView.qml:411 qml/Dash/GenericScopeView.qml:533

163+#: qml/Dash/GenericScopeView.qml:411 qml/Dash/GenericScopeView.qml:568

164msgid "See less"

165msgstr ""

166

@@ -205,6 +205,14 @@ msgstr "پێداچوونەوە زۆر بکە"

205msgid "Send"

206msgstr "ناردن"

207

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+

208#: qml/Dash/ScopesOverview.qml:206

216#: qml/Dash/ScopesOverview.qml:206

209msgid "Manage Scopes"

217msgid "Manage Scopes"

210msgstr ""

218msgstr ""

@@ -309,7 +317,7 @@ msgstr ""

309msgid "Enter passphrase"

317msgid "Enter passphrase"

310msgstr ""

318msgstr ""

311

319

312−#: qml/Shell.qml:321

320+#: qml/Shell.qml:341

313msgid "Sorry, incorrect passphrase"

321msgid "Sorry, incorrect passphrase"

314msgstr ""

322msgstr ""

315

323

@@ -321,7 +329,7 @@ msgstr ""

321msgid "Enter passcode"

329msgid "Enter passcode"

322msgstr ""

330msgstr ""

323

331

324−#: qml/Shell.qml:324

332+#: qml/Shell.qml:345

325msgid "Sorry, incorrect passcode"

333msgid "Sorry, incorrect passcode"

326msgstr ""

334msgstr ""

327

335

@@ -330,30 +338,30 @@ msgstr ""

330msgid "Enter %1"

338msgid "Enter %1"

331msgstr ""

339msgstr ""

332

340

333−#: qml/Shell.qml:328

341+#: qml/Shell.qml:349

334#, qt-format

342#, qt-format

335msgid "Sorry, incorrect %1"

343msgid "Sorry, incorrect %1"

336msgstr ""

344msgstr ""

337

345

338−#: qml/Shell.qml:363

346+#: qml/Shell.qml:384

339msgid "Sorry, incorrect passphrase."

347msgid "Sorry, incorrect passphrase."

340msgstr ""

348msgstr ""

341

349

342−#: qml/Shell.qml:364

350+#: qml/Shell.qml:385

343msgid "Sorry, incorrect passcode."

351msgid "Sorry, incorrect passcode."

344msgstr ""

352msgstr ""

345

353

346−#: qml/Shell.qml:365

354+#: qml/Shell.qml:386

347msgid "This will be your last attempt."

355msgid "This will be your last attempt."

348msgstr ""

356msgstr ""

349

357

350−#: qml/Shell.qml:367

358+#: qml/Shell.qml:388

351msgid ""

359msgid ""

352"If passphrase is entered incorrectly, your phone will conduct a factory "

360"If passphrase is entered incorrectly, your phone will conduct a factory "

353"reset and all personal data will be deleted."

361"reset and all personal data will be deleted."

354msgstr ""

362msgstr ""

355

363

356−#: qml/Shell.qml:368

364+#: qml/Shell.qml:389

357msgid ""

365msgid ""

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

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

359"and all personal data will be deleted."

367"and all personal data will be deleted."

po/cs.po+21−13

@@ -7,7 +7,7 @@ msgid ""

7msgstr ""

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

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

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

10+"POT-Creation-Date: 2014-10-03 08:13-0400\n"

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

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

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

@@ -15,7 +15,7 @@ msgstr ""

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

16"Content-Transfer-Encoding: 8bit\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"

18+"X-Launchpad-Export-Date: 2014-10-07 06:58+0000\n"

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

20

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

@@ -152,15 +152,15 @@ msgid ""

152"phone Tap on the screen to start"

153msgstr ""

154

155−#: qml/Components/Lockscreen.qml:206

155+#: qml/Components/Lockscreen.qml:218

156msgid "Emergency Call"

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

158

159−#: qml/Components/Lockscreen.qml:226

159+#: qml/Components/Lockscreen.qml:250

160msgid "OK"

161msgstr ""

162

163−#: qml/Dash/GenericScopeView.qml:411 qml/Dash/GenericScopeView.qml:533

163+#: qml/Dash/GenericScopeView.qml:411 qml/Dash/GenericScopeView.qml:568

164msgid "See less"

165msgstr ""

166

@@ -205,6 +205,14 @@ msgstr "Přidat recenzi"

205msgid "Send"

206msgstr "Odeslat"

207

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+

208#: qml/Dash/ScopesOverview.qml:206

216#: qml/Dash/ScopesOverview.qml:206

209msgid "Manage Scopes"

217msgid "Manage Scopes"

210msgstr ""

218msgstr ""

@@ -309,7 +317,7 @@ msgstr ""

309msgid "Enter passphrase"

317msgid "Enter passphrase"

310msgstr ""

318msgstr ""

311

319

312−#: qml/Shell.qml:321

320+#: qml/Shell.qml:341

313msgid "Sorry, incorrect passphrase"

321msgid "Sorry, incorrect passphrase"

314msgstr ""

322msgstr ""

315

323

@@ -321,7 +329,7 @@ msgstr ""

321msgid "Enter passcode"

329msgid "Enter passcode"

322msgstr ""

330msgstr ""

323

331

324−#: qml/Shell.qml:324

332+#: qml/Shell.qml:345

325msgid "Sorry, incorrect passcode"

333msgid "Sorry, incorrect passcode"

326msgstr ""

334msgstr ""

327

335

@@ -330,30 +338,30 @@ msgstr ""

330msgid "Enter %1"

338msgid "Enter %1"

331msgstr ""

339msgstr ""

332

340

333−#: qml/Shell.qml:328

341+#: qml/Shell.qml:349

334#, qt-format

342#, qt-format

335msgid "Sorry, incorrect %1"

343msgid "Sorry, incorrect %1"

336msgstr ""

344msgstr ""

337

345

338−#: qml/Shell.qml:363

346+#: qml/Shell.qml:384

339msgid "Sorry, incorrect passphrase."

347msgid "Sorry, incorrect passphrase."

340msgstr ""

348msgstr ""

341

349

342−#: qml/Shell.qml:364

350+#: qml/Shell.qml:385

343msgid "Sorry, incorrect passcode."

351msgid "Sorry, incorrect passcode."

344msgstr ""

352msgstr ""

345

353

346−#: qml/Shell.qml:365

354+#: qml/Shell.qml:386

347msgid "This will be your last attempt."

355msgid "This will be your last attempt."

348msgstr ""

356msgstr ""

349

357

350−#: qml/Shell.qml:367

358+#: qml/Shell.qml:388

351msgid ""

359msgid ""

352"If passphrase is entered incorrectly, your phone will conduct a factory "

360"If passphrase is entered incorrectly, your phone will conduct a factory "

353"reset and all personal data will be deleted."

361"reset and all personal data will be deleted."

354msgstr ""

362msgstr ""

355

363

356−#: qml/Shell.qml:368

364+#: qml/Shell.qml:389

357msgid ""

365msgid ""

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

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

359"and all personal data will be deleted."

367"and all personal data will be deleted."

po/da.po+21−13

@@ -8,7 +8,7 @@ msgid ""

8msgstr ""

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

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

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

11+"POT-Creation-Date: 2014-10-03 08:13-0400\n"

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

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

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

@@ -16,7 +16,7 @@ msgstr ""

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

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

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

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

19+"X-Launchpad-Export-Date: 2014-10-07 06:58+0000\n"

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

21

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

@@ -155,15 +155,15 @@ msgstr ""

155"Du mestrer nu kantbevægelserne og kan begynde at bruge telefonen Tryk "

156"på skærmen for at starte"

157

158−#: qml/Components/Lockscreen.qml:206

158+#: qml/Components/Lockscreen.qml:218

159msgid "Emergency Call"

160msgstr "Nødopkald"

161

162−#: qml/Components/Lockscreen.qml:226

162+#: qml/Components/Lockscreen.qml:250

163msgid "OK"

164msgstr "O.k."

165

166−#: qml/Dash/GenericScopeView.qml:411 qml/Dash/GenericScopeView.qml:533

166+#: qml/Dash/GenericScopeView.qml:411 qml/Dash/GenericScopeView.qml:568

167msgid "See less"

168msgstr "Vis mindre"

169

@@ -208,6 +208,14 @@ msgstr "Tilføj en forhåndsvisning"

208msgid "Send"

209msgstr "Send"

210

211+#: qml/Dash/PullToRefreshScopeStyle.qml:55

212+msgid "Pull to refresh…"

213+msgstr ""

214+

215+#: qml/Dash/PullToRefreshScopeStyle.qml:60

216+msgid "Release to refresh…"

217+msgstr ""

218+

211#: qml/Dash/ScopesOverview.qml:206

219#: qml/Dash/ScopesOverview.qml:206

212msgid "Manage Scopes"

220msgid "Manage Scopes"

213msgstr ""

221msgstr ""

@@ -312,7 +320,7 @@ msgstr ""

312msgid "Enter passphrase"

320msgid "Enter passphrase"

313msgstr ""

321msgstr ""

314

322

315−#: qml/Shell.qml:321

323+#: qml/Shell.qml:341

316msgid "Sorry, incorrect passphrase"

324msgid "Sorry, incorrect passphrase"

317msgstr ""

325msgstr ""

318

326

@@ -324,7 +332,7 @@ msgstr ""

324msgid "Enter passcode"

332msgid "Enter passcode"

325msgstr ""

333msgstr ""

326

334

327−#: qml/Shell.qml:324

335+#: qml/Shell.qml:345

328msgid "Sorry, incorrect passcode"

336msgid "Sorry, incorrect passcode"

329msgstr ""

337msgstr ""

330

338

@@ -333,30 +341,30 @@ msgstr ""

333msgid "Enter %1"

341msgid "Enter %1"

334msgstr ""

342msgstr ""

335

343

336−#: qml/Shell.qml:328

344+#: qml/Shell.qml:349

337#, qt-format

345#, qt-format

338msgid "Sorry, incorrect %1"

346msgid "Sorry, incorrect %1"

339msgstr ""

347msgstr ""

340

348

341−#: qml/Shell.qml:363

349+#: qml/Shell.qml:384

342msgid "Sorry, incorrect passphrase."

350msgid "Sorry, incorrect passphrase."

343msgstr ""

351msgstr ""

344

352

345−#: qml/Shell.qml:364

353+#: qml/Shell.qml:385

346msgid "Sorry, incorrect passcode."

354msgid "Sorry, incorrect passcode."

347msgstr ""

355msgstr ""

348

356

349−#: qml/Shell.qml:365

357+#: qml/Shell.qml:386

350msgid "This will be your last attempt."

358msgid "This will be your last attempt."

351msgstr ""

359msgstr ""

352

360

353−#: qml/Shell.qml:367

361+#: qml/Shell.qml:388

354msgid ""

362msgid ""

355"If passphrase is entered incorrectly, your phone will conduct a factory "

363"If passphrase is entered incorrectly, your phone will conduct a factory "

356"reset and all personal data will be deleted."

364"reset and all personal data will be deleted."

357msgstr ""

365msgstr ""

358

366

359−#: qml/Shell.qml:368

367+#: qml/Shell.qml:389

360msgid ""

368msgid ""

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

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

362"and all personal data will be deleted."

370"and all personal data will be deleted."

po/de.po+21−16

@@ -7,7 +7,7 @@ msgid ""

7msgstr ""

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

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

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

10+"POT-Creation-Date: 2014-10-03 08:13-0400\n"

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

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

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

@@ -15,7 +15,7 @@ msgstr ""

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

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

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

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

18+"X-Launchpad-Export-Date: 2014-10-07 06:58+0000\n"

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

20

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

@@ -159,15 +159,15 @@ msgstr ""

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

160"nun nutzen Zum Starten auf den Bildschirm tippen"

161

162−#: qml/Components/Lockscreen.qml:206

162+#: qml/Components/Lockscreen.qml:218

163msgid "Emergency Call"

164msgstr "Notruf"

165

166−#: qml/Components/Lockscreen.qml:226

166+#: qml/Components/Lockscreen.qml:250

167msgid "OK"

168msgstr "OK"

169

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

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

171msgid "See less"

172msgstr "Weniger ansehen"

173

@@ -212,6 +212,14 @@ msgstr "Bewertung hinzufügen"

212msgid "Send"

213msgstr "Senden"

214

215+#: qml/Dash/PullToRefreshScopeStyle.qml:55

216+msgid "Pull to refresh…"

217+msgstr ""

218+

219+#: qml/Dash/PullToRefreshScopeStyle.qml:60

220+msgid "Release to refresh…"

221+msgstr ""

222+

215#: qml/Dash/ScopesOverview.qml:206

223#: qml/Dash/ScopesOverview.qml:206

216msgid "Manage Scopes"

224msgid "Manage Scopes"

217msgstr "Filter verwalten"

225msgstr "Filter verwalten"

@@ -316,7 +324,7 @@ msgstr "Roaming"

316msgid "Enter passphrase"

324msgid "Enter passphrase"

317msgstr ""

325msgstr ""

318

326

319−#: qml/Shell.qml:321

327+#: qml/Shell.qml:341

320msgid "Sorry, incorrect passphrase"

328msgid "Sorry, incorrect passphrase"

321msgstr "Das Passwort ist nicht korrekt"

329msgstr "Das Passwort ist nicht korrekt"

322

330

@@ -328,7 +336,7 @@ msgstr ""

328msgid "Enter passcode"

336msgid "Enter passcode"

329msgstr ""

337msgstr ""

330

338

331−#: qml/Shell.qml:324

339+#: qml/Shell.qml:345

332msgid "Sorry, incorrect passcode"

340msgid "Sorry, incorrect passcode"

333msgstr "Falsches Passwort"

341msgstr "Falsches Passwort"

334

342

@@ -337,24 +345,24 @@ msgstr "Falsches Passwort"

337msgid "Enter %1"

345msgid "Enter %1"

338msgstr ""

346msgstr ""

339

347

340−#: qml/Shell.qml:328

348+#: qml/Shell.qml:349

341#, qt-format

349#, qt-format

342msgid "Sorry, incorrect %1"

350msgid "Sorry, incorrect %1"

343msgstr "%1 falsch"

351msgstr "%1 falsch"

344

352

345−#: qml/Shell.qml:363

353+#: qml/Shell.qml:384

346msgid "Sorry, incorrect passphrase."

354msgid "Sorry, incorrect passphrase."

347msgstr "Falsches Passwort."

355msgstr "Falsches Passwort."

348

356

349−#: qml/Shell.qml:364

357+#: qml/Shell.qml:385

350msgid "Sorry, incorrect passcode."

358msgid "Sorry, incorrect passcode."

351msgstr "Falsche PIN"

359msgstr "Falsche PIN"

352

360

353−#: qml/Shell.qml:365

361+#: qml/Shell.qml:386

354msgid "This will be your last attempt."

362msgid "This will be your last attempt."

355msgstr "Dies ist Ihr letzter Versuch."

363msgstr "Dies ist Ihr letzter Versuch."

356

364

357−#: qml/Shell.qml:367

365+#: qml/Shell.qml:388

358msgid ""

366msgid ""

359"If passphrase is entered incorrectly, your phone will conduct a factory "

367"If passphrase is entered incorrectly, your phone will conduct a factory "

360"reset and all personal data will be deleted."

368"reset and all personal data will be deleted."

@@ -362,7 +370,7 @@ msgstr ""

362"Wird das Passwort falsch eingegeben, wird das Telefon auf den Werkszustand "

370"Wird das Passwort falsch eingegeben, wird das Telefon auf den Werkszustand "

363"zurückgesetzt und alle Daten werden gelöscht."

371"zurückgesetzt und alle Daten werden gelöscht."

364

372

365−#: qml/Shell.qml:368

373+#: qml/Shell.qml:389

366msgid ""

374msgid ""

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

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

368"and all personal data will be deleted."

376"and all personal data will be deleted."

@@ -390,9 +398,6 @@ msgstr ""

390#~ msgid "Enter your %1"

398#~ msgid "Enter your %1"

391#~ msgstr "%1 eingeben"

399#~ msgstr "%1 eingeben"

392

400

393−#~ msgid "Manage Dash"

394−#~ msgstr "Dash verwalten"

395−

396#~ msgid "Enter your passphrase"

401#~ msgid "Enter your passphrase"

397#~ msgstr "Geben Sie Ihr Passwort ein"

402#~ msgstr "Geben Sie Ihr Passwort ein"

398

403

po/el.po+21−13

@@ -7,7 +7,7 @@ msgid ""

7msgstr ""

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

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

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

10+"POT-Creation-Date: 2014-10-03 08:13-0400\n"

11"PO-Revision-Date: 2014-08-21 12:06+0000\n"

12"Last-Translator: Chris Taklis (aka Kailor) <ctaklis@gmail.com>\n"

13"Language-Team: Greek <el@li.org>\n"

@@ -15,7 +15,7 @@ msgstr ""

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

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

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

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

18+"X-Launchpad-Export-Date: 2014-10-07 06:58+0000\n"

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

20

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

@@ -156,15 +156,15 @@ msgstr ""

156"Πλέον γνωρίζετε τις χειρονομίες από τα άκρα και μπορείτε να ξεκινήσετε να "

157"χρησιμοποιείτε το τηλέφωνο Αγγίξτε την οθόνη για να ξεκινήσετε"

158

159−#: qml/Components/Lockscreen.qml:206

159+#: qml/Components/Lockscreen.qml:218

160msgid "Emergency Call"

161msgstr "Κλήση έκτακτης ανάγκης"

162

163−#: qml/Components/Lockscreen.qml:226

163+#: qml/Components/Lockscreen.qml:250

164msgid "OK"

165msgstr "OK"

166

167−#: qml/Dash/GenericScopeView.qml:411 qml/Dash/GenericScopeView.qml:533

167+#: qml/Dash/GenericScopeView.qml:411 qml/Dash/GenericScopeView.qml:568

168msgid "See less"

169msgstr "Λιγότερα"

170

@@ -209,6 +209,14 @@ msgstr "Προσθέστε την αξιολόγησή σας"

209msgid "Send"

210msgstr "Αποστολή"

211

212+#: qml/Dash/PullToRefreshScopeStyle.qml:55

213+msgid "Pull to refresh…"

214+msgstr ""

215+

216+#: qml/Dash/PullToRefreshScopeStyle.qml:60

217+msgid "Release to refresh…"

218+msgstr ""

219+

212#: qml/Dash/ScopesOverview.qml:206

220#: qml/Dash/ScopesOverview.qml:206

213msgid "Manage Scopes"

221msgid "Manage Scopes"

214msgstr ""

222msgstr ""

@@ -313,7 +321,7 @@ msgstr "Περιαγωγή"

313msgid "Enter passphrase"

321msgid "Enter passphrase"

314msgstr ""

322msgstr ""

315

323

316−#: qml/Shell.qml:321

324+#: qml/Shell.qml:341

317msgid "Sorry, incorrect passphrase"

325msgid "Sorry, incorrect passphrase"

318msgstr ""

326msgstr ""

319

327

@@ -325,7 +333,7 @@ msgstr ""

325msgid "Enter passcode"

333msgid "Enter passcode"

326msgstr ""

334msgstr ""

327

335

328−#: qml/Shell.qml:324

336+#: qml/Shell.qml:345

329msgid "Sorry, incorrect passcode"

337msgid "Sorry, incorrect passcode"

330msgstr ""

338msgstr ""

331

339

@@ -334,30 +342,30 @@ msgstr ""

334msgid "Enter %1"

342msgid "Enter %1"

335msgstr ""

343msgstr ""

336

344

337−#: qml/Shell.qml:328

345+#: qml/Shell.qml:349

338#, qt-format

346#, qt-format

339msgid "Sorry, incorrect %1"

347msgid "Sorry, incorrect %1"

340msgstr ""

348msgstr ""

341

349

342−#: qml/Shell.qml:363

350+#: qml/Shell.qml:384

343msgid "Sorry, incorrect passphrase."

351msgid "Sorry, incorrect passphrase."

344msgstr ""

352msgstr ""

345

353

346−#: qml/Shell.qml:364

354+#: qml/Shell.qml:385

347msgid "Sorry, incorrect passcode."

355msgid "Sorry, incorrect passcode."

348msgstr ""

356msgstr ""

349

357

350−#: qml/Shell.qml:365

358+#: qml/Shell.qml:386

351msgid "This will be your last attempt."

359msgid "This will be your last attempt."

352msgstr ""

360msgstr ""

353

361

354−#: qml/Shell.qml:367

362+#: qml/Shell.qml:388

355msgid ""

363msgid ""

356"If passphrase is entered incorrectly, your phone will conduct a factory "

364"If passphrase is entered incorrectly, your phone will conduct a factory "

357"reset and all personal data will be deleted."

365"reset and all personal data will be deleted."

358msgstr ""

366msgstr ""

359

367

360−#: qml/Shell.qml:368

368+#: qml/Shell.qml:389

361msgid ""

369msgid ""

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

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

363"and all personal data will be deleted."

371"and all personal data will be deleted."

po/en_AU.po+21−16

@@ -7,7 +7,7 @@ msgid ""

7msgstr ""

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

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

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

10+"POT-Creation-Date: 2014-10-03 08:13-0400\n"

11"PO-Revision-Date: 2014-09-23 01:24+0000\n"

12"Last-Translator: Jared Norris <jarednorris@ubuntu.com>\n"

13"Language-Team: English (Australia) <en_AU@li.org>\n"

@@ -15,7 +15,7 @@ msgstr ""

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

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

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

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

18+"X-Launchpad-Export-Date: 2014-10-07 06:59+0000\n"

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

20

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

@@ -156,15 +156,15 @@ msgstr ""

156"You have now mastered the edge gestures and can start using the "

157"phone Tap on the screen to start"

158

159−#: qml/Components/Lockscreen.qml:206

159+#: qml/Components/Lockscreen.qml:218

160msgid "Emergency Call"

161msgstr "Emergency Call"

162

163−#: qml/Components/Lockscreen.qml:226

163+#: qml/Components/Lockscreen.qml:250

164msgid "OK"

165msgstr "OK"

166

167−#: qml/Dash/GenericScopeView.qml:411 qml/Dash/GenericScopeView.qml:533

167+#: qml/Dash/GenericScopeView.qml:411 qml/Dash/GenericScopeView.qml:568

168msgid "See less"

169msgstr "See less"

170

@@ -209,6 +209,14 @@ msgstr "Add a review"

209msgid "Send"

210msgstr "Send"

211

212+#: qml/Dash/PullToRefreshScopeStyle.qml:55

213+msgid "Pull to refresh…"

214+msgstr ""

215+

216+#: qml/Dash/PullToRefreshScopeStyle.qml:60

217+msgid "Release to refresh…"

218+msgstr ""

219+

212#: qml/Dash/ScopesOverview.qml:206

220#: qml/Dash/ScopesOverview.qml:206

213msgid "Manage Scopes"

221msgid "Manage Scopes"

214msgstr ""

222msgstr ""

@@ -313,7 +321,7 @@ msgstr "Roaming"

313msgid "Enter passphrase"

321msgid "Enter passphrase"

314msgstr ""

322msgstr ""

315

323

316−#: qml/Shell.qml:321

324+#: qml/Shell.qml:341

317msgid "Sorry, incorrect passphrase"

325msgid "Sorry, incorrect passphrase"

318msgstr "Sorry, incorrect passphrase"

326msgstr "Sorry, incorrect passphrase"

319

327

@@ -325,7 +333,7 @@ msgstr ""

325msgid "Enter passcode"

333msgid "Enter passcode"

326msgstr ""

334msgstr ""

327

335

328−#: qml/Shell.qml:324

336+#: qml/Shell.qml:345

329msgid "Sorry, incorrect passcode"

337msgid "Sorry, incorrect passcode"

330msgstr "Sorry, incorrect passcode"

338msgstr "Sorry, incorrect passcode"

331

339

@@ -334,24 +342,24 @@ msgstr "Sorry, incorrect passcode"

334msgid "Enter %1"

342msgid "Enter %1"

335msgstr ""

343msgstr ""

336

344

337−#: qml/Shell.qml:328

345+#: qml/Shell.qml:349

338#, qt-format

346#, qt-format

339msgid "Sorry, incorrect %1"

347msgid "Sorry, incorrect %1"

340msgstr "Sorry, incorrect %1"

348msgstr "Sorry, incorrect %1"

341

349

342−#: qml/Shell.qml:363

350+#: qml/Shell.qml:384

343msgid "Sorry, incorrect passphrase."

351msgid "Sorry, incorrect passphrase."

344msgstr "Sorry, incorrect passphrase."

352msgstr "Sorry, incorrect passphrase."

345

353

346−#: qml/Shell.qml:364

354+#: qml/Shell.qml:385

347msgid "Sorry, incorrect passcode."

355msgid "Sorry, incorrect passcode."

348msgstr "Sorry, incorrect passcode."

356msgstr "Sorry, incorrect passcode."

349

357

350−#: qml/Shell.qml:365

358+#: qml/Shell.qml:386

351msgid "This will be your last attempt."

359msgid "This will be your last attempt."

352msgstr "This will be your last attempt."

360msgstr "This will be your last attempt."

353

361

354−#: qml/Shell.qml:367

362+#: qml/Shell.qml:388

355msgid ""

363msgid ""

356"If passphrase is entered incorrectly, your phone will conduct a factory "

364"If passphrase is entered incorrectly, your phone will conduct a factory "

357"reset and all personal data will be deleted."

365"reset and all personal data will be deleted."

@@ -359,7 +367,7 @@ msgstr ""

359"If passphrase is entered incorrectly, your phone will conduct a factory "

367"If passphrase is entered incorrectly, your phone will conduct a factory "

360"reset and all personal data will be deleted."

368"reset and all personal data will be deleted."

361

369

362−#: qml/Shell.qml:368

370+#: qml/Shell.qml:389

363msgid ""

371msgid ""

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

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

365"and all personal data will be deleted."

373"and all personal data will be deleted."

@@ -377,9 +385,6 @@ msgstr ""

377#~ msgid "Swipe to unlock"

385#~ msgid "Swipe to unlock"

378#~ msgstr "Swipe to unlock"

386#~ msgstr "Swipe to unlock"

379

387

380−#~ msgid "Manage Dash"

381−#~ msgstr "Manage Dash"

382−

383#~ msgid "Please wait"

388#~ msgid "Please wait"

384#~ msgstr "Please wait"

389#~ msgstr "Please wait"

385

390

po/en_GB.po+33−28

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

7msgstr ""

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

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

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

10+"POT-Creation-Date: 2014-10-03 08:13-0400\n"

11−"PO-Revision-Date: 2014-08-23 13:48+0000\n"

11+"PO-Revision-Date: 2014-10-03 12:46+0000\n"

12−"Last-Translator: Alan Pope ( ͡° ͜ʖ ͡°) <alan@ubuntu.com>\n"

12+"Last-Translator: Andi Chandler <Unknown>\n"

13"Language-Team: English (United Kingdom) <en_GB@li.org>\n"

14"MIME-Version: 1.0\n"

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

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

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

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

18+"X-Launchpad-Export-Date: 2014-10-07 06:59+0000\n"

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

20

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

@@ -33,22 +33,22 @@ msgstr "Unpin shortcut"

33

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

35msgid "Device Locked"

36−msgstr ""

36+msgstr "Device Locked"

37

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

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

40−msgstr ""

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

41

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

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

44−msgstr ""

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

45

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

47#, qt-format

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

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

50−msgstr[0] ""

50+msgstr[0] "Please wait %1 minute and then try again…"

51−msgstr[1] ""

51+msgstr[1] "Please wait %1 minutes and then try again…"

52

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

54msgid "Log out"

@@ -156,15 +156,15 @@ msgstr ""

156"You have now mastered the edge gestures and can start using the "

157"phone Tap on the screen to start"

158

159−#: qml/Components/Lockscreen.qml:206

159+#: qml/Components/Lockscreen.qml:218

160msgid "Emergency Call"

161msgstr "Emergency Call"

162

163−#: qml/Components/Lockscreen.qml:226

163+#: qml/Components/Lockscreen.qml:250

164msgid "OK"

165msgstr "OK"

166

167−#: qml/Dash/GenericScopeView.qml:411 qml/Dash/GenericScopeView.qml:533

167+#: qml/Dash/GenericScopeView.qml:411 qml/Dash/GenericScopeView.qml:568

168msgid "See less"

169msgstr "See less"

170

@@ -209,6 +209,14 @@ msgstr "Add a review"

209msgid "Send"

210msgstr "Send"

211

212+#: qml/Dash/PullToRefreshScopeStyle.qml:55

213+msgid "Pull to refresh…"

214+msgstr ""

215+

216+#: qml/Dash/PullToRefreshScopeStyle.qml:60

217+msgid "Release to refresh…"

218+msgstr ""

219+

212#: qml/Dash/ScopesOverview.qml:206

220#: qml/Dash/ScopesOverview.qml:206

213msgid "Manage Scopes"

221msgid "Manage Scopes"

214msgstr "Manage Scopes"

222msgstr "Manage Scopes"

@@ -231,7 +239,7 @@ msgstr "All"

231

239

232#: qml/Greeter/Greeter.qml:157

240#: qml/Greeter/Greeter.qml:157

233msgid "Unlock"

241msgid "Unlock"

234−msgstr ""

242+msgstr "Unlock"

235

243

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

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

237msgid "Confirm"

245msgid "Confirm"

@@ -311,47 +319,47 @@ msgstr "Roaming"

311

319

312#: qml/Shell.qml:340

320#: qml/Shell.qml:340

313msgid "Enter passphrase"

321msgid "Enter passphrase"

314−msgstr ""

322+msgstr "Enter passphrase"

315

323

316−#: qml/Shell.qml:321

324+#: qml/Shell.qml:341

317msgid "Sorry, incorrect passphrase"

325msgid "Sorry, incorrect passphrase"

318msgstr "Sorry, incorrect passphrase"

326msgstr "Sorry, incorrect passphrase"

319

327

320#: qml/Shell.qml:342

328#: qml/Shell.qml:342

321msgid "Please re-enter"

329msgid "Please re-enter"

322−msgstr ""

330+msgstr "Please re-enter"

323

331

324#: qml/Shell.qml:344

332#: qml/Shell.qml:344

325msgid "Enter passcode"

333msgid "Enter passcode"

326−msgstr ""

334+msgstr "Enter passcode"

327

335

328−#: qml/Shell.qml:324

336+#: qml/Shell.qml:345

329msgid "Sorry, incorrect passcode"

337msgid "Sorry, incorrect passcode"

330msgstr "Sorry, incorrect passcode"

338msgstr "Sorry, incorrect passcode"

331

339

332#: qml/Shell.qml:348

340#: qml/Shell.qml:348

333#, qt-format

341#, qt-format

334msgid "Enter %1"

342msgid "Enter %1"

335−msgstr ""

343+msgstr "Enter %1"

336

344

337−#: qml/Shell.qml:328

345+#: qml/Shell.qml:349

338#, qt-format

346#, qt-format

339msgid "Sorry, incorrect %1"

347msgid "Sorry, incorrect %1"

340msgstr "Sorry, incorrect %1"

348msgstr "Sorry, incorrect %1"

341

349

342−#: qml/Shell.qml:363

350+#: qml/Shell.qml:384

343msgid "Sorry, incorrect passphrase."

351msgid "Sorry, incorrect passphrase."

344msgstr "Sorry, incorrect passphrase."

352msgstr "Sorry, incorrect passphrase."

345

353

346−#: qml/Shell.qml:364

354+#: qml/Shell.qml:385

347msgid "Sorry, incorrect passcode."

355msgid "Sorry, incorrect passcode."

348msgstr "Sorry, incorrect passcode."

356msgstr "Sorry, incorrect passcode."

349

357

350−#: qml/Shell.qml:365

358+#: qml/Shell.qml:386

351msgid "This will be your last attempt."

359msgid "This will be your last attempt."

352msgstr "This will be your last attempt."

360msgstr "This will be your last attempt."

353

361

354−#: qml/Shell.qml:367

362+#: qml/Shell.qml:388

355msgid ""

363msgid ""

356"If passphrase is entered incorrectly, your phone will conduct a factory "

364"If passphrase is entered incorrectly, your phone will conduct a factory "

357"reset and all personal data will be deleted."

365"reset and all personal data will be deleted."

@@ -359,7 +367,7 @@ msgstr ""

359"If passphrase is entered incorrectly, your phone will conduct a factory "

367"If passphrase is entered incorrectly, your phone will conduct a factory "

360"reset and all personal data will be deleted."

368"reset and all personal data will be deleted."

361

369

362−#: qml/Shell.qml:368

370+#: qml/Shell.qml:389

363msgid ""

371msgid ""

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

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

365"and all personal data will be deleted."

373"and all personal data will be deleted."

@@ -377,9 +385,6 @@ msgstr ""

377#~ msgid "Swipe to unlock"

385#~ msgid "Swipe to unlock"

378#~ msgstr "Swipe to unlock"

386#~ msgstr "Swipe to unlock"

379

387

380−#~ msgid "Manage Dash"

381−#~ msgstr "Manage Dash"

382−

383#~ msgid "Please wait"

388#~ msgid "Please wait"

384#~ msgstr "Please wait"

389#~ msgstr "Please wait"

385

390

po/eo.po+21−13

@@ -7,7 +7,7 @@ msgid ""

7msgstr ""

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

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

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

10+"POT-Creation-Date: 2014-10-03 08:13-0400\n"

11"PO-Revision-Date: 2013-06-26 22:35+0000\n"

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

13"Language-Team: Esperanto <eo@li.org>\n"

@@ -15,7 +15,7 @@ msgstr ""

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

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

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

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

18+"X-Launchpad-Export-Date: 2014-10-07 06:58+0000\n"

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

20

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

@@ -152,15 +152,15 @@ msgid ""

152"phone Tap on the screen to start"

153msgstr ""

154

155−#: qml/Components/Lockscreen.qml:206

155+#: qml/Components/Lockscreen.qml:218

156msgid "Emergency Call"

157msgstr ""

158

159−#: qml/Components/Lockscreen.qml:226

159+#: qml/Components/Lockscreen.qml:250

160msgid "OK"

161msgstr ""

162

163−#: qml/Dash/GenericScopeView.qml:411 qml/Dash/GenericScopeView.qml:533

163+#: qml/Dash/GenericScopeView.qml:411 qml/Dash/GenericScopeView.qml:568

164msgid "See less"

165msgstr ""

166

@@ -205,6 +205,14 @@ msgstr ""

205msgid "Send"

206msgstr ""

207

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+

208#: qml/Dash/ScopesOverview.qml:206

216#: qml/Dash/ScopesOverview.qml:206

209msgid "Manage Scopes"

217msgid "Manage Scopes"

210msgstr ""

218msgstr ""

@@ -309,7 +317,7 @@ msgstr ""

309msgid "Enter passphrase"

317msgid "Enter passphrase"

310msgstr ""

318msgstr ""

311

319

312−#: qml/Shell.qml:321

320+#: qml/Shell.qml:341

313msgid "Sorry, incorrect passphrase"

321msgid "Sorry, incorrect passphrase"

314msgstr ""

322msgstr ""

315

323

@@ -321,7 +329,7 @@ msgstr ""

321msgid "Enter passcode"

329msgid "Enter passcode"

322msgstr ""

330msgstr ""

323

331

324−#: qml/Shell.qml:324

332+#: qml/Shell.qml:345

325msgid "Sorry, incorrect passcode"

333msgid "Sorry, incorrect passcode"

326msgstr ""

334msgstr ""

327

335

@@ -330,30 +338,30 @@ msgstr ""

330msgid "Enter %1"

338msgid "Enter %1"

331msgstr ""

339msgstr ""

332

340

333−#: qml/Shell.qml:328

341+#: qml/Shell.qml:349

334#, qt-format

342#, qt-format

335msgid "Sorry, incorrect %1"

343msgid "Sorry, incorrect %1"

336msgstr ""

344msgstr ""

337

345

338−#: qml/Shell.qml:363

346+#: qml/Shell.qml:384

339msgid "Sorry, incorrect passphrase."

347msgid "Sorry, incorrect passphrase."

340msgstr ""

348msgstr ""

341

349

342−#: qml/Shell.qml:364

350+#: qml/Shell.qml:385

343msgid "Sorry, incorrect passcode."

351msgid "Sorry, incorrect passcode."

344msgstr ""

352msgstr ""

345

353

346−#: qml/Shell.qml:365

354+#: qml/Shell.qml:386

347msgid "This will be your last attempt."

355msgid "This will be your last attempt."

348msgstr ""

356msgstr ""

349

357

350−#: qml/Shell.qml:367

358+#: qml/Shell.qml:388

351msgid ""

359msgid ""

352"If passphrase is entered incorrectly, your phone will conduct a factory "

360"If passphrase is entered incorrectly, your phone will conduct a factory "

353"reset and all personal data will be deleted."

361"reset and all personal data will be deleted."

354msgstr ""

362msgstr ""

355

363

356−#: qml/Shell.qml:368

364+#: qml/Shell.qml:389

357msgid ""

365msgid ""

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

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

359"and all personal data will be deleted."

367"and all personal data will be deleted."

po/es.po+35−26

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

7msgstr ""

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

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

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

10+"POT-Creation-Date: 2014-10-03 08:13-0400\n"

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

11+"PO-Revision-Date: 2014-10-05 08:50+0000\n"

12−"Last-Translator: Leo Arias <leo.arias@canonical.com>\n"

12+"Last-Translator: Paco Molinero <paco@byasl.com>\n"

13"Language-Team: Spanish <es@li.org>\n"

14"MIME-Version: 1.0\n"

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

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

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

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

18+"X-Launchpad-Export-Date: 2014-10-07 06:59+0000\n"

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

20

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

@@ -33,22 +33,26 @@ msgstr "Desanclar"

33

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

35msgid "Device Locked"

36−msgstr ""

36+msgstr "Dispositivo bloqueado"

37

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

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

40msgstr ""

41+"Se ha proporcionado una contraseña errónea demasiadas veces. Se ha bloqueado "

42+"el dispositivo."

41

43

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

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

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

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

44msgstr ""

46msgstr ""

47+"Se ha bloqueado el dispositivo debido al gran número de intentos fallidos de "

48+"desbloqueo."

45

49

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

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

47#, qt-format

51#, qt-format

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

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

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

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

50−msgstr[0] ""

54+msgstr[0] "Espere %1 minuto e inténtelo de nuevo..."

51−msgstr[1] ""

55+msgstr[1] "Espere %1 minutos e inténtelo de nuevo..."

52

56

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

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

54msgid "Log out"

58msgid "Log out"

@@ -159,15 +163,15 @@ msgstr ""

159"Ahora domina los gestos de los bordes y puede usar el teléfono Toque "

163"Ahora domina los gestos de los bordes y puede usar el teléfono Toque "

160"la pantalla para comenzar"

164"la pantalla para comenzar"

161

165

162−#: qml/Components/Lockscreen.qml:206

166+#: qml/Components/Lockscreen.qml:218

163msgid "Emergency Call"

167msgid "Emergency Call"

164msgstr "Llamada de emergencia"

168msgstr "Llamada de emergencia"

165

169

166−#: qml/Components/Lockscreen.qml:226

170+#: qml/Components/Lockscreen.qml:250

167msgid "OK"

171msgid "OK"

168msgstr "Aceptar"

172msgstr "Aceptar"

169

173

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

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

171msgid "See less"

175msgid "See less"

172msgstr "Ver menos"

176msgstr "Ver menos"

173

177

@@ -212,6 +216,14 @@ msgstr "Añadir una reseña"

212msgid "Send"

216msgid "Send"

213msgstr "Enviar"

217msgstr "Enviar"

214

218

219+#: qml/Dash/PullToRefreshScopeStyle.qml:55

220+msgid "Pull to refresh…"

221+msgstr ""

222+

223+#: qml/Dash/PullToRefreshScopeStyle.qml:60

224+msgid "Release to refresh…"

225+msgstr ""

226+

215#: qml/Dash/ScopesOverview.qml:206

227#: qml/Dash/ScopesOverview.qml:206

216msgid "Manage Scopes"

228msgid "Manage Scopes"

217msgstr "Administrar ámbitos"

229msgstr "Administrar ámbitos"

@@ -234,7 +246,7 @@ msgstr "Todo"

234

246

235#: qml/Greeter/Greeter.qml:157

247#: qml/Greeter/Greeter.qml:157

236msgid "Unlock"

248msgid "Unlock"

237−msgstr ""

249+msgstr "Desbloquear"

238

250

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

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

240msgid "Confirm"

252msgid "Confirm"

@@ -314,47 +326,47 @@ msgstr "Itinerancia"

314

326

315#: qml/Shell.qml:340

327#: qml/Shell.qml:340

316msgid "Enter passphrase"

328msgid "Enter passphrase"

317−msgstr ""

329+msgstr "Introduzca la contraseña"

318

330

319−#: qml/Shell.qml:321

331+#: qml/Shell.qml:341

320msgid "Sorry, incorrect passphrase"

332msgid "Sorry, incorrect passphrase"

321msgstr "La contraseña es incorrecta"

333msgstr "La contraseña es incorrecta"

322

334

323#: qml/Shell.qml:342

335#: qml/Shell.qml:342

324msgid "Please re-enter"

336msgid "Please re-enter"

325−msgstr ""

337+msgstr "Reintroduzca"

326

338

327#: qml/Shell.qml:344

339#: qml/Shell.qml:344

328msgid "Enter passcode"

340msgid "Enter passcode"

329−msgstr ""

341+msgstr "Introduzca el código"

330

342

331−#: qml/Shell.qml:324

343+#: qml/Shell.qml:345

332msgid "Sorry, incorrect passcode"

344msgid "Sorry, incorrect passcode"

333msgstr "El código es incorrecto"

345msgstr "El código es incorrecto"

334

346

335#: qml/Shell.qml:348

347#: qml/Shell.qml:348

336#, qt-format

348#, qt-format

337msgid "Enter %1"

349msgid "Enter %1"

338−msgstr ""

350+msgstr "Introduzca %1"

339

351

340−#: qml/Shell.qml:328

352+#: qml/Shell.qml:349

341#, qt-format

353#, qt-format

342msgid "Sorry, incorrect %1"

354msgid "Sorry, incorrect %1"

343msgstr "Incorrecto (%1)"

355msgstr "Incorrecto (%1)"

344

356

345−#: qml/Shell.qml:363

357+#: qml/Shell.qml:384

346msgid "Sorry, incorrect passphrase."

358msgid "Sorry, incorrect passphrase."

347msgstr "La contraseña es incorrecta."

359msgstr "La contraseña es incorrecta."

348

360

349−#: qml/Shell.qml:364

361+#: qml/Shell.qml:385

350msgid "Sorry, incorrect passcode."

362msgid "Sorry, incorrect passcode."

351msgstr "Código de acceso incorrecto."

363msgstr "Código de acceso incorrecto."

352

364

353−#: qml/Shell.qml:365

365+#: qml/Shell.qml:386

354msgid "This will be your last attempt."

366msgid "This will be your last attempt."

355msgstr "Este será su último intento."

367msgstr "Este será su último intento."

356

368

357−#: qml/Shell.qml:367

369+#: qml/Shell.qml:388

358msgid ""

370msgid ""

359"If passphrase is entered incorrectly, your phone will conduct a factory "

371"If passphrase is entered incorrectly, your phone will conduct a factory "

360"reset and all personal data will be deleted."

372"reset and all personal data will be deleted."

@@ -362,7 +374,7 @@ msgstr ""

362"Si se introduce la frase incorrectamente, el teléfono volverá a la "

374"Si se introduce la frase incorrectamente, el teléfono volverá a la "

363"configuración de fábrica y se perderán todos los datos personales."

375"configuración de fábrica y se perderán todos los datos personales."

364

376

365−#: qml/Shell.qml:368

377+#: qml/Shell.qml:389

366msgid ""

378msgid ""

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

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

368"and all personal data will be deleted."

380"and all personal data will be deleted."

@@ -386,9 +398,6 @@ msgstr ""

386#~ msgid "Too many incorrect attempts"

398#~ msgid "Too many incorrect attempts"

387#~ msgstr "Demasiados intentos incorrectos"

399#~ msgstr "Demasiados intentos incorrectos"

388

400

389−#~ msgid "Manage Dash"

390−#~ msgstr "Gestionar tablero"

391−

392#, qt-format

401#, qt-format

393#~ msgid "Enter your %1"

402#~ msgid "Enter your %1"

394#~ msgstr "Introduzca su %1"

403#~ msgstr "Introduzca su %1"

po/eu.po+33−25

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

7msgstr ""

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

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

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

10+"POT-Creation-Date: 2014-10-03 08:13-0400\n"

11−"PO-Revision-Date: 2014-09-27 12:47+0000\n"

11+"PO-Revision-Date: 2014-10-04 01:50+0000\n"

12"Last-Translator: Ibai Oihanguren Sala <Unknown>\n"

13"Language-Team: Basque <eu@li.org>\n"

14"MIME-Version: 1.0\n"

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

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

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

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

18+"X-Launchpad-Export-Date: 2014-10-07 06:58+0000\n"

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

20

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

@@ -33,22 +33,25 @@ msgstr "Askatu lasterbidea"

33

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

35msgid "Device Locked"

36−msgstr ""

36+msgstr "Gailua blokeatuta"

37

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

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

40msgstr ""

41+"Gailua blokeatu da, pasaesaldia sartzeko saiakera gehiegi hutsegin "

42+"dituzulako."

41

43

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

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

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

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

44msgstr ""

46msgstr ""

47+"Gailua blokeatu da, pasakodea sartzeko saiakera gehiegi hutsegin dituzulako."

45

48

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

49#: qml/Components/DelayedLockscreen.qml:72

47#, qt-format

50#, qt-format

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

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

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

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

50−msgstr[0] ""

53+msgstr[0] "Itxaron minutu %1ez eta saiatu berriro…"

51−msgstr[1] ""

54+msgstr[1] "Itxaron %1 minutuz eta saiatu berriro…"

52

55

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

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

54msgid "Log out"

57msgid "Log out"

@@ -157,15 +160,15 @@ msgstr ""

157"Jadanik ezagutzen dituzu ertzetako keinuak, eta mugikorra erabiltzen has "

160"Jadanik ezagutzen dituzu ertzetako keinuak, eta mugikorra erabiltzen has "

158"zaitezke Sakatu pantailan hasteko"

161"zaitezke Sakatu pantailan hasteko"

159

162

160−#: qml/Components/Lockscreen.qml:206

163+#: qml/Components/Lockscreen.qml:218

161msgid "Emergency Call"

164msgid "Emergency Call"

162msgstr "Larrialdi-deia"

165msgstr "Larrialdi-deia"

163

166

164−#: qml/Components/Lockscreen.qml:226

167+#: qml/Components/Lockscreen.qml:250

165msgid "OK"

168msgid "OK"

166msgstr "Ados"

169msgstr "Ados"

167

170

168−#: qml/Dash/GenericScopeView.qml:411 qml/Dash/GenericScopeView.qml:533

171+#: qml/Dash/GenericScopeView.qml:411 qml/Dash/GenericScopeView.qml:568

169msgid "See less"

172msgid "See less"

170msgstr "Ikusi gutxiago"

173msgstr "Ikusi gutxiago"

171

174

@@ -210,6 +213,14 @@ msgstr "Gehitu kritika"

210msgid "Send"

213msgid "Send"

211msgstr "Bidali"

214msgstr "Bidali"

212

215

216+#: qml/Dash/PullToRefreshScopeStyle.qml:55

217+msgid "Pull to refresh…"

218+msgstr ""

219+

220+#: qml/Dash/PullToRefreshScopeStyle.qml:60

221+msgid "Release to refresh…"

222+msgstr ""

223+

213#: qml/Dash/ScopesOverview.qml:206

224#: qml/Dash/ScopesOverview.qml:206

214msgid "Manage Scopes"

225msgid "Manage Scopes"

215msgstr "Kudeatu eremuak"

226msgstr "Kudeatu eremuak"

@@ -232,7 +243,7 @@ msgstr "Guztiak"

232

243

233#: qml/Greeter/Greeter.qml:157

244#: qml/Greeter/Greeter.qml:157

234msgid "Unlock"

245msgid "Unlock"

235−msgstr ""

246+msgstr "Desblokeatu"

236

247

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

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

238msgid "Confirm"

249msgid "Confirm"

@@ -312,47 +323,47 @@ msgstr "Ibiltaritza"

312

323

313#: qml/Shell.qml:340

324#: qml/Shell.qml:340

314msgid "Enter passphrase"

325msgid "Enter passphrase"

315−msgstr ""

326+msgstr "Sartu pasaesaldia"

316

327

317−#: qml/Shell.qml:321

328+#: qml/Shell.qml:341

318msgid "Sorry, incorrect passphrase"

329msgid "Sorry, incorrect passphrase"

319msgstr "Sentitzen dugu, pasaesaldia okerrekoa da"

330msgstr "Sentitzen dugu, pasaesaldia okerrekoa da"

320

331

321#: qml/Shell.qml:342

332#: qml/Shell.qml:342

322msgid "Please re-enter"

333msgid "Please re-enter"

323−msgstr ""

334+msgstr "Errepikatu"

324

335

325#: qml/Shell.qml:344

336#: qml/Shell.qml:344

326msgid "Enter passcode"

337msgid "Enter passcode"

327−msgstr ""

338+msgstr "Sartu pasakodea"

328

339

329−#: qml/Shell.qml:324

340+#: qml/Shell.qml:345

330msgid "Sorry, incorrect passcode"

341msgid "Sorry, incorrect passcode"

331msgstr "Sentitzen dugu, pasakodea okerrekoa da"

342msgstr "Sentitzen dugu, pasakodea okerrekoa da"

332

343

333#: qml/Shell.qml:348

344#: qml/Shell.qml:348

334#, qt-format

345#, qt-format

335msgid "Enter %1"

346msgid "Enter %1"

336−msgstr ""

347+msgstr "Sartu %1"

337

348

338−#: qml/Shell.qml:328

349+#: qml/Shell.qml:349

339#, qt-format

350#, qt-format

340msgid "Sorry, incorrect %1"

351msgid "Sorry, incorrect %1"

341msgstr "Sentitzen dugu, %1 okerrekoa da"

352msgstr "Sentitzen dugu, %1 okerrekoa da"

342

353

343−#: qml/Shell.qml:363

354+#: qml/Shell.qml:384

344msgid "Sorry, incorrect passphrase."

355msgid "Sorry, incorrect passphrase."

345msgstr "Sentitzen dugu, pasaesaldia okerrekoa da."

356msgstr "Sentitzen dugu, pasaesaldia okerrekoa da."

346

357

347−#: qml/Shell.qml:364

358+#: qml/Shell.qml:385

348msgid "Sorry, incorrect passcode."

359msgid "Sorry, incorrect passcode."

349msgstr "Sentitzen dugu, pasakodea okerrekoa da."

360msgstr "Sentitzen dugu, pasakodea okerrekoa da."

350

361

351−#: qml/Shell.qml:365

362+#: qml/Shell.qml:386

352msgid "This will be your last attempt."

363msgid "This will be your last attempt."

353msgstr "Hau duzu azken saiakera."

364msgstr "Hau duzu azken saiakera."

354

365

355−#: qml/Shell.qml:367

366+#: qml/Shell.qml:388

356msgid ""

367msgid ""

357"If passphrase is entered incorrectly, your phone will conduct a factory "

368"If passphrase is entered incorrectly, your phone will conduct a factory "

358"reset and all personal data will be deleted."

369"reset and all personal data will be deleted."

@@ -360,7 +371,7 @@ msgstr ""

360"Okerreko pasaesaldia sartzen baduzu, telefonoaren jatorrizko ezarpenak "

371"Okerreko pasaesaldia sartzen baduzu, telefonoaren jatorrizko ezarpenak "

361"berrezarri eta datu pertsonal guztiak ezabatuko dira."

372"berrezarri eta datu pertsonal guztiak ezabatuko dira."

362

373

363−#: qml/Shell.qml:368

374+#: qml/Shell.qml:389

364msgid ""

375msgid ""

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

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

366"and all personal data will be deleted."

377"and all personal data will be deleted."

@@ -384,9 +395,6 @@ msgstr ""

384#~ msgid "Too many incorrect attempts"

395#~ msgid "Too many incorrect attempts"

385#~ msgstr "Okerreko saiakera gehiegi"

396#~ msgstr "Okerreko saiakera gehiegi"

386

397

387−#~ msgid "Manage Dash"

388−#~ msgstr "Kudeatu abio-leihoa"

389−

390#~ msgid "Enter your passphrase"

398#~ msgid "Enter your passphrase"

391#~ msgstr "Sartu pasaesaldia"

399#~ msgstr "Sartu pasaesaldia"

392

400

po/fa.po+21−16

@@ -7,7 +7,7 @@ msgid ""

7msgstr ""

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

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

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

10+"POT-Creation-Date: 2014-10-03 08:13-0400\n"

11"PO-Revision-Date: 2014-10-02 23:07+0000\n"

12"Last-Translator: Danial Behzadi <dani.behzi@gmail.com>\n"

13"Language-Team: Persian <fa@li.org>\n"

@@ -15,7 +15,7 @@ msgstr ""

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

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

17"Plural-Forms: nplurals=1; plural=0;\n"

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

18+"X-Launchpad-Export-Date: 2014-10-07 06:59+0000\n"

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

20

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

@@ -156,15 +156,15 @@ msgstr ""

156"هم اکنون در استفاده از ژست های حرکتی مهارت لازم را دارید و می‌توانید استفاده "

157"از تلفن را آغاز کنید برای شروع صفحه را لمس کنید"

158

159−#: qml/Components/Lockscreen.qml:206

159+#: qml/Components/Lockscreen.qml:218

160msgid "Emergency Call"

161msgstr "تماس اضطراری"

162

163−#: qml/Components/Lockscreen.qml:226

163+#: qml/Components/Lockscreen.qml:250

164msgid "OK"

165msgstr "قبول"

166

167−#: qml/Dash/GenericScopeView.qml:411 qml/Dash/GenericScopeView.qml:533

167+#: qml/Dash/GenericScopeView.qml:411 qml/Dash/GenericScopeView.qml:568

168msgid "See less"

169msgstr "کم‌تر ببینید"

170

@@ -209,6 +209,14 @@ msgstr "افزودن یک بازبینی"

209msgid "Send"

210msgstr "ارسال"

211

212+#: qml/Dash/PullToRefreshScopeStyle.qml:55

213+msgid "Pull to refresh…"

214+msgstr ""

215+

216+#: qml/Dash/PullToRefreshScopeStyle.qml:60

217+msgid "Release to refresh…"

218+msgstr ""

219+

212#: qml/Dash/ScopesOverview.qml:206

220#: qml/Dash/ScopesOverview.qml:206

213msgid "Manage Scopes"

221msgid "Manage Scopes"

214msgstr "مدیریت حوزه‌ها"

222msgstr "مدیریت حوزه‌ها"

@@ -313,7 +321,7 @@ msgstr "رومینگ"

313msgid "Enter passphrase"

321msgid "Enter passphrase"

314msgstr "عبارت‌عبور را وارد کنید"

322msgstr "عبارت‌عبور را وارد کنید"

315

323

316−#: qml/Shell.qml:321

324+#: qml/Shell.qml:341

317msgid "Sorry, incorrect passphrase"

325msgid "Sorry, incorrect passphrase"

318msgstr "متأسّفیم، عبارت‌عبور نادرست بود"

326msgstr "متأسّفیم، عبارت‌عبور نادرست بود"

319

327

@@ -325,7 +333,7 @@ msgstr "لطفاً دوباره وارد کنید"

325msgid "Enter passcode"

333msgid "Enter passcode"

326msgstr "رمزعبور را وارد کنید"

334msgstr "رمزعبور را وارد کنید"

327

335

328−#: qml/Shell.qml:324

336+#: qml/Shell.qml:345

329msgid "Sorry, incorrect passcode"

337msgid "Sorry, incorrect passcode"

330msgstr "متأسّفیم، رمزعبور نادرست بود"

338msgstr "متأسّفیم، رمزعبور نادرست بود"

331

339

@@ -334,24 +342,24 @@ msgstr "متأسّفیم، رمزعبور نادرست بود"

334msgid "Enter %1"

342msgid "Enter %1"

335msgstr "%1 را وارد کنید"

343msgstr "%1 را وارد کنید"

336

344

337−#: qml/Shell.qml:328

345+#: qml/Shell.qml:349

338#, qt-format

346#, qt-format

339msgid "Sorry, incorrect %1"

347msgid "Sorry, incorrect %1"

340msgstr "متأسّفیم، %1 نادرست بود"

348msgstr "متأسّفیم، %1 نادرست بود"

341

349

342−#: qml/Shell.qml:363

350+#: qml/Shell.qml:384

343msgid "Sorry, incorrect passphrase."

351msgid "Sorry, incorrect passphrase."

344msgstr "متأسّفیم، عبارت‌عبور نادرست است."

352msgstr "متأسّفیم، عبارت‌عبور نادرست است."

345

353

346−#: qml/Shell.qml:364

354+#: qml/Shell.qml:385

347msgid "Sorry, incorrect passcode."

355msgid "Sorry, incorrect passcode."

348msgstr "متأسّفیم، رمزعبور نادرست است."

356msgstr "متأسّفیم، رمزعبور نادرست است."

349

357

350−#: qml/Shell.qml:365

358+#: qml/Shell.qml:386

351msgid "This will be your last attempt."

359msgid "This will be your last attempt."

352msgstr "این آخرین تلاش شما خواهد بود."

360msgstr "این آخرین تلاش شما خواهد بود."

353

361

354−#: qml/Shell.qml:367

362+#: qml/Shell.qml:388

355msgid ""

363msgid ""

356"If passphrase is entered incorrectly, your phone will conduct a factory "

364"If passphrase is entered incorrectly, your phone will conduct a factory "

357"reset and all personal data will be deleted."

365"reset and all personal data will be deleted."

@@ -359,7 +367,7 @@ msgstr ""

359"اگر عبارت‌عبور نادرست وارد شود، تلفن شما بازنشانی کارخانه خواهد شد و تمامی "

367"اگر عبارت‌عبور نادرست وارد شود، تلفن شما بازنشانی کارخانه خواهد شد و تمامی "

360"اطّلاعات شخصی حذف خواهند شد."

368"اطّلاعات شخصی حذف خواهند شد."

361

369

362−#: qml/Shell.qml:368

370+#: qml/Shell.qml:389

363msgid ""

371msgid ""

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

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

365"and all personal data will be deleted."

373"and all personal data will be deleted."

@@ -377,9 +385,6 @@ msgstr ""

377#~ msgid "Swipe to unlock"

385#~ msgid "Swipe to unlock"

378#~ msgstr "برای باز کردن قفل بکشد"

386#~ msgstr "برای باز کردن قفل بکشد"

379

387

380−#~ msgid "Manage Dash"

381−#~ msgstr "مدیریت دش"

382−

383#~ msgid "Please wait"

388#~ msgid "Please wait"

384#~ msgstr "لطفاً صبر کنید"

389#~ msgstr "لطفاً صبر کنید"

385

390

po/fi.po+33−26

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

7msgstr ""

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

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

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

10+"POT-Creation-Date: 2014-10-03 08:13-0400\n"

11−"PO-Revision-Date: 2014-08-28 13:47+0000\n"

11+"PO-Revision-Date: 2014-10-04 08:00+0000\n"

12−"Last-Translator: Timo Jyrinki <timo.jyrinki@canonical.com>\n"

12+"Last-Translator: Jiri Grönroos <Unknown>\n"

13"Language-Team: Finnish <fi@li.org>\n"

14"MIME-Version: 1.0\n"

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

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

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

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

18+"X-Launchpad-Export-Date: 2014-10-07 06:58+0000\n"

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

20

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

@@ -33,22 +33,24 @@ msgstr "Poista pikakuvakkeen kiinnitys"

33

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

35msgid "Device Locked"

36−msgstr ""

36+msgstr "Laite on lukittu"

37

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

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

40msgstr ""

41+"Laite on lukittu liian monen virheellisen tunnuslauseyrityksen jälkeen."

41

42

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

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

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

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

44msgstr ""

45msgstr ""

46+"Laite on lukittu liian monen virheellisen suojakoodiyrityksen jälkeen."

45

47

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

48#: qml/Components/DelayedLockscreen.qml:72

47#, qt-format

49#, qt-format

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

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

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

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

50−msgstr[0] ""

52+msgstr[0] "Odota %1 minuutti ja yritä sitten uudelleen…"

51−msgstr[1] ""

53+msgstr[1] "Odota %1 minuuttia ja yritä sitten uudelleen…"

52

54

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

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

54msgid "Log out"

56msgid "Log out"

@@ -156,15 +158,15 @@ msgstr ""

156"Hallitset nyt reunaeleet, joten voit aloittaa puhelimen "

158"Hallitset nyt reunaeleet, joten voit aloittaa puhelimen "

157"käytön Napauta näyttöä aloittaaksesi"

159"käytön Napauta näyttöä aloittaaksesi"

158

160

159−#: qml/Components/Lockscreen.qml:206

161+#: qml/Components/Lockscreen.qml:218

160msgid "Emergency Call"

162msgid "Emergency Call"

161msgstr "Hätäpuhelu"

163msgstr "Hätäpuhelu"

162

164

163−#: qml/Components/Lockscreen.qml:226

165+#: qml/Components/Lockscreen.qml:250

164msgid "OK"

166msgid "OK"

165msgstr "OK"

167msgstr "OK"

166

168

167−#: qml/Dash/GenericScopeView.qml:411 qml/Dash/GenericScopeView.qml:533

169+#: qml/Dash/GenericScopeView.qml:411 qml/Dash/GenericScopeView.qml:568

168msgid "See less"

170msgid "See less"

169msgstr "Näytä vähemmän"

171msgstr "Näytä vähemmän"

170

172

@@ -209,6 +211,14 @@ msgstr "Lisää arvostelu"

209msgid "Send"

211msgid "Send"

210msgstr "Lähetä"

212msgstr "Lähetä"

211

213

214+#: qml/Dash/PullToRefreshScopeStyle.qml:55

215+msgid "Pull to refresh…"

216+msgstr ""

217+

218+#: qml/Dash/PullToRefreshScopeStyle.qml:60

219+msgid "Release to refresh…"

220+msgstr ""

221+

212#: qml/Dash/ScopesOverview.qml:206

222#: qml/Dash/ScopesOverview.qml:206

213msgid "Manage Scopes"

223msgid "Manage Scopes"

214msgstr "Näkymien hallinta"

224msgstr "Näkymien hallinta"

@@ -231,7 +241,7 @@ msgstr "Kaikki"

231

241

232#: qml/Greeter/Greeter.qml:157

242#: qml/Greeter/Greeter.qml:157

233msgid "Unlock"

243msgid "Unlock"

234−msgstr ""

244+msgstr "Avaa lukitus"

235

245

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

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

237msgid "Confirm"

247msgid "Confirm"

@@ -311,47 +321,47 @@ msgstr "Verkkovierailu"

311

321

312#: qml/Shell.qml:340

322#: qml/Shell.qml:340

313msgid "Enter passphrase"

323msgid "Enter passphrase"

314−msgstr ""

324+msgstr "Anna tunnuslause"

315

325

316−#: qml/Shell.qml:321

326+#: qml/Shell.qml:341

317msgid "Sorry, incorrect passphrase"

327msgid "Sorry, incorrect passphrase"

318msgstr "Virheellinen tunnuslause"

328msgstr "Virheellinen tunnuslause"

319

329

320#: qml/Shell.qml:342

330#: qml/Shell.qml:342

321msgid "Please re-enter"

331msgid "Please re-enter"

322−msgstr ""

332+msgstr "Anna uudelleen"

323

333

324#: qml/Shell.qml:344

334#: qml/Shell.qml:344

325msgid "Enter passcode"

335msgid "Enter passcode"

326−msgstr ""

336+msgstr "Anna suojakoodi"

327

337

328−#: qml/Shell.qml:324

338+#: qml/Shell.qml:345

329msgid "Sorry, incorrect passcode"

339msgid "Sorry, incorrect passcode"

330msgstr "Väärä suojakoodi"

340msgstr "Väärä suojakoodi"

331

341

332#: qml/Shell.qml:348

342#: qml/Shell.qml:348

333#, qt-format

343#, qt-format

334msgid "Enter %1"

344msgid "Enter %1"

335−msgstr ""

345+msgstr "Anna %1"

336

346

337−#: qml/Shell.qml:328

347+#: qml/Shell.qml:349

338#, qt-format

348#, qt-format

339msgid "Sorry, incorrect %1"

349msgid "Sorry, incorrect %1"

340msgstr "Väärä %1"

350msgstr "Väärä %1"

341

351

342−#: qml/Shell.qml:363

352+#: qml/Shell.qml:384

343msgid "Sorry, incorrect passphrase."

353msgid "Sorry, incorrect passphrase."

344msgstr "Virheellinen tunnuslause."

354msgstr "Virheellinen tunnuslause."

345

355

346−#: qml/Shell.qml:364

356+#: qml/Shell.qml:385

347msgid "Sorry, incorrect passcode."

357msgid "Sorry, incorrect passcode."

348msgstr "Virheellinen suojakoodi."

358msgstr "Virheellinen suojakoodi."

349

359

350−#: qml/Shell.qml:365

360+#: qml/Shell.qml:386

351msgid "This will be your last attempt."

361msgid "This will be your last attempt."

352msgstr "Tämä on viimeinen yritys."

362msgstr "Tämä on viimeinen yritys."

353

363

354−#: qml/Shell.qml:367

364+#: qml/Shell.qml:388

355msgid ""

365msgid ""

356"If passphrase is entered incorrectly, your phone will conduct a factory "

366"If passphrase is entered incorrectly, your phone will conduct a factory "

357"reset and all personal data will be deleted."

367"reset and all personal data will be deleted."

@@ -359,7 +369,7 @@ msgstr ""

359"Jos kirjoitat tunnuslauseen virheellisesti, puhelimesi palautetaan "

369"Jos kirjoitat tunnuslauseen virheellisesti, puhelimesi palautetaan "

360"tehdastilaan ja kaikki henkilökohtaiset tietosi poistetaan."

370"tehdastilaan ja kaikki henkilökohtaiset tietosi poistetaan."

361

371

362−#: qml/Shell.qml:368

372+#: qml/Shell.qml:389

363msgid ""

373msgid ""

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

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

365"and all personal data will be deleted."

375"and all personal data will be deleted."

@@ -387,9 +397,6 @@ msgstr ""

387#~ msgid "Enter your %1"

397#~ msgid "Enter your %1"

388#~ msgstr "Anna %1"

398#~ msgstr "Anna %1"

389

399

390−#~ msgid "Manage Dash"

391−#~ msgstr "Unityn hallinta"

392−

393#~ msgid "Enter your passphrase"

400#~ msgid "Enter your passphrase"

394#~ msgstr "Anna tunnuslause"

401#~ msgstr "Anna tunnuslause"

395

402

po/fo.po+21−13

@@ -7,7 +7,7 @@ msgid ""

7msgstr ""

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

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

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

10+"POT-Creation-Date: 2014-10-03 08:13-0400\n"

11"PO-Revision-Date: 2014-01-14 20:08+0000\n"

12"Last-Translator: Jógvan Olsen <jeggy@jebster.net>\n"

13"Language-Team: Faroese <fo@li.org>\n"

@@ -15,7 +15,7 @@ msgstr ""

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

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

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

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

18+"X-Launchpad-Export-Date: 2014-10-07 06:58+0000\n"

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

20

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

@@ -152,15 +152,15 @@ msgid ""

152"phone Tap on the screen to start"

153msgstr ""

154

155−#: qml/Components/Lockscreen.qml:206

155+#: qml/Components/Lockscreen.qml:218

156msgid "Emergency Call"

157msgstr ""

158

159−#: qml/Components/Lockscreen.qml:226

159+#: qml/Components/Lockscreen.qml:250

160msgid "OK"

161msgstr ""

162

163−#: qml/Dash/GenericScopeView.qml:411 qml/Dash/GenericScopeView.qml:533

163+#: qml/Dash/GenericScopeView.qml:411 qml/Dash/GenericScopeView.qml:568

164msgid "See less"

165msgstr ""

166

@@ -205,6 +205,14 @@ msgstr ""

205msgid "Send"

206msgstr ""

207

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+

208#: qml/Dash/ScopesOverview.qml:206

216#: qml/Dash/ScopesOverview.qml:206

209msgid "Manage Scopes"

217msgid "Manage Scopes"

210msgstr ""

218msgstr ""

@@ -309,7 +317,7 @@ msgstr ""

309msgid "Enter passphrase"

317msgid "Enter passphrase"

310msgstr ""

318msgstr ""

311

319

312−#: qml/Shell.qml:321

320+#: qml/Shell.qml:341

313msgid "Sorry, incorrect passphrase"

321msgid "Sorry, incorrect passphrase"

314msgstr ""

322msgstr ""

315

323

@@ -321,7 +329,7 @@ msgstr ""

321msgid "Enter passcode"

329msgid "Enter passcode"

322msgstr ""

330msgstr ""

323

331

324−#: qml/Shell.qml:324

332+#: qml/Shell.qml:345

325msgid "Sorry, incorrect passcode"

333msgid "Sorry, incorrect passcode"

326msgstr ""

334msgstr ""

327

335

@@ -330,30 +338,30 @@ msgstr ""

330msgid "Enter %1"

338msgid "Enter %1"

331msgstr ""

339msgstr ""

332

340

333−#: qml/Shell.qml:328

341+#: qml/Shell.qml:349

334#, qt-format

342#, qt-format

335msgid "Sorry, incorrect %1"

343msgid "Sorry, incorrect %1"

336msgstr ""

344msgstr ""

337

345

338−#: qml/Shell.qml:363

346+#: qml/Shell.qml:384

339msgid "Sorry, incorrect passphrase."

347msgid "Sorry, incorrect passphrase."

340msgstr ""

348msgstr ""

341

349

342−#: qml/Shell.qml:364

350+#: qml/Shell.qml:385

343msgid "Sorry, incorrect passcode."

351msgid "Sorry, incorrect passcode."

344msgstr ""

352msgstr ""

345

353

346−#: qml/Shell.qml:365

354+#: qml/Shell.qml:386

347msgid "This will be your last attempt."

355msgid "This will be your last attempt."

348msgstr ""

356msgstr ""

349

357

350−#: qml/Shell.qml:367

358+#: qml/Shell.qml:388

351msgid ""

359msgid ""

352"If passphrase is entered incorrectly, your phone will conduct a factory "

360"If passphrase is entered incorrectly, your phone will conduct a factory "

353"reset and all personal data will be deleted."

361"reset and all personal data will be deleted."

354msgstr ""

362msgstr ""

355

363

356−#: qml/Shell.qml:368

364+#: qml/Shell.qml:389

357msgid ""

365msgid ""

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

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

359"and all personal data will be deleted."

367"and all personal data will be deleted."

po/fr.po+37−28

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

7msgstr ""

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

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

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

10+"POT-Creation-Date: 2014-10-03 08:13-0400\n"

11−"PO-Revision-Date: 2014-08-29 10:31+0000\n"

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

12−"Last-Translator: Sébastien Maes <nautilussebastien@gmail.com>\n"

12+"Last-Translator: Jean Marc <Unknown>\n"

13"Language-Team: French <fr@li.org>\n"

14"MIME-Version: 1.0\n"

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

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

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

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

18+"X-Launchpad-Export-Date: 2014-10-07 06:58+0000\n"

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

20

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

@@ -33,22 +33,26 @@ msgstr "Détacher le raccourci"

33

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

35msgid "Device Locked"

36−msgstr ""

36+msgstr "Périphérique verrouillé"

37

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

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

40msgstr ""

41+"Vous avez été bloqué suite à un trop grand nombre de tentatives de saisie "

42+"d'une phrase de passe erronée."

41

43

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

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

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

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

44msgstr ""

46msgstr ""

47+"Vous avez été bloqué suite à un trop grand nombre de tentatives de saisie "

48+"d'un mot de passe erroné."

45

49

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

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

47#, qt-format

51#, qt-format

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

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

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

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

50−msgstr[0] ""

54+msgstr[0] "Veuillez patienter %1 minute et réessayer..."

51−msgstr[1] ""

55+msgstr[1] "Veuillez patienter %1 minutes et réessayer..."

52

56

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

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

54msgid "Log out"

58msgid "Log out"

@@ -163,15 +167,15 @@ msgstr ""

163"Vous maîtrisez maintenant les différents gestes et pouvez commencer à "

167"Vous maîtrisez maintenant les différents gestes et pouvez commencer à "

164"utiliser le téléphone Appuyez sur l'écran pour commencer"

168"utiliser le téléphone Appuyez sur l'écran pour commencer"

165

169

166−#: qml/Components/Lockscreen.qml:206

170+#: qml/Components/Lockscreen.qml:218

167msgid "Emergency Call"

171msgid "Emergency Call"

168msgstr "Appel d'urgence"

172msgstr "Appel d'urgence"

169

173

170−#: qml/Components/Lockscreen.qml:226

174+#: qml/Components/Lockscreen.qml:250

171msgid "OK"

175msgid "OK"

172msgstr "OK"

176msgstr "OK"

173

177

174−#: qml/Dash/GenericScopeView.qml:411 qml/Dash/GenericScopeView.qml:533

178+#: qml/Dash/GenericScopeView.qml:411 qml/Dash/GenericScopeView.qml:568

175msgid "See less"

179msgid "See less"

176msgstr "Voir moins"

180msgstr "Voir moins"

177

181

@@ -216,9 +220,17 @@ msgstr "Ajouter un avis"

216msgid "Send"

220msgid "Send"

217msgstr "Envoyer"

221msgstr "Envoyer"

218

222

223+#: qml/Dash/PullToRefreshScopeStyle.qml:55

224+msgid "Pull to refresh…"

225+msgstr ""

226+

227+#: qml/Dash/PullToRefreshScopeStyle.qml:60

228+msgid "Release to refresh…"

229+msgstr ""

230+

219#: qml/Dash/ScopesOverview.qml:206

231#: qml/Dash/ScopesOverview.qml:206

220msgid "Manage Scopes"

232msgid "Manage Scopes"

221−msgstr ""

233+msgstr "Gérer les moteurs de recherche"

222

234

223#: qml/Dash/ScopesOverview.qml:428

235#: qml/Dash/ScopesOverview.qml:428

224msgid "Done"

236msgid "Done"

@@ -238,7 +250,7 @@ msgstr "Toutes"

238

250

239#: qml/Greeter/Greeter.qml:157

251#: qml/Greeter/Greeter.qml:157

240msgid "Unlock"

252msgid "Unlock"

241−msgstr ""

253+msgstr "Déverrouiller"

242

254

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

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

244msgid "Confirm"

256msgid "Confirm"

@@ -282,7 +294,7 @@ msgstr "Conférence"

282

294

283#: qml/Panel/Indicators/MenuItemFactory.qml:600

295#: qml/Panel/Indicators/MenuItemFactory.qml:600

284msgid "Nothing is playing"

296msgid "Nothing is playing"

285−msgstr ""

297+msgstr "Rien n'est en cours de lecture"

286

298

287#: qml/Panel/Indicators/MenuItemFactory.qml:748

299#: qml/Panel/Indicators/MenuItemFactory.qml:748

288msgid "In queue…"

300msgid "In queue…"

@@ -318,47 +330,47 @@ msgstr "Roaming"

318

330

319#: qml/Shell.qml:340

331#: qml/Shell.qml:340

320msgid "Enter passphrase"

332msgid "Enter passphrase"

321−msgstr ""

333+msgstr "Saisissez la phrase de passe"

322

334

323−#: qml/Shell.qml:321

335+#: qml/Shell.qml:341

324msgid "Sorry, incorrect passphrase"

336msgid "Sorry, incorrect passphrase"

325msgstr "Désolé, phrase secrète incorrecte"

337msgstr "Désolé, phrase secrète incorrecte"

326

338

327#: qml/Shell.qml:342

339#: qml/Shell.qml:342

328msgid "Please re-enter"

340msgid "Please re-enter"

329−msgstr ""

341+msgstr "Veuillez ressaisir"

330

342

331#: qml/Shell.qml:344

343#: qml/Shell.qml:344

332msgid "Enter passcode"

344msgid "Enter passcode"

333−msgstr ""

345+msgstr "Saisissez le mot de passe"

334

346

335−#: qml/Shell.qml:324

347+#: qml/Shell.qml:345

336msgid "Sorry, incorrect passcode"

348msgid "Sorry, incorrect passcode"

337msgstr "Désolé, code incorrect"

349msgstr "Désolé, code incorrect"

338

350

339#: qml/Shell.qml:348

351#: qml/Shell.qml:348

340#, qt-format

352#, qt-format

341msgid "Enter %1"

353msgid "Enter %1"

342−msgstr ""

354+msgstr "Saisissez %1"

343

355

344−#: qml/Shell.qml:328

356+#: qml/Shell.qml:349

345#, qt-format

357#, qt-format

346msgid "Sorry, incorrect %1"

358msgid "Sorry, incorrect %1"

347msgstr "Désolé, %1 incorrect"

359msgstr "Désolé, %1 incorrect"

348

360

349−#: qml/Shell.qml:363

361+#: qml/Shell.qml:384

350msgid "Sorry, incorrect passphrase."

362msgid "Sorry, incorrect passphrase."

351msgstr "Désolé, phrase secrète incorrecte."

363msgstr "Désolé, phrase secrète incorrecte."

352

364

353−#: qml/Shell.qml:364

365+#: qml/Shell.qml:385

354msgid "Sorry, incorrect passcode."

366msgid "Sorry, incorrect passcode."

355msgstr "Désolé, code incorrect."

367msgstr "Désolé, code incorrect."

356

368

357−#: qml/Shell.qml:365

369+#: qml/Shell.qml:386

358msgid "This will be your last attempt."

370msgid "This will be your last attempt."

359msgstr "Ceci sera votre dernière tentative."

371msgstr "Ceci sera votre dernière tentative."

360

372

361−#: qml/Shell.qml:367

373+#: qml/Shell.qml:388

362msgid ""

374msgid ""

363"If passphrase is entered incorrectly, your phone will conduct a factory "

375"If passphrase is entered incorrectly, your phone will conduct a factory "

364"reset and all personal data will be deleted."

376"reset and all personal data will be deleted."

@@ -367,7 +379,7 @@ msgstr ""

367"effectuera une réinitialisation aux paramètres d'usine et toutes les données "

379"effectuera une réinitialisation aux paramètres d'usine et toutes les données "

368"personnelles seront supprimées."

380"personnelles seront supprimées."

369

381

370−#: qml/Shell.qml:368

382+#: qml/Shell.qml:389

371msgid ""

383msgid ""

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

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

373"and all personal data will be deleted."

385"and all personal data will be deleted."

@@ -386,9 +398,6 @@ msgstr ""

386#~ msgid "Swipe to unlock"

398#~ msgid "Swipe to unlock"

387#~ msgstr "Faites glisser pour déverrouiller"

399#~ msgstr "Faites glisser pour déverrouiller"

388

400

389−#~ msgid "Manage Dash"

390−#~ msgstr "Gérer le tableau de bord"

391−

392#~ msgid "Please wait"

401#~ msgid "Please wait"

393#~ msgstr "Veuillez patienter"

402#~ msgstr "Veuillez patienter"

394

403

po/gd.po+35−24

@@ -7,8 +7,8 @@ msgid ""

7msgstr ""

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

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

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

10+"POT-Creation-Date: 2014-10-03 08:13-0400\n"

11−"PO-Revision-Date: 2014-10-02 13:17+0000\n"

11+"PO-Revision-Date: 2014-10-03 19:54+0000\n"

12"Last-Translator: GunChleoc <Unknown>\n"

13"Language-Team: Fòram na Gàidhlig\n"

14"MIME-Version: 1.0\n"

@@ -16,7 +16,7 @@ msgstr ""

16"Content-Transfer-Encoding: 8bit\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-03 06:21+0000\n"

19+"X-Launchpad-Export-Date: 2014-10-07 06:58+0000\n"

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

21"Language: gd\n"

22

@@ -35,22 +35,28 @@ msgstr "Neo-phrìnich an ath-ghoirid"

35

36#: qml/Components/DelayedLockscreen.qml:47

37msgid "Device Locked"

38−msgstr ""

38+msgstr "Tha glas air an uidheam"

39

40#: qml/Components/DelayedLockscreen.qml:62

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

42msgstr ""

43+"Chaidh do glasadh a-mach às an uidheam on a chuir thu abairt-fhaire chearr a-"

44+"steach cus tursan."

43

45

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

46#: qml/Components/DelayedLockscreen.qml:63

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

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

46msgstr ""

48msgstr ""

49+"Chaidh do glasadh a-mach às an uidheam on a chuir thu còd-faire cearr a-"

50+"steach cus tursan."

47

51

48#: qml/Components/DelayedLockscreen.qml:72

52#: qml/Components/DelayedLockscreen.qml:72

49#, qt-format

53#, qt-format

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

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

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

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

52−msgstr[0] ""

56+msgstr[0] "Fuirich ort %1 diog 's feuch ris a-rithist an uairsin…"

53−msgstr[1] ""

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…"

54

60

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

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

56msgid "Log out"

62msgid "Log out"

@@ -164,15 +170,15 @@ msgstr ""

164"Fhuair thu air na gluasadan oire ceart a dhèanamh a-nis agus is urrainn dhut "

170"Fhuair thu air na gluasadan oire ceart a dhèanamh a-nis agus is urrainn dhut "

165"am fòn a chleachdadh Thoir gnogag air an sgrìn airson tòiseachadh"

171"am fòn a chleachdadh Thoir gnogag air an sgrìn airson tòiseachadh"

166

172

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

173+#: qml/Components/Lockscreen.qml:218

168msgid "Emergency Call"

174msgid "Emergency Call"

169msgstr "Gairm èiginn"

175msgstr "Gairm èiginn"

170

176

171−#: qml/Components/Lockscreen.qml:226

177+#: qml/Components/Lockscreen.qml:250

172msgid "OK"

178msgid "OK"

173msgstr "Ceart ma-thà"

179msgstr "Ceart ma-thà"

174

180

175−#: qml/Dash/GenericScopeView.qml:411 qml/Dash/GenericScopeView.qml:533

181+#: qml/Dash/GenericScopeView.qml:411 qml/Dash/GenericScopeView.qml:568

176msgid "See less"

182msgid "See less"

177msgstr "Seall nas lugha"

183msgstr "Seall nas lugha"

178

184

@@ -217,6 +223,14 @@ msgstr "Cuir lèirmheas ris"

217msgid "Send"

223msgid "Send"

218msgstr "Cuir"

224msgstr "Cuir"

219

225

226+#: qml/Dash/PullToRefreshScopeStyle.qml:55

227+msgid "Pull to refresh…"

228+msgstr ""

229+

230+#: qml/Dash/PullToRefreshScopeStyle.qml:60

231+msgid "Release to refresh…"

232+msgstr ""

233+

220#: qml/Dash/ScopesOverview.qml:206

234#: qml/Dash/ScopesOverview.qml:206

221msgid "Manage Scopes"

235msgid "Manage Scopes"

222msgstr "Stiùirich na sgòpaichean"

236msgstr "Stiùirich na sgòpaichean"

@@ -319,47 +333,47 @@ msgstr "Air fàrsan"

319

333

320#: qml/Shell.qml:340

334#: qml/Shell.qml:340

321msgid "Enter passphrase"

335msgid "Enter passphrase"

322−msgstr ""

336+msgstr "Cuir abairt-fhaire a-steach"

323

337

324−#: qml/Shell.qml:321

338+#: qml/Shell.qml:341

325msgid "Sorry, incorrect passphrase"

339msgid "Sorry, incorrect passphrase"

326msgstr "Duilich ach tha an abairt-fhaire cearr"

340msgstr "Duilich ach tha an abairt-fhaire cearr"

327

341

328#: qml/Shell.qml:342

342#: qml/Shell.qml:342

329msgid "Please re-enter"

343msgid "Please re-enter"

330−msgstr ""

344+msgstr "Cuir a-steach e a-rithist"

331

345

332#: qml/Shell.qml:344

346#: qml/Shell.qml:344

333msgid "Enter passcode"

347msgid "Enter passcode"

334−msgstr ""

348+msgstr "Cuir còd-faire a-steach"

335

349

336−#: qml/Shell.qml:324

350+#: qml/Shell.qml:345

337msgid "Sorry, incorrect passcode"

351msgid "Sorry, incorrect passcode"

338msgstr "Duilich ach tha an còd-faire cearr"

352msgstr "Duilich ach tha an còd-faire cearr"

339

353

340#: qml/Shell.qml:348

354#: qml/Shell.qml:348

341#, qt-format

355#, qt-format

342msgid "Enter %1"

356msgid "Enter %1"

343−msgstr ""

357+msgstr "Cuir a-steach %1"

344

358

345−#: qml/Shell.qml:328

359+#: qml/Shell.qml:349

346#, qt-format

360#, qt-format

347msgid "Sorry, incorrect %1"

361msgid "Sorry, incorrect %1"

348msgstr "Duilich ach tha a' %1 cearr"

362msgstr "Duilich ach tha a' %1 cearr"

349

363

350−#: qml/Shell.qml:363

364+#: qml/Shell.qml:384

351msgid "Sorry, incorrect passphrase."

365msgid "Sorry, incorrect passphrase."

352msgstr "Duilich ach tha an abairt-fhaire cearr."

366msgstr "Duilich ach tha an abairt-fhaire cearr."

353

367

354−#: qml/Shell.qml:364

368+#: qml/Shell.qml:385

355msgid "Sorry, incorrect passcode."

369msgid "Sorry, incorrect passcode."

356msgstr "Duilich ach tha an còd-faire cearr."

370msgstr "Duilich ach tha an còd-faire cearr."

357

371

358−#: qml/Shell.qml:365

372+#: qml/Shell.qml:386

359msgid "This will be your last attempt."

373msgid "This will be your last attempt."

360msgstr "Seo an oidhirp mu dheireadh agad."

374msgstr "Seo an oidhirp mu dheireadh agad."

361

375

362−#: qml/Shell.qml:367

376+#: qml/Shell.qml:388

363msgid ""

377msgid ""

364"If passphrase is entered incorrectly, your phone will conduct a factory "

378"If passphrase is entered incorrectly, your phone will conduct a factory "

365"reset and all personal data will be deleted."

379"reset and all personal data will be deleted."

@@ -368,7 +382,7 @@ msgstr ""

368"ath-shuidheachadh air roghainnean an fhactaraidh agus thèid gach dàta "

382"ath-shuidheachadh air roghainnean an fhactaraidh agus thèid gach dàta "

369"pearsanta a sguabadh às."

383"pearsanta a sguabadh às."

370

384

371−#: qml/Shell.qml:368

385+#: qml/Shell.qml:389

372msgid ""

386msgid ""

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

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

374"and all personal data will be deleted."

388"and all personal data will be deleted."

@@ -387,9 +401,6 @@ msgstr ""

387#~ msgid "Swipe to unlock"

401#~ msgid "Swipe to unlock"

388#~ msgstr "Dèan grad-shlaighdeadh gus a' ghlas a thoirt dheth"

402#~ msgstr "Dèan grad-shlaighdeadh gus a' ghlas a thoirt dheth"

389

403

390−#~ msgid "Manage Dash"

391−#~ msgstr "Stiùirich an deas-bhòrd"

392−

393#~ msgid "Please wait"

404#~ msgid "Please wait"

394#~ msgstr "Fuirich ort"

405#~ msgstr "Fuirich ort"

395

406

po/gl.po+21−16

@@ -7,7 +7,7 @@ msgid ""

7msgstr ""

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

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

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

10+"POT-Creation-Date: 2014-10-03 08:13-0400\n"

11"PO-Revision-Date: 2014-10-03 04:55+0000\n"

12"Last-Translator: Marcos Lans <Unknown>\n"

13"Language-Team: Galician <gl@li.org>\n"

@@ -15,7 +15,7 @@ msgstr ""

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

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

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

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

18+"X-Launchpad-Export-Date: 2014-10-07 06:58+0000\n"

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

20

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

@@ -156,15 +156,15 @@ msgstr ""

156"Agora xa domina os xestos dos bordos e pode comezar a usar o "

157"teléfono Toque na pantalla para comezar"

158

159−#: qml/Components/Lockscreen.qml:206

159+#: qml/Components/Lockscreen.qml:218

160msgid "Emergency Call"

161msgstr "Chamada de emerxencia"

162

163−#: qml/Components/Lockscreen.qml:226

163+#: qml/Components/Lockscreen.qml:250

164msgid "OK"

165msgstr "Aceptar"

166

167−#: qml/Dash/GenericScopeView.qml:411 qml/Dash/GenericScopeView.qml:533

167+#: qml/Dash/GenericScopeView.qml:411 qml/Dash/GenericScopeView.qml:568

168msgid "See less"

169msgstr "Ver menos"

170

@@ -209,6 +209,14 @@ msgstr "Engadir unha opinión"

209msgid "Send"

210msgstr "Enviar"

211

212+#: qml/Dash/PullToRefreshScopeStyle.qml:55

213+msgid "Pull to refresh…"

214+msgstr ""

215+

216+#: qml/Dash/PullToRefreshScopeStyle.qml:60

217+msgid "Release to refresh…"

218+msgstr ""

219+

212#: qml/Dash/ScopesOverview.qml:206

220#: qml/Dash/ScopesOverview.qml:206

213msgid "Manage Scopes"

221msgid "Manage Scopes"

214msgstr "Xestionar os Ámbitos"

222msgstr "Xestionar os Ámbitos"

@@ -313,7 +321,7 @@ msgstr "Itinerancia"

313msgid "Enter passphrase"

321msgid "Enter passphrase"

314msgstr "Introduza a frase secreta"

322msgstr "Introduza a frase secreta"

315

323

316−#: qml/Shell.qml:321

324+#: qml/Shell.qml:341

317msgid "Sorry, incorrect passphrase"

325msgid "Sorry, incorrect passphrase"

318msgstr "Sentímolo a frase é incorrecta"

326msgstr "Sentímolo a frase é incorrecta"

319

327

@@ -325,7 +333,7 @@ msgstr "Introducir de novo"

325msgid "Enter passcode"

333msgid "Enter passcode"

326msgstr "Introduza a clave"

334msgstr "Introduza a clave"

327

335

328−#: qml/Shell.qml:324

336+#: qml/Shell.qml:345

329msgid "Sorry, incorrect passcode"

337msgid "Sorry, incorrect passcode"

330msgstr "Sentímolo, a clave é incorrecta"

338msgstr "Sentímolo, a clave é incorrecta"

331

339

@@ -334,24 +342,24 @@ msgstr "Sentímolo, a clave é incorrecta"

334msgid "Enter %1"

342msgid "Enter %1"

335msgstr "Introducir %1"

343msgstr "Introducir %1"

336

344

337−#: qml/Shell.qml:328

345+#: qml/Shell.qml:349

338#, qt-format

346#, qt-format

339msgid "Sorry, incorrect %1"

347msgid "Sorry, incorrect %1"

340msgstr "Sentímolo, %1 non coincide"

348msgstr "Sentímolo, %1 non coincide"

341

349

342−#: qml/Shell.qml:363

350+#: qml/Shell.qml:384

343msgid "Sorry, incorrect passphrase."

351msgid "Sorry, incorrect passphrase."

344msgstr "Sentímolo a frase é incorrecta."

352msgstr "Sentímolo a frase é incorrecta."

345

353

346−#: qml/Shell.qml:364

354+#: qml/Shell.qml:385

347msgid "Sorry, incorrect passcode."

355msgid "Sorry, incorrect passcode."

348msgstr "Sentímolo, a clave é incorrecta."

356msgstr "Sentímolo, a clave é incorrecta."

349

357

350−#: qml/Shell.qml:365

358+#: qml/Shell.qml:386

351msgid "This will be your last attempt."

359msgid "This will be your last attempt."

352msgstr "Este será o seu último intento."

360msgstr "Este será o seu último intento."

353

361

354−#: qml/Shell.qml:367

362+#: qml/Shell.qml:388

355msgid ""

363msgid ""

356"If passphrase is entered incorrectly, your phone will conduct a factory "

364"If passphrase is entered incorrectly, your phone will conduct a factory "

357"reset and all personal data will be deleted."

365"reset and all personal data will be deleted."

@@ -359,7 +367,7 @@ msgstr ""

359"Se a frase de paso introducida é incorrecta, o teléfono restabelecerá os "

367"Se a frase de paso introducida é incorrecta, o teléfono restabelecerá os "

360"valores de fábrica e perderá todos os datos persoais."

368"valores de fábrica e perderá todos os datos persoais."

361

369

362−#: qml/Shell.qml:368

370+#: qml/Shell.qml:389

363msgid ""

371msgid ""

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

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

365"and all personal data will be deleted."

373"and all personal data will be deleted."

@@ -383,9 +391,6 @@ msgstr ""

383#~ msgid "Too many incorrect attempts"

391#~ msgid "Too many incorrect attempts"

384#~ msgstr "Demasiados erros"

392#~ msgstr "Demasiados erros"

385

393

386−#~ msgid "Manage Dash"

387−#~ msgstr "Xestión do Panel"

388−

389#, qt-format

394#, qt-format

390#~ msgid "Enter your %1"

395#~ msgid "Enter your %1"

391#~ msgstr "Introducir %1"

396#~ msgstr "Introducir %1"

po/he.po+21−13

@@ -7,7 +7,7 @@ msgid ""

7msgstr ""

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

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

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

10+"POT-Creation-Date: 2014-10-03 08:13-0400\n"

11"PO-Revision-Date: 2014-08-23 14:19+0000\n"

12"Last-Translator: Yaron <sh.yaron@gmail.com>\n"

13"Language-Team: Hebrew <he@li.org>\n"

@@ -15,7 +15,7 @@ msgstr ""

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

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

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

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

18+"X-Launchpad-Export-Date: 2014-10-07 06:58+0000\n"

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

20

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

@@ -154,15 +154,15 @@ msgstr ""

154"ברגעים אלו סיימת את התמחותך בשימוש במחוות קצה והטלפון פתוח לשימושך נא "

155"לגעת במסך כדי להתחיל"

156

157−#: qml/Components/Lockscreen.qml:206

157+#: qml/Components/Lockscreen.qml:218

158msgid "Emergency Call"

159msgstr "שיחת חירום"

160

161−#: qml/Components/Lockscreen.qml:226

161+#: qml/Components/Lockscreen.qml:250

162msgid "OK"

163msgstr "אישור"

164

165−#: qml/Dash/GenericScopeView.qml:411 qml/Dash/GenericScopeView.qml:533

165+#: qml/Dash/GenericScopeView.qml:411 qml/Dash/GenericScopeView.qml:568

166msgid "See less"

167msgstr "לראות פחות"

168

@@ -207,6 +207,14 @@ msgstr "הוספת סקירה"

207msgid "Send"

208msgstr "שליחה"

209

210+#: qml/Dash/PullToRefreshScopeStyle.qml:55

211+msgid "Pull to refresh…"

212+msgstr ""

213+

214+#: qml/Dash/PullToRefreshScopeStyle.qml:60

215+msgid "Release to refresh…"

216+msgstr ""

217+

210#: qml/Dash/ScopesOverview.qml:206

218#: qml/Dash/ScopesOverview.qml:206

211msgid "Manage Scopes"

219msgid "Manage Scopes"

212msgstr ""

220msgstr ""

@@ -311,7 +319,7 @@ msgstr "נדידה"

311msgid "Enter passphrase"

319msgid "Enter passphrase"

312msgstr ""

320msgstr ""

313

321

314−#: qml/Shell.qml:321

322+#: qml/Shell.qml:341

315msgid "Sorry, incorrect passphrase"

323msgid "Sorry, incorrect passphrase"

316msgstr "מילת הצופן שגויה, עמך הסליחה."

324msgstr "מילת הצופן שגויה, עמך הסליחה."

317

325

@@ -323,7 +331,7 @@ msgstr ""

323msgid "Enter passcode"

331msgid "Enter passcode"

324msgstr ""

332msgstr ""

325

333

326−#: qml/Shell.qml:324

334+#: qml/Shell.qml:345

327msgid "Sorry, incorrect passcode"

335msgid "Sorry, incorrect passcode"

328msgstr ""

336msgstr ""

329

337

@@ -332,30 +340,30 @@ msgstr ""

332msgid "Enter %1"

340msgid "Enter %1"

333msgstr ""

341msgstr ""

334

342

335−#: qml/Shell.qml:328

343+#: qml/Shell.qml:349

336#, qt-format

344#, qt-format

337msgid "Sorry, incorrect %1"

345msgid "Sorry, incorrect %1"

338msgstr ""

346msgstr ""

339

347

340−#: qml/Shell.qml:363

348+#: qml/Shell.qml:384

341msgid "Sorry, incorrect passphrase."

349msgid "Sorry, incorrect passphrase."

342msgstr "מילת הצופן שגויה, עמך הסליחה."

350msgstr "מילת הצופן שגויה, עמך הסליחה."

343

351

344−#: qml/Shell.qml:364

352+#: qml/Shell.qml:385

345msgid "Sorry, incorrect passcode."

353msgid "Sorry, incorrect passcode."

346msgstr "הצופן שגוי, עם הסליחה."

354msgstr "הצופן שגוי, עם הסליחה."

347

355

348−#: qml/Shell.qml:365

356+#: qml/Shell.qml:386

349msgid "This will be your last attempt."

357msgid "This will be your last attempt."

350msgstr "זה יהיה הניסיון האחרון שלך."

358msgstr "זה יהיה הניסיון האחרון שלך."

351

359

352−#: qml/Shell.qml:367

360+#: qml/Shell.qml:388

353msgid ""

361msgid ""

354"If passphrase is entered incorrectly, your phone will conduct a factory "

362"If passphrase is entered incorrectly, your phone will conduct a factory "

355"reset and all personal data will be deleted."

363"reset and all personal data will be deleted."

356msgstr ""

364msgstr ""

357

365

358−#: qml/Shell.qml:368

366+#: qml/Shell.qml:389

359msgid ""

367msgid ""

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

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

361"and all personal data will be deleted."

369"and all personal data will be deleted."

po/hi.po+21−13

@@ -7,7 +7,7 @@ msgid ""

7msgstr ""

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

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

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

10+"POT-Creation-Date: 2014-10-03 08:13-0400\n"

11"PO-Revision-Date: 2014-01-15 01:49+0000\n"

12"Last-Translator: Siddhanathan S. <Unknown>\n"

13"Language-Team: Hindi <hi@li.org>\n"

@@ -15,7 +15,7 @@ msgstr ""

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

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

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

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

18+"X-Launchpad-Export-Date: 2014-10-07 06:58+0000\n"

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

20

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

@@ -152,15 +152,15 @@ msgid ""

152"phone Tap on the screen to start"

153msgstr ""

154

155−#: qml/Components/Lockscreen.qml:206

155+#: qml/Components/Lockscreen.qml:218

156msgid "Emergency Call"

157msgstr "आपातकालीन कॉल"

158

159−#: qml/Components/Lockscreen.qml:226

159+#: qml/Components/Lockscreen.qml:250

160msgid "OK"

161msgstr ""

162

163−#: qml/Dash/GenericScopeView.qml:411 qml/Dash/GenericScopeView.qml:533

163+#: qml/Dash/GenericScopeView.qml:411 qml/Dash/GenericScopeView.qml:568

164msgid "See less"

165msgstr ""

166

@@ -205,6 +205,14 @@ msgstr "समीक्षा दे"

205msgid "Send"

206msgstr "भेजें"

207

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+

208#: qml/Dash/ScopesOverview.qml:206

216#: qml/Dash/ScopesOverview.qml:206

209msgid "Manage Scopes"

217msgid "Manage Scopes"

210msgstr ""

218msgstr ""

@@ -309,7 +317,7 @@ msgstr ""

309msgid "Enter passphrase"

317msgid "Enter passphrase"

310msgstr ""

318msgstr ""

311

319

312−#: qml/Shell.qml:321

320+#: qml/Shell.qml:341

313msgid "Sorry, incorrect passphrase"

321msgid "Sorry, incorrect passphrase"

314msgstr ""

322msgstr ""

315

323

@@ -321,7 +329,7 @@ msgstr ""

321msgid "Enter passcode"

329msgid "Enter passcode"

322msgstr ""

330msgstr ""

323

331

324−#: qml/Shell.qml:324

332+#: qml/Shell.qml:345

325msgid "Sorry, incorrect passcode"

333msgid "Sorry, incorrect passcode"

326msgstr ""

334msgstr ""

327

335

@@ -330,30 +338,30 @@ msgstr ""

330msgid "Enter %1"

338msgid "Enter %1"

331msgstr ""

339msgstr ""

332

340

333−#: qml/Shell.qml:328

341+#: qml/Shell.qml:349

334#, qt-format

342#, qt-format

335msgid "Sorry, incorrect %1"

343msgid "Sorry, incorrect %1"

336msgstr ""

344msgstr ""

337

345

338−#: qml/Shell.qml:363

346+#: qml/Shell.qml:384

339msgid "Sorry, incorrect passphrase."

347msgid "Sorry, incorrect passphrase."

340msgstr ""

348msgstr ""

341

349

342−#: qml/Shell.qml:364

350+#: qml/Shell.qml:385

343msgid "Sorry, incorrect passcode."

351msgid "Sorry, incorrect passcode."

344msgstr ""

352msgstr ""

345

353

346−#: qml/Shell.qml:365

354+#: qml/Shell.qml:386

347msgid "This will be your last attempt."

355msgid "This will be your last attempt."

348msgstr ""

356msgstr ""

349

357

350−#: qml/Shell.qml:367

358+#: qml/Shell.qml:388

351msgid ""

359msgid ""

352"If passphrase is entered incorrectly, your phone will conduct a factory "

360"If passphrase is entered incorrectly, your phone will conduct a factory "

353"reset and all personal data will be deleted."

361"reset and all personal data will be deleted."

354msgstr ""

362msgstr ""

355

363

356−#: qml/Shell.qml:368

364+#: qml/Shell.qml:389

357msgid ""

365msgid ""

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

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

359"and all personal data will be deleted."

367"and all personal data will be deleted."

po/hr.po+21−13

@@ -7,7 +7,7 @@ msgid ""

7msgstr ""

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

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

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

10+"POT-Creation-Date: 2014-10-03 08:13-0400\n"

11"PO-Revision-Date: 2013-06-27 04:14+0000\n"

12"Last-Translator: Michał Sawicz <michal.sawicz@canonical.com>\n"

13"Language-Team: Croatian <hr@li.org>\n"

@@ -16,7 +16,7 @@ msgstr ""

16"Content-Transfer-Encoding: 8bit\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"

19+"X-Launchpad-Export-Date: 2014-10-07 06:59+0000\n"

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

21

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

@@ -153,15 +153,15 @@ msgid ""

153"phone Tap on the screen to start"

154msgstr ""

155

156−#: qml/Components/Lockscreen.qml:206

156+#: qml/Components/Lockscreen.qml:218

157msgid "Emergency Call"

158msgstr ""

159

160−#: qml/Components/Lockscreen.qml:226

160+#: qml/Components/Lockscreen.qml:250

161msgid "OK"

162msgstr ""

163

164−#: qml/Dash/GenericScopeView.qml:411 qml/Dash/GenericScopeView.qml:533

164+#: qml/Dash/GenericScopeView.qml:411 qml/Dash/GenericScopeView.qml:568

165msgid "See less"

166msgstr ""

167

@@ -206,6 +206,14 @@ msgstr ""

206msgid "Send"

207msgstr ""

208

209+#: qml/Dash/PullToRefreshScopeStyle.qml:55

210+msgid "Pull to refresh…"

211+msgstr ""

212+

213+#: qml/Dash/PullToRefreshScopeStyle.qml:60

214+msgid "Release to refresh…"

215+msgstr ""

216+

209#: qml/Dash/ScopesOverview.qml:206

217#: qml/Dash/ScopesOverview.qml:206

210msgid "Manage Scopes"

218msgid "Manage Scopes"

211msgstr ""

219msgstr ""

@@ -310,7 +318,7 @@ msgstr ""

310msgid "Enter passphrase"

318msgid "Enter passphrase"

311msgstr ""

319msgstr ""

312

320

313−#: qml/Shell.qml:321

321+#: qml/Shell.qml:341

314msgid "Sorry, incorrect passphrase"

322msgid "Sorry, incorrect passphrase"

315msgstr ""

323msgstr ""

316

324

@@ -322,7 +330,7 @@ msgstr ""

322msgid "Enter passcode"

330msgid "Enter passcode"

323msgstr ""

331msgstr ""

324

332

325−#: qml/Shell.qml:324

333+#: qml/Shell.qml:345

326msgid "Sorry, incorrect passcode"

334msgid "Sorry, incorrect passcode"

327msgstr ""

335msgstr ""

328

336

@@ -331,30 +339,30 @@ msgstr ""

331msgid "Enter %1"

339msgid "Enter %1"

332msgstr ""

340msgstr ""

333

341

334−#: qml/Shell.qml:328

342+#: qml/Shell.qml:349

335#, qt-format

343#, qt-format

336msgid "Sorry, incorrect %1"

344msgid "Sorry, incorrect %1"

337msgstr ""

345msgstr ""

338

346

339−#: qml/Shell.qml:363

347+#: qml/Shell.qml:384

340msgid "Sorry, incorrect passphrase."

348msgid "Sorry, incorrect passphrase."

341msgstr ""

349msgstr ""

342

350

343−#: qml/Shell.qml:364

351+#: qml/Shell.qml:385

344msgid "Sorry, incorrect passcode."

352msgid "Sorry, incorrect passcode."

345msgstr ""

353msgstr ""

346

354

347−#: qml/Shell.qml:365

355+#: qml/Shell.qml:386

348msgid "This will be your last attempt."

356msgid "This will be your last attempt."

349msgstr ""

357msgstr ""

350

358

351−#: qml/Shell.qml:367

359+#: qml/Shell.qml:388

352msgid ""

360msgid ""

353"If passphrase is entered incorrectly, your phone will conduct a factory "

361"If passphrase is entered incorrectly, your phone will conduct a factory "

354"reset and all personal data will be deleted."

362"reset and all personal data will be deleted."

355msgstr ""

363msgstr ""

356

364

357−#: qml/Shell.qml:368

365+#: qml/Shell.qml:389

358msgid ""

366msgid ""

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

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

360"and all personal data will be deleted."

368"and all personal data will be deleted."

po/hu.po+32−27

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

7msgstr ""

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

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

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

10+"POT-Creation-Date: 2014-10-03 08:13-0400\n"

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

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

12"Last-Translator: Richard Somlói <ricsipontaz@gmail.com>\n"

13"Language-Team: Hungarian <hu@li.org>\n"

14"MIME-Version: 1.0\n"

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

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

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

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

18+"X-Launchpad-Export-Date: 2014-10-07 06:58+0000\n"

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

20

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

@@ -33,22 +33,22 @@ msgstr "Indító feloldása"

33

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

35msgid "Device Locked"

36−msgstr ""

36+msgstr "Eszköz lezárva"

37

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

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

40−msgstr ""

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

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

44−msgstr ""

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

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

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

50−msgstr[0] ""

50+msgstr[0] "Kérjük várjon %1 percet és próbálja újra…"

51−msgstr[1] ""

51+msgstr[1] "Kérjük várjon %1 percet és próbálja újra…"

52

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

54msgid "Log out"

@@ -158,15 +158,15 @@ msgstr ""

158"Elsajátította a gesztusokat, és megkezdheti a telefon "

159"használatát. Koppintson a képernyőre a kezdéshez."

160

161−#: qml/Components/Lockscreen.qml:206

161+#: qml/Components/Lockscreen.qml:218

162msgid "Emergency Call"

163msgstr "Vészhívás"

164

165−#: qml/Components/Lockscreen.qml:226

165+#: qml/Components/Lockscreen.qml:250

166msgid "OK"

167msgstr "Ok"

168

169−#: qml/Dash/GenericScopeView.qml:411 qml/Dash/GenericScopeView.qml:533

169+#: qml/Dash/GenericScopeView.qml:411 qml/Dash/GenericScopeView.qml:568

170msgid "See less"

171msgstr "Kevesebb"

172

@@ -211,6 +211,14 @@ msgstr "Értékelés hozzáadása"

211msgid "Send"

212msgstr "Küldés"

213

214+#: qml/Dash/PullToRefreshScopeStyle.qml:55

215+msgid "Pull to refresh…"

216+msgstr ""

217+

218+#: qml/Dash/PullToRefreshScopeStyle.qml:60

219+msgid "Release to refresh…"

220+msgstr ""

221+

214#: qml/Dash/ScopesOverview.qml:206

222#: qml/Dash/ScopesOverview.qml:206

215msgid "Manage Scopes"

223msgid "Manage Scopes"

216msgstr "Lencsék kezelése"

224msgstr "Lencsék kezelése"

@@ -233,7 +241,7 @@ msgstr "Összes"

233

241

234#: qml/Greeter/Greeter.qml:157

242#: qml/Greeter/Greeter.qml:157

235msgid "Unlock"

243msgid "Unlock"

236−msgstr ""

244+msgstr "Feloldás"

237

245

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

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

239msgid "Confirm"

247msgid "Confirm"

@@ -313,47 +321,47 @@ msgstr "Barangolás"

313

321

314#: qml/Shell.qml:340

322#: qml/Shell.qml:340

315msgid "Enter passphrase"

323msgid "Enter passphrase"

316−msgstr ""

324+msgstr "Jelmondat megadása"

317

325

318−#: qml/Shell.qml:321

326+#: qml/Shell.qml:341

319msgid "Sorry, incorrect passphrase"

327msgid "Sorry, incorrect passphrase"

320msgstr "Sajnáljuk, helytelen jelmondat"

328msgstr "Sajnáljuk, helytelen jelmondat"

321

329

322#: qml/Shell.qml:342

330#: qml/Shell.qml:342

323msgid "Please re-enter"

331msgid "Please re-enter"

324−msgstr ""

332+msgstr "Kérjük adja meg újra"

325

333

326#: qml/Shell.qml:344

334#: qml/Shell.qml:344

327msgid "Enter passcode"

335msgid "Enter passcode"

328−msgstr ""

336+msgstr "Jelkód megadása"

329

337

330−#: qml/Shell.qml:324

338+#: qml/Shell.qml:345

331msgid "Sorry, incorrect passcode"

339msgid "Sorry, incorrect passcode"

332msgstr "Sajnáljuk, helytelen jelkód"

340msgstr "Sajnáljuk, helytelen jelkód"

333

341

334#: qml/Shell.qml:348

342#: qml/Shell.qml:348

335#, qt-format

343#, qt-format

336msgid "Enter %1"

344msgid "Enter %1"

337−msgstr ""

345+msgstr "Adja meg: %1"

338

346

339−#: qml/Shell.qml:328

347+#: qml/Shell.qml:349

340#, qt-format

348#, qt-format

341msgid "Sorry, incorrect %1"

349msgid "Sorry, incorrect %1"

342msgstr "Sajnáljuk, helytelen %1"

350msgstr "Sajnáljuk, helytelen %1"

343

351

344−#: qml/Shell.qml:363

352+#: qml/Shell.qml:384

345msgid "Sorry, incorrect passphrase."

353msgid "Sorry, incorrect passphrase."

346msgstr "Sajnáljuk, helytelen jelmondat."

354msgstr "Sajnáljuk, helytelen jelmondat."

347

355

348−#: qml/Shell.qml:364

356+#: qml/Shell.qml:385

349msgid "Sorry, incorrect passcode."

357msgid "Sorry, incorrect passcode."

350msgstr "Sajnáljuk, helytelen jelkód."

358msgstr "Sajnáljuk, helytelen jelkód."

351

359

352−#: qml/Shell.qml:365

360+#: qml/Shell.qml:386

353msgid "This will be your last attempt."

361msgid "This will be your last attempt."

354msgstr "Ez az utolsó próbálkozási lehetősége."

362msgstr "Ez az utolsó próbálkozási lehetősége."

355

363

356−#: qml/Shell.qml:367

364+#: qml/Shell.qml:388

357msgid ""

365msgid ""

358"If passphrase is entered incorrectly, your phone will conduct a factory "

366"If passphrase is entered incorrectly, your phone will conduct a factory "

359"reset and all personal data will be deleted."

367"reset and all personal data will be deleted."

@@ -361,7 +369,7 @@ msgstr ""

361"Ha helytelen jelmondatot ad meg, a telefonja visszaállítja a gyári "

369"Ha helytelen jelmondatot ad meg, a telefonja visszaállítja a gyári "

362"beállításokat és törli minden személyes adatát."

370"beállításokat és törli minden személyes adatát."

363

371

364−#: qml/Shell.qml:368

372+#: qml/Shell.qml:389

365msgid ""

373msgid ""

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

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

367"and all personal data will be deleted."

375"and all personal data will be deleted."

@@ -385,9 +393,6 @@ msgstr ""

385#~ msgid "Too many incorrect attempts"

393#~ msgid "Too many incorrect attempts"

386#~ msgstr "Túl sok sikertelen kísérlet"

394#~ msgstr "Túl sok sikertelen kísérlet"

387

395

388−#~ msgid "Manage Dash"

389−#~ msgstr "Dash kezelése"

390−

391#~ msgid "Enter your passphrase"

396#~ msgid "Enter your passphrase"

392#~ msgstr "Adja meg a jelmondatot"

397#~ msgstr "Adja meg a jelmondatot"

393

398

po/hy.po+21−13

@@ -7,7 +7,7 @@ msgid ""

7msgstr ""

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

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

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

10+"POT-Creation-Date: 2014-10-03 08:13-0400\n"

11"PO-Revision-Date: 2013-06-27 04:43+0000\n"

12"Last-Translator: iAbaS <sosabazyan@yandex.ru>\n"

13"Language-Team: Armenian <hy@li.org>\n"

@@ -15,7 +15,7 @@ msgstr ""

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

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

17"Plural-Forms: nplurals=1; plural=0;\n"

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

18+"X-Launchpad-Export-Date: 2014-10-07 06:58+0000\n"

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

20

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

@@ -152,15 +152,15 @@ msgid ""

152"phone Tap on the screen to start"

153msgstr ""

154

155−#: qml/Components/Lockscreen.qml:206

155+#: qml/Components/Lockscreen.qml:218

156msgid "Emergency Call"

157msgstr ""

158

159−#: qml/Components/Lockscreen.qml:226

159+#: qml/Components/Lockscreen.qml:250

160msgid "OK"

161msgstr ""

162

163−#: qml/Dash/GenericScopeView.qml:411 qml/Dash/GenericScopeView.qml:533

163+#: qml/Dash/GenericScopeView.qml:411 qml/Dash/GenericScopeView.qml:568

164msgid "See less"

165msgstr ""

166

@@ -205,6 +205,14 @@ msgstr ""

205msgid "Send"

206msgstr ""

207

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+

208#: qml/Dash/ScopesOverview.qml:206

216#: qml/Dash/ScopesOverview.qml:206

209msgid "Manage Scopes"

217msgid "Manage Scopes"

210msgstr ""

218msgstr ""

@@ -309,7 +317,7 @@ msgstr ""

309msgid "Enter passphrase"

317msgid "Enter passphrase"

310msgstr ""

318msgstr ""

311

319

312−#: qml/Shell.qml:321

320+#: qml/Shell.qml:341

313msgid "Sorry, incorrect passphrase"

321msgid "Sorry, incorrect passphrase"

314msgstr ""

322msgstr ""

315

323

@@ -321,7 +329,7 @@ msgstr ""

321msgid "Enter passcode"

329msgid "Enter passcode"

322msgstr ""

330msgstr ""

323

331

324−#: qml/Shell.qml:324

332+#: qml/Shell.qml:345

325msgid "Sorry, incorrect passcode"

333msgid "Sorry, incorrect passcode"

326msgstr ""

334msgstr ""

327

335

@@ -330,30 +338,30 @@ msgstr ""

330msgid "Enter %1"

338msgid "Enter %1"

331msgstr ""

339msgstr ""

332

340

333−#: qml/Shell.qml:328

341+#: qml/Shell.qml:349

334#, qt-format

342#, qt-format

335msgid "Sorry, incorrect %1"

343msgid "Sorry, incorrect %1"

336msgstr ""

344msgstr ""

337

345

338−#: qml/Shell.qml:363

346+#: qml/Shell.qml:384

339msgid "Sorry, incorrect passphrase."

347msgid "Sorry, incorrect passphrase."

340msgstr ""

348msgstr ""

341

349

342−#: qml/Shell.qml:364

350+#: qml/Shell.qml:385

343msgid "Sorry, incorrect passcode."

351msgid "Sorry, incorrect passcode."

344msgstr ""

352msgstr ""

345

353

346−#: qml/Shell.qml:365

354+#: qml/Shell.qml:386

347msgid "This will be your last attempt."

355msgid "This will be your last attempt."

348msgstr ""

356msgstr ""

349

357

350−#: qml/Shell.qml:367

358+#: qml/Shell.qml:388

351msgid ""

359msgid ""

352"If passphrase is entered incorrectly, your phone will conduct a factory "

360"If passphrase is entered incorrectly, your phone will conduct a factory "

353"reset and all personal data will be deleted."

361"reset and all personal data will be deleted."

354msgstr ""

362msgstr ""

355

363

356−#: qml/Shell.qml:368

364+#: qml/Shell.qml:389

357msgid ""

365msgid ""

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

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

359"and all personal data will be deleted."

367"and all personal data will be deleted."

po/id.po+21−13

@@ -7,7 +7,7 @@ msgid ""

7msgstr ""

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

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

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

10+"POT-Creation-Date: 2014-10-03 08:13-0400\n"

11"PO-Revision-Date: 2013-06-26 22:35+0000\n"

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

13"Language-Team: Indonesian <id@li.org>\n"

@@ -15,7 +15,7 @@ msgstr ""

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

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

17"Plural-Forms: nplurals=1; plural=0;\n"

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

18+"X-Launchpad-Export-Date: 2014-10-07 06:59+0000\n"

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

20

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

@@ -152,15 +152,15 @@ msgid ""

152"phone Tap on the screen to start"

153msgstr ""

154

155−#: qml/Components/Lockscreen.qml:206

155+#: qml/Components/Lockscreen.qml:218

156msgid "Emergency Call"

157msgstr ""

158

159−#: qml/Components/Lockscreen.qml:226

159+#: qml/Components/Lockscreen.qml:250

160msgid "OK"

161msgstr ""

162

163−#: qml/Dash/GenericScopeView.qml:411 qml/Dash/GenericScopeView.qml:533

163+#: qml/Dash/GenericScopeView.qml:411 qml/Dash/GenericScopeView.qml:568

164msgid "See less"

165msgstr ""

166

@@ -205,6 +205,14 @@ msgstr ""

205msgid "Send"

206msgstr ""

207

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+

208#: qml/Dash/ScopesOverview.qml:206

216#: qml/Dash/ScopesOverview.qml:206

209msgid "Manage Scopes"

217msgid "Manage Scopes"

210msgstr ""

218msgstr ""

@@ -309,7 +317,7 @@ msgstr ""

309msgid "Enter passphrase"

317msgid "Enter passphrase"

310msgstr ""

318msgstr ""

311

319

312−#: qml/Shell.qml:321

320+#: qml/Shell.qml:341

313msgid "Sorry, incorrect passphrase"

321msgid "Sorry, incorrect passphrase"

314msgstr ""

322msgstr ""

315

323

@@ -321,7 +329,7 @@ msgstr ""

321msgid "Enter passcode"

329msgid "Enter passcode"

322msgstr ""

330msgstr ""

323

331

324−#: qml/Shell.qml:324

332+#: qml/Shell.qml:345

325msgid "Sorry, incorrect passcode"

333msgid "Sorry, incorrect passcode"

326msgstr ""

334msgstr ""

327

335

@@ -330,30 +338,30 @@ msgstr ""

330msgid "Enter %1"

338msgid "Enter %1"

331msgstr ""

339msgstr ""

332

340

333−#: qml/Shell.qml:328

341+#: qml/Shell.qml:349

334#, qt-format

342#, qt-format

335msgid "Sorry, incorrect %1"

343msgid "Sorry, incorrect %1"

336msgstr ""

344msgstr ""

337

345

338−#: qml/Shell.qml:363

346+#: qml/Shell.qml:384

339msgid "Sorry, incorrect passphrase."

347msgid "Sorry, incorrect passphrase."

340msgstr ""

348msgstr ""

341

349

342−#: qml/Shell.qml:364

350+#: qml/Shell.qml:385

343msgid "Sorry, incorrect passcode."

351msgid "Sorry, incorrect passcode."

344msgstr ""

352msgstr ""

345

353

346−#: qml/Shell.qml:365

354+#: qml/Shell.qml:386

347msgid "This will be your last attempt."

355msgid "This will be your last attempt."

348msgstr ""

356msgstr ""

349

357

350−#: qml/Shell.qml:367

358+#: qml/Shell.qml:388

351msgid ""

359msgid ""

352"If passphrase is entered incorrectly, your phone will conduct a factory "

360"If passphrase is entered incorrectly, your phone will conduct a factory "

353"reset and all personal data will be deleted."

361"reset and all personal data will be deleted."

354msgstr ""

362msgstr ""

355

363

356−#: qml/Shell.qml:368

364+#: qml/Shell.qml:389

357msgid ""

365msgid ""

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

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

359"and all personal data will be deleted."

367"and all personal data will be deleted."

po/is.po+51−24

@@ -9,15 +9,15 @@ msgid ""

9msgstr ""

10"Project-Id-Version: po_unity8-is\n"

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

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

12+"POT-Creation-Date: 2014-10-03 08:13-0400\n"

13−"PO-Revision-Date: 2014-09-21 12:07+0000\n"

13+"PO-Revision-Date: 2014-10-05 08:44+0000\n"

14"Last-Translator: Sveinn í Felli <sv1@fellsnet.is>\n"

15"Language-Team: Icelandic <translation-team-is@lists.sourceforge.net>\n"

16"MIME-Version: 1.0\n"

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

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

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

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

20+"X-Launchpad-Export-Date: 2014-10-07 06:59+0000\n"

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

22"Language: is\n"

23

@@ -59,7 +59,7 @@ msgstr "Útskráning"

59

60#: qml/Components/Dialogs.qml:71

61msgid "Are you sure you want to log out?"

62−msgstr ""

62+msgstr "Ertu viss um að þú viljir skrá þig út?"

63

64#: qml/Components/Dialogs.qml:73 qml/Components/Dialogs.qml:97

65#: qml/Components/Dialogs.qml:122

@@ -77,7 +77,7 @@ msgstr "Slökkva á tölvunni"

77

78#: qml/Components/Dialogs.qml:95

79msgid "Are you sure you want to shut down?"

80−msgstr ""

80+msgstr "Ertu viss um að þú viljir slökkva á símanum?"

81

82#: qml/Components/Dialogs.qml:119

83msgid "Reboot"

@@ -85,7 +85,7 @@ msgstr "Endurræsa"

85

86#: qml/Components/Dialogs.qml:120

87msgid "Are you sure you want to reboot?"

88−msgstr ""

88+msgstr "Ertu viss að þú viljir enduræsa?"

89

90#: qml/Components/Dialogs.qml:144

91msgid "Power"

@@ -96,6 +96,8 @@ msgid ""

96"Are you sure you would like\n"

97"to power off?"

98msgstr ""

99+"Ertu viss um að þú viljir\n"

100+"slökkva á símanum?"

99

101

100#: qml/Components/Dialogs.qml:147

102#: qml/Components/Dialogs.qml:147

101msgid "Power off"

103msgid "Power off"

@@ -158,15 +160,15 @@ msgstr ""

158"Þú ert núna með æfingu í að nota skjáhreyfingar og getur því farið að nota "

160"Þú ert núna með æfingu í að nota skjáhreyfingar og getur því farið að nota "

159"símann Sláðu létt á skjáinn til að byrja"

161"símann Sláðu létt á skjáinn til að byrja"

160

162

161−#: qml/Components/Lockscreen.qml:206

163+#: qml/Components/Lockscreen.qml:218

162msgid "Emergency Call"

164msgid "Emergency Call"

163msgstr "Neyðarsímtal"

165msgstr "Neyðarsímtal"

164

166

165−#: qml/Components/Lockscreen.qml:226

167+#: qml/Components/Lockscreen.qml:250

166msgid "OK"

168msgid "OK"

167msgstr "Í lagi"

169msgstr "Í lagi"

168

170

169−#: qml/Dash/GenericScopeView.qml:411 qml/Dash/GenericScopeView.qml:533

171+#: qml/Dash/GenericScopeView.qml:411 qml/Dash/GenericScopeView.qml:568

170msgid "See less"

172msgid "See less"

171msgstr "Sjá minna"

173msgstr "Sjá minna"

172

174

@@ -211,6 +213,14 @@ msgstr "Gefa umsögn"

211msgid "Send"

213msgid "Send"

212msgstr "Senda"

214msgstr "Senda"

213

215

216+#: qml/Dash/PullToRefreshScopeStyle.qml:55

217+msgid "Pull to refresh…"

218+msgstr ""

219+

220+#: qml/Dash/PullToRefreshScopeStyle.qml:60

221+msgid "Release to refresh…"

222+msgstr ""

223+

214#: qml/Dash/ScopesOverview.qml:206

224#: qml/Dash/ScopesOverview.qml:206

215msgid "Manage Scopes"

225msgid "Manage Scopes"

216msgstr ""

226msgstr ""

@@ -309,15 +319,15 @@ msgstr "Aflæsa SIM-korti"

309

319

310#: qml/Panel/Indicators/RoamingIndication.qml:27

320#: qml/Panel/Indicators/RoamingIndication.qml:27

311msgid "Roaming"

321msgid "Roaming"

312−msgstr ""

322+msgstr "Ráphamur"

313

323

314#: qml/Shell.qml:340

324#: qml/Shell.qml:340

315msgid "Enter passphrase"

325msgid "Enter passphrase"

316msgstr ""

326msgstr ""

317

327

318−#: qml/Shell.qml:321

328+#: qml/Shell.qml:341

319msgid "Sorry, incorrect passphrase"

329msgid "Sorry, incorrect passphrase"

320−msgstr ""

330+msgstr "Því miður, rangt lykilorð"

321

331

322#: qml/Shell.qml:342

332#: qml/Shell.qml:342

323msgid "Please re-enter"

333msgid "Please re-enter"

@@ -327,43 +337,47 @@ msgstr ""

327msgid "Enter passcode"

337msgid "Enter passcode"

328msgstr ""

338msgstr ""

329

339

330−#: qml/Shell.qml:324

340+#: qml/Shell.qml:345

331msgid "Sorry, incorrect passcode"

341msgid "Sorry, incorrect passcode"

332−msgstr ""

342+msgstr "Því miður, rangur aðgangskóði"

333

343

334#: qml/Shell.qml:348

344#: qml/Shell.qml:348

335#, qt-format

345#, qt-format

336msgid "Enter %1"

346msgid "Enter %1"

337msgstr ""

347msgstr ""

338

348

339−#: qml/Shell.qml:328

349+#: qml/Shell.qml:349

340#, qt-format

350#, qt-format

341msgid "Sorry, incorrect %1"

351msgid "Sorry, incorrect %1"

342−msgstr ""

352+msgstr "Því miður, rangt %1"

343

353

344−#: qml/Shell.qml:363

354+#: qml/Shell.qml:384

345msgid "Sorry, incorrect passphrase."

355msgid "Sorry, incorrect passphrase."

346−msgstr ""

356+msgstr "Því miður, rangt lykilorð."

347

357

348−#: qml/Shell.qml:364

358+#: qml/Shell.qml:385

349msgid "Sorry, incorrect passcode."

359msgid "Sorry, incorrect passcode."

350−msgstr ""

360+msgstr "Því miður, rangur aðgangskóði."

351

361

352−#: qml/Shell.qml:365

362+#: qml/Shell.qml:386

353msgid "This will be your last attempt."

363msgid "This will be your last attempt."

354−msgstr ""

364+msgstr "Þetta mun verða síðasta tilraunin þín."

355

365

356−#: qml/Shell.qml:367

366+#: qml/Shell.qml:388

357msgid ""

367msgid ""

358"If passphrase is entered incorrectly, your phone will conduct a factory "

368"If passphrase is entered incorrectly, your phone will conduct a factory "

359"reset and all personal data will be deleted."

369"reset and all personal data will be deleted."

360msgstr ""

370msgstr ""

371+"Ef lykilorð er rangt, mun síminn frumstilla allt á verksmiðjustillingar og "

372+"öllum einkagögnum verður eytt."

361

373

362−#: qml/Shell.qml:368

374+#: qml/Shell.qml:389

363msgid ""

375msgid ""

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

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

365"and all personal data will be deleted."

377"and all personal data will be deleted."

366msgstr ""

378msgstr ""

379+"Ef aðgangskóði er rangur, mun síminn frumstilla allt á verksmiðjustillingar "

380+"og öllum einkagögnum verður eytt."

367

381

368#, qt-format

382#, qt-format

369#~ msgid "Hello %1"

383#~ msgid "Hello %1"

@@ -377,3 +391,16 @@ msgstr ""

377

391

378#~ msgid "Please wait"

392#~ msgid "Please wait"

379#~ msgstr "Bíddu aðeins"

393#~ msgstr "Bíddu aðeins"

394+

395+#~ msgid "Too many incorrect attempts"

396+#~ msgstr "Of margar rangar tilraunir"

397+

398+#~ msgid "Enter your passphrase"

399+#~ msgstr "Sláðu inn lykilorðið þitt"

400+

401+#~ msgid "Enter your passcode"

402+#~ msgstr "Settu inn aðgangskóðann þinn"

403+

404+#, qt-format

405+#~ msgid "Enter your %1"

406+#~ msgstr "Settu inn %1"

po/it.po+21−16

@@ -7,7 +7,7 @@ msgid ""

7msgstr ""

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

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

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

10+"POT-Creation-Date: 2014-10-03 08:13-0400\n"

11"PO-Revision-Date: 2014-09-30 10:56+0000\n"

12"Last-Translator: Claudio Arseni <claudio.arseni@gmail.com>\n"

13"Language-Team: Italian <it@li.org>\n"

@@ -15,7 +15,7 @@ msgstr ""

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

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

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

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

18+"X-Launchpad-Export-Date: 2014-10-07 06:59+0000\n"

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

20

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

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

161"L'apprendimento dei gesti è stato completato. È ora possibile iniziare a "

162"usare il telefono. Toccare lo schermo per iniziare"

163

164−#: qml/Components/Lockscreen.qml:206

164+#: qml/Components/Lockscreen.qml:218

165msgid "Emergency Call"

166msgstr "Chiamata di emergenza"

167

168−#: qml/Components/Lockscreen.qml:226

168+#: qml/Components/Lockscreen.qml:250

169msgid "OK"

170msgstr "OK"

171

172−#: qml/Dash/GenericScopeView.qml:411 qml/Dash/GenericScopeView.qml:533

172+#: qml/Dash/GenericScopeView.qml:411 qml/Dash/GenericScopeView.qml:568

173msgid "See less"

174msgstr "Mostra meno"

175

@@ -214,6 +214,14 @@ msgstr "Aggiungi una recensione"

214msgid "Send"

215msgstr "Invia"

216

217+#: qml/Dash/PullToRefreshScopeStyle.qml:55

218+msgid "Pull to refresh…"

219+msgstr ""

220+

221+#: qml/Dash/PullToRefreshScopeStyle.qml:60

222+msgid "Release to refresh…"

223+msgstr ""

224+

217#: qml/Dash/ScopesOverview.qml:206

225#: qml/Dash/ScopesOverview.qml:206

218msgid "Manage Scopes"

226msgid "Manage Scopes"

219msgstr "Gestisci Scope"

227msgstr "Gestisci Scope"

@@ -318,7 +326,7 @@ msgstr "Roaming"

318msgid "Enter passphrase"

326msgid "Enter passphrase"

319msgstr ""

327msgstr ""

320

328

321−#: qml/Shell.qml:321

329+#: qml/Shell.qml:341

322msgid "Sorry, incorrect passphrase"

330msgid "Sorry, incorrect passphrase"

323msgstr "Passphrase errata"

331msgstr "Passphrase errata"

324

332

@@ -330,7 +338,7 @@ msgstr ""

330msgid "Enter passcode"

338msgid "Enter passcode"

331msgstr ""

339msgstr ""

332

340

333−#: qml/Shell.qml:324

341+#: qml/Shell.qml:345

334msgid "Sorry, incorrect passcode"

342msgid "Sorry, incorrect passcode"

335msgstr "Passcode non corretto"

343msgstr "Passcode non corretto"

336

344

@@ -339,24 +347,24 @@ msgstr "Passcode non corretto"

339msgid "Enter %1"

347msgid "Enter %1"

340msgstr ""

348msgstr ""

341

349

342−#: qml/Shell.qml:328

350+#: qml/Shell.qml:349

343#, qt-format

351#, qt-format

344msgid "Sorry, incorrect %1"

352msgid "Sorry, incorrect %1"

345msgstr "%1 non corretto"

353msgstr "%1 non corretto"

346

354

347−#: qml/Shell.qml:363

355+#: qml/Shell.qml:384

348msgid "Sorry, incorrect passphrase."

356msgid "Sorry, incorrect passphrase."

349msgstr "Passphrase non corretta"

357msgstr "Passphrase non corretta"

350

358

351−#: qml/Shell.qml:364

359+#: qml/Shell.qml:385

352msgid "Sorry, incorrect passcode."

360msgid "Sorry, incorrect passcode."

353msgstr "Passcode non corretto"

361msgstr "Passcode non corretto"

354

362

355−#: qml/Shell.qml:365

363+#: qml/Shell.qml:386

356msgid "This will be your last attempt."

364msgid "This will be your last attempt."

357msgstr "Questo sarà l'ultimo tentativo."

365msgstr "Questo sarà l'ultimo tentativo."

358

366

359−#: qml/Shell.qml:367

367+#: qml/Shell.qml:388

360msgid ""

368msgid ""

361"If passphrase is entered incorrectly, your phone will conduct a factory "

369"If passphrase is entered incorrectly, your phone will conduct a factory "

362"reset and all personal data will be deleted."

370"reset and all personal data will be deleted."

@@ -364,7 +372,7 @@ msgstr ""

364"Se verrà inserita una passphrase errata, il telefono eseguirà un ripristino "

372"Se verrà inserita una passphrase errata, il telefono eseguirà un ripristino "

365"delle impostazioni di fabbrica e tutti i dati personali verranno eliminati."

373"delle impostazioni di fabbrica e tutti i dati personali verranno eliminati."

366

374

367−#: qml/Shell.qml:368

375+#: qml/Shell.qml:389

368msgid ""

376msgid ""

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

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

370"and all personal data will be deleted."

378"and all personal data will be deleted."

@@ -382,9 +390,6 @@ msgstr ""

382#~ msgid "Swipe to unlock"

390#~ msgid "Swipe to unlock"

383#~ msgstr "Scorrere per sbloccare"

391#~ msgstr "Scorrere per sbloccare"

384

392

385−#~ msgid "Manage Dash"

386−#~ msgstr "Gestione della Dash"

387−

388#~ msgid "Please wait"

393#~ msgid "Please wait"

389#~ msgstr "Attendere"

394#~ msgstr "Attendere"

390

395

po/ja.po+21−16

@@ -7,7 +7,7 @@ msgid ""

7msgstr ""

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

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

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

10+"POT-Creation-Date: 2014-10-03 08:13-0400\n"

11"PO-Revision-Date: 2014-09-18 09:47+0000\n"

12"Last-Translator: Mitsuya Shibata <mty.shibata@gmail.com>\n"

13"Language-Team: Japanese <ja@li.org>\n"

@@ -15,7 +15,7 @@ msgstr ""

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

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

17"Plural-Forms: nplurals=1; plural=0;\n"

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

18+"X-Launchpad-Export-Date: 2014-10-07 06:59+0000\n"

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

20

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

@@ -153,15 +153,15 @@ msgid ""

153msgstr ""

154"これでスマートフォンの操作に必要な、画面端を用いたジェスチャーを習得できました。 利用を開始するなら画面をタップしてください"

155

156−#: qml/Components/Lockscreen.qml:206

156+#: qml/Components/Lockscreen.qml:218

157msgid "Emergency Call"

158msgstr "緊急通報"

159

160−#: qml/Components/Lockscreen.qml:226

160+#: qml/Components/Lockscreen.qml:250

161msgid "OK"

162msgstr "OK"

163

164−#: qml/Dash/GenericScopeView.qml:411 qml/Dash/GenericScopeView.qml:533

164+#: qml/Dash/GenericScopeView.qml:411 qml/Dash/GenericScopeView.qml:568

165msgid "See less"

166msgstr "隠す"

167

@@ -206,6 +206,14 @@ msgstr "レビューを追加"

206msgid "Send"

207msgstr "送信"

208

209+#: qml/Dash/PullToRefreshScopeStyle.qml:55

210+msgid "Pull to refresh…"

211+msgstr ""

212+

213+#: qml/Dash/PullToRefreshScopeStyle.qml:60

214+msgid "Release to refresh…"

215+msgstr ""

216+

209#: qml/Dash/ScopesOverview.qml:206

217#: qml/Dash/ScopesOverview.qml:206

210msgid "Manage Scopes"

218msgid "Manage Scopes"

211msgstr ""

219msgstr ""

@@ -310,7 +318,7 @@ msgstr "ローミング"

310msgid "Enter passphrase"

318msgid "Enter passphrase"

311msgstr ""

319msgstr ""

312

320

313−#: qml/Shell.qml:321

321+#: qml/Shell.qml:341

314msgid "Sorry, incorrect passphrase"

322msgid "Sorry, incorrect passphrase"

315msgstr "パスフレーズが違います"

323msgstr "パスフレーズが違います"

316

324

@@ -322,7 +330,7 @@ msgstr ""

322msgid "Enter passcode"

330msgid "Enter passcode"

323msgstr ""

331msgstr ""

324

332

325−#: qml/Shell.qml:324

333+#: qml/Shell.qml:345

326msgid "Sorry, incorrect passcode"

334msgid "Sorry, incorrect passcode"

327msgstr "パスコードが違います"

335msgstr "パスコードが違います"

328

336

@@ -331,30 +339,30 @@ msgstr "パスコードが違います"

331msgid "Enter %1"

339msgid "Enter %1"

332msgstr ""

340msgstr ""

333

341

334−#: qml/Shell.qml:328

342+#: qml/Shell.qml:349

335#, qt-format

343#, qt-format

336msgid "Sorry, incorrect %1"

344msgid "Sorry, incorrect %1"

337msgstr "%1が違います"

345msgstr "%1が違います"

338

346

339−#: qml/Shell.qml:363

347+#: qml/Shell.qml:384

340msgid "Sorry, incorrect passphrase."

348msgid "Sorry, incorrect passphrase."

341msgstr "パスフレーズが間違っています。"

349msgstr "パスフレーズが間違っています。"

342

350

343−#: qml/Shell.qml:364

351+#: qml/Shell.qml:385

344msgid "Sorry, incorrect passcode."

352msgid "Sorry, incorrect passcode."

345msgstr "パスコードが間違っています。"

353msgstr "パスコードが間違っています。"

346

354

347−#: qml/Shell.qml:365

355+#: qml/Shell.qml:386

348msgid "This will be your last attempt."

356msgid "This will be your last attempt."

349msgstr "これが最後のチャンスです。"

357msgstr "これが最後のチャンスです。"

350

358

351−#: qml/Shell.qml:367

359+#: qml/Shell.qml:388

352msgid ""

360msgid ""

353"If passphrase is entered incorrectly, your phone will conduct a factory "

361"If passphrase is entered incorrectly, your phone will conduct a factory "

354"reset and all personal data will be deleted."

362"reset and all personal data will be deleted."

355msgstr "パスフレーズが間違っている場合、ファクトリーリセットを実施し、すべての個人データは削除されます。"

363msgstr "パスフレーズが間違っている場合、ファクトリーリセットを実施し、すべての個人データは削除されます。"

356

364

357−#: qml/Shell.qml:368

365+#: qml/Shell.qml:389

358msgid ""

366msgid ""

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

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

360"and all personal data will be deleted."

368"and all personal data will be deleted."

@@ -376,9 +384,6 @@ msgstr "パスコードが間違っている場合、ファクトリーリセッ

376#~ msgid "Please wait"

384#~ msgid "Please wait"

377#~ msgstr "お待ちください"

385#~ msgstr "お待ちください"

378

386

379−#~ msgid "Manage Dash"

380−#~ msgstr "Dashの管理"

381−

382#, qt-format

387#, qt-format

383#~ msgid "Enter your %1"

388#~ msgid "Enter your %1"

384#~ msgstr "%1を入力してください"

389#~ msgstr "%1を入力してください"

po/km.po+22−17

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

7msgstr ""

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

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

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

10+"POT-Creation-Date: 2014-10-03 08:13-0400\n"

11"PO-Revision-Date: 2014-08-20 02:48+0000\n"

12−"Last-Translator: Sok Sophea <sksophea@gmail.com>\n"

12+"Last-Translator: Sophea Sok <sksophea@gmail.com>\n"

13"Language-Team: Khmer <km@li.org>\n"

14"MIME-Version: 1.0\n"

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

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

17"Plural-Forms: nplurals=1; plural=0;\n"

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

18+"X-Launchpad-Export-Date: 2014-10-07 06:59+0000\n"

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

20

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

@@ -158,15 +158,15 @@ msgstr ""

158"ឥឡូវអ្នកបានពិនិត្យកាយវិការគែម "

159"និងអាចចាប់ផ្ដើមប្រើទូរស័ព្ទ ប៉ះ លើអេក្រង់ដើម្បីចាប់ផ្ដើម"

160

161−#: qml/Components/Lockscreen.qml:206

161+#: qml/Components/Lockscreen.qml:218

162msgid "Emergency Call"

163msgstr "ការហៅពេលអាសន្ន"

164

165−#: qml/Components/Lockscreen.qml:226

165+#: qml/Components/Lockscreen.qml:250

166msgid "OK"

167msgstr "យល់ព្រម"

168

169−#: qml/Dash/GenericScopeView.qml:411 qml/Dash/GenericScopeView.qml:533

169+#: qml/Dash/GenericScopeView.qml:411 qml/Dash/GenericScopeView.qml:568

170msgid "See less"

171msgstr "មើលតិចជាង"

172

@@ -211,6 +211,14 @@ msgstr "បន្ថែមការពិនិត្យ"

211msgid "Send"

212msgstr "ផ្ញើ"

213

214+#: qml/Dash/PullToRefreshScopeStyle.qml:55

215+msgid "Pull to refresh…"

216+msgstr ""

217+

218+#: qml/Dash/PullToRefreshScopeStyle.qml:60

219+msgid "Release to refresh…"

220+msgstr ""

221+

214#: qml/Dash/ScopesOverview.qml:206

222#: qml/Dash/ScopesOverview.qml:206

215msgid "Manage Scopes"

223msgid "Manage Scopes"

216msgstr ""

224msgstr ""

@@ -315,7 +323,7 @@ msgstr "រ៉ូមីង"

315msgid "Enter passphrase"

323msgid "Enter passphrase"

316msgstr ""

324msgstr ""

317

325

318−#: qml/Shell.qml:321

326+#: qml/Shell.qml:341

319msgid "Sorry, incorrect passphrase"

327msgid "Sorry, incorrect passphrase"

320msgstr "សូមទោស! ឃ្លាសម្ងាត់មិនត្រឹមត្រូវ"

328msgstr "សូមទោស! ឃ្លាសម្ងាត់មិនត្រឹមត្រូវ"

321

329

@@ -327,7 +335,7 @@ msgstr ""

327msgid "Enter passcode"

335msgid "Enter passcode"

328msgstr ""

336msgstr ""

329

337

330−#: qml/Shell.qml:324

338+#: qml/Shell.qml:345

331msgid "Sorry, incorrect passcode"

339msgid "Sorry, incorrect passcode"

332msgstr "សូមទោស! កូដសម្ងាត់មិនត្រឹមត្រូវ"

340msgstr "សូមទោស! កូដសម្ងាត់មិនត្រឹមត្រូវ"

333

341

@@ -336,24 +344,24 @@ msgstr "សូមទោស! កូដសម្ងាត់មិនត

336msgid "Enter %1"

344msgid "Enter %1"

337msgstr ""

345msgstr ""

338

346

339−#: qml/Shell.qml:328

347+#: qml/Shell.qml:349

340#, qt-format

348#, qt-format

341msgid "Sorry, incorrect %1"

349msgid "Sorry, incorrect %1"

342msgstr "សូមទោស! %1 មិនត្រឹមត្រូវ"

350msgstr "សូមទោស! %1 មិនត្រឹមត្រូវ"

343

351

344−#: qml/Shell.qml:363

352+#: qml/Shell.qml:384

345msgid "Sorry, incorrect passphrase."

353msgid "Sorry, incorrect passphrase."

346msgstr "សូមទោស! ឃ្លាសម្ងាត់មិនត្រឹមត្រូវ។"

354msgstr "សូមទោស! ឃ្លាសម្ងាត់មិនត្រឹមត្រូវ។"

347

355

348−#: qml/Shell.qml:364

356+#: qml/Shell.qml:385

349msgid "Sorry, incorrect passcode."

357msgid "Sorry, incorrect passcode."

350msgstr "សូមទោស! កូដសម្ងាត់មិនត្រឹមត្រូវ។"

358msgstr "សូមទោស! កូដសម្ងាត់មិនត្រឹមត្រូវ។"

351

359

352−#: qml/Shell.qml:365

360+#: qml/Shell.qml:386

353msgid "This will be your last attempt."

361msgid "This will be your last attempt."

354msgstr "នេះគឺការព្យាយាមលើកចុងក្រោយ។"

362msgstr "នេះគឺការព្យាយាមលើកចុងក្រោយ។"

355

363

356−#: qml/Shell.qml:367

364+#: qml/Shell.qml:388

357msgid ""

365msgid ""

358"If passphrase is entered incorrectly, your phone will conduct a factory "

366"If passphrase is entered incorrectly, your phone will conduct a factory "

359"reset and all personal data will be deleted."

367"reset and all personal data will be deleted."

@@ -362,7 +370,7 @@ msgstr ""

362"ទូរស័ព្ទរបស់អ្នកនឹងកំណត់ទៅទិន្នន័យពីរោងចក្រវិញ "

370"ទូរស័ព្ទរបស់អ្នកនឹងកំណត់ទៅទិន្នន័យពីរោងចក្រវិញ "

363"ហើយទិន្នន័យផ្ទាល់ខ្លួនទាំងអស់របស់អ្នកនឹងត្រូវបានលុប។"

371"ហើយទិន្នន័យផ្ទាល់ខ្លួនទាំងអស់របស់អ្នកនឹងត្រូវបានលុប។"

364

372

365−#: qml/Shell.qml:368

373+#: qml/Shell.qml:389

366msgid ""

374msgid ""

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

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

368"and all personal data will be deleted."

376"and all personal data will be deleted."

@@ -381,9 +389,6 @@ msgstr ""

381#~ msgid "Swipe to unlock"

389#~ msgid "Swipe to unlock"

382#~ msgstr "អូសដើម្បីដោះសោ"

390#~ msgstr "អូសដើម្បីដោះសោ"

383

391

384−#~ msgid "Manage Dash"

385−#~ msgstr "គ្រប់គ្រងផ្ទាំង"

386−

387#~ msgid "Please wait"

392#~ msgid "Please wait"

388#~ msgstr "សូមរង់ចាំ"

393#~ msgstr "សូមរង់ចាំ"

389

394

po/kn.po+21−13

@@ -7,7 +7,7 @@ msgid ""

7msgstr ""

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

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

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

10+"POT-Creation-Date: 2014-10-03 08:13-0400\n"

11"PO-Revision-Date: 2013-06-27 05:43+0000\n"

12"Last-Translator: Michał Sawicz <michal.sawicz@canonical.com>\n"

13"Language-Team: Kannada <kn@li.org>\n"

@@ -15,7 +15,7 @@ msgstr ""

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

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

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

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

18+"X-Launchpad-Export-Date: 2014-10-07 06:59+0000\n"

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

20

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

@@ -152,15 +152,15 @@ msgid ""

152"phone Tap on the screen to start"

153msgstr ""

154

155−#: qml/Components/Lockscreen.qml:206

155+#: qml/Components/Lockscreen.qml:218

156msgid "Emergency Call"

157msgstr ""

158

159−#: qml/Components/Lockscreen.qml:226

159+#: qml/Components/Lockscreen.qml:250

160msgid "OK"

161msgstr ""

162

163−#: qml/Dash/GenericScopeView.qml:411 qml/Dash/GenericScopeView.qml:533

163+#: qml/Dash/GenericScopeView.qml:411 qml/Dash/GenericScopeView.qml:568

164msgid "See less"

165msgstr ""

166

@@ -205,6 +205,14 @@ msgstr ""

205msgid "Send"

206msgstr ""

207

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+

208#: qml/Dash/ScopesOverview.qml:206

216#: qml/Dash/ScopesOverview.qml:206

209msgid "Manage Scopes"

217msgid "Manage Scopes"

210msgstr ""

218msgstr ""

@@ -309,7 +317,7 @@ msgstr ""

309msgid "Enter passphrase"

317msgid "Enter passphrase"

310msgstr ""

318msgstr ""

311

319

312−#: qml/Shell.qml:321

320+#: qml/Shell.qml:341

313msgid "Sorry, incorrect passphrase"

321msgid "Sorry, incorrect passphrase"

314msgstr ""

322msgstr ""

315

323

@@ -321,7 +329,7 @@ msgstr ""

321msgid "Enter passcode"

329msgid "Enter passcode"

322msgstr ""

330msgstr ""

323

331

324−#: qml/Shell.qml:324

332+#: qml/Shell.qml:345

325msgid "Sorry, incorrect passcode"

333msgid "Sorry, incorrect passcode"

326msgstr ""

334msgstr ""

327

335

@@ -330,30 +338,30 @@ msgstr ""

330msgid "Enter %1"

338msgid "Enter %1"

331msgstr ""

339msgstr ""

332

340

333−#: qml/Shell.qml:328

341+#: qml/Shell.qml:349

334#, qt-format

342#, qt-format

335msgid "Sorry, incorrect %1"

343msgid "Sorry, incorrect %1"

336msgstr ""

344msgstr ""

337

345

338−#: qml/Shell.qml:363

346+#: qml/Shell.qml:384

339msgid "Sorry, incorrect passphrase."

347msgid "Sorry, incorrect passphrase."

340msgstr ""

348msgstr ""

341

349

342−#: qml/Shell.qml:364

350+#: qml/Shell.qml:385

343msgid "Sorry, incorrect passcode."

351msgid "Sorry, incorrect passcode."

344msgstr ""

352msgstr ""

345

353

346−#: qml/Shell.qml:365

354+#: qml/Shell.qml:386

347msgid "This will be your last attempt."

355msgid "This will be your last attempt."

348msgstr ""

356msgstr ""

349

357

350−#: qml/Shell.qml:367

358+#: qml/Shell.qml:388

351msgid ""

359msgid ""

352"If passphrase is entered incorrectly, your phone will conduct a factory "

360"If passphrase is entered incorrectly, your phone will conduct a factory "

353"reset and all personal data will be deleted."

361"reset and all personal data will be deleted."

354msgstr ""

362msgstr ""

355

363

356−#: qml/Shell.qml:368

364+#: qml/Shell.qml:389

357msgid ""

365msgid ""

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

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

359"and all personal data will be deleted."

367"and all personal data will be deleted."

po/ko.po+30−26

@@ -7,7 +7,7 @@ msgid ""

7msgstr ""

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

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

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

10+"POT-Creation-Date: 2014-10-03 08:13-0400\n"

11"PO-Revision-Date: 2014-08-19 13:02+0000\n"

12"Last-Translator: MinSik CHO <Unknown>\n"

13"Language-Team: Korean <ko@li.org>\n"

@@ -15,7 +15,7 @@ msgstr ""

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

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

17"Plural-Forms: nplurals=1; plural=0;\n"

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

18+"X-Launchpad-Export-Date: 2014-10-07 06:59+0000\n"

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

20

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

@@ -33,22 +33,21 @@ msgstr "바로 가기를 고정 해제"

33

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

35msgid "Device Locked"

36−msgstr ""

36+msgstr "장치가 잠김"

37

38#: qml/Components/DelayedLockscreen.qml:62

39msgid "You have been locked out due to too many failed passphrase attempts."

40−msgstr ""

40+msgstr "올바르지 않은 패스프레이즈를 너무 많이 입력해 장치가 잠겼습니다."

41

42#: qml/Components/DelayedLockscreen.qml:63

43msgid "You have been locked out due to too many failed passcode attempts."

44−msgstr ""

44+msgstr "올바르지 않은 패스코드를 너무 많이 입력해 장치가 잠겼습니다."

45

46#: qml/Components/DelayedLockscreen.qml:72

47#, qt-format

48msgid "Please wait %1 minute and then try again…"

49msgid_plural "Please wait %1 minutes and then try again…"

50−msgstr[0] ""

50+msgstr[0] "%1분 정도 기다린 후 다시 시독해주십시오..."

51−msgstr[1] ""

52

51

53#: qml/Components/Dialogs.qml:70

52#: qml/Components/Dialogs.qml:70

54msgid "Log out"

53msgid "Log out"

@@ -153,15 +152,15 @@ msgid ""

153msgstr ""

152msgstr ""

154"여러분은 가장자리에서 끌어오기 제스쳐를 완벽히 익히셨고 휴대 전화를 사용할 수 있습니다. 스크린을 터치해서 시작하세요."

153"여러분은 가장자리에서 끌어오기 제스쳐를 완벽히 익히셨고 휴대 전화를 사용할 수 있습니다. 스크린을 터치해서 시작하세요."

155

154

156−#: qml/Components/Lockscreen.qml:206

155+#: qml/Components/Lockscreen.qml:218

157msgid "Emergency Call"

156msgid "Emergency Call"

158msgstr "긴급 통화"

157msgstr "긴급 통화"

159

158

160−#: qml/Components/Lockscreen.qml:226

159+#: qml/Components/Lockscreen.qml:250

161msgid "OK"

160msgid "OK"

162msgstr "확인"

161msgstr "확인"

163

162

164−#: qml/Dash/GenericScopeView.qml:411 qml/Dash/GenericScopeView.qml:533

163+#: qml/Dash/GenericScopeView.qml:411 qml/Dash/GenericScopeView.qml:568

165msgid "See less"

164msgid "See less"

166msgstr "간단히 표시"

165msgstr "간단히 표시"

167

166

@@ -206,6 +205,14 @@ msgstr "평가 추가"

206msgid "Send"

205msgid "Send"

207msgstr "보내기"

206msgstr "보내기"

208

207

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+

209#: qml/Dash/ScopesOverview.qml:206

216#: qml/Dash/ScopesOverview.qml:206

210msgid "Manage Scopes"

217msgid "Manage Scopes"

211msgstr "스코프 관리"

218msgstr "스코프 관리"

@@ -228,7 +235,7 @@ msgstr "모두"

228

235

229#: qml/Greeter/Greeter.qml:157

236#: qml/Greeter/Greeter.qml:157

230msgid "Unlock"

237msgid "Unlock"

231−msgstr ""

238+msgstr "잠금 해제"

232

239

233#: qml/Hud/HudParametrizedActionsPage.qml:139

240#: qml/Hud/HudParametrizedActionsPage.qml:139

234msgid "Confirm"

241msgid "Confirm"

@@ -308,53 +315,53 @@ msgstr "로밍"

308

315

309#: qml/Shell.qml:340

316#: qml/Shell.qml:340

310msgid "Enter passphrase"

317msgid "Enter passphrase"

311−msgstr ""

318+msgstr "패스프레이즈를 입력해주십시오."

312

319

313−#: qml/Shell.qml:321

320+#: qml/Shell.qml:341

314msgid "Sorry, incorrect passphrase"

321msgid "Sorry, incorrect passphrase"

315msgstr "죄송합니다. 패스프레이즈가 올바르지 않습니다."

322msgstr "죄송합니다. 패스프레이즈가 올바르지 않습니다."

316

323

317#: qml/Shell.qml:342

324#: qml/Shell.qml:342

318msgid "Please re-enter"

325msgid "Please re-enter"

319−msgstr ""

326+msgstr "다시 입력해주십시오."

320

327

321#: qml/Shell.qml:344

328#: qml/Shell.qml:344

322msgid "Enter passcode"

329msgid "Enter passcode"

323−msgstr ""

330+msgstr "패스코드를 입력해주십시오."

324

331

325−#: qml/Shell.qml:324

332+#: qml/Shell.qml:345

326msgid "Sorry, incorrect passcode"

333msgid "Sorry, incorrect passcode"

327msgstr "죄송합니다. 패스코드가 올바르지 않습니다."

334msgstr "죄송합니다. 패스코드가 올바르지 않습니다."

328

335

329#: qml/Shell.qml:348

336#: qml/Shell.qml:348

330#, qt-format

337#, qt-format

331msgid "Enter %1"

338msgid "Enter %1"

332−msgstr ""

339+msgstr "%1 입력"

333

340

334−#: qml/Shell.qml:328

341+#: qml/Shell.qml:349

335#, qt-format

342#, qt-format

336msgid "Sorry, incorrect %1"

343msgid "Sorry, incorrect %1"

337msgstr "죄송합니다. %1이(가) 올바르지 않습니다."

344msgstr "죄송합니다. %1이(가) 올바르지 않습니다."

338

345

339−#: qml/Shell.qml:363

346+#: qml/Shell.qml:384

340msgid "Sorry, incorrect passphrase."

347msgid "Sorry, incorrect passphrase."

341msgstr "올바르지 않은 패스프레이즈입니다."

348msgstr "올바르지 않은 패스프레이즈입니다."

342

349

343−#: qml/Shell.qml:364

350+#: qml/Shell.qml:385

344msgid "Sorry, incorrect passcode."

351msgid "Sorry, incorrect passcode."

345msgstr "최송합니다. 패스코드가 올바르지 않습니다."

352msgstr "최송합니다. 패스코드가 올바르지 않습니다."

346

353

347−#: qml/Shell.qml:365

354+#: qml/Shell.qml:386

348msgid "This will be your last attempt."

355msgid "This will be your last attempt."

349msgstr "마지막 시도입니다."

356msgstr "마지막 시도입니다."

350

357

351−#: qml/Shell.qml:367

358+#: qml/Shell.qml:388

352msgid ""

359msgid ""

353"If passphrase is entered incorrectly, your phone will conduct a factory "

360"If passphrase is entered incorrectly, your phone will conduct a factory "

354"reset and all personal data will be deleted."

361"reset and all personal data will be deleted."

355msgstr "이번에도 올바르지 않은 패스프레이즈를 입력하면 휴대 전화를 공장 초기화하여 모든 개인 정보를 삭제합니다."

362msgstr "이번에도 올바르지 않은 패스프레이즈를 입력하면 휴대 전화를 공장 초기화하여 모든 개인 정보를 삭제합니다."

356

363

357−#: qml/Shell.qml:368

364+#: qml/Shell.qml:389

358msgid ""

365msgid ""

359"If passcode is entered incorrectly, your phone will conduct a factory reset "

366"If passcode is entered incorrectly, your phone will conduct a factory reset "

360"and all personal data will be deleted."

367"and all personal data will be deleted."

@@ -373,9 +380,6 @@ msgstr "이번에도 올바르지 않은 패스코드를 입력하면 휴대 전

373#~ msgid "Too many incorrect attempts"

380#~ msgid "Too many incorrect attempts"

374#~ msgstr "너무 많이 틀리셨습니다"

381#~ msgstr "너무 많이 틀리셨습니다"

375

382

376−#~ msgid "Manage Dash"

377−#~ msgstr "대시 관리"

378−

379#~ msgid "Enter your passphrase"

383#~ msgid "Enter your passphrase"

380#~ msgstr "패스프레이즈를 입력해주십시오."

384#~ msgstr "패스프레이즈를 입력해주십시오."

381

385

po/ku.po+21−13

@@ -7,7 +7,7 @@ msgid ""

7msgstr ""

8"Project-Id-Version: unity8\n"

9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10−"POT-Creation-Date: 2014-10-02 10:35+0200\n"

10+"POT-Creation-Date: 2014-10-03 08:13-0400\n"

11"PO-Revision-Date: 2014-09-10 13:14+0000\n"

12"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"

13"Language-Team: Kurdish <ku@li.org>\n"

@@ -15,7 +15,7 @@ msgstr ""

15"Content-Type: text/plain; charset=UTF-8\n"

16"Content-Transfer-Encoding: 8bit\n"

17"Plural-Forms: nplurals=2; plural=n != 1;\n"

18−"X-Launchpad-Export-Date: 2014-10-03 06:22+0000\n"

18+"X-Launchpad-Export-Date: 2014-10-07 06:59+0000\n"

19"X-Generator: Launchpad (build 17196)\n"

20

21#: plugins/LightDM/Greeter.cpp:130

@@ -155,15 +155,15 @@ msgid ""

155msgstr ""

156"Tu tevgerên kêlekê fêr bûyî Ji bo destpêkirinê ekranê bipelîne"

157

158−#: qml/Components/Lockscreen.qml:206

158+#: qml/Components/Lockscreen.qml:218

159msgid "Emergency Call"

160msgstr "Lêgerîna Lezgîn"

161

162−#: qml/Components/Lockscreen.qml:226

162+#: qml/Components/Lockscreen.qml:250

163msgid "OK"

164msgstr "BAŞ E"

165

166−#: qml/Dash/GenericScopeView.qml:411 qml/Dash/GenericScopeView.qml:533

166+#: qml/Dash/GenericScopeView.qml:411 qml/Dash/GenericScopeView.qml:568

167msgid "See less"

168msgstr "Hindiktir bibîne"

169

@@ -208,6 +208,14 @@ msgstr "Binirxîne"

208msgid "Send"

209msgstr "Bişîne"

210

211+#: qml/Dash/PullToRefreshScopeStyle.qml:55

212+msgid "Pull to refresh…"

213+msgstr ""

214+

215+#: qml/Dash/PullToRefreshScopeStyle.qml:60

216+msgid "Release to refresh…"

217+msgstr ""

218+

211#: qml/Dash/ScopesOverview.qml:206

219#: qml/Dash/ScopesOverview.qml:206

212msgid "Manage Scopes"

220msgid "Manage Scopes"

213msgstr ""

221msgstr ""

@@ -312,7 +320,7 @@ msgstr "Geriyan"

312msgid "Enter passphrase"

320msgid "Enter passphrase"

313msgstr ""

321msgstr ""

314

322

315−#: qml/Shell.qml:321

323+#: qml/Shell.qml:341

316msgid "Sorry, incorrect passphrase"

324msgid "Sorry, incorrect passphrase"

317msgstr "Bibore, parola çewt e"

325msgstr "Bibore, parola çewt e"

318

326

@@ -324,7 +332,7 @@ msgstr ""

324msgid "Enter passcode"

332msgid "Enter passcode"

325msgstr ""

333msgstr ""

326

334

327−#: qml/Shell.qml:324

335+#: qml/Shell.qml:345

328msgid "Sorry, incorrect passcode"

336msgid "Sorry, incorrect passcode"

329msgstr "Bibore, parola çewrt e"

337msgstr "Bibore, parola çewrt e"

330

338

@@ -333,24 +341,24 @@ msgstr "Bibore, parola çewrt e"

333msgid "Enter %1"

341msgid "Enter %1"

334msgstr ""

342msgstr ""

335

343

336−#: qml/Shell.qml:328

344+#: qml/Shell.qml:349

337#, qt-format

345#, qt-format

338msgid "Sorry, incorrect %1"

346msgid "Sorry, incorrect %1"

339msgstr "Bibore, %1 çewt e"

347msgstr "Bibore, %1 çewt e"

340

348

341−#: qml/Shell.qml:363

349+#: qml/Shell.qml:384

342msgid "Sorry, incorrect passphrase."

350msgid "Sorry, incorrect passphrase."

343msgstr "Bibore, parola çewt e."

351msgstr "Bibore, parola çewt e."

344

352

345−#: qml/Shell.qml:364

353+#: qml/Shell.qml:385

346msgid "Sorry, incorrect passcode."

354msgid "Sorry, incorrect passcode."

347msgstr "Bibore, parola çewt e."

355msgstr "Bibore, parola çewt e."

348

356

349−#: qml/Shell.qml:365

357+#: qml/Shell.qml:386

350msgid "This will be your last attempt."

358msgid "This will be your last attempt."

351msgstr "Ev ê ceribandina dawiyê be."

359msgstr "Ev ê ceribandina dawiyê be."

352

360

353−#: qml/Shell.qml:367

361+#: qml/Shell.qml:388

354msgid ""

362msgid ""

355"If passphrase is entered incorrectly, your phone will conduct a factory "

363"If passphrase is entered incorrectly, your phone will conduct a factory "

356"reset and all personal data will be deleted."

364"reset and all personal data will be deleted."

@@ -358,7 +366,7 @@ msgstr ""

358"Eger parola çewt bê nivîsandin, telefona te dê vegere eyarên fabrîkayê û "

366"Eger parola çewt bê nivîsandin, telefona te dê vegere eyarên fabrîkayê û "

359"hemû daneyên te yên taybet dê bên jêbirin."

367"hemû daneyên te yên taybet dê bên jêbirin."

360

368

361−#: qml/Shell.qml:368

369+#: qml/Shell.qml:389

362msgid ""

370msgid ""

363"If passcode is entered incorrectly, your phone will conduct a factory reset "

371"If passcode is entered incorrectly, your phone will conduct a factory reset "

364"and all personal data will be deleted."

372"and all personal data will be deleted."

po/ky.po+21−13

@@ -7,7 +7,7 @@ msgid ""

7msgstr ""

8"Project-Id-Version: unity\n"

9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10−"POT-Creation-Date: 2014-10-02 10:35+0200\n"

10+"POT-Creation-Date: 2014-10-03 08:13-0400\n"

11"PO-Revision-Date: 2013-06-27 06:17+0000\n"

12"Last-Translator: Michał Sawicz <michal.sawicz@canonical.com>\n"

13"Language-Team: Kirghiz <ky@li.org>\n"

@@ -15,7 +15,7 @@ msgstr ""

15"Content-Type: text/plain; charset=UTF-8\n"

16"Content-Transfer-Encoding: 8bit\n"

17"Plural-Forms: nplurals=1; plural=0;\n"

18−"X-Launchpad-Export-Date: 2014-10-03 06:22+0000\n"

18+"X-Launchpad-Export-Date: 2014-10-07 06:59+0000\n"

19"X-Generator: Launchpad (build 17196)\n"

20

21#: plugins/LightDM/Greeter.cpp:130

@@ -152,15 +152,15 @@ msgid ""

152"phone Tap on the screen to start"

153msgstr ""

154

155−#: qml/Components/Lockscreen.qml:206

155+#: qml/Components/Lockscreen.qml:218

156msgid "Emergency Call"

157msgstr ""

158

159−#: qml/Components/Lockscreen.qml:226

159+#: qml/Components/Lockscreen.qml:250

160msgid "OK"

161msgstr ""

162

163−#: qml/Dash/GenericScopeView.qml:411 qml/Dash/GenericScopeView.qml:533

163+#: qml/Dash/GenericScopeView.qml:411 qml/Dash/GenericScopeView.qml:568

164msgid "See less"

165msgstr ""

166

@@ -205,6 +205,14 @@ msgstr ""

205msgid "Send"

206msgstr ""

207

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+

208#: qml/Dash/ScopesOverview.qml:206

216#: qml/Dash/ScopesOverview.qml:206

209msgid "Manage Scopes"

217msgid "Manage Scopes"

210msgstr ""

218msgstr ""

@@ -309,7 +317,7 @@ msgstr ""

309msgid "Enter passphrase"

317msgid "Enter passphrase"

310msgstr ""

318msgstr ""

311

319

312−#: qml/Shell.qml:321

320+#: qml/Shell.qml:341

313msgid "Sorry, incorrect passphrase"

321msgid "Sorry, incorrect passphrase"

314msgstr ""

322msgstr ""

315

323

@@ -321,7 +329,7 @@ msgstr ""

321msgid "Enter passcode"

329msgid "Enter passcode"

322msgstr ""

330msgstr ""

323

331

324−#: qml/Shell.qml:324

332+#: qml/Shell.qml:345

325msgid "Sorry, incorrect passcode"

333msgid "Sorry, incorrect passcode"

326msgstr ""

334msgstr ""

327

335

@@ -330,30 +338,30 @@ msgstr ""

330msgid "Enter %1"

338msgid "Enter %1"

331msgstr ""

339msgstr ""

332

340

333−#: qml/Shell.qml:328

341+#: qml/Shell.qml:349

334#, qt-format

342#, qt-format

335msgid "Sorry, incorrect %1"

343msgid "Sorry, incorrect %1"

336msgstr ""

344msgstr ""

337

345

338−#: qml/Shell.qml:363

346+#: qml/Shell.qml:384

339msgid "Sorry, incorrect passphrase."

347msgid "Sorry, incorrect passphrase."

340msgstr ""

348msgstr ""

341

349

342−#: qml/Shell.qml:364

350+#: qml/Shell.qml:385

343msgid "Sorry, incorrect passcode."

351msgid "Sorry, incorrect passcode."

344msgstr ""

352msgstr ""

345

353

346−#: qml/Shell.qml:365

354+#: qml/Shell.qml:386

347msgid "This will be your last attempt."

355msgid "This will be your last attempt."

348msgstr ""

356msgstr ""

349

357

350−#: qml/Shell.qml:367

358+#: qml/Shell.qml:388

351msgid ""

359msgid ""

352"If passphrase is entered incorrectly, your phone will conduct a factory "

360"If passphrase is entered incorrectly, your phone will conduct a factory "

353"reset and all personal data will be deleted."

361"reset and all personal data will be deleted."

354msgstr ""

362msgstr ""

355

363

356−#: qml/Shell.qml:368

364+#: qml/Shell.qml:389

357msgid ""

365msgid ""

358"If passcode is entered incorrectly, your phone will conduct a factory reset "

366"If passcode is entered incorrectly, your phone will conduct a factory reset "

359"and all personal data will be deleted."

367"and all personal data will be deleted."

po/lo.po+21−13

@@ -7,7 +7,7 @@ msgid ""

7msgstr ""

8"Project-Id-Version: unity8\n"

9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10−"POT-Creation-Date: 2014-10-02 10:35+0200\n"

10+"POT-Creation-Date: 2014-10-03 08:13-0400\n"

11"PO-Revision-Date: 2013-10-02 10:00+0000\n"

12"Last-Translator: Anousak <anousak@gmail.com>\n"

13"Language-Team: Lao <lo@li.org>\n"

@@ -15,7 +15,7 @@ msgstr ""

15"Content-Type: text/plain; charset=UTF-8\n"

16"Content-Transfer-Encoding: 8bit\n"

17"Plural-Forms: nplurals=1; plural=0;\n"

18−"X-Launchpad-Export-Date: 2014-10-03 06:22+0000\n"

18+"X-Launchpad-Export-Date: 2014-10-07 06:59+0000\n"

19"X-Generator: Launchpad (build 17196)\n"

20

21#: plugins/LightDM/Greeter.cpp:130

@@ -152,15 +152,15 @@ msgid ""

152"phone Tap on the screen to start"

153msgstr ""

154

155−#: qml/Components/Lockscreen.qml:206

155+#: qml/Components/Lockscreen.qml:218

156msgid "Emergency Call"

157msgstr ""

158

159−#: qml/Components/Lockscreen.qml:226

159+#: qml/Components/Lockscreen.qml:250

160msgid "OK"

161msgstr ""

162

163−#: qml/Dash/GenericScopeView.qml:411 qml/Dash/GenericScopeView.qml:533

163+#: qml/Dash/GenericScopeView.qml:411 qml/Dash/GenericScopeView.qml:568

164msgid "See less"

165msgstr ""

166

@@ -205,6 +205,14 @@ msgstr ""

205msgid "Send"

206msgstr "ສົ່ງ"

207

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+

208#: qml/Dash/ScopesOverview.qml:206

216#: qml/Dash/ScopesOverview.qml:206

209msgid "Manage Scopes"

217msgid "Manage Scopes"

210msgstr ""

218msgstr ""

@@ -309,7 +317,7 @@ msgstr ""

309msgid "Enter passphrase"

317msgid "Enter passphrase"

310msgstr ""

318msgstr ""

311

319

312−#: qml/Shell.qml:321

320+#: qml/Shell.qml:341

313msgid "Sorry, incorrect passphrase"

321msgid "Sorry, incorrect passphrase"

314msgstr ""

322msgstr ""

315

323

@@ -321,7 +329,7 @@ msgstr ""

321msgid "Enter passcode"

329msgid "Enter passcode"

322msgstr ""

330msgstr ""

323

331

324−#: qml/Shell.qml:324

332+#: qml/Shell.qml:345

325msgid "Sorry, incorrect passcode"

333msgid "Sorry, incorrect passcode"

326msgstr ""

334msgstr ""

327

335

@@ -330,30 +338,30 @@ msgstr ""

330msgid "Enter %1"

338msgid "Enter %1"

331msgstr ""

339msgstr ""

332

340

333−#: qml/Shell.qml:328

341+#: qml/Shell.qml:349

334#, qt-format

342#, qt-format

335msgid "Sorry, incorrect %1"

343msgid "Sorry, incorrect %1"

336msgstr ""

344msgstr ""

337

345

338−#: qml/Shell.qml:363

346+#: qml/Shell.qml:384

339msgid "Sorry, incorrect passphrase."

347msgid "Sorry, incorrect passphrase."

340msgstr ""

348msgstr ""

341

349

342−#: qml/Shell.qml:364

350+#: qml/Shell.qml:385

343msgid "Sorry, incorrect passcode."

351msgid "Sorry, incorrect passcode."

344msgstr ""

352msgstr ""

345

353

346−#: qml/Shell.qml:365

354+#: qml/Shell.qml:386

347msgid "This will be your last attempt."

355msgid "This will be your last attempt."

348msgstr ""

356msgstr ""

349

357

350−#: qml/Shell.qml:367

358+#: qml/Shell.qml:388

351msgid ""

359msgid ""

352"If passphrase is entered incorrectly, your phone will conduct a factory "

360"If passphrase is entered incorrectly, your phone will conduct a factory "

353"reset and all personal data will be deleted."

361"reset and all personal data will be deleted."

354msgstr ""

362msgstr ""

355

363

356−#: qml/Shell.qml:368

364+#: qml/Shell.qml:389

357msgid ""

365msgid ""

358"If passcode is entered incorrectly, your phone will conduct a factory reset "

366"If passcode is entered incorrectly, your phone will conduct a factory reset "

359"and all personal data will be deleted."

367"and all personal data will be deleted."

po/lt.po+21−13

@@ -7,7 +7,7 @@ msgid ""

7msgstr ""

8"Project-Id-Version: unity8\n"

9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10−"POT-Creation-Date: 2014-10-02 10:35+0200\n"

10+"POT-Creation-Date: 2014-10-03 08:13-0400\n"

11"PO-Revision-Date: 2014-05-19 17:15+0000\n"

12"Last-Translator: Mantas Kriaučiūnas <mantas@akl.lt>\n"

13"Language-Team: Lithuanian <lt@li.org>\n"

@@ -16,7 +16,7 @@ msgstr ""

16"Content-Transfer-Encoding: 8bit\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"

19+"X-Launchpad-Export-Date: 2014-10-07 06:59+0000\n"

20"X-Generator: Launchpad (build 17196)\n"

21

22#: plugins/LightDM/Greeter.cpp:130

@@ -156,15 +156,15 @@ msgid ""

156"phone Tap on the screen to start"

157msgstr ""

158

159−#: qml/Components/Lockscreen.qml:206

159+#: qml/Components/Lockscreen.qml:218

160msgid "Emergency Call"

161msgstr "Pagalbos skambutis"

162

163−#: qml/Components/Lockscreen.qml:226

163+#: qml/Components/Lockscreen.qml:250

164msgid "OK"

165msgstr ""

166

167−#: qml/Dash/GenericScopeView.qml:411 qml/Dash/GenericScopeView.qml:533

167+#: qml/Dash/GenericScopeView.qml:411 qml/Dash/GenericScopeView.qml:568

168msgid "See less"

169msgstr ""

170

@@ -209,6 +209,14 @@ msgstr "Pridėkite apžvalgą"

209msgid "Send"

210msgstr "Siųsti"

211

212+#: qml/Dash/PullToRefreshScopeStyle.qml:55

213+msgid "Pull to refresh…"

214+msgstr ""

215+

216+#: qml/Dash/PullToRefreshScopeStyle.qml:60

217+msgid "Release to refresh…"

218+msgstr ""

219+

212#: qml/Dash/ScopesOverview.qml:206

220#: qml/Dash/ScopesOverview.qml:206

213msgid "Manage Scopes"

221msgid "Manage Scopes"

214msgstr ""

222msgstr ""

@@ -313,7 +321,7 @@ msgstr ""

313msgid "Enter passphrase"

321msgid "Enter passphrase"

314msgstr ""

322msgstr ""

315

323

316−#: qml/Shell.qml:321

324+#: qml/Shell.qml:341

317msgid "Sorry, incorrect passphrase"

325msgid "Sorry, incorrect passphrase"

318msgstr ""

326msgstr ""

319

327

@@ -325,7 +333,7 @@ msgstr ""

325msgid "Enter passcode"

333msgid "Enter passcode"

326msgstr ""

334msgstr ""

327

335

328−#: qml/Shell.qml:324

336+#: qml/Shell.qml:345

329msgid "Sorry, incorrect passcode"

337msgid "Sorry, incorrect passcode"

330msgstr ""

338msgstr ""

331

339

@@ -334,30 +342,30 @@ msgstr ""

334msgid "Enter %1"

342msgid "Enter %1"

335msgstr ""

343msgstr ""

336

344

337−#: qml/Shell.qml:328

345+#: qml/Shell.qml:349

338#, qt-format

346#, qt-format

339msgid "Sorry, incorrect %1"

347msgid "Sorry, incorrect %1"

340msgstr ""

348msgstr ""

341

349

342−#: qml/Shell.qml:363

350+#: qml/Shell.qml:384

343msgid "Sorry, incorrect passphrase."

351msgid "Sorry, incorrect passphrase."

344msgstr ""

352msgstr ""

345

353

346−#: qml/Shell.qml:364

354+#: qml/Shell.qml:385

347msgid "Sorry, incorrect passcode."

355msgid "Sorry, incorrect passcode."

348msgstr ""

356msgstr ""

349

357

350−#: qml/Shell.qml:365

358+#: qml/Shell.qml:386

351msgid "This will be your last attempt."

359msgid "This will be your last attempt."

352msgstr ""

360msgstr ""

353

361

354−#: qml/Shell.qml:367

362+#: qml/Shell.qml:388

355msgid ""

363msgid ""

356"If passphrase is entered incorrectly, your phone will conduct a factory "

364"If passphrase is entered incorrectly, your phone will conduct a factory "

357"reset and all personal data will be deleted."

365"reset and all personal data will be deleted."

358msgstr ""

366msgstr ""

359

367

360−#: qml/Shell.qml:368

368+#: qml/Shell.qml:389

361msgid ""

369msgid ""

362"If passcode is entered incorrectly, your phone will conduct a factory reset "

370"If passcode is entered incorrectly, your phone will conduct a factory reset "

363"and all personal data will be deleted."

371"and all personal data will be deleted."

po/lv.po+21−13

@@ -7,7 +7,7 @@ msgid ""

7msgstr ""

8"Project-Id-Version: unity\n"

9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10−"POT-Creation-Date: 2014-10-02 10:35+0200\n"

10+"POT-Creation-Date: 2014-10-03 08:13-0400\n"

11"PO-Revision-Date: 2014-08-21 09:46+0000\n"

12"Last-Translator: Jānis-Marks Gailis <jm-gailis@fai-vianet.fr>\n"

13"Language-Team: Latvian <lv@li.org>\n"

@@ -15,7 +15,7 @@ msgstr ""

15"Content-Type: text/plain; charset=UTF-8\n"

16"Content-Transfer-Encoding: 8bit\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"

18+"X-Launchpad-Export-Date: 2014-10-07 06:59+0000\n"

19"X-Generator: Launchpad (build 17196)\n"

20

21#: plugins/LightDM/Greeter.cpp:130

@@ -152,15 +152,15 @@ msgid ""

152"phone Tap on the screen to start"

153msgstr ""

154

155−#: qml/Components/Lockscreen.qml:206

155+#: qml/Components/Lockscreen.qml:218

156msgid "Emergency Call"

157msgstr "Neatliekamās Palīdzības zvans"

158

159−#: qml/Components/Lockscreen.qml:226

159+#: qml/Components/Lockscreen.qml:250

160msgid "OK"

161msgstr "LABI"

162

163−#: qml/Dash/GenericScopeView.qml:411 qml/Dash/GenericScopeView.qml:533

163+#: qml/Dash/GenericScopeView.qml:411 qml/Dash/GenericScopeView.qml:568

164msgid "See less"

165msgstr "Redzēt mazāk"

166

@@ -205,6 +205,14 @@ msgstr "Komentēt"

205msgid "Send"

206msgstr "Sūtīt"

207

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+

208#: qml/Dash/ScopesOverview.qml:206

216#: qml/Dash/ScopesOverview.qml:206

209msgid "Manage Scopes"

217msgid "Manage Scopes"

210msgstr ""

218msgstr ""

@@ -309,7 +317,7 @@ msgstr "Viesabonēšana"

309msgid "Enter passphrase"

317msgid "Enter passphrase"

310msgstr ""

318msgstr ""

311

319

312−#: qml/Shell.qml:321

320+#: qml/Shell.qml:341

313msgid "Sorry, incorrect passphrase"

321msgid "Sorry, incorrect passphrase"

314msgstr ""

322msgstr ""

315

323

@@ -321,7 +329,7 @@ msgstr ""

321msgid "Enter passcode"

329msgid "Enter passcode"

322msgstr ""

330msgstr ""

323

331

324−#: qml/Shell.qml:324

332+#: qml/Shell.qml:345

325msgid "Sorry, incorrect passcode"

333msgid "Sorry, incorrect passcode"

326msgstr ""

334msgstr ""

327

335

@@ -330,30 +338,30 @@ msgstr ""

330msgid "Enter %1"

338msgid "Enter %1"

331msgstr ""

339msgstr ""

332

340

333−#: qml/Shell.qml:328

341+#: qml/Shell.qml:349

334#, qt-format

342#, qt-format

335msgid "Sorry, incorrect %1"

343msgid "Sorry, incorrect %1"

336msgstr ""

344msgstr ""

337

345

338−#: qml/Shell.qml:363

346+#: qml/Shell.qml:384

339msgid "Sorry, incorrect passphrase."

347msgid "Sorry, incorrect passphrase."

340msgstr ""

348msgstr ""

341

349

342−#: qml/Shell.qml:364

350+#: qml/Shell.qml:385

343msgid "Sorry, incorrect passcode."

351msgid "Sorry, incorrect passcode."

344msgstr ""

352msgstr ""

345

353

346−#: qml/Shell.qml:365

354+#: qml/Shell.qml:386

347msgid "This will be your last attempt."

355msgid "This will be your last attempt."

348msgstr "Šīs būs jūs pēdējais mēģinājums."

356msgstr "Šīs būs jūs pēdējais mēģinājums."

349

357

350−#: qml/Shell.qml:367

358+#: qml/Shell.qml:388

351msgid ""

359msgid ""

352"If passphrase is entered incorrectly, your phone will conduct a factory "

360"If passphrase is entered incorrectly, your phone will conduct a factory "

353"reset and all personal data will be deleted."

361"reset and all personal data will be deleted."

354msgstr ""

362msgstr ""

355

363

356−#: qml/Shell.qml:368

364+#: qml/Shell.qml:389

357msgid ""

365msgid ""

358"If passcode is entered incorrectly, your phone will conduct a factory reset "

366"If passcode is entered incorrectly, your phone will conduct a factory reset "

359"and all personal data will be deleted."

367"and all personal data will be deleted."

po/ml.po+21−13

@@ -7,7 +7,7 @@ msgid ""

7msgstr ""

8"Project-Id-Version: unity8\n"

9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10−"POT-Creation-Date: 2014-10-02 10:35+0200\n"

10+"POT-Creation-Date: 2014-10-03 08:13-0400\n"

11"PO-Revision-Date: 2013-11-23 11:44+0000\n"

12"Last-Translator: ST Alfas <Unknown>\n"

13"Language-Team: Malayalam <ml@li.org>\n"

@@ -15,7 +15,7 @@ msgstr ""

15"Content-Type: text/plain; charset=UTF-8\n"

16"Content-Transfer-Encoding: 8bit\n"

17"Plural-Forms: nplurals=2; plural=n != 1;\n"

18−"X-Launchpad-Export-Date: 2014-10-03 06:22+0000\n"

18+"X-Launchpad-Export-Date: 2014-10-07 06:59+0000\n"

19"X-Generator: Launchpad (build 17196)\n"

20

21#: plugins/LightDM/Greeter.cpp:130

@@ -154,15 +154,15 @@ msgid ""

154"phone Tap on the screen to start"

155msgstr ""

156

157−#: qml/Components/Lockscreen.qml:206

157+#: qml/Components/Lockscreen.qml:218

158msgid "Emergency Call"

159msgstr "അടിയന്തിര വിളി"

160

161−#: qml/Components/Lockscreen.qml:226

161+#: qml/Components/Lockscreen.qml:250

162msgid "OK"

163msgstr ""

164

165−#: qml/Dash/GenericScopeView.qml:411 qml/Dash/GenericScopeView.qml:533

165+#: qml/Dash/GenericScopeView.qml:411 qml/Dash/GenericScopeView.qml:568

166msgid "See less"

167msgstr ""

168

@@ -207,6 +207,14 @@ msgstr "ഒരു അവലോകനം ചേര്‍ക്കുക"

207msgid "Send"

208msgstr "അയയ്‌ക്കുക"

209

210+#: qml/Dash/PullToRefreshScopeStyle.qml:55

211+msgid "Pull to refresh…"

212+msgstr ""

213+

214+#: qml/Dash/PullToRefreshScopeStyle.qml:60

215+msgid "Release to refresh…"

216+msgstr ""

217+

210#: qml/Dash/ScopesOverview.qml:206

218#: qml/Dash/ScopesOverview.qml:206

211msgid "Manage Scopes"

219msgid "Manage Scopes"

212msgstr ""

220msgstr ""

@@ -311,7 +319,7 @@ msgstr ""

311msgid "Enter passphrase"

319msgid "Enter passphrase"

312msgstr ""

320msgstr ""

313

321

314−#: qml/Shell.qml:321

322+#: qml/Shell.qml:341

315msgid "Sorry, incorrect passphrase"

323msgid "Sorry, incorrect passphrase"

316msgstr ""

324msgstr ""

317

325

@@ -323,7 +331,7 @@ msgstr ""

323msgid "Enter passcode"

331msgid "Enter passcode"

324msgstr ""

332msgstr ""

325

333

326−#: qml/Shell.qml:324

334+#: qml/Shell.qml:345

327msgid "Sorry, incorrect passcode"

335msgid "Sorry, incorrect passcode"

328msgstr ""

336msgstr ""

329

337

@@ -332,30 +340,30 @@ msgstr ""

332msgid "Enter %1"

340msgid "Enter %1"

333msgstr ""

341msgstr ""

334

342

335−#: qml/Shell.qml:328

343+#: qml/Shell.qml:349

336#, qt-format

344#, qt-format

337msgid "Sorry, incorrect %1"

345msgid "Sorry, incorrect %1"

338msgstr ""

346msgstr ""

339

347

340−#: qml/Shell.qml:363

348+#: qml/Shell.qml:384

341msgid "Sorry, incorrect passphrase."

349msgid "Sorry, incorrect passphrase."

342msgstr ""

350msgstr ""

343

351

344−#: qml/Shell.qml:364

352+#: qml/Shell.qml:385

345msgid "Sorry, incorrect passcode."

353msgid "Sorry, incorrect passcode."

346msgstr ""

354msgstr ""

347

355

348−#: qml/Shell.qml:365

356+#: qml/Shell.qml:386

349msgid "This will be your last attempt."

357msgid "This will be your last attempt."

350msgstr ""

358msgstr ""

351

359

352−#: qml/Shell.qml:367

360+#: qml/Shell.qml:388

353msgid ""

361msgid ""

354"If passphrase is entered incorrectly, your phone will conduct a factory "

362"If passphrase is entered incorrectly, your phone will conduct a factory "

355"reset and all personal data will be deleted."

363"reset and all personal data will be deleted."

356msgstr ""

364msgstr ""

357

365

358−#: qml/Shell.qml:368

366+#: qml/Shell.qml:389

359msgid ""

367msgid ""

360"If passcode is entered incorrectly, your phone will conduct a factory reset "

368"If passcode is entered incorrectly, your phone will conduct a factory reset "

361"and all personal data will be deleted."

369"and all personal data will be deleted."

po/mr.po+21−13

@@ -7,7 +7,7 @@ msgid ""

7msgstr ""

8"Project-Id-Version: unity8\n"

9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10−"POT-Creation-Date: 2014-10-02 10:35+0200\n"

10+"POT-Creation-Date: 2014-10-03 08:13-0400\n"

11"PO-Revision-Date: 2014-01-14 19:54+0000\n"

12"Last-Translator: Rohan Deshmukh <Unknown>\n"

13"Language-Team: Marathi <mr@li.org>\n"

@@ -15,7 +15,7 @@ msgstr ""

15"Content-Type: text/plain; charset=UTF-8\n"

16"Content-Transfer-Encoding: 8bit\n"

17"Plural-Forms: nplurals=2; plural=n != 1;\n"

18−"X-Launchpad-Export-Date: 2014-10-03 06:22+0000\n"

18+"X-Launchpad-Export-Date: 2014-10-07 06:59+0000\n"

19"X-Generator: Launchpad (build 17196)\n"

20

21#: plugins/LightDM/Greeter.cpp:130

@@ -152,15 +152,15 @@ msgid ""

152"phone Tap on the screen to start"

153msgstr ""

154

155−#: qml/Components/Lockscreen.qml:206

155+#: qml/Components/Lockscreen.qml:218

156msgid "Emergency Call"

157msgstr ""

158

159−#: qml/Components/Lockscreen.qml:226

159+#: qml/Components/Lockscreen.qml:250

160msgid "OK"

161msgstr ""

162

163−#: qml/Dash/GenericScopeView.qml:411 qml/Dash/GenericScopeView.qml:533

163+#: qml/Dash/GenericScopeView.qml:411 qml/Dash/GenericScopeView.qml:568

164msgid "See less"

165msgstr ""

166

@@ -205,6 +205,14 @@ msgstr ""

205msgid "Send"

206msgstr ""

207

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+

208#: qml/Dash/ScopesOverview.qml:206

216#: qml/Dash/ScopesOverview.qml:206

209msgid "Manage Scopes"

217msgid "Manage Scopes"

210msgstr ""

218msgstr ""

@@ -309,7 +317,7 @@ msgstr ""

309msgid "Enter passphrase"

317msgid "Enter passphrase"

310msgstr ""

318msgstr ""

311

319

312−#: qml/Shell.qml:321

320+#: qml/Shell.qml:341

313msgid "Sorry, incorrect passphrase"

321msgid "Sorry, incorrect passphrase"

314msgstr ""

322msgstr ""

315

323

@@ -321,7 +329,7 @@ msgstr ""

321msgid "Enter passcode"

329msgid "Enter passcode"

322msgstr ""

330msgstr ""

323

331

324−#: qml/Shell.qml:324

332+#: qml/Shell.qml:345

325msgid "Sorry, incorrect passcode"

333msgid "Sorry, incorrect passcode"

326msgstr ""

334msgstr ""

327

335

@@ -330,30 +338,30 @@ msgstr ""

330msgid "Enter %1"

338msgid "Enter %1"

331msgstr ""

339msgstr ""

332

340

333−#: qml/Shell.qml:328

341+#: qml/Shell.qml:349

334#, qt-format

342#, qt-format

335msgid "Sorry, incorrect %1"

343msgid "Sorry, incorrect %1"

336msgstr ""

344msgstr ""

337

345

338−#: qml/Shell.qml:363

346+#: qml/Shell.qml:384

339msgid "Sorry, incorrect passphrase."

347msgid "Sorry, incorrect passphrase."

340msgstr ""

348msgstr ""

341

349

342−#: qml/Shell.qml:364

350+#: qml/Shell.qml:385

343msgid "Sorry, incorrect passcode."

351msgid "Sorry, incorrect passcode."

344msgstr ""

352msgstr ""

345

353

346−#: qml/Shell.qml:365

354+#: qml/Shell.qml:386

347msgid "This will be your last attempt."

355msgid "This will be your last attempt."

348msgstr ""

356msgstr ""

349

357

350−#: qml/Shell.qml:367

358+#: qml/Shell.qml:388

351msgid ""

359msgid ""

352"If passphrase is entered incorrectly, your phone will conduct a factory "

360"If passphrase is entered incorrectly, your phone will conduct a factory "

353"reset and all personal data will be deleted."

361"reset and all personal data will be deleted."

354msgstr ""

362msgstr ""

355

363

356−#: qml/Shell.qml:368

364+#: qml/Shell.qml:389

357msgid ""

365msgid ""

358"If passcode is entered incorrectly, your phone will conduct a factory reset "

366"If passcode is entered incorrectly, your phone will conduct a factory reset "

359"and all personal data will be deleted."

367"and all personal data will be deleted."

po/ms.po+21−13

@@ -7,7 +7,7 @@ msgid ""

7msgstr ""

8"Project-Id-Version: unity8\n"

9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10−"POT-Creation-Date: 2014-10-02 10:35+0200\n"

10+"POT-Creation-Date: 2014-10-03 08:13-0400\n"

11"PO-Revision-Date: 2014-01-17 09:05+0000\n"

12"Last-Translator: abuyop <Unknown>\n"

13"Language-Team: Malay <ms@li.org>\n"

@@ -15,7 +15,7 @@ msgstr ""

15"Content-Type: text/plain; charset=UTF-8\n"

16"Content-Transfer-Encoding: 8bit\n"

17"Plural-Forms: nplurals=2; plural=n != 1;\n"

18−"X-Launchpad-Export-Date: 2014-10-03 06:22+0000\n"

18+"X-Launchpad-Export-Date: 2014-10-07 06:59+0000\n"

19"X-Generator: Launchpad (build 17196)\n"

20

21#: plugins/LightDM/Greeter.cpp:130

@@ -152,15 +152,15 @@ msgid ""

152"phone Tap on the screen to start"

153msgstr ""

154

155−#: qml/Components/Lockscreen.qml:206

155+#: qml/Components/Lockscreen.qml:218

156msgid "Emergency Call"

157msgstr "panggilan Kecemasan"

158

159−#: qml/Components/Lockscreen.qml:226

159+#: qml/Components/Lockscreen.qml:250

160msgid "OK"

161msgstr ""

162

163−#: qml/Dash/GenericScopeView.qml:411 qml/Dash/GenericScopeView.qml:533

163+#: qml/Dash/GenericScopeView.qml:411 qml/Dash/GenericScopeView.qml:568

164msgid "See less"

165msgstr ""

166

@@ -205,6 +205,14 @@ msgstr "Tambah ulasan"

205msgid "Send"

206msgstr "Hantar"

207

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+

208#: qml/Dash/ScopesOverview.qml:206

216#: qml/Dash/ScopesOverview.qml:206

209msgid "Manage Scopes"

217msgid "Manage Scopes"

210msgstr ""

218msgstr ""

@@ -309,7 +317,7 @@ msgstr ""

309msgid "Enter passphrase"

317msgid "Enter passphrase"

310msgstr ""

318msgstr ""

311

319

312−#: qml/Shell.qml:321

320+#: qml/Shell.qml:341

313msgid "Sorry, incorrect passphrase"

321msgid "Sorry, incorrect passphrase"

314msgstr ""

322msgstr ""

315

323

@@ -321,7 +329,7 @@ msgstr ""

321msgid "Enter passcode"

329msgid "Enter passcode"

322msgstr ""

330msgstr ""

323

331

324−#: qml/Shell.qml:324

332+#: qml/Shell.qml:345

325msgid "Sorry, incorrect passcode"

333msgid "Sorry, incorrect passcode"

326msgstr ""

334msgstr ""

327

335

@@ -330,30 +338,30 @@ msgstr ""

330msgid "Enter %1"

338msgid "Enter %1"

331msgstr ""

339msgstr ""

332

340

333−#: qml/Shell.qml:328

341+#: qml/Shell.qml:349

334#, qt-format

342#, qt-format

335msgid "Sorry, incorrect %1"

343msgid "Sorry, incorrect %1"

336msgstr ""

344msgstr ""

337

345

338−#: qml/Shell.qml:363

346+#: qml/Shell.qml:384

339msgid "Sorry, incorrect passphrase."

347msgid "Sorry, incorrect passphrase."

340msgstr ""

348msgstr ""

341

349

342−#: qml/Shell.qml:364

350+#: qml/Shell.qml:385

343msgid "Sorry, incorrect passcode."

351msgid "Sorry, incorrect passcode."

344msgstr ""

352msgstr ""

345

353

346−#: qml/Shell.qml:365

354+#: qml/Shell.qml:386

347msgid "This will be your last attempt."

355msgid "This will be your last attempt."

348msgstr ""

356msgstr ""

349

357

350−#: qml/Shell.qml:367

358+#: qml/Shell.qml:388

351msgid ""

359msgid ""

352"If passphrase is entered incorrectly, your phone will conduct a factory "

360"If passphrase is entered incorrectly, your phone will conduct a factory "

353"reset and all personal data will be deleted."

361"reset and all personal data will be deleted."

354msgstr ""

362msgstr ""

355

363

356−#: qml/Shell.qml:368

364+#: qml/Shell.qml:389

357msgid ""

365msgid ""

358"If passcode is entered incorrectly, your phone will conduct a factory reset "

366"If passcode is entered incorrectly, your phone will conduct a factory reset "

359"and all personal data will be deleted."

367"and all personal data will be deleted."

po/my.po+21−13

@@ -7,7 +7,7 @@ msgid ""

7msgstr ""

8"Project-Id-Version: unity\n"

9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10−"POT-Creation-Date: 2014-10-02 10:35+0200\n"

10+"POT-Creation-Date: 2014-10-03 08:13-0400\n"

11"PO-Revision-Date: 2013-12-12 11:12+0000\n"

12"Last-Translator: Pyae Sone <Unknown>\n"

13"Language-Team: Burmese <my@li.org>\n"

@@ -15,7 +15,7 @@ msgstr ""

15"Content-Type: text/plain; charset=UTF-8\n"

16"Content-Transfer-Encoding: 8bit\n"

17"Plural-Forms: nplurals=1; plural=0;\n"

18−"X-Launchpad-Export-Date: 2014-10-03 06:21+0000\n"

18+"X-Launchpad-Export-Date: 2014-10-07 06:58+0000\n"

19"X-Generator: Launchpad (build 17196)\n"

20

21#: plugins/LightDM/Greeter.cpp:130

@@ -152,15 +152,15 @@ msgid ""

152"phone Tap on the screen to start"

153msgstr ""

154

155−#: qml/Components/Lockscreen.qml:206

155+#: qml/Components/Lockscreen.qml:218

156msgid "Emergency Call"

157msgstr "အရေးပေါ်ခေါ်မည်"

158

159−#: qml/Components/Lockscreen.qml:226

159+#: qml/Components/Lockscreen.qml:250

160msgid "OK"

161msgstr ""

162

163−#: qml/Dash/GenericScopeView.qml:411 qml/Dash/GenericScopeView.qml:533

163+#: qml/Dash/GenericScopeView.qml:411 qml/Dash/GenericScopeView.qml:568

164msgid "See less"

165msgstr ""

166

@@ -205,6 +205,14 @@ msgstr ""

205msgid "Send"

206msgstr "ပို့မည်"

207

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+

208#: qml/Dash/ScopesOverview.qml:206

216#: qml/Dash/ScopesOverview.qml:206

209msgid "Manage Scopes"

217msgid "Manage Scopes"

210msgstr ""

218msgstr ""

@@ -309,7 +317,7 @@ msgstr ""

309msgid "Enter passphrase"

317msgid "Enter passphrase"

310msgstr ""

318msgstr ""

311

319

312−#: qml/Shell.qml:321

320+#: qml/Shell.qml:341

313msgid "Sorry, incorrect passphrase"

321msgid "Sorry, incorrect passphrase"

314msgstr ""

322msgstr ""

315

323

@@ -321,7 +329,7 @@ msgstr ""

321msgid "Enter passcode"

329msgid "Enter passcode"

322msgstr ""

330msgstr ""

323

331

324−#: qml/Shell.qml:324

332+#: qml/Shell.qml:345

325msgid "Sorry, incorrect passcode"

333msgid "Sorry, incorrect passcode"

326msgstr ""

334msgstr ""

327

335

@@ -330,30 +338,30 @@ msgstr ""

330msgid "Enter %1"

338msgid "Enter %1"

331msgstr ""

339msgstr ""

332

340

333−#: qml/Shell.qml:328

341+#: qml/Shell.qml:349

334#, qt-format

342#, qt-format

335msgid "Sorry, incorrect %1"

343msgid "Sorry, incorrect %1"

336msgstr ""

344msgstr ""

337

345

338−#: qml/Shell.qml:363

346+#: qml/Shell.qml:384

339msgid "Sorry, incorrect passphrase."

347msgid "Sorry, incorrect passphrase."

340msgstr ""

348msgstr ""

341

349

342−#: qml/Shell.qml:364

350+#: qml/Shell.qml:385

343msgid "Sorry, incorrect passcode."

351msgid "Sorry, incorrect passcode."

344msgstr ""

352msgstr ""

345

353

346−#: qml/Shell.qml:365

354+#: qml/Shell.qml:386

347msgid "This will be your last attempt."

355msgid "This will be your last attempt."

348msgstr ""

356msgstr ""

349

357

350−#: qml/Shell.qml:367

358+#: qml/Shell.qml:388

351msgid ""

359msgid ""

352"If passphrase is entered incorrectly, your phone will conduct a factory "

360"If passphrase is entered incorrectly, your phone will conduct a factory "

353"reset and all personal data will be deleted."

361"reset and all personal data will be deleted."

354msgstr ""

362msgstr ""

355

363

356−#: qml/Shell.qml:368

364+#: qml/Shell.qml:389

357msgid ""

365msgid ""

358"If passcode is entered incorrectly, your phone will conduct a factory reset "

366"If passcode is entered incorrectly, your phone will conduct a factory reset "

359"and all personal data will be deleted."

367"and all personal data will be deleted."

po/nb.po+33−26

@@ -7,15 +7,15 @@ msgid ""

7msgstr ""

8"Project-Id-Version: unity\n"

9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10−"POT-Creation-Date: 2014-10-02 10:35+0200\n"

10+"POT-Creation-Date: 2014-10-03 08:13-0400\n"

11−"PO-Revision-Date: 2014-09-29 05:32+0000\n"

11+"PO-Revision-Date: 2014-10-03 08:44+0000\n"

12"Last-Translator: Åka Sikrom <Unknown>\n"

13"Language-Team: Norwegian Bokmal <nb@li.org>\n"

14"MIME-Version: 1.0\n"

15"Content-Type: text/plain; charset=UTF-8\n"

16"Content-Transfer-Encoding: 8bit\n"

17"Plural-Forms: nplurals=2; plural=n != 1;\n"

18−"X-Launchpad-Export-Date: 2014-10-03 06:22+0000\n"

18+"X-Launchpad-Export-Date: 2014-10-07 06:59+0000\n"

19"X-Generator: Launchpad (build 17196)\n"

20

21#: plugins/LightDM/Greeter.cpp:130

@@ -33,22 +33,24 @@ msgstr "Fjern snarvei"

33

34#: qml/Components/DelayedLockscreen.qml:47

35msgid "Device Locked"

36−msgstr ""

36+msgstr "Enheten er låst"

37

38#: qml/Components/DelayedLockscreen.qml:62

39msgid "You have been locked out due to too many failed passphrase attempts."

40msgstr ""

41+"Du har skrevet inn feil passordfrase for mange ganger, og er derfor "

42+"utestengt."

41

43

42#: qml/Components/DelayedLockscreen.qml:63

44#: qml/Components/DelayedLockscreen.qml:63

43msgid "You have been locked out due to too many failed passcode attempts."

45msgid "You have been locked out due to too many failed passcode attempts."

44−msgstr ""

46+msgstr "Du har tastet feil kode for mange ganger, og er derfor utestengt."

45

47

46#: qml/Components/DelayedLockscreen.qml:72

48#: qml/Components/DelayedLockscreen.qml:72

47#, qt-format

49#, qt-format

48msgid "Please wait %1 minute and then try again…"

50msgid "Please wait %1 minute and then try again…"

49msgid_plural "Please wait %1 minutes and then try again…"

51msgid_plural "Please wait %1 minutes and then try again…"

50−msgstr[0] ""

52+msgstr[0] "Vent i %1 minutt, og prøv deretter på nytt …"

51−msgstr[1] ""

53+msgstr[1] "Vent i %1 minutter, og prøv deretter på nytt …"

52

54

53#: qml/Components/Dialogs.qml:70

55#: qml/Components/Dialogs.qml:70

54msgid "Log out"

56msgid "Log out"

@@ -156,15 +158,15 @@ msgstr ""

156"Du har nå mestret kantbevegelsene, og er klar til å bruke "

158"Du har nå mestret kantbevegelsene, og er klar til å bruke "

157"telefonen Trykk på skjermen for å begynne"

159"telefonen Trykk på skjermen for å begynne"

158

160

159−#: qml/Components/Lockscreen.qml:206

161+#: qml/Components/Lockscreen.qml:218

160msgid "Emergency Call"

162msgid "Emergency Call"

161msgstr "Nødanrop"

163msgstr "Nødanrop"

162

164

163−#: qml/Components/Lockscreen.qml:226

165+#: qml/Components/Lockscreen.qml:250

164msgid "OK"

166msgid "OK"

165msgstr "OK"

167msgstr "OK"

166

168

167−#: qml/Dash/GenericScopeView.qml:411 qml/Dash/GenericScopeView.qml:533

169+#: qml/Dash/GenericScopeView.qml:411 qml/Dash/GenericScopeView.qml:568

168msgid "See less"

170msgid "See less"

169msgstr "Vis mindre"

171msgstr "Vis mindre"

170

172

@@ -209,6 +211,14 @@ msgstr "Skriv en anmeldelse"

209msgid "Send"

211msgid "Send"

210msgstr "Send"

212msgstr "Send"

211

213

214+#: qml/Dash/PullToRefreshScopeStyle.qml:55

215+msgid "Pull to refresh…"

216+msgstr ""

217+

218+#: qml/Dash/PullToRefreshScopeStyle.qml:60

219+msgid "Release to refresh…"

220+msgstr ""

221+

212#: qml/Dash/ScopesOverview.qml:206

222#: qml/Dash/ScopesOverview.qml:206

213msgid "Manage Scopes"

223msgid "Manage Scopes"

214msgstr "Håndter virkefelt"

224msgstr "Håndter virkefelt"

@@ -231,7 +241,7 @@ msgstr "Alt"

231

241

232#: qml/Greeter/Greeter.qml:157

242#: qml/Greeter/Greeter.qml:157

233msgid "Unlock"

243msgid "Unlock"

234−msgstr ""

244+msgstr "Lås opp"

235

245

236#: qml/Hud/HudParametrizedActionsPage.qml:139

246#: qml/Hud/HudParametrizedActionsPage.qml:139

237msgid "Confirm"

247msgid "Confirm"

@@ -311,47 +321,47 @@ msgstr "Fremmednett"

311

321

312#: qml/Shell.qml:340

322#: qml/Shell.qml:340

313msgid "Enter passphrase"

323msgid "Enter passphrase"

314−msgstr ""

324+msgstr "Skriv inn passordfrase"

315

325

316−#: qml/Shell.qml:321

326+#: qml/Shell.qml:341

317msgid "Sorry, incorrect passphrase"

327msgid "Sorry, incorrect passphrase"

318msgstr "Feil passordfrase"

328msgstr "Feil passordfrase"

319

329

320#: qml/Shell.qml:342

330#: qml/Shell.qml:342

321msgid "Please re-enter"

331msgid "Please re-enter"

322−msgstr ""

332+msgstr "Skriv inn på nytt"

323

333

324#: qml/Shell.qml:344

334#: qml/Shell.qml:344

325msgid "Enter passcode"

335msgid "Enter passcode"

326−msgstr ""

336+msgstr "Tast kode"

327

337

328−#: qml/Shell.qml:324

338+#: qml/Shell.qml:345

329msgid "Sorry, incorrect passcode"

339msgid "Sorry, incorrect passcode"

330msgstr "Feil kode"

340msgstr "Feil kode"

331

341

332#: qml/Shell.qml:348

342#: qml/Shell.qml:348

333#, qt-format

343#, qt-format

334msgid "Enter %1"

344msgid "Enter %1"

335−msgstr ""

345+msgstr "Skriv inn %1"

336

346

337−#: qml/Shell.qml:328

347+#: qml/Shell.qml:349

338#, qt-format

348#, qt-format

339msgid "Sorry, incorrect %1"

349msgid "Sorry, incorrect %1"

340msgstr "Feil %1"

350msgstr "Feil %1"

341

351

342−#: qml/Shell.qml:363

352+#: qml/Shell.qml:384

343msgid "Sorry, incorrect passphrase."

353msgid "Sorry, incorrect passphrase."

344msgstr "Feil passordfrase."

354msgstr "Feil passordfrase."

345

355

346−#: qml/Shell.qml:364

356+#: qml/Shell.qml:385

347msgid "Sorry, incorrect passcode."

357msgid "Sorry, incorrect passcode."

348msgstr "Feil kode."

358msgstr "Feil kode."

349

359

350−#: qml/Shell.qml:365

360+#: qml/Shell.qml:386

351msgid "This will be your last attempt."

361msgid "This will be your last attempt."

352msgstr "Dette er ditt siste forsøk."

362msgstr "Dette er ditt siste forsøk."

353

363

354−#: qml/Shell.qml:367

364+#: qml/Shell.qml:388

355msgid ""

365msgid ""

356"If passphrase is entered incorrectly, your phone will conduct a factory "

366"If passphrase is entered incorrectly, your phone will conduct a factory "

357"reset and all personal data will be deleted."

367"reset and all personal data will be deleted."

@@ -359,7 +369,7 @@ msgstr ""

359"Hvis du skriver feil passordfrase en gang til, tilbakestilles telefonen til "

369"Hvis du skriver feil passordfrase en gang til, tilbakestilles telefonen til "

360"fabrikkinnstillinger, og alle personlige data slettes."

370"fabrikkinnstillinger, og alle personlige data slettes."

361

371

362−#: qml/Shell.qml:368

372+#: qml/Shell.qml:389

363msgid ""

373msgid ""

364"If passcode is entered incorrectly, your phone will conduct a factory reset "

374"If passcode is entered incorrectly, your phone will conduct a factory reset "

365"and all personal data will be deleted."

375"and all personal data will be deleted."

@@ -374,9 +384,6 @@ msgstr ""

374#~ msgid "Hello %1"

384#~ msgid "Hello %1"

375#~ msgstr "Hei, %1"

385#~ msgstr "Hei, %1"

376

386

377−#~ msgid "Manage Dash"

378−#~ msgstr "Håndter dashbord"

379−

380#~ msgid "Please wait"

387#~ msgid "Please wait"

381#~ msgstr "Vent litt"

388#~ msgstr "Vent litt"

382

389

po/nl.po+34−25

@@ -7,15 +7,15 @@ msgid ""

7msgstr ""

8"Project-Id-Version: unity\n"

9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10−"POT-Creation-Date: 2014-10-02 10:35+0200\n"

10+"POT-Creation-Date: 2014-10-03 08:13-0400\n"

11−"PO-Revision-Date: 2014-09-28 16:19+0000\n"

11+"PO-Revision-Date: 2014-10-03 18:53+0000\n"

12"Last-Translator: rob <linuxned@gmail.com>\n"

13"Language-Team: Dutch <nl@li.org>\n"

14"MIME-Version: 1.0\n"

15"Content-Type: text/plain; charset=UTF-8\n"

16"Content-Transfer-Encoding: 8bit\n"

17"Plural-Forms: nplurals=2; plural=n != 1;\n"

18−"X-Launchpad-Export-Date: 2014-10-03 06:21+0000\n"

18+"X-Launchpad-Export-Date: 2014-10-07 06:58+0000\n"

19"X-Generator: Launchpad (build 17196)\n"

20

21#: plugins/LightDM/Greeter.cpp:130

@@ -33,22 +33,26 @@ msgstr "Snelkoppeling losmaken"

33

34#: qml/Components/DelayedLockscreen.qml:47

35msgid "Device Locked"

36−msgstr ""

36+msgstr "Apparaat vergrendeld"

37

38#: qml/Components/DelayedLockscreen.qml:62

39msgid "You have been locked out due to too many failed passphrase attempts."

40msgstr ""

41+"U werd de toegang geweigerd omdat u te vaak een onjuiste wachtwoordzin heeft "

42+"ingevoerd."

41

43

42#: qml/Components/DelayedLockscreen.qml:63

44#: qml/Components/DelayedLockscreen.qml:63

43msgid "You have been locked out due to too many failed passcode attempts."

45msgid "You have been locked out due to too many failed passcode attempts."

44msgstr ""

46msgstr ""

47+"U werd de toegang geweigerd omdat u te vaak een onjuiste toegangscode heeft "

48+"ingevoerd."

45

49

46#: qml/Components/DelayedLockscreen.qml:72

50#: qml/Components/DelayedLockscreen.qml:72

47#, qt-format

51#, qt-format

48msgid "Please wait %1 minute and then try again…"

52msgid "Please wait %1 minute and then try again…"

49msgid_plural "Please wait %1 minutes and then try again…"

53msgid_plural "Please wait %1 minutes and then try again…"

50−msgstr[0] ""

54+msgstr[0] "Wacht a.u.b. %1 minuut en probeer het dan opnieuw…"

51−msgstr[1] ""

55+msgstr[1] "Wacht a.u.b. %1 minuten en probeer het dan opnieuw…"

52

56

53#: qml/Components/Dialogs.qml:70

57#: qml/Components/Dialogs.qml:70

54msgid "Log out"

58msgid "Log out"

@@ -156,15 +160,15 @@ msgstr ""

156"Nu u de bewegingen vanuit de randen onder de knie heeft, kunt u beginnen met "

160"Nu u de bewegingen vanuit de randen onder de knie heeft, kunt u beginnen met "

157"het gebruiken van de telefoon Tik op het scherm om te beginnen"

161"het gebruiken van de telefoon Tik op het scherm om te beginnen"

158

162

159−#: qml/Components/Lockscreen.qml:206

163+#: qml/Components/Lockscreen.qml:218

160msgid "Emergency Call"

164msgid "Emergency Call"

161msgstr "Noodoproep"

165msgstr "Noodoproep"

162

166

163−#: qml/Components/Lockscreen.qml:226

167+#: qml/Components/Lockscreen.qml:250

164msgid "OK"

168msgid "OK"

165msgstr "Ok"

169msgstr "Ok"

166

170

167−#: qml/Dash/GenericScopeView.qml:411 qml/Dash/GenericScopeView.qml:533

171+#: qml/Dash/GenericScopeView.qml:411 qml/Dash/GenericScopeView.qml:568

168msgid "See less"

172msgid "See less"

169msgstr "Minder zien"

173msgstr "Minder zien"

170

174

@@ -209,6 +213,14 @@ msgstr "Voeg recensie toe"

209msgid "Send"

213msgid "Send"

210msgstr "Versturen"

214msgstr "Versturen"

211

215

216+#: qml/Dash/PullToRefreshScopeStyle.qml:55

217+msgid "Pull to refresh…"

218+msgstr ""

219+

220+#: qml/Dash/PullToRefreshScopeStyle.qml:60

221+msgid "Release to refresh…"

222+msgstr ""

223+

212#: qml/Dash/ScopesOverview.qml:206

224#: qml/Dash/ScopesOverview.qml:206

213msgid "Manage Scopes"

225msgid "Manage Scopes"

214msgstr "Scopes-beheer"

226msgstr "Scopes-beheer"

@@ -231,7 +243,7 @@ msgstr "Alles"

231

243

232#: qml/Greeter/Greeter.qml:157

244#: qml/Greeter/Greeter.qml:157

233msgid "Unlock"

245msgid "Unlock"

234−msgstr ""

246+msgstr "Ontgrendelen"

235

247

236#: qml/Hud/HudParametrizedActionsPage.qml:139

248#: qml/Hud/HudParametrizedActionsPage.qml:139

237msgid "Confirm"

249msgid "Confirm"

@@ -311,47 +323,47 @@ msgstr "Roaming"

311

323

312#: qml/Shell.qml:340

324#: qml/Shell.qml:340

313msgid "Enter passphrase"

325msgid "Enter passphrase"

314−msgstr ""

326+msgstr "Voer wachtwoordzin in"

315

327

316−#: qml/Shell.qml:321

328+#: qml/Shell.qml:341

317msgid "Sorry, incorrect passphrase"

329msgid "Sorry, incorrect passphrase"

318msgstr "Sorry, onjuiste wachtwoordzin"

330msgstr "Sorry, onjuiste wachtwoordzin"

319

331

320#: qml/Shell.qml:342

332#: qml/Shell.qml:342

321msgid "Please re-enter"

333msgid "Please re-enter"

322−msgstr ""

334+msgstr "Herhaal deze a.u.b."

323

335

324#: qml/Shell.qml:344

336#: qml/Shell.qml:344

325msgid "Enter passcode"

337msgid "Enter passcode"

326−msgstr ""

338+msgstr "Voer toegangscode in"

327

339

328−#: qml/Shell.qml:324

340+#: qml/Shell.qml:345

329msgid "Sorry, incorrect passcode"

341msgid "Sorry, incorrect passcode"

330msgstr "Sorry, onjuiste toegangscode"

342msgstr "Sorry, onjuiste toegangscode"

331

343

332#: qml/Shell.qml:348

344#: qml/Shell.qml:348

333#, qt-format

345#, qt-format

334msgid "Enter %1"

346msgid "Enter %1"

335−msgstr ""

347+msgstr "Voer %1 in"

336

348

337−#: qml/Shell.qml:328

349+#: qml/Shell.qml:349

338#, qt-format

350#, qt-format

339msgid "Sorry, incorrect %1"

351msgid "Sorry, incorrect %1"

340msgstr "Sorry, onjuiste %1"

352msgstr "Sorry, onjuiste %1"

341

353

342−#: qml/Shell.qml:363

354+#: qml/Shell.qml:384

343msgid "Sorry, incorrect passphrase."

355msgid "Sorry, incorrect passphrase."

344msgstr "Sorry, onjuiste wachtwoordzin."

356msgstr "Sorry, onjuiste wachtwoordzin."

345

357

346−#: qml/Shell.qml:364

358+#: qml/Shell.qml:385

347msgid "Sorry, incorrect passcode."

359msgid "Sorry, incorrect passcode."

348msgstr "Sorry, onjuiste toegangscode."

360msgstr "Sorry, onjuiste toegangscode."

349

361

350−#: qml/Shell.qml:365

362+#: qml/Shell.qml:386

351msgid "This will be your last attempt."

363msgid "This will be your last attempt."

352msgstr "Dit zal uw laatste poging worden."

364msgstr "Dit zal uw laatste poging worden."

353

365

354−#: qml/Shell.qml:367

366+#: qml/Shell.qml:388

355msgid ""

367msgid ""

356"If passphrase is entered incorrectly, your phone will conduct a factory "

368"If passphrase is entered incorrectly, your phone will conduct a factory "

357"reset and all personal data will be deleted."

369"reset and all personal data will be deleted."

@@ -359,7 +371,7 @@ msgstr ""

359"Wanneer de wachtwoordzin nu opnieuw onjuist wordt ingevoerd, zal uw telefoon "

371"Wanneer de wachtwoordzin nu opnieuw onjuist wordt ingevoerd, zal uw telefoon "

360"teruggaan naar de fabrieksinstellingen en zal al uw eigen data verloren gaan."

372"teruggaan naar de fabrieksinstellingen en zal al uw eigen data verloren gaan."

361

373

362−#: qml/Shell.qml:368

374+#: qml/Shell.qml:389

363msgid ""

375msgid ""

364"If passcode is entered incorrectly, your phone will conduct a factory reset "

376"If passcode is entered incorrectly, your phone will conduct a factory reset "

365"and all personal data will be deleted."

377"and all personal data will be deleted."

@@ -377,9 +389,6 @@ msgstr ""

377#~ msgid "Swipe to unlock"

389#~ msgid "Swipe to unlock"

378#~ msgstr "Veeg om te ontgrendelen"

390#~ msgstr "Veeg om te ontgrendelen"

379

391

380−#~ msgid "Manage Dash"

381−#~ msgstr "Snelzoeker-beheer"

382−

383#~ msgid "Please wait"

392#~ msgid "Please wait"

384#~ msgstr "Even geduld a.u.b."

393#~ msgstr "Even geduld a.u.b."

385

394

po/pl.po+21−13

@@ -7,7 +7,7 @@ msgid ""

7msgstr ""

8"Project-Id-Version: unity\n"

9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10−"POT-Creation-Date: 2014-10-02 10:35+0200\n"

10+"POT-Creation-Date: 2014-10-03 08:13-0400\n"

11"PO-Revision-Date: 2014-08-18 20:25+0000\n"

12"Last-Translator: Paweł Stroka <pawstr@gmail.com>\n"

13"Language-Team: Polish <pl@li.org>\n"

@@ -16,7 +16,7 @@ msgstr ""

16"Content-Transfer-Encoding: 8bit\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"

19+"X-Launchpad-Export-Date: 2014-10-07 06:59+0000\n"

20"X-Generator: Launchpad (build 17196)\n"

21

22#: plugins/LightDM/Greeter.cpp:130

@@ -157,15 +157,15 @@ msgstr ""

157"Wydawanie poleceń krawędzi zostało opanowane. Urządzenie gotowe do "

158"pracy. Dotknij ekranu by rozpocząć"

159

160−#: qml/Components/Lockscreen.qml:206

160+#: qml/Components/Lockscreen.qml:218

161msgid "Emergency Call"

162msgstr "Telefon ratunkowy"

163

164−#: qml/Components/Lockscreen.qml:226

164+#: qml/Components/Lockscreen.qml:250

165msgid "OK"

166msgstr "OK"

167

168−#: qml/Dash/GenericScopeView.qml:411 qml/Dash/GenericScopeView.qml:533

168+#: qml/Dash/GenericScopeView.qml:411 qml/Dash/GenericScopeView.qml:568

169msgid "See less"

170msgstr "Zobacz mniej"

171

@@ -210,6 +210,14 @@ msgstr "Dodaj recenzję"

210msgid "Send"

211msgstr "Wyślij"

212

213+#: qml/Dash/PullToRefreshScopeStyle.qml:55

214+msgid "Pull to refresh…"

215+msgstr ""

216+

217+#: qml/Dash/PullToRefreshScopeStyle.qml:60

218+msgid "Release to refresh…"

219+msgstr ""

220+

213#: qml/Dash/ScopesOverview.qml:206

221#: qml/Dash/ScopesOverview.qml:206

214msgid "Manage Scopes"

222msgid "Manage Scopes"

215msgstr ""

223msgstr ""

@@ -314,7 +322,7 @@ msgstr ""

314msgid "Enter passphrase"

322msgid "Enter passphrase"

315msgstr ""

323msgstr ""

316

324

317−#: qml/Shell.qml:321

325+#: qml/Shell.qml:341

318msgid "Sorry, incorrect passphrase"

326msgid "Sorry, incorrect passphrase"

319msgstr ""

327msgstr ""

320

328

@@ -326,7 +334,7 @@ msgstr ""

326msgid "Enter passcode"

334msgid "Enter passcode"

327msgstr ""

335msgstr ""

328

336

329−#: qml/Shell.qml:324

337+#: qml/Shell.qml:345

330msgid "Sorry, incorrect passcode"

338msgid "Sorry, incorrect passcode"

331msgstr ""

339msgstr ""

332

340

@@ -335,30 +343,30 @@ msgstr ""

335msgid "Enter %1"

343msgid "Enter %1"

336msgstr ""

344msgstr ""

337

345

338−#: qml/Shell.qml:328

346+#: qml/Shell.qml:349

339#, qt-format

347#, qt-format

340msgid "Sorry, incorrect %1"

348msgid "Sorry, incorrect %1"

341msgstr ""

349msgstr ""

342

350

343−#: qml/Shell.qml:363

351+#: qml/Shell.qml:384

344msgid "Sorry, incorrect passphrase."

352msgid "Sorry, incorrect passphrase."

345msgstr "Niestety, błędne hasło"

353msgstr "Niestety, błędne hasło"

346

354

347−#: qml/Shell.qml:364

355+#: qml/Shell.qml:385

348msgid "Sorry, incorrect passcode."

356msgid "Sorry, incorrect passcode."

349msgstr "Niestety, błędny kod"

357msgstr "Niestety, błędny kod"

350

358

351−#: qml/Shell.qml:365

359+#: qml/Shell.qml:386

352msgid "This will be your last attempt."

360msgid "This will be your last attempt."

353msgstr ""

361msgstr ""

354

362

355−#: qml/Shell.qml:367

363+#: qml/Shell.qml:388

356msgid ""

364msgid ""

357"If passphrase is entered incorrectly, your phone will conduct a factory "

365"If passphrase is entered incorrectly, your phone will conduct a factory "

358"reset and all personal data will be deleted."

366"reset and all personal data will be deleted."

359msgstr ""

367msgstr ""

360

368

361−#: qml/Shell.qml:368

369+#: qml/Shell.qml:389

362msgid ""

370msgid ""

363"If passcode is entered incorrectly, your phone will conduct a factory reset "

371"If passcode is entered incorrectly, your phone will conduct a factory reset "

364"and all personal data will be deleted."

372"and all personal data will be deleted."

po/pt.po+32−27

@@ -7,15 +7,15 @@ msgid ""

7msgstr ""

8"Project-Id-Version: unity8\n"

9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10−"POT-Creation-Date: 2014-10-02 10:35+0200\n"

10+"POT-Creation-Date: 2014-10-03 08:13-0400\n"

11−"PO-Revision-Date: 2014-09-28 18:52+0000\n"

11+"PO-Revision-Date: 2014-10-03 16:17+0000\n"

12"Last-Translator: Ivo Xavier <ivofernandes12@gmail.com>\n"

13"Language-Team: Portuguese <pt@li.org>\n"

14"MIME-Version: 1.0\n"

15"Content-Type: text/plain; charset=UTF-8\n"

16"Content-Transfer-Encoding: 8bit\n"

17"Plural-Forms: nplurals=2; plural=n != 1;\n"

18−"X-Launchpad-Export-Date: 2014-10-03 06:22+0000\n"

18+"X-Launchpad-Export-Date: 2014-10-07 06:59+0000\n"

19"X-Generator: Launchpad (build 17196)\n"

20

21#: plugins/LightDM/Greeter.cpp:130

@@ -33,22 +33,22 @@ msgstr "Remover atalho"

33

34#: qml/Components/DelayedLockscreen.qml:47

35msgid "Device Locked"

36−msgstr ""

36+msgstr "Dispositivo bloqueado"

37

38#: qml/Components/DelayedLockscreen.qml:62

39msgid "You have been locked out due to too many failed passphrase attempts."

40−msgstr ""

40+msgstr "Foi bloqueado devido a muitas tentativas falhadas da frase-senha."

41

42#: qml/Components/DelayedLockscreen.qml:63

43msgid "You have been locked out due to too many failed passcode attempts."

44−msgstr ""

44+msgstr "Foi bloqueado devido a muitas tentativas falhadas da senha."

45

46#: qml/Components/DelayedLockscreen.qml:72

47#, qt-format

48msgid "Please wait %1 minute and then try again…"

49msgid_plural "Please wait %1 minutes and then try again…"

50−msgstr[0] ""

50+msgstr[0] "Por favor, aguarde %1 minuto e tente novamente…"

51−msgstr[1] ""

51+msgstr[1] "Por favor, aguarde %1 minutos e tente novamente…"

52

53#: qml/Components/Dialogs.qml:70

54msgid "Log out"

@@ -157,15 +157,15 @@ msgstr ""

157"Já domina os gestos dos limites e pode começar a usar o "

158"telefone Toque no ecrã para começar"

159

160−#: qml/Components/Lockscreen.qml:206

160+#: qml/Components/Lockscreen.qml:218

161msgid "Emergency Call"

162msgstr "Chamada de emergência"

163

164−#: qml/Components/Lockscreen.qml:226

164+#: qml/Components/Lockscreen.qml:250

165msgid "OK"

166msgstr "OK"

167

168−#: qml/Dash/GenericScopeView.qml:411 qml/Dash/GenericScopeView.qml:533

168+#: qml/Dash/GenericScopeView.qml:411 qml/Dash/GenericScopeView.qml:568

169msgid "See less"

170msgstr "Ver menos"

171

@@ -210,6 +210,14 @@ msgstr "Adicione uma crítica"

210msgid "Send"

211msgstr "Enviar"

212

213+#: qml/Dash/PullToRefreshScopeStyle.qml:55

214+msgid "Pull to refresh…"

215+msgstr ""

216+

217+#: qml/Dash/PullToRefreshScopeStyle.qml:60

218+msgid "Release to refresh…"

219+msgstr ""

220+

213#: qml/Dash/ScopesOverview.qml:206

221#: qml/Dash/ScopesOverview.qml:206

214msgid "Manage Scopes"

222msgid "Manage Scopes"

215msgstr "Gerir Scopes"

223msgstr "Gerir Scopes"

@@ -232,7 +240,7 @@ msgstr "Todos"

232

240

233#: qml/Greeter/Greeter.qml:157

241#: qml/Greeter/Greeter.qml:157

234msgid "Unlock"

242msgid "Unlock"

235−msgstr ""

243+msgstr "Desbloquear"

236

244

237#: qml/Hud/HudParametrizedActionsPage.qml:139

245#: qml/Hud/HudParametrizedActionsPage.qml:139

238msgid "Confirm"

246msgid "Confirm"

@@ -312,47 +320,47 @@ msgstr "Roaming"

312

320

313#: qml/Shell.qml:340

321#: qml/Shell.qml:340

314msgid "Enter passphrase"

322msgid "Enter passphrase"

315−msgstr ""

323+msgstr "Indique a frase-senha"

316

324

317−#: qml/Shell.qml:321

325+#: qml/Shell.qml:341

318msgid "Sorry, incorrect passphrase"

326msgid "Sorry, incorrect passphrase"

319msgstr "Desculpe, frase-senha incorreta"

327msgstr "Desculpe, frase-senha incorreta"

320

328

321#: qml/Shell.qml:342

329#: qml/Shell.qml:342

322msgid "Please re-enter"

330msgid "Please re-enter"

323−msgstr ""

331+msgstr "Por favor, volte a introduzir"

324

332

325#: qml/Shell.qml:344

333#: qml/Shell.qml:344

326msgid "Enter passcode"

334msgid "Enter passcode"

327−msgstr ""

335+msgstr "Introduza senha"

328

336

329−#: qml/Shell.qml:324

337+#: qml/Shell.qml:345

330msgid "Sorry, incorrect passcode"

338msgid "Sorry, incorrect passcode"

331msgstr "Desculpe, senha incorreta"

339msgstr "Desculpe, senha incorreta"

332

340

333#: qml/Shell.qml:348

341#: qml/Shell.qml:348

334#, qt-format

342#, qt-format

335msgid "Enter %1"

343msgid "Enter %1"

336−msgstr ""

344+msgstr "Introduziu %1"

337

345

338−#: qml/Shell.qml:328

346+#: qml/Shell.qml:349

339#, qt-format

347#, qt-format

340msgid "Sorry, incorrect %1"

348msgid "Sorry, incorrect %1"

341msgstr "Desculpe, incorreto %1"

349msgstr "Desculpe, incorreto %1"

342

350

343−#: qml/Shell.qml:363

351+#: qml/Shell.qml:384

344msgid "Sorry, incorrect passphrase."

352msgid "Sorry, incorrect passphrase."

345msgstr "Desculpe, frase de acesso incorreta."

353msgstr "Desculpe, frase de acesso incorreta."

346

354

347−#: qml/Shell.qml:364

355+#: qml/Shell.qml:385

348msgid "Sorry, incorrect passcode."

356msgid "Sorry, incorrect passcode."

349msgstr "Desculpe, senha incorreta."

357msgstr "Desculpe, senha incorreta."

350

358

351−#: qml/Shell.qml:365

359+#: qml/Shell.qml:386

352msgid "This will be your last attempt."

360msgid "This will be your last attempt."

353msgstr "Esta será a sua última tentativa."

361msgstr "Esta será a sua última tentativa."

354

362

355−#: qml/Shell.qml:367

363+#: qml/Shell.qml:388

356msgid ""

364msgid ""

357"If passphrase is entered incorrectly, your phone will conduct a factory "

365"If passphrase is entered incorrectly, your phone will conduct a factory "

358"reset and all personal data will be deleted."

366"reset and all personal data will be deleted."

@@ -360,7 +368,7 @@ msgstr ""

360"Se a frase de acesso for introduzida incorretamente, o seu telemóvel vai "

368"Se a frase de acesso for introduzida incorretamente, o seu telemóvel vai "

361"proceder ao restauro de fábrica e apagará toda a sua informação pessoal."

369"proceder ao restauro de fábrica e apagará toda a sua informação pessoal."

362

370

363−#: qml/Shell.qml:368

371+#: qml/Shell.qml:389

364msgid ""

372msgid ""

365"If passcode is entered incorrectly, your phone will conduct a factory reset "

373"If passcode is entered incorrectly, your phone will conduct a factory reset "

366"and all personal data will be deleted."

374"and all personal data will be deleted."

@@ -378,9 +386,6 @@ msgstr ""

378#~ msgid "Swipe to unlock"

386#~ msgid "Swipe to unlock"

379#~ msgstr "Deslize para desbloquear"

387#~ msgstr "Deslize para desbloquear"

380

388

381−#~ msgid "Manage Dash"

382−#~ msgstr "Gerir o Dash"

383−

384#~ msgid "Please wait"

389#~ msgid "Please wait"

385#~ msgstr "Por favor aguarde"

390#~ msgstr "Por favor aguarde"

386

391

po/pt_BR.po+21−16

@@ -7,7 +7,7 @@ msgid ""

7msgstr ""

8"Project-Id-Version: unity\n"

9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10−"POT-Creation-Date: 2014-10-02 10:35+0200\n"

10+"POT-Creation-Date: 2014-10-03 08:13-0400\n"

11"PO-Revision-Date: 2014-09-30 17:37+0000\n"

12"Last-Translator: Rafael Neri <Unknown>\n"

13"Language-Team: Brazilian Portuguese <pt_BR@li.org>\n"

@@ -15,7 +15,7 @@ msgstr ""

15"Content-Type: text/plain; charset=UTF-8\n"

16"Content-Transfer-Encoding: 8bit\n"

17"Plural-Forms: nplurals=2; plural=n > 1;\n"

18−"X-Launchpad-Export-Date: 2014-10-03 06:22+0000\n"

18+"X-Launchpad-Export-Date: 2014-10-07 06:59+0000\n"

19"X-Generator: Launchpad (build 17196)\n"

20

21#: plugins/LightDM/Greeter.cpp:130

@@ -158,15 +158,15 @@ msgstr ""

158"Agora você já domina os gestos das bordas e pode começar a usar o "

159"telefone Toque na tela para iniciar"

160

161−#: qml/Components/Lockscreen.qml:206

161+#: qml/Components/Lockscreen.qml:218

162msgid "Emergency Call"

163msgstr "Chamada de emergência"

164

165−#: qml/Components/Lockscreen.qml:226

165+#: qml/Components/Lockscreen.qml:250

166msgid "OK"

167msgstr "OK"

168

169−#: qml/Dash/GenericScopeView.qml:411 qml/Dash/GenericScopeView.qml:533

169+#: qml/Dash/GenericScopeView.qml:411 qml/Dash/GenericScopeView.qml:568

170msgid "See less"

171msgstr "Ver menos"

172

@@ -211,6 +211,14 @@ msgstr "Adicionar uma análise"

211msgid "Send"

212msgstr "Enviar"

213

214+#: qml/Dash/PullToRefreshScopeStyle.qml:55

215+msgid "Pull to refresh…"

216+msgstr ""

217+

218+#: qml/Dash/PullToRefreshScopeStyle.qml:60

219+msgid "Release to refresh…"

220+msgstr ""

221+

214#: qml/Dash/ScopesOverview.qml:206

222#: qml/Dash/ScopesOverview.qml:206

215msgid "Manage Scopes"

223msgid "Manage Scopes"

216msgstr "Gerenciar Plugins"

224msgstr "Gerenciar Plugins"

@@ -315,7 +323,7 @@ msgstr "Roaming"

315msgid "Enter passphrase"

323msgid "Enter passphrase"

316msgstr ""

324msgstr ""

317

325

318−#: qml/Shell.qml:321

326+#: qml/Shell.qml:341

319msgid "Sorry, incorrect passphrase"

327msgid "Sorry, incorrect passphrase"

320msgstr "Desculpe, senha incorreta"

328msgstr "Desculpe, senha incorreta"

321

329

@@ -327,7 +335,7 @@ msgstr ""

327msgid "Enter passcode"

335msgid "Enter passcode"

328msgstr ""

336msgstr ""

329

337

330−#: qml/Shell.qml:324

338+#: qml/Shell.qml:345

331msgid "Sorry, incorrect passcode"

339msgid "Sorry, incorrect passcode"

332msgstr "Desculpe, senha incorreta"

340msgstr "Desculpe, senha incorreta"

333

341

@@ -336,24 +344,24 @@ msgstr "Desculpe, senha incorreta"

336msgid "Enter %1"

344msgid "Enter %1"

337msgstr ""

345msgstr ""

338

346

339−#: qml/Shell.qml:328

347+#: qml/Shell.qml:349

340#, qt-format

348#, qt-format

341msgid "Sorry, incorrect %1"

349msgid "Sorry, incorrect %1"

342msgstr "Desculpe, %1 incorreto"

350msgstr "Desculpe, %1 incorreto"

343

351

344−#: qml/Shell.qml:363

352+#: qml/Shell.qml:384

345msgid "Sorry, incorrect passphrase."

353msgid "Sorry, incorrect passphrase."

346msgstr "Desculpe, senha incorreta."

354msgstr "Desculpe, senha incorreta."

347

355

348−#: qml/Shell.qml:364

356+#: qml/Shell.qml:385

349msgid "Sorry, incorrect passcode."

357msgid "Sorry, incorrect passcode."

350msgstr "Desculpe, código de acesso incorreto."

358msgstr "Desculpe, código de acesso incorreto."

351

359

352−#: qml/Shell.qml:365

360+#: qml/Shell.qml:386

353msgid "This will be your last attempt."

361msgid "This will be your last attempt."

354msgstr "Esta será a sua última tentativa."

362msgstr "Esta será a sua última tentativa."

355

363

356−#: qml/Shell.qml:367

364+#: qml/Shell.qml:388

357msgid ""

365msgid ""

358"If passphrase is entered incorrectly, your phone will conduct a factory "

366"If passphrase is entered incorrectly, your phone will conduct a factory "

359"reset and all personal data will be deleted."

367"reset and all personal data will be deleted."

@@ -361,7 +369,7 @@ msgstr ""

361"Se a senha for digitada incorretamente, o telefone será restaurado aos "

369"Se a senha for digitada incorretamente, o telefone será restaurado aos "

362"padrões de fábrica e todos os dados pessoais serão apagados."

370"padrões de fábrica e todos os dados pessoais serão apagados."

363

371

364−#: qml/Shell.qml:368

372+#: qml/Shell.qml:389

365msgid ""

373msgid ""

366"If passcode is entered incorrectly, your phone will conduct a factory reset "

374"If passcode is entered incorrectly, your phone will conduct a factory reset "

367"and all personal data will be deleted."

375"and all personal data will be deleted."

@@ -389,9 +397,6 @@ msgstr ""

389#~ msgid "Please wait"

397#~ msgid "Please wait"

390#~ msgstr "Por favor, aguarde"

398#~ msgstr "Por favor, aguarde"

391

399

392−#~ msgid "Manage Dash"

393−#~ msgstr "Gerencia painel"

394−

395#~ msgid "Enter your passphrase"

400#~ msgid "Enter your passphrase"

396#~ msgstr "Digite sua senha"

401#~ msgstr "Digite sua senha"

397

402

po/ro.po+33−24

@@ -7,8 +7,8 @@ msgid ""

7msgstr ""

8"Project-Id-Version: unity\n"

9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10−"POT-Creation-Date: 2014-10-02 10:35+0200\n"

10+"POT-Creation-Date: 2014-10-03 08:13-0400\n"

11−"PO-Revision-Date: 2014-09-28 13:24+0000\n"

11+"PO-Revision-Date: 2014-10-04 11:36+0000\n"

12"Last-Translator: Marian Vasile <marianvasile1972@gmail.com>\n"

13"Language-Team: Romanian <ro@li.org>\n"

14"MIME-Version: 1.0\n"

@@ -16,7 +16,7 @@ msgstr ""

16"Content-Transfer-Encoding: 8bit\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-03 06:22+0000\n"

19+"X-Launchpad-Export-Date: 2014-10-07 06:59+0000\n"

20"X-Generator: Launchpad (build 17196)\n"

21

22#: plugins/LightDM/Greeter.cpp:130

@@ -34,22 +34,26 @@ msgstr "Eliberează scurtătura"

34

35#: qml/Components/DelayedLockscreen.qml:47

36msgid "Device Locked"

37−msgstr ""

37+msgstr "Dispozitiv blocat"

38

39#: qml/Components/DelayedLockscreen.qml:62

40msgid "You have been locked out due to too many failed passphrase attempts."

41msgstr ""

42+"Dispozitivul este blocat din cauza utilizării mai multor fraze parolă "

43+"greșite."

42

44

43#: qml/Components/DelayedLockscreen.qml:63

45#: qml/Components/DelayedLockscreen.qml:63

44msgid "You have been locked out due to too many failed passcode attempts."

46msgid "You have been locked out due to too many failed passcode attempts."

45msgstr ""

47msgstr ""

48+"Dispozitivul este blocat din cauza utilizării mai multor parole greșite."

46

49

47#: qml/Components/DelayedLockscreen.qml:72

50#: qml/Components/DelayedLockscreen.qml:72

48#, qt-format

51#, qt-format

49msgid "Please wait %1 minute and then try again…"

52msgid "Please wait %1 minute and then try again…"

50msgid_plural "Please wait %1 minutes and then try again…"

53msgid_plural "Please wait %1 minutes and then try again…"

51−msgstr[0] ""

54+msgstr[0] "Așteptați %1 minut și apoi încercați din nou..."

52−msgstr[1] ""

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..."

53

57

54#: qml/Components/Dialogs.qml:70

58#: qml/Components/Dialogs.qml:70

55msgid "Log out"

59msgid "Log out"

@@ -160,15 +164,15 @@ msgstr ""

160"De acum stăpâniți gesturile de control și puteți începe să utilizați "

164"De acum stăpâniți gesturile de control și puteți începe să utilizați "

161"telefonul Atingeți ecranul pentru a începe"

165"telefonul Atingeți ecranul pentru a începe"

162

166

163−#: qml/Components/Lockscreen.qml:206

167+#: qml/Components/Lockscreen.qml:218

164msgid "Emergency Call"

168msgid "Emergency Call"

165msgstr "Apel de urgență"

169msgstr "Apel de urgență"

166

170

167−#: qml/Components/Lockscreen.qml:226

171+#: qml/Components/Lockscreen.qml:250

168msgid "OK"

172msgid "OK"

169msgstr "În regulă"

173msgstr "În regulă"

170

174

171−#: qml/Dash/GenericScopeView.qml:411 qml/Dash/GenericScopeView.qml:533

175+#: qml/Dash/GenericScopeView.qml:411 qml/Dash/GenericScopeView.qml:568

172msgid "See less"

176msgid "See less"

173msgstr "Afișează mai puține"

177msgstr "Afișează mai puține"

174

178

@@ -213,6 +217,14 @@ msgstr "Adăugați o recenzie"

213msgid "Send"

217msgid "Send"

214msgstr "Trimite"

218msgstr "Trimite"

215

219

220+#: qml/Dash/PullToRefreshScopeStyle.qml:55

221+msgid "Pull to refresh…"

222+msgstr ""

223+

224+#: qml/Dash/PullToRefreshScopeStyle.qml:60

225+msgid "Release to refresh…"

226+msgstr ""

227+

216#: qml/Dash/ScopesOverview.qml:206

228#: qml/Dash/ScopesOverview.qml:206

217msgid "Manage Scopes"

229msgid "Manage Scopes"

218msgstr "Administrare domenii"

230msgstr "Administrare domenii"

@@ -235,7 +247,7 @@ msgstr "Tot"

235

247

236#: qml/Greeter/Greeter.qml:157

248#: qml/Greeter/Greeter.qml:157

237msgid "Unlock"

249msgid "Unlock"

238−msgstr ""

250+msgstr "Deblocare"

239

251

240#: qml/Hud/HudParametrizedActionsPage.qml:139

252#: qml/Hud/HudParametrizedActionsPage.qml:139

241msgid "Confirm"

253msgid "Confirm"

@@ -315,21 +327,21 @@ msgstr "Roaming"

315

327

316#: qml/Shell.qml:340

328#: qml/Shell.qml:340

317msgid "Enter passphrase"

329msgid "Enter passphrase"

318−msgstr ""

330+msgstr "Introduceți fraza parolă"

319

331

320−#: qml/Shell.qml:321

332+#: qml/Shell.qml:341

321msgid "Sorry, incorrect passphrase"

333msgid "Sorry, incorrect passphrase"

322msgstr "Frază secretă incorectă"

334msgstr "Frază secretă incorectă"

323

335

324#: qml/Shell.qml:342

336#: qml/Shell.qml:342

325msgid "Please re-enter"

337msgid "Please re-enter"

326−msgstr ""

338+msgstr "Introduceți din nou"

327

339

328#: qml/Shell.qml:344

340#: qml/Shell.qml:344

329msgid "Enter passcode"

341msgid "Enter passcode"

330−msgstr ""

342+msgstr "Introduceți parola"

331

343

332−#: qml/Shell.qml:324

344+#: qml/Shell.qml:345

333msgid "Sorry, incorrect passcode"

345msgid "Sorry, incorrect passcode"

334msgstr "Parolă incorectă"

346msgstr "Parolă incorectă"

335

347

@@ -338,24 +350,24 @@ msgstr "Parolă incorectă"

338msgid "Enter %1"

350msgid "Enter %1"

339msgstr ""

351msgstr ""

340

352

341−#: qml/Shell.qml:328

353+#: qml/Shell.qml:349

342#, qt-format

354#, qt-format

343msgid "Sorry, incorrect %1"

355msgid "Sorry, incorrect %1"

344msgstr "%1 incorectă"

356msgstr "%1 incorectă"

345

357

346−#: qml/Shell.qml:363

358+#: qml/Shell.qml:384

347msgid "Sorry, incorrect passphrase."

359msgid "Sorry, incorrect passphrase."

348msgstr "Frază parolă greșită"

360msgstr "Frază parolă greșită"

349

361

350−#: qml/Shell.qml:364

362+#: qml/Shell.qml:385

351msgid "Sorry, incorrect passcode."

363msgid "Sorry, incorrect passcode."

352msgstr "Parolă greșită"

364msgstr "Parolă greșită"

353

365

354−#: qml/Shell.qml:365

366+#: qml/Shell.qml:386

355msgid "This will be your last attempt."

367msgid "This will be your last attempt."

356msgstr "Aceasta va fi ultima încercare"

368msgstr "Aceasta va fi ultima încercare"

357

369

358−#: qml/Shell.qml:367

370+#: qml/Shell.qml:388

359msgid ""

371msgid ""

360"If passphrase is entered incorrectly, your phone will conduct a factory "

372"If passphrase is entered incorrectly, your phone will conduct a factory "

361"reset and all personal data will be deleted."

373"reset and all personal data will be deleted."

@@ -364,7 +376,7 @@ msgstr ""

364"configurările inițiale, ale fabricantului, iar toate datele personale vor fi "

376"configurările inițiale, ale fabricantului, iar toate datele personale vor fi "

365"șterse."

377"șterse."

366

378

367−#: qml/Shell.qml:368

379+#: qml/Shell.qml:389

368msgid ""

380msgid ""

369"If passcode is entered incorrectly, your phone will conduct a factory reset "

381"If passcode is entered incorrectly, your phone will conduct a factory reset "

370"and all personal data will be deleted."

382"and all personal data will be deleted."

@@ -383,9 +395,6 @@ msgstr ""

383#~ msgid "Swipe to unlock"

395#~ msgid "Swipe to unlock"

384#~ msgstr "Glisați pentru deblocare"

396#~ msgstr "Glisați pentru deblocare"

385

397

386−#~ msgid "Manage Dash"

387−#~ msgstr "Administrare Panou principal"

388−

389#~ msgid "Please wait"

398#~ msgid "Please wait"

390#~ msgstr "Așteptați"

399#~ msgstr "Așteptați"

391

400

po/ru.po+21−13

@@ -7,7 +7,7 @@ msgid ""

7msgstr ""

8"Project-Id-Version: unity\n"

9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10−"POT-Creation-Date: 2014-10-02 10:35+0200\n"

10+"POT-Creation-Date: 2014-10-03 08:13-0400\n"

11"PO-Revision-Date: 2014-08-29 08:06+0000\n"

12"Last-Translator: Jay ZDLin <Unknown>\n"

13"Language-Team: Russian <ru@li.org>\n"

@@ -16,7 +16,7 @@ msgstr ""

16"Content-Transfer-Encoding: 8bit\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"

19+"X-Launchpad-Export-Date: 2014-10-07 06:59+0000\n"

20"X-Generator: Launchpad (build 17196)\n"

21

22#: plugins/LightDM/Greeter.cpp:130

@@ -160,15 +160,15 @@ msgstr ""

160"Вы научились пользоваться Ubuntu и можете начать использовать свой "

161"телефон Нажмите на экран"

162

163−#: qml/Components/Lockscreen.qml:206

163+#: qml/Components/Lockscreen.qml:218

164msgid "Emergency Call"

165msgstr "Экстренный вызов"

166

167−#: qml/Components/Lockscreen.qml:226

167+#: qml/Components/Lockscreen.qml:250

168msgid "OK"

169msgstr "ОК"

170

171−#: qml/Dash/GenericScopeView.qml:411 qml/Dash/GenericScopeView.qml:533

171+#: qml/Dash/GenericScopeView.qml:411 qml/Dash/GenericScopeView.qml:568

172msgid "See less"

173msgstr "Вкратце"

174

@@ -213,6 +213,14 @@ msgstr "Добавьте отзыв"

213msgid "Send"

214msgstr "Отправить"

215

216+#: qml/Dash/PullToRefreshScopeStyle.qml:55

217+msgid "Pull to refresh…"

218+msgstr ""

219+

220+#: qml/Dash/PullToRefreshScopeStyle.qml:60

221+msgid "Release to refresh…"

222+msgstr ""

223+

216#: qml/Dash/ScopesOverview.qml:206

224#: qml/Dash/ScopesOverview.qml:206

217msgid "Manage Scopes"

225msgid "Manage Scopes"

218msgstr ""

226msgstr ""

@@ -317,7 +325,7 @@ msgstr "Роуминг"

317msgid "Enter passphrase"

325msgid "Enter passphrase"

318msgstr ""

326msgstr ""

319

327

320−#: qml/Shell.qml:321

328+#: qml/Shell.qml:341

321msgid "Sorry, incorrect passphrase"

329msgid "Sorry, incorrect passphrase"

322msgstr "Введена неверная кодовая фраза"

330msgstr "Введена неверная кодовая фраза"

323

331

@@ -329,7 +337,7 @@ msgstr ""

329msgid "Enter passcode"

337msgid "Enter passcode"

330msgstr ""

338msgstr ""

331

339

332−#: qml/Shell.qml:324

340+#: qml/Shell.qml:345

333msgid "Sorry, incorrect passcode"

341msgid "Sorry, incorrect passcode"

334msgstr "Секретный код введён неверно"

342msgstr "Секретный код введён неверно"

335

343

@@ -338,24 +346,24 @@ msgstr "Секретный код введён неверно"

338msgid "Enter %1"

346msgid "Enter %1"

339msgstr ""

347msgstr ""

340

348

341−#: qml/Shell.qml:328

349+#: qml/Shell.qml:349

342#, qt-format

350#, qt-format

343msgid "Sorry, incorrect %1"

351msgid "Sorry, incorrect %1"

344msgstr "Некорректный ввод %1"

352msgstr "Некорректный ввод %1"

345

353

346−#: qml/Shell.qml:363

354+#: qml/Shell.qml:384

347msgid "Sorry, incorrect passphrase."

355msgid "Sorry, incorrect passphrase."

348msgstr "Неверная ключевая фраза."

356msgstr "Неверная ключевая фраза."

349

357

350−#: qml/Shell.qml:364

358+#: qml/Shell.qml:385

351msgid "Sorry, incorrect passcode."

359msgid "Sorry, incorrect passcode."

352msgstr "Неверный секретный код."

360msgstr "Неверный секретный код."

353

361

354−#: qml/Shell.qml:365

362+#: qml/Shell.qml:386

355msgid "This will be your last attempt."

363msgid "This will be your last attempt."

356msgstr "Осталась последняя попытка."

364msgstr "Осталась последняя попытка."

357

365

358−#: qml/Shell.qml:367

366+#: qml/Shell.qml:388

359msgid ""

367msgid ""

360"If passphrase is entered incorrectly, your phone will conduct a factory "

368"If passphrase is entered incorrectly, your phone will conduct a factory "

361"reset and all personal data will be deleted."

369"reset and all personal data will be deleted."

@@ -363,7 +371,7 @@ msgstr ""

363"Если ключевая фраза будет введена неверно, то телефон вернётся к заводским "

371"Если ключевая фраза будет введена неверно, то телефон вернётся к заводским "

364"настройкам, а все личные данные будут удалены."

372"настройкам, а все личные данные будут удалены."

365

373

366−#: qml/Shell.qml:368

374+#: qml/Shell.qml:389

367msgid ""

375msgid ""

368"If passcode is entered incorrectly, your phone will conduct a factory reset "

376"If passcode is entered incorrectly, your phone will conduct a factory reset "

369"and all personal data will be deleted."

377"and all personal data will be deleted."

po/shn.po+21−13

@@ -7,7 +7,7 @@ msgid ""

7msgstr ""

8"Project-Id-Version: unity8\n"

9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10−"POT-Creation-Date: 2014-10-02 10:35+0200\n"

10+"POT-Creation-Date: 2014-10-03 08:13-0400\n"

11"PO-Revision-Date: 2013-10-07 11:46+0000\n"

12"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"

13"Language-Team: Shan <shn@li.org>\n"

@@ -15,7 +15,7 @@ msgstr ""

15"Content-Type: text/plain; charset=UTF-8\n"

16"Content-Transfer-Encoding: 8bit\n"

17"Plural-Forms: nplurals=2; plural=(n == 1) ? 0 : 1;\n"

18−"X-Launchpad-Export-Date: 2014-10-03 06:22+0000\n"

18+"X-Launchpad-Export-Date: 2014-10-07 06:59+0000\n"

19"X-Generator: Launchpad (build 17196)\n"

20

21#: plugins/LightDM/Greeter.cpp:130

@@ -152,15 +152,15 @@ msgid ""

152"phone Tap on the screen to start"

153msgstr ""

154

155−#: qml/Components/Lockscreen.qml:206

155+#: qml/Components/Lockscreen.qml:218

156msgid "Emergency Call"

157msgstr ""

158

159−#: qml/Components/Lockscreen.qml:226

159+#: qml/Components/Lockscreen.qml:250

160msgid "OK"

161msgstr ""

162

163−#: qml/Dash/GenericScopeView.qml:411 qml/Dash/GenericScopeView.qml:533

163+#: qml/Dash/GenericScopeView.qml:411 qml/Dash/GenericScopeView.qml:568

164msgid "See less"

165msgstr ""

166

@@ -205,6 +205,14 @@ msgstr ""

205msgid "Send"

206msgstr ""

207

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+

208#: qml/Dash/ScopesOverview.qml:206

216#: qml/Dash/ScopesOverview.qml:206

209msgid "Manage Scopes"

217msgid "Manage Scopes"

210msgstr ""

218msgstr ""

@@ -309,7 +317,7 @@ msgstr ""

309msgid "Enter passphrase"

317msgid "Enter passphrase"

310msgstr ""

318msgstr ""

311

319

312−#: qml/Shell.qml:321

320+#: qml/Shell.qml:341

313msgid "Sorry, incorrect passphrase"

321msgid "Sorry, incorrect passphrase"

314msgstr ""

322msgstr ""

315

323

@@ -321,7 +329,7 @@ msgstr ""

321msgid "Enter passcode"

329msgid "Enter passcode"

322msgstr ""

330msgstr ""

323

331

324−#: qml/Shell.qml:324

332+#: qml/Shell.qml:345

325msgid "Sorry, incorrect passcode"

333msgid "Sorry, incorrect passcode"

326msgstr ""

334msgstr ""

327

335

@@ -330,30 +338,30 @@ msgstr ""

330msgid "Enter %1"

338msgid "Enter %1"

331msgstr ""

339msgstr ""

332

340

333−#: qml/Shell.qml:328

341+#: qml/Shell.qml:349

334#, qt-format

342#, qt-format

335msgid "Sorry, incorrect %1"

343msgid "Sorry, incorrect %1"

336msgstr ""

344msgstr ""

337

345

338−#: qml/Shell.qml:363

346+#: qml/Shell.qml:384

339msgid "Sorry, incorrect passphrase."

347msgid "Sorry, incorrect passphrase."

340msgstr ""

348msgstr ""

341

349

342−#: qml/Shell.qml:364

350+#: qml/Shell.qml:385

343msgid "Sorry, incorrect passcode."

351msgid "Sorry, incorrect passcode."

344msgstr ""

352msgstr ""

345

353

346−#: qml/Shell.qml:365

354+#: qml/Shell.qml:386

347msgid "This will be your last attempt."

355msgid "This will be your last attempt."

348msgstr ""

356msgstr ""

349

357

350−#: qml/Shell.qml:367

358+#: qml/Shell.qml:388

351msgid ""

359msgid ""

352"If passphrase is entered incorrectly, your phone will conduct a factory "

360"If passphrase is entered incorrectly, your phone will conduct a factory "

353"reset and all personal data will be deleted."

361"reset and all personal data will be deleted."

354msgstr ""

362msgstr ""

355

363

356−#: qml/Shell.qml:368

364+#: qml/Shell.qml:389

357msgid ""

365msgid ""

358"If passcode is entered incorrectly, your phone will conduct a factory reset "

366"If passcode is entered incorrectly, your phone will conduct a factory reset "

359"and all personal data will be deleted."

367"and all personal data will be deleted."

po/si.po+21−13

@@ -7,7 +7,7 @@ msgid ""

7msgstr ""

8"Project-Id-Version: unity\n"

9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10−"POT-Creation-Date: 2014-10-02 10:35+0200\n"

10+"POT-Creation-Date: 2014-10-03 08:13-0400\n"

11"PO-Revision-Date: 2013-06-26 22:36+0000\n"

12"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"

13"Language-Team: Sinhalese <si@li.org>\n"

@@ -15,7 +15,7 @@ msgstr ""

15"Content-Type: text/plain; charset=UTF-8\n"

16"Content-Transfer-Encoding: 8bit\n"

17"Plural-Forms: nplurals=2; plural=n != 1;\n"

18−"X-Launchpad-Export-Date: 2014-10-03 06:22+0000\n"

18+"X-Launchpad-Export-Date: 2014-10-07 06:59+0000\n"

19"X-Generator: Launchpad (build 17196)\n"

20

21#: plugins/LightDM/Greeter.cpp:130

@@ -152,15 +152,15 @@ msgid ""

152"phone Tap on the screen to start"

153msgstr ""

154

155−#: qml/Components/Lockscreen.qml:206

155+#: qml/Components/Lockscreen.qml:218

156msgid "Emergency Call"

157msgstr ""

158

159−#: qml/Components/Lockscreen.qml:226

159+#: qml/Components/Lockscreen.qml:250

160msgid "OK"

161msgstr ""

162

163−#: qml/Dash/GenericScopeView.qml:411 qml/Dash/GenericScopeView.qml:533

163+#: qml/Dash/GenericScopeView.qml:411 qml/Dash/GenericScopeView.qml:568

164msgid "See less"

165msgstr ""

166

@@ -205,6 +205,14 @@ msgstr ""

205msgid "Send"

206msgstr ""

207

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+

208#: qml/Dash/ScopesOverview.qml:206

216#: qml/Dash/ScopesOverview.qml:206

209msgid "Manage Scopes"

217msgid "Manage Scopes"

210msgstr ""

218msgstr ""

@@ -309,7 +317,7 @@ msgstr ""

309msgid "Enter passphrase"

317msgid "Enter passphrase"

310msgstr ""

318msgstr ""

311

319

312−#: qml/Shell.qml:321

320+#: qml/Shell.qml:341

313msgid "Sorry, incorrect passphrase"

321msgid "Sorry, incorrect passphrase"

314msgstr ""

322msgstr ""

315

323

@@ -321,7 +329,7 @@ msgstr ""

321msgid "Enter passcode"

329msgid "Enter passcode"

322msgstr ""

330msgstr ""

323

331

324−#: qml/Shell.qml:324

332+#: qml/Shell.qml:345

325msgid "Sorry, incorrect passcode"

333msgid "Sorry, incorrect passcode"

326msgstr ""

334msgstr ""

327

335

@@ -330,30 +338,30 @@ msgstr ""

330msgid "Enter %1"

338msgid "Enter %1"

331msgstr ""

339msgstr ""

332

340

333−#: qml/Shell.qml:328

341+#: qml/Shell.qml:349

334#, qt-format

342#, qt-format

335msgid "Sorry, incorrect %1"

343msgid "Sorry, incorrect %1"

336msgstr ""

344msgstr ""

337

345

338−#: qml/Shell.qml:363

346+#: qml/Shell.qml:384

339msgid "Sorry, incorrect passphrase."

347msgid "Sorry, incorrect passphrase."

340msgstr ""

348msgstr ""

341

349

342−#: qml/Shell.qml:364

350+#: qml/Shell.qml:385

343msgid "Sorry, incorrect passcode."

351msgid "Sorry, incorrect passcode."

344msgstr ""

352msgstr ""

345

353

346−#: qml/Shell.qml:365

354+#: qml/Shell.qml:386

347msgid "This will be your last attempt."

355msgid "This will be your last attempt."

348msgstr ""

356msgstr ""

349

357

350−#: qml/Shell.qml:367

358+#: qml/Shell.qml:388

351msgid ""

359msgid ""

352"If passphrase is entered incorrectly, your phone will conduct a factory "

360"If passphrase is entered incorrectly, your phone will conduct a factory "

353"reset and all personal data will be deleted."

361"reset and all personal data will be deleted."

354msgstr ""

362msgstr ""

355

363

356−#: qml/Shell.qml:368

364+#: qml/Shell.qml:389

357msgid ""

365msgid ""

358"If passcode is entered incorrectly, your phone will conduct a factory reset "

366"If passcode is entered incorrectly, your phone will conduct a factory reset "

359"and all personal data will be deleted."

367"and all personal data will be deleted."

po/sl.po+35−28

@@ -7,8 +7,8 @@ msgid ""

7msgstr ""

8"Project-Id-Version: unity\n"

9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10−"POT-Creation-Date: 2014-10-02 10:35+0200\n"

10+"POT-Creation-Date: 2014-10-03 08:13-0400\n"

11−"PO-Revision-Date: 2014-09-23 12:35+0000\n"

11+"PO-Revision-Date: 2014-10-03 17:37+0000\n"

12"Last-Translator: Damir Jerovšek <Unknown>\n"

13"Language-Team: Slovenian <sl@li.org>\n"

14"MIME-Version: 1.0\n"

@@ -16,7 +16,7 @@ msgstr ""

16"Content-Transfer-Encoding: 8bit\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-03 06:22+0000\n"

19+"X-Launchpad-Export-Date: 2014-10-07 06:59+0000\n"

20"X-Generator: Launchpad (build 17196)\n"

21

22#: plugins/LightDM/Greeter.cpp:130

@@ -34,22 +34,24 @@ msgstr "Odpni bližnjico"

34

35#: qml/Components/DelayedLockscreen.qml:47

36msgid "Device Locked"

37−msgstr ""

37+msgstr "Naprava je zaklenjena"

38

39#: qml/Components/DelayedLockscreen.qml:62

40msgid "You have been locked out due to too many failed passphrase attempts."

41−msgstr ""

41+msgstr "Telefon ste zaklenili zaradi preveč napačnih vnosov šifrirnih rekel."

42

43#: qml/Components/DelayedLockscreen.qml:63

44msgid "You have been locked out due to too many failed passcode attempts."

45−msgstr ""

45+msgstr "Telefon ste zaklenili zaradi preveč napačnih vnosov gesla."

46

47#: qml/Components/DelayedLockscreen.qml:72

48#, qt-format

49msgid "Please wait %1 minute and then try again…"

50msgid_plural "Please wait %1 minutes and then try again…"

51−msgstr[0] ""

51+msgstr[0] "Počakajte %1 minut ter poskusite ponovno ..."

52−msgstr[1] ""

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 ..."

53

55

54#: qml/Components/Dialogs.qml:70

56#: qml/Components/Dialogs.qml:70

55msgid "Log out"

57msgid "Log out"

@@ -159,15 +161,15 @@ msgstr ""

159"Sedaj, ko ste osvojili poteze robov, lahko začnete uporabljati "

161"Sedaj, ko ste osvojili poteze robov, lahko začnete uporabljati "

160"telefon Tapnite na zaslon za začetek"

162"telefon Tapnite na zaslon za začetek"

161

163

162−#: qml/Components/Lockscreen.qml:206

164+#: qml/Components/Lockscreen.qml:218

163msgid "Emergency Call"

165msgid "Emergency Call"

164msgstr "Klic v sili"

166msgstr "Klic v sili"

165

167

166−#: qml/Components/Lockscreen.qml:226

168+#: qml/Components/Lockscreen.qml:250

167msgid "OK"

169msgid "OK"

168msgstr "V REDU"

170msgstr "V REDU"

169

171

170−#: qml/Dash/GenericScopeView.qml:411 qml/Dash/GenericScopeView.qml:533

172+#: qml/Dash/GenericScopeView.qml:411 qml/Dash/GenericScopeView.qml:568

171msgid "See less"

173msgid "See less"

172msgstr "Pokaži manj"

174msgstr "Pokaži manj"

173

175

@@ -212,6 +214,14 @@ msgstr "Dodaj oceno"

212msgid "Send"

214msgid "Send"

213msgstr "Pošlji"

215msgstr "Pošlji"

214

216

217+#: qml/Dash/PullToRefreshScopeStyle.qml:55

218+msgid "Pull to refresh…"

219+msgstr ""

220+

221+#: qml/Dash/PullToRefreshScopeStyle.qml:60

222+msgid "Release to refresh…"

223+msgstr ""

224+

215#: qml/Dash/ScopesOverview.qml:206

225#: qml/Dash/ScopesOverview.qml:206

216msgid "Manage Scopes"

226msgid "Manage Scopes"

217msgstr ""

227msgstr ""

@@ -234,7 +244,7 @@ msgstr "Vse"

234

244

235#: qml/Greeter/Greeter.qml:157

245#: qml/Greeter/Greeter.qml:157

236msgid "Unlock"

246msgid "Unlock"

237−msgstr ""

247+msgstr "Odkleni"

238

248

239#: qml/Hud/HudParametrizedActionsPage.qml:139

249#: qml/Hud/HudParametrizedActionsPage.qml:139

240msgid "Confirm"

250msgid "Confirm"

@@ -278,7 +288,7 @@ msgstr "Konferenca"

278

288

279#: qml/Panel/Indicators/MenuItemFactory.qml:600

289#: qml/Panel/Indicators/MenuItemFactory.qml:600

280msgid "Nothing is playing"

290msgid "Nothing is playing"

281−msgstr ""

291+msgstr "Nič se ne predvaja"

282

292

283#: qml/Panel/Indicators/MenuItemFactory.qml:748

293#: qml/Panel/Indicators/MenuItemFactory.qml:748

284msgid "In queue…"

294msgid "In queue…"

@@ -314,47 +324,47 @@ msgstr "Gostovanje"

314

324

315#: qml/Shell.qml:340

325#: qml/Shell.qml:340

316msgid "Enter passphrase"

326msgid "Enter passphrase"

317−msgstr ""

327+msgstr "Vnesite šifrirno reklo"

318

328

319−#: qml/Shell.qml:321

329+#: qml/Shell.qml:341

320msgid "Sorry, incorrect passphrase"

330msgid "Sorry, incorrect passphrase"

321msgstr "Oprostite, napačno šifrirno reklo"

331msgstr "Oprostite, napačno šifrirno reklo"

322

332

323#: qml/Shell.qml:342

333#: qml/Shell.qml:342

324msgid "Please re-enter"

334msgid "Please re-enter"

325−msgstr ""

335+msgstr "Ponovno vnesite"

326

336

327#: qml/Shell.qml:344

337#: qml/Shell.qml:344

328msgid "Enter passcode"

338msgid "Enter passcode"

329−msgstr ""

339+msgstr "Vnesite geslo"

330

340

331−#: qml/Shell.qml:324

341+#: qml/Shell.qml:345

332msgid "Sorry, incorrect passcode"

342msgid "Sorry, incorrect passcode"

333msgstr "Nepravilno geslo"

343msgstr "Nepravilno geslo"

334

344

335#: qml/Shell.qml:348

345#: qml/Shell.qml:348

336#, qt-format

346#, qt-format

337msgid "Enter %1"

347msgid "Enter %1"

338−msgstr ""

348+msgstr "Vnesite %1"

339

349

340−#: qml/Shell.qml:328

350+#: qml/Shell.qml:349

341#, qt-format

351#, qt-format

342msgid "Sorry, incorrect %1"

352msgid "Sorry, incorrect %1"

343msgstr "Oprostite, napačen %1"

353msgstr "Oprostite, napačen %1"

344

354

345−#: qml/Shell.qml:363

355+#: qml/Shell.qml:384

346msgid "Sorry, incorrect passphrase."

356msgid "Sorry, incorrect passphrase."

347msgstr "Nepravilno geslo."

357msgstr "Nepravilno geslo."

348

358

349−#: qml/Shell.qml:364

359+#: qml/Shell.qml:385

350msgid "Sorry, incorrect passcode."

360msgid "Sorry, incorrect passcode."

351msgstr "Nepravilno geslo."

361msgstr "Nepravilno geslo."

352

362

353−#: qml/Shell.qml:365

363+#: qml/Shell.qml:386

354msgid "This will be your last attempt."

364msgid "This will be your last attempt."

355msgstr "To je vaš zadnji poskus"

365msgstr "To je vaš zadnji poskus"

356

366

357−#: qml/Shell.qml:367

367+#: qml/Shell.qml:388

358msgid ""

368msgid ""

359"If passphrase is entered incorrectly, your phone will conduct a factory "

369"If passphrase is entered incorrectly, your phone will conduct a factory "

360"reset and all personal data will be deleted."

370"reset and all personal data will be deleted."

@@ -362,7 +372,7 @@ msgstr ""

362"Če je vneseno nepravilno šifrirno reklo, bo telefon ponastavljen na "

372"Če je vneseno nepravilno šifrirno reklo, bo telefon ponastavljen na "

363"tovarniške nastavitve ter vsi osebni podatki bodo izbrisani."

373"tovarniške nastavitve ter vsi osebni podatki bodo izbrisani."

364

374

365−#: qml/Shell.qml:368

375+#: qml/Shell.qml:389

366msgid ""

376msgid ""

367"If passcode is entered incorrectly, your phone will conduct a factory reset "

377"If passcode is entered incorrectly, your phone will conduct a factory reset "

368"and all personal data will be deleted."

378"and all personal data will be deleted."

@@ -386,9 +396,6 @@ msgstr ""

386#~ msgid "Too many incorrect attempts"

396#~ msgid "Too many incorrect attempts"

387#~ msgstr "Preveč nepravilnih poskusov"

397#~ msgstr "Preveč nepravilnih poskusov"

388

398

389−#~ msgid "Manage Dash"

390−#~ msgstr "Upravljaj s pregledno ploščo"

391−

392#, qt-format

399#, qt-format

393#~ msgid "Enter your %1"

400#~ msgid "Enter your %1"

394#~ msgstr "Vnesite vaš %1"

401#~ msgstr "Vnesite vaš %1"

po/sq.po+21−13

@@ -7,7 +7,7 @@ msgid ""

7msgstr ""

8"Project-Id-Version: unity8\n"

9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10−"POT-Creation-Date: 2014-10-02 10:35+0200\n"

10+"POT-Creation-Date: 2014-10-03 08:13-0400\n"

11"PO-Revision-Date: 2014-01-15 13:51+0000\n"

12"Last-Translator: Besmir Zanaj <besmirzanaj@gmail.com>\n"

13"Language-Team: Albanian <sq@li.org>\n"

@@ -15,7 +15,7 @@ msgstr ""

15"Content-Type: text/plain; charset=UTF-8\n"

16"Content-Transfer-Encoding: 8bit\n"

17"Plural-Forms: nplurals=2; plural=n != 1;\n"

18−"X-Launchpad-Export-Date: 2014-10-03 06:21+0000\n"

18+"X-Launchpad-Export-Date: 2014-10-07 06:58+0000\n"

19"X-Generator: Launchpad (build 17196)\n"

20

21#: plugins/LightDM/Greeter.cpp:130

@@ -153,15 +153,15 @@ msgid ""

153"phone Tap on the screen to start"

154msgstr ""

155

156−#: qml/Components/Lockscreen.qml:206

156+#: qml/Components/Lockscreen.qml:218

157msgid "Emergency Call"

158msgstr ""

159

160−#: qml/Components/Lockscreen.qml:226

160+#: qml/Components/Lockscreen.qml:250

161msgid "OK"

162msgstr ""

163

164−#: qml/Dash/GenericScopeView.qml:411 qml/Dash/GenericScopeView.qml:533

164+#: qml/Dash/GenericScopeView.qml:411 qml/Dash/GenericScopeView.qml:568

165msgid "See less"

166msgstr ""

167

@@ -206,6 +206,14 @@ msgstr "Shto një rishikim"

206msgid "Send"

207msgstr ""

208

209+#: qml/Dash/PullToRefreshScopeStyle.qml:55

210+msgid "Pull to refresh…"

211+msgstr ""

212+

213+#: qml/Dash/PullToRefreshScopeStyle.qml:60

214+msgid "Release to refresh…"

215+msgstr ""

216+

209#: qml/Dash/ScopesOverview.qml:206

217#: qml/Dash/ScopesOverview.qml:206

210msgid "Manage Scopes"

218msgid "Manage Scopes"

211msgstr ""

219msgstr ""

@@ -310,7 +318,7 @@ msgstr ""

310msgid "Enter passphrase"

318msgid "Enter passphrase"

311msgstr ""

319msgstr ""

312

320

313−#: qml/Shell.qml:321

321+#: qml/Shell.qml:341

314msgid "Sorry, incorrect passphrase"

322msgid "Sorry, incorrect passphrase"

315msgstr ""

323msgstr ""

316

324

@@ -322,7 +330,7 @@ msgstr ""

322msgid "Enter passcode"

330msgid "Enter passcode"

323msgstr ""

331msgstr ""

324

332

325−#: qml/Shell.qml:324

333+#: qml/Shell.qml:345

326msgid "Sorry, incorrect passcode"

334msgid "Sorry, incorrect passcode"

327msgstr ""

335msgstr ""

328

336

@@ -331,30 +339,30 @@ msgstr ""

331msgid "Enter %1"

339msgid "Enter %1"

332msgstr ""

340msgstr ""

333

341

334−#: qml/Shell.qml:328

342+#: qml/Shell.qml:349

335#, qt-format

343#, qt-format

336msgid "Sorry, incorrect %1"

344msgid "Sorry, incorrect %1"

337msgstr ""

345msgstr ""

338

346

339−#: qml/Shell.qml:363

347+#: qml/Shell.qml:384

340msgid "Sorry, incorrect passphrase."

348msgid "Sorry, incorrect passphrase."

341msgstr ""

349msgstr ""

342

350

343−#: qml/Shell.qml:364

351+#: qml/Shell.qml:385

344msgid "Sorry, incorrect passcode."

352msgid "Sorry, incorrect passcode."

345msgstr ""

353msgstr ""

346

354

347−#: qml/Shell.qml:365

355+#: qml/Shell.qml:386

348msgid "This will be your last attempt."

356msgid "This will be your last attempt."

349msgstr ""

357msgstr ""

350

358

351−#: qml/Shell.qml:367

359+#: qml/Shell.qml:388

352msgid ""

360msgid ""

353"If passphrase is entered incorrectly, your phone will conduct a factory "

361"If passphrase is entered incorrectly, your phone will conduct a factory "

354"reset and all personal data will be deleted."

362"reset and all personal data will be deleted."

355msgstr ""

363msgstr ""

356

364

357−#: qml/Shell.qml:368

365+#: qml/Shell.qml:389

358msgid ""

366msgid ""

359"If passcode is entered incorrectly, your phone will conduct a factory reset "

367"If passcode is entered incorrectly, your phone will conduct a factory reset "

360"and all personal data will be deleted."

368"and all personal data will be deleted."

po/sr.po+21−16

@@ -7,7 +7,7 @@ msgid ""

7msgstr ""

8"Project-Id-Version: unity\n"

9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10−"POT-Creation-Date: 2014-10-02 10:35+0200\n"

10+"POT-Creation-Date: 2014-10-03 08:13-0400\n"

11"PO-Revision-Date: 2014-09-24 13:29+0000\n"

12"Last-Translator: Данило Шеган <Unknown>\n"

13"Language-Team: Serbian <sr@li.org>\n"

@@ -16,7 +16,7 @@ msgstr ""

16"Content-Transfer-Encoding: 8bit\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"

19+"X-Launchpad-Export-Date: 2014-10-07 06:59+0000\n"

20"X-Generator: Launchpad (build 17196)\n"

21

22#: plugins/LightDM/Greeter.cpp:130

@@ -157,15 +157,15 @@ msgstr ""

157"Сада сте савладали превлачења са ивица и можете да користите "

158"телефон Тапните на екран да почнете"

159

160−#: qml/Components/Lockscreen.qml:206

160+#: qml/Components/Lockscreen.qml:218

161msgid "Emergency Call"

162msgstr "Хитан позив"

163

164−#: qml/Components/Lockscreen.qml:226

164+#: qml/Components/Lockscreen.qml:250

165msgid "OK"

166msgstr "У реду"

167

168−#: qml/Dash/GenericScopeView.qml:411 qml/Dash/GenericScopeView.qml:533

168+#: qml/Dash/GenericScopeView.qml:411 qml/Dash/GenericScopeView.qml:568

169msgid "See less"

170msgstr "Сажетије"

171

@@ -210,6 +210,14 @@ msgstr "Напиши оцену"

210msgid "Send"

211msgstr "Пошаљи"

212

213+#: qml/Dash/PullToRefreshScopeStyle.qml:55

214+msgid "Pull to refresh…"

215+msgstr ""

216+

217+#: qml/Dash/PullToRefreshScopeStyle.qml:60

218+msgid "Release to refresh…"

219+msgstr ""

220+

213#: qml/Dash/ScopesOverview.qml:206

221#: qml/Dash/ScopesOverview.qml:206

214msgid "Manage Scopes"

222msgid "Manage Scopes"

215msgstr ""

223msgstr ""

@@ -314,7 +322,7 @@ msgstr "Роминг"

314msgid "Enter passphrase"

322msgid "Enter passphrase"

315msgstr ""

323msgstr ""

316

324

317−#: qml/Shell.qml:321

325+#: qml/Shell.qml:341

318msgid "Sorry, incorrect passphrase"

326msgid "Sorry, incorrect passphrase"

319msgstr "Жао ми је, погрешна лозинка"

327msgstr "Жао ми је, погрешна лозинка"

320

328

@@ -326,7 +334,7 @@ msgstr ""

326msgid "Enter passcode"

334msgid "Enter passcode"

327msgstr ""

335msgstr ""

328

336

329−#: qml/Shell.qml:324

337+#: qml/Shell.qml:345

330msgid "Sorry, incorrect passcode"

338msgid "Sorry, incorrect passcode"

331msgstr "Жао ми је, погрешан код"

339msgstr "Жао ми је, погрешан код"

332

340

@@ -335,24 +343,24 @@ msgstr "Жао ми је, погрешан код"

335msgid "Enter %1"

343msgid "Enter %1"

336msgstr ""

344msgstr ""

337

345

338−#: qml/Shell.qml:328

346+#: qml/Shell.qml:349

339#, qt-format

347#, qt-format

340msgid "Sorry, incorrect %1"

348msgid "Sorry, incorrect %1"

341msgstr "Жао ми је, погрешан %1"

349msgstr "Жао ми је, погрешан %1"

342

350

343−#: qml/Shell.qml:363

351+#: qml/Shell.qml:384

344msgid "Sorry, incorrect passphrase."

352msgid "Sorry, incorrect passphrase."

345msgstr "Жао ми је, погрешна лозинка."

353msgstr "Жао ми је, погрешна лозинка."

346

354

347−#: qml/Shell.qml:364

355+#: qml/Shell.qml:385

348msgid "Sorry, incorrect passcode."

356msgid "Sorry, incorrect passcode."

349msgstr "Жао ми је, погрешан код."

357msgstr "Жао ми је, погрешан код."

350

358

351−#: qml/Shell.qml:365

359+#: qml/Shell.qml:386

352msgid "This will be your last attempt."

360msgid "This will be your last attempt."

353msgstr "Ово је ваш последњи покушај."

361msgstr "Ово је ваш последњи покушај."

354

362

355−#: qml/Shell.qml:367

363+#: qml/Shell.qml:388

356msgid ""

364msgid ""

357"If passphrase is entered incorrectly, your phone will conduct a factory "

365"If passphrase is entered incorrectly, your phone will conduct a factory "

358"reset and all personal data will be deleted."

366"reset and all personal data will be deleted."

@@ -360,7 +368,7 @@ msgstr ""

360"Ако се унесе погрешна лозинка, ваш телефон ће се ресетовати и сви лични "

368"Ако се унесе погрешна лозинка, ваш телефон ће се ресетовати и сви лични "

361"подаци ће бити обрисани."

369"подаци ће бити обрисани."

362

370

363−#: qml/Shell.qml:368

371+#: qml/Shell.qml:389

364msgid ""

372msgid ""

365"If passcode is entered incorrectly, your phone will conduct a factory reset "

373"If passcode is entered incorrectly, your phone will conduct a factory reset "

366"and all personal data will be deleted."

374"and all personal data will be deleted."

@@ -381,9 +389,6 @@ msgstr ""

381#~ msgid "Hello"

389#~ msgid "Hello"

382#~ msgstr "Здраво"

390#~ msgstr "Здраво"

383

391

384−#~ msgid "Manage Dash"

385−#~ msgstr "Управљај Полицом"

386−

387#~ msgid "Enter your passphrase"

392#~ msgid "Enter your passphrase"

388#~ msgstr "Унесите вашу лозинку"

393#~ msgstr "Унесите вашу лозинку"

389

394

po/sv.po+21−16

@@ -7,7 +7,7 @@ msgid ""

7msgstr ""

8"Project-Id-Version: unity\n"

9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10−"POT-Creation-Date: 2014-10-02 10:35+0200\n"

10+"POT-Creation-Date: 2014-10-03 08:13-0400\n"

11"PO-Revision-Date: 2014-09-23 08:37+0000\n"

12"Last-Translator: Josef Andersson <Unknown>\n"

13"Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"

@@ -15,7 +15,7 @@ msgstr ""

15"Content-Type: text/plain; charset=UTF-8\n"

16"Content-Transfer-Encoding: 8bit\n"

17"Plural-Forms: nplurals=2; plural=n != 1;\n"

18−"X-Launchpad-Export-Date: 2014-10-03 06:22+0000\n"

18+"X-Launchpad-Export-Date: 2014-10-07 06:59+0000\n"

19"X-Generator: Launchpad (build 17196)\n"

20"Language: sv\n"

21

@@ -157,15 +157,15 @@ msgstr ""

157"Du har nu bemästrat kantgesterna och kan börja använda "

158"telefonen Tryck på skärmen för att starta"

159

160−#: qml/Components/Lockscreen.qml:206

160+#: qml/Components/Lockscreen.qml:218

161msgid "Emergency Call"

162msgstr "Nödsamtal"

163

164−#: qml/Components/Lockscreen.qml:226

164+#: qml/Components/Lockscreen.qml:250

165msgid "OK"

166msgstr "Ok"

167

168−#: qml/Dash/GenericScopeView.qml:411 qml/Dash/GenericScopeView.qml:533

168+#: qml/Dash/GenericScopeView.qml:411 qml/Dash/GenericScopeView.qml:568

169msgid "See less"

170msgstr "Visa mindre"

171

@@ -210,6 +210,14 @@ msgstr "Lägg till en recension"

210msgid "Send"

211msgstr "Skicka"

212

213+#: qml/Dash/PullToRefreshScopeStyle.qml:55

214+msgid "Pull to refresh…"

215+msgstr ""

216+

217+#: qml/Dash/PullToRefreshScopeStyle.qml:60

218+msgid "Release to refresh…"

219+msgstr ""

220+

213#: qml/Dash/ScopesOverview.qml:206

221#: qml/Dash/ScopesOverview.qml:206

214msgid "Manage Scopes"

222msgid "Manage Scopes"

215msgstr "Hantera vyer"

223msgstr "Hantera vyer"

@@ -314,7 +322,7 @@ msgstr "Roaming"

314msgid "Enter passphrase"

322msgid "Enter passphrase"

315msgstr ""

323msgstr ""

316

324

317−#: qml/Shell.qml:321

325+#: qml/Shell.qml:341

318msgid "Sorry, incorrect passphrase"

326msgid "Sorry, incorrect passphrase"

319msgstr "Felaktig lösenfras"

327msgstr "Felaktig lösenfras"

320

328

@@ -326,7 +334,7 @@ msgstr ""

326msgid "Enter passcode"

334msgid "Enter passcode"

327msgstr ""

335msgstr ""

328

336

329−#: qml/Shell.qml:324

337+#: qml/Shell.qml:345

330msgid "Sorry, incorrect passcode"

338msgid "Sorry, incorrect passcode"

331msgstr "Felaktig lösenkod"

339msgstr "Felaktig lösenkod"

332

340

@@ -335,24 +343,24 @@ msgstr "Felaktig lösenkod"

335msgid "Enter %1"

343msgid "Enter %1"

336msgstr ""

344msgstr ""

337

345

338−#: qml/Shell.qml:328

346+#: qml/Shell.qml:349

339#, qt-format

347#, qt-format

340msgid "Sorry, incorrect %1"

348msgid "Sorry, incorrect %1"

341msgstr "Felaktig %1"

349msgstr "Felaktig %1"

342

350

343−#: qml/Shell.qml:363

351+#: qml/Shell.qml:384

344msgid "Sorry, incorrect passphrase."

352msgid "Sorry, incorrect passphrase."

345msgstr "Felaktig lösenfras."

353msgstr "Felaktig lösenfras."

346

354

347−#: qml/Shell.qml:364

355+#: qml/Shell.qml:385

348msgid "Sorry, incorrect passcode."

356msgid "Sorry, incorrect passcode."

349msgstr "Felaktig lösenkod."

357msgstr "Felaktig lösenkod."

350

358

351−#: qml/Shell.qml:365

359+#: qml/Shell.qml:386

352msgid "This will be your last attempt."

360msgid "This will be your last attempt."

353msgstr "Detta är ditt sista försök."

361msgstr "Detta är ditt sista försök."

354

362

355−#: qml/Shell.qml:367

363+#: qml/Shell.qml:388

356msgid ""

364msgid ""

357"If passphrase is entered incorrectly, your phone will conduct a factory "

365"If passphrase is entered incorrectly, your phone will conduct a factory "

358"reset and all personal data will be deleted."

366"reset and all personal data will be deleted."

@@ -360,7 +368,7 @@ msgstr ""

360"Om lösenfrasen anges inkorrekt kommer telefonen att fabrikåterställas och "

368"Om lösenfrasen anges inkorrekt kommer telefonen att fabrikåterställas och "

361"all personlig data kommer att tas bort."

369"all personlig data kommer att tas bort."

362

370

363−#: qml/Shell.qml:368

371+#: qml/Shell.qml:389

364msgid ""

372msgid ""

365"If passcode is entered incorrectly, your phone will conduct a factory reset "

373"If passcode is entered incorrectly, your phone will conduct a factory reset "

366"and all personal data will be deleted."

374"and all personal data will be deleted."

@@ -388,9 +396,6 @@ msgstr ""

388#~ msgid "Too many incorrect attempts"

396#~ msgid "Too many incorrect attempts"

389#~ msgstr "För många felaktiga försök"

397#~ msgstr "För många felaktiga försök"

390

398

391−#~ msgid "Manage Dash"

392−#~ msgstr "Hantera Dash"

393−

394#~ msgid "Enter your passphrase"

399#~ msgid "Enter your passphrase"

395#~ msgstr "Ange din lösenfras"

400#~ msgstr "Ange din lösenfras"

396

401

po/sw.po+21−13

@@ -7,7 +7,7 @@ msgid ""

7msgstr ""

8"Project-Id-Version: unity8\n"

9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10−"POT-Creation-Date: 2014-10-02 10:35+0200\n"

10+"POT-Creation-Date: 2014-10-03 08:13-0400\n"

11"PO-Revision-Date: 2014-01-14 19:28+0000\n"

12"Last-Translator: Damas <Unknown>\n"

13"Language-Team: Swahili <sw@li.org>\n"

@@ -15,7 +15,7 @@ msgstr ""

15"Content-Type: text/plain; charset=UTF-8\n"

16"Content-Transfer-Encoding: 8bit\n"

17"Plural-Forms: nplurals=2; plural=n != 1;\n"

18−"X-Launchpad-Export-Date: 2014-10-03 06:22+0000\n"

18+"X-Launchpad-Export-Date: 2014-10-07 06:59+0000\n"

19"X-Generator: Launchpad (build 17196)\n"

20

21#: plugins/LightDM/Greeter.cpp:130

@@ -152,15 +152,15 @@ msgid ""

152"phone Tap on the screen to start"

153msgstr ""

154

155−#: qml/Components/Lockscreen.qml:206

155+#: qml/Components/Lockscreen.qml:218

156msgid "Emergency Call"

157msgstr ""

158

159−#: qml/Components/Lockscreen.qml:226

159+#: qml/Components/Lockscreen.qml:250

160msgid "OK"

161msgstr ""

162

163−#: qml/Dash/GenericScopeView.qml:411 qml/Dash/GenericScopeView.qml:533

163+#: qml/Dash/GenericScopeView.qml:411 qml/Dash/GenericScopeView.qml:568

164msgid "See less"

165msgstr ""

166

@@ -205,6 +205,14 @@ msgstr ""

205msgid "Send"

206msgstr "Tuma"

207

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+

208#: qml/Dash/ScopesOverview.qml:206

216#: qml/Dash/ScopesOverview.qml:206

209msgid "Manage Scopes"

217msgid "Manage Scopes"

210msgstr ""

218msgstr ""

@@ -309,7 +317,7 @@ msgstr ""

309msgid "Enter passphrase"

317msgid "Enter passphrase"

310msgstr ""

318msgstr ""

311

319

312−#: qml/Shell.qml:321

320+#: qml/Shell.qml:341

313msgid "Sorry, incorrect passphrase"

321msgid "Sorry, incorrect passphrase"

314msgstr ""

322msgstr ""

315

323

@@ -321,7 +329,7 @@ msgstr ""

321msgid "Enter passcode"

329msgid "Enter passcode"

322msgstr ""

330msgstr ""

323

331

324−#: qml/Shell.qml:324

332+#: qml/Shell.qml:345

325msgid "Sorry, incorrect passcode"

333msgid "Sorry, incorrect passcode"

326msgstr ""

334msgstr ""

327

335

@@ -330,30 +338,30 @@ msgstr ""

330msgid "Enter %1"

338msgid "Enter %1"

331msgstr ""

339msgstr ""

332

340

333−#: qml/Shell.qml:328

341+#: qml/Shell.qml:349

334#, qt-format

342#, qt-format

335msgid "Sorry, incorrect %1"

343msgid "Sorry, incorrect %1"

336msgstr ""

344msgstr ""

337

345

338−#: qml/Shell.qml:363

346+#: qml/Shell.qml:384

339msgid "Sorry, incorrect passphrase."

347msgid "Sorry, incorrect passphrase."

340msgstr ""

348msgstr ""

341

349

342−#: qml/Shell.qml:364

350+#: qml/Shell.qml:385

343msgid "Sorry, incorrect passcode."

351msgid "Sorry, incorrect passcode."

344msgstr ""

352msgstr ""

345

353

346−#: qml/Shell.qml:365

354+#: qml/Shell.qml:386

347msgid "This will be your last attempt."

355msgid "This will be your last attempt."

348msgstr ""

356msgstr ""

349

357

350−#: qml/Shell.qml:367

358+#: qml/Shell.qml:388

351msgid ""

359msgid ""

352"If passphrase is entered incorrectly, your phone will conduct a factory "

360"If passphrase is entered incorrectly, your phone will conduct a factory "

353"reset and all personal data will be deleted."

361"reset and all personal data will be deleted."

354msgstr ""

362msgstr ""

355

363

356−#: qml/Shell.qml:368

364+#: qml/Shell.qml:389

357msgid ""

365msgid ""

358"If passcode is entered incorrectly, your phone will conduct a factory reset "

366"If passcode is entered incorrectly, your phone will conduct a factory reset "

359"and all personal data will be deleted."

367"and all personal data will be deleted."

po/ta.po+21−13

@@ -7,7 +7,7 @@ msgid ""

7msgstr ""

8"Project-Id-Version: unity8\n"

9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10−"POT-Creation-Date: 2014-10-02 10:35+0200\n"

10+"POT-Creation-Date: 2014-10-03 08:13-0400\n"

11"PO-Revision-Date: 2013-10-24 11:36+0000\n"

12"Last-Translator: Arun Kumar - அருண் குமார் <thangam.arunx@gmail.com>\n"

13"Language-Team: Ubuntu Tamil Team/Free Tamil Computing/Thamizha\n"

@@ -15,7 +15,7 @@ msgstr ""

15"Content-Type: text/plain; charset=UTF-8\n"

16"Content-Transfer-Encoding: 8bit\n"

17"Plural-Forms: nplurals=2; plural=n != 1;\n"

18−"X-Launchpad-Export-Date: 2014-10-03 06:22+0000\n"

18+"X-Launchpad-Export-Date: 2014-10-07 06:59+0000\n"

19"X-Generator: Launchpad (build 17196)\n"

20"Language: ta\n"

21

@@ -155,15 +155,15 @@ msgid ""

155"phone Tap on the screen to start"

156msgstr ""

157

158−#: qml/Components/Lockscreen.qml:206

158+#: qml/Components/Lockscreen.qml:218

159msgid "Emergency Call"

160msgstr "அவசர அழைப்பு"

161

162−#: qml/Components/Lockscreen.qml:226

162+#: qml/Components/Lockscreen.qml:250

163msgid "OK"

164msgstr ""

165

166−#: qml/Dash/GenericScopeView.qml:411 qml/Dash/GenericScopeView.qml:533

166+#: qml/Dash/GenericScopeView.qml:411 qml/Dash/GenericScopeView.qml:568

167msgid "See less"

168msgstr ""

169

@@ -208,6 +208,14 @@ msgstr "ஒரு பரிசீலனையை சேர்"

208msgid "Send"

209msgstr "அனுப்பு"

210

211+#: qml/Dash/PullToRefreshScopeStyle.qml:55

212+msgid "Pull to refresh…"

213+msgstr ""

214+

215+#: qml/Dash/PullToRefreshScopeStyle.qml:60

216+msgid "Release to refresh…"

217+msgstr ""

218+

211#: qml/Dash/ScopesOverview.qml:206

219#: qml/Dash/ScopesOverview.qml:206

212msgid "Manage Scopes"

220msgid "Manage Scopes"

213msgstr ""

221msgstr ""

@@ -312,7 +320,7 @@ msgstr ""

312msgid "Enter passphrase"

320msgid "Enter passphrase"

313msgstr ""

321msgstr ""

314

322

315−#: qml/Shell.qml:321

323+#: qml/Shell.qml:341

316msgid "Sorry, incorrect passphrase"

324msgid "Sorry, incorrect passphrase"

317msgstr ""

325msgstr ""

318

326

@@ -324,7 +332,7 @@ msgstr ""

324msgid "Enter passcode"

332msgid "Enter passcode"

325msgstr ""

333msgstr ""

326

334

327−#: qml/Shell.qml:324

335+#: qml/Shell.qml:345

328msgid "Sorry, incorrect passcode"

336msgid "Sorry, incorrect passcode"

329msgstr ""

337msgstr ""

330

338

@@ -333,30 +341,30 @@ msgstr ""

333msgid "Enter %1"

341msgid "Enter %1"

334msgstr ""

342msgstr ""

335

343

336−#: qml/Shell.qml:328

344+#: qml/Shell.qml:349

337#, qt-format

345#, qt-format

338msgid "Sorry, incorrect %1"

346msgid "Sorry, incorrect %1"

339msgstr ""

347msgstr ""

340

348

341−#: qml/Shell.qml:363

349+#: qml/Shell.qml:384

342msgid "Sorry, incorrect passphrase."

350msgid "Sorry, incorrect passphrase."

343msgstr ""

351msgstr ""

344

352

345−#: qml/Shell.qml:364

353+#: qml/Shell.qml:385

346msgid "Sorry, incorrect passcode."

354msgid "Sorry, incorrect passcode."

347msgstr ""

355msgstr ""

348

356

349−#: qml/Shell.qml:365

357+#: qml/Shell.qml:386

350msgid "This will be your last attempt."

358msgid "This will be your last attempt."

351msgstr ""

359msgstr ""

352

360

353−#: qml/Shell.qml:367

361+#: qml/Shell.qml:388

354msgid ""

362msgid ""

355"If passphrase is entered incorrectly, your phone will conduct a factory "

363"If passphrase is entered incorrectly, your phone will conduct a factory "

356"reset and all personal data will be deleted."

364"reset and all personal data will be deleted."

357msgstr ""

365msgstr ""

358

366

359−#: qml/Shell.qml:368

367+#: qml/Shell.qml:389

360msgid ""

368msgid ""

361"If passcode is entered incorrectly, your phone will conduct a factory reset "

369"If passcode is entered incorrectly, your phone will conduct a factory reset "

362"and all personal data will be deleted."

370"and all personal data will be deleted."

po/te.po+21−13

@@ -7,7 +7,7 @@ msgid ""

7msgstr ""

8"Project-Id-Version: unity\n"

9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10−"POT-Creation-Date: 2014-10-02 10:35+0200\n"

10+"POT-Creation-Date: 2014-10-03 08:13-0400\n"

11"PO-Revision-Date: 2014-07-19 10:04+0000\n"

12"Last-Translator: Praveen Illa <mail2ipn@gmail.com>\n"

13"Language-Team: Telugu <te@li.org>\n"

@@ -15,7 +15,7 @@ msgstr ""

15"Content-Type: text/plain; charset=UTF-8\n"

16"Content-Transfer-Encoding: 8bit\n"

17"Plural-Forms: nplurals=2; plural=n != 1;\n"

18−"X-Launchpad-Export-Date: 2014-10-03 06:22+0000\n"

18+"X-Launchpad-Export-Date: 2014-10-07 06:59+0000\n"

19"X-Generator: Launchpad (build 17196)\n"

20

21#: plugins/LightDM/Greeter.cpp:130

@@ -152,15 +152,15 @@ msgid ""

152"phone Tap on the screen to start"

153msgstr ""

154

155−#: qml/Components/Lockscreen.qml:206

155+#: qml/Components/Lockscreen.qml:218

156msgid "Emergency Call"

157msgstr "అత్యవసర పిలుపు"

158

159−#: qml/Components/Lockscreen.qml:226

159+#: qml/Components/Lockscreen.qml:250

160msgid "OK"

161msgstr "సరే"

162

163−#: qml/Dash/GenericScopeView.qml:411 qml/Dash/GenericScopeView.qml:533

163+#: qml/Dash/GenericScopeView.qml:411 qml/Dash/GenericScopeView.qml:568

164msgid "See less"

165msgstr ""

166

@@ -205,6 +205,14 @@ msgstr "ఒక సమీక్షను వ్రాయండి"

205msgid "Send"

206msgstr "పంపు"

207

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+

208#: qml/Dash/ScopesOverview.qml:206

216#: qml/Dash/ScopesOverview.qml:206

209msgid "Manage Scopes"

217msgid "Manage Scopes"

210msgstr ""

218msgstr ""

@@ -309,7 +317,7 @@ msgstr ""

309msgid "Enter passphrase"

317msgid "Enter passphrase"

310msgstr ""

318msgstr ""

311

319

312−#: qml/Shell.qml:321

320+#: qml/Shell.qml:341

313msgid "Sorry, incorrect passphrase"

321msgid "Sorry, incorrect passphrase"

314msgstr ""

322msgstr ""

315

323

@@ -321,7 +329,7 @@ msgstr ""

321msgid "Enter passcode"

329msgid "Enter passcode"

322msgstr ""

330msgstr ""

323

331

324−#: qml/Shell.qml:324

332+#: qml/Shell.qml:345

325msgid "Sorry, incorrect passcode"

333msgid "Sorry, incorrect passcode"

326msgstr ""

334msgstr ""

327

335

@@ -330,30 +338,30 @@ msgstr ""

330msgid "Enter %1"

338msgid "Enter %1"

331msgstr ""

339msgstr ""

332

340

333−#: qml/Shell.qml:328

341+#: qml/Shell.qml:349

334#, qt-format

342#, qt-format

335msgid "Sorry, incorrect %1"

343msgid "Sorry, incorrect %1"

336msgstr ""

344msgstr ""

337

345

338−#: qml/Shell.qml:363

346+#: qml/Shell.qml:384

339msgid "Sorry, incorrect passphrase."

347msgid "Sorry, incorrect passphrase."

340msgstr ""

348msgstr ""

341

349

342−#: qml/Shell.qml:364

350+#: qml/Shell.qml:385

343msgid "Sorry, incorrect passcode."

351msgid "Sorry, incorrect passcode."

344msgstr ""

352msgstr ""

345

353

346−#: qml/Shell.qml:365

354+#: qml/Shell.qml:386

347msgid "This will be your last attempt."

355msgid "This will be your last attempt."

348msgstr ""

356msgstr ""

349

357

350−#: qml/Shell.qml:367

358+#: qml/Shell.qml:388

351msgid ""

359msgid ""

352"If passphrase is entered incorrectly, your phone will conduct a factory "

360"If passphrase is entered incorrectly, your phone will conduct a factory "

353"reset and all personal data will be deleted."

361"reset and all personal data will be deleted."

354msgstr ""

362msgstr ""

355

363

356−#: qml/Shell.qml:368

364+#: qml/Shell.qml:389

357msgid ""

365msgid ""

358"If passcode is entered incorrectly, your phone will conduct a factory reset "

366"If passcode is entered incorrectly, your phone will conduct a factory reset "

359"and all personal data will be deleted."

367"and all personal data will be deleted."

po/th.po+21−13

@@ -7,7 +7,7 @@ msgid ""

7msgstr ""

8"Project-Id-Version: unity8\n"

9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10−"POT-Creation-Date: 2014-10-02 10:35+0200\n"

10+"POT-Creation-Date: 2014-10-03 08:13-0400\n"

11"PO-Revision-Date: 2014-10-02 04:55+0000\n"

12"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"

13"Language-Team: Thai <th@li.org>\n"

@@ -15,7 +15,7 @@ msgstr ""

15"Content-Type: text/plain; charset=UTF-8\n"

16"Content-Transfer-Encoding: 8bit\n"

17"Plural-Forms: nplurals=1; plural=0;\n"

18−"X-Launchpad-Export-Date: 2014-10-03 06:22+0000\n"

18+"X-Launchpad-Export-Date: 2014-10-07 06:59+0000\n"

19"X-Generator: Launchpad (build 17196)\n"

20

21#: plugins/LightDM/Greeter.cpp:130

@@ -152,15 +152,15 @@ msgid ""

152"phone Tap on the screen to start"

153msgstr ""

154

155−#: qml/Components/Lockscreen.qml:206

155+#: qml/Components/Lockscreen.qml:218

156msgid "Emergency Call"

157msgstr ""

158

159−#: qml/Components/Lockscreen.qml:226

159+#: qml/Components/Lockscreen.qml:250

160msgid "OK"

161msgstr ""

162

163−#: qml/Dash/GenericScopeView.qml:411 qml/Dash/GenericScopeView.qml:533

163+#: qml/Dash/GenericScopeView.qml:411 qml/Dash/GenericScopeView.qml:568

164msgid "See less"

165msgstr ""

166

@@ -205,6 +205,14 @@ msgstr ""

205msgid "Send"

206msgstr ""

207

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+

208#: qml/Dash/ScopesOverview.qml:206

216#: qml/Dash/ScopesOverview.qml:206

209msgid "Manage Scopes"

217msgid "Manage Scopes"

210msgstr ""

218msgstr ""

@@ -309,7 +317,7 @@ msgstr ""

309msgid "Enter passphrase"

317msgid "Enter passphrase"

310msgstr ""

318msgstr ""

311

319

312−#: qml/Shell.qml:321

320+#: qml/Shell.qml:341

313msgid "Sorry, incorrect passphrase"

321msgid "Sorry, incorrect passphrase"

314msgstr ""

322msgstr ""

315

323

@@ -321,7 +329,7 @@ msgstr ""

321msgid "Enter passcode"

329msgid "Enter passcode"

322msgstr ""

330msgstr ""

323

331

324−#: qml/Shell.qml:324

332+#: qml/Shell.qml:345

325msgid "Sorry, incorrect passcode"

333msgid "Sorry, incorrect passcode"

326msgstr ""

334msgstr ""

327

335

@@ -330,30 +338,30 @@ msgstr ""

330msgid "Enter %1"

338msgid "Enter %1"

331msgstr ""

339msgstr ""

332

340

333−#: qml/Shell.qml:328

341+#: qml/Shell.qml:349

334#, qt-format

342#, qt-format

335msgid "Sorry, incorrect %1"

343msgid "Sorry, incorrect %1"

336msgstr ""

344msgstr ""

337

345

338−#: qml/Shell.qml:363

346+#: qml/Shell.qml:384

339msgid "Sorry, incorrect passphrase."

347msgid "Sorry, incorrect passphrase."

340msgstr ""

348msgstr ""

341

349

342−#: qml/Shell.qml:364

350+#: qml/Shell.qml:385

343msgid "Sorry, incorrect passcode."

351msgid "Sorry, incorrect passcode."

344msgstr ""

352msgstr ""

345

353

346−#: qml/Shell.qml:365

354+#: qml/Shell.qml:386

347msgid "This will be your last attempt."

355msgid "This will be your last attempt."

348msgstr ""

356msgstr ""

349

357

350−#: qml/Shell.qml:367

358+#: qml/Shell.qml:388

351msgid ""

359msgid ""

352"If passphrase is entered incorrectly, your phone will conduct a factory "

360"If passphrase is entered incorrectly, your phone will conduct a factory "

353"reset and all personal data will be deleted."

361"reset and all personal data will be deleted."

354msgstr ""

362msgstr ""

355

363

356−#: qml/Shell.qml:368

364+#: qml/Shell.qml:389

357msgid ""

365msgid ""

358"If passcode is entered incorrectly, your phone will conduct a factory reset "

366"If passcode is entered incorrectly, your phone will conduct a factory reset "

359"and all personal data will be deleted."

367"and all personal data will be deleted."

po/tr.po+21−13

@@ -7,7 +7,7 @@ msgid ""

7msgstr ""

8"Project-Id-Version: unity\n"

9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10−"POT-Creation-Date: 2014-10-02 10:35+0200\n"

10+"POT-Creation-Date: 2014-10-03 08:13-0400\n"

11"PO-Revision-Date: 2014-07-16 17:58+0000\n"

12"Last-Translator: Volkan Gezer <Unknown>\n"

13"Language-Team: Turkish <tr@li.org>\n"

@@ -15,7 +15,7 @@ msgstr ""

15"Content-Type: text/plain; charset=UTF-8\n"

16"Content-Transfer-Encoding: 8bit\n"

17"Plural-Forms: nplurals=2; plural=n != 1;\n"

18−"X-Launchpad-Export-Date: 2014-10-03 06:22+0000\n"

18+"X-Launchpad-Export-Date: 2014-10-07 06:59+0000\n"

19"X-Generator: Launchpad (build 17196)\n"

20

21#: plugins/LightDM/Greeter.cpp:130

@@ -155,15 +155,15 @@ msgstr ""

155"Kenar haraketlerini öğrendiniz ve telefonu kullanmaya "

156"başlayabilirsiniz Başlamak için ekrana dokunun"

157

158−#: qml/Components/Lockscreen.qml:206

158+#: qml/Components/Lockscreen.qml:218

159msgid "Emergency Call"

160msgstr "Acil Arama"

161

162−#: qml/Components/Lockscreen.qml:226

162+#: qml/Components/Lockscreen.qml:250

163msgid "OK"

164msgstr "Tamam"

165

166−#: qml/Dash/GenericScopeView.qml:411 qml/Dash/GenericScopeView.qml:533

166+#: qml/Dash/GenericScopeView.qml:411 qml/Dash/GenericScopeView.qml:568

167msgid "See less"

168msgstr "Daha azını gör"

169

@@ -208,6 +208,14 @@ msgstr "Bir inceleme ekle"

208msgid "Send"

209msgstr "Gönder"

210

211+#: qml/Dash/PullToRefreshScopeStyle.qml:55

212+msgid "Pull to refresh…"

213+msgstr ""

214+

215+#: qml/Dash/PullToRefreshScopeStyle.qml:60

216+msgid "Release to refresh…"

217+msgstr ""

218+

211#: qml/Dash/ScopesOverview.qml:206

219#: qml/Dash/ScopesOverview.qml:206

212msgid "Manage Scopes"

220msgid "Manage Scopes"

213msgstr ""

221msgstr ""

@@ -312,7 +320,7 @@ msgstr ""

312msgid "Enter passphrase"

320msgid "Enter passphrase"

313msgstr ""

321msgstr ""

314

322

315−#: qml/Shell.qml:321

323+#: qml/Shell.qml:341

316msgid "Sorry, incorrect passphrase"

324msgid "Sorry, incorrect passphrase"

317msgstr "Üzgünüm, hatalı parola"

325msgstr "Üzgünüm, hatalı parola"

318

326

@@ -324,7 +332,7 @@ msgstr ""

324msgid "Enter passcode"

332msgid "Enter passcode"

325msgstr ""

333msgstr ""

326

334

327−#: qml/Shell.qml:324

335+#: qml/Shell.qml:345

328msgid "Sorry, incorrect passcode"

336msgid "Sorry, incorrect passcode"

329msgstr "Üzgünüm, hatalı parola"

337msgstr "Üzgünüm, hatalı parola"

330

338

@@ -333,24 +341,24 @@ msgstr "Üzgünüm, hatalı parola"

333msgid "Enter %1"

341msgid "Enter %1"

334msgstr ""

342msgstr ""

335

343

336−#: qml/Shell.qml:328

344+#: qml/Shell.qml:349

337#, qt-format

345#, qt-format

338msgid "Sorry, incorrect %1"

346msgid "Sorry, incorrect %1"

339msgstr "Üzgünüm, hatalı %1"

347msgstr "Üzgünüm, hatalı %1"

340

348

341−#: qml/Shell.qml:363

349+#: qml/Shell.qml:384

342msgid "Sorry, incorrect passphrase."

350msgid "Sorry, incorrect passphrase."

343msgstr "Üzgünüm, hatalı parola."

351msgstr "Üzgünüm, hatalı parola."

344

352

345−#: qml/Shell.qml:364

353+#: qml/Shell.qml:385

346msgid "Sorry, incorrect passcode."

354msgid "Sorry, incorrect passcode."

347msgstr "Üzgünüm, hatalı parola."

355msgstr "Üzgünüm, hatalı parola."

348

356

349−#: qml/Shell.qml:365

357+#: qml/Shell.qml:386

350msgid "This will be your last attempt."

358msgid "This will be your last attempt."

351msgstr "Bu son denemeniz olacak."

359msgstr "Bu son denemeniz olacak."

352

360

353−#: qml/Shell.qml:367

361+#: qml/Shell.qml:388

354msgid ""

362msgid ""

355"If passphrase is entered incorrectly, your phone will conduct a factory "

363"If passphrase is entered incorrectly, your phone will conduct a factory "

356"reset and all personal data will be deleted."

364"reset and all personal data will be deleted."

@@ -358,7 +366,7 @@ msgstr ""

358"Eğer hatalı parola girilirse, telefonunuz fabrika ayarlarına dönecek ve tüm "

366"Eğer hatalı parola girilirse, telefonunuz fabrika ayarlarına dönecek ve tüm "

359"kişisel verileriniz silinecek."

367"kişisel verileriniz silinecek."

360

368

361−#: qml/Shell.qml:368

369+#: qml/Shell.qml:389

362msgid ""

370msgid ""

363"If passcode is entered incorrectly, your phone will conduct a factory reset "

371"If passcode is entered incorrectly, your phone will conduct a factory reset "

364"and all personal data will be deleted."

372"and all personal data will be deleted."

po/ug.po+31−27

@@ -7,15 +7,15 @@ msgid ""

7msgstr ""

8"Project-Id-Version: unity\n"

9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10−"POT-Creation-Date: 2014-10-02 10:35+0200\n"

10+"POT-Creation-Date: 2014-10-03 08:13-0400\n"

11−"PO-Revision-Date: 2014-09-29 00:52+0000\n"

11+"PO-Revision-Date: 2014-10-06 00:47+0000\n"

12"Last-Translator: Gheyret T.Kenji <Unknown>\n"

13"Language-Team: Uyghur Computer Science Association <UKIJ@yahoogroups.com>\n"

14"MIME-Version: 1.0\n"

15"Content-Type: text/plain; charset=UTF-8\n"

16"Content-Transfer-Encoding: 8bit\n"

17"Plural-Forms: nplurals=1; plural=0;\n"

18−"X-Launchpad-Export-Date: 2014-10-03 06:22+0000\n"

18+"X-Launchpad-Export-Date: 2014-10-07 06:59+0000\n"

19"X-Generator: Launchpad (build 17196)\n"

20

21#: plugins/LightDM/Greeter.cpp:130

@@ -33,22 +33,21 @@ msgstr "تېزلەتمىنى ئېلىۋەت"

33

34#: qml/Components/DelayedLockscreen.qml:47

35msgid "Device Locked"

36−msgstr ""

36+msgstr "ئۈسكۈنە قۇلۇپلانغان"

37

38#: qml/Components/DelayedLockscreen.qml:62

39msgid "You have been locked out due to too many failed passphrase attempts."

40−msgstr ""

40+msgstr "خاتا ئىم جۈملىسى كۆپ قېتىم كىرگۈزۈلگەنلىكى ئۈچۈن قۇلۇپلاندى."

41

42#: qml/Components/DelayedLockscreen.qml:63

43msgid "You have been locked out due to too many failed passcode attempts."

44−msgstr ""

44+msgstr "خاتا ئىم كودى(passcode) كۆپ قېتىم كىرگۈزۈلگەنلىكى ئۈچۈن قۇلۇپلاندى."

45

46#: qml/Components/DelayedLockscreen.qml:72

47#, qt-format

48msgid "Please wait %1 minute and then try again…"

49msgid_plural "Please wait %1 minutes and then try again…"

50−msgstr[0] ""

50+msgstr[0] "%1 مىنۇت كۈتۈپ ئاندىن قايتا سىناڭ…"

51−msgstr[1] ""

52

51

53#: qml/Components/Dialogs.qml:70

52#: qml/Components/Dialogs.qml:70

54msgid "Log out"

53msgid "Log out"

@@ -156,15 +155,15 @@ msgstr ""

156"ئېكراننى چېكىپ باشلاڭ سىز ھازىر گىرۋەك بارماق ئىشارەتلىرىنى ئىگىلەپ "

155"ئېكراننى چېكىپ باشلاڭ سىز ھازىر گىرۋەك بارماق ئىشارەتلىرىنى ئىگىلەپ "

157"بولدىڭىز،ئەمدى تېلېفوننى ئىشلىتىشنى باشلىسىڭىز بولىدۇ"

156"بولدىڭىز،ئەمدى تېلېفوننى ئىشلىتىشنى باشلىسىڭىز بولىدۇ"

158

157

159−#: qml/Components/Lockscreen.qml:206

158+#: qml/Components/Lockscreen.qml:218

160msgid "Emergency Call"

159msgid "Emergency Call"

161msgstr "جىددىي تېلېفون"

160msgstr "جىددىي تېلېفون"

162

161

163−#: qml/Components/Lockscreen.qml:226

162+#: qml/Components/Lockscreen.qml:250

164msgid "OK"

163msgid "OK"

165msgstr "تامام"

164msgstr "تامام"

166

165

167−#: qml/Dash/GenericScopeView.qml:411 qml/Dash/GenericScopeView.qml:533

166+#: qml/Dash/GenericScopeView.qml:411 qml/Dash/GenericScopeView.qml:568

168msgid "See less"

167msgid "See less"

169msgstr "ئازراق كۆرۈش"

168msgstr "ئازراق كۆرۈش"

170

169

@@ -209,6 +208,14 @@ msgstr "باھا قوشۇش"

209msgid "Send"

208msgid "Send"

210msgstr "يوللا"

209msgstr "يوللا"

211

210

211+#: qml/Dash/PullToRefreshScopeStyle.qml:55

212+msgid "Pull to refresh…"

213+msgstr ""

214+

215+#: qml/Dash/PullToRefreshScopeStyle.qml:60

216+msgid "Release to refresh…"

217+msgstr ""

218+

212#: qml/Dash/ScopesOverview.qml:206

219#: qml/Dash/ScopesOverview.qml:206

213msgid "Manage Scopes"

220msgid "Manage Scopes"

214msgstr "دائىرە باشقۇرۇش"

221msgstr "دائىرە باشقۇرۇش"

@@ -231,7 +238,7 @@ msgstr "ھەممىسى"

231

238

232#: qml/Greeter/Greeter.qml:157

239#: qml/Greeter/Greeter.qml:157

233msgid "Unlock"

240msgid "Unlock"

234−msgstr ""

241+msgstr "قۇلۇپسىزلا"

235

242

236#: qml/Hud/HudParametrizedActionsPage.qml:139

243#: qml/Hud/HudParametrizedActionsPage.qml:139

237msgid "Confirm"

244msgid "Confirm"

@@ -311,47 +318,47 @@ msgstr "كەزمە"

311

318

312#: qml/Shell.qml:340

319#: qml/Shell.qml:340

313msgid "Enter passphrase"

320msgid "Enter passphrase"

314−msgstr ""

321+msgstr "ئىم كىرگۈزۈڭ"

315

322

316−#: qml/Shell.qml:321

323+#: qml/Shell.qml:341

317msgid "Sorry, incorrect passphrase"

324msgid "Sorry, incorrect passphrase"

318msgstr "كەچۈرۈڭ، ئىم توغرا ئەمەس"

325msgstr "كەچۈرۈڭ، ئىم توغرا ئەمەس"

319

326

320#: qml/Shell.qml:342

327#: qml/Shell.qml:342

321msgid "Please re-enter"

328msgid "Please re-enter"

322−msgstr ""

329+msgstr "قايتا كىرگۈزۈڭ"

323

330

324#: qml/Shell.qml:344

331#: qml/Shell.qml:344

325msgid "Enter passcode"

332msgid "Enter passcode"

326−msgstr ""

333+msgstr "ئىم كودى(passcode)نى كىرگۈزۈڭ"

327

334

328−#: qml/Shell.qml:324

335+#: qml/Shell.qml:345

329msgid "Sorry, incorrect passcode"

336msgid "Sorry, incorrect passcode"

330msgstr "كەچۈرۈڭ، ئىم توغرا ئەمەس"

337msgstr "كەچۈرۈڭ، ئىم توغرا ئەمەس"

331

338

332#: qml/Shell.qml:348

339#: qml/Shell.qml:348

333#, qt-format

340#, qt-format

334msgid "Enter %1"

341msgid "Enter %1"

335−msgstr ""

342+msgstr "%1 نى كىرگۈزۈڭ"

336

343

337−#: qml/Shell.qml:328

344+#: qml/Shell.qml:349

338#, qt-format

345#, qt-format

339msgid "Sorry, incorrect %1"

346msgid "Sorry, incorrect %1"

340msgstr "كەچۈرۈڭ، %1 توغرا ئەمەس"

347msgstr "كەچۈرۈڭ، %1 توغرا ئەمەس"

341

348

342−#: qml/Shell.qml:363

349+#: qml/Shell.qml:384

343msgid "Sorry, incorrect passphrase."

350msgid "Sorry, incorrect passphrase."

344msgstr "كەچۈرۈڭ، ئىم توغرا ئەمەس"

351msgstr "كەچۈرۈڭ، ئىم توغرا ئەمەس"

345

352

346−#: qml/Shell.qml:364

353+#: qml/Shell.qml:385

347msgid "Sorry, incorrect passcode."

354msgid "Sorry, incorrect passcode."

348msgstr "كەچۈرۈڭ، ئىم كودى ئەمەس"

355msgstr "كەچۈرۈڭ، ئىم كودى ئەمەس"

349

356

350−#: qml/Shell.qml:365

357+#: qml/Shell.qml:386

351msgid "This will be your last attempt."

358msgid "This will be your last attempt."

352msgstr "بۇ سىزنىڭ ئەڭ ئاخىرقى پۇرسىتىڭىز"

359msgstr "بۇ سىزنىڭ ئەڭ ئاخىرقى پۇرسىتىڭىز"

353

360

354−#: qml/Shell.qml:367

361+#: qml/Shell.qml:388

355msgid ""

362msgid ""

356"If passphrase is entered incorrectly, your phone will conduct a factory "

363"If passphrase is entered incorrectly, your phone will conduct a factory "

357"reset and all personal data will be deleted."

364"reset and all personal data will be deleted."

@@ -359,7 +366,7 @@ msgstr ""

359"ئەگەر ئىم توغرا بولمىسا، تېلېفونىڭىز ئەسلىگە قايتۇرۇلۇپ، زاۋۇتتىن چىققان "

366"ئەگەر ئىم توغرا بولمىسا، تېلېفونىڭىز ئەسلىگە قايتۇرۇلۇپ، زاۋۇتتىن چىققان "

360"ھالەتكە كېلىپ قالىدۇ. بارلىق مەزمۇنلار يوقىلىدۇ."

367"ھالەتكە كېلىپ قالىدۇ. بارلىق مەزمۇنلار يوقىلىدۇ."

361

368

362−#: qml/Shell.qml:368

369+#: qml/Shell.qml:389

363msgid ""

370msgid ""

364"If passcode is entered incorrectly, your phone will conduct a factory reset "

371"If passcode is entered incorrectly, your phone will conduct a factory reset "

365"and all personal data will be deleted."

372"and all personal data will be deleted."

@@ -380,9 +387,6 @@ msgstr ""

380#~ msgid "Please wait"

387#~ msgid "Please wait"

381#~ msgstr "سەل ساقلاڭ"

388#~ msgstr "سەل ساقلاڭ"

382

389

383−#~ msgid "Manage Dash"

384−#~ msgstr "باش تاختىنى باشقۇرۇش"

385−

386#~ msgid "Enter your passphrase"

390#~ msgid "Enter your passphrase"

387#~ msgstr "ئىمىڭىزنى كىرگۈزۈڭ"

391#~ msgstr "ئىمىڭىزنى كىرگۈزۈڭ"

388

392

po/uk.po+35−25

@@ -7,8 +7,8 @@ msgid ""

7msgstr ""

8"Project-Id-Version: unity\n"

9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10−"POT-Creation-Date: 2014-10-02 10:35+0200\n"

10+"POT-Creation-Date: 2014-10-03 08:13-0400\n"

11−"PO-Revision-Date: 2014-08-26 19:06+0000\n"

11+"PO-Revision-Date: 2014-10-03 12:44+0000\n"

12"Last-Translator: Yuri Chornoivan <yurchor@gmail.com>\n"

13"Language-Team: Ukrainian <uk@li.org>\n"

14"MIME-Version: 1.0\n"

@@ -16,7 +16,7 @@ msgstr ""

16"Content-Transfer-Encoding: 8bit\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"

19+"X-Launchpad-Export-Date: 2014-10-07 06:59+0000\n"

20"X-Generator: Launchpad (build 17196)\n"

21

22#: plugins/LightDM/Greeter.cpp:130

@@ -34,22 +34,27 @@ msgstr "Розблокувати кнопку"

34

35#: qml/Components/DelayedLockscreen.qml:47

36msgid "Device Locked"

37−msgstr ""

37+msgstr "Пристрій заблоковано"

38

39#: qml/Components/DelayedLockscreen.qml:62

40msgid "You have been locked out due to too many failed passphrase attempts."

41msgstr ""

42+"Ваш пристрій було заблоковано через перевищення граничної кількості спроб "

43+"введення пароля."

42

44

43#: qml/Components/DelayedLockscreen.qml:63

45#: qml/Components/DelayedLockscreen.qml:63

44msgid "You have been locked out due to too many failed passcode attempts."

46msgid "You have been locked out due to too many failed passcode attempts."

45msgstr ""

47msgstr ""

48+"Ваш пристрій було заблоковано через перевищення граничної кількості спроб "

49+"введення коду-пароля."

46

50

47#: qml/Components/DelayedLockscreen.qml:72

51#: qml/Components/DelayedLockscreen.qml:72

48#, qt-format

52#, qt-format

49msgid "Please wait %1 minute and then try again…"

53msgid "Please wait %1 minute and then try again…"

50msgid_plural "Please wait %1 minutes and then try again…"

54msgid_plural "Please wait %1 minutes and then try again…"

51−msgstr[0] ""

55+msgstr[0] "Зачекайте %1 хвилину і повторіть спробу…"

52−msgstr[1] ""

56+msgstr[1] "Зачекайте %1 хвилини і повторіть спробу…"

57+msgstr[2] "Зачекайте %1 хвилин і повторіть спробу…"

53

58

54#: qml/Components/Dialogs.qml:70

59#: qml/Components/Dialogs.qml:70

55msgid "Log out"

60msgid "Log out"

@@ -160,15 +165,15 @@ msgstr ""

160"Вами налаштовано дії у відповідь на дотики на краях екрана. Тепер телефоном "

165"Вами налаштовано дії у відповідь на дотики на краях екрана. Тепер телефоном "

161"можна користуватися. Торкніться екрана, щоб розпочати."

166"можна користуватися. Торкніться екрана, щоб розпочати."

162

167

163−#: qml/Components/Lockscreen.qml:206

168+#: qml/Components/Lockscreen.qml:218

164msgid "Emergency Call"

169msgid "Emergency Call"

165msgstr "Терміновий виклик"

170msgstr "Терміновий виклик"

166

171

167−#: qml/Components/Lockscreen.qml:226

172+#: qml/Components/Lockscreen.qml:250

168msgid "OK"

173msgid "OK"

169msgstr "Гаразд"

174msgstr "Гаразд"

170

175

171−#: qml/Dash/GenericScopeView.qml:411 qml/Dash/GenericScopeView.qml:533

176+#: qml/Dash/GenericScopeView.qml:411 qml/Dash/GenericScopeView.qml:568

172msgid "See less"

177msgid "See less"

173msgstr "Стисліше"

178msgstr "Стисліше"

174

179

@@ -213,6 +218,14 @@ msgstr "Додати рецензію"

213msgid "Send"

218msgid "Send"

214msgstr "Надіслати"

219msgstr "Надіслати"

215

220

221+#: qml/Dash/PullToRefreshScopeStyle.qml:55

222+msgid "Pull to refresh…"

223+msgstr ""

224+

225+#: qml/Dash/PullToRefreshScopeStyle.qml:60

226+msgid "Release to refresh…"

227+msgstr ""

228+

216#: qml/Dash/ScopesOverview.qml:206

229#: qml/Dash/ScopesOverview.qml:206

217msgid "Manage Scopes"

230msgid "Manage Scopes"

218msgstr "Керування областями"

231msgstr "Керування областями"

@@ -235,7 +248,7 @@ msgstr "Все"

235

248

236#: qml/Greeter/Greeter.qml:157

249#: qml/Greeter/Greeter.qml:157

237msgid "Unlock"

250msgid "Unlock"

238−msgstr ""

251+msgstr "Розблокувати"

239

252

240#: qml/Hud/HudParametrizedActionsPage.qml:139

253#: qml/Hud/HudParametrizedActionsPage.qml:139

241msgid "Confirm"

254msgid "Confirm"

@@ -315,47 +328,47 @@ msgstr "Роумінг"

315

328

316#: qml/Shell.qml:340

329#: qml/Shell.qml:340

317msgid "Enter passphrase"

330msgid "Enter passphrase"

318−msgstr ""

331+msgstr "Введіть пароль"

319

332

320−#: qml/Shell.qml:321

333+#: qml/Shell.qml:341

321msgid "Sorry, incorrect passphrase"

334msgid "Sorry, incorrect passphrase"

322msgstr "Вибачте, помилковий пароль"

335msgstr "Вибачте, помилковий пароль"

323

336

324#: qml/Shell.qml:342

337#: qml/Shell.qml:342

325msgid "Please re-enter"

338msgid "Please re-enter"

326−msgstr ""

339+msgstr "Ввведіть ще раз"

327

340

328#: qml/Shell.qml:344

341#: qml/Shell.qml:344

329msgid "Enter passcode"

342msgid "Enter passcode"

330−msgstr ""

343+msgstr "Введіть код"

331

344

332−#: qml/Shell.qml:324

345+#: qml/Shell.qml:345

333msgid "Sorry, incorrect passcode"

346msgid "Sorry, incorrect passcode"

334msgstr "Вибачте, помилковий код-пароль"

347msgstr "Вибачте, помилковий код-пароль"

335

348

336#: qml/Shell.qml:348

349#: qml/Shell.qml:348

337#, qt-format

350#, qt-format

338msgid "Enter %1"

351msgid "Enter %1"

339−msgstr ""

352+msgstr "Введіть %1"

340

353

341−#: qml/Shell.qml:328

354+#: qml/Shell.qml:349

342#, qt-format

355#, qt-format

343msgid "Sorry, incorrect %1"

356msgid "Sorry, incorrect %1"

344msgstr "Вибачте, помилковий %1"

357msgstr "Вибачте, помилковий %1"

345

358

346−#: qml/Shell.qml:363

359+#: qml/Shell.qml:384

347msgid "Sorry, incorrect passphrase."

360msgid "Sorry, incorrect passphrase."

348msgstr "Вибачте, помилковий пароль."

361msgstr "Вибачте, помилковий пароль."

349

362

350−#: qml/Shell.qml:364

363+#: qml/Shell.qml:385

351msgid "Sorry, incorrect passcode."

364msgid "Sorry, incorrect passcode."

352msgstr "Вибачте, помилковий код-пароль."

365msgstr "Вибачте, помилковий код-пароль."

353

366

354−#: qml/Shell.qml:365

367+#: qml/Shell.qml:386

355msgid "This will be your last attempt."

368msgid "This will be your last attempt."

356msgstr "Ця спроба буде останньою."

369msgstr "Ця спроба буде останньою."

357

370

358−#: qml/Shell.qml:367

371+#: qml/Shell.qml:388

359msgid ""

372msgid ""

360"If passphrase is entered incorrectly, your phone will conduct a factory "

373"If passphrase is entered incorrectly, your phone will conduct a factory "

361"reset and all personal data will be deleted."

374"reset and all personal data will be deleted."

@@ -363,7 +376,7 @@ msgstr ""

363"Якщо пароль буде вказано неправильно, телефон повернеться до початкового "

376"Якщо пароль буде вказано неправильно, телефон повернеться до початкового "

364"стану, усі особисті дані буде вилучено."

377"стану, усі особисті дані буде вилучено."

365

378

366−#: qml/Shell.qml:368

379+#: qml/Shell.qml:389

367msgid ""

380msgid ""

368"If passcode is entered incorrectly, your phone will conduct a factory reset "

381"If passcode is entered incorrectly, your phone will conduct a factory reset "

369"and all personal data will be deleted."

382"and all personal data will be deleted."

@@ -381,9 +394,6 @@ msgstr ""

381#~ msgid "Swipe to unlock"

394#~ msgid "Swipe to unlock"

382#~ msgstr "Проведіть пальцем, щоб розблокувати"

395#~ msgstr "Проведіть пальцем, щоб розблокувати"

383

396

384−#~ msgid "Manage Dash"

385−#~ msgstr "Керування панеллю"

386−

387#~ msgid "Please wait"

397#~ msgid "Please wait"

388#~ msgstr "Будь ласка, зачекайте"

398#~ msgstr "Будь ласка, зачекайте"

389

399

po/unity8.pot+10−2

@@ -8,7 +8,7 @@ msgid ""

8msgstr ""

9"Project-Id-Version: unity8\n"

10"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"

12"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"

13"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"

14"Language-Team: LANGUAGE <LL@li.org>\n"

@@ -160,7 +160,7 @@ msgstr ""

160msgid "OK"

161msgstr ""

162

163−#: qml/Dash/GenericScopeView.qml:411 qml/Dash/GenericScopeView.qml:533

163+#: qml/Dash/GenericScopeView.qml:411 qml/Dash/GenericScopeView.qml:568

164msgid "See less"

165msgstr ""

166

@@ -205,6 +205,14 @@ msgstr ""

205msgid "Send"

206msgstr ""

207

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+

208#: qml/Dash/ScopesOverview.qml:206

216#: qml/Dash/ScopesOverview.qml:206

209msgid "Manage Scopes"

217msgid "Manage Scopes"

210msgstr ""

218msgstr ""

po/vi.po+21−13

@@ -7,7 +7,7 @@ msgid ""

7msgstr ""

8"Project-Id-Version: unity8\n"

9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10−"POT-Creation-Date: 2014-10-02 10:35+0200\n"

10+"POT-Creation-Date: 2014-10-03 08:13-0400\n"

11"PO-Revision-Date: 2014-01-15 01:19+0000\n"

12"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"

13"Language-Team: Vietnamese <vi@li.org>\n"

@@ -15,7 +15,7 @@ msgstr ""

15"Content-Type: text/plain; charset=UTF-8\n"

16"Content-Transfer-Encoding: 8bit\n"

17"Plural-Forms: nplurals=1; plural=0;\n"

18−"X-Launchpad-Export-Date: 2014-10-03 06:22+0000\n"

18+"X-Launchpad-Export-Date: 2014-10-07 06:59+0000\n"

19"X-Generator: Launchpad (build 17196)\n"

20

21#: plugins/LightDM/Greeter.cpp:130

@@ -152,15 +152,15 @@ msgid ""

152"phone Tap on the screen to start"

153msgstr ""

154

155−#: qml/Components/Lockscreen.qml:206

155+#: qml/Components/Lockscreen.qml:218

156msgid "Emergency Call"

157msgstr ""

158

159−#: qml/Components/Lockscreen.qml:226

159+#: qml/Components/Lockscreen.qml:250

160msgid "OK"

161msgstr ""

162

163−#: qml/Dash/GenericScopeView.qml:411 qml/Dash/GenericScopeView.qml:533

163+#: qml/Dash/GenericScopeView.qml:411 qml/Dash/GenericScopeView.qml:568

164msgid "See less"

165msgstr ""

166

@@ -205,6 +205,14 @@ msgstr ""

205msgid "Send"

206msgstr ""

207

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+

208#: qml/Dash/ScopesOverview.qml:206

216#: qml/Dash/ScopesOverview.qml:206

209msgid "Manage Scopes"

217msgid "Manage Scopes"

210msgstr ""

218msgstr ""

@@ -309,7 +317,7 @@ msgstr ""

309msgid "Enter passphrase"

317msgid "Enter passphrase"

310msgstr ""

318msgstr ""

311

319

312−#: qml/Shell.qml:321

320+#: qml/Shell.qml:341

313msgid "Sorry, incorrect passphrase"

321msgid "Sorry, incorrect passphrase"

314msgstr ""

322msgstr ""

315

323

@@ -321,7 +329,7 @@ msgstr ""

321msgid "Enter passcode"

329msgid "Enter passcode"

322msgstr ""

330msgstr ""

323

331

324−#: qml/Shell.qml:324

332+#: qml/Shell.qml:345

325msgid "Sorry, incorrect passcode"

333msgid "Sorry, incorrect passcode"

326msgstr ""

334msgstr ""

327

335

@@ -330,30 +338,30 @@ msgstr ""

330msgid "Enter %1"

338msgid "Enter %1"

331msgstr ""

339msgstr ""

332

340

333−#: qml/Shell.qml:328

341+#: qml/Shell.qml:349

334#, qt-format

342#, qt-format

335msgid "Sorry, incorrect %1"

343msgid "Sorry, incorrect %1"

336msgstr ""

344msgstr ""

337

345

338−#: qml/Shell.qml:363

346+#: qml/Shell.qml:384

339msgid "Sorry, incorrect passphrase."

347msgid "Sorry, incorrect passphrase."

340msgstr ""

348msgstr ""

341

349

342−#: qml/Shell.qml:364

350+#: qml/Shell.qml:385

343msgid "Sorry, incorrect passcode."

351msgid "Sorry, incorrect passcode."

344msgstr ""

352msgstr ""

345

353

346−#: qml/Shell.qml:365

354+#: qml/Shell.qml:386

347msgid "This will be your last attempt."

355msgid "This will be your last attempt."

348msgstr ""

356msgstr ""

349

357

350−#: qml/Shell.qml:367

358+#: qml/Shell.qml:388

351msgid ""

359msgid ""

352"If passphrase is entered incorrectly, your phone will conduct a factory "

360"If passphrase is entered incorrectly, your phone will conduct a factory "

353"reset and all personal data will be deleted."

361"reset and all personal data will be deleted."

354msgstr ""

362msgstr ""

355

363

356−#: qml/Shell.qml:368

364+#: qml/Shell.qml:389

357msgid ""

365msgid ""

358"If passcode is entered incorrectly, your phone will conduct a factory reset "

366"If passcode is entered incorrectly, your phone will conduct a factory reset "

359"and all personal data will be deleted."

367"and all personal data will be deleted."

po/xh.po+21−13

@@ -7,7 +7,7 @@ msgid ""

7msgstr ""

8"Project-Id-Version: unity8\n"

9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10−"POT-Creation-Date: 2014-10-02 10:35+0200\n"

10+"POT-Creation-Date: 2014-10-03 08:13-0400\n"

11"PO-Revision-Date: 2013-09-28 13:20+0000\n"

12"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"

13"Language-Team: Xhosa <xh@li.org>\n"

@@ -15,7 +15,7 @@ msgstr ""

15"Content-Type: text/plain; charset=UTF-8\n"

16"Content-Transfer-Encoding: 8bit\n"

17"Plural-Forms: nplurals=2; plural=n != 1;\n"

18−"X-Launchpad-Export-Date: 2014-10-03 06:22+0000\n"

18+"X-Launchpad-Export-Date: 2014-10-07 06:59+0000\n"

19"X-Generator: Launchpad (build 17196)\n"

20

21#: plugins/LightDM/Greeter.cpp:130

@@ -152,15 +152,15 @@ msgid ""

152"phone Tap on the screen to start"

153msgstr ""

154

155−#: qml/Components/Lockscreen.qml:206

155+#: qml/Components/Lockscreen.qml:218

156msgid "Emergency Call"

157msgstr ""

158

159−#: qml/Components/Lockscreen.qml:226

159+#: qml/Components/Lockscreen.qml:250

160msgid "OK"

161msgstr ""

162

163−#: qml/Dash/GenericScopeView.qml:411 qml/Dash/GenericScopeView.qml:533

163+#: qml/Dash/GenericScopeView.qml:411 qml/Dash/GenericScopeView.qml:568

164msgid "See less"

165msgstr ""

166

@@ -205,6 +205,14 @@ msgstr ""

205msgid "Send"

206msgstr ""

207

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+

208#: qml/Dash/ScopesOverview.qml:206

216#: qml/Dash/ScopesOverview.qml:206

209msgid "Manage Scopes"

217msgid "Manage Scopes"

210msgstr ""

218msgstr ""

@@ -309,7 +317,7 @@ msgstr ""

309msgid "Enter passphrase"

317msgid "Enter passphrase"

310msgstr ""

318msgstr ""

311

319

312−#: qml/Shell.qml:321

320+#: qml/Shell.qml:341

313msgid "Sorry, incorrect passphrase"

321msgid "Sorry, incorrect passphrase"

314msgstr ""

322msgstr ""

315

323

@@ -321,7 +329,7 @@ msgstr ""

321msgid "Enter passcode"

329msgid "Enter passcode"

322msgstr ""

330msgstr ""

323

331

324−#: qml/Shell.qml:324

332+#: qml/Shell.qml:345

325msgid "Sorry, incorrect passcode"

333msgid "Sorry, incorrect passcode"

326msgstr ""

334msgstr ""

327

335

@@ -330,30 +338,30 @@ msgstr ""

330msgid "Enter %1"

338msgid "Enter %1"

331msgstr ""

339msgstr ""

332

340

333−#: qml/Shell.qml:328

341+#: qml/Shell.qml:349

334#, qt-format

342#, qt-format

335msgid "Sorry, incorrect %1"

343msgid "Sorry, incorrect %1"

336msgstr ""

344msgstr ""

337

345

338−#: qml/Shell.qml:363

346+#: qml/Shell.qml:384

339msgid "Sorry, incorrect passphrase."

347msgid "Sorry, incorrect passphrase."

340msgstr ""

348msgstr ""

341

349

342−#: qml/Shell.qml:364

350+#: qml/Shell.qml:385

343msgid "Sorry, incorrect passcode."

351msgid "Sorry, incorrect passcode."

344msgstr ""

352msgstr ""

345

353

346−#: qml/Shell.qml:365

354+#: qml/Shell.qml:386

347msgid "This will be your last attempt."

355msgid "This will be your last attempt."

348msgstr ""

356msgstr ""

349

357

350−#: qml/Shell.qml:367

358+#: qml/Shell.qml:388

351msgid ""

359msgid ""

352"If passphrase is entered incorrectly, your phone will conduct a factory "

360"If passphrase is entered incorrectly, your phone will conduct a factory "

353"reset and all personal data will be deleted."

361"reset and all personal data will be deleted."

354msgstr ""

362msgstr ""

355

363

356−#: qml/Shell.qml:368

364+#: qml/Shell.qml:389

357msgid ""

365msgid ""

358"If passcode is entered incorrectly, your phone will conduct a factory reset "

366"If passcode is entered incorrectly, your phone will conduct a factory reset "

359"and all personal data will be deleted."

367"and all personal data will be deleted."

po/zh_CN.po+21−16

@@ -7,7 +7,7 @@ msgid ""

7msgstr ""

8"Project-Id-Version: unity\n"

9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10−"POT-Creation-Date: 2014-10-02 10:35+0200\n"

10+"POT-Creation-Date: 2014-10-03 08:13-0400\n"

11"PO-Revision-Date: 2014-08-12 14:09+0000\n"

12"Last-Translator: Anthony Wong <anthony.wong@ubuntu.com>\n"

13"Language-Team: Chinese (Simplified) <zh_CN@li.org>\n"

@@ -15,7 +15,7 @@ msgstr ""

15"Content-Type: text/plain; charset=UTF-8\n"

16"Content-Transfer-Encoding: 8bit\n"

17"Plural-Forms: nplurals=1; plural=0;\n"

18−"X-Launchpad-Export-Date: 2014-10-03 06:22+0000\n"

18+"X-Launchpad-Export-Date: 2014-10-07 06:59+0000\n"

19"X-Generator: Launchpad (build 17196)\n"

20

21#: plugins/LightDM/Greeter.cpp:130

@@ -152,15 +152,15 @@ msgid ""

152"phone Tap on the screen to start"

153msgstr "您现在已经掌握了边缘滑动手势，可以开始使用手机了 请点击屏幕开始使用"

154

155−#: qml/Components/Lockscreen.qml:206

155+#: qml/Components/Lockscreen.qml:218

156msgid "Emergency Call"

157msgstr "紧急电话"

158

159−#: qml/Components/Lockscreen.qml:226

159+#: qml/Components/Lockscreen.qml:250

160msgid "OK"

161msgstr "确定"

162

163−#: qml/Dash/GenericScopeView.qml:411 qml/Dash/GenericScopeView.qml:533

163+#: qml/Dash/GenericScopeView.qml:411 qml/Dash/GenericScopeView.qml:568

164msgid "See less"

165msgstr "显示更少"

166

@@ -205,6 +205,14 @@ msgstr "添加评论"

205msgid "Send"

206msgstr "发送"

207

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+

208#: qml/Dash/ScopesOverview.qml:206

216#: qml/Dash/ScopesOverview.qml:206

209msgid "Manage Scopes"

217msgid "Manage Scopes"

210msgstr ""

218msgstr ""

@@ -309,7 +317,7 @@ msgstr "漫游"

309msgid "Enter passphrase"

317msgid "Enter passphrase"

310msgstr ""

318msgstr ""

311

319

312−#: qml/Shell.qml:321

320+#: qml/Shell.qml:341

313msgid "Sorry, incorrect passphrase"

321msgid "Sorry, incorrect passphrase"

314msgstr ""

322msgstr ""

315

323

@@ -321,7 +329,7 @@ msgstr ""

321msgid "Enter passcode"

329msgid "Enter passcode"

322msgstr ""

330msgstr ""

323

331

324−#: qml/Shell.qml:324

332+#: qml/Shell.qml:345

325msgid "Sorry, incorrect passcode"

333msgid "Sorry, incorrect passcode"

326msgstr ""

334msgstr ""

327

335

@@ -330,30 +338,30 @@ msgstr ""

330msgid "Enter %1"

338msgid "Enter %1"

331msgstr ""

339msgstr ""

332

340

333−#: qml/Shell.qml:328

341+#: qml/Shell.qml:349

334#, qt-format

342#, qt-format

335msgid "Sorry, incorrect %1"

343msgid "Sorry, incorrect %1"

336msgstr ""

344msgstr ""

337

345

338−#: qml/Shell.qml:363

346+#: qml/Shell.qml:384

339msgid "Sorry, incorrect passphrase."

347msgid "Sorry, incorrect passphrase."

340msgstr ""

348msgstr ""

341

349

342−#: qml/Shell.qml:364

350+#: qml/Shell.qml:385

343msgid "Sorry, incorrect passcode."

351msgid "Sorry, incorrect passcode."

344msgstr ""

352msgstr ""

345

353

346−#: qml/Shell.qml:365

354+#: qml/Shell.qml:386

347msgid "This will be your last attempt."

355msgid "This will be your last attempt."

348msgstr ""

356msgstr ""

349

357

350−#: qml/Shell.qml:367

358+#: qml/Shell.qml:388

351msgid ""

359msgid ""

352"If passphrase is entered incorrectly, your phone will conduct a factory "

360"If passphrase is entered incorrectly, your phone will conduct a factory "

353"reset and all personal data will be deleted."

361"reset and all personal data will be deleted."

354msgstr ""

362msgstr ""

355

363

356−#: qml/Shell.qml:368

364+#: qml/Shell.qml:389

357msgid ""

365msgid ""

358"If passcode is entered incorrectly, your phone will conduct a factory reset "

366"If passcode is entered incorrectly, your phone will conduct a factory reset "

359"and all personal data will be deleted."

367"and all personal data will be deleted."

@@ -368,6 +376,3 @@ msgstr ""

368

376

369#~ msgid "Swipe to unlock"

377#~ msgid "Swipe to unlock"

370#~ msgstr "滑动解锁"

378#~ msgstr "滑动解锁"

371−

372−#~ msgid "Manage Dash"

373−#~ msgstr "管理 Dash"

po/zh_HK.po+21−13

@@ -7,7 +7,7 @@ msgid ""

7msgstr ""

8"Project-Id-Version: unity8\n"

9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10−"POT-Creation-Date: 2014-10-02 10:35+0200\n"

10+"POT-Creation-Date: 2014-10-03 08:13-0400\n"

11"PO-Revision-Date: 2014-08-10 11:45+0000\n"

12"Last-Translator: Daniel Cheung <daniel.2345@hotmail.com>\n"

13"Language-Team: Chinese (Hong Kong) <zh_HK@li.org>\n"

@@ -15,7 +15,7 @@ msgstr ""

15"Content-Type: text/plain; charset=UTF-8\n"

16"Content-Transfer-Encoding: 8bit\n"

17"Plural-Forms: nplurals=1; plural=0;\n"

18−"X-Launchpad-Export-Date: 2014-10-03 06:22+0000\n"

18+"X-Launchpad-Export-Date: 2014-10-07 06:59+0000\n"

19"X-Generator: Launchpad (build 17196)\n"

20

21#: plugins/LightDM/Greeter.cpp:130

@@ -152,15 +152,15 @@ msgid ""

152"phone Tap on the screen to start"

153msgstr "您現在已熟練邊緣手勢，可以開始使用手機了 輕觸螢幕開始使用"

154

155−#: qml/Components/Lockscreen.qml:206

155+#: qml/Components/Lockscreen.qml:218

156msgid "Emergency Call"

157msgstr "緊急電話"

158

159−#: qml/Components/Lockscreen.qml:226

159+#: qml/Components/Lockscreen.qml:250

160msgid "OK"

161msgstr "確定"

162

163−#: qml/Dash/GenericScopeView.qml:411 qml/Dash/GenericScopeView.qml:533

163+#: qml/Dash/GenericScopeView.qml:411 qml/Dash/GenericScopeView.qml:568

164msgid "See less"

165msgstr "縮減查看"

166

@@ -205,6 +205,14 @@ msgstr "新增評論"

205msgid "Send"

206msgstr "傳送"

207

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+

208#: qml/Dash/ScopesOverview.qml:206

216#: qml/Dash/ScopesOverview.qml:206

209msgid "Manage Scopes"

217msgid "Manage Scopes"

210msgstr ""

218msgstr ""

@@ -309,7 +317,7 @@ msgstr ""

309msgid "Enter passphrase"

317msgid "Enter passphrase"

310msgstr ""

318msgstr ""

311

319

312−#: qml/Shell.qml:321

320+#: qml/Shell.qml:341

313msgid "Sorry, incorrect passphrase"

321msgid "Sorry, incorrect passphrase"

314msgstr ""

322msgstr ""

315

323

@@ -321,7 +329,7 @@ msgstr ""

321msgid "Enter passcode"

329msgid "Enter passcode"

322msgstr ""

330msgstr ""

323

331

324−#: qml/Shell.qml:324

332+#: qml/Shell.qml:345

325msgid "Sorry, incorrect passcode"

333msgid "Sorry, incorrect passcode"

326msgstr ""

334msgstr ""

327

335

@@ -330,30 +338,30 @@ msgstr ""

330msgid "Enter %1"

338msgid "Enter %1"

331msgstr ""

339msgstr ""

332

340

333−#: qml/Shell.qml:328

341+#: qml/Shell.qml:349

334#, qt-format

342#, qt-format

335msgid "Sorry, incorrect %1"

343msgid "Sorry, incorrect %1"

336msgstr ""

344msgstr ""

337

345

338−#: qml/Shell.qml:363

346+#: qml/Shell.qml:384

339msgid "Sorry, incorrect passphrase."

347msgid "Sorry, incorrect passphrase."

340msgstr ""

348msgstr ""

341

349

342−#: qml/Shell.qml:364

350+#: qml/Shell.qml:385

343msgid "Sorry, incorrect passcode."

351msgid "Sorry, incorrect passcode."

344msgstr ""

352msgstr ""

345

353

346−#: qml/Shell.qml:365

354+#: qml/Shell.qml:386

347msgid "This will be your last attempt."

355msgid "This will be your last attempt."

348msgstr ""

356msgstr ""

349

357

350−#: qml/Shell.qml:367

358+#: qml/Shell.qml:388

351msgid ""

359msgid ""

352"If passphrase is entered incorrectly, your phone will conduct a factory "

360"If passphrase is entered incorrectly, your phone will conduct a factory "

353"reset and all personal data will be deleted."

361"reset and all personal data will be deleted."

354msgstr ""

362msgstr ""

355

363

356−#: qml/Shell.qml:368

364+#: qml/Shell.qml:389

357msgid ""

365msgid ""

358"If passcode is entered incorrectly, your phone will conduct a factory reset "

366"If passcode is entered incorrectly, your phone will conduct a factory reset "

359"and all personal data will be deleted."

367"and all personal data will be deleted."

po/zh_TW.po+32−28

@@ -7,7 +7,7 @@ msgid ""

7msgstr ""

8"Project-Id-Version: unity\n"

9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10−"POT-Creation-Date: 2014-10-02 10:35+0200\n"

10+"POT-Creation-Date: 2014-10-03 08:13-0400\n"

11"PO-Revision-Date: 2014-07-26 16:21+0000\n"

12"Last-Translator: Cheng-Chia Tseng <pswo10680@gmail.com>\n"

13"Language-Team: Chinese (Traditional) <zh_TW@li.org>\n"

@@ -15,7 +15,7 @@ msgstr ""

15"Content-Type: text/plain; charset=UTF-8\n"

16"Content-Transfer-Encoding: 8bit\n"

17"Plural-Forms: nplurals=1; plural=0;\n"

18−"X-Launchpad-Export-Date: 2014-10-03 06:22+0000\n"

18+"X-Launchpad-Export-Date: 2014-10-07 06:59+0000\n"

19"X-Generator: Launchpad (build 17196)\n"

20

21#: plugins/LightDM/Greeter.cpp:130

@@ -33,7 +33,7 @@ msgstr "取消捷徑釘選"

33

34#: qml/Components/DelayedLockscreen.qml:47

35msgid "Device Locked"

36−msgstr ""

36+msgstr "裝置已鎖定"

37

38#: qml/Components/DelayedLockscreen.qml:62

39msgid "You have been locked out due to too many failed passphrase attempts."

@@ -47,8 +47,7 @@ msgstr ""

47#, qt-format

48msgid "Please wait %1 minute and then try again…"

49msgid_plural "Please wait %1 minutes and then try again…"

50−msgstr[0] ""

50+msgstr[0] "請等候 %1 分鐘再試…"

51−msgstr[1] ""

52

51

53#: qml/Components/Dialogs.qml:70

52#: qml/Components/Dialogs.qml:70

54msgid "Log out"

53msgid "Log out"

@@ -100,7 +99,7 @@ msgstr "關閉電源"

100

99

101#: qml/Components/Dialogs.qml:157

100#: qml/Components/Dialogs.qml:157

102msgid "Restart"

101msgid "Restart"

103−msgstr ""

102+msgstr "重新啟動"

104

103

105#: qml/Components/Dialogs.qml:167

104#: qml/Components/Dialogs.qml:167

106msgid "Cancel"

105msgid "Cancel"

@@ -152,15 +151,15 @@ msgid ""

152"phone Tap on the screen to start"

151"phone Tap on the screen to start"

153msgstr "您現在已熟練邊緣手勢，可以開始使用手機了 輕觸螢幕開始使用"

152msgstr "您現在已熟練邊緣手勢，可以開始使用手機了 輕觸螢幕開始使用"

154

153

155−#: qml/Components/Lockscreen.qml:206

154+#: qml/Components/Lockscreen.qml:218

156msgid "Emergency Call"

155msgid "Emergency Call"

157msgstr "緊急通話"

156msgstr "緊急通話"

158

157

159−#: qml/Components/Lockscreen.qml:226

158+#: qml/Components/Lockscreen.qml:250

160msgid "OK"

159msgid "OK"

161msgstr "確定"

160msgstr "確定"

162

161

163−#: qml/Dash/GenericScopeView.qml:411 qml/Dash/GenericScopeView.qml:533

162+#: qml/Dash/GenericScopeView.qml:411 qml/Dash/GenericScopeView.qml:568

164msgid "See less"

163msgid "See less"

165msgstr "縮減查看"

164msgstr "縮減查看"

166

165

@@ -205,6 +204,14 @@ msgstr "新增評論"

205msgid "Send"

204msgid "Send"

206msgstr "發送"

205msgstr "發送"

207

206

207+#: qml/Dash/PullToRefreshScopeStyle.qml:55

208+msgid "Pull to refresh…"

209+msgstr ""

210+

211+#: qml/Dash/PullToRefreshScopeStyle.qml:60

212+msgid "Release to refresh…"

213+msgstr ""

214+

208#: qml/Dash/ScopesOverview.qml:206

215#: qml/Dash/ScopesOverview.qml:206

209msgid "Manage Scopes"

216msgid "Manage Scopes"

210msgstr ""

217msgstr ""

@@ -227,7 +234,7 @@ msgstr "全部"

227

234

228#: qml/Greeter/Greeter.qml:157

235#: qml/Greeter/Greeter.qml:157

229msgid "Unlock"

236msgid "Unlock"

230−msgstr ""

237+msgstr "解鎖"

231

238

232#: qml/Hud/HudParametrizedActionsPage.qml:139

239#: qml/Hud/HudParametrizedActionsPage.qml:139

233msgid "Confirm"

240msgid "Confirm"

@@ -307,57 +314,57 @@ msgstr "漫遊"

307

314

308#: qml/Shell.qml:340

315#: qml/Shell.qml:340

309msgid "Enter passphrase"

316msgid "Enter passphrase"

310−msgstr ""

317+msgstr "輸入密語"

311

318

312−#: qml/Shell.qml:321

319+#: qml/Shell.qml:341

313msgid "Sorry, incorrect passphrase"

320msgid "Sorry, incorrect passphrase"

314msgstr "抱歉，密語不對"

321msgstr "抱歉，密語不對"

315

322

316#: qml/Shell.qml:342

323#: qml/Shell.qml:342

317msgid "Please re-enter"

324msgid "Please re-enter"

318−msgstr ""

325+msgstr "請再輸入"

319

326

320#: qml/Shell.qml:344

327#: qml/Shell.qml:344

321msgid "Enter passcode"

328msgid "Enter passcode"

322−msgstr ""

329+msgstr "輸入 passcode"

323

330

324−#: qml/Shell.qml:324

331+#: qml/Shell.qml:345

325msgid "Sorry, incorrect passcode"

332msgid "Sorry, incorrect passcode"

326−msgstr "抱歉，密碼不對"

333+msgstr "抱歉，passcode 不對"

327

334

328#: qml/Shell.qml:348

335#: qml/Shell.qml:348

329#, qt-format

336#, qt-format

330msgid "Enter %1"

337msgid "Enter %1"

331−msgstr ""

338+msgstr "輸入 %1"

332

339

333−#: qml/Shell.qml:328

340+#: qml/Shell.qml:349

334#, qt-format

341#, qt-format

335msgid "Sorry, incorrect %1"

342msgid "Sorry, incorrect %1"

336msgstr "抱歉，%1不對"

343msgstr "抱歉，%1不對"

337

344

338−#: qml/Shell.qml:363

345+#: qml/Shell.qml:384

339msgid "Sorry, incorrect passphrase."

346msgid "Sorry, incorrect passphrase."

340msgstr "抱歉，密語不對"

347msgstr "抱歉，密語不對"

341

348

342−#: qml/Shell.qml:364

349+#: qml/Shell.qml:385

343msgid "Sorry, incorrect passcode."

350msgid "Sorry, incorrect passcode."

344−msgstr "抱歉，密碼不對。"

351+msgstr "抱歉，passcode 不對。"

345

352

346−#: qml/Shell.qml:365

353+#: qml/Shell.qml:386

347msgid "This will be your last attempt."

354msgid "This will be your last attempt."

348msgstr "這將會是您最後一次嘗試的機會。"

355msgstr "這將會是您最後一次嘗試的機會。"

349

356

350−#: qml/Shell.qml:367

357+#: qml/Shell.qml:388

351msgid ""

358msgid ""

352"If passphrase is entered incorrectly, your phone will conduct a factory "

359"If passphrase is entered incorrectly, your phone will conduct a factory "

353"reset and all personal data will be deleted."

360"reset and all personal data will be deleted."

354msgstr "如輸入的密語不對，本電話會進行重設，所有個人資料都會刪除。"

361msgstr "如輸入的密語不對，本電話會進行重設，所有個人資料都會刪除。"

355

362

356−#: qml/Shell.qml:368

363+#: qml/Shell.qml:389

357msgid ""

364msgid ""

358"If passcode is entered incorrectly, your phone will conduct a factory reset "

365"If passcode is entered incorrectly, your phone will conduct a factory reset "

359"and all personal data will be deleted."

366"and all personal data will be deleted."

360−msgstr "如輸入的密碼不對，本電話會進行重設，所有個人資料都會刪除。"

367+msgstr "如輸入的 passcode 不對，本電話會進行重設，所有個人資料都會刪除。"

361

368

362#, qt-format

369#, qt-format

363#~ msgid "Hello %1"

370#~ msgid "Hello %1"

@@ -379,9 +386,6 @@ msgstr "如輸入的密碼不對，本電話會進行重設，所有個人資料

379#~ msgid "Too many incorrect attempts"

386#~ msgid "Too many incorrect attempts"

380#~ msgstr "錯得太多次"

387#~ msgstr "錯得太多次"

381

388

382−#~ msgid "Manage Dash"

383−#~ msgstr "管理 Dash"

384−

385#~ msgid "Enter your passphrase"

389#~ msgid "Enter your passphrase"

386#~ msgstr "輸入密語"

390#~ msgstr "輸入密語"

387

391

qml/Components/LazyImage.qml+1

@@ -37,6 +37,7 @@ Item {

37 property alias horizontalAlignment: image.horizontalAlignment

38 property alias verticalAlignment: image.verticalAlignment

39 property alias sourceImage: image

40+ property alias borderSource: shape.borderSource

40

41

41 state: "default"

42 state: "default"

42

43

qml/Components/ResponsiveGridView.qml+5−1

@@ -34,7 +34,11 @@ Item {

34 readonly property int cellWidth: gridView.cellWidth

35 readonly property int cellHeight: gridView.cellHeight

36 readonly property int totalContentHeight: {

37+ if (gridView.model) {

37− return contentHeightForRows(Math.ceil(gridView.model.count / columns), cellHeight)

38+ return contentHeightForRows(Math.ceil(gridView.model.count / columns), cellHeight)

39+ } else {

40+ return 0;

41+ }

38 }

42 }

39 property alias interactive: gridView.interactive

43 property alias interactive: gridView.interactive

40 readonly property alias flicking: gridView.flicking

44 readonly property alias flicking: gridView.flicking

qml/Dash/CardGrid.qml+2−1

@@ -55,6 +55,7 @@ DashRenderer {

55 delegate: Item {

56 width: grid.cellWidth

57 height: grid.cellHeight

58+ visible: y + height >= root.visibleRangeBegin && y <= root.visibleRangeEnd

58 Loader {

59 Loader {

59 id: loader

60 id: loader

60 sourceComponent: cardTool.cardComponent

61 sourceComponent: cardTool.cardComponent

@@ -68,7 +69,7 @@ DashRenderer {

68 item.cardData = Qt.binding(function() { return model; });

69 item.cardData = Qt.binding(function() { return model; });

69 item.template = Qt.binding(function() { return cardTool.template; });

70 item.template = Qt.binding(function() { return cardTool.template; });

70 item.components = Qt.binding(function() { return cardTool.components; });

71 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; });

72 item.scopeStyle = root.scopeStyle;

73 item.scopeStyle = root.scopeStyle;

73 }

74 }

74 Connections {

75 Connections {

qml/Dash/CardHorizontalList.qml+1−1

@@ -49,7 +49,7 @@ DashRenderer {

49 item.cardData = Qt.binding(function() { return model; });

50 item.template = Qt.binding(function() { return cardTool.template; });

51 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; });

53 item.scopeStyle = root.scopeStyle;

54 }

55 Connections {

qml/Dash/CardTool.qml+26−18

@@ -131,21 +131,26 @@ Item {

131 property size artShapeSize: cardLoader.item ? cardLoader.item.artShapeSize : 0

132

133 /*!

134− \brief Desired alignment of header components.

134+ \brief Desired alignment of title

135 */

136− readonly property int headerAlignment: {

136+ readonly property int titleAlignment: {

137− var subtitle = components["subtitle"];

137+ if (template["card-layout"] === "horizontal"

138− var price = components["price"];

138+ || (typeof components["title"] !== "object" &&

139− var summary = components["summary"];

139+ components["title"]["align"] !== "center")) return Text.AlignLeft;

140−

140+

141− var hasSubtitle = subtitle && (typeof subtitle === "string" || subtitle["field"])

141+ var keys = ["mascot", "emblem", "subtitle", "attributes", "summary"];

142− var hasPrice = price && (typeof price === "string" || subtitle["field"]);

142+

143− var hasSummary = summary && (typeof summary === "string" || summary["field"])

143+ for (var key in keys) {

144−

144+ key = keys[key];

145− var isOnlyTextComponent = !hasSubtitle && !hasPrice && !hasSummary;

145+ try {

146− if (!isOnlyTextComponent) return Text.AlignLeft;

146+ if (typeof components[key] === "string"

147+ || typeof components[key]["field"] === "string") return Text.AlignLeft;

148+ } catch (e) {

149+ continue;

150+ }

151+ }

147

152

148− return (template["card-layout"] === "horizontal") ? Text.AlignLeft : Text.AlignHCenter;

153+ return Text.AlignHCenter;

149 }

154 }

150

155

151 QtObject {

156 QtObject {

@@ -169,16 +174,19 @@ Item {

169

174

170 Item {

175 Item {

171 id: attributesModel

176 id: attributesModel

172− property int numOfAttributes: {

177+ property int numOfAttributes: 0

178+ property var model: []

179+ property bool hasAttributes: {

173 var attributes = components["attributes"];

180 var attributes = components["attributes"];

174− if ((attributes != undefined) && attributes["field"]) {

181+ var hasAttributesFlag = (attributes != undefined) && attributes["field"];

182+

183+ if (hasAttributesFlag) {

175 if (attributes["max-count"]) {

184 if (attributes["max-count"]) {

176− return attributes["max-count"];

185+ numOfAttributes = attributes["max-count"];

177 }

186 }

178 }

187 }

179− return 0;

188+ return hasAttributesFlag

180 }

189 }

181− property var model: []

182

190

183 onNumOfAttributesChanged: {

191 onNumOfAttributesChanged: {

184 model = []

192 model = []

qml/Dash/CardVerticalJournal.qml+2−1

@@ -49,6 +49,7 @@ DashRenderer {

49 id: loader

50 sourceComponent: cardTool.cardComponent

51 width: cardTool.cardWidth

52+ visible: y + height >= root.visibleRangeBegin && y <= root.visibleRangeEnd

52 onLoaded: {

53 onLoaded: {

53 item.objectName = "delegate" + index;

54 item.objectName = "delegate" + index;

54 item.fixedArtShapeSize = Qt.binding(function() { return cardTool.artShapeSize; });

55 item.fixedArtShapeSize = Qt.binding(function() { return cardTool.artShapeSize; });

@@ -56,7 +57,7 @@ DashRenderer {

56 item.cardData = Qt.binding(function() { return model; });

57 item.cardData = Qt.binding(function() { return model; });

57 item.template = Qt.binding(function() { return cardTool.template; });

58 item.template = Qt.binding(function() { return cardTool.template; });

58 item.components = Qt.binding(function() { return cardTool.components; });

59 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; });

60 item.scopeStyle = root.scopeStyle;

61 item.scopeStyle = root.scopeStyle;

61 }

62 }

62 Connections {

63 Connections {

qml/Dash/DashContent.qml+3

@@ -111,6 +111,8 @@ Item {

111 highlightMoveDuration: 250

112 highlightRangeMode: ListView.StrictlyEnforceRange

113 // 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

114 cacheBuffer: 1073741823

116 cacheBuffer: 1073741823

115 onMovementStarted: currentItem.item.showHeader();

117 onMovementStarted: currentItem.item.showHeader();

116 clip: parent.x != 0

118 clip: parent.x != 0

@@ -177,6 +179,7 @@ Item {

177 dashContent.scopeLoaded(item.scope.id)

179 dashContent.scopeLoaded(item.scope.id)

178 item.paginationCount = Qt.binding(function() { return dashContentList.count } )

180 item.paginationCount = Qt.binding(function() { return dashContentList.count } )

179 item.paginationIndex = Qt.binding(function() { return dashContentList.currentIndex } )

181 item.paginationIndex = Qt.binding(function() { return dashContentList.currentIndex } )

182+ item.holdingList = dashContentList;

180 }

183 }

181 Connections {

184 Connections {

182 target: isCurrent ? scope : null

185 target: isCurrent ? scope : null

qml/Dash/DashNavigation.qml+1

@@ -52,6 +52,7 @@ Item {

52

53 Rectangle {

54 id: blackRect

55+ objectName: "blackRect"

55 color: "black"

56 color: "black"

56 opacity: openList && openList.currentItem && openList.currentItem.visible ? 0.5 : 0

57 opacity: openList && openList.currentItem && openList.currentItem.visible ? 0.5 : 0

57 Behavior on opacity { UbuntuNumberAnimation { duration: UbuntuAnimation.SnapDuration } }

58 Behavior on opacity { UbuntuNumberAnimation { duration: UbuntuAnimation.SnapDuration } }

qml/Dash/DashRenderer.qml+4

@@ -27,6 +27,10 @@ Item {

27

28 property int displayMarginEnd: 0

29

30+ property int visibleRangeBegin: 0

31+

32+ property int visibleRangeEnd: 0

33+

30 property real originY: 0

34 property real originY: 0

31

35

32 // The model to renderer

36 // The model to renderer

qml/Dash/GenericScopeView.qml+71−13

@@ -15,7 +15,7 @@

15 */

16

17import QtQuick 2.0

18−import Ubuntu.Components 0.1

18+import Ubuntu.Components 1.1

19import Utils 0.1

20import Unity 0.2

21import Dash 0.1

@@ -38,6 +38,7 @@ FocusScope {

38 property int paginationCount: 0

39 property int paginationIndex: 0

40 property alias pageHeaderTotallyVisible: categoryView.pageHeaderTotallyVisible

41+ property var holdingList: null

41

42

42 property var scopeStyle: ScopeStyle {

43 property var scopeStyle: ScopeStyle {

43 style: scope ? scope.customizations : {}

44 style: scope ? scope.customizations : {}

@@ -251,8 +252,8 @@ FocusScope {

251 }

252 }

253 }

253

254

254− onHeightChanged: rendererLoader.updateDelegateCreationRange();

255+ onHeightChanged: rendererLoader.updateRanges();

255− onYChanged: rendererLoader.updateDelegateCreationRange();

256+ onYChanged: rendererLoader.updateRanges();

256

257

257 Loader {

258 Loader {

258 id: rendererLoader

259 id: rendererLoader

@@ -314,7 +315,7 @@ FocusScope {

314 var shouldExpand = baseItem.category === categoryView.expandedCategoryId;

315 var shouldExpand = baseItem.category === categoryView.expandedCategoryId;

315 baseItem.expand(shouldExpand, false /*animate*/);

316 baseItem.expand(shouldExpand, false /*animate*/);

316 }

317 }

317− updateDelegateCreationRange();

318+ updateRanges();

318 if (scope && scope.id === "clickscope" && (categoryId === "predefined" || categoryId === "local")) {

319 if (scope && scope.id === "clickscope" && (categoryId === "predefined" || categoryId === "local")) {

319 // Yeah, hackish :/

320 // Yeah, hackish :/

320 cardTool.artShapeSize = Qt.size(units.gu(8), units.gu(7.5));

321 cardTool.artShapeSize = Qt.size(units.gu(8), units.gu(7.5));

@@ -348,13 +349,25 @@ FocusScope {

348 }

349 }

349 Connections {

350 Connections {

350 target: categoryView

351 target: categoryView

351− onOriginYChanged: rendererLoader.updateDelegateCreationRange();

352+ onOriginYChanged: rendererLoader.updateRanges();

352− onContentYChanged: rendererLoader.updateDelegateCreationRange();

353+ onContentYChanged: rendererLoader.updateRanges();

353− onHeightChanged: rendererLoader.updateDelegateCreationRange();

354+ onHeightChanged: rendererLoader.updateRanges();

354− onContentHeightChanged: rendererLoader.updateDelegateCreationRange();

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();

355 }

364 }

356

365

357− function updateDelegateCreationRange() {

366+ function updateRanges() {

367+ if (holdingList && holdingList.moving) {

368+ return;

369+ }

370+

358 if (categoryView.moving) {

371 if (categoryView.moving) {

359 // Do not update the range if we are overshooting up or down, since we'll come back

372 // Do not update the range if we are overshooting up or down, since we'll come back

360 // to the stable position and delete/create items without any reason

373 // to the stable position and delete/create items without any reason

@@ -366,10 +379,20 @@ FocusScope {

366 }

379 }

367 }

380 }

368

381

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+

369 if (item && item.hasOwnProperty("displayMarginBeginning")) {

387 if (item && item.hasOwnProperty("displayMarginBeginning")) {

370 // TODO do we need item.originY here, test 1300302 once we have a silo

388 // TODO do we need item.originY here, test 1300302 once we have a silo

371 // and we can run it on the phone

389 // and we can run it on the phone

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;

372− if (baseItem.y + baseItem.height <= 0) {

395+ } else if (baseItem.y + baseItem.height <= 0) {

373 // Not visible (item at top of the list viewport)

396 // Not visible (item at top of the list viewport)

374 item.displayMarginBeginning = -baseItem.height;

397 item.displayMarginBeginning = -baseItem.height;

375 item.displayMarginEnd = 0;

398 item.displayMarginEnd = 0;

@@ -378,9 +401,9 @@ FocusScope {

378 item.displayMarginBeginning = 0;

401 item.displayMarginBeginning = 0;

379 item.displayMarginEnd = -baseItem.height;

402 item.displayMarginEnd = -baseItem.height;

380 } else {

403 } else {

381− item.displayMarginBeginning = -Math.max(-baseItem.y, 0);

404+ item.displayMarginBeginning = Math.round(-Math.max(-baseItem.y, 0));

382− item.displayMarginEnd = -Math.max(baseItem.height - seeAll.height

405+ item.displayMarginEnd = -Math.round(Math.max(baseItem.height - seeAll.height -

383− - categoryView.height + baseItem.y, 0)

406+ categoryView.height + baseItem.y, 0));

384 }

407 }

385 }

408 }

386 }

409 }

@@ -496,6 +519,41 @@ FocusScope {

496 }

519 }

497 }

520 }

498

521

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+

499 AbstractButton {

557 AbstractButton {

500 id: floatingSeeLess

558 id: floatingSeeLess

501 objectName: "floatingSeeLess"

559 objectName: "floatingSeeLess"

qml/Dash/Previews/PreviewHeader.qml+13

@@ -16,12 +16,14 @@

16

17import QtQuick 2.0

18import Ubuntu.Components 0.1

19+import Dash 0.1

19import "../"

20import "../"

20

21

21/*! This preview widget shows a header

22/*! This preview widget shows a header

22 * The title comes in widgetData["title"]

23 * The title comes in widgetData["title"]

23 * The mascot comes in widgetData["mascot"]

24 * The mascot comes in widgetData["mascot"]

24 * The subtitle comes in widgetData["subtitle"]

25 * The subtitle comes in widgetData["subtitle"]

26+ * The attributes comes in widgetData["attributes"]

25 */

27 */

26

28

27PreviewWidget {

29PreviewWidget {

@@ -35,6 +37,7 @@ PreviewWidget {

35 readonly property url mascot: root.widgetData["mascot"] || ""

37 readonly property url mascot: root.widgetData["mascot"] || ""

36 readonly property string title: root.widgetData["title"] || ""

38 readonly property string title: root.widgetData["title"] || ""

37 readonly property string subtitle: root.widgetData["subtitle"] || ""

39 readonly property string subtitle: root.widgetData["subtitle"] || ""

40+ readonly property var attributes: root.widgetData["attributes"] || null

38 readonly property color fontColor: root.scopeStyle ? root.scopeStyle.foreground : Theme.palette.normal.baseText

41 readonly property color fontColor: root.scopeStyle ? root.scopeStyle.foreground : Theme.palette.normal.baseText

39

42

40 implicitHeight: row.height + row.margins * 2

43 implicitHeight: row.height + row.margins * 2

@@ -114,6 +117,16 @@ PreviewWidget {

114 text: headerRoot.subtitle

117 text: headerRoot.subtitle

115 }

118 }

116 }

119 }

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+ }

117 }

130 }

118 }

131 }

119 }

132 }

qml/Dash/Previews/PreviewImageGallery.qml+121−18

@@ -26,8 +26,11 @@ PreviewWidget {

26 id: root

27 implicitHeight: units.gu(22)

28

29+ property Item rootItem: QuickUtils.rootItem(root)

30+

29 ListView {

31 ListView {

30 id: previewImageListView

32 id: previewImageListView

33+ objectName: "previewImageListView"

31 spacing: units.gu(1)

34 spacing: units.gu(1)

32 anchors.fill: parent

35 anchors.fill: parent

33 orientation: ListView.Horizontal

36 orientation: ListView.Horizontal

@@ -35,24 +38,6 @@ PreviewWidget {

35 model: root.widgetData["sources"]

38 model: root.widgetData["sources"]

36 clip: true

39 clip: true

37

40

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−

56 LazyImage {

41 LazyImage {

57 objectName: "placeholderScreenshot"

42 objectName: "placeholderScreenshot"

58 anchors {

43 anchors {

@@ -66,6 +51,7 @@ PreviewWidget {

66 }

51 }

67

52

68 delegate: LazyImage {

53 delegate: LazyImage {

54+ objectName: "previewImage" + index

69 anchors {

55 anchors {

70 top: parent.top

56 top: parent.top

71 bottom: parent.bottom

57 bottom: parent.bottom

@@ -73,6 +59,123 @@ PreviewWidget {

73 source: modelData ? modelData : ""

59 source: modelData ? modelData : ""

74 scaleTo: "height"

60 scaleTo: "height"

75 initialWidth: units.gu(13)

61 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+ }

76 }

179 }

77 }

180 }

78}

181}

qml/Dash/PullToRefreshScopeStyle.qmlnew file+82

@@ -0,0 +1,82 @@

1+/*

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

20ListViewWithPageHeader {

21 maximumFlickVelocity: height * 10

22 flickDeceleration: height * 2

23+ cacheBuffer: Number.MAX_VALUE

23}

24}

qml/Dash/ScopeSettingsPage.qml+1

@@ -49,6 +49,7 @@ Item {

49 right: parent.right

50 }

51 model: root.scope ? root.scope.settings : null

52+ clip: true

52

53

53 delegate: ScopeSettingsWidgetFactory {

54 delegate: ScopeSettingsWidgetFactory {

54 objectName: "scopeSettingItem" + index

55 objectName: "scopeSettingItem" + index

qml/Dash/ScopesOverviewAll.qml+2

@@ -43,6 +43,8 @@ Flickable {

43 id: cardGrid

44 width: root.width

45 height: parent.height

46+ visibleRangeBegin: root.contentY

47+ visibleRangeEnd: root.contentY + root.height

46

48

47 onClicked: {

49 onClicked: {

48 root.clicked(index, result, item, itemModel);

50 root.clicked(index, result, item, itemModel);

qml/Dash/ScopesOverviewFavorites.qml+1−1

@@ -61,7 +61,7 @@ Flickable {

61 item.cardData = Qt.binding(function() { return model; });

62 item.template = Qt.binding(function() { return cardTool.template; });

63 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; });

65 }

66

67 Connections {

qml/Launcher/Launcher.qml+1

@@ -92,6 +92,7 @@ Item {

92 // machine and switch to the final state in the next event loop run

93 Timer {

94 id: animateTimer

95+ objectName: "animateTimer"

95 interval: 1

96 interval: 1

96 property string nextState: ""

97 property string nextState: ""

97 onTriggered: {

98 onTriggered: {

qml/Shell.qml+8−6

@@ -128,6 +128,13 @@ Item {

128 objectName: "dashCommunicator"

129 }

130

131+ Binding {

132+ target: ApplicationManager

133+ property: "forceDashActive"

134+ value: launcher.shown || launcher.dashSwipe

135+ }

136+

137+

131 WindowKeysFilter {

138 WindowKeysFilter {

132 // Handle but do not filter out volume keys

139 // Handle but do not filter out volume keys

133 Keys.onVolumeUpPressed: { volumeControl.volumeUp(); event.accepted = false; }

140 Keys.onVolumeUpPressed: { volumeControl.volumeUp(); event.accepted = false; }

@@ -170,7 +177,6 @@ Item {

170 lockscreen.show();

177 lockscreen.show();

171 }

178 }

172 greeter.hide();

179 greeter.hide();

173− launcher.hide();

174 }

180 }

175

181

176 onFocusedApplicationIdChanged: {

182 onFocusedApplicationIdChanged: {

@@ -597,11 +603,7 @@ Item {

597 available: edgeDemo.launcherEnabled && (!shell.locked || AccountsService.enableLauncherWhileLocked) && greeter.fakeActiveForApp === ""

603 available: edgeDemo.launcherEnabled && (!shell.locked || AccountsService.enableLauncherWhileLocked) && greeter.fakeActiveForApp === ""

598

604

599 onShowDashHome: showHome()

605 onShowDashHome: showHome()

600− onDash: {

601− if (ApplicationManager.focusedApplicationId != "unity8-dash") {

602− showDash()

606+ onDash: showDash()

603− }

604− }

605 onDashSwipeChanged: {

607 onDashSwipeChanged: {

606 if (dashSwipe) {

608 if (dashSwipe) {

607 dash.setCurrentScope("clickscope", false, true)

609 dash.setCurrentScope("clickscope", false, true)

src/CMakeLists.txt+1

@@ -36,3 +36,4 @@ install(TARGETS ${SHELL_APP}

36

37add_subdirectory(Panel)

38add_subdirectory(Dash)

39+add_subdirectory(libunity8-private)

src/Dash/CMakeLists.txt+2

@@ -9,6 +9,8 @@ add_executable(unity8-dash ${DASH_SRCS})

9

10qt5_use_modules(unity8-dash Gui Qml Quick Test)

11

12+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fvisibility=hidden")

13+

12# install binaries

14# install binaries

13install(TARGETS ${DASH_APP}

15install(TARGETS ${DASH_APP}

14 RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}

16 RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}

src/Panel/CMakeLists.txt+2

@@ -1 +1,3 @@

1add_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+/*

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+/*

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):

66 return resp_grid.select_single('Tile', text=text)

67

68 def get_scope(self, scope_name='clickscope'):

69− return self.dash_content_list.select_single(

69+ return self.dash_content_list.wait_select_single(

70 'QQuickLoader', scopeId=scope_name)

71

72 @autopilot_logging.log_action(logger.info)

@@ -86,14 +86,14 @@ class Dash(emulators.UnityEmulatorBase):

86

87 def _get_scope_loader(self, scope_id):

88 try:

89− return self.dash_content_list.select_single(

89+ return self.dash_content_list.wait_select_single(

90 'QQuickLoader', scopeId=scope_id)

91 except dbus.StateNotFoundError:

92 raise emulators.UnityEmulatorException(

93 'No scope found with id {0}'.format(scope_id))

94

95 def _get_scope_from_loader(self, loader):

96− return loader.get_children()[0]

96+ return loader.wait_select_single('GenericScopeView');

97

98 def _open_scope_scrolling(self, scope_loader):

99 scroll = self._get_scroll_direction(scope_loader)

@@ -102,8 +102,8 @@ class Dash(emulators.UnityEmulatorBase):

102 scroll()

103 self.dash_content_list.moving.wait_for(False)

104

105+ scope_loader.isCurrent.wait_for(True)

105 scope = self._get_scope_from_loader(scope_loader)

106 scope = self._get_scope_from_loader(scope_loader)

106− scope.isCurrent.wait_for(True)

107 return scope

108

109 def _get_scroll_direction(self, scope_loader):

tests/mocks/Ubuntu/CMakeLists.txt+1

@@ -1,3 +1,4 @@

1+add_subdirectory(Connectivity)

1add_subdirectory(DownloadDaemonListener)

2add_subdirectory(DownloadDaemonListener)

2add_subdirectory(Payments)

3add_subdirectory(Payments)

3add_subdirectory(SystemImage)

4add_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+/*

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+/*

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+/*

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+/*

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()

43ApplicationManager::ApplicationManager(QObject *parent)

44 : ApplicationManagerInterface(parent)

45 , m_suspended(false)

46+ , m_forceDashActive(false)

46{

47{

47 m_roleNames.insert(RoleSession, "session");

48 m_roleNames.insert(RoleSession, "session");

48 m_roleNames.insert(RoleFullscreen, "fullscreen");

49 m_roleNames.insert(RoleFullscreen, "fullscreen");

@@ -292,6 +293,31 @@ void ApplicationManager::setSuspended(bool suspended)

292 Q_EMIT suspendedChanged();

293 Q_EMIT suspendedChanged();

293}

294}

294

295

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+

295bool ApplicationManager::focusApplication(const QString &appId)

321bool ApplicationManager::focusApplication(const QString &appId)

296{

322{

297 ApplicationInfo *application = findApplication(appId);

323 ApplicationInfo *application = findApplication(appId);

tests/mocks/Unity/Application/ApplicationManager.h+6−2

@@ -99,8 +99,11 @@ class ApplicationManager : public ApplicationManagerInterface {

99 Q_INVOKABLE bool stopApplication(const QString &appId) override;

100

101 QString focusedApplicationId() const override;

102− bool suspended() const;

102+ bool suspended() const override;

103− void setSuspended(bool suspended);

103+ void setSuspended(bool suspended) override;

104+

105+ bool forceDashActive() const override;

106+ void setForceDashActive(bool forceDashActive) override;

104

107

105 // Only for testing

108 // Only for testing

106 Q_INVOKABLE QStringList availableApplications();

109 Q_INVOKABLE QStringList availableApplications();

@@ -124,6 +127,7 @@ class ApplicationManager : public ApplicationManagerInterface {

124 void buildListOfAvailableApplications();

127 void buildListOfAvailableApplications();

125 void onWindowCreated();

128 void onWindowCreated();

126 bool m_suspended;

129 bool m_suspended;

130+ bool m_forceDashActive;

127 QList<ApplicationInfo*> m_runningApplications;

131 QList<ApplicationInfo*> m_runningApplications;

128 QList<ApplicationInfo*> m_availableApplications;

132 QList<ApplicationInfo*> m_availableApplications;

129 QTimer m_windowCreatedTimer;

133 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)

2

3set(FakeUnityApplicationQml_SOURCES

4 plugin.cpp

tests/mocks/Unity/Indicators/fakeunitymenumodelcache.cppnew file+60

@@ -0,0 +1,60 @@

1+/*

3+ *

4+ * This program is free software; you can redistribute it and/or modify

5+ * it under the terms of the GNU Lesser 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 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+ * Nick Dedekind <nick.dedekind@canonical.com>

18+ */

19+

20+#include "fakeunitymenumodelcache.h"

21+#include <unitymenumodel.h>

22+

23+FakeUnityMenuModelCache* FakeUnityMenuModelCache::theFakeCache = nullptr;

24+

25+FakeUnityMenuModelCache* FakeUnityMenuModelCache::singleton()

26+{

27+ if (!theFakeCache) {

28+ theFakeCache = new FakeUnityMenuModelCache();

29+ }

30+ return theFakeCache;

31+}

32+

33+FakeUnityMenuModelCache::FakeUnityMenuModelCache(QObject* parent)

34+ : UnityMenuModelCache(parent)

35+{

36+}

37+

38+QSharedPointer<UnityMenuModel> FakeUnityMenuModelCache::model(const QByteArray& bus,

39+ const QByteArray& path,

40+ const QVariantMap& actions)

41+{

42+ return UnityMenuModelCache::singleton()->model(bus, path, actions);

43+}

44+

45+bool FakeUnityMenuModelCache::contains(const QByteArray& path)

46+{

47+ return UnityMenuModelCache::singleton()->contains(path);

48+}

49+

50+void FakeUnityMenuModelCache::setCachedModelData(const QByteArray& bus,

51+ const QByteArray& path,

52+ const QVariantMap& actions,

53+ const QVariant& data)

54+{

55+ // keep a ref forever!

56+ if (!m_models.contains(path)) {

57+ m_models[path] = model(bus, path, actions);

58+ }

59+ m_models[path]->setModelData(data);

60+}

tests/mocks/Unity/Indicators/fakeunitymenumodelcache.hnew file+53

@@ -0,0 +1,53 @@

1+/*

3+ *

4+ * This program is free software; you can redistribute it and/or modify

5+ * it under the terms of the GNU Lesser 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 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+ * Nick Dedekind <nick.dedekind@canonical.com>

18+ */

19+

20+#ifndef FAKEUNITYMENUMODELCACHE_H

21+#define FAKEUNITYMENUMODELCACHE_H

22+

23+#include "unitymenumodelcache.h"

24+

25+#include <QHash>

26+#include <QVariantMap>

27+

28+class FakeUnityMenuModelCache : public UnityMenuModelCache

29+{

30+ Q_OBJECT

31+public:

32+ FakeUnityMenuModelCache(QObject* parent = nullptr);

33+

34+ static FakeUnityMenuModelCache* singleton();

35+

36+ QSharedPointer<UnityMenuModel> model(const QByteArray& bus,

37+ const QByteArray& path,

38+ const QVariantMap& actions) override;

39+ bool contains(const QByteArray& path) override;

40+

41+

42+

43+ Q_INVOKABLE void setCachedModelData(const QByteArray& bus,

44+ const QByteArray& path,

45+ const QVariantMap& actions,

46+ const QVariant& data = QVariant());

47+

48+private:

49+ static FakeUnityMenuModelCache* theFakeCache;

50+ QHash<QByteArray, QSharedPointer<UnityMenuModel>> m_models;

51+};

52+

53+#endif // FAKEUNITYMENUMODELCACHE_H

tests/mocks/Unity/fake_scope.cpp+1−1

@@ -266,7 +266,7 @@ QVariantMap Scope::customizations() const

266

267void Scope::refresh()

268{

269− qDebug() << "Scope::refresh is currently not implmented in the fake scopes plugin";

269+ Q_EMIT refreshed();

270}

271

272unity::shell::scopes::NavigationInterface* Scope::getNavigation(const QString& id)

tests/mocks/Unity/fake_scope.h+3

@@ -79,6 +79,9 @@ public:

79

80 Q_INVOKABLE void refresh() override;

81

82+Q_SIGNALS:

83+ void refreshed(); // This is not in the Interface, here for testing benefits

84+

82protected:

85protected:

83

86

84 QString m_id;

87 QString m_id;

tests/plugins/Dash/CMakeLists.txt+3−3

@@ -32,7 +32,7 @@ macro(add_lvwph_test FILENAME TESTNAME)

32 qt5_use_modules(${TESTNAME}TestExec Test Core Qml)

33 target_link_libraries(${TESTNAME}TestExec ${Qt5Gui_LIBRARIES} ${Qt5Quick_LIBRARIES})

34

35− add_binary_qml_test(${TESTNAME} "" "Dash-qml")

35+ add_binary_qml_test(${TESTNAME} "" "Dash-qml" "")

36endmacro()

37

38add_lvwph_test(listviewwithpageheader ListViewWithPageHeader)

@@ -48,7 +48,7 @@ macro(add_dashview_try_test FILENAME TESTNAME)

48 qt5_use_modules(${TESTNAME}TestExec Test Core Qml)

49 target_link_libraries(${TESTNAME}TestExec ${Qt5Gui_LIBRARIES} ${Qt5Quick_LIBRARIES})

50

51− add_binary_qml_test(${TESTNAME} "" "Dash-qml")

51+ add_binary_qml_test(${TESTNAME} "" "Dash-qml" "")

52

53 add_executable(${TESTNAME}tryExec

54 ${FILENAME}try.cpp

@@ -71,7 +71,7 @@ add_dashview_try_test(organicgrid OrganicGrid)

71add_executable(CardCreatorTestExec cardcreatortest.cpp)

72qt5_use_modules(CardCreatorTestExec Test Core Qml)

73target_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/")

75

76# plain qml test

77set(qmltest_DEFAULT_TARGETS qmluitests)

tests/plugins/Dash/cardcreator/1.res+7−6

@@ -6,7 +6,7 @@ AbstractButton {

6 property var artShapeBorderSource: undefined;

7 property real fontScale: 1.0;

8 property var scopeStyle: null;

9− property int headerAlignment: Text.AlignLeft;

9+ property int titleAlignment: Text.AlignLeft;

10 property int fixedHeaderHeight: -1;

11 property size fixedArtShapeSize: Qt.size(-1, -1);

12 readonly property string title: cardData && cardData["title"] || "";

@@ -44,12 +44,13 @@ Item {

44 height = Qt.binding(function() { return image.status !== Image.Ready ? 0 : image.height });

45 }

46 }

47− image: Image {

47+ image: CroppedImageMinimumSourceSize {

48 objectName: "artImage";

49+ property bool doLoadSource: !NetworkingStatus.limitedBandwith;

49− source: cardData && cardData["art"] || "";

50+ source: { if (root.visible) doLoadSource = true; return doLoadSource && cardData && cardData["art"] || ""; }

50 cache: true;

51 cache: true;

51 asynchronous: root.asynchronous;

52 asynchronous: root.asynchronous;

52− fillMode: Image.PreserveAspectCrop;

53+ visible: false;

53 width: root.width;

54 width: root.width;

54 height: width / artShape.aspect;

55 height: width / artShape.aspect;

55 }

56 }

@@ -73,8 +74,8 @@ Label {

73 color: root.scopeStyle ? root.scopeStyle.foreground : Theme.palette.normal.baseText;

74 color: root.scopeStyle ? root.scopeStyle.foreground : Theme.palette.normal.baseText;

74 visible: showHeader ;

75 visible: showHeader ;

75 text: root.title;

76 text: root.title;

76− font.weight: components && components["subtitle"] ? Font.DemiBold : Font.Normal;

77+ font.weight: cardData && cardData["subtitle"] ? Font.DemiBold : Font.Normal;

77− horizontalAlignment: root.headerAlignment;

78+ horizontalAlignment: root.titleAlignment;

78 }

79 }

79UbuntuShape {

80UbuntuShape {

80 id: touchdown;

81 id: touchdown;

tests/plugins/Dash/cardcreator/2.res+8−11

@@ -6,7 +6,7 @@ AbstractButton {

6 property var artShapeBorderSource: undefined;

7 property real fontScale: 1.0;

8 property var scopeStyle: null;

9− property int headerAlignment: Text.AlignLeft;

9+ property int titleAlignment: Text.AlignLeft;

10 property int fixedHeaderHeight: -1;

11 property size fixedArtShapeSize: Qt.size(-1, -1);

12 readonly property string title: cardData && cardData["title"] || "";

@@ -62,19 +62,17 @@ Row {

62 anchors.margins: margins;

63 anchors.rightMargin: 0;

64 data: [

65−Image {

65+CroppedImageMinimumSourceSize {

66 id: mascotImage;

67 objectName: "mascotImage";

68 anchors { verticalCenter: parent.verticalCenter; }

69− readonly property int maxSize: Math.max(width, height) * 4;

69+ property bool doLoadSource: !NetworkingStatus.limitedBandwith;

70− source: cardData && cardData["mascot"] || "";

70+ source: { if (root.visible) doLoadSource = true; return doLoadSource && cardData && cardData["mascot"] || ""; }

71 width: units.gu(6);

72 height: units.gu(5.625);

73− sourceSize { width: maxSize; height: maxSize }

74− fillMode: Image.PreserveAspectCrop;

75 horizontalAlignment: Image.AlignHCenter;

73 horizontalAlignment: Image.AlignHCenter;

76 verticalAlignment: Image.AlignVCenter;

74 verticalAlignment: Image.AlignVCenter;

77− visible: showHeader;

75+ visible: showHeader && resized;

78 }

76 }

79,Item {

77,Item {

80 id: headerTitleContainer;

78 id: headerTitleContainer;

@@ -97,8 +95,8 @@ Image {

97 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");

95 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");

98 visible: showHeader ;

96 visible: showHeader ;

99 text: root.title;

97 text: root.title;

100− font.weight: components && components["subtitle"] ? Font.DemiBold : Font.Normal;

98+ font.weight: cardData && cardData["subtitle"] ? Font.DemiBold : Font.Normal;

101− horizontalAlignment: root.headerAlignment;

99+ horizontalAlignment: root.titleAlignment;

102 }

100 }

103 ,Label {

101 ,Label {

104 id: subtitleLabel;

102 id: subtitleLabel;

@@ -110,13 +108,12 @@ Image {

110 }

108 }

111 anchors.topMargin: units.dp(2);

109 anchors.topMargin: units.dp(2);

112 elide: Text.ElideRight;

110 elide: Text.ElideRight;

113− fontSize: "small";

111+ fontSize: "x-small";

114 font.pixelSize: Math.round(FontUtils.sizeToPixels(fontSize) * fontScale);

112 font.pixelSize: Math.round(FontUtils.sizeToPixels(fontSize) * fontScale);

115 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");

113 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");

116 visible: titleLabel.visible && titleLabel.text;

114 visible: titleLabel.visible && titleLabel.text;

117 text: cardData && cardData["subtitle"] || "";

115 text: cardData && cardData["subtitle"] || "";

118 font.weight: Font.Light;

116 font.weight: Font.Light;

119− horizontalAlignment: root.headerAlignment;

120 }

117 }

121

118

122 ]

119 ]

tests/plugins/Dash/cardcreator/3.res+9−9

@@ -6,7 +6,7 @@ AbstractButton {

6 property var artShapeBorderSource: undefined;

7 property real fontScale: 1.0;

8 property var scopeStyle: null;

9− property int headerAlignment: Text.AlignLeft;

9+ property int titleAlignment: Text.AlignLeft;

10 property int fixedHeaderHeight: -1;

11 property size fixedArtShapeSize: Qt.size(-1, -1);

12 readonly property string title: cardData && cardData["title"] || "";

@@ -44,12 +44,13 @@ Item {

44 height = Qt.binding(function() { return image.status !== Image.Ready ? 0 : image.height });

45 }

46 }

47− image: Image {

47+ image: CroppedImageMinimumSourceSize {

48 objectName: "artImage";

49+ property bool doLoadSource: !NetworkingStatus.limitedBandwith;

49− source: cardData && cardData["art"] || "";

50+ source: { if (root.visible) doLoadSource = true; return doLoadSource && cardData && cardData["art"] || ""; }

50− cache: true;

51+ cache: true;

51 asynchronous: root.asynchronous;

52 asynchronous: root.asynchronous;

52− fillMode: Image.PreserveAspectCrop;

53+ visible: false;

53 width: root.width;

54 width: root.width;

54 height: width / artShape.aspect;

55 height: width / artShape.aspect;

55 }

56 }

@@ -73,8 +74,8 @@ Label {

73 color: root.scopeStyle ? root.scopeStyle.foreground : Theme.palette.normal.baseText;

74 color: root.scopeStyle ? root.scopeStyle.foreground : Theme.palette.normal.baseText;

74 visible: showHeader ;

75 visible: showHeader ;

75 text: root.title;

76 text: root.title;

76− font.weight: components && components["subtitle"] ? Font.DemiBold : Font.Normal;

77+ font.weight: cardData && cardData["subtitle"] ? Font.DemiBold : Font.Normal;

77− horizontalAlignment: root.headerAlignment;

78+ horizontalAlignment: root.titleAlignment;

78 }

79 }

79Label {

80Label {

80 id: subtitleLabel;

81 id: subtitleLabel;

@@ -86,13 +87,12 @@ Label {

86 }

87 }

87 anchors.topMargin: units.dp(2);

88 anchors.topMargin: units.dp(2);

88 elide: Text.ElideRight;

89 elide: Text.ElideRight;

89− fontSize: "small";

90+ fontSize: "x-small";

90 font.pixelSize: Math.round(FontUtils.sizeToPixels(fontSize) * fontScale);

91 font.pixelSize: Math.round(FontUtils.sizeToPixels(fontSize) * fontScale);

91 color: root.scopeStyle ? root.scopeStyle.foreground : Theme.palette.normal.baseText;

92 color: root.scopeStyle ? root.scopeStyle.foreground : Theme.palette.normal.baseText;

92 visible: titleLabel.visible && titleLabel.text;

93 visible: titleLabel.visible && titleLabel.text;

93 text: cardData && cardData["subtitle"] || "";

94 text: cardData && cardData["subtitle"] || "";

94 font.weight: Font.Light;

95 font.weight: Font.Light;

95− horizontalAlignment: root.headerAlignment;

96 }

97UbuntuShape {

98 id: touchdown;

tests/plugins/Dash/cardcreator/4.res+8−11

@@ -6,7 +6,7 @@ AbstractButton {

6 property var artShapeBorderSource: undefined;

7 property real fontScale: 1.0;

8 property var scopeStyle: null;

9− property int headerAlignment: Text.AlignLeft;

9+ property int titleAlignment: Text.AlignLeft;

10 property int fixedHeaderHeight: -1;

11 property size fixedArtShapeSize: Qt.size(-1, -1);

12 readonly property string title: cardData && cardData["title"] || "";

@@ -41,16 +41,14 @@ Loader {

41 anchors { verticalCenter: parent.verticalCenter; }

42 }

43

44−,Image {

44+,CroppedImageMinimumSourceSize {

45 id: mascotImage;

46 objectName: "mascotImage";

47 anchors { verticalCenter: parent.verticalCenter; }

48− readonly property int maxSize: Math.max(width, height) * 4;

48+ property bool doLoadSource: !NetworkingStatus.limitedBandwith;

49− source: cardData && cardData["mascot"] || "";

49+ source: { if (root.visible) doLoadSource = true; return doLoadSource && cardData && cardData["mascot"] || ""; }

50− width: units.gu(6);

50+ width: units.gu(6);

51 height: units.gu(5.625);

52− sourceSize { width: maxSize; height: maxSize }

53− fillMode: Image.PreserveAspectCrop;

54 horizontalAlignment: Image.AlignHCenter;

52 horizontalAlignment: Image.AlignHCenter;

55 verticalAlignment: Image.AlignVCenter;

53 verticalAlignment: Image.AlignVCenter;

56 visible: false;

54 visible: false;

@@ -77,8 +75,8 @@ Label {

77 color: root.scopeStyle ? root.scopeStyle.foreground : Theme.palette.normal.baseText;

75 color: root.scopeStyle ? root.scopeStyle.foreground : Theme.palette.normal.baseText;

78 visible: showHeader ;

76 visible: showHeader ;

79 text: root.title;

77 text: root.title;

80− font.weight: components && components["subtitle"] ? Font.DemiBold : Font.Normal;

78+ font.weight: cardData && cardData["subtitle"] ? Font.DemiBold : Font.Normal;

81− horizontalAlignment: root.headerAlignment;

79+ horizontalAlignment: root.titleAlignment;

82 }

80 }

83,Label {

81,Label {

84 id: subtitleLabel;

82 id: subtitleLabel;

@@ -90,13 +88,12 @@ Label {

90 }

88 }

91 anchors.topMargin: units.dp(2);

89 anchors.topMargin: units.dp(2);

92 elide: Text.ElideRight;

90 elide: Text.ElideRight;

93− fontSize: "small";

91+ fontSize: "x-small";

94 font.pixelSize: Math.round(FontUtils.sizeToPixels(fontSize) * fontScale);

92 font.pixelSize: Math.round(FontUtils.sizeToPixels(fontSize) * fontScale);

95 color: root.scopeStyle ? root.scopeStyle.foreground : Theme.palette.normal.baseText;

93 color: root.scopeStyle ? root.scopeStyle.foreground : Theme.palette.normal.baseText;

96 visible: titleLabel.visible && titleLabel.text;

94 visible: titleLabel.visible && titleLabel.text;

97 text: cardData && cardData["subtitle"] || "";

95 text: cardData && cardData["subtitle"] || "";

98 font.weight: Font.Light;

96 font.weight: Font.Light;

99− horizontalAlignment: root.headerAlignment;

100 }

97 }

101]

98]

102}

99}

tests/plugins/Dash/cardcreator/5.res+9−9

@@ -6,7 +6,7 @@ AbstractButton {

6 property var artShapeBorderSource: undefined;

7 property real fontScale: 1.0;

8 property var scopeStyle: null;

9− property int headerAlignment: Text.AlignLeft;

9+ property int titleAlignment: Text.AlignLeft;

10 property int fixedHeaderHeight: -1;

11 property size fixedArtShapeSize: Qt.size(-1, -1);

12 readonly property string title: cardData && cardData["title"] || "";

@@ -44,12 +44,13 @@ Item {

44 height = Qt.binding(function() { return image.status !== Image.Ready ? 0 : image.height });

45 }

46 }

47− image: Image {

47+ image: CroppedImageMinimumSourceSize {

48 objectName: "artImage";

49+ property bool doLoadSource: !NetworkingStatus.limitedBandwith;

49− source: cardData && cardData["art"] || "";

50+ source: { if (root.visible) doLoadSource = true; return doLoadSource && cardData && cardData["art"] || ""; }

50− cache: true;

51+ cache: true;

51 asynchronous: root.asynchronous;

52 asynchronous: root.asynchronous;

52− fillMode: Image.PreserveAspectCrop;

53+ visible: false;

53 width: root.width;

54 width: root.width;

54 height: width / artShape.aspect;

55 height: width / artShape.aspect;

55 }

56 }

@@ -117,8 +118,8 @@ Label {

117 color: root.scopeStyle && overlayLoader.item ? root.scopeStyle.getTextColor(overlayLoader.item.luminance) : (overlayLoader.item && overlayLoader.item.luminance > 0.7 ? Theme.palette.normal.baseText : "white");

118 color: root.scopeStyle && overlayLoader.item ? root.scopeStyle.getTextColor(overlayLoader.item.luminance) : (overlayLoader.item && overlayLoader.item.luminance > 0.7 ? Theme.palette.normal.baseText : "white");

118 visible: showHeader && overlayLoader.active;

119 visible: showHeader && overlayLoader.active;

119 text: root.title;

120 text: root.title;

120− font.weight: components && components["subtitle"] ? Font.DemiBold : Font.Normal;

121+ font.weight: cardData && cardData["subtitle"] ? Font.DemiBold : Font.Normal;

121− horizontalAlignment: root.headerAlignment;

122+ horizontalAlignment: root.titleAlignment;

122 }

123 }

123Label {

124Label {

124 id: subtitleLabel;

125 id: subtitleLabel;

@@ -131,13 +132,12 @@ Label {

131 }

132 }

132 anchors.topMargin: units.dp(2);

133 anchors.topMargin: units.dp(2);

133 elide: Text.ElideRight;

134 elide: Text.ElideRight;

134− fontSize: "small";

135+ fontSize: "x-small";

135 font.pixelSize: Math.round(FontUtils.sizeToPixels(fontSize) * fontScale);

136 font.pixelSize: Math.round(FontUtils.sizeToPixels(fontSize) * fontScale);

136 color: root.scopeStyle && overlayLoader.item ? root.scopeStyle.getTextColor(overlayLoader.item.luminance) : (overlayLoader.item && overlayLoader.item.luminance > 0.7 ? Theme.palette.normal.baseText : "white");

137 color: root.scopeStyle && overlayLoader.item ? root.scopeStyle.getTextColor(overlayLoader.item.luminance) : (overlayLoader.item && overlayLoader.item.luminance > 0.7 ? Theme.palette.normal.baseText : "white");

137 visible: titleLabel.visible && titleLabel.text;

138 visible: titleLabel.visible && titleLabel.text;

138 text: cardData && cardData["subtitle"] || "";

139 text: cardData && cardData["subtitle"] || "";

139 font.weight: Font.Light;

140 font.weight: Font.Light;

140− horizontalAlignment: root.headerAlignment;

141 }

142UbuntuShape {

143 id: touchdown;

tests/plugins/Dash/cardcreator/6.res+5−7

@@ -6,7 +6,7 @@ AbstractButton {

6 property var artShapeBorderSource: undefined;

7 property real fontScale: 1.0;

8 property var scopeStyle: null;

9− property int headerAlignment: Text.AlignLeft;

9+ property int titleAlignment: Text.AlignLeft;

10 property int fixedHeaderHeight: -1;

11 property size fixedArtShapeSize: Qt.size(-1, -1);

12 readonly property string title: cardData && cardData["title"] || "";

@@ -73,8 +73,8 @@ Item {

73 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");

74 visible: showHeader ;

75 text: root.title;

76− font.weight: components && components["subtitle"] ? Font.DemiBold : Font.Normal;

76+ font.weight: cardData && cardData["subtitle"] ? Font.DemiBold : Font.Normal;

77− horizontalAlignment: root.headerAlignment;

77+ horizontalAlignment: root.titleAlignment;

78 }

79,Label {

80 id: subtitleLabel;

@@ -86,15 +86,14 @@ Item {

86 }

87 anchors.topMargin: units.dp(2);

88 elide: Text.ElideRight;

89− fontSize: "small";

89+ fontSize: "x-small";

90 font.pixelSize: Math.round(FontUtils.sizeToPixels(fontSize) * fontScale);

91 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");

92 visible: titleLabel.visible && titleLabel.text;

93 text: cardData && cardData["subtitle"] || "";

94 font.weight: Font.Light;

95− horizontalAlignment: root.headerAlignment;

96 }

95 }

97−,Icon {

96+,StatusIcon {

98 id: emblemIcon;

97 id: emblemIcon;

99 objectName: "emblemIcon";

98 objectName: "emblemIcon";

100 anchors {

99 anchors {

@@ -104,7 +103,6 @@ Item {

104 }

103 }

105 source: cardData && cardData["emblem"] || "";

104 source: cardData && cardData["emblem"] || "";

106 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");

105 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;

108 height: source != "" ? titleLabel.font.pixelSize : 0;

106 height: source != "" ? titleLabel.font.pixelSize : 0;

109 }

107 }

110

108

tests/plugins/Dash/cardcreator/7.res+9−12

@@ -6,7 +6,7 @@ AbstractButton {

6 property var artShapeBorderSource: undefined;

7 property real fontScale: 1.0;

8 property var scopeStyle: null;

9− property int headerAlignment: Text.AlignLeft;

9+ property int titleAlignment: Text.AlignLeft;

10 property int fixedHeaderHeight: -1;

11 property size fixedArtShapeSize: Qt.size(-1, -1);

12 readonly property string title: cardData && cardData["title"] || "";

@@ -62,19 +62,17 @@ Row {

62 anchors.margins: margins;

63 anchors.rightMargin: 0;

64 data: [

65−Image {

65+CroppedImageMinimumSourceSize {

66 id: mascotImage;

67 objectName: "mascotImage";

68 anchors { verticalCenter: parent.verticalCenter; }

69− readonly property int maxSize: Math.max(width, height) * 4;

69+ property bool doLoadSource: !NetworkingStatus.limitedBandwith;

70− source: cardData && cardData["mascot"] || "";

70+ source: { if (root.visible) doLoadSource = true; return doLoadSource && cardData && cardData["mascot"] || ""; }

71− width: units.gu(6);

71+ width: units.gu(6);

72 height: units.gu(5.625);

73− sourceSize { width: maxSize; height: maxSize }

74− fillMode: Image.PreserveAspectCrop;

75 horizontalAlignment: Image.AlignHCenter;

73 horizontalAlignment: Image.AlignHCenter;

76 verticalAlignment: Image.AlignVCenter;

74 verticalAlignment: Image.AlignVCenter;

77− visible: showHeader;

75+ visible: showHeader && resized;

78 }

76 }

79

77

80,Item {

78,Item {

@@ -98,8 +96,8 @@ Image {

98 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");

96 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");

99 visible: showHeader ;

97 visible: showHeader ;

100 text: root.title;

98 text: root.title;

101− font.weight: components && components["subtitle"] ? Font.DemiBold : Font.Normal;

99+ font.weight: cardData && cardData["subtitle"] ? Font.DemiBold : Font.Normal;

102− horizontalAlignment: root.headerAlignment;

100+ horizontalAlignment: root.titleAlignment;

103 }

101 }

104,Label {

102,Label {

105 id: subtitleLabel;

103 id: subtitleLabel;

@@ -111,13 +109,12 @@ Image {

111 }

109 }

112 anchors.topMargin: units.dp(2);

110 anchors.topMargin: units.dp(2);

113 elide: Text.ElideRight;

111 elide: Text.ElideRight;

114− fontSize: "small";

112+ fontSize: "x-small";

115 font.pixelSize: Math.round(FontUtils.sizeToPixels(fontSize) * fontScale);

113 font.pixelSize: Math.round(FontUtils.sizeToPixels(fontSize) * fontScale);

116 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");

114 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");

117 visible: titleLabel.visible && titleLabel.text;

115 visible: titleLabel.visible && titleLabel.text;

118 text: cardData && cardData["subtitle"] || "";

116 text: cardData && cardData["subtitle"] || "";

119 font.weight: Font.Light;

117 font.weight: Font.Light;

120− horizontalAlignment: root.headerAlignment;

121 }

118 }

122,CardAttributes {

119,CardAttributes {

123 id: attributesRow;

120 id: attributesRow;

tests/plugins/Dash/listviewwithpageheadertest.cpp+39

@@ -28,6 +28,8 @@

28#include <private/qquickitem_p.h>

29#pragma GCC diagnostic pop

30

31+#include <limits>

32+

31// TODO Think on how doing a test for lost items

33// TODO Think on how doing a test for lost items

32// particullary making sure that lost items are culled

34// particullary making sure that lost items are culled

33// and then removed in the next updatePolish cycle

35// and then removed in the next updatePolish cycle

@@ -1899,6 +1901,43 @@ private Q_SLOTS:

1899 QTRY_COMPARE(lvwph->m_firstVisibleIndex, 0);

1901 QTRY_COMPARE(lvwph->m_firstVisibleIndex, 0);

1900 }

1902 }

1901

1903

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+

1902private:

1941private:

1903 QQuickView *view;

1942 QQuickView *view;

1904 ListViewWithPageHeader *lvwph;

1943 ListViewWithPageHeader *lvwph;

tests/plugins/Dash/listviewwithpageheadertest.qml+1

@@ -60,6 +60,7 @@ Rectangle {

60 anchors.top: parent.top

61 anchors.bottom: parent.bottom

62 model: model

63+ cacheBuffer: height * 0.5

63 delegate: Rectangle {

64 delegate: Rectangle {

64 property bool timerDone: false

65 property bool timerDone: false

65 width: parent.width - 20

66 width: parent.width - 20

tests/plugins/Dash/listviewwithpageheadertestsection.qml+1

@@ -60,6 +60,7 @@ Rectangle {

60 anchors.top: parent.top

61 anchors.bottom: parent.bottom

62 model: model

63+ cacheBuffer: height * 0.5

63 delegate: Rectangle {

64 delegate: Rectangle {

64 property bool timerDone: false

65 property bool timerDone: false

65 width: parent.width - 20

66 width: parent.width - 20

tests/plugins/Dash/listviewwithpageheadertestsectionexternalmodel.qml+1

@@ -28,6 +28,7 @@ Rectangle {

28 anchors.top: parent.top

29 anchors.bottom: parent.bottom

30 model: model

31+ cacheBuffer: height * 0.5

31 delegate: Rectangle {

32 delegate: Rectangle {

32 property bool timerDone: false

33 property bool timerDone: false

33 width: parent.width - 20

34 width: parent.width - 20

tests/plugins/Ubuntu/Gestures/CMakeLists.txt+1−1

@@ -19,7 +19,7 @@ macro(add_gesture_ui_test CLASSNAME)

19 qt5_use_modules(${CLASSNAME}TestExec Test Core Qml Gui Quick)

20 target_link_libraries(${CLASSNAME}TestExec UbuntuGestureQml)

21

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 "")

23 add_manual_qml_test(. ${CLASSNAME} IMPORT_PATHS ${CMAKE_BINARY_DIR}/plugins)

24endmacro(add_gesture_ui_test)

25

tests/plugins/Unity/Launcher/CMakeLists.txt+1−1

@@ -1,6 +1,6 @@

1pkg_check_modules(GSETTINGS_QT REQUIRED gsettings-qt)

2pkg_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)

4

5include_directories(

6 ${CMAKE_CURRENT_BINARY_DIR}

tests/plugins/Unity/Launcher/launchermodeltest.cpp+2

@@ -105,6 +105,8 @@ public:

105 bool requestFocusApplication(const QString &appId) { Q_UNUSED(appId); return true; }

106 bool suspended() const { return false; }

107 void setSuspended(bool) {}

108+ bool forceDashActive() const { return false; }

109+ void setForceDashActive(bool) {}

108

110

109private:

111private:

110 QList<MockApp*> m_list;

112 QList<MockApp*> m_list;

tests/qmltests/Components/CMakeLists.txt+1−1

@@ -10,7 +10,7 @@ add_executable(DragHandleTestExec tst_DragHandle.cpp)

10qt5_use_modules(DragHandleTestExec Test Core Qml Gui Quick)

11target_link_libraries(DragHandleTestExec UbuntuGestureQml)

12

13−add_binary_qml_test(DragHandle ${CMAKE_BINARY_DIR}/plugins/Ubuntu/Gestures "")

13+add_binary_qml_test(DragHandle ${CMAKE_BINARY_DIR}/plugins/Ubuntu/Gestures "" "")

14add_manual_qml_test(. DragHandle IMPORT_PATHS ${CMAKE_BINARY_DIR}/plugins)

15

16add_definitions(-DUBUNTU_GESTURES_PLUGIN_DIR="${CMAKE_BINARY_DIR}/plugins")

tests/qmltests/Dash/CardHelpers.js+1−12

@@ -16,7 +16,7 @@

16

17.pragma library

18

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"]

20

21var defaultLayout = ' \

22{ \

@@ -37,17 +37,6 @@ var defaultLayout = ' \

37 "overlayColor": null, \

38 "mascot": null, \

39 "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, \

51 "summary": null, \

40 "summary": null, \

52 "attributes": { "max-count": 2 } \

41 "attributes": { "max-count": 2 } \

53 }, \

42 }, \

tests/qmltests/Dash/Previews/tst_PreviewHeader.qml+4−2

@@ -27,13 +27,15 @@ Rectangle {

27 property var origHeaderjson: {

28 "title": "THE TITLE",

29 "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"}]

31 }

32 }

32

33

33 property var headerjson: {

34 property var headerjson: {

34 "title": "THE TITLE",

35 "title": "THE TITLE",

35 "subtitle": "Something catchy",

36 "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"}]

37 }

39 }

38

40

39 PreviewHeader {

41 PreviewHeader {

tests/qmltests/Dash/Previews/tst_PreviewImageGallery.qml+51−1

@@ -21,7 +21,7 @@ import Unity.Test 0.1 as UT

21

22Rectangle {

23 id: root

24− width: units.gu(60)

24+ width: units.gu(80)

25 height: units.gu(80)

26 color: "lightgrey"

27

@@ -44,13 +44,63 @@ Rectangle {

44 }

45

46 UT.UnityTestCase {

47+ id: testCase

47 name: "PreviewImageGalleryTest"

48 name: "PreviewImageGalleryTest"

48 when: windowShown

49 when: windowShown

49

50

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+

50 function test_changeEmptyModel() {

61 function test_changeEmptyModel() {

51 imageGallery.widgetData = sourcesModel0;

62 imageGallery.widgetData = sourcesModel0;

52 var placeholderScreenshot = findChild(imageGallery, "placeholderScreenshot");

63 var placeholderScreenshot = findChild(imageGallery, "placeholderScreenshot");

53 compare(placeholderScreenshot.visible, true);

64 compare(placeholderScreenshot.visible, true);

54 }

65 }

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+ }

55 }

105 }

56}

106}

tests/qmltests/Dash/tst_Card.qml+26

@@ -17,6 +17,7 @@

17import QtQuick 2.0

18import QtTest 1.0

19import Ubuntu.Components 0.1

20+import Ubuntu.Connectivity 1.0

20import Unity.Test 0.1 as UT

21import Unity.Test 0.1 as UT

21import "../../../qml/Dash"

22import "../../../qml/Dash"

22import "CardHelpers.js" as Helpers

23import "CardHelpers.js" as Helpers

@@ -205,6 +206,11 @@ Rectangle {

205 property Item backgroundImage: findChild(card, "backgroundImage")

206 property Item backgroundImage: findChild(card, "backgroundImage")

206 property Item mascotImage: findChild(card, "mascotImage");

207 property Item mascotImage: findChild(card, "mascotImage");

207

208

209+ function init() {

210+ loader.visible = true;

211+ NetworkingStatus.limitedBandwith = false;

212+ }

213+

208 function cleanup() {

214 function cleanup() {

209 selector.selectedIndex = -1;

215 selector.selectedIndex = -1;

210 }

216 }

@@ -566,5 +572,25 @@ Rectangle {

566 verify((card.width - titleToCard.x - titleToCard.width) === units.gu(1));

572 verify((card.width - titleToCard.x - titleToCard.width) === units.gu(1));

567 }

573 }

568 }

574 }

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+ }

569 }

595 }

570}

596}

tests/qmltests/Dash/tst_CardTool.qml+28−20

@@ -85,8 +85,8 @@ Rectangle {

85 "layout": { "template": { "card-layout": "vertical" }, "components": { "title": "title", "subtitle": "subtitle" } }

86 },

87 {

88− "name": "Title, price - horizontal",

88+ "name": "Title, attributes - horizontal",

89− "layout": { "template": { "card-layout": "horizontal" }, "components": { "title": "title", "price": "price" } }

89+ "layout": { "template": { "card-layout": "horizontal" }, "components": { "title": "title", "attributes": "attributes" } }

90 },

91 ]

92

@@ -100,6 +100,7 @@ Rectangle {

100 }

101

102 Column {

103+ id: column

103 width: units.gu(38)

104 width: units.gu(38)

104 anchors { left: parent.left; top: parent.top; margins: units.gu(1) }

105 anchors { left: parent.left; top: parent.top; margins: units.gu(1) }

105

106

@@ -111,7 +112,7 @@ Rectangle {

111 ]

112 ]

112

113

113 delegate: Row {

114 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) }

115

116

116 Label {

117 Label {

117 height: units.gu(5)

118 height: units.gu(5)

@@ -315,28 +316,35 @@ Rectangle {

315 }

316 }

317 }

317

318

318− function test_card_header_component_alignment_data() {

319+ function test_card_title_alignment_data() {

319 return [

320 return [

320− { tag: "Title - vertical", component: "titleLabel", property: "headerAlignment",

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 },

321− value: Text.AlignHCenter, index: 11, layout_index: 0 },

332+ { tag: "Title - vertical", value: Text.AlignHCenter, index: 11 },

322− { tag: "Title - horizontal", component: "titleLabel", property: "headerAlignment",

323− value: Text.AlignLeft, index: 12, layout_index: 0},

333+ { tag: "Title - horizontal", value: Text.AlignLeft, index: 12 },

324− { tag: "Title, subtitle - vertical", component: "titleLabel", property: "headerAlignment",

325− value: Text.AlignLeft, index: 13, layout_index: 0},

334+ { tag: "Title, subtitle - vertical", value: Text.AlignLeft, index: 13 },

326− { tag: "Title, price - horizontal", component: "titleLabel", property: "headerAlignment",

327− value: Text.AlignLeft, index: 14, layout_index: 0},

335+ { tag: "Title, attributes - horizontal", value: Text.AlignLeft, index: 14 },

328− ]

336+ ];

329 }

337 }

330

338

331− function test_card_header_component_alignment(data) {

339+ function test_card_title_alignment(data) {

332 selector.selectedIndex = data.index;

340 selector.selectedIndex = data.index;

333− if (data.hasOwnProperty("layout_index")) {

334− layoutSelector.selectedIndex = data.layout_index;

335− }

336

341

337− if (data.hasOwnProperty("property")) {

342+ tryCompare(cardTool, "titleAlignment", Text.AlignLeft);

338− tryCompare(cardTool, data.property, data.value);

343+

339− }

344+ cardTool.components['title'] = { "field": "title", "align": "center" };

345+ cardTool.componentsChanged();

346+

347+ tryCompare(cardTool, "titleAlignment", data.value);

340 }

348 }

341

349

342 function test_categoryLayout_data() {

350 function test_categoryLayout_data() {

tests/qmltests/Dash/tst_Dash.qml+16−39

@@ -55,6 +55,16 @@ Item {

55 scopes.load();

56 tryCompare(dashContentList, "currentIndex", 0);

57 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);

58 }

68 }

59

69

60 function get_scope_data() {

70 function get_scope_data() {

@@ -92,15 +102,6 @@ Item {

92 }

102 }

93

103

94 function test_dash_overview_show_select_same_favorite() {

104 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−

104 // Show the overview

105 // Show the overview

105 touchFlick(dash, dash.width / 2, dash.height - 1, dash.width / 2, dash.height - units.gu(18));

106 touchFlick(dash, dash.width / 2, dash.height - 1, dash.width / 2, dash.height - units.gu(18));

106 var overviewController = findInvisibleChild(dash, "overviewController");

107 var overviewController = findInvisibleChild(dash, "overviewController");

@@ -121,18 +122,12 @@ Item {

121

122

122 // Make sure animation went back

123 // Make sure animation went back

123 tryCompare(overviewController, "progress", 0);

124 tryCompare(overviewController, "progress", 0);

125+

126+ var dashContentList = findChild(dash, "dashContentList");

124 compare(dashContentList.currentIndex, 0);

127 compare(dashContentList.currentIndex, 0);

125 }

128 }

126

129

127 function test_dash_overview_show_select_different_favorite() {

130 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−

136 // Show the overview

131 // Show the overview

137 touchFlick(dash, dash.width / 2, dash.height - 1, dash.width / 2, dash.height - units.gu(18));

132 touchFlick(dash, dash.width / 2, dash.height - 1, dash.width / 2, dash.height - units.gu(18));

138 var overviewController = findInvisibleChild(dash, "overviewController");

133 var overviewController = findInvisibleChild(dash, "overviewController");

@@ -153,19 +148,11 @@ Item {

153

148

154 // Make sure animation went back

149 // Make sure animation went back

155 tryCompare(overviewController, "progress", 0);

150 tryCompare(overviewController, "progress", 0);

151+ var dashContentList = findChild(dash, "dashContentList");

156 compare(dashContentList.currentIndex, 1);

152 compare(dashContentList.currentIndex, 1);

157 }

153 }

158

154

159 function test_dash_overview_all_temp_scope_done_from_all() {

155 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−

169 // Show the overview

156 // Show the overview

170 touchFlick(dash, dash.width / 2, dash.height - 1, dash.width / 2, dash.height - units.gu(18));

157 touchFlick(dash, dash.width / 2, dash.height - 1, dash.width / 2, dash.height - units.gu(18));

171 var overviewController = findInvisibleChild(dash, "overviewController");

158 var overviewController = findInvisibleChild(dash, "overviewController");

@@ -227,20 +214,13 @@ Item {

227 tryCompare(overviewController, "progress", 0);

214 tryCompare(overviewController, "progress", 0);

228

215

229 // Original list is still on 0

216 // Original list is still on 0

217+ var dashContentList = findChild(dash, "dashContentList");

230 compare(dashContentList.currentIndex, 0);

218 compare(dashContentList.currentIndex, 0);

231 }

219 }

232

220

233 function test_temp_scope_dash_overview_all_search_temp_scope_favorite_from_all() {

221 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−

243 // Swipe right to Apps scope

222 // Swipe right to Apps scope

223+ var dashContentList = findChild(dash, "dashContentList");

244 touchFlick(dash, dash.width - 1, units.gu(1), dash.width - units.gu(10), units.gu(1));

224 touchFlick(dash, dash.width - 1, units.gu(1), dash.width - units.gu(10), units.gu(1));

245 tryCompare(dashContentList, "contentX", dashContentList.width);

225 tryCompare(dashContentList, "contentX", dashContentList.width);

246 tryCompare(dashContentList, "currentIndex", 1);

226 tryCompare(dashContentList, "currentIndex", 1);

@@ -249,8 +229,7 @@ Item {

249 var categoryListView = findChild(dashContentList.currentItem, "categoryListView");

229 var categoryListView = findChild(dashContentList.currentItem, "categoryListView");

250 var dashCategory2 = findChild(categoryListView, "dashCategory2");

230 var dashCategory2 = findChild(categoryListView, "dashCategory2");

251 tryCompareFunction(function() {

231 tryCompareFunction(function() {

252− var d = findChild(dashCategory2, "delegate2");

253− if (d) return true;

232+ if (dashCategory2.y < 200) return true;

254 categoryListView.contentY += 100;

233 categoryListView.contentY += 100;

255 return false;

234 return false;

256 }, true);

235 }, true);

@@ -340,8 +319,6 @@ Item {

340 }

319 }

341

320

342 function test_processing_indicator() {

321 function test_processing_indicator() {

343− tryCompare(scopes, "loaded", true);

344−

345 var processingIndicator = findChild(dash, "processingIndicator");

322 var processingIndicator = findChild(dash, "processingIndicator");

346 verify(processingIndicator, "Can't find the processing indicator.");

323 verify(processingIndicator, "Can't find the processing indicator.");

347

324

tests/qmltests/Dash/tst_DashContent.qml+14−1

@@ -70,7 +70,17 @@ Item {

70 function loadScopes() {

71 scopeLoadedSpy.clear();

72 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);

74 }

84 }

75

85

76 function init() {

86 function init() {

@@ -467,6 +477,9 @@ Item {

467 var navigationListView = findChild(dashAltNavigationButton, "navigationListView");

477 var navigationListView = findChild(dashAltNavigationButton, "navigationListView");

468 tryCompare(navigationListView.currentItem.navigation, "loaded", true);

478 tryCompare(navigationListView.currentItem.navigation, "loaded", true);

469

479

480+ var blackRect = findChild(dashNavigation, "blackRect");

481+ tryCompare(blackRect, "opacity", 0.5);

482+

470 mouseClick(dashNavigation, dashNavigationButton.x, 0);

483 mouseClick(dashNavigation, dashNavigationButton.x, 0);

471 compare(dashNavigationButton.showList, false);

484 compare(dashNavigationButton.showList, false);

472 compare(dashAltNavigationButton.showList, false);

485 compare(dashAltNavigationButton.showList, false);

tests/qmltests/Dash/tst_GenericScopeView.qml+28−6

@@ -82,18 +82,19 @@ Item {

82 spy.signalName = "";

83 }

84

85− function scrollToCategory(category) {

85+ function scrollToCategory(categoryName) {

86 var categoryListView = findChild(genericScopeView, "categoryListView");

87 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;

89 mouseFlick(genericScopeView, genericScopeView.width/2, genericScopeView.height,

90 mouseFlick(genericScopeView, genericScopeView.width/2, genericScopeView.height,

90 genericScopeView.width/2, genericScopeView.y)

91 genericScopeView.width/2, genericScopeView.y)

91 tryCompare(categoryListView, "moving", false);

92 tryCompare(categoryListView, "moving", false);

92− return findChild(genericScopeView, category) !== null;

93+ return false;

93 }, true);

94 }, true);

94

95

95 tryCompareFunction(function() { return findChild(genericScopeView, "delegate0") !== null; }, true);

96 tryCompareFunction(function() { return findChild(genericScopeView, "delegate0") !== null; }, true);

96− return findChild(genericScopeView, category);

97+ return findChild(genericScopeView, categoryName);

97 }

98 }

98

99

99 function scrollToEnd()

100 function scrollToEnd()

@@ -283,7 +284,7 @@ Item {

283 if (category === undefined) category = 0;

284 if (category === undefined) category = 0;

284 if (delegate === undefined) delegate = 0;

285 if (delegate === undefined) delegate = 0;

285 tryCompareFunction(function() {

286 tryCompareFunction(function() {

286− var cardGrid = findChild(genericScopeView, category);

287+ var cardGrid = findChild(genericScopeView, "dashCategory"+category);

287 if (cardGrid != null) {

288 if (cardGrid != null) {

288 var tile = findChild(cardGrid, "delegate"+delegate);

289 var tile = findChild(cardGrid, "delegate"+delegate);

289 return tile != null;

290 return tile != null;

@@ -291,7 +292,7 @@ Item {

291 return false;

292 return false;

292 },

293 },

293 true);

294 true);

294− var tile = findChild(findChild(genericScopeView, category), "delegate"+delegate);

295+ var tile = findChild(findChild(genericScopeView, "dashCategory"+category), "delegate"+delegate);

295 mouseClick(tile, tile.width / 2, tile.height / 2);

296 mouseClick(tile, tile.width / 2, tile.height / 2);

296 tryCompare(testCase.subPageLoader, "open", true);

297 tryCompare(testCase.subPageLoader, "open", true);

297 tryCompare(testCase.subPageLoader, "x", 0);

298 tryCompare(testCase.subPageLoader, "x", 0);

@@ -581,6 +582,27 @@ Item {

581

582

582 genericScopeView.scope = !genericScopeView.scope;

583 genericScopeView.scope = !genericScopeView.scope;

583 }

584 }

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+ }

584 }

606 }

585 }

607 }

586}

608}

tests/qmltests/tst_Shell.qml+4

@@ -198,6 +198,10 @@ Row {

198

199 var launcher = findChild(shell, "launcherPanel");

200 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");

201 }

205 }

202

206

203 function test_suspend() {

207 function test_suspend() {

tests/utils/modules/Unity/Test/UnityTestCase.qml+3−2

@@ -178,9 +178,10 @@ TestCase {

178 // Keeps executing a given parameter-less function until it returns the given

179 // expected result or the timemout is reached (in which case a test failure

180 // is generated)

181− function tryCompareFunction(func, expectedResult) {

181+ function tryCompareFunction(func, expectedResult, timeout) {

182 var timeSpent = 0

183+ if (timeout === undefined)

183− var timeout = 5000

184+ timeout = 5000;

184 var success = false

185 var success = false

185 var actualResult

186 var actualResult

186 while (timeSpent < timeout && !success) {

187 while (timeSpent < timeout && !success) {

tools/unlock-device+14−13

@@ -4,7 +4,7 @@

4# Our goal here is to get an Ubuntu Touch device into a testable unlocked state.

5# This will include a reboot.

6

7−WAIT_COMMAND="adb reboot; sleep 5; adb wait-for-device"

7+WAIT_COMMAND="adb reboot; sleep 5; adb wait-for-device; sleep 20"

8

9while getopts s:w: opt; do

10 case $opt in

@@ -19,16 +19,17 @@ done

19

20eval "$WAIT_COMMAND"

21

22−# Force a sleep no matter what, since we may need to wait for unity8

22+for i in `seq 1 5`; do

23−# to finish coming up (it's hard to tell when the greeter is actually rendered)

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'"

24−sleep 30

30+ sleep 20

31+ fi

32+done

25

33

26−# We need to go through sudo to get a proper environment for dbus set up

34+echo "I: Too many unlock failures, giving 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

35+exit 1

34−fi