92f2c7d · 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+55

@@ -1,3 +1,58 @@

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

2+

3+ [ Michael Zanetti ]

4+ * Dual SIM pin unlocking. Hook up the UI to the backend. (LP:

5+ #1267135)

6+

7+ [ Antti Kaijanmäki ]

8+ * Dual SIM pin unlocking. Hook up the UI to the backend. (LP:

9+ #1267135)

10+

11+ [ Ubuntu daily release ]

12+ * New rebuild forced

13+

14+ -- Ubuntu daily release <ps-jenkins@lists.canonical.com> Wed, 08 Oct 2014 09:41:32 +0000

15+

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

17+

18+ [ Andrea Cimitan ]

19+ * Tweak card header to match the spec

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

21+

22+ [ Michał Sawicz ]

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

24+ (LP: #1336724)

25+ * Tweak card header to match the spec

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

27+

28+ [ Ying-Chun Liu ]

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

30+

31+ [ Albert Astals ]

32+ * Update pot

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

34+ (LP: #1336724)

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

36+ * Clip the settings list

37+ * Fix unlocking from the left again

38+ * Add wait_ makes tests more reliable

39+

40+ [ Michael Zanetti ]

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

42+ minimizing an app.

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

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

45+

46+ [ Michael Terry ]

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

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

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

50+

51+ [ CI bot ]

52+ * Resync trunk

53+

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

55+

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

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

2

57

3 [ Alexandros Frantzis ]

58 [ Alexandros Frantzis ]

debian/control+1

@@ -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=5)

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+33−53

@@ -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-07 11:37+0300\n"

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

11+"PO-Revision-Date: 2014-10-08 00:48+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-05 06:38+0000\n"

18+"X-Launchpad-Export-Date: 2014-10-09 06:36+0000\n"

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

20

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

@@ -155,23 +155,23 @@ msgid ""

155msgstr ""

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

157

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

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

159msgid "Emergency Call"

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

161

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

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

163msgid "OK"

164msgstr "እሺ"

165

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

166+#: qml/Dash/GenericScopeView.qml:434 qml/Dash/GenericScopeView.qml:591

167msgid "See less"

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

169

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

170+#: qml/Dash/GenericScopeView.qml:434

171msgid "See all"

172msgstr "ሁሉንም መመልከቻ"

173

174−#: qml/Dash/GenericScopeView.qml:473 qml/Dash/PageHeader.qml:258

174+#: qml/Dash/GenericScopeView.qml:496 qml/Dash/PageHeader.qml:258

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

176msgid "Search"

177msgstr "መፈለጊያ"

@@ -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 "የ ክልል አስተዳዳሪ"

@@ -252,18 +260,10 @@ msgstr "አሁን ይናገሩ..."

252msgid "Speaking..."

260msgid "Speaking..."

253msgstr "በመናገር ላይ..."

261msgstr "በመናገር ላይ..."

254

262

255−#: qml/Notifications/NotificationMenuItemFactory.qml:108

263+#: qml/Notifications/NotificationMenuItemFactory.qml:116

256msgid "Show password"

264msgid "Show password"

257msgstr "የመግቢያ ቃል ማሳያ"

265msgstr "የመግቢያ ቃል ማሳያ"

258

266

259−#: qml/Notifications/NotificationMenuItemFactory.qml:124

260−msgid "Enter SIM PIN"

261−msgstr "ሲም ፒን ያስገቡ"

262−

263−#: qml/Notifications/NotificationMenuItemFactory.qml:125

264−msgid "Sorry, incorrect PIN"

265−msgstr "አዝናለሁ የተሳሳተ ፒን"

266−

267#: qml/Panel/ActiveCallHint.qml:77

268msgid "Tap to return to call..."

269msgstr "ወደ ጥሪው ለመመለስ መታ ያድርጉ..."

@@ -308,49 +308,49 @@ msgstr "ሲም መክፈቻ"

308msgid "Roaming"

309msgstr "ማዘዋወሪያ"

310

311−#: qml/Shell.qml:340

311+#: qml/Shell.qml:346

312msgid "Enter passphrase"

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

314

315−#: qml/Shell.qml:321

315+#: qml/Shell.qml:347

316msgid "Sorry, incorrect passphrase"

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

318

319−#: qml/Shell.qml:342

319+#: qml/Shell.qml:348

320msgid "Please re-enter"

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

322

323−#: qml/Shell.qml:344

323+#: qml/Shell.qml:350

324msgid "Enter passcode"

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

326

327−#: qml/Shell.qml:324

327+#: qml/Shell.qml:351

328msgid "Sorry, incorrect passcode"

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

330

331−#: qml/Shell.qml:348

331+#: qml/Shell.qml:354

332#, qt-format

333msgid "Enter %1"

334msgstr "ማስገቢያ %1"

335

336−#: qml/Shell.qml:328

336+#: qml/Shell.qml:355

337#, qt-format

338msgid "Sorry, incorrect %1"

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

340

341−#: qml/Shell.qml:363

341+#: qml/Shell.qml:390

342msgid "Sorry, incorrect passphrase."

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

344

345−#: qml/Shell.qml:364

345+#: qml/Shell.qml:391

346msgid "Sorry, incorrect passcode."

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

348

349−#: qml/Shell.qml:365

349+#: qml/Shell.qml:392

350msgid "This will be your last attempt."

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

352

353−#: qml/Shell.qml:367

353+#: qml/Shell.qml:394

354msgid ""

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

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

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

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

359"ይጠፋል"

360

361−#: qml/Shell.qml:368

361+#: qml/Shell.qml:395

362msgid ""

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

364"and all personal data will be deleted."

@@ -366,28 +366,8 @@ msgstr ""

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

367"ይጠፋል"

368

369−#, qt-format

369+#~ msgid "Sorry, incorrect PIN"

370−#~ msgid "Hello %1"

370+#~ msgstr "አዝናለሁ የተሳሳተ ፒን"

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

372−

373−#~ msgid "Hello"

374−#~ msgstr "ሰላም"

375−

376−#~ msgid "Swipe to unlock"

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

378−

379−#~ msgid "Please wait"

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

381−

382−#~ msgid "Too many incorrect attempts"

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

384−

385−#, qt-format

386−#~ msgid "Enter your %1"

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

388−

389−#~ msgid "Enter your passphrase"

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

391

371

392−#~ msgid "Enter your passcode"

372+#~ msgid "Enter SIM PIN"

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

373+#~ msgstr "ሲም ፒን ያስገቡ"

po/ar.po+28−38

@@ -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-07 11:37+0300\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-09 06:36+0000\n"

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

21

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

@@ -156,23 +156,23 @@ msgstr ""

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

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

158

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

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

160msgid "Emergency Call"

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

162

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

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

164msgid "OK"

165msgstr ""

166

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

167+#: qml/Dash/GenericScopeView.qml:434 qml/Dash/GenericScopeView.qml:591

168msgid "See less"

169msgstr "شاهد أقل"

170

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

171+#: qml/Dash/GenericScopeView.qml:434

172msgid "See all"

173msgstr ""

174

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

175+#: qml/Dash/GenericScopeView.qml:496 qml/Dash/PageHeader.qml:258

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

177msgid "Search"

178msgstr "ابحث"

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

@@ -253,18 +261,10 @@ msgstr "تكلم الآن..."

253msgid "Speaking..."

261msgid "Speaking..."

254msgstr "تتكلم الآن..."

262msgstr "تتكلم الآن..."

255

263

256−#: qml/Notifications/NotificationMenuItemFactory.qml:108

264+#: qml/Notifications/NotificationMenuItemFactory.qml:116

257msgid "Show password"

265msgid "Show password"

258msgstr "عرض كلمة السر"

266msgstr "عرض كلمة السر"

259

267

260−#: qml/Notifications/NotificationMenuItemFactory.qml:124

261−msgid "Enter SIM PIN"

262−msgstr ""

263−

264−#: qml/Notifications/NotificationMenuItemFactory.qml:125

265−msgid "Sorry, incorrect PIN"

266−msgstr ""

267−

268#: qml/Panel/ActiveCallHint.qml:77

269msgid "Tap to return to call..."

270msgstr ""

@@ -309,66 +309,56 @@ msgstr ""

309msgid "Roaming"

310msgstr ""

311

312−#: qml/Shell.qml:340

312+#: qml/Shell.qml:346

313msgid "Enter passphrase"

314msgstr ""

315

316−#: qml/Shell.qml:321

316+#: qml/Shell.qml:347

317msgid "Sorry, incorrect passphrase"

318msgstr ""

319

320−#: qml/Shell.qml:342

320+#: qml/Shell.qml:348

321msgid "Please re-enter"

322msgstr ""

323

324−#: qml/Shell.qml:344

324+#: qml/Shell.qml:350

325msgid "Enter passcode"

326msgstr ""

327

328−#: qml/Shell.qml:324

328+#: qml/Shell.qml:351

329msgid "Sorry, incorrect passcode"

330msgstr ""

331

332−#: qml/Shell.qml:348

332+#: qml/Shell.qml:354

333#, qt-format

334msgid "Enter %1"

335msgstr ""

336

337−#: qml/Shell.qml:328

337+#: qml/Shell.qml:355

338#, qt-format

339msgid "Sorry, incorrect %1"

340msgstr ""

341

342−#: qml/Shell.qml:363

342+#: qml/Shell.qml:390

343msgid "Sorry, incorrect passphrase."

344msgstr ""

345

346−#: qml/Shell.qml:364

346+#: qml/Shell.qml:391

347msgid "Sorry, incorrect passcode."

348msgstr ""

349

350−#: qml/Shell.qml:365

350+#: qml/Shell.qml:392

351msgid "This will be your last attempt."

352msgstr ""

353

354−#: qml/Shell.qml:367

354+#: qml/Shell.qml:394

355msgid ""

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

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

358msgstr ""

359

360−#: qml/Shell.qml:368

360+#: qml/Shell.qml:395

361msgid ""

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

363"and all personal data will be deleted."

364msgstr ""

365−

366−#, qt-format

367−#~ msgid "Hello %1"

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

369−

370−#~ msgid "Hello"

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

372−

373−#~ msgid "Swipe to unlock"

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

po/ast.po+32−52

@@ -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-07 11:37+0300\n"

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

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

13"Language-Team: Asturian <ast@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-04 06:28+0000\n"

18+"X-Launchpad-Export-Date: 2014-10-09 06:36+0000\n"

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

20

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

@@ -158,23 +158,23 @@ 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:220

162msgid "Emergency Call"

163msgstr "Llamada d'emerxencia"

164

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

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

166msgid "OK"

167msgstr "Aceutar"

168

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

169+#: qml/Dash/GenericScopeView.qml:434 qml/Dash/GenericScopeView.qml:591

170msgid "See less"

171msgstr "Ver menos"

172

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

173+#: qml/Dash/GenericScopeView.qml:434

174msgid "See all"

175msgstr "Ver too"

176

177−#: qml/Dash/GenericScopeView.qml:473 qml/Dash/PageHeader.qml:258

177+#: qml/Dash/GenericScopeView.qml:496 qml/Dash/PageHeader.qml:258

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

179msgid "Search"

180msgstr "Guetar"

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

@@ -255,18 +263,10 @@ msgstr "Fala agora…"

255msgid "Speaking..."

263msgid "Speaking..."

256msgstr "Falando…"

264msgstr "Falando…"

257

265

258−#: qml/Notifications/NotificationMenuItemFactory.qml:108

266+#: qml/Notifications/NotificationMenuItemFactory.qml:116

259msgid "Show password"

267msgid "Show password"

260msgstr "Amosar contraseña"

268msgstr "Amosar contraseña"

261

269

262−#: qml/Notifications/NotificationMenuItemFactory.qml:124

263−msgid "Enter SIM PIN"

264−msgstr "Escribi'l PIN de la SIM"

265−

266−#: qml/Notifications/NotificationMenuItemFactory.qml:125

267−msgid "Sorry, incorrect PIN"

268−msgstr "PIN incorreutu"

269−

270#: qml/Panel/ActiveCallHint.qml:77

271msgid "Tap to return to call..."

272msgstr "Tocar pa tornar a la llamada..."

@@ -311,49 +311,49 @@ msgstr "Desbloquiar SIM"

311msgid "Roaming"

312msgstr "Roaming"

313

314−#: qml/Shell.qml:340

314+#: qml/Shell.qml:346

315msgid "Enter passphrase"

316msgstr ""

317

318−#: qml/Shell.qml:321

318+#: qml/Shell.qml:347

319msgid "Sorry, incorrect passphrase"

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

321

322−#: qml/Shell.qml:342

322+#: qml/Shell.qml:348

323msgid "Please re-enter"

324msgstr "Vuelvi a escribila"

325

326−#: qml/Shell.qml:344

326+#: qml/Shell.qml:350

327msgid "Enter passcode"

328msgstr ""

329

330−#: qml/Shell.qml:324

330+#: qml/Shell.qml:351

331msgid "Sorry, incorrect passcode"

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

333

334−#: qml/Shell.qml:348

334+#: qml/Shell.qml:354

335#, qt-format

336msgid "Enter %1"

337msgstr "Escribi %1"

338

339−#: qml/Shell.qml:328

339+#: qml/Shell.qml:355

340#, qt-format

341msgid "Sorry, incorrect %1"

342msgstr "Sentímoslo, %1 incorreutu"

343

344−#: qml/Shell.qml:363

344+#: qml/Shell.qml:390

345msgid "Sorry, incorrect passphrase."

346msgstr "Fras de pasu incorreuta"

347

348−#: qml/Shell.qml:364

348+#: qml/Shell.qml:391

349msgid "Sorry, incorrect passcode."

350msgstr "Códigu de pasu incorreutu"

351

352−#: qml/Shell.qml:365

352+#: qml/Shell.qml:392

353msgid "This will be your last attempt."

354msgstr "Esti ye'l caberu intentu."

355

356−#: qml/Shell.qml:367

356+#: qml/Shell.qml:394

357msgid ""

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

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

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

361"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."

363

364−#: qml/Shell.qml:368

364+#: qml/Shell.qml:395

365msgid ""

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

367"and all personal data will be deleted."

@@ -369,28 +369,8 @@ msgstr ""

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

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

371

372−#~ msgid "Hello"

372+#~ msgid "Sorry, incorrect PIN"

373−#~ msgstr "Hola"

373+#~ msgstr "PIN incorreutu"

374−

375−#, qt-format

376−#~ msgid "Hello %1"

377−#~ msgstr "Hola %1"

378−

379−#~ msgid "Swipe to unlock"

380−#~ msgstr "Esliza pa desbloquiar"

381−

382−#~ msgid "Please wait"

383−#~ msgstr "Espera un segundu"

384−

385−#, qt-format

386−#~ msgid "Enter your %1"

387−#~ msgstr "Introduz %1"

388−

389−#~ msgid "Enter your passphrase"

390−#~ msgstr "Introduz contraseña"

391−

392−#~ msgid "Enter your passcode"

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

394

374

395−#~ msgid "Too many incorrect attempts"

375+#~ msgid "Enter SIM PIN"

396−#~ msgstr "Munchos intentos incorreutos"

376+#~ msgstr "Escribi'l PIN de la SIM"

po/az.po+32−49

@@ -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-07 11:37+0300\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-09 06:36+0000\n"

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

20

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

@@ -155,23 +155,23 @@ 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:220

159msgid "Emergency Call"

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

161

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

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

163msgid "OK"

164msgstr "Oldu"

165

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

166+#: qml/Dash/GenericScopeView.qml:434 qml/Dash/GenericScopeView.qml:591

167msgid "See less"

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

169

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

170+#: qml/Dash/GenericScopeView.qml:434

171msgid "See all"

172msgstr "Hamısını gör"

173

174−#: qml/Dash/GenericScopeView.qml:473 qml/Dash/PageHeader.qml:258

174+#: qml/Dash/GenericScopeView.qml:496 qml/Dash/PageHeader.qml:258

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

176msgid "Search"

177msgstr "Axtar"

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

@@ -252,18 +260,10 @@ msgstr "Danışın..."

252msgid "Speaking..."

260msgid "Speaking..."

253msgstr "Danışır..."

261msgstr "Danışır..."

254

262

255−#: qml/Notifications/NotificationMenuItemFactory.qml:108

263+#: qml/Notifications/NotificationMenuItemFactory.qml:116

256msgid "Show password"

264msgid "Show password"

257msgstr "Şifrәni göstәr"

265msgstr "Şifrәni göstәr"

258

266

259−#: qml/Notifications/NotificationMenuItemFactory.qml:124

260−msgid "Enter SIM PIN"

261−msgstr "SIM PIN kodunuzu daxil edin"

262−

263−#: qml/Notifications/NotificationMenuItemFactory.qml:125

264−msgid "Sorry, incorrect PIN"

265−msgstr "Bağışlayın, PIN yanlışdır"

266−

267#: qml/Panel/ActiveCallHint.qml:77

268msgid "Tap to return to call..."

269msgstr "Zəngə qayıtmaq üçün toxunun..."

@@ -308,49 +308,49 @@ msgstr "SIM kilidini aç"

308msgid "Roaming"

309msgstr "Rominq"

310

311−#: qml/Shell.qml:340

311+#: qml/Shell.qml:346

312msgid "Enter passphrase"

313msgstr ""

314

315−#: qml/Shell.qml:321

315+#: qml/Shell.qml:347

316msgid "Sorry, incorrect passphrase"

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

318

319−#: qml/Shell.qml:342

319+#: qml/Shell.qml:348

320msgid "Please re-enter"

321msgstr ""

322

323−#: qml/Shell.qml:344

323+#: qml/Shell.qml:350

324msgid "Enter passcode"

325msgstr ""

326

327−#: qml/Shell.qml:324

327+#: qml/Shell.qml:351

328msgid "Sorry, incorrect passcode"

329msgstr ""

330

331−#: qml/Shell.qml:348

331+#: qml/Shell.qml:354

332#, qt-format

333msgid "Enter %1"

334msgstr ""

335

336−#: qml/Shell.qml:328

336+#: qml/Shell.qml:355

337#, qt-format

338msgid "Sorry, incorrect %1"

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

340

341−#: qml/Shell.qml:363

341+#: qml/Shell.qml:390

342msgid "Sorry, incorrect passphrase."

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

344

345−#: qml/Shell.qml:364

345+#: qml/Shell.qml:391

346msgid "Sorry, incorrect passcode."

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

348

349−#: qml/Shell.qml:365

349+#: qml/Shell.qml:392

350msgid "This will be your last attempt."

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

352

353−#: qml/Shell.qml:367

353+#: qml/Shell.qml:394

354msgid ""

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

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

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

358"Ə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."

360

361−#: qml/Shell.qml:368

361+#: qml/Shell.qml:395

362msgid ""

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

364"and all personal data will be deleted."

@@ -366,25 +366,8 @@ msgstr ""

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

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

368

369−#~ msgid "Swipe to unlock"

369+#~ msgid "Enter SIM PIN"

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

370+#~ msgstr "SIM PIN kodunuzu daxil edin"

371−

372−#, qt-format

373−#~ msgid "Enter your %1"

374−#~ msgstr "%1 daxil edin"

375−

376−#~ msgid "Enter your passphrase"

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

378−

379−#~ msgid "Please wait"

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

381−

382−#~ msgid "Too many incorrect attempts"

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

384−

385−#, qt-format

386−#~ msgid "Hello %1"

387−#~ msgstr "Salam %1"

388

371

389−#~ msgid "Hello"

372+#~ msgid "Sorry, incorrect PIN"

390−#~ msgstr "Salam"

373+#~ msgstr "Bağışlayın, PIN yanlışdır"

po/be.po+28−28

@@ -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-07 11:37+0300\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-09 06:36+0000\n"

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

21

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

@@ -153,23 +153,23 @@ msgid ""

153"phone Tap on the screen to start"

154msgstr ""

155

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

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

157msgid "Emergency Call"

158msgstr ""

159

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

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

161msgid "OK"

162msgstr ""

163

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

164+#: qml/Dash/GenericScopeView.qml:434 qml/Dash/GenericScopeView.qml:591

165msgid "See less"

166msgstr ""

167

168−#: qml/Dash/GenericScopeView.qml:411

168+#: qml/Dash/GenericScopeView.qml:434

169msgid "See all"

170msgstr ""

171

172−#: qml/Dash/GenericScopeView.qml:473 qml/Dash/PageHeader.qml:258

172+#: qml/Dash/GenericScopeView.qml:496 qml/Dash/PageHeader.qml:258

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

174msgid "Search"

175msgstr ""

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

@@ -250,18 +258,10 @@ msgstr ""

250msgid "Speaking..."

258msgid "Speaking..."

251msgstr ""

259msgstr ""

252

260

253−#: qml/Notifications/NotificationMenuItemFactory.qml:108

261+#: qml/Notifications/NotificationMenuItemFactory.qml:116

254msgid "Show password"

262msgid "Show password"

255msgstr ""

263msgstr ""

256

264

257−#: qml/Notifications/NotificationMenuItemFactory.qml:124

258−msgid "Enter SIM PIN"

259−msgstr ""

260−

261−#: qml/Notifications/NotificationMenuItemFactory.qml:125

262−msgid "Sorry, incorrect PIN"

263−msgstr ""

264−

265#: qml/Panel/ActiveCallHint.qml:77

266msgid "Tap to return to call..."

267msgstr ""

@@ -306,55 +306,55 @@ msgstr ""

306msgid "Roaming"

307msgstr ""

308

309−#: qml/Shell.qml:340

309+#: qml/Shell.qml:346

310msgid "Enter passphrase"

311msgstr ""

312

313−#: qml/Shell.qml:321

313+#: qml/Shell.qml:347

314msgid "Sorry, incorrect passphrase"

315msgstr ""

316

317−#: qml/Shell.qml:342

317+#: qml/Shell.qml:348

318msgid "Please re-enter"

319msgstr ""

320

321−#: qml/Shell.qml:344

321+#: qml/Shell.qml:350

322msgid "Enter passcode"

323msgstr ""

324

325−#: qml/Shell.qml:324

325+#: qml/Shell.qml:351

326msgid "Sorry, incorrect passcode"

327msgstr ""

328

329−#: qml/Shell.qml:348

329+#: qml/Shell.qml:354

330#, qt-format

331msgid "Enter %1"

332msgstr ""

333

334−#: qml/Shell.qml:328

334+#: qml/Shell.qml:355

335#, qt-format

336msgid "Sorry, incorrect %1"

337msgstr ""

338

339−#: qml/Shell.qml:363

339+#: qml/Shell.qml:390

340msgid "Sorry, incorrect passphrase."

341msgstr ""

342

343−#: qml/Shell.qml:364

343+#: qml/Shell.qml:391

344msgid "Sorry, incorrect passcode."

345msgstr ""

346

347−#: qml/Shell.qml:365

347+#: qml/Shell.qml:392

348msgid "This will be your last attempt."

349msgstr ""

350

351−#: qml/Shell.qml:367

351+#: qml/Shell.qml:394

352msgid ""

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

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

355msgstr ""

356

357−#: qml/Shell.qml:368

357+#: qml/Shell.qml:395

358msgid ""

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

360"and all personal data will be deleted."

po/bg.po+28−35

@@ -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-07 11:37+0300\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-09 06:36+0000\n"

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

20

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

@@ -159,23 +159,23 @@ msgid ""

159"phone Tap on the screen to start"

160msgstr ""

161

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

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

163msgid "Emergency Call"

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

165

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

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

167msgid "OK"

168msgstr ""

169

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

170+#: qml/Dash/GenericScopeView.qml:434 qml/Dash/GenericScopeView.qml:591

171msgid "See less"

172msgstr ""

173

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

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

175msgid "See all"

176msgstr ""

177

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

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

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

180msgid "Search"

181msgstr "Търсене"

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

@@ -256,18 +264,10 @@ msgstr "Говорете сега..."

256msgid "Speaking..."

264msgid "Speaking..."

257msgstr "Говорете..."

265msgstr "Говорете..."

258

266

259−#: qml/Notifications/NotificationMenuItemFactory.qml:108

267+#: qml/Notifications/NotificationMenuItemFactory.qml:116

260msgid "Show password"

268msgid "Show password"

261msgstr "Покажи паролата"

269msgstr "Покажи паролата"

262

270

263−#: qml/Notifications/NotificationMenuItemFactory.qml:124

264−msgid "Enter SIM PIN"

265−msgstr ""

266−

267−#: qml/Notifications/NotificationMenuItemFactory.qml:125

268−msgid "Sorry, incorrect PIN"

269−msgstr ""

270−

271#: qml/Panel/ActiveCallHint.qml:77

272msgid "Tap to return to call..."

273msgstr ""

@@ -312,63 +312,56 @@ msgstr ""

312msgid "Roaming"

313msgstr ""

314

315−#: qml/Shell.qml:340

315+#: qml/Shell.qml:346

316msgid "Enter passphrase"

317msgstr ""

318

319−#: qml/Shell.qml:321

319+#: qml/Shell.qml:347

320msgid "Sorry, incorrect passphrase"

321msgstr ""

322

323−#: qml/Shell.qml:342

323+#: qml/Shell.qml:348

324msgid "Please re-enter"

325msgstr ""

326

327−#: qml/Shell.qml:344

327+#: qml/Shell.qml:350

328msgid "Enter passcode"

329msgstr ""

330

331−#: qml/Shell.qml:324

331+#: qml/Shell.qml:351

332msgid "Sorry, incorrect passcode"

333msgstr ""

334

335−#: qml/Shell.qml:348

335+#: qml/Shell.qml:354

336#, qt-format

337msgid "Enter %1"

338msgstr ""

339

340−#: qml/Shell.qml:328

340+#: qml/Shell.qml:355

341#, qt-format

342msgid "Sorry, incorrect %1"

343msgstr ""

344

345−#: qml/Shell.qml:363

345+#: qml/Shell.qml:390

346msgid "Sorry, incorrect passphrase."

347msgstr ""

348

349−#: qml/Shell.qml:364

349+#: qml/Shell.qml:391

350msgid "Sorry, incorrect passcode."

351msgstr ""

352

353−#: qml/Shell.qml:365

353+#: qml/Shell.qml:392

354msgid "This will be your last attempt."

355msgstr ""

356

357−#: qml/Shell.qml:367

357+#: qml/Shell.qml:394

358msgid ""

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

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

361msgstr ""

362

363−#: qml/Shell.qml:368

363+#: qml/Shell.qml:395

364msgid ""

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

366"and all personal data will be deleted."

367msgstr ""

368−

369−#~ msgid "Hello"

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

371−

372−#, qt-format

373−#~ msgid "Hello %1"

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

po/br.po+33−53

@@ -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-07 11:37+0300\n"

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

11+"PO-Revision-Date: 2014-10-07 07:03+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-04 06:28+0000\n"

18+"X-Launchpad-Export-Date: 2014-10-09 06:36+0000\n"

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

20

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

@@ -165,23 +165,23 @@ msgstr ""

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

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

167

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

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

169msgid "Emergency Call"

170msgstr "Pellgomzadenn vallus"

171

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

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

173msgid "OK"

174msgstr "Mat eo"

175

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

176+#: qml/Dash/GenericScopeView.qml:434 qml/Dash/GenericScopeView.qml:591

177msgid "See less"

178msgstr "Gwelet nebeutoc'h"

179

180−#: qml/Dash/GenericScopeView.qml:411

180+#: qml/Dash/GenericScopeView.qml:434

181msgid "See all"

182msgstr "Gwelet pep tra"

183

184−#: qml/Dash/GenericScopeView.qml:473 qml/Dash/PageHeader.qml:258

184+#: qml/Dash/GenericScopeView.qml:496 qml/Dash/PageHeader.qml:258

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

186msgid "Search"

187msgstr "Klask"

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

218msgid "Send"

219msgstr "Kas"

220

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

222+msgid "Pull to refresh…"

223+msgstr "Tennañ evit freskaat..."

224+

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

226+msgid "Release to refresh…"

227+msgstr "Lezel da vont evit freskaat..."

228+

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

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

222msgid "Manage Scopes"

230msgid "Manage Scopes"

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

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

@@ -262,18 +270,10 @@ msgstr "Komzit bremañ..."

262msgid "Speaking..."

270msgid "Speaking..."

263msgstr "O komz..."

271msgstr "O komz..."

264

272

265−#: qml/Notifications/NotificationMenuItemFactory.qml:108

273+#: qml/Notifications/NotificationMenuItemFactory.qml:116

266msgid "Show password"

274msgid "Show password"

267msgstr "Diskouez ar ger-tremen"

275msgstr "Diskouez ar ger-tremen"

268

276

269−#: qml/Notifications/NotificationMenuItemFactory.qml:124

270−msgid "Enter SIM PIN"

271−msgstr "Ebarzhit kod PIN ar gartenn SIM"

272−

273−#: qml/Notifications/NotificationMenuItemFactory.qml:125

274−msgid "Sorry, incorrect PIN"

275−msgstr "Siwazh, kod PIN direizh"

276−

277#: qml/Panel/ActiveCallHint.qml:77

278msgid "Tap to return to call..."

279msgstr "Touchit evit distreiñ d'ar bellgomzadenn..."

@@ -318,49 +318,49 @@ msgstr "Dibrennañ ar gartenn SIM"

318msgid "Roaming"

319msgstr "O kantren"

320

321−#: qml/Shell.qml:340

321+#: qml/Shell.qml:346

322msgid "Enter passphrase"

323msgstr "Merkañ ar frazenn-dremen"

324

325−#: qml/Shell.qml:321

325+#: qml/Shell.qml:347

326msgid "Sorry, incorrect passphrase"

327msgstr "Siwazh, frazenn-dremen direizh"

328

329−#: qml/Shell.qml:342

329+#: qml/Shell.qml:348

330msgid "Please re-enter"

331msgstr "Adverkañ, mar plij"

332

333−#: qml/Shell.qml:344

333+#: qml/Shell.qml:350

334msgid "Enter passcode"

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

336

337−#: qml/Shell.qml:324

337+#: qml/Shell.qml:351

338msgid "Sorry, incorrect passcode"

339msgstr "Digarezit, kod-tremen direizh"

340

341−#: qml/Shell.qml:348

341+#: qml/Shell.qml:354

342#, qt-format

343msgid "Enter %1"

344msgstr "Merkañ %1"

345

346−#: qml/Shell.qml:328

346+#: qml/Shell.qml:355

347#, qt-format

348msgid "Sorry, incorrect %1"

349msgstr "Siwazh, %1 direizh"

350

351−#: qml/Shell.qml:363

351+#: qml/Shell.qml:390

352msgid "Sorry, incorrect passphrase."

353msgstr "Siwazh, frazenn-dremen direizh"

354

355−#: qml/Shell.qml:364

355+#: qml/Shell.qml:391

356msgid "Sorry, incorrect passcode."

357msgstr "Siwazh, kod-tremen direizh"

358

359−#: qml/Shell.qml:365

359+#: qml/Shell.qml:392

360msgid "This will be your last attempt."

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

362

363−#: qml/Shell.qml:367

363+#: qml/Shell.qml:394

364msgid ""

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

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

@@ -368,7 +368,7 @@ msgstr ""

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

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

370

371−#: qml/Shell.qml:368

371+#: qml/Shell.qml:395

372msgid ""

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

374"and all personal data will be deleted."

@@ -376,28 +376,8 @@ msgstr ""

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

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

378

379−#~ msgid "Hello"

379+#~ msgid "Sorry, incorrect PIN"

380−#~ msgstr "Demat"

381−

382−#, qt-format

383−#~ msgid "Hello %1"

384−#~ msgstr "Demat %1"

385−

386−#~ msgid "Swipe to unlock"

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

388−

389−#~ msgid "Please wait"

390−#~ msgstr "Gortozit, mar plij"

391−

392−#~ msgid "Too many incorrect attempts"

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

380+#~ msgstr "Siwazh, kod PIN direizh"

394−

395−#~ msgid "Enter your passphrase"

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

397−

398−#, qt-format

399−#~ msgid "Enter your %1"

400−#~ msgstr "Ebarzhit ho %1"

401

381

402−#~ msgid "Enter your passcode"

382+#~ msgid "Enter SIM PIN"

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

383+#~ msgstr "Ebarzhit kod PIN ar gartenn SIM"

po/bs.po+28−28

@@ -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-07 11:37+0300\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-09 06:36+0000\n"

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

21

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

@@ -153,23 +153,23 @@ msgid ""

153"phone Tap on the screen to start"

154msgstr ""

155

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

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

157msgid "Emergency Call"

158msgstr ""

159

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

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

161msgid "OK"

162msgstr ""

163

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

164+#: qml/Dash/GenericScopeView.qml:434 qml/Dash/GenericScopeView.qml:591

165msgid "See less"

166msgstr ""

167

168−#: qml/Dash/GenericScopeView.qml:411

168+#: qml/Dash/GenericScopeView.qml:434

169msgid "See all"

170msgstr ""

171

172−#: qml/Dash/GenericScopeView.qml:473 qml/Dash/PageHeader.qml:258

172+#: qml/Dash/GenericScopeView.qml:496 qml/Dash/PageHeader.qml:258

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

174msgid "Search"

175msgstr ""

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

@@ -250,18 +258,10 @@ msgstr ""

250msgid "Speaking..."

258msgid "Speaking..."

251msgstr ""

259msgstr ""

252

260

253−#: qml/Notifications/NotificationMenuItemFactory.qml:108

261+#: qml/Notifications/NotificationMenuItemFactory.qml:116

254msgid "Show password"

262msgid "Show password"

255msgstr ""

263msgstr ""

256

264

257−#: qml/Notifications/NotificationMenuItemFactory.qml:124

258−msgid "Enter SIM PIN"

259−msgstr ""

260−

261−#: qml/Notifications/NotificationMenuItemFactory.qml:125

262−msgid "Sorry, incorrect PIN"

263−msgstr ""

264−

265#: qml/Panel/ActiveCallHint.qml:77

266msgid "Tap to return to call..."

267msgstr ""

@@ -306,55 +306,55 @@ msgstr ""

306msgid "Roaming"

307msgstr ""

308

309−#: qml/Shell.qml:340

309+#: qml/Shell.qml:346

310msgid "Enter passphrase"

311msgstr ""

312

313−#: qml/Shell.qml:321

313+#: qml/Shell.qml:347

314msgid "Sorry, incorrect passphrase"

315msgstr ""

316

317−#: qml/Shell.qml:342

317+#: qml/Shell.qml:348

318msgid "Please re-enter"

319msgstr ""

320

321−#: qml/Shell.qml:344

321+#: qml/Shell.qml:350

322msgid "Enter passcode"

323msgstr ""

324

325−#: qml/Shell.qml:324

325+#: qml/Shell.qml:351

326msgid "Sorry, incorrect passcode"

327msgstr ""

328

329−#: qml/Shell.qml:348

329+#: qml/Shell.qml:354

330#, qt-format

331msgid "Enter %1"

332msgstr ""

333

334−#: qml/Shell.qml:328

334+#: qml/Shell.qml:355

335#, qt-format

336msgid "Sorry, incorrect %1"

337msgstr ""

338

339−#: qml/Shell.qml:363

339+#: qml/Shell.qml:390

340msgid "Sorry, incorrect passphrase."

341msgstr ""

342

343−#: qml/Shell.qml:364

343+#: qml/Shell.qml:391

344msgid "Sorry, incorrect passcode."

345msgstr ""

346

347−#: qml/Shell.qml:365

347+#: qml/Shell.qml:392

348msgid "This will be your last attempt."

349msgstr ""

350

351−#: qml/Shell.qml:367

351+#: qml/Shell.qml:394

352msgid ""

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

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

355msgstr ""

356

357−#: qml/Shell.qml:368

357+#: qml/Shell.qml:395

358msgid ""

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

360"and all personal data will be deleted."

po/ca.po+51−69

@@ -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-07 11:37+0300\n"

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

11+"PO-Revision-Date: 2014-10-07 10:51+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-09 06:36+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,23 +166,23 @@ 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:220

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:252

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:434 qml/Dash/GenericScopeView.qml:591

174msgid "See less"

178msgid "See less"

175msgstr "Mostra'n menys"

179msgstr "Mostra'n menys"

176

180

177−#: qml/Dash/GenericScopeView.qml:411

181+#: qml/Dash/GenericScopeView.qml:434

178msgid "See all"

182msgid "See all"

179msgstr "Mostra-ho tot"

183msgstr "Mostra-ho tot"

180

184

181−#: qml/Dash/GenericScopeView.qml:473 qml/Dash/PageHeader.qml:258

185+#: qml/Dash/GenericScopeView.qml:496 qml/Dash/PageHeader.qml:258

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

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

183msgid "Search"

187msgid "Search"

184msgstr "Cerca"

188msgstr "Cerca"

@@ -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 "Estireu per actualitzar..."

225+

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

227+msgid "Release to refresh…"

228+msgstr "Deixeu anar per actualitzar..."

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"

@@ -259,18 +271,10 @@ msgstr "Parleu..."

259msgid "Speaking..."

271msgid "Speaking..."

260msgstr "S'està parlant..."

272msgstr "S'està parlant..."

261

273

262−#: qml/Notifications/NotificationMenuItemFactory.qml:108

274+#: qml/Notifications/NotificationMenuItemFactory.qml:116

263msgid "Show password"

275msgid "Show password"

264msgstr "Mostra la contrasenya"

276msgstr "Mostra la contrasenya"

265

277

266−#: qml/Notifications/NotificationMenuItemFactory.qml:124

267−msgid "Enter SIM PIN"

268−msgstr "Introduïu el PIN de la targeta SIM"

269−

270−#: qml/Notifications/NotificationMenuItemFactory.qml:125

271−msgid "Sorry, incorrect PIN"

272−msgstr "El PIN no és correcte"

273−

274#: qml/Panel/ActiveCallHint.qml:77

278#: qml/Panel/ActiveCallHint.qml:77

275msgid "Tap to return to call..."

279msgid "Tap to return to call..."

276msgstr "Feu un toc per tornar a la trucada..."

280msgstr "Feu un toc per tornar a la trucada..."

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

281

285

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

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

283msgid "Nothing is playing"

287msgid "Nothing is playing"

284−msgstr ""

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

285

289

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

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

287msgid "In queue…"

291msgid "In queue…"

@@ -315,49 +319,49 @@ msgstr "Desbloca la SIM"

315msgid "Roaming"

319msgid "Roaming"

316msgstr "Itinerància"

320msgstr "Itinerància"

317

321

318−#: qml/Shell.qml:340

322+#: qml/Shell.qml:346

319msgid "Enter passphrase"

323msgid "Enter passphrase"

320−msgstr ""

324+msgstr "Introduïu la contrasenya"

321

325

322−#: qml/Shell.qml:321

326+#: qml/Shell.qml:347

323msgid "Sorry, incorrect passphrase"

327msgid "Sorry, incorrect passphrase"

324msgstr "La contrasenya no és correcta"

328msgstr "La contrasenya no és correcta"

325

329

326−#: qml/Shell.qml:342

330+#: qml/Shell.qml:348

327msgid "Please re-enter"

331msgid "Please re-enter"

328−msgstr ""

332+msgstr "Torneu-ho a introduir"

329

333

330−#: qml/Shell.qml:344

334+#: qml/Shell.qml:350

331msgid "Enter passcode"

335msgid "Enter passcode"

332−msgstr ""

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

333

337

334−#: qml/Shell.qml:324

338+#: qml/Shell.qml:351

335msgid "Sorry, incorrect passcode"

339msgid "Sorry, incorrect passcode"

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

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

337

341

338−#: qml/Shell.qml:348

342+#: qml/Shell.qml:354

339#, qt-format

343#, qt-format

340msgid "Enter %1"

344msgid "Enter %1"

341−msgstr ""

345+msgstr "Introduïu: %1"

342

346

343−#: qml/Shell.qml:328

347+#: qml/Shell.qml:355

344#, qt-format

348#, qt-format

345msgid "Sorry, incorrect %1"

349msgid "Sorry, incorrect %1"

346msgstr "Incorrecte (%1)"

350msgstr "Incorrecte (%1)"

347

351

348−#: qml/Shell.qml:363

352+#: qml/Shell.qml:390

349msgid "Sorry, incorrect passphrase."

353msgid "Sorry, incorrect passphrase."

350msgstr "La contrasenya és incorrecta"

354msgstr "La contrasenya és incorrecta"

351

355

352−#: qml/Shell.qml:364

356+#: qml/Shell.qml:391

353msgid "Sorry, incorrect passcode."

357msgid "Sorry, incorrect passcode."

354−msgstr "La clau és incorrecta"

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

355

359

356−#: qml/Shell.qml:365

360+#: qml/Shell.qml:392

357msgid "This will be your last attempt."

361msgid "This will be your last attempt."

358msgstr "Aquest serà el darrer intent."

362msgstr "Aquest serà el darrer intent."

359

363

360−#: qml/Shell.qml:367

364+#: qml/Shell.qml:394

361msgid ""

365msgid ""

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

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

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

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

@@ -366,39 +370,17 @@ msgstr ""

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

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

367"personals."

371"personals."

368

372

369−#: qml/Shell.qml:368

373+#: qml/Shell.qml:395

370msgid ""

374msgid ""

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

372"and all personal data will be deleted."

376"and all personal data will be deleted."

373msgstr ""

377msgstr ""

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

378+"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."

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

376−

380+"personals."

377−#~ msgid "Hello"

378−#~ msgstr "Hola"

379−

380−#, qt-format

381−#~ msgid "Hello %1"

382−#~ msgstr "Hola %1"

383−

384−#~ msgid "Swipe to unlock"

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

386−

387−#~ msgid "Manage Dash"

388−#~ msgstr "Gestiona el tauler"

389−

390−#~ msgid "Please wait"

391−#~ msgstr "Espereu"

392−

393−#~ msgid "Too many incorrect attempts"

394−#~ msgstr "Massa intents incorrectes"

395−

396−#, qt-format

397−#~ msgid "Enter your %1"

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

399

381

400−#~ msgid "Enter your passphrase"

382+#~ msgid "Sorry, incorrect PIN"

401−#~ msgstr "Escriviu la contrasenya"

383+#~ msgstr "El PIN no és correcte"

402

384

403−#~ msgid "Enter your passcode"

385+#~ msgid "Enter SIM PIN"

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

386+#~ msgstr "Introduïu el PIN de la targeta SIM"

po/ckb.po+28−35

@@ -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-07 11:37+0300\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-09 06:37+0000\n"

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

20

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

@@ -152,23 +152,23 @@ msgid ""

152"phone Tap on the screen to start"

153msgstr ""

154

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

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

156msgid "Emergency Call"

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

158

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

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

160msgid "OK"

161msgstr ""

162

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

163+#: qml/Dash/GenericScopeView.qml:434 qml/Dash/GenericScopeView.qml:591

164msgid "See less"

165msgstr ""

166

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

167+#: qml/Dash/GenericScopeView.qml:434

168msgid "See all"

169msgstr ""

170

171−#: qml/Dash/GenericScopeView.qml:473 qml/Dash/PageHeader.qml:258

171+#: qml/Dash/GenericScopeView.qml:496 qml/Dash/PageHeader.qml:258

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

173msgid "Search"

174msgstr "گەڕان"

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

@@ -249,18 +257,10 @@ msgstr "ئێستا قسە بکە"

249msgid "Speaking..."

257msgid "Speaking..."

250msgstr "قسە دەکات..."

258msgstr "قسە دەکات..."

251

259

252−#: qml/Notifications/NotificationMenuItemFactory.qml:108

260+#: qml/Notifications/NotificationMenuItemFactory.qml:116

253msgid "Show password"

261msgid "Show password"

254msgstr "تێپەڕەوشە پیشان بدە"

262msgstr "تێپەڕەوشە پیشان بدە"

255

263

256−#: qml/Notifications/NotificationMenuItemFactory.qml:124

257−msgid "Enter SIM PIN"

258−msgstr ""

259−

260−#: qml/Notifications/NotificationMenuItemFactory.qml:125

261−msgid "Sorry, incorrect PIN"

262−msgstr ""

263−

264#: qml/Panel/ActiveCallHint.qml:77

265msgid "Tap to return to call..."

266msgstr ""

@@ -305,63 +305,56 @@ msgstr ""

305msgid "Roaming"

306msgstr ""

307

308−#: qml/Shell.qml:340

308+#: qml/Shell.qml:346

309msgid "Enter passphrase"

310msgstr ""

311

312−#: qml/Shell.qml:321

312+#: qml/Shell.qml:347

313msgid "Sorry, incorrect passphrase"

314msgstr ""

315

316−#: qml/Shell.qml:342

316+#: qml/Shell.qml:348

317msgid "Please re-enter"

318msgstr ""

319

320−#: qml/Shell.qml:344

320+#: qml/Shell.qml:350

321msgid "Enter passcode"

322msgstr ""

323

324−#: qml/Shell.qml:324

324+#: qml/Shell.qml:351

325msgid "Sorry, incorrect passcode"

326msgstr ""

327

328−#: qml/Shell.qml:348

328+#: qml/Shell.qml:354

329#, qt-format

330msgid "Enter %1"

331msgstr ""

332

333−#: qml/Shell.qml:328

333+#: qml/Shell.qml:355

334#, qt-format

335msgid "Sorry, incorrect %1"

336msgstr ""

337

338−#: qml/Shell.qml:363

338+#: qml/Shell.qml:390

339msgid "Sorry, incorrect passphrase."

340msgstr ""

341

342−#: qml/Shell.qml:364

342+#: qml/Shell.qml:391

343msgid "Sorry, incorrect passcode."

344msgstr ""

345

346−#: qml/Shell.qml:365

346+#: qml/Shell.qml:392

347msgid "This will be your last attempt."

348msgstr ""

349

350−#: qml/Shell.qml:367

350+#: qml/Shell.qml:394

351msgid ""

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

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

354msgstr ""

355

356−#: qml/Shell.qml:368

356+#: qml/Shell.qml:395

357msgid ""

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

359"and all personal data will be deleted."

360msgstr ""

361−

362−#, qt-format

363−#~ msgid "Hello %1"

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

365−

366−#~ msgid "Hello"

367−#~ msgstr "سڵاو"

po/cs.po+28−35

@@ -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-07 11:37+0300\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-09 06:36+0000\n"

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

20

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

@@ -152,23 +152,23 @@ msgid ""

152"phone Tap on the screen to start"

153msgstr ""

154

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

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

156msgid "Emergency Call"

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

158

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

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

160msgid "OK"

161msgstr ""

162

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

163+#: qml/Dash/GenericScopeView.qml:434 qml/Dash/GenericScopeView.qml:591

164msgid "See less"

165msgstr ""

166

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

167+#: qml/Dash/GenericScopeView.qml:434

168msgid "See all"

169msgstr ""

170

171−#: qml/Dash/GenericScopeView.qml:473 qml/Dash/PageHeader.qml:258

171+#: qml/Dash/GenericScopeView.qml:496 qml/Dash/PageHeader.qml:258

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

173msgid "Search"

174msgstr "Hledat"

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

@@ -249,18 +257,10 @@ msgstr "Mluvte..."

249msgid "Speaking..."

257msgid "Speaking..."

250msgstr "Mluvte..."

258msgstr "Mluvte..."

251

259

252−#: qml/Notifications/NotificationMenuItemFactory.qml:108

260+#: qml/Notifications/NotificationMenuItemFactory.qml:116

253msgid "Show password"

261msgid "Show password"

254msgstr "Zobrazit heslo"

262msgstr "Zobrazit heslo"

255

263

256−#: qml/Notifications/NotificationMenuItemFactory.qml:124

257−msgid "Enter SIM PIN"

258−msgstr ""

259−

260−#: qml/Notifications/NotificationMenuItemFactory.qml:125

261−msgid "Sorry, incorrect PIN"

262−msgstr ""

263−

264#: qml/Panel/ActiveCallHint.qml:77

265msgid "Tap to return to call..."

266msgstr ""

@@ -305,63 +305,56 @@ msgstr ""

305msgid "Roaming"

306msgstr ""

307

308−#: qml/Shell.qml:340

308+#: qml/Shell.qml:346

309msgid "Enter passphrase"

310msgstr ""

311

312−#: qml/Shell.qml:321

312+#: qml/Shell.qml:347

313msgid "Sorry, incorrect passphrase"

314msgstr ""

315

316−#: qml/Shell.qml:342

316+#: qml/Shell.qml:348

317msgid "Please re-enter"

318msgstr ""

319

320−#: qml/Shell.qml:344

320+#: qml/Shell.qml:350

321msgid "Enter passcode"

322msgstr ""

323

324−#: qml/Shell.qml:324

324+#: qml/Shell.qml:351

325msgid "Sorry, incorrect passcode"

326msgstr ""

327

328−#: qml/Shell.qml:348

328+#: qml/Shell.qml:354

329#, qt-format

330msgid "Enter %1"

331msgstr ""

332

333−#: qml/Shell.qml:328

333+#: qml/Shell.qml:355

334#, qt-format

335msgid "Sorry, incorrect %1"

336msgstr ""

337

338−#: qml/Shell.qml:363

338+#: qml/Shell.qml:390

339msgid "Sorry, incorrect passphrase."

340msgstr ""

341

342−#: qml/Shell.qml:364

342+#: qml/Shell.qml:391

343msgid "Sorry, incorrect passcode."

344msgstr ""

345

346−#: qml/Shell.qml:365

346+#: qml/Shell.qml:392

347msgid "This will be your last attempt."

348msgstr ""

349

350−#: qml/Shell.qml:367

350+#: qml/Shell.qml:394

351msgid ""

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

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

354msgstr ""

355

356−#: qml/Shell.qml:368

356+#: qml/Shell.qml:395

357msgid ""

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

359"and all personal data will be deleted."

360msgstr ""

361−

362−#~ msgid "Hello"

363−#~ msgstr "Ahoj"

364−

365−#, qt-format

366−#~ msgid "Hello %1"

367−#~ msgstr "Ahoj %1"

po/da.po+28−38

@@ -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-07 11:37+0300\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-09 06:36+0000\n"

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

21

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

@@ -155,23 +155,23 @@ 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:220

159msgid "Emergency Call"

160msgstr "Nødopkald"

161

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

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

163msgid "OK"

164msgstr "O.k."

165

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

166+#: qml/Dash/GenericScopeView.qml:434 qml/Dash/GenericScopeView.qml:591

167msgid "See less"

168msgstr "Vis mindre"

169

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

170+#: qml/Dash/GenericScopeView.qml:434

171msgid "See all"

172msgstr "Se alle"

173

174−#: qml/Dash/GenericScopeView.qml:473 qml/Dash/PageHeader.qml:258

174+#: qml/Dash/GenericScopeView.qml:496 qml/Dash/PageHeader.qml:258

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

176msgid "Search"

177msgstr "Søg"

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

@@ -252,18 +260,10 @@ msgstr "Tal nu..."

252msgid "Speaking..."

260msgid "Speaking..."

253msgstr "Taler..."

261msgstr "Taler..."

254

262

255−#: qml/Notifications/NotificationMenuItemFactory.qml:108

263+#: qml/Notifications/NotificationMenuItemFactory.qml:116

256msgid "Show password"

264msgid "Show password"

257msgstr "Vis adgangskode"

265msgstr "Vis adgangskode"

258

266

259−#: qml/Notifications/NotificationMenuItemFactory.qml:124

260−msgid "Enter SIM PIN"

261−msgstr ""

262−

263−#: qml/Notifications/NotificationMenuItemFactory.qml:125

264−msgid "Sorry, incorrect PIN"

265−msgstr ""

266−

267#: qml/Panel/ActiveCallHint.qml:77

268msgid "Tap to return to call..."

269msgstr "Tryk for at besvare opkaldet..."

@@ -308,66 +308,56 @@ msgstr ""

308msgid "Roaming"

309msgstr ""

310

311−#: qml/Shell.qml:340

311+#: qml/Shell.qml:346

312msgid "Enter passphrase"

313msgstr ""

314

315−#: qml/Shell.qml:321

315+#: qml/Shell.qml:347

316msgid "Sorry, incorrect passphrase"

317msgstr ""

318

319−#: qml/Shell.qml:342

319+#: qml/Shell.qml:348

320msgid "Please re-enter"

321msgstr ""

322

323−#: qml/Shell.qml:344

323+#: qml/Shell.qml:350

324msgid "Enter passcode"

325msgstr ""

326

327−#: qml/Shell.qml:324

327+#: qml/Shell.qml:351

328msgid "Sorry, incorrect passcode"

329msgstr ""

330

331−#: qml/Shell.qml:348

331+#: qml/Shell.qml:354

332#, qt-format

333msgid "Enter %1"

334msgstr ""

335

336−#: qml/Shell.qml:328

336+#: qml/Shell.qml:355

337#, qt-format

338msgid "Sorry, incorrect %1"

339msgstr ""

340

341−#: qml/Shell.qml:363

341+#: qml/Shell.qml:390

342msgid "Sorry, incorrect passphrase."

343msgstr ""

344

345−#: qml/Shell.qml:364

345+#: qml/Shell.qml:391

346msgid "Sorry, incorrect passcode."

347msgstr ""

348

349−#: qml/Shell.qml:365

349+#: qml/Shell.qml:392

350msgid "This will be your last attempt."

351msgstr ""

352

353−#: qml/Shell.qml:367

353+#: qml/Shell.qml:394

354msgid ""

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

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

357msgstr ""

358

359−#: qml/Shell.qml:368

359+#: qml/Shell.qml:395

360msgid ""

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

362"and all personal data will be deleted."

363msgstr ""

364−

365−#, qt-format

366−#~ msgid "Hello %1"

367−#~ msgstr "Hej %1"

368−

369−#~ msgid "Hello"

370−#~ msgstr "Hej"

371−

372−#~ msgid "Swipe to unlock"

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

po/de.po+32−55

@@ -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-07 11:37+0300\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-09 06:36+0000\n"

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

20

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

@@ -159,23 +159,23 @@ 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:220

163msgid "Emergency Call"

164msgstr "Notruf"

165

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

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

167msgid "OK"

168msgstr "OK"

169

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

170+#: qml/Dash/GenericScopeView.qml:434 qml/Dash/GenericScopeView.qml:591

171msgid "See less"

172msgstr "Weniger ansehen"

173

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

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

175msgid "See all"

176msgstr "Alle anzeigen"

177

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

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

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

180msgid "Search"

181msgstr "Suchen"

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

@@ -256,18 +264,10 @@ msgstr "Sprechen Sie jetzt …"

256msgid "Speaking..."

264msgid "Speaking..."

257msgstr "Sprechen Sie …"

265msgstr "Sprechen Sie …"

258

266

259−#: qml/Notifications/NotificationMenuItemFactory.qml:108

267+#: qml/Notifications/NotificationMenuItemFactory.qml:116

260msgid "Show password"

268msgid "Show password"

261msgstr "Passwort anzeigen"

269msgstr "Passwort anzeigen"

262

270

263−#: qml/Notifications/NotificationMenuItemFactory.qml:124

264−msgid "Enter SIM PIN"

265−msgstr "Geben Sie die SIM-PIN ein"

266−

267−#: qml/Notifications/NotificationMenuItemFactory.qml:125

268−msgid "Sorry, incorrect PIN"

269−msgstr "Die PIN ist nicht korrekt"

270−

271#: qml/Panel/ActiveCallHint.qml:77

272msgid "Tap to return to call..."

273msgstr "Tippen um zum Anruf zurückzugehen"

@@ -312,49 +312,49 @@ msgstr "SIM-Karte entsperren"

312msgid "Roaming"

313msgstr "Roaming"

314

315−#: qml/Shell.qml:340

315+#: qml/Shell.qml:346

316msgid "Enter passphrase"

317msgstr ""

318

319−#: qml/Shell.qml:321

319+#: qml/Shell.qml:347

320msgid "Sorry, incorrect passphrase"

321msgstr "Das Passwort ist nicht korrekt"

322

323−#: qml/Shell.qml:342

323+#: qml/Shell.qml:348

324msgid "Please re-enter"

325msgstr ""

326

327−#: qml/Shell.qml:344

327+#: qml/Shell.qml:350

328msgid "Enter passcode"

329msgstr ""

330

331−#: qml/Shell.qml:324

331+#: qml/Shell.qml:351

332msgid "Sorry, incorrect passcode"

333msgstr "Falsches Passwort"

334

335−#: qml/Shell.qml:348

335+#: qml/Shell.qml:354

336#, qt-format

337msgid "Enter %1"

338msgstr ""

339

340−#: qml/Shell.qml:328

340+#: qml/Shell.qml:355

341#, qt-format

342msgid "Sorry, incorrect %1"

343msgstr "%1 falsch"

344

345−#: qml/Shell.qml:363

345+#: qml/Shell.qml:390

346msgid "Sorry, incorrect passphrase."

347msgstr "Falsches Passwort."

348

349−#: qml/Shell.qml:364

349+#: qml/Shell.qml:391

350msgid "Sorry, incorrect passcode."

351msgstr "Falsche PIN"

352

353−#: qml/Shell.qml:365

353+#: qml/Shell.qml:392

354msgid "This will be your last attempt."

355msgstr "Dies ist Ihr letzter Versuch."

356

357−#: qml/Shell.qml:367

357+#: qml/Shell.qml:394

358msgid ""

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

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

@@ -362,7 +362,7 @@ msgstr ""

362"Wird das Passwort falsch eingegeben, wird das Telefon auf den Werkszustand "

363"zurückgesetzt und alle Daten werden gelöscht."

364

365−#: qml/Shell.qml:368

365+#: qml/Shell.qml:395

366msgid ""

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

368"and all personal data will be deleted."

@@ -370,31 +370,8 @@ msgstr ""

370"Wird die PIN falsch eingegeben, wird das Telefon auf den Werkszustand "

371"zurückgesetzt und alle Daten werden gelöscht."

372

373−#, qt-format

373+#~ msgid "Sorry, incorrect PIN"

374−#~ msgid "Hello %1"

374+#~ msgstr "Die PIN ist nicht korrekt"

375−#~ msgstr "Hallo %1"

376−

377−#~ msgid "Hello"

378−#~ msgstr "Hallo"

379−

380−#~ msgid "Swipe to unlock"

381−#~ msgstr "Wischen zum Entsperren"

382−

383−#~ msgid "Please wait"

384−#~ msgstr "Bitte warten"

385−

386−#~ msgid "Too many incorrect attempts"

387−#~ msgstr "Zu viele falsche Versuche"

388−

389−#, qt-format

390−#~ msgid "Enter your %1"

391−#~ msgstr "%1 eingeben"

392−

393−#~ msgid "Manage Dash"

394−#~ msgstr "Dash verwalten"

395−

396−#~ msgid "Enter your passphrase"

397−#~ msgstr "Geben Sie Ihr Passwort ein"

398

375

399−#~ msgid "Enter your passcode"

376+#~ msgid "Enter SIM PIN"

400−#~ msgstr "Passwort eingeben"

377+#~ msgstr "Geben Sie die SIM-PIN ein"

po/el.po+28−48

@@ -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-07 11:37+0300\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-09 06:36+0000\n"

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

20

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

@@ -156,23 +156,23 @@ msgstr ""

156"Πλέον γνωρίζετε τις χειρονομίες από τα άκρα και μπορείτε να ξεκινήσετε να "

157"χρησιμοποιείτε το τηλέφωνο Αγγίξτε την οθόνη για να ξεκινήσετε"

158

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

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

160msgid "Emergency Call"

161msgstr "Κλήση έκτακτης ανάγκης"

162

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

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

164msgid "OK"

165msgstr "OK"

166

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

167+#: qml/Dash/GenericScopeView.qml:434 qml/Dash/GenericScopeView.qml:591

168msgid "See less"

169msgstr "Λιγότερα"

170

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

171+#: qml/Dash/GenericScopeView.qml:434

172msgid "See all"

173msgstr "Εμφάνιση όλων"

174

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

175+#: qml/Dash/GenericScopeView.qml:496 qml/Dash/PageHeader.qml:258

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

177msgid "Search"

178msgstr "Αναζήτηση"

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

@@ -253,18 +261,10 @@ msgstr "Μιλήστε τώρα..."

253msgid "Speaking..."

261msgid "Speaking..."

254msgstr "Ομιλία..."

262msgstr "Ομιλία..."

255

263

256−#: qml/Notifications/NotificationMenuItemFactory.qml:108

264+#: qml/Notifications/NotificationMenuItemFactory.qml:116

257msgid "Show password"

265msgid "Show password"

258msgstr "Εμφάνιση κωδικού"

266msgstr "Εμφάνιση κωδικού"

259

267

260−#: qml/Notifications/NotificationMenuItemFactory.qml:124

261−msgid "Enter SIM PIN"

262−msgstr ""

263−

264−#: qml/Notifications/NotificationMenuItemFactory.qml:125

265−msgid "Sorry, incorrect PIN"

266−msgstr ""

267−

268#: qml/Panel/ActiveCallHint.qml:77

269msgid "Tap to return to call..."

270msgstr "Πατήστε για να γυρίσετε στην κλήση..."

@@ -309,76 +309,56 @@ msgstr "Ξεκλείδωμα SIM"

309msgid "Roaming"

310msgstr "Περιαγωγή"

311

312−#: qml/Shell.qml:340

312+#: qml/Shell.qml:346

313msgid "Enter passphrase"

314msgstr ""

315

316−#: qml/Shell.qml:321

316+#: qml/Shell.qml:347

317msgid "Sorry, incorrect passphrase"

318msgstr ""

319

320−#: qml/Shell.qml:342

320+#: qml/Shell.qml:348

321msgid "Please re-enter"

322msgstr ""

323

324−#: qml/Shell.qml:344

324+#: qml/Shell.qml:350

325msgid "Enter passcode"

326msgstr ""

327

328−#: qml/Shell.qml:324

328+#: qml/Shell.qml:351

329msgid "Sorry, incorrect passcode"

330msgstr ""

331

332−#: qml/Shell.qml:348

332+#: qml/Shell.qml:354

333#, qt-format

334msgid "Enter %1"

335msgstr ""

336

337−#: qml/Shell.qml:328

337+#: qml/Shell.qml:355

338#, qt-format

339msgid "Sorry, incorrect %1"

340msgstr ""

341

342−#: qml/Shell.qml:363

342+#: qml/Shell.qml:390

343msgid "Sorry, incorrect passphrase."

344msgstr ""

345

346−#: qml/Shell.qml:364

346+#: qml/Shell.qml:391

347msgid "Sorry, incorrect passcode."

348msgstr ""

349

350−#: qml/Shell.qml:365

350+#: qml/Shell.qml:392

351msgid "This will be your last attempt."

352msgstr ""

353

354−#: qml/Shell.qml:367

354+#: qml/Shell.qml:394

355msgid ""

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

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

358msgstr ""

359

360−#: qml/Shell.qml:368

360+#: qml/Shell.qml:395

361msgid ""

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

363"and all personal data will be deleted."

364msgstr ""

365−

366−#~ msgid "Hello"

367−#~ msgstr "Γεια σας"

368−

369−#, qt-format

370−#~ msgid "Hello %1"

371−#~ msgstr "Γεια σας %1"

372−

373−#~ msgid "Swipe to unlock"

374−#~ msgstr "Σύρετε για να ξεκλειδώσετε"

375−

376−#~ msgid "Please wait"

377−#~ msgstr "Παρακαλώ περιμένετε"

378−

379−#~ msgid "Too many incorrect attempts"

380−#~ msgstr "Πολλές άκυρες προσπάθειες"

381−

382−#, qt-format

383−#~ msgid "Enter your %1"

384−#~ msgstr "Εισάγετε το %1"

po/en_AU.po+32−55

@@ -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-07 11:37+0300\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-09 06:37+0000\n"

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

20

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

@@ -156,23 +156,23 @@ 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:220

160msgid "Emergency Call"

161msgstr "Emergency Call"

162

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

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

164msgid "OK"

165msgstr "OK"

166

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

167+#: qml/Dash/GenericScopeView.qml:434 qml/Dash/GenericScopeView.qml:591

168msgid "See less"

169msgstr "See less"

170

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

171+#: qml/Dash/GenericScopeView.qml:434

172msgid "See all"

173msgstr "See all"

174

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

175+#: qml/Dash/GenericScopeView.qml:496 qml/Dash/PageHeader.qml:258

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

177msgid "Search"

178msgstr "Search"

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

@@ -253,18 +261,10 @@ msgstr "Speak Now..."

253msgid "Speaking..."

261msgid "Speaking..."

254msgstr "Speaking..."

262msgstr "Speaking..."

255

263

256−#: qml/Notifications/NotificationMenuItemFactory.qml:108

264+#: qml/Notifications/NotificationMenuItemFactory.qml:116

257msgid "Show password"

265msgid "Show password"

258msgstr "Show password"

266msgstr "Show password"

259

267

260−#: qml/Notifications/NotificationMenuItemFactory.qml:124

261−msgid "Enter SIM PIN"

262−msgstr "Enter SIM PIN"

263−

264−#: qml/Notifications/NotificationMenuItemFactory.qml:125

265−msgid "Sorry, incorrect PIN"

266−msgstr "Sorry, incorrect PIN"

267−

268#: qml/Panel/ActiveCallHint.qml:77

269msgid "Tap to return to call..."

270msgstr "Tap to return to call..."

@@ -309,49 +309,49 @@ msgstr "Unlock SIM"

309msgid "Roaming"

310msgstr "Roaming"

311

312−#: qml/Shell.qml:340

312+#: qml/Shell.qml:346

313msgid "Enter passphrase"

314msgstr ""

315

316−#: qml/Shell.qml:321

316+#: qml/Shell.qml:347

317msgid "Sorry, incorrect passphrase"

318msgstr "Sorry, incorrect passphrase"

319

320−#: qml/Shell.qml:342

320+#: qml/Shell.qml:348

321msgid "Please re-enter"

322msgstr ""

323

324−#: qml/Shell.qml:344

324+#: qml/Shell.qml:350

325msgid "Enter passcode"

326msgstr ""

327

328−#: qml/Shell.qml:324

328+#: qml/Shell.qml:351

329msgid "Sorry, incorrect passcode"

330msgstr "Sorry, incorrect passcode"

331

332−#: qml/Shell.qml:348

332+#: qml/Shell.qml:354

333#, qt-format

334msgid "Enter %1"

335msgstr ""

336

337−#: qml/Shell.qml:328

337+#: qml/Shell.qml:355

338#, qt-format

339msgid "Sorry, incorrect %1"

340msgstr "Sorry, incorrect %1"

341

342−#: qml/Shell.qml:363

342+#: qml/Shell.qml:390

343msgid "Sorry, incorrect passphrase."

344msgstr "Sorry, incorrect passphrase."

345

346−#: qml/Shell.qml:364

346+#: qml/Shell.qml:391

347msgid "Sorry, incorrect passcode."

348msgstr "Sorry, incorrect passcode."

349

350−#: qml/Shell.qml:365

350+#: qml/Shell.qml:392

351msgid "This will be your last attempt."

352msgstr "This will be your last attempt."

353

354−#: qml/Shell.qml:367

354+#: qml/Shell.qml:394

355msgid ""

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

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

@@ -359,7 +359,7 @@ msgstr ""

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

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

361

362−#: qml/Shell.qml:368

362+#: qml/Shell.qml:395

363msgid ""

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

365"and all personal data will be deleted."

@@ -367,31 +367,8 @@ msgstr ""

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

368"and all personal data will be deleted."

369

370−#, qt-format

370+#~ msgid "Sorry, incorrect PIN"

371−#~ msgid "Hello %1"

371+#~ msgstr "Sorry, incorrect PIN"

372−#~ msgstr "Hello %1"

373−

374−#~ msgid "Hello"

375−#~ msgstr "Hello"

376−

377−#~ msgid "Swipe to unlock"

378−#~ msgstr "Swipe to unlock"

379−

380−#~ msgid "Manage Dash"

381−#~ msgstr "Manage Dash"

382−

383−#~ msgid "Please wait"

384−#~ msgstr "Please wait"

385−

386−#~ msgid "Too many incorrect attempts"

387−#~ msgstr "Too many incorrect attempts"

388−

389−#, qt-format

390−#~ msgid "Enter your %1"

391−#~ msgstr "Enter your %1"

392−

393−#~ msgid "Enter your passphrase"

394−#~ msgstr "Enter your passphrase"

395

372

396−#~ msgid "Enter your passcode"

373+#~ msgid "Enter SIM PIN"

397−#~ msgstr "Enter your passcode"

374+#~ msgstr "Enter SIM PIN"

po/en_GB.po+32−52

@@ -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-07 11:37+0300\n"

11"PO-Revision-Date: 2014-10-03 12:46+0000\n"

12"Last-Translator: Andi Chandler <Unknown>\n"

13"Language-Team: English (United Kingdom) <en_GB@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-04 06:28+0000\n"

18+"X-Launchpad-Export-Date: 2014-10-09 06:37+0000\n"

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

20

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

@@ -156,23 +156,23 @@ 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:220

160msgid "Emergency Call"

161msgstr "Emergency Call"

162

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

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

164msgid "OK"

165msgstr "OK"

166

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

167+#: qml/Dash/GenericScopeView.qml:434 qml/Dash/GenericScopeView.qml:591

168msgid "See less"

169msgstr "See less"

170

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

171+#: qml/Dash/GenericScopeView.qml:434

172msgid "See all"

173msgstr "See all"

174

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

175+#: qml/Dash/GenericScopeView.qml:496 qml/Dash/PageHeader.qml:258

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

177msgid "Search"

178msgstr "Search"

@@ -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 "Pull to refresh…"

215+

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

217+msgid "Release to refresh…"

218+msgstr "Release to refresh…"

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"

@@ -253,18 +261,10 @@ msgstr "Speak Now..."

253msgid "Speaking..."

261msgid "Speaking..."

254msgstr "Speaking..."

262msgstr "Speaking..."

255

263

256−#: qml/Notifications/NotificationMenuItemFactory.qml:108

264+#: qml/Notifications/NotificationMenuItemFactory.qml:116

257msgid "Show password"

265msgid "Show password"

258msgstr "Show password"

266msgstr "Show password"

259

267

260−#: qml/Notifications/NotificationMenuItemFactory.qml:124

261−msgid "Enter SIM PIN"

262−msgstr "Enter SIM PIN"

263−

264−#: qml/Notifications/NotificationMenuItemFactory.qml:125

265−msgid "Sorry, incorrect PIN"

266−msgstr "Sorry, incorrect PIN"

267−

268#: qml/Panel/ActiveCallHint.qml:77

269msgid "Tap to return to call..."

270msgstr "Tap to return to call..."

@@ -309,49 +309,49 @@ msgstr "Unlock SIM"

309msgid "Roaming"

310msgstr "Roaming"

311

312−#: qml/Shell.qml:340

312+#: qml/Shell.qml:346

313msgid "Enter passphrase"

314msgstr "Enter passphrase"

315

316−#: qml/Shell.qml:321

316+#: qml/Shell.qml:347

317msgid "Sorry, incorrect passphrase"

318msgstr "Sorry, incorrect passphrase"

319

320−#: qml/Shell.qml:342

320+#: qml/Shell.qml:348

321msgid "Please re-enter"

322msgstr "Please re-enter"

323

324−#: qml/Shell.qml:344

324+#: qml/Shell.qml:350

325msgid "Enter passcode"

326msgstr "Enter passcode"

327

328−#: qml/Shell.qml:324

328+#: qml/Shell.qml:351

329msgid "Sorry, incorrect passcode"

330msgstr "Sorry, incorrect passcode"

331

332−#: qml/Shell.qml:348

332+#: qml/Shell.qml:354

333#, qt-format

334msgid "Enter %1"

335msgstr "Enter %1"

336

337−#: qml/Shell.qml:328

337+#: qml/Shell.qml:355

338#, qt-format

339msgid "Sorry, incorrect %1"

340msgstr "Sorry, incorrect %1"

341

342−#: qml/Shell.qml:363

342+#: qml/Shell.qml:390

343msgid "Sorry, incorrect passphrase."

344msgstr "Sorry, incorrect passphrase."

345

346−#: qml/Shell.qml:364

346+#: qml/Shell.qml:391

347msgid "Sorry, incorrect passcode."

348msgstr "Sorry, incorrect passcode."

349

350−#: qml/Shell.qml:365

350+#: qml/Shell.qml:392

351msgid "This will be your last attempt."

352msgstr "This will be your last attempt."

353

354−#: qml/Shell.qml:367

354+#: qml/Shell.qml:394

355msgid ""

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

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

@@ -359,7 +359,7 @@ msgstr ""

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

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

361

362−#: qml/Shell.qml:368

362+#: qml/Shell.qml:395

363msgid ""

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

365"and all personal data will be deleted."

@@ -367,28 +367,8 @@ msgstr ""

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

368"and all personal data will be deleted."

369

370−#, qt-format

370+#~ msgid "Sorry, incorrect PIN"

371−#~ msgid "Hello %1"

371+#~ msgstr "Sorry, incorrect PIN"

372−#~ msgstr "Hello %1"

373−

374−#~ msgid "Hello"

375−#~ msgstr "Hello"

376−

377−#~ msgid "Swipe to unlock"

378−#~ msgstr "Swipe to unlock"

379−

380−#~ msgid "Please wait"

381−#~ msgstr "Please wait"

382−

383−#~ msgid "Too many incorrect attempts"

384−#~ msgstr "Too many incorrect attempts"

385−

386−#, qt-format

387−#~ msgid "Enter your %1"

388−#~ msgstr "Enter your %1"

389−

390−#~ msgid "Enter your passphrase"

391−#~ msgstr "Enter your passphrase"

392

372

393−#~ msgid "Enter your passcode"

373+#~ msgid "Enter SIM PIN"

394−#~ msgstr "Enter your passcode"

374+#~ msgstr "Enter SIM PIN"

po/eo.po+28−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-07 11:37+0300\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-09 06:36+0000\n"

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

20

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

@@ -152,23 +152,23 @@ msgid ""

152"phone Tap on the screen to start"

153msgstr ""

154

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

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

156msgid "Emergency Call"

157msgstr ""

158

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

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

160msgid "OK"

161msgstr ""

162

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

163+#: qml/Dash/GenericScopeView.qml:434 qml/Dash/GenericScopeView.qml:591

164msgid "See less"

165msgstr ""

166

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

167+#: qml/Dash/GenericScopeView.qml:434

168msgid "See all"

169msgstr ""

170

171−#: qml/Dash/GenericScopeView.qml:473 qml/Dash/PageHeader.qml:258

171+#: qml/Dash/GenericScopeView.qml:496 qml/Dash/PageHeader.qml:258

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

173msgid "Search"

174msgstr ""

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

@@ -249,18 +257,10 @@ msgstr ""

249msgid "Speaking..."

257msgid "Speaking..."

250msgstr ""

258msgstr ""

251

259

252−#: qml/Notifications/NotificationMenuItemFactory.qml:108

260+#: qml/Notifications/NotificationMenuItemFactory.qml:116

253msgid "Show password"

261msgid "Show password"

254msgstr ""

262msgstr ""

255

263

256−#: qml/Notifications/NotificationMenuItemFactory.qml:124

257−msgid "Enter SIM PIN"

258−msgstr ""

259−

260−#: qml/Notifications/NotificationMenuItemFactory.qml:125

261−msgid "Sorry, incorrect PIN"

262−msgstr ""

263−

264#: qml/Panel/ActiveCallHint.qml:77

265msgid "Tap to return to call..."

266msgstr ""

@@ -305,55 +305,55 @@ msgstr ""

305msgid "Roaming"

306msgstr ""

307

308−#: qml/Shell.qml:340

308+#: qml/Shell.qml:346

309msgid "Enter passphrase"

310msgstr ""

311

312−#: qml/Shell.qml:321

312+#: qml/Shell.qml:347

313msgid "Sorry, incorrect passphrase"

314msgstr ""

315

316−#: qml/Shell.qml:342

316+#: qml/Shell.qml:348

317msgid "Please re-enter"

318msgstr ""

319

320−#: qml/Shell.qml:344

320+#: qml/Shell.qml:350

321msgid "Enter passcode"

322msgstr ""

323

324−#: qml/Shell.qml:324

324+#: qml/Shell.qml:351

325msgid "Sorry, incorrect passcode"

326msgstr ""

327

328−#: qml/Shell.qml:348

328+#: qml/Shell.qml:354

329#, qt-format

330msgid "Enter %1"

331msgstr ""

332

333−#: qml/Shell.qml:328

333+#: qml/Shell.qml:355

334#, qt-format

335msgid "Sorry, incorrect %1"

336msgstr ""

337

338−#: qml/Shell.qml:363

338+#: qml/Shell.qml:390

339msgid "Sorry, incorrect passphrase."

340msgstr ""

341

342−#: qml/Shell.qml:364

342+#: qml/Shell.qml:391

343msgid "Sorry, incorrect passcode."

344msgstr ""

345

346−#: qml/Shell.qml:365

346+#: qml/Shell.qml:392

347msgid "This will be your last attempt."

348msgstr ""

349

350−#: qml/Shell.qml:367

350+#: qml/Shell.qml:394

351msgid ""

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

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

354msgstr ""

355

356−#: qml/Shell.qml:368

356+#: qml/Shell.qml:395

357msgid ""

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

359"and all personal data will be deleted."

po/es.po+32−52

@@ -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-07 11:37+0300\n"

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

12"Last-Translator: Paco Molinero <paco@byasl.com>\n"

13"Language-Team: Spanish <es@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-06 07:00+0000\n"

18+"X-Launchpad-Export-Date: 2014-10-09 06:36+0000\n"

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

20

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

@@ -163,23 +163,23 @@ msgstr ""

163"Ahora domina los gestos de los bordes y puede usar el teléfono Toque "

164"la pantalla para comenzar"

165

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

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

167msgid "Emergency Call"

168msgstr "Llamada de emergencia"

169

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

170+#: qml/Components/Lockscreen.qml:252

171msgid "OK"

172msgstr "Aceptar"

173

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

174+#: qml/Dash/GenericScopeView.qml:434 qml/Dash/GenericScopeView.qml:591

175msgid "See less"

176msgstr "Ver menos"

177

178−#: qml/Dash/GenericScopeView.qml:411

178+#: qml/Dash/GenericScopeView.qml:434

179msgid "See all"

180msgstr "Ver todo"

181

182−#: qml/Dash/GenericScopeView.qml:473 qml/Dash/PageHeader.qml:258

182+#: qml/Dash/GenericScopeView.qml:496 qml/Dash/PageHeader.qml:258

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

184msgid "Search"

185msgstr "Buscar"

@@ -216,6 +216,14 @@ msgstr "Añadir una reseña"

216msgid "Send"

217msgstr "Enviar"

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+

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

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

220msgid "Manage Scopes"

228msgid "Manage Scopes"

221msgstr "Administrar ámbitos"

229msgstr "Administrar ámbitos"

@@ -260,18 +268,10 @@ msgstr "Hable ahora…"

260msgid "Speaking..."

268msgid "Speaking..."

261msgstr "Hablando…"

269msgstr "Hablando…"

262

270

263−#: qml/Notifications/NotificationMenuItemFactory.qml:108

271+#: qml/Notifications/NotificationMenuItemFactory.qml:116

264msgid "Show password"

272msgid "Show password"

265msgstr "Mostrar contraseña"

273msgstr "Mostrar contraseña"

266

274

267−#: qml/Notifications/NotificationMenuItemFactory.qml:124

268−msgid "Enter SIM PIN"

269−msgstr "Escriba el PIN de la SIM"

270−

271−#: qml/Notifications/NotificationMenuItemFactory.qml:125

272−msgid "Sorry, incorrect PIN"

273−msgstr "El PIN es incorrecto"

274−

275#: qml/Panel/ActiveCallHint.qml:77

276msgid "Tap to return to call..."

277msgstr "Toque para volver a llamar..."

@@ -316,49 +316,49 @@ msgstr "Desbloquear SIM"

316msgid "Roaming"

317msgstr "Itinerancia"

318

319−#: qml/Shell.qml:340

319+#: qml/Shell.qml:346

320msgid "Enter passphrase"

321msgstr "Introduzca la contraseña"

322

323−#: qml/Shell.qml:321

323+#: qml/Shell.qml:347

324msgid "Sorry, incorrect passphrase"

325msgstr "La contraseña es incorrecta"

326

327−#: qml/Shell.qml:342

327+#: qml/Shell.qml:348

328msgid "Please re-enter"

329msgstr "Reintroduzca"

330

331−#: qml/Shell.qml:344

331+#: qml/Shell.qml:350

332msgid "Enter passcode"

333msgstr "Introduzca el código"

334

335−#: qml/Shell.qml:324

335+#: qml/Shell.qml:351

336msgid "Sorry, incorrect passcode"

337msgstr "El código es incorrecto"

338

339−#: qml/Shell.qml:348

339+#: qml/Shell.qml:354

340#, qt-format

341msgid "Enter %1"

342msgstr "Introduzca %1"

343

344−#: qml/Shell.qml:328

344+#: qml/Shell.qml:355

345#, qt-format

346msgid "Sorry, incorrect %1"

347msgstr "Incorrecto (%1)"

348

349−#: qml/Shell.qml:363

349+#: qml/Shell.qml:390

350msgid "Sorry, incorrect passphrase."

351msgstr "La contraseña es incorrecta."

352

353−#: qml/Shell.qml:364

353+#: qml/Shell.qml:391

354msgid "Sorry, incorrect passcode."

355msgstr "Código de acceso incorrecto."

356

357−#: qml/Shell.qml:365

357+#: qml/Shell.qml:392

358msgid "This will be your last attempt."

359msgstr "Este será su último intento."

360

361−#: qml/Shell.qml:367

361+#: qml/Shell.qml:394

362msgid ""

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

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

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

366"Si se introduce la frase incorrectamente, el teléfono volverá a la "

367"configuración de fábrica y se perderán todos los datos personales."

368

369−#: qml/Shell.qml:368

369+#: qml/Shell.qml:395

370msgid ""

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

372"and all personal data will be deleted."

@@ -374,28 +374,8 @@ msgstr ""

374"Si se introduce el código incorrectamente, el teléfono volverá a la "

375"configuración de fábrica y se perderán todos los datos personales."

376

377−#~ msgid "Hello"

377+#~ msgid "Enter SIM PIN"

378−#~ msgstr "Hola"

379−

380−#, qt-format

381−#~ msgid "Hello %1"

382−#~ msgstr "Hola, %1"

383−

384−#~ msgid "Swipe to unlock"

385−#~ msgstr "Deslice para desbloquear"

386−

387−#~ msgid "Please wait"

388−#~ msgstr "Espere un momento"

389−

390−#~ msgid "Too many incorrect attempts"

391−#~ msgstr "Demasiados intentos incorrectos"

392−

393−#, qt-format

394−#~ msgid "Enter your %1"

395−#~ msgstr "Introduzca su %1"

396−

397−#~ msgid "Enter your passcode"

398−#~ msgstr "Escriba su código de acceso"

378+#~ msgstr "Escriba el PIN de la SIM"

399

379

400−#~ msgid "Enter your passphrase"

380+#~ msgid "Sorry, incorrect PIN"

401−#~ msgstr "Escriba su contraseña"

381+#~ msgstr "El PIN es incorrecto"

po/eu.po+33−53

@@ -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-07 11:37+0300\n"

11−"PO-Revision-Date: 2014-10-04 01:50+0000\n"

11+"PO-Revision-Date: 2014-10-07 19:21+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-05 06:38+0000\n"

18+"X-Launchpad-Export-Date: 2014-10-09 06:36+0000\n"

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

20

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

@@ -160,23 +160,23 @@ msgstr ""

160"Jadanik ezagutzen dituzu ertzetako keinuak, eta mugikorra erabiltzen has "

161"zaitezke Sakatu pantailan hasteko"

162

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

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

164msgid "Emergency Call"

165msgstr "Larrialdi-deia"

166

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

167+#: qml/Components/Lockscreen.qml:252

168msgid "OK"

169msgstr "Ados"

170

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

171+#: qml/Dash/GenericScopeView.qml:434 qml/Dash/GenericScopeView.qml:591

172msgid "See less"

173msgstr "Ikusi gutxiago"

174

175−#: qml/Dash/GenericScopeView.qml:411

175+#: qml/Dash/GenericScopeView.qml:434

176msgid "See all"

177msgstr "Ikusi guztiak"

178

179−#: qml/Dash/GenericScopeView.qml:473 qml/Dash/PageHeader.qml:258

179+#: qml/Dash/GenericScopeView.qml:496 qml/Dash/PageHeader.qml:258

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

181msgid "Search"

182msgstr "Bilatu"

@@ -213,6 +213,14 @@ msgstr "Gehitu kritika"

213msgid "Send"

214msgstr "Bidali"

215

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

217+msgid "Pull to refresh…"

218+msgstr "Tiratu freskatzeko…"

219+

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

221+msgid "Release to refresh…"

222+msgstr "Askatu freskatzeko…"

223+

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

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

217msgid "Manage Scopes"

225msgid "Manage Scopes"

218msgstr "Kudeatu eremuak"

226msgstr "Kudeatu eremuak"

@@ -257,18 +265,10 @@ msgstr "Hitz egin orain..."

257msgid "Speaking..."

265msgid "Speaking..."

258msgstr "Hitz egiten..."

266msgstr "Hitz egiten..."

259

267

260−#: qml/Notifications/NotificationMenuItemFactory.qml:108

268+#: qml/Notifications/NotificationMenuItemFactory.qml:116

261msgid "Show password"

269msgid "Show password"

262msgstr "Erakutsi pasahitza"

270msgstr "Erakutsi pasahitza"

263

271

264−#: qml/Notifications/NotificationMenuItemFactory.qml:124

265−msgid "Enter SIM PIN"

266−msgstr "Sartu SIMaren PINa"

267−

268−#: qml/Notifications/NotificationMenuItemFactory.qml:125

269−msgid "Sorry, incorrect PIN"

270−msgstr "Sentitzen dugu, PINa okerrekoa da"

271−

272#: qml/Panel/ActiveCallHint.qml:77

273msgid "Tap to return to call..."

274msgstr "Sakatu deira itzultzeko..."

@@ -313,49 +313,49 @@ msgstr "Desblokeatu SIMa"

313msgid "Roaming"

314msgstr "Ibiltaritza"

315

316−#: qml/Shell.qml:340

316+#: qml/Shell.qml:346

317msgid "Enter passphrase"

318msgstr "Sartu pasaesaldia"

319

320−#: qml/Shell.qml:321

320+#: qml/Shell.qml:347

321msgid "Sorry, incorrect passphrase"

322msgstr "Sentitzen dugu, pasaesaldia okerrekoa da"

323

324−#: qml/Shell.qml:342

324+#: qml/Shell.qml:348

325msgid "Please re-enter"

326msgstr "Errepikatu"

327

328−#: qml/Shell.qml:344

328+#: qml/Shell.qml:350

329msgid "Enter passcode"

330msgstr "Sartu pasakodea"

331

332−#: qml/Shell.qml:324

332+#: qml/Shell.qml:351

333msgid "Sorry, incorrect passcode"

334msgstr "Sentitzen dugu, pasakodea okerrekoa da"

335

336−#: qml/Shell.qml:348

336+#: qml/Shell.qml:354

337#, qt-format

338msgid "Enter %1"

339msgstr "Sartu %1"

340

341−#: qml/Shell.qml:328

341+#: qml/Shell.qml:355

342#, qt-format

343msgid "Sorry, incorrect %1"

344msgstr "Sentitzen dugu, %1 okerrekoa da"

345

346−#: qml/Shell.qml:363

346+#: qml/Shell.qml:390

347msgid "Sorry, incorrect passphrase."

348msgstr "Sentitzen dugu, pasaesaldia okerrekoa da."

349

350−#: qml/Shell.qml:364

350+#: qml/Shell.qml:391

351msgid "Sorry, incorrect passcode."

352msgstr "Sentitzen dugu, pasakodea okerrekoa da."

353

354−#: qml/Shell.qml:365

354+#: qml/Shell.qml:392

355msgid "This will be your last attempt."

356msgstr "Hau duzu azken saiakera."

357

358−#: qml/Shell.qml:367

358+#: qml/Shell.qml:394

359msgid ""

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

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

@@ -363,7 +363,7 @@ msgstr ""

363"Okerreko pasaesaldia sartzen baduzu, telefonoaren jatorrizko ezarpenak "

364"berrezarri eta datu pertsonal guztiak ezabatuko dira."

365

366−#: qml/Shell.qml:368

366+#: qml/Shell.qml:395

367msgid ""

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

369"and all personal data will be deleted."

@@ -371,28 +371,8 @@ msgstr ""

371"Okerreko pasakodea sartzen baduzu, telefonoaren jatorrizko ezarpenak "

372"berrezarri eta datu pertsonal guztiak ezabatuko dira."

373

374−#, qt-format

374+#~ msgid "Sorry, incorrect PIN"

375−#~ msgid "Hello %1"

375+#~ msgstr "Sentitzen dugu, PINa okerrekoa da"

376−#~ msgstr "Kaixo %1"

377−

378−#~ msgid "Hello"

379−#~ msgstr "Kaixo"

380−

381−#~ msgid "Swipe to unlock"

382−#~ msgstr "Pasatu hatza desblokeatzeko"

383−

384−#~ msgid "Please wait"

385−#~ msgstr "Itxaron"

386−

387−#~ msgid "Too many incorrect attempts"

388−#~ msgstr "Okerreko saiakera gehiegi"

389

376

390−#~ msgid "Enter your passphrase"

377+#~ msgid "Enter SIM PIN"

391−#~ msgstr "Sartu pasaesaldia"

392−

393−#~ msgid "Enter your passcode"

394−#~ msgstr "Sartu pasakodea"

378+#~ msgstr "Sartu SIMaren PINa"

395−

396−#, qt-format

397−#~ msgid "Enter your %1"

398−#~ msgstr "Sartu %1"

po/fa.po+32−55

@@ -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-07 11:37+0300\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-09 06:36+0000\n"

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

20

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

@@ -156,23 +156,23 @@ msgstr ""

156"هم اکنون در استفاده از ژست های حرکتی مهارت لازم را دارید و می‌توانید استفاده "

157"از تلفن را آغاز کنید برای شروع صفحه را لمس کنید"

158

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

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

160msgid "Emergency Call"

161msgstr "تماس اضطراری"

162

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

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

164msgid "OK"

165msgstr "قبول"

166

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

167+#: qml/Dash/GenericScopeView.qml:434 qml/Dash/GenericScopeView.qml:591

168msgid "See less"

169msgstr "کم‌تر ببینید"

170

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

171+#: qml/Dash/GenericScopeView.qml:434

172msgid "See all"

173msgstr "دیدن همه"

174

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

175+#: qml/Dash/GenericScopeView.qml:496 qml/Dash/PageHeader.qml:258

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

177msgid "Search"

178msgstr "جست‌وجو"

@@ -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 "مدیریت حوزه‌ها"

@@ -253,18 +261,10 @@ msgstr "اکنون صحبت کنید…"

253msgid "Speaking..."

261msgid "Speaking..."

254msgstr "در حال صحبت کردن…"

262msgstr "در حال صحبت کردن…"

255

263

256−#: qml/Notifications/NotificationMenuItemFactory.qml:108

264+#: qml/Notifications/NotificationMenuItemFactory.qml:116

257msgid "Show password"

265msgid "Show password"

258msgstr "نمایش گذرواژه"

266msgstr "نمایش گذرواژه"

259

267

260−#: qml/Notifications/NotificationMenuItemFactory.qml:124

261−msgid "Enter SIM PIN"

262−msgstr "PIN سیم‌کارت را وارد کنید"

263−

264−#: qml/Notifications/NotificationMenuItemFactory.qml:125

265−msgid "Sorry, incorrect PIN"

266−msgstr "متأسّفیم، PIN نادرست بود"

267−

268#: qml/Panel/ActiveCallHint.qml:77

269msgid "Tap to return to call..."

270msgstr "برای بازگشت به تماس ضربه بزنید…"

@@ -309,49 +309,49 @@ msgstr "باز کردن قفل سیم‌کارت"

309msgid "Roaming"

310msgstr "رومینگ"

311

312−#: qml/Shell.qml:340

312+#: qml/Shell.qml:346

313msgid "Enter passphrase"

314msgstr "عبارت‌عبور را وارد کنید"

315

316−#: qml/Shell.qml:321

316+#: qml/Shell.qml:347

317msgid "Sorry, incorrect passphrase"

318msgstr "متأسّفیم، عبارت‌عبور نادرست بود"

319

320−#: qml/Shell.qml:342

320+#: qml/Shell.qml:348

321msgid "Please re-enter"

322msgstr "لطفاً دوباره وارد کنید"

323

324−#: qml/Shell.qml:344

324+#: qml/Shell.qml:350

325msgid "Enter passcode"

326msgstr "رمزعبور را وارد کنید"

327

328−#: qml/Shell.qml:324

328+#: qml/Shell.qml:351

329msgid "Sorry, incorrect passcode"

330msgstr "متأسّفیم، رمزعبور نادرست بود"

331

332−#: qml/Shell.qml:348

332+#: qml/Shell.qml:354

333#, qt-format

334msgid "Enter %1"

335msgstr "%1 را وارد کنید"

336

337−#: qml/Shell.qml:328

337+#: qml/Shell.qml:355

338#, qt-format

339msgid "Sorry, incorrect %1"

340msgstr "متأسّفیم، %1 نادرست بود"

341

342−#: qml/Shell.qml:363

342+#: qml/Shell.qml:390

343msgid "Sorry, incorrect passphrase."

344msgstr "متأسّفیم، عبارت‌عبور نادرست است."

345

346−#: qml/Shell.qml:364

346+#: qml/Shell.qml:391

347msgid "Sorry, incorrect passcode."

348msgstr "متأسّفیم، رمزعبور نادرست است."

349

350−#: qml/Shell.qml:365

350+#: qml/Shell.qml:392

351msgid "This will be your last attempt."

352msgstr "این آخرین تلاش شما خواهد بود."

353

354−#: qml/Shell.qml:367

354+#: qml/Shell.qml:394

355msgid ""

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

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

@@ -359,7 +359,7 @@ msgstr ""

359"اگر عبارت‌عبور نادرست وارد شود، تلفن شما بازنشانی کارخانه خواهد شد و تمامی "

360"اطّلاعات شخصی حذف خواهند شد."

361

362−#: qml/Shell.qml:368

362+#: qml/Shell.qml:395

363msgid ""

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

365"and all personal data will be deleted."

@@ -367,31 +367,8 @@ msgstr ""

367"اگر رمزعبور نادرست وارد شود، تلفن شما بازنشانی کارخانه خواهد شد و تمامی "

368"اطّلاعات شخصی حذف خواهند شد."

369

370−#, qt-format

370+#~ msgid "Sorry, incorrect PIN"

371−#~ msgid "Hello %1"

371+#~ msgstr "متأسّفیم، PIN نادرست بود"

372−#~ msgstr "سلام %1"

373−

374−#~ msgid "Hello"

375−#~ msgstr "سلام"

376−

377−#~ msgid "Swipe to unlock"

378−#~ msgstr "برای باز کردن قفل بکشد"

379−

380−#~ msgid "Manage Dash"

381−#~ msgstr "مدیریت دش"

382−

383−#~ msgid "Please wait"

384−#~ msgstr "لطفاً صبر کنید"

385−

386−#~ msgid "Too many incorrect attempts"

387−#~ msgstr "تلاش‌های ناموفّق زیاد"

388−

389−#, qt-format

390−#~ msgid "Enter your %1"

391−#~ msgstr "%1 خود را وارد کنید"

392−

393−#~ msgid "Enter your passphrase"

394−#~ msgstr "عبارت‌عبورتان را وارد کنید"

395

372

396−#~ msgid "Enter your passcode"

373+#~ msgid "Enter SIM PIN"

397−#~ msgstr "رمزعبورتان را وارد کنید"

374+#~ msgstr "PIN سیم‌کارت را وارد کنید"

po/fi.po+33−53

@@ -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-07 11:37+0300\n"

11−"PO-Revision-Date: 2014-10-04 08:00+0000\n"

11+"PO-Revision-Date: 2014-10-07 13:10+0000\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-05 06:38+0000\n"

18+"X-Launchpad-Export-Date: 2014-10-09 06:36+0000\n"

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

20

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

@@ -158,23 +158,23 @@ msgstr ""

158"Hallitset nyt reunaeleet, joten voit aloittaa puhelimen "

159"käytön Napauta näyttöä aloittaaksesi"

160

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

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

162msgid "Emergency Call"

163msgstr "Hätäpuhelu"

164

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

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

166msgid "OK"

167msgstr "OK"

168

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

169+#: qml/Dash/GenericScopeView.qml:434 qml/Dash/GenericScopeView.qml:591

170msgid "See less"

171msgstr "Näytä vähemmän"

172

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

173+#: qml/Dash/GenericScopeView.qml:434

174msgid "See all"

175msgstr "Näytä kaikki"

176

177−#: qml/Dash/GenericScopeView.qml:473 qml/Dash/PageHeader.qml:258

177+#: qml/Dash/GenericScopeView.qml:496 qml/Dash/PageHeader.qml:258

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

179msgid "Search"

180msgstr "Hae"

@@ -211,6 +211,14 @@ msgstr "Lisää arvostelu"

211msgid "Send"

212msgstr "Lähetä"

213

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

215+msgid "Pull to refresh…"

216+msgstr "Vedä päivittääksesi…"

217+

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

219+msgid "Release to refresh…"

220+msgstr "Vapauta päivittääksesi…"

221+

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

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

215msgid "Manage Scopes"

223msgid "Manage Scopes"

216msgstr "Näkymien hallinta"

224msgstr "Näkymien hallinta"

@@ -255,18 +263,10 @@ msgstr "Puhu nyt..."

255msgid "Speaking..."

263msgid "Speaking..."

256msgstr "Puhutaan..."

264msgstr "Puhutaan..."

257

265

258−#: qml/Notifications/NotificationMenuItemFactory.qml:108

266+#: qml/Notifications/NotificationMenuItemFactory.qml:116

259msgid "Show password"

267msgid "Show password"

260msgstr "Näytä salasana"

268msgstr "Näytä salasana"

261

269

262−#: qml/Notifications/NotificationMenuItemFactory.qml:124

263−msgid "Enter SIM PIN"

264−msgstr "Anna SIM-kortin PIN-koodi"

265−

266−#: qml/Notifications/NotificationMenuItemFactory.qml:125

267−msgid "Sorry, incorrect PIN"

268−msgstr "Väärä PIN-koodi"

269−

270#: qml/Panel/ActiveCallHint.qml:77

271msgid "Tap to return to call..."

272msgstr "Napauta palataksesi puheluun..."

@@ -311,49 +311,49 @@ msgstr "Avaa SIM-kortin lukitus"

311msgid "Roaming"

312msgstr "Verkkovierailu"

313

314−#: qml/Shell.qml:340

314+#: qml/Shell.qml:346

315msgid "Enter passphrase"

316msgstr "Anna tunnuslause"

317

318−#: qml/Shell.qml:321

318+#: qml/Shell.qml:347

319msgid "Sorry, incorrect passphrase"

320msgstr "Virheellinen tunnuslause"

321

322−#: qml/Shell.qml:342

322+#: qml/Shell.qml:348

323msgid "Please re-enter"

324msgstr "Anna uudelleen"

325

326−#: qml/Shell.qml:344

326+#: qml/Shell.qml:350

327msgid "Enter passcode"

328msgstr "Anna suojakoodi"

329

330−#: qml/Shell.qml:324

330+#: qml/Shell.qml:351

331msgid "Sorry, incorrect passcode"

332msgstr "Väärä suojakoodi"

333

334−#: qml/Shell.qml:348

334+#: qml/Shell.qml:354

335#, qt-format

336msgid "Enter %1"

337msgstr "Anna %1"

338

339−#: qml/Shell.qml:328

339+#: qml/Shell.qml:355

340#, qt-format

341msgid "Sorry, incorrect %1"

342msgstr "Väärä %1"

343

344−#: qml/Shell.qml:363

344+#: qml/Shell.qml:390

345msgid "Sorry, incorrect passphrase."

346msgstr "Virheellinen tunnuslause."

347

348−#: qml/Shell.qml:364

348+#: qml/Shell.qml:391

349msgid "Sorry, incorrect passcode."

350msgstr "Virheellinen suojakoodi."

351

352−#: qml/Shell.qml:365

352+#: qml/Shell.qml:392

353msgid "This will be your last attempt."

354msgstr "Tämä on viimeinen yritys."

355

356−#: qml/Shell.qml:367

356+#: qml/Shell.qml:394

357msgid ""

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

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

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

361"Jos kirjoitat tunnuslauseen virheellisesti, puhelimesi palautetaan "

362"tehdastilaan ja kaikki henkilökohtaiset tietosi poistetaan."

363

364−#: qml/Shell.qml:368

364+#: qml/Shell.qml:395

365msgid ""

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

367"and all personal data will be deleted."

@@ -369,28 +369,8 @@ msgstr ""

369"Jos kirjoitat suojakoodin virheellisesti, puhelimesi palautetaan "

370"tehdastilaan ja kaikki henkilökohtaiset tietosi poistetaan."

371

372−#~ msgid "Hello"

372+#~ msgid "Sorry, incorrect PIN"

373−#~ msgstr "Hei"

373+#~ msgstr "Väärä PIN-koodi"

374−

375−#, qt-format

376−#~ msgid "Hello %1"

377−#~ msgstr "Hei %1!"

378−

379−#~ msgid "Swipe to unlock"

380−#~ msgstr "Avaa pyyhkäisemällä"

381−

382−#~ msgid "Please wait"

383−#~ msgstr "Odota hetki"

384−

385−#~ msgid "Too many incorrect attempts"

386−#~ msgstr "Liian monta virheellistä yritystä"

387−

388−#, qt-format

389−#~ msgid "Enter your %1"

390−#~ msgstr "Anna %1"

391−

392−#~ msgid "Enter your passphrase"

393−#~ msgstr "Anna tunnuslause"

394

374

395−#~ msgid "Enter your passcode"

375+#~ msgid "Enter SIM PIN"

396−#~ msgstr "Anna suojakoodi"

376+#~ msgstr "Anna SIM-kortin PIN-koodi"

po/fo.po+28−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-07 11:37+0300\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-09 06:36+0000\n"

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

20

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

@@ -152,23 +152,23 @@ msgid ""

152"phone Tap on the screen to start"

153msgstr ""

154

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

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

156msgid "Emergency Call"

157msgstr ""

158

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

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

160msgid "OK"

161msgstr ""

162

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

163+#: qml/Dash/GenericScopeView.qml:434 qml/Dash/GenericScopeView.qml:591

164msgid "See less"

165msgstr ""

166

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

167+#: qml/Dash/GenericScopeView.qml:434

168msgid "See all"

169msgstr ""

170

171−#: qml/Dash/GenericScopeView.qml:473 qml/Dash/PageHeader.qml:258

171+#: qml/Dash/GenericScopeView.qml:496 qml/Dash/PageHeader.qml:258

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

173msgid "Search"

174msgstr "Leita"

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

@@ -249,18 +257,10 @@ msgstr "Snakka nú..."

249msgid "Speaking..."

257msgid "Speaking..."

250msgstr "Snakkar..."

258msgstr "Snakkar..."

251

259

252−#: qml/Notifications/NotificationMenuItemFactory.qml:108

260+#: qml/Notifications/NotificationMenuItemFactory.qml:116

253msgid "Show password"

261msgid "Show password"

254msgstr ""

262msgstr ""

255

263

256−#: qml/Notifications/NotificationMenuItemFactory.qml:124

257−msgid "Enter SIM PIN"

258−msgstr ""

259−

260−#: qml/Notifications/NotificationMenuItemFactory.qml:125

261−msgid "Sorry, incorrect PIN"

262−msgstr ""

263−

264#: qml/Panel/ActiveCallHint.qml:77

265msgid "Tap to return to call..."

266msgstr ""

@@ -305,55 +305,55 @@ msgstr ""

305msgid "Roaming"

306msgstr ""

307

308−#: qml/Shell.qml:340

308+#: qml/Shell.qml:346

309msgid "Enter passphrase"

310msgstr ""

311

312−#: qml/Shell.qml:321

312+#: qml/Shell.qml:347

313msgid "Sorry, incorrect passphrase"

314msgstr ""

315

316−#: qml/Shell.qml:342

316+#: qml/Shell.qml:348

317msgid "Please re-enter"

318msgstr ""

319

320−#: qml/Shell.qml:344

320+#: qml/Shell.qml:350

321msgid "Enter passcode"

322msgstr ""

323

324−#: qml/Shell.qml:324

324+#: qml/Shell.qml:351

325msgid "Sorry, incorrect passcode"

326msgstr ""

327

328−#: qml/Shell.qml:348

328+#: qml/Shell.qml:354

329#, qt-format

330msgid "Enter %1"

331msgstr ""

332

333−#: qml/Shell.qml:328

333+#: qml/Shell.qml:355

334#, qt-format

335msgid "Sorry, incorrect %1"

336msgstr ""

337

338−#: qml/Shell.qml:363

338+#: qml/Shell.qml:390

339msgid "Sorry, incorrect passphrase."

340msgstr ""

341

342−#: qml/Shell.qml:364

342+#: qml/Shell.qml:391

343msgid "Sorry, incorrect passcode."

344msgstr ""

345

346−#: qml/Shell.qml:365

346+#: qml/Shell.qml:392

347msgid "This will be your last attempt."

348msgstr ""

349

350−#: qml/Shell.qml:367

350+#: qml/Shell.qml:394

351msgid ""

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

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

354msgstr ""

355

356−#: qml/Shell.qml:368

356+#: qml/Shell.qml:395

357msgid ""

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

359"and all personal data will be deleted."

po/fr.po+48−67

@@ -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-07 11:37+0300\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-09 06:36+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,23 +167,23 @@ 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:220

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:252

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:434 qml/Dash/GenericScopeView.qml:591

175msgid "See less"

179msgid "See less"

176msgstr "Voir moins"

180msgstr "Voir moins"

177

181

178−#: qml/Dash/GenericScopeView.qml:411

182+#: qml/Dash/GenericScopeView.qml:434

179msgid "See all"

183msgid "See all"

180msgstr "Tout voir"

184msgstr "Tout voir"

181

185

182−#: qml/Dash/GenericScopeView.qml:473 qml/Dash/PageHeader.qml:258

186+#: qml/Dash/GenericScopeView.qml:496 qml/Dash/PageHeader.qml:258

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

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

184msgid "Search"

188msgid "Search"

185msgstr "Rechercher"

189msgstr "Rechercher"

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

@@ -260,18 +272,10 @@ msgstr "Parlez maintenant…"

260msgid "Speaking..."

272msgid "Speaking..."

261msgstr "En cours d'écoute..."

273msgstr "En cours d'écoute..."

262

274

263−#: qml/Notifications/NotificationMenuItemFactory.qml:108

275+#: qml/Notifications/NotificationMenuItemFactory.qml:116

264msgid "Show password"

276msgid "Show password"

265msgstr "Afficher le mot de passe"

277msgstr "Afficher le mot de passe"

266

278

267−#: qml/Notifications/NotificationMenuItemFactory.qml:124

268−msgid "Enter SIM PIN"

269−msgstr "Entrez le code PIN de la SIM"

270−

271−#: qml/Notifications/NotificationMenuItemFactory.qml:125

272−msgid "Sorry, incorrect PIN"

273−msgstr "Désolé, code PIN incorrect"

274−

275#: qml/Panel/ActiveCallHint.qml:77

279#: qml/Panel/ActiveCallHint.qml:77

276msgid "Tap to return to call..."

280msgid "Tap to return to call..."

277msgstr "Appuyez pour revenir à l'appel…"

281msgstr "Appuyez pour revenir à l'appel…"

@@ -282,7 +286,7 @@ msgstr "Conférence"

282

286

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

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

284msgid "Nothing is playing"

288msgid "Nothing is playing"

285−msgstr ""

289+msgstr "Rien n'est en cours de lecture"

286

290

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

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

288msgid "In queue…"

292msgid "In queue…"

@@ -316,49 +320,49 @@ msgstr "Déverrouiller la carte SIM"

316msgid "Roaming"

320msgid "Roaming"

317msgstr "Roaming"

321msgstr "Roaming"

318

322

319−#: qml/Shell.qml:340

323+#: qml/Shell.qml:346

320msgid "Enter passphrase"

324msgid "Enter passphrase"

321−msgstr ""

325+msgstr "Saisissez la phrase de passe"

322

326

323−#: qml/Shell.qml:321

327+#: qml/Shell.qml:347

324msgid "Sorry, incorrect passphrase"

328msgid "Sorry, incorrect passphrase"

325msgstr "Désolé, phrase secrète incorrecte"

329msgstr "Désolé, phrase secrète incorrecte"

326

330

327−#: qml/Shell.qml:342

331+#: qml/Shell.qml:348

328msgid "Please re-enter"

332msgid "Please re-enter"

329−msgstr ""

333+msgstr "Veuillez ressaisir"

330

334

331−#: qml/Shell.qml:344

335+#: qml/Shell.qml:350

332msgid "Enter passcode"

336msgid "Enter passcode"

333−msgstr ""

337+msgstr "Saisissez le mot de passe"

334

338

335−#: qml/Shell.qml:324

339+#: qml/Shell.qml:351

336msgid "Sorry, incorrect passcode"

340msgid "Sorry, incorrect passcode"

337msgstr "Désolé, code incorrect"

341msgstr "Désolé, code incorrect"

338

342

339−#: qml/Shell.qml:348

343+#: qml/Shell.qml:354

340#, qt-format

344#, qt-format

341msgid "Enter %1"

345msgid "Enter %1"

342−msgstr ""

346+msgstr "Saisissez %1"

343

347

344−#: qml/Shell.qml:328

348+#: qml/Shell.qml:355

345#, qt-format

349#, qt-format

346msgid "Sorry, incorrect %1"

350msgid "Sorry, incorrect %1"

347msgstr "Désolé, %1 incorrect"

351msgstr "Désolé, %1 incorrect"

348

352

349−#: qml/Shell.qml:363

353+#: qml/Shell.qml:390

350msgid "Sorry, incorrect passphrase."

354msgid "Sorry, incorrect passphrase."

351msgstr "Désolé, phrase secrète incorrecte."

355msgstr "Désolé, phrase secrète incorrecte."

352

356

353−#: qml/Shell.qml:364

357+#: qml/Shell.qml:391

354msgid "Sorry, incorrect passcode."

358msgid "Sorry, incorrect passcode."

355msgstr "Désolé, code incorrect."

359msgstr "Désolé, code incorrect."

356

360

357−#: qml/Shell.qml:365

361+#: qml/Shell.qml:392

358msgid "This will be your last attempt."

362msgid "This will be your last attempt."

359msgstr "Ceci sera votre dernière tentative."

363msgstr "Ceci sera votre dernière tentative."

360

364

361−#: qml/Shell.qml:367

365+#: qml/Shell.qml:394

362msgid ""

366msgid ""

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

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

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

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

@@ -367,7 +371,7 @@ msgstr ""

367"effectuera une réinitialisation aux paramètres d'usine et toutes les données "

371"effectuera une réinitialisation aux paramètres d'usine et toutes les données "

368"personnelles seront supprimées."

372"personnelles seront supprimées."

369

373

370−#: qml/Shell.qml:368

374+#: qml/Shell.qml:395

371msgid ""

375msgid ""

372"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 "

373"and all personal data will be deleted."

377"and all personal data will be deleted."

@@ -376,31 +380,8 @@ msgstr ""

376"réinitialisation aux paramètres d'usine et toutes les données personnelles "

380"réinitialisation aux paramètres d'usine et toutes les données personnelles "

377"seront supprimées."

381"seront supprimées."

378

382

379−#~ msgid "Hello"

383+#~ msgid "Sorry, incorrect PIN"

380−#~ msgstr "Bonjour"

384+#~ msgstr "Désolé, code PIN incorrect"

381−

382−#, qt-format

383−#~ msgid "Hello %1"

384−#~ msgstr "Bonjour %1"

385−

386−#~ msgid "Swipe to unlock"

387−#~ msgstr "Faites glisser pour déverrouiller"

388−

389−#~ msgid "Manage Dash"

390−#~ msgstr "Gérer le tableau de bord"

391−

392−#~ msgid "Please wait"

393−#~ msgstr "Veuillez patienter"

394−

395−#~ msgid "Too many incorrect attempts"

396−#~ msgstr "Trop de tentatives incorrectes"

397−

398−#, qt-format

399−#~ msgid "Enter your %1"

400−#~ msgstr "Saisissez votre %1"

401−

402−#~ msgid "Enter your passphrase"

403−#~ msgstr "Entrez votre phrase secrète"

404

385

405−#~ msgid "Enter your passcode"

386+#~ msgid "Enter SIM PIN"

406−#~ msgstr "Entrez votre code"

387+#~ msgstr "Entrez le code PIN de la SIM"

po/gd.po+32−52

@@ -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-07 11:37+0300\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"

@@ -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-04 06:28+0000\n"

19+"X-Launchpad-Export-Date: 2014-10-09 06:36+0000\n"

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

21"Language: gd\n"

22

@@ -170,23 +170,23 @@ msgstr ""

170"Fhuair thu air na gluasadan oire ceart a dhèanamh a-nis agus is urrainn dhut "

171"am fòn a chleachdadh Thoir gnogag air an sgrìn airson tòiseachadh"

172

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

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

174msgid "Emergency Call"

175msgstr "Gairm èiginn"

176

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

177+#: qml/Components/Lockscreen.qml:252

178msgid "OK"

179msgstr "Ceart ma-thà"

180

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

181+#: qml/Dash/GenericScopeView.qml:434 qml/Dash/GenericScopeView.qml:591

182msgid "See less"

183msgstr "Seall nas lugha"

184

185−#: qml/Dash/GenericScopeView.qml:411

185+#: qml/Dash/GenericScopeView.qml:434

186msgid "See all"

187msgstr "Seall na h-uile"

188

189−#: qml/Dash/GenericScopeView.qml:473 qml/Dash/PageHeader.qml:258

189+#: qml/Dash/GenericScopeView.qml:496 qml/Dash/PageHeader.qml:258

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

191msgid "Search"

192msgstr "Lorg"

@@ -223,6 +223,14 @@ msgstr "Cuir lèirmheas ris"

223msgid "Send"

224msgstr "Cuir"

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+

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

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

227msgid "Manage Scopes"

235msgid "Manage Scopes"

228msgstr "Stiùirich na sgòpaichean"

236msgstr "Stiùirich na sgòpaichean"

@@ -267,18 +275,10 @@ msgstr "Can rud a-nis..."

267msgid "Speaking..."

275msgid "Speaking..."

268msgstr "A' bruidhinn..."

276msgstr "A' bruidhinn..."

269

277

270−#: qml/Notifications/NotificationMenuItemFactory.qml:108

278+#: qml/Notifications/NotificationMenuItemFactory.qml:116

271msgid "Show password"

279msgid "Show password"

272msgstr "Seall am facal-faire"

280msgstr "Seall am facal-faire"

273

281

274−#: qml/Notifications/NotificationMenuItemFactory.qml:124

275−msgid "Enter SIM PIN"

276−msgstr "Cuir a-steach PIN an t-SIM"

277−

278−#: qml/Notifications/NotificationMenuItemFactory.qml:125

279−msgid "Sorry, incorrect PIN"

280−msgstr "Duilich ach tha a' PIN cearr"

281−

282#: qml/Panel/ActiveCallHint.qml:77

283msgid "Tap to return to call..."

284msgstr "Gnog gus tilleadh dhan ghairm..."

@@ -323,49 +323,49 @@ msgstr "Thoir a' ghlas far an SIM"

323msgid "Roaming"

324msgstr "Air fàrsan"

325

326−#: qml/Shell.qml:340

326+#: qml/Shell.qml:346

327msgid "Enter passphrase"

328msgstr "Cuir abairt-fhaire a-steach"

329

330−#: qml/Shell.qml:321

330+#: qml/Shell.qml:347

331msgid "Sorry, incorrect passphrase"

332msgstr "Duilich ach tha an abairt-fhaire cearr"

333

334−#: qml/Shell.qml:342

334+#: qml/Shell.qml:348

335msgid "Please re-enter"

336msgstr "Cuir a-steach e a-rithist"

337

338−#: qml/Shell.qml:344

338+#: qml/Shell.qml:350

339msgid "Enter passcode"

340msgstr "Cuir còd-faire a-steach"

341

342−#: qml/Shell.qml:324

342+#: qml/Shell.qml:351

343msgid "Sorry, incorrect passcode"

344msgstr "Duilich ach tha an còd-faire cearr"

345

346−#: qml/Shell.qml:348

346+#: qml/Shell.qml:354

347#, qt-format

348msgid "Enter %1"

349msgstr "Cuir a-steach %1"

350

351−#: qml/Shell.qml:328

351+#: qml/Shell.qml:355

352#, qt-format

353msgid "Sorry, incorrect %1"

354msgstr "Duilich ach tha a' %1 cearr"

355

356−#: qml/Shell.qml:363

356+#: qml/Shell.qml:390

357msgid "Sorry, incorrect passphrase."

358msgstr "Duilich ach tha an abairt-fhaire cearr."

359

360−#: qml/Shell.qml:364

360+#: qml/Shell.qml:391

361msgid "Sorry, incorrect passcode."

362msgstr "Duilich ach tha an còd-faire cearr."

363

364−#: qml/Shell.qml:365

364+#: qml/Shell.qml:392

365msgid "This will be your last attempt."

366msgstr "Seo an oidhirp mu dheireadh agad."

367

368−#: qml/Shell.qml:367

368+#: qml/Shell.qml:394

369msgid ""

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

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

@@ -374,7 +374,7 @@ msgstr ""

374"ath-shuidheachadh air roghainnean an fhactaraidh agus thèid gach dàta "

375"pearsanta a sguabadh às."

376

377−#: qml/Shell.qml:368

377+#: qml/Shell.qml:395

378msgid ""

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

380"and all personal data will be deleted."

@@ -383,28 +383,8 @@ msgstr ""

383"shuidheachadh air roghainnean an fhactaraidh agus thèid gach dàta pearsanta "

384"a sguabadh às."

385

386−#, qt-format

386+#~ msgid "Enter SIM PIN"

387−#~ msgid "Hello %1"

387+#~ msgstr "Cuir a-steach PIN an t-SIM"

388−#~ msgstr "Shin thu, %1"

389−

390−#~ msgid "Hello"

391−#~ msgstr "Shin thu"

392−

393−#~ msgid "Swipe to unlock"

394−#~ msgstr "Dèan grad-shlaighdeadh gus a' ghlas a thoirt dheth"

395−

396−#~ msgid "Please wait"

397−#~ msgstr "Fuirich ort"

398

388

399−#~ msgid "Too many incorrect attempts"

389+#~ msgid "Sorry, incorrect PIN"

400−#~ msgstr "Cus oidhirpean leis nach do shoirbhich"

390+#~ msgstr "Duilich ach tha a' PIN cearr"

401−

402−#~ msgid "Enter your passphrase"

403−#~ msgstr "Cuir an abairt-fhaire agad a-steach"

404−

405−#~ msgid "Enter your passcode"

406−#~ msgstr "Cuir an còd-faire agad a-steach"

407−

408−#, qt-format

409−#~ msgid "Enter your %1"

410−#~ msgstr "Cuir a-steach a' %1 agad"

po/gl.po+33−53

@@ -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-07 11:37+0300\n"

11−"PO-Revision-Date: 2014-10-03 04:55+0000\n"

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

12"Last-Translator: Marcos Lans <Unknown>\n"

13"Language-Team: Galician <gl@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-04 06:28+0000\n"

18+"X-Launchpad-Export-Date: 2014-10-09 06:36+0000\n"

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

20

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

@@ -156,23 +156,23 @@ 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:220

160msgid "Emergency Call"

161msgstr "Chamada de emerxencia"

162

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

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

164msgid "OK"

165msgstr "Aceptar"

166

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

167+#: qml/Dash/GenericScopeView.qml:434 qml/Dash/GenericScopeView.qml:591

168msgid "See less"

169msgstr "Ver menos"

170

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

171+#: qml/Dash/GenericScopeView.qml:434

172msgid "See all"

173msgstr "Ver todo"

174

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

175+#: qml/Dash/GenericScopeView.qml:496 qml/Dash/PageHeader.qml:258

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

177msgid "Search"

178msgstr "Buscar"

@@ -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 "Tirar para actualizar..."

215+

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

217+msgid "Release to refresh…"

218+msgstr "Soltar para actualizar"

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"

@@ -253,18 +261,10 @@ msgstr "Fale agora…"

253msgid "Speaking..."

261msgid "Speaking..."

254msgstr "Falando…"

262msgstr "Falando…"

255

263

256−#: qml/Notifications/NotificationMenuItemFactory.qml:108

264+#: qml/Notifications/NotificationMenuItemFactory.qml:116

257msgid "Show password"

265msgid "Show password"

258msgstr "Mostrar contrasinal"

266msgstr "Mostrar contrasinal"

259

267

260−#: qml/Notifications/NotificationMenuItemFactory.qml:124

261−msgid "Enter SIM PIN"

262−msgstr "Introduza o PIN da SIM"

263−

264−#: qml/Notifications/NotificationMenuItemFactory.qml:125

265−msgid "Sorry, incorrect PIN"

266−msgstr "Sentímolo, o PIN é incorrecto"

267−

268#: qml/Panel/ActiveCallHint.qml:77

269msgid "Tap to return to call..."

270msgstr "Toque para volver a chamar..."

@@ -309,49 +309,49 @@ msgstr "Desbloquear a SIM"

309msgid "Roaming"

310msgstr "Itinerancia"

311

312−#: qml/Shell.qml:340

312+#: qml/Shell.qml:346

313msgid "Enter passphrase"

314msgstr "Introduza a frase secreta"

315

316−#: qml/Shell.qml:321

316+#: qml/Shell.qml:347

317msgid "Sorry, incorrect passphrase"

318msgstr "Sentímolo a frase é incorrecta"

319

320−#: qml/Shell.qml:342

320+#: qml/Shell.qml:348

321msgid "Please re-enter"

322msgstr "Introducir de novo"

323

324−#: qml/Shell.qml:344

324+#: qml/Shell.qml:350

325msgid "Enter passcode"

326msgstr "Introduza a clave"

327

328−#: qml/Shell.qml:324

328+#: qml/Shell.qml:351

329msgid "Sorry, incorrect passcode"

330msgstr "Sentímolo, a clave é incorrecta"

331

332−#: qml/Shell.qml:348

332+#: qml/Shell.qml:354

333#, qt-format

334msgid "Enter %1"

335msgstr "Introducir %1"

336

337−#: qml/Shell.qml:328

337+#: qml/Shell.qml:355

338#, qt-format

339msgid "Sorry, incorrect %1"

340msgstr "Sentímolo, %1 non coincide"

341

342−#: qml/Shell.qml:363

342+#: qml/Shell.qml:390

343msgid "Sorry, incorrect passphrase."

344msgstr "Sentímolo a frase é incorrecta."

345

346−#: qml/Shell.qml:364

346+#: qml/Shell.qml:391

347msgid "Sorry, incorrect passcode."

348msgstr "Sentímolo, a clave é incorrecta."

349

350−#: qml/Shell.qml:365

350+#: qml/Shell.qml:392

351msgid "This will be your last attempt."

352msgstr "Este será o seu último intento."

353

354−#: qml/Shell.qml:367

354+#: qml/Shell.qml:394

355msgid ""

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

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

@@ -359,7 +359,7 @@ msgstr ""

359"Se a frase de paso introducida é incorrecta, o teléfono restabelecerá os "

360"valores de fábrica e perderá todos os datos persoais."

361

362−#: qml/Shell.qml:368

362+#: qml/Shell.qml:395

363msgid ""

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

365"and all personal data will be deleted."

@@ -367,28 +367,8 @@ msgstr ""

367"Se a clave introducida é incorrecta, o teléfono restabelecerá os valores de "

368"fábrica e perderá todos os datos persoais."

369

370−#, qt-format

370+#~ msgid "Sorry, incorrect PIN"

371−#~ msgid "Hello %1"

371+#~ msgstr "Sentímolo, o PIN é incorrecto"

372−#~ msgstr "Ola %1"

373−

374−#~ msgid "Hello"

375−#~ msgstr "Ola"

376−

377−#~ msgid "Swipe to unlock"

378−#~ msgstr "Esvare o dedo para desbloquear"

379−

380−#~ msgid "Please wait"

381−#~ msgstr "Agarde"

382−

383−#~ msgid "Too many incorrect attempts"

384−#~ msgstr "Demasiados erros"

385−

386−#, qt-format

387−#~ msgid "Enter your %1"

388−#~ msgstr "Introducir %1"

389−

390−#~ msgid "Enter your passcode"

391−#~ msgstr "Introduza a clave"

392

372

393−#~ msgid "Enter your passphrase"

373+#~ msgid "Enter SIM PIN"

394−#~ msgstr "Introduza a frase secreta"

374+#~ msgstr "Introduza o PIN da SIM"

po/he.po+28−47

@@ -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-07 11:37+0300\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-09 06:36+0000\n"

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

20

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

@@ -154,23 +154,23 @@ msgstr ""

154"ברגעים אלו סיימת את התמחותך בשימוש במחוות קצה והטלפון פתוח לשימושך נא "

155"לגעת במסך כדי להתחיל"

156

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

157+#: qml/Components/Lockscreen.qml:220

158msgid "Emergency Call"

159msgstr "שיחת חירום"

160

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

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

162msgid "OK"

163msgstr "אישור"

164

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

165+#: qml/Dash/GenericScopeView.qml:434 qml/Dash/GenericScopeView.qml:591

166msgid "See less"

167msgstr "לראות פחות"

168

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

169+#: qml/Dash/GenericScopeView.qml:434

170msgid "See all"

171msgstr "להציג הכול"

172

173−#: qml/Dash/GenericScopeView.qml:473 qml/Dash/PageHeader.qml:258

173+#: qml/Dash/GenericScopeView.qml:496 qml/Dash/PageHeader.qml:258

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

175msgid "Search"

176msgstr "חיפוש"

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

@@ -251,18 +259,10 @@ msgstr "יש לדבר כעת..."

251msgid "Speaking..."

259msgid "Speaking..."

252msgstr "הדיבור מושמע…"

260msgstr "הדיבור מושמע…"

253

261

254−#: qml/Notifications/NotificationMenuItemFactory.qml:108

262+#: qml/Notifications/NotificationMenuItemFactory.qml:116

255msgid "Show password"

263msgid "Show password"

256msgstr "הצגת הססמה"

264msgstr "הצגת הססמה"

257

265

258−#: qml/Notifications/NotificationMenuItemFactory.qml:124

259−msgid "Enter SIM PIN"

260−msgstr ""

261−

262−#: qml/Notifications/NotificationMenuItemFactory.qml:125

263−msgid "Sorry, incorrect PIN"

264−msgstr ""

265−

266#: qml/Panel/ActiveCallHint.qml:77

267msgid "Tap to return to call..."

268msgstr "יש לגעת כדי להחזיר שיחה…"

@@ -307,75 +307,56 @@ msgstr ""

307msgid "Roaming"

308msgstr "נדידה"

309

310−#: qml/Shell.qml:340

310+#: qml/Shell.qml:346

311msgid "Enter passphrase"

312msgstr ""

313

314−#: qml/Shell.qml:321

314+#: qml/Shell.qml:347

315msgid "Sorry, incorrect passphrase"

316msgstr "מילת הצופן שגויה, עמך הסליחה."

317

318−#: qml/Shell.qml:342

318+#: qml/Shell.qml:348

319msgid "Please re-enter"

320msgstr ""

321

322−#: qml/Shell.qml:344

322+#: qml/Shell.qml:350

323msgid "Enter passcode"

324msgstr ""

325

326−#: qml/Shell.qml:324

326+#: qml/Shell.qml:351

327msgid "Sorry, incorrect passcode"

328msgstr ""

329

330−#: qml/Shell.qml:348

330+#: qml/Shell.qml:354

331#, qt-format

332msgid "Enter %1"

333msgstr ""

334

335−#: qml/Shell.qml:328

335+#: qml/Shell.qml:355

336#, qt-format

337msgid "Sorry, incorrect %1"

338msgstr ""

339

340−#: qml/Shell.qml:363

340+#: qml/Shell.qml:390

341msgid "Sorry, incorrect passphrase."

342msgstr "מילת הצופן שגויה, עמך הסליחה."

343

344−#: qml/Shell.qml:364

344+#: qml/Shell.qml:391

345msgid "Sorry, incorrect passcode."

346msgstr "הצופן שגוי, עם הסליחה."

347

348−#: qml/Shell.qml:365

348+#: qml/Shell.qml:392

349msgid "This will be your last attempt."

350msgstr "זה יהיה הניסיון האחרון שלך."

351

352−#: qml/Shell.qml:367

352+#: qml/Shell.qml:394

353msgid ""

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

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

356msgstr ""

357

358−#: qml/Shell.qml:368

358+#: qml/Shell.qml:395

359msgid ""

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

361"and all personal data will be deleted."

362msgstr ""

363−

364−#, qt-format

365−#~ msgid "Hello %1"

366−#~ msgstr "שלום %1"

367−

368−#~ msgid "Hello"

369−#~ msgstr "שלום"

370−

371−#~ msgid "Swipe to unlock"

372−#~ msgstr "יש להחליק לפתיחה"

373−

374−#~ msgid "Please wait"

375−#~ msgstr "נא להמתין"

376−

377−#~ msgid "Enter your passphrase"

378−#~ msgstr "נא להזין את מילת הצופן שלך"

379−

380−#~ msgid "Too many incorrect attempts"

381−#~ msgstr "יותר מדי ניסיונות שגויים"

po/hi.po+28−31

@@ -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-07 11:37+0300\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-09 06:36+0000\n"

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

20

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

@@ -152,23 +152,23 @@ msgid ""

152"phone Tap on the screen to start"

153msgstr ""

154

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

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

156msgid "Emergency Call"

157msgstr "आपातकालीन कॉल"

158

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

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

160msgid "OK"

161msgstr ""

162

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

163+#: qml/Dash/GenericScopeView.qml:434 qml/Dash/GenericScopeView.qml:591

164msgid "See less"

165msgstr ""

166

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

167+#: qml/Dash/GenericScopeView.qml:434

168msgid "See all"

169msgstr ""

170

171−#: qml/Dash/GenericScopeView.qml:473 qml/Dash/PageHeader.qml:258

171+#: qml/Dash/GenericScopeView.qml:496 qml/Dash/PageHeader.qml:258

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

173msgid "Search"

174msgstr "खोजें"

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

@@ -249,18 +257,10 @@ msgstr "अब बात करें"

249msgid "Speaking..."

257msgid "Speaking..."

250msgstr "अब बोल रहे हैं"

258msgstr "अब बोल रहे हैं"

251

259

252−#: qml/Notifications/NotificationMenuItemFactory.qml:108

260+#: qml/Notifications/NotificationMenuItemFactory.qml:116

253msgid "Show password"

261msgid "Show password"

254msgstr ""

262msgstr ""

255

263

256−#: qml/Notifications/NotificationMenuItemFactory.qml:124

257−msgid "Enter SIM PIN"

258−msgstr ""

259−

260−#: qml/Notifications/NotificationMenuItemFactory.qml:125

261−msgid "Sorry, incorrect PIN"

262−msgstr ""

263−

264#: qml/Panel/ActiveCallHint.qml:77

265msgid "Tap to return to call..."

266msgstr ""

@@ -305,59 +305,56 @@ msgstr ""

305msgid "Roaming"

306msgstr ""

307

308−#: qml/Shell.qml:340

308+#: qml/Shell.qml:346

309msgid "Enter passphrase"

310msgstr ""

311

312−#: qml/Shell.qml:321

312+#: qml/Shell.qml:347

313msgid "Sorry, incorrect passphrase"

314msgstr ""

315

316−#: qml/Shell.qml:342

316+#: qml/Shell.qml:348

317msgid "Please re-enter"

318msgstr ""

319

320−#: qml/Shell.qml:344

320+#: qml/Shell.qml:350

321msgid "Enter passcode"

322msgstr ""

323

324−#: qml/Shell.qml:324

324+#: qml/Shell.qml:351

325msgid "Sorry, incorrect passcode"

326msgstr ""

327

328−#: qml/Shell.qml:348

328+#: qml/Shell.qml:354

329#, qt-format

330msgid "Enter %1"

331msgstr ""

332

333−#: qml/Shell.qml:328

333+#: qml/Shell.qml:355

334#, qt-format

335msgid "Sorry, incorrect %1"

336msgstr ""

337

338−#: qml/Shell.qml:363

338+#: qml/Shell.qml:390

339msgid "Sorry, incorrect passphrase."

340msgstr ""

341

342−#: qml/Shell.qml:364

342+#: qml/Shell.qml:391

343msgid "Sorry, incorrect passcode."

344msgstr ""

345

346−#: qml/Shell.qml:365

346+#: qml/Shell.qml:392

347msgid "This will be your last attempt."

348msgstr ""

349

350−#: qml/Shell.qml:367

350+#: qml/Shell.qml:394

351msgid ""

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

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

354msgstr ""

355

356−#: qml/Shell.qml:368

356+#: qml/Shell.qml:395

357msgid ""

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

359"and all personal data will be deleted."

360msgstr ""

361−

362−#~ msgid "Hello"

363−#~ msgstr "नमस्ते"

po/hr.po+28−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-07 11:37+0300\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-09 06:36+0000\n"

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

21

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

@@ -153,23 +153,23 @@ msgid ""

153"phone Tap on the screen to start"

154msgstr ""

155

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

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

157msgid "Emergency Call"

158msgstr ""

159

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

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

161msgid "OK"

162msgstr ""

163

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

164+#: qml/Dash/GenericScopeView.qml:434 qml/Dash/GenericScopeView.qml:591

165msgid "See less"

166msgstr ""

167

168−#: qml/Dash/GenericScopeView.qml:411

168+#: qml/Dash/GenericScopeView.qml:434

169msgid "See all"

170msgstr ""

171

172−#: qml/Dash/GenericScopeView.qml:473 qml/Dash/PageHeader.qml:258

172+#: qml/Dash/GenericScopeView.qml:496 qml/Dash/PageHeader.qml:258

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

174msgid "Search"

175msgstr "Pretraživanje"

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

@@ -250,18 +258,10 @@ msgstr "Recite..."

250msgid "Speaking..."

258msgid "Speaking..."

251msgstr "Govor..."

259msgstr "Govor..."

252

260

253−#: qml/Notifications/NotificationMenuItemFactory.qml:108

261+#: qml/Notifications/NotificationMenuItemFactory.qml:116

254msgid "Show password"

262msgid "Show password"

255msgstr ""

263msgstr ""

256

264

257−#: qml/Notifications/NotificationMenuItemFactory.qml:124

258−msgid "Enter SIM PIN"

259−msgstr ""

260−

261−#: qml/Notifications/NotificationMenuItemFactory.qml:125

262−msgid "Sorry, incorrect PIN"

263−msgstr ""

264−

265#: qml/Panel/ActiveCallHint.qml:77

266msgid "Tap to return to call..."

267msgstr ""

@@ -306,55 +306,55 @@ msgstr ""

306msgid "Roaming"

307msgstr ""

308

309−#: qml/Shell.qml:340

309+#: qml/Shell.qml:346

310msgid "Enter passphrase"

311msgstr ""

312

313−#: qml/Shell.qml:321

313+#: qml/Shell.qml:347

314msgid "Sorry, incorrect passphrase"

315msgstr ""

316

317−#: qml/Shell.qml:342

317+#: qml/Shell.qml:348

318msgid "Please re-enter"

319msgstr ""

320

321−#: qml/Shell.qml:344

321+#: qml/Shell.qml:350

322msgid "Enter passcode"

323msgstr ""

324

325−#: qml/Shell.qml:324

325+#: qml/Shell.qml:351

326msgid "Sorry, incorrect passcode"

327msgstr ""

328

329−#: qml/Shell.qml:348

329+#: qml/Shell.qml:354

330#, qt-format

331msgid "Enter %1"

332msgstr ""

333

334−#: qml/Shell.qml:328

334+#: qml/Shell.qml:355

335#, qt-format

336msgid "Sorry, incorrect %1"

337msgstr ""

338

339−#: qml/Shell.qml:363

339+#: qml/Shell.qml:390

340msgid "Sorry, incorrect passphrase."

341msgstr ""

342

343−#: qml/Shell.qml:364

343+#: qml/Shell.qml:391

344msgid "Sorry, incorrect passcode."

345msgstr ""

346

347−#: qml/Shell.qml:365

347+#: qml/Shell.qml:392

348msgid "This will be your last attempt."

349msgstr ""

350

351−#: qml/Shell.qml:367

351+#: qml/Shell.qml:394

352msgid ""

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

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

355msgstr ""

356

357−#: qml/Shell.qml:368

357+#: qml/Shell.qml:395

358msgid ""

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

360"and all personal data will be deleted."

po/hu.po+33−53

@@ -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-07 11:37+0300\n"

11−"PO-Revision-Date: 2014-10-03 10:57+0000\n"

11+"PO-Revision-Date: 2014-10-08 08:13+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-04 06:28+0000\n"

18+"X-Launchpad-Export-Date: 2014-10-09 06:36+0000\n"

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

20

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

@@ -158,23 +158,23 @@ 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:220

162msgid "Emergency Call"

163msgstr "Vészhívás"

164

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

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

166msgid "OK"

167msgstr "Ok"

168

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

169+#: qml/Dash/GenericScopeView.qml:434 qml/Dash/GenericScopeView.qml:591

170msgid "See less"

171msgstr "Kevesebb"

172

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

173+#: qml/Dash/GenericScopeView.qml:434

174msgid "See all"

175msgstr "Összes megtekintése"

176

177−#: qml/Dash/GenericScopeView.qml:473 qml/Dash/PageHeader.qml:258

177+#: qml/Dash/GenericScopeView.qml:496 qml/Dash/PageHeader.qml:258

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

179msgid "Search"

180msgstr "Keresés"

@@ -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 "Húzza a frissítéshez…"

217+

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

219+msgid "Release to refresh…"

220+msgstr "Engedje el a frissítéshez…"

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"

@@ -255,18 +263,10 @@ msgstr "Most beszéljen…"

255msgid "Speaking..."

263msgid "Speaking..."

256msgstr "Beszéd…"

264msgstr "Beszéd…"

257

265

258−#: qml/Notifications/NotificationMenuItemFactory.qml:108

266+#: qml/Notifications/NotificationMenuItemFactory.qml:116

259msgid "Show password"

267msgid "Show password"

260msgstr "Jelszó megjelenítése"

268msgstr "Jelszó megjelenítése"

261

269

262−#: qml/Notifications/NotificationMenuItemFactory.qml:124

263−msgid "Enter SIM PIN"

264−msgstr "Adja meg a SIM PIN kódját"

265−

266−#: qml/Notifications/NotificationMenuItemFactory.qml:125

267−msgid "Sorry, incorrect PIN"

268−msgstr "Sajnáljuk, helytelen PIN"

269−

270#: qml/Panel/ActiveCallHint.qml:77

271msgid "Tap to return to call..."

272msgstr "Érintse meg, hogy visszatérjen a híváshoz..."

@@ -311,49 +311,49 @@ msgstr "SIM feloldása"

311msgid "Roaming"

312msgstr "Barangolás"

313

314−#: qml/Shell.qml:340

314+#: qml/Shell.qml:346

315msgid "Enter passphrase"

316msgstr "Jelmondat megadása"

317

318−#: qml/Shell.qml:321

318+#: qml/Shell.qml:347

319msgid "Sorry, incorrect passphrase"

320msgstr "Sajnáljuk, helytelen jelmondat"

321

322−#: qml/Shell.qml:342

322+#: qml/Shell.qml:348

323msgid "Please re-enter"

324msgstr "Kérjük adja meg újra"

325

326−#: qml/Shell.qml:344

326+#: qml/Shell.qml:350

327msgid "Enter passcode"

328msgstr "Jelkód megadása"

329

330−#: qml/Shell.qml:324

330+#: qml/Shell.qml:351

331msgid "Sorry, incorrect passcode"

332msgstr "Sajnáljuk, helytelen jelkód"

333

334−#: qml/Shell.qml:348

334+#: qml/Shell.qml:354

335#, qt-format

336msgid "Enter %1"

337msgstr "Adja meg: %1"

338

339−#: qml/Shell.qml:328

339+#: qml/Shell.qml:355

340#, qt-format

341msgid "Sorry, incorrect %1"

342msgstr "Sajnáljuk, helytelen %1"

343

344−#: qml/Shell.qml:363

344+#: qml/Shell.qml:390

345msgid "Sorry, incorrect passphrase."

346msgstr "Sajnáljuk, helytelen jelmondat."

347

348−#: qml/Shell.qml:364

348+#: qml/Shell.qml:391

349msgid "Sorry, incorrect passcode."

350msgstr "Sajnáljuk, helytelen jelkód."

351

352−#: qml/Shell.qml:365

352+#: qml/Shell.qml:392

353msgid "This will be your last attempt."

354msgstr "Ez az utolsó próbálkozási lehetősége."

355

356−#: qml/Shell.qml:367

356+#: qml/Shell.qml:394

357msgid ""

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

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

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

361"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."

363

364−#: qml/Shell.qml:368

364+#: qml/Shell.qml:395

365msgid ""

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

367"and all personal data will be deleted."

@@ -369,28 +369,8 @@ msgstr ""

369"Ha helytelen jelkódot ad meg, a telefonja visszaállítja a gyári "

370"beállításokat és törli minden személyes adatát."

371

372−#, qt-format

372+#~ msgid "Sorry, incorrect PIN"

373−#~ msgid "Hello %1"

373+#~ msgstr "Sajnáljuk, helytelen PIN"

374−#~ msgstr "Üdv %1"

375−

376−#~ msgid "Swipe to unlock"

377−#~ msgstr "Csúsztasson a feloldáshoz"

378−

379−#~ msgid "Hello"

380−#~ msgstr "Üdvözöljük"

381−

382−#~ msgid "Please wait"

383−#~ msgstr "Kérem várjon"

384−

385−#~ msgid "Too many incorrect attempts"

386−#~ msgstr "Túl sok sikertelen kísérlet"

387−

388−#~ msgid "Enter your passphrase"

389−#~ msgstr "Adja meg a jelmondatot"

390−

391−#, qt-format

392−#~ msgid "Enter your %1"

393−#~ msgstr "Kérjük adja meg: %1"

394

374

395−#~ msgid "Enter your passcode"

375+#~ msgid "Enter SIM PIN"

396−#~ msgstr "Adja meg a jelkódját"

376+#~ msgstr "Adja meg a SIM PIN kódját"

po/hy.po+28−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-07 11:37+0300\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-09 06:36+0000\n"

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

20

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

@@ -152,23 +152,23 @@ msgid ""

152"phone Tap on the screen to start"

153msgstr ""

154

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

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

156msgid "Emergency Call"

157msgstr ""

158

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

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

160msgid "OK"

161msgstr ""

162

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

163+#: qml/Dash/GenericScopeView.qml:434 qml/Dash/GenericScopeView.qml:591

164msgid "See less"

165msgstr ""

166

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

167+#: qml/Dash/GenericScopeView.qml:434

168msgid "See all"

169msgstr ""

170

171−#: qml/Dash/GenericScopeView.qml:473 qml/Dash/PageHeader.qml:258

171+#: qml/Dash/GenericScopeView.qml:496 qml/Dash/PageHeader.qml:258

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

173msgid "Search"

174msgstr "Որոնում"

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

@@ -249,18 +257,10 @@ msgstr "Խոսի՛ր"

249msgid "Speaking..."

257msgid "Speaking..."

250msgstr "Խոսում եմ..."

258msgstr "Խոսում եմ..."

251

259

252−#: qml/Notifications/NotificationMenuItemFactory.qml:108

260+#: qml/Notifications/NotificationMenuItemFactory.qml:116

253msgid "Show password"

261msgid "Show password"

254msgstr ""

262msgstr ""

255

263

256−#: qml/Notifications/NotificationMenuItemFactory.qml:124

257−msgid "Enter SIM PIN"

258−msgstr ""

259−

260−#: qml/Notifications/NotificationMenuItemFactory.qml:125

261−msgid "Sorry, incorrect PIN"

262−msgstr ""

263−

264#: qml/Panel/ActiveCallHint.qml:77

265msgid "Tap to return to call..."

266msgstr ""

@@ -305,55 +305,55 @@ msgstr ""

305msgid "Roaming"

306msgstr ""

307

308−#: qml/Shell.qml:340

308+#: qml/Shell.qml:346

309msgid "Enter passphrase"

310msgstr ""

311

312−#: qml/Shell.qml:321

312+#: qml/Shell.qml:347

313msgid "Sorry, incorrect passphrase"

314msgstr ""

315

316−#: qml/Shell.qml:342

316+#: qml/Shell.qml:348

317msgid "Please re-enter"

318msgstr ""

319

320−#: qml/Shell.qml:344

320+#: qml/Shell.qml:350

321msgid "Enter passcode"

322msgstr ""

323

324−#: qml/Shell.qml:324

324+#: qml/Shell.qml:351

325msgid "Sorry, incorrect passcode"

326msgstr ""

327

328−#: qml/Shell.qml:348

328+#: qml/Shell.qml:354

329#, qt-format

330msgid "Enter %1"

331msgstr ""

332

333−#: qml/Shell.qml:328

333+#: qml/Shell.qml:355

334#, qt-format

335msgid "Sorry, incorrect %1"

336msgstr ""

337

338−#: qml/Shell.qml:363

338+#: qml/Shell.qml:390

339msgid "Sorry, incorrect passphrase."

340msgstr ""

341

342−#: qml/Shell.qml:364

342+#: qml/Shell.qml:391

343msgid "Sorry, incorrect passcode."

344msgstr ""

345

346−#: qml/Shell.qml:365

346+#: qml/Shell.qml:392

347msgid "This will be your last attempt."

348msgstr ""

349

350−#: qml/Shell.qml:367

350+#: qml/Shell.qml:394

351msgid ""

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

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

354msgstr ""

355

356−#: qml/Shell.qml:368

356+#: qml/Shell.qml:395

357msgid ""

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

359"and all personal data will be deleted."

po/id.po+28−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-07 11:37+0300\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-09 06:36+0000\n"

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

20

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

@@ -152,23 +152,23 @@ msgid ""

152"phone Tap on the screen to start"

153msgstr ""

154

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

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

156msgid "Emergency Call"

157msgstr ""

158

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

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

160msgid "OK"

161msgstr ""

162

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

163+#: qml/Dash/GenericScopeView.qml:434 qml/Dash/GenericScopeView.qml:591

164msgid "See less"

165msgstr ""

166

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

167+#: qml/Dash/GenericScopeView.qml:434

168msgid "See all"

169msgstr ""

170

171−#: qml/Dash/GenericScopeView.qml:473 qml/Dash/PageHeader.qml:258

171+#: qml/Dash/GenericScopeView.qml:496 qml/Dash/PageHeader.qml:258

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

173msgid "Search"

174msgstr ""

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

@@ -249,18 +257,10 @@ msgstr ""

249msgid "Speaking..."

257msgid "Speaking..."

250msgstr ""

258msgstr ""

251

259

252−#: qml/Notifications/NotificationMenuItemFactory.qml:108

260+#: qml/Notifications/NotificationMenuItemFactory.qml:116

253msgid "Show password"

261msgid "Show password"

254msgstr ""

262msgstr ""

255

263

256−#: qml/Notifications/NotificationMenuItemFactory.qml:124

257−msgid "Enter SIM PIN"

258−msgstr ""

259−

260−#: qml/Notifications/NotificationMenuItemFactory.qml:125

261−msgid "Sorry, incorrect PIN"

262−msgstr ""

263−

264#: qml/Panel/ActiveCallHint.qml:77

265msgid "Tap to return to call..."

266msgstr ""

@@ -305,55 +305,55 @@ msgstr ""

305msgid "Roaming"

306msgstr ""

307

308−#: qml/Shell.qml:340

308+#: qml/Shell.qml:346

309msgid "Enter passphrase"

310msgstr ""

311

312−#: qml/Shell.qml:321

312+#: qml/Shell.qml:347

313msgid "Sorry, incorrect passphrase"

314msgstr ""

315

316−#: qml/Shell.qml:342

316+#: qml/Shell.qml:348

317msgid "Please re-enter"

318msgstr ""

319

320−#: qml/Shell.qml:344

320+#: qml/Shell.qml:350

321msgid "Enter passcode"

322msgstr ""

323

324−#: qml/Shell.qml:324

324+#: qml/Shell.qml:351

325msgid "Sorry, incorrect passcode"

326msgstr ""

327

328−#: qml/Shell.qml:348

328+#: qml/Shell.qml:354

329#, qt-format

330msgid "Enter %1"

331msgstr ""

332

333−#: qml/Shell.qml:328

333+#: qml/Shell.qml:355

334#, qt-format

335msgid "Sorry, incorrect %1"

336msgstr ""

337

338−#: qml/Shell.qml:363

338+#: qml/Shell.qml:390

339msgid "Sorry, incorrect passphrase."

340msgstr ""

341

342−#: qml/Shell.qml:364

342+#: qml/Shell.qml:391

343msgid "Sorry, incorrect passcode."

344msgstr ""

345

346−#: qml/Shell.qml:365

346+#: qml/Shell.qml:392

347msgid "This will be your last attempt."

348msgstr ""

349

350−#: qml/Shell.qml:367

350+#: qml/Shell.qml:394

351msgid ""

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

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

354msgstr ""

355

356−#: qml/Shell.qml:368

356+#: qml/Shell.qml:395

357msgid ""

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

359"and all personal data will be deleted."

po/is.po+32−52

@@ -9,7 +9,7 @@ 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-07 11:37+0300\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"

@@ -17,7 +17,7 @@ msgstr ""

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-06 07:00+0000\n"

20+"X-Launchpad-Export-Date: 2014-10-09 06:36+0000\n"

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

22"Language: is\n"

23

@@ -160,23 +160,23 @@ msgstr ""

160"Þú ert núna með æfingu í að nota skjáhreyfingar og getur því farið að nota "

161"símann Sláðu létt á skjáinn til að byrja"

162

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

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

164msgid "Emergency Call"

165msgstr "Neyðarsímtal"

166

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

167+#: qml/Components/Lockscreen.qml:252

168msgid "OK"

169msgstr "Í lagi"

170

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

171+#: qml/Dash/GenericScopeView.qml:434 qml/Dash/GenericScopeView.qml:591

172msgid "See less"

173msgstr "Sjá minna"

174

175−#: qml/Dash/GenericScopeView.qml:411

175+#: qml/Dash/GenericScopeView.qml:434

176msgid "See all"

177msgstr "Sjá allt"

178

179−#: qml/Dash/GenericScopeView.qml:473 qml/Dash/PageHeader.qml:258

179+#: qml/Dash/GenericScopeView.qml:496 qml/Dash/PageHeader.qml:258

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

181msgid "Search"

182msgstr "Leita"

@@ -213,6 +213,14 @@ msgstr "Gefa umsögn"

213msgid "Send"

214msgstr "Senda"

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

@@ -257,18 +265,10 @@ msgstr "Tala núna..."

257msgid "Speaking..."

265msgid "Speaking..."

258msgstr "Tala..."

266msgstr "Tala..."

259

267

260−#: qml/Notifications/NotificationMenuItemFactory.qml:108

268+#: qml/Notifications/NotificationMenuItemFactory.qml:116

261msgid "Show password"

269msgid "Show password"

262msgstr "Birta lykilorð"

270msgstr "Birta lykilorð"

263

271

264−#: qml/Notifications/NotificationMenuItemFactory.qml:124

265−msgid "Enter SIM PIN"

266−msgstr "Settu inn PIN-númer SIM-kortsins"

267−

268−#: qml/Notifications/NotificationMenuItemFactory.qml:125

269−msgid "Sorry, incorrect PIN"

270−msgstr "Því miður, rangt PIN-númer"

271−

272#: qml/Panel/ActiveCallHint.qml:77

273msgid "Tap to return to call..."

274msgstr "Slá til að svara símtali..."

@@ -313,49 +313,49 @@ msgstr "Aflæsa SIM-korti"

313msgid "Roaming"

314msgstr "Ráphamur"

315

316−#: qml/Shell.qml:340

316+#: qml/Shell.qml:346

317msgid "Enter passphrase"

318msgstr ""

319

320−#: qml/Shell.qml:321

320+#: qml/Shell.qml:347

321msgid "Sorry, incorrect passphrase"

322msgstr "Því miður, rangt lykilorð"

323

324−#: qml/Shell.qml:342

324+#: qml/Shell.qml:348

325msgid "Please re-enter"

326msgstr ""

327

328−#: qml/Shell.qml:344

328+#: qml/Shell.qml:350

329msgid "Enter passcode"

330msgstr ""

331

332−#: qml/Shell.qml:324

332+#: qml/Shell.qml:351

333msgid "Sorry, incorrect passcode"

334msgstr "Því miður, rangur aðgangskóði"

335

336−#: qml/Shell.qml:348

336+#: qml/Shell.qml:354

337#, qt-format

338msgid "Enter %1"

339msgstr ""

340

341−#: qml/Shell.qml:328

341+#: qml/Shell.qml:355

342#, qt-format

343msgid "Sorry, incorrect %1"

344msgstr "Því miður, rangt %1"

345

346−#: qml/Shell.qml:363

346+#: qml/Shell.qml:390

347msgid "Sorry, incorrect passphrase."

348msgstr "Því miður, rangt lykilorð."

349

350−#: qml/Shell.qml:364

350+#: qml/Shell.qml:391

351msgid "Sorry, incorrect passcode."

352msgstr "Því miður, rangur aðgangskóði."

353

354−#: qml/Shell.qml:365

354+#: qml/Shell.qml:392

355msgid "This will be your last attempt."

356msgstr "Þetta mun verða síðasta tilraunin þín."

357

358−#: qml/Shell.qml:367

358+#: qml/Shell.qml:394

359msgid ""

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

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

@@ -363,7 +363,7 @@ msgstr ""

363"Ef lykilorð er rangt, mun síminn frumstilla allt á verksmiðjustillingar og "

364"öllum einkagögnum verður eytt."

365

366−#: qml/Shell.qml:368

366+#: qml/Shell.qml:395

367msgid ""

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

369"and all personal data will be deleted."

@@ -371,28 +371,8 @@ msgstr ""

371"Ef aðgangskóði er rangur, mun síminn frumstilla allt á verksmiðjustillingar "

372"og öllum einkagögnum verður eytt."

373

374−#, qt-format

374+#~ msgid "Sorry, incorrect PIN"

375−#~ msgid "Hello %1"

375+#~ msgstr "Því miður, rangt PIN-númer"

376−#~ msgstr "Hæ %1"

377−

378−#~ msgid "Hello"

379−#~ msgstr "Hæ"

380−

381−#~ msgid "Swipe to unlock"

382−#~ msgstr "Strjúka til að aflæsa"

383−

384−#~ msgid "Please wait"

385−#~ msgstr "Bíddu aðeins"

386

376

387−#~ msgid "Too many incorrect attempts"

377+#~ msgid "Enter SIM PIN"

388−#~ msgstr "Of margar rangar tilraunir"

389−

390−#~ msgid "Enter your passphrase"

391−#~ msgstr "Sláðu inn lykilorðið þitt"

392−

393−#~ msgid "Enter your passcode"

394−#~ msgstr "Settu inn aðgangskóðann þinn"

378+#~ msgstr "Settu inn PIN-númer SIM-kortsins"

395−

396−#, qt-format

397−#~ msgid "Enter your %1"

398−#~ msgstr "Settu inn %1"

po/it.po+32−55

@@ -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-07 11:37+0300\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-09 06:36+0000\n"

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

20

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

@@ -161,23 +161,23 @@ 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:220

165msgid "Emergency Call"

166msgstr "Chiamata di emergenza"

167

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

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

169msgid "OK"

170msgstr "OK"

171

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

172+#: qml/Dash/GenericScopeView.qml:434 qml/Dash/GenericScopeView.qml:591

173msgid "See less"

174msgstr "Mostra meno"

175

176−#: qml/Dash/GenericScopeView.qml:411

176+#: qml/Dash/GenericScopeView.qml:434

177msgid "See all"

178msgstr "Mostra tutto"

179

180−#: qml/Dash/GenericScopeView.qml:473 qml/Dash/PageHeader.qml:258

180+#: qml/Dash/GenericScopeView.qml:496 qml/Dash/PageHeader.qml:258

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

182msgid "Search"

183msgstr "Cerca"

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

@@ -258,18 +266,10 @@ msgstr "Parla ora..."

258msgid "Speaking..."

266msgid "Speaking..."

259msgstr "Sto parlando..."

267msgstr "Sto parlando..."

260

268

261−#: qml/Notifications/NotificationMenuItemFactory.qml:108

269+#: qml/Notifications/NotificationMenuItemFactory.qml:116

262msgid "Show password"

270msgid "Show password"

263msgstr "Mostra password"

271msgstr "Mostra password"

264

272

265−#: qml/Notifications/NotificationMenuItemFactory.qml:124

266−msgid "Enter SIM PIN"

267−msgstr "Inserire il PIN della SIM"

268−

269−#: qml/Notifications/NotificationMenuItemFactory.qml:125

270−msgid "Sorry, incorrect PIN"

271−msgstr "PIN errato"

272−

273#: qml/Panel/ActiveCallHint.qml:77

274msgid "Tap to return to call..."

275msgstr "Tocca per tornare alla chiamata..."

@@ -314,49 +314,49 @@ msgstr "Sblocca SIM"

314msgid "Roaming"

315msgstr "Roaming"

316

317−#: qml/Shell.qml:340

317+#: qml/Shell.qml:346

318msgid "Enter passphrase"

319msgstr ""

320

321−#: qml/Shell.qml:321

321+#: qml/Shell.qml:347

322msgid "Sorry, incorrect passphrase"

323msgstr "Passphrase errata"

324

325−#: qml/Shell.qml:342

325+#: qml/Shell.qml:348

326msgid "Please re-enter"

327msgstr ""

328

329−#: qml/Shell.qml:344

329+#: qml/Shell.qml:350

330msgid "Enter passcode"

331msgstr ""

332

333−#: qml/Shell.qml:324

333+#: qml/Shell.qml:351

334msgid "Sorry, incorrect passcode"

335msgstr "Passcode non corretto"

336

337−#: qml/Shell.qml:348

337+#: qml/Shell.qml:354

338#, qt-format

339msgid "Enter %1"

340msgstr ""

341

342−#: qml/Shell.qml:328

342+#: qml/Shell.qml:355

343#, qt-format

344msgid "Sorry, incorrect %1"

345msgstr "%1 non corretto"

346

347−#: qml/Shell.qml:363

347+#: qml/Shell.qml:390

348msgid "Sorry, incorrect passphrase."

349msgstr "Passphrase non corretta"

350

351−#: qml/Shell.qml:364

351+#: qml/Shell.qml:391

352msgid "Sorry, incorrect passcode."

353msgstr "Passcode non corretto"

354

355−#: qml/Shell.qml:365

355+#: qml/Shell.qml:392

356msgid "This will be your last attempt."

357msgstr "Questo sarà l'ultimo tentativo."

358

359−#: qml/Shell.qml:367

359+#: qml/Shell.qml:394

360msgid ""

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

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

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

364"Se verrà inserita una passphrase errata, il telefono eseguirà un ripristino "

365"delle impostazioni di fabbrica e tutti i dati personali verranno eliminati."

366

367−#: qml/Shell.qml:368

367+#: qml/Shell.qml:395

368msgid ""

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

370"and all personal data will be deleted."

@@ -372,31 +372,8 @@ msgstr ""

372"Se verrà inserito una passcode errato, il telefono eseguirà un ripristino "

373"delle impostazioni di fabbrica e tutti i dati personali verranno eliminati."

374

375−#, qt-format

375+#~ msgid "Sorry, incorrect PIN"

376−#~ msgid "Hello %1"

377−#~ msgstr "Ciao %1"

378−

379−#~ msgid "Hello"

380−#~ msgstr "Ciao"

381−

382−#~ msgid "Swipe to unlock"

383−#~ msgstr "Scorrere per sbloccare"

384−

385−#~ msgid "Manage Dash"

386−#~ msgstr "Gestione della Dash"

387−

388−#~ msgid "Please wait"

389−#~ msgstr "Attendere"

390−

391−#~ msgid "Too many incorrect attempts"

392−#~ msgstr "Troppi tentativi errati"

393−

394−#, qt-format

395−#~ msgid "Enter your %1"

396−#~ msgstr "Inserire %1"

376+#~ msgstr "PIN errato"

397−

398−#~ msgid "Enter your passphrase"

399−#~ msgstr "Digitare la passphrase"

400

377

401−#~ msgid "Enter your passcode"

378+#~ msgid "Enter SIM PIN"

402−#~ msgstr "Inserire il passcode"

379+#~ msgstr "Inserire il PIN della SIM"

po/ja.po+32−55

@@ -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-07 11:37+0300\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-09 06:36+0000\n"

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

20

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

@@ -153,23 +153,23 @@ msgid ""

153msgstr ""

154"これでスマートフォンの操作に必要な、画面端を用いたジェスチャーを習得できました。 利用を開始するなら画面をタップしてください"

155

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

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

157msgid "Emergency Call"

158msgstr "緊急通報"

159

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

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

161msgid "OK"

162msgstr "OK"

163

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

164+#: qml/Dash/GenericScopeView.qml:434 qml/Dash/GenericScopeView.qml:591

165msgid "See less"

166msgstr "隠す"

167

168−#: qml/Dash/GenericScopeView.qml:411

168+#: qml/Dash/GenericScopeView.qml:434

169msgid "See all"

170msgstr "すべて表示する"

171

172−#: qml/Dash/GenericScopeView.qml:473 qml/Dash/PageHeader.qml:258

172+#: qml/Dash/GenericScopeView.qml:496 qml/Dash/PageHeader.qml:258

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

174msgid "Search"

175msgstr "検索"

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

@@ -250,18 +258,10 @@ msgstr "音声入力を開始..."

250msgid "Speaking..."

258msgid "Speaking..."

251msgstr "入力中..."

259msgstr "入力中..."

252

260

253−#: qml/Notifications/NotificationMenuItemFactory.qml:108

261+#: qml/Notifications/NotificationMenuItemFactory.qml:116

254msgid "Show password"

262msgid "Show password"

255msgstr "パスワードを表示"

263msgstr "パスワードを表示"

256

264

257−#: qml/Notifications/NotificationMenuItemFactory.qml:124

258−msgid "Enter SIM PIN"

259−msgstr "SIM PINの入力"

260−

261−#: qml/Notifications/NotificationMenuItemFactory.qml:125

262−msgid "Sorry, incorrect PIN"

263−msgstr "PINが違います"

264−

265#: qml/Panel/ActiveCallHint.qml:77

266msgid "Tap to return to call..."

267msgstr "タップすると通話に戻ります..."

@@ -306,85 +306,62 @@ msgstr "SIMのアンロック"

306msgid "Roaming"

307msgstr "ローミング"

308

309−#: qml/Shell.qml:340

309+#: qml/Shell.qml:346

310msgid "Enter passphrase"

311msgstr ""

312

313−#: qml/Shell.qml:321

313+#: qml/Shell.qml:347

314msgid "Sorry, incorrect passphrase"

315msgstr "パスフレーズが違います"

316

317−#: qml/Shell.qml:342

317+#: qml/Shell.qml:348

318msgid "Please re-enter"

319msgstr ""

320

321−#: qml/Shell.qml:344

321+#: qml/Shell.qml:350

322msgid "Enter passcode"

323msgstr ""

324

325−#: qml/Shell.qml:324

325+#: qml/Shell.qml:351

326msgid "Sorry, incorrect passcode"

327msgstr "パスコードが違います"

328

329−#: qml/Shell.qml:348

329+#: qml/Shell.qml:354

330#, qt-format

331msgid "Enter %1"

332msgstr ""

333

334−#: qml/Shell.qml:328

334+#: qml/Shell.qml:355

335#, qt-format

336msgid "Sorry, incorrect %1"

337msgstr "%1が違います"

338

339−#: qml/Shell.qml:363

339+#: qml/Shell.qml:390

340msgid "Sorry, incorrect passphrase."

341msgstr "パスフレーズが間違っています。"

342

343−#: qml/Shell.qml:364

343+#: qml/Shell.qml:391

344msgid "Sorry, incorrect passcode."

345msgstr "パスコードが間違っています。"

346

347−#: qml/Shell.qml:365

347+#: qml/Shell.qml:392

348msgid "This will be your last attempt."

349msgstr "これが最後のチャンスです。"

350

351−#: qml/Shell.qml:367

351+#: qml/Shell.qml:394

352msgid ""

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

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

355msgstr "パスフレーズが間違っている場合、ファクトリーリセットを実施し、すべての個人データは削除されます。"

356

357−#: qml/Shell.qml:368

357+#: qml/Shell.qml:395

358msgid ""

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

360"and all personal data will be deleted."

361msgstr "パスコードが間違っている場合、ファクトリーリセットを実施し、すべての個人データは削除されます。"

362

363−#, qt-format

363+#~ msgid "Sorry, incorrect PIN"

364−#~ msgid "Hello %1"

364+#~ msgstr "PINが違います"

365−#~ msgstr "こんにちは %1 さん"

366−

367−#~ msgid "Hello"

368−#~ msgstr "こんにちは"

369−

370−#~ msgid "Swipe to unlock"

371−#~ msgstr "スワイプしてロック解除"

372−

373−#~ msgid "Too many incorrect attempts"

374−#~ msgstr "失敗回数が上限に達しました"

375−

376−#~ msgid "Please wait"

377−#~ msgstr "お待ちください"

378−

379−#~ msgid "Manage Dash"

380−#~ msgstr "Dashの管理"

381−

382−#, qt-format

383−#~ msgid "Enter your %1"

384−#~ msgstr "%1を入力してください"

385−

386−#~ msgid "Enter your passphrase"

387−#~ msgstr "パスフレーズの入力"

388

365

389−#~ msgid "Enter your passcode"

366+#~ msgid "Enter SIM PIN"

390−#~ msgstr "パスコードの入力"

367+#~ msgstr "SIM PINの入力"

po/km.po+33−56

@@ -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-07 11:37+0300\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-09 06:36+0000\n"

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

20

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

@@ -158,23 +158,23 @@ msgstr ""

158"ឥឡូវអ្នកបានពិនិត្យកាយវិការគែម "

159"និងអាចចាប់ផ្ដើមប្រើទូរស័ព្ទ ប៉ះ លើអេក្រង់ដើម្បីចាប់ផ្ដើម"

160

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

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

162msgid "Emergency Call"

163msgstr "ការហៅពេលអាសន្ន"

164

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

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

166msgid "OK"

167msgstr "យល់ព្រម"

168

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

169+#: qml/Dash/GenericScopeView.qml:434 qml/Dash/GenericScopeView.qml:591

170msgid "See less"

171msgstr "មើលតិចជាង"

172

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

173+#: qml/Dash/GenericScopeView.qml:434

174msgid "See all"

175msgstr "មើលទាំងអស់"

176

177−#: qml/Dash/GenericScopeView.qml:473 qml/Dash/PageHeader.qml:258

177+#: qml/Dash/GenericScopeView.qml:496 qml/Dash/PageHeader.qml:258

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

179msgid "Search"

180msgstr "ស្វែងរក"

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

@@ -255,18 +263,10 @@ msgstr "និយាយឥឡូវ..."

255msgid "Speaking..."

263msgid "Speaking..."

256msgstr "កំពុងនិយាយ..."

264msgstr "កំពុងនិយាយ..."

257

265

258−#: qml/Notifications/NotificationMenuItemFactory.qml:108

266+#: qml/Notifications/NotificationMenuItemFactory.qml:116

259msgid "Show password"

267msgid "Show password"

260msgstr "បង្ហាញពាក្យសម្ងាត់"

268msgstr "បង្ហាញពាក្យសម្ងាត់"

261

269

262−#: qml/Notifications/NotificationMenuItemFactory.qml:124

263−msgid "Enter SIM PIN"

264−msgstr "បញ្ចូលលេខកូដ PIN ស៊ីម"

265−

266−#: qml/Notifications/NotificationMenuItemFactory.qml:125

267−msgid "Sorry, incorrect PIN"

268−msgstr "សូមទោស! លេខកូដ PIN មិនត្រឹមត្រូវ"

269−

270#: qml/Panel/ActiveCallHint.qml:77

271msgid "Tap to return to call..."

272msgstr "ប៉ះដើម្បីត្រឡប់ទៅការហៅ..."

@@ -311,49 +311,49 @@ msgstr "ដោះសោស៊ីម"

311msgid "Roaming"

312msgstr "រ៉ូមីង"

313

314−#: qml/Shell.qml:340

314+#: qml/Shell.qml:346

315msgid "Enter passphrase"

316msgstr ""

317

318−#: qml/Shell.qml:321

318+#: qml/Shell.qml:347

319msgid "Sorry, incorrect passphrase"

320msgstr "សូមទោស! ឃ្លាសម្ងាត់មិនត្រឹមត្រូវ"

321

322−#: qml/Shell.qml:342

322+#: qml/Shell.qml:348

323msgid "Please re-enter"

324msgstr ""

325

326−#: qml/Shell.qml:344

326+#: qml/Shell.qml:350

327msgid "Enter passcode"

328msgstr ""

329

330−#: qml/Shell.qml:324

330+#: qml/Shell.qml:351

331msgid "Sorry, incorrect passcode"

332msgstr "សូមទោស! កូដសម្ងាត់មិនត្រឹមត្រូវ"

333

334−#: qml/Shell.qml:348

334+#: qml/Shell.qml:354

335#, qt-format

336msgid "Enter %1"

337msgstr ""

338

339−#: qml/Shell.qml:328

339+#: qml/Shell.qml:355

340#, qt-format

341msgid "Sorry, incorrect %1"

342msgstr "សូមទោស! %1 មិនត្រឹមត្រូវ"

343

344−#: qml/Shell.qml:363

344+#: qml/Shell.qml:390

345msgid "Sorry, incorrect passphrase."

346msgstr "សូមទោស! ឃ្លាសម្ងាត់មិនត្រឹមត្រូវ។"

347

348−#: qml/Shell.qml:364

348+#: qml/Shell.qml:391

349msgid "Sorry, incorrect passcode."

350msgstr "សូមទោស! កូដសម្ងាត់មិនត្រឹមត្រូវ។"

351

352−#: qml/Shell.qml:365

352+#: qml/Shell.qml:392

353msgid "This will be your last attempt."

354msgstr "នេះគឺការព្យាយាមលើកចុងក្រោយ។"

355

356−#: qml/Shell.qml:367

356+#: qml/Shell.qml:394

357msgid ""

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

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

@@ -362,7 +362,7 @@ msgstr ""

362"ទូរស័ព្ទរបស់អ្នកនឹងកំណត់ទៅទិន្នន័យពីរោងចក្រវិញ "

363"ហើយទិន្នន័យផ្ទាល់ខ្លួនទាំងអស់របស់អ្នកនឹងត្រូវបានលុប។"

364

365−#: qml/Shell.qml:368

365+#: qml/Shell.qml:395

366msgid ""

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

368"and all personal data will be deleted."

@@ -371,31 +371,8 @@ msgstr ""

371"ទូរស័ព្ទរបស់អ្នកនឹងកំណត់ទៅទិន្នន័យពីរោងចក្រវិញ "

372"ហើយទិន្នន័យផ្ទាល់ខ្លួនទាំងអស់របស់អ្នកនឹងត្រូវបានលុប។"

373

374−#, qt-format

374+#~ msgid "Sorry, incorrect PIN"

375−#~ msgid "Hello %1"

375+#~ msgstr "សូមទោស! លេខកូដ PIN មិនត្រឹមត្រូវ"

376−#~ msgstr "សួស្ដី %1"

377−

378−#~ msgid "Hello"

379−#~ msgstr "សួស្តី"

380−

381−#~ msgid "Swipe to unlock"

382−#~ msgstr "អូសដើម្បីដោះសោ"

383−

384−#~ msgid "Manage Dash"

385−#~ msgstr "គ្រប់គ្រងផ្ទាំង"

386−

387−#~ msgid "Please wait"

388−#~ msgstr "សូមរង់ចាំ"

389−

390−#~ msgid "Too many incorrect attempts"

391−#~ msgstr "បានព្យាយាមខុសច្រើនដងពេក"

392−

393−#, qt-format

394−#~ msgid "Enter your %1"

395−#~ msgstr "បញ្ចូល %1 របស់អ្នក"

396−

397−#~ msgid "Enter your passphrase"

398−#~ msgstr "បញ្ចូលឃ្លាសម្ងាត់របស់អ្នក"

399

376

400−#~ msgid "Enter your passcode"

377+#~ msgid "Enter SIM PIN"

401−#~ msgstr "បញ្ចូលកូដសម្ងាត់របស់អ្នក"

378+#~ msgstr "បញ្ចូលលេខកូដ PIN ស៊ីម"

po/kn.po+28−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-07 11:37+0300\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-09 06:36+0000\n"

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

20

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

@@ -152,23 +152,23 @@ msgid ""

152"phone Tap on the screen to start"

153msgstr ""

154

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

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

156msgid "Emergency Call"

157msgstr ""

158

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

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

160msgid "OK"

161msgstr ""

162

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

163+#: qml/Dash/GenericScopeView.qml:434 qml/Dash/GenericScopeView.qml:591

164msgid "See less"

165msgstr ""

166

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

167+#: qml/Dash/GenericScopeView.qml:434

168msgid "See all"

169msgstr ""

170

171−#: qml/Dash/GenericScopeView.qml:473 qml/Dash/PageHeader.qml:258

171+#: qml/Dash/GenericScopeView.qml:496 qml/Dash/PageHeader.qml:258

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

173msgid "Search"

174msgstr "ಹುಡುಕು"

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

@@ -249,18 +257,10 @@ msgstr "ಈಗ ಮಾತನಾಡಿ ..."

249msgid "Speaking..."

257msgid "Speaking..."

250msgstr "ಮಾತನಾಡುತಿದ್ದೀರಿ"

258msgstr "ಮಾತನಾಡುತಿದ್ದೀರಿ"

251

259

252−#: qml/Notifications/NotificationMenuItemFactory.qml:108

260+#: qml/Notifications/NotificationMenuItemFactory.qml:116

253msgid "Show password"

261msgid "Show password"

254msgstr ""

262msgstr ""

255

263

256−#: qml/Notifications/NotificationMenuItemFactory.qml:124

257−msgid "Enter SIM PIN"

258−msgstr ""

259−

260−#: qml/Notifications/NotificationMenuItemFactory.qml:125

261−msgid "Sorry, incorrect PIN"

262−msgstr ""

263−

264#: qml/Panel/ActiveCallHint.qml:77

265msgid "Tap to return to call..."

266msgstr ""

@@ -305,55 +305,55 @@ msgstr ""

305msgid "Roaming"

306msgstr ""

307

308−#: qml/Shell.qml:340

308+#: qml/Shell.qml:346

309msgid "Enter passphrase"

310msgstr ""

311

312−#: qml/Shell.qml:321

312+#: qml/Shell.qml:347

313msgid "Sorry, incorrect passphrase"

314msgstr ""

315

316−#: qml/Shell.qml:342

316+#: qml/Shell.qml:348

317msgid "Please re-enter"

318msgstr ""

319

320−#: qml/Shell.qml:344

320+#: qml/Shell.qml:350

321msgid "Enter passcode"

322msgstr ""

323

324−#: qml/Shell.qml:324

324+#: qml/Shell.qml:351

325msgid "Sorry, incorrect passcode"

326msgstr ""

327

328−#: qml/Shell.qml:348

328+#: qml/Shell.qml:354

329#, qt-format

330msgid "Enter %1"

331msgstr ""

332

333−#: qml/Shell.qml:328

333+#: qml/Shell.qml:355

334#, qt-format

335msgid "Sorry, incorrect %1"

336msgstr ""

337

338−#: qml/Shell.qml:363

338+#: qml/Shell.qml:390

339msgid "Sorry, incorrect passphrase."

340msgstr ""

341

342−#: qml/Shell.qml:364

342+#: qml/Shell.qml:391

343msgid "Sorry, incorrect passcode."

344msgstr ""

345

346−#: qml/Shell.qml:365

346+#: qml/Shell.qml:392

347msgid "This will be your last attempt."

348msgstr ""

349

350−#: qml/Shell.qml:367

350+#: qml/Shell.qml:394

351msgid ""

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

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

354msgstr ""

355

356−#: qml/Shell.qml:368

356+#: qml/Shell.qml:395

357msgid ""

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

359"and all personal data will be deleted."

po/ko.po+41−65

@@ -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-07 11:37+0300\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-09 06:36+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,23 +152,23 @@ msgid ""

153msgstr ""

152msgstr ""

154"여러분은 가장자리에서 끌어오기 제스쳐를 완벽히 익히셨고 휴대 전화를 사용할 수 있습니다. 스크린을 터치해서 시작하세요."

153"여러분은 가장자리에서 끌어오기 제스쳐를 완벽히 익히셨고 휴대 전화를 사용할 수 있습니다. 스크린을 터치해서 시작하세요."

155

154

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

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

157msgid "Emergency Call"

156msgid "Emergency Call"

158msgstr "긴급 통화"

157msgstr "긴급 통화"

159

158

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

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

161msgid "OK"

160msgid "OK"

162msgstr "확인"

161msgstr "확인"

163

162

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

163+#: qml/Dash/GenericScopeView.qml:434 qml/Dash/GenericScopeView.qml:591

165msgid "See less"

164msgid "See less"

166msgstr "간단히 표시"

165msgstr "간단히 표시"

167

166

168−#: qml/Dash/GenericScopeView.qml:411

167+#: qml/Dash/GenericScopeView.qml:434

169msgid "See all"

168msgid "See all"

170msgstr "모두 보기"

169msgstr "모두 보기"

171

170

172−#: qml/Dash/GenericScopeView.qml:473 qml/Dash/PageHeader.qml:258

171+#: qml/Dash/GenericScopeView.qml:496 qml/Dash/PageHeader.qml:258

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

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

174msgid "Search"

173msgid "Search"

175msgstr "검색"

174msgstr "검색"

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

@@ -250,18 +257,10 @@ msgstr "지금 말하세요..."

250msgid "Speaking..."

257msgid "Speaking..."

251msgstr "말하는 중..."

258msgstr "말하는 중..."

252

259

253−#: qml/Notifications/NotificationMenuItemFactory.qml:108

260+#: qml/Notifications/NotificationMenuItemFactory.qml:116

254msgid "Show password"

261msgid "Show password"

255msgstr "암호 표시"

262msgstr "암호 표시"

256

263

257−#: qml/Notifications/NotificationMenuItemFactory.qml:124

258−msgid "Enter SIM PIN"

259−msgstr "심 카드의 개인 식별 번호 입력"

260−

261−#: qml/Notifications/NotificationMenuItemFactory.qml:125

262−msgid "Sorry, incorrect PIN"

263−msgstr "죄송합니다. 개인 식별 번호가 올바르지 않습니다."

264−

265#: qml/Panel/ActiveCallHint.qml:77

264#: qml/Panel/ActiveCallHint.qml:77

266msgid "Tap to return to call..."

265msgid "Tap to return to call..."

267msgstr "통화로 돌아가려면 터치하세요..."

266msgstr "통화로 돌아가려면 터치하세요..."

@@ -306,85 +305,62 @@ msgstr "심 카드 잠금 해제"

306msgid "Roaming"

305msgid "Roaming"

307msgstr "로밍"

306msgstr "로밍"

308

307

309−#: qml/Shell.qml:340

308+#: qml/Shell.qml:346

310msgid "Enter passphrase"

309msgid "Enter passphrase"

311−msgstr ""

310+msgstr "패스프레이즈를 입력해주십시오."

312

311

313−#: qml/Shell.qml:321

312+#: qml/Shell.qml:347

314msgid "Sorry, incorrect passphrase"

313msgid "Sorry, incorrect passphrase"

315msgstr "죄송합니다. 패스프레이즈가 올바르지 않습니다."

314msgstr "죄송합니다. 패스프레이즈가 올바르지 않습니다."

316

315

317−#: qml/Shell.qml:342

316+#: qml/Shell.qml:348

318msgid "Please re-enter"

317msgid "Please re-enter"

319−msgstr ""

318+msgstr "다시 입력해주십시오."

320

319

321−#: qml/Shell.qml:344

320+#: qml/Shell.qml:350

322msgid "Enter passcode"

321msgid "Enter passcode"

323−msgstr ""

322+msgstr "패스코드를 입력해주십시오."

324

323

325−#: qml/Shell.qml:324

324+#: qml/Shell.qml:351

326msgid "Sorry, incorrect passcode"

325msgid "Sorry, incorrect passcode"

327msgstr "죄송합니다. 패스코드가 올바르지 않습니다."

326msgstr "죄송합니다. 패스코드가 올바르지 않습니다."

328

327

329−#: qml/Shell.qml:348

328+#: qml/Shell.qml:354

330#, qt-format

329#, qt-format

331msgid "Enter %1"

330msgid "Enter %1"

332−msgstr ""

331+msgstr "%1 입력"

333

332

334−#: qml/Shell.qml:328

333+#: qml/Shell.qml:355

335#, qt-format

334#, qt-format

336msgid "Sorry, incorrect %1"

335msgid "Sorry, incorrect %1"

337msgstr "죄송합니다. %1이(가) 올바르지 않습니다."

336msgstr "죄송합니다. %1이(가) 올바르지 않습니다."

338

337

339−#: qml/Shell.qml:363

338+#: qml/Shell.qml:390

340msgid "Sorry, incorrect passphrase."

339msgid "Sorry, incorrect passphrase."

341msgstr "올바르지 않은 패스프레이즈입니다."

340msgstr "올바르지 않은 패스프레이즈입니다."

342

341

343−#: qml/Shell.qml:364

342+#: qml/Shell.qml:391

344msgid "Sorry, incorrect passcode."

343msgid "Sorry, incorrect passcode."

345msgstr "최송합니다. 패스코드가 올바르지 않습니다."

344msgstr "최송합니다. 패스코드가 올바르지 않습니다."

346

345

347−#: qml/Shell.qml:365

346+#: qml/Shell.qml:392

348msgid "This will be your last attempt."

347msgid "This will be your last attempt."

349msgstr "마지막 시도입니다."

348msgstr "마지막 시도입니다."

350

349

351−#: qml/Shell.qml:367

350+#: qml/Shell.qml:394

352msgid ""

351msgid ""

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

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

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

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

355msgstr "이번에도 올바르지 않은 패스프레이즈를 입력하면 휴대 전화를 공장 초기화하여 모든 개인 정보를 삭제합니다."

354msgstr "이번에도 올바르지 않은 패스프레이즈를 입력하면 휴대 전화를 공장 초기화하여 모든 개인 정보를 삭제합니다."

356

355

357−#: qml/Shell.qml:368

356+#: qml/Shell.qml:395

358msgid ""

357msgid ""

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

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

360"and all personal data will be deleted."

359"and all personal data will be deleted."

361msgstr "이번에도 올바르지 않은 패스코드를 입력하면 휴대 전화를 공장 초기화하여 모든 개인 정보를 삭제합니다."

360msgstr "이번에도 올바르지 않은 패스코드를 입력하면 휴대 전화를 공장 초기화하여 모든 개인 정보를 삭제합니다."

362

361

363−#, qt-format

362+#~ msgid "Sorry, incorrect PIN"

364−#~ msgid "Hello %1"

363+#~ msgstr "죄송합니다. 개인 식별 번호가 올바르지 않습니다."

365−#~ msgstr "안녕하세요 %1"

366−

367−#~ msgid "Hello"

368−#~ msgstr "안녕하세요"

369−

370−#~ msgid "Please wait"

371−#~ msgstr "기다려주십시오"

372−

373−#~ msgid "Too many incorrect attempts"

374−#~ msgstr "너무 많이 틀리셨습니다"

375

364

376−#~ msgid "Manage Dash"

365+#~ msgid "Enter SIM PIN"

377−#~ msgstr "대시 관리"

366+#~ msgstr "심 카드의 개인 식별 번호 입력"

378−

379−#~ msgid "Enter your passphrase"

380−#~ msgstr "패스프레이즈를 입력해주십시오."

381−

382−#~ msgid "Enter your passcode"

383−#~ msgstr "패스코드를 입력해주십시오."

384−

385−#~ msgid "Swipe to unlock"

386−#~ msgstr "쓸어서 잠금 해제"

387−

388−#, qt-format

389−#~ msgid "Enter your %1"

390−#~ msgstr "%1을(를) 입력해주십시오."

po/ku.po+32−52

@@ -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-07 11:37+0300\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-09 06:36+0000\n"

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

20

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

@@ -155,23 +155,23 @@ 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:220

159msgid "Emergency Call"

160msgstr "Lêgerîna Lezgîn"

161

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

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

163msgid "OK"

164msgstr "BAŞ E"

165

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

166+#: qml/Dash/GenericScopeView.qml:434 qml/Dash/GenericScopeView.qml:591

167msgid "See less"

168msgstr "Hindiktir bibîne"

169

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

170+#: qml/Dash/GenericScopeView.qml:434

171msgid "See all"

172msgstr "Tevî bibîne"

173

174−#: qml/Dash/GenericScopeView.qml:473 qml/Dash/PageHeader.qml:258

174+#: qml/Dash/GenericScopeView.qml:496 qml/Dash/PageHeader.qml:258

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

176msgid "Search"

177msgstr "Lêgerîn"

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

@@ -252,18 +260,10 @@ msgstr "Niha biaxive..."

252msgid "Speaking..."

260msgid "Speaking..."

253msgstr "Diaxive..."

261msgstr "Diaxive..."

254

262

255−#: qml/Notifications/NotificationMenuItemFactory.qml:108

263+#: qml/Notifications/NotificationMenuItemFactory.qml:116

256msgid "Show password"

264msgid "Show password"

257msgstr "Şîfreyê nîşan bide"

265msgstr "Şîfreyê nîşan bide"

258

266

259−#: qml/Notifications/NotificationMenuItemFactory.qml:124

260−msgid "Enter SIM PIN"

261−msgstr "PINa SIMê binivîse"

262−

263−#: qml/Notifications/NotificationMenuItemFactory.qml:125

264−msgid "Sorry, incorrect PIN"

265−msgstr "Bibore, PIN çewt e"

266−

267#: qml/Panel/ActiveCallHint.qml:77

268msgid "Tap to return to call..."

269msgstr "Ji bo vegerî lêgerînê bipelîne..."

@@ -308,49 +308,49 @@ msgstr "Kilîda SIMê veke"

308msgid "Roaming"

309msgstr "Geriyan"

310

311−#: qml/Shell.qml:340

311+#: qml/Shell.qml:346

312msgid "Enter passphrase"

313msgstr ""

314

315−#: qml/Shell.qml:321

315+#: qml/Shell.qml:347

316msgid "Sorry, incorrect passphrase"

317msgstr "Bibore, parola çewt e"

318

319−#: qml/Shell.qml:342

319+#: qml/Shell.qml:348

320msgid "Please re-enter"

321msgstr ""

322

323−#: qml/Shell.qml:344

323+#: qml/Shell.qml:350

324msgid "Enter passcode"

325msgstr ""

326

327−#: qml/Shell.qml:324

327+#: qml/Shell.qml:351

328msgid "Sorry, incorrect passcode"

329msgstr "Bibore, parola çewrt e"

330

331−#: qml/Shell.qml:348

331+#: qml/Shell.qml:354

332#, qt-format

333msgid "Enter %1"

334msgstr ""

335

336−#: qml/Shell.qml:328

336+#: qml/Shell.qml:355

337#, qt-format

338msgid "Sorry, incorrect %1"

339msgstr "Bibore, %1 çewt e"

340

341−#: qml/Shell.qml:363

341+#: qml/Shell.qml:390

342msgid "Sorry, incorrect passphrase."

343msgstr "Bibore, parola çewt e."

344

345−#: qml/Shell.qml:364

345+#: qml/Shell.qml:391

346msgid "Sorry, incorrect passcode."

347msgstr "Bibore, parola çewt e."

348

349−#: qml/Shell.qml:365

349+#: qml/Shell.qml:392

350msgid "This will be your last attempt."

351msgstr "Ev ê ceribandina dawiyê be."

352

353−#: qml/Shell.qml:367

353+#: qml/Shell.qml:394

354msgid ""

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

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

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

358"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."

360

361−#: qml/Shell.qml:368

361+#: qml/Shell.qml:395

362msgid ""

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

364"and all personal data will be deleted."

@@ -366,28 +366,8 @@ msgstr ""

366"Eger parola çewt bê nivîsandin, telefona te dê vegere eyarên fabrîkayê û "

367"hemû daneyên te yên taybet dê bên jêbirin."

368

369−#~ msgid "Please wait"

369+#~ msgid "Sorry, incorrect PIN"

370−#~ msgstr "Tika ye li bendê bimîne"

370+#~ msgstr "Bibore, PIN çewt e"

371−

372−#, qt-format

373−#~ msgid "Hello %1"

374−#~ msgstr "Silav %1"

375−

376−#~ msgid "Hello"

377−#~ msgstr "Silav"

378−

379−#~ msgid "Too many incorrect attempts"

380−#~ msgstr "Te gelek caran ceribandinên çewt kirin"

381−

382−#~ msgid "Swipe to unlock"

383−#~ msgstr "Ji bo vekirinê kaş bike"

384−

385−#~ msgid "Enter your passphrase"

386−#~ msgstr "Parolaya xwe binivîse"

387−

388−#, qt-format

389−#~ msgid "Enter your %1"

390−#~ msgstr "%1a xwe binivîse"

391

371

392−#~ msgid "Enter your passcode"

372+#~ msgid "Enter SIM PIN"

393−#~ msgstr "Parolaya xwe binivîse"

373+#~ msgstr "PINa SIMê binivîse"

po/ky.po+28−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-07 11:37+0300\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-09 06:36+0000\n"

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

20

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

@@ -152,23 +152,23 @@ msgid ""

152"phone Tap on the screen to start"

153msgstr ""

154

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

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

156msgid "Emergency Call"

157msgstr ""

158

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

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

160msgid "OK"

161msgstr ""

162

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

163+#: qml/Dash/GenericScopeView.qml:434 qml/Dash/GenericScopeView.qml:591

164msgid "See less"

165msgstr ""

166

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

167+#: qml/Dash/GenericScopeView.qml:434

168msgid "See all"

169msgstr ""

170

171−#: qml/Dash/GenericScopeView.qml:473 qml/Dash/PageHeader.qml:258

171+#: qml/Dash/GenericScopeView.qml:496 qml/Dash/PageHeader.qml:258

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

173msgid "Search"

174msgstr "Издөө"

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

@@ -249,18 +257,10 @@ msgstr "Азыр сүйлөңүз..."

249msgid "Speaking..."

257msgid "Speaking..."

250msgstr "Сүйлөнүүдө..."

258msgstr "Сүйлөнүүдө..."

251

259

252−#: qml/Notifications/NotificationMenuItemFactory.qml:108

260+#: qml/Notifications/NotificationMenuItemFactory.qml:116

253msgid "Show password"

261msgid "Show password"

254msgstr ""

262msgstr ""

255

263

256−#: qml/Notifications/NotificationMenuItemFactory.qml:124

257−msgid "Enter SIM PIN"

258−msgstr ""

259−

260−#: qml/Notifications/NotificationMenuItemFactory.qml:125

261−msgid "Sorry, incorrect PIN"

262−msgstr ""

263−

264#: qml/Panel/ActiveCallHint.qml:77

265msgid "Tap to return to call..."

266msgstr ""

@@ -305,55 +305,55 @@ msgstr ""

305msgid "Roaming"

306msgstr ""

307

308−#: qml/Shell.qml:340

308+#: qml/Shell.qml:346

309msgid "Enter passphrase"

310msgstr ""

311

312−#: qml/Shell.qml:321

312+#: qml/Shell.qml:347

313msgid "Sorry, incorrect passphrase"

314msgstr ""

315

316−#: qml/Shell.qml:342

316+#: qml/Shell.qml:348

317msgid "Please re-enter"

318msgstr ""

319

320−#: qml/Shell.qml:344

320+#: qml/Shell.qml:350

321msgid "Enter passcode"

322msgstr ""

323

324−#: qml/Shell.qml:324

324+#: qml/Shell.qml:351

325msgid "Sorry, incorrect passcode"

326msgstr ""

327

328−#: qml/Shell.qml:348

328+#: qml/Shell.qml:354

329#, qt-format

330msgid "Enter %1"

331msgstr ""

332

333−#: qml/Shell.qml:328

333+#: qml/Shell.qml:355

334#, qt-format

335msgid "Sorry, incorrect %1"

336msgstr ""

337

338−#: qml/Shell.qml:363

338+#: qml/Shell.qml:390

339msgid "Sorry, incorrect passphrase."

340msgstr ""

341

342−#: qml/Shell.qml:364

342+#: qml/Shell.qml:391

343msgid "Sorry, incorrect passcode."

344msgstr ""

345

346−#: qml/Shell.qml:365

346+#: qml/Shell.qml:392

347msgid "This will be your last attempt."

348msgstr ""

349

350−#: qml/Shell.qml:367

350+#: qml/Shell.qml:394

351msgid ""

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

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

354msgstr ""

355

356−#: qml/Shell.qml:368

356+#: qml/Shell.qml:395

357msgid ""

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

359"and all personal data will be deleted."

po/lo.po+28−35

@@ -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-07 11:37+0300\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-09 06:36+0000\n"

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

20

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

@@ -152,23 +152,23 @@ msgid ""

152"phone Tap on the screen to start"

153msgstr ""

154

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

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

156msgid "Emergency Call"

157msgstr ""

158

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

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

160msgid "OK"

161msgstr ""

162

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

163+#: qml/Dash/GenericScopeView.qml:434 qml/Dash/GenericScopeView.qml:591

164msgid "See less"

165msgstr ""

166

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

167+#: qml/Dash/GenericScopeView.qml:434

168msgid "See all"

169msgstr ""

170

171−#: qml/Dash/GenericScopeView.qml:473 qml/Dash/PageHeader.qml:258

171+#: qml/Dash/GenericScopeView.qml:496 qml/Dash/PageHeader.qml:258

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

173msgid "Search"

174msgstr "ຊອກຫາ"

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

@@ -249,18 +257,10 @@ msgstr "ເວົ້າໂລດ"

249msgid "Speaking..."

257msgid "Speaking..."

250msgstr "ກໍາລັງເວົ້າ"

258msgstr "ກໍາລັງເວົ້າ"

251

259

252−#: qml/Notifications/NotificationMenuItemFactory.qml:108

260+#: qml/Notifications/NotificationMenuItemFactory.qml:116

253msgid "Show password"

261msgid "Show password"

254msgstr ""

262msgstr ""

255

263

256−#: qml/Notifications/NotificationMenuItemFactory.qml:124

257−msgid "Enter SIM PIN"

258−msgstr ""

259−

260−#: qml/Notifications/NotificationMenuItemFactory.qml:125

261−msgid "Sorry, incorrect PIN"

262−msgstr ""

263−

264#: qml/Panel/ActiveCallHint.qml:77

265msgid "Tap to return to call..."

266msgstr ""

@@ -305,63 +305,56 @@ msgstr ""

305msgid "Roaming"

306msgstr ""

307

308−#: qml/Shell.qml:340

308+#: qml/Shell.qml:346

309msgid "Enter passphrase"

310msgstr ""

311

312−#: qml/Shell.qml:321

312+#: qml/Shell.qml:347

313msgid "Sorry, incorrect passphrase"

314msgstr ""

315

316−#: qml/Shell.qml:342

316+#: qml/Shell.qml:348

317msgid "Please re-enter"

318msgstr ""

319

320−#: qml/Shell.qml:344

320+#: qml/Shell.qml:350

321msgid "Enter passcode"

322msgstr ""

323

324−#: qml/Shell.qml:324

324+#: qml/Shell.qml:351

325msgid "Sorry, incorrect passcode"

326msgstr ""

327

328−#: qml/Shell.qml:348

328+#: qml/Shell.qml:354

329#, qt-format

330msgid "Enter %1"

331msgstr ""

332

333−#: qml/Shell.qml:328

333+#: qml/Shell.qml:355

334#, qt-format

335msgid "Sorry, incorrect %1"

336msgstr ""

337

338−#: qml/Shell.qml:363

338+#: qml/Shell.qml:390

339msgid "Sorry, incorrect passphrase."

340msgstr ""

341

342−#: qml/Shell.qml:364

342+#: qml/Shell.qml:391

343msgid "Sorry, incorrect passcode."

344msgstr ""

345

346−#: qml/Shell.qml:365

346+#: qml/Shell.qml:392

347msgid "This will be your last attempt."

348msgstr ""

349

350−#: qml/Shell.qml:367

350+#: qml/Shell.qml:394

351msgid ""

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

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

354msgstr ""

355

356−#: qml/Shell.qml:368

356+#: qml/Shell.qml:395

357msgid ""

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

359"and all personal data will be deleted."

360msgstr ""

361−

362−#, qt-format

363−#~ msgid "Hello %1"

364−#~ msgstr "ສະບາຍດີ %1"

365−

366−#~ msgid "Hello"

367−#~ msgstr "ສະບາຍດີ"

po/lt.po+28−38

@@ -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-07 11:37+0300\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-09 06:36+0000\n"

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

21

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

@@ -156,23 +156,23 @@ msgid ""

156"phone Tap on the screen to start"

157msgstr ""

158

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

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

160msgid "Emergency Call"

161msgstr "Pagalbos skambutis"

162

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

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

164msgid "OK"

165msgstr ""

166

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

167+#: qml/Dash/GenericScopeView.qml:434 qml/Dash/GenericScopeView.qml:591

168msgid "See less"

169msgstr ""

170

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

171+#: qml/Dash/GenericScopeView.qml:434

172msgid "See all"

173msgstr ""

174

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

175+#: qml/Dash/GenericScopeView.qml:496 qml/Dash/PageHeader.qml:258

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

177msgid "Search"

178msgstr "Paieška"

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

@@ -253,18 +261,10 @@ msgstr "Kalbėkite..."

253msgid "Speaking..."

261msgid "Speaking..."

254msgstr "Kalbama..."

262msgstr "Kalbama..."

255

263

256−#: qml/Notifications/NotificationMenuItemFactory.qml:108

264+#: qml/Notifications/NotificationMenuItemFactory.qml:116

257msgid "Show password"

265msgid "Show password"

258msgstr "Rodyti slaptažodį"

266msgstr "Rodyti slaptažodį"

259

267

260−#: qml/Notifications/NotificationMenuItemFactory.qml:124

261−msgid "Enter SIM PIN"

262−msgstr ""

263−

264−#: qml/Notifications/NotificationMenuItemFactory.qml:125

265−msgid "Sorry, incorrect PIN"

266−msgstr ""

267−

268#: qml/Panel/ActiveCallHint.qml:77

269msgid "Tap to return to call..."

270msgstr ""

@@ -309,66 +309,56 @@ msgstr ""

309msgid "Roaming"

310msgstr ""

311

312−#: qml/Shell.qml:340

312+#: qml/Shell.qml:346

313msgid "Enter passphrase"

314msgstr ""

315

316−#: qml/Shell.qml:321

316+#: qml/Shell.qml:347

317msgid "Sorry, incorrect passphrase"

318msgstr ""

319

320−#: qml/Shell.qml:342

320+#: qml/Shell.qml:348

321msgid "Please re-enter"

322msgstr ""

323

324−#: qml/Shell.qml:344

324+#: qml/Shell.qml:350

325msgid "Enter passcode"

326msgstr ""

327

328−#: qml/Shell.qml:324

328+#: qml/Shell.qml:351

329msgid "Sorry, incorrect passcode"

330msgstr ""

331

332−#: qml/Shell.qml:348

332+#: qml/Shell.qml:354

333#, qt-format

334msgid "Enter %1"

335msgstr ""

336

337−#: qml/Shell.qml:328

337+#: qml/Shell.qml:355

338#, qt-format

339msgid "Sorry, incorrect %1"

340msgstr ""

341

342−#: qml/Shell.qml:363

342+#: qml/Shell.qml:390

343msgid "Sorry, incorrect passphrase."

344msgstr ""

345

346−#: qml/Shell.qml:364

346+#: qml/Shell.qml:391

347msgid "Sorry, incorrect passcode."

348msgstr ""

349

350−#: qml/Shell.qml:365

350+#: qml/Shell.qml:392

351msgid "This will be your last attempt."

352msgstr ""

353

354−#: qml/Shell.qml:367

354+#: qml/Shell.qml:394

355msgid ""

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

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

358msgstr ""

359

360−#: qml/Shell.qml:368

360+#: qml/Shell.qml:395

361msgid ""

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

363"and all personal data will be deleted."

364msgstr ""

365−

366−#, qt-format

367−#~ msgid "Hello %1"

368−#~ msgstr "Laba diena, %1"

369−

370−#~ msgid "Hello"

371−#~ msgstr "Sveiki"

372−

373−#~ msgid "Swipe to unlock"

374−#~ msgstr "Braukite ir atrakinsite"

po/lv.po+30−41

@@ -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-07 11:37+0300\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-09 06:36+0000\n"

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

20

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

@@ -152,23 +152,23 @@ msgid ""

152"phone Tap on the screen to start"

153msgstr ""

154

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

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

156msgid "Emergency Call"

157msgstr "Neatliekamās Palīdzības zvans"

158

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

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

160msgid "OK"

161msgstr "LABI"

162

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

163+#: qml/Dash/GenericScopeView.qml:434 qml/Dash/GenericScopeView.qml:591

164msgid "See less"

165msgstr "Redzēt mazāk"

166

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

167+#: qml/Dash/GenericScopeView.qml:434

168msgid "See all"

169msgstr "Skatīt visus"

170

171−#: qml/Dash/GenericScopeView.qml:473 qml/Dash/PageHeader.qml:258

171+#: qml/Dash/GenericScopeView.qml:496 qml/Dash/PageHeader.qml:258

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

173msgid "Search"

174msgstr "Meklēt"

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

@@ -249,18 +257,10 @@ msgstr "Runajiet Tagad"

249msgid "Speaking..."

257msgid "Speaking..."

250msgstr "Runa..."

258msgstr "Runa..."

251

259

252−#: qml/Notifications/NotificationMenuItemFactory.qml:108

260+#: qml/Notifications/NotificationMenuItemFactory.qml:116

253msgid "Show password"

261msgid "Show password"

254msgstr "Rādīt paroli"

262msgstr "Rādīt paroli"

255

263

256−#: qml/Notifications/NotificationMenuItemFactory.qml:124

257−msgid "Enter SIM PIN"

258−msgstr "Ievadiet SIM PIN"

259−

260−#: qml/Notifications/NotificationMenuItemFactory.qml:125

261−msgid "Sorry, incorrect PIN"

262−msgstr ""

263−

264#: qml/Panel/ActiveCallHint.qml:77

265msgid "Tap to return to call..."

266msgstr ""

@@ -305,70 +305,59 @@ msgstr "Atbloķēt SIM"

305msgid "Roaming"

306msgstr "Viesabonēšana"

307

308−#: qml/Shell.qml:340

308+#: qml/Shell.qml:346

309msgid "Enter passphrase"

310msgstr ""

311

312−#: qml/Shell.qml:321

312+#: qml/Shell.qml:347

313msgid "Sorry, incorrect passphrase"

314msgstr ""

315

316−#: qml/Shell.qml:342

316+#: qml/Shell.qml:348

317msgid "Please re-enter"

318msgstr ""

319

320−#: qml/Shell.qml:344

320+#: qml/Shell.qml:350

321msgid "Enter passcode"

322msgstr ""

323

324−#: qml/Shell.qml:324

324+#: qml/Shell.qml:351

325msgid "Sorry, incorrect passcode"

326msgstr ""

327

328−#: qml/Shell.qml:348

328+#: qml/Shell.qml:354

329#, qt-format

330msgid "Enter %1"

331msgstr ""

332

333−#: qml/Shell.qml:328

333+#: qml/Shell.qml:355

334#, qt-format

335msgid "Sorry, incorrect %1"

336msgstr ""

337

338−#: qml/Shell.qml:363

338+#: qml/Shell.qml:390

339msgid "Sorry, incorrect passphrase."

340msgstr ""

341

342−#: qml/Shell.qml:364

342+#: qml/Shell.qml:391

343msgid "Sorry, incorrect passcode."

344msgstr ""

345

346−#: qml/Shell.qml:365

346+#: qml/Shell.qml:392

347msgid "This will be your last attempt."

348msgstr "Šīs būs jūs pēdējais mēģinājums."

349

350−#: qml/Shell.qml:367

350+#: qml/Shell.qml:394

351msgid ""

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

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

354msgstr ""

355

356−#: qml/Shell.qml:368

356+#: qml/Shell.qml:395

357msgid ""

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

359"and all personal data will be deleted."

360msgstr ""

361

362−#, qt-format

363−#~ msgid "Hello %1"

364−#~ msgstr "Sveiki, %1"

365−

366−#~ msgid "Hello"

367−#~ msgstr "Sveiki"

368−

369−#, qt-format

370−#~ msgid "Enter your %1"

362+#~ msgid "Enter SIM PIN"

371−#~ msgstr "Ievadiet jūsu %1"

363+#~ msgstr "Ievadiet SIM PIN"

372−

373−#~ msgid "Please wait"

374−#~ msgstr "Lūdzu, uzgaidiet"

po/ml.po+28−35

@@ -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-07 11:37+0300\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-09 06:36+0000\n"

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

20

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

@@ -154,23 +154,23 @@ msgid ""

154"phone Tap on the screen to start"

155msgstr ""

156

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

157+#: qml/Components/Lockscreen.qml:220

158msgid "Emergency Call"

159msgstr "അടിയന്തിര വിളി"

160

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

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

162msgid "OK"

163msgstr ""

164

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

165+#: qml/Dash/GenericScopeView.qml:434 qml/Dash/GenericScopeView.qml:591

166msgid "See less"

167msgstr ""

168

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

169+#: qml/Dash/GenericScopeView.qml:434

170msgid "See all"

171msgstr ""

172

173−#: qml/Dash/GenericScopeView.qml:473 qml/Dash/PageHeader.qml:258

173+#: qml/Dash/GenericScopeView.qml:496 qml/Dash/PageHeader.qml:258

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

175msgid "Search"

176msgstr "തിരയുക"

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

@@ -251,18 +259,10 @@ msgstr "ഇപ്പോള്‍ സംസാരിക്കുക..."

251msgid "Speaking..."

259msgid "Speaking..."

252msgstr "സംസാരിക്കുന്നു..."

260msgstr "സംസാരിക്കുന്നു..."

253

261

254−#: qml/Notifications/NotificationMenuItemFactory.qml:108

262+#: qml/Notifications/NotificationMenuItemFactory.qml:116

255msgid "Show password"

263msgid "Show password"

256msgstr "രഹസ്യവാക്ക് കാണിക്കുക"

264msgstr "രഹസ്യവാക്ക് കാണിക്കുക"

257

265

258−#: qml/Notifications/NotificationMenuItemFactory.qml:124

259−msgid "Enter SIM PIN"

260−msgstr ""

261−

262−#: qml/Notifications/NotificationMenuItemFactory.qml:125

263−msgid "Sorry, incorrect PIN"

264−msgstr ""

265−

266#: qml/Panel/ActiveCallHint.qml:77

267msgid "Tap to return to call..."

268msgstr ""

@@ -307,63 +307,56 @@ msgstr ""

307msgid "Roaming"

308msgstr ""

309

310−#: qml/Shell.qml:340

310+#: qml/Shell.qml:346

311msgid "Enter passphrase"

312msgstr ""

313

314−#: qml/Shell.qml:321

314+#: qml/Shell.qml:347

315msgid "Sorry, incorrect passphrase"

316msgstr ""

317

318−#: qml/Shell.qml:342

318+#: qml/Shell.qml:348

319msgid "Please re-enter"

320msgstr ""

321

322−#: qml/Shell.qml:344

322+#: qml/Shell.qml:350

323msgid "Enter passcode"

324msgstr ""

325

326−#: qml/Shell.qml:324

326+#: qml/Shell.qml:351

327msgid "Sorry, incorrect passcode"

328msgstr ""

329

330−#: qml/Shell.qml:348

330+#: qml/Shell.qml:354

331#, qt-format

332msgid "Enter %1"

333msgstr ""

334

335−#: qml/Shell.qml:328

335+#: qml/Shell.qml:355

336#, qt-format

337msgid "Sorry, incorrect %1"

338msgstr ""

339

340−#: qml/Shell.qml:363

340+#: qml/Shell.qml:390

341msgid "Sorry, incorrect passphrase."

342msgstr ""

343

344−#: qml/Shell.qml:364

344+#: qml/Shell.qml:391

345msgid "Sorry, incorrect passcode."

346msgstr ""

347

348−#: qml/Shell.qml:365

348+#: qml/Shell.qml:392

349msgid "This will be your last attempt."

350msgstr ""

351

352−#: qml/Shell.qml:367

352+#: qml/Shell.qml:394

353msgid ""

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

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

356msgstr ""

357

358−#: qml/Shell.qml:368

358+#: qml/Shell.qml:395

359msgid ""

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

361"and all personal data will be deleted."

362msgstr ""

363−

364−#, qt-format

365−#~ msgid "Hello %1"

366−#~ msgstr "ഹലോ %1"

367−

368−#~ msgid "Hello"

369−#~ msgstr "ഹലോ"

po/mr.po+28−28

@@ -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-07 11:37+0300\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-09 06:36+0000\n"

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

20

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

@@ -152,23 +152,23 @@ msgid ""

152"phone Tap on the screen to start"

153msgstr ""

154

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

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

156msgid "Emergency Call"

157msgstr ""

158

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

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

160msgid "OK"

161msgstr ""

162

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

163+#: qml/Dash/GenericScopeView.qml:434 qml/Dash/GenericScopeView.qml:591

164msgid "See less"

165msgstr ""

166

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

167+#: qml/Dash/GenericScopeView.qml:434

168msgid "See all"

169msgstr ""

170

171−#: qml/Dash/GenericScopeView.qml:473 qml/Dash/PageHeader.qml:258

171+#: qml/Dash/GenericScopeView.qml:496 qml/Dash/PageHeader.qml:258

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

173msgid "Search"

174msgstr ""

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

@@ -249,18 +257,10 @@ msgstr ""

249msgid "Speaking..."

257msgid "Speaking..."

250msgstr ""

258msgstr ""

251

259

252−#: qml/Notifications/NotificationMenuItemFactory.qml:108

260+#: qml/Notifications/NotificationMenuItemFactory.qml:116

253msgid "Show password"

261msgid "Show password"

254msgstr ""

262msgstr ""

255

263

256−#: qml/Notifications/NotificationMenuItemFactory.qml:124

257−msgid "Enter SIM PIN"

258−msgstr ""

259−

260−#: qml/Notifications/NotificationMenuItemFactory.qml:125

261−msgid "Sorry, incorrect PIN"

262−msgstr ""

263−

264#: qml/Panel/ActiveCallHint.qml:77

265msgid "Tap to return to call..."

266msgstr ""

@@ -305,55 +305,55 @@ msgstr ""

305msgid "Roaming"

306msgstr ""

307

308−#: qml/Shell.qml:340

308+#: qml/Shell.qml:346

309msgid "Enter passphrase"

310msgstr ""

311

312−#: qml/Shell.qml:321

312+#: qml/Shell.qml:347

313msgid "Sorry, incorrect passphrase"

314msgstr ""

315

316−#: qml/Shell.qml:342

316+#: qml/Shell.qml:348

317msgid "Please re-enter"

318msgstr ""

319

320−#: qml/Shell.qml:344

320+#: qml/Shell.qml:350

321msgid "Enter passcode"

322msgstr ""

323

324−#: qml/Shell.qml:324

324+#: qml/Shell.qml:351

325msgid "Sorry, incorrect passcode"

326msgstr ""

327

328−#: qml/Shell.qml:348

328+#: qml/Shell.qml:354

329#, qt-format

330msgid "Enter %1"

331msgstr ""

332

333−#: qml/Shell.qml:328

333+#: qml/Shell.qml:355

334#, qt-format

335msgid "Sorry, incorrect %1"

336msgstr ""

337

338−#: qml/Shell.qml:363

338+#: qml/Shell.qml:390

339msgid "Sorry, incorrect passphrase."

340msgstr ""

341

342−#: qml/Shell.qml:364

342+#: qml/Shell.qml:391

343msgid "Sorry, incorrect passcode."

344msgstr ""

345

346−#: qml/Shell.qml:365

346+#: qml/Shell.qml:392

347msgid "This will be your last attempt."

348msgstr ""

349

350−#: qml/Shell.qml:367

350+#: qml/Shell.qml:394

351msgid ""

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

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

354msgstr ""

355

356−#: qml/Shell.qml:368

356+#: qml/Shell.qml:395

357msgid ""

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

359"and all personal data will be deleted."

po/ms.po+28−35

@@ -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-07 11:37+0300\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-09 06:36+0000\n"

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

20

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

@@ -152,23 +152,23 @@ msgid ""

152"phone Tap on the screen to start"

153msgstr ""

154

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

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

156msgid "Emergency Call"

157msgstr "panggilan Kecemasan"

158

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

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

160msgid "OK"

161msgstr ""

162

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

163+#: qml/Dash/GenericScopeView.qml:434 qml/Dash/GenericScopeView.qml:591

164msgid "See less"

165msgstr ""

166

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

167+#: qml/Dash/GenericScopeView.qml:434

168msgid "See all"

169msgstr ""

170

171−#: qml/Dash/GenericScopeView.qml:473 qml/Dash/PageHeader.qml:258

171+#: qml/Dash/GenericScopeView.qml:496 qml/Dash/PageHeader.qml:258

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

173msgid "Search"

174msgstr "Gelintar"

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

@@ -249,18 +257,10 @@ msgstr "Cakap Sekarang..."

249msgid "Speaking..."

257msgid "Speaking..."

250msgstr "Bercakap..."

258msgstr "Bercakap..."

251

259

252−#: qml/Notifications/NotificationMenuItemFactory.qml:108

260+#: qml/Notifications/NotificationMenuItemFactory.qml:116

253msgid "Show password"

261msgid "Show password"

254msgstr "Tunjuk kata laluan"

262msgstr "Tunjuk kata laluan"

255

263

256−#: qml/Notifications/NotificationMenuItemFactory.qml:124

257−msgid "Enter SIM PIN"

258−msgstr ""

259−

260−#: qml/Notifications/NotificationMenuItemFactory.qml:125

261−msgid "Sorry, incorrect PIN"

262−msgstr ""

263−

264#: qml/Panel/ActiveCallHint.qml:77

265msgid "Tap to return to call..."

266msgstr ""

@@ -305,63 +305,56 @@ msgstr ""

305msgid "Roaming"

306msgstr ""

307

308−#: qml/Shell.qml:340

308+#: qml/Shell.qml:346

309msgid "Enter passphrase"

310msgstr ""

311

312−#: qml/Shell.qml:321

312+#: qml/Shell.qml:347

313msgid "Sorry, incorrect passphrase"

314msgstr ""

315

316−#: qml/Shell.qml:342

316+#: qml/Shell.qml:348

317msgid "Please re-enter"

318msgstr ""

319

320−#: qml/Shell.qml:344

320+#: qml/Shell.qml:350

321msgid "Enter passcode"

322msgstr ""

323

324−#: qml/Shell.qml:324

324+#: qml/Shell.qml:351

325msgid "Sorry, incorrect passcode"

326msgstr ""

327

328−#: qml/Shell.qml:348

328+#: qml/Shell.qml:354

329#, qt-format

330msgid "Enter %1"

331msgstr ""

332

333−#: qml/Shell.qml:328

333+#: qml/Shell.qml:355

334#, qt-format

335msgid "Sorry, incorrect %1"

336msgstr ""

337

338−#: qml/Shell.qml:363

338+#: qml/Shell.qml:390

339msgid "Sorry, incorrect passphrase."

340msgstr ""

341

342−#: qml/Shell.qml:364

342+#: qml/Shell.qml:391

343msgid "Sorry, incorrect passcode."

344msgstr ""

345

346−#: qml/Shell.qml:365

346+#: qml/Shell.qml:392

347msgid "This will be your last attempt."

348msgstr ""

349

350−#: qml/Shell.qml:367

350+#: qml/Shell.qml:394

351msgid ""

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

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

354msgstr ""

355

356−#: qml/Shell.qml:368

356+#: qml/Shell.qml:395

357msgid ""

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

359"and all personal data will be deleted."

360msgstr ""

361−

362−#, qt-format

363−#~ msgid "Hello %1"

364−#~ msgstr "Hai %1"

365−

366−#~ msgid "Hello"

367−#~ msgstr "Hello"

po/my.po+28−35

@@ -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-07 11:37+0300\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-09 06:36+0000\n"

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

20

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

@@ -152,23 +152,23 @@ msgid ""

152"phone Tap on the screen to start"

153msgstr ""

154

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

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

156msgid "Emergency Call"

157msgstr "အရေးပေါ်ခေါ်မည်"

158

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

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

160msgid "OK"

161msgstr ""

162

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

163+#: qml/Dash/GenericScopeView.qml:434 qml/Dash/GenericScopeView.qml:591

164msgid "See less"

165msgstr ""

166

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

167+#: qml/Dash/GenericScopeView.qml:434

168msgid "See all"

169msgstr ""

170

171−#: qml/Dash/GenericScopeView.qml:473 qml/Dash/PageHeader.qml:258

171+#: qml/Dash/GenericScopeView.qml:496 qml/Dash/PageHeader.qml:258

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

173msgid "Search"

174msgstr "ရှာဖွေ"

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

@@ -249,18 +257,10 @@ msgstr "ယခုပြောပါ"

249msgid "Speaking..."

257msgid "Speaking..."

250msgstr "ပြောနေသည်"

258msgstr "ပြောနေသည်"

251

259

252−#: qml/Notifications/NotificationMenuItemFactory.qml:108

260+#: qml/Notifications/NotificationMenuItemFactory.qml:116

253msgid "Show password"

261msgid "Show password"

254msgstr "စကားဝှက်ကိုပြ"

262msgstr "စကားဝှက်ကိုပြ"

255

263

256−#: qml/Notifications/NotificationMenuItemFactory.qml:124

257−msgid "Enter SIM PIN"

258−msgstr ""

259−

260−#: qml/Notifications/NotificationMenuItemFactory.qml:125

261−msgid "Sorry, incorrect PIN"

262−msgstr ""

263−

264#: qml/Panel/ActiveCallHint.qml:77

265msgid "Tap to return to call..."

266msgstr ""

@@ -305,63 +305,56 @@ msgstr ""

305msgid "Roaming"

306msgstr ""

307

308−#: qml/Shell.qml:340

308+#: qml/Shell.qml:346

309msgid "Enter passphrase"

310msgstr ""

311

312−#: qml/Shell.qml:321

312+#: qml/Shell.qml:347

313msgid "Sorry, incorrect passphrase"

314msgstr ""

315

316−#: qml/Shell.qml:342

316+#: qml/Shell.qml:348

317msgid "Please re-enter"

318msgstr ""

319

320−#: qml/Shell.qml:344

320+#: qml/Shell.qml:350

321msgid "Enter passcode"

322msgstr ""

323

324−#: qml/Shell.qml:324

324+#: qml/Shell.qml:351

325msgid "Sorry, incorrect passcode"

326msgstr ""

327

328−#: qml/Shell.qml:348

328+#: qml/Shell.qml:354

329#, qt-format

330msgid "Enter %1"

331msgstr ""

332

333−#: qml/Shell.qml:328

333+#: qml/Shell.qml:355

334#, qt-format

335msgid "Sorry, incorrect %1"

336msgstr ""

337

338−#: qml/Shell.qml:363

338+#: qml/Shell.qml:390

339msgid "Sorry, incorrect passphrase."

340msgstr ""

341

342−#: qml/Shell.qml:364

342+#: qml/Shell.qml:391

343msgid "Sorry, incorrect passcode."

344msgstr ""

345

346−#: qml/Shell.qml:365

346+#: qml/Shell.qml:392

347msgid "This will be your last attempt."

348msgstr ""

349

350−#: qml/Shell.qml:367

350+#: qml/Shell.qml:394

351msgid ""

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

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

354msgstr ""

355

356−#: qml/Shell.qml:368

356+#: qml/Shell.qml:395

357msgid ""

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

359"and all personal data will be deleted."

360msgstr ""

361−

362−#, qt-format

363−#~ msgid "Hello %1"

364−#~ msgstr "ဟဲလို %1"

365−

366−#~ msgid "Hello"

367−#~ msgstr "ဟဲလို"

po/nb.po+33−53

@@ -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-07 11:37+0300\n"

11−"PO-Revision-Date: 2014-10-03 08:44+0000\n"

11+"PO-Revision-Date: 2014-10-07 10:32+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-04 06:28+0000\n"

18+"X-Launchpad-Export-Date: 2014-10-09 06:36+0000\n"

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

20

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

@@ -158,23 +158,23 @@ msgstr ""

158"Du har nå mestret kantbevegelsene, og er klar til å bruke "

159"telefonen Trykk på skjermen for å begynne"

160

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

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

162msgid "Emergency Call"

163msgstr "Nødanrop"

164

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

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

166msgid "OK"

167msgstr "OK"

168

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

169+#: qml/Dash/GenericScopeView.qml:434 qml/Dash/GenericScopeView.qml:591

170msgid "See less"

171msgstr "Vis mindre"

172

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

173+#: qml/Dash/GenericScopeView.qml:434

174msgid "See all"

175msgstr "Vis alt"

176

177−#: qml/Dash/GenericScopeView.qml:473 qml/Dash/PageHeader.qml:258

177+#: qml/Dash/GenericScopeView.qml:496 qml/Dash/PageHeader.qml:258

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

179msgid "Search"

180msgstr "Søk"

@@ -211,6 +211,14 @@ msgstr "Skriv en anmeldelse"

211msgid "Send"

212msgstr "Send"

213

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

215+msgid "Pull to refresh…"

216+msgstr "Dra for å oppdatere …"

217+

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

219+msgid "Release to refresh…"

220+msgstr "Slipp for å oppdatere …"

221+

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

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

215msgid "Manage Scopes"

223msgid "Manage Scopes"

216msgstr "Håndter virkefelt"

224msgstr "Håndter virkefelt"

@@ -255,18 +263,10 @@ msgstr "Snakk nå …"

255msgid "Speaking..."

263msgid "Speaking..."

256msgstr "Snakker …"

264msgstr "Snakker …"

257

265

258−#: qml/Notifications/NotificationMenuItemFactory.qml:108

266+#: qml/Notifications/NotificationMenuItemFactory.qml:116

259msgid "Show password"

267msgid "Show password"

260msgstr "Vis passord"

268msgstr "Vis passord"

261

269

262−#: qml/Notifications/NotificationMenuItemFactory.qml:124

263−msgid "Enter SIM PIN"

264−msgstr "Tast SIM-kortets PIN-kode"

265−

266−#: qml/Notifications/NotificationMenuItemFactory.qml:125

267−msgid "Sorry, incorrect PIN"

268−msgstr "Feil PIN"

269−

270#: qml/Panel/ActiveCallHint.qml:77

271msgid "Tap to return to call..."

272msgstr "Trykk for å gå tilbake til anrop …"

@@ -311,49 +311,49 @@ msgstr "Lås opp SIM"

311msgid "Roaming"

312msgstr "Fremmednett"

313

314−#: qml/Shell.qml:340

314+#: qml/Shell.qml:346

315msgid "Enter passphrase"

316msgstr "Skriv inn passordfrase"

317

318−#: qml/Shell.qml:321

318+#: qml/Shell.qml:347

319msgid "Sorry, incorrect passphrase"

320msgstr "Feil passordfrase"

321

322−#: qml/Shell.qml:342

322+#: qml/Shell.qml:348

323msgid "Please re-enter"

324msgstr "Skriv inn på nytt"

325

326−#: qml/Shell.qml:344

326+#: qml/Shell.qml:350

327msgid "Enter passcode"

328msgstr "Tast kode"

329

330−#: qml/Shell.qml:324

330+#: qml/Shell.qml:351

331msgid "Sorry, incorrect passcode"

332msgstr "Feil kode"

333

334−#: qml/Shell.qml:348

334+#: qml/Shell.qml:354

335#, qt-format

336msgid "Enter %1"

337msgstr "Skriv inn %1"

338

339−#: qml/Shell.qml:328

339+#: qml/Shell.qml:355

340#, qt-format

341msgid "Sorry, incorrect %1"

342msgstr "Feil %1"

343

344−#: qml/Shell.qml:363

344+#: qml/Shell.qml:390

345msgid "Sorry, incorrect passphrase."

346msgstr "Feil passordfrase."

347

348−#: qml/Shell.qml:364

348+#: qml/Shell.qml:391

349msgid "Sorry, incorrect passcode."

350msgstr "Feil kode."

351

352−#: qml/Shell.qml:365

352+#: qml/Shell.qml:392

353msgid "This will be your last attempt."

354msgstr "Dette er ditt siste forsøk."

355

356−#: qml/Shell.qml:367

356+#: qml/Shell.qml:394

357msgid ""

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

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

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

361"Hvis du skriver feil passordfrase en gang til, tilbakestilles telefonen til "

362"fabrikkinnstillinger, og alle personlige data slettes."

363

364−#: qml/Shell.qml:368

364+#: qml/Shell.qml:395

365msgid ""

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

367"and all personal data will be deleted."

@@ -369,28 +369,8 @@ msgstr ""

369"Hvis du skriver feil kode en gang til, tilbakestilles telefonen til "

370"fabrikkinnstillinger, og alle personlige data slettes."

371

372−#~ msgid "Hello"

372+#~ msgid "Sorry, incorrect PIN"

373−#~ msgstr "Hei"

373+#~ msgstr "Feil PIN"

374−

375−#, qt-format

376−#~ msgid "Hello %1"

377−#~ msgstr "Hei, %1"

378−

379−#~ msgid "Please wait"

380−#~ msgstr "Vent litt"

381−

382−#~ msgid "Too many incorrect attempts"

383−#~ msgstr "Du har tastet feil for mange ganger"

384−

385−#, qt-format

386−#~ msgid "Enter your %1"

387−#~ msgstr "Skriv inn %1"

388−

389−#~ msgid "Enter your passphrase"

390−#~ msgstr "Skriv inn passordfrasen din"

391−

392−#~ msgid "Swipe to unlock"

393−#~ msgstr "Skyv for å låse opp"

394

374

395−#~ msgid "Enter your passcode"

375+#~ msgid "Enter SIM PIN"

396−#~ msgstr "Tast koden din"

376+#~ msgstr "Tast SIM-kortets PIN-kode"

po/nl.po+33−53

@@ -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-07 11:37+0300\n"

11−"PO-Revision-Date: 2014-10-03 18:53+0000\n"

11+"PO-Revision-Date: 2014-10-08 19: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-04 06:28+0000\n"

18+"X-Launchpad-Export-Date: 2014-10-09 06:36+0000\n"

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

20

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

@@ -160,23 +160,23 @@ msgstr ""

160"Nu u de bewegingen vanuit de randen onder de knie heeft, kunt u beginnen met "

161"het gebruiken van de telefoon Tik op het scherm om te beginnen"

162

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

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

164msgid "Emergency Call"

165msgstr "Noodoproep"

166

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

167+#: qml/Components/Lockscreen.qml:252

168msgid "OK"

169msgstr "Ok"

170

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

171+#: qml/Dash/GenericScopeView.qml:434 qml/Dash/GenericScopeView.qml:591

172msgid "See less"

173msgstr "Minder zien"

174

175−#: qml/Dash/GenericScopeView.qml:411

175+#: qml/Dash/GenericScopeView.qml:434

176msgid "See all"

177msgstr "Alles zien"

178

179−#: qml/Dash/GenericScopeView.qml:473 qml/Dash/PageHeader.qml:258

179+#: qml/Dash/GenericScopeView.qml:496 qml/Dash/PageHeader.qml:258

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

181msgid "Search"

182msgstr "Zoeken"

@@ -213,6 +213,14 @@ msgstr "Voeg recensie toe"

213msgid "Send"

214msgstr "Versturen"

215

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

217+msgid "Pull to refresh…"

218+msgstr "Trekken om te verversen…"

219+

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

221+msgid "Release to refresh…"

222+msgstr "Loslaten om te verversen…"

223+

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

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

217msgid "Manage Scopes"

225msgid "Manage Scopes"

218msgstr "Scopes-beheer"

226msgstr "Scopes-beheer"

@@ -257,18 +265,10 @@ msgstr "Nu inspreken…"

257msgid "Speaking..."

265msgid "Speaking..."

258msgstr "Inspreken…"

266msgstr "Inspreken…"

259

267

260−#: qml/Notifications/NotificationMenuItemFactory.qml:108

268+#: qml/Notifications/NotificationMenuItemFactory.qml:116

261msgid "Show password"

269msgid "Show password"

262msgstr "Wachtwoord tonen"

270msgstr "Wachtwoord tonen"

263

271

264−#: qml/Notifications/NotificationMenuItemFactory.qml:124

265−msgid "Enter SIM PIN"

266−msgstr "Voer simpincode in"

267−

268−#: qml/Notifications/NotificationMenuItemFactory.qml:125

269−msgid "Sorry, incorrect PIN"

270−msgstr "Sorry, onjuiste pincode"

271−

272#: qml/Panel/ActiveCallHint.qml:77

273msgid "Tap to return to call..."

274msgstr "Tik om terug te keren naar gesprek…"

@@ -313,49 +313,49 @@ msgstr "Simkaart deblokkeren"

313msgid "Roaming"

314msgstr "Roaming"

315

316−#: qml/Shell.qml:340

316+#: qml/Shell.qml:346

317msgid "Enter passphrase"

318msgstr "Voer wachtwoordzin in"

319

320−#: qml/Shell.qml:321

320+#: qml/Shell.qml:347

321msgid "Sorry, incorrect passphrase"

322msgstr "Sorry, onjuiste wachtwoordzin"

323

324−#: qml/Shell.qml:342

324+#: qml/Shell.qml:348

325msgid "Please re-enter"

326msgstr "Herhaal deze a.u.b."

327

328−#: qml/Shell.qml:344

328+#: qml/Shell.qml:350

329msgid "Enter passcode"

330msgstr "Voer toegangscode in"

331

332−#: qml/Shell.qml:324

332+#: qml/Shell.qml:351

333msgid "Sorry, incorrect passcode"

334msgstr "Sorry, onjuiste toegangscode"

335

336−#: qml/Shell.qml:348

336+#: qml/Shell.qml:354

337#, qt-format

338msgid "Enter %1"

339msgstr "Voer %1 in"

340

341−#: qml/Shell.qml:328

341+#: qml/Shell.qml:355

342#, qt-format

343msgid "Sorry, incorrect %1"

344msgstr "Sorry, onjuiste %1"

345

346−#: qml/Shell.qml:363

346+#: qml/Shell.qml:390

347msgid "Sorry, incorrect passphrase."

348msgstr "Sorry, onjuiste wachtwoordzin."

349

350−#: qml/Shell.qml:364

350+#: qml/Shell.qml:391

351msgid "Sorry, incorrect passcode."

352msgstr "Sorry, onjuiste toegangscode."

353

354−#: qml/Shell.qml:365

354+#: qml/Shell.qml:392

355msgid "This will be your last attempt."

356msgstr "Dit zal uw laatste poging worden."

357

358−#: qml/Shell.qml:367

358+#: qml/Shell.qml:394

359msgid ""

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

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

@@ -363,7 +363,7 @@ msgstr ""

363"Wanneer de wachtwoordzin nu opnieuw onjuist wordt ingevoerd, zal uw telefoon "

364"teruggaan naar de fabrieksinstellingen en zal al uw eigen data verloren gaan."

365

366−#: qml/Shell.qml:368

366+#: qml/Shell.qml:395

367msgid ""

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

369"and all personal data will be deleted."

@@ -371,28 +371,8 @@ msgstr ""

371"Wanneer de toegangscode nu opnieuw onjuist wordt ingevoerd, zal uw telefoon "

372"teruggaan naar de fabrieksinstellingen en zal al uw eigen data verloren gaan."

373

374−#, qt-format

374+#~ msgid "Sorry, incorrect PIN"

375−#~ msgid "Hello %1"

375+#~ msgstr "Sorry, onjuiste pincode"

376−#~ msgstr "Hallo %1"

377−

378−#~ msgid "Hello"

379−#~ msgstr "Hallo"

380−

381−#~ msgid "Swipe to unlock"

382−#~ msgstr "Veeg om te ontgrendelen"

383−

384−#~ msgid "Please wait"

385−#~ msgstr "Even geduld a.u.b."

386−

387−#, qt-format

388−#~ msgid "Enter your %1"

389−#~ msgstr "Voer uw %1 in"

390−

391−#~ msgid "Too many incorrect attempts"

392−#~ msgstr "Te veel mislukte pogingen"

393−

394−#~ msgid "Enter your passphrase"

395−#~ msgstr "Voer uw wachtwoordzin in"

396

376

397−#~ msgid "Enter your passcode"

377+#~ msgid "Enter SIM PIN"

398−#~ msgstr "Voer uw toegangscode in"

378+#~ msgstr "Voer simpincode in"

po/pl.po+28−38

@@ -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-07 11:37+0300\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-09 06:36+0000\n"

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

21

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

@@ -157,23 +157,23 @@ 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:220

161msgid "Emergency Call"

162msgstr "Telefon ratunkowy"

163

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

164+#: qml/Components/Lockscreen.qml:252

165msgid "OK"

166msgstr "OK"

167

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

168+#: qml/Dash/GenericScopeView.qml:434 qml/Dash/GenericScopeView.qml:591

169msgid "See less"

170msgstr "Zobacz mniej"

171

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

172+#: qml/Dash/GenericScopeView.qml:434

173msgid "See all"

174msgstr "Zobacz wszystko"

175

176−#: qml/Dash/GenericScopeView.qml:473 qml/Dash/PageHeader.qml:258

176+#: qml/Dash/GenericScopeView.qml:496 qml/Dash/PageHeader.qml:258

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

178msgid "Search"

179msgstr "Szukaj"

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

@@ -254,18 +262,10 @@ msgstr "Mów teraz..."

254msgid "Speaking..."

262msgid "Speaking..."

255msgstr "Rozpoznanie..."

263msgstr "Rozpoznanie..."

256

264

257−#: qml/Notifications/NotificationMenuItemFactory.qml:108

265+#: qml/Notifications/NotificationMenuItemFactory.qml:116

258msgid "Show password"

266msgid "Show password"

259msgstr "Wyświetl hasło"

267msgstr "Wyświetl hasło"

260

268

261−#: qml/Notifications/NotificationMenuItemFactory.qml:124

262−msgid "Enter SIM PIN"

263−msgstr ""

264−

265−#: qml/Notifications/NotificationMenuItemFactory.qml:125

266−msgid "Sorry, incorrect PIN"

267−msgstr ""

268−

269#: qml/Panel/ActiveCallHint.qml:77

270msgid "Tap to return to call..."

271msgstr "Dotknij aby powrócić do połączenia..."

@@ -310,66 +310,56 @@ msgstr ""

310msgid "Roaming"

311msgstr ""

312

313−#: qml/Shell.qml:340

313+#: qml/Shell.qml:346

314msgid "Enter passphrase"

315msgstr ""

316

317−#: qml/Shell.qml:321

317+#: qml/Shell.qml:347

318msgid "Sorry, incorrect passphrase"

319msgstr ""

320

321−#: qml/Shell.qml:342

321+#: qml/Shell.qml:348

322msgid "Please re-enter"

323msgstr ""

324

325−#: qml/Shell.qml:344

325+#: qml/Shell.qml:350

326msgid "Enter passcode"

327msgstr ""

328

329−#: qml/Shell.qml:324

329+#: qml/Shell.qml:351

330msgid "Sorry, incorrect passcode"

331msgstr ""

332

333−#: qml/Shell.qml:348

333+#: qml/Shell.qml:354

334#, qt-format

335msgid "Enter %1"

336msgstr ""

337

338−#: qml/Shell.qml:328

338+#: qml/Shell.qml:355

339#, qt-format

340msgid "Sorry, incorrect %1"

341msgstr ""

342

343−#: qml/Shell.qml:363

343+#: qml/Shell.qml:390

344msgid "Sorry, incorrect passphrase."

345msgstr "Niestety, błędne hasło"

346

347−#: qml/Shell.qml:364

347+#: qml/Shell.qml:391

348msgid "Sorry, incorrect passcode."

349msgstr "Niestety, błędny kod"

350

351−#: qml/Shell.qml:365

351+#: qml/Shell.qml:392

352msgid "This will be your last attempt."

353msgstr ""

354

355−#: qml/Shell.qml:367

355+#: qml/Shell.qml:394

356msgid ""

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

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

359msgstr ""

360

361−#: qml/Shell.qml:368

361+#: qml/Shell.qml:395

362msgid ""

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

364"and all personal data will be deleted."

365msgstr ""

366−

367−#, qt-format

368−#~ msgid "Hello %1"

369−#~ msgstr "Witaj %1"

370−

371−#~ msgid "Hello"

372−#~ msgstr "Witaj"

373−

374−#~ msgid "Swipe to unlock"

375−#~ msgstr "Przeciągnij aby odblokować"

po/pt.po+33−53

@@ -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-07 11:37+0300\n"

11−"PO-Revision-Date: 2014-10-03 16:17+0000\n"

11+"PO-Revision-Date: 2014-10-07 08:31+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-04 06:28+0000\n"

18+"X-Launchpad-Export-Date: 2014-10-09 06:36+0000\n"

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

20

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

@@ -157,23 +157,23 @@ 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:220

161msgid "Emergency Call"

162msgstr "Chamada de emergência"

163

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

164+#: qml/Components/Lockscreen.qml:252

165msgid "OK"

166msgstr "OK"

167

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

168+#: qml/Dash/GenericScopeView.qml:434 qml/Dash/GenericScopeView.qml:591

169msgid "See less"

170msgstr "Ver menos"

171

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

172+#: qml/Dash/GenericScopeView.qml:434

173msgid "See all"

174msgstr "Ver todos"

175

176−#: qml/Dash/GenericScopeView.qml:473 qml/Dash/PageHeader.qml:258

176+#: qml/Dash/GenericScopeView.qml:496 qml/Dash/PageHeader.qml:258

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

178msgid "Search"

179msgstr "Procurar"

@@ -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 "Puxe para atualizar..."

216+

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

218+msgid "Release to refresh…"

219+msgstr "Solte para atualizar..."

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"

@@ -254,18 +262,10 @@ msgstr "Fale agora..."

254msgid "Speaking..."

262msgid "Speaking..."

255msgstr "A falar..."

263msgstr "A falar..."

256

264

257−#: qml/Notifications/NotificationMenuItemFactory.qml:108

265+#: qml/Notifications/NotificationMenuItemFactory.qml:116

258msgid "Show password"

266msgid "Show password"

259msgstr "Mostrar palavra-passe"

267msgstr "Mostrar palavra-passe"

260

268

261−#: qml/Notifications/NotificationMenuItemFactory.qml:124

262−msgid "Enter SIM PIN"

263−msgstr "Introduza o PIN do SIM"

264−

265−#: qml/Notifications/NotificationMenuItemFactory.qml:125

266−msgid "Sorry, incorrect PIN"

267−msgstr "Desculpe, PIN incorreto"

268−

269#: qml/Panel/ActiveCallHint.qml:77

270msgid "Tap to return to call..."

271msgstr "Tocar para ligar de volta..."

@@ -310,49 +310,49 @@ msgstr "Desbloquear SIM"

310msgid "Roaming"

311msgstr "Roaming"

312

313−#: qml/Shell.qml:340

313+#: qml/Shell.qml:346

314msgid "Enter passphrase"

315msgstr "Indique a frase-senha"

316

317−#: qml/Shell.qml:321

317+#: qml/Shell.qml:347

318msgid "Sorry, incorrect passphrase"

319msgstr "Desculpe, frase-senha incorreta"

320

321−#: qml/Shell.qml:342

321+#: qml/Shell.qml:348

322msgid "Please re-enter"

323msgstr "Por favor, volte a introduzir"

324

325−#: qml/Shell.qml:344

325+#: qml/Shell.qml:350

326msgid "Enter passcode"

327msgstr "Introduza senha"

328

329−#: qml/Shell.qml:324

329+#: qml/Shell.qml:351

330msgid "Sorry, incorrect passcode"

331msgstr "Desculpe, senha incorreta"

332

333−#: qml/Shell.qml:348

333+#: qml/Shell.qml:354

334#, qt-format

335msgid "Enter %1"

336msgstr "Introduziu %1"

337

338−#: qml/Shell.qml:328

338+#: qml/Shell.qml:355

339#, qt-format

340msgid "Sorry, incorrect %1"

341msgstr "Desculpe, incorreto %1"

342

343−#: qml/Shell.qml:363

343+#: qml/Shell.qml:390

344msgid "Sorry, incorrect passphrase."

345msgstr "Desculpe, frase de acesso incorreta."

346

347−#: qml/Shell.qml:364

347+#: qml/Shell.qml:391

348msgid "Sorry, incorrect passcode."

349msgstr "Desculpe, senha incorreta."

350

351−#: qml/Shell.qml:365

351+#: qml/Shell.qml:392

352msgid "This will be your last attempt."

353msgstr "Esta será a sua última tentativa."

354

355−#: qml/Shell.qml:367

355+#: qml/Shell.qml:394

356msgid ""

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

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

@@ -360,7 +360,7 @@ msgstr ""

360"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."

362

363−#: qml/Shell.qml:368

363+#: qml/Shell.qml:395

364msgid ""

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

366"and all personal data will be deleted."

@@ -368,28 +368,8 @@ msgstr ""

368"Se a senha for introduzida incorretamente, o seu telemóvel vai apagar todos "

369"os seus dados pessoais."

370

371−#, qt-format

371+#~ msgid "Sorry, incorrect PIN"

372−#~ msgid "Hello %1"

372+#~ msgstr "Desculpe, PIN incorreto"

373−#~ msgstr "Olá %1"

374−

375−#~ msgid "Hello"

376−#~ msgstr "Olá"

377−

378−#~ msgid "Swipe to unlock"

379−#~ msgstr "Deslize para desbloquear"

380−

381−#~ msgid "Please wait"

382−#~ msgstr "Por favor aguarde"

383−

384−#~ msgid "Too many incorrect attempts"

385−#~ msgstr "Demasiadas tentativas incorrectas"

386−

387−#, qt-format

388−#~ msgid "Enter your %1"

389−#~ msgstr "Introduza o seu %1"

390−

391−#~ msgid "Enter your passphrase"

392−#~ msgstr "Introduza a sua frase-senha"

393

373

394−#~ msgid "Enter your passcode"

374+#~ msgid "Enter SIM PIN"

395−#~ msgstr "Introduza a sua senha"

375+#~ msgstr "Introduza o PIN do SIM"

po/pt_BR.po+32−55

@@ -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-07 11:37+0300\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-09 06:37+0000\n"

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

20

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

@@ -158,23 +158,23 @@ 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:220

162msgid "Emergency Call"

163msgstr "Chamada de emergência"

164

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

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

166msgid "OK"

167msgstr "OK"

168

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

169+#: qml/Dash/GenericScopeView.qml:434 qml/Dash/GenericScopeView.qml:591

170msgid "See less"

171msgstr "Ver menos"

172

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

173+#: qml/Dash/GenericScopeView.qml:434

174msgid "See all"

175msgstr "Ver todos"

176

177−#: qml/Dash/GenericScopeView.qml:473 qml/Dash/PageHeader.qml:258

177+#: qml/Dash/GenericScopeView.qml:496 qml/Dash/PageHeader.qml:258

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

179msgid "Search"

180msgstr "Pesquisar"

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

@@ -255,18 +263,10 @@ msgstr "Fale agora..."

255msgid "Speaking..."

263msgid "Speaking..."

256msgstr "Falando..."

264msgstr "Falando..."

257

265

258−#: qml/Notifications/NotificationMenuItemFactory.qml:108

266+#: qml/Notifications/NotificationMenuItemFactory.qml:116

259msgid "Show password"

267msgid "Show password"

260msgstr "Exibir senha"

268msgstr "Exibir senha"

261

269

262−#: qml/Notifications/NotificationMenuItemFactory.qml:124

263−msgid "Enter SIM PIN"

264−msgstr "Digite o PIN do SIM"

265−

266−#: qml/Notifications/NotificationMenuItemFactory.qml:125

267−msgid "Sorry, incorrect PIN"

268−msgstr "Desculpe, PIN incorreto"

269−

270#: qml/Panel/ActiveCallHint.qml:77

271msgid "Tap to return to call..."

272msgstr "Toque para retornar para a chamada..."

@@ -311,49 +311,49 @@ msgstr "Desbloquear SIM"

311msgid "Roaming"

312msgstr "Roaming"

313

314−#: qml/Shell.qml:340

314+#: qml/Shell.qml:346

315msgid "Enter passphrase"

316msgstr ""

317

318−#: qml/Shell.qml:321

318+#: qml/Shell.qml:347

319msgid "Sorry, incorrect passphrase"

320msgstr "Desculpe, senha incorreta"

321

322−#: qml/Shell.qml:342

322+#: qml/Shell.qml:348

323msgid "Please re-enter"

324msgstr ""

325

326−#: qml/Shell.qml:344

326+#: qml/Shell.qml:350

327msgid "Enter passcode"

328msgstr ""

329

330−#: qml/Shell.qml:324

330+#: qml/Shell.qml:351

331msgid "Sorry, incorrect passcode"

332msgstr "Desculpe, senha incorreta"

333

334−#: qml/Shell.qml:348

334+#: qml/Shell.qml:354

335#, qt-format

336msgid "Enter %1"

337msgstr ""

338

339−#: qml/Shell.qml:328

339+#: qml/Shell.qml:355

340#, qt-format

341msgid "Sorry, incorrect %1"

342msgstr "Desculpe, %1 incorreto"

343

344−#: qml/Shell.qml:363

344+#: qml/Shell.qml:390

345msgid "Sorry, incorrect passphrase."

346msgstr "Desculpe, senha incorreta."

347

348−#: qml/Shell.qml:364

348+#: qml/Shell.qml:391

349msgid "Sorry, incorrect passcode."

350msgstr "Desculpe, código de acesso incorreto."

351

352−#: qml/Shell.qml:365

352+#: qml/Shell.qml:392

353msgid "This will be your last attempt."

354msgstr "Esta será a sua última tentativa."

355

356−#: qml/Shell.qml:367

356+#: qml/Shell.qml:394

357msgid ""

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

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

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

361"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."

363

364−#: qml/Shell.qml:368

364+#: qml/Shell.qml:395

365msgid ""

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

367"and all personal data will be deleted."

@@ -369,31 +369,8 @@ msgstr ""

369"Se o código de acesso for digitado incorretamente, o telefone será "

370"restaurado aos padrões de fábrica e todos os dados pessoais serão apagados."

371

372−#, qt-format

372+#~ msgid "Sorry, incorrect PIN"

373−#~ msgid "Hello %1"

373+#~ msgstr "Desculpe, PIN incorreto"

374−#~ msgstr "Olá %1"

375−

376−#~ msgid "Hello"

377−#~ msgstr "Olá"

378−

379−#~ msgid "Swipe to unlock"

380−#~ msgstr "Deslizar para desbloquear"

381−

382−#~ msgid "Too many incorrect attempts"

383−#~ msgstr "Muitas tentativas incorretas"

384−

385−#, qt-format

386−#~ msgid "Enter your %1"

387−#~ msgstr "Digite o seu %1"

388−

389−#~ msgid "Please wait"

390−#~ msgstr "Por favor, aguarde"

391−

392−#~ msgid "Manage Dash"

393−#~ msgstr "Gerencia painel"

394−

395−#~ msgid "Enter your passphrase"

396−#~ msgstr "Digite sua senha"

397

374

398−#~ msgid "Enter your passcode"

375+#~ msgid "Enter SIM PIN"

399−#~ msgstr "Digite sua senha"

376+#~ msgstr "Digite o PIN do SIM"

po/ro.po+34−54

@@ -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-07 11:37+0300\n"

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

11+"PO-Revision-Date: 2014-10-07 15:54+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-05 06:38+0000\n"

19+"X-Launchpad-Export-Date: 2014-10-09 06:36+0000\n"

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

21

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

@@ -164,23 +164,23 @@ msgstr ""

164"De acum stăpâniți gesturile de control și puteți începe să utilizați "

165"telefonul Atingeți ecranul pentru a începe"

166

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

167+#: qml/Components/Lockscreen.qml:220

168msgid "Emergency Call"

169msgstr "Apel de urgență"

170

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

171+#: qml/Components/Lockscreen.qml:252

172msgid "OK"

173msgstr "În regulă"

174

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

175+#: qml/Dash/GenericScopeView.qml:434 qml/Dash/GenericScopeView.qml:591

176msgid "See less"

177msgstr "Afișează mai puține"

178

179−#: qml/Dash/GenericScopeView.qml:411

179+#: qml/Dash/GenericScopeView.qml:434

180msgid "See all"

181msgstr "Afișează tot"

182

183−#: qml/Dash/GenericScopeView.qml:473 qml/Dash/PageHeader.qml:258

183+#: qml/Dash/GenericScopeView.qml:496 qml/Dash/PageHeader.qml:258

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

185msgid "Search"

186msgstr "Căutare"

@@ -217,6 +217,14 @@ msgstr "Adăugați o recenzie"

217msgid "Send"

218msgstr "Trimite"

219

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

221+msgid "Pull to refresh…"

222+msgstr "Trageți pentru a actualiza..."

223+

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

225+msgid "Release to refresh…"

226+msgstr "Eliberați pentru a actualiza..."

227+

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

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

221msgid "Manage Scopes"

229msgid "Manage Scopes"

222msgstr "Administrare domenii"

230msgstr "Administrare domenii"

@@ -261,18 +269,10 @@ msgstr "Vorbiți acum..."

261msgid "Speaking..."

269msgid "Speaking..."

262msgstr "Vorbire..."

270msgstr "Vorbire..."

263

271

264−#: qml/Notifications/NotificationMenuItemFactory.qml:108

272+#: qml/Notifications/NotificationMenuItemFactory.qml:116

265msgid "Show password"

273msgid "Show password"

266msgstr "Arată parola"

274msgstr "Arată parola"

267

275

268−#: qml/Notifications/NotificationMenuItemFactory.qml:124

269−msgid "Enter SIM PIN"

270−msgstr "Introduceți codul PIN pentru SIM"

271−

272−#: qml/Notifications/NotificationMenuItemFactory.qml:125

273−msgid "Sorry, incorrect PIN"

274−msgstr "Cod PIN incorect"

275−

276#: qml/Panel/ActiveCallHint.qml:77

277msgid "Tap to return to call..."

278msgstr "Atingeți pentru a vă întoarce la convorbire..."

@@ -317,49 +317,49 @@ msgstr "Deblocare SIM"

317msgid "Roaming"

318msgstr "Roaming"

319

320−#: qml/Shell.qml:340

320+#: qml/Shell.qml:346

321msgid "Enter passphrase"

322msgstr "Introduceți fraza parolă"

323

324−#: qml/Shell.qml:321

324+#: qml/Shell.qml:347

325msgid "Sorry, incorrect passphrase"

326msgstr "Frază secretă incorectă"

327

328−#: qml/Shell.qml:342

328+#: qml/Shell.qml:348

329msgid "Please re-enter"

330msgstr "Introduceți din nou"

331

332−#: qml/Shell.qml:344

332+#: qml/Shell.qml:350

333msgid "Enter passcode"

334msgstr "Introduceți parola"

335

336−#: qml/Shell.qml:324

336+#: qml/Shell.qml:351

337msgid "Sorry, incorrect passcode"

338msgstr "Parolă incorectă"

339

340−#: qml/Shell.qml:348

340+#: qml/Shell.qml:354

341#, qt-format

342msgid "Enter %1"

343−msgstr ""

343+msgstr "Introducere %1"

344

345−#: qml/Shell.qml:328

345+#: qml/Shell.qml:355

346#, qt-format

347msgid "Sorry, incorrect %1"

348msgstr "%1 incorectă"

349

350−#: qml/Shell.qml:363

350+#: qml/Shell.qml:390

351msgid "Sorry, incorrect passphrase."

352msgstr "Frază parolă greșită"

353

354−#: qml/Shell.qml:364

354+#: qml/Shell.qml:391

355msgid "Sorry, incorrect passcode."

356msgstr "Parolă greșită"

357

358−#: qml/Shell.qml:365

358+#: qml/Shell.qml:392

359msgid "This will be your last attempt."

360msgstr "Aceasta va fi ultima încercare"

361

362−#: qml/Shell.qml:367

362+#: qml/Shell.qml:394

363msgid ""

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

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

@@ -368,7 +368,7 @@ msgstr ""

368"configurările inițiale, ale fabricantului, iar toate datele personale vor fi "

369"șterse."

370

371−#: qml/Shell.qml:368

371+#: qml/Shell.qml:395

372msgid ""

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

374"and all personal data will be deleted."

@@ -377,28 +377,8 @@ msgstr ""

377"configurările inițiale, ale fabricantului, iar toate datele personale vor fi "

378"șterse."

379

380−#, qt-format

380+#~ msgid "Enter SIM PIN"

381−#~ msgid "Hello %1"

381+#~ msgstr "Introduceți codul PIN pentru SIM"

382−#~ msgstr "Salutări %1"

383−

384−#~ msgid "Hello"

385−#~ msgstr "Salutări"

386−

387−#~ msgid "Swipe to unlock"

388−#~ msgstr "Glisați pentru deblocare"

389−

390−#~ msgid "Please wait"

391−#~ msgstr "Așteptați"

392−

393−#~ msgid "Too many incorrect attempts"

394−#~ msgstr "Prea multe încercări greșite"

395−

396−#, qt-format

397−#~ msgid "Enter your %1"

398−#~ msgstr "Introduceți %1"

399−

400−#~ msgid "Enter your passphrase"

401−#~ msgstr "Introduceți fraza dumneavoastră secretă"

402

382

403−#~ msgid "Enter your passcode"

383+#~ msgid "Sorry, incorrect PIN"

404−#~ msgstr "Introduceți parola"

384+#~ msgstr "Cod PIN incorect"

po/ru.po+32−52

@@ -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-07 11:37+0300\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-09 06:36+0000\n"

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

21

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

@@ -160,23 +160,23 @@ msgstr ""

160"Вы научились пользоваться Ubuntu и можете начать использовать свой "

161"телефон Нажмите на экран"

162

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

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

164msgid "Emergency Call"

165msgstr "Экстренный вызов"

166

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

167+#: qml/Components/Lockscreen.qml:252

168msgid "OK"

169msgstr "ОК"

170

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

171+#: qml/Dash/GenericScopeView.qml:434 qml/Dash/GenericScopeView.qml:591

172msgid "See less"

173msgstr "Вкратце"

174

175−#: qml/Dash/GenericScopeView.qml:411

175+#: qml/Dash/GenericScopeView.qml:434

176msgid "See all"

177msgstr "Показать всё"

178

179−#: qml/Dash/GenericScopeView.qml:473 qml/Dash/PageHeader.qml:258

179+#: qml/Dash/GenericScopeView.qml:496 qml/Dash/PageHeader.qml:258

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

181msgid "Search"

182msgstr "Поиск"

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

@@ -257,18 +265,10 @@ msgstr "Говорите..."

257msgid "Speaking..."

265msgid "Speaking..."

258msgstr "Говорите..."

266msgstr "Говорите..."

259

267

260−#: qml/Notifications/NotificationMenuItemFactory.qml:108

268+#: qml/Notifications/NotificationMenuItemFactory.qml:116

261msgid "Show password"

269msgid "Show password"

262msgstr "Показать пароль"

270msgstr "Показать пароль"

263

271

264−#: qml/Notifications/NotificationMenuItemFactory.qml:124

265−msgid "Enter SIM PIN"

266−msgstr "Введите ПИН-код SIM-карты"

267−

268−#: qml/Notifications/NotificationMenuItemFactory.qml:125

269−msgid "Sorry, incorrect PIN"

270−msgstr "Введён неверный ПИН-код"

271−

272#: qml/Panel/ActiveCallHint.qml:77

273msgid "Tap to return to call..."

274msgstr "Коснитесь для возврата к вызову..."

@@ -313,49 +313,49 @@ msgstr "Разблокировать SIM-карту"

313msgid "Roaming"

314msgstr "Роуминг"

315

316−#: qml/Shell.qml:340

316+#: qml/Shell.qml:346

317msgid "Enter passphrase"

318msgstr ""

319

320−#: qml/Shell.qml:321

320+#: qml/Shell.qml:347

321msgid "Sorry, incorrect passphrase"

322msgstr "Введена неверная кодовая фраза"

323

324−#: qml/Shell.qml:342

324+#: qml/Shell.qml:348

325msgid "Please re-enter"

326msgstr ""

327

328−#: qml/Shell.qml:344

328+#: qml/Shell.qml:350

329msgid "Enter passcode"

330msgstr ""

331

332−#: qml/Shell.qml:324

332+#: qml/Shell.qml:351

333msgid "Sorry, incorrect passcode"

334msgstr "Секретный код введён неверно"

335

336−#: qml/Shell.qml:348

336+#: qml/Shell.qml:354

337#, qt-format

338msgid "Enter %1"

339msgstr ""

340

341−#: qml/Shell.qml:328

341+#: qml/Shell.qml:355

342#, qt-format

343msgid "Sorry, incorrect %1"

344msgstr "Некорректный ввод %1"

345

346−#: qml/Shell.qml:363

346+#: qml/Shell.qml:390

347msgid "Sorry, incorrect passphrase."

348msgstr "Неверная ключевая фраза."

349

350−#: qml/Shell.qml:364

350+#: qml/Shell.qml:391

351msgid "Sorry, incorrect passcode."

352msgstr "Неверный секретный код."

353

354−#: qml/Shell.qml:365

354+#: qml/Shell.qml:392

355msgid "This will be your last attempt."

356msgstr "Осталась последняя попытка."

357

358−#: qml/Shell.qml:367

358+#: qml/Shell.qml:394

359msgid ""

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

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

@@ -363,7 +363,7 @@ msgstr ""

363"Если ключевая фраза будет введена неверно, то телефон вернётся к заводским "

364"настройкам, а все личные данные будут удалены."

365

366−#: qml/Shell.qml:368

366+#: qml/Shell.qml:395

367msgid ""

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

369"and all personal data will be deleted."

@@ -371,28 +371,8 @@ msgstr ""

371"Если секретный код будет введен неверно, то телефон вернётся к заводским "

372"настройкам, а все личные данные будут удалены."

373

374−#, qt-format

374+#~ msgid "Sorry, incorrect PIN"

375−#~ msgid "Hello %1"

375+#~ msgstr "Введён неверный ПИН-код"

376−#~ msgstr "Привет, %1"

377−

378−#~ msgid "Hello"

379−#~ msgstr "Привет"

380−

381−#~ msgid "Swipe to unlock"

382−#~ msgstr "Смахните, чтобы разблокировать"

383−

384−#, qt-format

385−#~ msgid "Enter your %1"

386−#~ msgstr "Введите %1"

387−

388−#~ msgid "Please wait"

389−#~ msgstr "Подождите"

390−

391−#~ msgid "Too many incorrect attempts"

392−#~ msgstr "Слишком много ошибок ввода"

393−

394−#~ msgid "Enter your passphrase"

395−#~ msgstr "Введите кодовую фразу"

396

376

397−#~ msgid "Enter your passcode"

377+#~ msgid "Enter SIM PIN"

398−#~ msgstr "Введите секретный код"

378+#~ msgstr "Введите ПИН-код SIM-карты"

po/shn.po+28−28

@@ -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-07 11:37+0300\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-09 06:36+0000\n"

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

20

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

@@ -152,23 +152,23 @@ msgid ""

152"phone Tap on the screen to start"

153msgstr ""

154

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

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

156msgid "Emergency Call"

157msgstr ""

158

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

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

160msgid "OK"

161msgstr ""

162

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

163+#: qml/Dash/GenericScopeView.qml:434 qml/Dash/GenericScopeView.qml:591

164msgid "See less"

165msgstr ""

166

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

167+#: qml/Dash/GenericScopeView.qml:434

168msgid "See all"

169msgstr ""

170

171−#: qml/Dash/GenericScopeView.qml:473 qml/Dash/PageHeader.qml:258

171+#: qml/Dash/GenericScopeView.qml:496 qml/Dash/PageHeader.qml:258

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

173msgid "Search"

174msgstr ""

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

@@ -249,18 +257,10 @@ msgstr ""

249msgid "Speaking..."

257msgid "Speaking..."

250msgstr ""

258msgstr ""

251

259

252−#: qml/Notifications/NotificationMenuItemFactory.qml:108

260+#: qml/Notifications/NotificationMenuItemFactory.qml:116

253msgid "Show password"

261msgid "Show password"

254msgstr ""

262msgstr ""

255

263

256−#: qml/Notifications/NotificationMenuItemFactory.qml:124

257−msgid "Enter SIM PIN"

258−msgstr ""

259−

260−#: qml/Notifications/NotificationMenuItemFactory.qml:125

261−msgid "Sorry, incorrect PIN"

262−msgstr ""

263−

264#: qml/Panel/ActiveCallHint.qml:77

265msgid "Tap to return to call..."

266msgstr ""

@@ -305,55 +305,55 @@ msgstr ""

305msgid "Roaming"

306msgstr ""

307

308−#: qml/Shell.qml:340

308+#: qml/Shell.qml:346

309msgid "Enter passphrase"

310msgstr ""

311

312−#: qml/Shell.qml:321

312+#: qml/Shell.qml:347

313msgid "Sorry, incorrect passphrase"

314msgstr ""

315

316−#: qml/Shell.qml:342

316+#: qml/Shell.qml:348

317msgid "Please re-enter"

318msgstr ""

319

320−#: qml/Shell.qml:344

320+#: qml/Shell.qml:350

321msgid "Enter passcode"

322msgstr ""

323

324−#: qml/Shell.qml:324

324+#: qml/Shell.qml:351

325msgid "Sorry, incorrect passcode"

326msgstr ""

327

328−#: qml/Shell.qml:348

328+#: qml/Shell.qml:354

329#, qt-format

330msgid "Enter %1"

331msgstr ""

332

333−#: qml/Shell.qml:328

333+#: qml/Shell.qml:355

334#, qt-format

335msgid "Sorry, incorrect %1"

336msgstr ""

337

338−#: qml/Shell.qml:363

338+#: qml/Shell.qml:390

339msgid "Sorry, incorrect passphrase."

340msgstr ""

341

342−#: qml/Shell.qml:364

342+#: qml/Shell.qml:391

343msgid "Sorry, incorrect passcode."

344msgstr ""

345

346−#: qml/Shell.qml:365

346+#: qml/Shell.qml:392

347msgid "This will be your last attempt."

348msgstr ""

349

350−#: qml/Shell.qml:367

350+#: qml/Shell.qml:394

351msgid ""

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

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

354msgstr ""

355

356−#: qml/Shell.qml:368

356+#: qml/Shell.qml:395

357msgid ""

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

359"and all personal data will be deleted."

po/si.po+28−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-07 11:37+0300\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-09 06:36+0000\n"

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

20

21#: plugins/LightDM/Greeter.cpp:130

@@ -152,23 +152,23 @@ msgid ""

152"phone Tap on the screen to start"

153msgstr ""

154

155−#: qml/Components/Lockscreen.qml:206

155+#: qml/Components/Lockscreen.qml:220

156msgid "Emergency Call"

157msgstr ""

158

159−#: qml/Components/Lockscreen.qml:226

159+#: qml/Components/Lockscreen.qml:252

160msgid "OK"

161msgstr ""

162

163−#: qml/Dash/GenericScopeView.qml:411 qml/Dash/GenericScopeView.qml:533

163+#: qml/Dash/GenericScopeView.qml:434 qml/Dash/GenericScopeView.qml:591

164msgid "See less"

165msgstr ""

166

167−#: qml/Dash/GenericScopeView.qml:411

167+#: qml/Dash/GenericScopeView.qml:434

168msgid "See all"

169msgstr ""

170

171−#: qml/Dash/GenericScopeView.qml:473 qml/Dash/PageHeader.qml:258

171+#: qml/Dash/GenericScopeView.qml:496 qml/Dash/PageHeader.qml:258

172#: qml/Panel/SearchIndicator.qml:27

173msgid "Search"

174msgstr ""

@@ -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 ""

@@ -249,18 +257,10 @@ msgstr ""

249msgid "Speaking..."

257msgid "Speaking..."

250msgstr ""

258msgstr ""

251

259

252−#: qml/Notifications/NotificationMenuItemFactory.qml:108

260+#: qml/Notifications/NotificationMenuItemFactory.qml:116

253msgid "Show password"

261msgid "Show password"

254msgstr ""

262msgstr ""

255

263

256−#: qml/Notifications/NotificationMenuItemFactory.qml:124

257−msgid "Enter SIM PIN"

258−msgstr ""

259−

260−#: qml/Notifications/NotificationMenuItemFactory.qml:125

261−msgid "Sorry, incorrect PIN"

262−msgstr ""

263−

264#: qml/Panel/ActiveCallHint.qml:77

265msgid "Tap to return to call..."

266msgstr ""

@@ -305,55 +305,55 @@ msgstr ""

305msgid "Roaming"

306msgstr ""

307

308−#: qml/Shell.qml:340

308+#: qml/Shell.qml:346

309msgid "Enter passphrase"

310msgstr ""

311

312−#: qml/Shell.qml:321

312+#: qml/Shell.qml:347

313msgid "Sorry, incorrect passphrase"

314msgstr ""

315

316−#: qml/Shell.qml:342

316+#: qml/Shell.qml:348

317msgid "Please re-enter"

318msgstr ""

319

320−#: qml/Shell.qml:344

320+#: qml/Shell.qml:350

321msgid "Enter passcode"

322msgstr ""

323

324−#: qml/Shell.qml:324

324+#: qml/Shell.qml:351

325msgid "Sorry, incorrect passcode"

326msgstr ""

327

328−#: qml/Shell.qml:348

328+#: qml/Shell.qml:354

329#, qt-format

330msgid "Enter %1"

331msgstr ""

332

333−#: qml/Shell.qml:328

333+#: qml/Shell.qml:355

334#, qt-format

335msgid "Sorry, incorrect %1"

336msgstr ""

337

338−#: qml/Shell.qml:363

338+#: qml/Shell.qml:390

339msgid "Sorry, incorrect passphrase."

340msgstr ""

341

342−#: qml/Shell.qml:364

342+#: qml/Shell.qml:391

343msgid "Sorry, incorrect passcode."

344msgstr ""

345

346−#: qml/Shell.qml:365

346+#: qml/Shell.qml:392

347msgid "This will be your last attempt."

348msgstr ""

349

350−#: qml/Shell.qml:367

350+#: qml/Shell.qml:394

351msgid ""

352"If passphrase is entered incorrectly, your phone will conduct a factory "

353"reset and all personal data will be deleted."

354msgstr ""

355

356−#: qml/Shell.qml:368

356+#: qml/Shell.qml:395

357msgid ""

358"If passcode is entered incorrectly, your phone will conduct a factory reset "

359"and all personal data will be deleted."

po/sl.po+33−53

@@ -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-07 11:37+0300\n"

11−"PO-Revision-Date: 2014-10-03 17:37+0000\n"

11+"PO-Revision-Date: 2014-10-07 09:28+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-04 06:28+0000\n"

19+"X-Launchpad-Export-Date: 2014-10-09 06:36+0000\n"

20"X-Generator: Launchpad (build 17196)\n"

21

22#: plugins/LightDM/Greeter.cpp:130

@@ -161,23 +161,23 @@ msgstr ""

161"Sedaj, ko ste osvojili poteze robov, lahko začnete uporabljati "

162"telefon Tapnite na zaslon za začetek"

163

164−#: qml/Components/Lockscreen.qml:206

164+#: qml/Components/Lockscreen.qml:220

165msgid "Emergency Call"

166msgstr "Klic v sili"

167

168−#: qml/Components/Lockscreen.qml:226

168+#: qml/Components/Lockscreen.qml:252

169msgid "OK"

170msgstr "V REDU"

171

172−#: qml/Dash/GenericScopeView.qml:411 qml/Dash/GenericScopeView.qml:533

172+#: qml/Dash/GenericScopeView.qml:434 qml/Dash/GenericScopeView.qml:591

173msgid "See less"

174msgstr "Pokaži manj"

175

176−#: qml/Dash/GenericScopeView.qml:411

176+#: qml/Dash/GenericScopeView.qml:434

177msgid "See all"

178msgstr "Ogled vsega"

179

180−#: qml/Dash/GenericScopeView.qml:473 qml/Dash/PageHeader.qml:258

180+#: qml/Dash/GenericScopeView.qml:496 qml/Dash/PageHeader.qml:258

181#: qml/Panel/SearchIndicator.qml:27

182msgid "Search"

183msgstr "Iskanje"

@@ -214,6 +214,14 @@ msgstr "Dodaj oceno"

214msgid "Send"

215msgstr "Pošlji"

216

217+#: qml/Dash/PullToRefreshScopeStyle.qml:55

218+msgid "Pull to refresh…"

219+msgstr "Povlecite za osvežitev ..."

220+

221+#: qml/Dash/PullToRefreshScopeStyle.qml:60

222+msgid "Release to refresh…"

223+msgstr "Spustite za osvežitev ..."

224+

217#: qml/Dash/ScopesOverview.qml:206

225#: qml/Dash/ScopesOverview.qml:206

218msgid "Manage Scopes"

226msgid "Manage Scopes"

219msgstr ""

227msgstr ""

@@ -258,18 +266,10 @@ msgstr "Govorite zdaj ..."

258msgid "Speaking..."

266msgid "Speaking..."

259msgstr "Govorjenje ..."

267msgstr "Govorjenje ..."

260

268

261−#: qml/Notifications/NotificationMenuItemFactory.qml:108

269+#: qml/Notifications/NotificationMenuItemFactory.qml:116

262msgid "Show password"

270msgid "Show password"

263msgstr "Pokaži geslo"

271msgstr "Pokaži geslo"

264

272

265−#: qml/Notifications/NotificationMenuItemFactory.qml:124

266−msgid "Enter SIM PIN"

267−msgstr "Vnesite PIN kartice SIM"

268−

269−#: qml/Notifications/NotificationMenuItemFactory.qml:125

270−msgid "Sorry, incorrect PIN"

271−msgstr "Oprostite, napačen PIN"

272−

273#: qml/Panel/ActiveCallHint.qml:77

274msgid "Tap to return to call..."

275msgstr "Tapnite za vrnitev v klic ..."

@@ -314,49 +314,49 @@ msgstr "Odkleni SIM"

314msgid "Roaming"

315msgstr "Gostovanje"

316

317−#: qml/Shell.qml:340

317+#: qml/Shell.qml:346

318msgid "Enter passphrase"

319msgstr "Vnesite šifrirno reklo"

320

321−#: qml/Shell.qml:321

321+#: qml/Shell.qml:347

322msgid "Sorry, incorrect passphrase"

323msgstr "Oprostite, napačno šifrirno reklo"

324

325−#: qml/Shell.qml:342

325+#: qml/Shell.qml:348

326msgid "Please re-enter"

327msgstr "Ponovno vnesite"

328

329−#: qml/Shell.qml:344

329+#: qml/Shell.qml:350

330msgid "Enter passcode"

331msgstr "Vnesite geslo"

332

333−#: qml/Shell.qml:324

333+#: qml/Shell.qml:351

334msgid "Sorry, incorrect passcode"

335msgstr "Nepravilno geslo"

336

337−#: qml/Shell.qml:348

337+#: qml/Shell.qml:354

338#, qt-format

339msgid "Enter %1"

340msgstr "Vnesite %1"

341

342−#: qml/Shell.qml:328

342+#: qml/Shell.qml:355

343#, qt-format

344msgid "Sorry, incorrect %1"

345msgstr "Oprostite, napačen %1"

346

347−#: qml/Shell.qml:363

347+#: qml/Shell.qml:390

348msgid "Sorry, incorrect passphrase."

349msgstr "Nepravilno geslo."

350

351−#: qml/Shell.qml:364

351+#: qml/Shell.qml:391

352msgid "Sorry, incorrect passcode."

353msgstr "Nepravilno geslo."

354

355−#: qml/Shell.qml:365

355+#: qml/Shell.qml:392

356msgid "This will be your last attempt."

357msgstr "To je vaš zadnji poskus"

358

359−#: qml/Shell.qml:367

359+#: qml/Shell.qml:394

360msgid ""

361"If passphrase is entered incorrectly, your phone will conduct a factory "

362"reset and all personal data will be deleted."

@@ -364,7 +364,7 @@ msgstr ""

364"Če je vneseno nepravilno šifrirno reklo, bo telefon ponastavljen na "

365"tovarniške nastavitve ter vsi osebni podatki bodo izbrisani."

366

367−#: qml/Shell.qml:368

367+#: qml/Shell.qml:395

368msgid ""

369"If passcode is entered incorrectly, your phone will conduct a factory reset "

370"and all personal data will be deleted."

@@ -372,28 +372,8 @@ msgstr ""

372"Če je vneseno nepravilno geslo, bo telefon ponastavljen na tovarniške "

373"nastavitve ter vsi osebni podatki bodo izbrisani."

374

375−#, qt-format

375+#~ msgid "Sorry, incorrect PIN"

376−#~ msgid "Hello %1"

376+#~ msgstr "Oprostite, napačen PIN"

377−#~ msgstr "Pozdravljeni, %1"

378−

379−#~ msgid "Hello"

380−#~ msgstr "Pozdravljeni"

381−

382−#~ msgid "Swipe to unlock"

383−#~ msgstr "Podrsajte za odklenitev"

384−

385−#~ msgid "Please wait"

386−#~ msgstr "Počakajte"

387−

388−#~ msgid "Too many incorrect attempts"

389−#~ msgstr "Preveč nepravilnih poskusov"

390−

391−#, qt-format

392−#~ msgid "Enter your %1"

393−#~ msgstr "Vnesite vaš %1"

394−

395−#~ msgid "Enter your passphrase"

396−#~ msgstr "Vnesite svoje šifrirno reklo"

397

377

398−#~ msgid "Enter your passcode"

378+#~ msgid "Enter SIM PIN"

399−#~ msgstr "Vnesite svoje geslo"

379+#~ msgstr "Vnesite PIN kartice SIM"

po/sq.po+28−28

@@ -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-07 11:37+0300\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-09 06:36+0000\n"

19"X-Generator: Launchpad (build 17196)\n"

20

21#: plugins/LightDM/Greeter.cpp:130

@@ -153,23 +153,23 @@ msgid ""

153"phone Tap on the screen to start"

154msgstr ""

155

156−#: qml/Components/Lockscreen.qml:206

156+#: qml/Components/Lockscreen.qml:220

157msgid "Emergency Call"

158msgstr ""

159

160−#: qml/Components/Lockscreen.qml:226

160+#: qml/Components/Lockscreen.qml:252

161msgid "OK"

162msgstr ""

163

164−#: qml/Dash/GenericScopeView.qml:411 qml/Dash/GenericScopeView.qml:533

164+#: qml/Dash/GenericScopeView.qml:434 qml/Dash/GenericScopeView.qml:591

165msgid "See less"

166msgstr ""

167

168−#: qml/Dash/GenericScopeView.qml:411

168+#: qml/Dash/GenericScopeView.qml:434

169msgid "See all"

170msgstr ""

171

172−#: qml/Dash/GenericScopeView.qml:473 qml/Dash/PageHeader.qml:258

172+#: qml/Dash/GenericScopeView.qml:496 qml/Dash/PageHeader.qml:258

173#: qml/Panel/SearchIndicator.qml:27

174msgid "Search"

175msgstr ""

@@ -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 ""

@@ -250,18 +258,10 @@ msgstr ""

250msgid "Speaking..."

258msgid "Speaking..."

251msgstr ""

259msgstr ""

252

260

253−#: qml/Notifications/NotificationMenuItemFactory.qml:108

261+#: qml/Notifications/NotificationMenuItemFactory.qml:116

254msgid "Show password"

262msgid "Show password"

255msgstr ""

263msgstr ""

256

264

257−#: qml/Notifications/NotificationMenuItemFactory.qml:124

258−msgid "Enter SIM PIN"

259−msgstr ""

260−

261−#: qml/Notifications/NotificationMenuItemFactory.qml:125

262−msgid "Sorry, incorrect PIN"

263−msgstr ""

264−

265#: qml/Panel/ActiveCallHint.qml:77

266msgid "Tap to return to call..."

267msgstr ""

@@ -306,55 +306,55 @@ msgstr ""

306msgid "Roaming"

307msgstr ""

308

309−#: qml/Shell.qml:340

309+#: qml/Shell.qml:346

310msgid "Enter passphrase"

311msgstr ""

312

313−#: qml/Shell.qml:321

313+#: qml/Shell.qml:347

314msgid "Sorry, incorrect passphrase"

315msgstr ""

316

317−#: qml/Shell.qml:342

317+#: qml/Shell.qml:348

318msgid "Please re-enter"

319msgstr ""

320

321−#: qml/Shell.qml:344

321+#: qml/Shell.qml:350

322msgid "Enter passcode"

323msgstr ""

324

325−#: qml/Shell.qml:324

325+#: qml/Shell.qml:351

326msgid "Sorry, incorrect passcode"

327msgstr ""

328

329−#: qml/Shell.qml:348

329+#: qml/Shell.qml:354

330#, qt-format

331msgid "Enter %1"

332msgstr ""

333

334−#: qml/Shell.qml:328

334+#: qml/Shell.qml:355

335#, qt-format

336msgid "Sorry, incorrect %1"

337msgstr ""

338

339−#: qml/Shell.qml:363

339+#: qml/Shell.qml:390

340msgid "Sorry, incorrect passphrase."

341msgstr ""

342

343−#: qml/Shell.qml:364

343+#: qml/Shell.qml:391

344msgid "Sorry, incorrect passcode."

345msgstr ""

346

347−#: qml/Shell.qml:365

347+#: qml/Shell.qml:392

348msgid "This will be your last attempt."

349msgstr ""

350

351−#: qml/Shell.qml:367

351+#: qml/Shell.qml:394

352msgid ""

353"If passphrase is entered incorrectly, your phone will conduct a factory "

354"reset and all personal data will be deleted."

355msgstr ""

356

357−#: qml/Shell.qml:368

357+#: qml/Shell.qml:395

358msgid ""

359"If passcode is entered incorrectly, your phone will conduct a factory reset "

360"and all personal data will be deleted."

po/sr.po+32−55

@@ -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-07 11:37+0300\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-09 06:36+0000\n"

20"X-Generator: Launchpad (build 17196)\n"

21

22#: plugins/LightDM/Greeter.cpp:130

@@ -157,23 +157,23 @@ msgstr ""

157"Сада сте савладали превлачења са ивица и можете да користите "

158"телефон Тапните на екран да почнете"

159

160−#: qml/Components/Lockscreen.qml:206

160+#: qml/Components/Lockscreen.qml:220

161msgid "Emergency Call"

162msgstr "Хитан позив"

163

164−#: qml/Components/Lockscreen.qml:226

164+#: qml/Components/Lockscreen.qml:252

165msgid "OK"

166msgstr "У реду"

167

168−#: qml/Dash/GenericScopeView.qml:411 qml/Dash/GenericScopeView.qml:533

168+#: qml/Dash/GenericScopeView.qml:434 qml/Dash/GenericScopeView.qml:591

169msgid "See less"

170msgstr "Сажетије"

171

172−#: qml/Dash/GenericScopeView.qml:411

172+#: qml/Dash/GenericScopeView.qml:434

173msgid "See all"

174msgstr "Опширније"

175

176−#: qml/Dash/GenericScopeView.qml:473 qml/Dash/PageHeader.qml:258

176+#: qml/Dash/GenericScopeView.qml:496 qml/Dash/PageHeader.qml:258

177#: qml/Panel/SearchIndicator.qml:27

178msgid "Search"

179msgstr "Претрага"

@@ -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 ""

@@ -254,18 +262,10 @@ msgstr "Изговорите сада..."

254msgid "Speaking..."

262msgid "Speaking..."

255msgstr "Говор..."

263msgstr "Говор..."

256

264

257−#: qml/Notifications/NotificationMenuItemFactory.qml:108

265+#: qml/Notifications/NotificationMenuItemFactory.qml:116

258msgid "Show password"

266msgid "Show password"

259msgstr "Прикажи лозинку"

267msgstr "Прикажи лозинку"

260

268

261−#: qml/Notifications/NotificationMenuItemFactory.qml:124

262−msgid "Enter SIM PIN"

263−msgstr "Унеси пин СИМ картице"

264−

265−#: qml/Notifications/NotificationMenuItemFactory.qml:125

266−msgid "Sorry, incorrect PIN"

267−msgstr "Жао ми је, погрешан ПИН код"

268−

269#: qml/Panel/ActiveCallHint.qml:77

270msgid "Tap to return to call..."

271msgstr "Тапните да одговорите на позив"

@@ -310,49 +310,49 @@ msgstr "Откључај СИМ картицу"

310msgid "Roaming"

311msgstr "Роминг"

312

313−#: qml/Shell.qml:340

313+#: qml/Shell.qml:346

314msgid "Enter passphrase"

315msgstr ""

316

317−#: qml/Shell.qml:321

317+#: qml/Shell.qml:347

318msgid "Sorry, incorrect passphrase"

319msgstr "Жао ми је, погрешна лозинка"

320

321−#: qml/Shell.qml:342

321+#: qml/Shell.qml:348

322msgid "Please re-enter"

323msgstr ""

324

325−#: qml/Shell.qml:344

325+#: qml/Shell.qml:350

326msgid "Enter passcode"

327msgstr ""

328

329−#: qml/Shell.qml:324

329+#: qml/Shell.qml:351

330msgid "Sorry, incorrect passcode"

331msgstr "Жао ми је, погрешан код"

332

333−#: qml/Shell.qml:348

333+#: qml/Shell.qml:354

334#, qt-format

335msgid "Enter %1"

336msgstr ""

337

338−#: qml/Shell.qml:328

338+#: qml/Shell.qml:355

339#, qt-format

340msgid "Sorry, incorrect %1"

341msgstr "Жао ми је, погрешан %1"

342

343−#: qml/Shell.qml:363

343+#: qml/Shell.qml:390

344msgid "Sorry, incorrect passphrase."

345msgstr "Жао ми је, погрешна лозинка."

346

347−#: qml/Shell.qml:364

347+#: qml/Shell.qml:391

348msgid "Sorry, incorrect passcode."

349msgstr "Жао ми је, погрешан код."

350

351−#: qml/Shell.qml:365

351+#: qml/Shell.qml:392

352msgid "This will be your last attempt."

353msgstr "Ово је ваш последњи покушај."

354

355−#: qml/Shell.qml:367

355+#: qml/Shell.qml:394

356msgid ""

357"If passphrase is entered incorrectly, your phone will conduct a factory "

358"reset and all personal data will be deleted."

@@ -360,7 +360,7 @@ msgstr ""

360"Ако се унесе погрешна лозинка, ваш телефон ће се ресетовати и сви лични "

361"подаци ће бити обрисани."

362

363−#: qml/Shell.qml:368

363+#: qml/Shell.qml:395

364msgid ""

365"If passcode is entered incorrectly, your phone will conduct a factory reset "

366"and all personal data will be deleted."

@@ -368,31 +368,8 @@ msgstr ""

368"Ако се унесе погрешан код, ваш телефон ће се ресетовати и сви лични подаци "

369"ће бити обрисани."

370

371−#, qt-format

371+#~ msgid "Enter SIM PIN"

372−#~ msgid "Hello %1"

372+#~ msgstr "Унеси пин СИМ картице"

373−#~ msgstr "Здраво %1"

374−

375−#~ msgid "Please wait"

376−#~ msgstr "Сачекајте"

377−

378−#~ msgid "Too many incorrect attempts"

379−#~ msgstr "Превише нетачних покушаја"

380−

381−#~ msgid "Hello"

382−#~ msgstr "Здраво"

383−

384−#~ msgid "Manage Dash"

385−#~ msgstr "Управљај Полицом"

386−

387−#~ msgid "Enter your passphrase"

388−#~ msgstr "Унесите вашу лозинку"

389−

390−#, qt-format

391−#~ msgid "Enter your %1"

392−#~ msgstr "Унесите ваш %1"

393−

394−#~ msgid "Enter your passcode"

395−#~ msgstr "Унесите ваш код"

396

373

397−#~ msgid "Swipe to unlock"

374+#~ msgid "Sorry, incorrect PIN"

398−#~ msgstr "Повуците да откључате"

375+#~ msgstr "Жао ми је, погрешан ПИН код"

po/sv.po+43−66

@@ -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-07 11:37+0300\n"

11−"PO-Revision-Date: 2014-09-23 08:37+0000\n"

11+"PO-Revision-Date: 2014-10-07 14:28+0000\n"

12"Last-Translator: Josef Andersson <Unknown>\n"

13"Language-Team: Swedish <tp-sv@listor.tp-sv.se>\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-09 06:36+0000\n"

19"X-Generator: Launchpad (build 17196)\n"

20"Language: sv\n"

21

@@ -34,22 +34,22 @@ msgstr "Släpp genväg"

34

35#: qml/Components/DelayedLockscreen.qml:47

36msgid "Device Locked"

37−msgstr ""

37+msgstr "Enhet låst"

38

39#: qml/Components/DelayedLockscreen.qml:62

40msgid "You have been locked out due to too many failed passphrase attempts."

41−msgstr ""

41+msgstr "Du har blivit utlåst efter för många misslyckade lösenfrasförsök."

42

43#: qml/Components/DelayedLockscreen.qml:63

44msgid "You have been locked out due to too many failed passcode attempts."

45−msgstr ""

45+msgstr "Du har blivit utlåst efter för många misslyckade lösenkodsförsök."

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] "Vänta %1 minut och prova sedan igen..."

52−msgstr[1] ""

52+msgstr[1] "Vänta %1 minuter och prova sedan igen..."

53

54#: qml/Components/Dialogs.qml:70

55msgid "Log out"

@@ -157,23 +157,23 @@ 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:220

161msgid "Emergency Call"

162msgstr "Nödsamtal"

163

164−#: qml/Components/Lockscreen.qml:226

164+#: qml/Components/Lockscreen.qml:252

165msgid "OK"

166msgstr "Ok"

167

168−#: qml/Dash/GenericScopeView.qml:411 qml/Dash/GenericScopeView.qml:533

168+#: qml/Dash/GenericScopeView.qml:434 qml/Dash/GenericScopeView.qml:591

169msgid "See less"

170msgstr "Visa mindre"

171

172−#: qml/Dash/GenericScopeView.qml:411

172+#: qml/Dash/GenericScopeView.qml:434

173msgid "See all"

174msgstr "Visa alla"

175

176−#: qml/Dash/GenericScopeView.qml:473 qml/Dash/PageHeader.qml:258

176+#: qml/Dash/GenericScopeView.qml:496 qml/Dash/PageHeader.qml:258

177#: qml/Panel/SearchIndicator.qml:27

178msgid "Search"

179msgstr "Sök"

@@ -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 "Dra för att uppdatera..."

216+

217+#: qml/Dash/PullToRefreshScopeStyle.qml:60

218+msgid "Release to refresh…"

219+msgstr "Släpp för uppdatera..."

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"

@@ -232,7 +240,7 @@ msgstr "Alla"

232

240

233#: qml/Greeter/Greeter.qml:157

241#: qml/Greeter/Greeter.qml:157

234msgid "Unlock"

242msgid "Unlock"

235−msgstr ""

243+msgstr "Lås upp"

236

244

237#: qml/Hud/HudParametrizedActionsPage.qml:139

245#: qml/Hud/HudParametrizedActionsPage.qml:139

238msgid "Confirm"

246msgid "Confirm"

@@ -254,18 +262,10 @@ msgstr "Tala nu…"

254msgid "Speaking..."

262msgid "Speaking..."

255msgstr "Talar…"

263msgstr "Talar…"

256

264

257−#: qml/Notifications/NotificationMenuItemFactory.qml:108

265+#: qml/Notifications/NotificationMenuItemFactory.qml:116

258msgid "Show password"

266msgid "Show password"

259msgstr "Visa lösenord"

267msgstr "Visa lösenord"

260

268

261−#: qml/Notifications/NotificationMenuItemFactory.qml:124

262−msgid "Enter SIM PIN"

263−msgstr "Ange SIM PIN-kod"

264−

265−#: qml/Notifications/NotificationMenuItemFactory.qml:125

266−msgid "Sorry, incorrect PIN"

267−msgstr "Felaktig PIN"

268−

269#: qml/Panel/ActiveCallHint.qml:77

270msgid "Tap to return to call..."

271msgstr "Tryck för att återgå till samtal..."

@@ -310,49 +310,49 @@ msgstr "Lås upp SIM-kort"

310msgid "Roaming"

311msgstr "Roaming"

312

313−#: qml/Shell.qml:340

313+#: qml/Shell.qml:346

314msgid "Enter passphrase"

315−msgstr ""

315+msgstr "Ange lösenfras"

316

317−#: qml/Shell.qml:321

317+#: qml/Shell.qml:347

318msgid "Sorry, incorrect passphrase"

319msgstr "Felaktig lösenfras"

320

321−#: qml/Shell.qml:342

321+#: qml/Shell.qml:348

322msgid "Please re-enter"

323−msgstr ""

323+msgstr "Ange igen"

324

325−#: qml/Shell.qml:344

325+#: qml/Shell.qml:350

326msgid "Enter passcode"

327−msgstr ""

327+msgstr "Ange lösenkod"

328

329−#: qml/Shell.qml:324

329+#: qml/Shell.qml:351

330msgid "Sorry, incorrect passcode"

331msgstr "Felaktig lösenkod"

332

333−#: qml/Shell.qml:348

333+#: qml/Shell.qml:354

334#, qt-format

335msgid "Enter %1"

336−msgstr ""

336+msgstr "Ange %1"

337

338−#: qml/Shell.qml:328

338+#: qml/Shell.qml:355

339#, qt-format

340msgid "Sorry, incorrect %1"

341msgstr "Felaktig %1"

342

343−#: qml/Shell.qml:363

343+#: qml/Shell.qml:390

344msgid "Sorry, incorrect passphrase."

345msgstr "Felaktig lösenfras."

346

347−#: qml/Shell.qml:364

347+#: qml/Shell.qml:391

348msgid "Sorry, incorrect passcode."

349msgstr "Felaktig lösenkod."

350

351−#: qml/Shell.qml:365

351+#: qml/Shell.qml:392

352msgid "This will be your last attempt."

353msgstr "Detta är ditt sista försök."

354

355−#: qml/Shell.qml:367

355+#: qml/Shell.qml:394

356msgid ""

357"If passphrase is entered incorrectly, your phone will conduct a factory "

358"reset and all personal data will be deleted."

@@ -360,7 +360,7 @@ msgstr ""

360"Om lösenfrasen anges inkorrekt kommer telefonen att fabrikåterställas och "

361"all personlig data kommer att tas bort."

362

363−#: qml/Shell.qml:368

363+#: qml/Shell.qml:395

364msgid ""

365"If passcode is entered incorrectly, your phone will conduct a factory reset "

366"and all personal data will be deleted."

@@ -368,31 +368,8 @@ msgstr ""

368"Om lösenkoden anges felaktigt kommer telefonen att fabrikåterställas och all "

369"personlig data kommer att tas bort."

370

371−#, qt-format

371+#~ msgid "Enter SIM PIN"

372−#~ msgid "Hello %1"

373−#~ msgstr "Hej %1"

374−

375−#~ msgid "Hello"

376−#~ msgstr "Hej"

377−

378−#~ msgid "Swipe to unlock"

379−#~ msgstr "Svep för att låsa upp"

380−

381−#~ msgid "Please wait"

382−#~ msgstr "Var god vänta"

383−

384−#, qt-format

385−#~ msgid "Enter your %1"

386−#~ msgstr "Skriv in din %1"

387−

388−#~ msgid "Too many incorrect attempts"

389−#~ msgstr "För många felaktiga försök"

390−

391−#~ msgid "Manage Dash"

392−#~ msgstr "Hantera Dash"

393−

394−#~ msgid "Enter your passphrase"

395−#~ msgstr "Ange din lösenfras"

372+#~ msgstr "Ange SIM PIN-kod"

396

373

397−#~ msgid "Enter your passcode"

374+#~ msgid "Sorry, incorrect PIN"

398−#~ msgstr "Ange din lösenkod"

375+#~ msgstr "Felaktig PIN"

po/sw.po+28−28

@@ -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-07 11:37+0300\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-09 06:36+0000\n"

19"X-Generator: Launchpad (build 17196)\n"

20

21#: plugins/LightDM/Greeter.cpp:130

@@ -152,23 +152,23 @@ msgid ""

152"phone Tap on the screen to start"

153msgstr ""

154

155−#: qml/Components/Lockscreen.qml:206

155+#: qml/Components/Lockscreen.qml:220

156msgid "Emergency Call"

157msgstr ""

158

159−#: qml/Components/Lockscreen.qml:226

159+#: qml/Components/Lockscreen.qml:252

160msgid "OK"

161msgstr ""

162

163−#: qml/Dash/GenericScopeView.qml:411 qml/Dash/GenericScopeView.qml:533

163+#: qml/Dash/GenericScopeView.qml:434 qml/Dash/GenericScopeView.qml:591

164msgid "See less"

165msgstr ""

166

167−#: qml/Dash/GenericScopeView.qml:411

167+#: qml/Dash/GenericScopeView.qml:434

168msgid "See all"

169msgstr ""

170

171−#: qml/Dash/GenericScopeView.qml:473 qml/Dash/PageHeader.qml:258

171+#: qml/Dash/GenericScopeView.qml:496 qml/Dash/PageHeader.qml:258

172#: qml/Panel/SearchIndicator.qml:27

173msgid "Search"

174msgstr "Tafuta"

@@ -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 ""

@@ -249,18 +257,10 @@ msgstr ""

249msgid "Speaking..."

257msgid "Speaking..."

250msgstr ""

258msgstr ""

251

259

252−#: qml/Notifications/NotificationMenuItemFactory.qml:108

260+#: qml/Notifications/NotificationMenuItemFactory.qml:116

253msgid "Show password"

261msgid "Show password"

254msgstr ""

262msgstr ""

255

263

256−#: qml/Notifications/NotificationMenuItemFactory.qml:124

257−msgid "Enter SIM PIN"

258−msgstr ""

259−

260−#: qml/Notifications/NotificationMenuItemFactory.qml:125

261−msgid "Sorry, incorrect PIN"

262−msgstr ""

263−

264#: qml/Panel/ActiveCallHint.qml:77

265msgid "Tap to return to call..."

266msgstr ""

@@ -305,55 +305,55 @@ msgstr ""

305msgid "Roaming"

306msgstr ""

307

308−#: qml/Shell.qml:340

308+#: qml/Shell.qml:346

309msgid "Enter passphrase"

310msgstr ""

311

312−#: qml/Shell.qml:321

312+#: qml/Shell.qml:347

313msgid "Sorry, incorrect passphrase"

314msgstr ""

315

316−#: qml/Shell.qml:342

316+#: qml/Shell.qml:348

317msgid "Please re-enter"

318msgstr ""

319

320−#: qml/Shell.qml:344

320+#: qml/Shell.qml:350

321msgid "Enter passcode"

322msgstr ""

323

324−#: qml/Shell.qml:324

324+#: qml/Shell.qml:351

325msgid "Sorry, incorrect passcode"

326msgstr ""

327

328−#: qml/Shell.qml:348

328+#: qml/Shell.qml:354

329#, qt-format

330msgid "Enter %1"

331msgstr ""

332

333−#: qml/Shell.qml:328

333+#: qml/Shell.qml:355

334#, qt-format

335msgid "Sorry, incorrect %1"

336msgstr ""

337

338−#: qml/Shell.qml:363

338+#: qml/Shell.qml:390

339msgid "Sorry, incorrect passphrase."

340msgstr ""

341

342−#: qml/Shell.qml:364

342+#: qml/Shell.qml:391

343msgid "Sorry, incorrect passcode."

344msgstr ""

345

346−#: qml/Shell.qml:365

346+#: qml/Shell.qml:392

347msgid "This will be your last attempt."

348msgstr ""

349

350−#: qml/Shell.qml:367

350+#: qml/Shell.qml:394

351msgid ""

352"If passphrase is entered incorrectly, your phone will conduct a factory "

353"reset and all personal data will be deleted."

354msgstr ""

355

356−#: qml/Shell.qml:368

356+#: qml/Shell.qml:395

357msgid ""

358"If passcode is entered incorrectly, your phone will conduct a factory reset "

359"and all personal data will be deleted."

po/ta.po+28−35

@@ -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-07 11:37+0300\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-09 06:37+0000\n"

19"X-Generator: Launchpad (build 17196)\n"

20"Language: ta\n"

21

@@ -155,23 +155,23 @@ msgid ""

155"phone Tap on the screen to start"

156msgstr ""

157

158−#: qml/Components/Lockscreen.qml:206

158+#: qml/Components/Lockscreen.qml:220

159msgid "Emergency Call"

160msgstr "அவசர அழைப்பு"

161

162−#: qml/Components/Lockscreen.qml:226

162+#: qml/Components/Lockscreen.qml:252

163msgid "OK"

164msgstr ""

165

166−#: qml/Dash/GenericScopeView.qml:411 qml/Dash/GenericScopeView.qml:533

166+#: qml/Dash/GenericScopeView.qml:434 qml/Dash/GenericScopeView.qml:591

167msgid "See less"

168msgstr ""

169

170−#: qml/Dash/GenericScopeView.qml:411

170+#: qml/Dash/GenericScopeView.qml:434

171msgid "See all"

172msgstr ""

173

174−#: qml/Dash/GenericScopeView.qml:473 qml/Dash/PageHeader.qml:258

174+#: qml/Dash/GenericScopeView.qml:496 qml/Dash/PageHeader.qml:258

175#: qml/Panel/SearchIndicator.qml:27

176msgid "Search"

177msgstr "தெடு"

@@ -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 ""

@@ -252,18 +260,10 @@ msgstr "இப்பொது பேசு..."

252msgid "Speaking..."

260msgid "Speaking..."

253msgstr "பேசுகிறது..."

261msgstr "பேசுகிறது..."

254

262

255−#: qml/Notifications/NotificationMenuItemFactory.qml:108

263+#: qml/Notifications/NotificationMenuItemFactory.qml:116

256msgid "Show password"

264msgid "Show password"

257msgstr ""

265msgstr ""

258

266

259−#: qml/Notifications/NotificationMenuItemFactory.qml:124

260−msgid "Enter SIM PIN"

261−msgstr ""

262−

263−#: qml/Notifications/NotificationMenuItemFactory.qml:125

264−msgid "Sorry, incorrect PIN"

265−msgstr ""

266−

267#: qml/Panel/ActiveCallHint.qml:77

268msgid "Tap to return to call..."

269msgstr ""

@@ -308,63 +308,56 @@ msgstr ""

308msgid "Roaming"

309msgstr ""

310

311−#: qml/Shell.qml:340

311+#: qml/Shell.qml:346

312msgid "Enter passphrase"

313msgstr ""

314

315−#: qml/Shell.qml:321

315+#: qml/Shell.qml:347

316msgid "Sorry, incorrect passphrase"

317msgstr ""

318

319−#: qml/Shell.qml:342

319+#: qml/Shell.qml:348

320msgid "Please re-enter"

321msgstr ""

322

323−#: qml/Shell.qml:344

323+#: qml/Shell.qml:350

324msgid "Enter passcode"

325msgstr ""

326

327−#: qml/Shell.qml:324

327+#: qml/Shell.qml:351

328msgid "Sorry, incorrect passcode"

329msgstr ""

330

331−#: qml/Shell.qml:348

331+#: qml/Shell.qml:354

332#, qt-format

333msgid "Enter %1"

334msgstr ""

335

336−#: qml/Shell.qml:328

336+#: qml/Shell.qml:355

337#, qt-format

338msgid "Sorry, incorrect %1"

339msgstr ""

340

341−#: qml/Shell.qml:363

341+#: qml/Shell.qml:390

342msgid "Sorry, incorrect passphrase."

343msgstr ""

344

345−#: qml/Shell.qml:364

345+#: qml/Shell.qml:391

346msgid "Sorry, incorrect passcode."

347msgstr ""

348

349−#: qml/Shell.qml:365

349+#: qml/Shell.qml:392

350msgid "This will be your last attempt."

351msgstr ""

352

353−#: qml/Shell.qml:367

353+#: qml/Shell.qml:394

354msgid ""

355"If passphrase is entered incorrectly, your phone will conduct a factory "

356"reset and all personal data will be deleted."

357msgstr ""

358

359−#: qml/Shell.qml:368

359+#: qml/Shell.qml:395

360msgid ""

361"If passcode is entered incorrectly, your phone will conduct a factory reset "

362"and all personal data will be deleted."

363msgstr ""

364−

365−#, qt-format

366−#~ msgid "Hello %1"

367−#~ msgstr "வணக்கம் %1"

368−

369−#~ msgid "Hello"

370−#~ msgstr "வணக்கம்"

po/te.po+28−38

@@ -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-07 11:37+0300\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-09 06:37+0000\n"

19"X-Generator: Launchpad (build 17196)\n"

20

21#: plugins/LightDM/Greeter.cpp:130

@@ -152,23 +152,23 @@ msgid ""

152"phone Tap on the screen to start"

153msgstr ""

154

155−#: qml/Components/Lockscreen.qml:206

155+#: qml/Components/Lockscreen.qml:220

156msgid "Emergency Call"

157msgstr "అత్యవసర పిలుపు"

158

159−#: qml/Components/Lockscreen.qml:226

159+#: qml/Components/Lockscreen.qml:252

160msgid "OK"

161msgstr "సరే"

162

163−#: qml/Dash/GenericScopeView.qml:411 qml/Dash/GenericScopeView.qml:533

163+#: qml/Dash/GenericScopeView.qml:434 qml/Dash/GenericScopeView.qml:591

164msgid "See less"

165msgstr ""

166

167−#: qml/Dash/GenericScopeView.qml:411

167+#: qml/Dash/GenericScopeView.qml:434

168msgid "See all"

169msgstr ""

170

171−#: qml/Dash/GenericScopeView.qml:473 qml/Dash/PageHeader.qml:258

171+#: qml/Dash/GenericScopeView.qml:496 qml/Dash/PageHeader.qml:258

172#: qml/Panel/SearchIndicator.qml:27

173msgid "Search"

174msgstr "వెతుకు"

@@ -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 ""

@@ -249,18 +257,10 @@ msgstr "ఇప్పుడు మాట్లాడండి..."

249msgid "Speaking..."

257msgid "Speaking..."

250msgstr "మాట్లాడుతున్నారు..."

258msgstr "మాట్లాడుతున్నారు..."

251

259

252−#: qml/Notifications/NotificationMenuItemFactory.qml:108

260+#: qml/Notifications/NotificationMenuItemFactory.qml:116

253msgid "Show password"

261msgid "Show password"

254msgstr "సంకేతపదాన్ని చూపించు"

262msgstr "సంకేతపదాన్ని చూపించు"

255

263

256−#: qml/Notifications/NotificationMenuItemFactory.qml:124

257−msgid "Enter SIM PIN"

258−msgstr ""

259−

260−#: qml/Notifications/NotificationMenuItemFactory.qml:125

261−msgid "Sorry, incorrect PIN"

262−msgstr ""

263−

264#: qml/Panel/ActiveCallHint.qml:77

265msgid "Tap to return to call..."

266msgstr ""

@@ -305,66 +305,56 @@ msgstr ""

305msgid "Roaming"

306msgstr ""

307

308−#: qml/Shell.qml:340

308+#: qml/Shell.qml:346

309msgid "Enter passphrase"

310msgstr ""

311

312−#: qml/Shell.qml:321

312+#: qml/Shell.qml:347

313msgid "Sorry, incorrect passphrase"

314msgstr ""

315

316−#: qml/Shell.qml:342

316+#: qml/Shell.qml:348

317msgid "Please re-enter"

318msgstr ""

319

320−#: qml/Shell.qml:344

320+#: qml/Shell.qml:350

321msgid "Enter passcode"

322msgstr ""

323

324−#: qml/Shell.qml:324

324+#: qml/Shell.qml:351

325msgid "Sorry, incorrect passcode"

326msgstr ""

327

328−#: qml/Shell.qml:348

328+#: qml/Shell.qml:354

329#, qt-format

330msgid "Enter %1"

331msgstr ""

332

333−#: qml/Shell.qml:328

333+#: qml/Shell.qml:355

334#, qt-format

335msgid "Sorry, incorrect %1"

336msgstr ""

337

338−#: qml/Shell.qml:363

338+#: qml/Shell.qml:390

339msgid "Sorry, incorrect passphrase."

340msgstr ""

341

342−#: qml/Shell.qml:364

342+#: qml/Shell.qml:391

343msgid "Sorry, incorrect passcode."

344msgstr ""

345

346−#: qml/Shell.qml:365

346+#: qml/Shell.qml:392

347msgid "This will be your last attempt."

348msgstr ""

349

350−#: qml/Shell.qml:367

350+#: qml/Shell.qml:394

351msgid ""

352"If passphrase is entered incorrectly, your phone will conduct a factory "

353"reset and all personal data will be deleted."

354msgstr ""

355

356−#: qml/Shell.qml:368

356+#: qml/Shell.qml:395

357msgid ""

358"If passcode is entered incorrectly, your phone will conduct a factory reset "

359"and all personal data will be deleted."

360msgstr ""

361−

362−#, qt-format

363−#~ msgid "Hello %1"

364−#~ msgstr "హలో %1"

365−

366−#~ msgid "Hello"

367−#~ msgstr "హలో"

368−

369−#~ msgid "Swipe to unlock"

370−#~ msgstr "తాళంతీయుటకు గీకండి"

po/th.po+28−28

@@ -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-07 11:37+0300\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-09 06:37+0000\n"

19"X-Generator: Launchpad (build 17196)\n"

20

21#: plugins/LightDM/Greeter.cpp:130

@@ -152,23 +152,23 @@ msgid ""

152"phone Tap on the screen to start"

153msgstr ""

154

155−#: qml/Components/Lockscreen.qml:206

155+#: qml/Components/Lockscreen.qml:220

156msgid "Emergency Call"

157msgstr ""

158

159−#: qml/Components/Lockscreen.qml:226

159+#: qml/Components/Lockscreen.qml:252

160msgid "OK"

161msgstr ""

162

163−#: qml/Dash/GenericScopeView.qml:411 qml/Dash/GenericScopeView.qml:533

163+#: qml/Dash/GenericScopeView.qml:434 qml/Dash/GenericScopeView.qml:591

164msgid "See less"

165msgstr ""

166

167−#: qml/Dash/GenericScopeView.qml:411

167+#: qml/Dash/GenericScopeView.qml:434

168msgid "See all"

169msgstr ""

170

171−#: qml/Dash/GenericScopeView.qml:473 qml/Dash/PageHeader.qml:258

171+#: qml/Dash/GenericScopeView.qml:496 qml/Dash/PageHeader.qml:258

172#: qml/Panel/SearchIndicator.qml:27

173msgid "Search"

174msgstr ""

@@ -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 ""

@@ -249,18 +257,10 @@ msgstr ""

249msgid "Speaking..."

257msgid "Speaking..."

250msgstr ""

258msgstr ""

251

259

252−#: qml/Notifications/NotificationMenuItemFactory.qml:108

260+#: qml/Notifications/NotificationMenuItemFactory.qml:116

253msgid "Show password"

261msgid "Show password"

254msgstr ""

262msgstr ""

255

263

256−#: qml/Notifications/NotificationMenuItemFactory.qml:124

257−msgid "Enter SIM PIN"

258−msgstr ""

259−

260−#: qml/Notifications/NotificationMenuItemFactory.qml:125

261−msgid "Sorry, incorrect PIN"

262−msgstr ""

263−

264#: qml/Panel/ActiveCallHint.qml:77

265msgid "Tap to return to call..."

266msgstr ""

@@ -305,55 +305,55 @@ msgstr ""

305msgid "Roaming"

306msgstr ""

307

308−#: qml/Shell.qml:340

308+#: qml/Shell.qml:346

309msgid "Enter passphrase"

310msgstr ""

311

312−#: qml/Shell.qml:321

312+#: qml/Shell.qml:347

313msgid "Sorry, incorrect passphrase"

314msgstr ""

315

316−#: qml/Shell.qml:342

316+#: qml/Shell.qml:348

317msgid "Please re-enter"

318msgstr ""

319

320−#: qml/Shell.qml:344

320+#: qml/Shell.qml:350

321msgid "Enter passcode"

322msgstr ""

323

324−#: qml/Shell.qml:324

324+#: qml/Shell.qml:351

325msgid "Sorry, incorrect passcode"

326msgstr ""

327

328−#: qml/Shell.qml:348

328+#: qml/Shell.qml:354

329#, qt-format

330msgid "Enter %1"

331msgstr ""

332

333−#: qml/Shell.qml:328

333+#: qml/Shell.qml:355

334#, qt-format

335msgid "Sorry, incorrect %1"

336msgstr ""

337

338−#: qml/Shell.qml:363

338+#: qml/Shell.qml:390

339msgid "Sorry, incorrect passphrase."

340msgstr ""

341

342−#: qml/Shell.qml:364

342+#: qml/Shell.qml:391

343msgid "Sorry, incorrect passcode."

344msgstr ""

345

346−#: qml/Shell.qml:365

346+#: qml/Shell.qml:392

347msgid "This will be your last attempt."

348msgstr ""

349

350−#: qml/Shell.qml:367

350+#: qml/Shell.qml:394

351msgid ""

352"If passphrase is entered incorrectly, your phone will conduct a factory "

353"reset and all personal data will be deleted."

354msgstr ""

355

356−#: qml/Shell.qml:368

356+#: qml/Shell.qml:395

357msgid ""

358"If passcode is entered incorrectly, your phone will conduct a factory reset "

359"and all personal data will be deleted."

po/tr.po+30−46

@@ -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-07 11:37+0300\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-09 06:37+0000\n"

19"X-Generator: Launchpad (build 17196)\n"

20

21#: plugins/LightDM/Greeter.cpp:130

@@ -155,23 +155,23 @@ 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:220

159msgid "Emergency Call"

160msgstr "Acil Arama"

161

162−#: qml/Components/Lockscreen.qml:226

162+#: qml/Components/Lockscreen.qml:252

163msgid "OK"

164msgstr "Tamam"

165

166−#: qml/Dash/GenericScopeView.qml:411 qml/Dash/GenericScopeView.qml:533

166+#: qml/Dash/GenericScopeView.qml:434 qml/Dash/GenericScopeView.qml:591

167msgid "See less"

168msgstr "Daha azını gör"

169

170−#: qml/Dash/GenericScopeView.qml:411

170+#: qml/Dash/GenericScopeView.qml:434

171msgid "See all"

172msgstr "Tümünü gör"

173

174−#: qml/Dash/GenericScopeView.qml:473 qml/Dash/PageHeader.qml:258

174+#: qml/Dash/GenericScopeView.qml:496 qml/Dash/PageHeader.qml:258

175#: qml/Panel/SearchIndicator.qml:27

176msgid "Search"

177msgstr "Ara"

@@ -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 ""

@@ -252,18 +260,10 @@ msgstr "Şimdi Konuşun..."

252msgid "Speaking..."

260msgid "Speaking..."

253msgstr "Konuşuyor..."

261msgstr "Konuşuyor..."

254

262

255−#: qml/Notifications/NotificationMenuItemFactory.qml:108

263+#: qml/Notifications/NotificationMenuItemFactory.qml:116

256msgid "Show password"

264msgid "Show password"

257msgstr "Parolayı göster"

265msgstr "Parolayı göster"

258

266

259−#: qml/Notifications/NotificationMenuItemFactory.qml:124

260−msgid "Enter SIM PIN"

261−msgstr ""

262−

263−#: qml/Notifications/NotificationMenuItemFactory.qml:125

264−msgid "Sorry, incorrect PIN"

265−msgstr "Üzgünüm, hatalı PIN"

266−

267#: qml/Panel/ActiveCallHint.qml:77

268msgid "Tap to return to call..."

269msgstr ""

@@ -308,49 +308,49 @@ msgstr "SIM kilidini aç"

308msgid "Roaming"

309msgstr ""

310

311−#: qml/Shell.qml:340

311+#: qml/Shell.qml:346

312msgid "Enter passphrase"

313msgstr ""

314

315−#: qml/Shell.qml:321

315+#: qml/Shell.qml:347

316msgid "Sorry, incorrect passphrase"

317msgstr "Üzgünüm, hatalı parola"

318

319−#: qml/Shell.qml:342

319+#: qml/Shell.qml:348

320msgid "Please re-enter"

321msgstr ""

322

323−#: qml/Shell.qml:344

323+#: qml/Shell.qml:350

324msgid "Enter passcode"

325msgstr ""

326

327−#: qml/Shell.qml:324

327+#: qml/Shell.qml:351

328msgid "Sorry, incorrect passcode"

329msgstr "Üzgünüm, hatalı parola"

330

331−#: qml/Shell.qml:348

331+#: qml/Shell.qml:354

332#, qt-format

333msgid "Enter %1"

334msgstr ""

335

336−#: qml/Shell.qml:328

336+#: qml/Shell.qml:355

337#, qt-format

338msgid "Sorry, incorrect %1"

339msgstr "Üzgünüm, hatalı %1"

340

341−#: qml/Shell.qml:363

341+#: qml/Shell.qml:390

342msgid "Sorry, incorrect passphrase."

343msgstr "Üzgünüm, hatalı parola."

344

345−#: qml/Shell.qml:364

345+#: qml/Shell.qml:391

346msgid "Sorry, incorrect passcode."

347msgstr "Üzgünüm, hatalı parola."

348

349−#: qml/Shell.qml:365

349+#: qml/Shell.qml:392

350msgid "This will be your last attempt."

351msgstr "Bu son denemeniz olacak."

352

353−#: qml/Shell.qml:367

353+#: qml/Shell.qml:394

354msgid ""

355"If passphrase is entered incorrectly, your phone will conduct a factory "

356"reset and all personal data will be deleted."

@@ -358,7 +358,7 @@ msgstr ""

358"Eğer hatalı parola girilirse, telefonunuz fabrika ayarlarına dönecek ve tüm "

359"kişisel verileriniz silinecek."

360

361−#: qml/Shell.qml:368

361+#: qml/Shell.qml:395

362msgid ""

363"If passcode is entered incorrectly, your phone will conduct a factory reset "

364"and all personal data will be deleted."

@@ -366,21 +366,5 @@ msgstr ""

366"Eğer hatalı parola girilirse, telefonunuz fabrika ayarlarına dönecek ve tüm "

367"kişisel verileriniz silinecek."

368

369−#~ msgid "Hello"

369+#~ msgid "Sorry, incorrect PIN"

370−#~ msgstr "Merhaba"

371−

372−#, qt-format

373−#~ msgid "Hello %1"

374−#~ msgstr "Merhaba %1"

375−

376−#~ msgid "Swipe to unlock"

377−#~ msgstr "Açmak için kaydırın"

378−

379−#~ msgid "Too many incorrect attempts"

380−#~ msgstr "Çok fazla hatalı deneme yaptınız"

370+#~ msgstr "Üzgünüm, hatalı PIN"

381−

382−#~ msgid "Enter your passphrase"

383−#~ msgstr "Parolanızı girin"

384−

385−#~ msgid "Enter your passcode"

386−#~ msgstr "Parolanızı girin"

po/ug.po+33−53

@@ -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-07 11:37+0300\n"

11−"PO-Revision-Date: 2014-10-06 00:47+0000\n"

11+"PO-Revision-Date: 2014-10-07 09:00+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-06 07:00+0000\n"

18+"X-Launchpad-Export-Date: 2014-10-09 06:37+0000\n"

19"X-Generator: Launchpad (build 17196)\n"

20

21#: plugins/LightDM/Greeter.cpp:130

@@ -155,23 +155,23 @@ msgstr ""

155"ئېكراننى چېكىپ باشلاڭ سىز ھازىر گىرۋەك بارماق ئىشارەتلىرىنى ئىگىلەپ "

156"بولدىڭىز،ئەمدى تېلېفوننى ئىشلىتىشنى باشلىسىڭىز بولىدۇ"

157

158−#: qml/Components/Lockscreen.qml:206

158+#: qml/Components/Lockscreen.qml:220

159msgid "Emergency Call"

160msgstr "جىددىي تېلېفون"

161

162−#: qml/Components/Lockscreen.qml:226

162+#: qml/Components/Lockscreen.qml:252

163msgid "OK"

164msgstr "تامام"

165

166−#: qml/Dash/GenericScopeView.qml:411 qml/Dash/GenericScopeView.qml:533

166+#: qml/Dash/GenericScopeView.qml:434 qml/Dash/GenericScopeView.qml:591

167msgid "See less"

168msgstr "ئازراق كۆرۈش"

169

170−#: qml/Dash/GenericScopeView.qml:411

170+#: qml/Dash/GenericScopeView.qml:434

171msgid "See all"

172msgstr "ھەممىنى كۆرۈش…"

173

174−#: qml/Dash/GenericScopeView.qml:473 qml/Dash/PageHeader.qml:258

174+#: qml/Dash/GenericScopeView.qml:496 qml/Dash/PageHeader.qml:258

175#: qml/Panel/SearchIndicator.qml:27

176msgid "Search"

177msgstr "ئىزدە"

@@ -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 "دائىرە باشقۇرۇش"

@@ -252,18 +260,10 @@ msgstr "ئەمدى سۆزلەڭ…"

252msgid "Speaking..."

260msgid "Speaking..."

253msgstr "سۆزلەۋاتىسىز…"

261msgstr "سۆزلەۋاتىسىز…"

254

262

255−#: qml/Notifications/NotificationMenuItemFactory.qml:108

263+#: qml/Notifications/NotificationMenuItemFactory.qml:116

256msgid "Show password"

264msgid "Show password"

257msgstr "ئىم كۆرسەت"

265msgstr "ئىم كۆرسەت"

258

266

259−#: qml/Notifications/NotificationMenuItemFactory.qml:124

260−msgid "Enter SIM PIN"

261−msgstr "SIM نىڭ ئىمى(PIN) نى كىرگۈزۈڭ"

262−

263−#: qml/Notifications/NotificationMenuItemFactory.qml:125

264−msgid "Sorry, incorrect PIN"

265−msgstr "كەچۈرۈڭ، PIN توغرا ئەمەس"

266−

267#: qml/Panel/ActiveCallHint.qml:77

268msgid "Tap to return to call..."

269msgstr "سۆزلىشىشكە قايتىش ئۈچۈن چېكىڭ…"

@@ -308,49 +308,49 @@ msgstr "SIM نى قۇلۇپسىزلاش"

308msgid "Roaming"

309msgstr "كەزمە"

310

311−#: qml/Shell.qml:340

311+#: qml/Shell.qml:346

312msgid "Enter passphrase"

313msgstr "ئىم كىرگۈزۈڭ"

314

315−#: qml/Shell.qml:321

315+#: qml/Shell.qml:347

316msgid "Sorry, incorrect passphrase"

317msgstr "كەچۈرۈڭ، ئىم توغرا ئەمەس"

318

319−#: qml/Shell.qml:342

319+#: qml/Shell.qml:348

320msgid "Please re-enter"

321msgstr "قايتا كىرگۈزۈڭ"

322

323−#: qml/Shell.qml:344

323+#: qml/Shell.qml:350

324msgid "Enter passcode"

325msgstr "ئىم كودى(passcode)نى كىرگۈزۈڭ"

326

327−#: qml/Shell.qml:324

327+#: qml/Shell.qml:351

328msgid "Sorry, incorrect passcode"

329msgstr "كەچۈرۈڭ، ئىم توغرا ئەمەس"

330

331−#: qml/Shell.qml:348

331+#: qml/Shell.qml:354

332#, qt-format

333msgid "Enter %1"

334msgstr "%1 نى كىرگۈزۈڭ"

335

336−#: qml/Shell.qml:328

336+#: qml/Shell.qml:355

337#, qt-format

338msgid "Sorry, incorrect %1"

339msgstr "كەچۈرۈڭ، %1 توغرا ئەمەس"

340

341−#: qml/Shell.qml:363

341+#: qml/Shell.qml:390

342msgid "Sorry, incorrect passphrase."

343msgstr "كەچۈرۈڭ، ئىم توغرا ئەمەس"

344

345−#: qml/Shell.qml:364

345+#: qml/Shell.qml:391

346msgid "Sorry, incorrect passcode."

347msgstr "كەچۈرۈڭ، ئىم كودى ئەمەس"

348

349−#: qml/Shell.qml:365

349+#: qml/Shell.qml:392

350msgid "This will be your last attempt."

351msgstr "بۇ سىزنىڭ ئەڭ ئاخىرقى پۇرسىتىڭىز"

352

353−#: qml/Shell.qml:367

353+#: qml/Shell.qml:394

354msgid ""

355"If passphrase is entered incorrectly, your phone will conduct a factory "

356"reset and all personal data will be deleted."

@@ -358,7 +358,7 @@ msgstr ""

358"ئەگەر ئىم توغرا بولمىسا، تېلېفونىڭىز ئەسلىگە قايتۇرۇلۇپ، زاۋۇتتىن چىققان "

359"ھالەتكە كېلىپ قالىدۇ. بارلىق مەزمۇنلار يوقىلىدۇ."

360

361−#: qml/Shell.qml:368

361+#: qml/Shell.qml:395

362msgid ""

363"If passcode is entered incorrectly, your phone will conduct a factory reset "

364"and all personal data will be deleted."

@@ -366,28 +366,8 @@ msgstr ""

366"ئەگەر ئىم كودى توغرا بولمىسا، تېلېفونىڭىز ئەسلىگە قايتۇرۇلۇپ، زاۋۇتتىن "

367"چىققان ھالەتكە كېلىپ قالىدۇ. بارلىق مەزمۇنلار يوقىلىدۇ."

368

369−#, qt-format

370−#~ msgid "Hello %1"

371−#~ msgstr "سالام %1"

372−

373−#~ msgid "Swipe to unlock"

374−#~ msgstr "سىيرىسىڭىز قۇلۇپسىزلىنىدۇ"

375−

376−#~ msgid "Hello"

377−#~ msgstr "ئەسسالامۇئەلەيكۇم"

378−

379−#~ msgid "Please wait"

380−#~ msgstr "سەل ساقلاڭ"

381−

382−#~ msgid "Enter your passphrase"

369+#~ msgid "Enter SIM PIN"

383−#~ msgstr "ئىمىڭىزنى كىرگۈزۈڭ"

370+#~ msgstr "SIM نىڭ ئىمى(PIN) نى كىرگۈزۈڭ"

384

371

385−#~ msgid "Enter your passcode"

372+#~ msgid "Sorry, incorrect PIN"

386−#~ msgstr "ئىمىڭىزنى كىرگۈزۈڭ"

373+#~ msgstr "كەچۈرۈڭ، PIN توغرا ئەمەس"

387−

388−#~ msgid "Too many incorrect attempts"

389−#~ msgstr "مەغلۇپ بولۇش سانى چەكتىن ئېشىپ كەتتى"

390−

391−#, qt-format

392−#~ msgid "Enter your %1"

393−#~ msgstr "%1 نى كىرگۈزۈڭ"

po/uk.po+33−53

@@ -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-07 11:37+0300\n"

11−"PO-Revision-Date: 2014-10-03 12:44+0000\n"

11+"PO-Revision-Date: 2014-10-08 12:02+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-04 06:28+0000\n"

19+"X-Launchpad-Export-Date: 2014-10-09 06:37+0000\n"

20"X-Generator: Launchpad (build 17196)\n"

21

22#: plugins/LightDM/Greeter.cpp:130

@@ -165,23 +165,23 @@ msgstr ""

165"Вами налаштовано дії у відповідь на дотики на краях екрана. Тепер телефоном "

166"можна користуватися. Торкніться екрана, щоб розпочати."

167

168−#: qml/Components/Lockscreen.qml:206

168+#: qml/Components/Lockscreen.qml:220

169msgid "Emergency Call"

170msgstr "Терміновий виклик"

171

172−#: qml/Components/Lockscreen.qml:226

172+#: qml/Components/Lockscreen.qml:252

173msgid "OK"

174msgstr "Гаразд"

175

176−#: qml/Dash/GenericScopeView.qml:411 qml/Dash/GenericScopeView.qml:533

176+#: qml/Dash/GenericScopeView.qml:434 qml/Dash/GenericScopeView.qml:591

177msgid "See less"

178msgstr "Стисліше"

179

180−#: qml/Dash/GenericScopeView.qml:411

180+#: qml/Dash/GenericScopeView.qml:434

181msgid "See all"

182msgstr "Детальніше"

183

184−#: qml/Dash/GenericScopeView.qml:473 qml/Dash/PageHeader.qml:258

184+#: qml/Dash/GenericScopeView.qml:496 qml/Dash/PageHeader.qml:258

185#: qml/Panel/SearchIndicator.qml:27

186msgid "Search"

187msgstr "Пошук"

@@ -218,6 +218,14 @@ msgstr "Додати рецензію"

218msgid "Send"

219msgstr "Надіслати"

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+

221#: qml/Dash/ScopesOverview.qml:206

229#: qml/Dash/ScopesOverview.qml:206

222msgid "Manage Scopes"

230msgid "Manage Scopes"

223msgstr "Керування областями"

231msgstr "Керування областями"

@@ -262,18 +270,10 @@ msgstr "Можна говорити…"

262msgid "Speaking..."

270msgid "Speaking..."

263msgstr "Мовлення…"

271msgstr "Мовлення…"

264

272

265−#: qml/Notifications/NotificationMenuItemFactory.qml:108

273+#: qml/Notifications/NotificationMenuItemFactory.qml:116

266msgid "Show password"

274msgid "Show password"

267msgstr "Показати пароль"

275msgstr "Показати пароль"

268

276

269−#: qml/Notifications/NotificationMenuItemFactory.qml:124

270−msgid "Enter SIM PIN"

271−msgstr "Введіть PIN-код SIM-картки"

272−

273−#: qml/Notifications/NotificationMenuItemFactory.qml:125

274−msgid "Sorry, incorrect PIN"

275−msgstr "Вибачте, помилковий PIN-код"

276−

277#: qml/Panel/ActiveCallHint.qml:77

278msgid "Tap to return to call..."

279msgstr "Торкніться, щоб повернутися до дзвінка…"

@@ -318,49 +318,49 @@ msgstr "Розблокувати SIM"

318msgid "Roaming"

319msgstr "Роумінг"

320

321−#: qml/Shell.qml:340

321+#: qml/Shell.qml:346

322msgid "Enter passphrase"

323msgstr "Введіть пароль"

324

325−#: qml/Shell.qml:321

325+#: qml/Shell.qml:347

326msgid "Sorry, incorrect passphrase"

327msgstr "Вибачте, помилковий пароль"

328

329−#: qml/Shell.qml:342

329+#: qml/Shell.qml:348

330msgid "Please re-enter"

331msgstr "Ввведіть ще раз"

332

333−#: qml/Shell.qml:344

333+#: qml/Shell.qml:350

334msgid "Enter passcode"

335msgstr "Введіть код"

336

337−#: qml/Shell.qml:324

337+#: qml/Shell.qml:351

338msgid "Sorry, incorrect passcode"

339msgstr "Вибачте, помилковий код-пароль"

340

341−#: qml/Shell.qml:348

341+#: qml/Shell.qml:354

342#, qt-format

343msgid "Enter %1"

344msgstr "Введіть %1"

345

346−#: qml/Shell.qml:328

346+#: qml/Shell.qml:355

347#, qt-format

348msgid "Sorry, incorrect %1"

349msgstr "Вибачте, помилковий %1"

350

351−#: qml/Shell.qml:363

351+#: qml/Shell.qml:390

352msgid "Sorry, incorrect passphrase."

353msgstr "Вибачте, помилковий пароль."

354

355−#: qml/Shell.qml:364

355+#: qml/Shell.qml:391

356msgid "Sorry, incorrect passcode."

357msgstr "Вибачте, помилковий код-пароль."

358

359−#: qml/Shell.qml:365

359+#: qml/Shell.qml:392

360msgid "This will be your last attempt."

361msgstr "Ця спроба буде останньою."

362

363−#: qml/Shell.qml:367

363+#: qml/Shell.qml:394

364msgid ""

365"If passphrase is entered incorrectly, your phone will conduct a factory "

366"reset and all personal data will be deleted."

@@ -368,7 +368,7 @@ msgstr ""

368"Якщо пароль буде вказано неправильно, телефон повернеться до початкового "

369"стану, усі особисті дані буде вилучено."

370

371−#: qml/Shell.qml:368

371+#: qml/Shell.qml:395

372msgid ""

373"If passcode is entered incorrectly, your phone will conduct a factory reset "

374"and all personal data will be deleted."

@@ -376,28 +376,8 @@ msgstr ""

376"Якщо код-пароль буде вказано неправильно, телефон повернеться до початкового "

377"стану, усі особисті дані буде вилучено."

378

379−#, qt-format

379+#~ msgid "Sorry, incorrect PIN"

380−#~ msgid "Hello %1"

380+#~ msgstr "Вибачте, помилковий PIN-код"

381−#~ msgstr "Привіт, %1"

382−

383−#~ msgid "Hello"

384−#~ msgstr "Привіт!"

385−

386−#~ msgid "Swipe to unlock"

387−#~ msgstr "Проведіть пальцем, щоб розблокувати"

388−

389−#~ msgid "Please wait"

390−#~ msgstr "Будь ласка, зачекайте"

391−

392−#~ msgid "Too many incorrect attempts"

393−#~ msgstr "Забагато помилкових спроб"

394−

395−#, qt-format

396−#~ msgid "Enter your %1"

397−#~ msgstr "Вкажіть ваш %1"

398−

399−#~ msgid "Enter your passphrase"

400−#~ msgstr "Введіть ваш пароль"

401

381

402−#~ msgid "Enter your passcode"

382+#~ msgid "Enter SIM PIN"

403−#~ msgstr "Введіть ваш код-пароль"

383+#~ msgstr "Введіть PIN-код SIM-картки"

po/unity8.pot+27−27

@@ -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-07 11:37+0300\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"

@@ -152,23 +152,23 @@ msgid ""

152"phone Tap on the screen to start"

153msgstr ""

154

155−#: qml/Components/Lockscreen.qml:218

155+#: qml/Components/Lockscreen.qml:220

156msgid "Emergency Call"

157msgstr ""

158

159−#: qml/Components/Lockscreen.qml:250

159+#: qml/Components/Lockscreen.qml:252

160msgid "OK"

161msgstr ""

162

163−#: qml/Dash/GenericScopeView.qml:411 qml/Dash/GenericScopeView.qml:533

163+#: qml/Dash/GenericScopeView.qml:434 qml/Dash/GenericScopeView.qml:591

164msgid "See less"

165msgstr ""

166

167−#: qml/Dash/GenericScopeView.qml:411

167+#: qml/Dash/GenericScopeView.qml:434

168msgid "See all"

169msgstr ""

170

171−#: qml/Dash/GenericScopeView.qml:473 qml/Dash/PageHeader.qml:258

171+#: qml/Dash/GenericScopeView.qml:496 qml/Dash/PageHeader.qml:258

172#: qml/Panel/SearchIndicator.qml:27

173msgid "Search"

174msgstr ""

@@ -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 ""

@@ -249,18 +257,10 @@ msgstr ""

249msgid "Speaking..."

257msgid "Speaking..."

250msgstr ""

258msgstr ""

251

259

252−#: qml/Notifications/NotificationMenuItemFactory.qml:108

260+#: qml/Notifications/NotificationMenuItemFactory.qml:116

253msgid "Show password"

261msgid "Show password"

254msgstr ""

262msgstr ""

255

263

256−#: qml/Notifications/NotificationMenuItemFactory.qml:124

257−msgid "Enter SIM PIN"

258−msgstr ""

259−

260−#: qml/Notifications/NotificationMenuItemFactory.qml:125

261−msgid "Sorry, incorrect PIN"

262−msgstr ""

263−

264#: qml/Panel/ActiveCallHint.qml:77

265msgid "Tap to return to call..."

266msgstr ""

@@ -305,55 +305,55 @@ msgstr ""

305msgid "Roaming"

306msgstr ""

307

308−#: qml/Shell.qml:340

308+#: qml/Shell.qml:346

309msgid "Enter passphrase"

310msgstr ""

311

312−#: qml/Shell.qml:341

312+#: qml/Shell.qml:347

313msgid "Sorry, incorrect passphrase"

314msgstr ""

315

316−#: qml/Shell.qml:342

316+#: qml/Shell.qml:348

317msgid "Please re-enter"

318msgstr ""

319

320−#: qml/Shell.qml:344

320+#: qml/Shell.qml:350

321msgid "Enter passcode"

322msgstr ""

323

324−#: qml/Shell.qml:345

324+#: qml/Shell.qml:351

325msgid "Sorry, incorrect passcode"

326msgstr ""

327

328−#: qml/Shell.qml:348

328+#: qml/Shell.qml:354

329#, qt-format

330msgid "Enter %1"

331msgstr ""

332

333−#: qml/Shell.qml:349

333+#: qml/Shell.qml:355

334#, qt-format

335msgid "Sorry, incorrect %1"

336msgstr ""

337

338−#: qml/Shell.qml:384

338+#: qml/Shell.qml:390

339msgid "Sorry, incorrect passphrase."

340msgstr ""

341

342−#: qml/Shell.qml:385

342+#: qml/Shell.qml:391

343msgid "Sorry, incorrect passcode."

344msgstr ""

345

346−#: qml/Shell.qml:386

346+#: qml/Shell.qml:392

347msgid "This will be your last attempt."

348msgstr ""

349

350−#: qml/Shell.qml:388

350+#: qml/Shell.qml:394

351msgid ""

352"If passphrase is entered incorrectly, your phone will conduct a factory "

353"reset and all personal data will be deleted."

354msgstr ""

355

356−#: qml/Shell.qml:389

356+#: qml/Shell.qml:395

357msgid ""

358"If passcode is entered incorrectly, your phone will conduct a factory reset "

359"and all personal data will be deleted."

po/vi.po+28−28

@@ -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-07 11:37+0300\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-09 06:37+0000\n"

19"X-Generator: Launchpad (build 17196)\n"

20

21#: plugins/LightDM/Greeter.cpp:130

@@ -152,23 +152,23 @@ msgid ""

152"phone Tap on the screen to start"

153msgstr ""

154

155−#: qml/Components/Lockscreen.qml:206

155+#: qml/Components/Lockscreen.qml:220

156msgid "Emergency Call"

157msgstr ""

158

159−#: qml/Components/Lockscreen.qml:226

159+#: qml/Components/Lockscreen.qml:252

160msgid "OK"

161msgstr ""

162

163−#: qml/Dash/GenericScopeView.qml:411 qml/Dash/GenericScopeView.qml:533

163+#: qml/Dash/GenericScopeView.qml:434 qml/Dash/GenericScopeView.qml:591

164msgid "See less"

165msgstr ""

166

167−#: qml/Dash/GenericScopeView.qml:411

167+#: qml/Dash/GenericScopeView.qml:434

168msgid "See all"

169msgstr ""

170

171−#: qml/Dash/GenericScopeView.qml:473 qml/Dash/PageHeader.qml:258

171+#: qml/Dash/GenericScopeView.qml:496 qml/Dash/PageHeader.qml:258

172#: qml/Panel/SearchIndicator.qml:27

173msgid "Search"

174msgstr ""

@@ -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 ""

@@ -249,18 +257,10 @@ msgstr ""

249msgid "Speaking..."

257msgid "Speaking..."

250msgstr ""

258msgstr ""

251

259

252−#: qml/Notifications/NotificationMenuItemFactory.qml:108

260+#: qml/Notifications/NotificationMenuItemFactory.qml:116

253msgid "Show password"

261msgid "Show password"

254msgstr ""

262msgstr ""

255

263

256−#: qml/Notifications/NotificationMenuItemFactory.qml:124

257−msgid "Enter SIM PIN"

258−msgstr ""

259−

260−#: qml/Notifications/NotificationMenuItemFactory.qml:125

261−msgid "Sorry, incorrect PIN"

262−msgstr ""

263−

264#: qml/Panel/ActiveCallHint.qml:77

265msgid "Tap to return to call..."

266msgstr ""

@@ -305,55 +305,55 @@ msgstr ""

305msgid "Roaming"

306msgstr ""

307

308−#: qml/Shell.qml:340

308+#: qml/Shell.qml:346

309msgid "Enter passphrase"

310msgstr ""

311

312−#: qml/Shell.qml:321

312+#: qml/Shell.qml:347

313msgid "Sorry, incorrect passphrase"

314msgstr ""

315

316−#: qml/Shell.qml:342

316+#: qml/Shell.qml:348

317msgid "Please re-enter"

318msgstr ""

319

320−#: qml/Shell.qml:344

320+#: qml/Shell.qml:350

321msgid "Enter passcode"

322msgstr ""

323

324−#: qml/Shell.qml:324

324+#: qml/Shell.qml:351

325msgid "Sorry, incorrect passcode"

326msgstr ""

327

328−#: qml/Shell.qml:348

328+#: qml/Shell.qml:354

329#, qt-format

330msgid "Enter %1"

331msgstr ""

332

333−#: qml/Shell.qml:328

333+#: qml/Shell.qml:355

334#, qt-format

335msgid "Sorry, incorrect %1"

336msgstr ""

337

338−#: qml/Shell.qml:363

338+#: qml/Shell.qml:390

339msgid "Sorry, incorrect passphrase."

340msgstr ""

341

342−#: qml/Shell.qml:364

342+#: qml/Shell.qml:391

343msgid "Sorry, incorrect passcode."

344msgstr ""

345

346−#: qml/Shell.qml:365

346+#: qml/Shell.qml:392

347msgid "This will be your last attempt."

348msgstr ""

349

350−#: qml/Shell.qml:367

350+#: qml/Shell.qml:394

351msgid ""

352"If passphrase is entered incorrectly, your phone will conduct a factory "

353"reset and all personal data will be deleted."

354msgstr ""

355

356−#: qml/Shell.qml:368

356+#: qml/Shell.qml:395

357msgid ""

358"If passcode is entered incorrectly, your phone will conduct a factory reset "

359"and all personal data will be deleted."

po/xh.po+28−28

@@ -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-07 11:37+0300\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-09 06:37+0000\n"

19"X-Generator: Launchpad (build 17196)\n"

20

21#: plugins/LightDM/Greeter.cpp:130

@@ -152,23 +152,23 @@ msgid ""

152"phone Tap on the screen to start"

153msgstr ""

154

155−#: qml/Components/Lockscreen.qml:206

155+#: qml/Components/Lockscreen.qml:220

156msgid "Emergency Call"

157msgstr ""

158

159−#: qml/Components/Lockscreen.qml:226

159+#: qml/Components/Lockscreen.qml:252

160msgid "OK"

161msgstr ""

162

163−#: qml/Dash/GenericScopeView.qml:411 qml/Dash/GenericScopeView.qml:533

163+#: qml/Dash/GenericScopeView.qml:434 qml/Dash/GenericScopeView.qml:591

164msgid "See less"

165msgstr ""

166

167−#: qml/Dash/GenericScopeView.qml:411

167+#: qml/Dash/GenericScopeView.qml:434

168msgid "See all"

169msgstr ""

170

171−#: qml/Dash/GenericScopeView.qml:473 qml/Dash/PageHeader.qml:258

171+#: qml/Dash/GenericScopeView.qml:496 qml/Dash/PageHeader.qml:258

172#: qml/Panel/SearchIndicator.qml:27

173msgid "Search"

174msgstr ""

@@ -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 ""

@@ -249,18 +257,10 @@ msgstr ""

249msgid "Speaking..."

257msgid "Speaking..."

250msgstr ""

258msgstr ""

251

259

252−#: qml/Notifications/NotificationMenuItemFactory.qml:108

260+#: qml/Notifications/NotificationMenuItemFactory.qml:116

253msgid "Show password"

261msgid "Show password"

254msgstr ""

262msgstr ""

255

263

256−#: qml/Notifications/NotificationMenuItemFactory.qml:124

257−msgid "Enter SIM PIN"

258−msgstr ""

259−

260−#: qml/Notifications/NotificationMenuItemFactory.qml:125

261−msgid "Sorry, incorrect PIN"

262−msgstr ""

263−

264#: qml/Panel/ActiveCallHint.qml:77

265msgid "Tap to return to call..."

266msgstr ""

@@ -305,55 +305,55 @@ msgstr ""

305msgid "Roaming"

306msgstr ""

307

308−#: qml/Shell.qml:340

308+#: qml/Shell.qml:346

309msgid "Enter passphrase"

310msgstr ""

311

312−#: qml/Shell.qml:321

312+#: qml/Shell.qml:347

313msgid "Sorry, incorrect passphrase"

314msgstr ""

315

316−#: qml/Shell.qml:342

316+#: qml/Shell.qml:348

317msgid "Please re-enter"

318msgstr ""

319

320−#: qml/Shell.qml:344

320+#: qml/Shell.qml:350

321msgid "Enter passcode"

322msgstr ""

323

324−#: qml/Shell.qml:324

324+#: qml/Shell.qml:351

325msgid "Sorry, incorrect passcode"

326msgstr ""

327

328−#: qml/Shell.qml:348

328+#: qml/Shell.qml:354

329#, qt-format

330msgid "Enter %1"

331msgstr ""

332

333−#: qml/Shell.qml:328

333+#: qml/Shell.qml:355

334#, qt-format

335msgid "Sorry, incorrect %1"

336msgstr ""

337

338−#: qml/Shell.qml:363

338+#: qml/Shell.qml:390

339msgid "Sorry, incorrect passphrase."

340msgstr ""

341

342−#: qml/Shell.qml:364

342+#: qml/Shell.qml:391

343msgid "Sorry, incorrect passcode."

344msgstr ""

345

346−#: qml/Shell.qml:365

346+#: qml/Shell.qml:392

347msgid "This will be your last attempt."

348msgstr ""

349

350−#: qml/Shell.qml:367

350+#: qml/Shell.qml:394

351msgid ""

352"If passphrase is entered incorrectly, your phone will conduct a factory "

353"reset and all personal data will be deleted."

354msgstr ""

355

356−#: qml/Shell.qml:368

356+#: qml/Shell.qml:395

357msgid ""

358"If passcode is entered incorrectly, your phone will conduct a factory reset "

359"and all personal data will be deleted."

po/zh_CN.po+28−41

@@ -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-07 11:37+0300\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-09 06:37+0000\n"

19"X-Generator: Launchpad (build 17196)\n"

20

21#: plugins/LightDM/Greeter.cpp:130

@@ -152,23 +152,23 @@ msgid ""

152"phone Tap on the screen to start"

153msgstr "您现在已经掌握了边缘滑动手势，可以开始使用手机了 请点击屏幕开始使用"

154

155−#: qml/Components/Lockscreen.qml:206

155+#: qml/Components/Lockscreen.qml:220

156msgid "Emergency Call"

157msgstr "紧急电话"

158

159−#: qml/Components/Lockscreen.qml:226

159+#: qml/Components/Lockscreen.qml:252

160msgid "OK"

161msgstr "确定"

162

163−#: qml/Dash/GenericScopeView.qml:411 qml/Dash/GenericScopeView.qml:533

163+#: qml/Dash/GenericScopeView.qml:434 qml/Dash/GenericScopeView.qml:591

164msgid "See less"

165msgstr "显示更少"

166

167−#: qml/Dash/GenericScopeView.qml:411

167+#: qml/Dash/GenericScopeView.qml:434

168msgid "See all"

169msgstr "查看全部"

170

171−#: qml/Dash/GenericScopeView.qml:473 qml/Dash/PageHeader.qml:258

171+#: qml/Dash/GenericScopeView.qml:496 qml/Dash/PageHeader.qml:258

172#: qml/Panel/SearchIndicator.qml:27

173msgid "Search"

174msgstr "搜索"

@@ -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 ""

@@ -249,18 +257,10 @@ msgstr "现在请讲..."

249msgid "Speaking..."

257msgid "Speaking..."

250msgstr "讲话中..."

258msgstr "讲话中..."

251

259

252−#: qml/Notifications/NotificationMenuItemFactory.qml:108

260+#: qml/Notifications/NotificationMenuItemFactory.qml:116

253msgid "Show password"

261msgid "Show password"

254msgstr "显示密码"

262msgstr "显示密码"

255

263

256−#: qml/Notifications/NotificationMenuItemFactory.qml:124

257−msgid "Enter SIM PIN"

258−msgstr ""

259−

260−#: qml/Notifications/NotificationMenuItemFactory.qml:125

261−msgid "Sorry, incorrect PIN"

262−msgstr ""

263−

264#: qml/Panel/ActiveCallHint.qml:77

265msgid "Tap to return to call..."

266msgstr "点击回到通话..."

@@ -305,69 +305,56 @@ msgstr "解开 SIM"

305msgid "Roaming"

306msgstr "漫游"

307

308−#: qml/Shell.qml:340

308+#: qml/Shell.qml:346

309msgid "Enter passphrase"

310msgstr ""

311

312−#: qml/Shell.qml:321

312+#: qml/Shell.qml:347

313msgid "Sorry, incorrect passphrase"

314msgstr ""

315

316−#: qml/Shell.qml:342

316+#: qml/Shell.qml:348

317msgid "Please re-enter"

318msgstr ""

319

320−#: qml/Shell.qml:344

320+#: qml/Shell.qml:350

321msgid "Enter passcode"

322msgstr ""

323

324−#: qml/Shell.qml:324

324+#: qml/Shell.qml:351

325msgid "Sorry, incorrect passcode"

326msgstr ""

327

328−#: qml/Shell.qml:348

328+#: qml/Shell.qml:354

329#, qt-format

330msgid "Enter %1"

331msgstr ""

332

333−#: qml/Shell.qml:328

333+#: qml/Shell.qml:355

334#, qt-format

335msgid "Sorry, incorrect %1"

336msgstr ""

337

338−#: qml/Shell.qml:363

338+#: qml/Shell.qml:390

339msgid "Sorry, incorrect passphrase."

340msgstr ""

341

342−#: qml/Shell.qml:364

342+#: qml/Shell.qml:391

343msgid "Sorry, incorrect passcode."

344msgstr ""

345

346−#: qml/Shell.qml:365

346+#: qml/Shell.qml:392

347msgid "This will be your last attempt."

348msgstr ""

349

350−#: qml/Shell.qml:367

350+#: qml/Shell.qml:394

351msgid ""

352"If passphrase is entered incorrectly, your phone will conduct a factory "

353"reset and all personal data will be deleted."

354msgstr ""

355

356−#: qml/Shell.qml:368

356+#: qml/Shell.qml:395

357msgid ""

358"If passcode is entered incorrectly, your phone will conduct a factory reset "

359"and all personal data will be deleted."

360msgstr ""

361−

362−#, qt-format

363−#~ msgid "Hello %1"

364−#~ msgstr "你好，%1"

365−

366−#~ msgid "Hello"

367−#~ msgstr "你好"

368−

369−#~ msgid "Swipe to unlock"

370−#~ msgstr "滑动解锁"

371−

372−#~ msgid "Manage Dash"

373−#~ msgstr "管理 Dash"

po/zh_HK.po+28−38

@@ -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-07 11:37+0300\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-09 06:37+0000\n"

19"X-Generator: Launchpad (build 17196)\n"

20

21#: plugins/LightDM/Greeter.cpp:130

@@ -152,23 +152,23 @@ msgid ""

152"phone Tap on the screen to start"

153msgstr "您現在已熟練邊緣手勢，可以開始使用手機了 輕觸螢幕開始使用"

154

155−#: qml/Components/Lockscreen.qml:206

155+#: qml/Components/Lockscreen.qml:220

156msgid "Emergency Call"

157msgstr "緊急電話"

158

159−#: qml/Components/Lockscreen.qml:226

159+#: qml/Components/Lockscreen.qml:252

160msgid "OK"

161msgstr "確定"

162

163−#: qml/Dash/GenericScopeView.qml:411 qml/Dash/GenericScopeView.qml:533

163+#: qml/Dash/GenericScopeView.qml:434 qml/Dash/GenericScopeView.qml:591

164msgid "See less"

165msgstr "縮減查看"

166

167−#: qml/Dash/GenericScopeView.qml:411

167+#: qml/Dash/GenericScopeView.qml:434

168msgid "See all"

169msgstr "查看全部"

170

171−#: qml/Dash/GenericScopeView.qml:473 qml/Dash/PageHeader.qml:258

171+#: qml/Dash/GenericScopeView.qml:496 qml/Dash/PageHeader.qml:258

172#: qml/Panel/SearchIndicator.qml:27

173msgid "Search"

174msgstr "搜尋"

@@ -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 ""

@@ -249,18 +257,10 @@ msgstr "請講..."

249msgid "Speaking..."

257msgid "Speaking..."

250msgstr "正在講..."

258msgstr "正在講..."

251

259

252−#: qml/Notifications/NotificationMenuItemFactory.qml:108

260+#: qml/Notifications/NotificationMenuItemFactory.qml:116

253msgid "Show password"

261msgid "Show password"

254msgstr "顯示密碼"

262msgstr "顯示密碼"

255

263

256−#: qml/Notifications/NotificationMenuItemFactory.qml:124

257−msgid "Enter SIM PIN"

258−msgstr ""

259−

260−#: qml/Notifications/NotificationMenuItemFactory.qml:125

261−msgid "Sorry, incorrect PIN"

262−msgstr ""

263−

264#: qml/Panel/ActiveCallHint.qml:77

265msgid "Tap to return to call..."

266msgstr "輕觸可返回通話…"

@@ -305,66 +305,56 @@ msgstr ""

305msgid "Roaming"

306msgstr ""

307

308−#: qml/Shell.qml:340

308+#: qml/Shell.qml:346

309msgid "Enter passphrase"

310msgstr ""

311

312−#: qml/Shell.qml:321

312+#: qml/Shell.qml:347

313msgid "Sorry, incorrect passphrase"

314msgstr ""

315

316−#: qml/Shell.qml:342

316+#: qml/Shell.qml:348

317msgid "Please re-enter"

318msgstr ""

319

320−#: qml/Shell.qml:344

320+#: qml/Shell.qml:350

321msgid "Enter passcode"

322msgstr ""

323

324−#: qml/Shell.qml:324

324+#: qml/Shell.qml:351

325msgid "Sorry, incorrect passcode"

326msgstr ""

327

328−#: qml/Shell.qml:348

328+#: qml/Shell.qml:354

329#, qt-format

330msgid "Enter %1"

331msgstr ""

332

333−#: qml/Shell.qml:328

333+#: qml/Shell.qml:355

334#, qt-format

335msgid "Sorry, incorrect %1"

336msgstr ""

337

338−#: qml/Shell.qml:363

338+#: qml/Shell.qml:390

339msgid "Sorry, incorrect passphrase."

340msgstr ""

341

342−#: qml/Shell.qml:364

342+#: qml/Shell.qml:391

343msgid "Sorry, incorrect passcode."

344msgstr ""

345

346−#: qml/Shell.qml:365

346+#: qml/Shell.qml:392

347msgid "This will be your last attempt."

348msgstr ""

349

350−#: qml/Shell.qml:367

350+#: qml/Shell.qml:394

351msgid ""

352"If passphrase is entered incorrectly, your phone will conduct a factory "

353"reset and all personal data will be deleted."

354msgstr ""

355

356−#: qml/Shell.qml:368

356+#: qml/Shell.qml:395

357msgid ""

358"If passcode is entered incorrectly, your phone will conduct a factory reset "

359"and all personal data will be deleted."

360msgstr ""

361−

362−#, qt-format

363−#~ msgid "Hello %1"

364−#~ msgstr "您好 %1"

365−

366−#~ msgid "Hello"

367−#~ msgstr "您好"

368−

369−#~ msgid "Swipe to unlock"

370−#~ msgstr "滑動解除鎖定"

po/zh_TW.po+43−67

@@ -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-07 11:37+0300\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-09 06:37+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,23 +151,23 @@ 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:220

156msgid "Emergency Call"

155msgid "Emergency Call"

157msgstr "緊急通話"

156msgstr "緊急通話"

158

157

159−#: qml/Components/Lockscreen.qml:226

158+#: qml/Components/Lockscreen.qml:252

160msgid "OK"

159msgid "OK"

161msgstr "確定"

160msgstr "確定"

162

161

163−#: qml/Dash/GenericScopeView.qml:411 qml/Dash/GenericScopeView.qml:533

162+#: qml/Dash/GenericScopeView.qml:434 qml/Dash/GenericScopeView.qml:591

164msgid "See less"

163msgid "See less"

165msgstr "縮減查看"

164msgstr "縮減查看"

166

165

167−#: qml/Dash/GenericScopeView.qml:411

166+#: qml/Dash/GenericScopeView.qml:434

168msgid "See all"

167msgid "See all"

169msgstr "查看全部"

168msgstr "查看全部"

170

169

171−#: qml/Dash/GenericScopeView.qml:473 qml/Dash/PageHeader.qml:258

170+#: qml/Dash/GenericScopeView.qml:496 qml/Dash/PageHeader.qml:258

172#: qml/Panel/SearchIndicator.qml:27

171#: qml/Panel/SearchIndicator.qml:27

173msgid "Search"

172msgid "Search"

174msgstr "搜尋"

173msgstr "搜尋"

@@ -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"

@@ -249,18 +256,10 @@ msgstr "請說..."

249msgid "Speaking..."

256msgid "Speaking..."

250msgstr "說話中..."

257msgstr "說話中..."

251

258

252−#: qml/Notifications/NotificationMenuItemFactory.qml:108

259+#: qml/Notifications/NotificationMenuItemFactory.qml:116

253msgid "Show password"

260msgid "Show password"

254msgstr "顯示密碼"

261msgstr "顯示密碼"

255

262

256−#: qml/Notifications/NotificationMenuItemFactory.qml:124

257−msgid "Enter SIM PIN"

258−msgstr "輸入 SIM 卡 PIN 碼"

259−

260−#: qml/Notifications/NotificationMenuItemFactory.qml:125

261−msgid "Sorry, incorrect PIN"

262−msgstr "抱歉，PIN 碼不對"

263−

264#: qml/Panel/ActiveCallHint.qml:77

263#: qml/Panel/ActiveCallHint.qml:77

265msgid "Tap to return to call..."

264msgid "Tap to return to call..."

266msgstr "輕觸可返回通話…"

265msgstr "輕觸可返回通話…"

@@ -305,85 +304,62 @@ msgstr "為 SIM 卡解鎖"

305msgid "Roaming"

304msgid "Roaming"

306msgstr "漫遊"

305msgstr "漫遊"

307

306

308−#: qml/Shell.qml:340

307+#: qml/Shell.qml:346

309msgid "Enter passphrase"

308msgid "Enter passphrase"

310−msgstr ""

309+msgstr "輸入密語"

311

310

312−#: qml/Shell.qml:321

311+#: qml/Shell.qml:347

313msgid "Sorry, incorrect passphrase"

312msgid "Sorry, incorrect passphrase"

314msgstr "抱歉，密語不對"

313msgstr "抱歉，密語不對"

315

314

316−#: qml/Shell.qml:342

315+#: qml/Shell.qml:348

317msgid "Please re-enter"

316msgid "Please re-enter"

318−msgstr ""

317+msgstr "請再輸入"

319

318

320−#: qml/Shell.qml:344

319+#: qml/Shell.qml:350

321msgid "Enter passcode"

320msgid "Enter passcode"

322−msgstr ""

321+msgstr "輸入 passcode"

323

322

324−#: qml/Shell.qml:324

323+#: qml/Shell.qml:351

325msgid "Sorry, incorrect passcode"

324msgid "Sorry, incorrect passcode"

326−msgstr "抱歉，密碼不對"

325+msgstr "抱歉，passcode 不對"

327

326

328−#: qml/Shell.qml:348

327+#: qml/Shell.qml:354

329#, qt-format

328#, qt-format

330msgid "Enter %1"

329msgid "Enter %1"

331−msgstr ""

330+msgstr "輸入 %1"

332

331

333−#: qml/Shell.qml:328

332+#: qml/Shell.qml:355

334#, qt-format

333#, qt-format

335msgid "Sorry, incorrect %1"

334msgid "Sorry, incorrect %1"

336msgstr "抱歉，%1不對"

335msgstr "抱歉，%1不對"

337

336

338−#: qml/Shell.qml:363

337+#: qml/Shell.qml:390

339msgid "Sorry, incorrect passphrase."

338msgid "Sorry, incorrect passphrase."

340msgstr "抱歉，密語不對"

339msgstr "抱歉，密語不對"

341

340

342−#: qml/Shell.qml:364

341+#: qml/Shell.qml:391

343msgid "Sorry, incorrect passcode."

342msgid "Sorry, incorrect passcode."

344−msgstr "抱歉，密碼不對。"

343+msgstr "抱歉，passcode 不對。"

345

344

346−#: qml/Shell.qml:365

345+#: qml/Shell.qml:392

347msgid "This will be your last attempt."

346msgid "This will be your last attempt."

348msgstr "這將會是您最後一次嘗試的機會。"

347msgstr "這將會是您最後一次嘗試的機會。"

349

348

350−#: qml/Shell.qml:367

349+#: qml/Shell.qml:394

351msgid ""

350msgid ""

352"If passphrase is entered incorrectly, your phone will conduct a factory "

351"If passphrase is entered incorrectly, your phone will conduct a factory "

353"reset and all personal data will be deleted."

352"reset and all personal data will be deleted."

354msgstr "如輸入的密語不對，本電話會進行重設，所有個人資料都會刪除。"

353msgstr "如輸入的密語不對，本電話會進行重設，所有個人資料都會刪除。"

355

354

356−#: qml/Shell.qml:368

355+#: qml/Shell.qml:395

357msgid ""

356msgid ""

358"If passcode is entered incorrectly, your phone will conduct a factory reset "

357"If passcode is entered incorrectly, your phone will conduct a factory reset "

359"and all personal data will be deleted."

358"and all personal data will be deleted."

360−msgstr "如輸入的密碼不對，本電話會進行重設，所有個人資料都會刪除。"

359+msgstr "如輸入的 passcode 不對，本電話會進行重設，所有個人資料都會刪除。"

361−

362−#, qt-format

363−#~ msgid "Hello %1"

364−#~ msgstr "%1 您好"

365−

366−#~ msgid "Hello"

367−#~ msgstr "您好"

368−

369−#~ msgid "Swipe to unlock"

370−#~ msgstr "滑開解除鎖定"

371−

372−#~ msgid "Please wait"

373−#~ msgstr "請稍候"

374−

375−#, qt-format

376−#~ msgid "Enter your %1"

377−#~ msgstr "輸入您的 %1"

378−

379−#~ msgid "Too many incorrect attempts"

380−#~ msgstr "錯得太多次"

381−

382−#~ msgid "Manage Dash"

383−#~ msgstr "管理 Dash"

384

360

385−#~ msgid "Enter your passphrase"

361+#~ msgid "Enter SIM PIN"

386−#~ msgstr "輸入密語"

362+#~ msgstr "輸入 SIM 卡 PIN 碼"

387

363

388−#~ msgid "Enter your passcode"

364+#~ msgid "Sorry, incorrect PIN"

389−#~ msgstr "輸入密碼"

365+#~ msgstr "抱歉，PIN 碼不對"

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/Lockscreen.qml+3−1

@@ -78,7 +78,9 @@ Showable {

78 }

79

80 function showInfoPopup(title, text) {

81− PopupUtils.open(infoPopupComponent, root, {title: title, text: text})

81+ var popup = PopupUtils.open(infoPopupComponent, root, {title: title, text: text})

82+ // FIXME: SDK will do this internally soonish

83+ popup.z = Number.MAX_VALUE

82 }

84 }

83

85

84 Rectangle {

86 Rectangle {

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

@@ -101,6 +101,7 @@ Item {

101 // machine and switch to the final state in the next event loop run

102 Timer {

103 id: animateTimer

104+ objectName: "animateTimer"

104 interval: 1

105 interval: 1

105 property string nextState: ""

106 property string nextState: ""

106 onTriggered: {

107 onTriggered: {

qml/Notifications/NotificationMenuItemFactory.qml+77−5

@@ -19,6 +19,7 @@

19

20import QtQuick 2.0

21import Ubuntu.Components 0.1

22+import QMenuModel 0.1

22import "../Components"

23import "../Components"

23

24

24Loader {

25Loader {

@@ -26,7 +27,7 @@ Loader {

26

27

27 property QtObject menuModel: null

28 property QtObject menuModel: null

28 property QtObject menuData: null

29 property QtObject menuData: null

29− property int menuIndex

30+ property int menuIndex : -1

30 property int maxHeight

31 property int maxHeight

31 readonly property bool fullscreen: menuData.type === "com.canonical.snapdecision.pinlock"

32 readonly property bool fullscreen: menuData.type === "com.canonical.snapdecision.pinlock"

32

33

@@ -46,6 +47,13 @@ Loader {

46 }

47 }

48 }

48

49

50+ function getExtendedProperty(object, propertyName, defaultValue) {

51+ if (object && object.hasOwnProperty(propertyName)) {

52+ return object[propertyName];

53+ }

54+ return defaultValue;

55+ }

56+

49 Component {

57 Component {

50 id: textfield

58 id: textfield

51

59

@@ -121,14 +129,14 @@ Loader {

121 right: parent.right

129 right: parent.right

122 }

130 }

123 height: menuFactory.maxHeight

131 height: menuFactory.maxHeight

124− infoText: i18n.tr("Enter SIM PIN")

132+ infoText: notification.summary

125− errorText: i18n.tr("Sorry, incorrect PIN")

133+ errorText: errorAction.valid ? errorAction.state : ""

126− minPinLength: 4

134+ retryText: notification.body

127− maxPinLength: 8

128 background: shell.background

135 background: shell.background

129

136

130 onEntered: {

137 onEntered: {

131 menuModel.changeState(menuIndex, passphrase);

138 menuModel.changeState(menuIndex, passphrase);

139+ clear(false);

132 }

140 }

133

141

134 onCancel: {

142 onCancel: {

@@ -139,6 +147,70 @@ Loader {

139 shell.activateApplication("dialer-app")

147 shell.activateApplication("dialer-app")

140 menuModel.activate(menuIndex, false)

148 menuModel.activate(menuIndex, false)

141 }

149 }

150+

151+ property var extendedData: menuData && menuData.ext || undefined

152+

153+ property var pinMinMaxAction : UnityMenuAction {

154+ model: menuModel

155+ index: menuIndex

156+ name: getExtendedProperty(extendedData, "xCanonicalPinMinMax", "")

157+

158+ onStateChanged: {

159+ var min = pinMinMaxAction.state[0];

160+ var max = pinMinMaxAction.state[1];

161+

162+ if (min === 0) min = -1;

163+ if (max === 0) max = -1;

164+

165+ minPinLength = min

166+ maxPinLength = max

167+ }

168+ }

169+

170+ property var popupAction: UnityMenuAction {

171+ model: menuModel

172+ index: menuIndex

173+ name: getExtendedProperty(extendedData, "xCanonicalPinPopup", "")

174+ onStateChanged: {

175+ if (state !== "")

176+ showInfoPopup("", state);

177+ }

178+ }

179+ onInfoPopupConfirmed: {

180+ popupAction.activate();

181+ }

182+

183+ Timer {

184+ id: errorTimer

185+ interval: 4000;

186+ running: false;

187+ repeat: false

188+ onTriggered: {

189+ errorAction.activate();

190+ }

191+ }

192+ property var errorAction: UnityMenuAction {

193+ model: menuModel

194+ index: menuIndex

195+ name: getExtendedProperty(extendedData, "xCanonicalPinError", "")

196+ onStateChanged: {

197+ errorText = state;

198+ if (state !== "") {

199+ clear(true);

200+ errorTimer.running = true;

201+ }

202+ }

203+ }

204+

205+ function loadAttributes() {

206+ if (!menuModel || menuIndex == -1) return;

207+ menuModel.loadExtendedAttributes(menuIndex, {'x-canonical-pin-min-max': 'string',

208+ 'x-canonical-pin-popup': 'string',

209+ 'x-canonical-pin-error': 'string'});

210+ }

211+ Component.onCompleted: {

212+ loadAttributes();

213+ }

142 }

214 }

143 }

215 }

144}

216}

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/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=5)

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+9

@@ -114,6 +114,8 @@ public:

114 bool requestFocusApplication(const QString &appId) { Q_UNUSED(appId); return true; }

115 bool suspended() const { return false; }

116 void setSuspended(bool) {}

117+ bool forceDashActive() const { return false; }

118+ void setForceDashActive(bool) {}

117

119

118private:

120private:

119 QList<MockApp*> m_list;

121 QList<MockApp*> m_list;

@@ -190,6 +192,13 @@ private Q_SLOTS:

190 QCOMPARE(launcherModel->get(1)->pinned(), false);

192 QCOMPARE(launcherModel->get(1)->pinned(), false);

191 QCOMPARE(spy.count(), 1);

193 QCOMPARE(spy.count(), 1);

192 QCOMPARE(spy.at(0).at(2).value<QVector<int>>().first(), (int)LauncherModelInterface::RolePinned);

194 QCOMPARE(spy.at(0).at(2).value<QVector<int>>().first(), (int)LauncherModelInterface::RolePinned);

195+

196+ spy.clear();

197+ launcherModel->requestRemove(launcherModel->get(0)->appId());

198+ QCOMPARE(launcherModel->get(0)->pinned(), false);

199+ QCOMPARE(launcherModel->get(1)->pinned(), false);

200+ QCOMPARE(spy.count(), 1);

201+ QCOMPARE(spy.at(0).at(2).value<QVector<int>>().first(), (int)LauncherModelInterface::RolePinned);

193 }

202 }

194

203

195 void testRemove_data() {

204 void testRemove_data() {

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