git.iko.soy/unity8
on xenial help sign in
merge trunk
3669634Michael Zanetti
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.")
64 message(FATAL_ERROR "Could not determine plugin installation dir.")
65endif()
65endif()
66
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")
74set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -fno-permissive -pedantic -Wall -Wextra")
75
75
76if ("${CMAKE_BUILD_TYPE}" STREQUAL "release" OR "${CMAKE_BUILD_TYPE}" STREQUAL "relwithdebinfo")
76if ("${CMAKE_BUILD_TYPE}" STREQUAL "release" OR "${CMAKE_BUILD_TYPE}" STREQUAL "relwithdebinfo")
CODING+4
@@ -154,6 +154,10 @@ So, for the DragHandle component that would be:
154
154
155$ make testDragHandle
155$ make testDragHandle
156
156
157+To run the tests for a single component/class under gdb (so you can catch SEGFAULTS)
158+
159+$ make gdbtestComponentName
160+
157To run a test application that allow you to manually test or to simply try out
161To run a test application that allow you to manually test or to simply try out
158a given component:
162a given component:
159
163
build.sh+1
@@ -51,6 +51,7 @@ install_dependencies() {
51 qtdeclarative5-ubuntu-settings-components \
51 qtdeclarative5-ubuntu-settings-components \
52 qtdeclarative5-ubuntu-telephony0.1 \
52 qtdeclarative5-ubuntu-telephony0.1 \
53 qtdeclarative5-ubuntu-thumbnailer0.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+10−1
@@ -12,6 +12,7 @@
12# Two targets will be created:
12# Two targets will be created:
13# - testComponentName - Runs the test with qmltestrunner
13# - testComponentName - Runs the test with qmltestrunner
14# - tryComponentName - Runs the test with uqmlscene, for manual interaction
14# - tryComponentName - Runs the test with uqmlscene, for manual interaction
15+# - gdbtestComponentName - Runs the test with qmltestrunner under gdb
15#
16#
16# To change/set a default value for the whole test suite, prior to calling add_qml_test, set:
17# To change/set a default value for the whole test suite, prior to calling add_qml_test, set:
17# qmltest_DEFAULT_NO_ADD_TEST (default: FALSE)
18# qmltest_DEFAULT_NO_ADD_TEST (default: FALSE)
@@ -81,6 +82,7 @@ macro(add_qml_test_internal SUBPATH COMPONENT_NAME ITERATIONS)
81 cmake_parse_arguments(qmltest_default "${options}" "" "${multi_value_keywords}" ${qmltest_DEFAULT_PROPERTIES})
82 cmake_parse_arguments(qmltest_default "${options}" "" "${multi_value_keywords}" ${qmltest_DEFAULT_PROPERTIES})
82
83
83 set(qmltest_TARGET test${COMPONENT_NAME})
84 set(qmltest_TARGET test${COMPONENT_NAME})
85+ set(qmltest_gdb_TARGET gdbtest${COMPONENT_NAME})
84 set(qmltest_xvfb_TARGET xvfbtest${COMPONENT_NAME})
86 set(qmltest_xvfb_TARGET xvfbtest${COMPONENT_NAME})
85 set(qmltest_FILE ${SUBPATH}/tst_${COMPONENT_NAME})
87 set(qmltest_FILE ${SUBPATH}/tst_${COMPONENT_NAME})
86
88
@@ -138,12 +140,18 @@ macro(add_qml_test_internal SUBPATH COMPONENT_NAME ITERATIONS)
138 ${function_ARGS}
140 ${function_ARGS}
139 )
141 )
140
142
143+ set(qmltest_gdb_command
144+ env ${test_env} ${qmltest_ENVIRONMENT} ${LD_PRELOAD_PATH}
145+ gdb -e ${qmltestrunner_exe} -ex \"run -input ${CMAKE_CURRENT_SOURCE_DIR}/${qmltest_FILE}.qml ${qmltestrunner_imports} ${ITERATIONS_STRING}\"
146+ )
147+
141 add_qmltest_target(${qmltest_TARGET} "${qmltest_command}" TRUE ${qmltest_NO_ADD_TEST})
148 add_qmltest_target(${qmltest_TARGET} "${qmltest_command}" TRUE ${qmltest_NO_ADD_TEST})
142 add_qmltest_target(${qmltest_xvfb_TARGET} "${qmltest_xvfb_command}" ${qmltest_NO_TARGETS} TRUE)
149 add_qmltest_target(${qmltest_xvfb_TARGET} "${qmltest_xvfb_command}" ${qmltest_NO_TARGETS} TRUE)
150+ add_qmltest_target(${qmltest_gdb_TARGET} "${qmltest_gdb_command}" TRUE TRUE)
143 add_manual_qml_test(${SUBPATH} ${COMPONENT_NAME} ${ARGN})
151 add_manual_qml_test(${SUBPATH} ${COMPONENT_NAME} ${ARGN})
144endmacro(add_qml_test_internal)
152endmacro(add_qml_test_internal)
145
153
146−macro(add_binary_qml_test CLASS_NAME LD_PATH DEPS)
154+macro(add_binary_qml_test CLASS_NAME LD_PATH DEPS ENVVAR)
147 set(testCommand
155 set(testCommand
148 LD_LIBRARY_PATH=${LD_PATH}
156 LD_LIBRARY_PATH=${LD_PATH}
149 ${CMAKE_CURRENT_BINARY_DIR}/${CLASS_NAME}TestExec
157 ${CMAKE_CURRENT_BINARY_DIR}/${CLASS_NAME}TestExec
@@ -160,6 +168,7 @@ macro(add_binary_qml_test CLASS_NAME LD_PATH DEPS)
160 endif()
168 endif()
161 set(xvfbtestCommand
169 set(xvfbtestCommand
162 ${LD_PRELOAD_PATH}
170 ${LD_PRELOAD_PATH}
171+ ${ENVVAR}
163 LD_LIBRARY_PATH=${LD_PATH}
172 LD_LIBRARY_PATH=${LD_PATH}
164 xvfb-run --server-args "-screen 0 1024x768x24" --auto-servernum
173 xvfb-run --server-args "-screen 0 1024x768x24" --auto-servernum
165 ${CMAKE_CURRENT_BINARY_DIR}/${CLASS_NAME}TestExec
174 ${CMAKE_CURRENT_BINARY_DIR}/${CLASS_NAME}TestExec
data/unity8.conf+5−1
@@ -34,11 +34,15 @@ pre-start script
34 gdbus call --session --dest org.freedesktop.DBus --object-path /org/freedesktop/DBus --method org.freedesktop.DBus.UpdateActivationEnvironment "@a{ss} {'MIR_SOCKET': '$MIR_SERVER_FILE'}"
34 gdbus call --session --dest org.freedesktop.DBus --object-path /org/freedesktop/DBus --method org.freedesktop.DBus.UpdateActivationEnvironment "@a{ss} {'MIR_SOCKET': '$MIR_SERVER_FILE'}"
35 fi
35 fi
36
36
37− # Remove the socket if still there
37+ # Remove the normal and trusted sockets if still there
38 if [ -S "$MIR_SERVER_FILE" ]; then
38 if [ -S "$MIR_SERVER_FILE" ]; then
39 rm "$MIR_SERVER_FILE"
39 rm "$MIR_SERVER_FILE"
40 fi
40 fi
41
41
42+ if [ -S "${MIR_SERVER_FILE}_trusted" ]; then
43+ rm "${MIR_SERVER_FILE}_trusted"
44+ fi
45+
42 initctl set-env --global MIR_SERVER_PROMPT_FILE=1
46 initctl set-env --global MIR_SERVER_PROMPT_FILE=1
43
47
44 initctl emit --no-wait indicator-services-start
48 initctl emit --no-wait indicator-services-start
debian/changelog+96
@@ -1,3 +1,99 @@
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+
56+unity8 (8.00+14.10.20140930.2-0ubuntu1) utopic; urgency=low
57+
58+ [ Alexandros Frantzis ]
59+ * Remove stale trusted socket before starting unity8 from upstart (LP:
60+ #1371597) (LP: #1371597)
61+
62+ [ CI bot ]
63+ * Resync trunk
64+
65+ [ Andrea Cimitan ]
66+ * Move activity indicator on top of keyboard (LP: #1354519)
67+
68+ [ Gerry Boland ]
69+ * Cleanup: Remove unused member and fix small syntax error in
70+ OrientationLock
71+
72+ [ josharenson ]
73+ * Fix lp:1367894 by correcting how the minute value is calculated in
74+ the panel. (LP: #1367894)
75+
76+ [ Nick Dedekind ]
77+ * Fixed DefaultIndicatorPage test. Fixed warnings from test.
78+
79+ [ Ying-Chun Liu ]
80+ * Remove maxLineCount in preview. (LP: 1328513) (LP: #1328513)
81+
82+ [ Michael Terry ]
83+ * Fix some code that accidentally landed in trunk before it got
84+ cleaned up. The current code just has some duplication to it that
85+ should be unified.
86+ * Implement latest visual designs for passphrase lockscreen.
87+ * Make it easier to use the Lockscreen component from the welcome
88+ wizard.
89+ * Limit how much memory we reserve for the greeter background image,
90+ allowing giant images to appear correctly.
91+
92+ [ Daniel d'Andrada ]
93+ * Add gdbTestComponentName build targets
94+
95+ -- Ubuntu daily release <ps-jenkins@lists.canonical.com> Tue, 30 Sep 2014 16:57:28 +0000
96+
1unity8 (8.00+14.10.20140926-0ubuntu1) utopic; urgency=low
97unity8 (8.00+14.10.20140926-0ubuntu1) utopic; urgency=low
2
98
3 [ CI bot ]
99 [ CI bot ]
debian/control+2−1
@@ -25,7 +25,7 @@ Build-Depends: cmake,
25 libpulse-dev,
25 libpulse-dev,
26 libqmenumodel-dev (>= 0.2.8),
26 libqmenumodel-dev (>= 0.2.8),
27 libqt5xmlpatterns5-dev,
27 libqt5xmlpatterns5-dev,
28− libunity-api-dev (>= 7.91),
28+ libunity-api-dev (>= 7.92),
29 libusermetricsoutput1-dev,
29 libusermetricsoutput1-dev,
30 libxcb1-dev,
30 libxcb1-dev,
31 pkg-config,
31 pkg-config,
@@ -174,6 +174,7 @@ Depends: accountsservice-ubuntu-schemas (>= 0.0.3),
174 libhardware2,
174 libhardware2,
175 unity-schemas (>= 7.3.1+14.10.20140915),
175 unity-schemas (>= 7.3.1+14.10.20140915),
176 pay-service,
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"] || "";
59 text: "value" in modelData && modelData["value"] || "";
60 elide: Text.ElideRight
60 elide: Text.ElideRight
61 maximumLineCount: 1
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"
63 fontSize: "small"
64 font.pixelSize: Math.round(FontUtils.sizeToPixels(fontSize) * fontScale)
64 font.pixelSize: Math.round(FontUtils.sizeToPixels(fontSize) * fontScale)
65 color: grid.color
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\
82 height = Qt.binding(function() { return image.status !== Image.Ready ? 0 : image.height }); \n\
83 } \n\
83 } \n\
84 } \n\
84 } \n\
85− image: Image { \n\
85+ image: CroppedImageMinimumSourceSize { \n\
86 objectName: "artImage"; \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+/*
2+ * Copyright (C) 2014 Canonical, Ltd.
3+ *
4+ * This program is free software; you can redistribute it and/or modify
5+ * it under the terms of the GNU General Public License as published by
6+ * the Free Software Foundation; version 3.
7+ *
8+ * This program is distributed in the hope that it will be useful,
9+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
10+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11+ * GNU General Public License for more details.
12+ *
13+ * You should have received a copy of the GNU General Public License
14+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
15+ */
16+
17+import QtQuick 2.3
18+
19+Image {
20+ property bool resized: false
21+ property bool resizing: false
22+ fillMode: Image.PreserveAspectCrop
23+ visible: resized
24+ onSourceSizeChanged: {
25+ if (!resized && !resizing) {
26+ resizing = true;
27+ var ar = width / height;
28+ var ssar = sourceSize.width / sourceSize.height;
29+ if (ar > ssar) {
30+ sourceSize = Qt.size(width, 0);
31+ } else {
32+ sourceSize = Qt.size(0, height);
33+ }
34+ resizing = false;
35+ resized = true;
36+ }
37+ }
38+}
plugins/Dash/listviewwithpageheader.cpp+18−7
@@ -104,8 +104,6 @@
104#pragma GCC diagnostic pop
104#pragma GCC diagnostic pop
105// #include <private/qquickrectangle_p.h>
105// #include <private/qquickrectangle_p.h>
106
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)
54 Q_PROPERTY(bool forceNoClip READ forceNoClip WRITE setForceNoClip NOTIFY forceNoClipChanged)
55 Q_PROPERTY(int stickyHeaderHeight READ stickyHeaderHeight NOTIFY stickyHeaderHeightChanged)
55 Q_PROPERTY(int stickyHeaderHeight READ stickyHeaderHeight NOTIFY stickyHeaderHeightChanged)
56 Q_PROPERTY(qreal headerItemShownHeight READ headerItemShownHeight NOTIFY headerItemShownHeightChanged)
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
3typeinfo Dash.qmltypes
4singleton CardCreatorCache 0.1 CardCreatorCache.qml
4singleton CardCreatorCache 0.1 CardCreatorCache.qml
5ScopeStyle 0.1 ScopeStyle.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>
21#include <QObject>
22
22
23class Greeter;
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>
21#include <QObject>
22
22
23class Greeter;
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(
1include_directories(
2 ${CMAKE_CURRENT_SOURCE_DIR}
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 */
15 */
16
16
17#include "dashcommunicator.h"
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{
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
17#ifndef DASHCOMMUNICATOR_H
18#define DASHCOMMUNICATOR_H
18#define DASHCOMMUNICATOR_H
19
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+/*
2+ * Copyright (C) 2014 Canonical, Ltd.
3+ *
4+ * This program is free software: you can redistribute it and/or modify it under
5+ * the terms of the GNU Lesser General Public License version 3, as published by
6+ * the Free Software Foundation.
7+ *
8+ * This program is distributed in the hope that it will be useful, but WITHOUT
9+ * ANY WARRANTY; without even the implied warranties of MERCHANTABILITY,
10+ * SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
11+ * Lesser General Public License for more details.
12+ *
13+ * You should have received a copy of the GNU Lesser General Public License
14+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
15+ */
16+
17+#include "dashconnection.h"
18+
19+#include <QDBusInterface>
20+#include <QDBusPendingCall>
21+
22+DashConnection::DashConnection(const QString &service, const QString &path, const QString &interface, QObject *parent):
23+ AbstractDBusServiceMonitor(service, path, interface, SessionBus, parent)
24+{
25+
26+}
27+
28+void DashConnection::setCurrentScope(const QString &scopeId, bool animate, bool isSwipe)
29+{
30+ if (dbusInterface()) {
31+ dbusInterface()->asyncCall("SetCurrentScope", scopeId, animate, isSwipe);
32+ }
33+}
plugins/Unity/DashCommunicator/dashconnection.hnew file+34
@@ -0,0 +1,34 @@
1+/*
2+ * Copyright (C) 2014 Canonical, Ltd.
3+ *
4+ * This program is free software: you can redistribute it and/or modify it under
5+ * the terms of the GNU Lesser General Public License version 3, as published by
6+ * the Free Software Foundation.
7+ *
8+ * This program is distributed in the hope that it will be useful, but WITHOUT
9+ * ANY WARRANTY; without even the implied warranties of MERCHANTABILITY,
10+ * SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
11+ * Lesser General Public License for more details.
12+ *
13+ * You should have received a copy of the GNU Lesser General Public License
14+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
15+ */
16+
17+#ifndef THREADEDDASHCONNECTION_H
18+#define THREADEDDASHCONNECTION_H
19+
20+// local
21+#include "abstractdbusservicemonitor.h"
22+
23+
24+class DashConnection: public AbstractDBusServiceMonitor
25+{
26+ Q_OBJECT
27+public:
28+ DashConnection(const QString &service, const QString &path, const QString &interface, QObject *parent = 0);
29+
30+public Q_SLOTS:
31+ void setCurrentScope(const QString &scopeId, bool animate, bool isSwipe);
32+};
33+
34+#endif
plugins/Unity/Launcher/CMakeLists.txt+1−1
@@ -1,6 +1,6 @@
1include(FindPkgConfig)
1include(FindPkgConfig)
2pkg_check_modules(LAUNCHER_API REQUIRED unity-shell-launcher=4)
2pkg_check_modules(LAUNCHER_API REQUIRED unity-shell-launcher=4)
3−pkg_check_modules(APPLICATION_API REQUIRED unity-shell-application=4)
3+pkg_check_modules(APPLICATION_API REQUIRED unity-shell-application=5)
4pkg_check_modules(GSETTINGS_QT REQUIRED gsettings-qt)
4pkg_check_modules(GSETTINGS_QT REQUIRED gsettings-qt)
5
5
6add_definitions(-DSM_BUSNAME=systemBus)
6add_definitions(-DSM_BUSNAME=systemBus)
plugins/Unity/Session/orientationlock.cpp+6−6
@@ -24,16 +24,16 @@ OrientationLock::OrientationLock(QObject *parent)
24 , m_enabled(false)
24 , m_enabled(false)
25 , m_savedOrientation(Qt::PortraitOrientation)
25 , m_savedOrientation(Qt::PortraitOrientation)
26{
26{
27− systemSettings = g_settings_new("com.ubuntu.touch.system");
27+ m_systemSettings = g_settings_new("com.ubuntu.touch.system");
28− g_signal_connect(systemSettings, "changed::rotation-lock",
28+ g_signal_connect(m_systemSettings, "changed::rotation-lock",
29 G_CALLBACK(OrientationLock::onEnabledChangedProxy), this);
29 G_CALLBACK(OrientationLock::onEnabledChangedProxy), this);
30− m_enabled = g_settings_get_boolean(systemSettings, "rotation-lock");
30+ m_enabled = g_settings_get_boolean(m_systemSettings, "rotation-lock");
31}
31}
32
32
33OrientationLock::~OrientationLock()
33OrientationLock::~OrientationLock()
34{
34{
35− g_signal_handlers_disconnect_by_data(systemSettings, this);
35+ g_signal_handlers_disconnect_by_data(m_systemSettings, this);
36− g_object_unref(systemSettings);
36+ g_object_unref(m_systemSettings);
37}
37}
38
38
39bool OrientationLock::enabled() const
39bool OrientationLock::enabled() const
@@ -54,7 +54,7 @@ void OrientationLock::onEnabledChangedProxy(GSettings */*settings*/, const gchar
54
54
55void OrientationLock::onEnabledChanged()
55void OrientationLock::onEnabledChanged()
56{
56{
57− const bool enabled = g_settings_get_boolean(systemSettings, "rotation-lock");
57+ const bool enabled = g_settings_get_boolean(m_systemSettings, "rotation-lock");
58 if (m_enabled != enabled) {
58 if (m_enabled != enabled) {
59 m_enabled = enabled;
59 m_enabled = enabled;
60 Q_EMIT enabledChanged();
60 Q_EMIT enabledChanged();
plugins/Unity/Session/orientationlock.h+1−3
@@ -19,7 +19,6 @@
19
19
20#include <gio/gio.h>
20#include <gio/gio.h>
21#include <QtCore/QObject>
21#include <QtCore/QObject>
22−#include <QtDBus/QDBusInterface>
23
22
24/**
23/**
25 * @brief The OrientationLock class exports orientation lock related properties to QML
24 * @brief The OrientationLock class exports orientation lock related properties to QML
@@ -52,8 +51,7 @@ private Q_SLOTS:
52 void onEnabledChanged();
51 void onEnabledChanged();
53
52
54private:
53private:
55− QDBusInterface *dbusInterface;
54+ GSettings *m_systemSettings;
56− GSettings *systemSettings;
57
55
58 bool m_enabled;
56 bool m_enabled;
59 Qt::ScreenOrientation m_savedOrientation;
57 Qt::ScreenOrientation m_savedOrientation;
po/am.po+65−55
@@ -7,14 +7,15 @@ msgid ""
7msgstr ""
7msgstr ""
8"Project-Id-Version: unity8\n"
8"Project-Id-Version: unity8\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2014-09-24 10:43+0100\n"
10+"POT-Creation-Date: 2014-10-07 11:37+0300\n"
11−"PO-Revision-Date: 2014-09-28 14:37+0000\n"
11+"PO-Revision-Date: 2014-10-08 00:48+0000\n"
12"Last-Translator: samson <Unknown>\n"
12"Last-Translator: samson <Unknown>\n"
13"Language-Team: Amharic <am@li.org>\n"
13"Language-Team: Amharic <am@li.org>\n"
14"MIME-Version: 1.0\n"
14"MIME-Version: 1.0\n"
15"Content-Type: text/plain; charset=UTF-8\n"
15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n"
16"Content-Transfer-Encoding: 8bit\n"
17+"Plural-Forms: nplurals=2; plural=n > 1;\n"
17−"X-Launchpad-Export-Date: 2014-09-29 05:19+0000\n"
18+"X-Launchpad-Export-Date: 2014-10-09 06:36+0000\n"
18"X-Generator: Launchpad (build 17196)\n"
19"X-Generator: Launchpad (build 17196)\n"
19
20
20#: plugins/LightDM/Greeter.cpp:130
21#: plugins/LightDM/Greeter.cpp:130
@@ -30,6 +31,25 @@ msgstr "አቋራጭ ማጣበቂያ"
30msgid "Unpin shortcut"
31msgid "Unpin shortcut"
31msgstr "አቋራጭ መለያያ"
32msgstr "አቋራጭ መለያያ"
32
33
34+#: qml/Components/DelayedLockscreen.qml:47
35+msgid "Device Locked"
36+msgstr "አካሉ ተቆልፏል"
37+
38+#: qml/Components/DelayedLockscreen.qml:62
39+msgid "You have been locked out due to too many failed passphrase attempts."
40+msgstr "ብዙ ጊዜ የተሳሳተ የ ማለፊያ ሀረግ ለማስገባት በ መሞከር ምክንያት ስልኩ ተቆልፏል"
41+
42+#: qml/Components/DelayedLockscreen.qml:63
43+msgid "You have been locked out due to too many failed passcode attempts."
44+msgstr "ብዙ ጊዜ የተሳሳተ የ ማለፊያ ኮድ ለማስገባት በ መሞከር ምክንያት ስልኩ ተቆልፏል"
45+
46+#: qml/Components/DelayedLockscreen.qml:72
47+#, qt-format
48+msgid "Please wait %1 minute and then try again…"
49+msgid_plural "Please wait %1 minutes and then try again…"
50+msgstr[0] "እባክዎን ይቆዩ %1 ደቂቃ እና ከዛ እንደ ገና ይምክሩ…"
51+msgstr[1] "እባክዎን ይቆዩ %1 ደቂቃዎች እና ከዛ እንደ ገና ይምክሩ…"
52+
33#: qml/Components/Dialogs.qml:70
53#: qml/Components/Dialogs.qml:70
34msgid "Log out"
54msgid "Log out"
35msgstr "መውጫ"
55msgstr "መውጫ"
@@ -135,40 +155,23 @@ msgid ""
135msgstr ""
155msgstr ""
136"አሁን የ ጠርዝ እንቅስቃሴን አውቀዋል እና መጀመር ይችላሉ ስልኩን መጠቀም <br><br>መመልከቻውን መታ ያድርጉ ለመጀመር"
156"አሁን የ ጠርዝ እንቅስቃሴን አውቀዋል እና መጀመር ይችላሉ ስልኩን መጠቀም <br><br>መመልከቻውን መታ ያድርጉ ለመጀመር"
137
157
138−#: qml/Components/Lockscreen.qml:167
158+#: qml/Components/Lockscreen.qml:220
139−msgid "Please wait"
140−msgstr "እባክዎን ይቆዩ"
141−
142−#: qml/Components/Lockscreen.qml:172
143−msgid "Too many incorrect attempts"
144−msgstr "በርካታ የተሳሳቱ ሙከራዎች"
145−
146−#: qml/Components/Lockscreen.qml:206
147msgid "Emergency Call"
159msgid "Emergency Call"
148msgstr "የ ድንገተኛ ጥሪ"
160msgstr "የ ድንገተኛ ጥሪ"
149
161
150−#: qml/Components/Lockscreen.qml:226
162+#: qml/Components/Lockscreen.qml:252
151msgid "OK"
163msgid "OK"
152msgstr "እሺ"
164msgstr "እሺ"
153
165
154−#: qml/Components/PassphraseLockscreen.qml:61
155−#, qt-format
156−msgid "Hello %1"
157−msgstr "ሰላም %1"
158−
159−#: qml/Components/PassphraseLockscreen.qml:61
160−msgid "Hello"
161−msgstr "ሰላም"
162−
163−#: qml/Dash/GenericScopeView.qml:411 qml/Dash/GenericScopeView.qml:533
166+#: qml/Dash/GenericScopeView.qml:434 qml/Dash/GenericScopeView.qml:591
164msgid "See less"
167msgid "See less"
165msgstr "አነስተኛ መመልከቻ"
168msgstr "አነስተኛ መመልከቻ"
166
169
167−#: qml/Dash/GenericScopeView.qml:411
170+#: qml/Dash/GenericScopeView.qml:434
168msgid "See all"
171msgid "See all"
169msgstr "ሁሉንም መመልከቻ"
172msgstr "ሁሉንም መመልከቻ"
170
173
171−#: qml/Dash/GenericScopeView.qml:473 qml/Dash/PageHeader.qml:258
174+#: qml/Dash/GenericScopeView.qml:496 qml/Dash/PageHeader.qml:258
172#: qml/Panel/SearchIndicator.qml:27
175#: qml/Panel/SearchIndicator.qml:27
173msgid "Search"
176msgid "Search"
174msgstr "መፈለጊያ"
177msgstr "መፈለጊያ"
@@ -205,6 +208,14 @@ msgstr "ግምገማ መጨመሪያ"
205msgid "Send"
208msgid "Send"
206msgstr "መላኪያ"
209msgstr "መላኪያ"
207
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+
208#: qml/Dash/ScopesOverview.qml:206
219#: qml/Dash/ScopesOverview.qml:206
209msgid "Manage Scopes"
220msgid "Manage Scopes"
210msgstr "የ ክልል አስተዳዳሪ"
221msgstr "የ ክልል አስተዳዳሪ"
@@ -226,8 +237,8 @@ msgid "All"
226msgstr "ሁሉንም"
237msgstr "ሁሉንም"
227
238
228#: qml/Greeter/Greeter.qml:157
239#: qml/Greeter/Greeter.qml:157
229−msgid "Swipe to unlock"
240+msgid "Unlock"
230−msgstr "ለመክፈት ይጥረጉ"
241+msgstr "መክፈቻ"
231
242
232#: qml/Hud/HudParametrizedActionsPage.qml:139
243#: qml/Hud/HudParametrizedActionsPage.qml:139
233msgid "Confirm"
244msgid "Confirm"
@@ -249,18 +260,10 @@ msgstr "አሁን ይናገሩ..."
249msgid "Speaking..."
260msgid "Speaking..."
250msgstr "በመናገር ላይ..."
261msgstr "በመናገር ላይ..."
251
262
252−#: qml/Notifications/NotificationMenuItemFactory.qml:108
263+#: qml/Notifications/NotificationMenuItemFactory.qml:116
253msgid "Show password"
264msgid "Show password"
254msgstr "የመግቢያ ቃል ማሳያ"
265msgstr "የመግቢያ ቃል ማሳያ"
255
266
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
267#: qml/Panel/ActiveCallHint.qml:77
265msgid "Tap to return to call..."
268msgid "Tap to return to call..."
266msgstr "ወደ ጥሪው ለመመለስ መታ ያድርጉ..."
269msgstr "ወደ ጥሪው ለመመለስ መታ ያድርጉ..."
@@ -305,45 +308,49 @@ msgstr "ሲም መክፈቻ"
305msgid "Roaming"
308msgid "Roaming"
306msgstr "ማዘዋወሪያ"
309msgstr "ማዘዋወሪያ"
307
310
308−#: qml/Shell.qml:320
311+#: qml/Shell.qml:346
309−msgid "Enter your passphrase"
312+msgid "Enter passphrase"
310−msgstr "የማለፊያ ሐረግ ያስገቡ"
313+msgstr "የ ማለፊያ ሀረግ ያስገቡ"
311
314
312−#: qml/Shell.qml:321
315+#: qml/Shell.qml:347
313msgid "Sorry, incorrect passphrase"
316msgid "Sorry, incorrect passphrase"
314msgstr "አዝናለሁ የተሳሳተ የማለፊያ ሐረግ"
317msgstr "አዝናለሁ የተሳሳተ የማለፊያ ሐረግ"
315
318
316−#: qml/Shell.qml:323
319+#: qml/Shell.qml:348
317−msgid "Enter your passcode"
320+msgid "Please re-enter"
318−msgstr "የ እርስዎን የማለፊያ ኮድ ያስገቡ"
321+msgstr "እባክዎን እንደገና-ያስገቡ"
319
322
320−#: qml/Shell.qml:324
323+#: qml/Shell.qml:350
324+msgid "Enter passcode"
325+msgstr "የ ማለፊያ ኮድ ያስገቡ"
326+
327+#: qml/Shell.qml:351
321msgid "Sorry, incorrect passcode"
328msgid "Sorry, incorrect passcode"
322msgstr "አዝናለሁ የተሳሳተ የማለፊያ ኮድ"
329msgstr "አዝናለሁ የተሳሳተ የማለፊያ ኮድ"
323
330
324−#: qml/Shell.qml:327
331+#: qml/Shell.qml:354
325#, qt-format
332#, qt-format
326−msgid "Enter your %1"
333+msgid "Enter %1"
327−msgstr "ያስገቡ የ እርስዎን %1"
334+msgstr "ማስገቢያ %1"
328
335
329−#: qml/Shell.qml:328
336+#: qml/Shell.qml:355
330#, qt-format
337#, qt-format
331msgid "Sorry, incorrect %1"
338msgid "Sorry, incorrect %1"
332msgstr "አዝናለሁ: የተሳሳተ%1"
339msgstr "አዝናለሁ: የተሳሳተ%1"
333
340
334−#: qml/Shell.qml:363
341+#: qml/Shell.qml:390
335msgid "Sorry, incorrect passphrase."
342msgid "Sorry, incorrect passphrase."
336msgstr "አዝናለሁ የተሳሳተ የማለፊያ ሐረግ"
343msgstr "አዝናለሁ የተሳሳተ የማለፊያ ሐረግ"
337
344
338−#: qml/Shell.qml:364
345+#: qml/Shell.qml:391
339msgid "Sorry, incorrect passcode."
346msgid "Sorry, incorrect passcode."
340msgstr "አዝናለሁ የተሳሳተ የማለፊያ ኮድ"
347msgstr "አዝናለሁ የተሳሳተ የማለፊያ ኮድ"
341
348
342−#: qml/Shell.qml:365
349+#: qml/Shell.qml:392
343msgid "This will be your last attempt."
350msgid "This will be your last attempt."
344msgstr "ይህ የመጨረሻ ሙከራዎ ነው"
351msgstr "ይህ የመጨረሻ ሙከራዎ ነው"
345
352
346−#: qml/Shell.qml:367
353+#: qml/Shell.qml:394
347msgid ""
354msgid ""
348"If passphrase is entered incorrectly, your phone will conduct a factory "
355"If passphrase is entered incorrectly, your phone will conduct a factory "
349"reset and all personal data will be deleted."
356"reset and all personal data will be deleted."
@@ -351,7 +358,7 @@ msgstr ""
351"የተሳሳተ የማለፊያ ሐረግ ካስገቡ የ እርስዎ ስልክ ወደ ነበረበት ወደ ፋክቶሪው ዘዴ ይመለሳል: እና የ ግል ዳታ በሙሉ "
358"የተሳሳተ የማለፊያ ሐረግ ካስገቡ የ እርስዎ ስልክ ወደ ነበረበት ወደ ፋክቶሪው ዘዴ ይመለሳል: እና የ ግል ዳታ በሙሉ "
352"ይጠፋል"
359"ይጠፋል"
353
360
354−#: qml/Shell.qml:368
361+#: qml/Shell.qml:395
355msgid ""
362msgid ""
356"If passcode is entered incorrectly, your phone will conduct a factory reset "
363"If passcode is entered incorrectly, your phone will conduct a factory reset "
357"and all personal data will be deleted."
364"and all personal data will be deleted."
@@ -359,5 +366,8 @@ msgstr ""
359"የተሳሳተ የማለፊያ ኮድ ካስገቡ የ እርስዎ ስልክ ወደ ነበረበት ወደ ፋክቶሪው ዘዴ ይመለሳል: እና የ ግል ዳታ በሙሉ "
366"የተሳሳተ የማለፊያ ኮድ ካስገቡ የ እርስዎ ስልክ ወደ ነበረበት ወደ ፋክቶሪው ዘዴ ይመለሳል: እና የ ግል ዳታ በሙሉ "
360"ይጠፋል"
367"ይጠፋል"
361
368
362−#~ msgid "Manage Dash"
369+#~ msgid "Sorry, incorrect PIN"
363−#~ msgstr "የ ዳሽ አስተዳዳሪ"
370+#~ msgstr "አዝናለሁ የተሳሳተ ፒን"
371+
372+#~ msgid "Enter SIM PIN"
373+#~ msgstr "ሲም ፒን ያስገቡ"
po/ar.po+57−49
@@ -7,14 +7,16 @@ msgid ""
7msgstr ""
7msgstr ""
8"Project-Id-Version: unity\n"
8"Project-Id-Version: unity\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2014-09-24 10:43+0100\n"
10+"POT-Creation-Date: 2014-10-07 11:37+0300\n"
11"PO-Revision-Date: 2014-05-22 08:22+0000\n"
11"PO-Revision-Date: 2014-05-22 08:22+0000\n"
12"Last-Translator: Ibrahim Saed <ibraheem5000@gmail.com>\n"
12"Last-Translator: Ibrahim Saed <ibraheem5000@gmail.com>\n"
13"Language-Team: Arabic <ar@li.org>\n"
13"Language-Team: Arabic <ar@li.org>\n"
14"MIME-Version: 1.0\n"
14"MIME-Version: 1.0\n"
15"Content-Type: text/plain; charset=UTF-8\n"
15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n"
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"
17−"X-Launchpad-Export-Date: 2014-09-29 05:19+0000\n"
19+"X-Launchpad-Export-Date: 2014-10-09 06:36+0000\n"
18"X-Generator: Launchpad (build 17196)\n"
20"X-Generator: Launchpad (build 17196)\n"
19
21
20#: plugins/LightDM/Greeter.cpp:130
22#: plugins/LightDM/Greeter.cpp:130
@@ -30,6 +32,25 @@ msgstr ""
30msgid "Unpin shortcut"
32msgid "Unpin shortcut"
31msgstr ""
33msgstr ""
32
34
35+#: qml/Components/DelayedLockscreen.qml:47
36+msgid "Device Locked"
37+msgstr ""
38+
39+#: qml/Components/DelayedLockscreen.qml:62
40+msgid "You have been locked out due to too many failed passphrase attempts."
41+msgstr ""
42+
43+#: qml/Components/DelayedLockscreen.qml:63
44+msgid "You have been locked out due to too many failed passcode attempts."
45+msgstr ""
46+
47+#: qml/Components/DelayedLockscreen.qml:72
48+#, qt-format
49+msgid "Please wait %1 minute and then try again…"
50+msgid_plural "Please wait %1 minutes and then try again…"
51+msgstr[0] ""
52+msgstr[1] ""
53+
33#: qml/Components/Dialogs.qml:70
54#: qml/Components/Dialogs.qml:70
34msgid "Log out"
55msgid "Log out"
35msgstr ""
56msgstr ""
@@ -135,40 +156,23 @@ msgstr ""
135"أنت الآن بارع في إيماءات الحواف ويمكنك البدء باستخدام هاتفك<br><br>انقر على "
156"أنت الآن بارع في إيماءات الحواف ويمكنك البدء باستخدام هاتفك<br><br>انقر على "
136"الشاشة للبدء"
157"الشاشة للبدء"
137
158
138−#: qml/Components/Lockscreen.qml:167
159+#: qml/Components/Lockscreen.qml:220
139−msgid "Please wait"
140−msgstr ""
141−
142−#: qml/Components/Lockscreen.qml:172
143−msgid "Too many incorrect attempts"
144−msgstr ""
145−
146−#: qml/Components/Lockscreen.qml:206
147msgid "Emergency Call"
160msgid "Emergency Call"
148msgstr "مكالمة طوارئ"
161msgstr "مكالمة طوارئ"
149
162
150−#: qml/Components/Lockscreen.qml:226
163+#: qml/Components/Lockscreen.qml:252
151msgid "OK"
164msgid "OK"
152msgstr ""
165msgstr ""
153
166
154−#: qml/Components/PassphraseLockscreen.qml:61
155−#, qt-format
156−msgid "Hello %1"
157−msgstr "مرحبا %1"
158−
159−#: qml/Components/PassphraseLockscreen.qml:61
160−msgid "Hello"
161−msgstr "مرحبًا"
162−
163−#: qml/Dash/GenericScopeView.qml:411 qml/Dash/GenericScopeView.qml:533
167+#: qml/Dash/GenericScopeView.qml:434 qml/Dash/GenericScopeView.qml:591
164msgid "See less"
168msgid "See less"
165msgstr "شاهد أقل"
169msgstr "شاهد أقل"
166
170
167−#: qml/Dash/GenericScopeView.qml:411
171+#: qml/Dash/GenericScopeView.qml:434
168msgid "See all"
172msgid "See all"
169msgstr ""
173msgstr ""
170
174
171−#: qml/Dash/GenericScopeView.qml:473 qml/Dash/PageHeader.qml:258
175+#: qml/Dash/GenericScopeView.qml:496 qml/Dash/PageHeader.qml:258
172#: qml/Panel/SearchIndicator.qml:27
176#: qml/Panel/SearchIndicator.qml:27
173msgid "Search"
177msgid "Search"
174msgstr "ابحث"
178msgstr "ابحث"
@@ -205,6 +209,14 @@ msgstr "أضف تعليق"
205msgid "Send"
209msgid "Send"
206msgstr "أرسل"
210msgstr "أرسل"
207
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+
208#: qml/Dash/ScopesOverview.qml:206
220#: qml/Dash/ScopesOverview.qml:206
209msgid "Manage Scopes"
221msgid "Manage Scopes"
210msgstr ""
222msgstr ""
@@ -226,8 +238,8 @@ msgid "All"
226msgstr ""
238msgstr ""
227
239
228#: qml/Greeter/Greeter.qml:157
240#: qml/Greeter/Greeter.qml:157
229−msgid "Swipe to unlock"
241+msgid "Unlock"
230−msgstr "اسحب لفتح القفل"
242+msgstr ""
231
243
232#: qml/Hud/HudParametrizedActionsPage.qml:139
244#: qml/Hud/HudParametrizedActionsPage.qml:139
233msgid "Confirm"
245msgid "Confirm"
@@ -249,18 +261,10 @@ msgstr "تكلم الآن..."
249msgid "Speaking..."
261msgid "Speaking..."
250msgstr "تتكلم الآن..."
262msgstr "تتكلم الآن..."
251
263
252−#: qml/Notifications/NotificationMenuItemFactory.qml:108
264+#: qml/Notifications/NotificationMenuItemFactory.qml:116
253msgid "Show password"
265msgid "Show password"
254msgstr "عرض كلمة السر"
266msgstr "عرض كلمة السر"
255
267
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
268#: qml/Panel/ActiveCallHint.qml:77
265msgid "Tap to return to call..."
269msgid "Tap to return to call..."
266msgstr ""
270msgstr ""
@@ -305,51 +309,55 @@ msgstr ""
305msgid "Roaming"
309msgid "Roaming"
306msgstr ""
310msgstr ""
307
311
308−#: qml/Shell.qml:320
312+#: qml/Shell.qml:346
309−msgid "Enter your passphrase"
313+msgid "Enter passphrase"
310msgstr ""
314msgstr ""
311
315
312−#: qml/Shell.qml:321
316+#: qml/Shell.qml:347
313msgid "Sorry, incorrect passphrase"
317msgid "Sorry, incorrect passphrase"
314msgstr ""
318msgstr ""
315
319
316−#: qml/Shell.qml:323
320+#: qml/Shell.qml:348
321+msgid "Please re-enter"
322+msgstr ""
323+
324+#: qml/Shell.qml:350
317−msgid "Enter your passcode"
325+msgid "Enter passcode"
318msgstr ""
326msgstr ""
319
327
320−#: qml/Shell.qml:324
328+#: qml/Shell.qml:351
321msgid "Sorry, incorrect passcode"
329msgid "Sorry, incorrect passcode"
322msgstr ""
330msgstr ""
323
331
324−#: qml/Shell.qml:327
332+#: qml/Shell.qml:354
325#, qt-format
333#, qt-format
326−msgid "Enter your %1"
334+msgid "Enter %1"
327msgstr ""
335msgstr ""
328
336
329−#: qml/Shell.qml:328
337+#: qml/Shell.qml:355
330#, qt-format
338#, qt-format
331msgid "Sorry, incorrect %1"
339msgid "Sorry, incorrect %1"
332msgstr ""
340msgstr ""
333
341
334−#: qml/Shell.qml:363
342+#: qml/Shell.qml:390
335msgid "Sorry, incorrect passphrase."
343msgid "Sorry, incorrect passphrase."
336msgstr ""
344msgstr ""
337
345
338−#: qml/Shell.qml:364
346+#: qml/Shell.qml:391
339msgid "Sorry, incorrect passcode."
347msgid "Sorry, incorrect passcode."
340msgstr ""
348msgstr ""
341
349
342−#: qml/Shell.qml:365
350+#: qml/Shell.qml:392
343msgid "This will be your last attempt."
351msgid "This will be your last attempt."
344msgstr ""
352msgstr ""
345
353
346−#: qml/Shell.qml:367
354+#: qml/Shell.qml:394
347msgid ""
355msgid ""
348"If passphrase is entered incorrectly, your phone will conduct a factory "
356"If passphrase is entered incorrectly, your phone will conduct a factory "
349"reset and all personal data will be deleted."
357"reset and all personal data will be deleted."
350msgstr ""
358msgstr ""
351
359
352−#: qml/Shell.qml:368
360+#: qml/Shell.qml:395
353msgid ""
361msgid ""
354"If passcode is entered incorrectly, your phone will conduct a factory reset "
362"If passcode is entered incorrectly, your phone will conduct a factory reset "
355"and all personal data will be deleted."
363"and all personal data will be deleted."
po/ast.po+66−56
@@ -7,14 +7,15 @@ msgid ""
7msgstr ""
7msgstr ""
8"Project-Id-Version: unity8\n"
8"Project-Id-Version: unity8\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2014-09-24 10:43+0100\n"
10+"POT-Creation-Date: 2014-10-07 11:37+0300\n"
11−"PO-Revision-Date: 2014-09-28 09:02+0000\n"
11+"PO-Revision-Date: 2014-10-03 22:20+0000\n"
12−"Last-Translator: ivarela <ivarela@ubuntu.com>\n"
12+"Last-Translator: Xuacu Saturio <xuacusk8@gmail.com>\n"
13"Language-Team: Asturian <ast@li.org>\n"
13"Language-Team: Asturian <ast@li.org>\n"
14"MIME-Version: 1.0\n"
14"MIME-Version: 1.0\n"
15"Content-Type: text/plain; charset=UTF-8\n"
15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n"
16"Content-Transfer-Encoding: 8bit\n"
17+"Plural-Forms: nplurals=2; plural=n != 1;\n"
17−"X-Launchpad-Export-Date: 2014-09-29 05:19+0000\n"
18+"X-Launchpad-Export-Date: 2014-10-09 06:36+0000\n"
18"X-Generator: Launchpad (build 17196)\n"
19"X-Generator: Launchpad (build 17196)\n"
19
20
20#: plugins/LightDM/Greeter.cpp:130
21#: plugins/LightDM/Greeter.cpp:130
@@ -30,6 +31,25 @@ msgstr "Anclar"
30msgid "Unpin shortcut"
31msgid "Unpin shortcut"
31msgstr "Desanclar"
32msgstr "Desanclar"
32
33
34+#: qml/Components/DelayedLockscreen.qml:47
35+msgid "Device Locked"
36+msgstr "Preséu bloquiáu"
37+
38+#: qml/Components/DelayedLockscreen.qml:62
39+msgid "You have been locked out due to too many failed passphrase attempts."
40+msgstr ""
41+
42+#: qml/Components/DelayedLockscreen.qml:63
43+msgid "You have been locked out due to too many failed passcode attempts."
44+msgstr ""
45+
46+#: qml/Components/DelayedLockscreen.qml:72
47+#, qt-format
48+msgid "Please wait %1 minute and then try again…"
49+msgid_plural "Please wait %1 minutes and then try again…"
50+msgstr[0] "Espera %1 minutu y vuelvi a intentalo…"
51+msgstr[1] "Espera %1 minutos y vuelvi a intentalo…"
52+
33#: qml/Components/Dialogs.qml:70
53#: qml/Components/Dialogs.qml:70
34msgid "Log out"
54msgid "Log out"
35msgstr "Zarrar sesión"
55msgstr "Zarrar sesión"
@@ -138,40 +158,23 @@ msgstr ""
138"Agora yá domines los xestos de los berbesos y pues entamar a usar el "
158"Agora yá domines los xestos de los berbesos y pues entamar a usar el "
139"teléfonu<br><br>Toca la pantalla pa comenzar"
159"teléfonu<br><br>Toca la pantalla pa comenzar"
140
160
141−#: qml/Components/Lockscreen.qml:167
161+#: qml/Components/Lockscreen.qml:220
142−msgid "Please wait"
143−msgstr "Espera un segundu"
144−
145−#: qml/Components/Lockscreen.qml:172
146−msgid "Too many incorrect attempts"
147−msgstr "Munchos intentos incorreutos"
148−
149−#: qml/Components/Lockscreen.qml:206
150msgid "Emergency Call"
162msgid "Emergency Call"
151msgstr "Llamada d'emerxencia"
163msgstr "Llamada d'emerxencia"
152
164
153−#: qml/Components/Lockscreen.qml:226
165+#: qml/Components/Lockscreen.qml:252
154msgid "OK"
166msgid "OK"
155msgstr "Aceutar"
167msgstr "Aceutar"
156
168
157−#: qml/Components/PassphraseLockscreen.qml:61
158−#, qt-format
159−msgid "Hello %1"
160−msgstr "Hola %1"
161−
162−#: qml/Components/PassphraseLockscreen.qml:61
163−msgid "Hello"
164−msgstr "Hola"
165−
166−#: qml/Dash/GenericScopeView.qml:411 qml/Dash/GenericScopeView.qml:533
169+#: qml/Dash/GenericScopeView.qml:434 qml/Dash/GenericScopeView.qml:591
167msgid "See less"
170msgid "See less"
168msgstr "Ver menos"
171msgstr "Ver menos"
169
172
170−#: qml/Dash/GenericScopeView.qml:411
173+#: qml/Dash/GenericScopeView.qml:434
171msgid "See all"
174msgid "See all"
172msgstr "Ver too"
175msgstr "Ver too"
173
176
174−#: qml/Dash/GenericScopeView.qml:473 qml/Dash/PageHeader.qml:258
177+#: qml/Dash/GenericScopeView.qml:496 qml/Dash/PageHeader.qml:258
175#: qml/Panel/SearchIndicator.qml:27
178#: qml/Panel/SearchIndicator.qml:27
176msgid "Search"
179msgid "Search"
177msgstr "Guetar"
180msgstr "Guetar"
@@ -208,6 +211,14 @@ msgstr "Amestar una reseña"
208msgid "Send"
211msgid "Send"
209msgstr "Unviar"
212msgstr "Unviar"
210
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+
211#: qml/Dash/ScopesOverview.qml:206
222#: qml/Dash/ScopesOverview.qml:206
212msgid "Manage Scopes"
223msgid "Manage Scopes"
213msgstr "Xestionar ámbitos"
224msgstr "Xestionar ámbitos"
@@ -229,8 +240,8 @@ msgid "All"
229msgstr "Too"
240msgstr "Too"
230
241
231#: qml/Greeter/Greeter.qml:157
242#: qml/Greeter/Greeter.qml:157
232−msgid "Swipe to unlock"
243+msgid "Unlock"
233−msgstr "Esliza pa desbloquiar"
244+msgstr "Desbloquiar"
234
245
235#: qml/Hud/HudParametrizedActionsPage.qml:139
246#: qml/Hud/HudParametrizedActionsPage.qml:139
236msgid "Confirm"
247msgid "Confirm"
@@ -252,18 +263,10 @@ msgstr "Fala agora…"
252msgid "Speaking..."
263msgid "Speaking..."
253msgstr "Falando…"
264msgstr "Falando…"
254
265
255−#: qml/Notifications/NotificationMenuItemFactory.qml:108
266+#: qml/Notifications/NotificationMenuItemFactory.qml:116
256msgid "Show password"
267msgid "Show password"
257msgstr "Amosar contraseña"
268msgstr "Amosar contraseña"
258
269
259−#: qml/Notifications/NotificationMenuItemFactory.qml:124
260−msgid "Enter SIM PIN"
261−msgstr "Escribi'l PIN de la SIM"
262−
263−#: qml/Notifications/NotificationMenuItemFactory.qml:125
264−msgid "Sorry, incorrect PIN"
265−msgstr "PIN incorreutu"
266−
267#: qml/Panel/ActiveCallHint.qml:77
270#: qml/Panel/ActiveCallHint.qml:77
268msgid "Tap to return to call..."
271msgid "Tap to return to call..."
269msgstr "Tocar pa tornar a la llamada..."
272msgstr "Tocar pa tornar a la llamada..."
@@ -308,45 +311,49 @@ msgstr "Desbloquiar SIM"
308msgid "Roaming"
311msgid "Roaming"
309msgstr "Roaming"
312msgstr "Roaming"
310
313
311−#: qml/Shell.qml:320
314+#: qml/Shell.qml:346
312−msgid "Enter your passphrase"
315+msgid "Enter passphrase"
313−msgstr "Introduz contraseña"
316+msgstr ""
314
317
315−#: qml/Shell.qml:321
318+#: qml/Shell.qml:347
316msgid "Sorry, incorrect passphrase"
319msgid "Sorry, incorrect passphrase"
317msgstr "Sentímoslo, contraseña incorreuta"
320msgstr "Sentímoslo, contraseña incorreuta"
318
321
319−#: qml/Shell.qml:323
322+#: qml/Shell.qml:348
320−msgid "Enter your passcode"
323+msgid "Please re-enter"
321−msgstr "Introduz códigu de pasu"
324+msgstr "Vuelvi a escribila"
322
325
323−#: qml/Shell.qml:324
326+#: qml/Shell.qml:350
327+msgid "Enter passcode"
328+msgstr ""
329+
330+#: qml/Shell.qml:351
324msgid "Sorry, incorrect passcode"
331msgid "Sorry, incorrect passcode"
325msgstr "Sentímoslo, códigu de pasu incorreutu"
332msgstr "Sentímoslo, códigu de pasu incorreutu"
326
333
327−#: qml/Shell.qml:327
334+#: qml/Shell.qml:354
328#, qt-format
335#, qt-format
329−msgid "Enter your %1"
336+msgid "Enter %1"
330−msgstr "Introduz %1"
337+msgstr "Escribi %1"
331
338
332−#: qml/Shell.qml:328
339+#: qml/Shell.qml:355
333#, qt-format
340#, qt-format
334msgid "Sorry, incorrect %1"
341msgid "Sorry, incorrect %1"
335msgstr "Sentímoslo, %1 incorreutu"
342msgstr "Sentímoslo, %1 incorreutu"
336
343
337−#: qml/Shell.qml:363
344+#: qml/Shell.qml:390
338msgid "Sorry, incorrect passphrase."
345msgid "Sorry, incorrect passphrase."
339msgstr "Fras de pasu incorreuta"
346msgstr "Fras de pasu incorreuta"
340
347
341−#: qml/Shell.qml:364
348+#: qml/Shell.qml:391
342msgid "Sorry, incorrect passcode."
349msgid "Sorry, incorrect passcode."
343msgstr "Códigu de pasu incorreutu"
350msgstr "Códigu de pasu incorreutu"
344
351
345−#: qml/Shell.qml:365
352+#: qml/Shell.qml:392
346msgid "This will be your last attempt."
353msgid "This will be your last attempt."
347msgstr "Esti ye'l caberu intentu."
354msgstr "Esti ye'l caberu intentu."
348
355
349−#: qml/Shell.qml:367
356+#: qml/Shell.qml:394
350msgid ""
357msgid ""
351"If passphrase is entered incorrectly, your phone will conduct a factory "
358"If passphrase is entered incorrectly, your phone will conduct a factory "
352"reset and all personal data will be deleted."
359"reset and all personal data will be deleted."
@@ -354,7 +361,7 @@ msgstr ""
354"Si s'inxerta la fras incorreutamente, el teléfonu va volver a la "
361"Si s'inxerta la fras incorreutamente, el teléfonu va volver a la "
355"configuración de fábrica y van perdese tolos datos personales."
362"configuración de fábrica y van perdese tolos datos personales."
356
363
357−#: qml/Shell.qml:368
364+#: qml/Shell.qml:395
358msgid ""
365msgid ""
359"If passcode is entered incorrectly, your phone will conduct a factory reset "
366"If passcode is entered incorrectly, your phone will conduct a factory reset "
360"and all personal data will be deleted."
367"and all personal data will be deleted."
@@ -362,5 +369,8 @@ msgstr ""
362"Si s'inxerta'l códigu incorreutamente, el teléfonu va volver a la "
369"Si s'inxerta'l códigu incorreutamente, el teléfonu va volver a la "
363"configuración de fábrica y van perdese tolos datos personales."
370"configuración de fábrica y van perdese tolos datos personales."
364
371
365−#~ msgid "Manage Dash"
372+#~ msgid "Sorry, incorrect PIN"
366−#~ msgstr "Xestionar tableru"
373+#~ msgstr "PIN incorreutu"
374+
375+#~ msgid "Enter SIM PIN"
376+#~ msgstr "Escribi'l PIN de la SIM"
po/az.po+64−51
@@ -7,14 +7,15 @@ msgid ""
7msgstr ""
7msgstr ""
8"Project-Id-Version: unity\n"
8"Project-Id-Version: unity\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2014-09-24 10:43+0100\n"
10+"POT-Creation-Date: 2014-10-07 11:37+0300\n"
11"PO-Revision-Date: 2014-09-03 16:39+0000\n"
11"PO-Revision-Date: 2014-09-03 16:39+0000\n"
12"Last-Translator: Nicat Məmmədov <n1c4t97@gmail.com>\n"
12"Last-Translator: Nicat Məmmədov <n1c4t97@gmail.com>\n"
13"Language-Team: Azerbaijani <az@li.org>\n"
13"Language-Team: Azerbaijani <az@li.org>\n"
14"MIME-Version: 1.0\n"
14"MIME-Version: 1.0\n"
15"Content-Type: text/plain; charset=UTF-8\n"
15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n"
16"Content-Transfer-Encoding: 8bit\n"
17+"Plural-Forms: nplurals=2; plural=n != 1;\n"
17−"X-Launchpad-Export-Date: 2014-09-29 05:19+0000\n"
18+"X-Launchpad-Export-Date: 2014-10-09 06:36+0000\n"
18"X-Generator: Launchpad (build 17196)\n"
19"X-Generator: Launchpad (build 17196)\n"
19
20
20#: plugins/LightDM/Greeter.cpp:130
21#: plugins/LightDM/Greeter.cpp:130
@@ -30,6 +31,25 @@ msgstr "Pin qısayolu"
30msgid "Unpin shortcut"
31msgid "Unpin shortcut"
31msgstr "Açma qısayolu"
32msgstr "Açma qısayolu"
32
33
34+#: qml/Components/DelayedLockscreen.qml:47
35+msgid "Device Locked"
36+msgstr ""
37+
38+#: qml/Components/DelayedLockscreen.qml:62
39+msgid "You have been locked out due to too many failed passphrase attempts."
40+msgstr ""
41+
42+#: qml/Components/DelayedLockscreen.qml:63
43+msgid "You have been locked out due to too many failed passcode attempts."
44+msgstr ""
45+
46+#: qml/Components/DelayedLockscreen.qml:72
47+#, qt-format
48+msgid "Please wait %1 minute and then try again…"
49+msgid_plural "Please wait %1 minutes and then try again…"
50+msgstr[0] ""
51+msgstr[1] ""
52+
33#: qml/Components/Dialogs.qml:70
53#: qml/Components/Dialogs.qml:70
34msgid "Log out"
54msgid "Log out"
35msgstr "Çıxış"
55msgstr "Çıxış"
@@ -135,40 +155,23 @@ msgstr ""
135"Siz künc hәrәkәtlәrini öyrәndiniz və telefonu istifadə etməyə başlaya "
155"Siz künc hәrәkәtlәrini öyrәndiniz və telefonu istifadə etməyə başlaya "
136"bilərsiniz.<br><br>Başlamaq üçün ekrana toxunun"
156"bilərsiniz.<br><br>Başlamaq üçün ekrana toxunun"
137
157
138−#: qml/Components/Lockscreen.qml:167
158+#: qml/Components/Lockscreen.qml:220
139−msgid "Please wait"
140−msgstr "Xahiş edirik gözləyin"
141−
142−#: qml/Components/Lockscreen.qml:172
143−msgid "Too many incorrect attempts"
144−msgstr "Çoxlu yanlış cəhdlәr"
145−
146−#: qml/Components/Lockscreen.qml:206
147msgid "Emergency Call"
159msgid "Emergency Call"
148msgstr "Zərurət zəngi"
160msgstr "Zərurət zəngi"
149
161
150−#: qml/Components/Lockscreen.qml:226
162+#: qml/Components/Lockscreen.qml:252
151msgid "OK"
163msgid "OK"
152msgstr "Oldu"
164msgstr "Oldu"
153
165
154−#: qml/Components/PassphraseLockscreen.qml:61
155−#, qt-format
156−msgid "Hello %1"
157−msgstr "Salam %1"
158−
159−#: qml/Components/PassphraseLockscreen.qml:61
160−msgid "Hello"
161−msgstr "Salam"
162−
163−#: qml/Dash/GenericScopeView.qml:411 qml/Dash/GenericScopeView.qml:533
166+#: qml/Dash/GenericScopeView.qml:434 qml/Dash/GenericScopeView.qml:591
164msgid "See less"
167msgid "See less"
165msgstr "Daha azını gör"
168msgstr "Daha azını gör"
166
169
167−#: qml/Dash/GenericScopeView.qml:411
170+#: qml/Dash/GenericScopeView.qml:434
168msgid "See all"
171msgid "See all"
169msgstr "Hamısını gör"
172msgstr "Hamısını gör"
170
173
171−#: qml/Dash/GenericScopeView.qml:473 qml/Dash/PageHeader.qml:258
174+#: qml/Dash/GenericScopeView.qml:496 qml/Dash/PageHeader.qml:258
172#: qml/Panel/SearchIndicator.qml:27
175#: qml/Panel/SearchIndicator.qml:27
173msgid "Search"
176msgid "Search"
174msgstr "Axtar"
177msgstr "Axtar"
@@ -205,6 +208,14 @@ msgstr "Rəy yaz"
205msgid "Send"
208msgid "Send"
206msgstr "Göndər"
209msgstr "Göndər"
207
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+
208#: qml/Dash/ScopesOverview.qml:206
219#: qml/Dash/ScopesOverview.qml:206
209msgid "Manage Scopes"
220msgid "Manage Scopes"
210msgstr ""
221msgstr ""
@@ -226,8 +237,8 @@ msgid "All"
226msgstr "Hamısı"
237msgstr "Hamısı"
227
238
228#: qml/Greeter/Greeter.qml:157
239#: qml/Greeter/Greeter.qml:157
229−msgid "Swipe to unlock"
240+msgid "Unlock"
230−msgstr "Kilidi açmaq üçün sürüşdürün"
241+msgstr ""
231
242
232#: qml/Hud/HudParametrizedActionsPage.qml:139
243#: qml/Hud/HudParametrizedActionsPage.qml:139
233msgid "Confirm"
244msgid "Confirm"
@@ -249,18 +260,10 @@ msgstr "Danışın..."
249msgid "Speaking..."
260msgid "Speaking..."
250msgstr "Danışır..."
261msgstr "Danışır..."
251
262
252−#: qml/Notifications/NotificationMenuItemFactory.qml:108
263+#: qml/Notifications/NotificationMenuItemFactory.qml:116
253msgid "Show password"
264msgid "Show password"
254msgstr "Şifrәni göstәr"
265msgstr "Şifrәni göstәr"
255
266
256−#: qml/Notifications/NotificationMenuItemFactory.qml:124
257−msgid "Enter SIM PIN"
258−msgstr "SIM PIN kodunuzu daxil edin"
259−
260−#: qml/Notifications/NotificationMenuItemFactory.qml:125
261−msgid "Sorry, incorrect PIN"
262−msgstr "Bağışlayın, PIN yanlışdır"
263−
264#: qml/Panel/ActiveCallHint.qml:77
267#: qml/Panel/ActiveCallHint.qml:77
265msgid "Tap to return to call..."
268msgid "Tap to return to call..."
266msgstr "Zəngə qayıtmaq üçün toxunun..."
269msgstr "Zəngə qayıtmaq üçün toxunun..."
@@ -305,45 +308,49 @@ msgstr "SIM kilidini aç"
305msgid "Roaming"
308msgid "Roaming"
306msgstr "Rominq"
309msgstr "Rominq"
307
310
308−#: qml/Shell.qml:320
311+#: qml/Shell.qml:346
309−msgid "Enter your passphrase"
312+msgid "Enter passphrase"
310−msgstr "Açar sözünüzü daxil edin"
313+msgstr ""
311
314
312−#: qml/Shell.qml:321
315+#: qml/Shell.qml:347
313msgid "Sorry, incorrect passphrase"
316msgid "Sorry, incorrect passphrase"
314msgstr "Bağışlayın, açar söz yanlışdır"
317msgstr "Bağışlayın, açar söz yanlışdır"
315
318
316−#: qml/Shell.qml:323
319+#: qml/Shell.qml:348
320+msgid "Please re-enter"
321+msgstr ""
322+
323+#: qml/Shell.qml:350
317−msgid "Enter your passcode"
324+msgid "Enter passcode"
318msgstr ""
325msgstr ""
319
326
320−#: qml/Shell.qml:324
327+#: qml/Shell.qml:351
321msgid "Sorry, incorrect passcode"
328msgid "Sorry, incorrect passcode"
322msgstr ""
329msgstr ""
323
330
324−#: qml/Shell.qml:327
331+#: qml/Shell.qml:354
325#, qt-format
332#, qt-format
326−msgid "Enter your %1"
333+msgid "Enter %1"
327−msgstr "%1 daxil edin"
334+msgstr ""
328
335
329−#: qml/Shell.qml:328
336+#: qml/Shell.qml:355
330#, qt-format
337#, qt-format
331msgid "Sorry, incorrect %1"
338msgid "Sorry, incorrect %1"
332msgstr "Bağışlayın, %1 yanlışdır"
339msgstr "Bağışlayın, %1 yanlışdır"
333
340
334−#: qml/Shell.qml:363
341+#: qml/Shell.qml:390
335msgid "Sorry, incorrect passphrase."
342msgid "Sorry, incorrect passphrase."
336msgstr "Bağışlayın, açar söz yanlışdır."
343msgstr "Bağışlayın, açar söz yanlışdır."
337
344
338−#: qml/Shell.qml:364
345+#: qml/Shell.qml:391
339msgid "Sorry, incorrect passcode."
346msgid "Sorry, incorrect passcode."
340msgstr "Təəssüf ki, açar kod yanlışdır."
347msgstr "Təəssüf ki, açar kod yanlışdır."
341
348
342−#: qml/Shell.qml:365
349+#: qml/Shell.qml:392
343msgid "This will be your last attempt."
350msgid "This will be your last attempt."
344msgstr "Bu sizin son cəhdiniz olacaq."
351msgstr "Bu sizin son cəhdiniz olacaq."
345
352
346−#: qml/Shell.qml:367
353+#: qml/Shell.qml:394
347msgid ""
354msgid ""
348"If passphrase is entered incorrectly, your phone will conduct a factory "
355"If passphrase is entered incorrectly, your phone will conduct a factory "
349"reset and all personal data will be deleted."
356"reset and all personal data will be deleted."
@@ -351,10 +358,16 @@ msgstr ""
351"Əgər açar söz yanlış daxil edilibsə, onda telefonunuz fabrika parametrlərinə "
358"Əgər açar söz yanlış daxil edilibsə, onda telefonunuz fabrika parametrlərinə "
352"geri qayıdacaq və bütün şəxsi məlumatlarınız silinəcək."
359"geri qayıdacaq və bütün şəxsi məlumatlarınız silinəcək."
353
360
354−#: qml/Shell.qml:368
361+#: qml/Shell.qml:395
355msgid ""
362msgid ""
356"If passcode is entered incorrectly, your phone will conduct a factory reset "
363"If passcode is entered incorrectly, your phone will conduct a factory reset "
357"and all personal data will be deleted."
364"and all personal data will be deleted."
358msgstr ""
365msgstr ""
359"Əgər açar kod yanlış daxil edilibsə, onda telefonunuz fabrika parametrlərinə "
366"Əgər açar kod yanlış daxil edilibsə, onda telefonunuz fabrika parametrlərinə "
360"geri qayıdacaq və bütün şəxsi məlumatlarınız silinəcək."
367"geri qayıdacaq və bütün şəxsi məlumatlarınız silinəcək."
368+
369+#~ msgid "Enter SIM PIN"
370+#~ msgstr "SIM PIN kodunuzu daxil edin"
371+
372+#~ msgid "Sorry, incorrect PIN"
373+#~ msgstr "Bağışlayın, PIN yanlışdır"
po/be.po+56−48
@@ -7,14 +7,16 @@ msgid ""
7msgstr ""
7msgstr ""
8"Project-Id-Version: unity8\n"
8"Project-Id-Version: unity8\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2014-09-24 10:43+0100\n"
10+"POT-Creation-Date: 2014-10-07 11:37+0300\n"
11"PO-Revision-Date: 2014-09-24 17:12+0000\n"
11"PO-Revision-Date: 2014-09-24 17:12+0000\n"
12"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
12"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
13"Language-Team: Belarusian <be@li.org>\n"
13"Language-Team: Belarusian <be@li.org>\n"
14"MIME-Version: 1.0\n"
14"MIME-Version: 1.0\n"
15"Content-Type: text/plain; charset=UTF-8\n"
15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n"
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"
17−"X-Launchpad-Export-Date: 2014-09-29 05:19+0000\n"
19+"X-Launchpad-Export-Date: 2014-10-09 06:36+0000\n"
18"X-Generator: Launchpad (build 17196)\n"
20"X-Generator: Launchpad (build 17196)\n"
19
21
20#: plugins/LightDM/Greeter.cpp:130
22#: plugins/LightDM/Greeter.cpp:130
@@ -30,6 +32,25 @@ msgstr ""
30msgid "Unpin shortcut"
32msgid "Unpin shortcut"
31msgstr ""
33msgstr ""
32
34
35+#: qml/Components/DelayedLockscreen.qml:47
36+msgid "Device Locked"
37+msgstr ""
38+
39+#: qml/Components/DelayedLockscreen.qml:62
40+msgid "You have been locked out due to too many failed passphrase attempts."
41+msgstr ""
42+
43+#: qml/Components/DelayedLockscreen.qml:63
44+msgid "You have been locked out due to too many failed passcode attempts."
45+msgstr ""
46+
47+#: qml/Components/DelayedLockscreen.qml:72
48+#, qt-format
49+msgid "Please wait %1 minute and then try again…"
50+msgid_plural "Please wait %1 minutes and then try again…"
51+msgstr[0] ""
52+msgstr[1] ""
53+
33#: qml/Components/Dialogs.qml:70
54#: qml/Components/Dialogs.qml:70
34msgid "Log out"
55msgid "Log out"
35msgstr ""
56msgstr ""
@@ -132,40 +153,23 @@ msgid ""
132"phone<br><br>Tap on the screen to start"
153"phone<br><br>Tap on the screen to start"
133msgstr ""
154msgstr ""
134
155
135−#: qml/Components/Lockscreen.qml:167
156+#: qml/Components/Lockscreen.qml:220
136−msgid "Please wait"
137−msgstr ""
138−
139−#: qml/Components/Lockscreen.qml:172
140−msgid "Too many incorrect attempts"
141−msgstr ""
142−
143−#: qml/Components/Lockscreen.qml:206
144msgid "Emergency Call"
157msgid "Emergency Call"
145msgstr ""
158msgstr ""
146
159
147−#: qml/Components/Lockscreen.qml:226
160+#: qml/Components/Lockscreen.qml:252
148msgid "OK"
161msgid "OK"
149msgstr ""
162msgstr ""
150
163
151−#: qml/Components/PassphraseLockscreen.qml:61
152−#, qt-format
153−msgid "Hello %1"
154−msgstr ""
155−
156−#: qml/Components/PassphraseLockscreen.qml:61
157−msgid "Hello"
158−msgstr ""
159−
160−#: qml/Dash/GenericScopeView.qml:411 qml/Dash/GenericScopeView.qml:533
164+#: qml/Dash/GenericScopeView.qml:434 qml/Dash/GenericScopeView.qml:591
161msgid "See less"
165msgid "See less"
162msgstr ""
166msgstr ""
163
167
164−#: qml/Dash/GenericScopeView.qml:411
168+#: qml/Dash/GenericScopeView.qml:434
165msgid "See all"
169msgid "See all"
166msgstr ""
170msgstr ""
167
171
168−#: qml/Dash/GenericScopeView.qml:473 qml/Dash/PageHeader.qml:258
172+#: qml/Dash/GenericScopeView.qml:496 qml/Dash/PageHeader.qml:258
169#: qml/Panel/SearchIndicator.qml:27
173#: qml/Panel/SearchIndicator.qml:27
170msgid "Search"
174msgid "Search"
171msgstr ""
175msgstr ""
@@ -202,6 +206,14 @@ msgstr ""
202msgid "Send"
206msgid "Send"
203msgstr ""
207msgstr ""
204
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+
205#: qml/Dash/ScopesOverview.qml:206
217#: qml/Dash/ScopesOverview.qml:206
206msgid "Manage Scopes"
218msgid "Manage Scopes"
207msgstr ""
219msgstr ""
@@ -223,7 +235,7 @@ msgid "All"
223msgstr ""
235msgstr ""
224
236
225#: qml/Greeter/Greeter.qml:157
237#: qml/Greeter/Greeter.qml:157
226−msgid "Swipe to unlock"
238+msgid "Unlock"
227msgstr ""
239msgstr ""
228
240
229#: qml/Hud/HudParametrizedActionsPage.qml:139
241#: qml/Hud/HudParametrizedActionsPage.qml:139
@@ -246,18 +258,10 @@ msgstr ""
246msgid "Speaking..."
258msgid "Speaking..."
247msgstr ""
259msgstr ""
248
260
249−#: qml/Notifications/NotificationMenuItemFactory.qml:108
261+#: qml/Notifications/NotificationMenuItemFactory.qml:116
250msgid "Show password"
262msgid "Show password"
251msgstr ""
263msgstr ""
252
264
253−#: qml/Notifications/NotificationMenuItemFactory.qml:124
254−msgid "Enter SIM PIN"
255−msgstr ""
256−
257−#: qml/Notifications/NotificationMenuItemFactory.qml:125
258−msgid "Sorry, incorrect PIN"
259−msgstr ""
260−
261#: qml/Panel/ActiveCallHint.qml:77
265#: qml/Panel/ActiveCallHint.qml:77
262msgid "Tap to return to call..."
266msgid "Tap to return to call..."
263msgstr ""
267msgstr ""
@@ -302,51 +306,55 @@ msgstr ""
302msgid "Roaming"
306msgid "Roaming"
303msgstr ""
307msgstr ""
304
308
305−#: qml/Shell.qml:320
309+#: qml/Shell.qml:346
306−msgid "Enter your passphrase"
310+msgid "Enter passphrase"
307msgstr ""
311msgstr ""
308
312
309−#: qml/Shell.qml:321
313+#: qml/Shell.qml:347
310msgid "Sorry, incorrect passphrase"
314msgid "Sorry, incorrect passphrase"
311msgstr ""
315msgstr ""
312
316
313−#: qml/Shell.qml:323
317+#: qml/Shell.qml:348
318+msgid "Please re-enter"
319+msgstr ""
320+
321+#: qml/Shell.qml:350
314−msgid "Enter your passcode"
322+msgid "Enter passcode"
315msgstr ""
323msgstr ""
316
324
317−#: qml/Shell.qml:324
325+#: qml/Shell.qml:351
318msgid "Sorry, incorrect passcode"
326msgid "Sorry, incorrect passcode"
319msgstr ""
327msgstr ""
320
328
321−#: qml/Shell.qml:327
329+#: qml/Shell.qml:354
322#, qt-format
330#, qt-format
323−msgid "Enter your %1"
331+msgid "Enter %1"
324msgstr ""
332msgstr ""
325
333
326−#: qml/Shell.qml:328
334+#: qml/Shell.qml:355
327#, qt-format
335#, qt-format
328msgid "Sorry, incorrect %1"
336msgid "Sorry, incorrect %1"
329msgstr ""
337msgstr ""
330
338
331−#: qml/Shell.qml:363
339+#: qml/Shell.qml:390
332msgid "Sorry, incorrect passphrase."
340msgid "Sorry, incorrect passphrase."
333msgstr ""
341msgstr ""
334
342
335−#: qml/Shell.qml:364
343+#: qml/Shell.qml:391
336msgid "Sorry, incorrect passcode."
344msgid "Sorry, incorrect passcode."
337msgstr ""
345msgstr ""
338
346
339−#: qml/Shell.qml:365
347+#: qml/Shell.qml:392
340msgid "This will be your last attempt."
348msgid "This will be your last attempt."
341msgstr ""
349msgstr ""
342
350
343−#: qml/Shell.qml:367
351+#: qml/Shell.qml:394
344msgid ""
352msgid ""
345"If passphrase is entered incorrectly, your phone will conduct a factory "
353"If passphrase is entered incorrectly, your phone will conduct a factory "
346"reset and all personal data will be deleted."
354"reset and all personal data will be deleted."
347msgstr ""
355msgstr ""
348
356
349−#: qml/Shell.qml:368
357+#: qml/Shell.qml:395
350msgid ""
358msgid ""
351"If passcode is entered incorrectly, your phone will conduct a factory reset "
359"If passcode is entered incorrectly, your phone will conduct a factory reset "
352"and all personal data will be deleted."
360"and all personal data will be deleted."
po/bg.po+55−48
@@ -7,14 +7,15 @@ msgid ""
7msgstr ""
7msgstr ""
8"Project-Id-Version: unity\n"
8"Project-Id-Version: unity\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2014-09-24 10:43+0100\n"
10+"POT-Creation-Date: 2014-10-07 11:37+0300\n"
11"PO-Revision-Date: 2014-04-01 14:08+0000\n"
11"PO-Revision-Date: 2014-04-01 14:08+0000\n"
12"Last-Translator: Atanas Kovachki <Unknown>\n"
12"Last-Translator: Atanas Kovachki <Unknown>\n"
13"Language-Team: Bulgarian <bg@li.org>\n"
13"Language-Team: Bulgarian <bg@li.org>\n"
14"MIME-Version: 1.0\n"
14"MIME-Version: 1.0\n"
15"Content-Type: text/plain; charset=UTF-8\n"
15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n"
16"Content-Transfer-Encoding: 8bit\n"
17+"Plural-Forms: nplurals=2; plural=n != 1;\n"
17−"X-Launchpad-Export-Date: 2014-09-29 05:19+0000\n"
18+"X-Launchpad-Export-Date: 2014-10-09 06:36+0000\n"
18"X-Generator: Launchpad (build 17196)\n"
19"X-Generator: Launchpad (build 17196)\n"
19
20
20#: plugins/LightDM/Greeter.cpp:130
21#: plugins/LightDM/Greeter.cpp:130
@@ -30,6 +31,25 @@ msgstr ""
30msgid "Unpin shortcut"
31msgid "Unpin shortcut"
31msgstr ""
32msgstr ""
32
33
34+#: qml/Components/DelayedLockscreen.qml:47
35+msgid "Device Locked"
36+msgstr ""
37+
38+#: qml/Components/DelayedLockscreen.qml:62
39+msgid "You have been locked out due to too many failed passphrase attempts."
40+msgstr ""
41+
42+#: qml/Components/DelayedLockscreen.qml:63
43+msgid "You have been locked out due to too many failed passcode attempts."
44+msgstr ""
45+
46+#: qml/Components/DelayedLockscreen.qml:72
47+#, qt-format
48+msgid "Please wait %1 minute and then try again…"
49+msgid_plural "Please wait %1 minutes and then try again…"
50+msgstr[0] ""
51+msgstr[1] ""
52+
33#: qml/Components/Dialogs.qml:70
53#: qml/Components/Dialogs.qml:70
34msgid "Log out"
54msgid "Log out"
35msgstr ""
55msgstr ""
@@ -139,40 +159,23 @@ msgid ""
139"phone<br><br>Tap on the screen to start"
159"phone<br><br>Tap on the screen to start"
140msgstr ""
160msgstr ""
141
161
142−#: qml/Components/Lockscreen.qml:167
162+#: qml/Components/Lockscreen.qml:220
143−msgid "Please wait"
144−msgstr ""
145−
146−#: qml/Components/Lockscreen.qml:172
147−msgid "Too many incorrect attempts"
148−msgstr ""
149−
150−#: qml/Components/Lockscreen.qml:206
151msgid "Emergency Call"
163msgid "Emergency Call"
152msgstr "Спешно повикване"
164msgstr "Спешно повикване"
153
165
154−#: qml/Components/Lockscreen.qml:226
166+#: qml/Components/Lockscreen.qml:252
155msgid "OK"
167msgid "OK"
156msgstr ""
168msgstr ""
157
169
158−#: qml/Components/PassphraseLockscreen.qml:61
159−#, qt-format
160−msgid "Hello %1"
161−msgstr "Здравей, %1"
162−
163−#: qml/Components/PassphraseLockscreen.qml:61
164−msgid "Hello"
165−msgstr "Здравей"
166−
167−#: qml/Dash/GenericScopeView.qml:411 qml/Dash/GenericScopeView.qml:533
170+#: qml/Dash/GenericScopeView.qml:434 qml/Dash/GenericScopeView.qml:591
168msgid "See less"
171msgid "See less"
169msgstr ""
172msgstr ""
170
173
171−#: qml/Dash/GenericScopeView.qml:411
174+#: qml/Dash/GenericScopeView.qml:434
172msgid "See all"
175msgid "See all"
173msgstr ""
176msgstr ""
174
177
175−#: qml/Dash/GenericScopeView.qml:473 qml/Dash/PageHeader.qml:258
178+#: qml/Dash/GenericScopeView.qml:496 qml/Dash/PageHeader.qml:258
176#: qml/Panel/SearchIndicator.qml:27
179#: qml/Panel/SearchIndicator.qml:27
177msgid "Search"
180msgid "Search"
178msgstr "Търсене"
181msgstr "Търсене"
@@ -209,6 +212,14 @@ msgstr "Добави отзив"
209msgid "Send"
212msgid "Send"
210msgstr "Изпрати"
213msgstr "Изпрати"
211
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+
212#: qml/Dash/ScopesOverview.qml:206
223#: qml/Dash/ScopesOverview.qml:206
213msgid "Manage Scopes"
224msgid "Manage Scopes"
214msgstr ""
225msgstr ""
@@ -230,7 +241,7 @@ msgid "All"
230msgstr ""
241msgstr ""
231
242
232#: qml/Greeter/Greeter.qml:157
243#: qml/Greeter/Greeter.qml:157
233−msgid "Swipe to unlock"
244+msgid "Unlock"
234msgstr ""
245msgstr ""
235
246
236#: qml/Hud/HudParametrizedActionsPage.qml:139
247#: qml/Hud/HudParametrizedActionsPage.qml:139
@@ -253,18 +264,10 @@ msgstr "Говорете сега..."
253msgid "Speaking..."
264msgid "Speaking..."
254msgstr "Говорете..."
265msgstr "Говорете..."
255
266
256−#: qml/Notifications/NotificationMenuItemFactory.qml:108
267+#: qml/Notifications/NotificationMenuItemFactory.qml:116
257msgid "Show password"
268msgid "Show password"
258msgstr "Покажи паролата"
269msgstr "Покажи паролата"
259
270
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
271#: qml/Panel/ActiveCallHint.qml:77
269msgid "Tap to return to call..."
272msgid "Tap to return to call..."
270msgstr ""
273msgstr ""
@@ -309,51 +312,55 @@ msgstr ""
309msgid "Roaming"
312msgid "Roaming"
310msgstr ""
313msgstr ""
311
314
312−#: qml/Shell.qml:320
315+#: qml/Shell.qml:346
313−msgid "Enter your passphrase"
316+msgid "Enter passphrase"
314msgstr ""
317msgstr ""
315
318
316−#: qml/Shell.qml:321
319+#: qml/Shell.qml:347
317msgid "Sorry, incorrect passphrase"
320msgid "Sorry, incorrect passphrase"
318msgstr ""
321msgstr ""
319
322
320−#: qml/Shell.qml:323
323+#: qml/Shell.qml:348
324+msgid "Please re-enter"
325+msgstr ""
326+
327+#: qml/Shell.qml:350
321−msgid "Enter your passcode"
328+msgid "Enter passcode"
322msgstr ""
329msgstr ""
323
330
324−#: qml/Shell.qml:324
331+#: qml/Shell.qml:351
325msgid "Sorry, incorrect passcode"
332msgid "Sorry, incorrect passcode"
326msgstr ""
333msgstr ""
327
334
328−#: qml/Shell.qml:327
335+#: qml/Shell.qml:354
329#, qt-format
336#, qt-format
330−msgid "Enter your %1"
337+msgid "Enter %1"
331msgstr ""
338msgstr ""
332
339
333−#: qml/Shell.qml:328
340+#: qml/Shell.qml:355
334#, qt-format
341#, qt-format
335msgid "Sorry, incorrect %1"
342msgid "Sorry, incorrect %1"
336msgstr ""
343msgstr ""
337
344
338−#: qml/Shell.qml:363
345+#: qml/Shell.qml:390
339msgid "Sorry, incorrect passphrase."
346msgid "Sorry, incorrect passphrase."
340msgstr ""
347msgstr ""
341
348
342−#: qml/Shell.qml:364
349+#: qml/Shell.qml:391
343msgid "Sorry, incorrect passcode."
350msgid "Sorry, incorrect passcode."
344msgstr ""
351msgstr ""
345
352
346−#: qml/Shell.qml:365
353+#: qml/Shell.qml:392
347msgid "This will be your last attempt."
354msgid "This will be your last attempt."
348msgstr ""
355msgstr ""
349
356
350−#: qml/Shell.qml:367
357+#: qml/Shell.qml:394
351msgid ""
358msgid ""
352"If passphrase is entered incorrectly, your phone will conduct a factory "
359"If passphrase is entered incorrectly, your phone will conduct a factory "
353"reset and all personal data will be deleted."
360"reset and all personal data will be deleted."
354msgstr ""
361msgstr ""
355
362
356−#: qml/Shell.qml:368
363+#: qml/Shell.qml:395
357msgid ""
364msgid ""
358"If passcode is entered incorrectly, your phone will conduct a factory reset "
365"If passcode is entered incorrectly, your phone will conduct a factory reset "
359"and all personal data will be deleted."
366"and all personal data will be deleted."
po/br.po+78−64
@@ -7,29 +7,53 @@ msgid ""
7msgstr ""
7msgstr ""
8"Project-Id-Version: unity8\n"
8"Project-Id-Version: unity8\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2014-09-24 10:43+0100\n"
10+"POT-Creation-Date: 2014-10-07 11:37+0300\n"
11−"PO-Revision-Date: 2014-09-30 06:25+0000\n"
11+"PO-Revision-Date: 2014-10-07 07:03+0000\n"
12"Last-Translator: Fohanno Thierry <thierry.fohanno@ofis-bzh.org>\n"
12"Last-Translator: Fohanno Thierry <thierry.fohanno@ofis-bzh.org>\n"
13"Language-Team: Breton <br@li.org>\n"
13"Language-Team: Breton <br@li.org>\n"
14"MIME-Version: 1.0\n"
14"MIME-Version: 1.0\n"
15"Content-Type: text/plain; charset=UTF-8\n"
15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n"
16"Content-Transfer-Encoding: 8bit\n"
17+"Plural-Forms: nplurals=2; plural=n > 1;\n"
17−"X-Launchpad-Export-Date: 2014-09-30 07:10+0000\n"
18+"X-Launchpad-Export-Date: 2014-10-09 06:36+0000\n"
18"X-Generator: Launchpad (build 17196)\n"
19"X-Generator: Launchpad (build 17196)\n"
19
20
20#: plugins/LightDM/Greeter.cpp:130
21#: plugins/LightDM/Greeter.cpp:130
21msgid "Password: "
22msgid "Password: "
22msgstr "Ger-tremen : "
23msgstr "Ger-tremen : "
23
24
24−#: plugins/Unity/Launcher/launcheritem.cpp:44
25+#: plugins/Unity/Launcher/launcheritem.cpp:45
25−#: plugins/Unity/Launcher/launcheritem.cpp:74
26+#: plugins/Unity/Launcher/launcheritem.cpp:91
26msgid "Pin shortcut"
27msgid "Pin shortcut"
27msgstr "Spilhennañ ar verradenn"
28msgstr "Spilhennañ ar verradenn"
28
29
29−#: plugins/Unity/Launcher/launcheritem.cpp:74
30+#: plugins/Unity/Launcher/launcheritem.cpp:91
30msgid "Unpin shortcut"
31msgid "Unpin shortcut"
31msgstr "Dispilhennañ ar verradenn"
32msgstr "Dispilhennañ ar verradenn"
32
33
34+#: qml/Components/DelayedLockscreen.qml:47
35+msgid "Device Locked"
36+msgstr "Benveg prennet"
37+
38+#: qml/Components/DelayedLockscreen.qml:62
39+msgid "You have been locked out due to too many failed passphrase attempts."
40+msgstr ""
41+"Prennet eo bet ho penveg abalamour da re a daolioù-esae c'hwitet evit merkañ "
42+"ho frazenn-dremen."
43+
44+#: qml/Components/DelayedLockscreen.qml:63
45+msgid "You have been locked out due to too many failed passcode attempts."
46+msgstr ""
47+"Prennet eo bet ho penveg abalamour da re a daolioù-esae evit merkañ ho kod-"
48+"tremen."
49+
50+#: qml/Components/DelayedLockscreen.qml:72
51+#, qt-format
52+msgid "Please wait %1 minute and then try again…"
53+msgid_plural "Please wait %1 minutes and then try again…"
54+msgstr[0] "Gortozit %1 vunutenn, mar plij, hag esaeit en-dro..."
55+msgstr[1] "Gortozit %1 a vunutoù, mar plij, hag esaeit en-dro..."
56+
33#: qml/Components/Dialogs.qml:70
57#: qml/Components/Dialogs.qml:70
34msgid "Log out"
58msgid "Log out"
35msgstr "Digevreañ"
59msgstr "Digevreañ"
@@ -141,40 +165,23 @@ msgstr ""
141"Mestroniañ a rit ar jestroù ha gallout a rit kregiñ da implijout ar "
165"Mestroniañ a rit ar jestroù ha gallout a rit kregiñ da implijout ar "
142"pellgomzer<br><br>Touchit d'ar skramm evit kregiñ ganti"
166"pellgomzer<br><br>Touchit d'ar skramm evit kregiñ ganti"
143
167
144−#: qml/Components/Lockscreen.qml:167
168+#: qml/Components/Lockscreen.qml:220
145−msgid "Please wait"
146−msgstr "Gortozit, mar plij"
147−
148−#: qml/Components/Lockscreen.qml:172
149−msgid "Too many incorrect attempts"
150−msgstr "Re a daolioù-esae direizh"
151−
152−#: qml/Components/Lockscreen.qml:206
153msgid "Emergency Call"
169msgid "Emergency Call"
154msgstr "Pellgomzadenn vallus"
170msgstr "Pellgomzadenn vallus"
155
171
156−#: qml/Components/Lockscreen.qml:226
172+#: qml/Components/Lockscreen.qml:252
157msgid "OK"
173msgid "OK"
158msgstr "Mat eo"
174msgstr "Mat eo"
159
175
160−#: qml/Components/PassphraseLockscreen.qml:61
161−#, qt-format
162−msgid "Hello %1"
163−msgstr "Demat %1"
164−
165−#: qml/Components/PassphraseLockscreen.qml:61
166−msgid "Hello"
167−msgstr "Demat"
168−
169−#: qml/Dash/GenericScopeView.qml:364 qml/Dash/GenericScopeView.qml:483
176+#: qml/Dash/GenericScopeView.qml:434 qml/Dash/GenericScopeView.qml:591
170msgid "See less"
177msgid "See less"
171msgstr "Gwelet nebeutoc'h"
178msgstr "Gwelet nebeutoc'h"
172
179
173−#: qml/Dash/GenericScopeView.qml:364
180+#: qml/Dash/GenericScopeView.qml:434
174msgid "See all"
181msgid "See all"
175msgstr "Gwelet pep tra"
182msgstr "Gwelet pep tra"
176
183
177−#: qml/Dash/GenericScopeView.qml:427 qml/Dash/PageHeader.qml:258
184+#: qml/Dash/GenericScopeView.qml:496 qml/Dash/PageHeader.qml:258
178#: qml/Panel/SearchIndicator.qml:27
185#: qml/Panel/SearchIndicator.qml:27
179msgid "Search"
186msgid "Search"
180msgstr "Klask"
187msgstr "Klask"
@@ -211,6 +218,14 @@ msgstr "Ouzhpennañ un ali"
211msgid "Send"
218msgid "Send"
212msgstr "Kas"
219msgstr "Kas"
213
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+
214#: qml/Dash/ScopesOverview.qml:206
229#: qml/Dash/ScopesOverview.qml:206
215msgid "Manage Scopes"
230msgid "Manage Scopes"
216msgstr "Merañ ar c'hefluskerioù enklask"
231msgstr "Merañ ar c'hefluskerioù enklask"
@@ -232,8 +247,8 @@ msgid "All"
232msgstr "An holl anezho"
247msgstr "An holl anezho"
233
248
234#: qml/Greeter/Greeter.qml:157
249#: qml/Greeter/Greeter.qml:157
235−msgid "Swipe to unlock"
250+msgid "Unlock"
236−msgstr "Riklañ evit dibrennañ"
251+msgstr "Dibrennañ"
237
252
238#: qml/Hud/HudParametrizedActionsPage.qml:139
253#: qml/Hud/HudParametrizedActionsPage.qml:139
239msgid "Confirm"
254msgid "Confirm"
@@ -255,18 +270,10 @@ msgstr "Komzit bremañ..."
255msgid "Speaking..."
270msgid "Speaking..."
256msgstr "O komz..."
271msgstr "O komz..."
257
272
258−#: qml/Notifications/NotificationMenuItemFactory.qml:108
273+#: qml/Notifications/NotificationMenuItemFactory.qml:116
259msgid "Show password"
274msgid "Show password"
260msgstr "Diskouez ar ger-tremen"
275msgstr "Diskouez ar ger-tremen"
261
276
262−#: qml/Notifications/NotificationMenuItemFactory.qml:124
263−msgid "Enter SIM PIN"
264−msgstr "Ebarzhit kod PIN ar gartenn SIM"
265−
266−#: qml/Notifications/NotificationMenuItemFactory.qml:125
267−msgid "Sorry, incorrect PIN"
268−msgstr "Siwazh, kod PIN direizh"
269−
270#: qml/Panel/ActiveCallHint.qml:77
277#: qml/Panel/ActiveCallHint.qml:77
271msgid "Tap to return to call..."
278msgid "Tap to return to call..."
272msgstr "Touchit evit distreiñ d'ar bellgomzadenn..."
279msgstr "Touchit evit distreiñ d'ar bellgomzadenn..."
@@ -279,27 +286,27 @@ msgstr "Kendiviz"
279msgid "Nothing is playing"
286msgid "Nothing is playing"
280msgstr "Ne lenner netra bremañ"
287msgstr "Ne lenner netra bremañ"
281
288
282−#: qml/Panel/Indicators/MenuItemFactory.qml:651
289+#: qml/Panel/Indicators/MenuItemFactory.qml:748
283msgid "In queue…"
290msgid "In queue…"
284msgstr "El lostennad..."
291msgstr "El lostennad..."
285
292
286−#: qml/Panel/Indicators/MenuItemFactory.qml:655
293+#: qml/Panel/Indicators/MenuItemFactory.qml:752
287msgid "Downloading"
294msgid "Downloading"
288msgstr "O pellgargañ"
295msgstr "O pellgargañ"
289
296
290−#: qml/Panel/Indicators/MenuItemFactory.qml:657
297+#: qml/Panel/Indicators/MenuItemFactory.qml:754
291msgid "Paused, tap to resume"
298msgid "Paused, tap to resume"
292msgstr "Ehanet, touchit evit adkregiñ"
299msgstr "Ehanet, touchit evit adkregiñ"
293
300
294−#: qml/Panel/Indicators/MenuItemFactory.qml:659
301+#: qml/Panel/Indicators/MenuItemFactory.qml:756
295msgid "Canceled"
302msgid "Canceled"
296msgstr "Nullet"
303msgstr "Nullet"
297
304
298−#: qml/Panel/Indicators/MenuItemFactory.qml:661
305+#: qml/Panel/Indicators/MenuItemFactory.qml:758
299msgid "Finished"
306msgid "Finished"
300msgstr "Echu"
307msgstr "Echu"
301
308
302−#: qml/Panel/Indicators/MenuItemFactory.qml:663
309+#: qml/Panel/Indicators/MenuItemFactory.qml:760
303msgid "Failed, tap to retry"
310msgid "Failed, tap to retry"
304msgstr "C'hwitet, touchit evit adkregiñ"
311msgstr "C'hwitet, touchit evit adkregiñ"
305
312
@@ -311,45 +318,49 @@ msgstr "Dibrennañ ar gartenn SIM"
311msgid "Roaming"
318msgid "Roaming"
312msgstr "O kantren"
319msgstr "O kantren"
313
320
314−#: qml/Shell.qml:292
321+#: qml/Shell.qml:346
315−msgid "Enter your passphrase"
322+msgid "Enter passphrase"
316−msgstr "Ebarzhit ho frazenn-dremen"
323+msgstr "Merkañ ar frazenn-dremen"
317
324
318−#: qml/Shell.qml:293
325+#: qml/Shell.qml:347
319msgid "Sorry, incorrect passphrase"
326msgid "Sorry, incorrect passphrase"
320msgstr "Siwazh, frazenn-dremen direizh"
327msgstr "Siwazh, frazenn-dremen direizh"
321
328
322−#: qml/Shell.qml:295
329+#: qml/Shell.qml:348
323−msgid "Enter your passcode"
330+msgid "Please re-enter"
324−msgstr "Ebarzhit ho kod-tremen"
331+msgstr "Adverkañ, mar plij"
325
332
326−#: qml/Shell.qml:296
333+#: qml/Shell.qml:350
334+msgid "Enter passcode"
335+msgstr "Merkañ ar c'hod-tremen"
336+
337+#: qml/Shell.qml:351
327msgid "Sorry, incorrect passcode"
338msgid "Sorry, incorrect passcode"
328msgstr "Digarezit, kod-tremen direizh"
339msgstr "Digarezit, kod-tremen direizh"
329
340
330−#: qml/Shell.qml:299
341+#: qml/Shell.qml:354
331#, qt-format
342#, qt-format
332−msgid "Enter your %1"
343+msgid "Enter %1"
333−msgstr "Ebarzhit ho %1"
344+msgstr "Merkañ %1"
334
345
335−#: qml/Shell.qml:300
346+#: qml/Shell.qml:355
336#, qt-format
347#, qt-format
337msgid "Sorry, incorrect %1"
348msgid "Sorry, incorrect %1"
338msgstr "Siwazh, %1 direizh"
349msgstr "Siwazh, %1 direizh"
339
350
340−#: qml/Shell.qml:335
351+#: qml/Shell.qml:390
341msgid "Sorry, incorrect passphrase."
352msgid "Sorry, incorrect passphrase."
342msgstr "Siwazh, frazenn-dremen direizh"
353msgstr "Siwazh, frazenn-dremen direizh"
343
354
344−#: qml/Shell.qml:336
355+#: qml/Shell.qml:391
345msgid "Sorry, incorrect passcode."
356msgid "Sorry, incorrect passcode."
346msgstr "Siwazh, kod-tremen direizh"
357msgstr "Siwazh, kod-tremen direizh"
347
358
348−#: qml/Shell.qml:337
359+#: qml/Shell.qml:392
349msgid "This will be your last attempt."
360msgid "This will be your last attempt."
350msgstr "Ho taol-esae diwezhañ e vo."
361msgstr "Ho taol-esae diwezhañ e vo."
351
362
352−#: qml/Shell.qml:339
363+#: qml/Shell.qml:394
353msgid ""
364msgid ""
354"If passphrase is entered incorrectly, your phone will conduct a factory "
365"If passphrase is entered incorrectly, your phone will conduct a factory "
355"reset and all personal data will be deleted."
366"reset and all personal data will be deleted."
@@ -357,7 +368,7 @@ msgstr ""
357"Ma vez ebarzhet ur frazenn-dremen direizh, e vo adderaouekaet ho pellgomzer "
368"Ma vez ebarzhet ur frazenn-dremen direizh, e vo adderaouekaet ho pellgomzer "
358"gant arventennoù al labouradeg hag e vo diverket an holl roadennoù personel"
369"gant arventennoù al labouradeg hag e vo diverket an holl roadennoù personel"
359
370
360−#: qml/Shell.qml:340
371+#: qml/Shell.qml:395
361msgid ""
372msgid ""
362"If passcode is entered incorrectly, your phone will conduct a factory reset "
373"If passcode is entered incorrectly, your phone will conduct a factory reset "
363"and all personal data will be deleted."
374"and all personal data will be deleted."
@@ -365,5 +376,8 @@ msgstr ""
365"Ma vez ebarzhet ur c'hod-tremen direizh, e vo adderaouekaet ho pellgomzer "
376"Ma vez ebarzhet ur c'hod-tremen direizh, e vo adderaouekaet ho pellgomzer "
366"gant arventennoù al labouradeg hag e vo diverket an holl roadennoù personel."
377"gant arventennoù al labouradeg hag e vo diverket an holl roadennoù personel."
367
378
368−#~ msgid "Manage Dash"
379+#~ msgid "Sorry, incorrect PIN"
369−#~ msgstr "Merañ an daolenn-vourzh"
380+#~ msgstr "Siwazh, kod PIN direizh"
381+
382+#~ msgid "Enter SIM PIN"
383+#~ msgstr "Ebarzhit kod PIN ar gartenn SIM"
po/bs.po+56−48
@@ -7,14 +7,16 @@ msgid ""
7msgstr ""
7msgstr ""
8"Project-Id-Version: unity8\n"
8"Project-Id-Version: unity8\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2014-09-24 10:43+0100\n"
10+"POT-Creation-Date: 2014-10-07 11:37+0300\n"
11"PO-Revision-Date: 2014-01-16 22:33+0000\n"
11"PO-Revision-Date: 2014-01-16 22:33+0000\n"
12"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
12"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
13"Language-Team: Bosnian <bs@li.org>\n"
13"Language-Team: Bosnian <bs@li.org>\n"
14"MIME-Version: 1.0\n"
14"MIME-Version: 1.0\n"
15"Content-Type: text/plain; charset=UTF-8\n"
15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n"
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"
17−"X-Launchpad-Export-Date: 2014-09-29 05:19+0000\n"
19+"X-Launchpad-Export-Date: 2014-10-09 06:36+0000\n"
18"X-Generator: Launchpad (build 17196)\n"
20"X-Generator: Launchpad (build 17196)\n"
19
21
20#: plugins/LightDM/Greeter.cpp:130
22#: plugins/LightDM/Greeter.cpp:130
@@ -30,6 +32,25 @@ msgstr ""
30msgid "Unpin shortcut"
32msgid "Unpin shortcut"
31msgstr ""
33msgstr ""
32
34
35+#: qml/Components/DelayedLockscreen.qml:47
36+msgid "Device Locked"
37+msgstr ""
38+
39+#: qml/Components/DelayedLockscreen.qml:62
40+msgid "You have been locked out due to too many failed passphrase attempts."
41+msgstr ""
42+
43+#: qml/Components/DelayedLockscreen.qml:63
44+msgid "You have been locked out due to too many failed passcode attempts."
45+msgstr ""
46+
47+#: qml/Components/DelayedLockscreen.qml:72
48+#, qt-format
49+msgid "Please wait %1 minute and then try again…"
50+msgid_plural "Please wait %1 minutes and then try again…"
51+msgstr[0] ""
52+msgstr[1] ""
53+
33#: qml/Components/Dialogs.qml:70
54#: qml/Components/Dialogs.qml:70
34msgid "Log out"
55msgid "Log out"
35msgstr ""
56msgstr ""
@@ -132,40 +153,23 @@ msgid ""
132"phone<br><br>Tap on the screen to start"
153"phone<br><br>Tap on the screen to start"
133msgstr ""
154msgstr ""
134
155
135−#: qml/Components/Lockscreen.qml:167
156+#: qml/Components/Lockscreen.qml:220
136−msgid "Please wait"
137−msgstr ""
138−
139−#: qml/Components/Lockscreen.qml:172
140−msgid "Too many incorrect attempts"
141−msgstr ""
142−
143−#: qml/Components/Lockscreen.qml:206
144msgid "Emergency Call"
157msgid "Emergency Call"
145msgstr ""
158msgstr ""
146
159
147−#: qml/Components/Lockscreen.qml:226
160+#: qml/Components/Lockscreen.qml:252
148msgid "OK"
161msgid "OK"
149msgstr ""
162msgstr ""
150
163
151−#: qml/Components/PassphraseLockscreen.qml:61
152−#, qt-format
153−msgid "Hello %1"
154−msgstr ""
155−
156−#: qml/Components/PassphraseLockscreen.qml:61
157−msgid "Hello"
158−msgstr ""
159−
160−#: qml/Dash/GenericScopeView.qml:411 qml/Dash/GenericScopeView.qml:533
164+#: qml/Dash/GenericScopeView.qml:434 qml/Dash/GenericScopeView.qml:591
161msgid "See less"
165msgid "See less"
162msgstr ""
166msgstr ""
163
167
164−#: qml/Dash/GenericScopeView.qml:411
168+#: qml/Dash/GenericScopeView.qml:434
165msgid "See all"
169msgid "See all"
166msgstr ""
170msgstr ""
167
171
168−#: qml/Dash/GenericScopeView.qml:473 qml/Dash/PageHeader.qml:258
172+#: qml/Dash/GenericScopeView.qml:496 qml/Dash/PageHeader.qml:258
169#: qml/Panel/SearchIndicator.qml:27
173#: qml/Panel/SearchIndicator.qml:27
170msgid "Search"
174msgid "Search"
171msgstr ""
175msgstr ""
@@ -202,6 +206,14 @@ msgstr ""
202msgid "Send"
206msgid "Send"
203msgstr ""
207msgstr ""
204
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+
205#: qml/Dash/ScopesOverview.qml:206
217#: qml/Dash/ScopesOverview.qml:206
206msgid "Manage Scopes"
218msgid "Manage Scopes"
207msgstr ""
219msgstr ""
@@ -223,7 +235,7 @@ msgid "All"
223msgstr ""
235msgstr ""
224
236
225#: qml/Greeter/Greeter.qml:157
237#: qml/Greeter/Greeter.qml:157
226−msgid "Swipe to unlock"
238+msgid "Unlock"
227msgstr ""
239msgstr ""
228
240
229#: qml/Hud/HudParametrizedActionsPage.qml:139
241#: qml/Hud/HudParametrizedActionsPage.qml:139
@@ -246,18 +258,10 @@ msgstr ""
246msgid "Speaking..."
258msgid "Speaking..."
247msgstr ""
259msgstr ""
248
260
249−#: qml/Notifications/NotificationMenuItemFactory.qml:108
261+#: qml/Notifications/NotificationMenuItemFactory.qml:116
250msgid "Show password"
262msgid "Show password"
251msgstr ""
263msgstr ""
252
264
253−#: qml/Notifications/NotificationMenuItemFactory.qml:124
254−msgid "Enter SIM PIN"
255−msgstr ""
256−
257−#: qml/Notifications/NotificationMenuItemFactory.qml:125
258−msgid "Sorry, incorrect PIN"
259−msgstr ""
260−
261#: qml/Panel/ActiveCallHint.qml:77
265#: qml/Panel/ActiveCallHint.qml:77
262msgid "Tap to return to call..."
266msgid "Tap to return to call..."
263msgstr ""
267msgstr ""
@@ -302,51 +306,55 @@ msgstr ""
302msgid "Roaming"
306msgid "Roaming"
303msgstr ""
307msgstr ""
304
308
305−#: qml/Shell.qml:320
309+#: qml/Shell.qml:346
306−msgid "Enter your passphrase"
310+msgid "Enter passphrase"
307msgstr ""
311msgstr ""
308
312
309−#: qml/Shell.qml:321
313+#: qml/Shell.qml:347
310msgid "Sorry, incorrect passphrase"
314msgid "Sorry, incorrect passphrase"
311msgstr ""
315msgstr ""
312
316
313−#: qml/Shell.qml:323
317+#: qml/Shell.qml:348
318+msgid "Please re-enter"
319+msgstr ""
320+
321+#: qml/Shell.qml:350
314−msgid "Enter your passcode"
322+msgid "Enter passcode"
315msgstr ""
323msgstr ""
316
324
317−#: qml/Shell.qml:324
325+#: qml/Shell.qml:351
318msgid "Sorry, incorrect passcode"
326msgid "Sorry, incorrect passcode"
319msgstr ""
327msgstr ""
320
328
321−#: qml/Shell.qml:327
329+#: qml/Shell.qml:354
322#, qt-format
330#, qt-format
323−msgid "Enter your %1"
331+msgid "Enter %1"
324msgstr ""
332msgstr ""
325
333
326−#: qml/Shell.qml:328
334+#: qml/Shell.qml:355
327#, qt-format
335#, qt-format
328msgid "Sorry, incorrect %1"
336msgid "Sorry, incorrect %1"
329msgstr ""
337msgstr ""
330
338
331−#: qml/Shell.qml:363
339+#: qml/Shell.qml:390
332msgid "Sorry, incorrect passphrase."
340msgid "Sorry, incorrect passphrase."
333msgstr ""
341msgstr ""
334
342
335−#: qml/Shell.qml:364
343+#: qml/Shell.qml:391
336msgid "Sorry, incorrect passcode."
344msgid "Sorry, incorrect passcode."
337msgstr ""
345msgstr ""
338
346
339−#: qml/Shell.qml:365
347+#: qml/Shell.qml:392
340msgid "This will be your last attempt."
348msgid "This will be your last attempt."
341msgstr ""
349msgstr ""
342
350
343−#: qml/Shell.qml:367
351+#: qml/Shell.qml:394
344msgid ""
352msgid ""
345"If passphrase is entered incorrectly, your phone will conduct a factory "
353"If passphrase is entered incorrectly, your phone will conduct a factory "
346"reset and all personal data will be deleted."
354"reset and all personal data will be deleted."
347msgstr ""
355msgstr ""
348
356
349−#: qml/Shell.qml:368
357+#: qml/Shell.qml:395
350msgid ""
358msgid ""
351"If passcode is entered incorrectly, your phone will conduct a factory reset "
359"If passcode is entered incorrectly, your phone will conduct a factory reset "
352"and all personal data will be deleted."
360"and all personal data will be deleted."
po/ca.po+74−59
@@ -7,14 +7,15 @@ msgid ""
7msgstr ""
7msgstr ""
8"Project-Id-Version: unity\n"
8"Project-Id-Version: unity\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2014-09-24 10:43+0100\n"
10+"POT-Creation-Date: 2014-10-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"
12"Last-Translator: David Planella <david.planella@ubuntu.com>\n"
13"Language-Team: Catalan <ca@li.org>\n"
13"Language-Team: Catalan <ca@li.org>\n"
14"MIME-Version: 1.0\n"
14"MIME-Version: 1.0\n"
15"Content-Type: text/plain; charset=UTF-8\n"
15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n"
16"Content-Transfer-Encoding: 8bit\n"
17+"Plural-Forms: nplurals=2; plural=n != 1;\n"
17−"X-Launchpad-Export-Date: 2014-09-29 05:19+0000\n"
18+"X-Launchpad-Export-Date: 2014-10-09 06:36+0000\n"
18"X-Generator: Launchpad (build 17196)\n"
19"X-Generator: Launchpad (build 17196)\n"
19
20
20#: plugins/LightDM/Greeter.cpp:130
21#: plugins/LightDM/Greeter.cpp:130
@@ -30,6 +31,29 @@ msgstr "Enganxa la drecera"
30msgid "Unpin shortcut"
31msgid "Unpin shortcut"
31msgstr "Desenganxa la drecera"
32msgstr "Desenganxa la drecera"
32
33
34+#: qml/Components/DelayedLockscreen.qml:47
35+msgid "Device Locked"
36+msgstr "Dispositiu bloquejat"
37+
38+#: qml/Components/DelayedLockscreen.qml:62
39+msgid "You have been locked out due to too many failed passphrase attempts."
40+msgstr ""
41+"Se us ha bloquejat l'accés al dispositiu. Heu sobrepassat el nombre "
42+"d'intents d'introducció de la contrasenya."
43+
44+#: qml/Components/DelayedLockscreen.qml:63
45+msgid "You have been locked out due to too many failed passcode attempts."
46+msgstr ""
47+"Se us ha bloquejat l'accés al dispositiu. Heu sobrepassat el nombre "
48+"d'intents d'introducció del codi d'accés."
49+
50+#: qml/Components/DelayedLockscreen.qml:72
51+#, qt-format
52+msgid "Please wait %1 minute and then try again…"
53+msgid_plural "Please wait %1 minutes and then try again…"
54+msgstr[0] "Espereu %1 minut i torneu-ho a intentar..."
55+msgstr[1] "Espereu %1 minuts i torneu-ho a intentar..."
56+
33#: qml/Components/Dialogs.qml:70
57#: qml/Components/Dialogs.qml:70
34msgid "Log out"
58msgid "Log out"
35msgstr "Surt"
59msgstr "Surt"
@@ -142,40 +166,23 @@ msgstr ""
142"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 "
143"telèfon<br><br>Feu un toc a la pantalla per començar"
167"telèfon<br><br>Feu un toc a la pantalla per començar"
144
168
145−#: qml/Components/Lockscreen.qml:167
169+#: qml/Components/Lockscreen.qml:220
146−msgid "Please wait"
147−msgstr "Espereu"
148−
149−#: qml/Components/Lockscreen.qml:172
150−msgid "Too many incorrect attempts"
151−msgstr "Massa intents incorrectes"
152−
153−#: qml/Components/Lockscreen.qml:206
154msgid "Emergency Call"
170msgid "Emergency Call"
155msgstr "Trucada d'emergència"
171msgstr "Trucada d'emergència"
156
172
157−#: qml/Components/Lockscreen.qml:226
173+#: qml/Components/Lockscreen.qml:252
158msgid "OK"
174msgid "OK"
159msgstr "D'acord"
175msgstr "D'acord"
160
176
161−#: qml/Components/PassphraseLockscreen.qml:61
162−#, qt-format
163−msgid "Hello %1"
164−msgstr "Hola %1"
165−
166−#: qml/Components/PassphraseLockscreen.qml:61
167−msgid "Hello"
168−msgstr "Hola"
169−
170−#: qml/Dash/GenericScopeView.qml:411 qml/Dash/GenericScopeView.qml:533
177+#: qml/Dash/GenericScopeView.qml:434 qml/Dash/GenericScopeView.qml:591
171msgid "See less"
178msgid "See less"
172msgstr "Mostra'n menys"
179msgstr "Mostra'n menys"
173
180
174−#: qml/Dash/GenericScopeView.qml:411
181+#: qml/Dash/GenericScopeView.qml:434
175msgid "See all"
182msgid "See all"
176msgstr "Mostra-ho tot"
183msgstr "Mostra-ho tot"
177
184
178−#: qml/Dash/GenericScopeView.qml:473 qml/Dash/PageHeader.qml:258
185+#: qml/Dash/GenericScopeView.qml:496 qml/Dash/PageHeader.qml:258
179#: qml/Panel/SearchIndicator.qml:27
186#: qml/Panel/SearchIndicator.qml:27
180msgid "Search"
187msgid "Search"
181msgstr "Cerca"
188msgstr "Cerca"
@@ -212,9 +219,17 @@ msgstr "Afegiu una ressenya"
212msgid "Send"
219msgid "Send"
213msgstr "Envia"
220msgstr "Envia"
214
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+
215#: qml/Dash/ScopesOverview.qml:206
230#: qml/Dash/ScopesOverview.qml:206
216msgid "Manage Scopes"
231msgid "Manage Scopes"
217−msgstr ""
232+msgstr "Gestioneu les lents"
218
233
219#: qml/Dash/ScopesOverview.qml:428
234#: qml/Dash/ScopesOverview.qml:428
220msgid "Done"
235msgid "Done"
@@ -233,8 +248,8 @@ msgid "All"
233msgstr "Totes"
248msgstr "Totes"
234
249
235#: qml/Greeter/Greeter.qml:157
250#: qml/Greeter/Greeter.qml:157
236−msgid "Swipe to unlock"
251+msgid "Unlock"
237−msgstr "Feu lliscar el dit per desbloquejar"
252+msgstr "Desbloca"
238
253
239#: qml/Hud/HudParametrizedActionsPage.qml:139
254#: qml/Hud/HudParametrizedActionsPage.qml:139
240msgid "Confirm"
255msgid "Confirm"
@@ -256,18 +271,10 @@ msgstr "Parleu..."
256msgid "Speaking..."
271msgid "Speaking..."
257msgstr "S'està parlant..."
272msgstr "S'està parlant..."
258
273
259−#: qml/Notifications/NotificationMenuItemFactory.qml:108
274+#: qml/Notifications/NotificationMenuItemFactory.qml:116
260msgid "Show password"
275msgid "Show password"
261msgstr "Mostra la contrasenya"
276msgstr "Mostra la contrasenya"
262
277
263−#: qml/Notifications/NotificationMenuItemFactory.qml:124
264−msgid "Enter SIM PIN"
265−msgstr "Introduïu el PIN de la targeta SIM"
266−
267−#: qml/Notifications/NotificationMenuItemFactory.qml:125
268−msgid "Sorry, incorrect PIN"
269−msgstr "El PIN no és correcte"
270−
271#: qml/Panel/ActiveCallHint.qml:77
278#: qml/Panel/ActiveCallHint.qml:77
272msgid "Tap to return to call..."
279msgid "Tap to return to call..."
273msgstr "Feu un toc per tornar a la trucada..."
280msgstr "Feu un toc per tornar a la trucada..."
@@ -278,7 +285,7 @@ msgstr "Conferència"
278
285
279#: qml/Panel/Indicators/MenuItemFactory.qml:600
286#: qml/Panel/Indicators/MenuItemFactory.qml:600
280msgid "Nothing is playing"
287msgid "Nothing is playing"
281−msgstr ""
288+msgstr "No s'està reproduint res"
282
289
283#: qml/Panel/Indicators/MenuItemFactory.qml:748
290#: qml/Panel/Indicators/MenuItemFactory.qml:748
284msgid "In queue…"
291msgid "In queue…"
@@ -312,45 +319,49 @@ msgstr "Desbloca la SIM"
312msgid "Roaming"
319msgid "Roaming"
313msgstr "Itinerància"
320msgstr "Itinerància"
314
321
315−#: qml/Shell.qml:320
322+#: qml/Shell.qml:346
316−msgid "Enter your passphrase"
323+msgid "Enter passphrase"
317−msgstr "Escriviu la contrasenya"
324+msgstr "Introduïu la contrasenya"
318
325
319−#: qml/Shell.qml:321
326+#: qml/Shell.qml:347
320msgid "Sorry, incorrect passphrase"
327msgid "Sorry, incorrect passphrase"
321msgstr "La contrasenya no és correcta"
328msgstr "La contrasenya no és correcta"
322
329
323−#: qml/Shell.qml:323
330+#: qml/Shell.qml:348
331+msgid "Please re-enter"
332+msgstr "Torneu-ho a introduir"
333+
334+#: qml/Shell.qml:350
324−msgid "Enter your passcode"
335+msgid "Enter passcode"
325msgstr "Introduïu el codi d'accés"
336msgstr "Introduïu el codi d'accés"
326
337
327−#: qml/Shell.qml:324
338+#: qml/Shell.qml:351
328msgid "Sorry, incorrect passcode"
339msgid "Sorry, incorrect passcode"
329msgstr "El codi d'accés no és correcte"
340msgstr "El codi d'accés no és correcte"
330
341
331−#: qml/Shell.qml:327
342+#: qml/Shell.qml:354
332#, qt-format
343#, qt-format
333−msgid "Enter your %1"
344+msgid "Enter %1"
334−msgstr "Introduïu la %1"
345+msgstr "Introduïu: %1"
335
346
336−#: qml/Shell.qml:328
347+#: qml/Shell.qml:355
337#, qt-format
348#, qt-format
338msgid "Sorry, incorrect %1"
349msgid "Sorry, incorrect %1"
339msgstr "Incorrecte (%1)"
350msgstr "Incorrecte (%1)"
340
351
341−#: qml/Shell.qml:363
352+#: qml/Shell.qml:390
342msgid "Sorry, incorrect passphrase."
353msgid "Sorry, incorrect passphrase."
343msgstr "La contrasenya és incorrecta"
354msgstr "La contrasenya és incorrecta"
344
355
345−#: qml/Shell.qml:364
356+#: qml/Shell.qml:391
346msgid "Sorry, incorrect passcode."
357msgid "Sorry, incorrect passcode."
347−msgstr "La clau és incorrecta"
358+msgstr "El codi d'accés no és correcte"
348
359
349−#: qml/Shell.qml:365
360+#: qml/Shell.qml:392
350msgid "This will be your last attempt."
361msgid "This will be your last attempt."
351msgstr "Aquest serà el darrer intent."
362msgstr "Aquest serà el darrer intent."
352
363
353−#: qml/Shell.qml:367
364+#: qml/Shell.qml:394
354msgid ""
365msgid ""
355"If passphrase is entered incorrectly, your phone will conduct a factory "
366"If passphrase is entered incorrectly, your phone will conduct a factory "
356"reset and all personal data will be deleted."
367"reset and all personal data will be deleted."
@@ -359,13 +370,17 @@ msgstr ""
359"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 "
360"personals."
371"personals."
361
372
362−#: qml/Shell.qml:368
373+#: qml/Shell.qml:395
363msgid ""
374msgid ""
364"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 "
365"and all personal data will be deleted."
376"and all personal data will be deleted."
366msgstr ""
377msgstr ""
367−"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 "
368−"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 "
380+"personals."
381+
382+#~ msgid "Sorry, incorrect PIN"
383+#~ msgstr "El PIN no és correcte"
369
384
370−#~ msgid "Manage Dash"
385+#~ msgid "Enter SIM PIN"
371−#~ msgstr "Gestiona el tauler"
386+#~ msgstr "Introduïu el PIN de la targeta SIM"
po/ckb.po+55−48
@@ -7,14 +7,15 @@ msgid ""
7msgstr ""
7msgstr ""
8"Project-Id-Version: unity8\n"
8"Project-Id-Version: unity8\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2014-09-24 10:43+0100\n"
10+"POT-Creation-Date: 2014-10-07 11:37+0300\n"
11"PO-Revision-Date: 2014-01-21 11:05+0000\n"
11"PO-Revision-Date: 2014-01-21 11:05+0000\n"
12"Last-Translator: Aras <aras.noori@gmail.com>\n"
12"Last-Translator: Aras <aras.noori@gmail.com>\n"
13"Language-Team: Kurdish (Sorani) <ckb@li.org>\n"
13"Language-Team: Kurdish (Sorani) <ckb@li.org>\n"
14"MIME-Version: 1.0\n"
14"MIME-Version: 1.0\n"
15"Content-Type: text/plain; charset=UTF-8\n"
15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n"
16"Content-Transfer-Encoding: 8bit\n"
17+"Plural-Forms: nplurals=2; plural=n != 1;\n"
17−"X-Launchpad-Export-Date: 2014-09-29 05:20+0000\n"
18+"X-Launchpad-Export-Date: 2014-10-09 06:37+0000\n"
18"X-Generator: Launchpad (build 17196)\n"
19"X-Generator: Launchpad (build 17196)\n"
19
20
20#: plugins/LightDM/Greeter.cpp:130
21#: plugins/LightDM/Greeter.cpp:130
@@ -30,6 +31,25 @@ msgstr ""
30msgid "Unpin shortcut"
31msgid "Unpin shortcut"
31msgstr ""
32msgstr ""
32
33
34+#: qml/Components/DelayedLockscreen.qml:47
35+msgid "Device Locked"
36+msgstr ""
37+
38+#: qml/Components/DelayedLockscreen.qml:62
39+msgid "You have been locked out due to too many failed passphrase attempts."
40+msgstr ""
41+
42+#: qml/Components/DelayedLockscreen.qml:63
43+msgid "You have been locked out due to too many failed passcode attempts."
44+msgstr ""
45+
46+#: qml/Components/DelayedLockscreen.qml:72
47+#, qt-format
48+msgid "Please wait %1 minute and then try again…"
49+msgid_plural "Please wait %1 minutes and then try again…"
50+msgstr[0] ""
51+msgstr[1] ""
52+
33#: qml/Components/Dialogs.qml:70
53#: qml/Components/Dialogs.qml:70
34msgid "Log out"
54msgid "Log out"
35msgstr ""
55msgstr ""
@@ -132,40 +152,23 @@ msgid ""
132"phone<br><br>Tap on the screen to start"
152"phone<br><br>Tap on the screen to start"
133msgstr ""
153msgstr ""
134
154
135−#: qml/Components/Lockscreen.qml:167
155+#: qml/Components/Lockscreen.qml:220
136−msgid "Please wait"
137−msgstr ""
138−
139−#: qml/Components/Lockscreen.qml:172
140−msgid "Too many incorrect attempts"
141−msgstr ""
142−
143−#: qml/Components/Lockscreen.qml:206
144msgid "Emergency Call"
156msgid "Emergency Call"
145msgstr "هێڵی فریاگوزاری"
157msgstr "هێڵی فریاگوزاری"
146
158
147−#: qml/Components/Lockscreen.qml:226
159+#: qml/Components/Lockscreen.qml:252
148msgid "OK"
160msgid "OK"
149msgstr ""
161msgstr ""
150
162
151−#: qml/Components/PassphraseLockscreen.qml:61
152−#, qt-format
153−msgid "Hello %1"
154−msgstr "سڵاو %1"
155−
156−#: qml/Components/PassphraseLockscreen.qml:61
157−msgid "Hello"
158−msgstr "سڵاو"
159−
160−#: qml/Dash/GenericScopeView.qml:411 qml/Dash/GenericScopeView.qml:533
163+#: qml/Dash/GenericScopeView.qml:434 qml/Dash/GenericScopeView.qml:591
161msgid "See less"
164msgid "See less"
162msgstr ""
165msgstr ""
163
166
164−#: qml/Dash/GenericScopeView.qml:411
167+#: qml/Dash/GenericScopeView.qml:434
165msgid "See all"
168msgid "See all"
166msgstr ""
169msgstr ""
167
170
168−#: qml/Dash/GenericScopeView.qml:473 qml/Dash/PageHeader.qml:258
171+#: qml/Dash/GenericScopeView.qml:496 qml/Dash/PageHeader.qml:258
169#: qml/Panel/SearchIndicator.qml:27
172#: qml/Panel/SearchIndicator.qml:27
170msgid "Search"
173msgid "Search"
171msgstr "گەڕان"
174msgstr "گەڕان"
@@ -202,6 +205,14 @@ msgstr "پێداچوونەوە زۆر بکە"
202msgid "Send"
205msgid "Send"
203msgstr "ناردن"
206msgstr "ناردن"
204
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+
205#: qml/Dash/ScopesOverview.qml:206
216#: qml/Dash/ScopesOverview.qml:206
206msgid "Manage Scopes"
217msgid "Manage Scopes"
207msgstr ""
218msgstr ""
@@ -223,7 +234,7 @@ msgid "All"
223msgstr ""
234msgstr ""
224
235
225#: qml/Greeter/Greeter.qml:157
236#: qml/Greeter/Greeter.qml:157
226−msgid "Swipe to unlock"
237+msgid "Unlock"
227msgstr ""
238msgstr ""
228
239
229#: qml/Hud/HudParametrizedActionsPage.qml:139
240#: qml/Hud/HudParametrizedActionsPage.qml:139
@@ -246,18 +257,10 @@ msgstr "ئێستا قسە بکە"
246msgid "Speaking..."
257msgid "Speaking..."
247msgstr "قسە دەکات..."
258msgstr "قسە دەکات..."
248
259
249−#: qml/Notifications/NotificationMenuItemFactory.qml:108
260+#: qml/Notifications/NotificationMenuItemFactory.qml:116
250msgid "Show password"
261msgid "Show password"
251msgstr "تێپەڕەوشە پیشان بدە"
262msgstr "تێپەڕەوشە پیشان بدە"
252
263
253−#: qml/Notifications/NotificationMenuItemFactory.qml:124
254−msgid "Enter SIM PIN"
255−msgstr ""
256−
257−#: qml/Notifications/NotificationMenuItemFactory.qml:125
258−msgid "Sorry, incorrect PIN"
259−msgstr ""
260−
261#: qml/Panel/ActiveCallHint.qml:77
264#: qml/Panel/ActiveCallHint.qml:77
262msgid "Tap to return to call..."
265msgid "Tap to return to call..."
263msgstr ""
266msgstr ""
@@ -302,51 +305,55 @@ msgstr ""
302msgid "Roaming"
305msgid "Roaming"
303msgstr ""
306msgstr ""
304
307
305−#: qml/Shell.qml:320
308+#: qml/Shell.qml:346
306−msgid "Enter your passphrase"
309+msgid "Enter passphrase"
307msgstr ""
310msgstr ""
308
311
309−#: qml/Shell.qml:321
312+#: qml/Shell.qml:347
310msgid "Sorry, incorrect passphrase"
313msgid "Sorry, incorrect passphrase"
311msgstr ""
314msgstr ""
312
315
313−#: qml/Shell.qml:323
316+#: qml/Shell.qml:348
317+msgid "Please re-enter"
318+msgstr ""
319+
320+#: qml/Shell.qml:350
314−msgid "Enter your passcode"
321+msgid "Enter passcode"
315msgstr ""
322msgstr ""
316
323
317−#: qml/Shell.qml:324
324+#: qml/Shell.qml:351
318msgid "Sorry, incorrect passcode"
325msgid "Sorry, incorrect passcode"
319msgstr ""
326msgstr ""
320
327
321−#: qml/Shell.qml:327
328+#: qml/Shell.qml:354
322#, qt-format
329#, qt-format
323−msgid "Enter your %1"
330+msgid "Enter %1"
324msgstr ""
331msgstr ""
325
332
326−#: qml/Shell.qml:328
333+#: qml/Shell.qml:355
327#, qt-format
334#, qt-format
328msgid "Sorry, incorrect %1"
335msgid "Sorry, incorrect %1"
329msgstr ""
336msgstr ""
330
337
331−#: qml/Shell.qml:363
338+#: qml/Shell.qml:390
332msgid "Sorry, incorrect passphrase."
339msgid "Sorry, incorrect passphrase."
333msgstr ""
340msgstr ""
334
341
335−#: qml/Shell.qml:364
342+#: qml/Shell.qml:391
336msgid "Sorry, incorrect passcode."
343msgid "Sorry, incorrect passcode."
337msgstr ""
344msgstr ""
338
345
339−#: qml/Shell.qml:365
346+#: qml/Shell.qml:392
340msgid "This will be your last attempt."
347msgid "This will be your last attempt."
341msgstr ""
348msgstr ""
342
349
343−#: qml/Shell.qml:367
350+#: qml/Shell.qml:394
344msgid ""
351msgid ""
345"If passphrase is entered incorrectly, your phone will conduct a factory "
352"If passphrase is entered incorrectly, your phone will conduct a factory "
346"reset and all personal data will be deleted."
353"reset and all personal data will be deleted."
347msgstr ""
354msgstr ""
348
355
349−#: qml/Shell.qml:368
356+#: qml/Shell.qml:395
350msgid ""
357msgid ""
351"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 "
352"and all personal data will be deleted."
359"and all personal data will be deleted."
po/cs.po+55−48
@@ -7,14 +7,15 @@ msgid ""
7msgstr ""
7msgstr ""
8"Project-Id-Version: unity8\n"
8"Project-Id-Version: unity8\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2014-09-24 10:43+0100\n"
10+"POT-Creation-Date: 2014-10-07 11:37+0300\n"
11"PO-Revision-Date: 2014-01-08 10:11+0000\n"
11"PO-Revision-Date: 2014-01-08 10:11+0000\n"
12"Last-Translator: Tadeáš Pařík <tadeas.parik@gmail.com>\n"
12"Last-Translator: Tadeáš Pařík <tadeas.parik@gmail.com>\n"
13"Language-Team: Czech <cs@li.org>\n"
13"Language-Team: Czech <cs@li.org>\n"
14"MIME-Version: 1.0\n"
14"MIME-Version: 1.0\n"
15"Content-Type: text/plain; charset=UTF-8\n"
15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n"
16"Content-Transfer-Encoding: 8bit\n"
17+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
17−"X-Launchpad-Export-Date: 2014-09-29 05:19+0000\n"
18+"X-Launchpad-Export-Date: 2014-10-09 06:36+0000\n"
18"X-Generator: Launchpad (build 17196)\n"
19"X-Generator: Launchpad (build 17196)\n"
19
20
20#: plugins/LightDM/Greeter.cpp:130
21#: plugins/LightDM/Greeter.cpp:130
@@ -30,6 +31,25 @@ msgstr ""
30msgid "Unpin shortcut"
31msgid "Unpin shortcut"
31msgstr ""
32msgstr ""
32
33
34+#: qml/Components/DelayedLockscreen.qml:47
35+msgid "Device Locked"
36+msgstr ""
37+
38+#: qml/Components/DelayedLockscreen.qml:62
39+msgid "You have been locked out due to too many failed passphrase attempts."
40+msgstr ""
41+
42+#: qml/Components/DelayedLockscreen.qml:63
43+msgid "You have been locked out due to too many failed passcode attempts."
44+msgstr ""
45+
46+#: qml/Components/DelayedLockscreen.qml:72
47+#, qt-format
48+msgid "Please wait %1 minute and then try again…"
49+msgid_plural "Please wait %1 minutes and then try again…"
50+msgstr[0] ""
51+msgstr[1] ""
52+
33#: qml/Components/Dialogs.qml:70
53#: qml/Components/Dialogs.qml:70
34msgid "Log out"
54msgid "Log out"
35msgstr ""
55msgstr ""
@@ -132,40 +152,23 @@ msgid ""
132"phone<br><br>Tap on the screen to start"
152"phone<br><br>Tap on the screen to start"
133msgstr ""
153msgstr ""
134
154
135−#: qml/Components/Lockscreen.qml:167
155+#: qml/Components/Lockscreen.qml:220
136−msgid "Please wait"
137−msgstr ""
138−
139−#: qml/Components/Lockscreen.qml:172
140−msgid "Too many incorrect attempts"
141−msgstr ""
142−
143−#: qml/Components/Lockscreen.qml:206
144msgid "Emergency Call"
156msgid "Emergency Call"
145msgstr "Tísňové volání"
157msgstr "Tísňové volání"
146
158
147−#: qml/Components/Lockscreen.qml:226
159+#: qml/Components/Lockscreen.qml:252
148msgid "OK"
160msgid "OK"
149msgstr ""
161msgstr ""
150
162
151−#: qml/Components/PassphraseLockscreen.qml:61
152−#, qt-format
153−msgid "Hello %1"
154−msgstr "Ahoj %1"
155−
156−#: qml/Components/PassphraseLockscreen.qml:61
157−msgid "Hello"
158−msgstr "Ahoj"
159−
160−#: qml/Dash/GenericScopeView.qml:411 qml/Dash/GenericScopeView.qml:533
163+#: qml/Dash/GenericScopeView.qml:434 qml/Dash/GenericScopeView.qml:591
161msgid "See less"
164msgid "See less"
162msgstr ""
165msgstr ""
163
166
164−#: qml/Dash/GenericScopeView.qml:411
167+#: qml/Dash/GenericScopeView.qml:434
165msgid "See all"
168msgid "See all"
166msgstr ""
169msgstr ""
167
170
168−#: qml/Dash/GenericScopeView.qml:473 qml/Dash/PageHeader.qml:258
171+#: qml/Dash/GenericScopeView.qml:496 qml/Dash/PageHeader.qml:258
169#: qml/Panel/SearchIndicator.qml:27
172#: qml/Panel/SearchIndicator.qml:27
170msgid "Search"
173msgid "Search"
171msgstr "Hledat"
174msgstr "Hledat"
@@ -202,6 +205,14 @@ msgstr "Přidat recenzi"
202msgid "Send"
205msgid "Send"
203msgstr "Odeslat"
206msgstr "Odeslat"
204
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+
205#: qml/Dash/ScopesOverview.qml:206
216#: qml/Dash/ScopesOverview.qml:206
206msgid "Manage Scopes"
217msgid "Manage Scopes"
207msgstr ""
218msgstr ""
@@ -223,7 +234,7 @@ msgid "All"
223msgstr ""
234msgstr ""
224
235
225#: qml/Greeter/Greeter.qml:157
236#: qml/Greeter/Greeter.qml:157
226−msgid "Swipe to unlock"
237+msgid "Unlock"
227msgstr ""
238msgstr ""
228
239
229#: qml/Hud/HudParametrizedActionsPage.qml:139
240#: qml/Hud/HudParametrizedActionsPage.qml:139
@@ -246,18 +257,10 @@ msgstr "Mluvte..."
246msgid "Speaking..."
257msgid "Speaking..."
247msgstr "Mluvte..."
258msgstr "Mluvte..."
248
259
249−#: qml/Notifications/NotificationMenuItemFactory.qml:108
260+#: qml/Notifications/NotificationMenuItemFactory.qml:116
250msgid "Show password"
261msgid "Show password"
251msgstr "Zobrazit heslo"
262msgstr "Zobrazit heslo"
252
263
253−#: qml/Notifications/NotificationMenuItemFactory.qml:124
254−msgid "Enter SIM PIN"
255−msgstr ""
256−
257−#: qml/Notifications/NotificationMenuItemFactory.qml:125
258−msgid "Sorry, incorrect PIN"
259−msgstr ""
260−
261#: qml/Panel/ActiveCallHint.qml:77
264#: qml/Panel/ActiveCallHint.qml:77
262msgid "Tap to return to call..."
265msgid "Tap to return to call..."
263msgstr ""
266msgstr ""
@@ -302,51 +305,55 @@ msgstr ""
302msgid "Roaming"
305msgid "Roaming"
303msgstr ""
306msgstr ""
304
307
305−#: qml/Shell.qml:320
308+#: qml/Shell.qml:346
306−msgid "Enter your passphrase"
309+msgid "Enter passphrase"
307msgstr ""
310msgstr ""
308
311
309−#: qml/Shell.qml:321
312+#: qml/Shell.qml:347
310msgid "Sorry, incorrect passphrase"
313msgid "Sorry, incorrect passphrase"
311msgstr ""
314msgstr ""
312
315
313−#: qml/Shell.qml:323
316+#: qml/Shell.qml:348
317+msgid "Please re-enter"
318+msgstr ""
319+
320+#: qml/Shell.qml:350
314−msgid "Enter your passcode"
321+msgid "Enter passcode"
315msgstr ""
322msgstr ""
316
323
317−#: qml/Shell.qml:324
324+#: qml/Shell.qml:351
318msgid "Sorry, incorrect passcode"
325msgid "Sorry, incorrect passcode"
319msgstr ""
326msgstr ""
320
327
321−#: qml/Shell.qml:327
328+#: qml/Shell.qml:354
322#, qt-format
329#, qt-format
323−msgid "Enter your %1"
330+msgid "Enter %1"
324msgstr ""
331msgstr ""
325
332
326−#: qml/Shell.qml:328
333+#: qml/Shell.qml:355
327#, qt-format
334#, qt-format
328msgid "Sorry, incorrect %1"
335msgid "Sorry, incorrect %1"
329msgstr ""
336msgstr ""
330
337
331−#: qml/Shell.qml:363
338+#: qml/Shell.qml:390
332msgid "Sorry, incorrect passphrase."
339msgid "Sorry, incorrect passphrase."
333msgstr ""
340msgstr ""
334
341
335−#: qml/Shell.qml:364
342+#: qml/Shell.qml:391
336msgid "Sorry, incorrect passcode."
343msgid "Sorry, incorrect passcode."
337msgstr ""
344msgstr ""
338
345
339−#: qml/Shell.qml:365
346+#: qml/Shell.qml:392
340msgid "This will be your last attempt."
347msgid "This will be your last attempt."
341msgstr ""
348msgstr ""
342
349
343−#: qml/Shell.qml:367
350+#: qml/Shell.qml:394
344msgid ""
351msgid ""
345"If passphrase is entered incorrectly, your phone will conduct a factory "
352"If passphrase is entered incorrectly, your phone will conduct a factory "
346"reset and all personal data will be deleted."
353"reset and all personal data will be deleted."
347msgstr ""
354msgstr ""
348
355
349−#: qml/Shell.qml:368
356+#: qml/Shell.qml:395
350msgid ""
357msgid ""
351"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 "
352"and all personal data will be deleted."
359"and all personal data will be deleted."
po/da.po+56−49
@@ -8,14 +8,15 @@ msgid ""
8msgstr ""
8msgstr ""
9"Project-Id-Version: unity8\n"
9"Project-Id-Version: unity8\n"
10"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
11−"POT-Creation-Date: 2014-09-24 10:43+0100\n"
11+"POT-Creation-Date: 2014-10-07 11:37+0300\n"
12"PO-Revision-Date: 2014-07-30 12:37+0000\n"
12"PO-Revision-Date: 2014-07-30 12:37+0000\n"
13"Last-Translator: Ask Hjorth Larsen <asklarsen@gmail.com>\n"
13"Last-Translator: Ask Hjorth Larsen <asklarsen@gmail.com>\n"
14"Language-Team: Danish <dansk@dansk-gruppen.dk>\n"
14"Language-Team: Danish <dansk@dansk-gruppen.dk>\n"
15"MIME-Version: 1.0\n"
15"MIME-Version: 1.0\n"
16"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Type: text/plain; charset=UTF-8\n"
17"Content-Transfer-Encoding: 8bit\n"
17"Content-Transfer-Encoding: 8bit\n"
18+"Plural-Forms: nplurals=2; plural=n != 1;\n"
18−"X-Launchpad-Export-Date: 2014-09-29 05:19+0000\n"
19+"X-Launchpad-Export-Date: 2014-10-09 06:36+0000\n"
19"X-Generator: Launchpad (build 17196)\n"
20"X-Generator: Launchpad (build 17196)\n"
20
21
21#: plugins/LightDM/Greeter.cpp:130
22#: plugins/LightDM/Greeter.cpp:130
@@ -31,6 +32,25 @@ msgstr "Fastgør genvej"
31msgid "Unpin shortcut"
32msgid "Unpin shortcut"
32msgstr "Gør genvej flytbar"
33msgstr "Gør genvej flytbar"
33
34
35+#: qml/Components/DelayedLockscreen.qml:47
36+msgid "Device Locked"
37+msgstr ""
38+
39+#: qml/Components/DelayedLockscreen.qml:62
40+msgid "You have been locked out due to too many failed passphrase attempts."
41+msgstr ""
42+
43+#: qml/Components/DelayedLockscreen.qml:63
44+msgid "You have been locked out due to too many failed passcode attempts."
45+msgstr ""
46+
47+#: qml/Components/DelayedLockscreen.qml:72
48+#, qt-format
49+msgid "Please wait %1 minute and then try again…"
50+msgid_plural "Please wait %1 minutes and then try again…"
51+msgstr[0] ""
52+msgstr[1] ""
53+
34#: qml/Components/Dialogs.qml:70
54#: qml/Components/Dialogs.qml:70
35msgid "Log out"
55msgid "Log out"
36msgstr ""
56msgstr ""
@@ -135,40 +155,23 @@ msgstr ""
135"Du mestrer nu kantbevægelserne og kan begynde at bruge telefonen<br><br>Tryk "
155"Du mestrer nu kantbevægelserne og kan begynde at bruge telefonen<br><br>Tryk "
136"på skærmen for at starte"
156"på skærmen for at starte"
137
157
138−#: qml/Components/Lockscreen.qml:167
158+#: qml/Components/Lockscreen.qml:220
139−msgid "Please wait"
140−msgstr ""
141−
142−#: qml/Components/Lockscreen.qml:172
143−msgid "Too many incorrect attempts"
144−msgstr ""
145−
146−#: qml/Components/Lockscreen.qml:206
147msgid "Emergency Call"
159msgid "Emergency Call"
148msgstr "Nødopkald"
160msgstr "Nødopkald"
149
161
150−#: qml/Components/Lockscreen.qml:226
162+#: qml/Components/Lockscreen.qml:252
151msgid "OK"
163msgid "OK"
152msgstr "O.k."
164msgstr "O.k."
153
165
154−#: qml/Components/PassphraseLockscreen.qml:61
155−#, qt-format
156−msgid "Hello %1"
157−msgstr "Hej %1"
158−
159−#: qml/Components/PassphraseLockscreen.qml:61
160−msgid "Hello"
161−msgstr "Hej"
162−
163−#: qml/Dash/GenericScopeView.qml:411 qml/Dash/GenericScopeView.qml:533
166+#: qml/Dash/GenericScopeView.qml:434 qml/Dash/GenericScopeView.qml:591
164msgid "See less"
167msgid "See less"
165msgstr "Vis mindre"
168msgstr "Vis mindre"
166
169
167−#: qml/Dash/GenericScopeView.qml:411
170+#: qml/Dash/GenericScopeView.qml:434
168msgid "See all"
171msgid "See all"
169msgstr "Se alle"
172msgstr "Se alle"
170
173
171−#: qml/Dash/GenericScopeView.qml:473 qml/Dash/PageHeader.qml:258
174+#: qml/Dash/GenericScopeView.qml:496 qml/Dash/PageHeader.qml:258
172#: qml/Panel/SearchIndicator.qml:27
175#: qml/Panel/SearchIndicator.qml:27
173msgid "Search"
176msgid "Search"
174msgstr "Søg"
177msgstr "Søg"
@@ -205,6 +208,14 @@ msgstr "Tilføj en forhåndsvisning"
205msgid "Send"
208msgid "Send"
206msgstr "Send"
209msgstr "Send"
207
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+
208#: qml/Dash/ScopesOverview.qml:206
219#: qml/Dash/ScopesOverview.qml:206
209msgid "Manage Scopes"
220msgid "Manage Scopes"
210msgstr ""
221msgstr ""
@@ -226,8 +237,8 @@ msgid "All"
226msgstr ""
237msgstr ""
227
238
228#: qml/Greeter/Greeter.qml:157
239#: qml/Greeter/Greeter.qml:157
229−msgid "Swipe to unlock"
240+msgid "Unlock"
230−msgstr "Stryg for at låse op"
241+msgstr ""
231
242
232#: qml/Hud/HudParametrizedActionsPage.qml:139
243#: qml/Hud/HudParametrizedActionsPage.qml:139
233msgid "Confirm"
244msgid "Confirm"
@@ -249,18 +260,10 @@ msgstr "Tal nu..."
249msgid "Speaking..."
260msgid "Speaking..."
250msgstr "Taler..."
261msgstr "Taler..."
251
262
252−#: qml/Notifications/NotificationMenuItemFactory.qml:108
263+#: qml/Notifications/NotificationMenuItemFactory.qml:116
253msgid "Show password"
264msgid "Show password"
254msgstr "Vis adgangskode"
265msgstr "Vis adgangskode"
255
266
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
267#: qml/Panel/ActiveCallHint.qml:77
265msgid "Tap to return to call..."
268msgid "Tap to return to call..."
266msgstr "Tryk for at besvare opkaldet..."
269msgstr "Tryk for at besvare opkaldet..."
@@ -305,51 +308,55 @@ msgstr ""
305msgid "Roaming"
308msgid "Roaming"
306msgstr ""
309msgstr ""
307
310
308−#: qml/Shell.qml:320
311+#: qml/Shell.qml:346
309−msgid "Enter your passphrase"
312+msgid "Enter passphrase"
310msgstr ""
313msgstr ""
311
314
312−#: qml/Shell.qml:321
315+#: qml/Shell.qml:347
313msgid "Sorry, incorrect passphrase"
316msgid "Sorry, incorrect passphrase"
314msgstr ""
317msgstr ""
315
318
316−#: qml/Shell.qml:323
319+#: qml/Shell.qml:348
320+msgid "Please re-enter"
321+msgstr ""
322+
323+#: qml/Shell.qml:350
317−msgid "Enter your passcode"
324+msgid "Enter passcode"
318msgstr ""
325msgstr ""
319
326
320−#: qml/Shell.qml:324
327+#: qml/Shell.qml:351
321msgid "Sorry, incorrect passcode"
328msgid "Sorry, incorrect passcode"
322msgstr ""
329msgstr ""
323
330
324−#: qml/Shell.qml:327
331+#: qml/Shell.qml:354
325#, qt-format
332#, qt-format
326−msgid "Enter your %1"
333+msgid "Enter %1"
327msgstr ""
334msgstr ""
328
335
329−#: qml/Shell.qml:328
336+#: qml/Shell.qml:355
330#, qt-format
337#, qt-format
331msgid "Sorry, incorrect %1"
338msgid "Sorry, incorrect %1"
332msgstr ""
339msgstr ""
333
340
334−#: qml/Shell.qml:363
341+#: qml/Shell.qml:390
335msgid "Sorry, incorrect passphrase."
342msgid "Sorry, incorrect passphrase."
336msgstr ""
343msgstr ""
337
344
338−#: qml/Shell.qml:364
345+#: qml/Shell.qml:391
339msgid "Sorry, incorrect passcode."
346msgid "Sorry, incorrect passcode."
340msgstr ""
347msgstr ""
341
348
342−#: qml/Shell.qml:365
349+#: qml/Shell.qml:392
343msgid "This will be your last attempt."
350msgid "This will be your last attempt."
344msgstr ""
351msgstr ""
345
352
346−#: qml/Shell.qml:367
353+#: qml/Shell.qml:394
347msgid ""
354msgid ""
348"If passphrase is entered incorrectly, your phone will conduct a factory "
355"If passphrase is entered incorrectly, your phone will conduct a factory "
349"reset and all personal data will be deleted."
356"reset and all personal data will be deleted."
350msgstr ""
357msgstr ""
351
358
352−#: qml/Shell.qml:368
359+#: qml/Shell.qml:395
353msgid ""
360msgid ""
354"If passcode is entered incorrectly, your phone will conduct a factory reset "
361"If passcode is entered incorrectly, your phone will conduct a factory reset "
355"and all personal data will be deleted."
362"and all personal data will be deleted."
po/de.po+73−63
@@ -7,29 +7,49 @@ msgid ""
7msgstr ""
7msgstr ""
8"Project-Id-Version: unity\n"
8"Project-Id-Version: unity\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2014-09-24 10:43+0100\n"
10+"POT-Creation-Date: 2014-10-07 11:37+0300\n"
11"PO-Revision-Date: 2014-09-29 06:33+0000\n"
11"PO-Revision-Date: 2014-09-29 06:33+0000\n"
12"Last-Translator: Niklas Wenzel <nikwen.developer@gmail.com>\n"
12"Last-Translator: Niklas Wenzel <nikwen.developer@gmail.com>\n"
13"Language-Team: German <de@li.org>\n"
13"Language-Team: German <de@li.org>\n"
14"MIME-Version: 1.0\n"
14"MIME-Version: 1.0\n"
15"Content-Type: text/plain; charset=UTF-8\n"
15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n"
16"Content-Transfer-Encoding: 8bit\n"
17+"Plural-Forms: nplurals=2; plural=n != 1;\n"
17−"X-Launchpad-Export-Date: 2014-09-30 07:10+0000\n"
18+"X-Launchpad-Export-Date: 2014-10-09 06:36+0000\n"
18"X-Generator: Launchpad (build 17196)\n"
19"X-Generator: Launchpad (build 17196)\n"
19
20
20#: plugins/LightDM/Greeter.cpp:130
21#: plugins/LightDM/Greeter.cpp:130
21msgid "Password: "
22msgid "Password: "
22msgstr "Passwort: "
23msgstr "Passwort: "
23
24
24−#: plugins/Unity/Launcher/launcheritem.cpp:44
25+#: plugins/Unity/Launcher/launcheritem.cpp:45
25−#: plugins/Unity/Launcher/launcheritem.cpp:74
26+#: plugins/Unity/Launcher/launcheritem.cpp:91
26msgid "Pin shortcut"
27msgid "Pin shortcut"
27msgstr "Verknüpfung anheften"
28msgstr "Verknüpfung anheften"
28
29
29−#: plugins/Unity/Launcher/launcheritem.cpp:74
30+#: plugins/Unity/Launcher/launcheritem.cpp:91
30msgid "Unpin shortcut"
31msgid "Unpin shortcut"
31msgstr "Verknüpfung entfernen"
32msgstr "Verknüpfung entfernen"
32
33
34+#: qml/Components/DelayedLockscreen.qml:47
35+msgid "Device Locked"
36+msgstr ""
37+
38+#: qml/Components/DelayedLockscreen.qml:62
39+msgid "You have been locked out due to too many failed passphrase attempts."
40+msgstr ""
41+
42+#: qml/Components/DelayedLockscreen.qml:63
43+msgid "You have been locked out due to too many failed passcode attempts."
44+msgstr ""
45+
46+#: qml/Components/DelayedLockscreen.qml:72
47+#, qt-format
48+msgid "Please wait %1 minute and then try again…"
49+msgid_plural "Please wait %1 minutes and then try again…"
50+msgstr[0] ""
51+msgstr[1] ""
52+
33#: qml/Components/Dialogs.qml:70
53#: qml/Components/Dialogs.qml:70
34msgid "Log out"
54msgid "Log out"
35msgstr "Abmelden"
55msgstr "Abmelden"
@@ -139,40 +159,23 @@ msgstr ""
139"Sie haben nun die Kantengesten erfolgreich erlernt und können das Telefon "
159"Sie haben nun die Kantengesten erfolgreich erlernt und können das Telefon "
140"nun nutzen<br><br>Zum Starten auf den Bildschirm tippen"
160"nun nutzen<br><br>Zum Starten auf den Bildschirm tippen"
141
161
142−#: qml/Components/Lockscreen.qml:167
162+#: qml/Components/Lockscreen.qml:220
143−msgid "Please wait"
144−msgstr "Bitte warten"
145−
146−#: qml/Components/Lockscreen.qml:172
147−msgid "Too many incorrect attempts"
148−msgstr "Zu viele falsche Versuche"
149−
150−#: qml/Components/Lockscreen.qml:206
151msgid "Emergency Call"
163msgid "Emergency Call"
152msgstr "Notruf"
164msgstr "Notruf"
153
165
154−#: qml/Components/Lockscreen.qml:226
166+#: qml/Components/Lockscreen.qml:252
155msgid "OK"
167msgid "OK"
156msgstr "OK"
168msgstr "OK"
157
169
158−#: qml/Components/PassphraseLockscreen.qml:61
159−#, qt-format
160−msgid "Hello %1"
161−msgstr "Hallo %1"
162−
163−#: qml/Components/PassphraseLockscreen.qml:61
164−msgid "Hello"
165−msgstr "Hallo"
166−
167−#: qml/Dash/GenericScopeView.qml:364 qml/Dash/GenericScopeView.qml:483
170+#: qml/Dash/GenericScopeView.qml:434 qml/Dash/GenericScopeView.qml:591
168msgid "See less"
171msgid "See less"
169msgstr "Weniger ansehen"
172msgstr "Weniger ansehen"
170
173
171−#: qml/Dash/GenericScopeView.qml:364
174+#: qml/Dash/GenericScopeView.qml:434
172msgid "See all"
175msgid "See all"
173msgstr "Alle anzeigen"
176msgstr "Alle anzeigen"
174
177
175−#: qml/Dash/GenericScopeView.qml:427 qml/Dash/PageHeader.qml:258
178+#: qml/Dash/GenericScopeView.qml:496 qml/Dash/PageHeader.qml:258
176#: qml/Panel/SearchIndicator.qml:27
179#: qml/Panel/SearchIndicator.qml:27
177msgid "Search"
180msgid "Search"
178msgstr "Suchen"
181msgstr "Suchen"
@@ -209,6 +212,14 @@ msgstr "Bewertung hinzufügen"
209msgid "Send"
212msgid "Send"
210msgstr "Senden"
213msgstr "Senden"
211
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+
212#: qml/Dash/ScopesOverview.qml:206
223#: qml/Dash/ScopesOverview.qml:206
213msgid "Manage Scopes"
224msgid "Manage Scopes"
214msgstr "Filter verwalten"
225msgstr "Filter verwalten"
@@ -230,8 +241,8 @@ msgid "All"
230msgstr "Alle"
241msgstr "Alle"
231
242
232#: qml/Greeter/Greeter.qml:157
243#: qml/Greeter/Greeter.qml:157
233−msgid "Swipe to unlock"
244+msgid "Unlock"
234−msgstr "Wischen zum Entsperren"
245+msgstr ""
235
246
236#: qml/Hud/HudParametrizedActionsPage.qml:139
247#: qml/Hud/HudParametrizedActionsPage.qml:139
237msgid "Confirm"
248msgid "Confirm"
@@ -253,18 +264,10 @@ msgstr "Sprechen Sie jetzt …"
253msgid "Speaking..."
264msgid "Speaking..."
254msgstr "Sprechen Sie …"
265msgstr "Sprechen Sie …"
255
266
256−#: qml/Notifications/NotificationMenuItemFactory.qml:108
267+#: qml/Notifications/NotificationMenuItemFactory.qml:116
257msgid "Show password"
268msgid "Show password"
258msgstr "Passwort anzeigen"
269msgstr "Passwort anzeigen"
259
270
260−#: qml/Notifications/NotificationMenuItemFactory.qml:124
261−msgid "Enter SIM PIN"
262−msgstr "Geben Sie die SIM-PIN ein"
263−
264−#: qml/Notifications/NotificationMenuItemFactory.qml:125
265−msgid "Sorry, incorrect PIN"
266−msgstr "Die PIN ist nicht korrekt"
267−
268#: qml/Panel/ActiveCallHint.qml:77
271#: qml/Panel/ActiveCallHint.qml:77
269msgid "Tap to return to call..."
272msgid "Tap to return to call..."
270msgstr "Tippen um zum Anruf zurückzugehen"
273msgstr "Tippen um zum Anruf zurückzugehen"
@@ -277,27 +280,27 @@ msgstr "Konferenz"
277msgid "Nothing is playing"
280msgid "Nothing is playing"
278msgstr "Nichts wird abgespielt"
281msgstr "Nichts wird abgespielt"
279
282
280−#: qml/Panel/Indicators/MenuItemFactory.qml:651
283+#: qml/Panel/Indicators/MenuItemFactory.qml:748
281msgid "In queue…"
284msgid "In queue…"
282msgstr "In Warteschlange …"
285msgstr "In Warteschlange …"
283
286
284−#: qml/Panel/Indicators/MenuItemFactory.qml:655
287+#: qml/Panel/Indicators/MenuItemFactory.qml:752
285msgid "Downloading"
288msgid "Downloading"
286msgstr "Wird heruntergeladen"
289msgstr "Wird heruntergeladen"
287
290
288−#: qml/Panel/Indicators/MenuItemFactory.qml:657
291+#: qml/Panel/Indicators/MenuItemFactory.qml:754
289msgid "Paused, tap to resume"
292msgid "Paused, tap to resume"
290msgstr "Pausiert, tippen Sie zum fortsetzen"
293msgstr "Pausiert, tippen Sie zum fortsetzen"
291
294
292−#: qml/Panel/Indicators/MenuItemFactory.qml:659
295+#: qml/Panel/Indicators/MenuItemFactory.qml:756
293msgid "Canceled"
296msgid "Canceled"
294msgstr "Abgebrochen"
297msgstr "Abgebrochen"
295
298
296−#: qml/Panel/Indicators/MenuItemFactory.qml:661
299+#: qml/Panel/Indicators/MenuItemFactory.qml:758
297msgid "Finished"
300msgid "Finished"
298msgstr "Erledigt"
301msgstr "Erledigt"
299
302
300−#: qml/Panel/Indicators/MenuItemFactory.qml:663
303+#: qml/Panel/Indicators/MenuItemFactory.qml:760
301msgid "Failed, tap to retry"
304msgid "Failed, tap to retry"
302msgstr "Fehlgeschlagen, tippen Sie zum Wiederholen"
305msgstr "Fehlgeschlagen, tippen Sie zum Wiederholen"
303
306
@@ -309,45 +312,49 @@ msgstr "SIM-Karte entsperren"
309msgid "Roaming"
312msgid "Roaming"
310msgstr "Roaming"
313msgstr "Roaming"
311
314
312−#: qml/Shell.qml:292
315+#: qml/Shell.qml:346
313−msgid "Enter your passphrase"
316+msgid "Enter passphrase"
314−msgstr "Geben Sie Ihr Passwort ein"
317+msgstr ""
315
318
316−#: qml/Shell.qml:293
319+#: qml/Shell.qml:347
317msgid "Sorry, incorrect passphrase"
320msgid "Sorry, incorrect passphrase"
318msgstr "Das Passwort ist nicht korrekt"
321msgstr "Das Passwort ist nicht korrekt"
319
322
320−#: qml/Shell.qml:295
323+#: qml/Shell.qml:348
324+msgid "Please re-enter"
325+msgstr ""
326+
327+#: qml/Shell.qml:350
321−msgid "Enter your passcode"
328+msgid "Enter passcode"
322−msgstr "Passwort eingeben"
329+msgstr ""
323
330
324−#: qml/Shell.qml:296
331+#: qml/Shell.qml:351
325msgid "Sorry, incorrect passcode"
332msgid "Sorry, incorrect passcode"
326msgstr "Falsches Passwort"
333msgstr "Falsches Passwort"
327
334
328−#: qml/Shell.qml:299
335+#: qml/Shell.qml:354
329#, qt-format
336#, qt-format
330−msgid "Enter your %1"
337+msgid "Enter %1"
331−msgstr "%1 eingeben"
338+msgstr ""
332
339
333−#: qml/Shell.qml:300
340+#: qml/Shell.qml:355
334#, qt-format
341#, qt-format
335msgid "Sorry, incorrect %1"
342msgid "Sorry, incorrect %1"
336msgstr "%1 falsch"
343msgstr "%1 falsch"
337
344
338−#: qml/Shell.qml:335
345+#: qml/Shell.qml:390
339msgid "Sorry, incorrect passphrase."
346msgid "Sorry, incorrect passphrase."
340msgstr "Falsches Passwort."
347msgstr "Falsches Passwort."
341
348
342−#: qml/Shell.qml:336
349+#: qml/Shell.qml:391
343msgid "Sorry, incorrect passcode."
350msgid "Sorry, incorrect passcode."
344msgstr "Falsche PIN"
351msgstr "Falsche PIN"
345
352
346−#: qml/Shell.qml:337
353+#: qml/Shell.qml:392
347msgid "This will be your last attempt."
354msgid "This will be your last attempt."
348msgstr "Dies ist Ihr letzter Versuch."
355msgstr "Dies ist Ihr letzter Versuch."
349
356
350−#: qml/Shell.qml:339
357+#: qml/Shell.qml:394
351msgid ""
358msgid ""
352"If passphrase is entered incorrectly, your phone will conduct a factory "
359"If passphrase is entered incorrectly, your phone will conduct a factory "
353"reset and all personal data will be deleted."
360"reset and all personal data will be deleted."
@@ -355,7 +362,7 @@ msgstr ""
355"Wird das Passwort falsch eingegeben, wird das Telefon auf den Werkszustand "
362"Wird das Passwort falsch eingegeben, wird das Telefon auf den Werkszustand "
356"zurückgesetzt und alle Daten werden gelöscht."
363"zurückgesetzt und alle Daten werden gelöscht."
357
364
358−#: qml/Shell.qml:340
365+#: qml/Shell.qml:395
359msgid ""
366msgid ""
360"If passcode is entered incorrectly, your phone will conduct a factory reset "
367"If passcode is entered incorrectly, your phone will conduct a factory reset "
361"and all personal data will be deleted."
368"and all personal data will be deleted."
@@ -363,5 +370,8 @@ msgstr ""
363"Wird die PIN falsch eingegeben, wird das Telefon auf den Werkszustand "
370"Wird die PIN falsch eingegeben, wird das Telefon auf den Werkszustand "
364"zurückgesetzt und alle Daten werden gelöscht."
371"zurückgesetzt und alle Daten werden gelöscht."
365
372
366−#~ msgid "Manage Dash"
373+#~ msgid "Sorry, incorrect PIN"
367−#~ msgstr "Dash verwalten"
374+#~ msgstr "Die PIN ist nicht korrekt"
375+
376+#~ msgid "Enter SIM PIN"
377+#~ msgstr "Geben Sie die SIM-PIN ein"
po/el.po+57−50
@@ -7,14 +7,15 @@ msgid ""
7msgstr ""
7msgstr ""
8"Project-Id-Version: unity\n"
8"Project-Id-Version: unity\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2014-09-24 10:43+0100\n"
10+"POT-Creation-Date: 2014-10-07 11:37+0300\n"
11"PO-Revision-Date: 2014-08-21 12:06+0000\n"
11"PO-Revision-Date: 2014-08-21 12:06+0000\n"
12"Last-Translator: Chris Taklis (aka Kailor) <ctaklis@gmail.com>\n"
12"Last-Translator: Chris Taklis (aka Kailor) <ctaklis@gmail.com>\n"
13"Language-Team: Greek <el@li.org>\n"
13"Language-Team: Greek <el@li.org>\n"
14"MIME-Version: 1.0\n"
14"MIME-Version: 1.0\n"
15"Content-Type: text/plain; charset=UTF-8\n"
15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n"
16"Content-Transfer-Encoding: 8bit\n"
17+"Plural-Forms: nplurals=2; plural=n != 1;\n"
17−"X-Launchpad-Export-Date: 2014-09-29 05:19+0000\n"
18+"X-Launchpad-Export-Date: 2014-10-09 06:36+0000\n"
18"X-Generator: Launchpad (build 17196)\n"
19"X-Generator: Launchpad (build 17196)\n"
19
20
20#: plugins/LightDM/Greeter.cpp:130
21#: plugins/LightDM/Greeter.cpp:130
@@ -30,6 +31,25 @@ msgstr "Καρφίτσωμα συντόμευσης"
30msgid "Unpin shortcut"
31msgid "Unpin shortcut"
31msgstr "Ξεκαρφίτσωμα συντόμευσης"
32msgstr "Ξεκαρφίτσωμα συντόμευσης"
32
33
34+#: qml/Components/DelayedLockscreen.qml:47
35+msgid "Device Locked"
36+msgstr ""
37+
38+#: qml/Components/DelayedLockscreen.qml:62
39+msgid "You have been locked out due to too many failed passphrase attempts."
40+msgstr ""
41+
42+#: qml/Components/DelayedLockscreen.qml:63
43+msgid "You have been locked out due to too many failed passcode attempts."
44+msgstr ""
45+
46+#: qml/Components/DelayedLockscreen.qml:72
47+#, qt-format
48+msgid "Please wait %1 minute and then try again…"
49+msgid_plural "Please wait %1 minutes and then try again…"
50+msgstr[0] ""
51+msgstr[1] ""
52+
33#: qml/Components/Dialogs.qml:70
53#: qml/Components/Dialogs.qml:70
34msgid "Log out"
54msgid "Log out"
35msgstr ""
55msgstr ""
@@ -136,40 +156,23 @@ msgstr ""
136"Πλέον γνωρίζετε τις χειρονομίες από τα άκρα και μπορείτε να ξεκινήσετε να "
156"Πλέον γνωρίζετε τις χειρονομίες από τα άκρα και μπορείτε να ξεκινήσετε να "
137"χρησιμοποιείτε το τηλέφωνο<br><br>Αγγίξτε την οθόνη για να ξεκινήσετε"
157"χρησιμοποιείτε το τηλέφωνο<br><br>Αγγίξτε την οθόνη για να ξεκινήσετε"
138
158
139−#: qml/Components/Lockscreen.qml:167
159+#: qml/Components/Lockscreen.qml:220
140−msgid "Please wait"
141−msgstr "Παρακαλώ περιμένετε"
142−
143−#: qml/Components/Lockscreen.qml:172
144−msgid "Too many incorrect attempts"
145−msgstr "Πολλές άκυρες προσπάθειες"
146−
147−#: qml/Components/Lockscreen.qml:206
148msgid "Emergency Call"
160msgid "Emergency Call"
149msgstr "Κλήση έκτακτης ανάγκης"
161msgstr "Κλήση έκτακτης ανάγκης"
150
162
151−#: qml/Components/Lockscreen.qml:226
163+#: qml/Components/Lockscreen.qml:252
152msgid "OK"
164msgid "OK"
153msgstr "OK"
165msgstr "OK"
154
166
155−#: qml/Components/PassphraseLockscreen.qml:61
156−#, qt-format
157−msgid "Hello %1"
158−msgstr "Γεια σας %1"
159−
160−#: qml/Components/PassphraseLockscreen.qml:61
161−msgid "Hello"
162−msgstr "Γεια σας"
163−
164−#: qml/Dash/GenericScopeView.qml:411 qml/Dash/GenericScopeView.qml:533
167+#: qml/Dash/GenericScopeView.qml:434 qml/Dash/GenericScopeView.qml:591
165msgid "See less"
168msgid "See less"
166msgstr "Λιγότερα"
169msgstr "Λιγότερα"
167
170
168−#: qml/Dash/GenericScopeView.qml:411
171+#: qml/Dash/GenericScopeView.qml:434
169msgid "See all"
172msgid "See all"
170msgstr "Εμφάνιση όλων"
173msgstr "Εμφάνιση όλων"
171
174
172−#: qml/Dash/GenericScopeView.qml:473 qml/Dash/PageHeader.qml:258
175+#: qml/Dash/GenericScopeView.qml:496 qml/Dash/PageHeader.qml:258
173#: qml/Panel/SearchIndicator.qml:27
176#: qml/Panel/SearchIndicator.qml:27
174msgid "Search"
177msgid "Search"
175msgstr "Αναζήτηση"
178msgstr "Αναζήτηση"
@@ -206,6 +209,14 @@ msgstr "Προσθέστε την αξιολόγησή σας"
206msgid "Send"
209msgid "Send"
207msgstr "Αποστολή"
210msgstr "Αποστολή"
208
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+
209#: qml/Dash/ScopesOverview.qml:206
220#: qml/Dash/ScopesOverview.qml:206
210msgid "Manage Scopes"
221msgid "Manage Scopes"
211msgstr ""
222msgstr ""
@@ -227,8 +238,8 @@ msgid "All"
227msgstr "Όλα"
238msgstr "Όλα"
228
239
229#: qml/Greeter/Greeter.qml:157
240#: qml/Greeter/Greeter.qml:157
230−msgid "Swipe to unlock"
241+msgid "Unlock"
231−msgstr "Σύρετε για να ξεκλειδώσετε"
242+msgstr ""
232
243
233#: qml/Hud/HudParametrizedActionsPage.qml:139
244#: qml/Hud/HudParametrizedActionsPage.qml:139
234msgid "Confirm"
245msgid "Confirm"
@@ -250,18 +261,10 @@ msgstr "Μιλήστε τώρα..."
250msgid "Speaking..."
261msgid "Speaking..."
251msgstr "Ομιλία..."
262msgstr "Ομιλία..."
252
263
253−#: qml/Notifications/NotificationMenuItemFactory.qml:108
264+#: qml/Notifications/NotificationMenuItemFactory.qml:116
254msgid "Show password"
265msgid "Show password"
255msgstr "Εμφάνιση κωδικού"
266msgstr "Εμφάνιση κωδικού"
256
267
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
268#: qml/Panel/ActiveCallHint.qml:77
266msgid "Tap to return to call..."
269msgid "Tap to return to call..."
267msgstr "Πατήστε για να γυρίσετε στην κλήση..."
270msgstr "Πατήστε για να γυρίσετε στην κλήση..."
@@ -306,51 +309,55 @@ msgstr "Ξεκλείδωμα SIM"
306msgid "Roaming"
309msgid "Roaming"
307msgstr "Περιαγωγή"
310msgstr "Περιαγωγή"
308
311
309−#: qml/Shell.qml:320
312+#: qml/Shell.qml:346
310−msgid "Enter your passphrase"
313+msgid "Enter passphrase"
311msgstr ""
314msgstr ""
312
315
313−#: qml/Shell.qml:321
316+#: qml/Shell.qml:347
314msgid "Sorry, incorrect passphrase"
317msgid "Sorry, incorrect passphrase"
315msgstr ""
318msgstr ""
316
319
317−#: qml/Shell.qml:323
320+#: qml/Shell.qml:348
318−msgid "Enter your passcode"
321+msgid "Please re-enter"
319msgstr ""
322msgstr ""
320
323
321−#: qml/Shell.qml:324
324+#: qml/Shell.qml:350
325+msgid "Enter passcode"
326+msgstr ""
327+
328+#: qml/Shell.qml:351
322msgid "Sorry, incorrect passcode"
329msgid "Sorry, incorrect passcode"
323msgstr ""
330msgstr ""
324
331
325−#: qml/Shell.qml:327
332+#: qml/Shell.qml:354
326#, qt-format
333#, qt-format
327−msgid "Enter your %1"
334+msgid "Enter %1"
328−msgstr "Εισάγετε το %1"
335+msgstr ""
329
336
330−#: qml/Shell.qml:328
337+#: qml/Shell.qml:355
331#, qt-format
338#, qt-format
332msgid "Sorry, incorrect %1"
339msgid "Sorry, incorrect %1"
333msgstr ""
340msgstr ""
334
341
335−#: qml/Shell.qml:363
342+#: qml/Shell.qml:390
336msgid "Sorry, incorrect passphrase."
343msgid "Sorry, incorrect passphrase."
337msgstr ""
344msgstr ""
338
345
339−#: qml/Shell.qml:364
346+#: qml/Shell.qml:391
340msgid "Sorry, incorrect passcode."
347msgid "Sorry, incorrect passcode."
341msgstr ""
348msgstr ""
342
349
343−#: qml/Shell.qml:365
350+#: qml/Shell.qml:392
344msgid "This will be your last attempt."
351msgid "This will be your last attempt."
345msgstr ""
352msgstr ""
346
353
347−#: qml/Shell.qml:367
354+#: qml/Shell.qml:394
348msgid ""
355msgid ""
349"If passphrase is entered incorrectly, your phone will conduct a factory "
356"If passphrase is entered incorrectly, your phone will conduct a factory "
350"reset and all personal data will be deleted."
357"reset and all personal data will be deleted."
351msgstr ""
358msgstr ""
352
359
353−#: qml/Shell.qml:368
360+#: qml/Shell.qml:395
354msgid ""
361msgid ""
355"If passcode is entered incorrectly, your phone will conduct a factory reset "
362"If passcode is entered incorrectly, your phone will conduct a factory reset "
356"and all personal data will be deleted."
363"and all personal data will be deleted."
po/en_AU.po+64−54
@@ -7,14 +7,15 @@ msgid ""
7msgstr ""
7msgstr ""
8"Project-Id-Version: unity\n"
8"Project-Id-Version: unity\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2014-09-24 10:43+0100\n"
10+"POT-Creation-Date: 2014-10-07 11:37+0300\n"
11"PO-Revision-Date: 2014-09-23 01:24+0000\n"
11"PO-Revision-Date: 2014-09-23 01:24+0000\n"
12"Last-Translator: Jared Norris <jarednorris@ubuntu.com>\n"
12"Last-Translator: Jared Norris <jarednorris@ubuntu.com>\n"
13"Language-Team: English (Australia) <en_AU@li.org>\n"
13"Language-Team: English (Australia) <en_AU@li.org>\n"
14"MIME-Version: 1.0\n"
14"MIME-Version: 1.0\n"
15"Content-Type: text/plain; charset=UTF-8\n"
15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n"
16"Content-Transfer-Encoding: 8bit\n"
17+"Plural-Forms: nplurals=2; plural=n != 1;\n"
17−"X-Launchpad-Export-Date: 2014-09-29 05:20+0000\n"
18+"X-Launchpad-Export-Date: 2014-10-09 06:37+0000\n"
18"X-Generator: Launchpad (build 17196)\n"
19"X-Generator: Launchpad (build 17196)\n"
19
20
20#: plugins/LightDM/Greeter.cpp:130
21#: plugins/LightDM/Greeter.cpp:130
@@ -30,6 +31,25 @@ msgstr "Pin shortcut"
30msgid "Unpin shortcut"
31msgid "Unpin shortcut"
31msgstr "Unpin shortcut"
32msgstr "Unpin shortcut"
32
33
34+#: qml/Components/DelayedLockscreen.qml:47
35+msgid "Device Locked"
36+msgstr ""
37+
38+#: qml/Components/DelayedLockscreen.qml:62
39+msgid "You have been locked out due to too many failed passphrase attempts."
40+msgstr ""
41+
42+#: qml/Components/DelayedLockscreen.qml:63
43+msgid "You have been locked out due to too many failed passcode attempts."
44+msgstr ""
45+
46+#: qml/Components/DelayedLockscreen.qml:72
47+#, qt-format
48+msgid "Please wait %1 minute and then try again…"
49+msgid_plural "Please wait %1 minutes and then try again…"
50+msgstr[0] ""
51+msgstr[1] ""
52+
33#: qml/Components/Dialogs.qml:70
53#: qml/Components/Dialogs.qml:70
34msgid "Log out"
54msgid "Log out"
35msgstr "Log out"
55msgstr "Log out"
@@ -136,40 +156,23 @@ msgstr ""
136"You have now mastered the edge gestures and can start using the "
156"You have now mastered the edge gestures and can start using the "
137"phone<br><br>Tap on the screen to start"
157"phone<br><br>Tap on the screen to start"
138
158
139−#: qml/Components/Lockscreen.qml:167
159+#: qml/Components/Lockscreen.qml:220
140−msgid "Please wait"
141−msgstr "Please wait"
142−
143−#: qml/Components/Lockscreen.qml:172
144−msgid "Too many incorrect attempts"
145−msgstr "Too many incorrect attempts"
146−
147−#: qml/Components/Lockscreen.qml:206
148msgid "Emergency Call"
160msgid "Emergency Call"
149msgstr "Emergency Call"
161msgstr "Emergency Call"
150
162
151−#: qml/Components/Lockscreen.qml:226
163+#: qml/Components/Lockscreen.qml:252
152msgid "OK"
164msgid "OK"
153msgstr "OK"
165msgstr "OK"
154
166
155−#: qml/Components/PassphraseLockscreen.qml:61
156−#, qt-format
157−msgid "Hello %1"
158−msgstr "Hello %1"
159−
160−#: qml/Components/PassphraseLockscreen.qml:61
161−msgid "Hello"
162−msgstr "Hello"
163−
164−#: qml/Dash/GenericScopeView.qml:411 qml/Dash/GenericScopeView.qml:533
167+#: qml/Dash/GenericScopeView.qml:434 qml/Dash/GenericScopeView.qml:591
165msgid "See less"
168msgid "See less"
166msgstr "See less"
169msgstr "See less"
167
170
168−#: qml/Dash/GenericScopeView.qml:411
171+#: qml/Dash/GenericScopeView.qml:434
169msgid "See all"
172msgid "See all"
170msgstr "See all"
173msgstr "See all"
171
174
172−#: qml/Dash/GenericScopeView.qml:473 qml/Dash/PageHeader.qml:258
175+#: qml/Dash/GenericScopeView.qml:496 qml/Dash/PageHeader.qml:258
173#: qml/Panel/SearchIndicator.qml:27
176#: qml/Panel/SearchIndicator.qml:27
174msgid "Search"
177msgid "Search"
175msgstr "Search"
178msgstr "Search"
@@ -206,6 +209,14 @@ msgstr "Add a review"
206msgid "Send"
209msgid "Send"
207msgstr "Send"
210msgstr "Send"
208
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+
209#: qml/Dash/ScopesOverview.qml:206
220#: qml/Dash/ScopesOverview.qml:206
210msgid "Manage Scopes"
221msgid "Manage Scopes"
211msgstr ""
222msgstr ""
@@ -227,8 +238,8 @@ msgid "All"
227msgstr "All"
238msgstr "All"
228
239
229#: qml/Greeter/Greeter.qml:157
240#: qml/Greeter/Greeter.qml:157
230−msgid "Swipe to unlock"
241+msgid "Unlock"
231−msgstr "Swipe to unlock"
242+msgstr ""
232
243
233#: qml/Hud/HudParametrizedActionsPage.qml:139
244#: qml/Hud/HudParametrizedActionsPage.qml:139
234msgid "Confirm"
245msgid "Confirm"
@@ -250,18 +261,10 @@ msgstr "Speak Now..."
250msgid "Speaking..."
261msgid "Speaking..."
251msgstr "Speaking..."
262msgstr "Speaking..."
252
263
253−#: qml/Notifications/NotificationMenuItemFactory.qml:108
264+#: qml/Notifications/NotificationMenuItemFactory.qml:116
254msgid "Show password"
265msgid "Show password"
255msgstr "Show password"
266msgstr "Show password"
256
267
257−#: qml/Notifications/NotificationMenuItemFactory.qml:124
258−msgid "Enter SIM PIN"
259−msgstr "Enter SIM PIN"
260−
261−#: qml/Notifications/NotificationMenuItemFactory.qml:125
262−msgid "Sorry, incorrect PIN"
263−msgstr "Sorry, incorrect PIN"
264−
265#: qml/Panel/ActiveCallHint.qml:77
268#: qml/Panel/ActiveCallHint.qml:77
266msgid "Tap to return to call..."
269msgid "Tap to return to call..."
267msgstr "Tap to return to call..."
270msgstr "Tap to return to call..."
@@ -306,45 +309,49 @@ msgstr "Unlock SIM"
306msgid "Roaming"
309msgid "Roaming"
307msgstr "Roaming"
310msgstr "Roaming"
308
311
309−#: qml/Shell.qml:320
312+#: qml/Shell.qml:346
310−msgid "Enter your passphrase"
313+msgid "Enter passphrase"
311−msgstr "Enter your passphrase"
314+msgstr ""
312
315
313−#: qml/Shell.qml:321
316+#: qml/Shell.qml:347
314msgid "Sorry, incorrect passphrase"
317msgid "Sorry, incorrect passphrase"
315msgstr "Sorry, incorrect passphrase"
318msgstr "Sorry, incorrect passphrase"
316
319
317−#: qml/Shell.qml:323
320+#: qml/Shell.qml:348
318−msgid "Enter your passcode"
321+msgid "Please re-enter"
319−msgstr "Enter your passcode"
322+msgstr ""
323+
324+#: qml/Shell.qml:350
325+msgid "Enter passcode"
326+msgstr ""
320
327
321−#: qml/Shell.qml:324
328+#: qml/Shell.qml:351
322msgid "Sorry, incorrect passcode"
329msgid "Sorry, incorrect passcode"
323msgstr "Sorry, incorrect passcode"
330msgstr "Sorry, incorrect passcode"
324
331
325−#: qml/Shell.qml:327
332+#: qml/Shell.qml:354
326#, qt-format
333#, qt-format
327−msgid "Enter your %1"
334+msgid "Enter %1"
328−msgstr "Enter your %1"
335+msgstr ""
329
336
330−#: qml/Shell.qml:328
337+#: qml/Shell.qml:355
331#, qt-format
338#, qt-format
332msgid "Sorry, incorrect %1"
339msgid "Sorry, incorrect %1"
333msgstr "Sorry, incorrect %1"
340msgstr "Sorry, incorrect %1"
334
341
335−#: qml/Shell.qml:363
342+#: qml/Shell.qml:390
336msgid "Sorry, incorrect passphrase."
343msgid "Sorry, incorrect passphrase."
337msgstr "Sorry, incorrect passphrase."
344msgstr "Sorry, incorrect passphrase."
338
345
339−#: qml/Shell.qml:364
346+#: qml/Shell.qml:391
340msgid "Sorry, incorrect passcode."
347msgid "Sorry, incorrect passcode."
341msgstr "Sorry, incorrect passcode."
348msgstr "Sorry, incorrect passcode."
342
349
343−#: qml/Shell.qml:365
350+#: qml/Shell.qml:392
344msgid "This will be your last attempt."
351msgid "This will be your last attempt."
345msgstr "This will be your last attempt."
352msgstr "This will be your last attempt."
346
353
347−#: qml/Shell.qml:367
354+#: qml/Shell.qml:394
348msgid ""
355msgid ""
349"If passphrase is entered incorrectly, your phone will conduct a factory "
356"If passphrase is entered incorrectly, your phone will conduct a factory "
350"reset and all personal data will be deleted."
357"reset and all personal data will be deleted."
@@ -352,7 +359,7 @@ msgstr ""
352"If passphrase is entered incorrectly, your phone will conduct a factory "
359"If passphrase is entered incorrectly, your phone will conduct a factory "
353"reset and all personal data will be deleted."
360"reset and all personal data will be deleted."
354
361
355−#: qml/Shell.qml:368
362+#: qml/Shell.qml:395
356msgid ""
363msgid ""
357"If passcode is entered incorrectly, your phone will conduct a factory reset "
364"If passcode is entered incorrectly, your phone will conduct a factory reset "
358"and all personal data will be deleted."
365"and all personal data will be deleted."
@@ -360,5 +367,8 @@ msgstr ""
360"If passcode is entered incorrectly, your phone will conduct a factory reset "
367"If passcode is entered incorrectly, your phone will conduct a factory reset "
361"and all personal data will be deleted."
368"and all personal data will be deleted."
362
369
363−#~ msgid "Manage Dash"
370+#~ msgid "Sorry, incorrect PIN"
364−#~ msgstr "Manage Dash"
371+#~ msgstr "Sorry, incorrect PIN"
372+
373+#~ msgid "Enter SIM PIN"
374+#~ msgstr "Enter SIM PIN"
po/en_GB.po+66−56
@@ -7,14 +7,15 @@ msgid ""
7msgstr ""
7msgstr ""
8"Project-Id-Version: unity\n"
8"Project-Id-Version: unity\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2014-09-24 10:43+0100\n"
10+"POT-Creation-Date: 2014-10-07 11:37+0300\n"
11−"PO-Revision-Date: 2014-08-23 13:48+0000\n"
11+"PO-Revision-Date: 2014-10-03 12:46+0000\n"
12−"Last-Translator: Alan Pope ( ͡° ͜ʖ ͡°) <alan@ubuntu.com>\n"
12+"Last-Translator: Andi Chandler <Unknown>\n"
13"Language-Team: English (United Kingdom) <en_GB@li.org>\n"
13"Language-Team: English (United Kingdom) <en_GB@li.org>\n"
14"MIME-Version: 1.0\n"
14"MIME-Version: 1.0\n"
15"Content-Type: text/plain; charset=UTF-8\n"
15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n"
16"Content-Transfer-Encoding: 8bit\n"
17+"Plural-Forms: nplurals=2; plural=n != 1;\n"
17−"X-Launchpad-Export-Date: 2014-09-29 05:20+0000\n"
18+"X-Launchpad-Export-Date: 2014-10-09 06:37+0000\n"
18"X-Generator: Launchpad (build 17196)\n"
19"X-Generator: Launchpad (build 17196)\n"
19
20
20#: plugins/LightDM/Greeter.cpp:130
21#: plugins/LightDM/Greeter.cpp:130
@@ -30,6 +31,25 @@ msgstr "Pin shortcut"
30msgid "Unpin shortcut"
31msgid "Unpin shortcut"
31msgstr "Unpin shortcut"
32msgstr "Unpin shortcut"
32
33
34+#: qml/Components/DelayedLockscreen.qml:47
35+msgid "Device Locked"
36+msgstr "Device Locked"
37+
38+#: qml/Components/DelayedLockscreen.qml:62
39+msgid "You have been locked out due to too many failed passphrase attempts."
40+msgstr "You have been locked out due to too many failed passphrase attempts."
41+
42+#: qml/Components/DelayedLockscreen.qml:63
43+msgid "You have been locked out due to too many failed passcode attempts."
44+msgstr "You have been locked out due to too many failed passcode attempts."
45+
46+#: qml/Components/DelayedLockscreen.qml:72
47+#, qt-format
48+msgid "Please wait %1 minute and then try again…"
49+msgid_plural "Please wait %1 minutes and then try again…"
50+msgstr[0] "Please wait %1 minute and then try again…"
51+msgstr[1] "Please wait %1 minutes and then try again…"
52+
33#: qml/Components/Dialogs.qml:70
53#: qml/Components/Dialogs.qml:70
34msgid "Log out"
54msgid "Log out"
35msgstr "Log out"
55msgstr "Log out"
@@ -136,40 +156,23 @@ msgstr ""
136"You have now mastered the edge gestures and can start using the "
156"You have now mastered the edge gestures and can start using the "
137"phone<br><br>Tap on the screen to start"
157"phone<br><br>Tap on the screen to start"
138
158
139−#: qml/Components/Lockscreen.qml:167
159+#: qml/Components/Lockscreen.qml:220
140−msgid "Please wait"
141−msgstr "Please wait"
142−
143−#: qml/Components/Lockscreen.qml:172
144−msgid "Too many incorrect attempts"
145−msgstr "Too many incorrect attempts"
146−
147−#: qml/Components/Lockscreen.qml:206
148msgid "Emergency Call"
160msgid "Emergency Call"
149msgstr "Emergency Call"
161msgstr "Emergency Call"
150
162
151−#: qml/Components/Lockscreen.qml:226
163+#: qml/Components/Lockscreen.qml:252
152msgid "OK"
164msgid "OK"
153msgstr "OK"
165msgstr "OK"
154
166
155−#: qml/Components/PassphraseLockscreen.qml:61
156−#, qt-format
157−msgid "Hello %1"
158−msgstr "Hello %1"
159−
160−#: qml/Components/PassphraseLockscreen.qml:61
161−msgid "Hello"
162−msgstr "Hello"
163−
164−#: qml/Dash/GenericScopeView.qml:411 qml/Dash/GenericScopeView.qml:533
167+#: qml/Dash/GenericScopeView.qml:434 qml/Dash/GenericScopeView.qml:591
165msgid "See less"
168msgid "See less"
166msgstr "See less"
169msgstr "See less"
167
170
168−#: qml/Dash/GenericScopeView.qml:411
171+#: qml/Dash/GenericScopeView.qml:434
169msgid "See all"
172msgid "See all"
170msgstr "See all"
173msgstr "See all"
171
174
172−#: qml/Dash/GenericScopeView.qml:473 qml/Dash/PageHeader.qml:258
175+#: qml/Dash/GenericScopeView.qml:496 qml/Dash/PageHeader.qml:258
173#: qml/Panel/SearchIndicator.qml:27
176#: qml/Panel/SearchIndicator.qml:27
174msgid "Search"
177msgid "Search"
175msgstr "Search"
178msgstr "Search"
@@ -206,6 +209,14 @@ msgstr "Add a review"
206msgid "Send"
209msgid "Send"
207msgstr "Send"
210msgstr "Send"
208
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+
209#: qml/Dash/ScopesOverview.qml:206
220#: qml/Dash/ScopesOverview.qml:206
210msgid "Manage Scopes"
221msgid "Manage Scopes"
211msgstr "Manage Scopes"
222msgstr "Manage Scopes"
@@ -227,8 +238,8 @@ msgid "All"
227msgstr "All"
238msgstr "All"
228
239
229#: qml/Greeter/Greeter.qml:157
240#: qml/Greeter/Greeter.qml:157
230−msgid "Swipe to unlock"
241+msgid "Unlock"
231−msgstr "Swipe to unlock"
242+msgstr "Unlock"
232
243
233#: qml/Hud/HudParametrizedActionsPage.qml:139
244#: qml/Hud/HudParametrizedActionsPage.qml:139
234msgid "Confirm"
245msgid "Confirm"
@@ -250,18 +261,10 @@ msgstr "Speak Now..."
250msgid "Speaking..."
261msgid "Speaking..."
251msgstr "Speaking..."
262msgstr "Speaking..."
252
263
253−#: qml/Notifications/NotificationMenuItemFactory.qml:108
264+#: qml/Notifications/NotificationMenuItemFactory.qml:116
254msgid "Show password"
265msgid "Show password"
255msgstr "Show password"
266msgstr "Show password"
256
267
257−#: qml/Notifications/NotificationMenuItemFactory.qml:124
258−msgid "Enter SIM PIN"
259−msgstr "Enter SIM PIN"
260−
261−#: qml/Notifications/NotificationMenuItemFactory.qml:125
262−msgid "Sorry, incorrect PIN"
263−msgstr "Sorry, incorrect PIN"
264−
265#: qml/Panel/ActiveCallHint.qml:77
268#: qml/Panel/ActiveCallHint.qml:77
266msgid "Tap to return to call..."
269msgid "Tap to return to call..."
267msgstr "Tap to return to call..."
270msgstr "Tap to return to call..."
@@ -306,45 +309,49 @@ msgstr "Unlock SIM"
306msgid "Roaming"
309msgid "Roaming"
307msgstr "Roaming"
310msgstr "Roaming"
308
311
309−#: qml/Shell.qml:320
312+#: qml/Shell.qml:346
310−msgid "Enter your passphrase"
313+msgid "Enter passphrase"
311−msgstr "Enter your passphrase"
314+msgstr "Enter passphrase"
312
315
313−#: qml/Shell.qml:321
316+#: qml/Shell.qml:347
314msgid "Sorry, incorrect passphrase"
317msgid "Sorry, incorrect passphrase"
315msgstr "Sorry, incorrect passphrase"
318msgstr "Sorry, incorrect passphrase"
316
319
317−#: qml/Shell.qml:323
320+#: qml/Shell.qml:348
318−msgid "Enter your passcode"
321+msgid "Please re-enter"
319−msgstr "Enter your passcode"
322+msgstr "Please re-enter"
320
323
321−#: qml/Shell.qml:324
324+#: qml/Shell.qml:350
325+msgid "Enter passcode"
326+msgstr "Enter passcode"
327+
328+#: qml/Shell.qml:351
322msgid "Sorry, incorrect passcode"
329msgid "Sorry, incorrect passcode"
323msgstr "Sorry, incorrect passcode"
330msgstr "Sorry, incorrect passcode"
324
331
325−#: qml/Shell.qml:327
332+#: qml/Shell.qml:354
326#, qt-format
333#, qt-format
327−msgid "Enter your %1"
334+msgid "Enter %1"
328−msgstr "Enter your %1"
335+msgstr "Enter %1"
329
336
330−#: qml/Shell.qml:328
337+#: qml/Shell.qml:355
331#, qt-format
338#, qt-format
332msgid "Sorry, incorrect %1"
339msgid "Sorry, incorrect %1"
333msgstr "Sorry, incorrect %1"
340msgstr "Sorry, incorrect %1"
334
341
335−#: qml/Shell.qml:363
342+#: qml/Shell.qml:390
336msgid "Sorry, incorrect passphrase."
343msgid "Sorry, incorrect passphrase."
337msgstr "Sorry, incorrect passphrase."
344msgstr "Sorry, incorrect passphrase."
338
345
339−#: qml/Shell.qml:364
346+#: qml/Shell.qml:391
340msgid "Sorry, incorrect passcode."
347msgid "Sorry, incorrect passcode."
341msgstr "Sorry, incorrect passcode."
348msgstr "Sorry, incorrect passcode."
342
349
343−#: qml/Shell.qml:365
350+#: qml/Shell.qml:392
344msgid "This will be your last attempt."
351msgid "This will be your last attempt."
345msgstr "This will be your last attempt."
352msgstr "This will be your last attempt."
346
353
347−#: qml/Shell.qml:367
354+#: qml/Shell.qml:394
348msgid ""
355msgid ""
349"If passphrase is entered incorrectly, your phone will conduct a factory "
356"If passphrase is entered incorrectly, your phone will conduct a factory "
350"reset and all personal data will be deleted."
357"reset and all personal data will be deleted."
@@ -352,7 +359,7 @@ msgstr ""
352"If passphrase is entered incorrectly, your phone will conduct a factory "
359"If passphrase is entered incorrectly, your phone will conduct a factory "
353"reset and all personal data will be deleted."
360"reset and all personal data will be deleted."
354
361
355−#: qml/Shell.qml:368
362+#: qml/Shell.qml:395
356msgid ""
363msgid ""
357"If passcode is entered incorrectly, your phone will conduct a factory reset "
364"If passcode is entered incorrectly, your phone will conduct a factory reset "
358"and all personal data will be deleted."
365"and all personal data will be deleted."
@@ -360,5 +367,8 @@ msgstr ""
360"If passcode is entered incorrectly, your phone will conduct a factory reset "
367"If passcode is entered incorrectly, your phone will conduct a factory reset "
361"and all personal data will be deleted."
368"and all personal data will be deleted."
362
369
363−#~ msgid "Manage Dash"
370+#~ msgid "Sorry, incorrect PIN"
364−#~ msgstr "Manage Dash"
371+#~ msgstr "Sorry, incorrect PIN"
372+
373+#~ msgid "Enter SIM PIN"
374+#~ msgstr "Enter SIM PIN"
po/eo.po+55−48
@@ -7,14 +7,15 @@ msgid ""
7msgstr ""
7msgstr ""
8"Project-Id-Version: unity\n"
8"Project-Id-Version: unity\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2014-09-24 10:43+0100\n"
10+"POT-Creation-Date: 2014-10-07 11:37+0300\n"
11"PO-Revision-Date: 2013-06-26 22:35+0000\n"
11"PO-Revision-Date: 2013-06-26 22:35+0000\n"
12"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
12"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
13"Language-Team: Esperanto <eo@li.org>\n"
13"Language-Team: Esperanto <eo@li.org>\n"
14"MIME-Version: 1.0\n"
14"MIME-Version: 1.0\n"
15"Content-Type: text/plain; charset=UTF-8\n"
15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n"
16"Content-Transfer-Encoding: 8bit\n"
17+"Plural-Forms: nplurals=2; plural=n != 1;\n"
17−"X-Launchpad-Export-Date: 2014-09-29 05:19+0000\n"
18+"X-Launchpad-Export-Date: 2014-10-09 06:36+0000\n"
18"X-Generator: Launchpad (build 17196)\n"
19"X-Generator: Launchpad (build 17196)\n"
19
20
20#: plugins/LightDM/Greeter.cpp:130
21#: plugins/LightDM/Greeter.cpp:130
@@ -30,6 +31,25 @@ msgstr ""
30msgid "Unpin shortcut"
31msgid "Unpin shortcut"
31msgstr ""
32msgstr ""
32
33
34+#: qml/Components/DelayedLockscreen.qml:47
35+msgid "Device Locked"
36+msgstr ""
37+
38+#: qml/Components/DelayedLockscreen.qml:62
39+msgid "You have been locked out due to too many failed passphrase attempts."
40+msgstr ""
41+
42+#: qml/Components/DelayedLockscreen.qml:63
43+msgid "You have been locked out due to too many failed passcode attempts."
44+msgstr ""
45+
46+#: qml/Components/DelayedLockscreen.qml:72
47+#, qt-format
48+msgid "Please wait %1 minute and then try again…"
49+msgid_plural "Please wait %1 minutes and then try again…"
50+msgstr[0] ""
51+msgstr[1] ""
52+
33#: qml/Components/Dialogs.qml:70
53#: qml/Components/Dialogs.qml:70
34msgid "Log out"
54msgid "Log out"
35msgstr ""
55msgstr ""
@@ -132,40 +152,23 @@ msgid ""
132"phone<br><br>Tap on the screen to start"
152"phone<br><br>Tap on the screen to start"
133msgstr ""
153msgstr ""
134
154
135−#: qml/Components/Lockscreen.qml:167
155+#: qml/Components/Lockscreen.qml:220
136−msgid "Please wait"
137−msgstr ""
138−
139−#: qml/Components/Lockscreen.qml:172
140−msgid "Too many incorrect attempts"
141−msgstr ""
142−
143−#: qml/Components/Lockscreen.qml:206
144msgid "Emergency Call"
156msgid "Emergency Call"
145msgstr ""
157msgstr ""
146
158
147−#: qml/Components/Lockscreen.qml:226
159+#: qml/Components/Lockscreen.qml:252
148msgid "OK"
160msgid "OK"
149msgstr ""
161msgstr ""
150
162
151−#: qml/Components/PassphraseLockscreen.qml:61
152−#, qt-format
153−msgid "Hello %1"
154−msgstr ""
155−
156−#: qml/Components/PassphraseLockscreen.qml:61
157−msgid "Hello"
158−msgstr ""
159−
160−#: qml/Dash/GenericScopeView.qml:411 qml/Dash/GenericScopeView.qml:533
163+#: qml/Dash/GenericScopeView.qml:434 qml/Dash/GenericScopeView.qml:591
161msgid "See less"
164msgid "See less"
162msgstr ""
165msgstr ""
163
166
164−#: qml/Dash/GenericScopeView.qml:411
167+#: qml/Dash/GenericScopeView.qml:434
165msgid "See all"
168msgid "See all"
166msgstr ""
169msgstr ""
167
170
168−#: qml/Dash/GenericScopeView.qml:473 qml/Dash/PageHeader.qml:258
171+#: qml/Dash/GenericScopeView.qml:496 qml/Dash/PageHeader.qml:258
169#: qml/Panel/SearchIndicator.qml:27
172#: qml/Panel/SearchIndicator.qml:27
170msgid "Search"
173msgid "Search"
171msgstr ""
174msgstr ""
@@ -202,6 +205,14 @@ msgstr ""
202msgid "Send"
205msgid "Send"
203msgstr ""
206msgstr ""
204
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+
205#: qml/Dash/ScopesOverview.qml:206
216#: qml/Dash/ScopesOverview.qml:206
206msgid "Manage Scopes"
217msgid "Manage Scopes"
207msgstr ""
218msgstr ""
@@ -223,7 +234,7 @@ msgid "All"
223msgstr ""
234msgstr ""
224
235
225#: qml/Greeter/Greeter.qml:157
236#: qml/Greeter/Greeter.qml:157
226−msgid "Swipe to unlock"
237+msgid "Unlock"
227msgstr ""
238msgstr ""
228
239
229#: qml/Hud/HudParametrizedActionsPage.qml:139
240#: qml/Hud/HudParametrizedActionsPage.qml:139
@@ -246,18 +257,10 @@ msgstr ""
246msgid "Speaking..."
257msgid "Speaking..."
247msgstr ""
258msgstr ""
248
259
249−#: qml/Notifications/NotificationMenuItemFactory.qml:108
260+#: qml/Notifications/NotificationMenuItemFactory.qml:116
250msgid "Show password"
261msgid "Show password"
251msgstr ""
262msgstr ""
252
263
253−#: qml/Notifications/NotificationMenuItemFactory.qml:124
254−msgid "Enter SIM PIN"
255−msgstr ""
256−
257−#: qml/Notifications/NotificationMenuItemFactory.qml:125
258−msgid "Sorry, incorrect PIN"
259−msgstr ""
260−
261#: qml/Panel/ActiveCallHint.qml:77
264#: qml/Panel/ActiveCallHint.qml:77
262msgid "Tap to return to call..."
265msgid "Tap to return to call..."
263msgstr ""
266msgstr ""
@@ -302,51 +305,55 @@ msgstr ""
302msgid "Roaming"
305msgid "Roaming"
303msgstr ""
306msgstr ""
304
307
305−#: qml/Shell.qml:320
308+#: qml/Shell.qml:346
306−msgid "Enter your passphrase"
309+msgid "Enter passphrase"
307msgstr ""
310msgstr ""
308
311
309−#: qml/Shell.qml:321
312+#: qml/Shell.qml:347
310msgid "Sorry, incorrect passphrase"
313msgid "Sorry, incorrect passphrase"
311msgstr ""
314msgstr ""
312
315
313−#: qml/Shell.qml:323
316+#: qml/Shell.qml:348
317+msgid "Please re-enter"
318+msgstr ""
319+
320+#: qml/Shell.qml:350
314−msgid "Enter your passcode"
321+msgid "Enter passcode"
315msgstr ""
322msgstr ""
316
323
317−#: qml/Shell.qml:324
324+#: qml/Shell.qml:351
318msgid "Sorry, incorrect passcode"
325msgid "Sorry, incorrect passcode"
319msgstr ""
326msgstr ""
320
327
321−#: qml/Shell.qml:327
328+#: qml/Shell.qml:354
322#, qt-format
329#, qt-format
323−msgid "Enter your %1"
330+msgid "Enter %1"
324msgstr ""
331msgstr ""
325
332
326−#: qml/Shell.qml:328
333+#: qml/Shell.qml:355
327#, qt-format
334#, qt-format
328msgid "Sorry, incorrect %1"
335msgid "Sorry, incorrect %1"
329msgstr ""
336msgstr ""
330
337
331−#: qml/Shell.qml:363
338+#: qml/Shell.qml:390
332msgid "Sorry, incorrect passphrase."
339msgid "Sorry, incorrect passphrase."
333msgstr ""
340msgstr ""
334
341
335−#: qml/Shell.qml:364
342+#: qml/Shell.qml:391
336msgid "Sorry, incorrect passcode."
343msgid "Sorry, incorrect passcode."
337msgstr ""
344msgstr ""
338
345
339−#: qml/Shell.qml:365
346+#: qml/Shell.qml:392
340msgid "This will be your last attempt."
347msgid "This will be your last attempt."
341msgstr ""
348msgstr ""
342
349
343−#: qml/Shell.qml:367
350+#: qml/Shell.qml:394
344msgid ""
351msgid ""
345"If passphrase is entered incorrectly, your phone will conduct a factory "
352"If passphrase is entered incorrectly, your phone will conduct a factory "
346"reset and all personal data will be deleted."
353"reset and all personal data will be deleted."
347msgstr ""
354msgstr ""
348
355
349−#: qml/Shell.qml:368
356+#: qml/Shell.qml:395
350msgid ""
357msgid ""
351"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 "
352"and all personal data will be deleted."
359"and all personal data will be deleted."
po/es.po+80−66
@@ -7,29 +7,53 @@ msgid ""
7msgstr ""
7msgstr ""
8"Project-Id-Version: unity\n"
8"Project-Id-Version: unity\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2014-09-24 10:43+0100\n"
10+"POT-Creation-Date: 2014-10-07 11:37+0300\n"
11−"PO-Revision-Date: 2014-09-29 20:25+0000\n"
11+"PO-Revision-Date: 2014-10-05 08:50+0000\n"
12−"Last-Translator: Víctor R. Ruiz <Unknown>\n"
12+"Last-Translator: Paco Molinero <paco@byasl.com>\n"
13"Language-Team: Spanish <es@li.org>\n"
13"Language-Team: Spanish <es@li.org>\n"
14"MIME-Version: 1.0\n"
14"MIME-Version: 1.0\n"
15"Content-Type: text/plain; charset=UTF-8\n"
15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n"
16"Content-Transfer-Encoding: 8bit\n"
17+"Plural-Forms: nplurals=2; plural=n != 1;\n"
17−"X-Launchpad-Export-Date: 2014-09-30 07:10+0000\n"
18+"X-Launchpad-Export-Date: 2014-10-09 06:36+0000\n"
18"X-Generator: Launchpad (build 17196)\n"
19"X-Generator: Launchpad (build 17196)\n"
19
20
20#: plugins/LightDM/Greeter.cpp:130
21#: plugins/LightDM/Greeter.cpp:130
21msgid "Password: "
22msgid "Password: "
22msgstr "Contraseña: "
23msgstr "Contraseña: "
23
24
24−#: plugins/Unity/Launcher/launcheritem.cpp:44
25+#: plugins/Unity/Launcher/launcheritem.cpp:45
25−#: plugins/Unity/Launcher/launcheritem.cpp:74
26+#: plugins/Unity/Launcher/launcheritem.cpp:91
26msgid "Pin shortcut"
27msgid "Pin shortcut"
27msgstr "Anclar"
28msgstr "Anclar"
28
29
29−#: plugins/Unity/Launcher/launcheritem.cpp:74
30+#: plugins/Unity/Launcher/launcheritem.cpp:91
30msgid "Unpin shortcut"
31msgid "Unpin shortcut"
31msgstr "Desanclar"
32msgstr "Desanclar"
32
33
34+#: qml/Components/DelayedLockscreen.qml:47
35+msgid "Device Locked"
36+msgstr "Dispositivo bloqueado"
37+
38+#: qml/Components/DelayedLockscreen.qml:62
39+msgid "You have been locked out due to too many failed passphrase attempts."
40+msgstr ""
41+"Se ha proporcionado una contraseña errónea demasiadas veces. Se ha bloqueado "
42+"el dispositivo."
43+
44+#: qml/Components/DelayedLockscreen.qml:63
45+msgid "You have been locked out due to too many failed passcode attempts."
46+msgstr ""
47+"Se ha bloqueado el dispositivo debido al gran número de intentos fallidos de "
48+"desbloqueo."
49+
50+#: qml/Components/DelayedLockscreen.qml:72
51+#, qt-format
52+msgid "Please wait %1 minute and then try again…"
53+msgid_plural "Please wait %1 minutes and then try again…"
54+msgstr[0] "Espere %1 minuto e inténtelo de nuevo..."
55+msgstr[1] "Espere %1 minutos e inténtelo de nuevo..."
56+
33#: qml/Components/Dialogs.qml:70
57#: qml/Components/Dialogs.qml:70
34msgid "Log out"
58msgid "Log out"
35msgstr "Cerrar la sesión"
59msgstr "Cerrar la sesión"
@@ -66,7 +90,7 @@ msgstr "¿Esta seguro de que quiere reiniciar?"
66
90
67#: qml/Components/Dialogs.qml:144
91#: qml/Components/Dialogs.qml:144
68msgid "Power"
92msgid "Power"
69−msgstr "Encendido"
93+msgstr "Apagar"
70
94
71#: qml/Components/Dialogs.qml:145
95#: qml/Components/Dialogs.qml:145
72msgid ""
96msgid ""
@@ -139,40 +163,23 @@ msgstr ""
139"Ahora domina los gestos de los bordes y puede usar el teléfono<br><br>Toque "
163"Ahora domina los gestos de los bordes y puede usar el teléfono<br><br>Toque "
140"la pantalla para comenzar"
164"la pantalla para comenzar"
141
165
142−#: qml/Components/Lockscreen.qml:167
166+#: qml/Components/Lockscreen.qml:220
143−msgid "Please wait"
144−msgstr "Espere un momento"
145−
146−#: qml/Components/Lockscreen.qml:172
147−msgid "Too many incorrect attempts"
148−msgstr "Demasiados intentos incorrectos"
149−
150−#: qml/Components/Lockscreen.qml:206
151msgid "Emergency Call"
167msgid "Emergency Call"
152msgstr "Llamada de emergencia"
168msgstr "Llamada de emergencia"
153
169
154−#: qml/Components/Lockscreen.qml:226
170+#: qml/Components/Lockscreen.qml:252
155msgid "OK"
171msgid "OK"
156msgstr "Aceptar"
172msgstr "Aceptar"
157
173
158−#: qml/Components/PassphraseLockscreen.qml:61
159−#, qt-format
160−msgid "Hello %1"
161−msgstr "Hola, %1"
162−
163−#: qml/Components/PassphraseLockscreen.qml:61
164−msgid "Hello"
165−msgstr "Hola"
166−
167−#: qml/Dash/GenericScopeView.qml:364 qml/Dash/GenericScopeView.qml:483
174+#: qml/Dash/GenericScopeView.qml:434 qml/Dash/GenericScopeView.qml:591
168msgid "See less"
175msgid "See less"
169msgstr "Ver menos"
176msgstr "Ver menos"
170
177
171−#: qml/Dash/GenericScopeView.qml:364
178+#: qml/Dash/GenericScopeView.qml:434
172msgid "See all"
179msgid "See all"
173msgstr "Ver todo"
180msgstr "Ver todo"
174
181
175−#: qml/Dash/GenericScopeView.qml:427 qml/Dash/PageHeader.qml:258
182+#: qml/Dash/GenericScopeView.qml:496 qml/Dash/PageHeader.qml:258
176#: qml/Panel/SearchIndicator.qml:27
183#: qml/Panel/SearchIndicator.qml:27
177msgid "Search"
184msgid "Search"
178msgstr "Buscar"
185msgstr "Buscar"
@@ -209,6 +216,14 @@ msgstr "Añadir una reseña"
209msgid "Send"
216msgid "Send"
210msgstr "Enviar"
217msgstr "Enviar"
211
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+
212#: qml/Dash/ScopesOverview.qml:206
227#: qml/Dash/ScopesOverview.qml:206
213msgid "Manage Scopes"
228msgid "Manage Scopes"
214msgstr "Administrar ámbitos"
229msgstr "Administrar ámbitos"
@@ -230,8 +245,8 @@ msgid "All"
230msgstr "Todo"
245msgstr "Todo"
231
246
232#: qml/Greeter/Greeter.qml:157
247#: qml/Greeter/Greeter.qml:157
233−msgid "Swipe to unlock"
248+msgid "Unlock"
234−msgstr "Deslice para desbloquear"
249+msgstr "Desbloquear"
235
250
236#: qml/Hud/HudParametrizedActionsPage.qml:139
251#: qml/Hud/HudParametrizedActionsPage.qml:139
237msgid "Confirm"
252msgid "Confirm"
@@ -253,18 +268,10 @@ msgstr "Hable ahora…"
253msgid "Speaking..."
268msgid "Speaking..."
254msgstr "Hablando…"
269msgstr "Hablando…"
255
270
256−#: qml/Notifications/NotificationMenuItemFactory.qml:108
271+#: qml/Notifications/NotificationMenuItemFactory.qml:116
257msgid "Show password"
272msgid "Show password"
258msgstr "Mostrar contraseña"
273msgstr "Mostrar contraseña"
259
274
260−#: qml/Notifications/NotificationMenuItemFactory.qml:124
261−msgid "Enter SIM PIN"
262−msgstr "Escriba el PIN de la SIM"
263−
264−#: qml/Notifications/NotificationMenuItemFactory.qml:125
265−msgid "Sorry, incorrect PIN"
266−msgstr "El PIN es incorrecto"
267−
268#: qml/Panel/ActiveCallHint.qml:77
275#: qml/Panel/ActiveCallHint.qml:77
269msgid "Tap to return to call..."
276msgid "Tap to return to call..."
270msgstr "Toque para volver a llamar..."
277msgstr "Toque para volver a llamar..."
@@ -277,27 +284,27 @@ msgstr "Conferencia"
277msgid "Nothing is playing"
284msgid "Nothing is playing"
278msgstr "Ningún contenido en reproducción"
285msgstr "Ningún contenido en reproducción"
279
286
280−#: qml/Panel/Indicators/MenuItemFactory.qml:651
287+#: qml/Panel/Indicators/MenuItemFactory.qml:748
281msgid "In queue…"
288msgid "In queue…"
282msgstr "En espera…"
289msgstr "En espera…"
283
290
284−#: qml/Panel/Indicators/MenuItemFactory.qml:655
291+#: qml/Panel/Indicators/MenuItemFactory.qml:752
285msgid "Downloading"
292msgid "Downloading"
286msgstr "Descargando"
293msgstr "Descargando"
287
294
288−#: qml/Panel/Indicators/MenuItemFactory.qml:657
295+#: qml/Panel/Indicators/MenuItemFactory.qml:754
289msgid "Paused, tap to resume"
296msgid "Paused, tap to resume"
290msgstr "Pausado, toque para reanudar"
297msgstr "Pausado, toque para reanudar"
291
298
292−#: qml/Panel/Indicators/MenuItemFactory.qml:659
299+#: qml/Panel/Indicators/MenuItemFactory.qml:756
293msgid "Canceled"
300msgid "Canceled"
294msgstr "Cancelado"
301msgstr "Cancelado"
295
302
296−#: qml/Panel/Indicators/MenuItemFactory.qml:661
303+#: qml/Panel/Indicators/MenuItemFactory.qml:758
297msgid "Finished"
304msgid "Finished"
298msgstr "Finalizado"
305msgstr "Finalizado"
299
306
300−#: qml/Panel/Indicators/MenuItemFactory.qml:663
307+#: qml/Panel/Indicators/MenuItemFactory.qml:760
301msgid "Failed, tap to retry"
308msgid "Failed, tap to retry"
302msgstr "Falló, toque para reintentar"
309msgstr "Falló, toque para reintentar"
303
310
@@ -309,45 +316,49 @@ msgstr "Desbloquear SIM"
309msgid "Roaming"
316msgid "Roaming"
310msgstr "Itinerancia"
317msgstr "Itinerancia"
311
318
312−#: qml/Shell.qml:292
319+#: qml/Shell.qml:346
313−msgid "Enter your passphrase"
320+msgid "Enter passphrase"
314−msgstr "Escriba su contraseña"
321+msgstr "Introduzca la contraseña"
315
322
316−#: qml/Shell.qml:293
323+#: qml/Shell.qml:347
317msgid "Sorry, incorrect passphrase"
324msgid "Sorry, incorrect passphrase"
318msgstr "La contraseña es incorrecta"
325msgstr "La contraseña es incorrecta"
319
326
320−#: qml/Shell.qml:295
327+#: qml/Shell.qml:348
321−msgid "Enter your passcode"
328+msgid "Please re-enter"
322−msgstr "Escriba su código de acceso"
329+msgstr "Reintroduzca"
323
330
324−#: qml/Shell.qml:296
331+#: qml/Shell.qml:350
332+msgid "Enter passcode"
333+msgstr "Introduzca el código"
334+
335+#: qml/Shell.qml:351
325msgid "Sorry, incorrect passcode"
336msgid "Sorry, incorrect passcode"
326msgstr "El código es incorrecto"
337msgstr "El código es incorrecto"
327
338
328−#: qml/Shell.qml:299
339+#: qml/Shell.qml:354
329#, qt-format
340#, qt-format
330−msgid "Enter your %1"
341+msgid "Enter %1"
331−msgstr "Introduzca su %1"
342+msgstr "Introduzca %1"
332
343
333−#: qml/Shell.qml:300
344+#: qml/Shell.qml:355
334#, qt-format
345#, qt-format
335msgid "Sorry, incorrect %1"
346msgid "Sorry, incorrect %1"
336msgstr "Incorrecto (%1)"
347msgstr "Incorrecto (%1)"
337
348
338−#: qml/Shell.qml:335
349+#: qml/Shell.qml:390
339msgid "Sorry, incorrect passphrase."
350msgid "Sorry, incorrect passphrase."
340msgstr "La contraseña es incorrecta."
351msgstr "La contraseña es incorrecta."
341
352
342−#: qml/Shell.qml:336
353+#: qml/Shell.qml:391
343msgid "Sorry, incorrect passcode."
354msgid "Sorry, incorrect passcode."
344msgstr "Código de acceso incorrecto."
355msgstr "Código de acceso incorrecto."
345
356
346−#: qml/Shell.qml:337
357+#: qml/Shell.qml:392
347msgid "This will be your last attempt."
358msgid "This will be your last attempt."
348msgstr "Este será su último intento."
359msgstr "Este será su último intento."
349
360
350−#: qml/Shell.qml:339
361+#: qml/Shell.qml:394
351msgid ""
362msgid ""
352"If passphrase is entered incorrectly, your phone will conduct a factory "
363"If passphrase is entered incorrectly, your phone will conduct a factory "
353"reset and all personal data will be deleted."
364"reset and all personal data will be deleted."
@@ -355,7 +366,7 @@ msgstr ""
355"Si se introduce la frase incorrectamente, el teléfono volverá a la "
366"Si se introduce la frase incorrectamente, el teléfono volverá a la "
356"configuración de fábrica y se perderán todos los datos personales."
367"configuración de fábrica y se perderán todos los datos personales."
357
368
358−#: qml/Shell.qml:340
369+#: qml/Shell.qml:395
359msgid ""
370msgid ""
360"If passcode is entered incorrectly, your phone will conduct a factory reset "
371"If passcode is entered incorrectly, your phone will conduct a factory reset "
361"and all personal data will be deleted."
372"and all personal data will be deleted."
@@ -363,5 +374,8 @@ msgstr ""
363"Si se introduce el código incorrectamente, el teléfono volverá a la "
374"Si se introduce el código incorrectamente, el teléfono volverá a la "
364"configuración de fábrica y se perderán todos los datos personales."
375"configuración de fábrica y se perderán todos los datos personales."
365
376
366−#~ msgid "Manage Dash"
377+#~ msgid "Enter SIM PIN"
367−#~ msgstr "Gestionar tablero"
378+#~ msgstr "Escriba el PIN de la SIM"
379+
380+#~ msgid "Sorry, incorrect PIN"
381+#~ msgstr "El PIN es incorrecto"
po/eu.po+65−52
@@ -7,14 +7,15 @@ msgid ""
7msgstr ""
7msgstr ""
8"Project-Id-Version: unity8\n"
8"Project-Id-Version: unity8\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2014-09-24 10:43+0100\n"
10+"POT-Creation-Date: 2014-10-07 11:37+0300\n"
11−"PO-Revision-Date: 2014-09-27 12:47+0000\n"
11+"PO-Revision-Date: 2014-10-07 19:21+0000\n"
12"Last-Translator: Ibai Oihanguren Sala <Unknown>\n"
12"Last-Translator: Ibai Oihanguren Sala <Unknown>\n"
13"Language-Team: Basque <eu@li.org>\n"
13"Language-Team: Basque <eu@li.org>\n"
14"MIME-Version: 1.0\n"
14"MIME-Version: 1.0\n"
15"Content-Type: text/plain; charset=UTF-8\n"
15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n"
16"Content-Transfer-Encoding: 8bit\n"
17+"Plural-Forms: nplurals=2; plural=n != 1;\n"
17−"X-Launchpad-Export-Date: 2014-09-29 05:19+0000\n"
18+"X-Launchpad-Export-Date: 2014-10-09 06:36+0000\n"
18"X-Generator: Launchpad (build 17196)\n"
19"X-Generator: Launchpad (build 17196)\n"
19
20
20#: plugins/LightDM/Greeter.cpp:130
21#: plugins/LightDM/Greeter.cpp:130
@@ -30,6 +31,28 @@ msgstr "Ainguratu lasterbidea"
30msgid "Unpin shortcut"
31msgid "Unpin shortcut"
31msgstr "Askatu lasterbidea"
32msgstr "Askatu lasterbidea"
32
33
34+#: qml/Components/DelayedLockscreen.qml:47
35+msgid "Device Locked"
36+msgstr "Gailua blokeatuta"
37+
38+#: qml/Components/DelayedLockscreen.qml:62
39+msgid "You have been locked out due to too many failed passphrase attempts."
40+msgstr ""
41+"Gailua blokeatu da, pasaesaldia sartzeko saiakera gehiegi hutsegin "
42+"dituzulako."
43+
44+#: qml/Components/DelayedLockscreen.qml:63
45+msgid "You have been locked out due to too many failed passcode attempts."
46+msgstr ""
47+"Gailua blokeatu da, pasakodea sartzeko saiakera gehiegi hutsegin dituzulako."
48+
49+#: qml/Components/DelayedLockscreen.qml:72
50+#, qt-format
51+msgid "Please wait %1 minute and then try again…"
52+msgid_plural "Please wait %1 minutes and then try again…"
53+msgstr[0] "Itxaron minutu %1ez eta saiatu berriro…"
54+msgstr[1] "Itxaron %1 minutuz eta saiatu berriro…"
55+
33#: qml/Components/Dialogs.qml:70
56#: qml/Components/Dialogs.qml:70
34msgid "Log out"
57msgid "Log out"
35msgstr "Amaitu saioa"
58msgstr "Amaitu saioa"
@@ -137,40 +160,23 @@ msgstr ""
137"Jadanik ezagutzen dituzu ertzetako keinuak, eta mugikorra erabiltzen has "
160"Jadanik ezagutzen dituzu ertzetako keinuak, eta mugikorra erabiltzen has "
138"zaitezke<br><br>Sakatu pantailan hasteko"
161"zaitezke<br><br>Sakatu pantailan hasteko"
139
162
140−#: qml/Components/Lockscreen.qml:167
163+#: qml/Components/Lockscreen.qml:220
141−msgid "Please wait"
142−msgstr "Itxaron"
143−
144−#: qml/Components/Lockscreen.qml:172
145−msgid "Too many incorrect attempts"
146−msgstr "Okerreko saiakera gehiegi"
147−
148−#: qml/Components/Lockscreen.qml:206
149msgid "Emergency Call"
164msgid "Emergency Call"
150msgstr "Larrialdi-deia"
165msgstr "Larrialdi-deia"
151
166
152−#: qml/Components/Lockscreen.qml:226
167+#: qml/Components/Lockscreen.qml:252
153msgid "OK"
168msgid "OK"
154msgstr "Ados"
169msgstr "Ados"
155
170
156−#: qml/Components/PassphraseLockscreen.qml:61
157−#, qt-format
158−msgid "Hello %1"
159−msgstr "Kaixo %1"
160−
161−#: qml/Components/PassphraseLockscreen.qml:61
162−msgid "Hello"
163−msgstr "Kaixo"
164−
165−#: qml/Dash/GenericScopeView.qml:411 qml/Dash/GenericScopeView.qml:533
171+#: qml/Dash/GenericScopeView.qml:434 qml/Dash/GenericScopeView.qml:591
166msgid "See less"
172msgid "See less"
167msgstr "Ikusi gutxiago"
173msgstr "Ikusi gutxiago"
168
174
169−#: qml/Dash/GenericScopeView.qml:411
175+#: qml/Dash/GenericScopeView.qml:434
170msgid "See all"
176msgid "See all"
171msgstr "Ikusi guztiak"
177msgstr "Ikusi guztiak"
172
178
173−#: qml/Dash/GenericScopeView.qml:473 qml/Dash/PageHeader.qml:258
179+#: qml/Dash/GenericScopeView.qml:496 qml/Dash/PageHeader.qml:258
174#: qml/Panel/SearchIndicator.qml:27
180#: qml/Panel/SearchIndicator.qml:27
175msgid "Search"
181msgid "Search"
176msgstr "Bilatu"
182msgstr "Bilatu"
@@ -207,6 +213,14 @@ msgstr "Gehitu kritika"
207msgid "Send"
213msgid "Send"
208msgstr "Bidali"
214msgstr "Bidali"
209
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+
210#: qml/Dash/ScopesOverview.qml:206
224#: qml/Dash/ScopesOverview.qml:206
211msgid "Manage Scopes"
225msgid "Manage Scopes"
212msgstr "Kudeatu eremuak"
226msgstr "Kudeatu eremuak"
@@ -228,8 +242,8 @@ msgid "All"
228msgstr "Guztiak"
242msgstr "Guztiak"
229
243
230#: qml/Greeter/Greeter.qml:157
244#: qml/Greeter/Greeter.qml:157
231−msgid "Swipe to unlock"
245+msgid "Unlock"
232−msgstr "Pasatu hatza desblokeatzeko"
246+msgstr "Desblokeatu"
233
247
234#: qml/Hud/HudParametrizedActionsPage.qml:139
248#: qml/Hud/HudParametrizedActionsPage.qml:139
235msgid "Confirm"
249msgid "Confirm"
@@ -251,18 +265,10 @@ msgstr "Hitz egin orain..."
251msgid "Speaking..."
265msgid "Speaking..."
252msgstr "Hitz egiten..."
266msgstr "Hitz egiten..."
253
267
254−#: qml/Notifications/NotificationMenuItemFactory.qml:108
268+#: qml/Notifications/NotificationMenuItemFactory.qml:116
255msgid "Show password"
269msgid "Show password"
256msgstr "Erakutsi pasahitza"
270msgstr "Erakutsi pasahitza"
257
271
258−#: qml/Notifications/NotificationMenuItemFactory.qml:124
259−msgid "Enter SIM PIN"
260−msgstr "Sartu SIMaren PINa"
261−
262−#: qml/Notifications/NotificationMenuItemFactory.qml:125
263−msgid "Sorry, incorrect PIN"
264−msgstr "Sentitzen dugu, PINa okerrekoa da"
265−
266#: qml/Panel/ActiveCallHint.qml:77
272#: qml/Panel/ActiveCallHint.qml:77
267msgid "Tap to return to call..."
273msgid "Tap to return to call..."
268msgstr "Sakatu deira itzultzeko..."
274msgstr "Sakatu deira itzultzeko..."
@@ -307,45 +313,49 @@ msgstr "Desblokeatu SIMa"
307msgid "Roaming"
313msgid "Roaming"
308msgstr "Ibiltaritza"
314msgstr "Ibiltaritza"
309
315
310−#: qml/Shell.qml:320
316+#: qml/Shell.qml:346
311−msgid "Enter your passphrase"
317+msgid "Enter passphrase"
312msgstr "Sartu pasaesaldia"
318msgstr "Sartu pasaesaldia"
313
319
314−#: qml/Shell.qml:321
320+#: qml/Shell.qml:347
315msgid "Sorry, incorrect passphrase"
321msgid "Sorry, incorrect passphrase"
316msgstr "Sentitzen dugu, pasaesaldia okerrekoa da"
322msgstr "Sentitzen dugu, pasaesaldia okerrekoa da"
317
323
318−#: qml/Shell.qml:323
324+#: qml/Shell.qml:348
325+msgid "Please re-enter"
326+msgstr "Errepikatu"
327+
328+#: qml/Shell.qml:350
319−msgid "Enter your passcode"
329+msgid "Enter passcode"
320msgstr "Sartu pasakodea"
330msgstr "Sartu pasakodea"
321
331
322−#: qml/Shell.qml:324
332+#: qml/Shell.qml:351
323msgid "Sorry, incorrect passcode"
333msgid "Sorry, incorrect passcode"
324msgstr "Sentitzen dugu, pasakodea okerrekoa da"
334msgstr "Sentitzen dugu, pasakodea okerrekoa da"
325
335
326−#: qml/Shell.qml:327
336+#: qml/Shell.qml:354
327#, qt-format
337#, qt-format
328−msgid "Enter your %1"
338+msgid "Enter %1"
329msgstr "Sartu %1"
339msgstr "Sartu %1"
330
340
331−#: qml/Shell.qml:328
341+#: qml/Shell.qml:355
332#, qt-format
342#, qt-format
333msgid "Sorry, incorrect %1"
343msgid "Sorry, incorrect %1"
334msgstr "Sentitzen dugu, %1 okerrekoa da"
344msgstr "Sentitzen dugu, %1 okerrekoa da"
335
345
336−#: qml/Shell.qml:363
346+#: qml/Shell.qml:390
337msgid "Sorry, incorrect passphrase."
347msgid "Sorry, incorrect passphrase."
338msgstr "Sentitzen dugu, pasaesaldia okerrekoa da."
348msgstr "Sentitzen dugu, pasaesaldia okerrekoa da."
339
349
340−#: qml/Shell.qml:364
350+#: qml/Shell.qml:391
341msgid "Sorry, incorrect passcode."
351msgid "Sorry, incorrect passcode."
342msgstr "Sentitzen dugu, pasakodea okerrekoa da."
352msgstr "Sentitzen dugu, pasakodea okerrekoa da."
343
353
344−#: qml/Shell.qml:365
354+#: qml/Shell.qml:392
345msgid "This will be your last attempt."
355msgid "This will be your last attempt."
346msgstr "Hau duzu azken saiakera."
356msgstr "Hau duzu azken saiakera."
347
357
348−#: qml/Shell.qml:367
358+#: qml/Shell.qml:394
349msgid ""
359msgid ""
350"If passphrase is entered incorrectly, your phone will conduct a factory "
360"If passphrase is entered incorrectly, your phone will conduct a factory "
351"reset and all personal data will be deleted."
361"reset and all personal data will be deleted."
@@ -353,7 +363,7 @@ msgstr ""
353"Okerreko pasaesaldia sartzen baduzu, telefonoaren jatorrizko ezarpenak "
363"Okerreko pasaesaldia sartzen baduzu, telefonoaren jatorrizko ezarpenak "
354"berrezarri eta datu pertsonal guztiak ezabatuko dira."
364"berrezarri eta datu pertsonal guztiak ezabatuko dira."
355
365
356−#: qml/Shell.qml:368
366+#: qml/Shell.qml:395
357msgid ""
367msgid ""
358"If passcode is entered incorrectly, your phone will conduct a factory reset "
368"If passcode is entered incorrectly, your phone will conduct a factory reset "
359"and all personal data will be deleted."
369"and all personal data will be deleted."
@@ -361,5 +371,8 @@ msgstr ""
361"Okerreko pasakodea sartzen baduzu, telefonoaren jatorrizko ezarpenak "
371"Okerreko pasakodea sartzen baduzu, telefonoaren jatorrizko ezarpenak "
362"berrezarri eta datu pertsonal guztiak ezabatuko dira."
372"berrezarri eta datu pertsonal guztiak ezabatuko dira."
363
373
364−#~ msgid "Manage Dash"
374+#~ msgid "Sorry, incorrect PIN"
365−#~ msgstr "Kudeatu abio-leihoa"
375+#~ msgstr "Sentitzen dugu, PINa okerrekoa da"
376+
377+#~ msgid "Enter SIM PIN"
378+#~ msgstr "Sartu SIMaren PINa"
po/fa.po+67−57
@@ -7,14 +7,15 @@ msgid ""
7msgstr ""
7msgstr ""
8"Project-Id-Version: unity8\n"
8"Project-Id-Version: unity8\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2014-09-24 10:43+0100\n"
10+"POT-Creation-Date: 2014-10-07 11:37+0300\n"
11−"PO-Revision-Date: 2014-09-21 10:43+0000\n"
11+"PO-Revision-Date: 2014-10-02 23:07+0000\n"
12"Last-Translator: Danial Behzadi <dani.behzi@gmail.com>\n"
12"Last-Translator: Danial Behzadi <dani.behzi@gmail.com>\n"
13"Language-Team: Persian <fa@li.org>\n"
13"Language-Team: Persian <fa@li.org>\n"
14"MIME-Version: 1.0\n"
14"MIME-Version: 1.0\n"
15"Content-Type: text/plain; charset=UTF-8\n"
15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n"
16"Content-Transfer-Encoding: 8bit\n"
17+"Plural-Forms: nplurals=1; plural=0;\n"
17−"X-Launchpad-Export-Date: 2014-09-29 05:20+0000\n"
18+"X-Launchpad-Export-Date: 2014-10-09 06:36+0000\n"
18"X-Generator: Launchpad (build 17196)\n"
19"X-Generator: Launchpad (build 17196)\n"
19
20
20#: plugins/LightDM/Greeter.cpp:130
21#: plugins/LightDM/Greeter.cpp:130
@@ -30,6 +31,25 @@ msgstr "سنجاق کردن میانبر"
30msgid "Unpin shortcut"
31msgid "Unpin shortcut"
31msgstr "برداشتن سنجاق میانبر"
32msgstr "برداشتن سنجاق میانبر"
32
33
34+#: qml/Components/DelayedLockscreen.qml:47
35+msgid "Device Locked"
36+msgstr "دستگاه قفل شد"
37+
38+#: qml/Components/DelayedLockscreen.qml:62
39+msgid "You have been locked out due to too many failed passphrase attempts."
40+msgstr ""
41+"شما به دلیل تلاش‌های بسیار زیاد شکست خورده برای عبارت‌عبور قفل شده‌اید."
42+
43+#: qml/Components/DelayedLockscreen.qml:63
44+msgid "You have been locked out due to too many failed passcode attempts."
45+msgstr "شما به دلیل تلاش‌های بسیار زیاد شکست خورده برای رمزعبور قفل شده‌اید."
46+
47+#: qml/Components/DelayedLockscreen.qml:72
48+#, qt-format
49+msgid "Please wait %1 minute and then try again…"
50+msgid_plural "Please wait %1 minutes and then try again…"
51+msgstr[0] "لطفاُ %1 دقیقه صبر نموده و سپس مجدّداً تلاش نمایید…"
52+
33#: qml/Components/Dialogs.qml:70
53#: qml/Components/Dialogs.qml:70
34msgid "Log out"
54msgid "Log out"
35msgstr "خروج از حساب"
55msgstr "خروج از حساب"
@@ -136,40 +156,23 @@ msgstr ""
136"هم اکنون در استفاده از ژست های حرکتی مهارت لازم را دارید و می‌توانید استفاده "
156"هم اکنون در استفاده از ژست های حرکتی مهارت لازم را دارید و می‌توانید استفاده "
137"از تلفن را آغاز کنید<br><br>برای شروع صفحه را لمس کنید"
157"از تلفن را آغاز کنید<br><br>برای شروع صفحه را لمس کنید"
138
158
139−#: qml/Components/Lockscreen.qml:167
159+#: qml/Components/Lockscreen.qml:220
140−msgid "Please wait"
141−msgstr "لطفاً صبر کنید"
142−
143−#: qml/Components/Lockscreen.qml:172
144−msgid "Too many incorrect attempts"
145−msgstr "تلاش‌های ناموفّق زیاد"
146−
147−#: qml/Components/Lockscreen.qml:206
148msgid "Emergency Call"
160msgid "Emergency Call"
149msgstr "تماس اضطراری"
161msgstr "تماس اضطراری"
150
162
151−#: qml/Components/Lockscreen.qml:226
163+#: qml/Components/Lockscreen.qml:252
152msgid "OK"
164msgid "OK"
153msgstr "قبول"
165msgstr "قبول"
154
166
155−#: qml/Components/PassphraseLockscreen.qml:61
156−#, qt-format
157−msgid "Hello %1"
158−msgstr "سلام %1"
159−
160−#: qml/Components/PassphraseLockscreen.qml:61
161−msgid "Hello"
162−msgstr "سلام"
163−
164−#: qml/Dash/GenericScopeView.qml:411 qml/Dash/GenericScopeView.qml:533
167+#: qml/Dash/GenericScopeView.qml:434 qml/Dash/GenericScopeView.qml:591
165msgid "See less"
168msgid "See less"
166msgstr "کم‌تر ببینید"
169msgstr "کم‌تر ببینید"
167
170
168−#: qml/Dash/GenericScopeView.qml:411
171+#: qml/Dash/GenericScopeView.qml:434
169msgid "See all"
172msgid "See all"
170msgstr "دیدن همه"
173msgstr "دیدن همه"
171
174
172−#: qml/Dash/GenericScopeView.qml:473 qml/Dash/PageHeader.qml:258
175+#: qml/Dash/GenericScopeView.qml:496 qml/Dash/PageHeader.qml:258
173#: qml/Panel/SearchIndicator.qml:27
176#: qml/Panel/SearchIndicator.qml:27
174msgid "Search"
177msgid "Search"
175msgstr "جست‌وجو"
178msgstr "جست‌وجو"
@@ -206,9 +209,17 @@ msgstr "افزودن یک بازبینی"
206msgid "Send"
209msgid "Send"
207msgstr "ارسال"
210msgstr "ارسال"
208
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+
209#: qml/Dash/ScopesOverview.qml:206
220#: qml/Dash/ScopesOverview.qml:206
210msgid "Manage Scopes"
221msgid "Manage Scopes"
211−msgstr ""
222+msgstr "مدیریت حوزه‌ها"
212
223
213#: qml/Dash/ScopesOverview.qml:428
224#: qml/Dash/ScopesOverview.qml:428
214msgid "Done"
225msgid "Done"
@@ -227,8 +238,8 @@ msgid "All"
227msgstr "همه"
238msgstr "همه"
228
239
229#: qml/Greeter/Greeter.qml:157
240#: qml/Greeter/Greeter.qml:157
230−msgid "Swipe to unlock"
241+msgid "Unlock"
231−msgstr "برای باز کردن قفل بکشد"
242+msgstr "بازکردن قفل"
232
243
233#: qml/Hud/HudParametrizedActionsPage.qml:139
244#: qml/Hud/HudParametrizedActionsPage.qml:139
234msgid "Confirm"
245msgid "Confirm"
@@ -250,18 +261,10 @@ msgstr "اکنون صحبت کنید…"
250msgid "Speaking..."
261msgid "Speaking..."
251msgstr "در حال صحبت کردن…"
262msgstr "در حال صحبت کردن…"
252
263
253−#: qml/Notifications/NotificationMenuItemFactory.qml:108
264+#: qml/Notifications/NotificationMenuItemFactory.qml:116
254msgid "Show password"
265msgid "Show password"
255msgstr "نمایش گذرواژه"
266msgstr "نمایش گذرواژه"
256
267
257−#: qml/Notifications/NotificationMenuItemFactory.qml:124
258−msgid "Enter SIM PIN"
259−msgstr "PIN سیم‌کارت را وارد کنید"
260−
261−#: qml/Notifications/NotificationMenuItemFactory.qml:125
262−msgid "Sorry, incorrect PIN"
263−msgstr "متأسّفیم، PIN نادرست بود"
264−
265#: qml/Panel/ActiveCallHint.qml:77
268#: qml/Panel/ActiveCallHint.qml:77
266msgid "Tap to return to call..."
269msgid "Tap to return to call..."
267msgstr "برای بازگشت به تماس ضربه بزنید…"
270msgstr "برای بازگشت به تماس ضربه بزنید…"
@@ -272,7 +275,7 @@ msgstr "کنفرانس"
272
275
273#: qml/Panel/Indicators/MenuItemFactory.qml:600
276#: qml/Panel/Indicators/MenuItemFactory.qml:600
274msgid "Nothing is playing"
277msgid "Nothing is playing"
275−msgstr ""
278+msgstr "هیچ چیزی در حال پخش نیست"
276
279
277#: qml/Panel/Indicators/MenuItemFactory.qml:748
280#: qml/Panel/Indicators/MenuItemFactory.qml:748
278msgid "In queue…"
281msgid "In queue…"
@@ -306,45 +309,49 @@ msgstr "باز کردن قفل سیم‌کارت"
306msgid "Roaming"
309msgid "Roaming"
307msgstr "رومینگ"
310msgstr "رومینگ"
308
311
309−#: qml/Shell.qml:320
312+#: qml/Shell.qml:346
310−msgid "Enter your passphrase"
313+msgid "Enter passphrase"
311−msgstr "عبارت‌عبورتان را وارد کنید"
314+msgstr "عبارت‌عبور را وارد کنید"
312
315
313−#: qml/Shell.qml:321
316+#: qml/Shell.qml:347
314msgid "Sorry, incorrect passphrase"
317msgid "Sorry, incorrect passphrase"
315msgstr "متأسّفیم، عبارت‌عبور نادرست بود"
318msgstr "متأسّفیم، عبارت‌عبور نادرست بود"
316
319
317−#: qml/Shell.qml:323
320+#: qml/Shell.qml:348
318−msgid "Enter your passcode"
321+msgid "Please re-enter"
319−msgstr "رمزعبورتان را وارد کنید"
322+msgstr "لطفاً دوباره وارد کنید"
320
323
321−#: qml/Shell.qml:324
324+#: qml/Shell.qml:350
325+msgid "Enter passcode"
326+msgstr "رمزعبور را وارد کنید"
327+
328+#: qml/Shell.qml:351
322msgid "Sorry, incorrect passcode"
329msgid "Sorry, incorrect passcode"
323msgstr "متأسّفیم، رمزعبور نادرست بود"
330msgstr "متأسّفیم، رمزعبور نادرست بود"
324
331
325−#: qml/Shell.qml:327
332+#: qml/Shell.qml:354
326#, qt-format
333#, qt-format
327−msgid "Enter your %1"
334+msgid "Enter %1"
328−msgstr "%1 خود را وارد کنید"
335+msgstr "%1 را وارد کنید"
329
336
330−#: qml/Shell.qml:328
337+#: qml/Shell.qml:355
331#, qt-format
338#, qt-format
332msgid "Sorry, incorrect %1"
339msgid "Sorry, incorrect %1"
333msgstr "متأسّفیم، %1 نادرست بود"
340msgstr "متأسّفیم، %1 نادرست بود"
334
341
335−#: qml/Shell.qml:363
342+#: qml/Shell.qml:390
336msgid "Sorry, incorrect passphrase."
343msgid "Sorry, incorrect passphrase."
337msgstr "متأسّفیم، عبارت‌عبور نادرست است."
344msgstr "متأسّفیم، عبارت‌عبور نادرست است."
338
345
339−#: qml/Shell.qml:364
346+#: qml/Shell.qml:391
340msgid "Sorry, incorrect passcode."
347msgid "Sorry, incorrect passcode."
341msgstr "متأسّفیم، رمزعبور نادرست است."
348msgstr "متأسّفیم، رمزعبور نادرست است."
342
349
343−#: qml/Shell.qml:365
350+#: qml/Shell.qml:392
344msgid "This will be your last attempt."
351msgid "This will be your last attempt."
345msgstr "این آخرین تلاش شما خواهد بود."
352msgstr "این آخرین تلاش شما خواهد بود."
346
353
347−#: qml/Shell.qml:367
354+#: qml/Shell.qml:394
348msgid ""
355msgid ""
349"If passphrase is entered incorrectly, your phone will conduct a factory "
356"If passphrase is entered incorrectly, your phone will conduct a factory "
350"reset and all personal data will be deleted."
357"reset and all personal data will be deleted."
@@ -352,7 +359,7 @@ msgstr ""
352"اگر عبارت‌عبور نادرست وارد شود، تلفن شما بازنشانی کارخانه خواهد شد و تمامی "
359"اگر عبارت‌عبور نادرست وارد شود، تلفن شما بازنشانی کارخانه خواهد شد و تمامی "
353"اطّلاعات شخصی حذف خواهند شد."
360"اطّلاعات شخصی حذف خواهند شد."
354
361
355−#: qml/Shell.qml:368
362+#: qml/Shell.qml:395
356msgid ""
363msgid ""
357"If passcode is entered incorrectly, your phone will conduct a factory reset "
364"If passcode is entered incorrectly, your phone will conduct a factory reset "
358"and all personal data will be deleted."
365"and all personal data will be deleted."
@@ -360,5 +367,8 @@ msgstr ""
360"اگر رمزعبور نادرست وارد شود، تلفن شما بازنشانی کارخانه خواهد شد و تمامی "
367"اگر رمزعبور نادرست وارد شود، تلفن شما بازنشانی کارخانه خواهد شد و تمامی "
361"اطّلاعات شخصی حذف خواهند شد."
368"اطّلاعات شخصی حذف خواهند شد."
362
369
363−#~ msgid "Manage Dash"
370+#~ msgid "Sorry, incorrect PIN"
364−#~ msgstr "مدیریت دش"
371+#~ msgstr "متأسّفیم، PIN نادرست بود"
372+
373+#~ msgid "Enter SIM PIN"
374+#~ msgstr "PIN سیم‌کارت را وارد کنید"
po/fi.po+65−53
@@ -7,14 +7,15 @@ msgid ""
7msgstr ""
7msgstr ""
8"Project-Id-Version: unity\n"
8"Project-Id-Version: unity\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2014-09-24 10:43+0100\n"
10+"POT-Creation-Date: 2014-10-07 11:37+0300\n"
11−"PO-Revision-Date: 2014-08-28 13:47+0000\n"
11+"PO-Revision-Date: 2014-10-07 13:10+0000\n"
12−"Last-Translator: Timo Jyrinki <timo.jyrinki@canonical.com>\n"
12+"Last-Translator: Jiri Grönroos <Unknown>\n"
13"Language-Team: Finnish <fi@li.org>\n"
13"Language-Team: Finnish <fi@li.org>\n"
14"MIME-Version: 1.0\n"
14"MIME-Version: 1.0\n"
15"Content-Type: text/plain; charset=UTF-8\n"
15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n"
16"Content-Transfer-Encoding: 8bit\n"
17+"Plural-Forms: nplurals=2; plural=n != 1;\n"
17−"X-Launchpad-Export-Date: 2014-09-29 05:19+0000\n"
18+"X-Launchpad-Export-Date: 2014-10-09 06:36+0000\n"
18"X-Generator: Launchpad (build 17196)\n"
19"X-Generator: Launchpad (build 17196)\n"
19
20
20#: plugins/LightDM/Greeter.cpp:130
21#: plugins/LightDM/Greeter.cpp:130
@@ -30,6 +31,27 @@ msgstr "Kiinnitä pikakuvake"
30msgid "Unpin shortcut"
31msgid "Unpin shortcut"
31msgstr "Poista pikakuvakkeen kiinnitys"
32msgstr "Poista pikakuvakkeen kiinnitys"
32
33
34+#: qml/Components/DelayedLockscreen.qml:47
35+msgid "Device Locked"
36+msgstr "Laite on lukittu"
37+
38+#: qml/Components/DelayedLockscreen.qml:62
39+msgid "You have been locked out due to too many failed passphrase attempts."
40+msgstr ""
41+"Laite on lukittu liian monen virheellisen tunnuslauseyrityksen jälkeen."
42+
43+#: qml/Components/DelayedLockscreen.qml:63
44+msgid "You have been locked out due to too many failed passcode attempts."
45+msgstr ""
46+"Laite on lukittu liian monen virheellisen suojakoodiyrityksen jälkeen."
47+
48+#: qml/Components/DelayedLockscreen.qml:72
49+#, qt-format
50+msgid "Please wait %1 minute and then try again…"
51+msgid_plural "Please wait %1 minutes and then try again…"
52+msgstr[0] "Odota %1 minuutti ja yritä sitten uudelleen…"
53+msgstr[1] "Odota %1 minuuttia ja yritä sitten uudelleen…"
54+
33#: qml/Components/Dialogs.qml:70
55#: qml/Components/Dialogs.qml:70
34msgid "Log out"
56msgid "Log out"
35msgstr "Kirjaudu ulos"
57msgstr "Kirjaudu ulos"
@@ -136,40 +158,23 @@ msgstr ""
136"Hallitset nyt reunaeleet, joten voit aloittaa puhelimen "
158"Hallitset nyt reunaeleet, joten voit aloittaa puhelimen "
137"käytön<br><br>Napauta näyttöä aloittaaksesi"
159"käytön<br><br>Napauta näyttöä aloittaaksesi"
138
160
139−#: qml/Components/Lockscreen.qml:167
161+#: qml/Components/Lockscreen.qml:220
140−msgid "Please wait"
141−msgstr "Odota hetki"
142−
143−#: qml/Components/Lockscreen.qml:172
144−msgid "Too many incorrect attempts"
145−msgstr "Liian monta virheellistä yritystä"
146−
147−#: qml/Components/Lockscreen.qml:206
148msgid "Emergency Call"
162msgid "Emergency Call"
149msgstr "Hätäpuhelu"
163msgstr "Hätäpuhelu"
150
164
151−#: qml/Components/Lockscreen.qml:226
165+#: qml/Components/Lockscreen.qml:252
152msgid "OK"
166msgid "OK"
153msgstr "OK"
167msgstr "OK"
154
168
155−#: qml/Components/PassphraseLockscreen.qml:61
156−#, qt-format
157−msgid "Hello %1"
158−msgstr "Hei %1!"
159−
160−#: qml/Components/PassphraseLockscreen.qml:61
161−msgid "Hello"
162−msgstr "Hei"
163−
164−#: qml/Dash/GenericScopeView.qml:411 qml/Dash/GenericScopeView.qml:533
169+#: qml/Dash/GenericScopeView.qml:434 qml/Dash/GenericScopeView.qml:591
165msgid "See less"
170msgid "See less"
166msgstr "Näytä vähemmän"
171msgstr "Näytä vähemmän"
167
172
168−#: qml/Dash/GenericScopeView.qml:411
173+#: qml/Dash/GenericScopeView.qml:434
169msgid "See all"
174msgid "See all"
170msgstr "Näytä kaikki"
175msgstr "Näytä kaikki"
171
176
172−#: qml/Dash/GenericScopeView.qml:473 qml/Dash/PageHeader.qml:258
177+#: qml/Dash/GenericScopeView.qml:496 qml/Dash/PageHeader.qml:258
173#: qml/Panel/SearchIndicator.qml:27
178#: qml/Panel/SearchIndicator.qml:27
174msgid "Search"
179msgid "Search"
175msgstr "Hae"
180msgstr "Hae"
@@ -206,6 +211,14 @@ msgstr "Lisää arvostelu"
206msgid "Send"
211msgid "Send"
207msgstr "Lähetä"
212msgstr "Lähetä"
208
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+
209#: qml/Dash/ScopesOverview.qml:206
222#: qml/Dash/ScopesOverview.qml:206
210msgid "Manage Scopes"
223msgid "Manage Scopes"
211msgstr "Näkymien hallinta"
224msgstr "Näkymien hallinta"
@@ -227,8 +240,8 @@ msgid "All"
227msgstr "Kaikki"
240msgstr "Kaikki"
228
241
229#: qml/Greeter/Greeter.qml:157
242#: qml/Greeter/Greeter.qml:157
230−msgid "Swipe to unlock"
243+msgid "Unlock"
231−msgstr "Avaa pyyhkäisemällä"
244+msgstr "Avaa lukitus"
232
245
233#: qml/Hud/HudParametrizedActionsPage.qml:139
246#: qml/Hud/HudParametrizedActionsPage.qml:139
234msgid "Confirm"
247msgid "Confirm"
@@ -250,18 +263,10 @@ msgstr "Puhu nyt..."
250msgid "Speaking..."
263msgid "Speaking..."
251msgstr "Puhutaan..."
264msgstr "Puhutaan..."
252
265
253−#: qml/Notifications/NotificationMenuItemFactory.qml:108
266+#: qml/Notifications/NotificationMenuItemFactory.qml:116
254msgid "Show password"
267msgid "Show password"
255msgstr "Näytä salasana"
268msgstr "Näytä salasana"
256
269
257−#: qml/Notifications/NotificationMenuItemFactory.qml:124
258−msgid "Enter SIM PIN"
259−msgstr "Anna SIM-kortin PIN-koodi"
260−
261−#: qml/Notifications/NotificationMenuItemFactory.qml:125
262−msgid "Sorry, incorrect PIN"
263−msgstr "Väärä PIN-koodi"
264−
265#: qml/Panel/ActiveCallHint.qml:77
270#: qml/Panel/ActiveCallHint.qml:77
266msgid "Tap to return to call..."
271msgid "Tap to return to call..."
267msgstr "Napauta palataksesi puheluun..."
272msgstr "Napauta palataksesi puheluun..."
@@ -306,45 +311,49 @@ msgstr "Avaa SIM-kortin lukitus"
306msgid "Roaming"
311msgid "Roaming"
307msgstr "Verkkovierailu"
312msgstr "Verkkovierailu"
308
313
309−#: qml/Shell.qml:320
314+#: qml/Shell.qml:346
310−msgid "Enter your passphrase"
315+msgid "Enter passphrase"
311msgstr "Anna tunnuslause"
316msgstr "Anna tunnuslause"
312
317
313−#: qml/Shell.qml:321
318+#: qml/Shell.qml:347
314msgid "Sorry, incorrect passphrase"
319msgid "Sorry, incorrect passphrase"
315msgstr "Virheellinen tunnuslause"
320msgstr "Virheellinen tunnuslause"
316
321
317−#: qml/Shell.qml:323
322+#: qml/Shell.qml:348
323+msgid "Please re-enter"
324+msgstr "Anna uudelleen"
325+
326+#: qml/Shell.qml:350
318−msgid "Enter your passcode"
327+msgid "Enter passcode"
319msgstr "Anna suojakoodi"
328msgstr "Anna suojakoodi"
320
329
321−#: qml/Shell.qml:324
330+#: qml/Shell.qml:351
322msgid "Sorry, incorrect passcode"
331msgid "Sorry, incorrect passcode"
323msgstr "Väärä suojakoodi"
332msgstr "Väärä suojakoodi"
324
333
325−#: qml/Shell.qml:327
334+#: qml/Shell.qml:354
326#, qt-format
335#, qt-format
327−msgid "Enter your %1"
336+msgid "Enter %1"
328msgstr "Anna %1"
337msgstr "Anna %1"
329
338
330−#: qml/Shell.qml:328
339+#: qml/Shell.qml:355
331#, qt-format
340#, qt-format
332msgid "Sorry, incorrect %1"
341msgid "Sorry, incorrect %1"
333msgstr "Väärä %1"
342msgstr "Väärä %1"
334
343
335−#: qml/Shell.qml:363
344+#: qml/Shell.qml:390
336msgid "Sorry, incorrect passphrase."
345msgid "Sorry, incorrect passphrase."
337msgstr "Virheellinen tunnuslause."
346msgstr "Virheellinen tunnuslause."
338
347
339−#: qml/Shell.qml:364
348+#: qml/Shell.qml:391
340msgid "Sorry, incorrect passcode."
349msgid "Sorry, incorrect passcode."
341msgstr "Virheellinen suojakoodi."
350msgstr "Virheellinen suojakoodi."
342
351
343−#: qml/Shell.qml:365
352+#: qml/Shell.qml:392
344msgid "This will be your last attempt."
353msgid "This will be your last attempt."
345msgstr "Tämä on viimeinen yritys."
354msgstr "Tämä on viimeinen yritys."
346
355
347−#: qml/Shell.qml:367
356+#: qml/Shell.qml:394
348msgid ""
357msgid ""
349"If passphrase is entered incorrectly, your phone will conduct a factory "
358"If passphrase is entered incorrectly, your phone will conduct a factory "
350"reset and all personal data will be deleted."
359"reset and all personal data will be deleted."
@@ -352,7 +361,7 @@ msgstr ""
352"Jos kirjoitat tunnuslauseen virheellisesti, puhelimesi palautetaan "
361"Jos kirjoitat tunnuslauseen virheellisesti, puhelimesi palautetaan "
353"tehdastilaan ja kaikki henkilökohtaiset tietosi poistetaan."
362"tehdastilaan ja kaikki henkilökohtaiset tietosi poistetaan."
354
363
355−#: qml/Shell.qml:368
364+#: qml/Shell.qml:395
356msgid ""
365msgid ""
357"If passcode is entered incorrectly, your phone will conduct a factory reset "
366"If passcode is entered incorrectly, your phone will conduct a factory reset "
358"and all personal data will be deleted."
367"and all personal data will be deleted."
@@ -360,5 +369,8 @@ msgstr ""
360"Jos kirjoitat suojakoodin virheellisesti, puhelimesi palautetaan "
369"Jos kirjoitat suojakoodin virheellisesti, puhelimesi palautetaan "
361"tehdastilaan ja kaikki henkilökohtaiset tietosi poistetaan."
370"tehdastilaan ja kaikki henkilökohtaiset tietosi poistetaan."
362
371
363−#~ msgid "Manage Dash"
372+#~ msgid "Sorry, incorrect PIN"
364−#~ msgstr "Unityn hallinta"
373+#~ msgstr "Väärä PIN-koodi"
374+
375+#~ msgid "Enter SIM PIN"
376+#~ msgstr "Anna SIM-kortin PIN-koodi"
po/fo.po+55−48
@@ -7,14 +7,15 @@ msgid ""
7msgstr ""
7msgstr ""
8"Project-Id-Version: unity\n"
8"Project-Id-Version: unity\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2014-09-24 10:43+0100\n"
10+"POT-Creation-Date: 2014-10-07 11:37+0300\n"
11"PO-Revision-Date: 2014-01-14 20:08+0000\n"
11"PO-Revision-Date: 2014-01-14 20:08+0000\n"
12"Last-Translator: Jógvan Olsen <jeggy@jebster.net>\n"
12"Last-Translator: Jógvan Olsen <jeggy@jebster.net>\n"
13"Language-Team: Faroese <fo@li.org>\n"
13"Language-Team: Faroese <fo@li.org>\n"
14"MIME-Version: 1.0\n"
14"MIME-Version: 1.0\n"
15"Content-Type: text/plain; charset=UTF-8\n"
15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n"
16"Content-Transfer-Encoding: 8bit\n"
17+"Plural-Forms: nplurals=2; plural=n != 1;\n"
17−"X-Launchpad-Export-Date: 2014-09-29 05:19+0000\n"
18+"X-Launchpad-Export-Date: 2014-10-09 06:36+0000\n"
18"X-Generator: Launchpad (build 17196)\n"
19"X-Generator: Launchpad (build 17196)\n"
19
20
20#: plugins/LightDM/Greeter.cpp:130
21#: plugins/LightDM/Greeter.cpp:130
@@ -30,6 +31,25 @@ msgstr ""
30msgid "Unpin shortcut"
31msgid "Unpin shortcut"
31msgstr ""
32msgstr ""
32
33
34+#: qml/Components/DelayedLockscreen.qml:47
35+msgid "Device Locked"
36+msgstr ""
37+
38+#: qml/Components/DelayedLockscreen.qml:62
39+msgid "You have been locked out due to too many failed passphrase attempts."
40+msgstr ""
41+
42+#: qml/Components/DelayedLockscreen.qml:63
43+msgid "You have been locked out due to too many failed passcode attempts."
44+msgstr ""
45+
46+#: qml/Components/DelayedLockscreen.qml:72
47+#, qt-format
48+msgid "Please wait %1 minute and then try again…"
49+msgid_plural "Please wait %1 minutes and then try again…"
50+msgstr[0] ""
51+msgstr[1] ""
52+
33#: qml/Components/Dialogs.qml:70
53#: qml/Components/Dialogs.qml:70
34msgid "Log out"
54msgid "Log out"
35msgstr ""
55msgstr ""
@@ -132,40 +152,23 @@ msgid ""
132"phone<br><br>Tap on the screen to start"
152"phone<br><br>Tap on the screen to start"
133msgstr ""
153msgstr ""
134
154
135−#: qml/Components/Lockscreen.qml:167
155+#: qml/Components/Lockscreen.qml:220
136−msgid "Please wait"
137−msgstr ""
138−
139−#: qml/Components/Lockscreen.qml:172
140−msgid "Too many incorrect attempts"
141−msgstr ""
142−
143−#: qml/Components/Lockscreen.qml:206
144msgid "Emergency Call"
156msgid "Emergency Call"
145msgstr ""
157msgstr ""
146
158
147−#: qml/Components/Lockscreen.qml:226
159+#: qml/Components/Lockscreen.qml:252
148msgid "OK"
160msgid "OK"
149msgstr ""
161msgstr ""
150
162
151−#: qml/Components/PassphraseLockscreen.qml:61
152−#, qt-format
153−msgid "Hello %1"
154−msgstr ""
155−
156−#: qml/Components/PassphraseLockscreen.qml:61
157−msgid "Hello"
158−msgstr ""
159−
160−#: qml/Dash/GenericScopeView.qml:411 qml/Dash/GenericScopeView.qml:533
163+#: qml/Dash/GenericScopeView.qml:434 qml/Dash/GenericScopeView.qml:591
161msgid "See less"
164msgid "See less"
162msgstr ""
165msgstr ""
163
166
164−#: qml/Dash/GenericScopeView.qml:411
167+#: qml/Dash/GenericScopeView.qml:434
165msgid "See all"
168msgid "See all"
166msgstr ""
169msgstr ""
167
170
168−#: qml/Dash/GenericScopeView.qml:473 qml/Dash/PageHeader.qml:258
171+#: qml/Dash/GenericScopeView.qml:496 qml/Dash/PageHeader.qml:258
169#: qml/Panel/SearchIndicator.qml:27
172#: qml/Panel/SearchIndicator.qml:27
170msgid "Search"
173msgid "Search"
171msgstr "Leita"
174msgstr "Leita"
@@ -202,6 +205,14 @@ msgstr ""
202msgid "Send"
205msgid "Send"
203msgstr ""
206msgstr ""
204
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+
205#: qml/Dash/ScopesOverview.qml:206
216#: qml/Dash/ScopesOverview.qml:206
206msgid "Manage Scopes"
217msgid "Manage Scopes"
207msgstr ""
218msgstr ""
@@ -223,7 +234,7 @@ msgid "All"
223msgstr ""
234msgstr ""
224
235
225#: qml/Greeter/Greeter.qml:157
236#: qml/Greeter/Greeter.qml:157
226−msgid "Swipe to unlock"
237+msgid "Unlock"
227msgstr ""
238msgstr ""
228
239
229#: qml/Hud/HudParametrizedActionsPage.qml:139
240#: qml/Hud/HudParametrizedActionsPage.qml:139
@@ -246,18 +257,10 @@ msgstr "Snakka nú..."
246msgid "Speaking..."
257msgid "Speaking..."
247msgstr "Snakkar..."
258msgstr "Snakkar..."
248
259
249−#: qml/Notifications/NotificationMenuItemFactory.qml:108
260+#: qml/Notifications/NotificationMenuItemFactory.qml:116
250msgid "Show password"
261msgid "Show password"
251msgstr ""
262msgstr ""
252
263
253−#: qml/Notifications/NotificationMenuItemFactory.qml:124
254−msgid "Enter SIM PIN"
255−msgstr ""
256−
257−#: qml/Notifications/NotificationMenuItemFactory.qml:125
258−msgid "Sorry, incorrect PIN"
259−msgstr ""
260−
261#: qml/Panel/ActiveCallHint.qml:77
264#: qml/Panel/ActiveCallHint.qml:77
262msgid "Tap to return to call..."
265msgid "Tap to return to call..."
263msgstr ""
266msgstr ""
@@ -302,51 +305,55 @@ msgstr ""
302msgid "Roaming"
305msgid "Roaming"
303msgstr ""
306msgstr ""
304
307
305−#: qml/Shell.qml:320
308+#: qml/Shell.qml:346
306−msgid "Enter your passphrase"
309+msgid "Enter passphrase"
307msgstr ""
310msgstr ""
308
311
309−#: qml/Shell.qml:321
312+#: qml/Shell.qml:347
310msgid "Sorry, incorrect passphrase"
313msgid "Sorry, incorrect passphrase"
311msgstr ""
314msgstr ""
312
315
313−#: qml/Shell.qml:323
316+#: qml/Shell.qml:348
317+msgid "Please re-enter"
318+msgstr ""
319+
320+#: qml/Shell.qml:350
314−msgid "Enter your passcode"
321+msgid "Enter passcode"
315msgstr ""
322msgstr ""
316
323
317−#: qml/Shell.qml:324
324+#: qml/Shell.qml:351
318msgid "Sorry, incorrect passcode"
325msgid "Sorry, incorrect passcode"
319msgstr ""
326msgstr ""
320
327
321−#: qml/Shell.qml:327
328+#: qml/Shell.qml:354
322#, qt-format
329#, qt-format
323−msgid "Enter your %1"
330+msgid "Enter %1"
324msgstr ""
331msgstr ""
325
332
326−#: qml/Shell.qml:328
333+#: qml/Shell.qml:355
327#, qt-format
334#, qt-format
328msgid "Sorry, incorrect %1"
335msgid "Sorry, incorrect %1"
329msgstr ""
336msgstr ""
330
337
331−#: qml/Shell.qml:363
338+#: qml/Shell.qml:390
332msgid "Sorry, incorrect passphrase."
339msgid "Sorry, incorrect passphrase."
333msgstr ""
340msgstr ""
334
341
335−#: qml/Shell.qml:364
342+#: qml/Shell.qml:391
336msgid "Sorry, incorrect passcode."
343msgid "Sorry, incorrect passcode."
337msgstr ""
344msgstr ""
338
345
339−#: qml/Shell.qml:365
346+#: qml/Shell.qml:392
340msgid "This will be your last attempt."
347msgid "This will be your last attempt."
341msgstr ""
348msgstr ""
342
349
343−#: qml/Shell.qml:367
350+#: qml/Shell.qml:394
344msgid ""
351msgid ""
345"If passphrase is entered incorrectly, your phone will conduct a factory "
352"If passphrase is entered incorrectly, your phone will conduct a factory "
346"reset and all personal data will be deleted."
353"reset and all personal data will be deleted."
347msgstr ""
354msgstr ""
348
355
349−#: qml/Shell.qml:368
356+#: qml/Shell.qml:395
350msgid ""
357msgid ""
351"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 "
352"and all personal data will be deleted."
359"and all personal data will be deleted."
po/fr.po+72−58
@@ -7,14 +7,15 @@ msgid ""
7msgstr ""
7msgstr ""
8"Project-Id-Version: unity\n"
8"Project-Id-Version: unity\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2014-09-24 10:43+0100\n"
10+"POT-Creation-Date: 2014-10-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"
13"Language-Team: French <fr@li.org>\n"
14"MIME-Version: 1.0\n"
14"MIME-Version: 1.0\n"
15"Content-Type: text/plain; charset=UTF-8\n"
15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n"
16"Content-Transfer-Encoding: 8bit\n"
17+"Plural-Forms: nplurals=2; plural=n > 1;\n"
17−"X-Launchpad-Export-Date: 2014-09-29 05:19+0000\n"
18+"X-Launchpad-Export-Date: 2014-10-09 06:36+0000\n"
18"X-Generator: Launchpad (build 17196)\n"
19"X-Generator: Launchpad (build 17196)\n"
19
20
20#: plugins/LightDM/Greeter.cpp:130
21#: plugins/LightDM/Greeter.cpp:130
@@ -30,6 +31,29 @@ msgstr "Épingler le raccourci"
30msgid "Unpin shortcut"
31msgid "Unpin shortcut"
31msgstr "Détacher le raccourci"
32msgstr "Détacher le raccourci"
32
33
34+#: qml/Components/DelayedLockscreen.qml:47
35+msgid "Device Locked"
36+msgstr "Périphérique verrouillé"
37+
38+#: qml/Components/DelayedLockscreen.qml:62
39+msgid "You have been locked out due to too many failed passphrase attempts."
40+msgstr ""
41+"Vous avez été bloqué suite à un trop grand nombre de tentatives de saisie "
42+"d'une phrase de passe erronée."
43+
44+#: qml/Components/DelayedLockscreen.qml:63
45+msgid "You have been locked out due to too many failed passcode attempts."
46+msgstr ""
47+"Vous avez été bloqué suite à un trop grand nombre de tentatives de saisie "
48+"d'un mot de passe erroné."
49+
50+#: qml/Components/DelayedLockscreen.qml:72
51+#, qt-format
52+msgid "Please wait %1 minute and then try again…"
53+msgid_plural "Please wait %1 minutes and then try again…"
54+msgstr[0] "Veuillez patienter %1 minute et réessayer..."
55+msgstr[1] "Veuillez patienter %1 minutes et réessayer..."
56+
33#: qml/Components/Dialogs.qml:70
57#: qml/Components/Dialogs.qml:70
34msgid "Log out"
58msgid "Log out"
35msgstr "Se déconnecter"
59msgstr "Se déconnecter"
@@ -143,40 +167,23 @@ msgstr ""
143"Vous maîtrisez maintenant les différents gestes et pouvez commencer à "
167"Vous maîtrisez maintenant les différents gestes et pouvez commencer à "
144"utiliser le téléphone<br><br>Appuyez sur l'écran pour commencer"
168"utiliser le téléphone<br><br>Appuyez sur l'écran pour commencer"
145
169
146−#: qml/Components/Lockscreen.qml:167
170+#: qml/Components/Lockscreen.qml:220
147−msgid "Please wait"
148−msgstr "Veuillez patienter"
149−
150−#: qml/Components/Lockscreen.qml:172
151−msgid "Too many incorrect attempts"
152−msgstr "Trop de tentatives incorrectes"
153−
154−#: qml/Components/Lockscreen.qml:206
155msgid "Emergency Call"
171msgid "Emergency Call"
156msgstr "Appel d'urgence"
172msgstr "Appel d'urgence"
157
173
158−#: qml/Components/Lockscreen.qml:226
174+#: qml/Components/Lockscreen.qml:252
159msgid "OK"
175msgid "OK"
160msgstr "OK"
176msgstr "OK"
161
177
162−#: qml/Components/PassphraseLockscreen.qml:61
163−#, qt-format
164−msgid "Hello %1"
165−msgstr "Bonjour %1"
166−
167−#: qml/Components/PassphraseLockscreen.qml:61
168−msgid "Hello"
169−msgstr "Bonjour"
170−
171−#: qml/Dash/GenericScopeView.qml:411 qml/Dash/GenericScopeView.qml:533
178+#: qml/Dash/GenericScopeView.qml:434 qml/Dash/GenericScopeView.qml:591
172msgid "See less"
179msgid "See less"
173msgstr "Voir moins"
180msgstr "Voir moins"
174
181
175−#: qml/Dash/GenericScopeView.qml:411
182+#: qml/Dash/GenericScopeView.qml:434
176msgid "See all"
183msgid "See all"
177msgstr "Tout voir"
184msgstr "Tout voir"
178
185
179−#: qml/Dash/GenericScopeView.qml:473 qml/Dash/PageHeader.qml:258
186+#: qml/Dash/GenericScopeView.qml:496 qml/Dash/PageHeader.qml:258
180#: qml/Panel/SearchIndicator.qml:27
187#: qml/Panel/SearchIndicator.qml:27
181msgid "Search"
188msgid "Search"
182msgstr "Rechercher"
189msgstr "Rechercher"
@@ -213,9 +220,17 @@ msgstr "Ajouter un avis"
213msgid "Send"
220msgid "Send"
214msgstr "Envoyer"
221msgstr "Envoyer"
215
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+
216#: qml/Dash/ScopesOverview.qml:206
231#: qml/Dash/ScopesOverview.qml:206
217msgid "Manage Scopes"
232msgid "Manage Scopes"
218−msgstr ""
233+msgstr "Gérer les moteurs de recherche"
219
234
220#: qml/Dash/ScopesOverview.qml:428
235#: qml/Dash/ScopesOverview.qml:428
221msgid "Done"
236msgid "Done"
@@ -234,8 +249,8 @@ msgid "All"
234msgstr "Toutes"
249msgstr "Toutes"
235
250
236#: qml/Greeter/Greeter.qml:157
251#: qml/Greeter/Greeter.qml:157
237−msgid "Swipe to unlock"
252+msgid "Unlock"
238−msgstr "Faites glisser pour déverrouiller"
253+msgstr "Déverrouiller"
239
254
240#: qml/Hud/HudParametrizedActionsPage.qml:139
255#: qml/Hud/HudParametrizedActionsPage.qml:139
241msgid "Confirm"
256msgid "Confirm"
@@ -257,18 +272,10 @@ msgstr "Parlez maintenant…"
257msgid "Speaking..."
272msgid "Speaking..."
258msgstr "En cours d'écoute..."
273msgstr "En cours d'écoute..."
259
274
260−#: qml/Notifications/NotificationMenuItemFactory.qml:108
275+#: qml/Notifications/NotificationMenuItemFactory.qml:116
261msgid "Show password"
276msgid "Show password"
262msgstr "Afficher le mot de passe"
277msgstr "Afficher le mot de passe"
263
278
264−#: qml/Notifications/NotificationMenuItemFactory.qml:124
265−msgid "Enter SIM PIN"
266−msgstr "Entrez le code PIN de la SIM"
267−
268−#: qml/Notifications/NotificationMenuItemFactory.qml:125
269−msgid "Sorry, incorrect PIN"
270−msgstr "Désolé, code PIN incorrect"
271−
272#: qml/Panel/ActiveCallHint.qml:77
279#: qml/Panel/ActiveCallHint.qml:77
273msgid "Tap to return to call..."
280msgid "Tap to return to call..."
274msgstr "Appuyez pour revenir à l'appel…"
281msgstr "Appuyez pour revenir à l'appel…"
@@ -279,7 +286,7 @@ msgstr "Conférence"
279
286
280#: qml/Panel/Indicators/MenuItemFactory.qml:600
287#: qml/Panel/Indicators/MenuItemFactory.qml:600
281msgid "Nothing is playing"
288msgid "Nothing is playing"
282−msgstr ""
289+msgstr "Rien n'est en cours de lecture"
283
290
284#: qml/Panel/Indicators/MenuItemFactory.qml:748
291#: qml/Panel/Indicators/MenuItemFactory.qml:748
285msgid "In queue…"
292msgid "In queue…"
@@ -313,45 +320,49 @@ msgstr "Déverrouiller la carte SIM"
313msgid "Roaming"
320msgid "Roaming"
314msgstr "Roaming"
321msgstr "Roaming"
315
322
316−#: qml/Shell.qml:320
323+#: qml/Shell.qml:346
317−msgid "Enter your passphrase"
324+msgid "Enter passphrase"
318−msgstr "Entrez votre phrase secrète"
325+msgstr "Saisissez la phrase de passe"
319
326
320−#: qml/Shell.qml:321
327+#: qml/Shell.qml:347
321msgid "Sorry, incorrect passphrase"
328msgid "Sorry, incorrect passphrase"
322msgstr "Désolé, phrase secrète incorrecte"
329msgstr "Désolé, phrase secrète incorrecte"
323
330
324−#: qml/Shell.qml:323
331+#: qml/Shell.qml:348
325−msgid "Enter your passcode"
332+msgid "Please re-enter"
326−msgstr "Entrez votre code"
333+msgstr "Veuillez ressaisir"
327
334
328−#: qml/Shell.qml:324
335+#: qml/Shell.qml:350
336+msgid "Enter passcode"
337+msgstr "Saisissez le mot de passe"
338+
339+#: qml/Shell.qml:351
329msgid "Sorry, incorrect passcode"
340msgid "Sorry, incorrect passcode"
330msgstr "Désolé, code incorrect"
341msgstr "Désolé, code incorrect"
331
342
332−#: qml/Shell.qml:327
343+#: qml/Shell.qml:354
333#, qt-format
344#, qt-format
334−msgid "Enter your %1"
345+msgid "Enter %1"
335−msgstr "Saisissez votre %1"
346+msgstr "Saisissez %1"
336
347
337−#: qml/Shell.qml:328
348+#: qml/Shell.qml:355
338#, qt-format
349#, qt-format
339msgid "Sorry, incorrect %1"
350msgid "Sorry, incorrect %1"
340msgstr "Désolé, %1 incorrect"
351msgstr "Désolé, %1 incorrect"
341
352
342−#: qml/Shell.qml:363
353+#: qml/Shell.qml:390
343msgid "Sorry, incorrect passphrase."
354msgid "Sorry, incorrect passphrase."
344msgstr "Désolé, phrase secrète incorrecte."
355msgstr "Désolé, phrase secrète incorrecte."
345
356
346−#: qml/Shell.qml:364
357+#: qml/Shell.qml:391
347msgid "Sorry, incorrect passcode."
358msgid "Sorry, incorrect passcode."
348msgstr "Désolé, code incorrect."
359msgstr "Désolé, code incorrect."
349
360
350−#: qml/Shell.qml:365
361+#: qml/Shell.qml:392
351msgid "This will be your last attempt."
362msgid "This will be your last attempt."
352msgstr "Ceci sera votre dernière tentative."
363msgstr "Ceci sera votre dernière tentative."
353
364
354−#: qml/Shell.qml:367
365+#: qml/Shell.qml:394
355msgid ""
366msgid ""
356"If passphrase is entered incorrectly, your phone will conduct a factory "
367"If passphrase is entered incorrectly, your phone will conduct a factory "
357"reset and all personal data will be deleted."
368"reset and all personal data will be deleted."
@@ -360,7 +371,7 @@ msgstr ""
360"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 "
361"personnelles seront supprimées."
372"personnelles seront supprimées."
362
373
363−#: qml/Shell.qml:368
374+#: qml/Shell.qml:395
364msgid ""
375msgid ""
365"If passcode is entered incorrectly, your phone will conduct a factory reset "
376"If passcode is entered incorrectly, your phone will conduct a factory reset "
366"and all personal data will be deleted."
377"and all personal data will be deleted."
@@ -369,5 +380,8 @@ msgstr ""
369"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 "
370"seront supprimées."
381"seront supprimées."
371
382
372−#~ msgid "Manage Dash"
383+#~ msgid "Sorry, incorrect PIN"
373−#~ msgstr "Gérer le tableau de bord"
384+#~ msgstr "Désolé, code PIN incorrect"
385+
386+#~ msgid "Enter SIM PIN"
387+#~ msgstr "Entrez le code PIN de la SIM"
po/gd.po+74−57
@@ -7,14 +7,16 @@ msgid ""
7msgstr ""
7msgstr ""
8"Project-Id-Version: unity8\n"
8"Project-Id-Version: unity8\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2014-09-24 10:43+0100\n"
10+"POT-Creation-Date: 2014-10-07 11:37+0300\n"
11−"PO-Revision-Date: 2014-09-25 12:40+0000\n"
11+"PO-Revision-Date: 2014-10-03 19:54+0000\n"
12"Last-Translator: GunChleoc <Unknown>\n"
12"Last-Translator: GunChleoc <Unknown>\n"
13"Language-Team: Fòram na Gàidhlig\n"
13"Language-Team: Fòram na Gàidhlig\n"
14"MIME-Version: 1.0\n"
14"MIME-Version: 1.0\n"
15"Content-Type: text/plain; charset=UTF-8\n"
15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n"
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"
17−"X-Launchpad-Export-Date: 2014-09-29 05:19+0000\n"
19+"X-Launchpad-Export-Date: 2014-10-09 06:36+0000\n"
18"X-Generator: Launchpad (build 17196)\n"
20"X-Generator: Launchpad (build 17196)\n"
19"Language: gd\n"
21"Language: gd\n"
20
22
@@ -31,6 +33,31 @@ msgstr "Prìnich ath-ghoirid"
31msgid "Unpin shortcut"
33msgid "Unpin shortcut"
32msgstr "Neo-phrìnich an ath-ghoirid"
34msgstr "Neo-phrìnich an ath-ghoirid"
33
35
36+#: qml/Components/DelayedLockscreen.qml:47
37+msgid "Device Locked"
38+msgstr "Tha glas air an uidheam"
39+
40+#: qml/Components/DelayedLockscreen.qml:62
41+msgid "You have been locked out due to too many failed passphrase attempts."
42+msgstr ""
43+"Chaidh do glasadh a-mach às an uidheam on a chuir thu abairt-fhaire chearr a-"
44+"steach cus tursan."
45+
46+#: qml/Components/DelayedLockscreen.qml:63
47+msgid "You have been locked out due to too many failed passcode attempts."
48+msgstr ""
49+"Chaidh do glasadh a-mach às an uidheam on a chuir thu còd-faire cearr a-"
50+"steach cus tursan."
51+
52+#: qml/Components/DelayedLockscreen.qml:72
53+#, qt-format
54+msgid "Please wait %1 minute and then try again…"
55+msgid_plural "Please wait %1 minutes and then try again…"
56+msgstr[0] "Fuirich ort %1 diog 's feuch ris a-rithist an uairsin…"
57+msgstr[1] "Fuirich ort %1 dhiog 's feuch ris a-rithist an uairsin…"
58+msgstr[2] "Fuirich ort %1 diogan 's feuch ris a-rithist an uairsin…"
59+msgstr[3] "Fuirich ort %1 diog 's feuch ris a-rithist an uairsin…"
60+
34#: qml/Components/Dialogs.qml:70
61#: qml/Components/Dialogs.qml:70
35msgid "Log out"
62msgid "Log out"
36msgstr "Clàraich a-mach"
63msgstr "Clàraich a-mach"
@@ -143,40 +170,23 @@ msgstr ""
143"Fhuair thu air na gluasadan oire ceart a dhèanamh a-nis agus is urrainn dhut "
170"Fhuair thu air na gluasadan oire ceart a dhèanamh a-nis agus is urrainn dhut "
144"am fòn a chleachdadh<br><br>Thoir gnogag air an sgrìn airson tòiseachadh"
171"am fòn a chleachdadh<br><br>Thoir gnogag air an sgrìn airson tòiseachadh"
145
172
146−#: qml/Components/Lockscreen.qml:167
173+#: qml/Components/Lockscreen.qml:220
147−msgid "Please wait"
148−msgstr "Fuirich ort"
149−
150−#: qml/Components/Lockscreen.qml:172
151−msgid "Too many incorrect attempts"
152−msgstr "Cus oidhirpean leis nach do shoirbhich"
153−
154−#: qml/Components/Lockscreen.qml:206
155msgid "Emergency Call"
174msgid "Emergency Call"
156msgstr "Gairm èiginn"
175msgstr "Gairm èiginn"
157
176
158−#: qml/Components/Lockscreen.qml:226
177+#: qml/Components/Lockscreen.qml:252
159msgid "OK"
178msgid "OK"
160msgstr "Ceart ma-thà"
179msgstr "Ceart ma-thà"
161
180
162−#: qml/Components/PassphraseLockscreen.qml:61
163−#, qt-format
164−msgid "Hello %1"
165−msgstr "Shin thu, %1"
166−
167−#: qml/Components/PassphraseLockscreen.qml:61
168−msgid "Hello"
169−msgstr "Shin thu"
170−
171−#: qml/Dash/GenericScopeView.qml:411 qml/Dash/GenericScopeView.qml:533
181+#: qml/Dash/GenericScopeView.qml:434 qml/Dash/GenericScopeView.qml:591
172msgid "See less"
182msgid "See less"
173msgstr "Seall nas lugha"
183msgstr "Seall nas lugha"
174
184
175−#: qml/Dash/GenericScopeView.qml:411
185+#: qml/Dash/GenericScopeView.qml:434
176msgid "See all"
186msgid "See all"
177msgstr "Seall na h-uile"
187msgstr "Seall na h-uile"
178
188
179−#: qml/Dash/GenericScopeView.qml:473 qml/Dash/PageHeader.qml:258
189+#: qml/Dash/GenericScopeView.qml:496 qml/Dash/PageHeader.qml:258
180#: qml/Panel/SearchIndicator.qml:27
190#: qml/Panel/SearchIndicator.qml:27
181msgid "Search"
191msgid "Search"
182msgstr "Lorg"
192msgstr "Lorg"
@@ -213,9 +223,17 @@ msgstr "Cuir lèirmheas ris"
213msgid "Send"
223msgid "Send"
214msgstr "Cuir"
224msgstr "Cuir"
215
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+
216#: qml/Dash/ScopesOverview.qml:206
234#: qml/Dash/ScopesOverview.qml:206
217msgid "Manage Scopes"
235msgid "Manage Scopes"
218−msgstr ""
236+msgstr "Stiùirich na sgòpaichean"
219
237
220#: qml/Dash/ScopesOverview.qml:428
238#: qml/Dash/ScopesOverview.qml:428
221msgid "Done"
239msgid "Done"
@@ -234,8 +252,8 @@ msgid "All"
234msgstr "Na h-uile"
252msgstr "Na h-uile"
235
253
236#: qml/Greeter/Greeter.qml:157
254#: qml/Greeter/Greeter.qml:157
237−msgid "Swipe to unlock"
255+msgid "Unlock"
238−msgstr "Dèan grad-shlaighdeadh gus a' ghlas a thoirt dheth"
256+msgstr "Thoir a' ghlas dheth"
239
257
240#: qml/Hud/HudParametrizedActionsPage.qml:139
258#: qml/Hud/HudParametrizedActionsPage.qml:139
241msgid "Confirm"
259msgid "Confirm"
@@ -257,18 +275,10 @@ msgstr "Can rud a-nis..."
257msgid "Speaking..."
275msgid "Speaking..."
258msgstr "A' bruidhinn..."
276msgstr "A' bruidhinn..."
259
277
260−#: qml/Notifications/NotificationMenuItemFactory.qml:108
278+#: qml/Notifications/NotificationMenuItemFactory.qml:116
261msgid "Show password"
279msgid "Show password"
262msgstr "Seall am facal-faire"
280msgstr "Seall am facal-faire"
263
281
264−#: qml/Notifications/NotificationMenuItemFactory.qml:124
265−msgid "Enter SIM PIN"
266−msgstr "Cuir a-steach PIN an t-SIM"
267−
268−#: qml/Notifications/NotificationMenuItemFactory.qml:125
269−msgid "Sorry, incorrect PIN"
270−msgstr "Duilich ach tha a' PIN cearr"
271−
272#: qml/Panel/ActiveCallHint.qml:77
282#: qml/Panel/ActiveCallHint.qml:77
273msgid "Tap to return to call..."
283msgid "Tap to return to call..."
274msgstr "Gnog gus tilleadh dhan ghairm..."
284msgstr "Gnog gus tilleadh dhan ghairm..."
@@ -279,7 +289,7 @@ msgstr "Gairm co-labhairt"
279
289
280#: qml/Panel/Indicators/MenuItemFactory.qml:600
290#: qml/Panel/Indicators/MenuItemFactory.qml:600
281msgid "Nothing is playing"
291msgid "Nothing is playing"
282−msgstr ""
292+msgstr "Chan eil dad 'ga chluich"
283
293
284#: qml/Panel/Indicators/MenuItemFactory.qml:748
294#: qml/Panel/Indicators/MenuItemFactory.qml:748
285msgid "In queue…"
295msgid "In queue…"
@@ -313,45 +323,49 @@ msgstr "Thoir a' ghlas far an SIM"
313msgid "Roaming"
323msgid "Roaming"
314msgstr "Air fàrsan"
324msgstr "Air fàrsan"
315
325
316−#: qml/Shell.qml:320
326+#: qml/Shell.qml:346
317−msgid "Enter your passphrase"
327+msgid "Enter passphrase"
318−msgstr "Cuir an abairt-fhaire agad a-steach"
328+msgstr "Cuir abairt-fhaire a-steach"
319
329
320−#: qml/Shell.qml:321
330+#: qml/Shell.qml:347
321msgid "Sorry, incorrect passphrase"
331msgid "Sorry, incorrect passphrase"
322msgstr "Duilich ach tha an abairt-fhaire cearr"
332msgstr "Duilich ach tha an abairt-fhaire cearr"
323
333
324−#: qml/Shell.qml:323
334+#: qml/Shell.qml:348
325−msgid "Enter your passcode"
335+msgid "Please re-enter"
326−msgstr "Cuir an còd-faire agad a-steach"
336+msgstr "Cuir a-steach e a-rithist"
327
337
328−#: qml/Shell.qml:324
338+#: qml/Shell.qml:350
339+msgid "Enter passcode"
340+msgstr "Cuir còd-faire a-steach"
341+
342+#: qml/Shell.qml:351
329msgid "Sorry, incorrect passcode"
343msgid "Sorry, incorrect passcode"
330msgstr "Duilich ach tha an còd-faire cearr"
344msgstr "Duilich ach tha an còd-faire cearr"
331
345
332−#: qml/Shell.qml:327
346+#: qml/Shell.qml:354
333#, qt-format
347#, qt-format
334−msgid "Enter your %1"
348+msgid "Enter %1"
335−msgstr "Cuir a-steach a' %1 agad"
349+msgstr "Cuir a-steach %1"
336
350
337−#: qml/Shell.qml:328
351+#: qml/Shell.qml:355
338#, qt-format
352#, qt-format
339msgid "Sorry, incorrect %1"
353msgid "Sorry, incorrect %1"
340msgstr "Duilich ach tha a' %1 cearr"
354msgstr "Duilich ach tha a' %1 cearr"
341
355
342−#: qml/Shell.qml:363
356+#: qml/Shell.qml:390
343msgid "Sorry, incorrect passphrase."
357msgid "Sorry, incorrect passphrase."
344msgstr "Duilich ach tha an abairt-fhaire cearr."
358msgstr "Duilich ach tha an abairt-fhaire cearr."
345
359
346−#: qml/Shell.qml:364
360+#: qml/Shell.qml:391
347msgid "Sorry, incorrect passcode."
361msgid "Sorry, incorrect passcode."
348msgstr "Duilich ach tha an còd-faire cearr."
362msgstr "Duilich ach tha an còd-faire cearr."
349
363
350−#: qml/Shell.qml:365
364+#: qml/Shell.qml:392
351msgid "This will be your last attempt."
365msgid "This will be your last attempt."
352msgstr "Seo an oidhirp mu dheireadh agad."
366msgstr "Seo an oidhirp mu dheireadh agad."
353
367
354−#: qml/Shell.qml:367
368+#: qml/Shell.qml:394
355msgid ""
369msgid ""
356"If passphrase is entered incorrectly, your phone will conduct a factory "
370"If passphrase is entered incorrectly, your phone will conduct a factory "
357"reset and all personal data will be deleted."
371"reset and all personal data will be deleted."
@@ -360,7 +374,7 @@ msgstr ""
360"ath-shuidheachadh air roghainnean an fhactaraidh agus thèid gach dàta "
374"ath-shuidheachadh air roghainnean an fhactaraidh agus thèid gach dàta "
361"pearsanta a sguabadh às."
375"pearsanta a sguabadh às."
362
376
363−#: qml/Shell.qml:368
377+#: qml/Shell.qml:395
364msgid ""
378msgid ""
365"If passcode is entered incorrectly, your phone will conduct a factory reset "
379"If passcode is entered incorrectly, your phone will conduct a factory reset "
366"and all personal data will be deleted."
380"and all personal data will be deleted."
@@ -369,5 +383,8 @@ msgstr ""
369"shuidheachadh air roghainnean an fhactaraidh agus thèid gach dàta pearsanta "
383"shuidheachadh air roghainnean an fhactaraidh agus thèid gach dàta pearsanta "
370"a sguabadh às."
384"a sguabadh às."
371
385
372−#~ msgid "Manage Dash"
386+#~ msgid "Enter SIM PIN"
373−#~ msgstr "Stiùirich an deas-bhòrd"
387+#~ msgstr "Cuir a-steach PIN an t-SIM"
388+
389+#~ msgid "Sorry, incorrect PIN"
390+#~ msgstr "Duilich ach tha a' PIN cearr"
po/gl.po+62−52
@@ -7,14 +7,15 @@ msgid ""
7msgstr ""
7msgstr ""
8"Project-Id-Version: unity\n"
8"Project-Id-Version: unity\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2014-09-24 10:43+0100\n"
10+"POT-Creation-Date: 2014-10-07 11:37+0300\n"
11−"PO-Revision-Date: 2014-09-28 13:57+0000\n"
11+"PO-Revision-Date: 2014-10-07 10:01+0000\n"
12"Last-Translator: Marcos Lans <Unknown>\n"
12"Last-Translator: Marcos Lans <Unknown>\n"
13"Language-Team: Galician <gl@li.org>\n"
13"Language-Team: Galician <gl@li.org>\n"
14"MIME-Version: 1.0\n"
14"MIME-Version: 1.0\n"
15"Content-Type: text/plain; charset=UTF-8\n"
15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n"
16"Content-Transfer-Encoding: 8bit\n"
17+"Plural-Forms: nplurals=2; plural=n != 1;\n"
17−"X-Launchpad-Export-Date: 2014-09-29 05:19+0000\n"
18+"X-Launchpad-Export-Date: 2014-10-09 06:36+0000\n"
18"X-Generator: Launchpad (build 17196)\n"
19"X-Generator: Launchpad (build 17196)\n"
19
20
20#: plugins/LightDM/Greeter.cpp:130
21#: plugins/LightDM/Greeter.cpp:130
@@ -30,6 +31,25 @@ msgstr "Fixar o atallo"
30msgid "Unpin shortcut"
31msgid "Unpin shortcut"
31msgstr "Eliminar o atallo"
32msgstr "Eliminar o atallo"
32
33
34+#: qml/Components/DelayedLockscreen.qml:47
35+msgid "Device Locked"
36+msgstr "Dispositivo bloqueado"
37+
38+#: qml/Components/DelayedLockscreen.qml:62
39+msgid "You have been locked out due to too many failed passphrase attempts."
40+msgstr "Bloqueouse o dispositivo polos intentos fallidos da frase secreta."
41+
42+#: qml/Components/DelayedLockscreen.qml:63
43+msgid "You have been locked out due to too many failed passcode attempts."
44+msgstr "Bloqueouse o dispositivo polos intentos fallidos da clave."
45+
46+#: qml/Components/DelayedLockscreen.qml:72
47+#, qt-format
48+msgid "Please wait %1 minute and then try again…"
49+msgid_plural "Please wait %1 minutes and then try again…"
50+msgstr[0] "Agarde %1 minuto e ténteo de novo…"
51+msgstr[1] "Agarde %1 minutos e ténteo de novo…"
52+
33#: qml/Components/Dialogs.qml:70
53#: qml/Components/Dialogs.qml:70
34msgid "Log out"
54msgid "Log out"
35msgstr "Saír da sesión"
55msgstr "Saír da sesión"
@@ -136,40 +156,23 @@ msgstr ""
136"Agora xa domina os xestos dos bordos e pode comezar a usar o "
156"Agora xa domina os xestos dos bordos e pode comezar a usar o "
137"teléfono<br><br>Toque na pantalla para comezar"
157"teléfono<br><br>Toque na pantalla para comezar"
138
158
139−#: qml/Components/Lockscreen.qml:167
159+#: qml/Components/Lockscreen.qml:220
140−msgid "Please wait"
141−msgstr "Agarde"
142−
143−#: qml/Components/Lockscreen.qml:172
144−msgid "Too many incorrect attempts"
145−msgstr "Demasiados erros"
146−
147−#: qml/Components/Lockscreen.qml:206
148msgid "Emergency Call"
160msgid "Emergency Call"
149msgstr "Chamada de emerxencia"
161msgstr "Chamada de emerxencia"
150
162
151−#: qml/Components/Lockscreen.qml:226
163+#: qml/Components/Lockscreen.qml:252
152msgid "OK"
164msgid "OK"
153msgstr "Aceptar"
165msgstr "Aceptar"
154
166
155−#: qml/Components/PassphraseLockscreen.qml:61
156−#, qt-format
157−msgid "Hello %1"
158−msgstr "Ola %1"
159−
160−#: qml/Components/PassphraseLockscreen.qml:61
161−msgid "Hello"
162−msgstr "Ola"
163−
164−#: qml/Dash/GenericScopeView.qml:411 qml/Dash/GenericScopeView.qml:533
167+#: qml/Dash/GenericScopeView.qml:434 qml/Dash/GenericScopeView.qml:591
165msgid "See less"
168msgid "See less"
166msgstr "Ver menos"
169msgstr "Ver menos"
167
170
168−#: qml/Dash/GenericScopeView.qml:411
171+#: qml/Dash/GenericScopeView.qml:434
169msgid "See all"
172msgid "See all"
170msgstr "Ver todo"
173msgstr "Ver todo"
171
174
172−#: qml/Dash/GenericScopeView.qml:473 qml/Dash/PageHeader.qml:258
175+#: qml/Dash/GenericScopeView.qml:496 qml/Dash/PageHeader.qml:258
173#: qml/Panel/SearchIndicator.qml:27
176#: qml/Panel/SearchIndicator.qml:27
174msgid "Search"
177msgid "Search"
175msgstr "Buscar"
178msgstr "Buscar"
@@ -206,6 +209,14 @@ msgstr "Engadir unha opinión"
206msgid "Send"
209msgid "Send"
207msgstr "Enviar"
210msgstr "Enviar"
208
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+
209#: qml/Dash/ScopesOverview.qml:206
220#: qml/Dash/ScopesOverview.qml:206
210msgid "Manage Scopes"
221msgid "Manage Scopes"
211msgstr "Xestionar os Ámbitos"
222msgstr "Xestionar os Ámbitos"
@@ -227,8 +238,8 @@ msgid "All"
227msgstr "Todos"
238msgstr "Todos"
228
239
229#: qml/Greeter/Greeter.qml:157
240#: qml/Greeter/Greeter.qml:157
230−msgid "Swipe to unlock"
241+msgid "Unlock"
231−msgstr "Esvare o dedo para desbloquear"
242+msgstr "Desbloquear"
232
243
233#: qml/Hud/HudParametrizedActionsPage.qml:139
244#: qml/Hud/HudParametrizedActionsPage.qml:139
234msgid "Confirm"
245msgid "Confirm"
@@ -250,18 +261,10 @@ msgstr "Fale agora…"
250msgid "Speaking..."
261msgid "Speaking..."
251msgstr "Falando…"
262msgstr "Falando…"
252
263
253−#: qml/Notifications/NotificationMenuItemFactory.qml:108
264+#: qml/Notifications/NotificationMenuItemFactory.qml:116
254msgid "Show password"
265msgid "Show password"
255msgstr "Mostrar contrasinal"
266msgstr "Mostrar contrasinal"
256
267
257−#: qml/Notifications/NotificationMenuItemFactory.qml:124
258−msgid "Enter SIM PIN"
259−msgstr "Introduza o PIN da SIM"
260−
261−#: qml/Notifications/NotificationMenuItemFactory.qml:125
262−msgid "Sorry, incorrect PIN"
263−msgstr "Sentímolo, o PIN é incorrecto"
264−
265#: qml/Panel/ActiveCallHint.qml:77
268#: qml/Panel/ActiveCallHint.qml:77
266msgid "Tap to return to call..."
269msgid "Tap to return to call..."
267msgstr "Toque para volver a chamar..."
270msgstr "Toque para volver a chamar..."
@@ -306,45 +309,49 @@ msgstr "Desbloquear a SIM"
306msgid "Roaming"
309msgid "Roaming"
307msgstr "Itinerancia"
310msgstr "Itinerancia"
308
311
309−#: qml/Shell.qml:320
312+#: qml/Shell.qml:346
310−msgid "Enter your passphrase"
313+msgid "Enter passphrase"
311msgstr "Introduza a frase secreta"
314msgstr "Introduza a frase secreta"
312
315
313−#: qml/Shell.qml:321
316+#: qml/Shell.qml:347
314msgid "Sorry, incorrect passphrase"
317msgid "Sorry, incorrect passphrase"
315msgstr "Sentímolo a frase é incorrecta"
318msgstr "Sentímolo a frase é incorrecta"
316
319
317−#: qml/Shell.qml:323
320+#: qml/Shell.qml:348
321+msgid "Please re-enter"
322+msgstr "Introducir de novo"
323+
324+#: qml/Shell.qml:350
318−msgid "Enter your passcode"
325+msgid "Enter passcode"
319msgstr "Introduza a clave"
326msgstr "Introduza a clave"
320
327
321−#: qml/Shell.qml:324
328+#: qml/Shell.qml:351
322msgid "Sorry, incorrect passcode"
329msgid "Sorry, incorrect passcode"
323msgstr "Sentímolo, a clave é incorrecta"
330msgstr "Sentímolo, a clave é incorrecta"
324
331
325−#: qml/Shell.qml:327
332+#: qml/Shell.qml:354
326#, qt-format
333#, qt-format
327−msgid "Enter your %1"
334+msgid "Enter %1"
328msgstr "Introducir %1"
335msgstr "Introducir %1"
329
336
330−#: qml/Shell.qml:328
337+#: qml/Shell.qml:355
331#, qt-format
338#, qt-format
332msgid "Sorry, incorrect %1"
339msgid "Sorry, incorrect %1"
333msgstr "Sentímolo, %1 non coincide"
340msgstr "Sentímolo, %1 non coincide"
334
341
335−#: qml/Shell.qml:363
342+#: qml/Shell.qml:390
336msgid "Sorry, incorrect passphrase."
343msgid "Sorry, incorrect passphrase."
337msgstr "Sentímolo a frase é incorrecta."
344msgstr "Sentímolo a frase é incorrecta."
338
345
339−#: qml/Shell.qml:364
346+#: qml/Shell.qml:391
340msgid "Sorry, incorrect passcode."
347msgid "Sorry, incorrect passcode."
341msgstr "Sentímolo, a clave é incorrecta."
348msgstr "Sentímolo, a clave é incorrecta."
342
349
343−#: qml/Shell.qml:365
350+#: qml/Shell.qml:392
344msgid "This will be your last attempt."
351msgid "This will be your last attempt."
345msgstr "Este será o seu último intento."
352msgstr "Este será o seu último intento."
346
353
347−#: qml/Shell.qml:367
354+#: qml/Shell.qml:394
348msgid ""
355msgid ""
349"If passphrase is entered incorrectly, your phone will conduct a factory "
356"If passphrase is entered incorrectly, your phone will conduct a factory "
350"reset and all personal data will be deleted."
357"reset and all personal data will be deleted."
@@ -352,7 +359,7 @@ msgstr ""
352"Se a frase de paso introducida é incorrecta, o teléfono restabelecerá os "
359"Se a frase de paso introducida é incorrecta, o teléfono restabelecerá os "
353"valores de fábrica e perderá todos os datos persoais."
360"valores de fábrica e perderá todos os datos persoais."
354
361
355−#: qml/Shell.qml:368
362+#: qml/Shell.qml:395
356msgid ""
363msgid ""
357"If passcode is entered incorrectly, your phone will conduct a factory reset "
364"If passcode is entered incorrectly, your phone will conduct a factory reset "
358"and all personal data will be deleted."
365"and all personal data will be deleted."
@@ -360,5 +367,8 @@ msgstr ""
360"Se a clave introducida é incorrecta, o teléfono restabelecerá os valores de "
367"Se a clave introducida é incorrecta, o teléfono restabelecerá os valores de "
361"fábrica e perderá todos os datos persoais."
368"fábrica e perderá todos os datos persoais."
362
369
363−#~ msgid "Manage Dash"
370+#~ msgid "Sorry, incorrect PIN"
364−#~ msgstr "Xestión do Panel"
371+#~ msgstr "Sentímolo, o PIN é incorrecto"
372+
373+#~ msgid "Enter SIM PIN"
374+#~ msgstr "Introduza o PIN da SIM"
po/he.po+57−50
@@ -7,14 +7,15 @@ msgid ""
7msgstr ""
7msgstr ""
8"Project-Id-Version: unity\n"
8"Project-Id-Version: unity\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2014-09-24 10:43+0100\n"
10+"POT-Creation-Date: 2014-10-07 11:37+0300\n"
11"PO-Revision-Date: 2014-08-23 14:19+0000\n"
11"PO-Revision-Date: 2014-08-23 14:19+0000\n"
12"Last-Translator: Yaron <sh.yaron@gmail.com>\n"
12"Last-Translator: Yaron <sh.yaron@gmail.com>\n"
13"Language-Team: Hebrew <he@li.org>\n"
13"Language-Team: Hebrew <he@li.org>\n"
14"MIME-Version: 1.0\n"
14"MIME-Version: 1.0\n"
15"Content-Type: text/plain; charset=UTF-8\n"
15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n"
16"Content-Transfer-Encoding: 8bit\n"
17+"Plural-Forms: nplurals=2; plural=n != 1;\n"
17−"X-Launchpad-Export-Date: 2014-09-29 05:19+0000\n"
18+"X-Launchpad-Export-Date: 2014-10-09 06:36+0000\n"
18"X-Generator: Launchpad (build 17196)\n"
19"X-Generator: Launchpad (build 17196)\n"
19
20
20#: plugins/LightDM/Greeter.cpp:130
21#: plugins/LightDM/Greeter.cpp:130
@@ -30,6 +31,25 @@ msgstr "הצמדת קיצור דרך"
30msgid "Unpin shortcut"
31msgid "Unpin shortcut"
31msgstr "הפרדת קיצור הדרך"
32msgstr "הפרדת קיצור הדרך"
32
33
34+#: qml/Components/DelayedLockscreen.qml:47
35+msgid "Device Locked"
36+msgstr ""
37+
38+#: qml/Components/DelayedLockscreen.qml:62
39+msgid "You have been locked out due to too many failed passphrase attempts."
40+msgstr ""
41+
42+#: qml/Components/DelayedLockscreen.qml:63
43+msgid "You have been locked out due to too many failed passcode attempts."
44+msgstr ""
45+
46+#: qml/Components/DelayedLockscreen.qml:72
47+#, qt-format
48+msgid "Please wait %1 minute and then try again…"
49+msgid_plural "Please wait %1 minutes and then try again…"
50+msgstr[0] ""
51+msgstr[1] ""
52+
33#: qml/Components/Dialogs.qml:70
53#: qml/Components/Dialogs.qml:70
34msgid "Log out"
54msgid "Log out"
35msgstr ""
55msgstr ""
@@ -134,40 +154,23 @@ msgstr ""
134"ברגעים אלו סיימת את התמחותך בשימוש במחוות קצה והטלפון פתוח לשימושך<br><br>נא "
154"ברגעים אלו סיימת את התמחותך בשימוש במחוות קצה והטלפון פתוח לשימושך<br><br>נא "
135"לגעת במסך כדי להתחיל"
155"לגעת במסך כדי להתחיל"
136
156
137−#: qml/Components/Lockscreen.qml:167
157+#: qml/Components/Lockscreen.qml:220
138−msgid "Please wait"
139−msgstr "נא להמתין"
140−
141−#: qml/Components/Lockscreen.qml:172
142−msgid "Too many incorrect attempts"
143−msgstr "יותר מדי ניסיונות שגויים"
144−
145−#: qml/Components/Lockscreen.qml:206
146msgid "Emergency Call"
158msgid "Emergency Call"
147msgstr "שיחת חירום"
159msgstr "שיחת חירום"
148
160
149−#: qml/Components/Lockscreen.qml:226
161+#: qml/Components/Lockscreen.qml:252
150msgid "OK"
162msgid "OK"
151msgstr "אישור"
163msgstr "אישור"
152
164
153−#: qml/Components/PassphraseLockscreen.qml:61
154−#, qt-format
155−msgid "Hello %1"
156−msgstr "שלום %1"
157−
158−#: qml/Components/PassphraseLockscreen.qml:61
159−msgid "Hello"
160−msgstr "שלום"
161−
162−#: qml/Dash/GenericScopeView.qml:411 qml/Dash/GenericScopeView.qml:533
165+#: qml/Dash/GenericScopeView.qml:434 qml/Dash/GenericScopeView.qml:591
163msgid "See less"
166msgid "See less"
164msgstr "לראות פחות"
167msgstr "לראות פחות"
165
168
166−#: qml/Dash/GenericScopeView.qml:411
169+#: qml/Dash/GenericScopeView.qml:434
167msgid "See all"
170msgid "See all"
168msgstr "להציג הכול"
171msgstr "להציג הכול"
169
172
170−#: qml/Dash/GenericScopeView.qml:473 qml/Dash/PageHeader.qml:258
173+#: qml/Dash/GenericScopeView.qml:496 qml/Dash/PageHeader.qml:258
171#: qml/Panel/SearchIndicator.qml:27
174#: qml/Panel/SearchIndicator.qml:27
172msgid "Search"
175msgid "Search"
173msgstr "חיפוש"
176msgstr "חיפוש"
@@ -204,6 +207,14 @@ msgstr "הוספת סקירה"
204msgid "Send"
207msgid "Send"
205msgstr "שליחה"
208msgstr "שליחה"
206
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+
207#: qml/Dash/ScopesOverview.qml:206
218#: qml/Dash/ScopesOverview.qml:206
208msgid "Manage Scopes"
219msgid "Manage Scopes"
209msgstr ""
220msgstr ""
@@ -225,8 +236,8 @@ msgid "All"
225msgstr "הכול"
236msgstr "הכול"
226
237
227#: qml/Greeter/Greeter.qml:157
238#: qml/Greeter/Greeter.qml:157
228−msgid "Swipe to unlock"
239+msgid "Unlock"
229−msgstr "יש להחליק לפתיחה"
240+msgstr ""
230
241
231#: qml/Hud/HudParametrizedActionsPage.qml:139
242#: qml/Hud/HudParametrizedActionsPage.qml:139
232msgid "Confirm"
243msgid "Confirm"
@@ -248,18 +259,10 @@ msgstr "יש לדבר כעת..."
248msgid "Speaking..."
259msgid "Speaking..."
249msgstr "הדיבור מושמע…"
260msgstr "הדיבור מושמע…"
250
261
251−#: qml/Notifications/NotificationMenuItemFactory.qml:108
262+#: qml/Notifications/NotificationMenuItemFactory.qml:116
252msgid "Show password"
263msgid "Show password"
253msgstr "הצגת הססמה"
264msgstr "הצגת הססמה"
254
265
255−#: qml/Notifications/NotificationMenuItemFactory.qml:124
256−msgid "Enter SIM PIN"
257−msgstr ""
258−
259−#: qml/Notifications/NotificationMenuItemFactory.qml:125
260−msgid "Sorry, incorrect PIN"
261−msgstr ""
262−
263#: qml/Panel/ActiveCallHint.qml:77
266#: qml/Panel/ActiveCallHint.qml:77
264msgid "Tap to return to call..."
267msgid "Tap to return to call..."
265msgstr "יש לגעת כדי להחזיר שיחה…"
268msgstr "יש לגעת כדי להחזיר שיחה…"
@@ -304,51 +307,55 @@ msgstr ""
304msgid "Roaming"
307msgid "Roaming"
305msgstr "נדידה"
308msgstr "נדידה"
306
309
307−#: qml/Shell.qml:320
310+#: qml/Shell.qml:346
308−msgid "Enter your passphrase"
311+msgid "Enter passphrase"
309−msgstr "נא להזין את מילת הצופן שלך"
312+msgstr ""
310
313
311−#: qml/Shell.qml:321
314+#: qml/Shell.qml:347
312msgid "Sorry, incorrect passphrase"
315msgid "Sorry, incorrect passphrase"
313msgstr "מילת הצופן שגויה, עמך הסליחה."
316msgstr "מילת הצופן שגויה, עמך הסליחה."
314
317
315−#: qml/Shell.qml:323
318+#: qml/Shell.qml:348
319+msgid "Please re-enter"
320+msgstr ""
321+
322+#: qml/Shell.qml:350
316−msgid "Enter your passcode"
323+msgid "Enter passcode"
317msgstr ""
324msgstr ""
318
325
319−#: qml/Shell.qml:324
326+#: qml/Shell.qml:351
320msgid "Sorry, incorrect passcode"
327msgid "Sorry, incorrect passcode"
321msgstr ""
328msgstr ""
322
329
323−#: qml/Shell.qml:327
330+#: qml/Shell.qml:354
324#, qt-format
331#, qt-format
325−msgid "Enter your %1"
332+msgid "Enter %1"
326msgstr ""
333msgstr ""
327
334
328−#: qml/Shell.qml:328
335+#: qml/Shell.qml:355
329#, qt-format
336#, qt-format
330msgid "Sorry, incorrect %1"
337msgid "Sorry, incorrect %1"
331msgstr ""
338msgstr ""
332
339
333−#: qml/Shell.qml:363
340+#: qml/Shell.qml:390
334msgid "Sorry, incorrect passphrase."
341msgid "Sorry, incorrect passphrase."
335msgstr "מילת הצופן שגויה, עמך הסליחה."
342msgstr "מילת הצופן שגויה, עמך הסליחה."
336
343
337−#: qml/Shell.qml:364
344+#: qml/Shell.qml:391
338msgid "Sorry, incorrect passcode."
345msgid "Sorry, incorrect passcode."
339msgstr "הצופן שגוי, עם הסליחה."
346msgstr "הצופן שגוי, עם הסליחה."
340
347
341−#: qml/Shell.qml:365
348+#: qml/Shell.qml:392
342msgid "This will be your last attempt."
349msgid "This will be your last attempt."
343msgstr "זה יהיה הניסיון האחרון שלך."
350msgstr "זה יהיה הניסיון האחרון שלך."
344
351
345−#: qml/Shell.qml:367
352+#: qml/Shell.qml:394
346msgid ""
353msgid ""
347"If passphrase is entered incorrectly, your phone will conduct a factory "
354"If passphrase is entered incorrectly, your phone will conduct a factory "
348"reset and all personal data will be deleted."
355"reset and all personal data will be deleted."
349msgstr ""
356msgstr ""
350
357
351−#: qml/Shell.qml:368
358+#: qml/Shell.qml:395
352msgid ""
359msgid ""
353"If passcode is entered incorrectly, your phone will conduct a factory reset "
360"If passcode is entered incorrectly, your phone will conduct a factory reset "
354"and all personal data will be deleted."
361"and all personal data will be deleted."
po/hi.po+55−48
@@ -7,14 +7,15 @@ msgid ""
7msgstr ""
7msgstr ""
8"Project-Id-Version: unity8\n"
8"Project-Id-Version: unity8\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2014-09-24 10:43+0100\n"
10+"POT-Creation-Date: 2014-10-07 11:37+0300\n"
11"PO-Revision-Date: 2014-01-15 01:49+0000\n"
11"PO-Revision-Date: 2014-01-15 01:49+0000\n"
12"Last-Translator: Siddhanathan S. <Unknown>\n"
12"Last-Translator: Siddhanathan S. <Unknown>\n"
13"Language-Team: Hindi <hi@li.org>\n"
13"Language-Team: Hindi <hi@li.org>\n"
14"MIME-Version: 1.0\n"
14"MIME-Version: 1.0\n"
15"Content-Type: text/plain; charset=UTF-8\n"
15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n"
16"Content-Transfer-Encoding: 8bit\n"
17+"Plural-Forms: nplurals=2; plural=n != 1;\n"
17−"X-Launchpad-Export-Date: 2014-09-29 05:19+0000\n"
18+"X-Launchpad-Export-Date: 2014-10-09 06:36+0000\n"
18"X-Generator: Launchpad (build 17196)\n"
19"X-Generator: Launchpad (build 17196)\n"
19
20
20#: plugins/LightDM/Greeter.cpp:130
21#: plugins/LightDM/Greeter.cpp:130
@@ -30,6 +31,25 @@ msgstr ""
30msgid "Unpin shortcut"
31msgid "Unpin shortcut"
31msgstr ""
32msgstr ""
32
33
34+#: qml/Components/DelayedLockscreen.qml:47
35+msgid "Device Locked"
36+msgstr ""
37+
38+#: qml/Components/DelayedLockscreen.qml:62
39+msgid "You have been locked out due to too many failed passphrase attempts."
40+msgstr ""
41+
42+#: qml/Components/DelayedLockscreen.qml:63
43+msgid "You have been locked out due to too many failed passcode attempts."
44+msgstr ""
45+
46+#: qml/Components/DelayedLockscreen.qml:72
47+#, qt-format
48+msgid "Please wait %1 minute and then try again…"
49+msgid_plural "Please wait %1 minutes and then try again…"
50+msgstr[0] ""
51+msgstr[1] ""
52+
33#: qml/Components/Dialogs.qml:70
53#: qml/Components/Dialogs.qml:70
34msgid "Log out"
54msgid "Log out"
35msgstr ""
55msgstr ""
@@ -132,40 +152,23 @@ msgid ""
132"phone<br><br>Tap on the screen to start"
152"phone<br><br>Tap on the screen to start"
133msgstr ""
153msgstr ""
134
154
135−#: qml/Components/Lockscreen.qml:167
155+#: qml/Components/Lockscreen.qml:220
136−msgid "Please wait"
137−msgstr ""
138−
139−#: qml/Components/Lockscreen.qml:172
140−msgid "Too many incorrect attempts"
141−msgstr ""
142−
143−#: qml/Components/Lockscreen.qml:206
144msgid "Emergency Call"
156msgid "Emergency Call"
145msgstr "आपातकालीन कॉल"
157msgstr "आपातकालीन कॉल"
146
158
147−#: qml/Components/Lockscreen.qml:226
159+#: qml/Components/Lockscreen.qml:252
148msgid "OK"
160msgid "OK"
149msgstr ""
161msgstr ""
150
162
151−#: qml/Components/PassphraseLockscreen.qml:61
152−#, qt-format
153−msgid "Hello %1"
154−msgstr ""
155−
156−#: qml/Components/PassphraseLockscreen.qml:61
157−msgid "Hello"
158−msgstr "नमस्ते"
159−
160−#: qml/Dash/GenericScopeView.qml:411 qml/Dash/GenericScopeView.qml:533
163+#: qml/Dash/GenericScopeView.qml:434 qml/Dash/GenericScopeView.qml:591
161msgid "See less"
164msgid "See less"
162msgstr ""
165msgstr ""
163
166
164−#: qml/Dash/GenericScopeView.qml:411
167+#: qml/Dash/GenericScopeView.qml:434
165msgid "See all"
168msgid "See all"
166msgstr ""
169msgstr ""
167
170
168−#: qml/Dash/GenericScopeView.qml:473 qml/Dash/PageHeader.qml:258
171+#: qml/Dash/GenericScopeView.qml:496 qml/Dash/PageHeader.qml:258
169#: qml/Panel/SearchIndicator.qml:27
172#: qml/Panel/SearchIndicator.qml:27
170msgid "Search"
173msgid "Search"
171msgstr "खोजें"
174msgstr "खोजें"
@@ -202,6 +205,14 @@ msgstr "समीक्षा दे"
202msgid "Send"
205msgid "Send"
203msgstr "भेजें"
206msgstr "भेजें"
204
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+
205#: qml/Dash/ScopesOverview.qml:206
216#: qml/Dash/ScopesOverview.qml:206
206msgid "Manage Scopes"
217msgid "Manage Scopes"
207msgstr ""
218msgstr ""
@@ -223,7 +234,7 @@ msgid "All"
223msgstr ""
234msgstr ""
224
235
225#: qml/Greeter/Greeter.qml:157
236#: qml/Greeter/Greeter.qml:157
226−msgid "Swipe to unlock"
237+msgid "Unlock"
227msgstr ""
238msgstr ""
228
239
229#: qml/Hud/HudParametrizedActionsPage.qml:139
240#: qml/Hud/HudParametrizedActionsPage.qml:139
@@ -246,18 +257,10 @@ msgstr "अब बात करें"
246msgid "Speaking..."
257msgid "Speaking..."
247msgstr "अब बोल रहे हैं"
258msgstr "अब बोल रहे हैं"
248
259
249−#: qml/Notifications/NotificationMenuItemFactory.qml:108
260+#: qml/Notifications/NotificationMenuItemFactory.qml:116
250msgid "Show password"
261msgid "Show password"
251msgstr ""
262msgstr ""
252
263
253−#: qml/Notifications/NotificationMenuItemFactory.qml:124
254−msgid "Enter SIM PIN"
255−msgstr ""
256−
257−#: qml/Notifications/NotificationMenuItemFactory.qml:125
258−msgid "Sorry, incorrect PIN"
259−msgstr ""
260−
261#: qml/Panel/ActiveCallHint.qml:77
264#: qml/Panel/ActiveCallHint.qml:77
262msgid "Tap to return to call..."
265msgid "Tap to return to call..."
263msgstr ""
266msgstr ""
@@ -302,51 +305,55 @@ msgstr ""
302msgid "Roaming"
305msgid "Roaming"
303msgstr ""
306msgstr ""
304
307
305−#: qml/Shell.qml:320
308+#: qml/Shell.qml:346
306−msgid "Enter your passphrase"
309+msgid "Enter passphrase"
307msgstr ""
310msgstr ""
308
311
309−#: qml/Shell.qml:321
312+#: qml/Shell.qml:347
310msgid "Sorry, incorrect passphrase"
313msgid "Sorry, incorrect passphrase"
311msgstr ""
314msgstr ""
312
315
313−#: qml/Shell.qml:323
316+#: qml/Shell.qml:348
317+msgid "Please re-enter"
318+msgstr ""
319+
320+#: qml/Shell.qml:350
314−msgid "Enter your passcode"
321+msgid "Enter passcode"
315msgstr ""
322msgstr ""
316
323
317−#: qml/Shell.qml:324
324+#: qml/Shell.qml:351
318msgid "Sorry, incorrect passcode"
325msgid "Sorry, incorrect passcode"
319msgstr ""
326msgstr ""
320
327
321−#: qml/Shell.qml:327
328+#: qml/Shell.qml:354
322#, qt-format
329#, qt-format
323−msgid "Enter your %1"
330+msgid "Enter %1"
324msgstr ""
331msgstr ""
325
332
326−#: qml/Shell.qml:328
333+#: qml/Shell.qml:355
327#, qt-format
334#, qt-format
328msgid "Sorry, incorrect %1"
335msgid "Sorry, incorrect %1"
329msgstr ""
336msgstr ""
330
337
331−#: qml/Shell.qml:363
338+#: qml/Shell.qml:390
332msgid "Sorry, incorrect passphrase."
339msgid "Sorry, incorrect passphrase."
333msgstr ""
340msgstr ""
334
341
335−#: qml/Shell.qml:364
342+#: qml/Shell.qml:391
336msgid "Sorry, incorrect passcode."
343msgid "Sorry, incorrect passcode."
337msgstr ""
344msgstr ""
338
345
339−#: qml/Shell.qml:365
346+#: qml/Shell.qml:392
340msgid "This will be your last attempt."
347msgid "This will be your last attempt."
341msgstr ""
348msgstr ""
342
349
343−#: qml/Shell.qml:367
350+#: qml/Shell.qml:394
344msgid ""
351msgid ""
345"If passphrase is entered incorrectly, your phone will conduct a factory "
352"If passphrase is entered incorrectly, your phone will conduct a factory "
346"reset and all personal data will be deleted."
353"reset and all personal data will be deleted."
347msgstr ""
354msgstr ""
348
355
349−#: qml/Shell.qml:368
356+#: qml/Shell.qml:395
350msgid ""
357msgid ""
351"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 "
352"and all personal data will be deleted."
359"and all personal data will be deleted."
po/hr.po+56−48
@@ -7,14 +7,16 @@ msgid ""
7msgstr ""
7msgstr ""
8"Project-Id-Version: unity\n"
8"Project-Id-Version: unity\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2014-09-24 10:43+0100\n"
10+"POT-Creation-Date: 2014-10-07 11:37+0300\n"
11"PO-Revision-Date: 2013-06-27 04:14+0000\n"
11"PO-Revision-Date: 2013-06-27 04:14+0000\n"
12"Last-Translator: Michał Sawicz <michal.sawicz@canonical.com>\n"
12"Last-Translator: Michał Sawicz <michal.sawicz@canonical.com>\n"
13"Language-Team: Croatian <hr@li.org>\n"
13"Language-Team: Croatian <hr@li.org>\n"
14"MIME-Version: 1.0\n"
14"MIME-Version: 1.0\n"
15"Content-Type: text/plain; charset=UTF-8\n"
15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n"
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"
17−"X-Launchpad-Export-Date: 2014-09-29 05:20+0000\n"
19+"X-Launchpad-Export-Date: 2014-10-09 06:36+0000\n"
18"X-Generator: Launchpad (build 17196)\n"
20"X-Generator: Launchpad (build 17196)\n"
19
21
20#: plugins/LightDM/Greeter.cpp:130
22#: plugins/LightDM/Greeter.cpp:130
@@ -30,6 +32,25 @@ msgstr ""
30msgid "Unpin shortcut"
32msgid "Unpin shortcut"
31msgstr ""
33msgstr ""
32
34
35+#: qml/Components/DelayedLockscreen.qml:47
36+msgid "Device Locked"
37+msgstr ""
38+
39+#: qml/Components/DelayedLockscreen.qml:62
40+msgid "You have been locked out due to too many failed passphrase attempts."
41+msgstr ""
42+
43+#: qml/Components/DelayedLockscreen.qml:63
44+msgid "You have been locked out due to too many failed passcode attempts."
45+msgstr ""
46+
47+#: qml/Components/DelayedLockscreen.qml:72
48+#, qt-format
49+msgid "Please wait %1 minute and then try again…"
50+msgid_plural "Please wait %1 minutes and then try again…"
51+msgstr[0] ""
52+msgstr[1] ""
53+
33#: qml/Components/Dialogs.qml:70
54#: qml/Components/Dialogs.qml:70
34msgid "Log out"
55msgid "Log out"
35msgstr ""
56msgstr ""
@@ -132,40 +153,23 @@ msgid ""
132"phone<br><br>Tap on the screen to start"
153"phone<br><br>Tap on the screen to start"
133msgstr ""
154msgstr ""
134
155
135−#: qml/Components/Lockscreen.qml:167
156+#: qml/Components/Lockscreen.qml:220
136−msgid "Please wait"
137−msgstr ""
138−
139−#: qml/Components/Lockscreen.qml:172
140−msgid "Too many incorrect attempts"
141−msgstr ""
142−
143−#: qml/Components/Lockscreen.qml:206
144msgid "Emergency Call"
157msgid "Emergency Call"
145msgstr ""
158msgstr ""
146
159
147−#: qml/Components/Lockscreen.qml:226
160+#: qml/Components/Lockscreen.qml:252
148msgid "OK"
161msgid "OK"
149msgstr ""
162msgstr ""
150
163
151−#: qml/Components/PassphraseLockscreen.qml:61
152−#, qt-format
153−msgid "Hello %1"
154−msgstr ""
155−
156−#: qml/Components/PassphraseLockscreen.qml:61
157−msgid "Hello"
158−msgstr ""
159−
160−#: qml/Dash/GenericScopeView.qml:411 qml/Dash/GenericScopeView.qml:533
164+#: qml/Dash/GenericScopeView.qml:434 qml/Dash/GenericScopeView.qml:591
161msgid "See less"
165msgid "See less"
162msgstr ""
166msgstr ""
163
167
164−#: qml/Dash/GenericScopeView.qml:411
168+#: qml/Dash/GenericScopeView.qml:434
165msgid "See all"
169msgid "See all"
166msgstr ""
170msgstr ""
167
171
168−#: qml/Dash/GenericScopeView.qml:473 qml/Dash/PageHeader.qml:258
172+#: qml/Dash/GenericScopeView.qml:496 qml/Dash/PageHeader.qml:258
169#: qml/Panel/SearchIndicator.qml:27
173#: qml/Panel/SearchIndicator.qml:27
170msgid "Search"
174msgid "Search"
171msgstr "Pretraživanje"
175msgstr "Pretraživanje"
@@ -202,6 +206,14 @@ msgstr ""
202msgid "Send"
206msgid "Send"
203msgstr ""
207msgstr ""
204
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+
205#: qml/Dash/ScopesOverview.qml:206
217#: qml/Dash/ScopesOverview.qml:206
206msgid "Manage Scopes"
218msgid "Manage Scopes"
207msgstr ""
219msgstr ""
@@ -223,7 +235,7 @@ msgid "All"
223msgstr ""
235msgstr ""
224
236
225#: qml/Greeter/Greeter.qml:157
237#: qml/Greeter/Greeter.qml:157
226−msgid "Swipe to unlock"
238+msgid "Unlock"
227msgstr ""
239msgstr ""
228
240
229#: qml/Hud/HudParametrizedActionsPage.qml:139
241#: qml/Hud/HudParametrizedActionsPage.qml:139
@@ -246,18 +258,10 @@ msgstr "Recite..."
246msgid "Speaking..."
258msgid "Speaking..."
247msgstr "Govor..."
259msgstr "Govor..."
248
260
249−#: qml/Notifications/NotificationMenuItemFactory.qml:108
261+#: qml/Notifications/NotificationMenuItemFactory.qml:116
250msgid "Show password"
262msgid "Show password"
251msgstr ""
263msgstr ""
252
264
253−#: qml/Notifications/NotificationMenuItemFactory.qml:124
254−msgid "Enter SIM PIN"
255−msgstr ""
256−
257−#: qml/Notifications/NotificationMenuItemFactory.qml:125
258−msgid "Sorry, incorrect PIN"
259−msgstr ""
260−
261#: qml/Panel/ActiveCallHint.qml:77
265#: qml/Panel/ActiveCallHint.qml:77
262msgid "Tap to return to call..."
266msgid "Tap to return to call..."
263msgstr ""
267msgstr ""
@@ -302,51 +306,55 @@ msgstr ""
302msgid "Roaming"
306msgid "Roaming"
303msgstr ""
307msgstr ""
304
308
305−#: qml/Shell.qml:320
309+#: qml/Shell.qml:346
306−msgid "Enter your passphrase"
310+msgid "Enter passphrase"
307msgstr ""
311msgstr ""
308
312
309−#: qml/Shell.qml:321
313+#: qml/Shell.qml:347
310msgid "Sorry, incorrect passphrase"
314msgid "Sorry, incorrect passphrase"
311msgstr ""
315msgstr ""
312
316
313−#: qml/Shell.qml:323
317+#: qml/Shell.qml:348
318+msgid "Please re-enter"
319+msgstr ""
320+
321+#: qml/Shell.qml:350
314−msgid "Enter your passcode"
322+msgid "Enter passcode"
315msgstr ""
323msgstr ""
316
324
317−#: qml/Shell.qml:324
325+#: qml/Shell.qml:351
318msgid "Sorry, incorrect passcode"
326msgid "Sorry, incorrect passcode"
319msgstr ""
327msgstr ""
320
328
321−#: qml/Shell.qml:327
329+#: qml/Shell.qml:354
322#, qt-format
330#, qt-format
323−msgid "Enter your %1"
331+msgid "Enter %1"
324msgstr ""
332msgstr ""
325
333
326−#: qml/Shell.qml:328
334+#: qml/Shell.qml:355
327#, qt-format
335#, qt-format
328msgid "Sorry, incorrect %1"
336msgid "Sorry, incorrect %1"
329msgstr ""
337msgstr ""
330
338
331−#: qml/Shell.qml:363
339+#: qml/Shell.qml:390
332msgid "Sorry, incorrect passphrase."
340msgid "Sorry, incorrect passphrase."
333msgstr ""
341msgstr ""
334
342
335−#: qml/Shell.qml:364
343+#: qml/Shell.qml:391
336msgid "Sorry, incorrect passcode."
344msgid "Sorry, incorrect passcode."
337msgstr ""
345msgstr ""
338
346
339−#: qml/Shell.qml:365
347+#: qml/Shell.qml:392
340msgid "This will be your last attempt."
348msgid "This will be your last attempt."
341msgstr ""
349msgstr ""
342
350
343−#: qml/Shell.qml:367
351+#: qml/Shell.qml:394
344msgid ""
352msgid ""
345"If passphrase is entered incorrectly, your phone will conduct a factory "
353"If passphrase is entered incorrectly, your phone will conduct a factory "
346"reset and all personal data will be deleted."
354"reset and all personal data will be deleted."
347msgstr ""
355msgstr ""
348
356
349−#: qml/Shell.qml:368
357+#: qml/Shell.qml:395
350msgid ""
358msgid ""
351"If passcode is entered incorrectly, your phone will conduct a factory reset "
359"If passcode is entered incorrectly, your phone will conduct a factory reset "
352"and all personal data will be deleted."
360"and all personal data will be deleted."
po/hu.po+65−55
@@ -7,14 +7,15 @@ msgid ""
7msgstr ""
7msgstr ""
8"Project-Id-Version: unity\n"
8"Project-Id-Version: unity\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2014-09-24 10:43+0100\n"
10+"POT-Creation-Date: 2014-10-07 11:37+0300\n"
11−"PO-Revision-Date: 2014-09-28 09:02+0000\n"
11+"PO-Revision-Date: 2014-10-08 08:13+0000\n"
12"Last-Translator: Richard Somlói <ricsipontaz@gmail.com>\n"
12"Last-Translator: Richard Somlói <ricsipontaz@gmail.com>\n"
13"Language-Team: Hungarian <hu@li.org>\n"
13"Language-Team: Hungarian <hu@li.org>\n"
14"MIME-Version: 1.0\n"
14"MIME-Version: 1.0\n"
15"Content-Type: text/plain; charset=UTF-8\n"
15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n"
16"Content-Transfer-Encoding: 8bit\n"
17+"Plural-Forms: nplurals=2; plural=n != 1;\n"
17−"X-Launchpad-Export-Date: 2014-09-29 05:19+0000\n"
18+"X-Launchpad-Export-Date: 2014-10-09 06:36+0000\n"
18"X-Generator: Launchpad (build 17196)\n"
19"X-Generator: Launchpad (build 17196)\n"
19
20
20#: plugins/LightDM/Greeter.cpp:130
21#: plugins/LightDM/Greeter.cpp:130
@@ -30,6 +31,25 @@ msgstr "Indító rögzítése"
30msgid "Unpin shortcut"
31msgid "Unpin shortcut"
31msgstr "Indító feloldása"
32msgstr "Indító feloldása"
32
33
34+#: qml/Components/DelayedLockscreen.qml:47
35+msgid "Device Locked"
36+msgstr "Eszköz lezárva"
37+
38+#: qml/Components/DelayedLockscreen.qml:62
39+msgid "You have been locked out due to too many failed passphrase attempts."
40+msgstr "A túl sok hibás jelmondat próbálkozás miatt le lett zárva az eszköz."
41+
42+#: qml/Components/DelayedLockscreen.qml:63
43+msgid "You have been locked out due to too many failed passcode attempts."
44+msgstr "A túl sok hibás jelkód próbálkozás miatt le lett zárva az eszköz."
45+
46+#: qml/Components/DelayedLockscreen.qml:72
47+#, qt-format
48+msgid "Please wait %1 minute and then try again…"
49+msgid_plural "Please wait %1 minutes and then try again…"
50+msgstr[0] "Kérjük várjon %1 percet és próbálja újra…"
51+msgstr[1] "Kérjük várjon %1 percet és próbálja újra…"
52+
33#: qml/Components/Dialogs.qml:70
53#: qml/Components/Dialogs.qml:70
34msgid "Log out"
54msgid "Log out"
35msgstr "Kijelentkezés"
55msgstr "Kijelentkezés"
@@ -138,40 +158,23 @@ msgstr ""
138"Elsajátította a gesztusokat, és megkezdheti a telefon "
158"Elsajátította a gesztusokat, és megkezdheti a telefon "
139"használatát.<br><br>Koppintson a képernyőre a kezdéshez."
159"használatát.<br><br>Koppintson a képernyőre a kezdéshez."
140
160
141−#: qml/Components/Lockscreen.qml:167
161+#: qml/Components/Lockscreen.qml:220
142−msgid "Please wait"
143−msgstr "Kérem várjon"
144−
145−#: qml/Components/Lockscreen.qml:172
146−msgid "Too many incorrect attempts"
147−msgstr "Túl sok sikertelen kísérlet"
148−
149−#: qml/Components/Lockscreen.qml:206
150msgid "Emergency Call"
162msgid "Emergency Call"
151msgstr "Vészhívás"
163msgstr "Vészhívás"
152
164
153−#: qml/Components/Lockscreen.qml:226
165+#: qml/Components/Lockscreen.qml:252
154msgid "OK"
166msgid "OK"
155msgstr "Ok"
167msgstr "Ok"
156
168
157−#: qml/Components/PassphraseLockscreen.qml:61
158−#, qt-format
159−msgid "Hello %1"
160−msgstr "Üdv %1"
161−
162−#: qml/Components/PassphraseLockscreen.qml:61
163−msgid "Hello"
164−msgstr "Üdvözöljük"
165−
166−#: qml/Dash/GenericScopeView.qml:411 qml/Dash/GenericScopeView.qml:533
169+#: qml/Dash/GenericScopeView.qml:434 qml/Dash/GenericScopeView.qml:591
167msgid "See less"
170msgid "See less"
168msgstr "Kevesebb"
171msgstr "Kevesebb"
169
172
170−#: qml/Dash/GenericScopeView.qml:411
173+#: qml/Dash/GenericScopeView.qml:434
171msgid "See all"
174msgid "See all"
172msgstr "Összes megtekintése"
175msgstr "Összes megtekintése"
173
176
174−#: qml/Dash/GenericScopeView.qml:473 qml/Dash/PageHeader.qml:258
177+#: qml/Dash/GenericScopeView.qml:496 qml/Dash/PageHeader.qml:258
175#: qml/Panel/SearchIndicator.qml:27
178#: qml/Panel/SearchIndicator.qml:27
176msgid "Search"
179msgid "Search"
177msgstr "Keresés"
180msgstr "Keresés"
@@ -208,6 +211,14 @@ msgstr "Értékelés hozzáadása"
208msgid "Send"
211msgid "Send"
209msgstr "Küldés"
212msgstr "Küldés"
210
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+
211#: qml/Dash/ScopesOverview.qml:206
222#: qml/Dash/ScopesOverview.qml:206
212msgid "Manage Scopes"
223msgid "Manage Scopes"
213msgstr "Lencsék kezelése"
224msgstr "Lencsék kezelése"
@@ -229,8 +240,8 @@ msgid "All"
229msgstr "Összes"
240msgstr "Összes"
230
241
231#: qml/Greeter/Greeter.qml:157
242#: qml/Greeter/Greeter.qml:157
232−msgid "Swipe to unlock"
243+msgid "Unlock"
233−msgstr "Csúsztasson a feloldáshoz"
244+msgstr "Feloldás"
234
245
235#: qml/Hud/HudParametrizedActionsPage.qml:139
246#: qml/Hud/HudParametrizedActionsPage.qml:139
236msgid "Confirm"
247msgid "Confirm"
@@ -252,18 +263,10 @@ msgstr "Most beszéljen…"
252msgid "Speaking..."
263msgid "Speaking..."
253msgstr "Beszéd…"
264msgstr "Beszéd…"
254
265
255−#: qml/Notifications/NotificationMenuItemFactory.qml:108
266+#: qml/Notifications/NotificationMenuItemFactory.qml:116
256msgid "Show password"
267msgid "Show password"
257msgstr "Jelszó megjelenítése"
268msgstr "Jelszó megjelenítése"
258
269
259−#: qml/Notifications/NotificationMenuItemFactory.qml:124
260−msgid "Enter SIM PIN"
261−msgstr "Adja meg a SIM PIN kódját"
262−
263−#: qml/Notifications/NotificationMenuItemFactory.qml:125
264−msgid "Sorry, incorrect PIN"
265−msgstr "Sajnáljuk, helytelen PIN"
266−
267#: qml/Panel/ActiveCallHint.qml:77
270#: qml/Panel/ActiveCallHint.qml:77
268msgid "Tap to return to call..."
271msgid "Tap to return to call..."
269msgstr "Érintse meg, hogy visszatérjen a híváshoz..."
272msgstr "Érintse meg, hogy visszatérjen a híváshoz..."
@@ -308,45 +311,49 @@ msgstr "SIM feloldása"
308msgid "Roaming"
311msgid "Roaming"
309msgstr "Barangolás"
312msgstr "Barangolás"
310
313
311−#: qml/Shell.qml:320
314+#: qml/Shell.qml:346
312−msgid "Enter your passphrase"
315+msgid "Enter passphrase"
313−msgstr "Adja meg a jelmondatot"
316+msgstr "Jelmondat megadása"
314
317
315−#: qml/Shell.qml:321
318+#: qml/Shell.qml:347
316msgid "Sorry, incorrect passphrase"
319msgid "Sorry, incorrect passphrase"
317msgstr "Sajnáljuk, helytelen jelmondat"
320msgstr "Sajnáljuk, helytelen jelmondat"
318
321
319−#: qml/Shell.qml:323
322+#: qml/Shell.qml:348
320−msgid "Enter your passcode"
323+msgid "Please re-enter"
321−msgstr "Adja meg a jelkódját"
324+msgstr "Kérjük adja meg újra"
322
325
323−#: qml/Shell.qml:324
326+#: qml/Shell.qml:350
327+msgid "Enter passcode"
328+msgstr "Jelkód megadása"
329+
330+#: qml/Shell.qml:351
324msgid "Sorry, incorrect passcode"
331msgid "Sorry, incorrect passcode"
325msgstr "Sajnáljuk, helytelen jelkód"
332msgstr "Sajnáljuk, helytelen jelkód"
326
333
327−#: qml/Shell.qml:327
334+#: qml/Shell.qml:354
328#, qt-format
335#, qt-format
329−msgid "Enter your %1"
336+msgid "Enter %1"
330−msgstr "Kérjük adja meg: %1"
337+msgstr "Adja meg: %1"
331
338
332−#: qml/Shell.qml:328
339+#: qml/Shell.qml:355
333#, qt-format
340#, qt-format
334msgid "Sorry, incorrect %1"
341msgid "Sorry, incorrect %1"
335msgstr "Sajnáljuk, helytelen %1"
342msgstr "Sajnáljuk, helytelen %1"
336
343
337−#: qml/Shell.qml:363
344+#: qml/Shell.qml:390
338msgid "Sorry, incorrect passphrase."
345msgid "Sorry, incorrect passphrase."
339msgstr "Sajnáljuk, helytelen jelmondat."
346msgstr "Sajnáljuk, helytelen jelmondat."
340
347
341−#: qml/Shell.qml:364
348+#: qml/Shell.qml:391
342msgid "Sorry, incorrect passcode."
349msgid "Sorry, incorrect passcode."
343msgstr "Sajnáljuk, helytelen jelkód."
350msgstr "Sajnáljuk, helytelen jelkód."
344
351
345−#: qml/Shell.qml:365
352+#: qml/Shell.qml:392
346msgid "This will be your last attempt."
353msgid "This will be your last attempt."
347msgstr "Ez az utolsó próbálkozási lehetősége."
354msgstr "Ez az utolsó próbálkozási lehetősége."
348
355
349−#: qml/Shell.qml:367
356+#: qml/Shell.qml:394
350msgid ""
357msgid ""
351"If passphrase is entered incorrectly, your phone will conduct a factory "
358"If passphrase is entered incorrectly, your phone will conduct a factory "
352"reset and all personal data will be deleted."
359"reset and all personal data will be deleted."
@@ -354,7 +361,7 @@ msgstr ""
354"Ha helytelen jelmondatot ad meg, a telefonja visszaállítja a gyári "
361"Ha helytelen jelmondatot ad meg, a telefonja visszaállítja a gyári "
355"beállításokat és törli minden személyes adatát."
362"beállításokat és törli minden személyes adatát."
356
363
357−#: qml/Shell.qml:368
364+#: qml/Shell.qml:395
358msgid ""
365msgid ""
359"If passcode is entered incorrectly, your phone will conduct a factory reset "
366"If passcode is entered incorrectly, your phone will conduct a factory reset "
360"and all personal data will be deleted."
367"and all personal data will be deleted."
@@ -362,5 +369,8 @@ msgstr ""
362"Ha helytelen jelkódot ad meg, a telefonja visszaállítja a gyári "
369"Ha helytelen jelkódot ad meg, a telefonja visszaállítja a gyári "
363"beállításokat és törli minden személyes adatát."
370"beállításokat és törli minden személyes adatát."
364
371
365−#~ msgid "Manage Dash"
372+#~ msgid "Sorry, incorrect PIN"
366−#~ msgstr "Dash kezelése"
373+#~ msgstr "Sajnáljuk, helytelen PIN"
374+
375+#~ msgid "Enter SIM PIN"
376+#~ msgstr "Adja meg a SIM PIN kódját"
po/hy.po+55−48
@@ -7,14 +7,15 @@ msgid ""
7msgstr ""
7msgstr ""
8"Project-Id-Version: unity\n"
8"Project-Id-Version: unity\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2014-09-24 10:43+0100\n"
10+"POT-Creation-Date: 2014-10-07 11:37+0300\n"
11"PO-Revision-Date: 2013-06-27 04:43+0000\n"
11"PO-Revision-Date: 2013-06-27 04:43+0000\n"
12"Last-Translator: iAbaS <sosabazyan@yandex.ru>\n"
12"Last-Translator: iAbaS <sosabazyan@yandex.ru>\n"
13"Language-Team: Armenian <hy@li.org>\n"
13"Language-Team: Armenian <hy@li.org>\n"
14"MIME-Version: 1.0\n"
14"MIME-Version: 1.0\n"
15"Content-Type: text/plain; charset=UTF-8\n"
15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n"
16"Content-Transfer-Encoding: 8bit\n"
17+"Plural-Forms: nplurals=1; plural=0;\n"
17−"X-Launchpad-Export-Date: 2014-09-29 05:19+0000\n"
18+"X-Launchpad-Export-Date: 2014-10-09 06:36+0000\n"
18"X-Generator: Launchpad (build 17196)\n"
19"X-Generator: Launchpad (build 17196)\n"
19
20
20#: plugins/LightDM/Greeter.cpp:130
21#: plugins/LightDM/Greeter.cpp:130
@@ -30,6 +31,25 @@ msgstr ""
30msgid "Unpin shortcut"
31msgid "Unpin shortcut"
31msgstr ""
32msgstr ""
32
33
34+#: qml/Components/DelayedLockscreen.qml:47
35+msgid "Device Locked"
36+msgstr ""
37+
38+#: qml/Components/DelayedLockscreen.qml:62
39+msgid "You have been locked out due to too many failed passphrase attempts."
40+msgstr ""
41+
42+#: qml/Components/DelayedLockscreen.qml:63
43+msgid "You have been locked out due to too many failed passcode attempts."
44+msgstr ""
45+
46+#: qml/Components/DelayedLockscreen.qml:72
47+#, qt-format
48+msgid "Please wait %1 minute and then try again…"
49+msgid_plural "Please wait %1 minutes and then try again…"
50+msgstr[0] ""
51+msgstr[1] ""
52+
33#: qml/Components/Dialogs.qml:70
53#: qml/Components/Dialogs.qml:70
34msgid "Log out"
54msgid "Log out"
35msgstr ""
55msgstr ""
@@ -132,40 +152,23 @@ msgid ""
132"phone<br><br>Tap on the screen to start"
152"phone<br><br>Tap on the screen to start"
133msgstr ""
153msgstr ""
134
154
135−#: qml/Components/Lockscreen.qml:167
155+#: qml/Components/Lockscreen.qml:220
136−msgid "Please wait"
137−msgstr ""
138−
139−#: qml/Components/Lockscreen.qml:172
140−msgid "Too many incorrect attempts"
141−msgstr ""
142−
143−#: qml/Components/Lockscreen.qml:206
144msgid "Emergency Call"
156msgid "Emergency Call"
145msgstr ""
157msgstr ""
146
158
147−#: qml/Components/Lockscreen.qml:226
159+#: qml/Components/Lockscreen.qml:252
148msgid "OK"
160msgid "OK"
149msgstr ""
161msgstr ""
150
162
151−#: qml/Components/PassphraseLockscreen.qml:61
152−#, qt-format
153−msgid "Hello %1"
154−msgstr ""
155−
156−#: qml/Components/PassphraseLockscreen.qml:61
157−msgid "Hello"
158−msgstr ""
159−
160−#: qml/Dash/GenericScopeView.qml:411 qml/Dash/GenericScopeView.qml:533
163+#: qml/Dash/GenericScopeView.qml:434 qml/Dash/GenericScopeView.qml:591
161msgid "See less"
164msgid "See less"
162msgstr ""
165msgstr ""
163
166
164−#: qml/Dash/GenericScopeView.qml:411
167+#: qml/Dash/GenericScopeView.qml:434
165msgid "See all"
168msgid "See all"
166msgstr ""
169msgstr ""
167
170
168−#: qml/Dash/GenericScopeView.qml:473 qml/Dash/PageHeader.qml:258
171+#: qml/Dash/GenericScopeView.qml:496 qml/Dash/PageHeader.qml:258
169#: qml/Panel/SearchIndicator.qml:27
172#: qml/Panel/SearchIndicator.qml:27
170msgid "Search"
173msgid "Search"
171msgstr "Որոնում"
174msgstr "Որոնում"
@@ -202,6 +205,14 @@ msgstr ""
202msgid "Send"
205msgid "Send"
203msgstr ""
206msgstr ""
204
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+
205#: qml/Dash/ScopesOverview.qml:206
216#: qml/Dash/ScopesOverview.qml:206
206msgid "Manage Scopes"
217msgid "Manage Scopes"
207msgstr ""
218msgstr ""
@@ -223,7 +234,7 @@ msgid "All"
223msgstr ""
234msgstr ""
224
235
225#: qml/Greeter/Greeter.qml:157
236#: qml/Greeter/Greeter.qml:157
226−msgid "Swipe to unlock"
237+msgid "Unlock"
227msgstr ""
238msgstr ""
228
239
229#: qml/Hud/HudParametrizedActionsPage.qml:139
240#: qml/Hud/HudParametrizedActionsPage.qml:139
@@ -246,18 +257,10 @@ msgstr "Խոսի՛ր"
246msgid "Speaking..."
257msgid "Speaking..."
247msgstr "Խոսում եմ..."
258msgstr "Խոսում եմ..."
248
259
249−#: qml/Notifications/NotificationMenuItemFactory.qml:108
260+#: qml/Notifications/NotificationMenuItemFactory.qml:116
250msgid "Show password"
261msgid "Show password"
251msgstr ""
262msgstr ""
252
263
253−#: qml/Notifications/NotificationMenuItemFactory.qml:124
254−msgid "Enter SIM PIN"
255−msgstr ""
256−
257−#: qml/Notifications/NotificationMenuItemFactory.qml:125
258−msgid "Sorry, incorrect PIN"
259−msgstr ""
260−
261#: qml/Panel/ActiveCallHint.qml:77
264#: qml/Panel/ActiveCallHint.qml:77
262msgid "Tap to return to call..."
265msgid "Tap to return to call..."
263msgstr ""
266msgstr ""
@@ -302,51 +305,55 @@ msgstr ""
302msgid "Roaming"
305msgid "Roaming"
303msgstr ""
306msgstr ""
304
307
305−#: qml/Shell.qml:320
308+#: qml/Shell.qml:346
306−msgid "Enter your passphrase"
309+msgid "Enter passphrase"
307msgstr ""
310msgstr ""
308
311
309−#: qml/Shell.qml:321
312+#: qml/Shell.qml:347
310msgid "Sorry, incorrect passphrase"
313msgid "Sorry, incorrect passphrase"
311msgstr ""
314msgstr ""
312
315
313−#: qml/Shell.qml:323
316+#: qml/Shell.qml:348
317+msgid "Please re-enter"
318+msgstr ""
319+
320+#: qml/Shell.qml:350
314−msgid "Enter your passcode"
321+msgid "Enter passcode"
315msgstr ""
322msgstr ""
316
323
317−#: qml/Shell.qml:324
324+#: qml/Shell.qml:351
318msgid "Sorry, incorrect passcode"
325msgid "Sorry, incorrect passcode"
319msgstr ""
326msgstr ""
320
327
321−#: qml/Shell.qml:327
328+#: qml/Shell.qml:354
322#, qt-format
329#, qt-format
323−msgid "Enter your %1"
330+msgid "Enter %1"
324msgstr ""
331msgstr ""
325
332
326−#: qml/Shell.qml:328
333+#: qml/Shell.qml:355
327#, qt-format
334#, qt-format
328msgid "Sorry, incorrect %1"
335msgid "Sorry, incorrect %1"
329msgstr ""
336msgstr ""
330
337
331−#: qml/Shell.qml:363
338+#: qml/Shell.qml:390
332msgid "Sorry, incorrect passphrase."
339msgid "Sorry, incorrect passphrase."
333msgstr ""
340msgstr ""
334
341
335−#: qml/Shell.qml:364
342+#: qml/Shell.qml:391
336msgid "Sorry, incorrect passcode."
343msgid "Sorry, incorrect passcode."
337msgstr ""
344msgstr ""
338
345
339−#: qml/Shell.qml:365
346+#: qml/Shell.qml:392
340msgid "This will be your last attempt."
347msgid "This will be your last attempt."
341msgstr ""
348msgstr ""
342
349
343−#: qml/Shell.qml:367
350+#: qml/Shell.qml:394
344msgid ""
351msgid ""
345"If passphrase is entered incorrectly, your phone will conduct a factory "
352"If passphrase is entered incorrectly, your phone will conduct a factory "
346"reset and all personal data will be deleted."
353"reset and all personal data will be deleted."
347msgstr ""
354msgstr ""
348
355
349−#: qml/Shell.qml:368
356+#: qml/Shell.qml:395
350msgid ""
357msgid ""
351"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 "
352"and all personal data will be deleted."
359"and all personal data will be deleted."
po/id.po+55−48
@@ -7,14 +7,15 @@ msgid ""
7msgstr ""
7msgstr ""
8"Project-Id-Version: unity\n"
8"Project-Id-Version: unity\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2014-09-24 10:43+0100\n"
10+"POT-Creation-Date: 2014-10-07 11:37+0300\n"
11"PO-Revision-Date: 2013-06-26 22:35+0000\n"
11"PO-Revision-Date: 2013-06-26 22:35+0000\n"
12"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
12"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
13"Language-Team: Indonesian <id@li.org>\n"
13"Language-Team: Indonesian <id@li.org>\n"
14"MIME-Version: 1.0\n"
14"MIME-Version: 1.0\n"
15"Content-Type: text/plain; charset=UTF-8\n"
15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n"
16"Content-Transfer-Encoding: 8bit\n"
17+"Plural-Forms: nplurals=1; plural=0;\n"
17−"X-Launchpad-Export-Date: 2014-09-29 05:19+0000\n"
18+"X-Launchpad-Export-Date: 2014-10-09 06:36+0000\n"
18"X-Generator: Launchpad (build 17196)\n"
19"X-Generator: Launchpad (build 17196)\n"
19
20
20#: plugins/LightDM/Greeter.cpp:130
21#: plugins/LightDM/Greeter.cpp:130
@@ -30,6 +31,25 @@ msgstr ""
30msgid "Unpin shortcut"
31msgid "Unpin shortcut"
31msgstr ""
32msgstr ""
32
33
34+#: qml/Components/DelayedLockscreen.qml:47
35+msgid "Device Locked"
36+msgstr ""
37+
38+#: qml/Components/DelayedLockscreen.qml:62
39+msgid "You have been locked out due to too many failed passphrase attempts."
40+msgstr ""
41+
42+#: qml/Components/DelayedLockscreen.qml:63
43+msgid "You have been locked out due to too many failed passcode attempts."
44+msgstr ""
45+
46+#: qml/Components/DelayedLockscreen.qml:72
47+#, qt-format
48+msgid "Please wait %1 minute and then try again…"
49+msgid_plural "Please wait %1 minutes and then try again…"
50+msgstr[0] ""
51+msgstr[1] ""
52+
33#: qml/Components/Dialogs.qml:70
53#: qml/Components/Dialogs.qml:70
34msgid "Log out"
54msgid "Log out"
35msgstr ""
55msgstr ""
@@ -132,40 +152,23 @@ msgid ""
132"phone<br><br>Tap on the screen to start"
152"phone<br><br>Tap on the screen to start"
133msgstr ""
153msgstr ""
134
154
135−#: qml/Components/Lockscreen.qml:167
155+#: qml/Components/Lockscreen.qml:220
136−msgid "Please wait"
137−msgstr ""
138−
139−#: qml/Components/Lockscreen.qml:172
140−msgid "Too many incorrect attempts"
141−msgstr ""
142−
143−#: qml/Components/Lockscreen.qml:206
144msgid "Emergency Call"
156msgid "Emergency Call"
145msgstr ""
157msgstr ""
146
158
147−#: qml/Components/Lockscreen.qml:226
159+#: qml/Components/Lockscreen.qml:252
148msgid "OK"
160msgid "OK"
149msgstr ""
161msgstr ""
150
162
151−#: qml/Components/PassphraseLockscreen.qml:61
152−#, qt-format
153−msgid "Hello %1"
154−msgstr ""
155−
156−#: qml/Components/PassphraseLockscreen.qml:61
157−msgid "Hello"
158−msgstr ""
159−
160−#: qml/Dash/GenericScopeView.qml:411 qml/Dash/GenericScopeView.qml:533
163+#: qml/Dash/GenericScopeView.qml:434 qml/Dash/GenericScopeView.qml:591
161msgid "See less"
164msgid "See less"
162msgstr ""
165msgstr ""
163
166
164−#: qml/Dash/GenericScopeView.qml:411
167+#: qml/Dash/GenericScopeView.qml:434
165msgid "See all"
168msgid "See all"
166msgstr ""
169msgstr ""
167
170
168−#: qml/Dash/GenericScopeView.qml:473 qml/Dash/PageHeader.qml:258
171+#: qml/Dash/GenericScopeView.qml:496 qml/Dash/PageHeader.qml:258
169#: qml/Panel/SearchIndicator.qml:27
172#: qml/Panel/SearchIndicator.qml:27
170msgid "Search"
173msgid "Search"
171msgstr ""
174msgstr ""
@@ -202,6 +205,14 @@ msgstr ""
202msgid "Send"
205msgid "Send"
203msgstr ""
206msgstr ""
204
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+
205#: qml/Dash/ScopesOverview.qml:206
216#: qml/Dash/ScopesOverview.qml:206
206msgid "Manage Scopes"
217msgid "Manage Scopes"
207msgstr ""
218msgstr ""
@@ -223,7 +234,7 @@ msgid "All"
223msgstr ""
234msgstr ""
224
235
225#: qml/Greeter/Greeter.qml:157
236#: qml/Greeter/Greeter.qml:157
226−msgid "Swipe to unlock"
237+msgid "Unlock"
227msgstr ""
238msgstr ""
228
239
229#: qml/Hud/HudParametrizedActionsPage.qml:139
240#: qml/Hud/HudParametrizedActionsPage.qml:139
@@ -246,18 +257,10 @@ msgstr ""
246msgid "Speaking..."
257msgid "Speaking..."
247msgstr ""
258msgstr ""
248
259
249−#: qml/Notifications/NotificationMenuItemFactory.qml:108
260+#: qml/Notifications/NotificationMenuItemFactory.qml:116
250msgid "Show password"
261msgid "Show password"
251msgstr ""
262msgstr ""
252
263
253−#: qml/Notifications/NotificationMenuItemFactory.qml:124
254−msgid "Enter SIM PIN"
255−msgstr ""
256−
257−#: qml/Notifications/NotificationMenuItemFactory.qml:125
258−msgid "Sorry, incorrect PIN"
259−msgstr ""
260−
261#: qml/Panel/ActiveCallHint.qml:77
264#: qml/Panel/ActiveCallHint.qml:77
262msgid "Tap to return to call..."
265msgid "Tap to return to call..."
263msgstr ""
266msgstr ""
@@ -302,51 +305,55 @@ msgstr ""
302msgid "Roaming"
305msgid "Roaming"
303msgstr ""
306msgstr ""
304
307
305−#: qml/Shell.qml:320
308+#: qml/Shell.qml:346
306−msgid "Enter your passphrase"
309+msgid "Enter passphrase"
307msgstr ""
310msgstr ""
308
311
309−#: qml/Shell.qml:321
312+#: qml/Shell.qml:347
310msgid "Sorry, incorrect passphrase"
313msgid "Sorry, incorrect passphrase"
311msgstr ""
314msgstr ""
312
315
313−#: qml/Shell.qml:323
316+#: qml/Shell.qml:348
317+msgid "Please re-enter"
318+msgstr ""
319+
320+#: qml/Shell.qml:350
314−msgid "Enter your passcode"
321+msgid "Enter passcode"
315msgstr ""
322msgstr ""
316
323
317−#: qml/Shell.qml:324
324+#: qml/Shell.qml:351
318msgid "Sorry, incorrect passcode"
325msgid "Sorry, incorrect passcode"
319msgstr ""
326msgstr ""
320
327
321−#: qml/Shell.qml:327
328+#: qml/Shell.qml:354
322#, qt-format
329#, qt-format
323−msgid "Enter your %1"
330+msgid "Enter %1"
324msgstr ""
331msgstr ""
325
332
326−#: qml/Shell.qml:328
333+#: qml/Shell.qml:355
327#, qt-format
334#, qt-format
328msgid "Sorry, incorrect %1"
335msgid "Sorry, incorrect %1"
329msgstr ""
336msgstr ""
330
337
331−#: qml/Shell.qml:363
338+#: qml/Shell.qml:390
332msgid "Sorry, incorrect passphrase."
339msgid "Sorry, incorrect passphrase."
333msgstr ""
340msgstr ""
334
341
335−#: qml/Shell.qml:364
342+#: qml/Shell.qml:391
336msgid "Sorry, incorrect passcode."
343msgid "Sorry, incorrect passcode."
337msgstr ""
344msgstr ""
338
345
339−#: qml/Shell.qml:365
346+#: qml/Shell.qml:392
340msgid "This will be your last attempt."
347msgid "This will be your last attempt."
341msgstr ""
348msgstr ""
342
349
343−#: qml/Shell.qml:367
350+#: qml/Shell.qml:394
344msgid ""
351msgid ""
345"If passphrase is entered incorrectly, your phone will conduct a factory "
352"If passphrase is entered incorrectly, your phone will conduct a factory "
346"reset and all personal data will be deleted."
353"reset and all personal data will be deleted."
347msgstr ""
354msgstr ""
348
355
349−#: qml/Shell.qml:368
356+#: qml/Shell.qml:395
350msgid ""
357msgid ""
351"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 "
352"and all personal data will be deleted."
359"and all personal data will be deleted."
po/is.po+78−59
@@ -9,14 +9,15 @@ msgid ""
9msgstr ""
9msgstr ""
10"Project-Id-Version: po_unity8-is\n"
10"Project-Id-Version: po_unity8-is\n"
11"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
11"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
12−"POT-Creation-Date: 2014-09-24 10:43+0100\n"
12+"POT-Creation-Date: 2014-10-07 11:37+0300\n"
13−"PO-Revision-Date: 2014-09-21 12:07+0000\n"
13+"PO-Revision-Date: 2014-10-05 08:44+0000\n"
14"Last-Translator: Sveinn í Felli <sv1@fellsnet.is>\n"
14"Last-Translator: Sveinn í Felli <sv1@fellsnet.is>\n"
15"Language-Team: Icelandic <translation-team-is@lists.sourceforge.net>\n"
15"Language-Team: Icelandic <translation-team-is@lists.sourceforge.net>\n"
16"MIME-Version: 1.0\n"
16"MIME-Version: 1.0\n"
17"Content-Type: text/plain; charset=UTF-8\n"
17"Content-Type: text/plain; charset=UTF-8\n"
18"Content-Transfer-Encoding: 8bit\n"
18"Content-Transfer-Encoding: 8bit\n"
19+"Plural-Forms: nplurals=2; plural=n != 1;\n"
19−"X-Launchpad-Export-Date: 2014-09-29 05:19+0000\n"
20+"X-Launchpad-Export-Date: 2014-10-09 06:36+0000\n"
20"X-Generator: Launchpad (build 17196)\n"
21"X-Generator: Launchpad (build 17196)\n"
21"Language: is\n"
22"Language: is\n"
22
23
@@ -33,13 +34,32 @@ msgstr "Pinna flýtilykil"
33msgid "Unpin shortcut"
34msgid "Unpin shortcut"
34msgstr "Losa flýtilykil"
35msgstr "Losa flýtilykil"
35
36
37+#: qml/Components/DelayedLockscreen.qml:47
38+msgid "Device Locked"
39+msgstr ""
40+
41+#: qml/Components/DelayedLockscreen.qml:62
42+msgid "You have been locked out due to too many failed passphrase attempts."
43+msgstr ""
44+
45+#: qml/Components/DelayedLockscreen.qml:63
46+msgid "You have been locked out due to too many failed passcode attempts."
47+msgstr ""
48+
49+#: qml/Components/DelayedLockscreen.qml:72
50+#, qt-format
51+msgid "Please wait %1 minute and then try again…"
52+msgid_plural "Please wait %1 minutes and then try again…"
53+msgstr[0] ""
54+msgstr[1] ""
55+
36#: qml/Components/Dialogs.qml:70
56#: qml/Components/Dialogs.qml:70
37msgid "Log out"
57msgid "Log out"
38msgstr "Útskráning"
58msgstr "Útskráning"
39
59
40#: qml/Components/Dialogs.qml:71
60#: qml/Components/Dialogs.qml:71
41msgid "Are you sure you want to log out?"
61msgid "Are you sure you want to log out?"
42−msgstr ""
62+msgstr "Ertu viss um að þú viljir skrá þig út?"
43
63
44#: qml/Components/Dialogs.qml:73 qml/Components/Dialogs.qml:97
64#: qml/Components/Dialogs.qml:73 qml/Components/Dialogs.qml:97
45#: qml/Components/Dialogs.qml:122
65#: qml/Components/Dialogs.qml:122
@@ -57,7 +77,7 @@ msgstr "Slökkva á tölvunni"
57
77
58#: qml/Components/Dialogs.qml:95
78#: qml/Components/Dialogs.qml:95
59msgid "Are you sure you want to shut down?"
79msgid "Are you sure you want to shut down?"
60−msgstr ""
80+msgstr "Ertu viss um að þú viljir slökkva á símanum?"
61
81
62#: qml/Components/Dialogs.qml:119
82#: qml/Components/Dialogs.qml:119
63msgid "Reboot"
83msgid "Reboot"
@@ -65,7 +85,7 @@ msgstr "Endurræsa"
65
85
66#: qml/Components/Dialogs.qml:120
86#: qml/Components/Dialogs.qml:120
67msgid "Are you sure you want to reboot?"
87msgid "Are you sure you want to reboot?"
68−msgstr ""
88+msgstr "Ertu viss að þú viljir enduræsa?"
69
89
70#: qml/Components/Dialogs.qml:144
90#: qml/Components/Dialogs.qml:144
71msgid "Power"
91msgid "Power"
@@ -76,6 +96,8 @@ msgid ""
76"Are you sure you would like\n"
96"Are you sure you would like\n"
77"to power off?"
97"to power off?"
78msgstr ""
98msgstr ""
99+"Ertu viss um að þú viljir\n"
100+"slökkva á símanum?"
79
101
80#: qml/Components/Dialogs.qml:147
102#: qml/Components/Dialogs.qml:147
81msgid "Power off"
103msgid "Power off"
@@ -138,40 +160,23 @@ msgstr ""
138"Þú ert núna með æfingu í að nota skjáhreyfingar og getur því farið að nota "
160"Þú ert núna með æfingu í að nota skjáhreyfingar og getur því farið að nota "
139"símann<br><br>Sláðu létt á skjáinn til að byrja"
161"símann<br><br>Sláðu létt á skjáinn til að byrja"
140
162
141−#: qml/Components/Lockscreen.qml:167
163+#: qml/Components/Lockscreen.qml:220
142−msgid "Please wait"
143−msgstr "Bíddu aðeins"
144−
145−#: qml/Components/Lockscreen.qml:172
146−msgid "Too many incorrect attempts"
147−msgstr ""
148−
149−#: qml/Components/Lockscreen.qml:206
150msgid "Emergency Call"
164msgid "Emergency Call"
151msgstr "Neyðarsímtal"
165msgstr "Neyðarsímtal"
152
166
153−#: qml/Components/Lockscreen.qml:226
167+#: qml/Components/Lockscreen.qml:252
154msgid "OK"
168msgid "OK"
155msgstr "Í lagi"
169msgstr "Í lagi"
156
170
157−#: qml/Components/PassphraseLockscreen.qml:61
158−#, qt-format
159−msgid "Hello %1"
160−msgstr "Hæ %1"
161−
162−#: qml/Components/PassphraseLockscreen.qml:61
163−msgid "Hello"
164−msgstr "Hæ"
165−
166−#: qml/Dash/GenericScopeView.qml:411 qml/Dash/GenericScopeView.qml:533
171+#: qml/Dash/GenericScopeView.qml:434 qml/Dash/GenericScopeView.qml:591
167msgid "See less"
172msgid "See less"
168msgstr "Sjá minna"
173msgstr "Sjá minna"
169
174
170−#: qml/Dash/GenericScopeView.qml:411
175+#: qml/Dash/GenericScopeView.qml:434
171msgid "See all"
176msgid "See all"
172msgstr "Sjá allt"
177msgstr "Sjá allt"
173
178
174−#: qml/Dash/GenericScopeView.qml:473 qml/Dash/PageHeader.qml:258
179+#: qml/Dash/GenericScopeView.qml:496 qml/Dash/PageHeader.qml:258
175#: qml/Panel/SearchIndicator.qml:27
180#: qml/Panel/SearchIndicator.qml:27
176msgid "Search"
181msgid "Search"
177msgstr "Leita"
182msgstr "Leita"
@@ -208,6 +213,14 @@ msgstr "Gefa umsögn"
208msgid "Send"
213msgid "Send"
209msgstr "Senda"
214msgstr "Senda"
210
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+
211#: qml/Dash/ScopesOverview.qml:206
224#: qml/Dash/ScopesOverview.qml:206
212msgid "Manage Scopes"
225msgid "Manage Scopes"
213msgstr ""
226msgstr ""
@@ -229,8 +242,8 @@ msgid "All"
229msgstr "Allt"
242msgstr "Allt"
230
243
231#: qml/Greeter/Greeter.qml:157
244#: qml/Greeter/Greeter.qml:157
232−msgid "Swipe to unlock"
245+msgid "Unlock"
233−msgstr "Strjúka til að aflæsa"
246+msgstr ""
234
247
235#: qml/Hud/HudParametrizedActionsPage.qml:139
248#: qml/Hud/HudParametrizedActionsPage.qml:139
236msgid "Confirm"
249msgid "Confirm"
@@ -252,18 +265,10 @@ msgstr "Tala núna..."
252msgid "Speaking..."
265msgid "Speaking..."
253msgstr "Tala..."
266msgstr "Tala..."
254
267
255−#: qml/Notifications/NotificationMenuItemFactory.qml:108
268+#: qml/Notifications/NotificationMenuItemFactory.qml:116
256msgid "Show password"
269msgid "Show password"
257msgstr "Birta lykilorð"
270msgstr "Birta lykilorð"
258
271
259−#: qml/Notifications/NotificationMenuItemFactory.qml:124
260−msgid "Enter SIM PIN"
261−msgstr "Settu inn PIN-númer SIM-kortsins"
262−
263−#: qml/Notifications/NotificationMenuItemFactory.qml:125
264−msgid "Sorry, incorrect PIN"
265−msgstr "Því miður, rangt PIN-númer"
266−
267#: qml/Panel/ActiveCallHint.qml:77
272#: qml/Panel/ActiveCallHint.qml:77
268msgid "Tap to return to call..."
273msgid "Tap to return to call..."
269msgstr "Slá til að svara símtali..."
274msgstr "Slá til að svara símtali..."
@@ -306,54 +311,68 @@ msgstr "Aflæsa SIM-korti"
306
311
307#: qml/Panel/Indicators/RoamingIndication.qml:27
312#: qml/Panel/Indicators/RoamingIndication.qml:27
308msgid "Roaming"
313msgid "Roaming"
309−msgstr ""
314+msgstr "Ráphamur"
310
315
311−#: qml/Shell.qml:320
316+#: qml/Shell.qml:346
312−msgid "Enter your passphrase"
317+msgid "Enter passphrase"
313msgstr ""
318msgstr ""
314
319
315−#: qml/Shell.qml:321
320+#: qml/Shell.qml:347
316msgid "Sorry, incorrect passphrase"
321msgid "Sorry, incorrect passphrase"
322+msgstr "Því miður, rangt lykilorð"
323+
324+#: qml/Shell.qml:348
325+msgid "Please re-enter"
317msgstr ""
326msgstr ""
318
327
319−#: qml/Shell.qml:323
328+#: qml/Shell.qml:350
320−msgid "Enter your passcode"
329+msgid "Enter passcode"
321msgstr ""
330msgstr ""
322
331
323−#: qml/Shell.qml:324
332+#: qml/Shell.qml:351
324msgid "Sorry, incorrect passcode"
333msgid "Sorry, incorrect passcode"
325−msgstr ""
334+msgstr "Því miður, rangur aðgangskóði"
326
335
327−#: qml/Shell.qml:327
336+#: qml/Shell.qml:354
328#, qt-format
337#, qt-format
329−msgid "Enter your %1"
338+msgid "Enter %1"
330msgstr ""
339msgstr ""
331
340
332−#: qml/Shell.qml:328
341+#: qml/Shell.qml:355
333#, qt-format
342#, qt-format
334msgid "Sorry, incorrect %1"
343msgid "Sorry, incorrect %1"
335−msgstr ""
344+msgstr "Því miður, rangt %1"
336
345
337−#: qml/Shell.qml:363
346+#: qml/Shell.qml:390
338msgid "Sorry, incorrect passphrase."
347msgid "Sorry, incorrect passphrase."
339−msgstr ""
348+msgstr "Því miður, rangt lykilorð."
340
349
341−#: qml/Shell.qml:364
350+#: qml/Shell.qml:391
342msgid "Sorry, incorrect passcode."
351msgid "Sorry, incorrect passcode."
343−msgstr ""
352+msgstr "Því miður, rangur aðgangskóði."
344
353
345−#: qml/Shell.qml:365
354+#: qml/Shell.qml:392
346msgid "This will be your last attempt."
355msgid "This will be your last attempt."
347−msgstr ""
356+msgstr "Þetta mun verða síðasta tilraunin þín."
348
357
349−#: qml/Shell.qml:367
358+#: qml/Shell.qml:394
350msgid ""
359msgid ""
351"If passphrase is entered incorrectly, your phone will conduct a factory "
360"If passphrase is entered incorrectly, your phone will conduct a factory "
352"reset and all personal data will be deleted."
361"reset and all personal data will be deleted."
353msgstr ""
362msgstr ""
363+"Ef lykilorð er rangt, mun síminn frumstilla allt á verksmiðjustillingar og "
364+"öllum einkagögnum verður eytt."
354
365
355−#: qml/Shell.qml:368
366+#: qml/Shell.qml:395
356msgid ""
367msgid ""
357"If passcode is entered incorrectly, your phone will conduct a factory reset "
368"If passcode is entered incorrectly, your phone will conduct a factory reset "
358"and all personal data will be deleted."
369"and all personal data will be deleted."
359msgstr ""
370msgstr ""
371+"Ef aðgangskóði er rangur, mun síminn frumstilla allt á verksmiðjustillingar "
372+"og öllum einkagögnum verður eytt."
373+
374+#~ msgid "Sorry, incorrect PIN"
375+#~ msgstr "Því miður, rangt PIN-númer"
376+
377+#~ msgid "Enter SIM PIN"
378+#~ msgstr "Settu inn PIN-númer SIM-kortsins"
po/it.po+68−58
@@ -7,14 +7,15 @@ msgid ""
7msgstr ""
7msgstr ""
8"Project-Id-Version: unity\n"
8"Project-Id-Version: unity\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2014-09-24 10:43+0100\n"
10+"POT-Creation-Date: 2014-10-07 11:37+0300\n"
11−"PO-Revision-Date: 2014-08-28 15:31+0000\n"
11+"PO-Revision-Date: 2014-09-30 10:56+0000\n"
12"Last-Translator: Claudio Arseni <claudio.arseni@gmail.com>\n"
12"Last-Translator: Claudio Arseni <claudio.arseni@gmail.com>\n"
13"Language-Team: Italian <it@li.org>\n"
13"Language-Team: Italian <it@li.org>\n"
14"MIME-Version: 1.0\n"
14"MIME-Version: 1.0\n"
15"Content-Type: text/plain; charset=UTF-8\n"
15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n"
16"Content-Transfer-Encoding: 8bit\n"
17+"Plural-Forms: nplurals=2; plural=n != 1;\n"
17−"X-Launchpad-Export-Date: 2014-09-29 05:19+0000\n"
18+"X-Launchpad-Export-Date: 2014-10-09 06:36+0000\n"
18"X-Generator: Launchpad (build 17196)\n"
19"X-Generator: Launchpad (build 17196)\n"
19
20
20#: plugins/LightDM/Greeter.cpp:130
21#: plugins/LightDM/Greeter.cpp:130
@@ -30,6 +31,25 @@ msgstr "Blocca scorciatoia"
30msgid "Unpin shortcut"
31msgid "Unpin shortcut"
31msgstr "Sblocca scorciatoia"
32msgstr "Sblocca scorciatoia"
32
33
34+#: qml/Components/DelayedLockscreen.qml:47
35+msgid "Device Locked"
36+msgstr ""
37+
38+#: qml/Components/DelayedLockscreen.qml:62
39+msgid "You have been locked out due to too many failed passphrase attempts."
40+msgstr ""
41+
42+#: qml/Components/DelayedLockscreen.qml:63
43+msgid "You have been locked out due to too many failed passcode attempts."
44+msgstr ""
45+
46+#: qml/Components/DelayedLockscreen.qml:72
47+#, qt-format
48+msgid "Please wait %1 minute and then try again…"
49+msgid_plural "Please wait %1 minutes and then try again…"
50+msgstr[0] ""
51+msgstr[1] ""
52+
33#: qml/Components/Dialogs.qml:70
53#: qml/Components/Dialogs.qml:70
34msgid "Log out"
54msgid "Log out"
35msgstr "Termina sessione"
55msgstr "Termina sessione"
@@ -82,7 +102,7 @@ msgstr "Spegni"
82
102
83#: qml/Components/Dialogs.qml:157
103#: qml/Components/Dialogs.qml:157
84msgid "Restart"
104msgid "Restart"
85−msgstr ""
105+msgstr "Riavvia"
86
106
87#: qml/Components/Dialogs.qml:167
107#: qml/Components/Dialogs.qml:167
88msgid "Cancel"
108msgid "Cancel"
@@ -141,40 +161,23 @@ msgstr ""
141"L'apprendimento dei gesti è stato completato. È ora possibile iniziare a "
161"L'apprendimento dei gesti è stato completato. È ora possibile iniziare a "
142"usare il telefono.<br><br>Toccare lo schermo per iniziare"
162"usare il telefono.<br><br>Toccare lo schermo per iniziare"
143
163
144−#: qml/Components/Lockscreen.qml:167
164+#: qml/Components/Lockscreen.qml:220
145−msgid "Please wait"
146−msgstr "Attendere"
147−
148−#: qml/Components/Lockscreen.qml:172
149−msgid "Too many incorrect attempts"
150−msgstr "Troppi tentativi errati"
151−
152−#: qml/Components/Lockscreen.qml:206
153msgid "Emergency Call"
165msgid "Emergency Call"
154msgstr "Chiamata di emergenza"
166msgstr "Chiamata di emergenza"
155
167
156−#: qml/Components/Lockscreen.qml:226
168+#: qml/Components/Lockscreen.qml:252
157msgid "OK"
169msgid "OK"
158msgstr "OK"
170msgstr "OK"
159
171
160−#: qml/Components/PassphraseLockscreen.qml:61
161−#, qt-format
162−msgid "Hello %1"
163−msgstr "Ciao %1"
164−
165−#: qml/Components/PassphraseLockscreen.qml:61
166−msgid "Hello"
167−msgstr "Ciao"
168−
169−#: qml/Dash/GenericScopeView.qml:411 qml/Dash/GenericScopeView.qml:533
172+#: qml/Dash/GenericScopeView.qml:434 qml/Dash/GenericScopeView.qml:591
170msgid "See less"
173msgid "See less"
171msgstr "Mostra meno"
174msgstr "Mostra meno"
172
175
173−#: qml/Dash/GenericScopeView.qml:411
176+#: qml/Dash/GenericScopeView.qml:434
174msgid "See all"
177msgid "See all"
175msgstr "Mostra tutto"
178msgstr "Mostra tutto"
176
179
177−#: qml/Dash/GenericScopeView.qml:473 qml/Dash/PageHeader.qml:258
180+#: qml/Dash/GenericScopeView.qml:496 qml/Dash/PageHeader.qml:258
178#: qml/Panel/SearchIndicator.qml:27
181#: qml/Panel/SearchIndicator.qml:27
179msgid "Search"
182msgid "Search"
180msgstr "Cerca"
183msgstr "Cerca"
@@ -211,9 +214,17 @@ msgstr "Aggiungi una recensione"
211msgid "Send"
214msgid "Send"
212msgstr "Invia"
215msgstr "Invia"
213
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+
214#: qml/Dash/ScopesOverview.qml:206
225#: qml/Dash/ScopesOverview.qml:206
215msgid "Manage Scopes"
226msgid "Manage Scopes"
216−msgstr ""
227+msgstr "Gestisci Scope"
217
228
218#: qml/Dash/ScopesOverview.qml:428
229#: qml/Dash/ScopesOverview.qml:428
219msgid "Done"
230msgid "Done"
@@ -232,8 +243,8 @@ msgid "All"
232msgstr "Tutto"
243msgstr "Tutto"
233
244
234#: qml/Greeter/Greeter.qml:157
245#: qml/Greeter/Greeter.qml:157
235−msgid "Swipe to unlock"
246+msgid "Unlock"
236−msgstr "Scorrere per sbloccare"
247+msgstr ""
237
248
238#: qml/Hud/HudParametrizedActionsPage.qml:139
249#: qml/Hud/HudParametrizedActionsPage.qml:139
239msgid "Confirm"
250msgid "Confirm"
@@ -255,18 +266,10 @@ msgstr "Parla ora..."
255msgid "Speaking..."
266msgid "Speaking..."
256msgstr "Sto parlando..."
267msgstr "Sto parlando..."
257
268
258−#: qml/Notifications/NotificationMenuItemFactory.qml:108
269+#: qml/Notifications/NotificationMenuItemFactory.qml:116
259msgid "Show password"
270msgid "Show password"
260msgstr "Mostra password"
271msgstr "Mostra password"
261
272
262−#: qml/Notifications/NotificationMenuItemFactory.qml:124
263−msgid "Enter SIM PIN"
264−msgstr "Inserire il PIN della SIM"
265−
266−#: qml/Notifications/NotificationMenuItemFactory.qml:125
267−msgid "Sorry, incorrect PIN"
268−msgstr "PIN errato"
269−
270#: qml/Panel/ActiveCallHint.qml:77
273#: qml/Panel/ActiveCallHint.qml:77
271msgid "Tap to return to call..."
274msgid "Tap to return to call..."
272msgstr "Tocca per tornare alla chiamata..."
275msgstr "Tocca per tornare alla chiamata..."
@@ -277,7 +280,7 @@ msgstr "Conferenza"
277
280
278#: qml/Panel/Indicators/MenuItemFactory.qml:600
281#: qml/Panel/Indicators/MenuItemFactory.qml:600
279msgid "Nothing is playing"
282msgid "Nothing is playing"
280−msgstr ""
283+msgstr "Niente in riproduzione"
281
284
282#: qml/Panel/Indicators/MenuItemFactory.qml:748
285#: qml/Panel/Indicators/MenuItemFactory.qml:748
283msgid "In queue…"
286msgid "In queue…"
@@ -311,45 +314,49 @@ msgstr "Sblocca SIM"
311msgid "Roaming"
314msgid "Roaming"
312msgstr "Roaming"
315msgstr "Roaming"
313
316
314−#: qml/Shell.qml:320
317+#: qml/Shell.qml:346
315−msgid "Enter your passphrase"
318+msgid "Enter passphrase"
316−msgstr "Digitare la passphrase"
319+msgstr ""
317
320
318−#: qml/Shell.qml:321
321+#: qml/Shell.qml:347
319msgid "Sorry, incorrect passphrase"
322msgid "Sorry, incorrect passphrase"
320msgstr "Passphrase errata"
323msgstr "Passphrase errata"
321
324
322−#: qml/Shell.qml:323
325+#: qml/Shell.qml:348
323−msgid "Enter your passcode"
326+msgid "Please re-enter"
324−msgstr "Inserire il passcode"
327+msgstr ""
325
328
326−#: qml/Shell.qml:324
329+#: qml/Shell.qml:350
330+msgid "Enter passcode"
331+msgstr ""
332+
333+#: qml/Shell.qml:351
327msgid "Sorry, incorrect passcode"
334msgid "Sorry, incorrect passcode"
328msgstr "Passcode non corretto"
335msgstr "Passcode non corretto"
329
336
330−#: qml/Shell.qml:327
337+#: qml/Shell.qml:354
331#, qt-format
338#, qt-format
332−msgid "Enter your %1"
339+msgid "Enter %1"
333−msgstr "Inserire %1"
340+msgstr ""
334
341
335−#: qml/Shell.qml:328
342+#: qml/Shell.qml:355
336#, qt-format
343#, qt-format
337msgid "Sorry, incorrect %1"
344msgid "Sorry, incorrect %1"
338msgstr "%1 non corretto"
345msgstr "%1 non corretto"
339
346
340−#: qml/Shell.qml:363
347+#: qml/Shell.qml:390
341msgid "Sorry, incorrect passphrase."
348msgid "Sorry, incorrect passphrase."
342msgstr "Passphrase non corretta"
349msgstr "Passphrase non corretta"
343
350
344−#: qml/Shell.qml:364
351+#: qml/Shell.qml:391
345msgid "Sorry, incorrect passcode."
352msgid "Sorry, incorrect passcode."
346msgstr "Passcode non corretto"
353msgstr "Passcode non corretto"
347
354
348−#: qml/Shell.qml:365
355+#: qml/Shell.qml:392
349msgid "This will be your last attempt."
356msgid "This will be your last attempt."
350msgstr "Questo sarà l'ultimo tentativo."
357msgstr "Questo sarà l'ultimo tentativo."
351
358
352−#: qml/Shell.qml:367
359+#: qml/Shell.qml:394
353msgid ""
360msgid ""
354"If passphrase is entered incorrectly, your phone will conduct a factory "
361"If passphrase is entered incorrectly, your phone will conduct a factory "
355"reset and all personal data will be deleted."
362"reset and all personal data will be deleted."
@@ -357,7 +364,7 @@ msgstr ""
357"Se verrà inserita una passphrase errata, il telefono eseguirà un ripristino "
364"Se verrà inserita una passphrase errata, il telefono eseguirà un ripristino "
358"delle impostazioni di fabbrica e tutti i dati personali verranno eliminati."
365"delle impostazioni di fabbrica e tutti i dati personali verranno eliminati."
359
366
360−#: qml/Shell.qml:368
367+#: qml/Shell.qml:395
361msgid ""
368msgid ""
362"If passcode is entered incorrectly, your phone will conduct a factory reset "
369"If passcode is entered incorrectly, your phone will conduct a factory reset "
363"and all personal data will be deleted."
370"and all personal data will be deleted."
@@ -365,5 +372,8 @@ msgstr ""
365"Se verrà inserito una passcode errato, il telefono eseguirà un ripristino "
372"Se verrà inserito una passcode errato, il telefono eseguirà un ripristino "
366"delle impostazioni di fabbrica e tutti i dati personali verranno eliminati."
373"delle impostazioni di fabbrica e tutti i dati personali verranno eliminati."
367
374
368−#~ msgid "Manage Dash"
375+#~ msgid "Sorry, incorrect PIN"
376+#~ msgstr "PIN errato"
377+
378+#~ msgid "Enter SIM PIN"
369−#~ msgstr "Gestione della Dash"
379+#~ msgstr "Inserire il PIN della SIM"
po/ja.po+64−54
@@ -7,14 +7,15 @@ msgid ""
7msgstr ""
7msgstr ""
8"Project-Id-Version: unity\n"
8"Project-Id-Version: unity\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2014-09-24 10:43+0100\n"
10+"POT-Creation-Date: 2014-10-07 11:37+0300\n"
11"PO-Revision-Date: 2014-09-18 09:47+0000\n"
11"PO-Revision-Date: 2014-09-18 09:47+0000\n"
12"Last-Translator: Mitsuya Shibata <mty.shibata@gmail.com>\n"
12"Last-Translator: Mitsuya Shibata <mty.shibata@gmail.com>\n"
13"Language-Team: Japanese <ja@li.org>\n"
13"Language-Team: Japanese <ja@li.org>\n"
14"MIME-Version: 1.0\n"
14"MIME-Version: 1.0\n"
15"Content-Type: text/plain; charset=UTF-8\n"
15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n"
16"Content-Transfer-Encoding: 8bit\n"
17+"Plural-Forms: nplurals=1; plural=0;\n"
17−"X-Launchpad-Export-Date: 2014-09-29 05:19+0000\n"
18+"X-Launchpad-Export-Date: 2014-10-09 06:36+0000\n"
18"X-Generator: Launchpad (build 17196)\n"
19"X-Generator: Launchpad (build 17196)\n"
19
20
20#: plugins/LightDM/Greeter.cpp:130
21#: plugins/LightDM/Greeter.cpp:130
@@ -30,6 +31,25 @@ msgstr "ショートカットを追加する"
30msgid "Unpin shortcut"
31msgid "Unpin shortcut"
31msgstr "ショートカットを削除する"
32msgstr "ショートカットを削除する"
32
33
34+#: qml/Components/DelayedLockscreen.qml:47
35+msgid "Device Locked"
36+msgstr ""
37+
38+#: qml/Components/DelayedLockscreen.qml:62
39+msgid "You have been locked out due to too many failed passphrase attempts."
40+msgstr ""
41+
42+#: qml/Components/DelayedLockscreen.qml:63
43+msgid "You have been locked out due to too many failed passcode attempts."
44+msgstr ""
45+
46+#: qml/Components/DelayedLockscreen.qml:72
47+#, qt-format
48+msgid "Please wait %1 minute and then try again…"
49+msgid_plural "Please wait %1 minutes and then try again…"
50+msgstr[0] ""
51+msgstr[1] ""
52+
33#: qml/Components/Dialogs.qml:70
53#: qml/Components/Dialogs.qml:70
34msgid "Log out"
54msgid "Log out"
35msgstr "ログアウト"
55msgstr "ログアウト"
@@ -133,40 +153,23 @@ msgid ""
133msgstr ""
153msgstr ""
134"これでスマートフォンの操作に必要な、画面端を用いたジェスチャーを習得できました。<br><br>利用を開始するなら画面をタップしてください"
154"これでスマートフォンの操作に必要な、画面端を用いたジェスチャーを習得できました。<br><br>利用を開始するなら画面をタップしてください"
135
155
136−#: qml/Components/Lockscreen.qml:167
156+#: qml/Components/Lockscreen.qml:220
137−msgid "Please wait"
138−msgstr "お待ちください"
139−
140−#: qml/Components/Lockscreen.qml:172
141−msgid "Too many incorrect attempts"
142−msgstr "失敗回数が上限に達しました"
143−
144−#: qml/Components/Lockscreen.qml:206
145msgid "Emergency Call"
157msgid "Emergency Call"
146msgstr "緊急通報"
158msgstr "緊急通報"
147
159
148−#: qml/Components/Lockscreen.qml:226
160+#: qml/Components/Lockscreen.qml:252
149msgid "OK"
161msgid "OK"
150msgstr "OK"
162msgstr "OK"
151
163
152−#: qml/Components/PassphraseLockscreen.qml:61
153−#, qt-format
154−msgid "Hello %1"
155−msgstr "こんにちは %1 さん"
156−
157−#: qml/Components/PassphraseLockscreen.qml:61
158−msgid "Hello"
159−msgstr "こんにちは"
160−
161−#: qml/Dash/GenericScopeView.qml:411 qml/Dash/GenericScopeView.qml:533
164+#: qml/Dash/GenericScopeView.qml:434 qml/Dash/GenericScopeView.qml:591
162msgid "See less"
165msgid "See less"
163msgstr "隠す"
166msgstr "隠す"
164
167
165−#: qml/Dash/GenericScopeView.qml:411
168+#: qml/Dash/GenericScopeView.qml:434
166msgid "See all"
169msgid "See all"
167msgstr "すべて表示する"
170msgstr "すべて表示する"
168
171
169−#: qml/Dash/GenericScopeView.qml:473 qml/Dash/PageHeader.qml:258
172+#: qml/Dash/GenericScopeView.qml:496 qml/Dash/PageHeader.qml:258
170#: qml/Panel/SearchIndicator.qml:27
173#: qml/Panel/SearchIndicator.qml:27
171msgid "Search"
174msgid "Search"
172msgstr "検索"
175msgstr "検索"
@@ -203,6 +206,14 @@ msgstr "レビューを追加"
203msgid "Send"
206msgid "Send"
204msgstr "送信"
207msgstr "送信"
205
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+
206#: qml/Dash/ScopesOverview.qml:206
217#: qml/Dash/ScopesOverview.qml:206
207msgid "Manage Scopes"
218msgid "Manage Scopes"
208msgstr ""
219msgstr ""
@@ -224,8 +235,8 @@ msgid "All"
224msgstr "すべて"
235msgstr "すべて"
225
236
226#: qml/Greeter/Greeter.qml:157
237#: qml/Greeter/Greeter.qml:157
227−msgid "Swipe to unlock"
238+msgid "Unlock"
228−msgstr "スワイプしてロック解除"
239+msgstr ""
229
240
230#: qml/Hud/HudParametrizedActionsPage.qml:139
241#: qml/Hud/HudParametrizedActionsPage.qml:139
231msgid "Confirm"
242msgid "Confirm"
@@ -247,18 +258,10 @@ msgstr "音声入力を開始..."
247msgid "Speaking..."
258msgid "Speaking..."
248msgstr "入力中..."
259msgstr "入力中..."
249
260
250−#: qml/Notifications/NotificationMenuItemFactory.qml:108
261+#: qml/Notifications/NotificationMenuItemFactory.qml:116
251msgid "Show password"
262msgid "Show password"
252msgstr "パスワードを表示"
263msgstr "パスワードを表示"
253
264
254−#: qml/Notifications/NotificationMenuItemFactory.qml:124
255−msgid "Enter SIM PIN"
256−msgstr "SIM PINの入力"
257−
258−#: qml/Notifications/NotificationMenuItemFactory.qml:125
259−msgid "Sorry, incorrect PIN"
260−msgstr "PINが違います"
261−
262#: qml/Panel/ActiveCallHint.qml:77
265#: qml/Panel/ActiveCallHint.qml:77
263msgid "Tap to return to call..."
266msgid "Tap to return to call..."
264msgstr "タップすると通話に戻ります..."
267msgstr "タップすると通話に戻ります..."
@@ -303,55 +306,62 @@ msgstr "SIMのアンロック"
303msgid "Roaming"
306msgid "Roaming"
304msgstr "ローミング"
307msgstr "ローミング"
305
308
306−#: qml/Shell.qml:320
309+#: qml/Shell.qml:346
307−msgid "Enter your passphrase"
310+msgid "Enter passphrase"
308−msgstr "パスフレーズの入力"
311+msgstr ""
309
312
310−#: qml/Shell.qml:321
313+#: qml/Shell.qml:347
311msgid "Sorry, incorrect passphrase"
314msgid "Sorry, incorrect passphrase"
312msgstr "パスフレーズが違います"
315msgstr "パスフレーズが違います"
313
316
314−#: qml/Shell.qml:323
317+#: qml/Shell.qml:348
318+msgid "Please re-enter"
319+msgstr ""
320+
321+#: qml/Shell.qml:350
315−msgid "Enter your passcode"
322+msgid "Enter passcode"
316−msgstr "パスコードの入力"
323+msgstr ""
317
324
318−#: qml/Shell.qml:324
325+#: qml/Shell.qml:351
319msgid "Sorry, incorrect passcode"
326msgid "Sorry, incorrect passcode"
320msgstr "パスコードが違います"
327msgstr "パスコードが違います"
321
328
322−#: qml/Shell.qml:327
329+#: qml/Shell.qml:354
323#, qt-format
330#, qt-format
324−msgid "Enter your %1"
331+msgid "Enter %1"
325−msgstr "%1を入力してください"
332+msgstr ""
326
333
327−#: qml/Shell.qml:328
334+#: qml/Shell.qml:355
328#, qt-format
335#, qt-format
329msgid "Sorry, incorrect %1"
336msgid "Sorry, incorrect %1"
330msgstr "%1が違います"
337msgstr "%1が違います"
331
338
332−#: qml/Shell.qml:363
339+#: qml/Shell.qml:390
333msgid "Sorry, incorrect passphrase."
340msgid "Sorry, incorrect passphrase."
334msgstr "パスフレーズが間違っています。"
341msgstr "パスフレーズが間違っています。"
335
342
336−#: qml/Shell.qml:364
343+#: qml/Shell.qml:391
337msgid "Sorry, incorrect passcode."
344msgid "Sorry, incorrect passcode."
338msgstr "パスコードが間違っています。"
345msgstr "パスコードが間違っています。"
339
346
340−#: qml/Shell.qml:365
347+#: qml/Shell.qml:392
341msgid "This will be your last attempt."
348msgid "This will be your last attempt."
342msgstr "これが最後のチャンスです。"
349msgstr "これが最後のチャンスです。"
343
350
344−#: qml/Shell.qml:367
351+#: qml/Shell.qml:394
345msgid ""
352msgid ""
346"If passphrase is entered incorrectly, your phone will conduct a factory "
353"If passphrase is entered incorrectly, your phone will conduct a factory "
347"reset and all personal data will be deleted."
354"reset and all personal data will be deleted."
348msgstr "パスフレーズが間違っている場合、ファクトリーリセットを実施し、すべての個人データは削除されます。"
355msgstr "パスフレーズが間違っている場合、ファクトリーリセットを実施し、すべての個人データは削除されます。"
349
356
350−#: qml/Shell.qml:368
357+#: qml/Shell.qml:395
351msgid ""
358msgid ""
352"If passcode is entered incorrectly, your phone will conduct a factory reset "
359"If passcode is entered incorrectly, your phone will conduct a factory reset "
353"and all personal data will be deleted."
360"and all personal data will be deleted."
354msgstr "パスコードが間違っている場合、ファクトリーリセットを実施し、すべての個人データは削除されます。"
361msgstr "パスコードが間違っている場合、ファクトリーリセットを実施し、すべての個人データは削除されます。"
355
362
356−#~ msgid "Manage Dash"
363+#~ msgid "Sorry, incorrect PIN"
357−#~ msgstr "Dashの管理"
364+#~ msgstr "PINが違います"
365+
366+#~ msgid "Enter SIM PIN"
367+#~ msgstr "SIM PINの入力"
po/km.po+65−55
@@ -7,14 +7,15 @@ msgid ""
7msgstr ""
7msgstr ""
8"Project-Id-Version: unity8\n"
8"Project-Id-Version: unity8\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2014-09-24 10:43+0100\n"
10+"POT-Creation-Date: 2014-10-07 11:37+0300\n"
11"PO-Revision-Date: 2014-08-20 02:48+0000\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"
13"Language-Team: Khmer <km@li.org>\n"
14"MIME-Version: 1.0\n"
14"MIME-Version: 1.0\n"
15"Content-Type: text/plain; charset=UTF-8\n"
15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n"
16"Content-Transfer-Encoding: 8bit\n"
17+"Plural-Forms: nplurals=1; plural=0;\n"
17−"X-Launchpad-Export-Date: 2014-09-29 05:19+0000\n"
18+"X-Launchpad-Export-Date: 2014-10-09 06:36+0000\n"
18"X-Generator: Launchpad (build 17196)\n"
19"X-Generator: Launchpad (build 17196)\n"
19
20
20#: plugins/LightDM/Greeter.cpp:130
21#: plugins/LightDM/Greeter.cpp:130
@@ -30,6 +31,25 @@ msgstr "ភ្ជាប់​ផ្លូវកាត់"
30msgid "Unpin shortcut"
31msgid "Unpin shortcut"
31msgstr "មិន​ភ្ជាប់ផ្លូវកាត់"
32msgstr "មិន​ភ្ជាប់ផ្លូវកាត់"
32
33
34+#: qml/Components/DelayedLockscreen.qml:47
35+msgid "Device Locked"
36+msgstr ""
37+
38+#: qml/Components/DelayedLockscreen.qml:62
39+msgid "You have been locked out due to too many failed passphrase attempts."
40+msgstr ""
41+
42+#: qml/Components/DelayedLockscreen.qml:63
43+msgid "You have been locked out due to too many failed passcode attempts."
44+msgstr ""
45+
46+#: qml/Components/DelayedLockscreen.qml:72
47+#, qt-format
48+msgid "Please wait %1 minute and then try again…"
49+msgid_plural "Please wait %1 minutes and then try again…"
50+msgstr[0] ""
51+msgstr[1] ""
52+
33#: qml/Components/Dialogs.qml:70
53#: qml/Components/Dialogs.qml:70
34msgid "Log out"
54msgid "Log out"
35msgstr "ចេញ"
55msgstr "ចេញ"
@@ -138,40 +158,23 @@ msgstr ""
138"ឥឡូវ​អ្នក​បាន​ពិនិត្យ​កាយវិការ​គែម​ "
158"ឥឡូវ​អ្នក​បាន​ពិនិត្យ​កាយវិការ​គែម​ "
139"និង​អាច​ចាប់ផ្ដើម​ប្រើ​ទូរស័ព្ទ<br><br>ប៉ះ លើ​អេក្រង់​ដើម្បី​ចាប់ផ្ដើម"
159"និង​អាច​ចាប់ផ្ដើម​ប្រើ​ទូរស័ព្ទ<br><br>ប៉ះ លើ​អេក្រង់​ដើម្បី​ចាប់ផ្ដើម"
140
160
141−#: qml/Components/Lockscreen.qml:167
161+#: qml/Components/Lockscreen.qml:220
142−msgid "Please wait"
143−msgstr "សូមរង់ចាំ"
144−
145−#: qml/Components/Lockscreen.qml:172
146−msgid "Too many incorrect attempts"
147−msgstr "បាន​ព្យាយាម​ខុស​ច្រើន​ដង​ពេក"
148−
149−#: qml/Components/Lockscreen.qml:206
150msgid "Emergency Call"
162msgid "Emergency Call"
151msgstr "ការ​ហៅ​ពេល​អាសន្ន"
163msgstr "ការ​ហៅ​ពេល​អាសន្ន"
152
164
153−#: qml/Components/Lockscreen.qml:226
165+#: qml/Components/Lockscreen.qml:252
154msgid "OK"
166msgid "OK"
155msgstr "យល់ព្រម"
167msgstr "យល់ព្រម"
156
168
157−#: qml/Components/PassphraseLockscreen.qml:61
158−#, qt-format
159−msgid "Hello %1"
160−msgstr "សួស្ដី %1"
161−
162−#: qml/Components/PassphraseLockscreen.qml:61
163−msgid "Hello"
164−msgstr "សួស្តី"
165−
166−#: qml/Dash/GenericScopeView.qml:411 qml/Dash/GenericScopeView.qml:533
169+#: qml/Dash/GenericScopeView.qml:434 qml/Dash/GenericScopeView.qml:591
167msgid "See less"
170msgid "See less"
168msgstr "មើល​តិច​ជាង"
171msgstr "មើល​តិច​ជាង"
169
172
170−#: qml/Dash/GenericScopeView.qml:411
173+#: qml/Dash/GenericScopeView.qml:434
171msgid "See all"
174msgid "See all"
172msgstr "មើល​ទាំងអស់"
175msgstr "មើល​ទាំងអស់"
173
176
174−#: qml/Dash/GenericScopeView.qml:473 qml/Dash/PageHeader.qml:258
177+#: qml/Dash/GenericScopeView.qml:496 qml/Dash/PageHeader.qml:258
175#: qml/Panel/SearchIndicator.qml:27
178#: qml/Panel/SearchIndicator.qml:27
176msgid "Search"
179msgid "Search"
177msgstr "ស្វែង​រក"
180msgstr "ស្វែង​រក"
@@ -208,6 +211,14 @@ msgstr "បន្ថែម​ការ​ពិនិត្យ"
208msgid "Send"
211msgid "Send"
209msgstr "ផ្ញើ"
212msgstr "ផ្ញើ"
210
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+
211#: qml/Dash/ScopesOverview.qml:206
222#: qml/Dash/ScopesOverview.qml:206
212msgid "Manage Scopes"
223msgid "Manage Scopes"
213msgstr ""
224msgstr ""
@@ -229,8 +240,8 @@ msgid "All"
229msgstr "ទាំងអស់"
240msgstr "ទាំងអស់"
230
241
231#: qml/Greeter/Greeter.qml:157
242#: qml/Greeter/Greeter.qml:157
232−msgid "Swipe to unlock"
243+msgid "Unlock"
233−msgstr "អូស​ដើម្បី​ដោះសោ"
244+msgstr ""
234
245
235#: qml/Hud/HudParametrizedActionsPage.qml:139
246#: qml/Hud/HudParametrizedActionsPage.qml:139
236msgid "Confirm"
247msgid "Confirm"
@@ -252,18 +263,10 @@ msgstr "និយាយ​ឥឡូវ..."
252msgid "Speaking..."
263msgid "Speaking..."
253msgstr "កំពុង​និយាយ..."
264msgstr "កំពុង​និយាយ..."
254
265
255−#: qml/Notifications/NotificationMenuItemFactory.qml:108
266+#: qml/Notifications/NotificationMenuItemFactory.qml:116
256msgid "Show password"
267msgid "Show password"
257msgstr "បង្ហាញ​ពាក្យ​សម្ងាត់"
268msgstr "បង្ហាញ​ពាក្យ​សម្ងាត់"
258
269
259−#: qml/Notifications/NotificationMenuItemFactory.qml:124
260−msgid "Enter SIM PIN"
261−msgstr "បញ្ចូល​លេខ​កូដ PIN ស៊ីម"
262−
263−#: qml/Notifications/NotificationMenuItemFactory.qml:125
264−msgid "Sorry, incorrect PIN"
265−msgstr "សូមទោស! លេខ​កូដ PIN មិន​ត្រឹមត្រូវ"
266−
267#: qml/Panel/ActiveCallHint.qml:77
270#: qml/Panel/ActiveCallHint.qml:77
268msgid "Tap to return to call..."
271msgid "Tap to return to call..."
269msgstr "ប៉ះ​ដើម្បី​ត្រឡប់​ទៅ​ការ​ហៅ..."
272msgstr "ប៉ះ​ដើម្បី​ត្រឡប់​ទៅ​ការ​ហៅ..."
@@ -308,45 +311,49 @@ msgstr "ដោះ​សោ​ស៊ីម"
308msgid "Roaming"
311msgid "Roaming"
309msgstr "រ៉ូមីង"
312msgstr "រ៉ូមីង"
310
313
311−#: qml/Shell.qml:320
314+#: qml/Shell.qml:346
312−msgid "Enter your passphrase"
315+msgid "Enter passphrase"
313−msgstr "បញ្ចូល​ឃ្លា​សម្ងាត់​របស់​អ្នក"
316+msgstr ""
314
317
315−#: qml/Shell.qml:321
318+#: qml/Shell.qml:347
316msgid "Sorry, incorrect passphrase"
319msgid "Sorry, incorrect passphrase"
317msgstr "សូមទោស! ឃ្លា​សម្ងាត់​មិន​ត្រឹមត្រូវ"
320msgstr "សូមទោស! ឃ្លា​សម្ងាត់​មិន​ត្រឹមត្រូវ"
318
321
319−#: qml/Shell.qml:323
322+#: qml/Shell.qml:348
323+msgid "Please re-enter"
324+msgstr ""
325+
326+#: qml/Shell.qml:350
320−msgid "Enter your passcode"
327+msgid "Enter passcode"
321−msgstr "បញ្ចូល​កូដ​សម្ងាត់​របស់​អ្នក"
328+msgstr ""
322
329
323−#: qml/Shell.qml:324
330+#: qml/Shell.qml:351
324msgid "Sorry, incorrect passcode"
331msgid "Sorry, incorrect passcode"
325msgstr "សូមទោស! កូដ​សម្ងាត់​មិន​ត្រឹមត្រូវ"
332msgstr "សូមទោស! កូដ​សម្ងាត់​មិន​ត្រឹមត្រូវ"
326
333
327−#: qml/Shell.qml:327
334+#: qml/Shell.qml:354
328#, qt-format
335#, qt-format
329−msgid "Enter your %1"
336+msgid "Enter %1"
330−msgstr "បញ្ចូល %1 របស់​អ្នក"
337+msgstr ""
331
338
332−#: qml/Shell.qml:328
339+#: qml/Shell.qml:355
333#, qt-format
340#, qt-format
334msgid "Sorry, incorrect %1"
341msgid "Sorry, incorrect %1"
335msgstr "សូមទោស! %1 មិន​ត្រឹមត្រូវ"
342msgstr "សូមទោស! %1 មិន​ត្រឹមត្រូវ"
336
343
337−#: qml/Shell.qml:363
344+#: qml/Shell.qml:390
338msgid "Sorry, incorrect passphrase."
345msgid "Sorry, incorrect passphrase."
339msgstr "សូមទោស! ឃ្លា​សម្ងាត់​មិន​ត្រឹមត្រូវ។"
346msgstr "សូមទោស! ឃ្លា​សម្ងាត់​មិន​ត្រឹមត្រូវ។"
340
347
341−#: qml/Shell.qml:364
348+#: qml/Shell.qml:391
342msgid "Sorry, incorrect passcode."
349msgid "Sorry, incorrect passcode."
343msgstr "សូមទោស! កូដ​សម្ងាត់​មិន​ត្រឹមត្រូវ។"
350msgstr "សូមទោស! កូដ​សម្ងាត់​មិន​ត្រឹមត្រូវ។"
344
351
345−#: qml/Shell.qml:365
352+#: qml/Shell.qml:392
346msgid "This will be your last attempt."
353msgid "This will be your last attempt."
347msgstr "នេះ​គឺ​ការ​ព្យាយាម​លើក​ចុងក្រោយ។"
354msgstr "នេះ​គឺ​ការ​ព្យាយាម​លើក​ចុងក្រោយ។"
348
355
349−#: qml/Shell.qml:367
356+#: qml/Shell.qml:394
350msgid ""
357msgid ""
351"If passphrase is entered incorrectly, your phone will conduct a factory "
358"If passphrase is entered incorrectly, your phone will conduct a factory "
352"reset and all personal data will be deleted."
359"reset and all personal data will be deleted."
@@ -355,7 +362,7 @@ msgstr ""
355"ទូរស័ព្ទ​របស់​អ្នក​នឹង​កំណត់​ទៅ​ទិន្នន័យ​ពី​រោងចក្រ​វិញ "
362"ទូរស័ព្ទ​របស់​អ្នក​នឹង​កំណត់​ទៅ​ទិន្នន័យ​ពី​រោងចក្រ​វិញ "
356"ហើយ​ទិន្នន័យ​ផ្ទាល់ខ្លួន​ទាំងអស់​របស់​អ្នក​នឹង​ត្រូវ​បាន​លុប។"
363"ហើយ​ទិន្នន័យ​ផ្ទាល់ខ្លួន​ទាំងអស់​របស់​អ្នក​នឹង​ត្រូវ​បាន​លុប។"
357
364
358−#: qml/Shell.qml:368
365+#: qml/Shell.qml:395
359msgid ""
366msgid ""
360"If passcode is entered incorrectly, your phone will conduct a factory reset "
367"If passcode is entered incorrectly, your phone will conduct a factory reset "
361"and all personal data will be deleted."
368"and all personal data will be deleted."
@@ -364,5 +371,8 @@ msgstr ""
364"ទូរស័ព្ទ​របស់​អ្នក​នឹង​កំណត់​ទៅ​ទិន្នន័យ​ពី​រោងចក្រ​វិញ "
371"ទូរស័ព្ទ​របស់​អ្នក​នឹង​កំណត់​ទៅ​ទិន្នន័យ​ពី​រោងចក្រ​វិញ "
365"ហើយ​ទិន្នន័យ​ផ្ទាល់ខ្លួន​ទាំងអស់​របស់​អ្នក​នឹង​ត្រូវ​បាន​លុប។"
372"ហើយ​ទិន្នន័យ​ផ្ទាល់ខ្លួន​ទាំងអស់​របស់​អ្នក​នឹង​ត្រូវ​បាន​លុប។"
366
373
367−#~ msgid "Manage Dash"
374+#~ msgid "Sorry, incorrect PIN"
368−#~ msgstr "គ្រប់គ្រង​ផ្ទាំង"
375+#~ msgstr "សូមទោស! លេខ​កូដ PIN មិន​ត្រឹមត្រូវ"
376+
377+#~ msgid "Enter SIM PIN"
378+#~ msgstr "បញ្ចូល​លេខ​កូដ PIN ស៊ីម"
po/kn.po+55−48
@@ -7,14 +7,15 @@ msgid ""
7msgstr ""
7msgstr ""
8"Project-Id-Version: unity\n"
8"Project-Id-Version: unity\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2014-09-24 10:43+0100\n"
10+"POT-Creation-Date: 2014-10-07 11:37+0300\n"
11"PO-Revision-Date: 2013-06-27 05:43+0000\n"
11"PO-Revision-Date: 2013-06-27 05:43+0000\n"
12"Last-Translator: Michał Sawicz <michal.sawicz@canonical.com>\n"
12"Last-Translator: Michał Sawicz <michal.sawicz@canonical.com>\n"
13"Language-Team: Kannada <kn@li.org>\n"
13"Language-Team: Kannada <kn@li.org>\n"
14"MIME-Version: 1.0\n"
14"MIME-Version: 1.0\n"
15"Content-Type: text/plain; charset=UTF-8\n"
15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n"
16"Content-Transfer-Encoding: 8bit\n"
17+"Plural-Forms: nplurals=2; plural=n != 1;\n"
17−"X-Launchpad-Export-Date: 2014-09-29 05:19+0000\n"
18+"X-Launchpad-Export-Date: 2014-10-09 06:36+0000\n"
18"X-Generator: Launchpad (build 17196)\n"
19"X-Generator: Launchpad (build 17196)\n"
19
20
20#: plugins/LightDM/Greeter.cpp:130
21#: plugins/LightDM/Greeter.cpp:130
@@ -30,6 +31,25 @@ msgstr ""
30msgid "Unpin shortcut"
31msgid "Unpin shortcut"
31msgstr ""
32msgstr ""
32
33
34+#: qml/Components/DelayedLockscreen.qml:47
35+msgid "Device Locked"
36+msgstr ""
37+
38+#: qml/Components/DelayedLockscreen.qml:62
39+msgid "You have been locked out due to too many failed passphrase attempts."
40+msgstr ""
41+
42+#: qml/Components/DelayedLockscreen.qml:63
43+msgid "You have been locked out due to too many failed passcode attempts."
44+msgstr ""
45+
46+#: qml/Components/DelayedLockscreen.qml:72
47+#, qt-format
48+msgid "Please wait %1 minute and then try again…"
49+msgid_plural "Please wait %1 minutes and then try again…"
50+msgstr[0] ""
51+msgstr[1] ""
52+
33#: qml/Components/Dialogs.qml:70
53#: qml/Components/Dialogs.qml:70
34msgid "Log out"
54msgid "Log out"
35msgstr ""
55msgstr ""
@@ -132,40 +152,23 @@ msgid ""
132"phone<br><br>Tap on the screen to start"
152"phone<br><br>Tap on the screen to start"
133msgstr ""
153msgstr ""
134
154
135−#: qml/Components/Lockscreen.qml:167
155+#: qml/Components/Lockscreen.qml:220
136−msgid "Please wait"
137−msgstr ""
138−
139−#: qml/Components/Lockscreen.qml:172
140−msgid "Too many incorrect attempts"
141−msgstr ""
142−
143−#: qml/Components/Lockscreen.qml:206
144msgid "Emergency Call"
156msgid "Emergency Call"
145msgstr ""
157msgstr ""
146
158
147−#: qml/Components/Lockscreen.qml:226
159+#: qml/Components/Lockscreen.qml:252
148msgid "OK"
160msgid "OK"
149msgstr ""
161msgstr ""
150
162
151−#: qml/Components/PassphraseLockscreen.qml:61
152−#, qt-format
153−msgid "Hello %1"
154−msgstr ""
155−
156−#: qml/Components/PassphraseLockscreen.qml:61
157−msgid "Hello"
158−msgstr ""
159−
160−#: qml/Dash/GenericScopeView.qml:411 qml/Dash/GenericScopeView.qml:533
163+#: qml/Dash/GenericScopeView.qml:434 qml/Dash/GenericScopeView.qml:591
161msgid "See less"
164msgid "See less"
162msgstr ""
165msgstr ""
163
166
164−#: qml/Dash/GenericScopeView.qml:411
167+#: qml/Dash/GenericScopeView.qml:434
165msgid "See all"
168msgid "See all"
166msgstr ""
169msgstr ""
167
170
168−#: qml/Dash/GenericScopeView.qml:473 qml/Dash/PageHeader.qml:258
171+#: qml/Dash/GenericScopeView.qml:496 qml/Dash/PageHeader.qml:258
169#: qml/Panel/SearchIndicator.qml:27
172#: qml/Panel/SearchIndicator.qml:27
170msgid "Search"
173msgid "Search"
171msgstr "ಹುಡುಕು"
174msgstr "ಹುಡುಕು"
@@ -202,6 +205,14 @@ msgstr ""
202msgid "Send"
205msgid "Send"
203msgstr ""
206msgstr ""
204
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+
205#: qml/Dash/ScopesOverview.qml:206
216#: qml/Dash/ScopesOverview.qml:206
206msgid "Manage Scopes"
217msgid "Manage Scopes"
207msgstr ""
218msgstr ""
@@ -223,7 +234,7 @@ msgid "All"
223msgstr ""
234msgstr ""
224
235
225#: qml/Greeter/Greeter.qml:157
236#: qml/Greeter/Greeter.qml:157
226−msgid "Swipe to unlock"
237+msgid "Unlock"
227msgstr ""
238msgstr ""
228
239
229#: qml/Hud/HudParametrizedActionsPage.qml:139
240#: qml/Hud/HudParametrizedActionsPage.qml:139
@@ -246,18 +257,10 @@ msgstr "ಈಗ ಮಾತನಾಡಿ ..."
246msgid "Speaking..."
257msgid "Speaking..."
247msgstr "ಮಾತನಾಡುತಿದ್ದೀರಿ"
258msgstr "ಮಾತನಾಡುತಿದ್ದೀರಿ"
248
259
249−#: qml/Notifications/NotificationMenuItemFactory.qml:108
260+#: qml/Notifications/NotificationMenuItemFactory.qml:116
250msgid "Show password"
261msgid "Show password"
251msgstr ""
262msgstr ""
252
263
253−#: qml/Notifications/NotificationMenuItemFactory.qml:124
254−msgid "Enter SIM PIN"
255−msgstr ""
256−
257−#: qml/Notifications/NotificationMenuItemFactory.qml:125
258−msgid "Sorry, incorrect PIN"
259−msgstr ""
260−
261#: qml/Panel/ActiveCallHint.qml:77
264#: qml/Panel/ActiveCallHint.qml:77
262msgid "Tap to return to call..."
265msgid "Tap to return to call..."
263msgstr ""
266msgstr ""
@@ -302,51 +305,55 @@ msgstr ""
302msgid "Roaming"
305msgid "Roaming"
303msgstr ""
306msgstr ""
304
307
305−#: qml/Shell.qml:320
308+#: qml/Shell.qml:346
306−msgid "Enter your passphrase"
309+msgid "Enter passphrase"
307msgstr ""
310msgstr ""
308
311
309−#: qml/Shell.qml:321
312+#: qml/Shell.qml:347
310msgid "Sorry, incorrect passphrase"
313msgid "Sorry, incorrect passphrase"
311msgstr ""
314msgstr ""
312
315
313−#: qml/Shell.qml:323
316+#: qml/Shell.qml:348
317+msgid "Please re-enter"
318+msgstr ""
319+
320+#: qml/Shell.qml:350
314−msgid "Enter your passcode"
321+msgid "Enter passcode"
315msgstr ""
322msgstr ""
316
323
317−#: qml/Shell.qml:324
324+#: qml/Shell.qml:351
318msgid "Sorry, incorrect passcode"
325msgid "Sorry, incorrect passcode"
319msgstr ""
326msgstr ""
320
327
321−#: qml/Shell.qml:327
328+#: qml/Shell.qml:354
322#, qt-format
329#, qt-format
323−msgid "Enter your %1"
330+msgid "Enter %1"
324msgstr ""
331msgstr ""
325
332
326−#: qml/Shell.qml:328
333+#: qml/Shell.qml:355
327#, qt-format
334#, qt-format
328msgid "Sorry, incorrect %1"
335msgid "Sorry, incorrect %1"
329msgstr ""
336msgstr ""
330
337
331−#: qml/Shell.qml:363
338+#: qml/Shell.qml:390
332msgid "Sorry, incorrect passphrase."
339msgid "Sorry, incorrect passphrase."
333msgstr ""
340msgstr ""
334
341
335−#: qml/Shell.qml:364
342+#: qml/Shell.qml:391
336msgid "Sorry, incorrect passcode."
343msgid "Sorry, incorrect passcode."
337msgstr ""
344msgstr ""
338
345
339−#: qml/Shell.qml:365
346+#: qml/Shell.qml:392
340msgid "This will be your last attempt."
347msgid "This will be your last attempt."
341msgstr ""
348msgstr ""
342
349
343−#: qml/Shell.qml:367
350+#: qml/Shell.qml:394
344msgid ""
351msgid ""
345"If passphrase is entered incorrectly, your phone will conduct a factory "
352"If passphrase is entered incorrectly, your phone will conduct a factory "
346"reset and all personal data will be deleted."
353"reset and all personal data will be deleted."
347msgstr ""
354msgstr ""
348
355
349−#: qml/Shell.qml:368
356+#: qml/Shell.qml:395
350msgid ""
357msgid ""
351"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 "
352"and all personal data will be deleted."
359"and all personal data will be deleted."
po/ko.po+61−52
@@ -7,14 +7,15 @@ msgid ""
7msgstr ""
7msgstr ""
8"Project-Id-Version: unity\n"
8"Project-Id-Version: unity\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2014-09-24 10:43+0100\n"
10+"POT-Creation-Date: 2014-10-07 11:37+0300\n"
11"PO-Revision-Date: 2014-08-19 13:02+0000\n"
11"PO-Revision-Date: 2014-08-19 13:02+0000\n"
12"Last-Translator: MinSik CHO <Unknown>\n"
12"Last-Translator: MinSik CHO <Unknown>\n"
13"Language-Team: Korean <ko@li.org>\n"
13"Language-Team: Korean <ko@li.org>\n"
14"MIME-Version: 1.0\n"
14"MIME-Version: 1.0\n"
15"Content-Type: text/plain; charset=UTF-8\n"
15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n"
16"Content-Transfer-Encoding: 8bit\n"
17+"Plural-Forms: nplurals=1; plural=0;\n"
17−"X-Launchpad-Export-Date: 2014-09-29 05:19+0000\n"
18+"X-Launchpad-Export-Date: 2014-10-09 06:36+0000\n"
18"X-Generator: Launchpad (build 17196)\n"
19"X-Generator: Launchpad (build 17196)\n"
19
20
20#: plugins/LightDM/Greeter.cpp:130
21#: plugins/LightDM/Greeter.cpp:130
@@ -30,6 +31,24 @@ msgstr "바로 가기를 고정"
30msgid "Unpin shortcut"
31msgid "Unpin shortcut"
31msgstr "바로 가기를 고정 해제"
32msgstr "바로 가기를 고정 해제"
32
33
34+#: qml/Components/DelayedLockscreen.qml:47
35+msgid "Device Locked"
36+msgstr "장치가 잠김"
37+
38+#: qml/Components/DelayedLockscreen.qml:62
39+msgid "You have been locked out due to too many failed passphrase attempts."
40+msgstr "올바르지 않은 패스프레이즈를 너무 많이 입력해 장치가 잠겼습니다."
41+
42+#: qml/Components/DelayedLockscreen.qml:63
43+msgid "You have been locked out due to too many failed passcode attempts."
44+msgstr "올바르지 않은 패스코드를 너무 많이 입력해 장치가 잠겼습니다."
45+
46+#: qml/Components/DelayedLockscreen.qml:72
47+#, qt-format
48+msgid "Please wait %1 minute and then try again…"
49+msgid_plural "Please wait %1 minutes and then try again…"
50+msgstr[0] "%1분 정도 기다린 후 다시 시독해주십시오..."
51+
33#: qml/Components/Dialogs.qml:70
52#: qml/Components/Dialogs.qml:70
34msgid "Log out"
53msgid "Log out"
35msgstr "로그아웃"
54msgstr "로그아웃"
@@ -133,40 +152,23 @@ msgid ""
133msgstr ""
152msgstr ""
134"여러분은 가장자리에서 끌어오기 제스쳐를 완벽히 익히셨고 휴대 전화를 사용할 수 있습니다. <br><br> 스크린을 터치해서 시작하세요."
153"여러분은 가장자리에서 끌어오기 제스쳐를 완벽히 익히셨고 휴대 전화를 사용할 수 있습니다. <br><br> 스크린을 터치해서 시작하세요."
135
154
136−#: qml/Components/Lockscreen.qml:167
155+#: qml/Components/Lockscreen.qml:220
137−msgid "Please wait"
138−msgstr "기다려주십시오"
139−
140−#: qml/Components/Lockscreen.qml:172
141−msgid "Too many incorrect attempts"
142−msgstr "너무 많이 틀리셨습니다"
143−
144−#: qml/Components/Lockscreen.qml:206
145msgid "Emergency Call"
156msgid "Emergency Call"
146msgstr "긴급 통화"
157msgstr "긴급 통화"
147
158
148−#: qml/Components/Lockscreen.qml:226
159+#: qml/Components/Lockscreen.qml:252
149msgid "OK"
160msgid "OK"
150msgstr "확인"
161msgstr "확인"
151
162
152−#: qml/Components/PassphraseLockscreen.qml:61
153−#, qt-format
154−msgid "Hello %1"
155−msgstr "안녕하세요 %1"
156−
157−#: qml/Components/PassphraseLockscreen.qml:61
158−msgid "Hello"
159−msgstr "안녕하세요"
160−
161−#: qml/Dash/GenericScopeView.qml:411 qml/Dash/GenericScopeView.qml:533
163+#: qml/Dash/GenericScopeView.qml:434 qml/Dash/GenericScopeView.qml:591
162msgid "See less"
164msgid "See less"
163msgstr "간단히 표시"
165msgstr "간단히 표시"
164
166
165−#: qml/Dash/GenericScopeView.qml:411
167+#: qml/Dash/GenericScopeView.qml:434
166msgid "See all"
168msgid "See all"
167msgstr "모두 보기"
169msgstr "모두 보기"
168
170
169−#: qml/Dash/GenericScopeView.qml:473 qml/Dash/PageHeader.qml:258
171+#: qml/Dash/GenericScopeView.qml:496 qml/Dash/PageHeader.qml:258
170#: qml/Panel/SearchIndicator.qml:27
172#: qml/Panel/SearchIndicator.qml:27
171msgid "Search"
173msgid "Search"
172msgstr "검색"
174msgstr "검색"
@@ -203,6 +205,14 @@ msgstr "평가 추가"
203msgid "Send"
205msgid "Send"
204msgstr "보내기"
206msgstr "보내기"
205
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+
206#: qml/Dash/ScopesOverview.qml:206
216#: qml/Dash/ScopesOverview.qml:206
207msgid "Manage Scopes"
217msgid "Manage Scopes"
208msgstr "스코프 관리"
218msgstr "스코프 관리"
@@ -224,8 +234,8 @@ msgid "All"
224msgstr "모두"
234msgstr "모두"
225
235
226#: qml/Greeter/Greeter.qml:157
236#: qml/Greeter/Greeter.qml:157
227−msgid "Swipe to unlock"
237+msgid "Unlock"
228−msgstr "쓸어서 잠금 해제"
238+msgstr "잠금 해제"
229
239
230#: qml/Hud/HudParametrizedActionsPage.qml:139
240#: qml/Hud/HudParametrizedActionsPage.qml:139
231msgid "Confirm"
241msgid "Confirm"
@@ -247,18 +257,10 @@ msgstr "지금 말하세요..."
247msgid "Speaking..."
257msgid "Speaking..."
248msgstr "말하는 중..."
258msgstr "말하는 중..."
249
259
250−#: qml/Notifications/NotificationMenuItemFactory.qml:108
260+#: qml/Notifications/NotificationMenuItemFactory.qml:116
251msgid "Show password"
261msgid "Show password"
252msgstr "암호 표시"
262msgstr "암호 표시"
253
263
254−#: qml/Notifications/NotificationMenuItemFactory.qml:124
255−msgid "Enter SIM PIN"
256−msgstr "심 카드의 개인 식별 번호 입력"
257−
258−#: qml/Notifications/NotificationMenuItemFactory.qml:125
259−msgid "Sorry, incorrect PIN"
260−msgstr "죄송합니다. 개인 식별 번호가 올바르지 않습니다."
261−
262#: qml/Panel/ActiveCallHint.qml:77
264#: qml/Panel/ActiveCallHint.qml:77
263msgid "Tap to return to call..."
265msgid "Tap to return to call..."
264msgstr "통화로 돌아가려면 터치하세요..."
266msgstr "통화로 돌아가려면 터치하세요..."
@@ -303,55 +305,62 @@ msgstr "심 카드 잠금 해제"
303msgid "Roaming"
305msgid "Roaming"
304msgstr "로밍"
306msgstr "로밍"
305
307
306−#: qml/Shell.qml:320
308+#: qml/Shell.qml:346
307−msgid "Enter your passphrase"
309+msgid "Enter passphrase"
308msgstr "패스프레이즈를 입력해주십시오."
310msgstr "패스프레이즈를 입력해주십시오."
309
311
310−#: qml/Shell.qml:321
312+#: qml/Shell.qml:347
311msgid "Sorry, incorrect passphrase"
313msgid "Sorry, incorrect passphrase"
312msgstr "죄송합니다. 패스프레이즈가 올바르지 않습니다."
314msgstr "죄송합니다. 패스프레이즈가 올바르지 않습니다."
313
315
314−#: qml/Shell.qml:323
316+#: qml/Shell.qml:348
317+msgid "Please re-enter"
318+msgstr "다시 입력해주십시오."
319+
320+#: qml/Shell.qml:350
315−msgid "Enter your passcode"
321+msgid "Enter passcode"
316msgstr "패스코드를 입력해주십시오."
322msgstr "패스코드를 입력해주십시오."
317
323
318−#: qml/Shell.qml:324
324+#: qml/Shell.qml:351
319msgid "Sorry, incorrect passcode"
325msgid "Sorry, incorrect passcode"
320msgstr "죄송합니다. 패스코드가 올바르지 않습니다."
326msgstr "죄송합니다. 패스코드가 올바르지 않습니다."
321
327
322−#: qml/Shell.qml:327
328+#: qml/Shell.qml:354
323#, qt-format
329#, qt-format
324−msgid "Enter your %1"
330+msgid "Enter %1"
325−msgstr "%1을(를) 입력해주십시오."
331+msgstr "%1 입력"
326
332
327−#: qml/Shell.qml:328
333+#: qml/Shell.qml:355
328#, qt-format
334#, qt-format
329msgid "Sorry, incorrect %1"
335msgid "Sorry, incorrect %1"
330msgstr "죄송합니다. %1이(가) 올바르지 않습니다."
336msgstr "죄송합니다. %1이(가) 올바르지 않습니다."
331
337
332−#: qml/Shell.qml:363
338+#: qml/Shell.qml:390
333msgid "Sorry, incorrect passphrase."
339msgid "Sorry, incorrect passphrase."
334msgstr "올바르지 않은 패스프레이즈입니다."
340msgstr "올바르지 않은 패스프레이즈입니다."
335
341
336−#: qml/Shell.qml:364
342+#: qml/Shell.qml:391
337msgid "Sorry, incorrect passcode."
343msgid "Sorry, incorrect passcode."
338msgstr "최송합니다. 패스코드가 올바르지 않습니다."
344msgstr "최송합니다. 패스코드가 올바르지 않습니다."
339
345
340−#: qml/Shell.qml:365
346+#: qml/Shell.qml:392
341msgid "This will be your last attempt."
347msgid "This will be your last attempt."
342msgstr "마지막 시도입니다."
348msgstr "마지막 시도입니다."
343
349
344−#: qml/Shell.qml:367
350+#: qml/Shell.qml:394
345msgid ""
351msgid ""
346"If passphrase is entered incorrectly, your phone will conduct a factory "
352"If passphrase is entered incorrectly, your phone will conduct a factory "
347"reset and all personal data will be deleted."
353"reset and all personal data will be deleted."
348msgstr "이번에도 올바르지 않은 패스프레이즈를 입력하면 휴대 전화를 공장 초기화하여 모든 개인 정보를 삭제합니다."
354msgstr "이번에도 올바르지 않은 패스프레이즈를 입력하면 휴대 전화를 공장 초기화하여 모든 개인 정보를 삭제합니다."
349
355
350−#: qml/Shell.qml:368
356+#: qml/Shell.qml:395
351msgid ""
357msgid ""
352"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 "
353"and all personal data will be deleted."
359"and all personal data will be deleted."
354msgstr "이번에도 올바르지 않은 패스코드를 입력하면 휴대 전화를 공장 초기화하여 모든 개인 정보를 삭제합니다."
360msgstr "이번에도 올바르지 않은 패스코드를 입력하면 휴대 전화를 공장 초기화하여 모든 개인 정보를 삭제합니다."
355
361
356−#~ msgid "Manage Dash"
362+#~ msgid "Sorry, incorrect PIN"
357−#~ msgstr "대시 관리"
363+#~ msgstr "죄송합니다. 개인 식별 번호가 올바르지 않습니다."
364+
365+#~ msgid "Enter SIM PIN"
366+#~ msgstr "심 카드의 개인 식별 번호 입력"
po/ku.po+65−52
@@ -7,14 +7,15 @@ msgid ""
7msgstr ""
7msgstr ""
8"Project-Id-Version: unity8\n"
8"Project-Id-Version: unity8\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2014-09-24 10:43+0100\n"
10+"POT-Creation-Date: 2014-10-07 11:37+0300\n"
11"PO-Revision-Date: 2014-09-10 13:14+0000\n"
11"PO-Revision-Date: 2014-09-10 13:14+0000\n"
12"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
12"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
13"Language-Team: Kurdish <ku@li.org>\n"
13"Language-Team: Kurdish <ku@li.org>\n"
14"MIME-Version: 1.0\n"
14"MIME-Version: 1.0\n"
15"Content-Type: text/plain; charset=UTF-8\n"
15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n"
16"Content-Transfer-Encoding: 8bit\n"
17+"Plural-Forms: nplurals=2; plural=n != 1;\n"
17−"X-Launchpad-Export-Date: 2014-09-29 05:19+0000\n"
18+"X-Launchpad-Export-Date: 2014-10-09 06:36+0000\n"
18"X-Generator: Launchpad (build 17196)\n"
19"X-Generator: Launchpad (build 17196)\n"
19
20
20#: plugins/LightDM/Greeter.cpp:130
21#: plugins/LightDM/Greeter.cpp:130
@@ -30,6 +31,25 @@ msgstr "Kurteriyê pêveke"
30msgid "Unpin shortcut"
31msgid "Unpin shortcut"
31msgstr "Derzîdanka kurteriyê rake"
32msgstr "Derzîdanka kurteriyê rake"
32
33
34+#: qml/Components/DelayedLockscreen.qml:47
35+msgid "Device Locked"
36+msgstr ""
37+
38+#: qml/Components/DelayedLockscreen.qml:62
39+msgid "You have been locked out due to too many failed passphrase attempts."
40+msgstr ""
41+
42+#: qml/Components/DelayedLockscreen.qml:63
43+msgid "You have been locked out due to too many failed passcode attempts."
44+msgstr ""
45+
46+#: qml/Components/DelayedLockscreen.qml:72
47+#, qt-format
48+msgid "Please wait %1 minute and then try again…"
49+msgid_plural "Please wait %1 minutes and then try again…"
50+msgstr[0] ""
51+msgstr[1] ""
52+
33#: qml/Components/Dialogs.qml:70
53#: qml/Components/Dialogs.qml:70
34msgid "Log out"
54msgid "Log out"
35msgstr "Derkeve"
55msgstr "Derkeve"
@@ -135,40 +155,23 @@ msgid ""
135msgstr ""
155msgstr ""
136"Tu tevgerên kêlekê fêr bûyî<br><br>Ji bo destpêkirinê ekranê bipelîne"
156"Tu tevgerên kêlekê fêr bûyî<br><br>Ji bo destpêkirinê ekranê bipelîne"
137
157
138−#: qml/Components/Lockscreen.qml:167
158+#: qml/Components/Lockscreen.qml:220
139−msgid "Please wait"
140−msgstr "Tika ye li bendê bimîne"
141−
142−#: qml/Components/Lockscreen.qml:172
143−msgid "Too many incorrect attempts"
144−msgstr "Te gelek caran ceribandinên çewt kirin"
145−
146−#: qml/Components/Lockscreen.qml:206
147msgid "Emergency Call"
159msgid "Emergency Call"
148msgstr "Lêgerîna Lezgîn"
160msgstr "Lêgerîna Lezgîn"
149
161
150−#: qml/Components/Lockscreen.qml:226
162+#: qml/Components/Lockscreen.qml:252
151msgid "OK"
163msgid "OK"
152msgstr "BAŞ E"
164msgstr "BAŞ E"
153
165
154−#: qml/Components/PassphraseLockscreen.qml:61
155−#, qt-format
156−msgid "Hello %1"
157−msgstr "Silav %1"
158−
159−#: qml/Components/PassphraseLockscreen.qml:61
160−msgid "Hello"
161−msgstr "Silav"
162−
163−#: qml/Dash/GenericScopeView.qml:411 qml/Dash/GenericScopeView.qml:533
166+#: qml/Dash/GenericScopeView.qml:434 qml/Dash/GenericScopeView.qml:591
164msgid "See less"
167msgid "See less"
165msgstr "Hindiktir bibîne"
168msgstr "Hindiktir bibîne"
166
169
167−#: qml/Dash/GenericScopeView.qml:411
170+#: qml/Dash/GenericScopeView.qml:434
168msgid "See all"
171msgid "See all"
169msgstr "Tevî bibîne"
172msgstr "Tevî bibîne"
170
173
171−#: qml/Dash/GenericScopeView.qml:473 qml/Dash/PageHeader.qml:258
174+#: qml/Dash/GenericScopeView.qml:496 qml/Dash/PageHeader.qml:258
172#: qml/Panel/SearchIndicator.qml:27
175#: qml/Panel/SearchIndicator.qml:27
173msgid "Search"
176msgid "Search"
174msgstr "Lêgerîn"
177msgstr "Lêgerîn"
@@ -205,6 +208,14 @@ msgstr "Binirxîne"
205msgid "Send"
208msgid "Send"
206msgstr "Bişîne"
209msgstr "Bişîne"
207
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+
208#: qml/Dash/ScopesOverview.qml:206
219#: qml/Dash/ScopesOverview.qml:206
209msgid "Manage Scopes"
220msgid "Manage Scopes"
210msgstr ""
221msgstr ""
@@ -226,8 +237,8 @@ msgid "All"
226msgstr "Hemû"
237msgstr "Hemû"
227
238
228#: qml/Greeter/Greeter.qml:157
239#: qml/Greeter/Greeter.qml:157
229−msgid "Swipe to unlock"
240+msgid "Unlock"
230−msgstr "Ji bo vekirinê kaş bike"
241+msgstr ""
231
242
232#: qml/Hud/HudParametrizedActionsPage.qml:139
243#: qml/Hud/HudParametrizedActionsPage.qml:139
233msgid "Confirm"
244msgid "Confirm"
@@ -249,18 +260,10 @@ msgstr "Niha biaxive..."
249msgid "Speaking..."
260msgid "Speaking..."
250msgstr "Diaxive..."
261msgstr "Diaxive..."
251
262
252−#: qml/Notifications/NotificationMenuItemFactory.qml:108
263+#: qml/Notifications/NotificationMenuItemFactory.qml:116
253msgid "Show password"
264msgid "Show password"
254msgstr "Şîfreyê nîşan bide"
265msgstr "Şîfreyê nîşan bide"
255
266
256−#: qml/Notifications/NotificationMenuItemFactory.qml:124
257−msgid "Enter SIM PIN"
258−msgstr "PINa SIMê binivîse"
259−
260−#: qml/Notifications/NotificationMenuItemFactory.qml:125
261−msgid "Sorry, incorrect PIN"
262−msgstr "Bibore, PIN çewt e"
263−
264#: qml/Panel/ActiveCallHint.qml:77
267#: qml/Panel/ActiveCallHint.qml:77
265msgid "Tap to return to call..."
268msgid "Tap to return to call..."
266msgstr "Ji bo vegerî lêgerînê bipelîne..."
269msgstr "Ji bo vegerî lêgerînê bipelîne..."
@@ -305,45 +308,49 @@ msgstr "Kilîda SIMê veke"
305msgid "Roaming"
308msgid "Roaming"
306msgstr "Geriyan"
309msgstr "Geriyan"
307
310
308−#: qml/Shell.qml:320
311+#: qml/Shell.qml:346
309−msgid "Enter your passphrase"
312+msgid "Enter passphrase"
310−msgstr "Parolaya xwe binivîse"
313+msgstr ""
311
314
312−#: qml/Shell.qml:321
315+#: qml/Shell.qml:347
313msgid "Sorry, incorrect passphrase"
316msgid "Sorry, incorrect passphrase"
314msgstr "Bibore, parola çewt e"
317msgstr "Bibore, parola çewt e"
315
318
316−#: qml/Shell.qml:323
319+#: qml/Shell.qml:348
320+msgid "Please re-enter"
321+msgstr ""
322+
323+#: qml/Shell.qml:350
317−msgid "Enter your passcode"
324+msgid "Enter passcode"
318−msgstr "Parolaya xwe binivîse"
325+msgstr ""
319
326
320−#: qml/Shell.qml:324
327+#: qml/Shell.qml:351
321msgid "Sorry, incorrect passcode"
328msgid "Sorry, incorrect passcode"
322msgstr "Bibore, parola çewrt e"
329msgstr "Bibore, parola çewrt e"
323
330
324−#: qml/Shell.qml:327
331+#: qml/Shell.qml:354
325#, qt-format
332#, qt-format
326−msgid "Enter your %1"
333+msgid "Enter %1"
327−msgstr "%1a xwe binivîse"
334+msgstr ""
328
335
329−#: qml/Shell.qml:328
336+#: qml/Shell.qml:355
330#, qt-format
337#, qt-format
331msgid "Sorry, incorrect %1"
338msgid "Sorry, incorrect %1"
332msgstr "Bibore, %1 çewt e"
339msgstr "Bibore, %1 çewt e"
333
340
334−#: qml/Shell.qml:363
341+#: qml/Shell.qml:390
335msgid "Sorry, incorrect passphrase."
342msgid "Sorry, incorrect passphrase."
336msgstr "Bibore, parola çewt e."
343msgstr "Bibore, parola çewt e."
337
344
338−#: qml/Shell.qml:364
345+#: qml/Shell.qml:391
339msgid "Sorry, incorrect passcode."
346msgid "Sorry, incorrect passcode."
340msgstr "Bibore, parola çewt e."
347msgstr "Bibore, parola çewt e."
341
348
342−#: qml/Shell.qml:365
349+#: qml/Shell.qml:392
343msgid "This will be your last attempt."
350msgid "This will be your last attempt."
344msgstr "Ev ê ceribandina dawiyê be."
351msgstr "Ev ê ceribandina dawiyê be."
345
352
346−#: qml/Shell.qml:367
353+#: qml/Shell.qml:394
347msgid ""
354msgid ""
348"If passphrase is entered incorrectly, your phone will conduct a factory "
355"If passphrase is entered incorrectly, your phone will conduct a factory "
349"reset and all personal data will be deleted."
356"reset and all personal data will be deleted."
@@ -351,10 +358,16 @@ msgstr ""
351"Eger parola çewt bê nivîsandin, telefona te dê vegere eyarên fabrîkayê û "
358"Eger parola çewt bê nivîsandin, telefona te dê vegere eyarên fabrîkayê û "
352"hemû daneyên te yên taybet dê bên jêbirin."
359"hemû daneyên te yên taybet dê bên jêbirin."
353
360
354−#: qml/Shell.qml:368
361+#: qml/Shell.qml:395
355msgid ""
362msgid ""
356"If passcode is entered incorrectly, your phone will conduct a factory reset "
363"If passcode is entered incorrectly, your phone will conduct a factory reset "
357"and all personal data will be deleted."
364"and all personal data will be deleted."
358msgstr ""
365msgstr ""
359"Eger parola çewt bê nivîsandin, telefona te dê vegere eyarên fabrîkayê û "
366"Eger parola çewt bê nivîsandin, telefona te dê vegere eyarên fabrîkayê û "
360"hemû daneyên te yên taybet dê bên jêbirin."
367"hemû daneyên te yên taybet dê bên jêbirin."
368+
369+#~ msgid "Sorry, incorrect PIN"
370+#~ msgstr "Bibore, PIN çewt e"
371+
372+#~ msgid "Enter SIM PIN"
373+#~ msgstr "PINa SIMê binivîse"
po/ky.po+55−48
@@ -7,14 +7,15 @@ msgid ""
7msgstr ""
7msgstr ""
8"Project-Id-Version: unity\n"
8"Project-Id-Version: unity\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2014-09-24 10:43+0100\n"
10+"POT-Creation-Date: 2014-10-07 11:37+0300\n"
11"PO-Revision-Date: 2013-06-27 06:17+0000\n"
11"PO-Revision-Date: 2013-06-27 06:17+0000\n"
12"Last-Translator: Michał Sawicz <michal.sawicz@canonical.com>\n"
12"Last-Translator: Michał Sawicz <michal.sawicz@canonical.com>\n"
13"Language-Team: Kirghiz <ky@li.org>\n"
13"Language-Team: Kirghiz <ky@li.org>\n"
14"MIME-Version: 1.0\n"
14"MIME-Version: 1.0\n"
15"Content-Type: text/plain; charset=UTF-8\n"
15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n"
16"Content-Transfer-Encoding: 8bit\n"
17+"Plural-Forms: nplurals=1; plural=0;\n"
17−"X-Launchpad-Export-Date: 2014-09-29 05:19+0000\n"
18+"X-Launchpad-Export-Date: 2014-10-09 06:36+0000\n"
18"X-Generator: Launchpad (build 17196)\n"
19"X-Generator: Launchpad (build 17196)\n"
19
20
20#: plugins/LightDM/Greeter.cpp:130
21#: plugins/LightDM/Greeter.cpp:130
@@ -30,6 +31,25 @@ msgstr ""
30msgid "Unpin shortcut"
31msgid "Unpin shortcut"
31msgstr ""
32msgstr ""
32
33
34+#: qml/Components/DelayedLockscreen.qml:47
35+msgid "Device Locked"
36+msgstr ""
37+
38+#: qml/Components/DelayedLockscreen.qml:62
39+msgid "You have been locked out due to too many failed passphrase attempts."
40+msgstr ""
41+
42+#: qml/Components/DelayedLockscreen.qml:63
43+msgid "You have been locked out due to too many failed passcode attempts."
44+msgstr ""
45+
46+#: qml/Components/DelayedLockscreen.qml:72
47+#, qt-format
48+msgid "Please wait %1 minute and then try again…"
49+msgid_plural "Please wait %1 minutes and then try again…"
50+msgstr[0] ""
51+msgstr[1] ""
52+
33#: qml/Components/Dialogs.qml:70
53#: qml/Components/Dialogs.qml:70
34msgid "Log out"
54msgid "Log out"
35msgstr ""
55msgstr ""
@@ -132,40 +152,23 @@ msgid ""
132"phone<br><br>Tap on the screen to start"
152"phone<br><br>Tap on the screen to start"
133msgstr ""
153msgstr ""
134
154
135−#: qml/Components/Lockscreen.qml:167
155+#: qml/Components/Lockscreen.qml:220
136−msgid "Please wait"
137−msgstr ""
138−
139−#: qml/Components/Lockscreen.qml:172
140−msgid "Too many incorrect attempts"
141−msgstr ""
142−
143−#: qml/Components/Lockscreen.qml:206
144msgid "Emergency Call"
156msgid "Emergency Call"
145msgstr ""
157msgstr ""
146
158
147−#: qml/Components/Lockscreen.qml:226
159+#: qml/Components/Lockscreen.qml:252
148msgid "OK"
160msgid "OK"
149msgstr ""
161msgstr ""
150
162
151−#: qml/Components/PassphraseLockscreen.qml:61
152−#, qt-format
153−msgid "Hello %1"
154−msgstr ""
155−
156−#: qml/Components/PassphraseLockscreen.qml:61
157−msgid "Hello"
158−msgstr ""
159−
160−#: qml/Dash/GenericScopeView.qml:411 qml/Dash/GenericScopeView.qml:533
163+#: qml/Dash/GenericScopeView.qml:434 qml/Dash/GenericScopeView.qml:591
161msgid "See less"
164msgid "See less"
162msgstr ""
165msgstr ""
163
166
164−#: qml/Dash/GenericScopeView.qml:411
167+#: qml/Dash/GenericScopeView.qml:434
165msgid "See all"
168msgid "See all"
166msgstr ""
169msgstr ""
167
170
168−#: qml/Dash/GenericScopeView.qml:473 qml/Dash/PageHeader.qml:258
171+#: qml/Dash/GenericScopeView.qml:496 qml/Dash/PageHeader.qml:258
169#: qml/Panel/SearchIndicator.qml:27
172#: qml/Panel/SearchIndicator.qml:27
170msgid "Search"
173msgid "Search"
171msgstr "Издөө"
174msgstr "Издөө"
@@ -202,6 +205,14 @@ msgstr ""
202msgid "Send"
205msgid "Send"
203msgstr ""
206msgstr ""
204
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+
205#: qml/Dash/ScopesOverview.qml:206
216#: qml/Dash/ScopesOverview.qml:206
206msgid "Manage Scopes"
217msgid "Manage Scopes"
207msgstr ""
218msgstr ""
@@ -223,7 +234,7 @@ msgid "All"
223msgstr ""
234msgstr ""
224
235
225#: qml/Greeter/Greeter.qml:157
236#: qml/Greeter/Greeter.qml:157
226−msgid "Swipe to unlock"
237+msgid "Unlock"
227msgstr ""
238msgstr ""
228
239
229#: qml/Hud/HudParametrizedActionsPage.qml:139
240#: qml/Hud/HudParametrizedActionsPage.qml:139
@@ -246,18 +257,10 @@ msgstr "Азыр сүйлөңүз..."
246msgid "Speaking..."
257msgid "Speaking..."
247msgstr "Сүйлөнүүдө..."
258msgstr "Сүйлөнүүдө..."
248
259
249−#: qml/Notifications/NotificationMenuItemFactory.qml:108
260+#: qml/Notifications/NotificationMenuItemFactory.qml:116
250msgid "Show password"
261msgid "Show password"
251msgstr ""
262msgstr ""
252
263
253−#: qml/Notifications/NotificationMenuItemFactory.qml:124
254−msgid "Enter SIM PIN"
255−msgstr ""
256−
257−#: qml/Notifications/NotificationMenuItemFactory.qml:125
258−msgid "Sorry, incorrect PIN"
259−msgstr ""
260−
261#: qml/Panel/ActiveCallHint.qml:77
264#: qml/Panel/ActiveCallHint.qml:77
262msgid "Tap to return to call..."
265msgid "Tap to return to call..."
263msgstr ""
266msgstr ""
@@ -302,51 +305,55 @@ msgstr ""
302msgid "Roaming"
305msgid "Roaming"
303msgstr ""
306msgstr ""
304
307
305−#: qml/Shell.qml:320
308+#: qml/Shell.qml:346
306−msgid "Enter your passphrase"
309+msgid "Enter passphrase"
307msgstr ""
310msgstr ""
308
311
309−#: qml/Shell.qml:321
312+#: qml/Shell.qml:347
310msgid "Sorry, incorrect passphrase"
313msgid "Sorry, incorrect passphrase"
311msgstr ""
314msgstr ""
312
315
313−#: qml/Shell.qml:323
316+#: qml/Shell.qml:348
317+msgid "Please re-enter"
318+msgstr ""
319+
320+#: qml/Shell.qml:350
314−msgid "Enter your passcode"
321+msgid "Enter passcode"
315msgstr ""
322msgstr ""
316
323
317−#: qml/Shell.qml:324
324+#: qml/Shell.qml:351
318msgid "Sorry, incorrect passcode"
325msgid "Sorry, incorrect passcode"
319msgstr ""
326msgstr ""
320
327
321−#: qml/Shell.qml:327
328+#: qml/Shell.qml:354
322#, qt-format
329#, qt-format
323−msgid "Enter your %1"
330+msgid "Enter %1"
324msgstr ""
331msgstr ""
325
332
326−#: qml/Shell.qml:328
333+#: qml/Shell.qml:355
327#, qt-format
334#, qt-format
328msgid "Sorry, incorrect %1"
335msgid "Sorry, incorrect %1"
329msgstr ""
336msgstr ""
330
337
331−#: qml/Shell.qml:363
338+#: qml/Shell.qml:390
332msgid "Sorry, incorrect passphrase."
339msgid "Sorry, incorrect passphrase."
333msgstr ""
340msgstr ""
334
341
335−#: qml/Shell.qml:364
342+#: qml/Shell.qml:391
336msgid "Sorry, incorrect passcode."
343msgid "Sorry, incorrect passcode."
337msgstr ""
344msgstr ""
338
345
339−#: qml/Shell.qml:365
346+#: qml/Shell.qml:392
340msgid "This will be your last attempt."
347msgid "This will be your last attempt."
341msgstr ""
348msgstr ""
342
349
343−#: qml/Shell.qml:367
350+#: qml/Shell.qml:394
344msgid ""
351msgid ""
345"If passphrase is entered incorrectly, your phone will conduct a factory "
352"If passphrase is entered incorrectly, your phone will conduct a factory "
346"reset and all personal data will be deleted."
353"reset and all personal data will be deleted."
347msgstr ""
354msgstr ""
348
355
349−#: qml/Shell.qml:368
356+#: qml/Shell.qml:395
350msgid ""
357msgid ""
351"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 "
352"and all personal data will be deleted."
359"and all personal data will be deleted."
po/lo.po+55−48
@@ -7,14 +7,15 @@ msgid ""
7msgstr ""
7msgstr ""
8"Project-Id-Version: unity8\n"
8"Project-Id-Version: unity8\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2014-09-24 10:43+0100\n"
10+"POT-Creation-Date: 2014-10-07 11:37+0300\n"
11"PO-Revision-Date: 2013-10-02 10:00+0000\n"
11"PO-Revision-Date: 2013-10-02 10:00+0000\n"
12"Last-Translator: Anousak <anousak@gmail.com>\n"
12"Last-Translator: Anousak <anousak@gmail.com>\n"
13"Language-Team: Lao <lo@li.org>\n"
13"Language-Team: Lao <lo@li.org>\n"
14"MIME-Version: 1.0\n"
14"MIME-Version: 1.0\n"
15"Content-Type: text/plain; charset=UTF-8\n"
15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n"
16"Content-Transfer-Encoding: 8bit\n"
17+"Plural-Forms: nplurals=1; plural=0;\n"
17−"X-Launchpad-Export-Date: 2014-09-29 05:19+0000\n"
18+"X-Launchpad-Export-Date: 2014-10-09 06:36+0000\n"
18"X-Generator: Launchpad (build 17196)\n"
19"X-Generator: Launchpad (build 17196)\n"
19
20
20#: plugins/LightDM/Greeter.cpp:130
21#: plugins/LightDM/Greeter.cpp:130
@@ -30,6 +31,25 @@ msgstr ""
30msgid "Unpin shortcut"
31msgid "Unpin shortcut"
31msgstr ""
32msgstr ""
32
33
34+#: qml/Components/DelayedLockscreen.qml:47
35+msgid "Device Locked"
36+msgstr ""
37+
38+#: qml/Components/DelayedLockscreen.qml:62
39+msgid "You have been locked out due to too many failed passphrase attempts."
40+msgstr ""
41+
42+#: qml/Components/DelayedLockscreen.qml:63
43+msgid "You have been locked out due to too many failed passcode attempts."
44+msgstr ""
45+
46+#: qml/Components/DelayedLockscreen.qml:72
47+#, qt-format
48+msgid "Please wait %1 minute and then try again…"
49+msgid_plural "Please wait %1 minutes and then try again…"
50+msgstr[0] ""
51+msgstr[1] ""
52+
33#: qml/Components/Dialogs.qml:70
53#: qml/Components/Dialogs.qml:70
34msgid "Log out"
54msgid "Log out"
35msgstr ""
55msgstr ""
@@ -132,40 +152,23 @@ msgid ""
132"phone<br><br>Tap on the screen to start"
152"phone<br><br>Tap on the screen to start"
133msgstr ""
153msgstr ""
134
154
135−#: qml/Components/Lockscreen.qml:167
155+#: qml/Components/Lockscreen.qml:220
136−msgid "Please wait"
137−msgstr ""
138−
139−#: qml/Components/Lockscreen.qml:172
140−msgid "Too many incorrect attempts"
141−msgstr ""
142−
143−#: qml/Components/Lockscreen.qml:206
144msgid "Emergency Call"
156msgid "Emergency Call"
145msgstr ""
157msgstr ""
146
158
147−#: qml/Components/Lockscreen.qml:226
159+#: qml/Components/Lockscreen.qml:252
148msgid "OK"
160msgid "OK"
149msgstr ""
161msgstr ""
150
162
151−#: qml/Components/PassphraseLockscreen.qml:61
152−#, qt-format
153−msgid "Hello %1"
154−msgstr "ສະບາຍດີ %1"
155−
156−#: qml/Components/PassphraseLockscreen.qml:61
157−msgid "Hello"
158−msgstr "ສະບາຍດີ"
159−
160−#: qml/Dash/GenericScopeView.qml:411 qml/Dash/GenericScopeView.qml:533
163+#: qml/Dash/GenericScopeView.qml:434 qml/Dash/GenericScopeView.qml:591
161msgid "See less"
164msgid "See less"
162msgstr ""
165msgstr ""
163
166
164−#: qml/Dash/GenericScopeView.qml:411
167+#: qml/Dash/GenericScopeView.qml:434
165msgid "See all"
168msgid "See all"
166msgstr ""
169msgstr ""
167
170
168−#: qml/Dash/GenericScopeView.qml:473 qml/Dash/PageHeader.qml:258
171+#: qml/Dash/GenericScopeView.qml:496 qml/Dash/PageHeader.qml:258
169#: qml/Panel/SearchIndicator.qml:27
172#: qml/Panel/SearchIndicator.qml:27
170msgid "Search"
173msgid "Search"
171msgstr "ຊອກຫາ"
174msgstr "ຊອກຫາ"
@@ -202,6 +205,14 @@ msgstr ""
202msgid "Send"
205msgid "Send"
203msgstr "ສົ່ງ"
206msgstr "ສົ່ງ"
204
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+
205#: qml/Dash/ScopesOverview.qml:206
216#: qml/Dash/ScopesOverview.qml:206
206msgid "Manage Scopes"
217msgid "Manage Scopes"
207msgstr ""
218msgstr ""
@@ -223,7 +234,7 @@ msgid "All"
223msgstr ""
234msgstr ""
224
235
225#: qml/Greeter/Greeter.qml:157
236#: qml/Greeter/Greeter.qml:157
226−msgid "Swipe to unlock"
237+msgid "Unlock"
227msgstr ""
238msgstr ""
228
239
229#: qml/Hud/HudParametrizedActionsPage.qml:139
240#: qml/Hud/HudParametrizedActionsPage.qml:139
@@ -246,18 +257,10 @@ msgstr "ເວົ້າໂລດ"
246msgid "Speaking..."
257msgid "Speaking..."
247msgstr "ກໍາລັງເວົ້າ"
258msgstr "ກໍາລັງເວົ້າ"
248
259
249−#: qml/Notifications/NotificationMenuItemFactory.qml:108
260+#: qml/Notifications/NotificationMenuItemFactory.qml:116
250msgid "Show password"
261msgid "Show password"
251msgstr ""
262msgstr ""
252
263
253−#: qml/Notifications/NotificationMenuItemFactory.qml:124
254−msgid "Enter SIM PIN"
255−msgstr ""
256−
257−#: qml/Notifications/NotificationMenuItemFactory.qml:125
258−msgid "Sorry, incorrect PIN"
259−msgstr ""
260−
261#: qml/Panel/ActiveCallHint.qml:77
264#: qml/Panel/ActiveCallHint.qml:77
262msgid "Tap to return to call..."
265msgid "Tap to return to call..."
263msgstr ""
266msgstr ""
@@ -302,51 +305,55 @@ msgstr ""
302msgid "Roaming"
305msgid "Roaming"
303msgstr ""
306msgstr ""
304
307
305−#: qml/Shell.qml:320
308+#: qml/Shell.qml:346
306−msgid "Enter your passphrase"
309+msgid "Enter passphrase"
307msgstr ""
310msgstr ""
308
311
309−#: qml/Shell.qml:321
312+#: qml/Shell.qml:347
310msgid "Sorry, incorrect passphrase"
313msgid "Sorry, incorrect passphrase"
311msgstr ""
314msgstr ""
312
315
313−#: qml/Shell.qml:323
316+#: qml/Shell.qml:348
317+msgid "Please re-enter"
318+msgstr ""
319+
320+#: qml/Shell.qml:350
314−msgid "Enter your passcode"
321+msgid "Enter passcode"
315msgstr ""
322msgstr ""
316
323
317−#: qml/Shell.qml:324
324+#: qml/Shell.qml:351
318msgid "Sorry, incorrect passcode"
325msgid "Sorry, incorrect passcode"
319msgstr ""
326msgstr ""
320
327
321−#: qml/Shell.qml:327
328+#: qml/Shell.qml:354
322#, qt-format
329#, qt-format
323−msgid "Enter your %1"
330+msgid "Enter %1"
324msgstr ""
331msgstr ""
325
332
326−#: qml/Shell.qml:328
333+#: qml/Shell.qml:355
327#, qt-format
334#, qt-format
328msgid "Sorry, incorrect %1"
335msgid "Sorry, incorrect %1"
329msgstr ""
336msgstr ""
330
337
331−#: qml/Shell.qml:363
338+#: qml/Shell.qml:390
332msgid "Sorry, incorrect passphrase."
339msgid "Sorry, incorrect passphrase."
333msgstr ""
340msgstr ""
334
341
335−#: qml/Shell.qml:364
342+#: qml/Shell.qml:391
336msgid "Sorry, incorrect passcode."
343msgid "Sorry, incorrect passcode."
337msgstr ""
344msgstr ""
338
345
339−#: qml/Shell.qml:365
346+#: qml/Shell.qml:392
340msgid "This will be your last attempt."
347msgid "This will be your last attempt."
341msgstr ""
348msgstr ""
342
349
343−#: qml/Shell.qml:367
350+#: qml/Shell.qml:394
344msgid ""
351msgid ""
345"If passphrase is entered incorrectly, your phone will conduct a factory "
352"If passphrase is entered incorrectly, your phone will conduct a factory "
346"reset and all personal data will be deleted."
353"reset and all personal data will be deleted."
347msgstr ""
354msgstr ""
348
355
349−#: qml/Shell.qml:368
356+#: qml/Shell.qml:395
350msgid ""
357msgid ""
351"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 "
352"and all personal data will be deleted."
359"and all personal data will be deleted."
po/lt.po+57−49
@@ -7,14 +7,16 @@ msgid ""
7msgstr ""
7msgstr ""
8"Project-Id-Version: unity8\n"
8"Project-Id-Version: unity8\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2014-09-24 10:43+0100\n"
10+"POT-Creation-Date: 2014-10-07 11:37+0300\n"
11"PO-Revision-Date: 2014-05-19 17:15+0000\n"
11"PO-Revision-Date: 2014-05-19 17:15+0000\n"
12"Last-Translator: Mantas Kriaučiūnas <mantas@akl.lt>\n"
12"Last-Translator: Mantas Kriaučiūnas <mantas@akl.lt>\n"
13"Language-Team: Lithuanian <lt@li.org>\n"
13"Language-Team: Lithuanian <lt@li.org>\n"
14"MIME-Version: 1.0\n"
14"MIME-Version: 1.0\n"
15"Content-Type: text/plain; charset=UTF-8\n"
15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n"
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"
17−"X-Launchpad-Export-Date: 2014-09-29 05:19+0000\n"
19+"X-Launchpad-Export-Date: 2014-10-09 06:36+0000\n"
18"X-Generator: Launchpad (build 17196)\n"
20"X-Generator: Launchpad (build 17196)\n"
19
21
20#: plugins/LightDM/Greeter.cpp:130
22#: plugins/LightDM/Greeter.cpp:130
@@ -30,6 +32,25 @@ msgstr ""
30msgid "Unpin shortcut"
32msgid "Unpin shortcut"
31msgstr ""
33msgstr ""
32
34
35+#: qml/Components/DelayedLockscreen.qml:47
36+msgid "Device Locked"
37+msgstr ""
38+
39+#: qml/Components/DelayedLockscreen.qml:62
40+msgid "You have been locked out due to too many failed passphrase attempts."
41+msgstr ""
42+
43+#: qml/Components/DelayedLockscreen.qml:63
44+msgid "You have been locked out due to too many failed passcode attempts."
45+msgstr ""
46+
47+#: qml/Components/DelayedLockscreen.qml:72
48+#, qt-format
49+msgid "Please wait %1 minute and then try again…"
50+msgid_plural "Please wait %1 minutes and then try again…"
51+msgstr[0] ""
52+msgstr[1] ""
53+
33#: qml/Components/Dialogs.qml:70
54#: qml/Components/Dialogs.qml:70
34msgid "Log out"
55msgid "Log out"
35msgstr ""
56msgstr ""
@@ -135,40 +156,23 @@ msgid ""
135"phone<br><br>Tap on the screen to start"
156"phone<br><br>Tap on the screen to start"
136msgstr ""
157msgstr ""
137
158
138−#: qml/Components/Lockscreen.qml:167
159+#: qml/Components/Lockscreen.qml:220
139−msgid "Please wait"
140−msgstr ""
141−
142−#: qml/Components/Lockscreen.qml:172
143−msgid "Too many incorrect attempts"
144−msgstr ""
145−
146−#: qml/Components/Lockscreen.qml:206
147msgid "Emergency Call"
160msgid "Emergency Call"
148msgstr "Pagalbos skambutis"
161msgstr "Pagalbos skambutis"
149
162
150−#: qml/Components/Lockscreen.qml:226
163+#: qml/Components/Lockscreen.qml:252
151msgid "OK"
164msgid "OK"
152msgstr ""
165msgstr ""
153
166
154−#: qml/Components/PassphraseLockscreen.qml:61
155−#, qt-format
156−msgid "Hello %1"
157−msgstr "Laba diena, %1"
158−
159−#: qml/Components/PassphraseLockscreen.qml:61
160−msgid "Hello"
161−msgstr "Sveiki"
162−
163−#: qml/Dash/GenericScopeView.qml:411 qml/Dash/GenericScopeView.qml:533
167+#: qml/Dash/GenericScopeView.qml:434 qml/Dash/GenericScopeView.qml:591
164msgid "See less"
168msgid "See less"
165msgstr ""
169msgstr ""
166
170
167−#: qml/Dash/GenericScopeView.qml:411
171+#: qml/Dash/GenericScopeView.qml:434
168msgid "See all"
172msgid "See all"
169msgstr ""
173msgstr ""
170
174
171−#: qml/Dash/GenericScopeView.qml:473 qml/Dash/PageHeader.qml:258
175+#: qml/Dash/GenericScopeView.qml:496 qml/Dash/PageHeader.qml:258
172#: qml/Panel/SearchIndicator.qml:27
176#: qml/Panel/SearchIndicator.qml:27
173msgid "Search"
177msgid "Search"
174msgstr "Paieška"
178msgstr "Paieška"
@@ -205,6 +209,14 @@ msgstr "Pridėkite apžvalgą"
205msgid "Send"
209msgid "Send"
206msgstr "Siųsti"
210msgstr "Siųsti"
207
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+
208#: qml/Dash/ScopesOverview.qml:206
220#: qml/Dash/ScopesOverview.qml:206
209msgid "Manage Scopes"
221msgid "Manage Scopes"
210msgstr ""
222msgstr ""
@@ -226,8 +238,8 @@ msgid "All"
226msgstr ""
238msgstr ""
227
239
228#: qml/Greeter/Greeter.qml:157
240#: qml/Greeter/Greeter.qml:157
229−msgid "Swipe to unlock"
241+msgid "Unlock"
230−msgstr "Braukite ir atrakinsite"
242+msgstr ""
231
243
232#: qml/Hud/HudParametrizedActionsPage.qml:139
244#: qml/Hud/HudParametrizedActionsPage.qml:139
233msgid "Confirm"
245msgid "Confirm"
@@ -249,18 +261,10 @@ msgstr "Kalbėkite..."
249msgid "Speaking..."
261msgid "Speaking..."
250msgstr "Kalbama..."
262msgstr "Kalbama..."
251
263
252−#: qml/Notifications/NotificationMenuItemFactory.qml:108
264+#: qml/Notifications/NotificationMenuItemFactory.qml:116
253msgid "Show password"
265msgid "Show password"
254msgstr "Rodyti slaptažodį"
266msgstr "Rodyti slaptažodį"
255
267
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
268#: qml/Panel/ActiveCallHint.qml:77
265msgid "Tap to return to call..."
269msgid "Tap to return to call..."
266msgstr ""
270msgstr ""
@@ -305,51 +309,55 @@ msgstr ""
305msgid "Roaming"
309msgid "Roaming"
306msgstr ""
310msgstr ""
307
311
308−#: qml/Shell.qml:320
312+#: qml/Shell.qml:346
309−msgid "Enter your passphrase"
313+msgid "Enter passphrase"
310msgstr ""
314msgstr ""
311
315
312−#: qml/Shell.qml:321
316+#: qml/Shell.qml:347
313msgid "Sorry, incorrect passphrase"
317msgid "Sorry, incorrect passphrase"
314msgstr ""
318msgstr ""
315
319
316−#: qml/Shell.qml:323
320+#: qml/Shell.qml:348
321+msgid "Please re-enter"
322+msgstr ""
323+
324+#: qml/Shell.qml:350
317−msgid "Enter your passcode"
325+msgid "Enter passcode"
318msgstr ""
326msgstr ""
319
327
320−#: qml/Shell.qml:324
328+#: qml/Shell.qml:351
321msgid "Sorry, incorrect passcode"
329msgid "Sorry, incorrect passcode"
322msgstr ""
330msgstr ""
323
331
324−#: qml/Shell.qml:327
332+#: qml/Shell.qml:354
325#, qt-format
333#, qt-format
326−msgid "Enter your %1"
334+msgid "Enter %1"
327msgstr ""
335msgstr ""
328
336
329−#: qml/Shell.qml:328
337+#: qml/Shell.qml:355
330#, qt-format
338#, qt-format
331msgid "Sorry, incorrect %1"
339msgid "Sorry, incorrect %1"
332msgstr ""
340msgstr ""
333
341
334−#: qml/Shell.qml:363
342+#: qml/Shell.qml:390
335msgid "Sorry, incorrect passphrase."
343msgid "Sorry, incorrect passphrase."
336msgstr ""
344msgstr ""
337
345
338−#: qml/Shell.qml:364
346+#: qml/Shell.qml:391
339msgid "Sorry, incorrect passcode."
347msgid "Sorry, incorrect passcode."
340msgstr ""
348msgstr ""
341
349
342−#: qml/Shell.qml:365
350+#: qml/Shell.qml:392
343msgid "This will be your last attempt."
351msgid "This will be your last attempt."
344msgstr ""
352msgstr ""
345
353
346−#: qml/Shell.qml:367
354+#: qml/Shell.qml:394
347msgid ""
355msgid ""
348"If passphrase is entered incorrectly, your phone will conduct a factory "
356"If passphrase is entered incorrectly, your phone will conduct a factory "
349"reset and all personal data will be deleted."
357"reset and all personal data will be deleted."
350msgstr ""
358msgstr ""
351
359
352−#: qml/Shell.qml:368
360+#: qml/Shell.qml:395
353msgid ""
361msgid ""
354"If passcode is entered incorrectly, your phone will conduct a factory reset "
362"If passcode is entered incorrectly, your phone will conduct a factory reset "
355"and all personal data will be deleted."
363"and all personal data will be deleted."
po/lv.po+59−49
@@ -7,14 +7,15 @@ msgid ""
7msgstr ""
7msgstr ""
8"Project-Id-Version: unity\n"
8"Project-Id-Version: unity\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2014-09-24 10:43+0100\n"
10+"POT-Creation-Date: 2014-10-07 11:37+0300\n"
11"PO-Revision-Date: 2014-08-21 09:46+0000\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"
12"Last-Translator: Jānis-Marks Gailis <jm-gailis@fai-vianet.fr>\n"
13"Language-Team: Latvian <lv@li.org>\n"
13"Language-Team: Latvian <lv@li.org>\n"
14"MIME-Version: 1.0\n"
14"MIME-Version: 1.0\n"
15"Content-Type: text/plain; charset=UTF-8\n"
15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\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"
17−"X-Launchpad-Export-Date: 2014-09-29 05:19+0000\n"
18+"X-Launchpad-Export-Date: 2014-10-09 06:36+0000\n"
18"X-Generator: Launchpad (build 17196)\n"
19"X-Generator: Launchpad (build 17196)\n"
19
20
20#: plugins/LightDM/Greeter.cpp:130
21#: plugins/LightDM/Greeter.cpp:130
@@ -30,6 +31,25 @@ msgstr ""
30msgid "Unpin shortcut"
31msgid "Unpin shortcut"
31msgstr ""
32msgstr ""
32
33
34+#: qml/Components/DelayedLockscreen.qml:47
35+msgid "Device Locked"
36+msgstr ""
37+
38+#: qml/Components/DelayedLockscreen.qml:62
39+msgid "You have been locked out due to too many failed passphrase attempts."
40+msgstr ""
41+
42+#: qml/Components/DelayedLockscreen.qml:63
43+msgid "You have been locked out due to too many failed passcode attempts."
44+msgstr ""
45+
46+#: qml/Components/DelayedLockscreen.qml:72
47+#, qt-format
48+msgid "Please wait %1 minute and then try again…"
49+msgid_plural "Please wait %1 minutes and then try again…"
50+msgstr[0] ""
51+msgstr[1] ""
52+
33#: qml/Components/Dialogs.qml:70
53#: qml/Components/Dialogs.qml:70
34msgid "Log out"
54msgid "Log out"
35msgstr "Iziet"
55msgstr "Iziet"
@@ -132,40 +152,23 @@ msgid ""
132"phone<br><br>Tap on the screen to start"
152"phone<br><br>Tap on the screen to start"
133msgstr ""
153msgstr ""
134
154
135−#: qml/Components/Lockscreen.qml:167
155+#: qml/Components/Lockscreen.qml:220
136−msgid "Please wait"
137−msgstr "Lūdzu, uzgaidiet"
138−
139−#: qml/Components/Lockscreen.qml:172
140−msgid "Too many incorrect attempts"
141−msgstr ""
142−
143−#: qml/Components/Lockscreen.qml:206
144msgid "Emergency Call"
156msgid "Emergency Call"
145msgstr "Neatliekamās Palīdzības zvans"
157msgstr "Neatliekamās Palīdzības zvans"
146
158
147−#: qml/Components/Lockscreen.qml:226
159+#: qml/Components/Lockscreen.qml:252
148msgid "OK"
160msgid "OK"
149msgstr "LABI"
161msgstr "LABI"
150
162
151−#: qml/Components/PassphraseLockscreen.qml:61
152−#, qt-format
153−msgid "Hello %1"
154−msgstr "Sveiki, %1"
155−
156−#: qml/Components/PassphraseLockscreen.qml:61
157−msgid "Hello"
158−msgstr "Sveiki"
159−
160−#: qml/Dash/GenericScopeView.qml:411 qml/Dash/GenericScopeView.qml:533
163+#: qml/Dash/GenericScopeView.qml:434 qml/Dash/GenericScopeView.qml:591
161msgid "See less"
164msgid "See less"
162msgstr "Redzēt mazāk"
165msgstr "Redzēt mazāk"
163
166
164−#: qml/Dash/GenericScopeView.qml:411
167+#: qml/Dash/GenericScopeView.qml:434
165msgid "See all"
168msgid "See all"
166msgstr "Skatīt visus"
169msgstr "Skatīt visus"
167
170
168−#: qml/Dash/GenericScopeView.qml:473 qml/Dash/PageHeader.qml:258
171+#: qml/Dash/GenericScopeView.qml:496 qml/Dash/PageHeader.qml:258
169#: qml/Panel/SearchIndicator.qml:27
172#: qml/Panel/SearchIndicator.qml:27
170msgid "Search"
173msgid "Search"
171msgstr "Meklēt"
174msgstr "Meklēt"
@@ -202,6 +205,14 @@ msgstr "Komentēt"
202msgid "Send"
205msgid "Send"
203msgstr "Sūtīt"
206msgstr "Sūtīt"
204
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+
205#: qml/Dash/ScopesOverview.qml:206
216#: qml/Dash/ScopesOverview.qml:206
206msgid "Manage Scopes"
217msgid "Manage Scopes"
207msgstr ""
218msgstr ""
@@ -223,7 +234,7 @@ msgid "All"
223msgstr "Visi"
234msgstr "Visi"
224
235
225#: qml/Greeter/Greeter.qml:157
236#: qml/Greeter/Greeter.qml:157
226−msgid "Swipe to unlock"
237+msgid "Unlock"
227msgstr ""
238msgstr ""
228
239
229#: qml/Hud/HudParametrizedActionsPage.qml:139
240#: qml/Hud/HudParametrizedActionsPage.qml:139
@@ -246,18 +257,10 @@ msgstr "Runajiet Tagad"
246msgid "Speaking..."
257msgid "Speaking..."
247msgstr "Runa..."
258msgstr "Runa..."
248
259
249−#: qml/Notifications/NotificationMenuItemFactory.qml:108
260+#: qml/Notifications/NotificationMenuItemFactory.qml:116
250msgid "Show password"
261msgid "Show password"
251msgstr "Rādīt paroli"
262msgstr "Rādīt paroli"
252
263
253−#: qml/Notifications/NotificationMenuItemFactory.qml:124
254−msgid "Enter SIM PIN"
255−msgstr "Ievadiet SIM PIN"
256−
257−#: qml/Notifications/NotificationMenuItemFactory.qml:125
258−msgid "Sorry, incorrect PIN"
259−msgstr ""
260−
261#: qml/Panel/ActiveCallHint.qml:77
264#: qml/Panel/ActiveCallHint.qml:77
262msgid "Tap to return to call..."
265msgid "Tap to return to call..."
263msgstr ""
266msgstr ""
@@ -302,52 +305,59 @@ msgstr "Atbloķēt SIM"
302msgid "Roaming"
305msgid "Roaming"
303msgstr "Viesabonēšana"
306msgstr "Viesabonēšana"
304
307
305−#: qml/Shell.qml:320
308+#: qml/Shell.qml:346
306−msgid "Enter your passphrase"
309+msgid "Enter passphrase"
307msgstr ""
310msgstr ""
308
311
309−#: qml/Shell.qml:321
312+#: qml/Shell.qml:347
310msgid "Sorry, incorrect passphrase"
313msgid "Sorry, incorrect passphrase"
311msgstr ""
314msgstr ""
312
315
313−#: qml/Shell.qml:323
316+#: qml/Shell.qml:348
317+msgid "Please re-enter"
318+msgstr ""
319+
320+#: qml/Shell.qml:350
314−msgid "Enter your passcode"
321+msgid "Enter passcode"
315msgstr ""
322msgstr ""
316
323
317−#: qml/Shell.qml:324
324+#: qml/Shell.qml:351
318msgid "Sorry, incorrect passcode"
325msgid "Sorry, incorrect passcode"
319msgstr ""
326msgstr ""
320
327
321−#: qml/Shell.qml:327
328+#: qml/Shell.qml:354
322#, qt-format
329#, qt-format
323−msgid "Enter your %1"
330+msgid "Enter %1"
324−msgstr "Ievadiet jūsu %1"
331+msgstr ""
325
332
326−#: qml/Shell.qml:328
333+#: qml/Shell.qml:355
327#, qt-format
334#, qt-format
328msgid "Sorry, incorrect %1"
335msgid "Sorry, incorrect %1"
329msgstr ""
336msgstr ""
330
337
331−#: qml/Shell.qml:363
338+#: qml/Shell.qml:390
332msgid "Sorry, incorrect passphrase."
339msgid "Sorry, incorrect passphrase."
333msgstr ""
340msgstr ""
334
341
335−#: qml/Shell.qml:364
342+#: qml/Shell.qml:391
336msgid "Sorry, incorrect passcode."
343msgid "Sorry, incorrect passcode."
337msgstr ""
344msgstr ""
338
345
339−#: qml/Shell.qml:365
346+#: qml/Shell.qml:392
340msgid "This will be your last attempt."
347msgid "This will be your last attempt."
341msgstr "Šīs būs jūs pēdējais mēģinājums."
348msgstr "Šīs būs jūs pēdējais mēģinājums."
342
349
343−#: qml/Shell.qml:367
350+#: qml/Shell.qml:394
344msgid ""
351msgid ""
345"If passphrase is entered incorrectly, your phone will conduct a factory "
352"If passphrase is entered incorrectly, your phone will conduct a factory "
346"reset and all personal data will be deleted."
353"reset and all personal data will be deleted."
347msgstr ""
354msgstr ""
348
355
349−#: qml/Shell.qml:368
356+#: qml/Shell.qml:395
350msgid ""
357msgid ""
351"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 "
352"and all personal data will be deleted."
359"and all personal data will be deleted."
353msgstr ""
360msgstr ""
361+
362+#~ msgid "Enter SIM PIN"
363+#~ msgstr "Ievadiet SIM PIN"
po/ml.po+55−48
@@ -7,14 +7,15 @@ msgid ""
7msgstr ""
7msgstr ""
8"Project-Id-Version: unity8\n"
8"Project-Id-Version: unity8\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2014-09-24 10:43+0100\n"
10+"POT-Creation-Date: 2014-10-07 11:37+0300\n"
11"PO-Revision-Date: 2013-11-23 11:44+0000\n"
11"PO-Revision-Date: 2013-11-23 11:44+0000\n"
12"Last-Translator: ST Alfas <Unknown>\n"
12"Last-Translator: ST Alfas <Unknown>\n"
13"Language-Team: Malayalam <ml@li.org>\n"
13"Language-Team: Malayalam <ml@li.org>\n"
14"MIME-Version: 1.0\n"
14"MIME-Version: 1.0\n"
15"Content-Type: text/plain; charset=UTF-8\n"
15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n"
16"Content-Transfer-Encoding: 8bit\n"
17+"Plural-Forms: nplurals=2; plural=n != 1;\n"
17−"X-Launchpad-Export-Date: 2014-09-29 05:19+0000\n"
18+"X-Launchpad-Export-Date: 2014-10-09 06:36+0000\n"
18"X-Generator: Launchpad (build 17196)\n"
19"X-Generator: Launchpad (build 17196)\n"
19
20
20#: plugins/LightDM/Greeter.cpp:130
21#: plugins/LightDM/Greeter.cpp:130
@@ -30,6 +31,25 @@ msgstr ""
30msgid "Unpin shortcut"
31msgid "Unpin shortcut"
31msgstr ""
32msgstr ""
32
33
34+#: qml/Components/DelayedLockscreen.qml:47
35+msgid "Device Locked"
36+msgstr ""
37+
38+#: qml/Components/DelayedLockscreen.qml:62
39+msgid "You have been locked out due to too many failed passphrase attempts."
40+msgstr ""
41+
42+#: qml/Components/DelayedLockscreen.qml:63
43+msgid "You have been locked out due to too many failed passcode attempts."
44+msgstr ""
45+
46+#: qml/Components/DelayedLockscreen.qml:72
47+#, qt-format
48+msgid "Please wait %1 minute and then try again…"
49+msgid_plural "Please wait %1 minutes and then try again…"
50+msgstr[0] ""
51+msgstr[1] ""
52+
33#: qml/Components/Dialogs.qml:70
53#: qml/Components/Dialogs.qml:70
34msgid "Log out"
54msgid "Log out"
35msgstr ""
55msgstr ""
@@ -134,40 +154,23 @@ msgid ""
134"phone<br><br>Tap on the screen to start"
154"phone<br><br>Tap on the screen to start"
135msgstr ""
155msgstr ""
136
156
137−#: qml/Components/Lockscreen.qml:167
157+#: qml/Components/Lockscreen.qml:220
138−msgid "Please wait"
139−msgstr ""
140−
141−#: qml/Components/Lockscreen.qml:172
142−msgid "Too many incorrect attempts"
143−msgstr ""
144−
145−#: qml/Components/Lockscreen.qml:206
146msgid "Emergency Call"
158msgid "Emergency Call"
147msgstr "അടിയന്തിര വിളി"
159msgstr "അടിയന്തിര വിളി"
148
160
149−#: qml/Components/Lockscreen.qml:226
161+#: qml/Components/Lockscreen.qml:252
150msgid "OK"
162msgid "OK"
151msgstr ""
163msgstr ""
152
164
153−#: qml/Components/PassphraseLockscreen.qml:61
154−#, qt-format
155−msgid "Hello %1"
156−msgstr "ഹലോ %1"
157−
158−#: qml/Components/PassphraseLockscreen.qml:61
159−msgid "Hello"
160−msgstr "ഹലോ"
161−
162−#: qml/Dash/GenericScopeView.qml:411 qml/Dash/GenericScopeView.qml:533
165+#: qml/Dash/GenericScopeView.qml:434 qml/Dash/GenericScopeView.qml:591
163msgid "See less"
166msgid "See less"
164msgstr ""
167msgstr ""
165
168
166−#: qml/Dash/GenericScopeView.qml:411
169+#: qml/Dash/GenericScopeView.qml:434
167msgid "See all"
170msgid "See all"
168msgstr ""
171msgstr ""
169
172
170−#: qml/Dash/GenericScopeView.qml:473 qml/Dash/PageHeader.qml:258
173+#: qml/Dash/GenericScopeView.qml:496 qml/Dash/PageHeader.qml:258
171#: qml/Panel/SearchIndicator.qml:27
174#: qml/Panel/SearchIndicator.qml:27
172msgid "Search"
175msgid "Search"
173msgstr "തിരയുക"
176msgstr "തിരയുക"
@@ -204,6 +207,14 @@ msgstr "ഒരു അവലോകനം ചേര്‍ക്കുക"
204msgid "Send"
207msgid "Send"
205msgstr "അയയ്‌ക്കുക"
208msgstr "അയയ്‌ക്കുക"
206
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+
207#: qml/Dash/ScopesOverview.qml:206
218#: qml/Dash/ScopesOverview.qml:206
208msgid "Manage Scopes"
219msgid "Manage Scopes"
209msgstr ""
220msgstr ""
@@ -225,7 +236,7 @@ msgid "All"
225msgstr ""
236msgstr ""
226
237
227#: qml/Greeter/Greeter.qml:157
238#: qml/Greeter/Greeter.qml:157
228−msgid "Swipe to unlock"
239+msgid "Unlock"
229msgstr ""
240msgstr ""
230
241
231#: qml/Hud/HudParametrizedActionsPage.qml:139
242#: qml/Hud/HudParametrizedActionsPage.qml:139
@@ -248,18 +259,10 @@ msgstr "ഇപ്പോള്‍ സംസാരിക്കുക..."
248msgid "Speaking..."
259msgid "Speaking..."
249msgstr "സംസാരിക്കുന്നു..."
260msgstr "സംസാരിക്കുന്നു..."
250
261
251−#: qml/Notifications/NotificationMenuItemFactory.qml:108
262+#: qml/Notifications/NotificationMenuItemFactory.qml:116
252msgid "Show password"
263msgid "Show password"
253msgstr "രഹസ്യവാക്ക് കാണിക്കുക"
264msgstr "രഹസ്യവാക്ക് കാണിക്കുക"
254
265
255−#: qml/Notifications/NotificationMenuItemFactory.qml:124
256−msgid "Enter SIM PIN"
257−msgstr ""
258−
259−#: qml/Notifications/NotificationMenuItemFactory.qml:125
260−msgid "Sorry, incorrect PIN"
261−msgstr ""
262−
263#: qml/Panel/ActiveCallHint.qml:77
266#: qml/Panel/ActiveCallHint.qml:77
264msgid "Tap to return to call..."
267msgid "Tap to return to call..."
265msgstr ""
268msgstr ""
@@ -304,51 +307,55 @@ msgstr ""
304msgid "Roaming"
307msgid "Roaming"
305msgstr ""
308msgstr ""
306
309
307−#: qml/Shell.qml:320
310+#: qml/Shell.qml:346
308−msgid "Enter your passphrase"
311+msgid "Enter passphrase"
309msgstr ""
312msgstr ""
310
313
311−#: qml/Shell.qml:321
314+#: qml/Shell.qml:347
312msgid "Sorry, incorrect passphrase"
315msgid "Sorry, incorrect passphrase"
313msgstr ""
316msgstr ""
314
317
315−#: qml/Shell.qml:323
318+#: qml/Shell.qml:348
319+msgid "Please re-enter"
320+msgstr ""
321+
322+#: qml/Shell.qml:350
316−msgid "Enter your passcode"
323+msgid "Enter passcode"
317msgstr ""
324msgstr ""
318
325
319−#: qml/Shell.qml:324
326+#: qml/Shell.qml:351
320msgid "Sorry, incorrect passcode"
327msgid "Sorry, incorrect passcode"
321msgstr ""
328msgstr ""
322
329
323−#: qml/Shell.qml:327
330+#: qml/Shell.qml:354
324#, qt-format
331#, qt-format
325−msgid "Enter your %1"
332+msgid "Enter %1"
326msgstr ""
333msgstr ""
327
334
328−#: qml/Shell.qml:328
335+#: qml/Shell.qml:355
329#, qt-format
336#, qt-format
330msgid "Sorry, incorrect %1"
337msgid "Sorry, incorrect %1"
331msgstr ""
338msgstr ""
332
339
333−#: qml/Shell.qml:363
340+#: qml/Shell.qml:390
334msgid "Sorry, incorrect passphrase."
341msgid "Sorry, incorrect passphrase."
335msgstr ""
342msgstr ""
336
343
337−#: qml/Shell.qml:364
344+#: qml/Shell.qml:391
338msgid "Sorry, incorrect passcode."
345msgid "Sorry, incorrect passcode."
339msgstr ""
346msgstr ""
340
347
341−#: qml/Shell.qml:365
348+#: qml/Shell.qml:392
342msgid "This will be your last attempt."
349msgid "This will be your last attempt."
343msgstr ""
350msgstr ""
344
351
345−#: qml/Shell.qml:367
352+#: qml/Shell.qml:394
346msgid ""
353msgid ""
347"If passphrase is entered incorrectly, your phone will conduct a factory "
354"If passphrase is entered incorrectly, your phone will conduct a factory "
348"reset and all personal data will be deleted."
355"reset and all personal data will be deleted."
349msgstr ""
356msgstr ""
350
357
351−#: qml/Shell.qml:368
358+#: qml/Shell.qml:395
352msgid ""
359msgid ""
353"If passcode is entered incorrectly, your phone will conduct a factory reset "
360"If passcode is entered incorrectly, your phone will conduct a factory reset "
354"and all personal data will be deleted."
361"and all personal data will be deleted."
po/mr.po+55−48
@@ -7,14 +7,15 @@ msgid ""
7msgstr ""
7msgstr ""
8"Project-Id-Version: unity8\n"
8"Project-Id-Version: unity8\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2014-09-24 10:43+0100\n"
10+"POT-Creation-Date: 2014-10-07 11:37+0300\n"
11"PO-Revision-Date: 2014-01-14 19:54+0000\n"
11"PO-Revision-Date: 2014-01-14 19:54+0000\n"
12"Last-Translator: Rohan Deshmukh <Unknown>\n"
12"Last-Translator: Rohan Deshmukh <Unknown>\n"
13"Language-Team: Marathi <mr@li.org>\n"
13"Language-Team: Marathi <mr@li.org>\n"
14"MIME-Version: 1.0\n"
14"MIME-Version: 1.0\n"
15"Content-Type: text/plain; charset=UTF-8\n"
15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n"
16"Content-Transfer-Encoding: 8bit\n"
17+"Plural-Forms: nplurals=2; plural=n != 1;\n"
17−"X-Launchpad-Export-Date: 2014-09-29 05:19+0000\n"
18+"X-Launchpad-Export-Date: 2014-10-09 06:36+0000\n"
18"X-Generator: Launchpad (build 17196)\n"
19"X-Generator: Launchpad (build 17196)\n"
19
20
20#: plugins/LightDM/Greeter.cpp:130
21#: plugins/LightDM/Greeter.cpp:130
@@ -30,6 +31,25 @@ msgstr ""
30msgid "Unpin shortcut"
31msgid "Unpin shortcut"
31msgstr ""
32msgstr ""
32
33
34+#: qml/Components/DelayedLockscreen.qml:47
35+msgid "Device Locked"
36+msgstr ""
37+
38+#: qml/Components/DelayedLockscreen.qml:62
39+msgid "You have been locked out due to too many failed passphrase attempts."
40+msgstr ""
41+
42+#: qml/Components/DelayedLockscreen.qml:63
43+msgid "You have been locked out due to too many failed passcode attempts."
44+msgstr ""
45+
46+#: qml/Components/DelayedLockscreen.qml:72
47+#, qt-format
48+msgid "Please wait %1 minute and then try again…"
49+msgid_plural "Please wait %1 minutes and then try again…"
50+msgstr[0] ""
51+msgstr[1] ""
52+
33#: qml/Components/Dialogs.qml:70
53#: qml/Components/Dialogs.qml:70
34msgid "Log out"
54msgid "Log out"
35msgstr ""
55msgstr ""
@@ -132,40 +152,23 @@ msgid ""
132"phone<br><br>Tap on the screen to start"
152"phone<br><br>Tap on the screen to start"
133msgstr ""
153msgstr ""
134
154
135−#: qml/Components/Lockscreen.qml:167
155+#: qml/Components/Lockscreen.qml:220
136−msgid "Please wait"
137−msgstr ""
138−
139−#: qml/Components/Lockscreen.qml:172
140−msgid "Too many incorrect attempts"
141−msgstr ""
142−
143−#: qml/Components/Lockscreen.qml:206
144msgid "Emergency Call"
156msgid "Emergency Call"
145msgstr ""
157msgstr ""
146
158
147−#: qml/Components/Lockscreen.qml:226
159+#: qml/Components/Lockscreen.qml:252
148msgid "OK"
160msgid "OK"
149msgstr ""
161msgstr ""
150
162
151−#: qml/Components/PassphraseLockscreen.qml:61
152−#, qt-format
153−msgid "Hello %1"
154−msgstr ""
155−
156−#: qml/Components/PassphraseLockscreen.qml:61
157−msgid "Hello"
158−msgstr ""
159−
160−#: qml/Dash/GenericScopeView.qml:411 qml/Dash/GenericScopeView.qml:533
163+#: qml/Dash/GenericScopeView.qml:434 qml/Dash/GenericScopeView.qml:591
161msgid "See less"
164msgid "See less"
162msgstr ""
165msgstr ""
163
166
164−#: qml/Dash/GenericScopeView.qml:411
167+#: qml/Dash/GenericScopeView.qml:434
165msgid "See all"
168msgid "See all"
166msgstr ""
169msgstr ""
167
170
168−#: qml/Dash/GenericScopeView.qml:473 qml/Dash/PageHeader.qml:258
171+#: qml/Dash/GenericScopeView.qml:496 qml/Dash/PageHeader.qml:258
169#: qml/Panel/SearchIndicator.qml:27
172#: qml/Panel/SearchIndicator.qml:27
170msgid "Search"
173msgid "Search"
171msgstr ""
174msgstr ""
@@ -202,6 +205,14 @@ msgstr ""
202msgid "Send"
205msgid "Send"
203msgstr ""
206msgstr ""
204
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+
205#: qml/Dash/ScopesOverview.qml:206
216#: qml/Dash/ScopesOverview.qml:206
206msgid "Manage Scopes"
217msgid "Manage Scopes"
207msgstr ""
218msgstr ""
@@ -223,7 +234,7 @@ msgid "All"
223msgstr ""
234msgstr ""
224
235
225#: qml/Greeter/Greeter.qml:157
236#: qml/Greeter/Greeter.qml:157
226−msgid "Swipe to unlock"
237+msgid "Unlock"
227msgstr ""
238msgstr ""
228
239
229#: qml/Hud/HudParametrizedActionsPage.qml:139
240#: qml/Hud/HudParametrizedActionsPage.qml:139
@@ -246,18 +257,10 @@ msgstr ""
246msgid "Speaking..."
257msgid "Speaking..."
247msgstr ""
258msgstr ""
248
259
249−#: qml/Notifications/NotificationMenuItemFactory.qml:108
260+#: qml/Notifications/NotificationMenuItemFactory.qml:116
250msgid "Show password"
261msgid "Show password"
251msgstr ""
262msgstr ""
252
263
253−#: qml/Notifications/NotificationMenuItemFactory.qml:124
254−msgid "Enter SIM PIN"
255−msgstr ""
256−
257−#: qml/Notifications/NotificationMenuItemFactory.qml:125
258−msgid "Sorry, incorrect PIN"
259−msgstr ""
260−
261#: qml/Panel/ActiveCallHint.qml:77
264#: qml/Panel/ActiveCallHint.qml:77
262msgid "Tap to return to call..."
265msgid "Tap to return to call..."
263msgstr ""
266msgstr ""
@@ -302,51 +305,55 @@ msgstr ""
302msgid "Roaming"
305msgid "Roaming"
303msgstr ""
306msgstr ""
304
307
305−#: qml/Shell.qml:320
308+#: qml/Shell.qml:346
306−msgid "Enter your passphrase"
309+msgid "Enter passphrase"
307msgstr ""
310msgstr ""
308
311
309−#: qml/Shell.qml:321
312+#: qml/Shell.qml:347
310msgid "Sorry, incorrect passphrase"
313msgid "Sorry, incorrect passphrase"
311msgstr ""
314msgstr ""
312
315
313−#: qml/Shell.qml:323
316+#: qml/Shell.qml:348
317+msgid "Please re-enter"
318+msgstr ""
319+
320+#: qml/Shell.qml:350
314−msgid "Enter your passcode"
321+msgid "Enter passcode"
315msgstr ""
322msgstr ""
316
323
317−#: qml/Shell.qml:324
324+#: qml/Shell.qml:351
318msgid "Sorry, incorrect passcode"
325msgid "Sorry, incorrect passcode"
319msgstr ""
326msgstr ""
320
327
321−#: qml/Shell.qml:327
328+#: qml/Shell.qml:354
322#, qt-format
329#, qt-format
323−msgid "Enter your %1"
330+msgid "Enter %1"
324msgstr ""
331msgstr ""
325
332
326−#: qml/Shell.qml:328
333+#: qml/Shell.qml:355
327#, qt-format
334#, qt-format
328msgid "Sorry, incorrect %1"
335msgid "Sorry, incorrect %1"
329msgstr ""
336msgstr ""
330
337
331−#: qml/Shell.qml:363
338+#: qml/Shell.qml:390
332msgid "Sorry, incorrect passphrase."
339msgid "Sorry, incorrect passphrase."
333msgstr ""
340msgstr ""
334
341
335−#: qml/Shell.qml:364
342+#: qml/Shell.qml:391
336msgid "Sorry, incorrect passcode."
343msgid "Sorry, incorrect passcode."
337msgstr ""
344msgstr ""
338
345
339−#: qml/Shell.qml:365
346+#: qml/Shell.qml:392
340msgid "This will be your last attempt."
347msgid "This will be your last attempt."
341msgstr ""
348msgstr ""
342
349
343−#: qml/Shell.qml:367
350+#: qml/Shell.qml:394
344msgid ""
351msgid ""
345"If passphrase is entered incorrectly, your phone will conduct a factory "
352"If passphrase is entered incorrectly, your phone will conduct a factory "
346"reset and all personal data will be deleted."
353"reset and all personal data will be deleted."
347msgstr ""
354msgstr ""
348
355
349−#: qml/Shell.qml:368
356+#: qml/Shell.qml:395
350msgid ""
357msgid ""
351"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 "
352"and all personal data will be deleted."
359"and all personal data will be deleted."
po/ms.po+55−48
@@ -7,14 +7,15 @@ msgid ""
7msgstr ""
7msgstr ""
8"Project-Id-Version: unity8\n"
8"Project-Id-Version: unity8\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2014-09-24 10:43+0100\n"
10+"POT-Creation-Date: 2014-10-07 11:37+0300\n"
11"PO-Revision-Date: 2014-01-17 09:05+0000\n"
11"PO-Revision-Date: 2014-01-17 09:05+0000\n"
12"Last-Translator: abuyop <Unknown>\n"
12"Last-Translator: abuyop <Unknown>\n"
13"Language-Team: Malay <ms@li.org>\n"
13"Language-Team: Malay <ms@li.org>\n"
14"MIME-Version: 1.0\n"
14"MIME-Version: 1.0\n"
15"Content-Type: text/plain; charset=UTF-8\n"
15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n"
16"Content-Transfer-Encoding: 8bit\n"
17+"Plural-Forms: nplurals=2; plural=n != 1;\n"
17−"X-Launchpad-Export-Date: 2014-09-29 05:19+0000\n"
18+"X-Launchpad-Export-Date: 2014-10-09 06:36+0000\n"
18"X-Generator: Launchpad (build 17196)\n"
19"X-Generator: Launchpad (build 17196)\n"
19
20
20#: plugins/LightDM/Greeter.cpp:130
21#: plugins/LightDM/Greeter.cpp:130
@@ -30,6 +31,25 @@ msgstr ""
30msgid "Unpin shortcut"
31msgid "Unpin shortcut"
31msgstr ""
32msgstr ""
32
33
34+#: qml/Components/DelayedLockscreen.qml:47
35+msgid "Device Locked"
36+msgstr ""
37+
38+#: qml/Components/DelayedLockscreen.qml:62
39+msgid "You have been locked out due to too many failed passphrase attempts."
40+msgstr ""
41+
42+#: qml/Components/DelayedLockscreen.qml:63
43+msgid "You have been locked out due to too many failed passcode attempts."
44+msgstr ""
45+
46+#: qml/Components/DelayedLockscreen.qml:72
47+#, qt-format
48+msgid "Please wait %1 minute and then try again…"
49+msgid_plural "Please wait %1 minutes and then try again…"
50+msgstr[0] ""
51+msgstr[1] ""
52+
33#: qml/Components/Dialogs.qml:70
53#: qml/Components/Dialogs.qml:70
34msgid "Log out"
54msgid "Log out"
35msgstr ""
55msgstr ""
@@ -132,40 +152,23 @@ msgid ""
132"phone<br><br>Tap on the screen to start"
152"phone<br><br>Tap on the screen to start"
133msgstr ""
153msgstr ""
134
154
135−#: qml/Components/Lockscreen.qml:167
155+#: qml/Components/Lockscreen.qml:220
136−msgid "Please wait"
137−msgstr ""
138−
139−#: qml/Components/Lockscreen.qml:172
140−msgid "Too many incorrect attempts"
141−msgstr ""
142−
143−#: qml/Components/Lockscreen.qml:206
144msgid "Emergency Call"
156msgid "Emergency Call"
145msgstr "panggilan Kecemasan"
157msgstr "panggilan Kecemasan"
146
158
147−#: qml/Components/Lockscreen.qml:226
159+#: qml/Components/Lockscreen.qml:252
148msgid "OK"
160msgid "OK"
149msgstr ""
161msgstr ""
150
162
151−#: qml/Components/PassphraseLockscreen.qml:61
152−#, qt-format
153−msgid "Hello %1"
154−msgstr "Hai %1"
155−
156−#: qml/Components/PassphraseLockscreen.qml:61
157−msgid "Hello"
158−msgstr "Hello"
159−
160−#: qml/Dash/GenericScopeView.qml:411 qml/Dash/GenericScopeView.qml:533
163+#: qml/Dash/GenericScopeView.qml:434 qml/Dash/GenericScopeView.qml:591
161msgid "See less"
164msgid "See less"
162msgstr ""
165msgstr ""
163
166
164−#: qml/Dash/GenericScopeView.qml:411
167+#: qml/Dash/GenericScopeView.qml:434
165msgid "See all"
168msgid "See all"
166msgstr ""
169msgstr ""
167
170
168−#: qml/Dash/GenericScopeView.qml:473 qml/Dash/PageHeader.qml:258
171+#: qml/Dash/GenericScopeView.qml:496 qml/Dash/PageHeader.qml:258
169#: qml/Panel/SearchIndicator.qml:27
172#: qml/Panel/SearchIndicator.qml:27
170msgid "Search"
173msgid "Search"
171msgstr "Gelintar"
174msgstr "Gelintar"
@@ -202,6 +205,14 @@ msgstr "Tambah ulasan"
202msgid "Send"
205msgid "Send"
203msgstr "Hantar"
206msgstr "Hantar"
204
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+
205#: qml/Dash/ScopesOverview.qml:206
216#: qml/Dash/ScopesOverview.qml:206
206msgid "Manage Scopes"
217msgid "Manage Scopes"
207msgstr ""
218msgstr ""
@@ -223,7 +234,7 @@ msgid "All"
223msgstr ""
234msgstr ""
224
235
225#: qml/Greeter/Greeter.qml:157
236#: qml/Greeter/Greeter.qml:157
226−msgid "Swipe to unlock"
237+msgid "Unlock"
227msgstr ""
238msgstr ""
228
239
229#: qml/Hud/HudParametrizedActionsPage.qml:139
240#: qml/Hud/HudParametrizedActionsPage.qml:139
@@ -246,18 +257,10 @@ msgstr "Cakap Sekarang..."
246msgid "Speaking..."
257msgid "Speaking..."
247msgstr "Bercakap..."
258msgstr "Bercakap..."
248
259
249−#: qml/Notifications/NotificationMenuItemFactory.qml:108
260+#: qml/Notifications/NotificationMenuItemFactory.qml:116
250msgid "Show password"
261msgid "Show password"
251msgstr "Tunjuk kata laluan"
262msgstr "Tunjuk kata laluan"
252
263
253−#: qml/Notifications/NotificationMenuItemFactory.qml:124
254−msgid "Enter SIM PIN"
255−msgstr ""
256−
257−#: qml/Notifications/NotificationMenuItemFactory.qml:125
258−msgid "Sorry, incorrect PIN"
259−msgstr ""
260−
261#: qml/Panel/ActiveCallHint.qml:77
264#: qml/Panel/ActiveCallHint.qml:77
262msgid "Tap to return to call..."
265msgid "Tap to return to call..."
263msgstr ""
266msgstr ""
@@ -302,51 +305,55 @@ msgstr ""
302msgid "Roaming"
305msgid "Roaming"
303msgstr ""
306msgstr ""
304
307
305−#: qml/Shell.qml:320
308+#: qml/Shell.qml:346
306−msgid "Enter your passphrase"
309+msgid "Enter passphrase"
307msgstr ""
310msgstr ""
308
311
309−#: qml/Shell.qml:321
312+#: qml/Shell.qml:347
310msgid "Sorry, incorrect passphrase"
313msgid "Sorry, incorrect passphrase"
311msgstr ""
314msgstr ""
312
315
313−#: qml/Shell.qml:323
316+#: qml/Shell.qml:348
317+msgid "Please re-enter"
318+msgstr ""
319+
320+#: qml/Shell.qml:350
314−msgid "Enter your passcode"
321+msgid "Enter passcode"
315msgstr ""
322msgstr ""
316
323
317−#: qml/Shell.qml:324
324+#: qml/Shell.qml:351
318msgid "Sorry, incorrect passcode"
325msgid "Sorry, incorrect passcode"
319msgstr ""
326msgstr ""
320
327
321−#: qml/Shell.qml:327
328+#: qml/Shell.qml:354
322#, qt-format
329#, qt-format
323−msgid "Enter your %1"
330+msgid "Enter %1"
324msgstr ""
331msgstr ""
325
332
326−#: qml/Shell.qml:328
333+#: qml/Shell.qml:355
327#, qt-format
334#, qt-format
328msgid "Sorry, incorrect %1"
335msgid "Sorry, incorrect %1"
329msgstr ""
336msgstr ""
330
337
331−#: qml/Shell.qml:363
338+#: qml/Shell.qml:390
332msgid "Sorry, incorrect passphrase."
339msgid "Sorry, incorrect passphrase."
333msgstr ""
340msgstr ""
334
341
335−#: qml/Shell.qml:364
342+#: qml/Shell.qml:391
336msgid "Sorry, incorrect passcode."
343msgid "Sorry, incorrect passcode."
337msgstr ""
344msgstr ""
338
345
339−#: qml/Shell.qml:365
346+#: qml/Shell.qml:392
340msgid "This will be your last attempt."
347msgid "This will be your last attempt."
341msgstr ""
348msgstr ""
342
349
343−#: qml/Shell.qml:367
350+#: qml/Shell.qml:394
344msgid ""
351msgid ""
345"If passphrase is entered incorrectly, your phone will conduct a factory "
352"If passphrase is entered incorrectly, your phone will conduct a factory "
346"reset and all personal data will be deleted."
353"reset and all personal data will be deleted."
347msgstr ""
354msgstr ""
348
355
349−#: qml/Shell.qml:368
356+#: qml/Shell.qml:395
350msgid ""
357msgid ""
351"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 "
352"and all personal data will be deleted."
359"and all personal data will be deleted."
po/my.po+55−48
@@ -7,14 +7,15 @@ msgid ""
7msgstr ""
7msgstr ""
8"Project-Id-Version: unity\n"
8"Project-Id-Version: unity\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2014-09-24 10:43+0100\n"
10+"POT-Creation-Date: 2014-10-07 11:37+0300\n"
11"PO-Revision-Date: 2013-12-12 11:12+0000\n"
11"PO-Revision-Date: 2013-12-12 11:12+0000\n"
12"Last-Translator: Pyae Sone <Unknown>\n"
12"Last-Translator: Pyae Sone <Unknown>\n"
13"Language-Team: Burmese <my@li.org>\n"
13"Language-Team: Burmese <my@li.org>\n"
14"MIME-Version: 1.0\n"
14"MIME-Version: 1.0\n"
15"Content-Type: text/plain; charset=UTF-8\n"
15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n"
16"Content-Transfer-Encoding: 8bit\n"
17+"Plural-Forms: nplurals=1; plural=0;\n"
17−"X-Launchpad-Export-Date: 2014-09-29 05:19+0000\n"
18+"X-Launchpad-Export-Date: 2014-10-09 06:36+0000\n"
18"X-Generator: Launchpad (build 17196)\n"
19"X-Generator: Launchpad (build 17196)\n"
19
20
20#: plugins/LightDM/Greeter.cpp:130
21#: plugins/LightDM/Greeter.cpp:130
@@ -30,6 +31,25 @@ msgstr ""
30msgid "Unpin shortcut"
31msgid "Unpin shortcut"
31msgstr ""
32msgstr ""
32
33
34+#: qml/Components/DelayedLockscreen.qml:47
35+msgid "Device Locked"
36+msgstr ""
37+
38+#: qml/Components/DelayedLockscreen.qml:62
39+msgid "You have been locked out due to too many failed passphrase attempts."
40+msgstr ""
41+
42+#: qml/Components/DelayedLockscreen.qml:63
43+msgid "You have been locked out due to too many failed passcode attempts."
44+msgstr ""
45+
46+#: qml/Components/DelayedLockscreen.qml:72
47+#, qt-format
48+msgid "Please wait %1 minute and then try again…"
49+msgid_plural "Please wait %1 minutes and then try again…"
50+msgstr[0] ""
51+msgstr[1] ""
52+
33#: qml/Components/Dialogs.qml:70
53#: qml/Components/Dialogs.qml:70
34msgid "Log out"
54msgid "Log out"
35msgstr ""
55msgstr ""
@@ -132,40 +152,23 @@ msgid ""
132"phone<br><br>Tap on the screen to start"
152"phone<br><br>Tap on the screen to start"
133msgstr ""
153msgstr ""
134
154
135−#: qml/Components/Lockscreen.qml:167
155+#: qml/Components/Lockscreen.qml:220
136−msgid "Please wait"
137−msgstr ""
138−
139−#: qml/Components/Lockscreen.qml:172
140−msgid "Too many incorrect attempts"
141−msgstr ""
142−
143−#: qml/Components/Lockscreen.qml:206
144msgid "Emergency Call"
156msgid "Emergency Call"
145msgstr "အရေးပေါ်ခေါ်မည်"
157msgstr "အရေးပေါ်ခေါ်မည်"
146
158
147−#: qml/Components/Lockscreen.qml:226
159+#: qml/Components/Lockscreen.qml:252
148msgid "OK"
160msgid "OK"
149msgstr ""
161msgstr ""
150
162
151−#: qml/Components/PassphraseLockscreen.qml:61
152−#, qt-format
153−msgid "Hello %1"
154−msgstr "ဟဲလို %1"
155−
156−#: qml/Components/PassphraseLockscreen.qml:61
157−msgid "Hello"
158−msgstr "ဟဲလို"
159−
160−#: qml/Dash/GenericScopeView.qml:411 qml/Dash/GenericScopeView.qml:533
163+#: qml/Dash/GenericScopeView.qml:434 qml/Dash/GenericScopeView.qml:591
161msgid "See less"
164msgid "See less"
162msgstr ""
165msgstr ""
163
166
164−#: qml/Dash/GenericScopeView.qml:411
167+#: qml/Dash/GenericScopeView.qml:434
165msgid "See all"
168msgid "See all"
166msgstr ""
169msgstr ""
167
170
168−#: qml/Dash/GenericScopeView.qml:473 qml/Dash/PageHeader.qml:258
171+#: qml/Dash/GenericScopeView.qml:496 qml/Dash/PageHeader.qml:258
169#: qml/Panel/SearchIndicator.qml:27
172#: qml/Panel/SearchIndicator.qml:27
170msgid "Search"
173msgid "Search"
171msgstr "ရှာဖွေ"
174msgstr "ရှာဖွေ"
@@ -202,6 +205,14 @@ msgstr ""
202msgid "Send"
205msgid "Send"
203msgstr "ပို့မည်"
206msgstr "ပို့မည်"
204
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+
205#: qml/Dash/ScopesOverview.qml:206
216#: qml/Dash/ScopesOverview.qml:206
206msgid "Manage Scopes"
217msgid "Manage Scopes"
207msgstr ""
218msgstr ""
@@ -223,7 +234,7 @@ msgid "All"
223msgstr ""
234msgstr ""
224
235
225#: qml/Greeter/Greeter.qml:157
236#: qml/Greeter/Greeter.qml:157
226−msgid "Swipe to unlock"
237+msgid "Unlock"
227msgstr ""
238msgstr ""
228
239
229#: qml/Hud/HudParametrizedActionsPage.qml:139
240#: qml/Hud/HudParametrizedActionsPage.qml:139
@@ -246,18 +257,10 @@ msgstr "ယခုပြောပါ"
246msgid "Speaking..."
257msgid "Speaking..."
247msgstr "ပြောနေသည်"
258msgstr "ပြောနေသည်"
248
259
249−#: qml/Notifications/NotificationMenuItemFactory.qml:108
260+#: qml/Notifications/NotificationMenuItemFactory.qml:116
250msgid "Show password"
261msgid "Show password"
251msgstr "စကားဝှက်ကိုပြ"
262msgstr "စကားဝှက်ကိုပြ"
252
263
253−#: qml/Notifications/NotificationMenuItemFactory.qml:124
254−msgid "Enter SIM PIN"
255−msgstr ""
256−
257−#: qml/Notifications/NotificationMenuItemFactory.qml:125
258−msgid "Sorry, incorrect PIN"
259−msgstr ""
260−
261#: qml/Panel/ActiveCallHint.qml:77
264#: qml/Panel/ActiveCallHint.qml:77
262msgid "Tap to return to call..."
265msgid "Tap to return to call..."
263msgstr ""
266msgstr ""
@@ -302,51 +305,55 @@ msgstr ""
302msgid "Roaming"
305msgid "Roaming"
303msgstr ""
306msgstr ""
304
307
305−#: qml/Shell.qml:320
308+#: qml/Shell.qml:346
306−msgid "Enter your passphrase"
309+msgid "Enter passphrase"
307msgstr ""
310msgstr ""
308
311
309−#: qml/Shell.qml:321
312+#: qml/Shell.qml:347
310msgid "Sorry, incorrect passphrase"
313msgid "Sorry, incorrect passphrase"
311msgstr ""
314msgstr ""
312
315
313−#: qml/Shell.qml:323
316+#: qml/Shell.qml:348
317+msgid "Please re-enter"
318+msgstr ""
319+
320+#: qml/Shell.qml:350
314−msgid "Enter your passcode"
321+msgid "Enter passcode"
315msgstr ""
322msgstr ""
316
323
317−#: qml/Shell.qml:324
324+#: qml/Shell.qml:351
318msgid "Sorry, incorrect passcode"
325msgid "Sorry, incorrect passcode"
319msgstr ""
326msgstr ""
320
327
321−#: qml/Shell.qml:327
328+#: qml/Shell.qml:354
322#, qt-format
329#, qt-format
323−msgid "Enter your %1"
330+msgid "Enter %1"
324msgstr ""
331msgstr ""
325
332
326−#: qml/Shell.qml:328
333+#: qml/Shell.qml:355
327#, qt-format
334#, qt-format
328msgid "Sorry, incorrect %1"
335msgid "Sorry, incorrect %1"
329msgstr ""
336msgstr ""
330
337
331−#: qml/Shell.qml:363
338+#: qml/Shell.qml:390
332msgid "Sorry, incorrect passphrase."
339msgid "Sorry, incorrect passphrase."
333msgstr ""
340msgstr ""
334
341
335−#: qml/Shell.qml:364
342+#: qml/Shell.qml:391
336msgid "Sorry, incorrect passcode."
343msgid "Sorry, incorrect passcode."
337msgstr ""
344msgstr ""
338
345
339−#: qml/Shell.qml:365
346+#: qml/Shell.qml:392
340msgid "This will be your last attempt."
347msgid "This will be your last attempt."
341msgstr ""
348msgstr ""
342
349
343−#: qml/Shell.qml:367
350+#: qml/Shell.qml:394
344msgid ""
351msgid ""
345"If passphrase is entered incorrectly, your phone will conduct a factory "
352"If passphrase is entered incorrectly, your phone will conduct a factory "
346"reset and all personal data will be deleted."
353"reset and all personal data will be deleted."
347msgstr ""
354msgstr ""
348
355
349−#: qml/Shell.qml:368
356+#: qml/Shell.qml:395
350msgid ""
357msgid ""
351"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 "
352"and all personal data will be deleted."
359"and all personal data will be deleted."
po/nb.po+75−63
@@ -7,29 +7,51 @@ msgid ""
7msgstr ""
7msgstr ""
8"Project-Id-Version: unity\n"
8"Project-Id-Version: unity\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2014-09-24 10:43+0100\n"
10+"POT-Creation-Date: 2014-10-07 11:37+0300\n"
11−"PO-Revision-Date: 2014-09-29 05:32+0000\n"
11+"PO-Revision-Date: 2014-10-07 10:32+0000\n"
12"Last-Translator: Åka Sikrom <Unknown>\n"
12"Last-Translator: Åka Sikrom <Unknown>\n"
13"Language-Team: Norwegian Bokmal <nb@li.org>\n"
13"Language-Team: Norwegian Bokmal <nb@li.org>\n"
14"MIME-Version: 1.0\n"
14"MIME-Version: 1.0\n"
15"Content-Type: text/plain; charset=UTF-8\n"
15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n"
16"Content-Transfer-Encoding: 8bit\n"
17+"Plural-Forms: nplurals=2; plural=n != 1;\n"
17−"X-Launchpad-Export-Date: 2014-09-30 07:10+0000\n"
18+"X-Launchpad-Export-Date: 2014-10-09 06:36+0000\n"
18"X-Generator: Launchpad (build 17196)\n"
19"X-Generator: Launchpad (build 17196)\n"
19
20
20#: plugins/LightDM/Greeter.cpp:130
21#: plugins/LightDM/Greeter.cpp:130
21msgid "Password: "
22msgid "Password: "
22msgstr "Passord: "
23msgstr "Passord: "
23
24
24−#: plugins/Unity/Launcher/launcheritem.cpp:44
25+#: plugins/Unity/Launcher/launcheritem.cpp:45
25−#: plugins/Unity/Launcher/launcheritem.cpp:74
26+#: plugins/Unity/Launcher/launcheritem.cpp:91
26msgid "Pin shortcut"
27msgid "Pin shortcut"
27msgstr "Fest snarvei"
28msgstr "Fest snarvei"
28
29
29−#: plugins/Unity/Launcher/launcheritem.cpp:74
30+#: plugins/Unity/Launcher/launcheritem.cpp:91
30msgid "Unpin shortcut"
31msgid "Unpin shortcut"
31msgstr "Fjern snarvei"
32msgstr "Fjern snarvei"
32
33
34+#: qml/Components/DelayedLockscreen.qml:47
35+msgid "Device Locked"
36+msgstr "Enheten er låst"
37+
38+#: qml/Components/DelayedLockscreen.qml:62
39+msgid "You have been locked out due to too many failed passphrase attempts."
40+msgstr ""
41+"Du har skrevet inn feil passordfrase for mange ganger, og er derfor "
42+"utestengt."
43+
44+#: qml/Components/DelayedLockscreen.qml:63
45+msgid "You have been locked out due to too many failed passcode attempts."
46+msgstr "Du har tastet feil kode for mange ganger, og er derfor utestengt."
47+
48+#: qml/Components/DelayedLockscreen.qml:72
49+#, qt-format
50+msgid "Please wait %1 minute and then try again…"
51+msgid_plural "Please wait %1 minutes and then try again…"
52+msgstr[0] "Vent i %1 minutt, og prøv deretter på nytt …"
53+msgstr[1] "Vent i %1 minutter, og prøv deretter på nytt …"
54+
33#: qml/Components/Dialogs.qml:70
55#: qml/Components/Dialogs.qml:70
34msgid "Log out"
56msgid "Log out"
35msgstr "Logg ut"
57msgstr "Logg ut"
@@ -136,40 +158,23 @@ msgstr ""
136"Du har nå mestret kantbevegelsene, og er klar til å bruke "
158"Du har nå mestret kantbevegelsene, og er klar til å bruke "
137"telefonen<br><br>Trykk på skjermen for å begynne"
159"telefonen<br><br>Trykk på skjermen for å begynne"
138
160
139−#: qml/Components/Lockscreen.qml:167
161+#: qml/Components/Lockscreen.qml:220
140−msgid "Please wait"
141−msgstr "Vent litt"
142−
143−#: qml/Components/Lockscreen.qml:172
144−msgid "Too many incorrect attempts"
145−msgstr "Du har tastet feil for mange ganger"
146−
147−#: qml/Components/Lockscreen.qml:206
148msgid "Emergency Call"
162msgid "Emergency Call"
149msgstr "Nødanrop"
163msgstr "Nødanrop"
150
164
151−#: qml/Components/Lockscreen.qml:226
165+#: qml/Components/Lockscreen.qml:252
152msgid "OK"
166msgid "OK"
153msgstr "OK"
167msgstr "OK"
154
168
155−#: qml/Components/PassphraseLockscreen.qml:61
156−#, qt-format
157−msgid "Hello %1"
158−msgstr "Hei, %1"
159−
160−#: qml/Components/PassphraseLockscreen.qml:61
161−msgid "Hello"
162−msgstr "Hei"
163−
164−#: qml/Dash/GenericScopeView.qml:364 qml/Dash/GenericScopeView.qml:483
169+#: qml/Dash/GenericScopeView.qml:434 qml/Dash/GenericScopeView.qml:591
165msgid "See less"
170msgid "See less"
166msgstr "Vis mindre"
171msgstr "Vis mindre"
167
172
168−#: qml/Dash/GenericScopeView.qml:364
173+#: qml/Dash/GenericScopeView.qml:434
169msgid "See all"
174msgid "See all"
170msgstr "Vis alt"
175msgstr "Vis alt"
171
176
172−#: qml/Dash/GenericScopeView.qml:427 qml/Dash/PageHeader.qml:258
177+#: qml/Dash/GenericScopeView.qml:496 qml/Dash/PageHeader.qml:258
173#: qml/Panel/SearchIndicator.qml:27
178#: qml/Panel/SearchIndicator.qml:27
174msgid "Search"
179msgid "Search"
175msgstr "Søk"
180msgstr "Søk"
@@ -206,6 +211,14 @@ msgstr "Skriv en anmeldelse"
206msgid "Send"
211msgid "Send"
207msgstr "Send"
212msgstr "Send"
208
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+
209#: qml/Dash/ScopesOverview.qml:206
222#: qml/Dash/ScopesOverview.qml:206
210msgid "Manage Scopes"
223msgid "Manage Scopes"
211msgstr "Håndter virkefelt"
224msgstr "Håndter virkefelt"
@@ -227,8 +240,8 @@ msgid "All"
227msgstr "Alt"
240msgstr "Alt"
228
241
229#: qml/Greeter/Greeter.qml:157
242#: qml/Greeter/Greeter.qml:157
230−msgid "Swipe to unlock"
243+msgid "Unlock"
231−msgstr "Skyv for å låse opp"
244+msgstr "Lås opp"
232
245
233#: qml/Hud/HudParametrizedActionsPage.qml:139
246#: qml/Hud/HudParametrizedActionsPage.qml:139
234msgid "Confirm"
247msgid "Confirm"
@@ -250,18 +263,10 @@ msgstr "Snakk nå …"
250msgid "Speaking..."
263msgid "Speaking..."
251msgstr "Snakker …"
264msgstr "Snakker …"
252
265
253−#: qml/Notifications/NotificationMenuItemFactory.qml:108
266+#: qml/Notifications/NotificationMenuItemFactory.qml:116
254msgid "Show password"
267msgid "Show password"
255msgstr "Vis passord"
268msgstr "Vis passord"
256
269
257−#: qml/Notifications/NotificationMenuItemFactory.qml:124
258−msgid "Enter SIM PIN"
259−msgstr "Tast SIM-kortets PIN-kode"
260−
261−#: qml/Notifications/NotificationMenuItemFactory.qml:125
262−msgid "Sorry, incorrect PIN"
263−msgstr "Feil PIN"
264−
265#: qml/Panel/ActiveCallHint.qml:77
270#: qml/Panel/ActiveCallHint.qml:77
266msgid "Tap to return to call..."
271msgid "Tap to return to call..."
267msgstr "Trykk for å gå tilbake til anrop …"
272msgstr "Trykk for å gå tilbake til anrop …"
@@ -274,27 +279,27 @@ msgstr "Konferanse"
274msgid "Nothing is playing"
279msgid "Nothing is playing"
275msgstr "Ingenting spilles nå"
280msgstr "Ingenting spilles nå"
276
281
277−#: qml/Panel/Indicators/MenuItemFactory.qml:651
282+#: qml/Panel/Indicators/MenuItemFactory.qml:748
278msgid "In queue…"
283msgid "In queue…"
279msgstr "I kø …"
284msgstr "I kø …"
280
285
281−#: qml/Panel/Indicators/MenuItemFactory.qml:655
286+#: qml/Panel/Indicators/MenuItemFactory.qml:752
282msgid "Downloading"
287msgid "Downloading"
283msgstr "Laster ned"
288msgstr "Laster ned"
284
289
285−#: qml/Panel/Indicators/MenuItemFactory.qml:657
290+#: qml/Panel/Indicators/MenuItemFactory.qml:754
286msgid "Paused, tap to resume"
291msgid "Paused, tap to resume"
287msgstr "Satt på pause (trykk for å fortsette)"
292msgstr "Satt på pause (trykk for å fortsette)"
288
293
289−#: qml/Panel/Indicators/MenuItemFactory.qml:659
294+#: qml/Panel/Indicators/MenuItemFactory.qml:756
290msgid "Canceled"
295msgid "Canceled"
291msgstr "Avbrutt"
296msgstr "Avbrutt"
292
297
293−#: qml/Panel/Indicators/MenuItemFactory.qml:661
298+#: qml/Panel/Indicators/MenuItemFactory.qml:758
294msgid "Finished"
299msgid "Finished"
295msgstr "Ferdig"
300msgstr "Ferdig"
296
301
297−#: qml/Panel/Indicators/MenuItemFactory.qml:663
302+#: qml/Panel/Indicators/MenuItemFactory.qml:760
298msgid "Failed, tap to retry"
303msgid "Failed, tap to retry"
299msgstr "Feilet. Trykk for å prøve på nytt"
304msgstr "Feilet. Trykk for å prøve på nytt"
300
305
@@ -306,45 +311,49 @@ msgstr "Lås opp SIM"
306msgid "Roaming"
311msgid "Roaming"
307msgstr "Fremmednett"
312msgstr "Fremmednett"
308
313
309−#: qml/Shell.qml:292
314+#: qml/Shell.qml:346
310−msgid "Enter your passphrase"
315+msgid "Enter passphrase"
311−msgstr "Skriv inn passordfrasen din"
316+msgstr "Skriv inn passordfrase"
312
317
313−#: qml/Shell.qml:293
318+#: qml/Shell.qml:347
314msgid "Sorry, incorrect passphrase"
319msgid "Sorry, incorrect passphrase"
315msgstr "Feil passordfrase"
320msgstr "Feil passordfrase"
316
321
317−#: qml/Shell.qml:295
322+#: qml/Shell.qml:348
318−msgid "Enter your passcode"
323+msgid "Please re-enter"
319−msgstr "Tast koden din"
324+msgstr "Skriv inn på nytt"
320
325
321−#: qml/Shell.qml:296
326+#: qml/Shell.qml:350
327+msgid "Enter passcode"
328+msgstr "Tast kode"
329+
330+#: qml/Shell.qml:351
322msgid "Sorry, incorrect passcode"
331msgid "Sorry, incorrect passcode"
323msgstr "Feil kode"
332msgstr "Feil kode"
324
333
325−#: qml/Shell.qml:299
334+#: qml/Shell.qml:354
326#, qt-format
335#, qt-format
327−msgid "Enter your %1"
336+msgid "Enter %1"
328msgstr "Skriv inn %1"
337msgstr "Skriv inn %1"
329
338
330−#: qml/Shell.qml:300
339+#: qml/Shell.qml:355
331#, qt-format
340#, qt-format
332msgid "Sorry, incorrect %1"
341msgid "Sorry, incorrect %1"
333msgstr "Feil %1"
342msgstr "Feil %1"
334
343
335−#: qml/Shell.qml:335
344+#: qml/Shell.qml:390
336msgid "Sorry, incorrect passphrase."
345msgid "Sorry, incorrect passphrase."
337msgstr "Feil passordfrase."
346msgstr "Feil passordfrase."
338
347
339−#: qml/Shell.qml:336
348+#: qml/Shell.qml:391
340msgid "Sorry, incorrect passcode."
349msgid "Sorry, incorrect passcode."
341msgstr "Feil kode."
350msgstr "Feil kode."
342
351
343−#: qml/Shell.qml:337
352+#: qml/Shell.qml:392
344msgid "This will be your last attempt."
353msgid "This will be your last attempt."
345msgstr "Dette er ditt siste forsøk."
354msgstr "Dette er ditt siste forsøk."
346
355
347−#: qml/Shell.qml:339
356+#: qml/Shell.qml:394
348msgid ""
357msgid ""
349"If passphrase is entered incorrectly, your phone will conduct a factory "
358"If passphrase is entered incorrectly, your phone will conduct a factory "
350"reset and all personal data will be deleted."
359"reset and all personal data will be deleted."
@@ -352,7 +361,7 @@ msgstr ""
352"Hvis du skriver feil passordfrase en gang til, tilbakestilles telefonen til "
361"Hvis du skriver feil passordfrase en gang til, tilbakestilles telefonen til "
353"fabrikkinnstillinger, og alle personlige data slettes."
362"fabrikkinnstillinger, og alle personlige data slettes."
354
363
355−#: qml/Shell.qml:340
364+#: qml/Shell.qml:395
356msgid ""
365msgid ""
357"If passcode is entered incorrectly, your phone will conduct a factory reset "
366"If passcode is entered incorrectly, your phone will conduct a factory reset "
358"and all personal data will be deleted."
367"and all personal data will be deleted."
@@ -360,5 +369,8 @@ msgstr ""
360"Hvis du skriver feil kode en gang til, tilbakestilles telefonen til "
369"Hvis du skriver feil kode en gang til, tilbakestilles telefonen til "
361"fabrikkinnstillinger, og alle personlige data slettes."
370"fabrikkinnstillinger, og alle personlige data slettes."
362
371
363−#~ msgid "Manage Dash"
372+#~ msgid "Sorry, incorrect PIN"
364−#~ msgstr "Håndter dashbord"
373+#~ msgstr "Feil PIN"
374+
375+#~ msgid "Enter SIM PIN"
376+#~ msgstr "Tast SIM-kortets PIN-kode"
po/nl.po+69−55
@@ -7,14 +7,15 @@ msgid ""
7msgstr ""
7msgstr ""
8"Project-Id-Version: unity\n"
8"Project-Id-Version: unity\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2014-09-24 10:43+0100\n"
10+"POT-Creation-Date: 2014-10-07 11:37+0300\n"
11−"PO-Revision-Date: 2014-09-28 16:19+0000\n"
11+"PO-Revision-Date: 2014-10-08 19:53+0000\n"
12"Last-Translator: rob <linuxned@gmail.com>\n"
12"Last-Translator: rob <linuxned@gmail.com>\n"
13"Language-Team: Dutch <nl@li.org>\n"
13"Language-Team: Dutch <nl@li.org>\n"
14"MIME-Version: 1.0\n"
14"MIME-Version: 1.0\n"
15"Content-Type: text/plain; charset=UTF-8\n"
15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n"
16"Content-Transfer-Encoding: 8bit\n"
17+"Plural-Forms: nplurals=2; plural=n != 1;\n"
17−"X-Launchpad-Export-Date: 2014-09-29 05:19+0000\n"
18+"X-Launchpad-Export-Date: 2014-10-09 06:36+0000\n"
18"X-Generator: Launchpad (build 17196)\n"
19"X-Generator: Launchpad (build 17196)\n"
19
20
20#: plugins/LightDM/Greeter.cpp:130
21#: plugins/LightDM/Greeter.cpp:130
@@ -30,6 +31,29 @@ msgstr "Snelkoppeling vastzetten"
30msgid "Unpin shortcut"
31msgid "Unpin shortcut"
31msgstr "Snelkoppeling losmaken"
32msgstr "Snelkoppeling losmaken"
32
33
34+#: qml/Components/DelayedLockscreen.qml:47
35+msgid "Device Locked"
36+msgstr "Apparaat vergrendeld"
37+
38+#: qml/Components/DelayedLockscreen.qml:62
39+msgid "You have been locked out due to too many failed passphrase attempts."
40+msgstr ""
41+"U werd de toegang geweigerd omdat u te vaak een onjuiste wachtwoordzin heeft "
42+"ingevoerd."
43+
44+#: qml/Components/DelayedLockscreen.qml:63
45+msgid "You have been locked out due to too many failed passcode attempts."
46+msgstr ""
47+"U werd de toegang geweigerd omdat u te vaak een onjuiste toegangscode heeft "
48+"ingevoerd."
49+
50+#: qml/Components/DelayedLockscreen.qml:72
51+#, qt-format
52+msgid "Please wait %1 minute and then try again…"
53+msgid_plural "Please wait %1 minutes and then try again…"
54+msgstr[0] "Wacht a.u.b. %1 minuut en probeer het dan opnieuw…"
55+msgstr[1] "Wacht a.u.b. %1 minuten en probeer het dan opnieuw…"
56+
33#: qml/Components/Dialogs.qml:70
57#: qml/Components/Dialogs.qml:70
34msgid "Log out"
58msgid "Log out"
35msgstr "Afmelden"
59msgstr "Afmelden"
@@ -136,40 +160,23 @@ msgstr ""
136"Nu u de bewegingen vanuit de randen onder de knie heeft, kunt u beginnen met "
160"Nu u de bewegingen vanuit de randen onder de knie heeft, kunt u beginnen met "
137"het gebruiken van de telefoon<br><br>Tik op het scherm om te beginnen"
161"het gebruiken van de telefoon<br><br>Tik op het scherm om te beginnen"
138
162
139−#: qml/Components/Lockscreen.qml:167
163+#: qml/Components/Lockscreen.qml:220
140−msgid "Please wait"
141−msgstr "Even geduld a.u.b."
142−
143−#: qml/Components/Lockscreen.qml:172
144−msgid "Too many incorrect attempts"
145−msgstr "Te veel mislukte pogingen"
146−
147−#: qml/Components/Lockscreen.qml:206
148msgid "Emergency Call"
164msgid "Emergency Call"
149msgstr "Noodoproep"
165msgstr "Noodoproep"
150
166
151−#: qml/Components/Lockscreen.qml:226
167+#: qml/Components/Lockscreen.qml:252
152msgid "OK"
168msgid "OK"
153msgstr "Ok"
169msgstr "Ok"
154
170
155−#: qml/Components/PassphraseLockscreen.qml:61
156−#, qt-format
157−msgid "Hello %1"
158−msgstr "Hallo %1"
159−
160−#: qml/Components/PassphraseLockscreen.qml:61
161−msgid "Hello"
162−msgstr "Hallo"
163−
164−#: qml/Dash/GenericScopeView.qml:411 qml/Dash/GenericScopeView.qml:533
171+#: qml/Dash/GenericScopeView.qml:434 qml/Dash/GenericScopeView.qml:591
165msgid "See less"
172msgid "See less"
166msgstr "Minder zien"
173msgstr "Minder zien"
167
174
168−#: qml/Dash/GenericScopeView.qml:411
175+#: qml/Dash/GenericScopeView.qml:434
169msgid "See all"
176msgid "See all"
170msgstr "Alles zien"
177msgstr "Alles zien"
171
178
172−#: qml/Dash/GenericScopeView.qml:473 qml/Dash/PageHeader.qml:258
179+#: qml/Dash/GenericScopeView.qml:496 qml/Dash/PageHeader.qml:258
173#: qml/Panel/SearchIndicator.qml:27
180#: qml/Panel/SearchIndicator.qml:27
174msgid "Search"
181msgid "Search"
175msgstr "Zoeken"
182msgstr "Zoeken"
@@ -206,6 +213,14 @@ msgstr "Voeg recensie toe"
206msgid "Send"
213msgid "Send"
207msgstr "Versturen"
214msgstr "Versturen"
208
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+
209#: qml/Dash/ScopesOverview.qml:206
224#: qml/Dash/ScopesOverview.qml:206
210msgid "Manage Scopes"
225msgid "Manage Scopes"
211msgstr "Scopes-beheer"
226msgstr "Scopes-beheer"
@@ -227,8 +242,8 @@ msgid "All"
227msgstr "Alles"
242msgstr "Alles"
228
243
229#: qml/Greeter/Greeter.qml:157
244#: qml/Greeter/Greeter.qml:157
230−msgid "Swipe to unlock"
245+msgid "Unlock"
231−msgstr "Veeg om te ontgrendelen"
246+msgstr "Ontgrendelen"
232
247
233#: qml/Hud/HudParametrizedActionsPage.qml:139
248#: qml/Hud/HudParametrizedActionsPage.qml:139
234msgid "Confirm"
249msgid "Confirm"
@@ -250,18 +265,10 @@ msgstr "Nu inspreken…"
250msgid "Speaking..."
265msgid "Speaking..."
251msgstr "Inspreken…"
266msgstr "Inspreken…"
252
267
253−#: qml/Notifications/NotificationMenuItemFactory.qml:108
268+#: qml/Notifications/NotificationMenuItemFactory.qml:116
254msgid "Show password"
269msgid "Show password"
255msgstr "Wachtwoord tonen"
270msgstr "Wachtwoord tonen"
256
271
257−#: qml/Notifications/NotificationMenuItemFactory.qml:124
258−msgid "Enter SIM PIN"
259−msgstr "Voer simpincode in"
260−
261−#: qml/Notifications/NotificationMenuItemFactory.qml:125
262−msgid "Sorry, incorrect PIN"
263−msgstr "Sorry, onjuiste pincode"
264−
265#: qml/Panel/ActiveCallHint.qml:77
272#: qml/Panel/ActiveCallHint.qml:77
266msgid "Tap to return to call..."
273msgid "Tap to return to call..."
267msgstr "Tik om terug te keren naar gesprek…"
274msgstr "Tik om terug te keren naar gesprek…"
@@ -306,45 +313,49 @@ msgstr "Simkaart deblokkeren"
306msgid "Roaming"
313msgid "Roaming"
307msgstr "Roaming"
314msgstr "Roaming"
308
315
309−#: qml/Shell.qml:320
316+#: qml/Shell.qml:346
310−msgid "Enter your passphrase"
317+msgid "Enter passphrase"
311−msgstr "Voer uw wachtwoordzin in"
318+msgstr "Voer wachtwoordzin in"
312
319
313−#: qml/Shell.qml:321
320+#: qml/Shell.qml:347
314msgid "Sorry, incorrect passphrase"
321msgid "Sorry, incorrect passphrase"
315msgstr "Sorry, onjuiste wachtwoordzin"
322msgstr "Sorry, onjuiste wachtwoordzin"
316
323
317−#: qml/Shell.qml:323
324+#: qml/Shell.qml:348
318−msgid "Enter your passcode"
325+msgid "Please re-enter"
319−msgstr "Voer uw toegangscode in"
326+msgstr "Herhaal deze a.u.b."
320
327
321−#: qml/Shell.qml:324
328+#: qml/Shell.qml:350
329+msgid "Enter passcode"
330+msgstr "Voer toegangscode in"
331+
332+#: qml/Shell.qml:351
322msgid "Sorry, incorrect passcode"
333msgid "Sorry, incorrect passcode"
323msgstr "Sorry, onjuiste toegangscode"
334msgstr "Sorry, onjuiste toegangscode"
324
335
325−#: qml/Shell.qml:327
336+#: qml/Shell.qml:354
326#, qt-format
337#, qt-format
327−msgid "Enter your %1"
338+msgid "Enter %1"
328−msgstr "Voer uw %1 in"
339+msgstr "Voer %1 in"
329
340
330−#: qml/Shell.qml:328
341+#: qml/Shell.qml:355
331#, qt-format
342#, qt-format
332msgid "Sorry, incorrect %1"
343msgid "Sorry, incorrect %1"
333msgstr "Sorry, onjuiste %1"
344msgstr "Sorry, onjuiste %1"
334
345
335−#: qml/Shell.qml:363
346+#: qml/Shell.qml:390
336msgid "Sorry, incorrect passphrase."
347msgid "Sorry, incorrect passphrase."
337msgstr "Sorry, onjuiste wachtwoordzin."
348msgstr "Sorry, onjuiste wachtwoordzin."
338
349
339−#: qml/Shell.qml:364
350+#: qml/Shell.qml:391
340msgid "Sorry, incorrect passcode."
351msgid "Sorry, incorrect passcode."
341msgstr "Sorry, onjuiste toegangscode."
352msgstr "Sorry, onjuiste toegangscode."
342
353
343−#: qml/Shell.qml:365
354+#: qml/Shell.qml:392
344msgid "This will be your last attempt."
355msgid "This will be your last attempt."
345msgstr "Dit zal uw laatste poging worden."
356msgstr "Dit zal uw laatste poging worden."
346
357
347−#: qml/Shell.qml:367
358+#: qml/Shell.qml:394
348msgid ""
359msgid ""
349"If passphrase is entered incorrectly, your phone will conduct a factory "
360"If passphrase is entered incorrectly, your phone will conduct a factory "
350"reset and all personal data will be deleted."
361"reset and all personal data will be deleted."
@@ -352,7 +363,7 @@ msgstr ""
352"Wanneer de wachtwoordzin nu opnieuw onjuist wordt ingevoerd, zal uw telefoon "
363"Wanneer de wachtwoordzin nu opnieuw onjuist wordt ingevoerd, zal uw telefoon "
353"teruggaan naar de fabrieksinstellingen en zal al uw eigen data verloren gaan."
364"teruggaan naar de fabrieksinstellingen en zal al uw eigen data verloren gaan."
354
365
355−#: qml/Shell.qml:368
366+#: qml/Shell.qml:395
356msgid ""
367msgid ""
357"If passcode is entered incorrectly, your phone will conduct a factory reset "
368"If passcode is entered incorrectly, your phone will conduct a factory reset "
358"and all personal data will be deleted."
369"and all personal data will be deleted."
@@ -360,5 +371,8 @@ msgstr ""
360"Wanneer de toegangscode nu opnieuw onjuist wordt ingevoerd, zal uw telefoon "
371"Wanneer de toegangscode nu opnieuw onjuist wordt ingevoerd, zal uw telefoon "
361"teruggaan naar de fabrieksinstellingen en zal al uw eigen data verloren gaan."
372"teruggaan naar de fabrieksinstellingen en zal al uw eigen data verloren gaan."
362
373
363−#~ msgid "Manage Dash"
374+#~ msgid "Sorry, incorrect PIN"
364−#~ msgstr "Snelzoeker-beheer"
375+#~ msgstr "Sorry, onjuiste pincode"
376+
377+#~ msgid "Enter SIM PIN"
378+#~ msgstr "Voer simpincode in"
po/pl.po+57−49
@@ -7,14 +7,16 @@ msgid ""
7msgstr ""
7msgstr ""
8"Project-Id-Version: unity\n"
8"Project-Id-Version: unity\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2014-09-24 10:43+0100\n"
10+"POT-Creation-Date: 2014-10-07 11:37+0300\n"
11"PO-Revision-Date: 2014-08-18 20:25+0000\n"
11"PO-Revision-Date: 2014-08-18 20:25+0000\n"
12"Last-Translator: Paweł Stroka <pawstr@gmail.com>\n"
12"Last-Translator: Paweł Stroka <pawstr@gmail.com>\n"
13"Language-Team: Polish <pl@li.org>\n"
13"Language-Team: Polish <pl@li.org>\n"
14"MIME-Version: 1.0\n"
14"MIME-Version: 1.0\n"
15"Content-Type: text/plain; charset=UTF-8\n"
15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n"
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"
17−"X-Launchpad-Export-Date: 2014-09-29 05:20+0000\n"
19+"X-Launchpad-Export-Date: 2014-10-09 06:36+0000\n"
18"X-Generator: Launchpad (build 17196)\n"
20"X-Generator: Launchpad (build 17196)\n"
19
21
20#: plugins/LightDM/Greeter.cpp:130
22#: plugins/LightDM/Greeter.cpp:130
@@ -30,6 +32,25 @@ msgstr "Przypnij skrót"
30msgid "Unpin shortcut"
32msgid "Unpin shortcut"
31msgstr "Odepnij skrót"
33msgstr "Odepnij skrót"
32
34
35+#: qml/Components/DelayedLockscreen.qml:47
36+msgid "Device Locked"
37+msgstr ""
38+
39+#: qml/Components/DelayedLockscreen.qml:62
40+msgid "You have been locked out due to too many failed passphrase attempts."
41+msgstr ""
42+
43+#: qml/Components/DelayedLockscreen.qml:63
44+msgid "You have been locked out due to too many failed passcode attempts."
45+msgstr ""
46+
47+#: qml/Components/DelayedLockscreen.qml:72
48+#, qt-format
49+msgid "Please wait %1 minute and then try again…"
50+msgid_plural "Please wait %1 minutes and then try again…"
51+msgstr[0] ""
52+msgstr[1] ""
53+
33#: qml/Components/Dialogs.qml:70
54#: qml/Components/Dialogs.qml:70
34msgid "Log out"
55msgid "Log out"
35msgstr ""
56msgstr ""
@@ -136,40 +157,23 @@ msgstr ""
136"Wydawanie poleceń krawędzi zostało opanowane. Urządzenie gotowe do "
157"Wydawanie poleceń krawędzi zostało opanowane. Urządzenie gotowe do "
137"pracy.<br><br>Dotknij ekranu by rozpocząć"
158"pracy.<br><br>Dotknij ekranu by rozpocząć"
138
159
139−#: qml/Components/Lockscreen.qml:167
160+#: qml/Components/Lockscreen.qml:220
140−msgid "Please wait"
141−msgstr ""
142−
143−#: qml/Components/Lockscreen.qml:172
144−msgid "Too many incorrect attempts"
145−msgstr ""
146−
147−#: qml/Components/Lockscreen.qml:206
148msgid "Emergency Call"
161msgid "Emergency Call"
149msgstr "Telefon ratunkowy"
162msgstr "Telefon ratunkowy"
150
163
151−#: qml/Components/Lockscreen.qml:226
164+#: qml/Components/Lockscreen.qml:252
152msgid "OK"
165msgid "OK"
153msgstr "OK"
166msgstr "OK"
154
167
155−#: qml/Components/PassphraseLockscreen.qml:61
156−#, qt-format
157−msgid "Hello %1"
158−msgstr "Witaj %1"
159−
160−#: qml/Components/PassphraseLockscreen.qml:61
161−msgid "Hello"
162−msgstr "Witaj"
163−
164−#: qml/Dash/GenericScopeView.qml:411 qml/Dash/GenericScopeView.qml:533
168+#: qml/Dash/GenericScopeView.qml:434 qml/Dash/GenericScopeView.qml:591
165msgid "See less"
169msgid "See less"
166msgstr "Zobacz mniej"
170msgstr "Zobacz mniej"
167
171
168−#: qml/Dash/GenericScopeView.qml:411
172+#: qml/Dash/GenericScopeView.qml:434
169msgid "See all"
173msgid "See all"
170msgstr "Zobacz wszystko"
174msgstr "Zobacz wszystko"
171
175
172−#: qml/Dash/GenericScopeView.qml:473 qml/Dash/PageHeader.qml:258
176+#: qml/Dash/GenericScopeView.qml:496 qml/Dash/PageHeader.qml:258
173#: qml/Panel/SearchIndicator.qml:27
177#: qml/Panel/SearchIndicator.qml:27
174msgid "Search"
178msgid "Search"
175msgstr "Szukaj"
179msgstr "Szukaj"
@@ -206,6 +210,14 @@ msgstr "Dodaj recenzję"
206msgid "Send"
210msgid "Send"
207msgstr "Wyślij"
211msgstr "Wyślij"
208
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+
209#: qml/Dash/ScopesOverview.qml:206
221#: qml/Dash/ScopesOverview.qml:206
210msgid "Manage Scopes"
222msgid "Manage Scopes"
211msgstr ""
223msgstr ""
@@ -227,8 +239,8 @@ msgid "All"
227msgstr ""
239msgstr ""
228
240
229#: qml/Greeter/Greeter.qml:157
241#: qml/Greeter/Greeter.qml:157
230−msgid "Swipe to unlock"
242+msgid "Unlock"
231−msgstr "Przeciągnij aby odblokować"
243+msgstr ""
232
244
233#: qml/Hud/HudParametrizedActionsPage.qml:139
245#: qml/Hud/HudParametrizedActionsPage.qml:139
234msgid "Confirm"
246msgid "Confirm"
@@ -250,18 +262,10 @@ msgstr "Mów teraz..."
250msgid "Speaking..."
262msgid "Speaking..."
251msgstr "Rozpoznanie..."
263msgstr "Rozpoznanie..."
252
264
253−#: qml/Notifications/NotificationMenuItemFactory.qml:108
265+#: qml/Notifications/NotificationMenuItemFactory.qml:116
254msgid "Show password"
266msgid "Show password"
255msgstr "Wyświetl hasło"
267msgstr "Wyświetl hasło"
256
268
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
269#: qml/Panel/ActiveCallHint.qml:77
266msgid "Tap to return to call..."
270msgid "Tap to return to call..."
267msgstr "Dotknij aby powrócić do połączenia..."
271msgstr "Dotknij aby powrócić do połączenia..."
@@ -306,51 +310,55 @@ msgstr ""
306msgid "Roaming"
310msgid "Roaming"
307msgstr ""
311msgstr ""
308
312
309−#: qml/Shell.qml:320
313+#: qml/Shell.qml:346
310−msgid "Enter your passphrase"
314+msgid "Enter passphrase"
311msgstr ""
315msgstr ""
312
316
313−#: qml/Shell.qml:321
317+#: qml/Shell.qml:347
314msgid "Sorry, incorrect passphrase"
318msgid "Sorry, incorrect passphrase"
315msgstr ""
319msgstr ""
316
320
317−#: qml/Shell.qml:323
321+#: qml/Shell.qml:348
322+msgid "Please re-enter"
323+msgstr ""
324+
325+#: qml/Shell.qml:350
318−msgid "Enter your passcode"
326+msgid "Enter passcode"
319msgstr ""
327msgstr ""
320
328
321−#: qml/Shell.qml:324
329+#: qml/Shell.qml:351
322msgid "Sorry, incorrect passcode"
330msgid "Sorry, incorrect passcode"
323msgstr ""
331msgstr ""
324
332
325−#: qml/Shell.qml:327
333+#: qml/Shell.qml:354
326#, qt-format
334#, qt-format
327−msgid "Enter your %1"
335+msgid "Enter %1"
328msgstr ""
336msgstr ""
329
337
330−#: qml/Shell.qml:328
338+#: qml/Shell.qml:355
331#, qt-format
339#, qt-format
332msgid "Sorry, incorrect %1"
340msgid "Sorry, incorrect %1"
333msgstr ""
341msgstr ""
334
342
335−#: qml/Shell.qml:363
343+#: qml/Shell.qml:390
336msgid "Sorry, incorrect passphrase."
344msgid "Sorry, incorrect passphrase."
337msgstr "Niestety, błędne hasło"
345msgstr "Niestety, błędne hasło"
338
346
339−#: qml/Shell.qml:364
347+#: qml/Shell.qml:391
340msgid "Sorry, incorrect passcode."
348msgid "Sorry, incorrect passcode."
341msgstr "Niestety, błędny kod"
349msgstr "Niestety, błędny kod"
342
350
343−#: qml/Shell.qml:365
351+#: qml/Shell.qml:392
344msgid "This will be your last attempt."
352msgid "This will be your last attempt."
345msgstr ""
353msgstr ""
346
354
347−#: qml/Shell.qml:367
355+#: qml/Shell.qml:394
348msgid ""
356msgid ""
349"If passphrase is entered incorrectly, your phone will conduct a factory "
357"If passphrase is entered incorrectly, your phone will conduct a factory "
350"reset and all personal data will be deleted."
358"reset and all personal data will be deleted."
351msgstr ""
359msgstr ""
352
360
353−#: qml/Shell.qml:368
361+#: qml/Shell.qml:395
354msgid ""
362msgid ""
355"If passcode is entered incorrectly, your phone will conduct a factory reset "
363"If passcode is entered incorrectly, your phone will conduct a factory reset "
356"and all personal data will be deleted."
364"and all personal data will be deleted."
po/pt.po+65−55
@@ -7,14 +7,15 @@ msgid ""
7msgstr ""
7msgstr ""
8"Project-Id-Version: unity8\n"
8"Project-Id-Version: unity8\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2014-09-24 10:43+0100\n"
10+"POT-Creation-Date: 2014-10-07 11:37+0300\n"
11−"PO-Revision-Date: 2014-09-28 18:52+0000\n"
11+"PO-Revision-Date: 2014-10-07 08:31+0000\n"
12"Last-Translator: Ivo Xavier <ivofernandes12@gmail.com>\n"
12"Last-Translator: Ivo Xavier <ivofernandes12@gmail.com>\n"
13"Language-Team: Portuguese <pt@li.org>\n"
13"Language-Team: Portuguese <pt@li.org>\n"
14"MIME-Version: 1.0\n"
14"MIME-Version: 1.0\n"
15"Content-Type: text/plain; charset=UTF-8\n"
15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n"
16"Content-Transfer-Encoding: 8bit\n"
17+"Plural-Forms: nplurals=2; plural=n != 1;\n"
17−"X-Launchpad-Export-Date: 2014-09-29 05:20+0000\n"
18+"X-Launchpad-Export-Date: 2014-10-09 06:36+0000\n"
18"X-Generator: Launchpad (build 17196)\n"
19"X-Generator: Launchpad (build 17196)\n"
19
20
20#: plugins/LightDM/Greeter.cpp:130
21#: plugins/LightDM/Greeter.cpp:130
@@ -30,6 +31,25 @@ msgstr "Afixar atalho"
30msgid "Unpin shortcut"
31msgid "Unpin shortcut"
31msgstr "Remover atalho"
32msgstr "Remover atalho"
32
33
34+#: qml/Components/DelayedLockscreen.qml:47
35+msgid "Device Locked"
36+msgstr "Dispositivo bloqueado"
37+
38+#: qml/Components/DelayedLockscreen.qml:62
39+msgid "You have been locked out due to too many failed passphrase attempts."
40+msgstr "Foi bloqueado devido a muitas tentativas falhadas da frase-senha."
41+
42+#: qml/Components/DelayedLockscreen.qml:63
43+msgid "You have been locked out due to too many failed passcode attempts."
44+msgstr "Foi bloqueado devido a muitas tentativas falhadas da senha."
45+
46+#: qml/Components/DelayedLockscreen.qml:72
47+#, qt-format
48+msgid "Please wait %1 minute and then try again…"
49+msgid_plural "Please wait %1 minutes and then try again…"
50+msgstr[0] "Por favor, aguarde %1 minuto e tente novamente…"
51+msgstr[1] "Por favor, aguarde %1 minutos e tente novamente…"
52+
33#: qml/Components/Dialogs.qml:70
53#: qml/Components/Dialogs.qml:70
34msgid "Log out"
54msgid "Log out"
35msgstr "Terminar sessão"
55msgstr "Terminar sessão"
@@ -137,40 +157,23 @@ msgstr ""
137"Já domina os gestos dos limites e pode começar a usar o "
157"Já domina os gestos dos limites e pode começar a usar o "
138"telefone<br><br>Toque no ecrã para começar"
158"telefone<br><br>Toque no ecrã para começar"
139
159
140−#: qml/Components/Lockscreen.qml:167
160+#: qml/Components/Lockscreen.qml:220
141−msgid "Please wait"
142−msgstr "Por favor aguarde"
143−
144−#: qml/Components/Lockscreen.qml:172
145−msgid "Too many incorrect attempts"
146−msgstr "Demasiadas tentativas incorrectas"
147−
148−#: qml/Components/Lockscreen.qml:206
149msgid "Emergency Call"
161msgid "Emergency Call"
150msgstr "Chamada de emergência"
162msgstr "Chamada de emergência"
151
163
152−#: qml/Components/Lockscreen.qml:226
164+#: qml/Components/Lockscreen.qml:252
153msgid "OK"
165msgid "OK"
154msgstr "OK"
166msgstr "OK"
155
167
156−#: qml/Components/PassphraseLockscreen.qml:61
157−#, qt-format
158−msgid "Hello %1"
159−msgstr "Olá %1"
160−
161−#: qml/Components/PassphraseLockscreen.qml:61
162−msgid "Hello"
163−msgstr "Olá"
164−
165−#: qml/Dash/GenericScopeView.qml:411 qml/Dash/GenericScopeView.qml:533
168+#: qml/Dash/GenericScopeView.qml:434 qml/Dash/GenericScopeView.qml:591
166msgid "See less"
169msgid "See less"
167msgstr "Ver menos"
170msgstr "Ver menos"
168
171
169−#: qml/Dash/GenericScopeView.qml:411
172+#: qml/Dash/GenericScopeView.qml:434
170msgid "See all"
173msgid "See all"
171msgstr "Ver todos"
174msgstr "Ver todos"
172
175
173−#: qml/Dash/GenericScopeView.qml:473 qml/Dash/PageHeader.qml:258
176+#: qml/Dash/GenericScopeView.qml:496 qml/Dash/PageHeader.qml:258
174#: qml/Panel/SearchIndicator.qml:27
177#: qml/Panel/SearchIndicator.qml:27
175msgid "Search"
178msgid "Search"
176msgstr "Procurar"
179msgstr "Procurar"
@@ -207,6 +210,14 @@ msgstr "Adicione uma crítica"
207msgid "Send"
210msgid "Send"
208msgstr "Enviar"
211msgstr "Enviar"
209
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+
210#: qml/Dash/ScopesOverview.qml:206
221#: qml/Dash/ScopesOverview.qml:206
211msgid "Manage Scopes"
222msgid "Manage Scopes"
212msgstr "Gerir Scopes"
223msgstr "Gerir Scopes"
@@ -228,8 +239,8 @@ msgid "All"
228msgstr "Todos"
239msgstr "Todos"
229
240
230#: qml/Greeter/Greeter.qml:157
241#: qml/Greeter/Greeter.qml:157
231−msgid "Swipe to unlock"
242+msgid "Unlock"
232−msgstr "Deslize para desbloquear"
243+msgstr "Desbloquear"
233
244
234#: qml/Hud/HudParametrizedActionsPage.qml:139
245#: qml/Hud/HudParametrizedActionsPage.qml:139
235msgid "Confirm"
246msgid "Confirm"
@@ -251,18 +262,10 @@ msgstr "Fale agora..."
251msgid "Speaking..."
262msgid "Speaking..."
252msgstr "A falar..."
263msgstr "A falar..."
253
264
254−#: qml/Notifications/NotificationMenuItemFactory.qml:108
265+#: qml/Notifications/NotificationMenuItemFactory.qml:116
255msgid "Show password"
266msgid "Show password"
256msgstr "Mostrar palavra-passe"
267msgstr "Mostrar palavra-passe"
257
268
258−#: qml/Notifications/NotificationMenuItemFactory.qml:124
259−msgid "Enter SIM PIN"
260−msgstr "Introduza o PIN do SIM"
261−
262−#: qml/Notifications/NotificationMenuItemFactory.qml:125
263−msgid "Sorry, incorrect PIN"
264−msgstr "Desculpe, PIN incorreto"
265−
266#: qml/Panel/ActiveCallHint.qml:77
269#: qml/Panel/ActiveCallHint.qml:77
267msgid "Tap to return to call..."
270msgid "Tap to return to call..."
268msgstr "Tocar para ligar de volta..."
271msgstr "Tocar para ligar de volta..."
@@ -307,45 +310,49 @@ msgstr "Desbloquear SIM"
307msgid "Roaming"
310msgid "Roaming"
308msgstr "Roaming"
311msgstr "Roaming"
309
312
310−#: qml/Shell.qml:320
313+#: qml/Shell.qml:346
311−msgid "Enter your passphrase"
314+msgid "Enter passphrase"
312−msgstr "Introduza a sua frase-senha"
315+msgstr "Indique a frase-senha"
313
316
314−#: qml/Shell.qml:321
317+#: qml/Shell.qml:347
315msgid "Sorry, incorrect passphrase"
318msgid "Sorry, incorrect passphrase"
316msgstr "Desculpe, frase-senha incorreta"
319msgstr "Desculpe, frase-senha incorreta"
317
320
318−#: qml/Shell.qml:323
321+#: qml/Shell.qml:348
319−msgid "Enter your passcode"
322+msgid "Please re-enter"
320−msgstr "Introduza a sua senha"
323+msgstr "Por favor, volte a introduzir"
321
324
322−#: qml/Shell.qml:324
325+#: qml/Shell.qml:350
326+msgid "Enter passcode"
327+msgstr "Introduza senha"
328+
329+#: qml/Shell.qml:351
323msgid "Sorry, incorrect passcode"
330msgid "Sorry, incorrect passcode"
324msgstr "Desculpe, senha incorreta"
331msgstr "Desculpe, senha incorreta"
325
332
326−#: qml/Shell.qml:327
333+#: qml/Shell.qml:354
327#, qt-format
334#, qt-format
328−msgid "Enter your %1"
335+msgid "Enter %1"
329−msgstr "Introduza o seu %1"
336+msgstr "Introduziu %1"
330
337
331−#: qml/Shell.qml:328
338+#: qml/Shell.qml:355
332#, qt-format
339#, qt-format
333msgid "Sorry, incorrect %1"
340msgid "Sorry, incorrect %1"
334msgstr "Desculpe, incorreto %1"
341msgstr "Desculpe, incorreto %1"
335
342
336−#: qml/Shell.qml:363
343+#: qml/Shell.qml:390
337msgid "Sorry, incorrect passphrase."
344msgid "Sorry, incorrect passphrase."
338msgstr "Desculpe, frase de acesso incorreta."
345msgstr "Desculpe, frase de acesso incorreta."
339
346
340−#: qml/Shell.qml:364
347+#: qml/Shell.qml:391
341msgid "Sorry, incorrect passcode."
348msgid "Sorry, incorrect passcode."
342msgstr "Desculpe, senha incorreta."
349msgstr "Desculpe, senha incorreta."
343
350
344−#: qml/Shell.qml:365
351+#: qml/Shell.qml:392
345msgid "This will be your last attempt."
352msgid "This will be your last attempt."
346msgstr "Esta será a sua última tentativa."
353msgstr "Esta será a sua última tentativa."
347
354
348−#: qml/Shell.qml:367
355+#: qml/Shell.qml:394
349msgid ""
356msgid ""
350"If passphrase is entered incorrectly, your phone will conduct a factory "
357"If passphrase is entered incorrectly, your phone will conduct a factory "
351"reset and all personal data will be deleted."
358"reset and all personal data will be deleted."
@@ -353,7 +360,7 @@ msgstr ""
353"Se a frase de acesso for introduzida incorretamente, o seu telemóvel vai "
360"Se a frase de acesso for introduzida incorretamente, o seu telemóvel vai "
354"proceder ao restauro de fábrica e apagará toda a sua informação pessoal."
361"proceder ao restauro de fábrica e apagará toda a sua informação pessoal."
355
362
356−#: qml/Shell.qml:368
363+#: qml/Shell.qml:395
357msgid ""
364msgid ""
358"If passcode is entered incorrectly, your phone will conduct a factory reset "
365"If passcode is entered incorrectly, your phone will conduct a factory reset "
359"and all personal data will be deleted."
366"and all personal data will be deleted."
@@ -361,5 +368,8 @@ msgstr ""
361"Se a senha for introduzida incorretamente, o seu telemóvel vai apagar todos "
368"Se a senha for introduzida incorretamente, o seu telemóvel vai apagar todos "
362"os seus dados pessoais."
369"os seus dados pessoais."
363
370
364−#~ msgid "Manage Dash"
371+#~ msgid "Sorry, incorrect PIN"
365−#~ msgstr "Gerir o Dash"
372+#~ msgstr "Desculpe, PIN incorreto"
373+
374+#~ msgid "Enter SIM PIN"
375+#~ msgstr "Introduza o PIN do SIM"
po/pt_BR.po+68−58
@@ -7,14 +7,15 @@ msgid ""
7msgstr ""
7msgstr ""
8"Project-Id-Version: unity\n"
8"Project-Id-Version: unity\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2014-09-24 10:43+0100\n"
10+"POT-Creation-Date: 2014-10-07 11:37+0300\n"
11−"PO-Revision-Date: 2014-08-27 19:23+0000\n"
11+"PO-Revision-Date: 2014-09-30 17:37+0000\n"
12"Last-Translator: Rafael Neri <Unknown>\n"
12"Last-Translator: Rafael Neri <Unknown>\n"
13"Language-Team: Brazilian Portuguese <pt_BR@li.org>\n"
13"Language-Team: Brazilian Portuguese <pt_BR@li.org>\n"
14"MIME-Version: 1.0\n"
14"MIME-Version: 1.0\n"
15"Content-Type: text/plain; charset=UTF-8\n"
15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n"
16"Content-Transfer-Encoding: 8bit\n"
17+"Plural-Forms: nplurals=2; plural=n > 1;\n"
17−"X-Launchpad-Export-Date: 2014-09-29 05:20+0000\n"
18+"X-Launchpad-Export-Date: 2014-10-09 06:37+0000\n"
18"X-Generator: Launchpad (build 17196)\n"
19"X-Generator: Launchpad (build 17196)\n"
19
20
20#: plugins/LightDM/Greeter.cpp:130
21#: plugins/LightDM/Greeter.cpp:130
@@ -30,6 +31,25 @@ msgstr "Fixar atalho"
30msgid "Unpin shortcut"
31msgid "Unpin shortcut"
31msgstr "Desafixar atalho"
32msgstr "Desafixar atalho"
32
33
34+#: qml/Components/DelayedLockscreen.qml:47
35+msgid "Device Locked"
36+msgstr ""
37+
38+#: qml/Components/DelayedLockscreen.qml:62
39+msgid "You have been locked out due to too many failed passphrase attempts."
40+msgstr ""
41+
42+#: qml/Components/DelayedLockscreen.qml:63
43+msgid "You have been locked out due to too many failed passcode attempts."
44+msgstr ""
45+
46+#: qml/Components/DelayedLockscreen.qml:72
47+#, qt-format
48+msgid "Please wait %1 minute and then try again…"
49+msgid_plural "Please wait %1 minutes and then try again…"
50+msgstr[0] ""
51+msgstr[1] ""
52+
33#: qml/Components/Dialogs.qml:70
53#: qml/Components/Dialogs.qml:70
34msgid "Log out"
54msgid "Log out"
35msgstr "Sair"
55msgstr "Sair"
@@ -82,7 +102,7 @@ msgstr "Desligar"
82
102
83#: qml/Components/Dialogs.qml:157
103#: qml/Components/Dialogs.qml:157
84msgid "Restart"
104msgid "Restart"
85−msgstr ""
105+msgstr "Reiniciar"
86
106
87#: qml/Components/Dialogs.qml:167
107#: qml/Components/Dialogs.qml:167
88msgid "Cancel"
108msgid "Cancel"
@@ -138,40 +158,23 @@ msgstr ""
138"Agora você já domina os gestos das bordas e pode começar a usar o "
158"Agora você já domina os gestos das bordas e pode começar a usar o "
139"telefone<br><br>Toque na tela para iniciar"
159"telefone<br><br>Toque na tela para iniciar"
140
160
141−#: qml/Components/Lockscreen.qml:167
161+#: qml/Components/Lockscreen.qml:220
142−msgid "Please wait"
143−msgstr "Por favor, aguarde"
144−
145−#: qml/Components/Lockscreen.qml:172
146−msgid "Too many incorrect attempts"
147−msgstr "Muitas tentativas incorretas"
148−
149−#: qml/Components/Lockscreen.qml:206
150msgid "Emergency Call"
162msgid "Emergency Call"
151msgstr "Chamada de emergência"
163msgstr "Chamada de emergência"
152
164
153−#: qml/Components/Lockscreen.qml:226
165+#: qml/Components/Lockscreen.qml:252
154msgid "OK"
166msgid "OK"
155msgstr "OK"
167msgstr "OK"
156
168
157−#: qml/Components/PassphraseLockscreen.qml:61
158−#, qt-format
159−msgid "Hello %1"
160−msgstr "Olá %1"
161−
162−#: qml/Components/PassphraseLockscreen.qml:61
163−msgid "Hello"
164−msgstr "Olá"
165−
166−#: qml/Dash/GenericScopeView.qml:411 qml/Dash/GenericScopeView.qml:533
169+#: qml/Dash/GenericScopeView.qml:434 qml/Dash/GenericScopeView.qml:591
167msgid "See less"
170msgid "See less"
168msgstr "Ver menos"
171msgstr "Ver menos"
169
172
170−#: qml/Dash/GenericScopeView.qml:411
173+#: qml/Dash/GenericScopeView.qml:434
171msgid "See all"
174msgid "See all"
172msgstr "Ver todos"
175msgstr "Ver todos"
173
176
174−#: qml/Dash/GenericScopeView.qml:473 qml/Dash/PageHeader.qml:258
177+#: qml/Dash/GenericScopeView.qml:496 qml/Dash/PageHeader.qml:258
175#: qml/Panel/SearchIndicator.qml:27
178#: qml/Panel/SearchIndicator.qml:27
176msgid "Search"
179msgid "Search"
177msgstr "Pesquisar"
180msgstr "Pesquisar"
@@ -208,9 +211,17 @@ msgstr "Adicionar uma análise"
208msgid "Send"
211msgid "Send"
209msgstr "Enviar"
212msgstr "Enviar"
210
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+
211#: qml/Dash/ScopesOverview.qml:206
222#: qml/Dash/ScopesOverview.qml:206
212msgid "Manage Scopes"
223msgid "Manage Scopes"
213−msgstr ""
224+msgstr "Gerenciar Plugins"
214
225
215#: qml/Dash/ScopesOverview.qml:428
226#: qml/Dash/ScopesOverview.qml:428
216msgid "Done"
227msgid "Done"
@@ -229,8 +240,8 @@ msgid "All"
229msgstr "Tudo"
240msgstr "Tudo"
230
241
231#: qml/Greeter/Greeter.qml:157
242#: qml/Greeter/Greeter.qml:157
232−msgid "Swipe to unlock"
243+msgid "Unlock"
233−msgstr "Deslizar para desbloquear"
244+msgstr ""
234
245
235#: qml/Hud/HudParametrizedActionsPage.qml:139
246#: qml/Hud/HudParametrizedActionsPage.qml:139
236msgid "Confirm"
247msgid "Confirm"
@@ -252,18 +263,10 @@ msgstr "Fale agora..."
252msgid "Speaking..."
263msgid "Speaking..."
253msgstr "Falando..."
264msgstr "Falando..."
254
265
255−#: qml/Notifications/NotificationMenuItemFactory.qml:108
266+#: qml/Notifications/NotificationMenuItemFactory.qml:116
256msgid "Show password"
267msgid "Show password"
257msgstr "Exibir senha"
268msgstr "Exibir senha"
258
269
259−#: qml/Notifications/NotificationMenuItemFactory.qml:124
260−msgid "Enter SIM PIN"
261−msgstr "Digite o PIN do SIM"
262−
263−#: qml/Notifications/NotificationMenuItemFactory.qml:125
264−msgid "Sorry, incorrect PIN"
265−msgstr "Desculpe, PIN incorreto"
266−
267#: qml/Panel/ActiveCallHint.qml:77
270#: qml/Panel/ActiveCallHint.qml:77
268msgid "Tap to return to call..."
271msgid "Tap to return to call..."
269msgstr "Toque para retornar para a chamada..."
272msgstr "Toque para retornar para a chamada..."
@@ -274,7 +277,7 @@ msgstr "Conferência"
274
277
275#: qml/Panel/Indicators/MenuItemFactory.qml:600
278#: qml/Panel/Indicators/MenuItemFactory.qml:600
276msgid "Nothing is playing"
279msgid "Nothing is playing"
277−msgstr ""
280+msgstr "Nada está tocando"
278
281
279#: qml/Panel/Indicators/MenuItemFactory.qml:748
282#: qml/Panel/Indicators/MenuItemFactory.qml:748
280msgid "In queue…"
283msgid "In queue…"
@@ -308,45 +311,49 @@ msgstr "Desbloquear SIM"
308msgid "Roaming"
311msgid "Roaming"
309msgstr "Roaming"
312msgstr "Roaming"
310
313
311−#: qml/Shell.qml:320
314+#: qml/Shell.qml:346
312−msgid "Enter your passphrase"
315+msgid "Enter passphrase"
313−msgstr "Digite sua senha"
316+msgstr ""
314
317
315−#: qml/Shell.qml:321
318+#: qml/Shell.qml:347
316msgid "Sorry, incorrect passphrase"
319msgid "Sorry, incorrect passphrase"
317msgstr "Desculpe, senha incorreta"
320msgstr "Desculpe, senha incorreta"
318
321
319−#: qml/Shell.qml:323
322+#: qml/Shell.qml:348
320−msgid "Enter your passcode"
323+msgid "Please re-enter"
321−msgstr "Digite sua senha"
324+msgstr ""
322
325
323−#: qml/Shell.qml:324
326+#: qml/Shell.qml:350
327+msgid "Enter passcode"
328+msgstr ""
329+
330+#: qml/Shell.qml:351
324msgid "Sorry, incorrect passcode"
331msgid "Sorry, incorrect passcode"
325msgstr "Desculpe, senha incorreta"
332msgstr "Desculpe, senha incorreta"
326
333
327−#: qml/Shell.qml:327
334+#: qml/Shell.qml:354
328#, qt-format
335#, qt-format
329−msgid "Enter your %1"
336+msgid "Enter %1"
330−msgstr "Digite o seu %1"
337+msgstr ""
331
338
332−#: qml/Shell.qml:328
339+#: qml/Shell.qml:355
333#, qt-format
340#, qt-format
334msgid "Sorry, incorrect %1"
341msgid "Sorry, incorrect %1"
335msgstr "Desculpe, %1 incorreto"
342msgstr "Desculpe, %1 incorreto"
336
343
337−#: qml/Shell.qml:363
344+#: qml/Shell.qml:390
338msgid "Sorry, incorrect passphrase."
345msgid "Sorry, incorrect passphrase."
339msgstr "Desculpe, senha incorreta."
346msgstr "Desculpe, senha incorreta."
340
347
341−#: qml/Shell.qml:364
348+#: qml/Shell.qml:391
342msgid "Sorry, incorrect passcode."
349msgid "Sorry, incorrect passcode."
343msgstr "Desculpe, código de acesso incorreto."
350msgstr "Desculpe, código de acesso incorreto."
344
351
345−#: qml/Shell.qml:365
352+#: qml/Shell.qml:392
346msgid "This will be your last attempt."
353msgid "This will be your last attempt."
347msgstr "Esta será a sua última tentativa."
354msgstr "Esta será a sua última tentativa."
348
355
349−#: qml/Shell.qml:367
356+#: qml/Shell.qml:394
350msgid ""
357msgid ""
351"If passphrase is entered incorrectly, your phone will conduct a factory "
358"If passphrase is entered incorrectly, your phone will conduct a factory "
352"reset and all personal data will be deleted."
359"reset and all personal data will be deleted."
@@ -354,7 +361,7 @@ msgstr ""
354"Se a senha for digitada incorretamente, o telefone será restaurado aos "
361"Se a senha for digitada incorretamente, o telefone será restaurado aos "
355"padrões de fábrica e todos os dados pessoais serão apagados."
362"padrões de fábrica e todos os dados pessoais serão apagados."
356
363
357−#: qml/Shell.qml:368
364+#: qml/Shell.qml:395
358msgid ""
365msgid ""
359"If passcode is entered incorrectly, your phone will conduct a factory reset "
366"If passcode is entered incorrectly, your phone will conduct a factory reset "
360"and all personal data will be deleted."
367"and all personal data will be deleted."
@@ -362,5 +369,8 @@ msgstr ""
362"Se o código de acesso for digitado incorretamente, o telefone será "
369"Se o código de acesso for digitado incorretamente, o telefone será "
363"restaurado aos padrões de fábrica e todos os dados pessoais serão apagados."
370"restaurado aos padrões de fábrica e todos os dados pessoais serão apagados."
364
371
365−#~ msgid "Manage Dash"
372+#~ msgid "Sorry, incorrect PIN"
366−#~ msgstr "Gerencia painel"
373+#~ msgstr "Desculpe, PIN incorreto"
374+
375+#~ msgid "Enter SIM PIN"
376+#~ msgstr "Digite o PIN do SIM"
po/ro.po+69−54
@@ -7,14 +7,16 @@ msgid ""
7msgstr ""
7msgstr ""
8"Project-Id-Version: unity\n"
8"Project-Id-Version: unity\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2014-09-24 10:43+0100\n"
10+"POT-Creation-Date: 2014-10-07 11:37+0300\n"
11−"PO-Revision-Date: 2014-09-28 13:24+0000\n"
11+"PO-Revision-Date: 2014-10-07 15:54+0000\n"
12"Last-Translator: Marian Vasile <marianvasile1972@gmail.com>\n"
12"Last-Translator: Marian Vasile <marianvasile1972@gmail.com>\n"
13"Language-Team: Romanian <ro@li.org>\n"
13"Language-Team: Romanian <ro@li.org>\n"
14"MIME-Version: 1.0\n"
14"MIME-Version: 1.0\n"
15"Content-Type: text/plain; charset=UTF-8\n"
15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n"
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"
17−"X-Launchpad-Export-Date: 2014-09-29 05:20+0000\n"
19+"X-Launchpad-Export-Date: 2014-10-09 06:36+0000\n"
18"X-Generator: Launchpad (build 17196)\n"
20"X-Generator: Launchpad (build 17196)\n"
19
21
20#: plugins/LightDM/Greeter.cpp:130
22#: plugins/LightDM/Greeter.cpp:130
@@ -30,6 +32,29 @@ msgstr "Fixează scurtătura"
30msgid "Unpin shortcut"
32msgid "Unpin shortcut"
31msgstr "Eliberează scurtătura"
33msgstr "Eliberează scurtătura"
32
34
35+#: qml/Components/DelayedLockscreen.qml:47
36+msgid "Device Locked"
37+msgstr "Dispozitiv blocat"
38+
39+#: qml/Components/DelayedLockscreen.qml:62
40+msgid "You have been locked out due to too many failed passphrase attempts."
41+msgstr ""
42+"Dispozitivul este blocat din cauza utilizării mai multor fraze parolă "
43+"greșite."
44+
45+#: qml/Components/DelayedLockscreen.qml:63
46+msgid "You have been locked out due to too many failed passcode attempts."
47+msgstr ""
48+"Dispozitivul este blocat din cauza utilizării mai multor parole greșite."
49+
50+#: qml/Components/DelayedLockscreen.qml:72
51+#, qt-format
52+msgid "Please wait %1 minute and then try again…"
53+msgid_plural "Please wait %1 minutes and then try again…"
54+msgstr[0] "Așteptați %1 minut și apoi încercați din nou..."
55+msgstr[1] "Așteptați %1 minute și apoi încercați din nou..."
56+msgstr[2] "Așteptați %1 de minute și apoi încercați din nou..."
57+
33#: qml/Components/Dialogs.qml:70
58#: qml/Components/Dialogs.qml:70
34msgid "Log out"
59msgid "Log out"
35msgstr "Închide sesiunea"
60msgstr "Închide sesiunea"
@@ -139,40 +164,23 @@ msgstr ""
139"De acum stăpâniți gesturile de control și puteți începe să utilizați "
164"De acum stăpâniți gesturile de control și puteți începe să utilizați "
140"telefonul<br><br>Atingeți ecranul pentru a începe"
165"telefonul<br><br>Atingeți ecranul pentru a începe"
141
166
142−#: qml/Components/Lockscreen.qml:167
167+#: qml/Components/Lockscreen.qml:220
143−msgid "Please wait"
144−msgstr "Așteptați"
145−
146−#: qml/Components/Lockscreen.qml:172
147−msgid "Too many incorrect attempts"
148−msgstr "Prea multe încercări greșite"
149−
150−#: qml/Components/Lockscreen.qml:206
151msgid "Emergency Call"
168msgid "Emergency Call"
152msgstr "Apel de urgență"
169msgstr "Apel de urgență"
153
170
154−#: qml/Components/Lockscreen.qml:226
171+#: qml/Components/Lockscreen.qml:252
155msgid "OK"
172msgid "OK"
156msgstr "În regulă"
173msgstr "În regulă"
157
174
158−#: qml/Components/PassphraseLockscreen.qml:61
159−#, qt-format
160−msgid "Hello %1"
161−msgstr "Salutări %1"
162−
163−#: qml/Components/PassphraseLockscreen.qml:61
164−msgid "Hello"
165−msgstr "Salutări"
166−
167−#: qml/Dash/GenericScopeView.qml:411 qml/Dash/GenericScopeView.qml:533
175+#: qml/Dash/GenericScopeView.qml:434 qml/Dash/GenericScopeView.qml:591
168msgid "See less"
176msgid "See less"
169msgstr "Afișează mai puține"
177msgstr "Afișează mai puține"
170
178
171−#: qml/Dash/GenericScopeView.qml:411
179+#: qml/Dash/GenericScopeView.qml:434
172msgid "See all"
180msgid "See all"
173msgstr "Afișează tot"
181msgstr "Afișează tot"
174
182
175−#: qml/Dash/GenericScopeView.qml:473 qml/Dash/PageHeader.qml:258
183+#: qml/Dash/GenericScopeView.qml:496 qml/Dash/PageHeader.qml:258
176#: qml/Panel/SearchIndicator.qml:27
184#: qml/Panel/SearchIndicator.qml:27
177msgid "Search"
185msgid "Search"
178msgstr "Căutare"
186msgstr "Căutare"
@@ -209,6 +217,14 @@ msgstr "Adăugați o recenzie"
209msgid "Send"
217msgid "Send"
210msgstr "Trimite"
218msgstr "Trimite"
211
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+
212#: qml/Dash/ScopesOverview.qml:206
228#: qml/Dash/ScopesOverview.qml:206
213msgid "Manage Scopes"
229msgid "Manage Scopes"
214msgstr "Administrare domenii"
230msgstr "Administrare domenii"
@@ -230,8 +246,8 @@ msgid "All"
230msgstr "Tot"
246msgstr "Tot"
231
247
232#: qml/Greeter/Greeter.qml:157
248#: qml/Greeter/Greeter.qml:157
233−msgid "Swipe to unlock"
249+msgid "Unlock"
234−msgstr "Glisați pentru deblocare"
250+msgstr "Deblocare"
235
251
236#: qml/Hud/HudParametrizedActionsPage.qml:139
252#: qml/Hud/HudParametrizedActionsPage.qml:139
237msgid "Confirm"
253msgid "Confirm"
@@ -253,18 +269,10 @@ msgstr "Vorbiți acum..."
253msgid "Speaking..."
269msgid "Speaking..."
254msgstr "Vorbire..."
270msgstr "Vorbire..."
255
271
256−#: qml/Notifications/NotificationMenuItemFactory.qml:108
272+#: qml/Notifications/NotificationMenuItemFactory.qml:116
257msgid "Show password"
273msgid "Show password"
258msgstr "Arată parola"
274msgstr "Arată parola"
259
275
260−#: qml/Notifications/NotificationMenuItemFactory.qml:124
261−msgid "Enter SIM PIN"
262−msgstr "Introduceți codul PIN pentru SIM"
263−
264−#: qml/Notifications/NotificationMenuItemFactory.qml:125
265−msgid "Sorry, incorrect PIN"
266−msgstr "Cod PIN incorect"
267−
268#: qml/Panel/ActiveCallHint.qml:77
276#: qml/Panel/ActiveCallHint.qml:77
269msgid "Tap to return to call..."
277msgid "Tap to return to call..."
270msgstr "Atingeți pentru a vă întoarce la convorbire..."
278msgstr "Atingeți pentru a vă întoarce la convorbire..."
@@ -309,45 +317,49 @@ msgstr "Deblocare SIM"
309msgid "Roaming"
317msgid "Roaming"
310msgstr "Roaming"
318msgstr "Roaming"
311
319
312−#: qml/Shell.qml:320
320+#: qml/Shell.qml:346
313−msgid "Enter your passphrase"
321+msgid "Enter passphrase"
314−msgstr "Introduceți fraza dumneavoastră secretă"
322+msgstr "Introduceți fraza parolă"
315
323
316−#: qml/Shell.qml:321
324+#: qml/Shell.qml:347
317msgid "Sorry, incorrect passphrase"
325msgid "Sorry, incorrect passphrase"
318msgstr "Frază secretă incorectă"
326msgstr "Frază secretă incorectă"
319
327
320−#: qml/Shell.qml:323
328+#: qml/Shell.qml:348
329+msgid "Please re-enter"
330+msgstr "Introduceți din nou"
331+
332+#: qml/Shell.qml:350
321−msgid "Enter your passcode"
333+msgid "Enter passcode"
322msgstr "Introduceți parola"
334msgstr "Introduceți parola"
323
335
324−#: qml/Shell.qml:324
336+#: qml/Shell.qml:351
325msgid "Sorry, incorrect passcode"
337msgid "Sorry, incorrect passcode"
326msgstr "Parolă incorectă"
338msgstr "Parolă incorectă"
327
339
328−#: qml/Shell.qml:327
340+#: qml/Shell.qml:354
329#, qt-format
341#, qt-format
330−msgid "Enter your %1"
342+msgid "Enter %1"
331−msgstr "Introduceți %1"
343+msgstr "Introducere %1"
332
344
333−#: qml/Shell.qml:328
345+#: qml/Shell.qml:355
334#, qt-format
346#, qt-format
335msgid "Sorry, incorrect %1"
347msgid "Sorry, incorrect %1"
336msgstr "%1 incorectă"
348msgstr "%1 incorectă"
337
349
338−#: qml/Shell.qml:363
350+#: qml/Shell.qml:390
339msgid "Sorry, incorrect passphrase."
351msgid "Sorry, incorrect passphrase."
340msgstr "Frază parolă greșită"
352msgstr "Frază parolă greșită"
341
353
342−#: qml/Shell.qml:364
354+#: qml/Shell.qml:391
343msgid "Sorry, incorrect passcode."
355msgid "Sorry, incorrect passcode."
344msgstr "Parolă greșită"
356msgstr "Parolă greșită"
345
357
346−#: qml/Shell.qml:365
358+#: qml/Shell.qml:392
347msgid "This will be your last attempt."
359msgid "This will be your last attempt."
348msgstr "Aceasta va fi ultima încercare"
360msgstr "Aceasta va fi ultima încercare"
349
361
350−#: qml/Shell.qml:367
362+#: qml/Shell.qml:394
351msgid ""
363msgid ""
352"If passphrase is entered incorrectly, your phone will conduct a factory "
364"If passphrase is entered incorrectly, your phone will conduct a factory "
353"reset and all personal data will be deleted."
365"reset and all personal data will be deleted."
@@ -356,7 +368,7 @@ msgstr ""
356"configurările inițiale, ale fabricantului, iar toate datele personale vor fi "
368"configurările inițiale, ale fabricantului, iar toate datele personale vor fi "
357"șterse."
369"șterse."
358
370
359−#: qml/Shell.qml:368
371+#: qml/Shell.qml:395
360msgid ""
372msgid ""
361"If passcode is entered incorrectly, your phone will conduct a factory reset "
373"If passcode is entered incorrectly, your phone will conduct a factory reset "
362"and all personal data will be deleted."
374"and all personal data will be deleted."
@@ -365,5 +377,8 @@ msgstr ""
365"configurările inițiale, ale fabricantului, iar toate datele personale vor fi "
377"configurările inițiale, ale fabricantului, iar toate datele personale vor fi "
366"șterse."
378"șterse."
367
379
368−#~ msgid "Manage Dash"
380+#~ msgid "Enter SIM PIN"
369−#~ msgstr "Administrare Panou principal"
381+#~ msgstr "Introduceți codul PIN pentru SIM"
382+
383+#~ msgid "Sorry, incorrect PIN"
384+#~ msgstr "Cod PIN incorect"
po/ru.po+67−53
@@ -7,14 +7,16 @@ msgid ""
7msgstr ""
7msgstr ""
8"Project-Id-Version: unity\n"
8"Project-Id-Version: unity\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2014-09-24 10:43+0100\n"
10+"POT-Creation-Date: 2014-10-07 11:37+0300\n"
11"PO-Revision-Date: 2014-08-29 08:06+0000\n"
11"PO-Revision-Date: 2014-08-29 08:06+0000\n"
12"Last-Translator: Jay ZDLin <Unknown>\n"
12"Last-Translator: Jay ZDLin <Unknown>\n"
13"Language-Team: Russian <ru@li.org>\n"
13"Language-Team: Russian <ru@li.org>\n"
14"MIME-Version: 1.0\n"
14"MIME-Version: 1.0\n"
15"Content-Type: text/plain; charset=UTF-8\n"
15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n"
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"
17−"X-Launchpad-Export-Date: 2014-09-29 05:20+0000\n"
19+"X-Launchpad-Export-Date: 2014-10-09 06:36+0000\n"
18"X-Generator: Launchpad (build 17196)\n"
20"X-Generator: Launchpad (build 17196)\n"
19
21
20#: plugins/LightDM/Greeter.cpp:130
22#: plugins/LightDM/Greeter.cpp:130
@@ -30,6 +32,25 @@ msgstr "Закрепить ярлык"
30msgid "Unpin shortcut"
32msgid "Unpin shortcut"
31msgstr "Изъять ярлык"
33msgstr "Изъять ярлык"
32
34
35+#: qml/Components/DelayedLockscreen.qml:47
36+msgid "Device Locked"
37+msgstr ""
38+
39+#: qml/Components/DelayedLockscreen.qml:62
40+msgid "You have been locked out due to too many failed passphrase attempts."
41+msgstr ""
42+
43+#: qml/Components/DelayedLockscreen.qml:63
44+msgid "You have been locked out due to too many failed passcode attempts."
45+msgstr ""
46+
47+#: qml/Components/DelayedLockscreen.qml:72
48+#, qt-format
49+msgid "Please wait %1 minute and then try again…"
50+msgid_plural "Please wait %1 minutes and then try again…"
51+msgstr[0] ""
52+msgstr[1] ""
53+
33#: qml/Components/Dialogs.qml:70
54#: qml/Components/Dialogs.qml:70
34msgid "Log out"
55msgid "Log out"
35msgstr "Завершение сеанса"
56msgstr "Завершение сеанса"
@@ -80,7 +101,7 @@ msgstr "Отключить"
80
101
81#: qml/Components/Dialogs.qml:157
102#: qml/Components/Dialogs.qml:157
82msgid "Restart"
103msgid "Restart"
83−msgstr ""
104+msgstr "Перезагрузить"
84
105
85#: qml/Components/Dialogs.qml:167
106#: qml/Components/Dialogs.qml:167
86msgid "Cancel"
107msgid "Cancel"
@@ -139,40 +160,23 @@ msgstr ""
139"Вы научились пользоваться Ubuntu и можете начать использовать свой "
160"Вы научились пользоваться Ubuntu и можете начать использовать свой "
140"телефон<br><br>Нажмите на экран"
161"телефон<br><br>Нажмите на экран"
141
162
142−#: qml/Components/Lockscreen.qml:167
163+#: qml/Components/Lockscreen.qml:220
143−msgid "Please wait"
144−msgstr "Подождите"
145−
146−#: qml/Components/Lockscreen.qml:172
147−msgid "Too many incorrect attempts"
148−msgstr "Слишком много ошибок ввода"
149−
150−#: qml/Components/Lockscreen.qml:206
151msgid "Emergency Call"
164msgid "Emergency Call"
152msgstr "Экстренный вызов"
165msgstr "Экстренный вызов"
153
166
154−#: qml/Components/Lockscreen.qml:226
167+#: qml/Components/Lockscreen.qml:252
155msgid "OK"
168msgid "OK"
156msgstr "ОК"
169msgstr "ОК"
157
170
158−#: qml/Components/PassphraseLockscreen.qml:61
159−#, qt-format
160−msgid "Hello %1"
161−msgstr "Привет, %1"
162−
163−#: qml/Components/PassphraseLockscreen.qml:61
164−msgid "Hello"
165−msgstr "Привет"
166−
167−#: qml/Dash/GenericScopeView.qml:411 qml/Dash/GenericScopeView.qml:533
171+#: qml/Dash/GenericScopeView.qml:434 qml/Dash/GenericScopeView.qml:591
168msgid "See less"
172msgid "See less"
169msgstr "Вкратце"
173msgstr "Вкратце"
170
174
171−#: qml/Dash/GenericScopeView.qml:411
175+#: qml/Dash/GenericScopeView.qml:434
172msgid "See all"
176msgid "See all"
173msgstr "Показать всё"
177msgstr "Показать всё"
174
178
175−#: qml/Dash/GenericScopeView.qml:473 qml/Dash/PageHeader.qml:258
179+#: qml/Dash/GenericScopeView.qml:496 qml/Dash/PageHeader.qml:258
176#: qml/Panel/SearchIndicator.qml:27
180#: qml/Panel/SearchIndicator.qml:27
177msgid "Search"
181msgid "Search"
178msgstr "Поиск"
182msgstr "Поиск"
@@ -209,6 +213,14 @@ msgstr "Добавьте отзыв"
209msgid "Send"
213msgid "Send"
210msgstr "Отправить"
214msgstr "Отправить"
211
215
216+#: qml/Dash/PullToRefreshScopeStyle.qml:55
217+msgid "Pull to refresh…"
218+msgstr ""
219+
220+#: qml/Dash/PullToRefreshScopeStyle.qml:60
221+msgid "Release to refresh…"
222+msgstr ""
223+
212#: qml/Dash/ScopesOverview.qml:206
224#: qml/Dash/ScopesOverview.qml:206
213msgid "Manage Scopes"
225msgid "Manage Scopes"
214msgstr ""
226msgstr ""
@@ -230,8 +242,8 @@ msgid "All"
230msgstr "Все"
242msgstr "Все"
231
243
232#: qml/Greeter/Greeter.qml:157
244#: qml/Greeter/Greeter.qml:157
233−msgid "Swipe to unlock"
245+msgid "Unlock"
234−msgstr "Смахните, чтобы разблокировать"
246+msgstr ""
235
247
236#: qml/Hud/HudParametrizedActionsPage.qml:139
248#: qml/Hud/HudParametrizedActionsPage.qml:139
237msgid "Confirm"
249msgid "Confirm"
@@ -253,18 +265,10 @@ msgstr "Говорите..."
253msgid "Speaking..."
265msgid "Speaking..."
254msgstr "Говорите..."
266msgstr "Говорите..."
255
267
256−#: qml/Notifications/NotificationMenuItemFactory.qml:108
268+#: qml/Notifications/NotificationMenuItemFactory.qml:116
257msgid "Show password"
269msgid "Show password"
258msgstr "Показать пароль"
270msgstr "Показать пароль"
259
271
260−#: qml/Notifications/NotificationMenuItemFactory.qml:124
261−msgid "Enter SIM PIN"
262−msgstr "Введите ПИН-код SIM-карты"
263−
264−#: qml/Notifications/NotificationMenuItemFactory.qml:125
265−msgid "Sorry, incorrect PIN"
266−msgstr "Введён неверный ПИН-код"
267−
268#: qml/Panel/ActiveCallHint.qml:77
272#: qml/Panel/ActiveCallHint.qml:77
269msgid "Tap to return to call..."
273msgid "Tap to return to call..."
270msgstr "Коснитесь для возврата к вызову..."
274msgstr "Коснитесь для возврата к вызову..."
@@ -309,45 +313,49 @@ msgstr "Разблокировать SIM-карту"
309msgid "Roaming"
313msgid "Roaming"
310msgstr "Роуминг"
314msgstr "Роуминг"
311
315
312−#: qml/Shell.qml:320
316+#: qml/Shell.qml:346
313−msgid "Enter your passphrase"
317+msgid "Enter passphrase"
314−msgstr "Введите кодовую фразу"
318+msgstr ""
315
319
316−#: qml/Shell.qml:321
320+#: qml/Shell.qml:347
317msgid "Sorry, incorrect passphrase"
321msgid "Sorry, incorrect passphrase"
318msgstr "Введена неверная кодовая фраза"
322msgstr "Введена неверная кодовая фраза"
319
323
320−#: qml/Shell.qml:323
324+#: qml/Shell.qml:348
325+msgid "Please re-enter"
326+msgstr ""
327+
328+#: qml/Shell.qml:350
321−msgid "Enter your passcode"
329+msgid "Enter passcode"
322−msgstr "Введите секретный код"
330+msgstr ""
323
331
324−#: qml/Shell.qml:324
332+#: qml/Shell.qml:351
325msgid "Sorry, incorrect passcode"
333msgid "Sorry, incorrect passcode"
326msgstr "Секретный код введён неверно"
334msgstr "Секретный код введён неверно"
327
335
328−#: qml/Shell.qml:327
336+#: qml/Shell.qml:354
329#, qt-format
337#, qt-format
330−msgid "Enter your %1"
338+msgid "Enter %1"
331−msgstr "Введите %1"
339+msgstr ""
332
340
333−#: qml/Shell.qml:328
341+#: qml/Shell.qml:355
334#, qt-format
342#, qt-format
335msgid "Sorry, incorrect %1"
343msgid "Sorry, incorrect %1"
336msgstr "Некорректный ввод %1"
344msgstr "Некорректный ввод %1"
337
345
338−#: qml/Shell.qml:363
346+#: qml/Shell.qml:390
339msgid "Sorry, incorrect passphrase."
347msgid "Sorry, incorrect passphrase."
340msgstr "Неверная ключевая фраза."
348msgstr "Неверная ключевая фраза."
341
349
342−#: qml/Shell.qml:364
350+#: qml/Shell.qml:391
343msgid "Sorry, incorrect passcode."
351msgid "Sorry, incorrect passcode."
344msgstr "Неверный секретный код."
352msgstr "Неверный секретный код."
345
353
346−#: qml/Shell.qml:365
354+#: qml/Shell.qml:392
347msgid "This will be your last attempt."
355msgid "This will be your last attempt."
348msgstr "Осталась последняя попытка."
356msgstr "Осталась последняя попытка."
349
357
350−#: qml/Shell.qml:367
358+#: qml/Shell.qml:394
351msgid ""
359msgid ""
352"If passphrase is entered incorrectly, your phone will conduct a factory "
360"If passphrase is entered incorrectly, your phone will conduct a factory "
353"reset and all personal data will be deleted."
361"reset and all personal data will be deleted."
@@ -355,10 +363,16 @@ msgstr ""
355"Если ключевая фраза будет введена неверно, то телефон вернётся к заводским "
363"Если ключевая фраза будет введена неверно, то телефон вернётся к заводским "
356"настройкам, а все личные данные будут удалены."
364"настройкам, а все личные данные будут удалены."
357
365
358−#: qml/Shell.qml:368
366+#: qml/Shell.qml:395
359msgid ""
367msgid ""
360"If passcode is entered incorrectly, your phone will conduct a factory reset "
368"If passcode is entered incorrectly, your phone will conduct a factory reset "
361"and all personal data will be deleted."
369"and all personal data will be deleted."
362msgstr ""
370msgstr ""
363"Если секретный код будет введен неверно, то телефон вернётся к заводским "
371"Если секретный код будет введен неверно, то телефон вернётся к заводским "
364"настройкам, а все личные данные будут удалены."
372"настройкам, а все личные данные будут удалены."
373+
374+#~ msgid "Sorry, incorrect PIN"
375+#~ msgstr "Введён неверный ПИН-код"
376+
377+#~ msgid "Enter SIM PIN"
378+#~ msgstr "Введите ПИН-код SIM-карты"
po/shn.po+55−48
@@ -7,14 +7,15 @@ msgid ""
7msgstr ""
7msgstr ""
8"Project-Id-Version: unity8\n"
8"Project-Id-Version: unity8\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2014-09-24 10:43+0100\n"
10+"POT-Creation-Date: 2014-10-07 11:37+0300\n"
11"PO-Revision-Date: 2013-10-07 11:46+0000\n"
11"PO-Revision-Date: 2013-10-07 11:46+0000\n"
12"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
12"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
13"Language-Team: Shan <shn@li.org>\n"
13"Language-Team: Shan <shn@li.org>\n"
14"MIME-Version: 1.0\n"
14"MIME-Version: 1.0\n"
15"Content-Type: text/plain; charset=UTF-8\n"
15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n"
16"Content-Transfer-Encoding: 8bit\n"
17+"Plural-Forms: nplurals=2; plural=(n == 1) ? 0 : 1;\n"
17−"X-Launchpad-Export-Date: 2014-09-29 05:20+0000\n"
18+"X-Launchpad-Export-Date: 2014-10-09 06:36+0000\n"
18"X-Generator: Launchpad (build 17196)\n"
19"X-Generator: Launchpad (build 17196)\n"
19
20
20#: plugins/LightDM/Greeter.cpp:130
21#: plugins/LightDM/Greeter.cpp:130
@@ -30,6 +31,25 @@ msgstr ""
30msgid "Unpin shortcut"
31msgid "Unpin shortcut"
31msgstr ""
32msgstr ""
32
33
34+#: qml/Components/DelayedLockscreen.qml:47
35+msgid "Device Locked"
36+msgstr ""
37+
38+#: qml/Components/DelayedLockscreen.qml:62
39+msgid "You have been locked out due to too many failed passphrase attempts."
40+msgstr ""
41+
42+#: qml/Components/DelayedLockscreen.qml:63
43+msgid "You have been locked out due to too many failed passcode attempts."
44+msgstr ""
45+
46+#: qml/Components/DelayedLockscreen.qml:72
47+#, qt-format
48+msgid "Please wait %1 minute and then try again…"
49+msgid_plural "Please wait %1 minutes and then try again…"
50+msgstr[0] ""
51+msgstr[1] ""
52+
33#: qml/Components/Dialogs.qml:70
53#: qml/Components/Dialogs.qml:70
34msgid "Log out"
54msgid "Log out"
35msgstr ""
55msgstr ""
@@ -132,40 +152,23 @@ msgid ""
132"phone<br><br>Tap on the screen to start"
152"phone<br><br>Tap on the screen to start"
133msgstr ""
153msgstr ""
134
154
135−#: qml/Components/Lockscreen.qml:167
155+#: qml/Components/Lockscreen.qml:220
136−msgid "Please wait"
137−msgstr ""
138−
139−#: qml/Components/Lockscreen.qml:172
140−msgid "Too many incorrect attempts"
141−msgstr ""
142−
143−#: qml/Components/Lockscreen.qml:206
144msgid "Emergency Call"
156msgid "Emergency Call"
145msgstr ""
157msgstr ""
146
158
147−#: qml/Components/Lockscreen.qml:226
159+#: qml/Components/Lockscreen.qml:252
148msgid "OK"
160msgid "OK"
149msgstr ""
161msgstr ""
150
162
151−#: qml/Components/PassphraseLockscreen.qml:61
152−#, qt-format
153−msgid "Hello %1"
154−msgstr ""
155−
156−#: qml/Components/PassphraseLockscreen.qml:61
157−msgid "Hello"
158−msgstr ""
159−
160−#: qml/Dash/GenericScopeView.qml:411 qml/Dash/GenericScopeView.qml:533
163+#: qml/Dash/GenericScopeView.qml:434 qml/Dash/GenericScopeView.qml:591
161msgid "See less"
164msgid "See less"
162msgstr ""
165msgstr ""
163
166
164−#: qml/Dash/GenericScopeView.qml:411
167+#: qml/Dash/GenericScopeView.qml:434
165msgid "See all"
168msgid "See all"
166msgstr ""
169msgstr ""
167
170
168−#: qml/Dash/GenericScopeView.qml:473 qml/Dash/PageHeader.qml:258
171+#: qml/Dash/GenericScopeView.qml:496 qml/Dash/PageHeader.qml:258
169#: qml/Panel/SearchIndicator.qml:27
172#: qml/Panel/SearchIndicator.qml:27
170msgid "Search"
173msgid "Search"
171msgstr ""
174msgstr ""
@@ -202,6 +205,14 @@ msgstr ""
202msgid "Send"
205msgid "Send"
203msgstr ""
206msgstr ""
204
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+
205#: qml/Dash/ScopesOverview.qml:206
216#: qml/Dash/ScopesOverview.qml:206
206msgid "Manage Scopes"
217msgid "Manage Scopes"
207msgstr ""
218msgstr ""
@@ -223,7 +234,7 @@ msgid "All"
223msgstr ""
234msgstr ""
224
235
225#: qml/Greeter/Greeter.qml:157
236#: qml/Greeter/Greeter.qml:157
226−msgid "Swipe to unlock"
237+msgid "Unlock"
227msgstr ""
238msgstr ""
228
239
229#: qml/Hud/HudParametrizedActionsPage.qml:139
240#: qml/Hud/HudParametrizedActionsPage.qml:139
@@ -246,18 +257,10 @@ msgstr ""
246msgid "Speaking..."
257msgid "Speaking..."
247msgstr ""
258msgstr ""
248
259
249−#: qml/Notifications/NotificationMenuItemFactory.qml:108
260+#: qml/Notifications/NotificationMenuItemFactory.qml:116
250msgid "Show password"
261msgid "Show password"
251msgstr ""
262msgstr ""
252
263
253−#: qml/Notifications/NotificationMenuItemFactory.qml:124
254−msgid "Enter SIM PIN"
255−msgstr ""
256−
257−#: qml/Notifications/NotificationMenuItemFactory.qml:125
258−msgid "Sorry, incorrect PIN"
259−msgstr ""
260−
261#: qml/Panel/ActiveCallHint.qml:77
264#: qml/Panel/ActiveCallHint.qml:77
262msgid "Tap to return to call..."
265msgid "Tap to return to call..."
263msgstr ""
266msgstr ""
@@ -302,51 +305,55 @@ msgstr ""
302msgid "Roaming"
305msgid "Roaming"
303msgstr ""
306msgstr ""
304
307
305−#: qml/Shell.qml:320
308+#: qml/Shell.qml:346
306−msgid "Enter your passphrase"
309+msgid "Enter passphrase"
307msgstr ""
310msgstr ""
308
311
309−#: qml/Shell.qml:321
312+#: qml/Shell.qml:347
310msgid "Sorry, incorrect passphrase"
313msgid "Sorry, incorrect passphrase"
311msgstr ""
314msgstr ""
312
315
313−#: qml/Shell.qml:323
316+#: qml/Shell.qml:348
317+msgid "Please re-enter"
318+msgstr ""
319+
320+#: qml/Shell.qml:350
314−msgid "Enter your passcode"
321+msgid "Enter passcode"
315msgstr ""
322msgstr ""
316
323
317−#: qml/Shell.qml:324
324+#: qml/Shell.qml:351
318msgid "Sorry, incorrect passcode"
325msgid "Sorry, incorrect passcode"
319msgstr ""
326msgstr ""
320
327
321−#: qml/Shell.qml:327
328+#: qml/Shell.qml:354
322#, qt-format
329#, qt-format
323−msgid "Enter your %1"
330+msgid "Enter %1"
324msgstr ""
331msgstr ""
325
332
326−#: qml/Shell.qml:328
333+#: qml/Shell.qml:355
327#, qt-format
334#, qt-format
328msgid "Sorry, incorrect %1"
335msgid "Sorry, incorrect %1"
329msgstr ""
336msgstr ""
330
337
331−#: qml/Shell.qml:363
338+#: qml/Shell.qml:390
332msgid "Sorry, incorrect passphrase."
339msgid "Sorry, incorrect passphrase."
333msgstr ""
340msgstr ""
334
341
335−#: qml/Shell.qml:364
342+#: qml/Shell.qml:391
336msgid "Sorry, incorrect passcode."
343msgid "Sorry, incorrect passcode."
337msgstr ""
344msgstr ""
338
345
339−#: qml/Shell.qml:365
346+#: qml/Shell.qml:392
340msgid "This will be your last attempt."
347msgid "This will be your last attempt."
341msgstr ""
348msgstr ""
342
349
343−#: qml/Shell.qml:367
350+#: qml/Shell.qml:394
344msgid ""
351msgid ""
345"If passphrase is entered incorrectly, your phone will conduct a factory "
352"If passphrase is entered incorrectly, your phone will conduct a factory "
346"reset and all personal data will be deleted."
353"reset and all personal data will be deleted."
347msgstr ""
354msgstr ""
348
355
349−#: qml/Shell.qml:368
356+#: qml/Shell.qml:395
350msgid ""
357msgid ""
351"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 "
352"and all personal data will be deleted."
359"and all personal data will be deleted."
po/si.po+55−48
@@ -7,14 +7,15 @@ msgid ""
7msgstr ""
7msgstr ""
8"Project-Id-Version: unity\n"
8"Project-Id-Version: unity\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2014-09-24 10:43+0100\n"
10+"POT-Creation-Date: 2014-10-07 11:37+0300\n"
11"PO-Revision-Date: 2013-06-26 22:36+0000\n"
11"PO-Revision-Date: 2013-06-26 22:36+0000\n"
12"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
12"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
13"Language-Team: Sinhalese <si@li.org>\n"
13"Language-Team: Sinhalese <si@li.org>\n"
14"MIME-Version: 1.0\n"
14"MIME-Version: 1.0\n"
15"Content-Type: text/plain; charset=UTF-8\n"
15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n"
16"Content-Transfer-Encoding: 8bit\n"
17+"Plural-Forms: nplurals=2; plural=n != 1;\n"
17−"X-Launchpad-Export-Date: 2014-09-29 05:20+0000\n"
18+"X-Launchpad-Export-Date: 2014-10-09 06:36+0000\n"
18"X-Generator: Launchpad (build 17196)\n"
19"X-Generator: Launchpad (build 17196)\n"
19
20
20#: plugins/LightDM/Greeter.cpp:130
21#: plugins/LightDM/Greeter.cpp:130
@@ -30,6 +31,25 @@ msgstr ""
30msgid "Unpin shortcut"
31msgid "Unpin shortcut"
31msgstr ""
32msgstr ""
32
33
34+#: qml/Components/DelayedLockscreen.qml:47
35+msgid "Device Locked"
36+msgstr ""
37+
38+#: qml/Components/DelayedLockscreen.qml:62
39+msgid "You have been locked out due to too many failed passphrase attempts."
40+msgstr ""
41+
42+#: qml/Components/DelayedLockscreen.qml:63
43+msgid "You have been locked out due to too many failed passcode attempts."
44+msgstr ""
45+
46+#: qml/Components/DelayedLockscreen.qml:72
47+#, qt-format
48+msgid "Please wait %1 minute and then try again…"
49+msgid_plural "Please wait %1 minutes and then try again…"
50+msgstr[0] ""
51+msgstr[1] ""
52+
33#: qml/Components/Dialogs.qml:70
53#: qml/Components/Dialogs.qml:70
34msgid "Log out"
54msgid "Log out"
35msgstr ""
55msgstr ""
@@ -132,40 +152,23 @@ msgid ""
132"phone<br><br>Tap on the screen to start"
152"phone<br><br>Tap on the screen to start"
133msgstr ""
153msgstr ""
134
154
135−#: qml/Components/Lockscreen.qml:167
155+#: qml/Components/Lockscreen.qml:220
136−msgid "Please wait"
137−msgstr ""
138−
139−#: qml/Components/Lockscreen.qml:172
140−msgid "Too many incorrect attempts"
141−msgstr ""
142−
143−#: qml/Components/Lockscreen.qml:206
144msgid "Emergency Call"
156msgid "Emergency Call"
145msgstr ""
157msgstr ""
146
158
147−#: qml/Components/Lockscreen.qml:226
159+#: qml/Components/Lockscreen.qml:252
148msgid "OK"
160msgid "OK"
149msgstr ""
161msgstr ""
150
162
151−#: qml/Components/PassphraseLockscreen.qml:61
152−#, qt-format
153−msgid "Hello %1"
154−msgstr ""
155−
156−#: qml/Components/PassphraseLockscreen.qml:61
157−msgid "Hello"
158−msgstr ""
159−
160−#: qml/Dash/GenericScopeView.qml:411 qml/Dash/GenericScopeView.qml:533
163+#: qml/Dash/GenericScopeView.qml:434 qml/Dash/GenericScopeView.qml:591
161msgid "See less"
164msgid "See less"
162msgstr ""
165msgstr ""
163
166
164−#: qml/Dash/GenericScopeView.qml:411
167+#: qml/Dash/GenericScopeView.qml:434
165msgid "See all"
168msgid "See all"
166msgstr ""
169msgstr ""
167
170
168−#: qml/Dash/GenericScopeView.qml:473 qml/Dash/PageHeader.qml:258
171+#: qml/Dash/GenericScopeView.qml:496 qml/Dash/PageHeader.qml:258
169#: qml/Panel/SearchIndicator.qml:27
172#: qml/Panel/SearchIndicator.qml:27
170msgid "Search"
173msgid "Search"
171msgstr ""
174msgstr ""
@@ -202,6 +205,14 @@ msgstr ""
202msgid "Send"
205msgid "Send"
203msgstr ""
206msgstr ""
204
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+
205#: qml/Dash/ScopesOverview.qml:206
216#: qml/Dash/ScopesOverview.qml:206
206msgid "Manage Scopes"
217msgid "Manage Scopes"
207msgstr ""
218msgstr ""
@@ -223,7 +234,7 @@ msgid "All"
223msgstr ""
234msgstr ""
224
235
225#: qml/Greeter/Greeter.qml:157
236#: qml/Greeter/Greeter.qml:157
226−msgid "Swipe to unlock"
237+msgid "Unlock"
227msgstr ""
238msgstr ""
228
239
229#: qml/Hud/HudParametrizedActionsPage.qml:139
240#: qml/Hud/HudParametrizedActionsPage.qml:139
@@ -246,18 +257,10 @@ msgstr ""
246msgid "Speaking..."
257msgid "Speaking..."
247msgstr ""
258msgstr ""
248
259
249−#: qml/Notifications/NotificationMenuItemFactory.qml:108
260+#: qml/Notifications/NotificationMenuItemFactory.qml:116
250msgid "Show password"
261msgid "Show password"
251msgstr ""
262msgstr ""
252
263
253−#: qml/Notifications/NotificationMenuItemFactory.qml:124
254−msgid "Enter SIM PIN"
255−msgstr ""
256−
257−#: qml/Notifications/NotificationMenuItemFactory.qml:125
258−msgid "Sorry, incorrect PIN"
259−msgstr ""
260−
261#: qml/Panel/ActiveCallHint.qml:77
264#: qml/Panel/ActiveCallHint.qml:77
262msgid "Tap to return to call..."
265msgid "Tap to return to call..."
263msgstr ""
266msgstr ""
@@ -302,51 +305,55 @@ msgstr ""
302msgid "Roaming"
305msgid "Roaming"
303msgstr ""
306msgstr ""
304
307
305−#: qml/Shell.qml:320
308+#: qml/Shell.qml:346
306−msgid "Enter your passphrase"
309+msgid "Enter passphrase"
307msgstr ""
310msgstr ""
308
311
309−#: qml/Shell.qml:321
312+#: qml/Shell.qml:347
310msgid "Sorry, incorrect passphrase"
313msgid "Sorry, incorrect passphrase"
311msgstr ""
314msgstr ""
312
315
313−#: qml/Shell.qml:323
316+#: qml/Shell.qml:348
317+msgid "Please re-enter"
318+msgstr ""
319+
320+#: qml/Shell.qml:350
314−msgid "Enter your passcode"
321+msgid "Enter passcode"
315msgstr ""
322msgstr ""
316
323
317−#: qml/Shell.qml:324
324+#: qml/Shell.qml:351
318msgid "Sorry, incorrect passcode"
325msgid "Sorry, incorrect passcode"
319msgstr ""
326msgstr ""
320
327
321−#: qml/Shell.qml:327
328+#: qml/Shell.qml:354
322#, qt-format
329#, qt-format
323−msgid "Enter your %1"
330+msgid "Enter %1"
324msgstr ""
331msgstr ""
325
332
326−#: qml/Shell.qml:328
333+#: qml/Shell.qml:355
327#, qt-format
334#, qt-format
328msgid "Sorry, incorrect %1"
335msgid "Sorry, incorrect %1"
329msgstr ""
336msgstr ""
330
337
331−#: qml/Shell.qml:363
338+#: qml/Shell.qml:390
332msgid "Sorry, incorrect passphrase."
339msgid "Sorry, incorrect passphrase."
333msgstr ""
340msgstr ""
334
341
335−#: qml/Shell.qml:364
342+#: qml/Shell.qml:391
336msgid "Sorry, incorrect passcode."
343msgid "Sorry, incorrect passcode."
337msgstr ""
344msgstr ""
338
345
339−#: qml/Shell.qml:365
346+#: qml/Shell.qml:392
340msgid "This will be your last attempt."
347msgid "This will be your last attempt."
341msgstr ""
348msgstr ""
342
349
343−#: qml/Shell.qml:367
350+#: qml/Shell.qml:394
344msgid ""
351msgid ""
345"If passphrase is entered incorrectly, your phone will conduct a factory "
352"If passphrase is entered incorrectly, your phone will conduct a factory "
346"reset and all personal data will be deleted."
353"reset and all personal data will be deleted."
347msgstr ""
354msgstr ""
348
355
349−#: qml/Shell.qml:368
356+#: qml/Shell.qml:395
350msgid ""
357msgid ""
351"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 "
352"and all personal data will be deleted."
359"and all personal data will be deleted."
po/sl.po+69−56
@@ -7,14 +7,16 @@ msgid ""
7msgstr ""
7msgstr ""
8"Project-Id-Version: unity\n"
8"Project-Id-Version: unity\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2014-09-24 10:43+0100\n"
10+"POT-Creation-Date: 2014-10-07 11:37+0300\n"
11−"PO-Revision-Date: 2014-09-23 12:35+0000\n"
11+"PO-Revision-Date: 2014-10-07 09:28+0000\n"
12"Last-Translator: Damir Jerovšek <Unknown>\n"
12"Last-Translator: Damir Jerovšek <Unknown>\n"
13"Language-Team: Slovenian <sl@li.org>\n"
13"Language-Team: Slovenian <sl@li.org>\n"
14"MIME-Version: 1.0\n"
14"MIME-Version: 1.0\n"
15"Content-Type: text/plain; charset=UTF-8\n"
15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n"
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"
17−"X-Launchpad-Export-Date: 2014-09-29 05:20+0000\n"
19+"X-Launchpad-Export-Date: 2014-10-09 06:36+0000\n"
18"X-Generator: Launchpad (build 17196)\n"
20"X-Generator: Launchpad (build 17196)\n"
19
21
20#: plugins/LightDM/Greeter.cpp:130
22#: plugins/LightDM/Greeter.cpp:130
@@ -30,6 +32,27 @@ msgstr "Pripni bližnjico"
30msgid "Unpin shortcut"
32msgid "Unpin shortcut"
31msgstr "Odpni bližnjico"
33msgstr "Odpni bližnjico"
32
34
35+#: qml/Components/DelayedLockscreen.qml:47
36+msgid "Device Locked"
37+msgstr "Naprava je zaklenjena"
38+
39+#: qml/Components/DelayedLockscreen.qml:62
40+msgid "You have been locked out due to too many failed passphrase attempts."
41+msgstr "Telefon ste zaklenili zaradi preveč napačnih vnosov šifrirnih rekel."
42+
43+#: qml/Components/DelayedLockscreen.qml:63
44+msgid "You have been locked out due to too many failed passcode attempts."
45+msgstr "Telefon ste zaklenili zaradi preveč napačnih vnosov gesla."
46+
47+#: qml/Components/DelayedLockscreen.qml:72
48+#, qt-format
49+msgid "Please wait %1 minute and then try again…"
50+msgid_plural "Please wait %1 minutes and then try again…"
51+msgstr[0] "Počakajte %1 minut ter poskusite ponovno ..."
52+msgstr[1] "Počakajte %1 minuto ter poskusite ponovno ..."
53+msgstr[2] "Počakajte %1 minuti ter poskusite ponovno ..."
54+msgstr[3] "Počakajte %1 minute ter poskusite ponovno ..."
55+
33#: qml/Components/Dialogs.qml:70
56#: qml/Components/Dialogs.qml:70
34msgid "Log out"
57msgid "Log out"
35msgstr "Odjava"
58msgstr "Odjava"
@@ -138,40 +161,23 @@ msgstr ""
138"Sedaj, ko ste osvojili poteze robov, lahko začnete uporabljati "
161"Sedaj, ko ste osvojili poteze robov, lahko začnete uporabljati "
139"telefon<br><br>Tapnite na zaslon za začetek"
162"telefon<br><br>Tapnite na zaslon za začetek"
140
163
141−#: qml/Components/Lockscreen.qml:167
164+#: qml/Components/Lockscreen.qml:220
142−msgid "Please wait"
143−msgstr "Počakajte"
144−
145−#: qml/Components/Lockscreen.qml:172
146−msgid "Too many incorrect attempts"
147−msgstr "Preveč nepravilnih poskusov"
148−
149−#: qml/Components/Lockscreen.qml:206
150msgid "Emergency Call"
165msgid "Emergency Call"
151msgstr "Klic v sili"
166msgstr "Klic v sili"
152
167
153−#: qml/Components/Lockscreen.qml:226
168+#: qml/Components/Lockscreen.qml:252
154msgid "OK"
169msgid "OK"
155msgstr "V REDU"
170msgstr "V REDU"
156
171
157−#: qml/Components/PassphraseLockscreen.qml:61
158−#, qt-format
159−msgid "Hello %1"
160−msgstr "Pozdravljeni, %1"
161−
162−#: qml/Components/PassphraseLockscreen.qml:61
163−msgid "Hello"
164−msgstr "Pozdravljeni"
165−
166−#: qml/Dash/GenericScopeView.qml:411 qml/Dash/GenericScopeView.qml:533
172+#: qml/Dash/GenericScopeView.qml:434 qml/Dash/GenericScopeView.qml:591
167msgid "See less"
173msgid "See less"
168msgstr "Pokaži manj"
174msgstr "Pokaži manj"
169
175
170−#: qml/Dash/GenericScopeView.qml:411
176+#: qml/Dash/GenericScopeView.qml:434
171msgid "See all"
177msgid "See all"
172msgstr "Ogled vsega"
178msgstr "Ogled vsega"
173
179
174−#: qml/Dash/GenericScopeView.qml:473 qml/Dash/PageHeader.qml:258
180+#: qml/Dash/GenericScopeView.qml:496 qml/Dash/PageHeader.qml:258
175#: qml/Panel/SearchIndicator.qml:27
181#: qml/Panel/SearchIndicator.qml:27
176msgid "Search"
182msgid "Search"
177msgstr "Iskanje"
183msgstr "Iskanje"
@@ -208,6 +214,14 @@ msgstr "Dodaj oceno"
208msgid "Send"
214msgid "Send"
209msgstr "Pošlji"
215msgstr "Pošlji"
210
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+
211#: qml/Dash/ScopesOverview.qml:206
225#: qml/Dash/ScopesOverview.qml:206
212msgid "Manage Scopes"
226msgid "Manage Scopes"
213msgstr ""
227msgstr ""
@@ -229,8 +243,8 @@ msgid "All"
229msgstr "Vse"
243msgstr "Vse"
230
244
231#: qml/Greeter/Greeter.qml:157
245#: qml/Greeter/Greeter.qml:157
232−msgid "Swipe to unlock"
246+msgid "Unlock"
233−msgstr "Podrsajte za odklenitev"
247+msgstr "Odkleni"
234
248
235#: qml/Hud/HudParametrizedActionsPage.qml:139
249#: qml/Hud/HudParametrizedActionsPage.qml:139
236msgid "Confirm"
250msgid "Confirm"
@@ -252,18 +266,10 @@ msgstr "Govorite zdaj ..."
252msgid "Speaking..."
266msgid "Speaking..."
253msgstr "Govorjenje ..."
267msgstr "Govorjenje ..."
254
268
255−#: qml/Notifications/NotificationMenuItemFactory.qml:108
269+#: qml/Notifications/NotificationMenuItemFactory.qml:116
256msgid "Show password"
270msgid "Show password"
257msgstr "Pokaži geslo"
271msgstr "Pokaži geslo"
258
272
259−#: qml/Notifications/NotificationMenuItemFactory.qml:124
260−msgid "Enter SIM PIN"
261−msgstr "Vnesite PIN kartice SIM"
262−
263−#: qml/Notifications/NotificationMenuItemFactory.qml:125
264−msgid "Sorry, incorrect PIN"
265−msgstr "Oprostite, napačen PIN"
266−
267#: qml/Panel/ActiveCallHint.qml:77
273#: qml/Panel/ActiveCallHint.qml:77
268msgid "Tap to return to call..."
274msgid "Tap to return to call..."
269msgstr "Tapnite za vrnitev v klic ..."
275msgstr "Tapnite za vrnitev v klic ..."
@@ -274,7 +280,7 @@ msgstr "Konferenca"
274
280
275#: qml/Panel/Indicators/MenuItemFactory.qml:600
281#: qml/Panel/Indicators/MenuItemFactory.qml:600
276msgid "Nothing is playing"
282msgid "Nothing is playing"
277−msgstr ""
283+msgstr "Nič se ne predvaja"
278
284
279#: qml/Panel/Indicators/MenuItemFactory.qml:748
285#: qml/Panel/Indicators/MenuItemFactory.qml:748
280msgid "In queue…"
286msgid "In queue…"
@@ -308,45 +314,49 @@ msgstr "Odkleni SIM"
308msgid "Roaming"
314msgid "Roaming"
309msgstr "Gostovanje"
315msgstr "Gostovanje"
310
316
311−#: qml/Shell.qml:320
317+#: qml/Shell.qml:346
312−msgid "Enter your passphrase"
318+msgid "Enter passphrase"
313−msgstr "Vnesite svoje šifrirno reklo"
319+msgstr "Vnesite šifrirno reklo"
314
320
315−#: qml/Shell.qml:321
321+#: qml/Shell.qml:347
316msgid "Sorry, incorrect passphrase"
322msgid "Sorry, incorrect passphrase"
317msgstr "Oprostite, napačno šifrirno reklo"
323msgstr "Oprostite, napačno šifrirno reklo"
318
324
319−#: qml/Shell.qml:323
325+#: qml/Shell.qml:348
320−msgid "Enter your passcode"
326+msgid "Please re-enter"
321−msgstr "Vnesite svoje geslo"
327+msgstr "Ponovno vnesite"
322
328
323−#: qml/Shell.qml:324
329+#: qml/Shell.qml:350
330+msgid "Enter passcode"
331+msgstr "Vnesite geslo"
332+
333+#: qml/Shell.qml:351
324msgid "Sorry, incorrect passcode"
334msgid "Sorry, incorrect passcode"
325msgstr "Nepravilno geslo"
335msgstr "Nepravilno geslo"
326
336
327−#: qml/Shell.qml:327
337+#: qml/Shell.qml:354
328#, qt-format
338#, qt-format
329−msgid "Enter your %1"
339+msgid "Enter %1"
330−msgstr "Vnesite vaš %1"
340+msgstr "Vnesite %1"
331
341
332−#: qml/Shell.qml:328
342+#: qml/Shell.qml:355
333#, qt-format
343#, qt-format
334msgid "Sorry, incorrect %1"
344msgid "Sorry, incorrect %1"
335msgstr "Oprostite, napačen %1"
345msgstr "Oprostite, napačen %1"
336
346
337−#: qml/Shell.qml:363
347+#: qml/Shell.qml:390
338msgid "Sorry, incorrect passphrase."
348msgid "Sorry, incorrect passphrase."
339msgstr "Nepravilno geslo."
349msgstr "Nepravilno geslo."
340
350
341−#: qml/Shell.qml:364
351+#: qml/Shell.qml:391
342msgid "Sorry, incorrect passcode."
352msgid "Sorry, incorrect passcode."
343msgstr "Nepravilno geslo."
353msgstr "Nepravilno geslo."
344
354
345−#: qml/Shell.qml:365
355+#: qml/Shell.qml:392
346msgid "This will be your last attempt."
356msgid "This will be your last attempt."
347msgstr "To je vaš zadnji poskus"
357msgstr "To je vaš zadnji poskus"
348
358
349−#: qml/Shell.qml:367
359+#: qml/Shell.qml:394
350msgid ""
360msgid ""
351"If passphrase is entered incorrectly, your phone will conduct a factory "
361"If passphrase is entered incorrectly, your phone will conduct a factory "
352"reset and all personal data will be deleted."
362"reset and all personal data will be deleted."
@@ -354,7 +364,7 @@ msgstr ""
354"Če je vneseno nepravilno šifrirno reklo, bo telefon ponastavljen na "
364"Če je vneseno nepravilno šifrirno reklo, bo telefon ponastavljen na "
355"tovarniške nastavitve ter vsi osebni podatki bodo izbrisani."
365"tovarniške nastavitve ter vsi osebni podatki bodo izbrisani."
356
366
357−#: qml/Shell.qml:368
367+#: qml/Shell.qml:395
358msgid ""
368msgid ""
359"If passcode is entered incorrectly, your phone will conduct a factory reset "
369"If passcode is entered incorrectly, your phone will conduct a factory reset "
360"and all personal data will be deleted."
370"and all personal data will be deleted."
@@ -362,5 +372,8 @@ msgstr ""
362"Če je vneseno nepravilno geslo, bo telefon ponastavljen na tovarniške "
372"Če je vneseno nepravilno geslo, bo telefon ponastavljen na tovarniške "
363"nastavitve ter vsi osebni podatki bodo izbrisani."
373"nastavitve ter vsi osebni podatki bodo izbrisani."
364
374
365−#~ msgid "Manage Dash"
375+#~ msgid "Sorry, incorrect PIN"
366−#~ msgstr "Upravljaj s pregledno ploščo"
376+#~ msgstr "Oprostite, napačen PIN"
377+
378+#~ msgid "Enter SIM PIN"
379+#~ msgstr "Vnesite PIN kartice SIM"
po/sq.po+55−48
@@ -7,14 +7,15 @@ msgid ""
7msgstr ""
7msgstr ""
8"Project-Id-Version: unity8\n"
8"Project-Id-Version: unity8\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2014-09-24 10:43+0100\n"
10+"POT-Creation-Date: 2014-10-07 11:37+0300\n"
11"PO-Revision-Date: 2014-01-15 13:51+0000\n"
11"PO-Revision-Date: 2014-01-15 13:51+0000\n"
12"Last-Translator: Besmir Zanaj <besmirzanaj@gmail.com>\n"
12"Last-Translator: Besmir Zanaj <besmirzanaj@gmail.com>\n"
13"Language-Team: Albanian <sq@li.org>\n"
13"Language-Team: Albanian <sq@li.org>\n"
14"MIME-Version: 1.0\n"
14"MIME-Version: 1.0\n"
15"Content-Type: text/plain; charset=UTF-8\n"
15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n"
16"Content-Transfer-Encoding: 8bit\n"
17+"Plural-Forms: nplurals=2; plural=n != 1;\n"
17−"X-Launchpad-Export-Date: 2014-09-29 05:19+0000\n"
18+"X-Launchpad-Export-Date: 2014-10-09 06:36+0000\n"
18"X-Generator: Launchpad (build 17196)\n"
19"X-Generator: Launchpad (build 17196)\n"
19
20
20#: plugins/LightDM/Greeter.cpp:130
21#: plugins/LightDM/Greeter.cpp:130
@@ -30,6 +31,25 @@ msgstr ""
30msgid "Unpin shortcut"
31msgid "Unpin shortcut"
31msgstr ""
32msgstr ""
32
33
34+#: qml/Components/DelayedLockscreen.qml:47
35+msgid "Device Locked"
36+msgstr ""
37+
38+#: qml/Components/DelayedLockscreen.qml:62
39+msgid "You have been locked out due to too many failed passphrase attempts."
40+msgstr ""
41+
42+#: qml/Components/DelayedLockscreen.qml:63
43+msgid "You have been locked out due to too many failed passcode attempts."
44+msgstr ""
45+
46+#: qml/Components/DelayedLockscreen.qml:72
47+#, qt-format
48+msgid "Please wait %1 minute and then try again…"
49+msgid_plural "Please wait %1 minutes and then try again…"
50+msgstr[0] ""
51+msgstr[1] ""
52+
33#: qml/Components/Dialogs.qml:70
53#: qml/Components/Dialogs.qml:70
34msgid "Log out"
54msgid "Log out"
35msgstr ""
55msgstr ""
@@ -133,40 +153,23 @@ msgid ""
133"phone<br><br>Tap on the screen to start"
153"phone<br><br>Tap on the screen to start"
134msgstr ""
154msgstr ""
135
155
136−#: qml/Components/Lockscreen.qml:167
156+#: qml/Components/Lockscreen.qml:220
137−msgid "Please wait"
138−msgstr ""
139−
140−#: qml/Components/Lockscreen.qml:172
141−msgid "Too many incorrect attempts"
142−msgstr ""
143−
144−#: qml/Components/Lockscreen.qml:206
145msgid "Emergency Call"
157msgid "Emergency Call"
146msgstr ""
158msgstr ""
147
159
148−#: qml/Components/Lockscreen.qml:226
160+#: qml/Components/Lockscreen.qml:252
149msgid "OK"
161msgid "OK"
150msgstr ""
162msgstr ""
151
163
152−#: qml/Components/PassphraseLockscreen.qml:61
153−#, qt-format
154−msgid "Hello %1"
155−msgstr ""
156−
157−#: qml/Components/PassphraseLockscreen.qml:61
158−msgid "Hello"
159−msgstr ""
160−
161−#: qml/Dash/GenericScopeView.qml:411 qml/Dash/GenericScopeView.qml:533
164+#: qml/Dash/GenericScopeView.qml:434 qml/Dash/GenericScopeView.qml:591
162msgid "See less"
165msgid "See less"
163msgstr ""
166msgstr ""
164
167
165−#: qml/Dash/GenericScopeView.qml:411
168+#: qml/Dash/GenericScopeView.qml:434
166msgid "See all"
169msgid "See all"
167msgstr ""
170msgstr ""
168
171
169−#: qml/Dash/GenericScopeView.qml:473 qml/Dash/PageHeader.qml:258
172+#: qml/Dash/GenericScopeView.qml:496 qml/Dash/PageHeader.qml:258
170#: qml/Panel/SearchIndicator.qml:27
173#: qml/Panel/SearchIndicator.qml:27
171msgid "Search"
174msgid "Search"
172msgstr ""
175msgstr ""
@@ -203,6 +206,14 @@ msgstr "Shto një rishikim"
203msgid "Send"
206msgid "Send"
204msgstr ""
207msgstr ""
205
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+
206#: qml/Dash/ScopesOverview.qml:206
217#: qml/Dash/ScopesOverview.qml:206
207msgid "Manage Scopes"
218msgid "Manage Scopes"
208msgstr ""
219msgstr ""
@@ -224,7 +235,7 @@ msgid "All"
224msgstr ""
235msgstr ""
225
236
226#: qml/Greeter/Greeter.qml:157
237#: qml/Greeter/Greeter.qml:157
227−msgid "Swipe to unlock"
238+msgid "Unlock"
228msgstr ""
239msgstr ""
229
240
230#: qml/Hud/HudParametrizedActionsPage.qml:139
241#: qml/Hud/HudParametrizedActionsPage.qml:139
@@ -247,18 +258,10 @@ msgstr ""
247msgid "Speaking..."
258msgid "Speaking..."
248msgstr ""
259msgstr ""
249
260
250−#: qml/Notifications/NotificationMenuItemFactory.qml:108
261+#: qml/Notifications/NotificationMenuItemFactory.qml:116
251msgid "Show password"
262msgid "Show password"
252msgstr ""
263msgstr ""
253
264
254−#: qml/Notifications/NotificationMenuItemFactory.qml:124
255−msgid "Enter SIM PIN"
256−msgstr ""
257−
258−#: qml/Notifications/NotificationMenuItemFactory.qml:125
259−msgid "Sorry, incorrect PIN"
260−msgstr ""
261−
262#: qml/Panel/ActiveCallHint.qml:77
265#: qml/Panel/ActiveCallHint.qml:77
263msgid "Tap to return to call..."
266msgid "Tap to return to call..."
264msgstr ""
267msgstr ""
@@ -303,51 +306,55 @@ msgstr ""
303msgid "Roaming"
306msgid "Roaming"
304msgstr ""
307msgstr ""
305
308
306−#: qml/Shell.qml:320
309+#: qml/Shell.qml:346
307−msgid "Enter your passphrase"
310+msgid "Enter passphrase"
308msgstr ""
311msgstr ""
309
312
310−#: qml/Shell.qml:321
313+#: qml/Shell.qml:347
311msgid "Sorry, incorrect passphrase"
314msgid "Sorry, incorrect passphrase"
312msgstr ""
315msgstr ""
313
316
314−#: qml/Shell.qml:323
317+#: qml/Shell.qml:348
318+msgid "Please re-enter"
319+msgstr ""
320+
321+#: qml/Shell.qml:350
315−msgid "Enter your passcode"
322+msgid "Enter passcode"
316msgstr ""
323msgstr ""
317
324
318−#: qml/Shell.qml:324
325+#: qml/Shell.qml:351
319msgid "Sorry, incorrect passcode"
326msgid "Sorry, incorrect passcode"
320msgstr ""
327msgstr ""
321
328
322−#: qml/Shell.qml:327
329+#: qml/Shell.qml:354
323#, qt-format
330#, qt-format
324−msgid "Enter your %1"
331+msgid "Enter %1"
325msgstr ""
332msgstr ""
326
333
327−#: qml/Shell.qml:328
334+#: qml/Shell.qml:355
328#, qt-format
335#, qt-format
329msgid "Sorry, incorrect %1"
336msgid "Sorry, incorrect %1"
330msgstr ""
337msgstr ""
331
338
332−#: qml/Shell.qml:363
339+#: qml/Shell.qml:390
333msgid "Sorry, incorrect passphrase."
340msgid "Sorry, incorrect passphrase."
334msgstr ""
341msgstr ""
335
342
336−#: qml/Shell.qml:364
343+#: qml/Shell.qml:391
337msgid "Sorry, incorrect passcode."
344msgid "Sorry, incorrect passcode."
338msgstr ""
345msgstr ""
339
346
340−#: qml/Shell.qml:365
347+#: qml/Shell.qml:392
341msgid "This will be your last attempt."
348msgid "This will be your last attempt."
342msgstr ""
349msgstr ""
343
350
344−#: qml/Shell.qml:367
351+#: qml/Shell.qml:394
345msgid ""
352msgid ""
346"If passphrase is entered incorrectly, your phone will conduct a factory "
353"If passphrase is entered incorrectly, your phone will conduct a factory "
347"reset and all personal data will be deleted."
354"reset and all personal data will be deleted."
348msgstr ""
355msgstr ""
349
356
350−#: qml/Shell.qml:368
357+#: qml/Shell.qml:395
351msgid ""
358msgid ""
352"If passcode is entered incorrectly, your phone will conduct a factory reset "
359"If passcode is entered incorrectly, your phone will conduct a factory reset "
353"and all personal data will be deleted."
360"and all personal data will be deleted."
po/sr.po+65−54
@@ -7,14 +7,16 @@ msgid ""
7msgstr ""
7msgstr ""
8"Project-Id-Version: unity\n"
8"Project-Id-Version: unity\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2014-09-24 10:43+0100\n"
10+"POT-Creation-Date: 2014-10-07 11:37+0300\n"
11"PO-Revision-Date: 2014-09-24 13:29+0000\n"
11"PO-Revision-Date: 2014-09-24 13:29+0000\n"
12"Last-Translator: Данило Шеган <Unknown>\n"
12"Last-Translator: Данило Шеган <Unknown>\n"
13"Language-Team: Serbian <sr@li.org>\n"
13"Language-Team: Serbian <sr@li.org>\n"
14"MIME-Version: 1.0\n"
14"MIME-Version: 1.0\n"
15"Content-Type: text/plain; charset=UTF-8\n"
15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n"
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"
17−"X-Launchpad-Export-Date: 2014-09-29 05:20+0000\n"
19+"X-Launchpad-Export-Date: 2014-10-09 06:36+0000\n"
18"X-Generator: Launchpad (build 17196)\n"
20"X-Generator: Launchpad (build 17196)\n"
19
21
20#: plugins/LightDM/Greeter.cpp:130
22#: plugins/LightDM/Greeter.cpp:130
@@ -30,6 +32,25 @@ msgstr "Прикачи пречицу"
30msgid "Unpin shortcut"
32msgid "Unpin shortcut"
31msgstr "Откачи пречицу"
33msgstr "Откачи пречицу"
32
34
35+#: qml/Components/DelayedLockscreen.qml:47
36+msgid "Device Locked"
37+msgstr ""
38+
39+#: qml/Components/DelayedLockscreen.qml:62
40+msgid "You have been locked out due to too many failed passphrase attempts."
41+msgstr ""
42+
43+#: qml/Components/DelayedLockscreen.qml:63
44+msgid "You have been locked out due to too many failed passcode attempts."
45+msgstr ""
46+
47+#: qml/Components/DelayedLockscreen.qml:72
48+#, qt-format
49+msgid "Please wait %1 minute and then try again…"
50+msgid_plural "Please wait %1 minutes and then try again…"
51+msgstr[0] ""
52+msgstr[1] ""
53+
33#: qml/Components/Dialogs.qml:70
54#: qml/Components/Dialogs.qml:70
34msgid "Log out"
55msgid "Log out"
35msgstr "Одјави се"
56msgstr "Одјави се"
@@ -136,40 +157,23 @@ msgstr ""
136"Сада сте савладали превлачења са ивица и можете да користите "
157"Сада сте савладали превлачења са ивица и можете да користите "
137"телефон<br><br>Тапните на екран да почнете"
158"телефон<br><br>Тапните на екран да почнете"
138
159
139−#: qml/Components/Lockscreen.qml:167
160+#: qml/Components/Lockscreen.qml:220
140−msgid "Please wait"
141−msgstr "Сачекајте"
142−
143−#: qml/Components/Lockscreen.qml:172
144−msgid "Too many incorrect attempts"
145−msgstr "Превише нетачних покушаја"
146−
147−#: qml/Components/Lockscreen.qml:206
148msgid "Emergency Call"
161msgid "Emergency Call"
149msgstr "Хитан позив"
162msgstr "Хитан позив"
150
163
151−#: qml/Components/Lockscreen.qml:226
164+#: qml/Components/Lockscreen.qml:252
152msgid "OK"
165msgid "OK"
153msgstr "У реду"
166msgstr "У реду"
154
167
155−#: qml/Components/PassphraseLockscreen.qml:61
156−#, qt-format
157−msgid "Hello %1"
158−msgstr "Здраво %1"
159−
160−#: qml/Components/PassphraseLockscreen.qml:61
161−msgid "Hello"
162−msgstr "Здраво"
163−
164−#: qml/Dash/GenericScopeView.qml:411 qml/Dash/GenericScopeView.qml:533
168+#: qml/Dash/GenericScopeView.qml:434 qml/Dash/GenericScopeView.qml:591
165msgid "See less"
169msgid "See less"
166msgstr "Сажетије"
170msgstr "Сажетије"
167
171
168−#: qml/Dash/GenericScopeView.qml:411
172+#: qml/Dash/GenericScopeView.qml:434
169msgid "See all"
173msgid "See all"
170msgstr "Опширније"
174msgstr "Опширније"
171
175
172−#: qml/Dash/GenericScopeView.qml:473 qml/Dash/PageHeader.qml:258
176+#: qml/Dash/GenericScopeView.qml:496 qml/Dash/PageHeader.qml:258
173#: qml/Panel/SearchIndicator.qml:27
177#: qml/Panel/SearchIndicator.qml:27
174msgid "Search"
178msgid "Search"
175msgstr "Претрага"
179msgstr "Претрага"
@@ -206,6 +210,14 @@ msgstr "Напиши оцену"
206msgid "Send"
210msgid "Send"
207msgstr "Пошаљи"
211msgstr "Пошаљи"
208
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+
209#: qml/Dash/ScopesOverview.qml:206
221#: qml/Dash/ScopesOverview.qml:206
210msgid "Manage Scopes"
222msgid "Manage Scopes"
211msgstr ""
223msgstr ""
@@ -227,8 +239,8 @@ msgid "All"
227msgstr "Сви"
239msgstr "Сви"
228
240
229#: qml/Greeter/Greeter.qml:157
241#: qml/Greeter/Greeter.qml:157
230−msgid "Swipe to unlock"
242+msgid "Unlock"
231−msgstr "Повуците да откључате"
243+msgstr ""
232
244
233#: qml/Hud/HudParametrizedActionsPage.qml:139
245#: qml/Hud/HudParametrizedActionsPage.qml:139
234msgid "Confirm"
246msgid "Confirm"
@@ -250,18 +262,10 @@ msgstr "Изговорите сада..."
250msgid "Speaking..."
262msgid "Speaking..."
251msgstr "Говор..."
263msgstr "Говор..."
252
264
253−#: qml/Notifications/NotificationMenuItemFactory.qml:108
265+#: qml/Notifications/NotificationMenuItemFactory.qml:116
254msgid "Show password"
266msgid "Show password"
255msgstr "Прикажи лозинку"
267msgstr "Прикажи лозинку"
256
268
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
269#: qml/Panel/ActiveCallHint.qml:77
266msgid "Tap to return to call..."
270msgid "Tap to return to call..."
267msgstr "Тапните да одговорите на позив"
271msgstr "Тапните да одговорите на позив"
@@ -306,45 +310,49 @@ msgstr "Откључај СИМ картицу"
306msgid "Roaming"
310msgid "Roaming"
307msgstr "Роминг"
311msgstr "Роминг"
308
312
309−#: qml/Shell.qml:320
313+#: qml/Shell.qml:346
310−msgid "Enter your passphrase"
314+msgid "Enter passphrase"
311−msgstr "Унесите вашу лозинку"
315+msgstr ""
312
316
313−#: qml/Shell.qml:321
317+#: qml/Shell.qml:347
314msgid "Sorry, incorrect passphrase"
318msgid "Sorry, incorrect passphrase"
315msgstr "Жао ми је, погрешна лозинка"
319msgstr "Жао ми је, погрешна лозинка"
316
320
317−#: qml/Shell.qml:323
321+#: qml/Shell.qml:348
322+msgid "Please re-enter"
323+msgstr ""
324+
325+#: qml/Shell.qml:350
318−msgid "Enter your passcode"
326+msgid "Enter passcode"
319−msgstr "Унесите ваш код"
327+msgstr ""
320
328
321−#: qml/Shell.qml:324
329+#: qml/Shell.qml:351
322msgid "Sorry, incorrect passcode"
330msgid "Sorry, incorrect passcode"
323msgstr "Жао ми је, погрешан код"
331msgstr "Жао ми је, погрешан код"
324
332
325−#: qml/Shell.qml:327
333+#: qml/Shell.qml:354
326#, qt-format
334#, qt-format
327−msgid "Enter your %1"
335+msgid "Enter %1"
328−msgstr "Унесите ваш %1"
336+msgstr ""
329
337
330−#: qml/Shell.qml:328
338+#: qml/Shell.qml:355
331#, qt-format
339#, qt-format
332msgid "Sorry, incorrect %1"
340msgid "Sorry, incorrect %1"
333msgstr "Жао ми је, погрешан %1"
341msgstr "Жао ми је, погрешан %1"
334
342
335−#: qml/Shell.qml:363
343+#: qml/Shell.qml:390
336msgid "Sorry, incorrect passphrase."
344msgid "Sorry, incorrect passphrase."
337msgstr "Жао ми је, погрешна лозинка."
345msgstr "Жао ми је, погрешна лозинка."
338
346
339−#: qml/Shell.qml:364
347+#: qml/Shell.qml:391
340msgid "Sorry, incorrect passcode."
348msgid "Sorry, incorrect passcode."
341msgstr "Жао ми је, погрешан код."
349msgstr "Жао ми је, погрешан код."
342
350
343−#: qml/Shell.qml:365
351+#: qml/Shell.qml:392
344msgid "This will be your last attempt."
352msgid "This will be your last attempt."
345msgstr "Ово је ваш последњи покушај."
353msgstr "Ово је ваш последњи покушај."
346
354
347−#: qml/Shell.qml:367
355+#: qml/Shell.qml:394
348msgid ""
356msgid ""
349"If passphrase is entered incorrectly, your phone will conduct a factory "
357"If passphrase is entered incorrectly, your phone will conduct a factory "
350"reset and all personal data will be deleted."
358"reset and all personal data will be deleted."
@@ -352,7 +360,7 @@ msgstr ""
352"Ако се унесе погрешна лозинка, ваш телефон ће се ресетовати и сви лични "
360"Ако се унесе погрешна лозинка, ваш телефон ће се ресетовати и сви лични "
353"подаци ће бити обрисани."
361"подаци ће бити обрисани."
354
362
355−#: qml/Shell.qml:368
363+#: qml/Shell.qml:395
356msgid ""
364msgid ""
357"If passcode is entered incorrectly, your phone will conduct a factory reset "
365"If passcode is entered incorrectly, your phone will conduct a factory reset "
358"and all personal data will be deleted."
366"and all personal data will be deleted."
@@ -360,5 +368,8 @@ msgstr ""
360"Ако се унесе погрешан код, ваш телефон ће се ресетовати и сви лични подаци "
368"Ако се унесе погрешан код, ваш телефон ће се ресетовати и сви лични подаци "
361"ће бити обрисани."
369"ће бити обрисани."
362
370
363−#~ msgid "Manage Dash"
371+#~ msgid "Enter SIM PIN"
364−#~ msgstr "Управљај Полицом"
372+#~ msgstr "Унеси пин СИМ картице"
373+
374+#~ msgid "Sorry, incorrect PIN"
375+#~ msgstr "Жао ми је, погрешан ПИН код"
po/sv.po+65−55
@@ -7,14 +7,15 @@ msgid ""
7msgstr ""
7msgstr ""
8"Project-Id-Version: unity\n"
8"Project-Id-Version: unity\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2014-09-24 10:43+0100\n"
10+"POT-Creation-Date: 2014-10-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"
12"Last-Translator: Josef Andersson <Unknown>\n"
13"Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
13"Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
14"MIME-Version: 1.0\n"
14"MIME-Version: 1.0\n"
15"Content-Type: text/plain; charset=UTF-8\n"
15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n"
16"Content-Transfer-Encoding: 8bit\n"
17+"Plural-Forms: nplurals=2; plural=n != 1;\n"
17−"X-Launchpad-Export-Date: 2014-09-29 05:20+0000\n"
18+"X-Launchpad-Export-Date: 2014-10-09 06:36+0000\n"
18"X-Generator: Launchpad (build 17196)\n"
19"X-Generator: Launchpad (build 17196)\n"
19"Language: sv\n"
20"Language: sv\n"
20
21
@@ -31,6 +32,25 @@ msgstr "Fäst genväg"
31msgid "Unpin shortcut"
32msgid "Unpin shortcut"
32msgstr "Släpp genväg"
33msgstr "Släpp genväg"
33
34
35+#: qml/Components/DelayedLockscreen.qml:47
36+msgid "Device Locked"
37+msgstr "Enhet låst"
38+
39+#: qml/Components/DelayedLockscreen.qml:62
40+msgid "You have been locked out due to too many failed passphrase attempts."
41+msgstr "Du har blivit utlåst efter för många misslyckade lösenfrasförsök."
42+
43+#: qml/Components/DelayedLockscreen.qml:63
44+msgid "You have been locked out due to too many failed passcode attempts."
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
49+msgid "Please wait %1 minute and then try again…"
50+msgid_plural "Please wait %1 minutes and then try again…"
51+msgstr[0] "Vänta %1 minut och prova sedan igen..."
52+msgstr[1] "Vänta %1 minuter och prova sedan igen..."
53+
34#: qml/Components/Dialogs.qml:70
54#: qml/Components/Dialogs.qml:70
35msgid "Log out"
55msgid "Log out"
36msgstr "Logga ut"
56msgstr "Logga ut"
@@ -137,40 +157,23 @@ msgstr ""
137"Du har nu bemästrat kantgesterna och kan börja använda "
157"Du har nu bemästrat kantgesterna och kan börja använda "
138"telefonen<br><br>Tryck på skärmen för att starta"
158"telefonen<br><br>Tryck på skärmen för att starta"
139
159
140−#: qml/Components/Lockscreen.qml:167
160+#: qml/Components/Lockscreen.qml:220
141−msgid "Please wait"
142−msgstr "Var god vänta"
143−
144−#: qml/Components/Lockscreen.qml:172
145−msgid "Too many incorrect attempts"
146−msgstr "För många felaktiga försök"
147−
148−#: qml/Components/Lockscreen.qml:206
149msgid "Emergency Call"
161msgid "Emergency Call"
150msgstr "Nödsamtal"
162msgstr "Nödsamtal"
151
163
152−#: qml/Components/Lockscreen.qml:226
164+#: qml/Components/Lockscreen.qml:252
153msgid "OK"
165msgid "OK"
154msgstr "Ok"
166msgstr "Ok"
155
167
156−#: qml/Components/PassphraseLockscreen.qml:61
157−#, qt-format
158−msgid "Hello %1"
159−msgstr "Hej %1"
160−
161−#: qml/Components/PassphraseLockscreen.qml:61
162−msgid "Hello"
163−msgstr "Hej"
164−
165−#: qml/Dash/GenericScopeView.qml:411 qml/Dash/GenericScopeView.qml:533
168+#: qml/Dash/GenericScopeView.qml:434 qml/Dash/GenericScopeView.qml:591
166msgid "See less"
169msgid "See less"
167msgstr "Visa mindre"
170msgstr "Visa mindre"
168
171
169−#: qml/Dash/GenericScopeView.qml:411
172+#: qml/Dash/GenericScopeView.qml:434
170msgid "See all"
173msgid "See all"
171msgstr "Visa alla"
174msgstr "Visa alla"
172
175
173−#: qml/Dash/GenericScopeView.qml:473 qml/Dash/PageHeader.qml:258
176+#: qml/Dash/GenericScopeView.qml:496 qml/Dash/PageHeader.qml:258
174#: qml/Panel/SearchIndicator.qml:27
177#: qml/Panel/SearchIndicator.qml:27
175msgid "Search"
178msgid "Search"
176msgstr "Sök"
179msgstr "Sök"
@@ -207,6 +210,14 @@ msgstr "Lägg till en recension"
207msgid "Send"
210msgid "Send"
208msgstr "Skicka"
211msgstr "Skicka"
209
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+
210#: qml/Dash/ScopesOverview.qml:206
221#: qml/Dash/ScopesOverview.qml:206
211msgid "Manage Scopes"
222msgid "Manage Scopes"
212msgstr "Hantera vyer"
223msgstr "Hantera vyer"
@@ -228,8 +239,8 @@ msgid "All"
228msgstr "Alla"
239msgstr "Alla"
229
240
230#: qml/Greeter/Greeter.qml:157
241#: qml/Greeter/Greeter.qml:157
231−msgid "Swipe to unlock"
242+msgid "Unlock"
232−msgstr "Svep för att låsa upp"
243+msgstr "Lås upp"
233
244
234#: qml/Hud/HudParametrizedActionsPage.qml:139
245#: qml/Hud/HudParametrizedActionsPage.qml:139
235msgid "Confirm"
246msgid "Confirm"
@@ -251,18 +262,10 @@ msgstr "Tala nu…"
251msgid "Speaking..."
262msgid "Speaking..."
252msgstr "Talar…"
263msgstr "Talar…"
253
264
254−#: qml/Notifications/NotificationMenuItemFactory.qml:108
265+#: qml/Notifications/NotificationMenuItemFactory.qml:116
255msgid "Show password"
266msgid "Show password"
256msgstr "Visa lösenord"
267msgstr "Visa lösenord"
257
268
258−#: qml/Notifications/NotificationMenuItemFactory.qml:124
259−msgid "Enter SIM PIN"
260−msgstr "Ange SIM PIN-kod"
261−
262−#: qml/Notifications/NotificationMenuItemFactory.qml:125
263−msgid "Sorry, incorrect PIN"
264−msgstr "Felaktig PIN"
265−
266#: qml/Panel/ActiveCallHint.qml:77
269#: qml/Panel/ActiveCallHint.qml:77
267msgid "Tap to return to call..."
270msgid "Tap to return to call..."
268msgstr "Tryck för att återgå till samtal..."
271msgstr "Tryck för att återgå till samtal..."
@@ -307,45 +310,49 @@ msgstr "Lås upp SIM-kort"
307msgid "Roaming"
310msgid "Roaming"
308msgstr "Roaming"
311msgstr "Roaming"
309
312
310−#: qml/Shell.qml:320
313+#: qml/Shell.qml:346
311−msgid "Enter your passphrase"
314+msgid "Enter passphrase"
312−msgstr "Ange din lösenfras"
315+msgstr "Ange lösenfras"
313
316
314−#: qml/Shell.qml:321
317+#: qml/Shell.qml:347
315msgid "Sorry, incorrect passphrase"
318msgid "Sorry, incorrect passphrase"
316msgstr "Felaktig lösenfras"
319msgstr "Felaktig lösenfras"
317
320
318−#: qml/Shell.qml:323
321+#: qml/Shell.qml:348
319−msgid "Enter your passcode"
322+msgid "Please re-enter"
320−msgstr "Ange din lösenkod"
323+msgstr "Ange igen"
321
324
322−#: qml/Shell.qml:324
325+#: qml/Shell.qml:350
326+msgid "Enter passcode"
327+msgstr "Ange lösenkod"
328+
329+#: qml/Shell.qml:351
323msgid "Sorry, incorrect passcode"
330msgid "Sorry, incorrect passcode"
324msgstr "Felaktig lösenkod"
331msgstr "Felaktig lösenkod"
325
332
326−#: qml/Shell.qml:327
333+#: qml/Shell.qml:354
327#, qt-format
334#, qt-format
328−msgid "Enter your %1"
335+msgid "Enter %1"
329−msgstr "Skriv in din %1"
336+msgstr "Ange %1"
330
337
331−#: qml/Shell.qml:328
338+#: qml/Shell.qml:355
332#, qt-format
339#, qt-format
333msgid "Sorry, incorrect %1"
340msgid "Sorry, incorrect %1"
334msgstr "Felaktig %1"
341msgstr "Felaktig %1"
335
342
336−#: qml/Shell.qml:363
343+#: qml/Shell.qml:390
337msgid "Sorry, incorrect passphrase."
344msgid "Sorry, incorrect passphrase."
338msgstr "Felaktig lösenfras."
345msgstr "Felaktig lösenfras."
339
346
340−#: qml/Shell.qml:364
347+#: qml/Shell.qml:391
341msgid "Sorry, incorrect passcode."
348msgid "Sorry, incorrect passcode."
342msgstr "Felaktig lösenkod."
349msgstr "Felaktig lösenkod."
343
350
344−#: qml/Shell.qml:365
351+#: qml/Shell.qml:392
345msgid "This will be your last attempt."
352msgid "This will be your last attempt."
346msgstr "Detta är ditt sista försök."
353msgstr "Detta är ditt sista försök."
347
354
348−#: qml/Shell.qml:367
355+#: qml/Shell.qml:394
349msgid ""
356msgid ""
350"If passphrase is entered incorrectly, your phone will conduct a factory "
357"If passphrase is entered incorrectly, your phone will conduct a factory "
351"reset and all personal data will be deleted."
358"reset and all personal data will be deleted."
@@ -353,7 +360,7 @@ msgstr ""
353"Om lösenfrasen anges inkorrekt kommer telefonen att fabrikåterställas och "
360"Om lösenfrasen anges inkorrekt kommer telefonen att fabrikåterställas och "
354"all personlig data kommer att tas bort."
361"all personlig data kommer att tas bort."
355
362
356−#: qml/Shell.qml:368
363+#: qml/Shell.qml:395
357msgid ""
364msgid ""
358"If passcode is entered incorrectly, your phone will conduct a factory reset "
365"If passcode is entered incorrectly, your phone will conduct a factory reset "
359"and all personal data will be deleted."
366"and all personal data will be deleted."
@@ -361,5 +368,8 @@ msgstr ""
361"Om lösenkoden anges felaktigt kommer telefonen att fabrikåterställas och all "
368"Om lösenkoden anges felaktigt kommer telefonen att fabrikåterställas och all "
362"personlig data kommer att tas bort."
369"personlig data kommer att tas bort."
363
370
364−#~ msgid "Manage Dash"
371+#~ msgid "Enter SIM PIN"
365−#~ msgstr "Hantera Dash"
372+#~ msgstr "Ange SIM PIN-kod"
373+
374+#~ msgid "Sorry, incorrect PIN"
375+#~ msgstr "Felaktig PIN"
po/sw.po+55−48
@@ -7,14 +7,15 @@ msgid ""
7msgstr ""
7msgstr ""
8"Project-Id-Version: unity8\n"
8"Project-Id-Version: unity8\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2014-09-24 10:43+0100\n"
10+"POT-Creation-Date: 2014-10-07 11:37+0300\n"
11"PO-Revision-Date: 2014-01-14 19:28+0000\n"
11"PO-Revision-Date: 2014-01-14 19:28+0000\n"
12"Last-Translator: Damas <Unknown>\n"
12"Last-Translator: Damas <Unknown>\n"
13"Language-Team: Swahili <sw@li.org>\n"
13"Language-Team: Swahili <sw@li.org>\n"
14"MIME-Version: 1.0\n"
14"MIME-Version: 1.0\n"
15"Content-Type: text/plain; charset=UTF-8\n"
15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n"
16"Content-Transfer-Encoding: 8bit\n"
17+"Plural-Forms: nplurals=2; plural=n != 1;\n"
17−"X-Launchpad-Export-Date: 2014-09-29 05:20+0000\n"
18+"X-Launchpad-Export-Date: 2014-10-09 06:36+0000\n"
18"X-Generator: Launchpad (build 17196)\n"
19"X-Generator: Launchpad (build 17196)\n"
19
20
20#: plugins/LightDM/Greeter.cpp:130
21#: plugins/LightDM/Greeter.cpp:130
@@ -30,6 +31,25 @@ msgstr ""
30msgid "Unpin shortcut"
31msgid "Unpin shortcut"
31msgstr ""
32msgstr ""
32
33
34+#: qml/Components/DelayedLockscreen.qml:47
35+msgid "Device Locked"
36+msgstr ""
37+
38+#: qml/Components/DelayedLockscreen.qml:62
39+msgid "You have been locked out due to too many failed passphrase attempts."
40+msgstr ""
41+
42+#: qml/Components/DelayedLockscreen.qml:63
43+msgid "You have been locked out due to too many failed passcode attempts."
44+msgstr ""
45+
46+#: qml/Components/DelayedLockscreen.qml:72
47+#, qt-format
48+msgid "Please wait %1 minute and then try again…"
49+msgid_plural "Please wait %1 minutes and then try again…"
50+msgstr[0] ""
51+msgstr[1] ""
52+
33#: qml/Components/Dialogs.qml:70
53#: qml/Components/Dialogs.qml:70
34msgid "Log out"
54msgid "Log out"
35msgstr ""
55msgstr ""
@@ -132,40 +152,23 @@ msgid ""
132"phone<br><br>Tap on the screen to start"
152"phone<br><br>Tap on the screen to start"
133msgstr ""
153msgstr ""
134
154
135−#: qml/Components/Lockscreen.qml:167
155+#: qml/Components/Lockscreen.qml:220
136−msgid "Please wait"
137−msgstr ""
138−
139−#: qml/Components/Lockscreen.qml:172
140−msgid "Too many incorrect attempts"
141−msgstr ""
142−
143−#: qml/Components/Lockscreen.qml:206
144msgid "Emergency Call"
156msgid "Emergency Call"
145msgstr ""
157msgstr ""
146
158
147−#: qml/Components/Lockscreen.qml:226
159+#: qml/Components/Lockscreen.qml:252
148msgid "OK"
160msgid "OK"
149msgstr ""
161msgstr ""
150
162
151−#: qml/Components/PassphraseLockscreen.qml:61
152−#, qt-format
153−msgid "Hello %1"
154−msgstr ""
155−
156−#: qml/Components/PassphraseLockscreen.qml:61
157−msgid "Hello"
158−msgstr ""
159−
160−#: qml/Dash/GenericScopeView.qml:411 qml/Dash/GenericScopeView.qml:533
163+#: qml/Dash/GenericScopeView.qml:434 qml/Dash/GenericScopeView.qml:591
161msgid "See less"
164msgid "See less"
162msgstr ""
165msgstr ""
163
166
164−#: qml/Dash/GenericScopeView.qml:411
167+#: qml/Dash/GenericScopeView.qml:434
165msgid "See all"
168msgid "See all"
166msgstr ""
169msgstr ""
167
170
168−#: qml/Dash/GenericScopeView.qml:473 qml/Dash/PageHeader.qml:258
171+#: qml/Dash/GenericScopeView.qml:496 qml/Dash/PageHeader.qml:258
169#: qml/Panel/SearchIndicator.qml:27
172#: qml/Panel/SearchIndicator.qml:27
170msgid "Search"
173msgid "Search"
171msgstr "Tafuta"
174msgstr "Tafuta"
@@ -202,6 +205,14 @@ msgstr ""
202msgid "Send"
205msgid "Send"
203msgstr "Tuma"
206msgstr "Tuma"
204
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+
205#: qml/Dash/ScopesOverview.qml:206
216#: qml/Dash/ScopesOverview.qml:206
206msgid "Manage Scopes"
217msgid "Manage Scopes"
207msgstr ""
218msgstr ""
@@ -223,7 +234,7 @@ msgid "All"
223msgstr ""
234msgstr ""
224
235
225#: qml/Greeter/Greeter.qml:157
236#: qml/Greeter/Greeter.qml:157
226−msgid "Swipe to unlock"
237+msgid "Unlock"
227msgstr ""
238msgstr ""
228
239
229#: qml/Hud/HudParametrizedActionsPage.qml:139
240#: qml/Hud/HudParametrizedActionsPage.qml:139
@@ -246,18 +257,10 @@ msgstr ""
246msgid "Speaking..."
257msgid "Speaking..."
247msgstr ""
258msgstr ""
248
259
249−#: qml/Notifications/NotificationMenuItemFactory.qml:108
260+#: qml/Notifications/NotificationMenuItemFactory.qml:116
250msgid "Show password"
261msgid "Show password"
251msgstr ""
262msgstr ""
252
263
253−#: qml/Notifications/NotificationMenuItemFactory.qml:124
254−msgid "Enter SIM PIN"
255−msgstr ""
256−
257−#: qml/Notifications/NotificationMenuItemFactory.qml:125
258−msgid "Sorry, incorrect PIN"
259−msgstr ""
260−
261#: qml/Panel/ActiveCallHint.qml:77
264#: qml/Panel/ActiveCallHint.qml:77
262msgid "Tap to return to call..."
265msgid "Tap to return to call..."
263msgstr ""
266msgstr ""
@@ -302,51 +305,55 @@ msgstr ""
302msgid "Roaming"
305msgid "Roaming"
303msgstr ""
306msgstr ""
304
307
305−#: qml/Shell.qml:320
308+#: qml/Shell.qml:346
306−msgid "Enter your passphrase"
309+msgid "Enter passphrase"
307msgstr ""
310msgstr ""
308
311
309−#: qml/Shell.qml:321
312+#: qml/Shell.qml:347
310msgid "Sorry, incorrect passphrase"
313msgid "Sorry, incorrect passphrase"
311msgstr ""
314msgstr ""
312
315
313−#: qml/Shell.qml:323
316+#: qml/Shell.qml:348
317+msgid "Please re-enter"
318+msgstr ""
319+
320+#: qml/Shell.qml:350
314−msgid "Enter your passcode"
321+msgid "Enter passcode"
315msgstr ""
322msgstr ""
316
323
317−#: qml/Shell.qml:324
324+#: qml/Shell.qml:351
318msgid "Sorry, incorrect passcode"
325msgid "Sorry, incorrect passcode"
319msgstr ""
326msgstr ""
320
327
321−#: qml/Shell.qml:327
328+#: qml/Shell.qml:354
322#, qt-format
329#, qt-format
323−msgid "Enter your %1"
330+msgid "Enter %1"
324msgstr ""
331msgstr ""
325
332
326−#: qml/Shell.qml:328
333+#: qml/Shell.qml:355
327#, qt-format
334#, qt-format
328msgid "Sorry, incorrect %1"
335msgid "Sorry, incorrect %1"
329msgstr ""
336msgstr ""
330
337
331−#: qml/Shell.qml:363
338+#: qml/Shell.qml:390
332msgid "Sorry, incorrect passphrase."
339msgid "Sorry, incorrect passphrase."
333msgstr ""
340msgstr ""
334
341
335−#: qml/Shell.qml:364
342+#: qml/Shell.qml:391
336msgid "Sorry, incorrect passcode."
343msgid "Sorry, incorrect passcode."
337msgstr ""
344msgstr ""
338
345
339−#: qml/Shell.qml:365
346+#: qml/Shell.qml:392
340msgid "This will be your last attempt."
347msgid "This will be your last attempt."
341msgstr ""
348msgstr ""
342
349
343−#: qml/Shell.qml:367
350+#: qml/Shell.qml:394
344msgid ""
351msgid ""
345"If passphrase is entered incorrectly, your phone will conduct a factory "
352"If passphrase is entered incorrectly, your phone will conduct a factory "
346"reset and all personal data will be deleted."
353"reset and all personal data will be deleted."
347msgstr ""
354msgstr ""
348
355
349−#: qml/Shell.qml:368
356+#: qml/Shell.qml:395
350msgid ""
357msgid ""
351"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 "
352"and all personal data will be deleted."
359"and all personal data will be deleted."
po/ta.po+55−48
@@ -7,14 +7,15 @@ msgid ""
7msgstr ""
7msgstr ""
8"Project-Id-Version: unity8\n"
8"Project-Id-Version: unity8\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2014-09-24 10:43+0100\n"
10+"POT-Creation-Date: 2014-10-07 11:37+0300\n"
11"PO-Revision-Date: 2013-10-24 11:36+0000\n"
11"PO-Revision-Date: 2013-10-24 11:36+0000\n"
12"Last-Translator: Arun Kumar - அருண் குமார் <thangam.arunx@gmail.com>\n"
12"Last-Translator: Arun Kumar - அருண் குமார் <thangam.arunx@gmail.com>\n"
13"Language-Team: Ubuntu Tamil Team/Free Tamil Computing/Thamizha\n"
13"Language-Team: Ubuntu Tamil Team/Free Tamil Computing/Thamizha\n"
14"MIME-Version: 1.0\n"
14"MIME-Version: 1.0\n"
15"Content-Type: text/plain; charset=UTF-8\n"
15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n"
16"Content-Transfer-Encoding: 8bit\n"
17+"Plural-Forms: nplurals=2; plural=n != 1;\n"
17−"X-Launchpad-Export-Date: 2014-09-29 05:20+0000\n"
18+"X-Launchpad-Export-Date: 2014-10-09 06:37+0000\n"
18"X-Generator: Launchpad (build 17196)\n"
19"X-Generator: Launchpad (build 17196)\n"
19"Language: ta\n"
20"Language: ta\n"
20
21
@@ -31,6 +32,25 @@ msgstr ""
31msgid "Unpin shortcut"
32msgid "Unpin shortcut"
32msgstr ""
33msgstr ""
33
34
35+#: qml/Components/DelayedLockscreen.qml:47
36+msgid "Device Locked"
37+msgstr ""
38+
39+#: qml/Components/DelayedLockscreen.qml:62
40+msgid "You have been locked out due to too many failed passphrase attempts."
41+msgstr ""
42+
43+#: qml/Components/DelayedLockscreen.qml:63
44+msgid "You have been locked out due to too many failed passcode attempts."
45+msgstr ""
46+
47+#: qml/Components/DelayedLockscreen.qml:72
48+#, qt-format
49+msgid "Please wait %1 minute and then try again…"
50+msgid_plural "Please wait %1 minutes and then try again…"
51+msgstr[0] ""
52+msgstr[1] ""
53+
34#: qml/Components/Dialogs.qml:70
54#: qml/Components/Dialogs.qml:70
35msgid "Log out"
55msgid "Log out"
36msgstr ""
56msgstr ""
@@ -135,40 +155,23 @@ msgid ""
135"phone<br><br>Tap on the screen to start"
155"phone<br><br>Tap on the screen to start"
136msgstr ""
156msgstr ""
137
157
138−#: qml/Components/Lockscreen.qml:167
158+#: qml/Components/Lockscreen.qml:220
139−msgid "Please wait"
140−msgstr ""
141−
142−#: qml/Components/Lockscreen.qml:172
143−msgid "Too many incorrect attempts"
144−msgstr ""
145−
146−#: qml/Components/Lockscreen.qml:206
147msgid "Emergency Call"
159msgid "Emergency Call"
148msgstr "அவசர அழைப்பு"
160msgstr "அவசர அழைப்பு"
149
161
150−#: qml/Components/Lockscreen.qml:226
162+#: qml/Components/Lockscreen.qml:252
151msgid "OK"
163msgid "OK"
152msgstr ""
164msgstr ""
153
165
154−#: qml/Components/PassphraseLockscreen.qml:61
155−#, qt-format
156−msgid "Hello %1"
157−msgstr "வணக்கம் %1"
158−
159−#: qml/Components/PassphraseLockscreen.qml:61
160−msgid "Hello"
161−msgstr "வணக்கம்"
162−
163−#: qml/Dash/GenericScopeView.qml:411 qml/Dash/GenericScopeView.qml:533
166+#: qml/Dash/GenericScopeView.qml:434 qml/Dash/GenericScopeView.qml:591
164msgid "See less"
167msgid "See less"
165msgstr ""
168msgstr ""
166
169
167−#: qml/Dash/GenericScopeView.qml:411
170+#: qml/Dash/GenericScopeView.qml:434
168msgid "See all"
171msgid "See all"
169msgstr ""
172msgstr ""
170
173
171−#: qml/Dash/GenericScopeView.qml:473 qml/Dash/PageHeader.qml:258
174+#: qml/Dash/GenericScopeView.qml:496 qml/Dash/PageHeader.qml:258
172#: qml/Panel/SearchIndicator.qml:27
175#: qml/Panel/SearchIndicator.qml:27
173msgid "Search"
176msgid "Search"
174msgstr "தெடு"
177msgstr "தெடு"
@@ -205,6 +208,14 @@ msgstr "ஒரு பரிசீலனையை சேர்"
205msgid "Send"
208msgid "Send"
206msgstr "அனுப்பு"
209msgstr "அனுப்பு"
207
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+
208#: qml/Dash/ScopesOverview.qml:206
219#: qml/Dash/ScopesOverview.qml:206
209msgid "Manage Scopes"
220msgid "Manage Scopes"
210msgstr ""
221msgstr ""
@@ -226,7 +237,7 @@ msgid "All"
226msgstr ""
237msgstr ""
227
238
228#: qml/Greeter/Greeter.qml:157
239#: qml/Greeter/Greeter.qml:157
229−msgid "Swipe to unlock"
240+msgid "Unlock"
230msgstr ""
241msgstr ""
231
242
232#: qml/Hud/HudParametrizedActionsPage.qml:139
243#: qml/Hud/HudParametrizedActionsPage.qml:139
@@ -249,18 +260,10 @@ msgstr "இப்பொது பேசு..."
249msgid "Speaking..."
260msgid "Speaking..."
250msgstr "பேசுகிறது..."
261msgstr "பேசுகிறது..."
251
262
252−#: qml/Notifications/NotificationMenuItemFactory.qml:108
263+#: qml/Notifications/NotificationMenuItemFactory.qml:116
253msgid "Show password"
264msgid "Show password"
254msgstr ""
265msgstr ""
255
266
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
267#: qml/Panel/ActiveCallHint.qml:77
265msgid "Tap to return to call..."
268msgid "Tap to return to call..."
266msgstr ""
269msgstr ""
@@ -305,51 +308,55 @@ msgstr ""
305msgid "Roaming"
308msgid "Roaming"
306msgstr ""
309msgstr ""
307
310
308−#: qml/Shell.qml:320
311+#: qml/Shell.qml:346
309−msgid "Enter your passphrase"
312+msgid "Enter passphrase"
310msgstr ""
313msgstr ""
311
314
312−#: qml/Shell.qml:321
315+#: qml/Shell.qml:347
313msgid "Sorry, incorrect passphrase"
316msgid "Sorry, incorrect passphrase"
314msgstr ""
317msgstr ""
315
318
316−#: qml/Shell.qml:323
319+#: qml/Shell.qml:348
320+msgid "Please re-enter"
321+msgstr ""
322+
323+#: qml/Shell.qml:350
317−msgid "Enter your passcode"
324+msgid "Enter passcode"
318msgstr ""
325msgstr ""
319
326
320−#: qml/Shell.qml:324
327+#: qml/Shell.qml:351
321msgid "Sorry, incorrect passcode"
328msgid "Sorry, incorrect passcode"
322msgstr ""
329msgstr ""
323
330
324−#: qml/Shell.qml:327
331+#: qml/Shell.qml:354
325#, qt-format
332#, qt-format
326−msgid "Enter your %1"
333+msgid "Enter %1"
327msgstr ""
334msgstr ""
328
335
329−#: qml/Shell.qml:328
336+#: qml/Shell.qml:355
330#, qt-format
337#, qt-format
331msgid "Sorry, incorrect %1"
338msgid "Sorry, incorrect %1"
332msgstr ""
339msgstr ""
333
340
334−#: qml/Shell.qml:363
341+#: qml/Shell.qml:390
335msgid "Sorry, incorrect passphrase."
342msgid "Sorry, incorrect passphrase."
336msgstr ""
343msgstr ""
337
344
338−#: qml/Shell.qml:364
345+#: qml/Shell.qml:391
339msgid "Sorry, incorrect passcode."
346msgid "Sorry, incorrect passcode."
340msgstr ""
347msgstr ""
341
348
342−#: qml/Shell.qml:365
349+#: qml/Shell.qml:392
343msgid "This will be your last attempt."
350msgid "This will be your last attempt."
344msgstr ""
351msgstr ""
345
352
346−#: qml/Shell.qml:367
353+#: qml/Shell.qml:394
347msgid ""
354msgid ""
348"If passphrase is entered incorrectly, your phone will conduct a factory "
355"If passphrase is entered incorrectly, your phone will conduct a factory "
349"reset and all personal data will be deleted."
356"reset and all personal data will be deleted."
350msgstr ""
357msgstr ""
351
358
352−#: qml/Shell.qml:368
359+#: qml/Shell.qml:395
353msgid ""
360msgid ""
354"If passcode is entered incorrectly, your phone will conduct a factory reset "
361"If passcode is entered incorrectly, your phone will conduct a factory reset "
355"and all personal data will be deleted."
362"and all personal data will be deleted."
po/te.po+56−49
@@ -7,14 +7,15 @@ msgid ""
7msgstr ""
7msgstr ""
8"Project-Id-Version: unity\n"
8"Project-Id-Version: unity\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2014-09-24 10:43+0100\n"
10+"POT-Creation-Date: 2014-10-07 11:37+0300\n"
11"PO-Revision-Date: 2014-07-19 10:04+0000\n"
11"PO-Revision-Date: 2014-07-19 10:04+0000\n"
12"Last-Translator: Praveen Illa <mail2ipn@gmail.com>\n"
12"Last-Translator: Praveen Illa <mail2ipn@gmail.com>\n"
13"Language-Team: Telugu <te@li.org>\n"
13"Language-Team: Telugu <te@li.org>\n"
14"MIME-Version: 1.0\n"
14"MIME-Version: 1.0\n"
15"Content-Type: text/plain; charset=UTF-8\n"
15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n"
16"Content-Transfer-Encoding: 8bit\n"
17+"Plural-Forms: nplurals=2; plural=n != 1;\n"
17−"X-Launchpad-Export-Date: 2014-09-29 05:20+0000\n"
18+"X-Launchpad-Export-Date: 2014-10-09 06:37+0000\n"
18"X-Generator: Launchpad (build 17196)\n"
19"X-Generator: Launchpad (build 17196)\n"
19
20
20#: plugins/LightDM/Greeter.cpp:130
21#: plugins/LightDM/Greeter.cpp:130
@@ -30,6 +31,25 @@ msgstr ""
30msgid "Unpin shortcut"
31msgid "Unpin shortcut"
31msgstr ""
32msgstr ""
32
33
34+#: qml/Components/DelayedLockscreen.qml:47
35+msgid "Device Locked"
36+msgstr ""
37+
38+#: qml/Components/DelayedLockscreen.qml:62
39+msgid "You have been locked out due to too many failed passphrase attempts."
40+msgstr ""
41+
42+#: qml/Components/DelayedLockscreen.qml:63
43+msgid "You have been locked out due to too many failed passcode attempts."
44+msgstr ""
45+
46+#: qml/Components/DelayedLockscreen.qml:72
47+#, qt-format
48+msgid "Please wait %1 minute and then try again…"
49+msgid_plural "Please wait %1 minutes and then try again…"
50+msgstr[0] ""
51+msgstr[1] ""
52+
33#: qml/Components/Dialogs.qml:70
53#: qml/Components/Dialogs.qml:70
34msgid "Log out"
54msgid "Log out"
35msgstr ""
55msgstr ""
@@ -132,40 +152,23 @@ msgid ""
132"phone<br><br>Tap on the screen to start"
152"phone<br><br>Tap on the screen to start"
133msgstr ""
153msgstr ""
134
154
135−#: qml/Components/Lockscreen.qml:167
155+#: qml/Components/Lockscreen.qml:220
136−msgid "Please wait"
137−msgstr ""
138−
139−#: qml/Components/Lockscreen.qml:172
140−msgid "Too many incorrect attempts"
141−msgstr ""
142−
143−#: qml/Components/Lockscreen.qml:206
144msgid "Emergency Call"
156msgid "Emergency Call"
145msgstr "అత్యవసర పిలుపు"
157msgstr "అత్యవసర పిలుపు"
146
158
147−#: qml/Components/Lockscreen.qml:226
159+#: qml/Components/Lockscreen.qml:252
148msgid "OK"
160msgid "OK"
149msgstr "సరే"
161msgstr "సరే"
150
162
151−#: qml/Components/PassphraseLockscreen.qml:61
152−#, qt-format
153−msgid "Hello %1"
154−msgstr "హలో %1"
155−
156−#: qml/Components/PassphraseLockscreen.qml:61
157−msgid "Hello"
158−msgstr "హలో"
159−
160−#: qml/Dash/GenericScopeView.qml:411 qml/Dash/GenericScopeView.qml:533
163+#: qml/Dash/GenericScopeView.qml:434 qml/Dash/GenericScopeView.qml:591
161msgid "See less"
164msgid "See less"
162msgstr ""
165msgstr ""
163
166
164−#: qml/Dash/GenericScopeView.qml:411
167+#: qml/Dash/GenericScopeView.qml:434
165msgid "See all"
168msgid "See all"
166msgstr ""
169msgstr ""
167
170
168−#: qml/Dash/GenericScopeView.qml:473 qml/Dash/PageHeader.qml:258
171+#: qml/Dash/GenericScopeView.qml:496 qml/Dash/PageHeader.qml:258
169#: qml/Panel/SearchIndicator.qml:27
172#: qml/Panel/SearchIndicator.qml:27
170msgid "Search"
173msgid "Search"
171msgstr "వెతుకు"
174msgstr "వెతుకు"
@@ -202,6 +205,14 @@ msgstr "ఒక సమీక్షను వ్రాయండి"
202msgid "Send"
205msgid "Send"
203msgstr "పంపు"
206msgstr "పంపు"
204
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+
205#: qml/Dash/ScopesOverview.qml:206
216#: qml/Dash/ScopesOverview.qml:206
206msgid "Manage Scopes"
217msgid "Manage Scopes"
207msgstr ""
218msgstr ""
@@ -223,8 +234,8 @@ msgid "All"
223msgstr ""
234msgstr ""
224
235
225#: qml/Greeter/Greeter.qml:157
236#: qml/Greeter/Greeter.qml:157
226−msgid "Swipe to unlock"
237+msgid "Unlock"
227−msgstr "తాళంతీయుటకు గీకండి"
238+msgstr ""
228
239
229#: qml/Hud/HudParametrizedActionsPage.qml:139
240#: qml/Hud/HudParametrizedActionsPage.qml:139
230msgid "Confirm"
241msgid "Confirm"
@@ -246,18 +257,10 @@ msgstr "ఇప్పుడు మాట్లాడండి..."
246msgid "Speaking..."
257msgid "Speaking..."
247msgstr "మాట్లాడుతున్నారు..."
258msgstr "మాట్లాడుతున్నారు..."
248
259
249−#: qml/Notifications/NotificationMenuItemFactory.qml:108
260+#: qml/Notifications/NotificationMenuItemFactory.qml:116
250msgid "Show password"
261msgid "Show password"
251msgstr "సంకేతపదాన్ని చూపించు"
262msgstr "సంకేతపదాన్ని చూపించు"
252
263
253−#: qml/Notifications/NotificationMenuItemFactory.qml:124
254−msgid "Enter SIM PIN"
255−msgstr ""
256−
257−#: qml/Notifications/NotificationMenuItemFactory.qml:125
258−msgid "Sorry, incorrect PIN"
259−msgstr ""
260−
261#: qml/Panel/ActiveCallHint.qml:77
264#: qml/Panel/ActiveCallHint.qml:77
262msgid "Tap to return to call..."
265msgid "Tap to return to call..."
263msgstr ""
266msgstr ""
@@ -302,51 +305,55 @@ msgstr ""
302msgid "Roaming"
305msgid "Roaming"
303msgstr ""
306msgstr ""
304
307
305−#: qml/Shell.qml:320
308+#: qml/Shell.qml:346
306−msgid "Enter your passphrase"
309+msgid "Enter passphrase"
307msgstr ""
310msgstr ""
308
311
309−#: qml/Shell.qml:321
312+#: qml/Shell.qml:347
310msgid "Sorry, incorrect passphrase"
313msgid "Sorry, incorrect passphrase"
311msgstr ""
314msgstr ""
312
315
313−#: qml/Shell.qml:323
316+#: qml/Shell.qml:348
317+msgid "Please re-enter"
318+msgstr ""
319+
320+#: qml/Shell.qml:350
314−msgid "Enter your passcode"
321+msgid "Enter passcode"
315msgstr ""
322msgstr ""
316
323
317−#: qml/Shell.qml:324
324+#: qml/Shell.qml:351
318msgid "Sorry, incorrect passcode"
325msgid "Sorry, incorrect passcode"
319msgstr ""
326msgstr ""
320
327
321−#: qml/Shell.qml:327
328+#: qml/Shell.qml:354
322#, qt-format
329#, qt-format
323−msgid "Enter your %1"
330+msgid "Enter %1"
324msgstr ""
331msgstr ""
325
332
326−#: qml/Shell.qml:328
333+#: qml/Shell.qml:355
327#, qt-format
334#, qt-format
328msgid "Sorry, incorrect %1"
335msgid "Sorry, incorrect %1"
329msgstr ""
336msgstr ""
330
337
331−#: qml/Shell.qml:363
338+#: qml/Shell.qml:390
332msgid "Sorry, incorrect passphrase."
339msgid "Sorry, incorrect passphrase."
333msgstr ""
340msgstr ""
334
341
335−#: qml/Shell.qml:364
342+#: qml/Shell.qml:391
336msgid "Sorry, incorrect passcode."
343msgid "Sorry, incorrect passcode."
337msgstr ""
344msgstr ""
338
345
339−#: qml/Shell.qml:365
346+#: qml/Shell.qml:392
340msgid "This will be your last attempt."
347msgid "This will be your last attempt."
341msgstr ""
348msgstr ""
342
349
343−#: qml/Shell.qml:367
350+#: qml/Shell.qml:394
344msgid ""
351msgid ""
345"If passphrase is entered incorrectly, your phone will conduct a factory "
352"If passphrase is entered incorrectly, your phone will conduct a factory "
346"reset and all personal data will be deleted."
353"reset and all personal data will be deleted."
347msgstr ""
354msgstr ""
348
355
349−#: qml/Shell.qml:368
356+#: qml/Shell.qml:395
350msgid ""
357msgid ""
351"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 "
352"and all personal data will be deleted."
359"and all personal data will be deleted."
po/th.po+245−105
@@ -1,220 +1,360 @@
1−# Thai translation for unity
1+# Thai translation for unity8
2−# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013
2+# Copyright (c) 2014 Rosetta Contributors and Canonical Ltd 2014
3−# This file is distributed under the same license as the unity package.
3+# This file is distributed under the same license as the unity8 package.
4−# FIRST AUTHOR <EMAIL@ADDRESS>, 2013.
4+# FIRST AUTHOR <EMAIL@ADDRESS>, 2014.
5#
5#
6msgid ""
6msgid ""
7msgstr ""
7msgstr ""
8−"Project-Id-Version: unity\n"
8+"Project-Id-Version: unity8\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2013-06-26 22:58+0200\n"
10+"POT-Creation-Date: 2014-10-07 11:37+0300\n"
11−"PO-Revision-Date: 2013-06-28 15:34+0000\n"
11+"PO-Revision-Date: 2014-10-02 04:55+0000\n"
12"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
12"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
13"Language-Team: Thai <th@li.org>\n"
13"Language-Team: Thai <th@li.org>\n"
14"MIME-Version: 1.0\n"
14"MIME-Version: 1.0\n"
15"Content-Type: text/plain; charset=UTF-8\n"
15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n"
16"Content-Transfer-Encoding: 8bit\n"
17+"Plural-Forms: nplurals=1; plural=0;\n"
17−"X-Launchpad-Export-Date: 2013-06-30 07:12+0000\n"
18+"X-Launchpad-Export-Date: 2014-10-09 06:37+0000\n"
18−"X-Generator: Launchpad (build 16692)\n"
19+"X-Generator: Launchpad (build 17196)\n"
19
20
20−#: Applications/applications.js:23
21+#: plugins/LightDM/Greeter.cpp:130
21−msgid "Phone"
22+msgid "Password: "
22msgstr ""
23msgstr ""
23
24
24−#: Applications/applications.js:29
25+#: plugins/Unity/Launcher/launcheritem.cpp:45
25−msgid "Camera"
26+#: plugins/Unity/Launcher/launcheritem.cpp:91
27+msgid "Pin shortcut"
26msgstr ""
28msgstr ""
27
29
28−#: Applications/applications.js:35
30+#: plugins/Unity/Launcher/launcheritem.cpp:91
29−msgid "Gallery"
31+msgid "Unpin shortcut"
30msgstr ""
32msgstr ""
31
33
32−#: Applications/applications.js:40
34+#: qml/Components/DelayedLockscreen.qml:47
33−msgid "Facebook"
35+msgid "Device Locked"
34msgstr ""
36msgstr ""
35
37
36−#: Applications/applications.js:46
38+#: qml/Components/DelayedLockscreen.qml:62
37−msgid "Browser"
39+msgid "You have been locked out due to too many failed passphrase attempts."
38msgstr ""
40msgstr ""
39
41
40−#: Applications/applications.js:51
42+#: qml/Components/DelayedLockscreen.qml:63
41−msgid "Twitter"
43+msgid "You have been locked out due to too many failed passcode attempts."
42msgstr ""
44msgstr ""
43
45
44−#: Applications/applications.js:57
46+#: qml/Components/DelayedLockscreen.qml:72
45−msgid "GMail"
47+#, qt-format
48+msgid "Please wait %1 minute and then try again…"
49+msgid_plural "Please wait %1 minutes and then try again…"
50+msgstr[0] ""
51+msgstr[1] ""
52+
53+#: qml/Components/Dialogs.qml:70
54+msgid "Log out"
46msgstr ""
55msgstr ""
47
56
48−#: Applications/applications.js:62
57+#: qml/Components/Dialogs.qml:71
49−msgid "Weather"
58+msgid "Are you sure you want to log out?"
50msgstr ""
59msgstr ""
51
60
52−#: Applications/applications.js:68
61+#: qml/Components/Dialogs.qml:73 qml/Components/Dialogs.qml:97
62+#: qml/Components/Dialogs.qml:122
53−msgid "Notepad"
63+msgid "No"
54msgstr ""
64msgstr ""
55
65
56−#: Applications/applications.js:74
66+#: qml/Components/Dialogs.qml:80 qml/Components/Dialogs.qml:104
67+#: qml/Components/Dialogs.qml:129
57−msgid "Calendar"
68+msgid "Yes"
58msgstr ""
69msgstr ""
59
70
60−#: Applications/applications.js:80
71+#: qml/Components/Dialogs.qml:94
61−msgid "Media Player"
72+msgid "Shut down"
62msgstr ""
73msgstr ""
63
74
64−#: Applications/applications.js:86
75+#: qml/Components/Dialogs.qml:95
65−msgid "Evernote"
76+msgid "Are you sure you want to shut down?"
66msgstr ""
77msgstr ""
67
78
68−#: Applications/applications.js:91
79+#: qml/Components/Dialogs.qml:119
69−msgid "Map"
80+msgid "Reboot"
70msgstr ""
81msgstr ""
71
82
72−#: Applications/applications.js:96
83+#: qml/Components/Dialogs.qml:120
73−msgid "Pinterest"
84+msgid "Are you sure you want to reboot?"
74msgstr ""
85msgstr ""
75
86
76−#: Applications/applications.js:101
87+#: qml/Components/Dialogs.qml:144
77−msgid "SoundCloud"
88+msgid "Power"
78msgstr ""
89msgstr ""
79
90
80−#: Applications/applications.js:106
91+#: qml/Components/Dialogs.qml:145
81−msgid "Wikipedia"
92+msgid ""
93+"Are you sure you would like\n"
94+"to power off?"
82msgstr ""
95msgstr ""
83
96
84−#: Applications/applications.js:111
97+#: qml/Components/Dialogs.qml:147
85−msgid "YouTube"
98+msgid "Power off"
86msgstr ""
99msgstr ""
87
100
88−#: Components/PageHeader.qml:300
101+#: qml/Components/Dialogs.qml:157
89−msgid "Recent searches"
102+msgid "Restart"
90msgstr ""
103msgstr ""
91
104
92−#: Dash/DashApps.qml:65
105+#: qml/Components/Dialogs.qml:167
93−msgid "Running apps"
106+msgid "Cancel"
94msgstr ""
107msgstr ""
95
108
96−#: Dash/DashApps.qml:68
109+#: qml/Components/EdgeDemoOverlay.qml:151
97−msgid "Frequently used"
110+msgid "Skip intro"
98msgstr ""
111msgstr ""
99
112
100−#: Dash/DashApps.qml:71
113+#: qml/Components/EdgeDemo.qml:112
101−msgid "Installed"
114+msgid "Right edge"
102msgstr ""
115msgstr ""
103
116
104−#: Dash/DashApps.qml:74
117+#: qml/Components/EdgeDemo.qml:113
105−msgid "Available for download"
118+msgid "Try swiping from the right edge to unlock the phone"
106msgstr ""
119msgstr ""
107
120
108−#: Dash/DashApps.qml:178
121+#: qml/Components/EdgeDemo.qml:144
109−msgid "Apps"
122+msgid "Top edge"
110msgstr ""
123msgstr ""
111
124
112−#: Dash/DashHome.qml:40
125+#: qml/Components/EdgeDemo.qml:145
113−msgid "Frequent Apps"
126+msgid "Try swiping from the top edge to access the indicators"
114msgstr ""
127msgstr ""
115
128
116−#: Dash/DashHome.qml:43
129+#: qml/Components/EdgeDemo.qml:170
117−msgid "Recent Music"
130+msgid "Close"
118msgstr ""
131msgstr ""
119
132
120−#: Dash/DashHome.qml:46
133+#: qml/Components/EdgeDemo.qml:171
121−msgid "Videos Popular Online"
134+msgid "Swipe up again to close the settings screen"
122msgstr ""
135msgstr ""
123
136
124−#: Dash/DashHome.qml:175
137+#: qml/Components/EdgeDemo.qml:198
125−msgid "Home"
138+msgid "Left edge"
126msgstr ""
139msgstr ""
127
140
128−#: Dash/DashMusic.qml:27 Dash/DashVideos.qml:28
141+#: qml/Components/EdgeDemo.qml:199
129−msgid "Featured"
142+msgid "Swipe from the left to reveal the launcher for quick access to apps"
130msgstr ""
143msgstr ""
131
144
132−#: Dash/DashMusic.qml:28 Dash/DashVideos.qml:29
145+#: qml/Components/EdgeDemo.qml:226
133−msgid "Recent"
146+msgid "Well done"
134msgstr ""
147msgstr ""
135
148
136−#: Dash/DashMusic.qml:29 Dash/DashVideos.qml:30
149+#: qml/Components/EdgeDemo.qml:227
137−msgid "New Releases"
150+msgid ""
151+"You have now mastered the edge gestures and can start using the "
152+"phone<br><br>Tap on the screen to start"
138msgstr ""
153msgstr ""
139
154
140−#: Dash/DashMusic.qml:30
155+#: qml/Components/Lockscreen.qml:220
141−msgid "Top Charting"
156+msgid "Emergency Call"
142msgstr ""
157msgstr ""
143
158
144−#: Dash/DashMusic.qml:99
159+#: qml/Components/Lockscreen.qml:252
145−msgid "Music"
160+msgid "OK"
146msgstr ""
161msgstr ""
147
162
148−#: Dash/DashVideos.qml:31
163+#: qml/Dash/GenericScopeView.qml:434 qml/Dash/GenericScopeView.qml:591
149−msgid "Popular Online"
164+msgid "See less"
150msgstr ""
165msgstr ""
151
166
152−#: Dash/DashVideos.qml:155
167+#: qml/Dash/GenericScopeView.qml:434
153−msgid "Videos"
168+msgid "See all"
154msgstr ""
169msgstr ""
155
170
156−#: Dash/Video/VideoPreview.qml:98
171+#: qml/Dash/GenericScopeView.qml:496 qml/Dash/PageHeader.qml:258
157−msgid "Directed by:"
172+#: qml/Panel/SearchIndicator.qml:27
173+msgid "Search"
158msgstr ""
174msgstr ""
159
175
160−#: Dash/Video/VideoPreview.qml:121
176+#: qml/Dash/PageHeader.qml:268
161−msgid "Starring:"
177+msgid "Settings"
162msgstr ""
178msgstr ""
163
179
164−#: Dash/Video/VideoPreview.qml:144
180+#: qml/Dash/PageHeader.qml:275
165−msgid "Author:"
181+msgid "Remove from Favorites"
166msgstr ""
182msgstr ""
167
183
168−#: Greeter/Lockscreen.qml:133
184+#: qml/Dash/PageHeader.qml:275
169−msgid "Emergency call"
185+msgid "Add to Favorites"
170msgstr ""
186msgstr ""
171
187
172−#: Greeter/PassphraseLockscreen.qml:59
188+#: qml/Dash/Previews/PreviewActionCombo.qml:35
173−#, qt-format
189+msgid "More..."
174−msgid "Hello %1"
190+msgstr ""
191+
192+#: qml/Dash/Previews/PreviewActionCombo.qml:35
193+msgid "Less..."
194+msgstr ""
195+
196+#: qml/Dash/Previews/PreviewRatingInput.qml:81
197+msgid "Rate this"
198+msgstr ""
199+
200+#: qml/Dash/Previews/PreviewRatingInput.qml:126
201+msgid "Add a review"
202+msgstr ""
203+
204+#: qml/Dash/Previews/PreviewRatingInput.qml:166
205+msgid "Send"
206+msgstr ""
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…"
175msgstr ""
214msgstr ""
176
215
177−#: Greeter/PassphraseLockscreen.qml:59
216+#: qml/Dash/ScopesOverview.qml:206
178−msgid "Hello"
217+msgid "Manage Scopes"
179msgstr ""
218msgstr ""
180
219
220+#: qml/Dash/ScopesOverview.qml:428
221+msgid "Done"
222+msgstr ""
223+
224+#: qml/Dash/ScopesOverview.qml:454
225+msgid "Store"
226+msgstr ""
227+
228+#: qml/Dash/ScopesOverviewTab.qml:36
229+msgid "Favorites"
230+msgstr ""
231+
232+#: qml/Dash/ScopesOverviewTab.qml:54
233+msgid "All"
234+msgstr ""
235+
236+#: qml/Greeter/Greeter.qml:157
237+msgid "Unlock"
238+msgstr ""
239+
181−#: Hud/HudParametrizedActionsPage.qml:132
240+#: qml/Hud/HudParametrizedActionsPage.qml:139
182msgid "Confirm"
241msgid "Confirm"
183msgstr ""
242msgstr ""
184
243
185−#: Hud/Hud.qml:61 Hud/Hud.qml:99 Hud/Hud.qml:372
244+#: qml/Hud/Hud.qml:61 qml/Hud/Hud.qml:99 qml/Hud/Hud.qml:372
186msgid "Type or say a command"
245msgid "Type or say a command"
187msgstr ""
246msgstr ""
188
247
189−#: Hud/Hud.qml:84
248+#: qml/Hud/Hud.qml:84
190msgid "Loading. Please Wait..."
249msgid "Loading. Please Wait..."
191msgstr ""
250msgstr ""
192
251
193−#: Hud/Hud.qml:89
252+#: qml/Hud/Hud.qml:89
194msgid "Speak Now..."
253msgid "Speak Now..."
195msgstr ""
254msgstr ""
196
255
197−#: Hud/Hud.qml:94
256+#: qml/Hud/Hud.qml:94
198msgid "Speaking..."
257msgid "Speaking..."
199msgstr ""
258msgstr ""
200
259
201−#: Panel/MenuContent.qml:192
260+#: qml/Notifications/NotificationMenuItemFactory.qml:116
202−msgid "Device"
261+msgid "Show password"
203msgstr ""
262msgstr ""
204
263
205−#: Panel/Menus/Overview/FlightModeWidget.qml:42
264+#: qml/Panel/ActiveCallHint.qml:77
206−msgid "Flight mode"
265+msgid "Tap to return to call..."
207msgstr ""
266msgstr ""
208
267
209−#: Panel/SearchIndicator.qml:26
268+#: qml/Panel/ActiveCallHint.qml:90
210−msgid "Search"
269+msgid "Conference"
270+msgstr ""
271+
272+#: qml/Panel/Indicators/MenuItemFactory.qml:600
273+msgid "Nothing is playing"
274+msgstr ""
275+
276+#: qml/Panel/Indicators/MenuItemFactory.qml:748
277+msgid "In queue…"
278+msgstr ""
279+
280+#: qml/Panel/Indicators/MenuItemFactory.qml:752
281+msgid "Downloading"
211msgstr ""
282msgstr ""
212
283
213−#: plugins/Unity/scope.cpp:268
284+#: qml/Panel/Indicators/MenuItemFactory.qml:754
214−msgid "Sorry, there is nothing that matches your search."
285+msgid "Paused, tap to resume"
215msgstr ""
286msgstr ""
216
287
288+#: qml/Panel/Indicators/MenuItemFactory.qml:756
289+msgid "Canceled"
290+msgstr ""
291+
292+#: qml/Panel/Indicators/MenuItemFactory.qml:758
293+msgid "Finished"
294+msgstr ""
295+
296+#: qml/Panel/Indicators/MenuItemFactory.qml:760
297+msgid "Failed, tap to retry"
298+msgstr ""
299+
300+#: qml/Panel/Indicators/ModemInfoItem.qml:105
301+msgid "Unlock SIM"
302+msgstr ""
303+
304+#: qml/Panel/Indicators/RoamingIndication.qml:27
305+msgid "Roaming"
306+msgstr ""
307+
308+#: qml/Shell.qml:346
309+msgid "Enter passphrase"
310+msgstr ""
311+
217−#: Shell.qml:383
312+#: qml/Shell.qml:347
313+msgid "Sorry, incorrect passphrase"
314+msgstr ""
315+
316+#: qml/Shell.qml:348
317+msgid "Please re-enter"
318+msgstr ""
319+
320+#: qml/Shell.qml:350
321+msgid "Enter passcode"
322+msgstr ""
323+
324+#: qml/Shell.qml:351
325+msgid "Sorry, incorrect passcode"
326+msgstr ""
327+
328+#: qml/Shell.qml:354
329+#, qt-format
330+msgid "Enter %1"
331+msgstr ""
332+
333+#: qml/Shell.qml:355
218#, qt-format
334#, qt-format
219−msgid "Please enter %1"
335+msgid "Sorry, incorrect %1"
336+msgstr ""
337+
338+#: qml/Shell.qml:390
339+msgid "Sorry, incorrect passphrase."
340+msgstr ""
341+
342+#: qml/Shell.qml:391
343+msgid "Sorry, incorrect passcode."
344+msgstr ""
345+
346+#: qml/Shell.qml:392
347+msgid "This will be your last attempt."
348+msgstr ""
349+
350+#: qml/Shell.qml:394
351+msgid ""
352+"If passphrase is entered incorrectly, your phone will conduct a factory "
353+"reset and all personal data will be deleted."
354+msgstr ""
355+
356+#: qml/Shell.qml:395
357+msgid ""
358+"If passcode is entered incorrectly, your phone will conduct a factory reset "
359+"and all personal data will be deleted."
220msgstr ""
360msgstr ""
po/tr.po+61−51
@@ -7,14 +7,15 @@ msgid ""
7msgstr ""
7msgstr ""
8"Project-Id-Version: unity\n"
8"Project-Id-Version: unity\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2014-09-24 10:43+0100\n"
10+"POT-Creation-Date: 2014-10-07 11:37+0300\n"
11"PO-Revision-Date: 2014-07-16 17:58+0000\n"
11"PO-Revision-Date: 2014-07-16 17:58+0000\n"
12"Last-Translator: Volkan Gezer <Unknown>\n"
12"Last-Translator: Volkan Gezer <Unknown>\n"
13"Language-Team: Turkish <tr@li.org>\n"
13"Language-Team: Turkish <tr@li.org>\n"
14"MIME-Version: 1.0\n"
14"MIME-Version: 1.0\n"
15"Content-Type: text/plain; charset=UTF-8\n"
15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n"
16"Content-Transfer-Encoding: 8bit\n"
17+"Plural-Forms: nplurals=2; plural=n != 1;\n"
17−"X-Launchpad-Export-Date: 2014-09-29 05:20+0000\n"
18+"X-Launchpad-Export-Date: 2014-10-09 06:37+0000\n"
18"X-Generator: Launchpad (build 17196)\n"
19"X-Generator: Launchpad (build 17196)\n"
19
20
20#: plugins/LightDM/Greeter.cpp:130
21#: plugins/LightDM/Greeter.cpp:130
@@ -30,6 +31,25 @@ msgstr "Kısayolu iğnele"
30msgid "Unpin shortcut"
31msgid "Unpin shortcut"
31msgstr "Kısayol iğnesini kaldır"
32msgstr "Kısayol iğnesini kaldır"
32
33
34+#: qml/Components/DelayedLockscreen.qml:47
35+msgid "Device Locked"
36+msgstr ""
37+
38+#: qml/Components/DelayedLockscreen.qml:62
39+msgid "You have been locked out due to too many failed passphrase attempts."
40+msgstr ""
41+
42+#: qml/Components/DelayedLockscreen.qml:63
43+msgid "You have been locked out due to too many failed passcode attempts."
44+msgstr ""
45+
46+#: qml/Components/DelayedLockscreen.qml:72
47+#, qt-format
48+msgid "Please wait %1 minute and then try again…"
49+msgid_plural "Please wait %1 minutes and then try again…"
50+msgstr[0] ""
51+msgstr[1] ""
52+
33#: qml/Components/Dialogs.qml:70
53#: qml/Components/Dialogs.qml:70
34msgid "Log out"
54msgid "Log out"
35msgstr ""
55msgstr ""
@@ -135,40 +155,23 @@ msgstr ""
135"Kenar haraketlerini öğrendiniz ve telefonu kullanmaya "
155"Kenar haraketlerini öğrendiniz ve telefonu kullanmaya "
136"başlayabilirsiniz<br><br>Başlamak için ekrana dokunun"
156"başlayabilirsiniz<br><br>Başlamak için ekrana dokunun"
137
157
138−#: qml/Components/Lockscreen.qml:167
158+#: qml/Components/Lockscreen.qml:220
139−msgid "Please wait"
140−msgstr ""
141−
142−#: qml/Components/Lockscreen.qml:172
143−msgid "Too many incorrect attempts"
144−msgstr "Çok fazla hatalı deneme yaptınız"
145−
146−#: qml/Components/Lockscreen.qml:206
147msgid "Emergency Call"
159msgid "Emergency Call"
148msgstr "Acil Arama"
160msgstr "Acil Arama"
149
161
150−#: qml/Components/Lockscreen.qml:226
162+#: qml/Components/Lockscreen.qml:252
151msgid "OK"
163msgid "OK"
152msgstr "Tamam"
164msgstr "Tamam"
153
165
154−#: qml/Components/PassphraseLockscreen.qml:61
155−#, qt-format
156−msgid "Hello %1"
157−msgstr "Merhaba %1"
158−
159−#: qml/Components/PassphraseLockscreen.qml:61
160−msgid "Hello"
161−msgstr "Merhaba"
162−
163−#: qml/Dash/GenericScopeView.qml:411 qml/Dash/GenericScopeView.qml:533
166+#: qml/Dash/GenericScopeView.qml:434 qml/Dash/GenericScopeView.qml:591
164msgid "See less"
167msgid "See less"
165msgstr "Daha azını gör"
168msgstr "Daha azını gör"
166
169
167−#: qml/Dash/GenericScopeView.qml:411
170+#: qml/Dash/GenericScopeView.qml:434
168msgid "See all"
171msgid "See all"
169msgstr "Tümünü gör"
172msgstr "Tümünü gör"
170
173
171−#: qml/Dash/GenericScopeView.qml:473 qml/Dash/PageHeader.qml:258
174+#: qml/Dash/GenericScopeView.qml:496 qml/Dash/PageHeader.qml:258
172#: qml/Panel/SearchIndicator.qml:27
175#: qml/Panel/SearchIndicator.qml:27
173msgid "Search"
176msgid "Search"
174msgstr "Ara"
177msgstr "Ara"
@@ -205,6 +208,14 @@ msgstr "Bir inceleme ekle"
205msgid "Send"
208msgid "Send"
206msgstr "Gönder"
209msgstr "Gönder"
207
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+
208#: qml/Dash/ScopesOverview.qml:206
219#: qml/Dash/ScopesOverview.qml:206
209msgid "Manage Scopes"
220msgid "Manage Scopes"
210msgstr ""
221msgstr ""
@@ -226,8 +237,8 @@ msgid "All"
226msgstr ""
237msgstr ""
227
238
228#: qml/Greeter/Greeter.qml:157
239#: qml/Greeter/Greeter.qml:157
229−msgid "Swipe to unlock"
240+msgid "Unlock"
230−msgstr "Açmak için kaydırın"
241+msgstr ""
231
242
232#: qml/Hud/HudParametrizedActionsPage.qml:139
243#: qml/Hud/HudParametrizedActionsPage.qml:139
233msgid "Confirm"
244msgid "Confirm"
@@ -249,18 +260,10 @@ msgstr "Şimdi Konuşun..."
249msgid "Speaking..."
260msgid "Speaking..."
250msgstr "Konuşuyor..."
261msgstr "Konuşuyor..."
251
262
252−#: qml/Notifications/NotificationMenuItemFactory.qml:108
263+#: qml/Notifications/NotificationMenuItemFactory.qml:116
253msgid "Show password"
264msgid "Show password"
254msgstr "Parolayı göster"
265msgstr "Parolayı göster"
255
266
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 "Üzgünüm, hatalı PIN"
263−
264#: qml/Panel/ActiveCallHint.qml:77
267#: qml/Panel/ActiveCallHint.qml:77
265msgid "Tap to return to call..."
268msgid "Tap to return to call..."
266msgstr ""
269msgstr ""
@@ -305,45 +308,49 @@ msgstr "SIM kilidini aç"
305msgid "Roaming"
308msgid "Roaming"
306msgstr ""
309msgstr ""
307
310
308−#: qml/Shell.qml:320
311+#: qml/Shell.qml:346
309−msgid "Enter your passphrase"
312+msgid "Enter passphrase"
310−msgstr "Parolanızı girin"
313+msgstr ""
311
314
312−#: qml/Shell.qml:321
315+#: qml/Shell.qml:347
313msgid "Sorry, incorrect passphrase"
316msgid "Sorry, incorrect passphrase"
314msgstr "Üzgünüm, hatalı parola"
317msgstr "Üzgünüm, hatalı parola"
315
318
316−#: qml/Shell.qml:323
319+#: qml/Shell.qml:348
320+msgid "Please re-enter"
321+msgstr ""
322+
323+#: qml/Shell.qml:350
317−msgid "Enter your passcode"
324+msgid "Enter passcode"
318−msgstr "Parolanızı girin"
325+msgstr ""
319
326
320−#: qml/Shell.qml:324
327+#: qml/Shell.qml:351
321msgid "Sorry, incorrect passcode"
328msgid "Sorry, incorrect passcode"
322msgstr "Üzgünüm, hatalı parola"
329msgstr "Üzgünüm, hatalı parola"
323
330
324−#: qml/Shell.qml:327
331+#: qml/Shell.qml:354
325#, qt-format
332#, qt-format
326−msgid "Enter your %1"
333+msgid "Enter %1"
327msgstr ""
334msgstr ""
328
335
329−#: qml/Shell.qml:328
336+#: qml/Shell.qml:355
330#, qt-format
337#, qt-format
331msgid "Sorry, incorrect %1"
338msgid "Sorry, incorrect %1"
332msgstr "Üzgünüm, hatalı %1"
339msgstr "Üzgünüm, hatalı %1"
333
340
334−#: qml/Shell.qml:363
341+#: qml/Shell.qml:390
335msgid "Sorry, incorrect passphrase."
342msgid "Sorry, incorrect passphrase."
336msgstr "Üzgünüm, hatalı parola."
343msgstr "Üzgünüm, hatalı parola."
337
344
338−#: qml/Shell.qml:364
345+#: qml/Shell.qml:391
339msgid "Sorry, incorrect passcode."
346msgid "Sorry, incorrect passcode."
340msgstr "Üzgünüm, hatalı parola."
347msgstr "Üzgünüm, hatalı parola."
341
348
342−#: qml/Shell.qml:365
349+#: qml/Shell.qml:392
343msgid "This will be your last attempt."
350msgid "This will be your last attempt."
344msgstr "Bu son denemeniz olacak."
351msgstr "Bu son denemeniz olacak."
345
352
346−#: qml/Shell.qml:367
353+#: qml/Shell.qml:394
347msgid ""
354msgid ""
348"If passphrase is entered incorrectly, your phone will conduct a factory "
355"If passphrase is entered incorrectly, your phone will conduct a factory "
349"reset and all personal data will be deleted."
356"reset and all personal data will be deleted."
@@ -351,10 +358,13 @@ msgstr ""
351"Eğer hatalı parola girilirse, telefonunuz fabrika ayarlarına dönecek ve tüm "
358"Eğer hatalı parola girilirse, telefonunuz fabrika ayarlarına dönecek ve tüm "
352"kişisel verileriniz silinecek."
359"kişisel verileriniz silinecek."
353
360
354−#: qml/Shell.qml:368
361+#: qml/Shell.qml:395
355msgid ""
362msgid ""
356"If passcode is entered incorrectly, your phone will conduct a factory reset "
363"If passcode is entered incorrectly, your phone will conduct a factory reset "
357"and all personal data will be deleted."
364"and all personal data will be deleted."
358msgstr ""
365msgstr ""
359"Eğer hatalı parola girilirse, telefonunuz fabrika ayarlarına dönecek ve tüm "
366"Eğer hatalı parola girilirse, telefonunuz fabrika ayarlarına dönecek ve tüm "
360"kişisel verileriniz silinecek."
367"kişisel verileriniz silinecek."
368+
369+#~ msgid "Sorry, incorrect PIN"
370+#~ msgstr "Üzgünüm, hatalı PIN"
po/ug.po+72−63
@@ -7,29 +7,48 @@ msgid ""
7msgstr ""
7msgstr ""
8"Project-Id-Version: unity\n"
8"Project-Id-Version: unity\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2014-09-24 10:43+0100\n"
10+"POT-Creation-Date: 2014-10-07 11:37+0300\n"
11−"PO-Revision-Date: 2014-09-29 00:52+0000\n"
11+"PO-Revision-Date: 2014-10-07 09:00+0000\n"
12"Last-Translator: Gheyret T.Kenji <Unknown>\n"
12"Last-Translator: Gheyret T.Kenji <Unknown>\n"
13"Language-Team: Uyghur Computer Science Association <UKIJ@yahoogroups.com>\n"
13"Language-Team: Uyghur Computer Science Association <UKIJ@yahoogroups.com>\n"
14"MIME-Version: 1.0\n"
14"MIME-Version: 1.0\n"
15"Content-Type: text/plain; charset=UTF-8\n"
15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n"
16"Content-Transfer-Encoding: 8bit\n"
17+"Plural-Forms: nplurals=1; plural=0;\n"
17−"X-Launchpad-Export-Date: 2014-09-30 07:10+0000\n"
18+"X-Launchpad-Export-Date: 2014-10-09 06:37+0000\n"
18"X-Generator: Launchpad (build 17196)\n"
19"X-Generator: Launchpad (build 17196)\n"
19
20
20#: plugins/LightDM/Greeter.cpp:130
21#: plugins/LightDM/Greeter.cpp:130
21msgid "Password: "
22msgid "Password: "
22msgstr "ئىم: "
23msgstr "ئىم: "
23
24
24−#: plugins/Unity/Launcher/launcheritem.cpp:44
25+#: plugins/Unity/Launcher/launcheritem.cpp:45
25−#: plugins/Unity/Launcher/launcheritem.cpp:74
26+#: plugins/Unity/Launcher/launcheritem.cpp:91
26msgid "Pin shortcut"
27msgid "Pin shortcut"
27msgstr "تېزلەتمىنى قوي"
28msgstr "تېزلەتمىنى قوي"
28
29
29−#: plugins/Unity/Launcher/launcheritem.cpp:74
30+#: plugins/Unity/Launcher/launcheritem.cpp:91
30msgid "Unpin shortcut"
31msgid "Unpin shortcut"
31msgstr "تېزلەتمىنى ئېلىۋەت"
32msgstr "تېزلەتمىنى ئېلىۋەت"
32
33
34+#: qml/Components/DelayedLockscreen.qml:47
35+msgid "Device Locked"
36+msgstr "ئۈسكۈنە قۇلۇپلانغان"
37+
38+#: qml/Components/DelayedLockscreen.qml:62
39+msgid "You have been locked out due to too many failed passphrase attempts."
40+msgstr "خاتا ئىم جۈملىسى كۆپ قېتىم كىرگۈزۈلگەنلىكى ئۈچۈن قۇلۇپلاندى."
41+
42+#: qml/Components/DelayedLockscreen.qml:63
43+msgid "You have been locked out due to too many failed passcode attempts."
44+msgstr "خاتا ئىم كودى(passcode) كۆپ قېتىم كىرگۈزۈلگەنلىكى ئۈچۈن قۇلۇپلاندى."
45+
46+#: qml/Components/DelayedLockscreen.qml:72
47+#, qt-format
48+msgid "Please wait %1 minute and then try again…"
49+msgid_plural "Please wait %1 minutes and then try again…"
50+msgstr[0] "%1 مىنۇت كۈتۈپ ئاندىن قايتا سىناڭ…"
51+
33#: qml/Components/Dialogs.qml:70
52#: qml/Components/Dialogs.qml:70
34msgid "Log out"
53msgid "Log out"
35msgstr "تىزىمدىن چىق"
54msgstr "تىزىمدىن چىق"
@@ -136,40 +155,23 @@ msgstr ""
136"ئېكراننى چېكىپ باشلاڭ<br><br>سىز ھازىر گىرۋەك بارماق ئىشارەتلىرىنى ئىگىلەپ "
155"ئېكراننى چېكىپ باشلاڭ<br><br>سىز ھازىر گىرۋەك بارماق ئىشارەتلىرىنى ئىگىلەپ "
137"بولدىڭىز،ئەمدى تېلېفوننى ئىشلىتىشنى باشلىسىڭىز بولىدۇ"
156"بولدىڭىز،ئەمدى تېلېفوننى ئىشلىتىشنى باشلىسىڭىز بولىدۇ"
138
157
139−#: qml/Components/Lockscreen.qml:167
158+#: qml/Components/Lockscreen.qml:220
140−msgid "Please wait"
141−msgstr "سەل ساقلاڭ"
142−
143−#: qml/Components/Lockscreen.qml:172
144−msgid "Too many incorrect attempts"
145−msgstr "مەغلۇپ بولۇش سانى چەكتىن ئېشىپ كەتتى"
146−
147−#: qml/Components/Lockscreen.qml:206
148msgid "Emergency Call"
159msgid "Emergency Call"
149msgstr "جىددىي تېلېفون"
160msgstr "جىددىي تېلېفون"
150
161
151−#: qml/Components/Lockscreen.qml:226
162+#: qml/Components/Lockscreen.qml:252
152msgid "OK"
163msgid "OK"
153msgstr "تامام"
164msgstr "تامام"
154
165
155−#: qml/Components/PassphraseLockscreen.qml:61
156−#, qt-format
157−msgid "Hello %1"
158−msgstr "سالام %1"
159−
160−#: qml/Components/PassphraseLockscreen.qml:61
161−msgid "Hello"
162−msgstr "ئەسسالامۇئەلەيكۇم"
163−
164−#: qml/Dash/GenericScopeView.qml:364 qml/Dash/GenericScopeView.qml:483
166+#: qml/Dash/GenericScopeView.qml:434 qml/Dash/GenericScopeView.qml:591
165msgid "See less"
167msgid "See less"
166msgstr "ئازراق كۆرۈش"
168msgstr "ئازراق كۆرۈش"
167
169
168−#: qml/Dash/GenericScopeView.qml:364
170+#: qml/Dash/GenericScopeView.qml:434
169msgid "See all"
171msgid "See all"
170msgstr "ھەممىنى كۆرۈش…"
172msgstr "ھەممىنى كۆرۈش…"
171
173
172−#: qml/Dash/GenericScopeView.qml:427 qml/Dash/PageHeader.qml:258
174+#: qml/Dash/GenericScopeView.qml:496 qml/Dash/PageHeader.qml:258
173#: qml/Panel/SearchIndicator.qml:27
175#: qml/Panel/SearchIndicator.qml:27
174msgid "Search"
176msgid "Search"
175msgstr "ئىزدە"
177msgstr "ئىزدە"
@@ -206,6 +208,14 @@ msgstr "باھا قوشۇش"
206msgid "Send"
208msgid "Send"
207msgstr "يوللا"
209msgstr "يوللا"
208
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+
209#: qml/Dash/ScopesOverview.qml:206
219#: qml/Dash/ScopesOverview.qml:206
210msgid "Manage Scopes"
220msgid "Manage Scopes"
211msgstr "دائىرە باشقۇرۇش"
221msgstr "دائىرە باشقۇرۇش"
@@ -227,8 +237,8 @@ msgid "All"
227msgstr "ھەممىسى"
237msgstr "ھەممىسى"
228
238
229#: qml/Greeter/Greeter.qml:157
239#: qml/Greeter/Greeter.qml:157
230−msgid "Swipe to unlock"
240+msgid "Unlock"
231−msgstr "سىيرىسىڭىز قۇلۇپسىزلىنىدۇ"
241+msgstr "قۇلۇپسىزلا"
232
242
233#: qml/Hud/HudParametrizedActionsPage.qml:139
243#: qml/Hud/HudParametrizedActionsPage.qml:139
234msgid "Confirm"
244msgid "Confirm"
@@ -250,18 +260,10 @@ msgstr "ئەمدى سۆزلەڭ…"
250msgid "Speaking..."
260msgid "Speaking..."
251msgstr "سۆزلەۋاتىسىز…"
261msgstr "سۆزلەۋاتىسىز…"
252
262
253−#: qml/Notifications/NotificationMenuItemFactory.qml:108
263+#: qml/Notifications/NotificationMenuItemFactory.qml:116
254msgid "Show password"
264msgid "Show password"
255msgstr "ئىم كۆرسەت"
265msgstr "ئىم كۆرسەت"
256
266
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
267#: qml/Panel/ActiveCallHint.qml:77
266msgid "Tap to return to call..."
268msgid "Tap to return to call..."
267msgstr "سۆزلىشىشكە قايتىش ئۈچۈن چېكىڭ…"
269msgstr "سۆزلىشىشكە قايتىش ئۈچۈن چېكىڭ…"
@@ -274,27 +276,27 @@ msgstr "يىغىن"
274msgid "Nothing is playing"
276msgid "Nothing is playing"
275msgstr "ھېچ نېمە قويۇلمايۋاتىدۇ"
277msgstr "ھېچ نېمە قويۇلمايۋاتىدۇ"
276
278
277−#: qml/Panel/Indicators/MenuItemFactory.qml:651
279+#: qml/Panel/Indicators/MenuItemFactory.qml:748
278msgid "In queue…"
280msgid "In queue…"
279msgstr "قاتاردا…"
281msgstr "قاتاردا…"
280
282
281−#: qml/Panel/Indicators/MenuItemFactory.qml:655
283+#: qml/Panel/Indicators/MenuItemFactory.qml:752
282msgid "Downloading"
284msgid "Downloading"
283msgstr "چۈشۈرۈۋاتىدۇ"
285msgstr "چۈشۈرۈۋاتىدۇ"
284
286
285−#: qml/Panel/Indicators/MenuItemFactory.qml:657
287+#: qml/Panel/Indicators/MenuItemFactory.qml:754
286msgid "Paused, tap to resume"
288msgid "Paused, tap to resume"
287msgstr "توختىتىلغان، چەكسە داۋاملىشىدۇ"
289msgstr "توختىتىلغان، چەكسە داۋاملىشىدۇ"
288
290
289−#: qml/Panel/Indicators/MenuItemFactory.qml:659
291+#: qml/Panel/Indicators/MenuItemFactory.qml:756
290msgid "Canceled"
292msgid "Canceled"
291msgstr "قالدۇرۇۋېتىلدى"
293msgstr "قالدۇرۇۋېتىلدى"
292
294
293−#: qml/Panel/Indicators/MenuItemFactory.qml:661
295+#: qml/Panel/Indicators/MenuItemFactory.qml:758
294msgid "Finished"
296msgid "Finished"
295msgstr "تاماملاندى"
297msgstr "تاماملاندى"
296
298
297−#: qml/Panel/Indicators/MenuItemFactory.qml:663
299+#: qml/Panel/Indicators/MenuItemFactory.qml:760
298msgid "Failed, tap to retry"
300msgid "Failed, tap to retry"
299msgstr "مەغلۇپ بولدى، چېكىپ قايتا سىناڭ"
301msgstr "مەغلۇپ بولدى، چېكىپ قايتا سىناڭ"
300
302
@@ -306,45 +308,49 @@ msgstr "SIM نى قۇلۇپسىزلاش"
306msgid "Roaming"
308msgid "Roaming"
307msgstr "كەزمە"
309msgstr "كەزمە"
308
310
309−#: qml/Shell.qml:292
311+#: qml/Shell.qml:346
310−msgid "Enter your passphrase"
312+msgid "Enter passphrase"
311−msgstr "ئىمىڭىزنى كىرگۈزۈڭ"
313+msgstr "ئىم كىرگۈزۈڭ"
312
314
313−#: qml/Shell.qml:293
315+#: qml/Shell.qml:347
314msgid "Sorry, incorrect passphrase"
316msgid "Sorry, incorrect passphrase"
315msgstr "كەچۈرۈڭ، ئىم توغرا ئەمەس"
317msgstr "كەچۈرۈڭ، ئىم توغرا ئەمەس"
316
318
317−#: qml/Shell.qml:295
319+#: qml/Shell.qml:348
318−msgid "Enter your passcode"
320+msgid "Please re-enter"
319−msgstr "ئىمىڭىزنى كىرگۈزۈڭ"
321+msgstr "قايتا كىرگۈزۈڭ"
320
322
321−#: qml/Shell.qml:296
323+#: qml/Shell.qml:350
324+msgid "Enter passcode"
325+msgstr "ئىم كودى(passcode)نى كىرگۈزۈڭ"
326+
327+#: qml/Shell.qml:351
322msgid "Sorry, incorrect passcode"
328msgid "Sorry, incorrect passcode"
323msgstr "كەچۈرۈڭ، ئىم توغرا ئەمەس"
329msgstr "كەچۈرۈڭ، ئىم توغرا ئەمەس"
324
330
325−#: qml/Shell.qml:299
331+#: qml/Shell.qml:354
326#, qt-format
332#, qt-format
327−msgid "Enter your %1"
333+msgid "Enter %1"
328msgstr "%1 نى كىرگۈزۈڭ"
334msgstr "%1 نى كىرگۈزۈڭ"
329
335
330−#: qml/Shell.qml:300
336+#: qml/Shell.qml:355
331#, qt-format
337#, qt-format
332msgid "Sorry, incorrect %1"
338msgid "Sorry, incorrect %1"
333msgstr "كەچۈرۈڭ، %1 توغرا ئەمەس"
339msgstr "كەچۈرۈڭ، %1 توغرا ئەمەس"
334
340
335−#: qml/Shell.qml:335
341+#: qml/Shell.qml:390
336msgid "Sorry, incorrect passphrase."
342msgid "Sorry, incorrect passphrase."
337msgstr "كەچۈرۈڭ، ئىم توغرا ئەمەس"
343msgstr "كەچۈرۈڭ، ئىم توغرا ئەمەس"
338
344
339−#: qml/Shell.qml:336
345+#: qml/Shell.qml:391
340msgid "Sorry, incorrect passcode."
346msgid "Sorry, incorrect passcode."
341msgstr "كەچۈرۈڭ، ئىم كودى ئەمەس"
347msgstr "كەچۈرۈڭ، ئىم كودى ئەمەس"
342
348
343−#: qml/Shell.qml:337
349+#: qml/Shell.qml:392
344msgid "This will be your last attempt."
350msgid "This will be your last attempt."
345msgstr "بۇ سىزنىڭ ئەڭ ئاخىرقى پۇرسىتىڭىز"
351msgstr "بۇ سىزنىڭ ئەڭ ئاخىرقى پۇرسىتىڭىز"
346
352
347−#: qml/Shell.qml:339
353+#: qml/Shell.qml:394
348msgid ""
354msgid ""
349"If passphrase is entered incorrectly, your phone will conduct a factory "
355"If passphrase is entered incorrectly, your phone will conduct a factory "
350"reset and all personal data will be deleted."
356"reset and all personal data will be deleted."
@@ -352,7 +358,7 @@ msgstr ""
352"ئەگەر ئىم توغرا بولمىسا، تېلېفونىڭىز ئەسلىگە قايتۇرۇلۇپ، زاۋۇتتىن چىققان "
358"ئەگەر ئىم توغرا بولمىسا، تېلېفونىڭىز ئەسلىگە قايتۇرۇلۇپ، زاۋۇتتىن چىققان "
353"ھالەتكە كېلىپ قالىدۇ. بارلىق مەزمۇنلار يوقىلىدۇ."
359"ھالەتكە كېلىپ قالىدۇ. بارلىق مەزمۇنلار يوقىلىدۇ."
354
360
355−#: qml/Shell.qml:340
361+#: qml/Shell.qml:395
356msgid ""
362msgid ""
357"If passcode is entered incorrectly, your phone will conduct a factory reset "
363"If passcode is entered incorrectly, your phone will conduct a factory reset "
358"and all personal data will be deleted."
364"and all personal data will be deleted."
@@ -360,5 +366,8 @@ msgstr ""
360"ئەگەر ئىم كودى توغرا بولمىسا، تېلېفونىڭىز ئەسلىگە قايتۇرۇلۇپ، زاۋۇتتىن "
366"ئەگەر ئىم كودى توغرا بولمىسا، تېلېفونىڭىز ئەسلىگە قايتۇرۇلۇپ، زاۋۇتتىن "
361"چىققان ھالەتكە كېلىپ قالىدۇ. بارلىق مەزمۇنلار يوقىلىدۇ."
367"چىققان ھالەتكە كېلىپ قالىدۇ. بارلىق مەزمۇنلار يوقىلىدۇ."
362
368
363−#~ msgid "Manage Dash"
369+#~ msgid "Enter SIM PIN"
364−#~ msgstr "باش تاختىنى باشقۇرۇش"
370+#~ msgstr "SIM نىڭ ئىمى(PIN) نى كىرگۈزۈڭ"
371+
372+#~ msgid "Sorry, incorrect PIN"
373+#~ msgstr "كەچۈرۈڭ، PIN توغرا ئەمەس"
po/uk.po+71−55
@@ -7,14 +7,16 @@ msgid ""
7msgstr ""
7msgstr ""
8"Project-Id-Version: unity\n"
8"Project-Id-Version: unity\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2014-09-24 10:43+0100\n"
10+"POT-Creation-Date: 2014-10-07 11:37+0300\n"
11−"PO-Revision-Date: 2014-08-26 19:06+0000\n"
11+"PO-Revision-Date: 2014-10-08 12:02+0000\n"
12"Last-Translator: Yuri Chornoivan <yurchor@gmail.com>\n"
12"Last-Translator: Yuri Chornoivan <yurchor@gmail.com>\n"
13"Language-Team: Ukrainian <uk@li.org>\n"
13"Language-Team: Ukrainian <uk@li.org>\n"
14"MIME-Version: 1.0\n"
14"MIME-Version: 1.0\n"
15"Content-Type: text/plain; charset=UTF-8\n"
15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n"
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"
17−"X-Launchpad-Export-Date: 2014-09-29 05:20+0000\n"
19+"X-Launchpad-Export-Date: 2014-10-09 06:37+0000\n"
18"X-Generator: Launchpad (build 17196)\n"
20"X-Generator: Launchpad (build 17196)\n"
19
21
20#: plugins/LightDM/Greeter.cpp:130
22#: plugins/LightDM/Greeter.cpp:130
@@ -30,6 +32,30 @@ msgstr "Заблокувати кнопку"
30msgid "Unpin shortcut"
32msgid "Unpin shortcut"
31msgstr "Розблокувати кнопку"
33msgstr "Розблокувати кнопку"
32
34
35+#: qml/Components/DelayedLockscreen.qml:47
36+msgid "Device Locked"
37+msgstr "Пристрій заблоковано"
38+
39+#: qml/Components/DelayedLockscreen.qml:62
40+msgid "You have been locked out due to too many failed passphrase attempts."
41+msgstr ""
42+"Ваш пристрій було заблоковано через перевищення граничної кількості спроб "
43+"введення пароля."
44+
45+#: qml/Components/DelayedLockscreen.qml:63
46+msgid "You have been locked out due to too many failed passcode attempts."
47+msgstr ""
48+"Ваш пристрій було заблоковано через перевищення граничної кількості спроб "
49+"введення коду-пароля."
50+
51+#: qml/Components/DelayedLockscreen.qml:72
52+#, qt-format
53+msgid "Please wait %1 minute and then try again…"
54+msgid_plural "Please wait %1 minutes and then try again…"
55+msgstr[0] "Зачекайте %1 хвилину і повторіть спробу…"
56+msgstr[1] "Зачекайте %1 хвилини і повторіть спробу…"
57+msgstr[2] "Зачекайте %1 хвилин і повторіть спробу…"
58+
33#: qml/Components/Dialogs.qml:70
59#: qml/Components/Dialogs.qml:70
34msgid "Log out"
60msgid "Log out"
35msgstr "Вийти"
61msgstr "Вийти"
@@ -139,40 +165,23 @@ msgstr ""
139"Вами налаштовано дії у відповідь на дотики на краях екрана. Тепер телефоном "
165"Вами налаштовано дії у відповідь на дотики на краях екрана. Тепер телефоном "
140"можна користуватися.<br><br>Торкніться екрана, щоб розпочати."
166"можна користуватися.<br><br>Торкніться екрана, щоб розпочати."
141
167
142−#: qml/Components/Lockscreen.qml:167
168+#: qml/Components/Lockscreen.qml:220
143−msgid "Please wait"
144−msgstr "Будь ласка, зачекайте"
145−
146−#: qml/Components/Lockscreen.qml:172
147−msgid "Too many incorrect attempts"
148−msgstr "Забагато помилкових спроб"
149−
150−#: qml/Components/Lockscreen.qml:206
151msgid "Emergency Call"
169msgid "Emergency Call"
152msgstr "Терміновий виклик"
170msgstr "Терміновий виклик"
153
171
154−#: qml/Components/Lockscreen.qml:226
172+#: qml/Components/Lockscreen.qml:252
155msgid "OK"
173msgid "OK"
156msgstr "Гаразд"
174msgstr "Гаразд"
157
175
158−#: qml/Components/PassphraseLockscreen.qml:61
159−#, qt-format
160−msgid "Hello %1"
161−msgstr "Привіт, %1"
162−
163−#: qml/Components/PassphraseLockscreen.qml:61
164−msgid "Hello"
165−msgstr "Привіт!"
166−
167−#: qml/Dash/GenericScopeView.qml:411 qml/Dash/GenericScopeView.qml:533
176+#: qml/Dash/GenericScopeView.qml:434 qml/Dash/GenericScopeView.qml:591
168msgid "See less"
177msgid "See less"
169msgstr "Стисліше"
178msgstr "Стисліше"
170
179
171−#: qml/Dash/GenericScopeView.qml:411
180+#: qml/Dash/GenericScopeView.qml:434
172msgid "See all"
181msgid "See all"
173msgstr "Детальніше"
182msgstr "Детальніше"
174
183
175−#: qml/Dash/GenericScopeView.qml:473 qml/Dash/PageHeader.qml:258
184+#: qml/Dash/GenericScopeView.qml:496 qml/Dash/PageHeader.qml:258
176#: qml/Panel/SearchIndicator.qml:27
185#: qml/Panel/SearchIndicator.qml:27
177msgid "Search"
186msgid "Search"
178msgstr "Пошук"
187msgstr "Пошук"
@@ -209,6 +218,14 @@ msgstr "Додати рецензію"
209msgid "Send"
218msgid "Send"
210msgstr "Надіслати"
219msgstr "Надіслати"
211
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+
212#: qml/Dash/ScopesOverview.qml:206
229#: qml/Dash/ScopesOverview.qml:206
213msgid "Manage Scopes"
230msgid "Manage Scopes"
214msgstr "Керування областями"
231msgstr "Керування областями"
@@ -230,8 +247,8 @@ msgid "All"
230msgstr "Все"
247msgstr "Все"
231
248
232#: qml/Greeter/Greeter.qml:157
249#: qml/Greeter/Greeter.qml:157
233−msgid "Swipe to unlock"
250+msgid "Unlock"
234−msgstr "Проведіть пальцем, щоб розблокувати"
251+msgstr "Розблокувати"
235
252
236#: qml/Hud/HudParametrizedActionsPage.qml:139
253#: qml/Hud/HudParametrizedActionsPage.qml:139
237msgid "Confirm"
254msgid "Confirm"
@@ -253,18 +270,10 @@ msgstr "Можна говорити…"
253msgid "Speaking..."
270msgid "Speaking..."
254msgstr "Мовлення…"
271msgstr "Мовлення…"
255
272
256−#: qml/Notifications/NotificationMenuItemFactory.qml:108
273+#: qml/Notifications/NotificationMenuItemFactory.qml:116
257msgid "Show password"
274msgid "Show password"
258msgstr "Показати пароль"
275msgstr "Показати пароль"
259
276
260−#: qml/Notifications/NotificationMenuItemFactory.qml:124
261−msgid "Enter SIM PIN"
262−msgstr "Введіть PIN-код SIM-картки"
263−
264−#: qml/Notifications/NotificationMenuItemFactory.qml:125
265−msgid "Sorry, incorrect PIN"
266−msgstr "Вибачте, помилковий PIN-код"
267−
268#: qml/Panel/ActiveCallHint.qml:77
277#: qml/Panel/ActiveCallHint.qml:77
269msgid "Tap to return to call..."
278msgid "Tap to return to call..."
270msgstr "Торкніться, щоб повернутися до дзвінка…"
279msgstr "Торкніться, щоб повернутися до дзвінка…"
@@ -309,45 +318,49 @@ msgstr "Розблокувати SIM"
309msgid "Roaming"
318msgid "Roaming"
310msgstr "Роумінг"
319msgstr "Роумінг"
311
320
312−#: qml/Shell.qml:320
321+#: qml/Shell.qml:346
313−msgid "Enter your passphrase"
322+msgid "Enter passphrase"
314−msgstr "Введіть ваш пароль"
323+msgstr "Введіть пароль"
315
324
316−#: qml/Shell.qml:321
325+#: qml/Shell.qml:347
317msgid "Sorry, incorrect passphrase"
326msgid "Sorry, incorrect passphrase"
318msgstr "Вибачте, помилковий пароль"
327msgstr "Вибачте, помилковий пароль"
319
328
320−#: qml/Shell.qml:323
329+#: qml/Shell.qml:348
321−msgid "Enter your passcode"
330+msgid "Please re-enter"
322−msgstr "Введіть ваш код-пароль"
331+msgstr "Ввведіть ще раз"
323
332
324−#: qml/Shell.qml:324
333+#: qml/Shell.qml:350
334+msgid "Enter passcode"
335+msgstr "Введіть код"
336+
337+#: qml/Shell.qml:351
325msgid "Sorry, incorrect passcode"
338msgid "Sorry, incorrect passcode"
326msgstr "Вибачте, помилковий код-пароль"
339msgstr "Вибачте, помилковий код-пароль"
327
340
328−#: qml/Shell.qml:327
341+#: qml/Shell.qml:354
329#, qt-format
342#, qt-format
330−msgid "Enter your %1"
343+msgid "Enter %1"
331−msgstr "Вкажіть ваш %1"
344+msgstr "Введіть %1"
332
345
333−#: qml/Shell.qml:328
346+#: qml/Shell.qml:355
334#, qt-format
347#, qt-format
335msgid "Sorry, incorrect %1"
348msgid "Sorry, incorrect %1"
336msgstr "Вибачте, помилковий %1"
349msgstr "Вибачте, помилковий %1"
337
350
338−#: qml/Shell.qml:363
351+#: qml/Shell.qml:390
339msgid "Sorry, incorrect passphrase."
352msgid "Sorry, incorrect passphrase."
340msgstr "Вибачте, помилковий пароль."
353msgstr "Вибачте, помилковий пароль."
341
354
342−#: qml/Shell.qml:364
355+#: qml/Shell.qml:391
343msgid "Sorry, incorrect passcode."
356msgid "Sorry, incorrect passcode."
344msgstr "Вибачте, помилковий код-пароль."
357msgstr "Вибачте, помилковий код-пароль."
345
358
346−#: qml/Shell.qml:365
359+#: qml/Shell.qml:392
347msgid "This will be your last attempt."
360msgid "This will be your last attempt."
348msgstr "Ця спроба буде останньою."
361msgstr "Ця спроба буде останньою."
349
362
350−#: qml/Shell.qml:367
363+#: qml/Shell.qml:394
351msgid ""
364msgid ""
352"If passphrase is entered incorrectly, your phone will conduct a factory "
365"If passphrase is entered incorrectly, your phone will conduct a factory "
353"reset and all personal data will be deleted."
366"reset and all personal data will be deleted."
@@ -355,7 +368,7 @@ msgstr ""
355"Якщо пароль буде вказано неправильно, телефон повернеться до початкового "
368"Якщо пароль буде вказано неправильно, телефон повернеться до початкового "
356"стану, усі особисті дані буде вилучено."
369"стану, усі особисті дані буде вилучено."
357
370
358−#: qml/Shell.qml:368
371+#: qml/Shell.qml:395
359msgid ""
372msgid ""
360"If passcode is entered incorrectly, your phone will conduct a factory reset "
373"If passcode is entered incorrectly, your phone will conduct a factory reset "
361"and all personal data will be deleted."
374"and all personal data will be deleted."
@@ -363,5 +376,8 @@ msgstr ""
363"Якщо код-пароль буде вказано неправильно, телефон повернеться до початкового "
376"Якщо код-пароль буде вказано неправильно, телефон повернеться до початкового "
364"стану, усі особисті дані буде вилучено."
377"стану, усі особисті дані буде вилучено."
365
378
366−#~ msgid "Manage Dash"
379+#~ msgid "Sorry, incorrect PIN"
367−#~ msgstr "Керування панеллю"
380+#~ msgstr "Вибачте, помилковий PIN-код"
381+
382+#~ msgid "Enter SIM PIN"
383+#~ msgstr "Введіть PIN-код SIM-картки"
po/unity8.pot+54−47
@@ -8,7 +8,7 @@ msgid ""
8msgstr ""
8msgstr ""
9"Project-Id-Version: unity8\n"
9"Project-Id-Version: unity8\n"
10"Report-Msgid-Bugs-To: \n"
10"Report-Msgid-Bugs-To: \n"
11−"POT-Creation-Date: 2014-09-24 10:43+0100\n"
11+"POT-Creation-Date: 2014-10-07 11:37+0300\n"
12"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
12"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
13"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
13"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
14"Language-Team: LANGUAGE <LL@li.org>\n"
14"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,6 +16,7 @@ msgstr ""
16"MIME-Version: 1.0\n"
16"MIME-Version: 1.0\n"
17"Content-Type: text/plain; charset=UTF-8\n"
17"Content-Type: text/plain; charset=UTF-8\n"
18"Content-Transfer-Encoding: 8bit\n"
18"Content-Transfer-Encoding: 8bit\n"
19+"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
19
20
20#: plugins/LightDM/Greeter.cpp:130
21#: plugins/LightDM/Greeter.cpp:130
21msgid "Password: "
22msgid "Password: "
@@ -30,6 +31,25 @@ msgstr ""
30msgid "Unpin shortcut"
31msgid "Unpin shortcut"
31msgstr ""
32msgstr ""
32
33
34+#: qml/Components/DelayedLockscreen.qml:47
35+msgid "Device Locked"
36+msgstr ""
37+
38+#: qml/Components/DelayedLockscreen.qml:62
39+msgid "You have been locked out due to too many failed passphrase attempts."
40+msgstr ""
41+
42+#: qml/Components/DelayedLockscreen.qml:63
43+msgid "You have been locked out due to too many failed passcode attempts."
44+msgstr ""
45+
46+#: qml/Components/DelayedLockscreen.qml:72
47+#, qt-format
48+msgid "Please wait %1 minute and then try again…"
49+msgid_plural "Please wait %1 minutes and then try again…"
50+msgstr[0] ""
51+msgstr[1] ""
52+
33#: qml/Components/Dialogs.qml:70
53#: qml/Components/Dialogs.qml:70
34msgid "Log out"
54msgid "Log out"
35msgstr ""
55msgstr ""
@@ -132,40 +152,23 @@ msgid ""
132"phone<br><br>Tap on the screen to start"
152"phone<br><br>Tap on the screen to start"
133msgstr ""
153msgstr ""
134
154
135−#: qml/Components/Lockscreen.qml:167
155+#: qml/Components/Lockscreen.qml:220
136−msgid "Please wait"
137−msgstr ""
138−
139−#: qml/Components/Lockscreen.qml:172
140−msgid "Too many incorrect attempts"
141−msgstr ""
142−
143−#: qml/Components/Lockscreen.qml:206
144msgid "Emergency Call"
156msgid "Emergency Call"
145msgstr ""
157msgstr ""
146
158
147−#: qml/Components/Lockscreen.qml:226
159+#: qml/Components/Lockscreen.qml:252
148msgid "OK"
160msgid "OK"
149msgstr ""
161msgstr ""
150
162
151−#: qml/Components/PassphraseLockscreen.qml:61
152−#, qt-format
153−msgid "Hello %1"
154−msgstr ""
155−
156−#: qml/Components/PassphraseLockscreen.qml:61
157−msgid "Hello"
158−msgstr ""
159−
160−#: qml/Dash/GenericScopeView.qml:411 qml/Dash/GenericScopeView.qml:533
163+#: qml/Dash/GenericScopeView.qml:434 qml/Dash/GenericScopeView.qml:591
161msgid "See less"
164msgid "See less"
162msgstr ""
165msgstr ""
163
166
164−#: qml/Dash/GenericScopeView.qml:411
167+#: qml/Dash/GenericScopeView.qml:434
165msgid "See all"
168msgid "See all"
166msgstr ""
169msgstr ""
167
170
168−#: qml/Dash/GenericScopeView.qml:473 qml/Dash/PageHeader.qml:258
171+#: qml/Dash/GenericScopeView.qml:496 qml/Dash/PageHeader.qml:258
169#: qml/Panel/SearchIndicator.qml:27
172#: qml/Panel/SearchIndicator.qml:27
170msgid "Search"
173msgid "Search"
171msgstr ""
174msgstr ""
@@ -202,6 +205,14 @@ msgstr ""
202msgid "Send"
205msgid "Send"
203msgstr ""
206msgstr ""
204
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+
205#: qml/Dash/ScopesOverview.qml:206
216#: qml/Dash/ScopesOverview.qml:206
206msgid "Manage Scopes"
217msgid "Manage Scopes"
207msgstr ""
218msgstr ""
@@ -223,7 +234,7 @@ msgid "All"
223msgstr ""
234msgstr ""
224
235
225#: qml/Greeter/Greeter.qml:157
236#: qml/Greeter/Greeter.qml:157
226−msgid "Swipe to unlock"
237+msgid "Unlock"
227msgstr ""
238msgstr ""
228
239
229#: qml/Hud/HudParametrizedActionsPage.qml:139
240#: qml/Hud/HudParametrizedActionsPage.qml:139
@@ -246,18 +257,10 @@ msgstr ""
246msgid "Speaking..."
257msgid "Speaking..."
247msgstr ""
258msgstr ""
248
259
249−#: qml/Notifications/NotificationMenuItemFactory.qml:108
260+#: qml/Notifications/NotificationMenuItemFactory.qml:116
250msgid "Show password"
261msgid "Show password"
251msgstr ""
262msgstr ""
252
263
253−#: qml/Notifications/NotificationMenuItemFactory.qml:124
254−msgid "Enter SIM PIN"
255−msgstr ""
256−
257−#: qml/Notifications/NotificationMenuItemFactory.qml:125
258−msgid "Sorry, incorrect PIN"
259−msgstr ""
260−
261#: qml/Panel/ActiveCallHint.qml:77
264#: qml/Panel/ActiveCallHint.qml:77
262msgid "Tap to return to call..."
265msgid "Tap to return to call..."
263msgstr ""
266msgstr ""
@@ -302,51 +305,55 @@ msgstr ""
302msgid "Roaming"
305msgid "Roaming"
303msgstr ""
306msgstr ""
304
307
305−#: qml/Shell.qml:320
308+#: qml/Shell.qml:346
306−msgid "Enter your passphrase"
309+msgid "Enter passphrase"
307msgstr ""
310msgstr ""
308
311
309−#: qml/Shell.qml:321
312+#: qml/Shell.qml:347
310msgid "Sorry, incorrect passphrase"
313msgid "Sorry, incorrect passphrase"
311msgstr ""
314msgstr ""
312
315
313−#: qml/Shell.qml:323
316+#: qml/Shell.qml:348
317+msgid "Please re-enter"
318+msgstr ""
319+
320+#: qml/Shell.qml:350
314−msgid "Enter your passcode"
321+msgid "Enter passcode"
315msgstr ""
322msgstr ""
316
323
317−#: qml/Shell.qml:324
324+#: qml/Shell.qml:351
318msgid "Sorry, incorrect passcode"
325msgid "Sorry, incorrect passcode"
319msgstr ""
326msgstr ""
320
327
321−#: qml/Shell.qml:327
328+#: qml/Shell.qml:354
322#, qt-format
329#, qt-format
323−msgid "Enter your %1"
330+msgid "Enter %1"
324msgstr ""
331msgstr ""
325
332
326−#: qml/Shell.qml:328
333+#: qml/Shell.qml:355
327#, qt-format
334#, qt-format
328msgid "Sorry, incorrect %1"
335msgid "Sorry, incorrect %1"
329msgstr ""
336msgstr ""
330
337
331−#: qml/Shell.qml:363
338+#: qml/Shell.qml:390
332msgid "Sorry, incorrect passphrase."
339msgid "Sorry, incorrect passphrase."
333msgstr ""
340msgstr ""
334
341
335−#: qml/Shell.qml:364
342+#: qml/Shell.qml:391
336msgid "Sorry, incorrect passcode."
343msgid "Sorry, incorrect passcode."
337msgstr ""
344msgstr ""
338
345
339−#: qml/Shell.qml:365
346+#: qml/Shell.qml:392
340msgid "This will be your last attempt."
347msgid "This will be your last attempt."
341msgstr ""
348msgstr ""
342
349
343−#: qml/Shell.qml:367
350+#: qml/Shell.qml:394
344msgid ""
351msgid ""
345"If passphrase is entered incorrectly, your phone will conduct a factory "
352"If passphrase is entered incorrectly, your phone will conduct a factory "
346"reset and all personal data will be deleted."
353"reset and all personal data will be deleted."
347msgstr ""
354msgstr ""
348
355
349−#: qml/Shell.qml:368
356+#: qml/Shell.qml:395
350msgid ""
357msgid ""
351"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 "
352"and all personal data will be deleted."
359"and all personal data will be deleted."
po/vi.po+55−48
@@ -7,14 +7,15 @@ msgid ""
7msgstr ""
7msgstr ""
8"Project-Id-Version: unity8\n"
8"Project-Id-Version: unity8\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2014-09-24 10:43+0100\n"
10+"POT-Creation-Date: 2014-10-07 11:37+0300\n"
11"PO-Revision-Date: 2014-01-15 01:19+0000\n"
11"PO-Revision-Date: 2014-01-15 01:19+0000\n"
12"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
12"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
13"Language-Team: Vietnamese <vi@li.org>\n"
13"Language-Team: Vietnamese <vi@li.org>\n"
14"MIME-Version: 1.0\n"
14"MIME-Version: 1.0\n"
15"Content-Type: text/plain; charset=UTF-8\n"
15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n"
16"Content-Transfer-Encoding: 8bit\n"
17+"Plural-Forms: nplurals=1; plural=0;\n"
17−"X-Launchpad-Export-Date: 2014-09-29 05:20+0000\n"
18+"X-Launchpad-Export-Date: 2014-10-09 06:37+0000\n"
18"X-Generator: Launchpad (build 17196)\n"
19"X-Generator: Launchpad (build 17196)\n"
19
20
20#: plugins/LightDM/Greeter.cpp:130
21#: plugins/LightDM/Greeter.cpp:130
@@ -30,6 +31,25 @@ msgstr ""
30msgid "Unpin shortcut"
31msgid "Unpin shortcut"
31msgstr ""
32msgstr ""
32
33
34+#: qml/Components/DelayedLockscreen.qml:47
35+msgid "Device Locked"
36+msgstr ""
37+
38+#: qml/Components/DelayedLockscreen.qml:62
39+msgid "You have been locked out due to too many failed passphrase attempts."
40+msgstr ""
41+
42+#: qml/Components/DelayedLockscreen.qml:63
43+msgid "You have been locked out due to too many failed passcode attempts."
44+msgstr ""
45+
46+#: qml/Components/DelayedLockscreen.qml:72
47+#, qt-format
48+msgid "Please wait %1 minute and then try again…"
49+msgid_plural "Please wait %1 minutes and then try again…"
50+msgstr[0] ""
51+msgstr[1] ""
52+
33#: qml/Components/Dialogs.qml:70
53#: qml/Components/Dialogs.qml:70
34msgid "Log out"
54msgid "Log out"
35msgstr ""
55msgstr ""
@@ -132,40 +152,23 @@ msgid ""
132"phone<br><br>Tap on the screen to start"
152"phone<br><br>Tap on the screen to start"
133msgstr ""
153msgstr ""
134
154
135−#: qml/Components/Lockscreen.qml:167
155+#: qml/Components/Lockscreen.qml:220
136−msgid "Please wait"
137−msgstr ""
138−
139−#: qml/Components/Lockscreen.qml:172
140−msgid "Too many incorrect attempts"
141−msgstr ""
142−
143−#: qml/Components/Lockscreen.qml:206
144msgid "Emergency Call"
156msgid "Emergency Call"
145msgstr ""
157msgstr ""
146
158
147−#: qml/Components/Lockscreen.qml:226
159+#: qml/Components/Lockscreen.qml:252
148msgid "OK"
160msgid "OK"
149msgstr ""
161msgstr ""
150
162
151−#: qml/Components/PassphraseLockscreen.qml:61
152−#, qt-format
153−msgid "Hello %1"
154−msgstr ""
155−
156−#: qml/Components/PassphraseLockscreen.qml:61
157−msgid "Hello"
158−msgstr ""
159−
160−#: qml/Dash/GenericScopeView.qml:411 qml/Dash/GenericScopeView.qml:533
163+#: qml/Dash/GenericScopeView.qml:434 qml/Dash/GenericScopeView.qml:591
161msgid "See less"
164msgid "See less"
162msgstr ""
165msgstr ""
163
166
164−#: qml/Dash/GenericScopeView.qml:411
167+#: qml/Dash/GenericScopeView.qml:434
165msgid "See all"
168msgid "See all"
166msgstr ""
169msgstr ""
167
170
168−#: qml/Dash/GenericScopeView.qml:473 qml/Dash/PageHeader.qml:258
171+#: qml/Dash/GenericScopeView.qml:496 qml/Dash/PageHeader.qml:258
169#: qml/Panel/SearchIndicator.qml:27
172#: qml/Panel/SearchIndicator.qml:27
170msgid "Search"
173msgid "Search"
171msgstr ""
174msgstr ""
@@ -202,6 +205,14 @@ msgstr ""
202msgid "Send"
205msgid "Send"
203msgstr ""
206msgstr ""
204
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+
205#: qml/Dash/ScopesOverview.qml:206
216#: qml/Dash/ScopesOverview.qml:206
206msgid "Manage Scopes"
217msgid "Manage Scopes"
207msgstr ""
218msgstr ""
@@ -223,7 +234,7 @@ msgid "All"
223msgstr ""
234msgstr ""
224
235
225#: qml/Greeter/Greeter.qml:157
236#: qml/Greeter/Greeter.qml:157
226−msgid "Swipe to unlock"
237+msgid "Unlock"
227msgstr ""
238msgstr ""
228
239
229#: qml/Hud/HudParametrizedActionsPage.qml:139
240#: qml/Hud/HudParametrizedActionsPage.qml:139
@@ -246,18 +257,10 @@ msgstr ""
246msgid "Speaking..."
257msgid "Speaking..."
247msgstr ""
258msgstr ""
248
259
249−#: qml/Notifications/NotificationMenuItemFactory.qml:108
260+#: qml/Notifications/NotificationMenuItemFactory.qml:116
250msgid "Show password"
261msgid "Show password"
251msgstr ""
262msgstr ""
252
263
253−#: qml/Notifications/NotificationMenuItemFactory.qml:124
254−msgid "Enter SIM PIN"
255−msgstr ""
256−
257−#: qml/Notifications/NotificationMenuItemFactory.qml:125
258−msgid "Sorry, incorrect PIN"
259−msgstr ""
260−
261#: qml/Panel/ActiveCallHint.qml:77
264#: qml/Panel/ActiveCallHint.qml:77
262msgid "Tap to return to call..."
265msgid "Tap to return to call..."
263msgstr ""
266msgstr ""
@@ -302,51 +305,55 @@ msgstr ""
302msgid "Roaming"
305msgid "Roaming"
303msgstr ""
306msgstr ""
304
307
305−#: qml/Shell.qml:320
308+#: qml/Shell.qml:346
306−msgid "Enter your passphrase"
309+msgid "Enter passphrase"
307msgstr ""
310msgstr ""
308
311
309−#: qml/Shell.qml:321
312+#: qml/Shell.qml:347
310msgid "Sorry, incorrect passphrase"
313msgid "Sorry, incorrect passphrase"
311msgstr ""
314msgstr ""
312
315
313−#: qml/Shell.qml:323
316+#: qml/Shell.qml:348
317+msgid "Please re-enter"
318+msgstr ""
319+
320+#: qml/Shell.qml:350
314−msgid "Enter your passcode"
321+msgid "Enter passcode"
315msgstr ""
322msgstr ""
316
323
317−#: qml/Shell.qml:324
324+#: qml/Shell.qml:351
318msgid "Sorry, incorrect passcode"
325msgid "Sorry, incorrect passcode"
319msgstr ""
326msgstr ""
320
327
321−#: qml/Shell.qml:327
328+#: qml/Shell.qml:354
322#, qt-format
329#, qt-format
323−msgid "Enter your %1"
330+msgid "Enter %1"
324msgstr ""
331msgstr ""
325
332
326−#: qml/Shell.qml:328
333+#: qml/Shell.qml:355
327#, qt-format
334#, qt-format
328msgid "Sorry, incorrect %1"
335msgid "Sorry, incorrect %1"
329msgstr ""
336msgstr ""
330
337
331−#: qml/Shell.qml:363
338+#: qml/Shell.qml:390
332msgid "Sorry, incorrect passphrase."
339msgid "Sorry, incorrect passphrase."
333msgstr ""
340msgstr ""
334
341
335−#: qml/Shell.qml:364
342+#: qml/Shell.qml:391
336msgid "Sorry, incorrect passcode."
343msgid "Sorry, incorrect passcode."
337msgstr ""
344msgstr ""
338
345
339−#: qml/Shell.qml:365
346+#: qml/Shell.qml:392
340msgid "This will be your last attempt."
347msgid "This will be your last attempt."
341msgstr ""
348msgstr ""
342
349
343−#: qml/Shell.qml:367
350+#: qml/Shell.qml:394
344msgid ""
351msgid ""
345"If passphrase is entered incorrectly, your phone will conduct a factory "
352"If passphrase is entered incorrectly, your phone will conduct a factory "
346"reset and all personal data will be deleted."
353"reset and all personal data will be deleted."
347msgstr ""
354msgstr ""
348
355
349−#: qml/Shell.qml:368
356+#: qml/Shell.qml:395
350msgid ""
357msgid ""
351"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 "
352"and all personal data will be deleted."
359"and all personal data will be deleted."
po/xh.po+55−48
@@ -7,14 +7,15 @@ msgid ""
7msgstr ""
7msgstr ""
8"Project-Id-Version: unity8\n"
8"Project-Id-Version: unity8\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2014-09-24 10:43+0100\n"
10+"POT-Creation-Date: 2014-10-07 11:37+0300\n"
11"PO-Revision-Date: 2013-09-28 13:20+0000\n"
11"PO-Revision-Date: 2013-09-28 13:20+0000\n"
12"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
12"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
13"Language-Team: Xhosa <xh@li.org>\n"
13"Language-Team: Xhosa <xh@li.org>\n"
14"MIME-Version: 1.0\n"
14"MIME-Version: 1.0\n"
15"Content-Type: text/plain; charset=UTF-8\n"
15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n"
16"Content-Transfer-Encoding: 8bit\n"
17+"Plural-Forms: nplurals=2; plural=n != 1;\n"
17−"X-Launchpad-Export-Date: 2014-09-29 05:20+0000\n"
18+"X-Launchpad-Export-Date: 2014-10-09 06:37+0000\n"
18"X-Generator: Launchpad (build 17196)\n"
19"X-Generator: Launchpad (build 17196)\n"
19
20
20#: plugins/LightDM/Greeter.cpp:130
21#: plugins/LightDM/Greeter.cpp:130
@@ -30,6 +31,25 @@ msgstr ""
30msgid "Unpin shortcut"
31msgid "Unpin shortcut"
31msgstr ""
32msgstr ""
32
33
34+#: qml/Components/DelayedLockscreen.qml:47
35+msgid "Device Locked"
36+msgstr ""
37+
38+#: qml/Components/DelayedLockscreen.qml:62
39+msgid "You have been locked out due to too many failed passphrase attempts."
40+msgstr ""
41+
42+#: qml/Components/DelayedLockscreen.qml:63
43+msgid "You have been locked out due to too many failed passcode attempts."
44+msgstr ""
45+
46+#: qml/Components/DelayedLockscreen.qml:72
47+#, qt-format
48+msgid "Please wait %1 minute and then try again…"
49+msgid_plural "Please wait %1 minutes and then try again…"
50+msgstr[0] ""
51+msgstr[1] ""
52+
33#: qml/Components/Dialogs.qml:70
53#: qml/Components/Dialogs.qml:70
34msgid "Log out"
54msgid "Log out"
35msgstr ""
55msgstr ""
@@ -132,40 +152,23 @@ msgid ""
132"phone<br><br>Tap on the screen to start"
152"phone<br><br>Tap on the screen to start"
133msgstr ""
153msgstr ""
134
154
135−#: qml/Components/Lockscreen.qml:167
155+#: qml/Components/Lockscreen.qml:220
136−msgid "Please wait"
137−msgstr ""
138−
139−#: qml/Components/Lockscreen.qml:172
140−msgid "Too many incorrect attempts"
141−msgstr ""
142−
143−#: qml/Components/Lockscreen.qml:206
144msgid "Emergency Call"
156msgid "Emergency Call"
145msgstr ""
157msgstr ""
146
158
147−#: qml/Components/Lockscreen.qml:226
159+#: qml/Components/Lockscreen.qml:252
148msgid "OK"
160msgid "OK"
149msgstr ""
161msgstr ""
150
162
151−#: qml/Components/PassphraseLockscreen.qml:61
152−#, qt-format
153−msgid "Hello %1"
154−msgstr ""
155−
156−#: qml/Components/PassphraseLockscreen.qml:61
157−msgid "Hello"
158−msgstr ""
159−
160−#: qml/Dash/GenericScopeView.qml:411 qml/Dash/GenericScopeView.qml:533
163+#: qml/Dash/GenericScopeView.qml:434 qml/Dash/GenericScopeView.qml:591
161msgid "See less"
164msgid "See less"
162msgstr ""
165msgstr ""
163
166
164−#: qml/Dash/GenericScopeView.qml:411
167+#: qml/Dash/GenericScopeView.qml:434
165msgid "See all"
168msgid "See all"
166msgstr ""
169msgstr ""
167
170
168−#: qml/Dash/GenericScopeView.qml:473 qml/Dash/PageHeader.qml:258
171+#: qml/Dash/GenericScopeView.qml:496 qml/Dash/PageHeader.qml:258
169#: qml/Panel/SearchIndicator.qml:27
172#: qml/Panel/SearchIndicator.qml:27
170msgid "Search"
173msgid "Search"
171msgstr ""
174msgstr ""
@@ -202,6 +205,14 @@ msgstr ""
202msgid "Send"
205msgid "Send"
203msgstr ""
206msgstr ""
204
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+
205#: qml/Dash/ScopesOverview.qml:206
216#: qml/Dash/ScopesOverview.qml:206
206msgid "Manage Scopes"
217msgid "Manage Scopes"
207msgstr ""
218msgstr ""
@@ -223,7 +234,7 @@ msgid "All"
223msgstr ""
234msgstr ""
224
235
225#: qml/Greeter/Greeter.qml:157
236#: qml/Greeter/Greeter.qml:157
226−msgid "Swipe to unlock"
237+msgid "Unlock"
227msgstr ""
238msgstr ""
228
239
229#: qml/Hud/HudParametrizedActionsPage.qml:139
240#: qml/Hud/HudParametrizedActionsPage.qml:139
@@ -246,18 +257,10 @@ msgstr ""
246msgid "Speaking..."
257msgid "Speaking..."
247msgstr ""
258msgstr ""
248
259
249−#: qml/Notifications/NotificationMenuItemFactory.qml:108
260+#: qml/Notifications/NotificationMenuItemFactory.qml:116
250msgid "Show password"
261msgid "Show password"
251msgstr ""
262msgstr ""
252
263
253−#: qml/Notifications/NotificationMenuItemFactory.qml:124
254−msgid "Enter SIM PIN"
255−msgstr ""
256−
257−#: qml/Notifications/NotificationMenuItemFactory.qml:125
258−msgid "Sorry, incorrect PIN"
259−msgstr ""
260−
261#: qml/Panel/ActiveCallHint.qml:77
264#: qml/Panel/ActiveCallHint.qml:77
262msgid "Tap to return to call..."
265msgid "Tap to return to call..."
263msgstr ""
266msgstr ""
@@ -302,51 +305,55 @@ msgstr ""
302msgid "Roaming"
305msgid "Roaming"
303msgstr ""
306msgstr ""
304
307
305−#: qml/Shell.qml:320
308+#: qml/Shell.qml:346
306−msgid "Enter your passphrase"
309+msgid "Enter passphrase"
307msgstr ""
310msgstr ""
308
311
309−#: qml/Shell.qml:321
312+#: qml/Shell.qml:347
310msgid "Sorry, incorrect passphrase"
313msgid "Sorry, incorrect passphrase"
311msgstr ""
314msgstr ""
312
315
313−#: qml/Shell.qml:323
316+#: qml/Shell.qml:348
317+msgid "Please re-enter"
318+msgstr ""
319+
320+#: qml/Shell.qml:350
314−msgid "Enter your passcode"
321+msgid "Enter passcode"
315msgstr ""
322msgstr ""
316
323
317−#: qml/Shell.qml:324
324+#: qml/Shell.qml:351
318msgid "Sorry, incorrect passcode"
325msgid "Sorry, incorrect passcode"
319msgstr ""
326msgstr ""
320
327
321−#: qml/Shell.qml:327
328+#: qml/Shell.qml:354
322#, qt-format
329#, qt-format
323−msgid "Enter your %1"
330+msgid "Enter %1"
324msgstr ""
331msgstr ""
325
332
326−#: qml/Shell.qml:328
333+#: qml/Shell.qml:355
327#, qt-format
334#, qt-format
328msgid "Sorry, incorrect %1"
335msgid "Sorry, incorrect %1"
329msgstr ""
336msgstr ""
330
337
331−#: qml/Shell.qml:363
338+#: qml/Shell.qml:390
332msgid "Sorry, incorrect passphrase."
339msgid "Sorry, incorrect passphrase."
333msgstr ""
340msgstr ""
334
341
335−#: qml/Shell.qml:364
342+#: qml/Shell.qml:391
336msgid "Sorry, incorrect passcode."
343msgid "Sorry, incorrect passcode."
337msgstr ""
344msgstr ""
338
345
339−#: qml/Shell.qml:365
346+#: qml/Shell.qml:392
340msgid "This will be your last attempt."
347msgid "This will be your last attempt."
341msgstr ""
348msgstr ""
342
349
343−#: qml/Shell.qml:367
350+#: qml/Shell.qml:394
344msgid ""
351msgid ""
345"If passphrase is entered incorrectly, your phone will conduct a factory "
352"If passphrase is entered incorrectly, your phone will conduct a factory "
346"reset and all personal data will be deleted."
353"reset and all personal data will be deleted."
347msgstr ""
354msgstr ""
348
355
349−#: qml/Shell.qml:368
356+#: qml/Shell.qml:395
350msgid ""
357msgid ""
351"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 "
352"and all personal data will be deleted."
359"and all personal data will be deleted."
po/zh_CN.po+56−52
@@ -7,14 +7,15 @@ msgid ""
7msgstr ""
7msgstr ""
8"Project-Id-Version: unity\n"
8"Project-Id-Version: unity\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2014-09-24 10:43+0100\n"
10+"POT-Creation-Date: 2014-10-07 11:37+0300\n"
11"PO-Revision-Date: 2014-08-12 14:09+0000\n"
11"PO-Revision-Date: 2014-08-12 14:09+0000\n"
12"Last-Translator: Anthony Wong <anthony.wong@ubuntu.com>\n"
12"Last-Translator: Anthony Wong <anthony.wong@ubuntu.com>\n"
13"Language-Team: Chinese (Simplified) <zh_CN@li.org>\n"
13"Language-Team: Chinese (Simplified) <zh_CN@li.org>\n"
14"MIME-Version: 1.0\n"
14"MIME-Version: 1.0\n"
15"Content-Type: text/plain; charset=UTF-8\n"
15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n"
16"Content-Transfer-Encoding: 8bit\n"
17+"Plural-Forms: nplurals=1; plural=0;\n"
17−"X-Launchpad-Export-Date: 2014-09-29 05:20+0000\n"
18+"X-Launchpad-Export-Date: 2014-10-09 06:37+0000\n"
18"X-Generator: Launchpad (build 17196)\n"
19"X-Generator: Launchpad (build 17196)\n"
19
20
20#: plugins/LightDM/Greeter.cpp:130
21#: plugins/LightDM/Greeter.cpp:130
@@ -30,6 +31,25 @@ msgstr "固定快捷方式"
30msgid "Unpin shortcut"
31msgid "Unpin shortcut"
31msgstr "取消固定快捷方式"
32msgstr "取消固定快捷方式"
32
33
34+#: qml/Components/DelayedLockscreen.qml:47
35+msgid "Device Locked"
36+msgstr ""
37+
38+#: qml/Components/DelayedLockscreen.qml:62
39+msgid "You have been locked out due to too many failed passphrase attempts."
40+msgstr ""
41+
42+#: qml/Components/DelayedLockscreen.qml:63
43+msgid "You have been locked out due to too many failed passcode attempts."
44+msgstr ""
45+
46+#: qml/Components/DelayedLockscreen.qml:72
47+#, qt-format
48+msgid "Please wait %1 minute and then try again…"
49+msgid_plural "Please wait %1 minutes and then try again…"
50+msgstr[0] ""
51+msgstr[1] ""
52+
33#: qml/Components/Dialogs.qml:70
53#: qml/Components/Dialogs.qml:70
34msgid "Log out"
54msgid "Log out"
35msgstr ""
55msgstr ""
@@ -132,40 +152,23 @@ msgid ""
132"phone<br><br>Tap on the screen to start"
152"phone<br><br>Tap on the screen to start"
133msgstr "您现在已经掌握了边缘滑动手势，可以开始使用手机了<br><br>请点击屏幕开始使用"
153msgstr "您现在已经掌握了边缘滑动手势，可以开始使用手机了<br><br>请点击屏幕开始使用"
134
154
135−#: qml/Components/Lockscreen.qml:167
155+#: qml/Components/Lockscreen.qml:220
136−msgid "Please wait"
137−msgstr ""
138−
139−#: qml/Components/Lockscreen.qml:172
140−msgid "Too many incorrect attempts"
141−msgstr ""
142−
143−#: qml/Components/Lockscreen.qml:206
144msgid "Emergency Call"
156msgid "Emergency Call"
145msgstr "紧急电话"
157msgstr "紧急电话"
146
158
147−#: qml/Components/Lockscreen.qml:226
159+#: qml/Components/Lockscreen.qml:252
148msgid "OK"
160msgid "OK"
149msgstr "确定"
161msgstr "确定"
150
162
151−#: qml/Components/PassphraseLockscreen.qml:61
152−#, qt-format
153−msgid "Hello %1"
154−msgstr "你好，%1"
155−
156−#: qml/Components/PassphraseLockscreen.qml:61
157−msgid "Hello"
158−msgstr "你好"
159−
160−#: qml/Dash/GenericScopeView.qml:411 qml/Dash/GenericScopeView.qml:533
163+#: qml/Dash/GenericScopeView.qml:434 qml/Dash/GenericScopeView.qml:591
161msgid "See less"
164msgid "See less"
162msgstr "显示更少"
165msgstr "显示更少"
163
166
164−#: qml/Dash/GenericScopeView.qml:411
167+#: qml/Dash/GenericScopeView.qml:434
165msgid "See all"
168msgid "See all"
166msgstr "查看全部"
169msgstr "查看全部"
167
170
168−#: qml/Dash/GenericScopeView.qml:473 qml/Dash/PageHeader.qml:258
171+#: qml/Dash/GenericScopeView.qml:496 qml/Dash/PageHeader.qml:258
169#: qml/Panel/SearchIndicator.qml:27
172#: qml/Panel/SearchIndicator.qml:27
170msgid "Search"
173msgid "Search"
171msgstr "搜索"
174msgstr "搜索"
@@ -202,6 +205,14 @@ msgstr "添加评论"
202msgid "Send"
205msgid "Send"
203msgstr "发送"
206msgstr "发送"
204
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+
205#: qml/Dash/ScopesOverview.qml:206
216#: qml/Dash/ScopesOverview.qml:206
206msgid "Manage Scopes"
217msgid "Manage Scopes"
207msgstr ""
218msgstr ""
@@ -223,8 +234,8 @@ msgid "All"
223msgstr "所有"
234msgstr "所有"
224
235
225#: qml/Greeter/Greeter.qml:157
236#: qml/Greeter/Greeter.qml:157
226−msgid "Swipe to unlock"
237+msgid "Unlock"
227−msgstr "滑动解锁"
238+msgstr ""
228
239
229#: qml/Hud/HudParametrizedActionsPage.qml:139
240#: qml/Hud/HudParametrizedActionsPage.qml:139
230msgid "Confirm"
241msgid "Confirm"
@@ -246,18 +257,10 @@ msgstr "现在请讲..."
246msgid "Speaking..."
257msgid "Speaking..."
247msgstr "讲话中..."
258msgstr "讲话中..."
248
259
249−#: qml/Notifications/NotificationMenuItemFactory.qml:108
260+#: qml/Notifications/NotificationMenuItemFactory.qml:116
250msgid "Show password"
261msgid "Show password"
251msgstr "显示密码"
262msgstr "显示密码"
252
263
253−#: qml/Notifications/NotificationMenuItemFactory.qml:124
254−msgid "Enter SIM PIN"
255−msgstr ""
256−
257−#: qml/Notifications/NotificationMenuItemFactory.qml:125
258−msgid "Sorry, incorrect PIN"
259−msgstr ""
260−
261#: qml/Panel/ActiveCallHint.qml:77
264#: qml/Panel/ActiveCallHint.qml:77
262msgid "Tap to return to call..."
265msgid "Tap to return to call..."
263msgstr "点击回到通话..."
266msgstr "点击回到通话..."
@@ -302,55 +305,56 @@ msgstr "解开 SIM"
302msgid "Roaming"
305msgid "Roaming"
303msgstr "漫游"
306msgstr "漫游"
304
307
305−#: qml/Shell.qml:320
308+#: qml/Shell.qml:346
306−msgid "Enter your passphrase"
309+msgid "Enter passphrase"
307msgstr ""
310msgstr ""
308
311
309−#: qml/Shell.qml:321
312+#: qml/Shell.qml:347
310msgid "Sorry, incorrect passphrase"
313msgid "Sorry, incorrect passphrase"
311msgstr ""
314msgstr ""
312
315
313−#: qml/Shell.qml:323
316+#: qml/Shell.qml:348
314−msgid "Enter your passcode"
317+msgid "Please re-enter"
315msgstr ""
318msgstr ""
316
319
317−#: qml/Shell.qml:324
320+#: qml/Shell.qml:350
321+msgid "Enter passcode"
322+msgstr ""
323+
324+#: qml/Shell.qml:351
318msgid "Sorry, incorrect passcode"
325msgid "Sorry, incorrect passcode"
319msgstr ""
326msgstr ""
320
327
321−#: qml/Shell.qml:327
328+#: qml/Shell.qml:354
322#, qt-format
329#, qt-format
323−msgid "Enter your %1"
330+msgid "Enter %1"
324msgstr ""
331msgstr ""
325
332
326−#: qml/Shell.qml:328
333+#: qml/Shell.qml:355
327#, qt-format
334#, qt-format
328msgid "Sorry, incorrect %1"
335msgid "Sorry, incorrect %1"
329msgstr ""
336msgstr ""
330
337
331−#: qml/Shell.qml:363
338+#: qml/Shell.qml:390
332msgid "Sorry, incorrect passphrase."
339msgid "Sorry, incorrect passphrase."
333msgstr ""
340msgstr ""
334
341
335−#: qml/Shell.qml:364
342+#: qml/Shell.qml:391
336msgid "Sorry, incorrect passcode."
343msgid "Sorry, incorrect passcode."
337msgstr ""
344msgstr ""
338
345
339−#: qml/Shell.qml:365
346+#: qml/Shell.qml:392
340msgid "This will be your last attempt."
347msgid "This will be your last attempt."
341msgstr ""
348msgstr ""
342
349
343−#: qml/Shell.qml:367
350+#: qml/Shell.qml:394
344msgid ""
351msgid ""
345"If passphrase is entered incorrectly, your phone will conduct a factory "
352"If passphrase is entered incorrectly, your phone will conduct a factory "
346"reset and all personal data will be deleted."
353"reset and all personal data will be deleted."
347msgstr ""
354msgstr ""
348
355
349−#: qml/Shell.qml:368
356+#: qml/Shell.qml:395
350msgid ""
357msgid ""
351"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 "
352"and all personal data will be deleted."
359"and all personal data will be deleted."
353msgstr ""
360msgstr ""
354−
355−#~ msgid "Manage Dash"
356−#~ msgstr "管理 Dash"
po/zh_HK.po+56−49
@@ -7,14 +7,15 @@ msgid ""
7msgstr ""
7msgstr ""
8"Project-Id-Version: unity8\n"
8"Project-Id-Version: unity8\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2014-09-24 10:43+0100\n"
10+"POT-Creation-Date: 2014-10-07 11:37+0300\n"
11"PO-Revision-Date: 2014-08-10 11:45+0000\n"
11"PO-Revision-Date: 2014-08-10 11:45+0000\n"
12"Last-Translator: Daniel Cheung <daniel.2345@hotmail.com>\n"
12"Last-Translator: Daniel Cheung <daniel.2345@hotmail.com>\n"
13"Language-Team: Chinese (Hong Kong) <zh_HK@li.org>\n"
13"Language-Team: Chinese (Hong Kong) <zh_HK@li.org>\n"
14"MIME-Version: 1.0\n"
14"MIME-Version: 1.0\n"
15"Content-Type: text/plain; charset=UTF-8\n"
15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n"
16"Content-Transfer-Encoding: 8bit\n"
17+"Plural-Forms: nplurals=1; plural=0;\n"
17−"X-Launchpad-Export-Date: 2014-09-29 05:20+0000\n"
18+"X-Launchpad-Export-Date: 2014-10-09 06:37+0000\n"
18"X-Generator: Launchpad (build 17196)\n"
19"X-Generator: Launchpad (build 17196)\n"
19
20
20#: plugins/LightDM/Greeter.cpp:130
21#: plugins/LightDM/Greeter.cpp:130
@@ -30,6 +31,25 @@ msgstr "釘住捷徑"
30msgid "Unpin shortcut"
31msgid "Unpin shortcut"
31msgstr "取消捷徑釘選"
32msgstr "取消捷徑釘選"
32
33
34+#: qml/Components/DelayedLockscreen.qml:47
35+msgid "Device Locked"
36+msgstr ""
37+
38+#: qml/Components/DelayedLockscreen.qml:62
39+msgid "You have been locked out due to too many failed passphrase attempts."
40+msgstr ""
41+
42+#: qml/Components/DelayedLockscreen.qml:63
43+msgid "You have been locked out due to too many failed passcode attempts."
44+msgstr ""
45+
46+#: qml/Components/DelayedLockscreen.qml:72
47+#, qt-format
48+msgid "Please wait %1 minute and then try again…"
49+msgid_plural "Please wait %1 minutes and then try again…"
50+msgstr[0] ""
51+msgstr[1] ""
52+
33#: qml/Components/Dialogs.qml:70
53#: qml/Components/Dialogs.qml:70
34msgid "Log out"
54msgid "Log out"
35msgstr ""
55msgstr ""
@@ -132,40 +152,23 @@ msgid ""
132"phone<br><br>Tap on the screen to start"
152"phone<br><br>Tap on the screen to start"
133msgstr "您現在已熟練邊緣手勢，可以開始使用手機了<br><br>輕觸螢幕開始使用"
153msgstr "您現在已熟練邊緣手勢，可以開始使用手機了<br><br>輕觸螢幕開始使用"
134
154
135−#: qml/Components/Lockscreen.qml:167
155+#: qml/Components/Lockscreen.qml:220
136−msgid "Please wait"
137−msgstr ""
138−
139−#: qml/Components/Lockscreen.qml:172
140−msgid "Too many incorrect attempts"
141−msgstr ""
142−
143−#: qml/Components/Lockscreen.qml:206
144msgid "Emergency Call"
156msgid "Emergency Call"
145msgstr "緊急電話"
157msgstr "緊急電話"
146
158
147−#: qml/Components/Lockscreen.qml:226
159+#: qml/Components/Lockscreen.qml:252
148msgid "OK"
160msgid "OK"
149msgstr "確定"
161msgstr "確定"
150
162
151−#: qml/Components/PassphraseLockscreen.qml:61
152−#, qt-format
153−msgid "Hello %1"
154−msgstr "您好 %1"
155−
156−#: qml/Components/PassphraseLockscreen.qml:61
157−msgid "Hello"
158−msgstr "您好"
159−
160−#: qml/Dash/GenericScopeView.qml:411 qml/Dash/GenericScopeView.qml:533
163+#: qml/Dash/GenericScopeView.qml:434 qml/Dash/GenericScopeView.qml:591
161msgid "See less"
164msgid "See less"
162msgstr "縮減查看"
165msgstr "縮減查看"
163
166
164−#: qml/Dash/GenericScopeView.qml:411
167+#: qml/Dash/GenericScopeView.qml:434
165msgid "See all"
168msgid "See all"
166msgstr "查看全部"
169msgstr "查看全部"
167
170
168−#: qml/Dash/GenericScopeView.qml:473 qml/Dash/PageHeader.qml:258
171+#: qml/Dash/GenericScopeView.qml:496 qml/Dash/PageHeader.qml:258
169#: qml/Panel/SearchIndicator.qml:27
172#: qml/Panel/SearchIndicator.qml:27
170msgid "Search"
173msgid "Search"
171msgstr "搜尋"
174msgstr "搜尋"
@@ -202,6 +205,14 @@ msgstr "新增評論"
202msgid "Send"
205msgid "Send"
203msgstr "傳送"
206msgstr "傳送"
204
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+
205#: qml/Dash/ScopesOverview.qml:206
216#: qml/Dash/ScopesOverview.qml:206
206msgid "Manage Scopes"
217msgid "Manage Scopes"
207msgstr ""
218msgstr ""
@@ -223,8 +234,8 @@ msgid "All"
223msgstr ""
234msgstr ""
224
235
225#: qml/Greeter/Greeter.qml:157
236#: qml/Greeter/Greeter.qml:157
226−msgid "Swipe to unlock"
237+msgid "Unlock"
227−msgstr "滑動解除鎖定"
238+msgstr ""
228
239
229#: qml/Hud/HudParametrizedActionsPage.qml:139
240#: qml/Hud/HudParametrizedActionsPage.qml:139
230msgid "Confirm"
241msgid "Confirm"
@@ -246,18 +257,10 @@ msgstr "請講..."
246msgid "Speaking..."
257msgid "Speaking..."
247msgstr "正在講..."
258msgstr "正在講..."
248
259
249−#: qml/Notifications/NotificationMenuItemFactory.qml:108
260+#: qml/Notifications/NotificationMenuItemFactory.qml:116
250msgid "Show password"
261msgid "Show password"
251msgstr "顯示密碼"
262msgstr "顯示密碼"
252
263
253−#: qml/Notifications/NotificationMenuItemFactory.qml:124
254−msgid "Enter SIM PIN"
255−msgstr ""
256−
257−#: qml/Notifications/NotificationMenuItemFactory.qml:125
258−msgid "Sorry, incorrect PIN"
259−msgstr ""
260−
261#: qml/Panel/ActiveCallHint.qml:77
264#: qml/Panel/ActiveCallHint.qml:77
262msgid "Tap to return to call..."
265msgid "Tap to return to call..."
263msgstr "輕觸可返回通話…"
266msgstr "輕觸可返回通話…"
@@ -302,51 +305,55 @@ msgstr ""
302msgid "Roaming"
305msgid "Roaming"
303msgstr ""
306msgstr ""
304
307
305−#: qml/Shell.qml:320
308+#: qml/Shell.qml:346
306−msgid "Enter your passphrase"
309+msgid "Enter passphrase"
307msgstr ""
310msgstr ""
308
311
309−#: qml/Shell.qml:321
312+#: qml/Shell.qml:347
310msgid "Sorry, incorrect passphrase"
313msgid "Sorry, incorrect passphrase"
311msgstr ""
314msgstr ""
312
315
313−#: qml/Shell.qml:323
316+#: qml/Shell.qml:348
317+msgid "Please re-enter"
318+msgstr ""
319+
320+#: qml/Shell.qml:350
314−msgid "Enter your passcode"
321+msgid "Enter passcode"
315msgstr ""
322msgstr ""
316
323
317−#: qml/Shell.qml:324
324+#: qml/Shell.qml:351
318msgid "Sorry, incorrect passcode"
325msgid "Sorry, incorrect passcode"
319msgstr ""
326msgstr ""
320
327
321−#: qml/Shell.qml:327
328+#: qml/Shell.qml:354
322#, qt-format
329#, qt-format
323−msgid "Enter your %1"
330+msgid "Enter %1"
324msgstr ""
331msgstr ""
325
332
326−#: qml/Shell.qml:328
333+#: qml/Shell.qml:355
327#, qt-format
334#, qt-format
328msgid "Sorry, incorrect %1"
335msgid "Sorry, incorrect %1"
329msgstr ""
336msgstr ""
330
337
331−#: qml/Shell.qml:363
338+#: qml/Shell.qml:390
332msgid "Sorry, incorrect passphrase."
339msgid "Sorry, incorrect passphrase."
333msgstr ""
340msgstr ""
334
341
335−#: qml/Shell.qml:364
342+#: qml/Shell.qml:391
336msgid "Sorry, incorrect passcode."
343msgid "Sorry, incorrect passcode."
337msgstr ""
344msgstr ""
338
345
339−#: qml/Shell.qml:365
346+#: qml/Shell.qml:392
340msgid "This will be your last attempt."
347msgid "This will be your last attempt."
341msgstr ""
348msgstr ""
342
349
343−#: qml/Shell.qml:367
350+#: qml/Shell.qml:394
344msgid ""
351msgid ""
345"If passphrase is entered incorrectly, your phone will conduct a factory "
352"If passphrase is entered incorrectly, your phone will conduct a factory "
346"reset and all personal data will be deleted."
353"reset and all personal data will be deleted."
347msgstr ""
354msgstr ""
348
355
349−#: qml/Shell.qml:368
356+#: qml/Shell.qml:395
350msgid ""
357msgid ""
351"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 "
352"and all personal data will be deleted."
359"and all personal data will be deleted."
po/zh_TW.po+66−57
@@ -7,14 +7,15 @@ msgid ""
7msgstr ""
7msgstr ""
8"Project-Id-Version: unity\n"
8"Project-Id-Version: unity\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2014-09-24 10:43+0100\n"
10+"POT-Creation-Date: 2014-10-07 11:37+0300\n"
11"PO-Revision-Date: 2014-07-26 16:21+0000\n"
11"PO-Revision-Date: 2014-07-26 16:21+0000\n"
12"Last-Translator: Cheng-Chia Tseng <pswo10680@gmail.com>\n"
12"Last-Translator: Cheng-Chia Tseng <pswo10680@gmail.com>\n"
13"Language-Team: Chinese (Traditional) <zh_TW@li.org>\n"
13"Language-Team: Chinese (Traditional) <zh_TW@li.org>\n"
14"MIME-Version: 1.0\n"
14"MIME-Version: 1.0\n"
15"Content-Type: text/plain; charset=UTF-8\n"
15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n"
16"Content-Transfer-Encoding: 8bit\n"
17+"Plural-Forms: nplurals=1; plural=0;\n"
17−"X-Launchpad-Export-Date: 2014-09-29 05:20+0000\n"
18+"X-Launchpad-Export-Date: 2014-10-09 06:37+0000\n"
18"X-Generator: Launchpad (build 17196)\n"
19"X-Generator: Launchpad (build 17196)\n"
19
20
20#: plugins/LightDM/Greeter.cpp:130
21#: plugins/LightDM/Greeter.cpp:130
@@ -30,6 +31,24 @@ msgstr "釘住捷徑"
30msgid "Unpin shortcut"
31msgid "Unpin shortcut"
31msgstr "取消捷徑釘選"
32msgstr "取消捷徑釘選"
32
33
34+#: qml/Components/DelayedLockscreen.qml:47
35+msgid "Device Locked"
36+msgstr "裝置已鎖定"
37+
38+#: qml/Components/DelayedLockscreen.qml:62
39+msgid "You have been locked out due to too many failed passphrase attempts."
40+msgstr ""
41+
42+#: qml/Components/DelayedLockscreen.qml:63
43+msgid "You have been locked out due to too many failed passcode attempts."
44+msgstr ""
45+
46+#: qml/Components/DelayedLockscreen.qml:72
47+#, qt-format
48+msgid "Please wait %1 minute and then try again…"
49+msgid_plural "Please wait %1 minutes and then try again…"
50+msgstr[0] "請等候 %1 分鐘再試…"
51+
33#: qml/Components/Dialogs.qml:70
52#: qml/Components/Dialogs.qml:70
34msgid "Log out"
53msgid "Log out"
35msgstr "登出"
54msgstr "登出"
@@ -80,7 +99,7 @@ msgstr "關閉電源"
80
99
81#: qml/Components/Dialogs.qml:157
100#: qml/Components/Dialogs.qml:157
82msgid "Restart"
101msgid "Restart"
83−msgstr ""
102+msgstr "重新啟動"
84
103
85#: qml/Components/Dialogs.qml:167
104#: qml/Components/Dialogs.qml:167
86msgid "Cancel"
105msgid "Cancel"
@@ -132,40 +151,23 @@ msgid ""
132"phone<br><br>Tap on the screen to start"
151"phone<br><br>Tap on the screen to start"
133msgstr "您現在已熟練邊緣手勢，可以開始使用手機了<br><br>輕觸螢幕開始使用"
152msgstr "您現在已熟練邊緣手勢，可以開始使用手機了<br><br>輕觸螢幕開始使用"
134
153
135−#: qml/Components/Lockscreen.qml:167
154+#: qml/Components/Lockscreen.qml:220
136−msgid "Please wait"
137−msgstr "請稍候"
138−
139−#: qml/Components/Lockscreen.qml:172
140−msgid "Too many incorrect attempts"
141−msgstr "錯得太多次"
142−
143−#: qml/Components/Lockscreen.qml:206
144msgid "Emergency Call"
155msgid "Emergency Call"
145msgstr "緊急通話"
156msgstr "緊急通話"
146
157
147−#: qml/Components/Lockscreen.qml:226
158+#: qml/Components/Lockscreen.qml:252
148msgid "OK"
159msgid "OK"
149msgstr "確定"
160msgstr "確定"
150
161
151−#: qml/Components/PassphraseLockscreen.qml:61
152−#, qt-format
153−msgid "Hello %1"
154−msgstr "%1 您好"
155−
156−#: qml/Components/PassphraseLockscreen.qml:61
157−msgid "Hello"
158−msgstr "您好"
159−
160−#: qml/Dash/GenericScopeView.qml:411 qml/Dash/GenericScopeView.qml:533
162+#: qml/Dash/GenericScopeView.qml:434 qml/Dash/GenericScopeView.qml:591
161msgid "See less"
163msgid "See less"
162msgstr "縮減查看"
164msgstr "縮減查看"
163
165
164−#: qml/Dash/GenericScopeView.qml:411
166+#: qml/Dash/GenericScopeView.qml:434
165msgid "See all"
167msgid "See all"
166msgstr "查看全部"
168msgstr "查看全部"
167
169
168−#: qml/Dash/GenericScopeView.qml:473 qml/Dash/PageHeader.qml:258
170+#: qml/Dash/GenericScopeView.qml:496 qml/Dash/PageHeader.qml:258
169#: qml/Panel/SearchIndicator.qml:27
171#: qml/Panel/SearchIndicator.qml:27
170msgid "Search"
172msgid "Search"
171msgstr "搜尋"
173msgstr "搜尋"
@@ -202,6 +204,14 @@ msgstr "新增評論"
202msgid "Send"
204msgid "Send"
203msgstr "發送"
205msgstr "發送"
204
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+
205#: qml/Dash/ScopesOverview.qml:206
215#: qml/Dash/ScopesOverview.qml:206
206msgid "Manage Scopes"
216msgid "Manage Scopes"
207msgstr ""
217msgstr ""
@@ -223,8 +233,8 @@ msgid "All"
223msgstr "全部"
233msgstr "全部"
224
234
225#: qml/Greeter/Greeter.qml:157
235#: qml/Greeter/Greeter.qml:157
226−msgid "Swipe to unlock"
236+msgid "Unlock"
227−msgstr "滑開解除鎖定"
237+msgstr "解鎖"
228
238
229#: qml/Hud/HudParametrizedActionsPage.qml:139
239#: qml/Hud/HudParametrizedActionsPage.qml:139
230msgid "Confirm"
240msgid "Confirm"
@@ -246,18 +256,10 @@ msgstr "請說..."
246msgid "Speaking..."
256msgid "Speaking..."
247msgstr "說話中..."
257msgstr "說話中..."
248
258
249−#: qml/Notifications/NotificationMenuItemFactory.qml:108
259+#: qml/Notifications/NotificationMenuItemFactory.qml:116
250msgid "Show password"
260msgid "Show password"
251msgstr "顯示密碼"
261msgstr "顯示密碼"
252
262
253−#: qml/Notifications/NotificationMenuItemFactory.qml:124
254−msgid "Enter SIM PIN"
255−msgstr "輸入 SIM 卡 PIN 碼"
256−
257−#: qml/Notifications/NotificationMenuItemFactory.qml:125
258−msgid "Sorry, incorrect PIN"
259−msgstr "抱歉，PIN 碼不對"
260−
261#: qml/Panel/ActiveCallHint.qml:77
263#: qml/Panel/ActiveCallHint.qml:77
262msgid "Tap to return to call..."
264msgid "Tap to return to call..."
263msgstr "輕觸可返回通話…"
265msgstr "輕觸可返回通話…"
@@ -302,55 +304,62 @@ msgstr "為 SIM 卡解鎖"
302msgid "Roaming"
304msgid "Roaming"
303msgstr "漫遊"
305msgstr "漫遊"
304
306
305−#: qml/Shell.qml:320
307+#: qml/Shell.qml:346
306−msgid "Enter your passphrase"
308+msgid "Enter passphrase"
307msgstr "輸入密語"
309msgstr "輸入密語"
308
310
309−#: qml/Shell.qml:321
311+#: qml/Shell.qml:347
310msgid "Sorry, incorrect passphrase"
312msgid "Sorry, incorrect passphrase"
311msgstr "抱歉，密語不對"
313msgstr "抱歉，密語不對"
312
314
313−#: qml/Shell.qml:323
315+#: qml/Shell.qml:348
314−msgid "Enter your passcode"
316+msgid "Please re-enter"
315−msgstr "輸入密碼"
317+msgstr "請再輸入"
316
318
317−#: qml/Shell.qml:324
319+#: qml/Shell.qml:350
320+msgid "Enter passcode"
321+msgstr "輸入 passcode"
322+
323+#: qml/Shell.qml:351
318msgid "Sorry, incorrect passcode"
324msgid "Sorry, incorrect passcode"
319−msgstr "抱歉，密碼不對"
325+msgstr "抱歉，passcode 不對"
320
326
321−#: qml/Shell.qml:327
327+#: qml/Shell.qml:354
322#, qt-format
328#, qt-format
323−msgid "Enter your %1"
329+msgid "Enter %1"
324−msgstr "輸入您的 %1"
330+msgstr "輸入 %1"
325
331
326−#: qml/Shell.qml:328
332+#: qml/Shell.qml:355
327#, qt-format
333#, qt-format
328msgid "Sorry, incorrect %1"
334msgid "Sorry, incorrect %1"
329msgstr "抱歉，%1不對"
335msgstr "抱歉，%1不對"
330
336
331−#: qml/Shell.qml:363
337+#: qml/Shell.qml:390
332msgid "Sorry, incorrect passphrase."
338msgid "Sorry, incorrect passphrase."
333msgstr "抱歉，密語不對"
339msgstr "抱歉，密語不對"
334
340
335−#: qml/Shell.qml:364
341+#: qml/Shell.qml:391
336msgid "Sorry, incorrect passcode."
342msgid "Sorry, incorrect passcode."
337−msgstr "抱歉，密碼不對。"
343+msgstr "抱歉，passcode 不對。"
338
344
339−#: qml/Shell.qml:365
345+#: qml/Shell.qml:392
340msgid "This will be your last attempt."
346msgid "This will be your last attempt."
341msgstr "這將會是您最後一次嘗試的機會。"
347msgstr "這將會是您最後一次嘗試的機會。"
342
348
343−#: qml/Shell.qml:367
349+#: qml/Shell.qml:394
344msgid ""
350msgid ""
345"If passphrase is entered incorrectly, your phone will conduct a factory "
351"If passphrase is entered incorrectly, your phone will conduct a factory "
346"reset and all personal data will be deleted."
352"reset and all personal data will be deleted."
347msgstr "如輸入的密語不對，本電話會進行重設，所有個人資料都會刪除。"
353msgstr "如輸入的密語不對，本電話會進行重設，所有個人資料都會刪除。"
348
354
349−#: qml/Shell.qml:368
355+#: qml/Shell.qml:395
350msgid ""
356msgid ""
351"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 "
352"and all personal data will be deleted."
358"and all personal data will be deleted."
353−msgstr "如輸入的密碼不對，本電話會進行重設，所有個人資料都會刪除。"
359+msgstr "如輸入的 passcode 不對，本電話會進行重設，所有個人資料都會刪除。"
360+
361+#~ msgid "Enter SIM PIN"
362+#~ msgstr "輸入 SIM 卡 PIN 碼"
354
363
355−#~ msgid "Manage Dash"
364+#~ msgid "Sorry, incorrect PIN"
356−#~ msgstr "管理 Dash"
365+#~ msgstr "抱歉，PIN 碼不對"
qml/Components/DelayedLockscreen.qmlnew file+92
@@ -0,0 +1,92 @@
1+/*
2+ * Copyright (C) 2013,2014 Canonical, Ltd.
3+ *
4+ * This program is free software; you can redistribute it and/or modify
5+ * it under the terms of the GNU General Public License as published by
6+ * the Free Software Foundation; version 3.
7+ *
8+ * This program is distributed in the hope that it will be useful,
9+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
10+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11+ * GNU General Public License for more details.
12+ *
13+ * You should have received a copy of the GNU General Public License
14+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
15+ */
16+
17+import QtQuick 2.0
18+import Ubuntu.Components 0.1
19+import "../Components"
20+
21+Item {
22+ id: root
23+ anchors.fill: parent
24+
25+ property int delayMinutes
26+ property bool alphaNumeric
27+
28+ function clear(playAnimation) {}
29+
30+ Column {
31+ anchors.left: parent.left
32+ anchors.right: parent.right
33+ anchors.leftMargin: units.gu(4)
34+ anchors.rightMargin: units.gu(4)
35+ anchors.verticalCenter: parent.verticalCenter
36+ spacing: units.gu(2)
37+
38+ Label {
39+ id: deviceLockedLabel
40+ objectName: "deviceLockedLabel"
41+ anchors.left: parent.left
42+ anchors.right: parent.right
43+ horizontalAlignment: Text.AlignHCenter
44+ wrapMode: Text.Wrap
45+ fontSize: "x-large"
46+ color: "#f3f3e7"
47+ text: i18n.tr("Device Locked")
48+ }
49+
50+ Item { // spacer
51+ width: units.gu(1)
52+ height: units.gu(1)
53+ }
54+
55+ Label {
56+ anchors.left: parent.left
57+ anchors.right: parent.right
58+ horizontalAlignment: Text.AlignHCenter
59+ wrapMode: Text.Wrap
60+ color: "#f3f3e7"
61+ text: alphaNumeric ?
62+ i18n.tr("You have been locked out due to too many failed passphrase attempts.") :
63+ i18n.tr("You have been locked out due to too many failed passcode attempts.")
64+ }
65+
66+ Label {
67+ anchors.left: parent.left
68+ anchors.right: parent.right
69+ horizontalAlignment: Text.AlignHCenter
70+ wrapMode: Text.Wrap
71+ color: "#f3f3e7"
72+ text: i18n.tr("Please wait %1 minute and then try again…",
73+ "Please wait %1 minutes and then try again…",
74+ root.delayMinutes).arg(root.delayMinutes)
75+ }
76+
77+ Item { // spacer
78+ width: units.gu(1)
79+ height: units.gu(1)
80+ }
81+
82+ Icon {
83+ // It would be nice to use a less network-specific name,
84+ // but this is the only lock icon we have.
85+ name: "network-secure"
86+ color: "#f3f3e7"
87+ height: units.gu(4)
88+ width: units.gu(4)
89+ anchors.horizontalCenter: parent.horizontalCenter
90+ }
91+ }
92+}
qml/Components/LazyImage.qml+1
@@ -37,6 +37,7 @@ Item {
37 property alias horizontalAlignment: image.horizontalAlignment
37 property alias horizontalAlignment: image.horizontalAlignment
38 property alias verticalAlignment: image.verticalAlignment
38 property alias verticalAlignment: image.verticalAlignment
39 property alias sourceImage: image
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+129−103
@@ -24,17 +24,24 @@ Showable {
24 // Determine if a numeric or alphanumeric pad is used.
24 // Determine if a numeric or alphanumeric pad is used.
25 property bool alphaNumeric: false
25 property bool alphaNumeric: false
26
26
27+ // Whether to show an emergency call button
28+ property bool showEmergencyCallButton: true
29+
30+ // Whether to show a cancel button (not all lockscreen types normally do anyway)
31+ property bool showCancelButton: true
32+
27 // Informational text. (e.g. some text to tell which domain this is pin is entered for)
33 // Informational text. (e.g. some text to tell which domain this is pin is entered for)
28 property string infoText: ""
34 property string infoText: ""
29
35
30 // Retries text (e.g. 3 retries left)
36 // Retries text (e.g. 3 retries left)
37+ // (This is not currently used, but will be necessary for SIM unlock screen)
31 property string retryText: ""
38 property string retryText: ""
32
39
33 // The text to be displayed in case the login failed
40 // The text to be displayed in case the login failed
34 property string errorText: ""
41 property string errorText: ""
35
42
36− // In case the Lockscreen can show a greeter message, this is the username
43+ // If > 0, a forced delay is happening
37− property string username: ""
44+ property int delayMinutes: 0
38
45
39 // Set those to a value greater 0 to restrict the pin length.
46 // Set those to a value greater 0 to restrict the pin length.
40 // If both are unset, the Lockscreen will show a confirm button and allow typing any length of pin before
47 // If both are unset, the Lockscreen will show a confirm button and allow typing any length of pin before
@@ -54,16 +61,7 @@ Showable {
54 signal emergencyCall()
61 signal emergencyCall()
55 signal infoPopupConfirmed()
62 signal infoPopupConfirmed()
56
63
57− onRequiredChanged: {
64+ onActiveFocusChanged: if (activeFocus && pinPadLoader.item) pinPadLoader.item.forceActiveFocus()
58− if (required && pinPadLoader.item) {
59− clear(false)
60− }
61− }
62−
63− function forceDelay(delay) {
64− forcedDelayTimer.interval = delay
65− forcedDelayTimer.start()
66− }
67
65
68 function reset() {
66 function reset() {
69 // This causes the loader below to destry and recreate the source
67 // This causes the loader below to destry and recreate the source
@@ -80,19 +78,17 @@ Showable {
80 }
78 }
81
79
82 function showInfoPopup(title, text) {
80 function showInfoPopup(title, text) {
83− PopupUtils.open(infoPopupComponent, root, {title: title, text: text})
81+ var popup = PopupUtils.open(infoPopupComponent, root, {title: title, text: text})
84− }
82+ // FIXME: SDK will do this internally soonish
85−
83+ popup.z = Number.MAX_VALUE
86− Timer {
87− id: forcedDelayTimer
88− onTriggered: pinPadLoader.showWrongText = false
89 }
84 }
90
85
91 Rectangle {
86 Rectangle {
92− // In case background fails to load or is undefined
87+ // In case background fails to load
93 id: backgroundBackup
88 id: backgroundBackup
94 anchors.fill: parent
89 anchors.fill: parent
95 color: "black"
90 color: "black"
91+ visible: root.background.toString() !== ""
96 }
92 }
97
93
98 Image {
94 Image {
@@ -107,111 +103,141 @@ Showable {
107
103
108 MouseArea {
104 MouseArea {
109 anchors.fill: root
105 anchors.fill: root
106+ onClicked: {
107+ if (pinPadLoader.item)
108+ pinPadLoader.item.forceActiveFocus()
109+ }
110 }
110 }
111
111
112+ FocusScope {
113+ id: loaderScope
114+ anchors.fill: parent
115+
112− Loader {
116+ Loader {
113− id: pinPadLoader
117+ id: pinPadLoader
114− objectName: "pinPadLoader"
118+ objectName: "pinPadLoader"
115− anchors {
119+ anchors.fill: parent
116− left: parent.left
117− right: parent.right
118− verticalCenter: parent.verticalCenter
119− verticalCenterOffset: root.alphaNumeric ? -units.gu(10) : 0
120− }
121− property bool resetting: false
120+ property bool resetting: false
122− property bool waiting: false
121+ property bool waiting: false
123− property bool showWrongText: false
122+ property bool showWrongText: false
124−
123+
124+ source: {
125+ if (resetting || !root.required) {
126+ return ""
127+ } else if (root.delayMinutes > 0) {
128+ return "DelayedLockscreen.qml"
129+ } else if (root.alphaNumeric) {
125− source: (!resetting && root.required) ? (root.alphaNumeric ? "PassphraseLockscreen.qml" : "PinLockscreen.qml") : ""
130+ return "PassphraseLockscreen.qml"
131+ } else {
132+ return "PinLockscreen.qml"
133+ }
134+ }
126− onSourceChanged: {
135+ onSourceChanged: {
127− waiting = false
136+ waiting = false
128− showWrongText = false
137+ showWrongText = false
129− }
138+ if (loaderScope.activeFocus && pinPadLoader.item)
130− onLoaded: {
131− if (forcedDelayTimer.running) {
132− pinPadLoader.item.clear(true)
139+ pinPadLoader.item.forceActiveFocus()
133 }
140 }
134− }
135
141
136− Connections {
142+ Connections {
137− target: pinPadLoader.item
143+ target: pinPadLoader.item
138
144
139− onEntered: {
145+ onEntered: {
140− pinPadLoader.waiting = true
146+ pinPadLoader.waiting = true
141− root.entered(passphrase);
147+ root.entered(passphrase);
142− }
148+ }
143
149
144− onCancel: {
150+ onCancel: {
145− root.cancel()
151+ root.cancel()
152+ }
146 }
153 }
147− }
148
154
149− Binding {
155+ Binding {
150− target: pinPadLoader.item
156+ target: pinPadLoader.item
151− property: "minPinLength"
157+ property: "minPinLength"
152− value: root.minPinLength
158+ value: root.minPinLength
153− }
159+ }
154− Binding {
160+ Binding {
155− target: pinPadLoader.item
161+ target: pinPadLoader.item
156− property: "maxPinLength"
162+ property: "maxPinLength"
157− value: root.maxPinLength
163+ value: root.maxPinLength
158− }
164+ }
159− Binding {
165+ Binding {
160− target: pinPadLoader.item
166+ target: pinPadLoader.item
161− property: "infoText"
167+ property: "infoText"
162− value: root.infoText
168+ value: root.infoText
163− }
169+ }
164− Binding {
170+ Binding {
165− target: pinPadLoader.item
171+ target: pinPadLoader.item
166− property: "retryText"
172+ property: "retryText"
167− value: forcedDelayTimer.running ? i18n.tr("Please wait") : root.retryText
173+ value: root.retryText
168− }
174+ }
169− Binding {
175+ Binding {
170− target: pinPadLoader.item
176+ target: pinPadLoader.item
171− property: "errorText"
177+ property: "errorText"
172− value: forcedDelayTimer.running ? i18n.tr("Too many incorrect attempts") :
173− (pinPadLoader.showWrongText ? root.errorText : "")
178+ value: pinPadLoader.showWrongText ? root.errorText : ""
174− }
179+ }
175− Binding {
180+ Binding {
181+ target: pinPadLoader.item
182+ property: "entryEnabled"
183+ value: !pinPadLoader.waiting
184+ }
185+ Binding {
176− target: pinPadLoader.item
186+ target: pinPadLoader.item
177− property: "username"
187+ property: "alphaNumeric"
188+ value: root.alphaNumeric
189+ }
190+ Binding {
191+ target: pinPadLoader.item
192+ property: "delayMinutes"
178− value: root.username
193+ value: root.delayMinutes
194+ }
179 }
195 }
180 Binding {
196 Binding {
181 target: pinPadLoader.item
197 target: pinPadLoader.item
182− property: "entryEnabled"
198+ property: "showCancelButton"
183− value: !pinPadLoader.waiting && !forcedDelayTimer.running
199+ value: root.showCancelButton
184 }
200 }
185 }
201 }
186
202
187− Label {
203+ Item {
188− id: emergencyCallLabel
204+ id: emergencyCallRow
189− objectName: "emergencyCallLabel"
190
205
191− // FIXME: We *should* show emergency dialer if there is a SIM present,
206+ visible: showEmergencyCallButton
192− // regardless of whether the side stage is enabled. But right now,
193− // the assumption is that narrow screens are phones which have SIMs
194− // and wider screens are tablets which don't. When we do allow this
195− // on devices with a side stage and a SIM, work should be done to
196− // ensure that the main stage is disabled while the dialer is present
197− // in the side stage.
198− visible: !shell.sideStageEnabled
199
207
200 anchors {
208 anchors {
201 bottom: parent.bottom
209 bottom: parent.bottom
202− bottomMargin: units.gu(4)
210+ bottomMargin: units.gu(7) + (Qt.inputMethod.visible ? Qt.inputMethod.keyboardRectangle.height : 0)
203− horizontalCenter: parent.horizontalCenter
211+ left: parent.left
212+ right: parent.right
204 }
213 }
205
214
206− text: i18n.tr("Emergency Call")
215+ Label {
207− color: "#f3f3e7"
216+ id: emergencyCallLabel
208− opacity: 0.6
217+ objectName: "emergencyCallLabel"
209− }
218+ anchors.horizontalCenter: parent.horizontalCenter
210
219
220+ text: i18n.tr("Emergency Call")
221+ color: "#f3f3e7"
222+ }
223+
224+ Icon {
225+ id: emergencyCallIcon
226+ anchors.left: emergencyCallLabel.right
227+ anchors.leftMargin: units.gu(1)
228+ width: emergencyCallLabel.height
229+ height: emergencyCallLabel.height
230+ name: "call-start"
231+ color: "#f3f3e7"
232+ }
233+
211− MouseArea {
234+ MouseArea {
235+ anchors.top: emergencyCallLabel.top
236+ anchors.bottom: emergencyCallLabel.bottom
212− anchors.fill: emergencyCallLabel
237+ anchors.left: emergencyCallLabel.left
238+ anchors.right: emergencyCallIcon.right
213− onClicked: root.emergencyCall()
239+ onClicked: root.emergencyCall()
214− enabled: emergencyCallLabel.visible
240+ }
215 }
241 }
216
242
217 Component {
243 Component {
qml/Components/PassphraseLockscreen.qml+96−43
@@ -20,10 +20,12 @@ import "../Components"
20
20
21Item {
21Item {
22 id: root
22 id: root
23+ anchors.top: parent.top
24+ anchors.topMargin: units.gu(4)
23− height: highlightItem.height
25+ height: shakeContainer.height
24
26
25 property string infoText
27 property string infoText
26− property string username: ""
28+ property string errorText
27 property bool entryEnabled: true
29 property bool entryEnabled: true
28
30
29 signal entered(string passphrase)
31 signal entered(string passphrase)
@@ -31,64 +33,115 @@ Item {
31
33
32 function clear(playAnimation) {
34 function clear(playAnimation) {
33 pinentryField.text = "";
35 pinentryField.text = "";
36+ pinentryField.incorrectOverride = false;
37+ pinentryField.forceActiveFocus();
34 if (playAnimation) {
38 if (playAnimation) {
35 wrongPasswordAnimation.start();
39 wrongPasswordAnimation.start();
36− pinentryField.forceActiveFocus();
37− } else {
38− pinentryField.focus = false
39 }
40 }
40 }
41 }
41
42
42− Rectangle {
43+ onActiveFocusChanged: if (activeFocus) pinentryField.forceActiveFocus()
43− id: highlightItem
44+
44− width: units.gu(32)
45+ Column {
45− height: units.gu(10)
46+ id: shakeContainer
46− anchors.centerIn: parent
47+ anchors.horizontalCenter: parent.horizontalCenter
47− color: Qt.rgba(0.1, 0.1, 0.1, 0.4)
48+ width: parent.width
48− border.color: Qt.rgba(0.4, 0.4, 0.4, 0.4)
49− border.width: units.dp(1)
50− radius: units.gu(1.5)
49+ spacing: units.gu(2)
51− antialiasing: true
52
50
53 Label {
51 Label {
52+ id: infoField
54− objectName: "greeterLabel"
53+ objectName: "infoTextLabel"
55− anchors {
54+ fontSize: "x-large"
56− left: parent.left
55+ color: "#f3f3e7"
57− top: parent.top
56+ anchors.horizontalCenter: parent.horizontalCenter
58− right: parent.right
57+ text: root.infoText
59− margins: units.gu(1.5)
60− }
61− text: root.username.length > 0 ? i18n.tr("Hello %1").arg(root.username) : i18n.tr("Hello")
62− color: "white"
63 }
58 }
64
59
65− TextField {
60+ Item {
61+ id: entryContainer
62+ anchors { left: parent.left; right: parent.right; margins: units.gu(2) }
63+ height: units.gu(4)
64+
65+ TextInput {
66− id: pinentryField
66+ id: pinentryField
67− objectName: "pinentryField"
67+ objectName: "pinentryField"
68+
69+ property bool incorrectOverride: false
70+
68− anchors {
71+ anchors {
69− horizontalCenter: parent.horizontalCenter
72+ top: parent.top
70− bottom: parent.bottom
73+ left: parent.left
71− margins: units.gu(1)
74+ right: parent.right
75+ }
76+ horizontalAlignment: Text.AlignHCenter
77+ font.pixelSize: FontUtils.sizeToPixels("large")
78+ echoMode: TextInput.Password
79+ inputMethodHints: Qt.ImhHiddenText | Qt.ImhSensitiveData |
80+ Qt.ImhNoAutoUppercase | Qt.ImhNoPredictiveText
81+ color: "#f3f3e7"
82+ cursorDelegate: Item {} // disable cursor
83+ onCursorPositionChanged: {
84+ // And because we don't show the cursor, always position the
85+ // cursor at the end of the string (so backspace works like
86+ // the user expects, even if they've clicked on us and
87+ // thus accidentally moved the cursor)
88+ if (cursorPosition !== length) {
89+ cursorPosition = length
90+ }
91+ }
92+ clip: true
93+
94+ // This is so that we can draw our own dots, for we want
95+ // complete control over the pixel sizes. (The ubuntu font
96+ // has oddly sized password characters that don't scale right)
97+ opacity: 0
98+
99+ // simulate being disabled, but without removing OSK focus
100+ maximumLength: root.entryEnabled ? 32767 : length
101+
102+ onTextChanged: incorrectOverride = true
103+
104+ onAccepted: {
105+ if (pinentryField.text) {
106+ root.entered(pinentryField.text);
107+ }
108+ }
72 }
109 }
73− height: units.gu(4.5)
110+
74− width: parent.width - units.gu(2)
111+ Row {
75− echoMode: TextInput.Password
112+ id: dotRow
76− opacity: 0.9
113+ anchors.centerIn: entryContainer
77− hasClearButton: false
114+
78− enabled: root.entryEnabled
115+ property real dotSize: Math.min(units.gu(2), entryContainer.width / pinentryField.length)
79− placeholderText: root.infoText
116+ spacing: Math.min(units.gu(2), Math.max(0, (entryContainer.width / pinentryField.length) - dotSize))
80−
117+
81− onAccepted: {
118+ Repeater {
82− if (pinentryField.text) {
119+ model: pinentryField.length
83− root.entered(pinentryField.text);
120+ delegate: Rectangle {
121+ color: "#f3f3e7"
122+ width: dotRow.dotSize
123+ height: width
124+ radius: width / 2
125+ }
84 }
126 }
85 }
127 }
128+
129+ Label {
130+ id: wrongNoticeLabel
131+ objectName: "wrongNoticeLabel"
132+ fontSize: "large"
133+ color: "#f3f3e7"
134+ anchors.horizontalCenter: parent.horizontalCenter
135+ horizontalAlignment: Text.AlignHCenter
136+ text: root.errorText
137+ visible: pinentryField.text.length == 0 && !pinentryField.incorrectOverride
138+ }
86 }
139 }
87 }
140 }
88
141
89 WrongPasswordAnimation {
142 WrongPasswordAnimation {
90 id: wrongPasswordAnimation
143 id: wrongPasswordAnimation
91 objectName: "wrongPasswordAnimation"
144 objectName: "wrongPasswordAnimation"
92− target: pinentryField
145+ target: shakeContainer
93 }
146 }
94}
147}
qml/Components/PinLockscreen.qml+10−5
@@ -21,7 +21,9 @@ import "../Components"
21
21
22Column {
22Column {
23 id: root
23 id: root
24− anchors.centerIn: parent
24+ anchors.top: parent.top
25+ anchors.topMargin: units.gu(4)
26+ anchors.horizontalCenter: parent.horizontalCenter
25 spacing: units.gu(2)
27 spacing: units.gu(2)
26
28
27 property string infoText
29 property string infoText
@@ -31,6 +33,7 @@ Column {
31 property int padHeight: units.gu(28)
33 property int padHeight: units.gu(28)
32 property int minPinLength: -1
34 property int minPinLength: -1
33 property int maxPinLength: -1
35 property int maxPinLength: -1
36+ property bool showCancelButton: true
34
37
35 signal entered(string passphrase)
38 signal entered(string passphrase)
36 signal cancel()
39 signal cancel()
@@ -49,7 +52,7 @@ Column {
49 id: shakeContainer
52 id: shakeContainer
50 anchors.horizontalCenter: parent.horizontalCenter
53 anchors.horizontalCenter: parent.horizontalCenter
51 width: parent.width
54 width: parent.width
52− spacing: units.gu(2)
55+ spacing: units.gu(1)
53
56
54 Label {
57 Label {
55 id: infoField
58 id: infoField
@@ -108,6 +111,7 @@ Column {
108 fontSize: "x-large"
111 fontSize: "x-large"
109 color: "#f3f3e7"
112 color: "#f3f3e7"
110 anchors.horizontalCenter: parent.horizontalCenter
113 anchors.horizontalCenter: parent.horizontalCenter
114+ horizontalAlignment: Text.AlignHCenter
111 text: root.errorText
115 text: root.errorText
112 visible: pinentryField.incorrectOverride
116 visible: pinentryField.incorrectOverride
113 }
117 }
@@ -193,19 +197,20 @@ Column {
193 }
197 }
194 PinPadButton {
198 PinPadButton {
195 iconName: "close"
199 iconName: "close"
196− height: numbersGrid.buttonHeight
200+ height: units.gu(5) // visual spec has this row a little closer in
197 width: numbersGrid.buttonWidth
201 width: numbersGrid.buttonWidth
198
202
199 onClicked: root.cancel()
203 onClicked: root.cancel()
204+ visible: root.showCancelButton
200 }
205 }
201 Item {
206 Item {
202− height: numbersGrid.buttonHeight
207+ height: units.gu(5)
203 width: numbersGrid.buttonWidth
208 width: numbersGrid.buttonWidth
204 }
209 }
205 PinPadButton {
210 PinPadButton {
206 iconName: "tick"
211 iconName: "tick"
207 objectName: "confirmButton"
212 objectName: "confirmButton"
208− height: numbersGrid.buttonHeight
213+ height: units.gu(5)
209 width: numbersGrid.buttonWidth
214 width: numbersGrid.buttonWidth
210 enabled: root.enabled && pinentryField.text.length >= root.minPinLength
215 enabled: root.enabled && pinentryField.text.length >= root.minPinLength
211 visible: root.minPinLength == -1 || root.minPinLength !== root.maxPinLength
216 visible: root.minPinLength == -1 || root.minPinLength !== root.maxPinLength
qml/Components/ResponsiveGridView.qml+5−1
@@ -34,7 +34,11 @@ Item {
34 readonly property int cellWidth: gridView.cellWidth
34 readonly property int cellWidth: gridView.cellWidth
35 readonly property int cellHeight: gridView.cellHeight
35 readonly property int cellHeight: gridView.cellHeight
36 readonly property int totalContentHeight: {
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 {
55 delegate: Item {
56 width: grid.cellWidth
56 width: grid.cellWidth
57 height: grid.cellHeight
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; });
49 item.cardData = Qt.binding(function() { return model; });
50 item.template = Qt.binding(function() { return cardTool.template; });
50 item.template = Qt.binding(function() { return cardTool.template; });
51 item.components = Qt.binding(function() { return cardTool.components; });
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;
53 item.scopeStyle = root.scopeStyle;
54 }
54 }
55 Connections {
55 Connections {
qml/Dash/CardTool.qml+26−18
@@ -131,21 +131,26 @@ Item {
131 property size artShapeSize: cardLoader.item ? cardLoader.item.artShapeSize : 0
131 property size artShapeSize: cardLoader.item ? cardLoader.item.artShapeSize : 0
132
132
133 /*!
133 /*!
134− \brief Desired alignment of header components.
134+ \brief Desired alignment of title
135 */
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
49 id: loader
50 sourceComponent: cardTool.cardComponent
50 sourceComponent: cardTool.cardComponent
51 width: cardTool.cardWidth
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/Dash.qml+1
@@ -275,6 +275,7 @@ Showable {
275 left: parent.left
275 left: parent.left
276 right: parent.right
276 right: parent.right
277 bottom: parent.bottom
277 bottom: parent.bottom
278+ bottomMargin: Qt.inputMethod.keyboardRectangle.height
278 }
279 }
279 height: units.dp(3)
280 height: units.dp(3)
280 color: scopeStyle.backgroundLuminance > 0.7 ? "#50000000" : "#50ffffff"
281 color: scopeStyle.backgroundLuminance > 0.7 ? "#50000000" : "#50ffffff"
qml/Dash/DashContent.qml+3
@@ -111,6 +111,8 @@ Item {
111 highlightMoveDuration: 250
111 highlightMoveDuration: 250
112 highlightRangeMode: ListView.StrictlyEnforceRange
112 highlightRangeMode: ListView.StrictlyEnforceRange
113 // TODO Investigate if we can switch to a smaller cache buffer when/if UbuntuShape gets more performant
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
52
53 Rectangle {
53 Rectangle {
54 id: blackRect
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
27
28 property int displayMarginEnd: 0
28 property int displayMarginEnd: 0
29
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 */
15 */
16
16
17import QtQuick 2.0
17import QtQuick 2.0
18−import Ubuntu.Components 0.1
18+import Ubuntu.Components 1.1
19import Utils 0.1
19import Utils 0.1
20import Unity 0.2
20import Unity 0.2
21import Dash 0.1
21import Dash 0.1
@@ -38,6 +38,7 @@ FocusScope {
38 property int paginationCount: 0
38 property int paginationCount: 0
39 property int paginationIndex: 0
39 property int paginationIndex: 0
40 property alias pageHeaderTotallyVisible: categoryView.pageHeaderTotallyVisible
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 }
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−1
@@ -16,12 +16,14 @@
16
16
17import QtQuick 2.0
17import QtQuick 2.0
18import Ubuntu.Components 0.1
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
@@ -97,7 +100,6 @@ PreviewWidget {
97 font.weight: Font.Normal
100 font.weight: Font.Normal
98 fontSize: "large"
101 fontSize: "large"
99 wrapMode: Text.Wrap
102 wrapMode: Text.Wrap
100− maximumLineCount: 2
101 color: headerRoot.fontColor
103 color: headerRoot.fontColor
102 text: headerRoot.title
104 text: headerRoot.title
103 }
105 }
@@ -115,6 +117,16 @@ PreviewWidget {
115 text: headerRoot.subtitle
117 text: headerRoot.subtitle
116 }
118 }
117 }
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+ }
118 }
130 }
119 }
131 }
120 }
132 }
qml/Dash/Previews/PreviewImageGallery.qml+121−18
@@ -26,8 +26,11 @@ PreviewWidget {
26 id: root
26 id: root
27 implicitHeight: units.gu(22)
27 implicitHeight: units.gu(22)
28
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+/*
2+ * Copyright (C) 2014 Canonical, Ltd.
3+ *
4+ * This program is free software; you can redistribute it and/or modify
5+ * it under the terms of the GNU General Public License as published by
6+ * the Free Software Foundation; version 3.
7+ *
8+ * This program is distributed in the hope that it will be useful,
9+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
10+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11+ * GNU General Public License for more details.
12+ *
13+ * You should have received a copy of the GNU General Public License
14+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
15+ */
16+
17+import QtQuick 2.3
18+import Ubuntu.Components 1.1
19+import Ubuntu.Components.Styles 1.1
20+
21+/**
22+ * TODO: Once the SDK version of PullToRefreshStyle doesn't have bug 1375799
23+ * (https://launchpad.net/bugs/1375799) anymore, we should switch to using a
24+ * a subclass of the Ambiance version with a hidden ActivityIndicator.
25+ */
26+PullToRefreshStyle {
27+ releaseToRefresh: styledItem.target.originY - styledItem.target.contentY > activationThreshold
28+
29+ Connections {
30+ property bool willRefresh: false
31+
32+ target: styledItem.target
33+ onDraggingChanged: {
34+ if (!styledItem.target.dragging && releaseToRefresh) {
35+ willRefresh = true
36+ }
37+ }
38+ onContentYChanged: {
39+ if (styledItem.target.originY - styledItem.target.contentY == 0 && willRefresh) {
40+ styledItem.refresh()
41+ willRefresh = false
42+ }
43+ }
44+ }
45+
46+ Label {
47+ id: pullLabel
48+ anchors.horizontalCenter: parent.horizontalCenter
49+ horizontalAlignment: Text.AlignHCenter
50+ verticalAlignment: Text.AlignVCenter
51+ states: [
52+ State {
53+ name: "pulling"
54+ when: styledItem.target.dragging && !releaseToRefresh
55+ PropertyChanges { target: pullLabel; text: i18n.tr("Pull to refresh…") }
56+ },
57+ State {
58+ name: "releasable"
59+ when: styledItem.target.dragging && releaseToRefresh
60+ PropertyChanges { target: pullLabel; text: i18n.tr("Release to refresh…") }
61+ }
62+ ]
63+ transitions: Transition {
64+ SequentialAnimation {
65+ UbuntuNumberAnimation {
66+ target: pullLabel
67+ property: "opacity"
68+ to: 0.0
69+ }
70+ PropertyAction {
71+ target: pullLabel
72+ property: "text"
73+ }
74+ UbuntuNumberAnimation {
75+ target: pullLabel
76+ property: "opacity"
77+ to: 1.0
78+ }
79+ }
80+ }
81+ }
82+}
qml/Dash/ScopeListView.qml+1
@@ -20,4 +20,5 @@ import Dash 0.1
20ListViewWithPageHeader {
20ListViewWithPageHeader {
21 maximumFlickVelocity: height * 10
21 maximumFlickVelocity: height * 10
22 flickDeceleration: height * 2
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
49 right: parent.right
50 }
50 }
51 model: root.scope ? root.scope.settings : null
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
43 id: cardGrid
44 width: root.width
44 width: root.width
45 height: parent.height
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; });
61 item.cardData = Qt.binding(function() { return model; });
62 item.template = Qt.binding(function() { return cardTool.template; });
62 item.template = Qt.binding(function() { return cardTool.template; });
63 item.components = Qt.binding(function() { return cardTool.components; });
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 }
65 }
66
66
67 Connections {
67 Connections {
qml/Greeter/Greeter.qml+1−1
@@ -154,7 +154,7 @@ Showable {
154 anchors.horizontalCenter: parent.horizontalCenter
154 anchors.horizontalCenter: parent.horizontalCenter
155 anchors.bottom: parent.bottom
155 anchors.bottom: parent.bottom
156 anchors.bottomMargin: units.gu(5)
156 anchors.bottomMargin: units.gu(5)
157− text: i18n.tr("Swipe to unlock")
157+ text: "《 " + i18n.tr("Unlock") + " 》"
158 color: "white"
158 color: "white"
159 font.weight: Font.Light
159 font.weight: Font.Light
160
160
qml/Greeter/GreeterContent.qml+3
@@ -47,6 +47,9 @@ Item {
47 topMargin: backgroundTopMargin
47 topMargin: backgroundTopMargin
48 }
48 }
49 fillMode: Image.PreserveAspectCrop
49 fillMode: Image.PreserveAspectCrop
50+ // Limit how much memory we'll reserve for this image
51+ sourceSize.height: height
52+ sourceSize.width: width
50 }
53 }
51
54
52 // See Shell.qml's backgroundSettings treatment for why we need a separate
55 // See Shell.qml's backgroundSettings treatment for why we need a separate
qml/Launcher/Launcher.qml+1
@@ -92,6 +92,7 @@ Item {
92 // machine and switch to the final state in the next event loop run
92 // machine and switch to the final state in the next event loop run
93 Timer {
93 Timer {
94 id: animateTimer
94 id: animateTimer
95+ objectName: "animateTimer"
95 interval: 1
96 interval: 1
96 property string nextState: ""
97 property string nextState: ""
97 onTriggered: {
98 onTriggered: {
qml/Notifications/NotificationMenuItemFactory.qml+77−5
@@ -19,6 +19,7 @@
19
19
20import QtQuick 2.0
20import QtQuick 2.0
21import Ubuntu.Components 0.1
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 }
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/Panel/ActiveCallHint.qml+1−1
@@ -117,7 +117,7 @@ Item {
117 verticalAlignment: Text.AlignVCenter
117 verticalAlignment: Text.AlignVCenter
118 horizontalAlignment: Text.AlignRight
118 horizontalAlignment: Text.AlignRight
119 text: {
119 text: {
120− var m = Math.round(d.callTime/60);
120+ var m = Math.floor(d.callTime/60);
121 var ss = d.callTime % 60;
121 var ss = d.callTime % 60;
122 if (ss >= 10) {
122 if (ss >= 10) {
123 return m + ":" + ss;
123 return m + ":" + ss;
qml/Panel/IndicatorItem.qml+6
@@ -39,6 +39,12 @@ Loader {
39 }
39 }
40 }
40 }
41
41
42+ Binding {
43+ target: item
44+ property: "identifier"
45+ value: identifier
46+ }
47+
42 Binding {
48 Binding {
43 target: item
49 target: item
44 property: "objectName"
50 property: "objectName"
qml/Panel/Indicators/DefaultIndicatorPage.qml+1−1
@@ -130,7 +130,7 @@ IndicatorBase {
130 visible: status == Loader.Ready
130 visible: status == Loader.Ready
131
131
132 property int modelIndex: index
132 property int modelIndex: index
133− sourceComponent: factory.load(model, identifier)
133+ sourceComponent: factory.load(model, main.identifier)
134
134
135 onLoaded: {
135 onLoaded: {
136 if (item.hasOwnProperty("selected")) {
136 if (item.hasOwnProperty("selected")) {
qml/Panel/Indicators/IndicatorBase.qml+1
@@ -26,6 +26,7 @@ Item {
26 enabled: menuObjectPath != ""
26 enabled: menuObjectPath != ""
27
27
28 //const
28 //const
29+ property string identifier
29 property string busName
30 property string busName
30 property string actionsObjectPath
31 property string actionsObjectPath
31 property string menuObjectPath
32 property string menuObjectPath
qml/Panel/Indicators/MenuItemFactory.qml+1−1
@@ -823,7 +823,7 @@ Item {
823 }
823 }
824
824
825 function load(modelData, context) {
825 function load(modelData, context) {
826− if (modelData.type !== undefined) {
826+ if (modelData.type !== undefined && modelData.type !== "") {
827 var component = undefined;
827 var component = undefined;
828
828
829 var contextComponents = _map[context];
829 var contextComponents = _map[context];
qml/Panel/Indicators/VisibleIndicators.qml+1
@@ -55,6 +55,7 @@ Item {
55 delegate: IndicatorDelegate {
55 delegate: IndicatorDelegate {
56 id: item
56 id: item
57 objectName: model.identifier + "-delegate"
57 objectName: model.identifier + "-delegate"
58+ identifier: model.identifier
58 Component.onCompleted: {
59 Component.onCompleted: {
59 for(var pName in indicatorProperties) {
60 for(var pName in indicatorProperties) {
60 if (item.hasOwnProperty(pName)) {
61 if (item.hasOwnProperty(pName)) {
qml/Panel/MenuContent.qml+6
@@ -123,6 +123,12 @@ Rectangle {
123 }
123 }
124 }
124 }
125
125
126+ Binding {
127+ target: loader.item
128+ property: "identifier"
129+ value: identifier
130+ }
131+
126 Binding {
132 Binding {
127 target: loader.item
133 target: loader.item
128 property: "objectName"
134 property: "objectName"
qml/Shell.qml+54−23
@@ -60,7 +60,7 @@ Item {
60
60
61 property int maxFailedLogins: -1 // disabled by default for now, will enable via settings in future
61 property int maxFailedLogins: -1 // disabled by default for now, will enable via settings in future
62 property int failedLoginsDelayAttempts: 7 // number of failed logins
62 property int failedLoginsDelayAttempts: 7 // number of failed logins
63− property int failedLoginsDelaySeconds: 5 * 60 // seconds of forced waiting
63+ property int failedLoginsDelayMinutes: 5 // minutes of forced waiting
64
64
65 property int orientation
65 property int orientation
66 readonly property int deviceOrientationAngle: Screen.angleBetween(Screen.primaryOrientation, Screen.orientation)
66 readonly property int deviceOrientationAngle: Screen.angleBetween(Screen.primaryOrientation, Screen.orientation)
@@ -128,6 +128,13 @@ Item {
128 objectName: "dashCommunicator"
128 objectName: "dashCommunicator"
129 }
129 }
130
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: {
@@ -278,8 +284,6 @@ Item {
278 id: lockscreen
284 id: lockscreen
279 objectName: "lockscreen"
285 objectName: "lockscreen"
280
286
281− readonly property int backgroundTopMargin: -panel.panelHeight
282−
283 hides: [launcher, panel.indicators]
287 hides: [launcher, panel.indicators]
284 shown: false
288 shown: false
285 enabled: true
289 enabled: true
@@ -294,12 +298,34 @@ Item {
294 minPinLength: 4
298 minPinLength: 4
295 maxPinLength: 4
299 maxPinLength: 4
296
300
301+ // FIXME: We *should* show emergency dialer if there is a SIM present,
302+ // regardless of whether the side stage is enabled. But right now,
303+ // the assumption is that narrow screens are phones which have SIMs
304+ // and wider screens are tablets which don't. When we do allow this
305+ // on devices with a side stage and a SIM, work should be done to
306+ // ensure that the main stage is disabled while the dialer is present
307+ // in the side stage.
308+ showEmergencyCallButton: !shell.sideStageEnabled
309+
297 onEntered: LightDM.Greeter.respond(passphrase);
310 onEntered: LightDM.Greeter.respond(passphrase);
298 onCancel: greeter.show()
311 onCancel: greeter.show()
299 onEmergencyCall: shell.activateApplication("dialer-app") // will automatically enter fake-active mode
312 onEmergencyCall: shell.activateApplication("dialer-app") // will automatically enter fake-active mode
300
313
301 onShownChanged: if (shown) greeter.fakeActiveForApp = ""
314 onShownChanged: if (shown) greeter.fakeActiveForApp = ""
302
315
316+ Timer {
317+ id: forcedDelayTimer
318+ interval: 1000 * 60
319+ onTriggered: {
320+ if (lockscreen.delayMinutes > 0) {
321+ lockscreen.delayMinutes -= 1
322+ if (lockscreen.delayMinutes > 0) {
323+ start() // go again
324+ }
325+ }
326+ }
327+ }
328+
303 Component.onCompleted: {
329 Component.onCompleted: {
304 if (greeter.narrowMode) {
330 if (greeter.narrowMode) {
305 LightDM.Greeter.authenticate(LightDM.Users.data(0, LightDM.UserRoles.NameRole))
331 LightDM.Greeter.authenticate(LightDM.Users.data(0, LightDM.UserRoles.NameRole))
@@ -317,14 +343,15 @@ Item {
317 if (greeter.narrowMode) {
343 if (greeter.narrowMode) {
318 if (isDefaultPrompt) {
344 if (isDefaultPrompt) {
319 if (lockscreen.alphaNumeric) {
345 if (lockscreen.alphaNumeric) {
320− lockscreen.infoText = i18n.tr("Enter your passphrase")
346+ lockscreen.infoText = i18n.tr("Enter passphrase")
321− lockscreen.errorText = i18n.tr("Sorry, incorrect passphrase")
347+ lockscreen.errorText = i18n.tr("Sorry, incorrect passphrase") + "\n" +
348+ i18n.tr("Please re-enter")
322 } else {
349 } else {
323− lockscreen.infoText = i18n.tr("Enter your passcode")
350+ lockscreen.infoText = i18n.tr("Enter passcode")
324 lockscreen.errorText = i18n.tr("Sorry, incorrect passcode")
351 lockscreen.errorText = i18n.tr("Sorry, incorrect passcode")
325 }
352 }
326 } else {
353 } else {
327− lockscreen.infoText = i18n.tr("Enter your %1").arg(text.toLowerCase())
354+ lockscreen.infoText = i18n.tr("Enter %1").arg(text.toLowerCase())
328 lockscreen.errorText = i18n.tr("Sorry, incorrect %1").arg(text.toLowerCase())
355 lockscreen.errorText = i18n.tr("Sorry, incorrect %1").arg(text.toLowerCase())
329 }
356 }
330
357
@@ -372,7 +399,8 @@ Item {
372 }
399 }
373 }
400 }
374 if (failedLoginsDelayAttempts > 0 && AccountsService.failedLogins % failedLoginsDelayAttempts == 0) {
401 if (failedLoginsDelayAttempts > 0 && AccountsService.failedLogins % failedLoginsDelayAttempts == 0) {
375− lockscreen.forceDelay(failedLoginsDelaySeconds * 1000)
402+ lockscreen.delayMinutes = failedLoginsDelayMinutes
403+ forcedDelayTimer.start()
376 }
404 }
377
405
378 lockscreen.clear(true);
406 lockscreen.clear(true);
@@ -418,7 +446,15 @@ Item {
418 }
446 }
419
447
420 readonly property real showProgress: MathUtils.clamp((1 - x/width) + greeter.showProgress - 1, 0, 1)
448 readonly property real showProgress: MathUtils.clamp((1 - x/width) + greeter.showProgress - 1, 0, 1)
449+ onShowProgressChanged: {
450+ if (showProgress === 0) {
421− onShowProgressChanged: if (LightDM.Greeter.authenticated && showProgress === 0) greeter.login()
451+ if (LightDM.Greeter.authenticated) {
452+ greeter.login()
453+ } else if (greeter.narrowMode) {
454+ lockscreen.clear(false) // to reset focus if necessary
455+ }
456+ }
457+ }
422
458
423 Greeter {
459 Greeter {
424 id: greeter
460 id: greeter
@@ -513,16 +549,19 @@ Item {
513 }
549 }
514
550
515 function showDash() {
551 function showDash() {
516− if (shell.locked) {
552+ if (greeter.fakeActiveForApp !== "") { // just in case user gets here
517− return;
553+ return
518 }
554 }
555+
519 if (greeter.shown) {
556 if (greeter.shown) {
520 greeter.hideRight();
557 greeter.hideRight();
521 launcher.fadeOut();
558 launcher.fadeOut();
522 }
559 }
523
560
561+ if (ApplicationManager.focusedApplicationId != "unity8-dash") {
524− ApplicationManager.requestFocusApplication("unity8-dash")
562+ ApplicationManager.requestFocusApplication("unity8-dash")
525− launcher.fadeOut();
563+ launcher.fadeOut();
564+ }
526 }
565 }
527
566
528 Item {
567 Item {
@@ -564,15 +603,7 @@ Item {
564 available: edgeDemo.launcherEnabled && (!shell.locked || AccountsService.enableLauncherWhileLocked) && greeter.fakeActiveForApp === ""
603 available: edgeDemo.launcherEnabled && (!shell.locked || AccountsService.enableLauncherWhileLocked) && greeter.fakeActiveForApp === ""
565
604
566 onShowDashHome: showHome()
605 onShowDashHome: showHome()
567− onDash: {
568− if (ApplicationManager.focusedApplicationId != "unity8-dash") {
569− showDash()
606+ onDash: showDash()
570− }
571− if (greeter.shown) {
572− launcher.fadeOut()
573− greeter.hideRight()
574− }
575− }
576 onDashSwipeChanged: {
607 onDashSwipeChanged: {
577 if (dashSwipe) {
608 if (dashSwipe) {
578 dash.setCurrentScope("clickscope", false, true)
609 dash.setCurrentScope("clickscope", false, true)
src/CMakeLists.txt+1
@@ -36,3 +36,4 @@ install(TARGETS ${SHELL_APP}
36
36
37add_subdirectory(Panel)
37add_subdirectory(Panel)
38add_subdirectory(Dash)
38add_subdirectory(Dash)
39+add_subdirectory(libunity8-private)
src/Dash/CMakeLists.txt+2
@@ -9,6 +9,8 @@ add_executable(unity8-dash ${DASH_SRCS})
9
9
10qt5_use_modules(unity8-dash Gui Qml Quick Test)
10qt5_use_modules(unity8-dash Gui Qml Quick Test)
11
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)
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+/*
2+ * Copyright (C) 2011-2014 Canonical, Ltd.
3+ *
4+ * Authors:
5+ * Ugo Riboni <ugo.riboni@canonical.com>
6+ *
7+ * This program is free software; you can redistribute it and/or modify
8+ * it under the terms of the GNU General Public License as published by
9+ * the Free Software Foundation; version 3.
10+ *
11+ * This program is distributed in the hope that it will be useful,
12+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
13+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14+ * GNU General Public License for more details.
15+ *
16+ * You should have received a copy of the GNU General Public License
17+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
18+ */
19+
20+#include "abstractdbusservicemonitor.h"
21+
22+#include <QDBusInterface>
23+#include <QDBusServiceWatcher>
24+#include <QDBusConnection>
25+#include <QDBusConnectionInterface>
26+#include <QDBusReply>
27+
28+AbstractDBusServiceMonitor::AbstractDBusServiceMonitor(const QString &service, const QString &path,
29+ const QString &interface, const Bus bus,
30+ QObject *parent)
31+ : QObject(parent)
32+ , m_service(service)
33+ , m_path(path)
34+ , m_interface(interface)
35+ , m_watcher(new QDBusServiceWatcher(service,
36+ (bus == SystemBus) ? QDBusConnection::systemBus()
37+ : QDBusConnection::sessionBus()))
38+ , m_dbusInterface(nullptr)
39+{
40+ connect(m_watcher, &QDBusServiceWatcher::serviceRegistered, this, &AbstractDBusServiceMonitor::createInterface);
41+ connect(m_watcher, &QDBusServiceWatcher::serviceUnregistered, this, &AbstractDBusServiceMonitor::destroyInterface);
42+
43+ // Connect to the service if it's up already
44+ QDBusConnectionInterface* sessionBus = QDBusConnection::sessionBus().interface();
45+ QDBusReply<bool> reply = sessionBus->isServiceRegistered(m_service);
46+ if (reply.isValid() && reply.value()) {
47+ createInterface(m_service);
48+ }
49+}
50+
51+AbstractDBusServiceMonitor::~AbstractDBusServiceMonitor()
52+{
53+ delete m_watcher;
54+ delete m_dbusInterface;
55+}
56+
57+void AbstractDBusServiceMonitor::createInterface(const QString &)
58+{
59+ if (m_dbusInterface != nullptr) {
60+ delete m_dbusInterface;
61+ m_dbusInterface = nullptr;
62+ }
63+
64+ m_dbusInterface = new QDBusInterface(m_service, m_path, m_interface,
65+ QDBusConnection::sessionBus());
66+ Q_EMIT serviceAvailableChanged(true);
67+}
68+
69+void AbstractDBusServiceMonitor::destroyInterface(const QString &)
70+{
71+ if (m_dbusInterface != nullptr) {
72+ delete m_dbusInterface;
73+ m_dbusInterface = nullptr;
74+ }
75+
76+ Q_EMIT serviceAvailableChanged(false);
77+}
78+
79+QDBusInterface* AbstractDBusServiceMonitor::dbusInterface() const
80+{
81+ return m_dbusInterface;
82+}
83+
84+bool AbstractDBusServiceMonitor::serviceAvailable() const
85+{
86+ return m_dbusInterface != nullptr;
87+}
src/libunity8-private/abstractdbusservicemonitor.hnew file+66
@@ -0,0 +1,66 @@
1+/*
2+ * Copyright (C) 2011-2014 Canonical, Ltd.
3+ *
4+ * Authors:
5+ * Ugo Riboni <ugo.riboni@canonical.com>
6+ *
7+ * This program is free software; you can redistribute it and/or modify
8+ * it under the terms of the GNU General Public License as published by
9+ * the Free Software Foundation; version 3.
10+ *
11+ * This program is distributed in the hope that it will be useful,
12+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
13+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14+ * GNU General Public License for more details.
15+ *
16+ * You should have received a copy of the GNU General Public License
17+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
18+ */
19+
20+#ifndef ABSTRACTDBUSSERVICEMONITOR_H
21+#define ABSTRACTDBUSSERVICEMONITOR_H
22+
23+#include <QObject>
24+#include <QString>
25+#include <QDBusConnection>
26+
27+class QDBusInterface;
28+class QDBusServiceWatcher;
29+
30+class Q_DECL_EXPORT AbstractDBusServiceMonitor : public QObject
31+{
32+ Q_OBJECT
33+ Q_ENUMS(Bus)
34+ Q_PROPERTY(bool serviceAvailable READ serviceAvailable NOTIFY serviceAvailableChanged)
35+
36+public:
37+ enum Bus {
38+ SessionBus,
39+ SystemBus,
40+ };
41+
42+ explicit AbstractDBusServiceMonitor(const QString &service, const QString &path, const QString &interface,
43+ const Bus bus = SessionBus,
44+ QObject *parent = 0);
45+ ~AbstractDBusServiceMonitor();
46+
47+ QDBusInterface* dbusInterface() const;
48+
49+ bool serviceAvailable() const;
50+
51+Q_SIGNALS:
52+ void serviceAvailableChanged(bool available);
53+
54+private Q_SLOTS:
55+ void createInterface(const QString &service);
56+ void destroyInterface(const QString &service);
57+
58+protected:
59+ const QString m_service;
60+ const QString m_path;
61+ const QString m_interface;
62+ QDBusServiceWatcher* m_watcher;
63+ QDBusInterface* m_dbusInterface;
64+};
65+
66+#endif // ABSTRACTDBUSSERVICEMONITOR_H
tests/autopilot/unity8/shell/emulators/dash.py+4−4
@@ -66,7 +66,7 @@ class Dash(emulators.UnityEmulatorBase):
66 return resp_grid.select_single('Tile', text=text)
66 return resp_grid.select_single('Tile', text=text)
67
67
68 def get_scope(self, scope_name='clickscope'):
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)
70 'QQuickLoader', scopeId=scope_name)
71
71
72 @autopilot_logging.log_action(logger.info)
72 @autopilot_logging.log_action(logger.info)
@@ -86,14 +86,14 @@ class Dash(emulators.UnityEmulatorBase):
86
86
87 def _get_scope_loader(self, scope_id):
87 def _get_scope_loader(self, scope_id):
88 try:
88 try:
89− return self.dash_content_list.select_single(
89+ return self.dash_content_list.wait_select_single(
90 'QQuickLoader', scopeId=scope_id)
90 'QQuickLoader', scopeId=scope_id)
91 except dbus.StateNotFoundError:
91 except dbus.StateNotFoundError:
92 raise emulators.UnityEmulatorException(
92 raise emulators.UnityEmulatorException(
93 'No scope found with id {0}'.format(scope_id))
93 'No scope found with id {0}'.format(scope_id))
94
94
95 def _get_scope_from_loader(self, loader):
95 def _get_scope_from_loader(self, loader):
96− return loader.get_children()[0]
96+ return loader.wait_select_single('GenericScopeView');
97
97
98 def _open_scope_scrolling(self, scope_loader):
98 def _open_scope_scrolling(self, scope_loader):
99 scroll = self._get_scroll_direction(scope_loader)
99 scroll = self._get_scroll_direction(scope_loader)
@@ -102,8 +102,8 @@ class Dash(emulators.UnityEmulatorBase):
102 scroll()
102 scroll()
103 self.dash_content_list.moving.wait_for(False)
103 self.dash_content_list.moving.wait_for(False)
104
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
107 return scope
108
108
109 def _get_scroll_direction(self, scope_loader):
109 def _get_scroll_direction(self, scope_loader):
tests/autopilot/unity8/shell/tests/test_lock_screen.py+3−1
@@ -132,8 +132,10 @@ class TestLockscreen(UnityTestCase):
132 )
132 )
133
133
134 pin_entry_field = self.main_window.get_pinentryField()
134 pin_entry_field = self.main_window.get_pinentryField()
135− pin_entry_field.write(passphrase)
135+ # pinentryField should automatically have focus
136+ self.keyboard.type(passphrase)
136 logger.debug("Typed passphrase: %s", pin_entry_field.text)
137 logger.debug("Typed passphrase: %s", pin_entry_field.text)
138+ self.assertEqual(pin_entry_field.text, passphrase)
137 self.keyboard.type("\n")
139 self.keyboard.type("\n")
138
140
139 def _enter_prompt_passphrase(self, passphrase):
141 def _enter_prompt_passphrase(self, passphrase):
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+/*
2+ * Copyright © 2014 Canonical Ltd.
3+ *
4+ * This program is free software: you can redistribute it and/or modify it
5+ * under the terms of the GNU Lesser General Public License version 3,
6+ * as published by the Free Software Foundation.
7+ *
8+ * This program is distributed in the hope that it will be useful,
9+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
10+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11+ * GNU Lesser General Public License for more details.
12+ *
13+ * You should have received a copy of the GNU Lesser General Public License
14+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
15+ *
16+ * Authors:
17+ * Antti Kaijanmäki <antti.kaijanmaki@canonical.com>
18+ */
19+
20+#include "networking-status.h"
21+
22+NetworkingStatus::NetworkingStatus(QObject *parent)
23+ : QObject(parent)
24+{
25+ qRegisterMetaType<NetworkingStatus::Limitations>();
26+ qRegisterMetaType<QVector<NetworkingStatus::Limitations>>();
27+ qRegisterMetaType<NetworkingStatus::Status>();
28+}
29+
30+NetworkingStatus::~NetworkingStatus()
31+{}
32+
33+QVector<NetworkingStatus::Limitations>
34+NetworkingStatus::limitations() const
35+{
36+ return m_limitations;
37+}
38+
39+NetworkingStatus::Status
40+NetworkingStatus::status() const
41+{
42+ return Status::Online;
43+}
44+
45+bool
46+NetworkingStatus::online() const
47+{
48+ return status() == Status::Online;
49+}
50+
51+bool
52+NetworkingStatus::limitedBandwith() const
53+{
54+ return limitations().contains(Limitations::Bandwith);
55+}
56+
57+void NetworkingStatus::setLimitedBandwidth(bool limited)
58+{
59+ if (limited) {
60+ m_limitations << Limitations::Bandwith;
61+ } else if (limitedBandwith()) {
62+ m_limitations.remove(m_limitations.indexOf(Limitations::Bandwith));
63+ }
64+}
tests/mocks/Ubuntu/Connectivity/networking-status.hnew file+73
@@ -0,0 +1,73 @@
1+/*
2+ * Copyright © 2014 Canonical Ltd.
3+ *
4+ * This program is free software: you can redistribute it and/or modify it
5+ * under the terms of the GNU Lesser General Public License version 3,
6+ * as published by the Free Software Foundation.
7+ *
8+ * This program is distributed in the hope that it will be useful,
9+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
10+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11+ * GNU Lesser General Public License for more details.
12+ *
13+ * You should have received a copy of the GNU Lesser General Public License
14+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
15+ *
16+ */
17+
18+#ifndef FAKE_NETWORKING_STATUS_H
19+#define FAKE_NETWORKING_STATUS_H
20+
21+#include <QObject>
22+#include <QVector>
23+
24+class Q_DECL_EXPORT NetworkingStatus : public QObject
25+{
26+ Q_OBJECT
27+ Q_DISABLE_COPY(NetworkingStatus)
28+
29+ Q_ENUMS(Limitations)
30+ Q_ENUMS(Status)
31+
32+ Q_PROPERTY(QVector<Limitations> limitations READ limitations NOTIFY limitationsChanged)
33+ Q_PROPERTY(Status status READ status NOTIFY statusChanged)
34+ Q_PROPERTY(bool online READ online NOTIFY onlineChanged)
35+ Q_PROPERTY(bool limitedBandwith READ limitedBandwith WRITE setLimitedBandwidth NOTIFY limitedBandwithChanged)
36+
37+public:
38+ explicit NetworkingStatus(QObject *parent = 0);
39+ virtual ~NetworkingStatus();
40+
41+ enum Limitations {
42+ Bandwith
43+ };
44+
45+ enum Status {
46+ Offline,
47+ Connecting,
48+ Online
49+ };
50+
51+ QVector<Limitations> limitations() const;
52+ Status status() const;
53+ bool online() const;
54+ bool limitedBandwith() const;
55+
56+ // Only in the fake one
57+ void setLimitedBandwidth(bool limited);
58+
59+Q_SIGNALS:
60+ void limitationsChanged();
61+ void statusChanged(Status value);
62+ void onlineChanged(bool value);
63+ void limitedBandwithChanged(bool value);
64+
65+private:
66+ QVector<NetworkingStatus::Limitations> m_limitations;
67+};
68+
69+Q_DECLARE_METATYPE(NetworkingStatus::Limitations)
70+Q_DECLARE_METATYPE(QVector<NetworkingStatus::Limitations>)
71+Q_DECLARE_METATYPE(NetworkingStatus::Status)
72+
73+#endif // FAKE_NETWORKING_STATUS_H
tests/mocks/Ubuntu/Connectivity/plugin.cppnew file+46
@@ -0,0 +1,46 @@
1+/*
2+ * Copyright © 2014 Canonical Ltd.
3+ *
4+ * This program is free software: you can redistribute it and/or modify it
5+ * under the terms of the GNU Lesser General Public License version 3,
6+ * as published by the Free Software Foundation.
7+ *
8+ * This program is distributed in the hope that it will be useful,
9+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
10+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11+ * GNU Lesser General Public License for more details.
12+ *
13+ * You should have received a copy of the GNU Lesser General Public License
14+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
15+ *
16+ * Authors:
17+ * Antti Kaijanmäki <antti.kaijanmaki@canonical.com>
18+ */
19+
20+#include "plugin.h"
21+
22+#include <QtQml>
23+
24+#include "networking-status.h"
25+
26+static QObject *
27+networkingStatusSingletonProvider(QQmlEngine *engine, QJSEngine *scriptEngine)
28+{
29+ Q_UNUSED(scriptEngine)
30+
31+ return new NetworkingStatus(engine);
32+}
33+
34+void
35+QmlConnectivityNetworkingPlugin::registerTypes(const char *uri)
36+{
37+ // @uri Ubuntu.Connectivity
38+ qmlRegisterSingletonType<NetworkingStatus>(uri, 1, 0, "NetworkingStatus", networkingStatusSingletonProvider);
39+}
40+
41+void
42+QmlConnectivityNetworkingPlugin::initializeEngine(QQmlEngine *engine, const char *uri)
43+{
44+ Q_UNUSED(uri);
45+ Q_UNUSED(engine);
46+}
tests/mocks/Ubuntu/Connectivity/plugin.hnew file+35
@@ -0,0 +1,35 @@
1+/*
2+ * Copyright © 2014 Canonical Ltd.
3+ *
4+ * This program is free software: you can redistribute it and/or modify it
5+ * under the terms of the GNU Lesser General Public License version 3,
6+ * as published by the Free Software Foundation.
7+ *
8+ * This program is distributed in the hope that it will be useful,
9+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
10+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11+ * GNU Lesser General Public License for more details.
12+ *
13+ * You should have received a copy of the GNU Lesser General Public License
14+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
15+ *
16+ * Authors:
17+ * Antti Kaijanmäki <antti.kaijanmaki@canonical.com>
18+ */
19+
20+#ifndef QML_CONNECTIVITY_PLUGIN_H
21+#define QML_CONNECTIVITY_PLUGIN_H
22+
23+#include <QQmlExtensionPlugin>
24+
25+class QmlConnectivityNetworkingPlugin : public QQmlExtensionPlugin {
26+ Q_OBJECT
27+ Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface")
28+ Q_INTERFACES(QQmlExtensionInterface)
29+
30+public:
31+ void registerTypes(const char *uri);
32+ void initializeEngine(QQmlEngine *engine, const char *uri);
33+};
34+
35+#endif // QML_CONNECTIVITY_PLUGIN_H
tests/mocks/Ubuntu/Connectivity/qmldirnew file+2
@@ -0,0 +1,2 @@
1+module Ubuntu.Connectivity
2+plugin connectivity-qml
tests/mocks/Ubuntu/Telephony/MockCallEntry.cpp+26−1
@@ -22,8 +22,8 @@ MockCallEntry::MockCallEntry(QObject *parent)
22 : QObject(parent)
22 : QObject(parent)
23 , m_conference(false)
23 , m_conference(false)
24 , m_elapsed(0)
24 , m_elapsed(0)
25+ , m_timer(0)
25{
26{
26− startTimer(1000);
27}
27}
28
28
29QString MockCallEntry::phoneNumber() const
29QString MockCallEntry::phoneNumber() const
@@ -52,11 +52,36 @@ void MockCallEntry::setIsConference(bool isConference)
52 }
52 }
53}
53}
54
54
55+void MockCallEntry::setElapsedTime(int elapsedTime)
56+{
57+ if (m_elapsed != elapsedTime) {
58+ m_elapsed = elapsedTime;
59+ Q_EMIT elapsedTimeChanged();
60+ }
61+}
62+
55int MockCallEntry::elapsedTime() const
63int MockCallEntry::elapsedTime() const
56{
64{
57 return m_elapsed;
65 return m_elapsed;
58}
66}
59
67
68+bool MockCallEntry::elapsedTimerRunning() const
69+{
70+ return m_timer != 0;
71+}
72+
73+void MockCallEntry::setSlapsedTimerRunning(bool elapsedTimerRunning)
74+{
75+ if (elapsedTimerRunning && m_timer == 0) {
76+ m_timer = startTimer(1000);
77+ Q_EMIT elapsedTimerRunningChanged();
78+ } else if (!elapsedTimerRunning && m_timer != 0) {
79+ killTimer(m_timer);
80+ m_timer = 0;
81+ Q_EMIT elapsedTimerRunningChanged();
82+ }
83+}
84+
60void MockCallEntry::timerEvent(QTimerEvent * event)
85void MockCallEntry::timerEvent(QTimerEvent * event)
61{
86{
62 Q_UNUSED(event);
87 Q_UNUSED(event);
tests/mocks/Ubuntu/Telephony/MockCallEntry.h+9−1
@@ -28,7 +28,10 @@ class MockCallEntry : public QObject
28
28
29 Q_PROPERTY(QString phoneNumber READ phoneNumber WRITE setPhoneNumber NOTIFY phoneNumberChanged)
29 Q_PROPERTY(QString phoneNumber READ phoneNumber WRITE setPhoneNumber NOTIFY phoneNumberChanged)
30 Q_PROPERTY(bool isConference READ isConference WRITE setIsConference NOTIFY isConferenceChanged)
30 Q_PROPERTY(bool isConference READ isConference WRITE setIsConference NOTIFY isConferenceChanged)
31− Q_PROPERTY(int elapsedTime READ elapsedTime NOTIFY elapsedTimeChanged)
31+ Q_PROPERTY(int elapsedTime READ elapsedTime WRITE setElapsedTime NOTIFY elapsedTimeChanged)
32+
33+ // For mock use only
34+ Q_PROPERTY(bool elapsedTimerRunning READ elapsedTimerRunning WRITE setSlapsedTimerRunning NOTIFY elapsedTimerRunningChanged)
32
35
33public:
36public:
34 MockCallEntry(QObject *parent = 0);
37 MockCallEntry(QObject *parent = 0);
@@ -36,14 +39,18 @@ public:
36 QString phoneNumber() const;
39 QString phoneNumber() const;
37 bool isConference() const;
40 bool isConference() const;
38 int elapsedTime() const;
41 int elapsedTime() const;
42+ bool elapsedTimerRunning() const;
39
43
40 void setPhoneNumber(const QString& phoneNumber);
44 void setPhoneNumber(const QString& phoneNumber);
41 void setIsConference(bool isConference);
45 void setIsConference(bool isConference);
46+ void setElapsedTime(int elapsedTime);
47+ void setSlapsedTimerRunning(bool elapsedTimerRunning);
42
48
43Q_SIGNALS:
49Q_SIGNALS:
44 void phoneNumberChanged();
50 void phoneNumberChanged();
45 void isConferenceChanged();
51 void isConferenceChanged();
46 void elapsedTimeChanged();
52 void elapsedTimeChanged();
53+ void elapsedTimerRunningChanged();
47
54
48protected:
55protected:
49 void timerEvent(QTimerEvent * event);
56 void timerEvent(QTimerEvent * event);
@@ -52,6 +59,7 @@ private:
52 QString m_phoneNumber;
59 QString m_phoneNumber;
53 bool m_conference;
60 bool m_conference;
54 int m_elapsed;
61 int m_elapsed;
62+ int m_timer;
55};
63};
56
64
57#endif // MOCKCALLENTRY_H
65#endif // MOCKCALLENTRY_H
tests/mocks/Unity/Application/ApplicationManager.cpp+26
@@ -43,6 +43,7 @@ ApplicationManager *ApplicationManager::singleton()
43ApplicationManager::ApplicationManager(QObject *parent)
43ApplicationManager::ApplicationManager(QObject *parent)
44 : ApplicationManagerInterface(parent)
44 : ApplicationManagerInterface(parent)
45 , m_suspended(false)
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;
99 Q_INVOKABLE bool stopApplication(const QString &appId) override;
100
100
101 QString focusedApplicationId() const override;
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
2
3set(FakeUnityApplicationQml_SOURCES
3set(FakeUnityApplicationQml_SOURCES
4 plugin.cpp
4 plugin.cpp
tests/mocks/Unity/fake_scope.cpp+1−1
@@ -266,7 +266,7 @@ QVariantMap Scope::customizations() const
266
266
267void Scope::refresh()
267void Scope::refresh()
268{
268{
269− qDebug() << "Scope::refresh is currently not implmented in the fake scopes plugin";
269+ Q_EMIT refreshed();
270}
270}
271
271
272unity::shell::scopes::NavigationInterface* Scope::getNavigation(const QString& id)
272unity::shell::scopes::NavigationInterface* Scope::getNavigation(const QString& id)
tests/mocks/Unity/fake_scope.h+3
@@ -79,6 +79,9 @@ public:
79
79
80 Q_INVOKABLE void refresh() override;
80 Q_INVOKABLE void refresh() override;
81
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)
32 qt5_use_modules(${TESTNAME}TestExec Test Core Qml)
33 target_link_libraries(${TESTNAME}TestExec ${Qt5Gui_LIBRARIES} ${Qt5Quick_LIBRARIES})
33 target_link_libraries(${TESTNAME}TestExec ${Qt5Gui_LIBRARIES} ${Qt5Quick_LIBRARIES})
34
34
35− add_binary_qml_test(${TESTNAME} "" "Dash-qml")
35+ add_binary_qml_test(${TESTNAME} "" "Dash-qml" "")
36endmacro()
36endmacro()
37
37
38add_lvwph_test(listviewwithpageheader ListViewWithPageHeader)
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)
48 qt5_use_modules(${TESTNAME}TestExec Test Core Qml)
49 target_link_libraries(${TESTNAME}TestExec ${Qt5Gui_LIBRARIES} ${Qt5Quick_LIBRARIES})
49 target_link_libraries(${TESTNAME}TestExec ${Qt5Gui_LIBRARIES} ${Qt5Quick_LIBRARIES})
50
50
51− add_binary_qml_test(${TESTNAME} "" "Dash-qml")
51+ add_binary_qml_test(${TESTNAME} "" "Dash-qml" "")
52
52
53 add_executable(${TESTNAME}tryExec
53 add_executable(${TESTNAME}tryExec
54 ${FILENAME}try.cpp
54 ${FILENAME}try.cpp
@@ -71,7 +71,7 @@ add_dashview_try_test(organicgrid OrganicGrid)
71add_executable(CardCreatorTestExec cardcreatortest.cpp)
71add_executable(CardCreatorTestExec cardcreatortest.cpp)
72qt5_use_modules(CardCreatorTestExec Test Core Qml)
72qt5_use_modules(CardCreatorTestExec Test Core Qml)
73target_link_libraries(CardCreatorTestExec ${Qt5Gui_LIBRARIES} ${Qt5Quick_LIBRARIES})
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
75
76# plain qml test
76# plain qml test
77set(qmltest_DEFAULT_TARGETS qmluitests)
77set(qmltest_DEFAULT_TARGETS qmluitests)
tests/plugins/Dash/cardcreator/1.res+7−6
@@ -6,7 +6,7 @@ AbstractButton {
6 property var artShapeBorderSource: undefined;
6 property var artShapeBorderSource: undefined;
7 property real fontScale: 1.0;
7 property real fontScale: 1.0;
8 property var scopeStyle: null;
8 property var scopeStyle: null;
9− property int headerAlignment: Text.AlignLeft;
9+ property int titleAlignment: Text.AlignLeft;
10 property int fixedHeaderHeight: -1;
10 property int fixedHeaderHeight: -1;
11 property size fixedArtShapeSize: Qt.size(-1, -1);
11 property size fixedArtShapeSize: Qt.size(-1, -1);
12 readonly property string title: cardData && cardData["title"] || "";
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 });
44 height = Qt.binding(function() { return image.status !== Image.Ready ? 0 : image.height });
45 }
45 }
46 }
46 }
47− image: Image {
47+ image: CroppedImageMinimumSourceSize {
48 objectName: "artImage";
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;
6 property var artShapeBorderSource: undefined;
7 property real fontScale: 1.0;
7 property real fontScale: 1.0;
8 property var scopeStyle: null;
8 property var scopeStyle: null;
9− property int headerAlignment: Text.AlignLeft;
9+ property int titleAlignment: Text.AlignLeft;
10 property int fixedHeaderHeight: -1;
10 property int fixedHeaderHeight: -1;
11 property size fixedArtShapeSize: Qt.size(-1, -1);
11 property size fixedArtShapeSize: Qt.size(-1, -1);
12 readonly property string title: cardData && cardData["title"] || "";
12 readonly property string title: cardData && cardData["title"] || "";
@@ -62,19 +62,17 @@ Row {
62 anchors.margins: margins;
62 anchors.margins: margins;
63 anchors.rightMargin: 0;
63 anchors.rightMargin: 0;
64 data: [
64 data: [
65−Image {
65+CroppedImageMinimumSourceSize {
66 id: mascotImage;
66 id: mascotImage;
67 objectName: "mascotImage";
67 objectName: "mascotImage";
68 anchors { verticalCenter: parent.verticalCenter; }
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);
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;
6 property var artShapeBorderSource: undefined;
7 property real fontScale: 1.0;
7 property real fontScale: 1.0;
8 property var scopeStyle: null;
8 property var scopeStyle: null;
9− property int headerAlignment: Text.AlignLeft;
9+ property int titleAlignment: Text.AlignLeft;
10 property int fixedHeaderHeight: -1;
10 property int fixedHeaderHeight: -1;
11 property size fixedArtShapeSize: Qt.size(-1, -1);
11 property size fixedArtShapeSize: Qt.size(-1, -1);
12 readonly property string title: cardData && cardData["title"] || "";
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 });
44 height = Qt.binding(function() { return image.status !== Image.Ready ? 0 : image.height });
45 }
45 }
46 }
46 }
47− image: Image {
47+ image: CroppedImageMinimumSourceSize {
48 objectName: "artImage";
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 }
96 }
97UbuntuShape {
97UbuntuShape {
98 id: touchdown;
98 id: touchdown;
tests/plugins/Dash/cardcreator/4.res+8−11
@@ -6,7 +6,7 @@ AbstractButton {
6 property var artShapeBorderSource: undefined;
6 property var artShapeBorderSource: undefined;
7 property real fontScale: 1.0;
7 property real fontScale: 1.0;
8 property var scopeStyle: null;
8 property var scopeStyle: null;
9− property int headerAlignment: Text.AlignLeft;
9+ property int titleAlignment: Text.AlignLeft;
10 property int fixedHeaderHeight: -1;
10 property int fixedHeaderHeight: -1;
11 property size fixedArtShapeSize: Qt.size(-1, -1);
11 property size fixedArtShapeSize: Qt.size(-1, -1);
12 readonly property string title: cardData && cardData["title"] || "";
12 readonly property string title: cardData && cardData["title"] || "";
@@ -41,16 +41,14 @@ Loader {
41 anchors { verticalCenter: parent.verticalCenter; }
41 anchors { verticalCenter: parent.verticalCenter; }
42 }
42 }
43
43
44−,Image {
44+,CroppedImageMinimumSourceSize {
45 id: mascotImage;
45 id: mascotImage;
46 objectName: "mascotImage";
46 objectName: "mascotImage";
47 anchors { verticalCenter: parent.verticalCenter; }
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);
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;
6 property var artShapeBorderSource: undefined;
7 property real fontScale: 1.0;
7 property real fontScale: 1.0;
8 property var scopeStyle: null;
8 property var scopeStyle: null;
9− property int headerAlignment: Text.AlignLeft;
9+ property int titleAlignment: Text.AlignLeft;
10 property int fixedHeaderHeight: -1;
10 property int fixedHeaderHeight: -1;
11 property size fixedArtShapeSize: Qt.size(-1, -1);
11 property size fixedArtShapeSize: Qt.size(-1, -1);
12 readonly property string title: cardData && cardData["title"] || "";
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 });
44 height = Qt.binding(function() { return image.status !== Image.Ready ? 0 : image.height });
45 }
45 }
46 }
46 }
47− image: Image {
47+ image: CroppedImageMinimumSourceSize {
48 objectName: "artImage";
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 }
141 }
142UbuntuShape {
142UbuntuShape {
143 id: touchdown;
143 id: touchdown;
tests/plugins/Dash/cardcreator/6.res+5−7
@@ -6,7 +6,7 @@ AbstractButton {
6 property var artShapeBorderSource: undefined;
6 property var artShapeBorderSource: undefined;
7 property real fontScale: 1.0;
7 property real fontScale: 1.0;
8 property var scopeStyle: null;
8 property var scopeStyle: null;
9− property int headerAlignment: Text.AlignLeft;
9+ property int titleAlignment: Text.AlignLeft;
10 property int fixedHeaderHeight: -1;
10 property int fixedHeaderHeight: -1;
11 property size fixedArtShapeSize: Qt.size(-1, -1);
11 property size fixedArtShapeSize: Qt.size(-1, -1);
12 readonly property string title: cardData && cardData["title"] || "";
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");
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 ;
74 visible: showHeader ;
75 text: root.title;
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 }
78 }
79,Label {
79,Label {
80 id: subtitleLabel;
80 id: subtitleLabel;
@@ -86,15 +86,14 @@ Item {
86 }
86 }
87 anchors.topMargin: units.dp(2);
87 anchors.topMargin: units.dp(2);
88 elide: Text.ElideRight;
88 elide: Text.ElideRight;
89− fontSize: "small";
89+ fontSize: "x-small";
90 font.pixelSize: Math.round(FontUtils.sizeToPixels(fontSize) * fontScale);
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");
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;
92 visible: titleLabel.visible && titleLabel.text;
93 text: cardData && cardData["subtitle"] || "";
93 text: cardData && cardData["subtitle"] || "";
94 font.weight: Font.Light;
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;
6 property var artShapeBorderSource: undefined;
7 property real fontScale: 1.0;
7 property real fontScale: 1.0;
8 property var scopeStyle: null;
8 property var scopeStyle: null;
9− property int headerAlignment: Text.AlignLeft;
9+ property int titleAlignment: Text.AlignLeft;
10 property int fixedHeaderHeight: -1;
10 property int fixedHeaderHeight: -1;
11 property size fixedArtShapeSize: Qt.size(-1, -1);
11 property size fixedArtShapeSize: Qt.size(-1, -1);
12 readonly property string title: cardData && cardData["title"] || "";
12 readonly property string title: cardData && cardData["title"] || "";
@@ -62,19 +62,17 @@ Row {
62 anchors.margins: margins;
62 anchors.margins: margins;
63 anchors.rightMargin: 0;
63 anchors.rightMargin: 0;
64 data: [
64 data: [
65−Image {
65+CroppedImageMinimumSourceSize {
66 id: mascotImage;
66 id: mascotImage;
67 objectName: "mascotImage";
67 objectName: "mascotImage";
68 anchors { verticalCenter: parent.verticalCenter; }
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);
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>
28#include <private/qquickitem_p.h>
29#pragma GCC diagnostic pop
29#pragma GCC diagnostic pop
30
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
60 anchors.top: parent.top
61 anchors.bottom: parent.bottom
61 anchors.bottom: parent.bottom
62 model: model
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
60 anchors.top: parent.top
61 anchors.bottom: parent.bottom
61 anchors.bottom: parent.bottom
62 model: model
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
28 anchors.top: parent.top
29 anchors.bottom: parent.bottom
29 anchors.bottom: parent.bottom
30 model: model
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)
19 qt5_use_modules(${CLASSNAME}TestExec Test Core Qml Gui Quick)
20 target_link_libraries(${CLASSNAME}TestExec UbuntuGestureQml)
20 target_link_libraries(${CLASSNAME}TestExec UbuntuGestureQml)
21
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)
23 add_manual_qml_test(. ${CLASSNAME} IMPORT_PATHS ${CMAKE_BINARY_DIR}/plugins)
24endmacro(add_gesture_ui_test)
24endmacro(add_gesture_ui_test)
25
25
tests/plugins/Unity/Launcher/CMakeLists.txt+1−1
@@ -1,6 +1,6 @@
1pkg_check_modules(GSETTINGS_QT REQUIRED gsettings-qt)
1pkg_check_modules(GSETTINGS_QT REQUIRED gsettings-qt)
2pkg_check_modules(LAUNCHER_API REQUIRED unity-shell-launcher=4)
2pkg_check_modules(LAUNCHER_API REQUIRED unity-shell-launcher=4)
3−pkg_check_modules(APPLICATION_API REQUIRED unity-shell-application=4)
3+pkg_check_modules(APPLICATION_API REQUIRED unity-shell-application=5)
4
4
5include_directories(
5include_directories(
6 ${CMAKE_CURRENT_BINARY_DIR}
6 ${CMAKE_CURRENT_BINARY_DIR}
tests/plugins/Unity/Launcher/launchermodeltest.cpp+2
@@ -114,6 +114,8 @@ public:
114 bool requestFocusApplication(const QString &appId) { Q_UNUSED(appId); return true; }
114 bool requestFocusApplication(const QString &appId) { Q_UNUSED(appId); return true; }
115 bool suspended() const { return false; }
115 bool suspended() const { return false; }
116 void setSuspended(bool) {}
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;
tests/qmltests/CMakeLists.txt+1−1
@@ -26,6 +26,7 @@ add_qml_test(Components Carousel)
26add_qml_test(Components DraggingArea)
26add_qml_test(Components DraggingArea)
27add_qml_test(Components EdgeDemoOverlay)
27add_qml_test(Components EdgeDemoOverlay)
28add_qml_test(Components LazyImage)
28add_qml_test(Components LazyImage)
29+add_qml_test(Components Lockscreen)
29add_qml_test(Components Rating)
30add_qml_test(Components Rating)
30add_qml_test(Components ResponsiveFlowView)
31add_qml_test(Components ResponsiveFlowView)
31add_qml_test(Components ResponsiveGridView)
32add_qml_test(Components ResponsiveGridView)
@@ -60,7 +61,6 @@ add_qml_test(Dash/ScopeSettings ScopeSettingList)
60add_qml_test(Dash/ScopeSettings ScopeSettingNumber)
61add_qml_test(Dash/ScopeSettings ScopeSettingNumber)
61add_qml_test(Dash/ScopeSettings ScopeSettingString)
62add_qml_test(Dash/ScopeSettings ScopeSettingString)
62add_qml_test(Dash/ScopeSettings ScopeSettingsWidgetFactory)
63add_qml_test(Dash/ScopeSettings ScopeSettingsWidgetFactory)
63−add_qml_test(Greeter Lockscreen ENVIRONMENT "LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/tests/mocks/libusermetrics:${CMAKE_BINARY_DIR}/tests/mocks/LightDM/full")
64add_qml_test(Greeter MultiGreeter ENVIRONMENT "LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/tests/mocks/libusermetrics:${CMAKE_BINARY_DIR}/tests/mocks/LightDM/full")
64add_qml_test(Greeter MultiGreeter ENVIRONMENT "LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/tests/mocks/libusermetrics:${CMAKE_BINARY_DIR}/tests/mocks/LightDM/full")
65add_qml_test(Greeter SingleGreeter ENVIRONMENT "LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/tests/mocks/libusermetrics:${CMAKE_BINARY_DIR}/tests/mocks/LightDM/single")
65add_qml_test(Greeter SingleGreeter ENVIRONMENT "LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/tests/mocks/libusermetrics:${CMAKE_BINARY_DIR}/tests/mocks/LightDM/single")
66add_qml_test(Greeter Infographics ENVIRONMENT "LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/tests/mocks/libusermetrics:${CMAKE_BINARY_DIR}/tests/mocks/LightDM/full")
66add_qml_test(Greeter Infographics ENVIRONMENT "LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/tests/mocks/libusermetrics:${CMAKE_BINARY_DIR}/tests/mocks/LightDM/full")
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)
10qt5_use_modules(DragHandleTestExec Test Core Qml Gui Quick)
11target_link_libraries(DragHandleTestExec UbuntuGestureQml)
11target_link_libraries(DragHandleTestExec UbuntuGestureQml)
12
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)
14add_manual_qml_test(. DragHandle IMPORT_PATHS ${CMAKE_BINARY_DIR}/plugins)
15
15
16add_definitions(-DUBUNTU_GESTURES_PLUGIN_DIR="${CMAKE_BINARY_DIR}/plugins")
16add_definitions(-DUBUNTU_GESTURES_PLUGIN_DIR="${CMAKE_BINARY_DIR}/plugins")
tests/qmltests/Greeter/tst_Lockscreen.qml → tests/qmltests/Components/tst_Lockscreen.qmlrenamed+31−51
@@ -18,15 +18,13 @@ import QtQuick 2.0
18import QtTest 1.0
18import QtTest 1.0
19import ".."
19import ".."
20import "../../../qml/Components"
20import "../../../qml/Components"
21−import AccountsService 0.1
22−import LightDM 0.1 as LightDM
23import Ubuntu.Components 0.1
21import Ubuntu.Components 0.1
24import Unity.Test 0.1 as UT
22import Unity.Test 0.1 as UT
25
23
26Rectangle {
24Rectangle {
27 id: root
25 id: root
28 width: units.gu(80)
26 width: units.gu(80)
29− height: units.gu(70)
27+ height: units.gu(76)
30 color: "orange"
28 color: "orange"
31
29
32 Lockscreen {
30 Lockscreen {
@@ -39,7 +37,7 @@ Rectangle {
39 alphaNumeric: pinPadCheckBox.checked
37 alphaNumeric: pinPadCheckBox.checked
40 minPinLength: minPinLengthTextField.text
38 minPinLength: minPinLengthTextField.text
41 maxPinLength: maxPinLengthTextField.text
39 maxPinLength: maxPinLengthTextField.text
42− username: "Lola"
40+ delayMinutes: delayMinutesTextField.text
43 background: "../../../qml/graphics/phone_background.jpg"
41 background: "../../../qml/graphics/phone_background.jpg"
44 }
42 }
45
43
@@ -53,24 +51,6 @@ Rectangle {
53 }
51 }
54 }
52 }
55
53
56− function setUser(username) {
57− AccountsService.user = username
58− LightDM.Greeter.authenticate(username)
59− }
60−
61− Connections {
62− target: LightDM.Greeter
63−
64− onShowPrompt: {
65− if (AccountsService.passwordDisplayHint === AccountsService.Numeric) {
66− pinPadCheckBox.checked = false
67− } else {
68− pinPadCheckBox.checked = true
69− }
70− lockscreen.infoText = text;
71− }
72− }
73−
74 Rectangle {
54 Rectangle {
75 anchors.fill: parent
55 anchors.fill: parent
76 anchors.leftMargin: lockscreen.width
56 anchors.leftMargin: lockscreen.width
@@ -129,6 +109,16 @@ Rectangle {
129 text: "Retries left"
109 text: "Retries left"
130 }
110 }
131 }
111 }
112+ Row {
113+ TextField {
114+ id: delayMinutesTextField
115+ width: units.gu(7)
116+ text: "0"
117+ }
118+ Label {
119+ text: "Delay Minutes"
120+ }
121+ }
132 Label {
122 Label {
133 id: pinLabel
123 id: pinLabel
134 anchors.verticalCenter: parent.verticalCenter
124 anchors.verticalCenter: parent.verticalCenter
@@ -141,17 +131,6 @@ Rectangle {
141 id: enteredLabel
131 id: enteredLabel
142 }
132 }
143 }
133 }
144− Button {
145− text: "start auth (1234)"
146− width: parent.width
147− onClicked: setUser("has-pin")
148− }
149− Button {
150− text: "start auth (password)"
151− width: parent.width
152− onClicked: setUser("has-password")
153− }
154−
155 TextField {
134 TextField {
156 id: infoTextTextField
135 id: infoTextTextField
157 width: parent.width
136 width: parent.width
@@ -193,6 +172,7 @@ Rectangle {
193
172
194 function cleanup() {
173 function cleanup() {
195 lockscreen.clear(false);
174 lockscreen.clear(false);
175+ delayMinutesTextField.text = "0"
196 }
176 }
197
177
198 function waitForLockscreenReady() {
178 function waitForLockscreenReady() {
@@ -237,8 +217,8 @@ Rectangle {
237
217
238 function test_labels_data() {
218 function test_labels_data() {
239 return [
219 return [
240− {tag: "numeric", alphanumeric: false, infoText: "Please enter your PIN", username: "foobar" },
220+ {tag: "numeric", alphanumeric: false, infoText: "Please enter your PIN" },
241− {tag: "alphanumeric", alphanumeric: true, infoText: "Please enter your password", username: "Lola" }
221+ {tag: "alphanumeric", alphanumeric: true, infoText: "Please enter your password" }
242 ]
222 ]
243 }
223 }
244
224
@@ -246,22 +226,16 @@ Rectangle {
246 pinPadCheckBox.checked = data.alphanumeric
226 pinPadCheckBox.checked = data.alphanumeric
247 lockscreen.infoText = data.infoText
227 lockscreen.infoText = data.infoText
248 waitForLockscreenReady();
228 waitForLockscreenReady();
249− if (data.alphanumeric) {
250− compare(findChild(lockscreen, "pinentryField").placeholderText, data.infoText, "Placeholdertext is not what it should be")
251− compare(findChild(lockscreen, "greeterLabel").text, "Hello " + data.username, "Greeter is not set correctly")
252− } else {
253− compare(findChild(lockscreen, "infoTextLabel").text, data.infoText, "Placeholdertext is not what it should be")
229+ compare(findChild(lockscreen, "infoTextLabel").text, data.infoText, "Placeholdertext is not what it should be")
254− }
255 }
230 }
256
231
257−
258 function test_unlock_data() {
232 function test_unlock_data() {
259 return [
233 return [
260− {tag: "numeric", alphanumeric: false, username: "has-pin", password: "1234", minPinLength: 4, maxPinLength: 4},
234+ {tag: "numeric", alphanumeric: false, password: "1234", minPinLength: 4, maxPinLength: 4},
261− {tag: "alphanumeric", alphanumeric: true, username: "has-password", password: "password", minPinLength: -1, maxPinLength: -1},
235+ {tag: "alphanumeric", alphanumeric: true, password: "password", minPinLength: -1, maxPinLength: -1},
262− {tag: "numeric (wrong)", alphanumeric: false, username: "has-pin", password: "4321", minPinLength: 4, maxPinLength: 4},
236+ {tag: "numeric (wrong)", alphanumeric: false, password: "4321", minPinLength: 4, maxPinLength: 4},
263− {tag: "alphanumeric (wrong)", alphanumeric: true, username: "has-password", password: "drowssap", minPinLength: -1, maxPinLength: -1},
237+ {tag: "alphanumeric (wrong)", alphanumeric: true, password: "drowssap", minPinLength: -1, maxPinLength: -1},
264− {tag: "flexible length", alphanumeric: false, username: "has-pin", password: "1234", minPinLength: -1, maxPinLength: -1},
238+ {tag: "flexible length", alphanumeric: false, password: "1234", minPinLength: -1, maxPinLength: -1},
265 ]
239 ]
266 }
240 }
267
241
@@ -269,13 +243,13 @@ Rectangle {
269 enteredLabel.text = ""
243 enteredLabel.text = ""
270 minPinLengthTextField.text = data.minPinLength
244 minPinLengthTextField.text = data.minPinLength
271 maxPinLengthTextField.text = data.maxPinLength
245 maxPinLengthTextField.text = data.maxPinLength
272− setUser(data.username)
246+ pinPadCheckBox.checked = data.alphanumeric
247+ infoTextTextField.text = "Enter " + (data.alphanumeric ? "passphrase" : "passcode")
273 waitForLockscreenReady();
248 waitForLockscreenReady();
274
249
275 var inputField = findChild(lockscreen, "pinentryField")
250 var inputField = findChild(lockscreen, "pinentryField")
276 if (data.alphanumeric) {
251 if (data.alphanumeric) {
277− mouseClick(inputField, units.gu(1), units.gu(1))
278− tryCompare(inputField, "focus", true);
252+ tryCompare(inputField, "activeFocus", true);
279 typeString(data.password)
253 typeString(data.password)
280 keyClick(Qt.Key_Enter)
254 keyClick(Qt.Key_Enter)
281 } else {
255 } else {
@@ -305,7 +279,6 @@ Rectangle {
305
279
306 var inputField = findChild(lockscreen, "pinentryField")
280 var inputField = findChild(lockscreen, "pinentryField")
307 if (data.alphanumeric) {
281 if (data.alphanumeric) {
308− mouseClick(inputField, units.gu(1), units.gu(1))
309 tryCompare(inputField, "activeFocus", true);
282 tryCompare(inputField, "activeFocus", true);
310 typeString("1")
283 typeString("1")
311 } else {
284 } else {
@@ -470,6 +443,13 @@ Rectangle {
470 var label = findChild(lockscreen, "infoTextLabel")
443 var label = findChild(lockscreen, "infoTextLabel")
471 compare(label.text, data.text);
444 compare(label.text, data.text);
472 }
445 }
446+
447+ function test_delayMinutes() {
448+ delayMinutesTextField.text = "4"
449+ waitForLockscreenReady()
450+ var label = findChild(lockscreen, "deviceLockedLabel")
451+ compare(label.text, "Device Locked")
452+ }
473 }
453 }
474
454
475 SignalSpy {
455 SignalSpy {
tests/qmltests/Dash/CardHelpers.js+1−12
@@ -16,7 +16,7 @@
16
16
17.pragma library
17.pragma library
18
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
20
21var defaultLayout = ' \
21var defaultLayout = ' \
22{ \
22{ \
@@ -37,17 +37,6 @@ var defaultLayout = ' \
37 "overlayColor": null, \
37 "overlayColor": null, \
38 "mascot": null, \
38 "mascot": null, \
39 "emblem": 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: {
27 property var origHeaderjson: {
28 "title": "THE TITLE",
28 "title": "THE TITLE",
29 "subtitle": "Something catchy",
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
21
22Rectangle {
22Rectangle {
23 id: root
23 id: root
24− width: units.gu(60)
24+ width: units.gu(80)
25 height: units.gu(80)
25 height: units.gu(80)
26 color: "lightgrey"
26 color: "lightgrey"
27
27
@@ -44,13 +44,63 @@ Rectangle {
44 }
44 }
45
45
46 UT.UnityTestCase {
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
17import QtQuick 2.0
18import QtTest 1.0
18import QtTest 1.0
19import Ubuntu.Components 0.1
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" } }
85 "layout": { "template": { "card-layout": "vertical" }, "components": { "title": "title", "subtitle": "subtitle" } }
86 },
86 },
87 {
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 },
90 },
91 ]
91 ]
92
92
@@ -100,6 +100,7 @@ Rectangle {
100 }
100 }
101
101
102 Column {
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 }
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();
55 scopes.load();
56 tryCompare(dashContentList, "currentIndex", 0);
56 tryCompare(dashContentList, "currentIndex", 0);
57 tryCompare(dashContentList, "count", 6);
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() {
70 function loadScopes() {
71 scopeLoadedSpy.clear();
71 scopeLoadedSpy.clear();
72 scopesModel.load();
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 = "";
82 spy.signalName = "";
83 }
83 }
84
84
85− function scrollToCategory(category) {
85+ function scrollToCategory(categoryName) {
86 var categoryListView = findChild(genericScopeView, "categoryListView");
86 var categoryListView = findChild(genericScopeView, "categoryListView");
87 tryCompareFunction(function() {
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/Panel/Indicators/tst_DefaultIndicatorPage.qml+3−23
@@ -29,14 +29,14 @@ Item {
29 id: page
29 id: page
30
30
31 anchors.fill: parent
31 anchors.fill: parent
32− contentActive: true
33
32
34 menuModel: UnityMenuModel {}
33 menuModel: UnityMenuModel {}
35 busName: "test"
34 busName: "test"
36 actionsObjectPath: "test"
35 actionsObjectPath: "test"
37 menuObjectPath: "test"
36 menuObjectPath: "test"
38
37
38+ identifier: "test-indicator"
39− rootMenuType: ""
39+ rootMenuType: "com.canonical.indicator.root"
40 }
40 }
41
41
42 property var fullMenuData: [{
42 property var fullMenuData: [{
@@ -117,13 +117,8 @@ Item {
117 name: "DefaultIndicatorPage"
117 name: "DefaultIndicatorPage"
118
118
119 function init() {
119 function init() {
120− page.stop();
121 var mainMenu = findChild(page, "mainMenu");
120 var mainMenu = findChild(page, "mainMenu");
122− verify(mainMenu.model === undefined);
121+ page.menuModel.modelData = [];
123−
124− page.rootMenuType = "com.canonical.indicator.root";
125− page.start();
126−
127 verify(mainMenu.model !== null);
122 verify(mainMenu.model !== null);
128 }
123 }
129
124
@@ -157,20 +152,5 @@ Item {
157 var mainMenu = findChild(page, "mainMenu");
152 var mainMenu = findChild(page, "mainMenu");
158 tryCompare(mainMenu, "count", data.expectedCount);
153 tryCompare(mainMenu, "count", data.expectedCount);
159 }
154 }
160−
161− function test_empty_data() {
162− return [
163− { tag: "EmptyNoData", modelData: [], visible: true},
164− { tag: "EmptySubmenu", modelData: emptySubMenuData, visible: true},
165− { tag: "NotEmpty", modelData: fullMenuData, visible: false},
166− ]
167− }
168−
169− function test_empty(data) {
170− page.menuModel.modelData = data.modelData;
171−
172− var emptyLabel = findChild(page, "emptyLabel");
173− tryCompare(emptyLabel, "visible", data.visible);
174− }
175 }
155 }
176}
156}
tests/qmltests/Panel/tst_ActiveCallHint.qml+19−6
@@ -39,6 +39,7 @@ Item {
39 Telephony.CallEntry {
39 Telephony.CallEntry {
40 id: call3
40 id: call3
41 phoneNumber: "+447812221113"
41 phoneNumber: "+447812221113"
42+ elapsedTimerRunning: true
42 }
43 }
43
44
44 ActiveCallHint {
45 ActiveCallHint {
@@ -69,6 +70,7 @@ Item {
69 callManager.foregroundCall = null;
70 callManager.foregroundCall = null;
70 callManager.backgroundCall = null;
71 callManager.backgroundCall = null;
71 callHint.labelSwitchInterval = 300;
72 callHint.labelSwitchInterval = 300;
73+ call1.elapsedTime = 0;
72
74
73 ApplicationManager.stopApplication("dialer-app");
75 ApplicationManager.stopApplication("dialer-app");
74 }
76 }
@@ -139,16 +141,27 @@ Item {
139 compare(contactLabel.text, "Freddy", "Contact label does not match call");
141 compare(contactLabel.text, "Freddy", "Contact label does not match call");
140 }
142 }
141
143
142− function test_timeLapse() {
144+ function test_timeElapsed_data() {
145+ return [
146+ { tag: "0:00->0:01", elpasedTime: 0, initial: "0:00", expected: "0:01" },
147+ { tag: "0:29->0:30", elpasedTime: 29, initial: "0:29", expected: "0:30" },
148+ { tag: "0:59->1:00", elpasedTime: 59, initial: "0:59", expected: "1:00" },
149+
150+ { tag: "01:59->02:00", elpasedTime: 119, initial: "1:59", expected: "2:00" },
151+ { tag: "59:59->60:00", elpasedTime: 3599, initial: "59:59", expected: "60:00" }
152+ ];
153+ }
154+
155+ function test_timeElapsed(data) {
143− callManager.backgroundCall = call3;
156+ callManager.backgroundCall = call1;
157+ call1.elapsedTime = data.elpasedTime;
144
158
145 var timeLabel = findChild(callHint, "timeLabel");
159 var timeLabel = findChild(callHint, "timeLabel");
146 verify(timeLabel !== null);
160 verify(timeLabel !== null);
147
161
148− var currentLabel = timeLabel.text;
162+ compare(timeLabel.text, data.initial);
149− tryCompareFunction(function() { return timeLabel.text !== currentLabel }, true);
163+ call1.elapsedTime = call1.elapsedTime + 1;
150− currentLabel = timeLabel.text;
164+ compare(timeLabel.text, data.expected);
151− tryCompareFunction(function() { return timeLabel.text !== currentLabel }, true);
152 }
165 }
153
166
154 function test_displayedLabelChangesOverTime() {
167 function test_displayedLabelChangesOverTime() {
tests/qmltests/tst_Shell.qml+4
@@ -198,6 +198,10 @@ Row {
198
198
199 var launcher = findChild(shell, "launcherPanel");
199 var launcher = findChild(shell, "launcherPanel");
200 tryCompare(launcher, "x", data.launcherHides ? -launcher.width : 0)
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/qmltests/tst_ShellWithPin.qml+3−1
@@ -230,8 +230,10 @@ Item {
230 enterPin("1111")
230 enterPin("1111")
231 tryCompare(placeHolder, "text", "Sorry, incorrect passcode")
231 tryCompare(placeHolder, "text", "Sorry, incorrect passcode")
232
232
233+ var lockscreen = findChild(shell, "lockscreen")
234+ tryCompare(lockscreen, "delayMinutes", 0)
233 enterPin("1111")
235 enterPin("1111")
234− tryCompare(placeHolder, "text", "Too many incorrect attempts")
236+ tryCompare(lockscreen, "delayMinutes", shell.failedLoginsDelayMinutes)
235 }
237 }
236
238
237 function test_factoryReset() {
239 function test_factoryReset() {
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
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
179 // expected result or the timemout is reached (in which case a test failure
180 // is generated)
180 // is generated)
181− function tryCompareFunction(func, expectedResult) {
181+ function tryCompareFunction(func, expectedResult, timeout) {
182 var timeSpent = 0
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.
4# Our goal here is to get an Ubuntu Touch device into a testable unlocked state.
5# This will include a reboot.
5# This will include a reboot.
6
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
8
9while getopts s:w: opt; do
9while getopts s:w: opt; do
10 case $opt in
10 case $opt in
@@ -19,16 +19,17 @@ done
19
19
20eval "$WAIT_COMMAND"
20eval "$WAIT_COMMAND"
21
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