on xenial help sign in
merge trunk
f75e1d0Josh Arenson
CMakeLists.txt+2−1
@@ -57,7 +57,8 @@ find_package(Qt5DBus 5.4 REQUIRED)
57find_package(Qt5Concurrent 5.4 REQUIRED)
57find_package(Qt5Concurrent 5.4 REQUIRED)
58find_package(Qt5Sql 5.4 REQUIRED)
58find_package(Qt5Sql 5.4 REQUIRED)
59
59
60−pkg_check_modules(APPLICATION_API REQUIRED unity-shell-application=13)
60+pkg_check_modules(APPLICATION_API REQUIRED unity-shell-application=14)
61+pkg_check_modules(GEONAMES REQUIRED geonames>=0.2)
61pkg_check_modules(GIO REQUIRED gio-2.0>=2.32)
62pkg_check_modules(GIO REQUIRED gio-2.0>=2.32)
62pkg_check_modules(GLIB REQUIRED glib-2.0>=2.32)
63pkg_check_modules(GLIB REQUIRED glib-2.0>=2.32)
63pkg_check_modules(QMENUMODEL REQUIRED qmenumodel)
64pkg_check_modules(QMENUMODEL REQUIRED qmenumodel)
CODING+2
@@ -54,6 +54,8 @@ $ ./run.sh -p OR -k
54Notes
54Notes
55-----
55-----
56- to navigate, utilize the mouse left button as you would your finger
56- to navigate, utilize the mouse left button as you would your finger
57+- a three point drag (for side stage operations) can be performed by using
58+ the Shift+Control+Alt (all together) keyboard modifiers while using the mouse.
57- to get the translations work, currently you have to do make install to
59- to get the translations work, currently you have to do make install to
58 put the *.mo files into correct structure. We'll look for a better solution
60 put the *.mo files into correct structure. We'll look for a better solution
59 later.
61 later.
debian/changelog+49
@@ -1,3 +1,52 @@
1+unity8 (8.12+16.04.20160323.2-0ubuntu1) xenial; urgency=medium
2+
3+ [ Michael Terry ]
4+ *
5+ * Fix setting OSK layout in OOBE wizard
6+ * Stop the left edge tutorial from being shown when the bottom edge
7+ tutorial wants to be shown after receiving a call.
8+
9+ [ Albert Astals Cid ]
10+ * Filter implementation with Option Selector filter as the only filter
11+ * Get the engine from the parent context
12+ * Implement the API changes due to filters
13+ * Match design visuals for the new dash navigation/page header popup
14+ * New Dash Navigation UX
15+ * Range Input filter
16+ * Value slider filter
17+ * Workaround SDK ListItem bug
18+
19+ [ Albert Astals Cid, Lukáš Tinkl ]
20+ * Fix various tests
21+
22+ [ CI Train Bot ]
23+ * Resync trunk.
24+ * Update translation template
25+
26+ [ Lukáš Tinkl, Michael Terry ]
27+ * New first-run wizard for the phone (part of the OOBE effort) (LP:
28+ #1536688, #1536617, #1543790, #1555222)
29+
30+ [ Lukáš Tinkl, Michał Sawicz ]
31+ * Keymap switching support (LP: #1524400, #1412492, #1491340)
32+
33+ [ Michael Terry, Michael Zanetti ]
34+ * Redesign the first-boot edge tutorial
35+
36+ [ Michael Zanetti ]
37+ * disabling some tests that are flaky in adt but can't be made fail on
38+ our machines
39+
40+ [ Michael Zanetti, Michał Sawicz ]
41+ * Change the behavior alond with the switch in indicator-display (LP:
42+ #1538591)
43+
44+ [ Michael Zanetti, Michał Sawicz, Nick Dedekind ]
45+ * Add support for low shell chrome. (LP: #1535397)
46+ * Sidestage load/unload redesign (LP: #1544479)
47+
48+ -- Michael Zanetti <michael.zanetti@canonical.com> Wed, 23 Mar 2016 09:53:17 +0000
49+
1unity8 (8.11+16.04.20160318.1-0ubuntu1) xenial; urgency=medium
50unity8 (8.11+16.04.20160318.1-0ubuntu1) xenial; urgency=medium
2
51
3 [ CI Train Bot ]
52 [ CI Train Bot ]
debian/control+9−7
@@ -8,13 +8,14 @@ Build-Depends: cmake,
8 doxyqml,
8 doxyqml,
9# To allow cross-compiling to work, we also must append :native
9# To allow cross-compiling to work, we also must append :native
10# to g++ so we don't try to run armhf g++
10# to g++ so we don't try to run armhf g++
11−# on an x86 CPU for eaxmple, when cross-compiling.
11+# on an x86 CPU for example, when cross-compiling.
12 g++:native,
12 g++:native,
13 libandroid-properties-dev,
13 libandroid-properties-dev,
14 graphviz,
14 graphviz,
15 gsettings-ubuntu-schemas (>= 0.0.2+14.10.20140815),
15 gsettings-ubuntu-schemas (>= 0.0.2+14.10.20140815),
16 libconnectivity-qt1-dev (>= 0.7.1),
16 libconnectivity-qt1-dev (>= 0.7.1),
17 libevdev-dev,
17 libevdev-dev,
18+ libgeonames-dev (>= 0.2),
18 libgl1-mesa-dev[!armhf] | libgl-dev[!armhf],
19 libgl1-mesa-dev[!armhf] | libgl-dev[!armhf],
19 libgl1-mesa-dri,
20 libgl1-mesa-dri,
20 libgles2-mesa-dev[armhf],
21 libgles2-mesa-dev[armhf],
@@ -30,7 +31,7 @@ Build-Depends: cmake,
30 libqt5xmlpatterns5-dev,
31 libqt5xmlpatterns5-dev,
31 libsystemsettings-dev,
32 libsystemsettings-dev,
32 libudev-dev,
33 libudev-dev,
33− libunity-api-dev (>= 7.107),
34+ libunity-api-dev (>= 7.108),
34 libusermetricsoutput1-dev,
35 libusermetricsoutput1-dev,
35# Need those X11 libs touch emulation from mouse events in manual QML tests on a X11 desktop
36# Need those X11 libs touch emulation from mouse events in manual QML tests on a X11 desktop
36 libx11-dev[!armhf],
37 libx11-dev[!armhf],
@@ -113,7 +114,7 @@ Depends: dmz-cursor-theme,
113 qml-module-qt-labs-folderlistmodel,
114 qml-module-qt-labs-folderlistmodel,
114 qml-module-qtquick-xmllistmodel,
115 qml-module-qtquick-xmllistmodel,
115 qml-module-qtsysteminfo,
116 qml-module-qtsysteminfo,
116− qtdeclarative5-qtmir-plugin (>= 0.4.5),
117+ qtdeclarative5-qtmir-plugin (>= 0.4.8),
117 qtdeclarative5-ubuntu-telephony0.1,
118 qtdeclarative5-ubuntu-telephony0.1,
118 qtdeclarative5-ubuntu-web-plugin,
119 qtdeclarative5-ubuntu-web-plugin,
119 ubuntu-system-settings,
120 ubuntu-system-settings,
@@ -123,7 +124,8 @@ Depends: dmz-cursor-theme,
123 unity8-private | unity-launcher-impl,
124 unity8-private | unity-launcher-impl,
124 ${misc:Depends},
125 ${misc:Depends},
125 ${shlibs:Depends},
126 ${shlibs:Depends},
127+Recommends: indicator-session,
126−Recommends: unity-scope-click,
128+ unity-scope-click,
127 unity-scope-mediascanner2,
129 unity-scope-mediascanner2,
128Breaks: indicator-network (<< 0.5.1+14.10.20141014),
130Breaks: indicator-network (<< 0.5.1+14.10.20141014),
129 ubuntu-touch-session (<< 0.107),
131 ubuntu-touch-session (<< 0.107),
@@ -142,10 +144,10 @@ Depends: qml-module-qtquick-layouts,
142 qtdeclarative5-ubuntu-ui-toolkit-plugin (>= 1.3.1845) | qtdeclarative5-ubuntu-ui-toolkit-plugin-gles (>= 1.3.1845),
144 qtdeclarative5-ubuntu-ui-toolkit-plugin (>= 1.3.1845) | qtdeclarative5-ubuntu-ui-toolkit-plugin-gles (>= 1.3.1845),
143 qtdeclarative5-unity-notifications-plugin (>= 0.1.2) | unity-notifications-impl,
145 qtdeclarative5-unity-notifications-plugin (>= 0.1.2) | unity-notifications-impl,
144 ubuntu-thumbnailer-impl-0,
146 ubuntu-thumbnailer-impl-0,
145− unity-application-impl-13,
147+ unity-application-impl-14,
146 unity-notifications-impl-3,
148 unity-notifications-impl-3,
147 unity-plugin-scopes | unity-scopes-impl,
149 unity-plugin-scopes | unity-scopes-impl,
148− unity-scopes-impl-10,
150+ unity-scopes-impl-11,
149 unity8-fake-env | unity-application-impl,
151 unity8-fake-env | unity-application-impl,
150 ${misc:Depends},
152 ${misc:Depends},
151Breaks: unity8 (<< 7.86),
153Breaks: unity8 (<< 7.86),
@@ -188,7 +190,7 @@ Pre-Depends: ${misc:Pre-Depends},
188Depends: ${misc:Depends},
190Depends: ${misc:Depends},
189 ${shlibs:Depends},
191 ${shlibs:Depends},
190Provides: unity-application-impl,
192Provides: unity-application-impl,
191− unity-application-impl-13,
193+ unity-application-impl-14,
192Replaces: unity8-autopilot (<< 8.02+15.04.20150422-0ubuntu1)
194Replaces: unity8-autopilot (<< 8.02+15.04.20150422-0ubuntu1)
193Description: Fake environment for running Unity 8 shell
195Description: Fake environment for running Unity 8 shell
194 Provides fake implementations of some QML modules used by Unity 8 shell
196 Provides fake implementations of some QML modules used by Unity 8 shell
libs/UbuntuGestures/Timer.h+5
@@ -35,6 +35,11 @@ public:
35 virtual int interval() const = 0;
35 virtual int interval() const = 0;
36 virtual void setInterval(int msecs) = 0;
36 virtual void setInterval(int msecs) = 0;
37 virtual void start() { m_isRunning = true; }
37 virtual void start() { m_isRunning = true; }
38+ virtual void start(int msecs)
39+ {
40+ setInterval(msecs);
41+ start();
42+ }
38 virtual void stop() { m_isRunning = false; }
43 virtual void stop() { m_isRunning = false; }
39 bool isRunning() const { return m_isRunning; }
44 bool isRunning() const { return m_isRunning; }
40 virtual bool isSingleShot() const = 0;
45 virtual bool isSingleShot() const = 0;
libs/UbuntuGestures/TouchRegistry.cpp+15−10
@@ -359,10 +359,6 @@ void TouchRegistry::removeCandidateOwnerForTouchByIndex(Pool<TouchRegistry::Touc
359
359
360void TouchRegistry::requestTouchOwnership(int id, QQuickItem *candidate)
360void TouchRegistry::requestTouchOwnership(int id, QQuickItem *candidate)
361{
361{
362− #if TOUCHREGISTRY_DEBUG
363− UG_DEBUG << "requestTouchOwnership id " << id << "candidate" << candidate;
364− #endif
365−
366 Pool<TouchInfo>::Iterator touchInfo = findTouchInfo(id);
362 Pool<TouchInfo>::Iterator touchInfo = findTouchInfo(id);
367 if (!touchInfo) { qFatal("TouchRegistry: Failed to find TouchInfo"); }
363 if (!touchInfo) { qFatal("TouchRegistry: Failed to find TouchInfo"); }
368
364
@@ -379,6 +375,9 @@ void TouchRegistry::requestTouchOwnership(int id, QQuickItem *candidate)
379 break;
375 break;
380 }
376 }
381 }
377 }
378+ #if TOUCHREGISTRY_DEBUG
379+ UG_DEBUG << "requestTouchOwnership id " << id << "candidate" << candidate << "index: " << candidateIndex;
380+ #endif
382
381
383 // add it as a candidate if not present yet
382 // add it as a candidate if not present yet
384 if (candidateIndex < 0) {
383 if (candidateIndex < 0) {
@@ -533,16 +532,22 @@ void TouchRegistry::TouchInfo::notifyCandidatesOfOwnershipResolution()
533 << " gained) to candidate" << candidates[0].item;
532 << " gained) to candidate" << candidates[0].item;
534 #endif
533 #endif
535
534
536− TouchOwnershipEvent gainedOwnershipEvent(id, true /*gained*/);
535+ // need to take a copy of the item list in case
537− QCoreApplication::sendEvent(candidates[0].item, &gainedOwnershipEvent);
536+ // we call back in to remove candidate during the lost ownership event.
537+ QList<QPointer<QQuickItem>> items;
538+ Q_FOREACH(const CandidateInfo& info, candidates) {
539+ items << info.item;
540+ }
538
541
542+ TouchOwnershipEvent gainedOwnershipEvent(id, true /*gained*/);
543+ QCoreApplication::sendEvent(items[0], &gainedOwnershipEvent);
539
544
540 TouchOwnershipEvent lostOwnershipEvent(id, false /*gained*/);
545 TouchOwnershipEvent lostOwnershipEvent(id, false /*gained*/);
541− for (int i = 1; i < candidates.count(); ++i) {
546+ for (int i = 1; i < items.count(); ++i) {
542 #if TOUCHREGISTRY_DEBUG
547 #if TOUCHREGISTRY_DEBUG
543− UG_DEBUG << "sending TouchWonershipEvent(id =" << id << " lost) to candidate"
548+ UG_DEBUG << "sending TouchOwnershipEvent(id =" << id << " lost) to candidate"
544− << candidates[i].item;
549+ << items[i];
545 #endif
550 #endif
546− QCoreApplication::sendEvent(candidates[i].item, &lostOwnershipEvent);
551+ QCoreApplication::sendEvent(items[i], &lostOwnershipEvent);
547 }
552 }
548}
553}
plugins/AccountsService/AccountsService.cpp+69−3
@@ -1,5 +1,5 @@
1/*
1/*
2− * Copyright (C) 2013 Canonical, Ltd.
2+ * Copyright (C) 2013, 2015 Canonical, Ltd.
3 *
3 *
4 * This program is free software; you can redistribute it and/or modify
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
5 * it under the terms of the GNU General Public License as published by
@@ -12,8 +12,6 @@
12 *
12 *
13 * You should have received a copy of the GNU General Public License
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/>.
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15− *
16− * Author: Michael Terry <michael.terry@canonical.com>
17 */
15 */
18
16
19#include "AccountsService.h"
17#include "AccountsService.h"
@@ -34,9 +32,12 @@
34
32
35#define PROP_BACKGROUND_FILE QStringLiteral("BackgroundFile")
33#define PROP_BACKGROUND_FILE QStringLiteral("BackgroundFile")
36#define PROP_DEMO_EDGES QStringLiteral("demo-edges")
34#define PROP_DEMO_EDGES QStringLiteral("demo-edges")
35+#define PROP_DEMO_EDGES_COMPLETED QStringLiteral("DemoEdgesCompleted")
36+#define PROP_EMAIL QStringLiteral("Email")
37#define PROP_ENABLE_INDICATORS_WHILE_LOCKED QStringLiteral("EnableIndicatorsWhileLocked")
37#define PROP_ENABLE_INDICATORS_WHILE_LOCKED QStringLiteral("EnableIndicatorsWhileLocked")
38#define PROP_ENABLE_LAUNCHER_WHILE_LOCKED QStringLiteral("EnableLauncherWhileLocked")
38#define PROP_ENABLE_LAUNCHER_WHILE_LOCKED QStringLiteral("EnableLauncherWhileLocked")
39#define PROP_FAILED_LOGINS QStringLiteral("FailedLogins")
39#define PROP_FAILED_LOGINS QStringLiteral("FailedLogins")
40+#define PROP_INPUT_SOURCES QStringLiteral("InputSources")
40#define PROP_LICENSE_ACCEPTED QStringLiteral("LicenseAccepted")
41#define PROP_LICENSE_ACCEPTED QStringLiteral("LicenseAccepted")
41#define PROP_LICENSE_BASE_PATH QStringLiteral("LicenseBasePath")
42#define PROP_LICENSE_BASE_PATH QStringLiteral("LicenseBasePath")
42#define PROP_MOUSE_CURSOR_SPEED QStringLiteral("MouseCursorSpeed")
43#define PROP_MOUSE_CURSOR_SPEED QStringLiteral("MouseCursorSpeed")
@@ -44,6 +45,7 @@
44#define PROP_MOUSE_PRIMARY_BUTTON QStringLiteral("MousePrimaryButton")
45#define PROP_MOUSE_PRIMARY_BUTTON QStringLiteral("MousePrimaryButton")
45#define PROP_MOUSE_SCROLL_SPEED QStringLiteral("MouseScrollSpeed")
46#define PROP_MOUSE_SCROLL_SPEED QStringLiteral("MouseScrollSpeed")
46#define PROP_PASSWORD_DISPLAY_HINT QStringLiteral("PasswordDisplayHint")
47#define PROP_PASSWORD_DISPLAY_HINT QStringLiteral("PasswordDisplayHint")
48+#define PROP_REAL_NAME QStringLiteral("RealName")
47#define PROP_STATS_WELCOME_SCREEN QStringLiteral("StatsWelcomeScreen")
49#define PROP_STATS_WELCOME_SCREEN QStringLiteral("StatsWelcomeScreen")
48#define PROP_TOUCHPAD_CURSOR_SPEED QStringLiteral("TouchpadCursorSpeed")
50#define PROP_TOUCHPAD_CURSOR_SPEED QStringLiteral("TouchpadCursorSpeed")
49#define PROP_TOUCHPAD_DISABLE_WHILE_TYPING QStringLiteral("TouchpadDisableWhileTyping")
51#define PROP_TOUCHPAD_DISABLE_WHILE_TYPING QStringLiteral("TouchpadDisableWhileTyping")
@@ -54,6 +56,10 @@
54#define PROP_TOUCHPAD_TAP_TO_CLICK QStringLiteral("TouchpadTapToClick")
56#define PROP_TOUCHPAD_TAP_TO_CLICK QStringLiteral("TouchpadTapToClick")
55#define PROP_TOUCHPAD_TWO_FINGER_SCROLL QStringLiteral("TouchpadTwoFingerScroll")
57#define PROP_TOUCHPAD_TWO_FINGER_SCROLL QStringLiteral("TouchpadTwoFingerScroll")
56
58
59+using StringMap = QMap<QString,QString>;
60+using StringMapList = QList<StringMap>;
61+Q_DECLARE_METATYPE(StringMapList)
62+
57
63
58QVariant primaryButtonConverter(const QVariant &value)
64QVariant primaryButtonConverter(const QVariant &value)
59{
65{
@@ -80,6 +86,9 @@ AccountsService::AccountsService(QObject* parent, const QString &user)
80 connect(m_service, &AccountsServiceDBusAdaptor::maybeChanged, this, &AccountsService::onMaybeChanged);
86 connect(m_service, &AccountsServiceDBusAdaptor::maybeChanged, this, &AccountsService::onMaybeChanged);
81
87
82 registerProperty(IFACE_ACCOUNTS_USER, PROP_BACKGROUND_FILE, QStringLiteral("backgroundFileChanged"));
88 registerProperty(IFACE_ACCOUNTS_USER, PROP_BACKGROUND_FILE, QStringLiteral("backgroundFileChanged"));
89+ registerProperty(IFACE_ACCOUNTS_USER, PROP_EMAIL, QStringLiteral("emailChanged"));
90+ registerProperty(IFACE_ACCOUNTS_USER, PROP_REAL_NAME, QStringLiteral("realNameChanged"));
91+ registerProperty(IFACE_ACCOUNTS_USER, PROP_INPUT_SOURCES, QStringLiteral("keymapsChanged"));
83 registerProperty(IFACE_LOCATION_HERE, PROP_LICENSE_ACCEPTED, QStringLiteral("hereEnabledChanged"));
92 registerProperty(IFACE_LOCATION_HERE, PROP_LICENSE_ACCEPTED, QStringLiteral("hereEnabledChanged"));
84 registerProperty(IFACE_LOCATION_HERE, PROP_LICENSE_BASE_PATH, QStringLiteral("hereLicensePathChanged"));
93 registerProperty(IFACE_LOCATION_HERE, PROP_LICENSE_BASE_PATH, QStringLiteral("hereLicensePathChanged"));
85 registerProperty(IFACE_UBUNTU_SECURITY, PROP_ENABLE_LAUNCHER_WHILE_LOCKED, QStringLiteral("enableLauncherWhileLockedChanged"));
94 registerProperty(IFACE_UBUNTU_SECURITY, PROP_ENABLE_LAUNCHER_WHILE_LOCKED, QStringLiteral("enableLauncherWhileLockedChanged"));
@@ -87,6 +96,7 @@ AccountsService::AccountsService(QObject* parent, const QString &user)
87 registerProperty(IFACE_UBUNTU_SECURITY, PROP_PASSWORD_DISPLAY_HINT, QStringLiteral("passwordDisplayHintChanged"));
96 registerProperty(IFACE_UBUNTU_SECURITY, PROP_PASSWORD_DISPLAY_HINT, QStringLiteral("passwordDisplayHintChanged"));
88 registerProperty(IFACE_UBUNTU_SECURITY_OLD, PROP_STATS_WELCOME_SCREEN, QStringLiteral("statsWelcomeScreenChanged"));
97 registerProperty(IFACE_UBUNTU_SECURITY_OLD, PROP_STATS_WELCOME_SCREEN, QStringLiteral("statsWelcomeScreenChanged"));
89 registerProperty(IFACE_UNITY, PROP_DEMO_EDGES, QStringLiteral("demoEdgesChanged"));
98 registerProperty(IFACE_UNITY, PROP_DEMO_EDGES, QStringLiteral("demoEdgesChanged"));
99+ registerProperty(IFACE_UNITY, PROP_DEMO_EDGES_COMPLETED, QStringLiteral("demoEdgesCompletedChanged"));
90 registerProperty(IFACE_UNITY_PRIVATE, PROP_FAILED_LOGINS, QStringLiteral("failedLoginsChanged"));
100 registerProperty(IFACE_UNITY_PRIVATE, PROP_FAILED_LOGINS, QStringLiteral("failedLoginsChanged"));
91
101
92 registerProxy(IFACE_UBUNTU_INPUT, PROP_MOUSE_CURSOR_SPEED,
102 registerProxy(IFACE_UBUNTU_INPUT, PROP_MOUSE_CURSOR_SPEED,
@@ -150,6 +160,20 @@ void AccountsService::setDemoEdges(bool demoEdges)
150 setProperty(IFACE_UNITY, PROP_DEMO_EDGES, demoEdges);
160 setProperty(IFACE_UNITY, PROP_DEMO_EDGES, demoEdges);
151}
161}
152
162
163+QStringList AccountsService::demoEdgesCompleted() const
164+{
165+ auto value = getProperty(IFACE_UNITY, PROP_DEMO_EDGES_COMPLETED);
166+ return value.toStringList();
167+}
168+
169+void AccountsService::markDemoEdgeCompleted(const QString &edge)
170+{
171+ auto currentList = demoEdgesCompleted();
172+ if (!currentList.contains(edge)) {
173+ setProperty(IFACE_UNITY, PROP_DEMO_EDGES_COMPLETED, currentList << edge);
174+ }
175+}
176+
153bool AccountsService::enableLauncherWhileLocked() const
177bool AccountsService::enableLauncherWhileLocked() const
154{
178{
155 auto value = getProperty(IFACE_UBUNTU_SECURITY, PROP_ENABLE_LAUNCHER_WHILE_LOCKED);
179 auto value = getProperty(IFACE_UBUNTU_SECURITY, PROP_ENABLE_LAUNCHER_WHILE_LOCKED);
@@ -206,6 +230,48 @@ bool AccountsService::hereLicensePathValid() const
206 return !value.toString().isNull();
230 return !value.toString().isNull();
207}
231}
208
232
233+QString AccountsService::realName() const
234+{
235+ auto value = getProperty(IFACE_ACCOUNTS_USER, PROP_REAL_NAME);
236+ return value.toString();
237+}
238+
239+void AccountsService::setRealName(const QString &realName)
240+{
241+ setProperty(IFACE_ACCOUNTS_USER, PROP_REAL_NAME, realName);
242+}
243+
244+QString AccountsService::email() const
245+{
246+ auto value = getProperty(IFACE_ACCOUNTS_USER, PROP_EMAIL);
247+ return value.toString();
248+}
249+
250+void AccountsService::setEmail(const QString &email)
251+{
252+ setProperty(IFACE_ACCOUNTS_USER, PROP_EMAIL, email);
253+}
254+
255+QStringList AccountsService::keymaps() const
256+{
257+ auto value = getProperty(IFACE_ACCOUNTS_USER, PROP_INPUT_SOURCES);
258+ QDBusArgument arg = value.value<QDBusArgument>();
259+ StringMapList maps = qdbus_cast<StringMapList>(arg);
260+ QStringList simplifiedMaps;
261+
262+ Q_FOREACH(const StringMap &map, maps) {
263+ Q_FOREACH(const QString &entry, map) {
264+ simplifiedMaps.append(entry);
265+ }
266+ }
267+
268+ if (!simplifiedMaps.isEmpty()) {
269+ return simplifiedMaps;
270+ }
271+
272+ return {QStringLiteral("us")};
273+}
274+
209uint AccountsService::failedLogins() const
275uint AccountsService::failedLogins() const
210{
276{
211 return getProperty(IFACE_UNITY_PRIVATE, PROP_FAILED_LOGINS).toUInt();
277 return getProperty(IFACE_UNITY_PRIVATE, PROP_FAILED_LOGINS).toUInt();
plugins/AccountsService/AccountsService.h+21−3
@@ -1,5 +1,5 @@
1/*
1/*
2− * Copyright (C) 2013 Canonical, Ltd.
2+ * Copyright (C) 2013, 2015 Canonical, Ltd.
3 *
3 *
4 * This program is free software; you can redistribute it and/or modify
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
5 * it under the terms of the GNU General Public License as published by
@@ -12,8 +12,6 @@
12 *
12 *
13 * You should have received a copy of the GNU General Public License
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/>.
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15− *
16− * Authors: Michael Terry <michael.terry@canonical.com>
17 */
15 */
18
16
19#ifndef UNITY_ACCOUNTSSERVICE_H
17#ifndef UNITY_ACCOUNTSSERVICE_H
@@ -22,6 +20,7 @@
22#include <QHash>
20#include <QHash>
23#include <QObject>
21#include <QObject>
24#include <QString>
22#include <QString>
23+#include <QStringList>
25#include <QVariant>
24#include <QVariant>
26
25
27class AccountsServiceDBusAdaptor;
26class AccountsServiceDBusAdaptor;
@@ -39,6 +38,9 @@ class AccountsService: public QObject
39 READ demoEdges
38 READ demoEdges
40 WRITE setDemoEdges
39 WRITE setDemoEdges
41 NOTIFY demoEdgesChanged)
40 NOTIFY demoEdgesChanged)
41+ Q_PROPERTY (QStringList demoEdgesCompleted
42+ READ demoEdgesCompleted
43+ NOTIFY demoEdgesCompletedChanged)
42 Q_PROPERTY (bool enableLauncherWhileLocked
44 Q_PROPERTY (bool enableLauncherWhileLocked
43 READ enableLauncherWhileLocked
45 READ enableLauncherWhileLocked
44 NOTIFY enableLauncherWhileLockedChanged)
46 NOTIFY enableLauncherWhileLockedChanged)
@@ -68,6 +70,11 @@ class AccountsService: public QObject
68 Q_PROPERTY(bool hereLicensePathValid // qml sees a null string as "", so we use proxy setting for that
70 Q_PROPERTY(bool hereLicensePathValid // qml sees a null string as "", so we use proxy setting for that
69 READ hereLicensePathValid
71 READ hereLicensePathValid
70 NOTIFY hereLicensePathChanged)
72 NOTIFY hereLicensePathChanged)
73+ Q_PROPERTY(QString realName READ realName WRITE setRealName NOTIFY realNameChanged)
74+ Q_PROPERTY(QString email READ email WRITE setEmail NOTIFY emailChanged)
75+ Q_PROPERTY(QStringList keymaps
76+ READ keymaps
77+ NOTIFY keymapsChanged)
71
78
72public:
79public:
73 enum PasswordDisplayHint {
80 enum PasswordDisplayHint {
@@ -82,6 +89,8 @@ public:
82 void setUser(const QString &user);
89 void setUser(const QString &user);
83 bool demoEdges() const;
90 bool demoEdges() const;
84 void setDemoEdges(bool demoEdges);
91 void setDemoEdges(bool demoEdges);
92+ QStringList demoEdgesCompleted() const;
93+ Q_INVOKABLE void markDemoEdgeCompleted(const QString &edge);
85 bool enableLauncherWhileLocked() const;
94 bool enableLauncherWhileLocked() const;
86 bool enableIndicatorsWhileLocked() const;
95 bool enableIndicatorsWhileLocked() const;
87 QString backgroundFile() const;
96 QString backgroundFile() const;
@@ -93,10 +102,16 @@ public:
93 void setHereEnabled(bool enabled);
102 void setHereEnabled(bool enabled);
94 QString hereLicensePath() const;
103 QString hereLicensePath() const;
95 bool hereLicensePathValid() const;
104 bool hereLicensePathValid() const;
105+ QString realName() const;
106+ void setRealName(const QString &realName);
107+ QString email() const;
108+ void setEmail(const QString &email);
109+ QStringList keymaps() const;
96
110
97Q_SIGNALS:
111Q_SIGNALS:
98 void userChanged();
112 void userChanged();
99 void demoEdgesChanged();
113 void demoEdgesChanged();
114+ void demoEdgesCompletedChanged();
100 void enableLauncherWhileLockedChanged();
115 void enableLauncherWhileLockedChanged();
101 void enableIndicatorsWhileLockedChanged();
116 void enableIndicatorsWhileLockedChanged();
102 void backgroundFileChanged();
117 void backgroundFileChanged();
@@ -105,6 +120,9 @@ Q_SIGNALS:
105 void failedLoginsChanged();
120 void failedLoginsChanged();
106 void hereEnabledChanged();
121 void hereEnabledChanged();
107 void hereLicensePathChanged();
122 void hereLicensePathChanged();
123+ void realNameChanged();
124+ void emailChanged();
125+ void keymapsChanged();
108
126
109private Q_SLOTS:
127private Q_SLOTS:
110 void onPropertiesChanged(const QString &user, const QString &interface, const QStringList &changed);
128 void onPropertiesChanged(const QString &user, const QString &interface, const QStringList &changed);
plugins/AccountsService/AccountsService.qmltypes+5
@@ -23,6 +23,7 @@ Module {
23 }
23 }
24 Property { name: "user"; type: "string" }
24 Property { name: "user"; type: "string" }
25 Property { name: "demoEdges"; type: "bool" }
25 Property { name: "demoEdges"; type: "bool" }
26+ Property { name: "demoEdgesCompleted"; type: "QStringList"; isReadonly: true }
26 Property { name: "enableLauncherWhileLocked"; type: "bool"; isReadonly: true }
27 Property { name: "enableLauncherWhileLocked"; type: "bool"; isReadonly: true }
27 Property { name: "enableIndicatorsWhileLocked"; type: "bool"; isReadonly: true }
28 Property { name: "enableIndicatorsWhileLocked"; type: "bool"; isReadonly: true }
28 Property { name: "backgroundFile"; type: "string"; isReadonly: true }
29 Property { name: "backgroundFile"; type: "string"; isReadonly: true }
@@ -32,5 +33,9 @@ Module {
32 Property { name: "hereEnabled"; type: "bool" }
33 Property { name: "hereEnabled"; type: "bool" }
33 Property { name: "hereLicensePath"; type: "string"; isReadonly: true }
34 Property { name: "hereLicensePath"; type: "string"; isReadonly: true }
34 Property { name: "hereLicensePathValid"; type: "bool"; isReadonly: true }
35 Property { name: "hereLicensePathValid"; type: "bool"; isReadonly: true }
36+ Method {
37+ name: "markDemoEdgeCompleted"
38+ Parameter { name: "edge"; type: "string" }
39+ }
35 }
40 }
36}
41}
plugins/AccountsService/com.canonical.unity.AccountsService.xml+5
@@ -14,6 +14,11 @@
14 <annotation name="org.freedesktop.Accounts.DefaultValue" value="true"/>
14 <annotation name="org.freedesktop.Accounts.DefaultValue" value="true"/>
15 </property>
15 </property>
16
16
17+ <!-- List of tutorial pages that have been completed by the user -->
18+ <property name="DemoEdgesCompleted" type="as" access="readwrite">
19+ <annotation name="org.freedesktop.Accounts.DefaultValue" value="[]"/>
20+ </property>
21+
17 <property name="LauncherItems" type="aa{sv}" access="readwrite">
22 <property name="LauncherItems" type="aa{sv}" access="readwrite">
18 <annotation name="org.freedesktop.Accounts.DefaultValue" value="[{'defaults': <true>}]"/>
23 <annotation name="org.freedesktop.Accounts.DefaultValue" value="[{'defaults': <true>}]"/>
19 </property>
24 </property>
plugins/Cursor/Cursor.qmltypesnew file+78
@@ -0,0 +1,78 @@
1+import QtQuick.tooling 1.1
2+
3+// This file describes the plugin-supplied types contained in the library.
4+// It is used for QML tooling purposes only.
5+//
6+// This file was auto-generated by:
7+// 'qmlplugindump -notrelocatable Cursor 1.0 plugins'
8+
9+Module {
10+ Component {
11+ name: "MirMousePointerInterface"
12+ defaultProperty: "data"
13+ prototype: "QQuickItem"
14+ Property { name: "cursorName"; type: "string"; isReadonly: true }
15+ Property { name: "themeName"; type: "string"; isReadonly: true }
16+ Property { name: "hotspotX"; type: "double"; isReadonly: true }
17+ Property { name: "hotspotY"; type: "double"; isReadonly: true }
18+ Signal {
19+ name: "cursorNameChanged"
20+ Parameter { name: "name"; type: "string" }
21+ }
22+ Signal {
23+ name: "themeNameChanged"
24+ Parameter { name: "name"; type: "string" }
25+ }
26+ Signal {
27+ name: "hotspotXChanged"
28+ Parameter { name: "value"; type: "double" }
29+ }
30+ Signal {
31+ name: "hotspotYChanged"
32+ Parameter { name: "value"; type: "double" }
33+ }
34+ Method {
35+ name: "handleMouseEvent"
36+ Parameter { name: "timestamp"; type: "ulong" }
37+ Parameter { name: "movement"; type: "QPointF" }
38+ Parameter { name: "buttons"; type: "Qt::MouseButtons" }
39+ Parameter { name: "modifiers"; type: "Qt::KeyboardModifiers" }
40+ }
41+ Method {
42+ name: "handleWheelEvent"
43+ Parameter { name: "timestamp"; type: "ulong" }
44+ Parameter { name: "angleDelta"; type: "QPoint" }
45+ Parameter { name: "modifiers"; type: "Qt::KeyboardModifiers" }
46+ }
47+ }
48+ Component {
49+ name: "MousePointer"
50+ defaultProperty: "data"
51+ prototype: "MirMousePointerInterface"
52+ exports: ["Cursor/MousePointer 1.0"]
53+ exportMetaObjectRevisions: [0]
54+ Signal {
55+ name: "pushedLeftBoundary"
56+ Parameter { name: "amount"; type: "double" }
57+ Parameter { name: "buttons"; type: "Qt::MouseButtons" }
58+ }
59+ Signal {
60+ name: "pushedRightBoundary"
61+ Parameter { name: "amount"; type: "double" }
62+ Parameter { name: "buttons"; type: "Qt::MouseButtons" }
63+ }
64+ Method {
65+ name: "handleMouseEvent"
66+ Parameter { name: "timestamp"; type: "ulong" }
67+ Parameter { name: "movement"; type: "QPointF" }
68+ Parameter { name: "buttons"; type: "Qt::MouseButtons" }
69+ Parameter { name: "modifiers"; type: "Qt::KeyboardModifiers" }
70+ }
71+ Method {
72+ name: "handleWheelEvent"
73+ Parameter { name: "timestamp"; type: "ulong" }
74+ Parameter { name: "angleDelta"; type: "QPoint" }
75+ Parameter { name: "modifiers"; type: "Qt::KeyboardModifiers" }
76+ }
77+ }
78+}
plugins/Dash/ScopeStyle.qml+1−1
@@ -58,7 +58,7 @@ QtObject {
58 readonly property url headerLogo: "logo" in d.headerStyle ? d.headerStyle["logo"] : ""
58 readonly property url headerLogo: "logo" in d.headerStyle ? d.headerStyle["logo"] : ""
59
59
60 /// Background style for the header
60 /// Background style for the header
61− readonly property url headerBackground: "background" in d.headerStyle ? d.headerStyle["background"] : "color:///#f5f5f5"
61+ readonly property url headerBackground: "background" in d.headerStyle ? d.headerStyle["background"] : "color:///#ffffff"
62
62
63 /// Foreground color for the header
63 /// Foreground color for the header
64 readonly property color headerForeground: "foreground-color" in d.headerStyle ? d.headerStyle["foreground-color"] : foreground
64 readonly property color headerForeground: "foreground-color" in d.headerStyle ? d.headerStyle["foreground-color"] : foreground
plugins/GlobalShortcut/GlobalShortcut.qmltypesnew file+31
@@ -0,0 +1,31 @@
1+import QtQuick.tooling 1.1
2+
3+// This file describes the plugin-supplied types contained in the library.
4+// It is used for QML tooling purposes only.
5+//
6+// This file was auto-generated by:
7+// 'qmlplugindump -notrelocatable GlobalShortcut 1.0 plugins'
8+
9+Module {
10+ Component {
11+ name: "GlobalShortcut"
12+ defaultProperty: "data"
13+ prototype: "QQuickItem"
14+ exports: ["GlobalShortcut/GlobalShortcut 1.0"]
15+ exportMetaObjectRevisions: [0]
16+ Property { name: "shortcut"; type: "QVariant" }
17+ Property { name: "active"; type: "bool" }
18+ Signal {
19+ name: "shortcutChanged"
20+ Parameter { name: "shortcut"; type: "QVariant" }
21+ }
22+ Signal {
23+ name: "triggered"
24+ Parameter { name: "shortcut"; type: "string" }
25+ }
26+ Signal {
27+ name: "activeChanged"
28+ Parameter { name: "active"; type: "bool" }
29+ }
30+ }
31+}
plugins/ScreenGrabber/screengrabber.cpp−2
@@ -46,12 +46,10 @@ ScreenGrabber::ScreenGrabber(QObject *parent)
46
46
47 QDir screenshotsDir;
47 QDir screenshotsDir;
48 if (qEnvironmentVariableIsSet("UNITY_TESTING")) {
48 if (qEnvironmentVariableIsSet("UNITY_TESTING")) {
49− qDebug() << "Using test environment";
50 QTemporaryDir tDir;
49 QTemporaryDir tDir;
51 tDir.setAutoRemove(false);
50 tDir.setAutoRemove(false);
52 screenshotsDir = tDir.path();
51 screenshotsDir = tDir.path();
53 } else {
52 } else {
54− qDebug() << "Using real environment";
55 screenshotsDir = QStandardPaths::writableLocation(QStandardPaths::PicturesLocation);
53 screenshotsDir = QStandardPaths::writableLocation(QStandardPaths::PicturesLocation);
56 }
54 }
57 screenshotsDir.mkpath(QStringLiteral("Screenshots"));
55 screenshotsDir.mkpath(QStringLiteral("Screenshots"));
plugins/Ubuntu/Gestures/CMakeLists.txt+1
@@ -11,6 +11,7 @@ set(UbuntuGesturesQml_SOURCES
11 PressedOutsideNotifier.cpp
11 PressedOutsideNotifier.cpp
12 TouchDispatcher.cpp
12 TouchDispatcher.cpp
13 TouchGate.cpp
13 TouchGate.cpp
14+ TouchGestureArea.cpp
14)
15)
15
16
16add_definitions(-DUBUNTUGESTURESQML_LIBRARY)
17add_definitions(-DUBUNTUGESTURESQML_LIBRARY)
plugins/Ubuntu/Gestures/DirectionalDragArea.cpp+43−5
@@ -194,6 +194,26 @@ void DirectionalDragArea::setImmediateRecognition(bool enabled)
194 }
194 }
195}
195}
196
196
197+bool DirectionalDragArea::monitorOnly() const
198+{
199+ return d->monitorOnly;
200+}
201+
202+void DirectionalDragArea::setMonitorOnly(bool monitorOnly)
203+{
204+ if (d->monitorOnly != monitorOnly) {
205+ d->monitorOnly = monitorOnly;
206+
207+ if (monitorOnly && d->status == DirectionalDragAreaPrivate::Undecided) {
208+ TouchRegistry::instance()->removeCandidateOwnerForTouch(d->touchId, this);
209+ // We still wanna know when it ends for keeping the composition time window up-to-date
210+ TouchRegistry::instance()->addTouchWatcher(d->touchId, this);
211+ }
212+
213+ Q_EMIT monitorOnlyChanged(monitorOnly);
214+ }
215+}
216+
197void DirectionalDragArea::removeTimeConstraints()
217void DirectionalDragArea::removeTimeConstraints()
198{
218{
199 d->setMaxTime(60 * 60 * 1000);
219 d->setMaxTime(60 * 60 * 1000);
@@ -260,7 +280,10 @@ void DirectionalDragAreaPrivate::unownedTouchEvent(UnownedTouchEvent *unownedTou
260 unownedTouchEvent_undecided(unownedTouchEvent);
280 unownedTouchEvent_undecided(unownedTouchEvent);
261 break;
281 break;
262 default: // Recognized:
282 default: // Recognized:
263− // do nothing
283+ if (monitorOnly) {
284+ // Treat unowned event as if we owned it, but we are really just watching it
285+ touchEvent_recognized(event);
286+ }
264 break;
287 break;
265 }
288 }
266
289
@@ -311,7 +334,9 @@ void DirectionalDragAreaPrivate::unownedTouchEvent_undecided(UnownedTouchEvent *
311 }
334 }
312
335
313 if (movedFarEnoughAlongGestureAxis()) {
336 if (movedFarEnoughAlongGestureAxis()) {
337+ if (!monitorOnly) {
314− TouchRegistry::instance()->requestTouchOwnership(touchId, q);
338+ TouchRegistry::instance()->requestTouchOwnership(touchId, q);
339+ }
315 setStatus(Recognized);
340 setStatus(Recognized);
316 setPublicPos(touchPoint->pos());
341 setPublicPos(touchPoint->pos());
317 setPublicScenePos(touchScenePos);
342 setPublicScenePos(touchScenePos);
@@ -411,12 +436,21 @@ void DirectionalDragAreaPrivate::touchEvent_absent(QTouchEvent *event)
411 if (recognitionIsDisabled()) {
436 if (recognitionIsDisabled()) {
412 // Behave like a dumb TouchArea
437 // Behave like a dumb TouchArea
413 ddaDebug("Gesture recognition is disabled. Requesting touch ownership immediately.");
438 ddaDebug("Gesture recognition is disabled. Requesting touch ownership immediately.");
414− TouchRegistry::instance()->requestTouchOwnership(touchId, q);
415 setStatus(Recognized);
439 setStatus(Recognized);
440+ if (monitorOnly) {
441+ watchPressedTouchPoints(touchPoints);
442+ event->ignore();
443+ } else {
444+ TouchRegistry::instance()->requestTouchOwnership(touchId, q);
416− event->accept();
445+ event->accept();
446+ }
417 } else {
447 } else {
418 // just monitor the touch points for now.
448 // just monitor the touch points for now.
449+ if (monitorOnly) {
450+ watchPressedTouchPoints(touchPoints);
451+ } else {
419− TouchRegistry::instance()->addCandidateOwnerForTouch(touchId, q);
452+ TouchRegistry::instance()->addCandidateOwnerForTouch(touchId, q);
453+ }
420
454
421 setStatus(Undecided);
455 setStatus(Undecided);
422 // Let the item below have it. We will monitor it and grab it later if a gesture
456 // Let the item below have it. We will monitor it and grab it later if a gesture
@@ -606,6 +640,9 @@ void DirectionalDragAreaPrivate::setStatus(Status newStatus)
606 Q_EMIT q->pressedChanged(true);
640 Q_EMIT q->pressedChanged(true);
607 break;
641 break;
608 case Recognized:
642 case Recognized:
643+ if (oldStatus == WaitingForTouch) { // for immediate recognition
644+ Q_EMIT q->pressedChanged(true);
645+ }
609 Q_EMIT q->draggingChanged(true);
646 Q_EMIT q->draggingChanged(true);
610 break;
647 break;
611 default:
648 default:
@@ -890,5 +927,6 @@ DirectionalDragAreaPrivate::DirectionalDragAreaPrivate(DirectionalDragArea *q)
890 , recognitionTimer(nullptr)
927 , recognitionTimer(nullptr)
891 , timeSource(new RealTimeSource)
928 , timeSource(new RealTimeSource)
892 , activeTouches(timeSource)
929 , activeTouches(timeSource)
930+ , monitorOnly(false)
893{
931{
894}
932}
plugins/Ubuntu/Gestures/DirectionalDragArea.h+8
@@ -77,6 +77,10 @@ class UBUNTUGESTURESQML_EXPORT DirectionalDragArea : public QQuickItem {
77 WRITE setImmediateRecognition
77 WRITE setImmediateRecognition
78 NOTIFY immediateRecognitionChanged)
78 NOTIFY immediateRecognitionChanged)
79
79
80+ // Whether we are merely monitoring touch events (in which case, we don't
81+ // claim ownership of the touch).
82+ Q_PROPERTY(bool monitorOnly READ monitorOnly WRITE setMonitorOnly NOTIFY monitorOnlyChanged)
83+
80 Q_ENUMS(Direction)
84 Q_ENUMS(Direction)
81public:
85public:
82 DirectionalDragArea(QQuickItem *parent = 0);
86 DirectionalDragArea(QQuickItem *parent = 0);
@@ -100,6 +104,9 @@ public:
100 bool immediateRecognition() const;
104 bool immediateRecognition() const;
101 void setImmediateRecognition(bool enabled);
105 void setImmediateRecognition(bool enabled);
102
106
107+ bool monitorOnly() const;
108+ void setMonitorOnly(bool monitorOnly);
109+
103 bool event(QEvent *e) override;
110 bool event(QEvent *e) override;
104
111
105 /*
112 /*
@@ -123,6 +130,7 @@ Q_SIGNALS:
123 void touchSceneXChanged(qreal value);
130 void touchSceneXChanged(qreal value);
124 void touchSceneYChanged(qreal value);
131 void touchSceneYChanged(qreal value);
125 void immediateRecognitionChanged(bool value);
132 void immediateRecognitionChanged(bool value);
133+ void monitorOnlyChanged(bool value);
126
134
127protected:
135protected:
128 void touchEvent(QTouchEvent *event) override;
136 void touchEvent(QTouchEvent *event) override;
plugins/Ubuntu/Gestures/DirectionalDragArea_p.h+2
@@ -160,6 +160,8 @@ public:
160
160
161 ActiveTouchesInfo activeTouches;
161 ActiveTouchesInfo activeTouches;
162
162
163+ bool monitorOnly;
164+
163Q_SIGNALS:
165Q_SIGNALS:
164 void statusChanged(Status value);
166 void statusChanged(Status value);
165};
167};
plugins/Ubuntu/Gestures/Gestures.qmltypes+86−45
@@ -34,7 +34,8 @@ Module {
34 "Leftwards": 1,
34 "Leftwards": 1,
35 "Downwards": 2,
35 "Downwards": 2,
36 "Upwards": 3,
36 "Upwards": 3,
37− "Horizontal": 4
37+ "Horizontal": 4,
38+ "Vertical": 5
38 }
39 }
39 }
40 }
40 Method {
41 Method {
@@ -59,14 +60,6 @@ Module {
59 prototype: "QQuickItem"
60 prototype: "QQuickItem"
60 exports: ["Ubuntu.Gestures/DirectionalDragArea 0.1"]
61 exports: ["Ubuntu.Gestures/DirectionalDragArea 0.1"]
61 exportMetaObjectRevisions: [0]
62 exportMetaObjectRevisions: [0]
62− Enum {
63− name: "Status"
64− values: {
65− "WaitingForTouch": 0,
66− "Undecided": 1,
67− "Recognized": 2
68− }
69− }
70 Property { name: "direction"; type: "Direction::Type" }
63 Property { name: "direction"; type: "Direction::Type" }
71 Property { name: "distance"; type: "double"; isReadonly: true }
64 Property { name: "distance"; type: "double"; isReadonly: true }
72 Property { name: "sceneDistance"; type: "double"; isReadonly: true }
65 Property { name: "sceneDistance"; type: "double"; isReadonly: true }
@@ -74,24 +67,19 @@ Module {
74 Property { name: "touchY"; type: "double"; isReadonly: true }
67 Property { name: "touchY"; type: "double"; isReadonly: true }
75 Property { name: "touchSceneX"; type: "double"; isReadonly: true }
68 Property { name: "touchSceneX"; type: "double"; isReadonly: true }
76 Property { name: "touchSceneY"; type: "double"; isReadonly: true }
69 Property { name: "touchSceneY"; type: "double"; isReadonly: true }
77− Property { name: "status"; type: "Status"; isReadonly: true }
78 Property { name: "dragging"; type: "bool"; isReadonly: true }
70 Property { name: "dragging"; type: "bool"; isReadonly: true }
79− Property { name: "maxDeviation"; type: "double" }
71+ Property { name: "pressed"; type: "bool"; isReadonly: true }
80− Property { name: "wideningAngle"; type: "double" }
81− Property { name: "distanceThreshold"; type: "double" }
72+ Property { name: "immediateRecognition"; type: "bool" }
82− Property { name: "minSpeed"; type: "double" }
83− Property { name: "maxSilenceTime"; type: "int" }
84− Property { name: "compositionTime"; type: "int" }
85 Signal {
73 Signal {
86 name: "directionChanged"
74 name: "directionChanged"
87 Parameter { name: "direction"; type: "Direction::Type" }
75 Parameter { name: "direction"; type: "Direction::Type" }
88 }
76 }
89 Signal {
77 Signal {
90− name: "statusChanged"
78+ name: "draggingChanged"
91− Parameter { name: "value"; type: "Status" }
79+ Parameter { name: "value"; type: "bool" }
92 }
80 }
93 Signal {
81 Signal {
94− name: "draggingChanged"
82+ name: "pressedChanged"
95 Parameter { name: "value"; type: "bool" }
83 Parameter { name: "value"; type: "bool" }
96 }
84 }
97 Signal {
85 Signal {
@@ -102,30 +90,6 @@ Module {
102 name: "sceneDistanceChanged"
90 name: "sceneDistanceChanged"
103 Parameter { name: "value"; type: "double" }
91 Parameter { name: "value"; type: "double" }
104 }
92 }
105− Signal {
106− name: "maxDeviationChanged"
107− Parameter { name: "value"; type: "double" }
108− }
109− Signal {
110− name: "wideningAngleChanged"
111− Parameter { name: "value"; type: "double" }
112− }
113− Signal {
114− name: "distanceThresholdChanged"
115− Parameter { name: "value"; type: "double" }
116− }
117− Signal {
118− name: "minSpeedChanged"
119− Parameter { name: "value"; type: "double" }
120− }
121− Signal {
122− name: "maxSilenceTimeChanged"
123− Parameter { name: "value"; type: "int" }
124− }
125− Signal {
126− name: "compositionTimeChanged"
127− Parameter { name: "value"; type: "int" }
128− }
129 Signal {
93 Signal {
130 name: "touchXChanged"
94 name: "touchXChanged"
131 Parameter { name: "value"; type: "double" }
95 Parameter { name: "value"; type: "double" }
@@ -142,7 +106,35 @@ Module {
142 name: "touchSceneYChanged"
106 name: "touchSceneYChanged"
143 Parameter { name: "value"; type: "double" }
107 Parameter { name: "value"; type: "double" }
144 }
108 }
145− Signal { name: "tapped" }
109+ Signal {
110+ name: "immediateRecognitionChanged"
111+ Parameter { name: "value"; type: "bool" }
112+ }
113+ Method { name: "removeTimeConstraints" }
114+ }
115+ Component {
116+ name: "FloatingFlickable"
117+ defaultProperty: "data"
118+ prototype: "QQuickItem"
119+ exports: ["Ubuntu.Gestures/FloatingFlickable 0.1"]
120+ exportMetaObjectRevisions: [0]
121+ Property { name: "contentWidth"; type: "double" }
122+ Property { name: "contentHeight"; type: "double" }
123+ Property { name: "contentX"; type: "double" }
124+ Property { name: "contentY"; type: "double" }
125+ Property { name: "direction"; type: "Direction::Type" }
126+ }
127+ Component {
128+ name: "GestureTouchPoint"
129+ prototype: "QObject"
130+ exports: ["Ubuntu.Gestures/GestureTouchPoint 0.1"]
131+ isCreatable: false
132+ exportMetaObjectRevisions: [0]
133+ Property { name: "pointId"; type: "int"; isReadonly: true }
134+ Property { name: "pressed"; type: "bool"; isReadonly: true }
135+ Property { name: "x"; type: "double"; isReadonly: true }
136+ Property { name: "y"; type: "double"; isReadonly: true }
137+ Property { name: "dragging"; type: "bool"; isReadonly: true }
146 }
138 }
147 Component {
139 Component {
148 name: "PressedOutsideNotifier"
140 name: "PressedOutsideNotifier"
@@ -163,6 +155,55 @@ Module {
163 name: "targetItemChanged"
155 name: "targetItemChanged"
164 Parameter { name: "item"; type: "QQuickItem"; isPointer: true }
156 Parameter { name: "item"; type: "QQuickItem"; isPointer: true }
165 }
157 }
158+ }
159+ Component {
160+ name: "TouchGestureArea"
161+ defaultProperty: "data"
162+ prototype: "QQuickItem"
163+ exports: ["Ubuntu.Gestures/TouchGestureArea 0.1"]
164+ exportMetaObjectRevisions: [0]
165+ Enum {
166+ name: "Status"
167+ values: {
168+ "WaitingForTouch": 0,
169+ "Undecided": 1,
170+ "Recognized": 2,
171+ "Rejected": 3
172+ }
173+ }
174+ Property { name: "touchPoints"; type: "GestureTouchPoint"; isList: true; isReadonly: true }
175+ Property { name: "dragging"; type: "bool"; isReadonly: true }
176+ Property { name: "minimumTouchPoints"; type: "int" }
177+ Property { name: "maximumTouchPoints"; type: "int" }
178+ Signal {
179+ name: "statusChanged"
180+ Parameter { name: "status"; type: "Status" }
181+ }
182+ Signal { name: "touchPointsUpdated" }
183+ Signal {
184+ name: "draggingChanged"
185+ Parameter { name: "dragging"; type: "bool" }
186+ }
187+ Signal {
188+ name: "minimumTouchPointsChanged"
189+ Parameter { name: "value"; type: "bool" }
190+ }
191+ Signal {
192+ name: "maximumTouchPointsChanged"
193+ Parameter { name: "value"; type: "bool" }
194+ }
195+ Signal {
166− Signal { name: "pressed" }
196+ name: "pressed"
197+ Parameter { name: "points"; type: "QList<QObject*>" }
198+ }
199+ Signal {
200+ name: "released"
201+ Parameter { name: "points"; type: "QList<QObject*>" }
202+ }
203+ Signal {
204+ name: "updated"
205+ Parameter { name: "points"; type: "QList<QObject*>" }
206+ }
207+ Signal { name: "clicked" }
167 }
208 }
168}
209}
plugins/Ubuntu/Gestures/TouchGestureArea.cppnew file+875
@@ -0,0 +1,875 @@
1+/*
2+ * Copyright (C) 2016 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+#include "TouchGestureArea.h"
18+
19+// local
20+#include "TouchOwnershipEvent.h"
21+#include "TouchRegistry.h"
22+#include "UnownedTouchEvent.h"
23+
24+#include <QGuiApplication>
25+#include <QStyleHints>
26+#include <private/qquickwindow_p.h>
27+
28+#define TOUCHGESTUREAREA_DEBUG 0
29+
30+// TODO - understand more about why we lose touch event releases.
31+// Workaround for now is to monitor all the touch points from first touch till
32+// all have been released; no matter if we've rejected the gesture.
33+
34+namespace {
35+
36+struct InternalStatus {
37+ enum Status {
38+ WaitingForTouch,
39+ WaitingForMoreTouches,
40+ WaitingForOwnership, //Recognizing,
41+ Recognized,
42+ WaitingForRejection,
43+ Rejected
44+ };
45+};
46+
47+TouchGestureArea::Status internalStatusToGestureStatus(int internalStatus) {
48+ switch (internalStatus) {
49+ case InternalStatus::WaitingForTouch: return TouchGestureArea::WaitingForTouch;
50+ case InternalStatus::WaitingForMoreTouches: return TouchGestureArea::Undecided;
51+ case InternalStatus::WaitingForOwnership: return TouchGestureArea::Undecided;
52+ case InternalStatus::Recognized: return TouchGestureArea::Recognized;
53+ case InternalStatus::WaitingForRejection: return TouchGestureArea::Recognized;
54+ case InternalStatus::Rejected: return TouchGestureArea::Rejected;
55+ }
56+ return TouchGestureArea::WaitingForTouch;
57+}
58+
59+}
60+
61+#if TOUCHGESTUREAREA_DEBUG
62+#define tgaDebug(params) qDebug().nospace() << "[TGA(" << qPrintable(objectName()) << ")] " << params
63+#include "DebugHelpers.h"
64+
65+namespace {
66+
67+const char *statusToString(int status)
68+{
69+ if (status == InternalStatus::WaitingForTouch) {
70+ return "WaitingForTouch";
71+ } else if (status == InternalStatus::WaitingForMoreTouches) {
72+ return "WaitingForMoreTouches";
73+ } else if (status == InternalStatus::WaitingForOwnership) {
74+ return "WaitingForOwnership";
75+ } else if (status == InternalStatus::Rejected) {
76+ return "Rejected";
77+ } else if (status == InternalStatus::WaitingForRejection) {
78+ return "WaitingForRejection";
79+ } else {
80+ return "Recognized";
81+ }
82+ return "Unknown";
83+}
84+
85+QString touchState(Qt::TouchPointState state) {
86+ switch (state) {
87+ case Qt::TouchPointPressed: return "pressed";
88+ case Qt::TouchPointMoved: return "moved";
89+ case Qt::TouchPointStationary: return "stationary";
90+ case Qt::TouchPointReleased: return "released";
91+ break;
92+ }
93+ return "unknown";
94+}
95+
96+QString touchesString(const QList<QObject*> touches) {
97+ QString str;
98+ Q_FOREACH(QObject* object, touches) {
99+ GestureTouchPoint* touchPoint = qobject_cast<GestureTouchPoint*>(object);
100+ if (touchPoint) {
101+ str += QStringLiteral("[%1 @ (%2, %3)], ").arg(touchPoint->id())
102+ .arg(touchPoint->x())
103+ .arg(touchPoint->y());
104+ }
105+ }
106+ return str;
107+}
108+
109+QString touchEventString(QTouchEvent* event) {
110+ if (!event) return QString();
111+ QString str;
112+ Q_FOREACH(const auto& touchPoint, event->touchPoints()) {
113+ str += QStringLiteral("[%1:%2 @ (%3, %4)], ").arg(touchPoint.id())
114+ .arg(touchState(touchPoint.state()))
115+ .arg(touchPoint.pos().x())
116+ .arg(touchPoint.pos().y());
117+ }
118+ return str;
119+}
120+
121+
122+} // namespace {
123+#else // TOUCHGESTUREAREA_DEBUG
124+#define tgaDebug(params) ((void)0)
125+#endif // TOUCHGESTUREAREA_DEBUG
126+
127+TouchGestureArea::TouchGestureArea(QQuickItem* parent)
128+ : QQuickItem(parent)
129+ , m_status(WaitingForTouch)
130+ , m_recognitionTimer(nullptr)
131+ , m_dragging(false)
132+ , m_minimumTouchPoints(1)
133+ , m_maximumTouchPoints(INT_MAX)
134+ , m_recognitionPeriod(50)
135+ , m_releaseRejectPeriod(100)
136+{
137+ setRecognitionTimer(new UbuntuGestures::Timer(this));
138+ m_recognitionTimer->setInterval(m_recognitionPeriod);
139+ m_recognitionTimer->setSingleShot(true);
140+}
141+
142+TouchGestureArea::~TouchGestureArea()
143+{
144+ clearTouchLists();
145+ qDeleteAll(m_liveTouchPoints);
146+ m_liveTouchPoints.clear();
147+ qDeleteAll(m_cachedTouchPoints);
148+ m_cachedTouchPoints.clear();
149+}
150+
151+bool TouchGestureArea::event(QEvent *event)
152+{
153+ // Process unowned touch events (handles update/release for incomplete gestures)
154+ if (event->type() == TouchOwnershipEvent::touchOwnershipEventType()) {
155+ touchOwnershipEvent(static_cast<TouchOwnershipEvent *>(event));
156+ return true;
157+ } else if (event->type() == UnownedTouchEvent::unownedTouchEventType()) {
158+ unownedTouchEvent(static_cast<UnownedTouchEvent *>(event)->touchEvent());
159+ return true;
160+ }
161+
162+ return QQuickItem::event(event);
163+}
164+
165+void TouchGestureArea::touchOwnershipEvent(TouchOwnershipEvent *event)
166+{
167+ int touchId = event->touchId();
168+ tgaDebug("touchOwnershipEvent - id:" << touchId << ", gained:" << event->gained());
169+
170+ if (event->gained()) {
171+ grabTouchPoints(QVector<int>() << touchId);
172+ m_candidateTouches.remove(touchId);
173+ TouchRegistry::instance()->addTouchWatcher(touchId, this);
174+ m_watchedTouches.insert(touchId);
175+
176+ if (m_watchedTouches.count() >= m_minimumTouchPoints) {
177+ setInternalStatus(InternalStatus::Recognized);
178+ }
179+ } else {
180+ rejectGesture();
181+ }
182+}
183+
184+void TouchGestureArea::touchEvent(QTouchEvent *event)
185+{
186+ if (!isEnabled() || !isVisible()) {
187+ tgaDebug(QString("NOT ENABLED touchEvent(%1) %2").arg(statusToString(m_status)).arg(touchEventString(event)));
188+ QQuickItem::touchEvent(event);
189+ return;
190+ }
191+
192+ tgaDebug(QString("touchEvent(%1) %2").arg(statusToString(m_status)).arg(touchEventString(event)));
193+
194+ switch (m_status) {
195+ case InternalStatus::WaitingForTouch:
196+ touchEvent_waitingForTouch(event);
197+ break;
198+ case InternalStatus::WaitingForMoreTouches:
199+ touchEvent_waitingForMoreTouches(event);
200+ break;
201+ case InternalStatus::WaitingForOwnership:
202+ touchEvent_waitingForOwnership(event);
203+ break;
204+ case InternalStatus::Recognized:
205+ case InternalStatus::WaitingForRejection:
206+ touchEvent_recognized(event);
207+ break;
208+ case InternalStatus::Rejected:
209+ touchEvent_rejected(event);
210+ break;
211+ default: // Recognized:
212+ break;
213+ }
214+
215+ updateTouchPoints(event);
216+}
217+
218+void TouchGestureArea::touchEvent_waitingForTouch(QTouchEvent *event)
219+{
220+ Q_FOREACH(const QTouchEvent::TouchPoint& touchPoint, event->touchPoints()) {
221+ Qt::TouchPointState touchPointState = touchPoint.state();
222+ int touchId = touchPoint.id();
223+
224+ if (touchPointState == Qt::TouchPointPressed) {
225+ if (!m_candidateTouches.contains(touchId)) {
226+ TouchRegistry::instance()->addCandidateOwnerForTouch(touchId, this);
227+ m_candidateTouches.insert(touchId);
228+ }
229+ }
230+ }
231+ event->ignore();
232+
233+ if (m_candidateTouches.count() > m_maximumTouchPoints) {
234+ rejectGesture();
235+ } else if (m_candidateTouches.count() >= m_minimumTouchPoints) {
236+ setInternalStatus(InternalStatus::WaitingForOwnership);
237+
238+ QSet<int> tmpCandidates(m_candidateTouches);
239+ Q_FOREACH(int candidateTouchId, tmpCandidates) {
240+ TouchRegistry::instance()->requestTouchOwnership(candidateTouchId, this);
241+ }
242+ // We accept the gesture; so don't pass to lower items
243+ event->accept();
244+ } else if (m_candidateTouches.count() > 0) {
245+ setInternalStatus(InternalStatus::WaitingForMoreTouches);
246+ }
247+}
248+
249+void TouchGestureArea::touchEvent_waitingForMoreTouches(QTouchEvent *event)
250+{
251+ Q_FOREACH(const QTouchEvent::TouchPoint& touchPoint, event->touchPoints()) {
252+ Qt::TouchPointState touchPointState = touchPoint.state();
253+ int touchId = touchPoint.id();
254+
255+ if (touchPointState == Qt::TouchPointPressed) {
256+ if (!m_candidateTouches.contains(touchId)) {
257+ TouchRegistry::instance()->addCandidateOwnerForTouch(touchId, this);
258+ m_candidateTouches.insert(touchId);
259+ }
260+ }
261+ }
262+ event->ignore();
263+
264+ if (m_candidateTouches.count() > m_maximumTouchPoints) {
265+ rejectGesture();
266+ } else if (m_candidateTouches.count() >= m_minimumTouchPoints) {
267+ setInternalStatus(InternalStatus::WaitingForOwnership);
268+
269+ QSet<int> tmpCandidates(m_candidateTouches);
270+ Q_FOREACH(int candidateTouchId, tmpCandidates) {
271+ TouchRegistry::instance()->requestTouchOwnership(candidateTouchId, this);
272+ }
273+ // We accept the gesture; so don't pass to lower items
274+ event->accept();
275+ }
276+}
277+
278+void TouchGestureArea::touchEvent_waitingForOwnership(QTouchEvent *event)
279+{
280+ Q_FOREACH(const QTouchEvent::TouchPoint& touchPoint, event->touchPoints()) {
281+ Qt::TouchPointState touchPointState = touchPoint.state();
282+ int touchId = touchPoint.id();
283+
284+ if (touchPointState == Qt::TouchPointPressed) {
285+ if (!m_watchedTouches.contains(touchId)) {
286+ TouchRegistry::instance()->addTouchWatcher(touchId, this);
287+ m_watchedTouches.insert(touchId);
288+ }
289+ }
290+ }
291+}
292+
293+void TouchGestureArea::touchEvent_recognized(QTouchEvent *event)
294+{
295+ Q_FOREACH(const QTouchEvent::TouchPoint& touchPoint, event->touchPoints()) {
296+ Qt::TouchPointState touchPointState = touchPoint.state();
297+ int touchId = touchPoint.id();
298+
299+ if (touchPointState == Qt::TouchPointPressed) {
300+ if (!m_watchedTouches.contains(touchId)) {
301+ TouchRegistry::instance()->addTouchWatcher(touchId, this);
302+ m_watchedTouches.insert(touchId);
303+ }
304+ }
305+ }
306+
307+ if (m_watchedTouches.count() > m_maximumTouchPoints) {
308+ rejectGesture();
309+ } else if (m_watchedTouches.count() >= m_minimumTouchPoints &&
310+ m_status==InternalStatus::WaitingForRejection) {
311+ setInternalStatus(InternalStatus::Recognized);
312+ }
313+}
314+
315+void TouchGestureArea::touchEvent_rejected(QTouchEvent *event)
316+{
317+ Q_FOREACH(const QTouchEvent::TouchPoint& touchPoint, event->touchPoints()) {
318+ Qt::TouchPointState touchPointState = touchPoint.state();
319+ int touchId = touchPoint.id();
320+
321+ if (touchPointState == Qt::TouchPointPressed) {
322+ if (!m_watchedTouches.contains(touchId)) {
323+ TouchRegistry::instance()->addTouchWatcher(touchId, this);
324+ m_watchedTouches.insert(touchId);
325+ }
326+ }
327+ }
328+}
329+
330+void TouchGestureArea::unownedTouchEvent(QTouchEvent *unownedTouchEvent)
331+{
332+ tgaDebug(QString("unownedTouchEvent(%1) %2").arg(statusToString(m_status)).arg(touchEventString(unownedTouchEvent)));
333+
334+ // Only monitor unowned touch events for presses/releases
335+ if ((unownedTouchEvent->touchPointStates() & (Qt::TouchPointPressed|Qt::TouchPointReleased)) == 0) {
336+ return;
337+ }
338+
339+ switch (m_status) {
340+ case InternalStatus::WaitingForTouch:
341+ break;
342+ case InternalStatus::WaitingForMoreTouches:
343+ unownedTouchEvent_waitingForMoreTouches(unownedTouchEvent);
344+ // do nothing
345+ break;
346+ case InternalStatus::WaitingForOwnership:
347+ unownedTouchEvent_waitingForOwnership(unownedTouchEvent);
348+ break;
349+ case InternalStatus::Recognized:
350+ case InternalStatus::WaitingForRejection:
351+ unownedTouchEvent_recognised(unownedTouchEvent);
352+ break;
353+ case InternalStatus::Rejected:
354+ unownedTouchEvent_rejected(unownedTouchEvent);
355+ break;
356+ default:
357+ break;
358+ }
359+
360+ updateTouchPoints(unownedTouchEvent);
361+}
362+
363+void TouchGestureArea::unownedTouchEvent_waitingForMoreTouches(QTouchEvent *event)
364+{
365+ Q_FOREACH(const QTouchEvent::TouchPoint& touchPoint, event->touchPoints()) {
366+ Qt::TouchPointState touchPointState = touchPoint.state();
367+ int touchId = touchPoint.id();
368+
369+ if (touchPointState == Qt::TouchPointReleased) {
370+ if (m_candidateTouches.contains(touchId)) {
371+ TouchRegistry::instance()->removeCandidateOwnerForTouch(touchId, this);
372+ m_candidateTouches.remove(touchId);
373+ }
374+ }
375+ }
376+
377+ if (m_candidateTouches.count() == 0) {
378+ setInternalStatus(InternalStatus::WaitingForTouch);
379+ }
380+}
381+
382+void TouchGestureArea::unownedTouchEvent_waitingForOwnership(QTouchEvent *event)
383+{
384+ Q_FOREACH(const QTouchEvent::TouchPoint& touchPoint, event->touchPoints()) {
385+ Qt::TouchPointState touchPointState = touchPoint.state();
386+ int touchId = touchPoint.id();
387+
388+ if (touchPointState == Qt::TouchPointReleased) {
389+ if (m_candidateTouches.contains(touchId)) {
390+ TouchRegistry::instance()->removeCandidateOwnerForTouch(touchId, this);
391+ m_candidateTouches.remove(touchId);
392+ }
393+ if (m_watchedTouches.contains(touchId)) {
394+ m_watchedTouches.remove(touchId);
395+ }
396+ }
397+ }
398+
399+ if (m_candidateTouches.count() + m_watchedTouches.count() == 0) {
400+ setInternalStatus(InternalStatus::WaitingForTouch);
401+ }
402+}
403+
404+void TouchGestureArea::unownedTouchEvent_recognised(QTouchEvent *event)
405+{
406+ Q_FOREACH(const QTouchEvent::TouchPoint& touchPoint, event->touchPoints()) {
407+ Qt::TouchPointState touchPointState = touchPoint.state();
408+ int touchId = touchPoint.id();
409+
410+ if (touchPointState == Qt::TouchPointReleased) {
411+ if (m_watchedTouches.contains(touchId)) {
412+ m_watchedTouches.remove(touchId);
413+ }
414+ }
415+ }
416+
417+ if (m_watchedTouches.count() < m_minimumTouchPoints && m_status==InternalStatus::Recognized) {
418+ setInternalStatus(InternalStatus::WaitingForRejection);
419+ }
420+}
421+
422+void TouchGestureArea::unownedTouchEvent_rejected(QTouchEvent *event)
423+{
424+ Q_FOREACH(const QTouchEvent::TouchPoint& touchPoint, event->touchPoints()) {
425+ Qt::TouchPointState touchPointState = touchPoint.state();
426+ int touchId = touchPoint.id();
427+
428+ if (touchPointState == Qt::TouchPointPressed) {
429+ if (!m_watchedTouches.contains(touchId)) {
430+ TouchRegistry::instance()->addTouchWatcher(touchId, this);
431+ m_watchedTouches.insert(touchId);
432+ }
433+ }
434+ if (touchPointState == Qt::TouchPointReleased) {
435+ if (m_watchedTouches.contains(touchId)) {
436+ m_watchedTouches.remove(touchId);
437+ }
438+ }
439+ }
440+
441+ if (m_watchedTouches.count() == 0) {
442+ setInternalStatus(InternalStatus::WaitingForTouch);
443+ }
444+}
445+
446+void TouchGestureArea::updateTouchPoints(QTouchEvent *touchEvent)
447+{
448+ bool added = false;
449+ bool ended = false;
450+ bool moved = false;
451+
452+ const int dragThreshold = qApp->styleHints()->startDragDistance();
453+ const int dragVelocity = qApp->styleHints()->startDragVelocity();
454+
455+ clearTouchLists();
456+ bool updateable = m_status != InternalStatus::WaitingForRejection;
457+
458+ Q_FOREACH(const QTouchEvent::TouchPoint& touchPoint, touchEvent->touchPoints()) {
459+ Qt::TouchPointState touchPointState = touchPoint.state();
460+ int touchId = touchPoint.id();
461+
462+ if (touchPointState & Qt::TouchPointReleased) {
463+ GestureTouchPoint* gtp = m_liveTouchPoints.value(touchId);
464+ if (!gtp) continue;
465+
466+ gtp->setPos(touchPoint.pos());
467+ gtp->setPressed(false);
468+ m_releasedTouchPoints.append(gtp);
469+ m_liveTouchPoints.remove(touchId);
470+
471+ if (updateable) {
472+ if (m_cachedTouchPoints.contains(touchId)) {
473+ GestureTouchPoint* cachedPoint = m_cachedTouchPoints.take(touchId);
474+ cachedPoint->deleteLater();
475+ }
476+ }
477+ ended = true;
478+ } else {
479+ GestureTouchPoint* gtp = m_liveTouchPoints.value(touchPoint.id(), nullptr);
480+ if (!gtp) {
481+ gtp = addTouchPoint(&touchPoint);
482+ m_pressedTouchPoints.append(gtp);
483+
484+ if (updateable) {
485+ if (m_cachedTouchPoints.contains(touchId)) {
486+ m_cachedTouchPoints[touchId]->setPos(touchPoint.pos());
487+ } else {
488+ m_cachedTouchPoints[touchId] = new GestureTouchPoint(*gtp);
489+ }
490+ }
491+ added = true;
492+ } else if (touchPointState & Qt::TouchPointMoved) {
493+ gtp->setPos(touchPoint.pos());
494+ m_movedTouchPoints.append(gtp);
495+ moved = true;
496+
497+ const QPointF &currentPos = touchPoint.scenePos();
498+ const QPointF &startPos = touchPoint.startScenePos();
499+
500+ bool overDragThreshold = false;
501+ bool supportsVelocity = (touchEvent->device()->capabilities() & QTouchDevice::Velocity) && dragVelocity;
502+ overDragThreshold |= qAbs(currentPos.x() - startPos.x()) > dragThreshold ||
503+ qAbs(currentPos.y() - startPos.y()) > dragThreshold;
504+ if (supportsVelocity) {
505+ QVector2D velocityVec = touchPoint.velocity();
506+ overDragThreshold |= qAbs(velocityVec.x()) > dragVelocity;
507+ overDragThreshold |= qAbs(velocityVec.y()) > dragVelocity;
508+ }
509+
510+ if (overDragThreshold) {
511+ gtp->setDragging(true);
512+ }
513+
514+ if (updateable) {
515+ if (m_cachedTouchPoints.contains(touchId)) {
516+ m_cachedTouchPoints[touchId]->setPos(touchPoint.pos());
517+ if (overDragThreshold) {
518+ m_cachedTouchPoints[touchId]->setDragging(true);
519+ }
520+ }
521+ }
522+ }
523+ }
524+ }
525+
526+ if (updateable) {
527+ if (!dragging() && m_status == InternalStatus::Recognized) {
528+ bool allWantDrag = !m_liveTouchPoints.isEmpty();
529+ Q_FOREACH(auto point, m_liveTouchPoints) {
530+ allWantDrag &= point->dragging();
531+ }
532+ // only dragging if all points are dragging.
533+ if (allWantDrag) {
534+ setDragging(true);
535+ }
536+ }
537+
538+ if (ended) {
539+ if (m_liveTouchPoints.isEmpty()) {
540+ if (!dragging()) Q_EMIT clicked();
541+ setDragging(false);
542+ }
543+ tgaDebug("Released " << touchesString(m_releasedTouchPoints));
544+ Q_EMIT released(m_releasedTouchPoints);
545+ }
546+ if (added) {
547+ tgaDebug("Pressed " << touchesString(m_pressedTouchPoints));
548+ Q_EMIT pressed(m_pressedTouchPoints);
549+ }
550+ if (moved) {
551+ tgaDebug("Updated " << touchesString(m_movedTouchPoints));
552+ Q_EMIT updated(m_movedTouchPoints);
553+ }
554+ if (added || ended || moved) {
555+ Q_EMIT touchPointsUpdated();
556+ }
557+ }
558+}
559+
560+void TouchGestureArea::clearTouchLists()
561+{
562+ Q_FOREACH (QObject *gtp, m_releasedTouchPoints) {
563+ delete gtp;
564+ }
565+ m_releasedTouchPoints.clear();
566+ m_pressedTouchPoints.clear();
567+ m_movedTouchPoints.clear();
568+}
569+
570+void TouchGestureArea::setInternalStatus(uint newStatus)
571+{
572+ if (newStatus == m_status)
573+ return;
574+
575+ uint oldStatus = m_status;
576+
577+ m_status = newStatus;
578+ Q_EMIT statusChanged(status());
579+
580+ if (oldStatus == InternalStatus::WaitingForMoreTouches || oldStatus == InternalStatus::WaitingForRejection) {
581+ m_recognitionTimer->stop();
582+ }
583+
584+ tgaDebug(statusToString(oldStatus) << " -> " << statusToString(newStatus));
585+
586+ switch (newStatus) {
587+ case InternalStatus::WaitingForTouch:
588+ resyncCachedTouchPoints();
589+ break;
590+ case InternalStatus::WaitingForMoreTouches:
591+ m_recognitionTimer->start(m_recognitionPeriod);
592+ break;
593+ case InternalStatus::Recognized:
594+ resyncCachedTouchPoints();
595+ break;
596+ case InternalStatus::WaitingForRejection:
597+ m_recognitionTimer->start(m_releaseRejectPeriod);
598+ break;
599+ case InternalStatus::Rejected:
600+ resyncCachedTouchPoints();
601+ break;
602+ default:
603+ // no-op
604+ break;
605+ }
606+}
607+
608+void TouchGestureArea::setRecognitionTimer(UbuntuGestures::AbstractTimer *timer)
609+{
610+ int interval = 0;
611+ bool timerWasRunning = false;
612+ bool wasSingleShot = false;
613+
614+ // can be null when called from the constructor
615+ if (m_recognitionTimer) {
616+ interval = m_recognitionTimer->interval();
617+ timerWasRunning = m_recognitionTimer->isRunning();
618+ if (m_recognitionTimer->parent() == this) {
619+ delete m_recognitionTimer;
620+ }
621+ }
622+
623+ m_recognitionTimer = timer;
624+ timer->setInterval(interval);
625+ timer->setSingleShot(wasSingleShot);
626+ connect(timer, SIGNAL(timeout()),
627+ this, SLOT(rejectGesture()));
628+ if (timerWasRunning) {
629+ m_recognitionTimer->start();
630+ }
631+}
632+
633+int TouchGestureArea::status() const
634+{
635+ return internalStatusToGestureStatus(m_status);
636+}
637+
638+bool TouchGestureArea::dragging() const
639+{
640+ return m_dragging;
641+}
642+
643+QQmlListProperty<GestureTouchPoint> TouchGestureArea::touchPoints()
644+{
645+ return QQmlListProperty<GestureTouchPoint>(this,
646+ 0,
647+ nullptr,
648+ TouchGestureArea::touchPoint_count,
649+ TouchGestureArea::touchPoint_at,
650+ 0);
651+}
652+
653+int TouchGestureArea::minimumTouchPoints() const
654+{
655+ return m_minimumTouchPoints;
656+}
657+
658+void TouchGestureArea::setMinimumTouchPoints(int value)
659+{
660+ if (m_minimumTouchPoints != value) {
661+ m_minimumTouchPoints = value;
662+ Q_EMIT minimumTouchPointsChanged(value);
663+ }
664+}
665+
666+int TouchGestureArea::maximumTouchPoints() const
667+{
668+ return m_maximumTouchPoints;
669+}
670+
671+void TouchGestureArea::setMaximumTouchPoints(int value)
672+{
673+ if (m_maximumTouchPoints != value) {
674+ m_maximumTouchPoints = value;
675+ Q_EMIT maximumTouchPointsChanged(value);
676+ }
677+}
678+
679+int TouchGestureArea::recognitionPeriod() const
680+{
681+ return m_recognitionPeriod;
682+}
683+
684+void TouchGestureArea::setRecognitionPeriod(int value)
685+{
686+ if (value != m_recognitionPeriod) {
687+ m_recognitionPeriod = value;
688+ Q_EMIT recognitionPeriodChanged(value);
689+ }
690+}
691+
692+int TouchGestureArea::releaseRejectPeriod() const
693+{
694+ return m_releaseRejectPeriod;
695+}
696+
697+void TouchGestureArea::setReleaseRejectPeriod(int value)
698+{
699+ if (value != m_releaseRejectPeriod) {
700+ m_releaseRejectPeriod = value;
701+ Q_EMIT releaseRejectPeriodChanged(value);
702+ }
703+}
704+
705+void TouchGestureArea::rejectGesture()
706+{
707+ tgaDebug("rejectGesture");
708+ ungrabTouchPoints();
709+
710+ Q_FOREACH(int touchId, m_candidateTouches) {
711+ TouchRegistry::instance()->removeCandidateOwnerForTouch(touchId, this);
712+ }
713+
714+ // Monitor the candidates
715+ Q_FOREACH(int touchId, m_candidateTouches) {
716+ TouchRegistry::instance()->addTouchWatcher(touchId, this);
717+ m_watchedTouches.insert(touchId);
718+ }
719+ m_candidateTouches.clear();
720+
721+ if (m_watchedTouches.count() == 0) {
722+ setInternalStatus(InternalStatus::WaitingForTouch);
723+ } else {
724+ setInternalStatus(InternalStatus::Rejected);
725+ }
726+}
727+
728+void TouchGestureArea::resyncCachedTouchPoints()
729+{
730+ clearTouchLists();
731+
732+ bool added = false;
733+ bool ended = false;
734+ bool moved = false;
735+ bool wantsDrag = false;
736+
737+ // list of deletes
738+ QMutableHashIterator<int, GestureTouchPoint*> removeIter(m_cachedTouchPoints);
739+ while(removeIter.hasNext()) {
740+ removeIter.next();
741+ if (!m_liveTouchPoints.contains(removeIter.key())) {
742+ m_releasedTouchPoints.append(removeIter.value());
743+ removeIter.remove();
744+ ended = true;
745+ }
746+ }
747+
748+ // list of adds/moves
749+ Q_FOREACH(GestureTouchPoint* touchPoint, m_liveTouchPoints) {
750+ if (m_cachedTouchPoints.contains(touchPoint->id())) {
751+ GestureTouchPoint* cachedPoint = m_cachedTouchPoints[touchPoint->id()];
752+
753+ if (*cachedPoint != *touchPoint) {
754+ *cachedPoint = *touchPoint;
755+ m_movedTouchPoints.append(touchPoint);
756+ moved = true;
757+ }
758+ } else {
759+ m_cachedTouchPoints.insert(touchPoint->id(), new GestureTouchPoint(*touchPoint));
760+ m_pressedTouchPoints.append(touchPoint);
761+ added = true;
762+ }
763+ }
764+
765+ if (wantsDrag && !dragging()) {
766+ setDragging(true);
767+ }
768+
769+ if (ended) {
770+ if (m_cachedTouchPoints.isEmpty()) {
771+ if (!dragging()) Q_EMIT clicked();
772+ setDragging(false);
773+ }
774+ tgaDebug("Cached Release " << touchesString(m_releasedTouchPoints));
775+ Q_EMIT released(m_releasedTouchPoints);
776+ }
777+ if (added) {
778+ tgaDebug("Cached Press " << touchesString(m_pressedTouchPoints));
779+ Q_EMIT pressed(m_pressedTouchPoints);
780+ }
781+ if (moved) {
782+ tgaDebug("Cached Update " << touchesString(m_movedTouchPoints));
783+ Q_EMIT updated(m_movedTouchPoints);
784+ }
785+ if (added || ended || moved) Q_EMIT touchPointsUpdated();
786+}
787+
788+int TouchGestureArea::touchPoint_count(QQmlListProperty<GestureTouchPoint> *list)
789+{
790+ TouchGestureArea *q = static_cast<TouchGestureArea*>(list->object);
791+ return q->m_cachedTouchPoints.count();
792+}
793+
794+GestureTouchPoint *TouchGestureArea::touchPoint_at(QQmlListProperty<GestureTouchPoint> *list, int index)
795+{
796+ TouchGestureArea *q = static_cast<TouchGestureArea*>(list->object);
797+ return (q->m_cachedTouchPoints.begin()+index).value();
798+}
799+
800+GestureTouchPoint* TouchGestureArea::addTouchPoint(QTouchEvent::TouchPoint const* tp)
801+{
802+ GestureTouchPoint* gtp = new GestureTouchPoint();
803+ gtp->setId(tp->id());
804+ gtp->setPressed(true);
805+ gtp->setPos(tp->pos());
806+ m_liveTouchPoints.insert(tp->id(), gtp);
807+ return gtp;
808+}
809+
810+void TouchGestureArea::itemChange(ItemChange change, const ItemChangeData &value)
811+{
812+ if (change == QQuickItem::ItemSceneChange) {
813+ if (value.window != nullptr) {
814+ value.window->installEventFilter(TouchRegistry::instance());
815+ }
816+ }
817+}
818+
819+void TouchGestureArea::setDragging(bool dragging)
820+{
821+ if (m_dragging == dragging)
822+ return;
823+
824+ tgaDebug("setDragging " << dragging);
825+
826+ m_dragging = dragging;
827+ Q_EMIT draggingChanged(m_dragging);
828+}
829+
830+void GestureTouchPoint::setId(int id)
831+{
832+ if (m_id == id)
833+ return;
834+ m_id = id;
835+ Q_EMIT idChanged();
836+}
837+
838+void GestureTouchPoint::setPressed(bool pressed)
839+{
840+ if (m_pressed == pressed)
841+ return;
842+ m_pressed = pressed;
843+ Q_EMIT pressedChanged();
844+}
845+
846+void GestureTouchPoint::setX(qreal x)
847+{
848+ if (m_x == x)
849+ return;
850+ m_x = x;
851+ Q_EMIT xChanged();
852+}
853+
854+void GestureTouchPoint::setY(qreal y)
855+{
856+ if (m_y == y)
857+ return;
858+ m_y = y;
859+ Q_EMIT yChanged();
860+}
861+
862+void GestureTouchPoint::setDragging(bool dragging)
863+{
864+ if (m_dragging == dragging)
865+ return;
866+
867+ m_dragging = dragging;
868+ Q_EMIT draggingChanged();
869+}
870+
871+void GestureTouchPoint::setPos(const QPointF &pos)
872+{
873+ setX(pos.x());
874+ setY(pos.y());
875+}
plugins/Ubuntu/Gestures/TouchGestureArea.hnew file+229
@@ -0,0 +1,229 @@
1+/*
2+ * Copyright (C) 2016 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+#ifndef TOUCHGESTUREAREA_H
18+#define TOUCHGESTUREAREA_H
19+
20+#include "UbuntuGesturesQmlGlobal.h"
21+
22+#include <QQuickItem>
23+
24+// lib UbuntuGestures
25+#include <Timer.h>
26+
27+class TouchOwnershipEvent;
28+class UnownedTouchEvent;
29+
30+class GestureTouchPoint : public QObject
31+{
32+ Q_OBJECT
33+ Q_PROPERTY(int id READ id NOTIFY idChanged)
34+ Q_PROPERTY(bool pressed READ pressed NOTIFY pressedChanged)
35+ Q_PROPERTY(qreal x READ x NOTIFY xChanged)
36+ Q_PROPERTY(qreal y READ y NOTIFY yChanged)
37+ Q_PROPERTY(bool dragging READ dragging NOTIFY draggingChanged)
38+public:
39+ GestureTouchPoint()
40+ : m_id(-1)
41+ , m_pressed(false)
42+ , m_x(0)
43+ , m_y(0)
44+ , m_dragging(false)
45+ {
46+ }
47+
48+ GestureTouchPoint(const GestureTouchPoint& other)
49+ : QObject(nullptr)
50+ {
51+ operator=(other);
52+ }
53+
54+ int id() const { return m_id; }
55+ void setId(int id);
56+
57+ bool pressed() const { return m_pressed; }
58+ void setPressed(bool pressed);
59+
60+ qreal x() const { return m_x; }
61+ void setX(qreal x);
62+
63+ qreal y() const { return m_y; }
64+ void setY(qreal y);
65+
66+ bool dragging() const { return m_dragging; }
67+ void setDragging(bool dragging);
68+
69+ GestureTouchPoint& operator=(const GestureTouchPoint& rhs) {
70+ if (&rhs == this) return *this;
71+ m_id = rhs.m_id;
72+ m_pressed = rhs.m_pressed;
73+ m_x = rhs.m_x;
74+ m_y = rhs.m_y;
75+ m_dragging = rhs.m_dragging;
76+ return *this;
77+ }
78+
79+ bool operator=(const GestureTouchPoint& rhs) const {
80+ if (&rhs == this) return true;
81+ return m_id == rhs.m_id &&
82+ m_pressed == rhs.m_pressed &&
83+ m_x == rhs.m_x &&
84+ m_y == rhs.m_y &&
85+ m_dragging == rhs.m_dragging;
86+ }
87+ bool operator!=(const GestureTouchPoint& rhs) const { return !operator=(rhs); }
88+
89+ void setPos(const QPointF &pos);
90+
91+Q_SIGNALS:
92+ void idChanged();
93+ void pressedChanged();
94+ void xChanged();
95+ void yChanged();
96+ void draggingChanged();
97+
98+private:
99+ int m_id;
100+ bool m_pressed;
101+ qreal m_x;
102+ qreal m_y;
103+ bool m_dragging;
104+};
105+
106+/*
107+ An area that detects multi-finger gestures.
108+
109+ We can use this to detect gestures contstrained by a minimim and/or maximum number of touch points.
110+ This components uses the touch registry to apply for ownership of touch points.
111+ This way we can use the component in conjuntion with the directional drag area to compete for ownwership
112+ or gestures; unlike the MultiPointTouchArea.
113+ */
114+class UBUNTUGESTURESQML_EXPORT TouchGestureArea : public QQuickItem
115+{
116+ Q_OBJECT
117+ Q_ENUMS(Status)
118+
119+ Q_PROPERTY(int status READ status NOTIFY statusChanged)
120+ Q_PROPERTY(bool dragging READ dragging NOTIFY draggingChanged)
121+ Q_PROPERTY(QQmlListProperty<GestureTouchPoint> touchPoints READ touchPoints NOTIFY touchPointsUpdated)
122+
123+ Q_PROPERTY(int minimumTouchPoints READ minimumTouchPoints WRITE setMinimumTouchPoints NOTIFY minimumTouchPointsChanged)
124+ Q_PROPERTY(int maximumTouchPoints READ maximumTouchPoints WRITE setMaximumTouchPoints NOTIFY maximumTouchPointsChanged)
125+
126+ // Time(ms) the component will wait for after receiving an initial touch to recognise a gesutre before rejecting it.
127+ Q_PROPERTY(int recognitionPeriod READ recognitionPeriod WRITE setRecognitionPeriod NOTIFY recognitionPeriodChanged)
128+ // Time(ms) the component will allow a recognised gesture to intermitently release a touch point before rejecting the gesture.
129+ // This is so we will not immediately reject a gesture if there are fleeting touch point releases while dragging.
130+ Q_PROPERTY(int releaseRejectPeriod READ releaseRejectPeriod WRITE setReleaseRejectPeriod NOTIFY releaseRejectPeriodChanged)
131+
132+public:
133+ // Describes the state of the touch gesture area.
134+ enum Status {
135+ WaitingForTouch,
136+ Undecided,
137+ Recognized,
138+ Rejected
139+ };
140+ TouchGestureArea(QQuickItem* parent = NULL);
141+ ~TouchGestureArea();
142+
143+ bool event(QEvent *e) override;
144+
145+ void setRecognitionTimer(UbuntuGestures::AbstractTimer *timer);
146+
147+ int status() const;
148+ bool dragging() const;
149+ QQmlListProperty<GestureTouchPoint> touchPoints();
150+
151+ int minimumTouchPoints() const;
152+ void setMinimumTouchPoints(int value);
153+
154+ int maximumTouchPoints() const;
155+ void setMaximumTouchPoints(int value);
156+
157+ int recognitionPeriod() const;
158+ void setRecognitionPeriod(int value);
159+
160+ int releaseRejectPeriod() const;
161+ void setReleaseRejectPeriod(int value);
162+
163+Q_SIGNALS:
164+ void statusChanged(int status);
165+
166+ void touchPointsUpdated();
167+ void draggingChanged(bool dragging);
168+ void minimumTouchPointsChanged(bool value);
169+ void maximumTouchPointsChanged(bool value);
170+ void recognitionPeriodChanged(bool value);
171+ void releaseRejectPeriodChanged(bool value);
172+
173+ void pressed(const QList<QObject*>& points);
174+ void released(const QList<QObject*>& points);
175+ void updated(const QList<QObject*>& points);
176+ void clicked();
177+
178+protected:
179+ void itemChange(ItemChange change, const ItemChangeData &value);
180+
181+private Q_SLOTS:
182+ void rejectGesture();
183+
184+private:
185+ void touchEvent(QTouchEvent *event) override;
186+ void touchEvent_waitingForTouch(QTouchEvent *event);
187+ void touchEvent_waitingForMoreTouches(QTouchEvent *event);
188+ void touchEvent_waitingForOwnership(QTouchEvent *event);
189+ void touchEvent_recognized(QTouchEvent *event);
190+ void touchEvent_rejected(QTouchEvent *event);
191+
192+ void unownedTouchEvent(QTouchEvent *unownedTouchEvent);
193+ void unownedTouchEvent_waitingForMoreTouches(QTouchEvent *unownedTouchEvent);
194+ void unownedTouchEvent_waitingForOwnership(QTouchEvent *unownedTouchEvent);
195+ void unownedTouchEvent_recognised(QTouchEvent *unownedTouchEvent);
196+ void unownedTouchEvent_rejected(QTouchEvent *unownedTouchEvent);
197+
198+ void touchOwnershipEvent(TouchOwnershipEvent *event);
199+ void updateTouchPoints(QTouchEvent *event);
200+
201+ GestureTouchPoint* addTouchPoint(const QTouchEvent::TouchPoint *tp);
202+ void clearTouchLists();
203+ void setDragging(bool dragging);
204+ void setInternalStatus(uint status);
205+ void resyncCachedTouchPoints();
206+
207+ static int touchPoint_count(QQmlListProperty<GestureTouchPoint> *list);
208+ static GestureTouchPoint* touchPoint_at(QQmlListProperty<GestureTouchPoint> *list, int index);
209+
210+ uint m_status;
211+ QSet<int> m_candidateTouches;
212+ QSet<int> m_watchedTouches;
213+ UbuntuGestures::AbstractTimer *m_recognitionTimer;
214+
215+ bool m_dragging;
216+ QHash<int, GestureTouchPoint*> m_liveTouchPoints;
217+ QHash<int, GestureTouchPoint*> m_cachedTouchPoints;
218+ QList<QObject*> m_releasedTouchPoints;
219+ QList<QObject*> m_pressedTouchPoints;
220+ QList<QObject*> m_movedTouchPoints;
221+ int m_minimumTouchPoints;
222+ int m_maximumTouchPoints;
223+ int m_recognitionPeriod;
224+ int m_releaseRejectPeriod;
225+};
226+
227+QML_DECLARE_TYPE(GestureTouchPoint)
228+
229+#endif // TOUCHGESTUREAREA_H
plugins/Ubuntu/Gestures/plugin.cpp+3
@@ -21,6 +21,7 @@
21#include "FloatingFlickable.h"
21#include "FloatingFlickable.h"
22#include "PressedOutsideNotifier.h"
22#include "PressedOutsideNotifier.h"
23#include "TouchGate.h"
23#include "TouchGate.h"
24+#include "TouchGestureArea.h"
24
25
25#include <qqml.h>
26#include <qqml.h>
26
27
@@ -38,4 +39,6 @@ void UbuntuGesturesQmlPlugin::registerTypes(const char *uri)
38 qmlRegisterType<FloatingFlickable>(uri, 0, 1, "FloatingFlickable");
39 qmlRegisterType<FloatingFlickable>(uri, 0, 1, "FloatingFlickable");
39 qmlRegisterType<PressedOutsideNotifier>(uri, 0, 1, "PressedOutsideNotifier");
40 qmlRegisterType<PressedOutsideNotifier>(uri, 0, 1, "PressedOutsideNotifier");
40 qmlRegisterType<TouchGate>(uri, 0, 1, "TouchGate");
41 qmlRegisterType<TouchGate>(uri, 0, 1, "TouchGate");
42+ qmlRegisterType<TouchGestureArea>(uri, 0, 1, "TouchGestureArea");
43+ qmlRegisterUncreatableType<GestureTouchPoint>(uri, 0, 1, "GestureTouchPoint", "Cannot create GestureTouchPoints");
41}
44}
plugins/Unity/Indicators/indicatorsmanager.cpp+3−5
@@ -1,5 +1,5 @@
1/*
1/*
2− * Copyright (C) 2013 Canonical, Ltd.
2+ * Copyright (C) 2013-2016 Canonical, Ltd.
3 *
3 *
4 * This program is free software; you can redistribute it and/or modify
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
5 * it under the terms of the GNU General Public License as published by
@@ -12,8 +12,6 @@
12 *
12 *
13 * You should have received a copy of the GNU General Public License
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/>.
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15− *
16− * Author: Nick Dedekind <nick.dedekind@canonical.com>
17 */
15 */
18
16
19#include "indicatorsmanager.h"
17#include "indicatorsmanager.h"
@@ -286,12 +284,12 @@ Indicator::Ptr IndicatorsManager::indicator(const QString& indicator_name)
286 new_indicator->init(data->m_fileInfo.fileName(), settings);
284 new_indicator->init(data->m_fileInfo.fileName(), settings);
287
285
288 // convergence:
286 // convergence:
289− // 1) enable session indicator conditionally, typically when running in a multisession/multiuser environment
287+ // 1) enable session indicator
290 // 2) on a PC, switch the battery/power indicator to desktop mode,
288 // 2) on a PC, switch the battery/power indicator to desktop mode,
291 // can't control brightness for now and phone-on-desktop broken (FIXME)
289 // can't control brightness for now and phone-on-desktop broken (FIXME)
292 //
290 //
293 // The rest of the indicators respect their default profile (which is "phone", even on desktop PCs)
291 // The rest of the indicators respect their default profile (which is "phone", even on desktop PCs)
294− if ((new_indicator->identifier() == QStringLiteral("indicator-session") && m_platform.isMultiSession())
292+ if ((new_indicator->identifier() == QStringLiteral("indicator-session"))
295 || (new_indicator->identifier() == QStringLiteral("indicator-power") && m_platform.isPC())) {
293 || (new_indicator->identifier() == QStringLiteral("indicator-power") && m_platform.isPC())) {
296 new_indicator->setProfile(QStringLiteral("desktop"));
294 new_indicator->setProfile(QStringLiteral("desktop"));
297 } else {
295 } else {
plugins/Unity/InputInfo/InputInfo.qmltypesnew file+71
@@ -0,0 +1,71 @@
1+import QtQuick.tooling 1.1
2+
3+// This file describes the plugin-supplied types contained in the library.
4+// It is used for QML tooling purposes only.
5+//
6+// This file was auto-generated by:
7+// 'qmlplugindump -notrelocatable Unity.InputInfo 0.1 plugins'
8+
9+Module {
10+ Component {
11+ name: "QDeclarativeInputDeviceModel"
12+ prototype: "QAbstractListModel"
13+ exports: ["Unity.InputInfo/InputDeviceModel 0.1"]
14+ exportMetaObjectRevisions: [0]
15+ Property { name: "deviceFilter"; type: "QInputDevice::InputType" }
16+ Property { name: "count"; type: "int"; isReadonly: true }
17+ Signal {
18+ name: "deviceAdded"
19+ Parameter { name: "devicePath"; type: "string" }
20+ }
21+ Signal {
22+ name: "deviceRemoved"
23+ Parameter { name: "devicePath"; type: "string" }
24+ }
25+ Signal {
26+ name: "deviceFilterChanged"
27+ Parameter { name: "filter"; type: "QInputDevice::InputType" }
28+ }
29+ Method { name: "updateDeviceList" }
30+ Method {
31+ name: "indexOf"
32+ type: "int"
33+ Parameter { name: "devicePath"; type: "string" }
34+ }
35+ Method {
36+ name: "get"
37+ type: "QInputDevice*"
38+ Parameter { name: "index"; type: "int" }
39+ }
40+ }
41+ Component {
42+ name: "QInputDevice"
43+ prototype: "QObject"
44+ exports: ["Unity.InputInfo/InputInfo 0.1"]
45+ exportMetaObjectRevisions: [0]
46+ Enum {
47+ name: "InputType"
48+ values: {
49+ "Unknown": 0,
50+ "Button": 1,
51+ "Mouse": 2,
52+ "TouchPad": 4,
53+ "TouchScreen": 8,
54+ "Keyboard": 16,
55+ "Switch": 32
56+ }
57+ }
58+ Enum {
59+ name: "InputTypeFlags"
60+ values: {
61+ "Unknown": 0,
62+ "Button": 1,
63+ "Mouse": 2,
64+ "TouchPad": 4,
65+ "TouchScreen": 8,
66+ "Keyboard": 16,
67+ "Switch": 32
68+ }
69+ }
70+ }
71+}
plugins/Unity/Platform/Platform.qmltypesnew file+20
@@ -0,0 +1,20 @@
1+import QtQuick.tooling 1.1
2+
3+// This file describes the plugin-supplied types contained in the library.
4+// It is used for QML tooling purposes only.
5+//
6+// This file was auto-generated by:
7+// 'qmlplugindump -notrelocatable Unity.Platform 1.0 plugins'
8+
9+Module {
10+ Component {
11+ name: "Platform"
12+ prototype: "QObject"
13+ exports: ["Unity.Platform/Platform 1.0"]
14+ isCreatable: false
15+ isSingleton: true
16+ exportMetaObjectRevisions: [0]
17+ Property { name: "chassis"; type: "string"; isReadonly: true }
18+ Property { name: "isPC"; type: "bool"; isReadonly: true }
19+ }
20+}
plugins/Unity/Session/dbusunitysessionservice.cpp+4−1
@@ -336,6 +336,9 @@ void DBusUnitySessionService::PromptLock()
336
336
337void DBusUnitySessionService::Lock()
337void DBusUnitySessionService::Lock()
338{
338{
339+ // signal u8 to show the lockscreen/greeter
340+ PromptLock();
341+
339 // lock the session using the org.freedesktop.DisplayManager system DBUS service
342 // lock the session using the org.freedesktop.DisplayManager system DBUS service
340 const QString sessionPath = QString::fromLocal8Bit(qgetenv("XDG_SESSION_PATH"));
343 const QString sessionPath = QString::fromLocal8Bit(qgetenv("XDG_SESSION_PATH"));
341 QDBusMessage msg = QDBusMessage::createMethodCall(QStringLiteral("org.freedesktop.DisplayManager"),
344 QDBusMessage msg = QDBusMessage::createMethodCall(QStringLiteral("org.freedesktop.DisplayManager"),
@@ -348,7 +351,7 @@ void DBusUnitySessionService::Lock()
348 connect(watcher, &QDBusPendingCallWatcher::finished,
351 connect(watcher, &QDBusPendingCallWatcher::finished,
349 this, [this](QDBusPendingCallWatcher* watcher) {
352 this, [this](QDBusPendingCallWatcher* watcher) {
350
353
351− QDBusPendingReply<QVariant> reply = *watcher;
354+ QDBusPendingReply<void> reply = *watcher;
352 watcher->deleteLater();
355 watcher->deleteLater();
353 if (reply.isError()) {
356 if (reply.isError()) {
354 qWarning() << "Lock call failed" << reply.error().message();
357 qWarning() << "Lock call failed" << reply.error().message();
plugins/Utils/CMakeLists.txt+2−1
@@ -17,13 +17,14 @@ set(QMLPLUGIN_SRC
17 unitysortfilterproxymodelqml.cpp
17 unitysortfilterproxymodelqml.cpp
18 Timer.cpp
18 Timer.cpp
19 unitymenumodelpaths.cpp
19 unitymenumodelpaths.cpp
20− windowkeysfilter.cpp
20+ windowinputfilter.cpp
21 windowscreenshotprovider.cpp
21 windowscreenshotprovider.cpp
22 easingcurve.cpp
22 easingcurve.cpp
23 windowstatestorage.cpp
23 windowstatestorage.cpp
24 timezoneFormatter.cpp
24 timezoneFormatter.cpp
25 inputeventgenerator.cpp
25 inputeventgenerator.cpp
26 deviceconfigparser.cpp
26 deviceconfigparser.cpp
27+ globalfunctions.cpp
27 plugin.cpp
28 plugin.cpp
28 )
29 )
29
30
plugins/Utils/Utils.qmltypes+2−2
@@ -147,10 +147,10 @@ Module {
147 }
147 }
148 }
148 }
149 Component {
149 Component {
150− name: "WindowKeysFilter"
150+ name: "WindowInputFilter"
151 defaultProperty: "data"
151 defaultProperty: "data"
152 prototype: "QQuickItem"
152 prototype: "QQuickItem"
153− exports: ["Utils/WindowKeysFilter 0.1"]
153+ exports: ["Utils/WindowInputFilter 0.1"]
154 exportMetaObjectRevisions: [0]
154 exportMetaObjectRevisions: [0]
155 }
155 }
156 Component {
156 Component {
plugins/Utils/globalfunctions.cppnew file+56
@@ -0,0 +1,56 @@
1+/*
2+ * Copyright 2015 Canonical Ltd.
3+ *
4+ * This program is free software; you can redistribute it and/or modify
5+ * it under the terms of the GNU Lesser General Public License as published by
6+ * the Free Software Foundation; version 3.
7+ *
8+ * This program is distributed in the hope that it will be useful,
9+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
10+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11+ * GNU Lesser General Public License for more details.
12+ *
13+ * You should have received a copy of the GNU Lesser General Public License
14+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
15+*/
16+
17+#include "globalfunctions.h"
18+
19+#pragma GCC diagnostic push
20+#pragma GCC diagnostic ignored "-pedantic"
21+#include <private/qquickitem_p.h>
22+#pragma GCC diagnostic pop
23+#include <QQmlEngine>
24+
25+GlobalFunctions::GlobalFunctions(QObject *parent)
26+ : QObject(parent)
27+{
28+}
29+
30+QQuickItem *GlobalFunctions::itemAt(QQuickItem* parent, int x, int y, QJSValue matcher)
31+{
32+ if (!parent) return nullptr;
33+ QList<QQuickItem *> children = QQuickItemPrivate::get(parent)->paintOrderChildItems();
34+
35+ for (int i = children.count() - 1; i >= 0; --i) {
36+ QQuickItem *child = children.at(i);
37+
38+ // Map coordinates to the child element's coordinate space
39+ QPointF point = parent->mapToItem(child, QPointF(x, y));
40+ if (child->isVisible() && point.x() >= 0
41+ && child->width() >= point.x()
42+ && point.y() >= 0
43+ && child->height() >= point.y()) {
44+ if (!matcher.isCallable()) return child;
45+
46+ QQmlEngine* engine = qmlEngine(child);
47+ if (!engine) return child;
48+
49+ QJSValue newObj = engine->newQObject(child);
50+ if (matcher.call(QJSValueList() << newObj).toBool()) {
51+ return child;
52+ }
53+ }
54+ }
55+ return nullptr;
56+}
plugins/Utils/globalfunctions.hnew file+42
@@ -0,0 +1,42 @@
1+/*
2+ * Copyright 2015 Canonical Ltd.
3+ *
4+ * This program is free software; you can redistribute it and/or modify
5+ * it under the terms of the GNU Lesser General Public License as published by
6+ * the Free Software Foundation; version 3.
7+ *
8+ * This program is distributed in the hope that it will be useful,
9+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
10+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11+ * GNU Lesser General Public License for more details.
12+ *
13+ * You should have received a copy of the GNU Lesser General Public License
14+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
15+*/
16+
17+#ifndef GLOBALFUNCTIONS_H
18+#define GLOBALFUNCTIONS_H
19+
20+#include <QObject>
21+#include <QJSValue>
22+class QQuickItem;
23+
24+/**
25+ * @brief The GlobalFunctions class
26+ *
27+ * This singleton class exposes utility functions to QML
28+ *
29+ */
30+class GlobalFunctions : public QObject
31+{
32+ Q_OBJECT
33+public:
34+ explicit GlobalFunctions(QObject *parent = 0);
35+
36+ static Q_INVOKABLE QQuickItem* itemAt(QQuickItem* parent,
37+ int x,
38+ int y,
39+ QJSValue matcher);
40+};
41+
42+#endif // GLOBALFUNCTIONS_H
plugins/Utils/plugin.cpp+11−2
@@ -30,7 +30,7 @@
30#include "qlimitproxymodelqml.h"
30#include "qlimitproxymodelqml.h"
31#include "unitysortfilterproxymodelqml.h"
31#include "unitysortfilterproxymodelqml.h"
32#include "unitymenumodelpaths.h"
32#include "unitymenumodelpaths.h"
33−#include "windowkeysfilter.h"
33+#include "windowinputfilter.h"
34#include "windowscreenshotprovider.h"
34#include "windowscreenshotprovider.h"
35#include "windowstatestorage.h"
35#include "windowstatestorage.h"
36#include "constants.h"
36#include "constants.h"
@@ -38,6 +38,7 @@
38#include "applicationsfiltermodel.h"
38#include "applicationsfiltermodel.h"
39#include "inputeventgenerator.h"
39#include "inputeventgenerator.h"
40#include "deviceconfigparser.h"
40#include "deviceconfigparser.h"
41+#include "globalfunctions.h"
41
42
42static QObject *createWindowStateStorage(QQmlEngine *engine, QJSEngine *scriptEngine)
43static QObject *createWindowStateStorage(QQmlEngine *engine, QJSEngine *scriptEngine)
43{
44{
@@ -53,6 +54,13 @@ static QObject *createConstants(QQmlEngine *engine, QJSEngine *scriptEngine)
53 return new Constants();
54 return new Constants();
54}
55}
55
56
57+static QObject *createGlobalFunctions(QQmlEngine *engine, QJSEngine *scriptEngine)
58+{
59+ Q_UNUSED(engine)
60+ Q_UNUSED(scriptEngine)
61+ return new GlobalFunctions();
62+}
63+
56void UtilsPlugin::registerTypes(const char *uri)
64void UtilsPlugin::registerTypes(const char *uri)
57{
65{
58 Q_ASSERT(uri == QLatin1String("Utils"));
66 Q_ASSERT(uri == QLatin1String("Utils"));
@@ -61,7 +69,7 @@ void UtilsPlugin::registerTypes(const char *uri)
61 qmlRegisterType<QLimitProxyModelQML>(uri, 0, 1, "LimitProxyModel");
69 qmlRegisterType<QLimitProxyModelQML>(uri, 0, 1, "LimitProxyModel");
62 qmlRegisterType<UnitySortFilterProxyModelQML>(uri, 0, 1, "UnitySortFilterProxyModel");
70 qmlRegisterType<UnitySortFilterProxyModelQML>(uri, 0, 1, "UnitySortFilterProxyModel");
63 qmlRegisterType<UnityMenuModelPaths>(uri, 0, 1, "UnityMenuModelPaths");
71 qmlRegisterType<UnityMenuModelPaths>(uri, 0, 1, "UnityMenuModelPaths");
64− qmlRegisterType<WindowKeysFilter>(uri, 0, 1, "WindowKeysFilter");
72+ qmlRegisterType<WindowInputFilter>(uri, 0, 1, "WindowInputFilter");
65 qmlRegisterType<EasingCurve>(uri, 0, 1, "EasingCurve");
73 qmlRegisterType<EasingCurve>(uri, 0, 1, "EasingCurve");
66 qmlRegisterSingletonType<WindowStateStorage>(uri, 0, 1, "WindowStateStorage", createWindowStateStorage);
74 qmlRegisterSingletonType<WindowStateStorage>(uri, 0, 1, "WindowStateStorage", createWindowStateStorage);
67 qmlRegisterType<InputWatcher>(uri, 0, 1, "InputWatcher");
75 qmlRegisterType<InputWatcher>(uri, 0, 1, "InputWatcher");
@@ -72,6 +80,7 @@ void UtilsPlugin::registerTypes(const char *uri)
72 qmlRegisterType<ApplicationsFilterModel>(uri, 0, 1, "ApplicationsFilterModel");
80 qmlRegisterType<ApplicationsFilterModel>(uri, 0, 1, "ApplicationsFilterModel");
73 qmlRegisterType<InputEventGenerator>(uri, 0, 1, "InputEventGenerator");
81 qmlRegisterType<InputEventGenerator>(uri, 0, 1, "InputEventGenerator");
74 qmlRegisterType<DeviceConfigParser>(uri, 0, 1, "DeviceConfigParser");
82 qmlRegisterType<DeviceConfigParser>(uri, 0, 1, "DeviceConfigParser");
83+ qmlRegisterSingletonType<GlobalFunctions>(uri, 0, 1, "Functions", createGlobalFunctions);
75}
84}
76
85
77void UtilsPlugin::initializeEngine(QQmlEngine *engine, const char *uri)
86void UtilsPlugin::initializeEngine(QQmlEngine *engine, const char *uri)
plugins/Utils/timezoneFormatter.cpp+10
@@ -33,3 +33,13 @@ QString TimezoneFormatter::currentTimeInTimezone(const QVariant &tzId) const
33 }
33 }
34 return QString();
34 return QString();
35}
35}
36+
37+QString TimezoneFormatter::currentTimeInTimezoneWithAbbrev(const QVariant &tzId) const
38+{
39+ QTimeZone tz(tzId.toByteArray());
40+ if (tz.isValid()) {
41+ const QDateTime now = QDateTime::currentDateTime().toTimeZone(tz);
42+ return QStringLiteral("%1 %2").arg(now.time().toString(QStringLiteral("h:mm"))).arg(tz.abbreviation(now));
43+ }
44+ return QString();
45+}
plugins/Utils/timezoneFormatter.h+1
@@ -27,6 +27,7 @@ public:
27 ~TimezoneFormatter() = default;
27 ~TimezoneFormatter() = default;
28
28
29 Q_INVOKABLE QString currentTimeInTimezone(const QVariant &tzId) const;
29 Q_INVOKABLE QString currentTimeInTimezone(const QVariant &tzId) const;
30+ Q_INVOKABLE QString currentTimeInTimezoneWithAbbrev(const QVariant &tzId) const;
30};
31};
31
32
32#endif
33#endif
plugins/Utils/windowkeysfilter.cpp → plugins/Utils/windowinputfilter.cpprenamed+14−16
@@ -16,36 +16,34 @@
16 * Author: Daniel d'Andrada <daniel.dandrada@canonical.com>
16 * Author: Daniel d'Andrada <daniel.dandrada@canonical.com>
17 */
17 */
18
18
19−#include "windowkeysfilter.h"
19+#include "windowinputfilter.h"
20
20
21#include <QQuickWindow>
21#include <QQuickWindow>
22
22
23−WindowKeysFilter::WindowKeysFilter(QQuickItem *parent)
23+WindowInputFilter::WindowInputFilter(QQuickItem *parent)
24 : QQuickItem(parent),
24 : QQuickItem(parent),
25− m_currentEventTimestamp(0)
25+ m_lastInputTimestamp(0)
26{
26{
27 connect(this, &QQuickItem::windowChanged,
27 connect(this, &QQuickItem::windowChanged,
28− this, &WindowKeysFilter::setupFilterOnWindow);
28+ this, &WindowInputFilter::setupFilterOnWindow);
29}
29}
30
30
31−bool WindowKeysFilter::eventFilter(QObject *watched, QEvent *event)
31+bool WindowInputFilter::eventFilter(QObject *watched, QEvent *event)
32{
32{
33 Q_ASSERT(!m_filteredWindow.isNull());
33 Q_ASSERT(!m_filteredWindow.isNull());
34 Q_ASSERT(watched == static_cast<QObject*>(m_filteredWindow.data()));
34 Q_ASSERT(watched == static_cast<QObject*>(m_filteredWindow.data()));
35 Q_UNUSED(watched);
35 Q_UNUSED(watched);
36
36
37+ QInputEvent *inputEvent = dynamic_cast<QInputEvent*>(event);
38+ if (inputEvent) {
39+ m_lastInputTimestamp = inputEvent->timestamp();
40+ Q_EMIT lastInputTimestampChanged();
41+ }
42+
37 if (event->type() == QEvent::KeyPress || event->type() == QEvent::KeyRelease) {
43 if (event->type() == QEvent::KeyPress || event->type() == QEvent::KeyRelease) {
38 // Let QML see this event and decide if it does not want it
44 // Let QML see this event and decide if it does not want it
39 event->accept();
45 event->accept();
40−
41− m_currentEventTimestamp = static_cast<QInputEvent*>(event)->timestamp();
42− Q_EMIT currentEventTimestampChanged();
43−
44 QCoreApplication::sendEvent(this, event);
46 QCoreApplication::sendEvent(this, event);
45−
46− m_currentEventTimestamp = 0;
47− Q_EMIT currentEventTimestampChanged();
48−
49 return event->isAccepted();
47 return event->isAccepted();
50 } else {
48 } else {
51 // Not interested
49 // Not interested
@@ -53,7 +51,7 @@ bool WindowKeysFilter::eventFilter(QObject *watched, QEvent *event)
53 }
51 }
54}
52}
55
53
56−void WindowKeysFilter::setupFilterOnWindow(QQuickWindow *window)
54+void WindowInputFilter::setupFilterOnWindow(QQuickWindow *window)
57{
55{
58 if (!m_filteredWindow.isNull()) {
56 if (!m_filteredWindow.isNull()) {
59 m_filteredWindow->removeEventFilter(this);
57 m_filteredWindow->removeEventFilter(this);
@@ -66,7 +64,7 @@ void WindowKeysFilter::setupFilterOnWindow(QQuickWindow *window)
66 }
64 }
67}
65}
68
66
69−ulong WindowKeysFilter::currentEventTimestamp() const
67+ulong WindowInputFilter::lastInputTimestamp() const
70{
68{
71− return m_currentEventTimestamp;
69+ return m_lastInputTimestamp;
72}
70}
plugins/Utils/windowkeysfilter.h → plugins/Utils/windowinputfilter.hrenamed+11−11
@@ -16,8 +16,8 @@
16 * Author: Daniel d'Andrada <daniel.dandrada@canonical.com>
16 * Author: Daniel d'Andrada <daniel.dandrada@canonical.com>
17 */
17 */
18
18
19−#ifndef UNITY_WINDOWKEYSFILTER_H
19+#ifndef UNITY_WINDOWINPUTFILTER_H
20−#define UNITY_WINDOWKEYSFILTER_H
20+#define UNITY_WINDOWINPUTFILTER_H
21
21
22#include <QQuickItem>
22#include <QQuickItem>
23#include <QPointer>
23#include <QPointer>
@@ -29,30 +29,30 @@
29 accepted ones will be filtered out. Events are accepted by default, so make sure you reject
29 accepted ones will be filtered out. Events are accepted by default, so make sure you reject
30 the keys you're not interested in.
30 the keys you're not interested in.
31
31
32− If more than one WindowKeysFilter exist in the same QML scene (and thus in the same QQuickWindow)
32+ If more than one WindowInputFilter exist in the same QML scene (and thus in the same QQuickWindow)
33 they will be called in the order of creation, which can be tricky to assess. So the best practice
33 they will be called in the order of creation, which can be tricky to assess. So the best practice
34− is to have at most one WindowKeysFilter per QML scene.
34+ is to have at most one WindowInputFilter per QML scene.
35 */
35 */
36−class WindowKeysFilter : public QQuickItem
36+class WindowInputFilter : public QQuickItem
37{
37{
38 Q_OBJECT
38 Q_OBJECT
39− Q_PROPERTY(ulong currentEventTimestamp READ currentEventTimestamp NOTIFY currentEventTimestampChanged)
39+ Q_PROPERTY(ulong lastInputTimestamp READ lastInputTimestamp NOTIFY lastInputTimestampChanged)
40public:
40public:
41− WindowKeysFilter(QQuickItem *parent = 0);
41+ WindowInputFilter(QQuickItem *parent = 0);
42
42
43 bool eventFilter(QObject *watched, QEvent *event) override;
43 bool eventFilter(QObject *watched, QEvent *event) override;
44
44
45− ulong currentEventTimestamp() const;
45+ ulong lastInputTimestamp() const;
46
46
47Q_SIGNALS:
47Q_SIGNALS:
48− void currentEventTimestampChanged();
48+ void lastInputTimestampChanged();
49
49
50private Q_SLOTS:
50private Q_SLOTS:
51 void setupFilterOnWindow(QQuickWindow *window);
51 void setupFilterOnWindow(QQuickWindow *window);
52
52
53private:
53private:
54 QPointer<QQuickWindow> m_filteredWindow;
54 QPointer<QQuickWindow> m_filteredWindow;
55− ulong m_currentEventTimestamp;
55+ ulong m_lastInputTimestamp;
56};
56};
57
57
58−#endif // UNITY_WINDOWKEYSFILTER_H
58+#endif // UNITY_WINDOWINPUTFILTER_H
plugins/Utils/windowstatestorage.cpp+36−4
@@ -23,9 +23,14 @@
23#include <QSqlError>
23#include <QSqlError>
24#include <QSqlResult>
24#include <QSqlResult>
25#include <QRect>
25#include <QRect>
26+#include <unity/shell/application/ApplicationInfoInterface.h>
26
27
27QMutex WindowStateStorage::s_mutex;
28QMutex WindowStateStorage::s_mutex;
28
29
30+inline QString sanitiseString(QString string) {
31+ return string.remove("\"").remove("'").remove("\\");
32+}
33+
29WindowStateStorage::WindowStateStorage(QObject *parent):
34WindowStateStorage::WindowStateStorage(QObject *parent):
30 QObject(parent)
35 QObject(parent)
31{
36{
@@ -50,7 +55,7 @@ WindowStateStorage::~WindowStateStorage()
50void WindowStateStorage::saveState(const QString &windowId, WindowStateStorage::WindowState state)
55void WindowStateStorage::saveState(const QString &windowId, WindowStateStorage::WindowState state)
51{
56{
52 const QString queryString = QStringLiteral("INSERT OR REPLACE INTO state (windowId, state) values ('%1', '%2');")
57 const QString queryString = QStringLiteral("INSERT OR REPLACE INTO state (windowId, state) values ('%1', '%2');")
53− .arg(windowId)
58+ .arg(sanitiseString(windowId))
54 .arg((int)state);
59 .arg((int)state);
55
60
56 saveValue(queryString);
61 saveValue(queryString);
@@ -59,7 +64,7 @@ void WindowStateStorage::saveState(const QString &windowId, WindowStateStorage::
59WindowStateStorage::WindowState WindowStateStorage::getState(const QString &windowId, WindowStateStorage::WindowState defaultValue) const
64WindowStateStorage::WindowState WindowStateStorage::getState(const QString &windowId, WindowStateStorage::WindowState defaultValue) const
60{
65{
61 const QString queryString = QStringLiteral("SELECT * FROM state WHERE windowId = '%1';")
66 const QString queryString = QStringLiteral("SELECT * FROM state WHERE windowId = '%1';")
62− .arg(windowId);
67+ .arg(sanitiseString(windowId));
63
68
64 QSqlQuery query = getValue(queryString);
69 QSqlQuery query = getValue(queryString);
65
70
@@ -72,7 +77,7 @@ WindowStateStorage::WindowState WindowStateStorage::getState(const QString &wind
72void WindowStateStorage::saveGeometry(const QString &windowId, const QRect rect)
77void WindowStateStorage::saveGeometry(const QString &windowId, const QRect rect)
73{
78{
74 const QString queryString = QStringLiteral("INSERT OR REPLACE INTO geometry (windowId, x, y, width, height) values ('%1', '%2', '%3', '%4', '%5');")
79 const QString queryString = QStringLiteral("INSERT OR REPLACE INTO geometry (windowId, x, y, width, height) values ('%1', '%2', '%3', '%4', '%5');")
75− .arg(windowId)
80+ .arg(sanitiseString(windowId))
76 .arg(rect.x())
81 .arg(rect.x())
77 .arg(rect.y())
82 .arg(rect.y())
78 .arg(rect.width())
83 .arg(rect.width())
@@ -81,6 +86,28 @@ void WindowStateStorage::saveGeometry(const QString &windowId, const QRect rect)
81 saveValue(queryString);
86 saveValue(queryString);
82}
87}
83
88
89+void WindowStateStorage::saveStage(const QString &appId, int stage)
90+{
91+ const QString queryString = QStringLiteral("INSERT OR REPLACE INTO stage (appId, stage) values ('%1', '%2');")
92+ .arg(sanitiseString(appId))
93+ .arg((int)stage);
94+
95+ saveValue(queryString);
96+}
97+
98+int WindowStateStorage::getStage(const QString &appId) const
99+{
100+ const QString queryString = QStringLiteral("SELECT * FROM stage WHERE appId = '%1';")
101+ .arg(sanitiseString(appId));
102+
103+ QSqlQuery query = getValue(queryString);
104+
105+ if (!query.first()) {
106+ return unity::shell::application::ApplicationInfoInterface::MainStage;
107+ }
108+ return query.value("stage").toInt();
109+}
110+
84void WindowStateStorage::executeAsyncQuery(const QString &queryString)
111void WindowStateStorage::executeAsyncQuery(const QString &queryString)
85{
112{
86 QMutexLocker l(&s_mutex);
113 QMutexLocker l(&s_mutex);
@@ -97,7 +124,7 @@ void WindowStateStorage::executeAsyncQuery(const QString &queryString)
97QRect WindowStateStorage::getGeometry(const QString &windowId, const QRect defaultValue) const
124QRect WindowStateStorage::getGeometry(const QString &windowId, const QRect defaultValue) const
98{
125{
99 QString queryString = QStringLiteral("SELECT * FROM geometry WHERE windowId = '%1';")
126 QString queryString = QStringLiteral("SELECT * FROM geometry WHERE windowId = '%1';")
100− .arg(windowId);
127+ .arg(sanitiseString(windowId));
101
128
102 QSqlQuery query = getValue(queryString);
129 QSqlQuery query = getValue(queryString);
103
130
@@ -124,6 +151,11 @@ void WindowStateStorage::initdb()
124 QSqlQuery query;
151 QSqlQuery query;
125 query.exec(QStringLiteral("CREATE TABLE state(windowId TEXT UNIQUE, state INTEGER);"));
152 query.exec(QStringLiteral("CREATE TABLE state(windowId TEXT UNIQUE, state INTEGER);"));
126 }
153 }
154+
155+ if (!m_db.tables().contains(QStringLiteral("stage"))) {
156+ QSqlQuery query;
157+ query.exec(QStringLiteral("CREATE TABLE stage(appId TEXT UNIQUE, stage INTEGER);"));
158+ }
127}
159}
128
160
129void WindowStateStorage::saveValue(const QString &queryString)
161void WindowStateStorage::saveValue(const QString &queryString)
plugins/Utils/windowstatestorage.h+3
@@ -38,6 +38,9 @@ public:
38 Q_INVOKABLE void saveGeometry(const QString &windowId, const QRect rect);
38 Q_INVOKABLE void saveGeometry(const QString &windowId, const QRect rect);
39 Q_INVOKABLE QRect getGeometry(const QString &windowId, const QRect defaultValue) const;
39 Q_INVOKABLE QRect getGeometry(const QString &windowId, const QRect defaultValue) const;
40
40
41+ Q_INVOKABLE void saveStage(const QString &appId, int stage);
42+ Q_INVOKABLE int getStage(const QString &appId) const;
43+
41private:
44private:
42 void initdb();
45 void initdb();
43
46
plugins/Wizard/CMakeLists.txt+7−1
@@ -1,10 +1,16 @@
1+include_directories(${GLIB_INCLUDE_DIRS} ${GEONAMES_INCLUDE_DIRS})
2+
1add_library(Wizard-qml MODULE
3add_library(Wizard-qml MODULE
2 plugin.cpp
4 plugin.cpp
3 PageList.cpp
5 PageList.cpp
4 System.cpp
6 System.cpp
7+ LocalePlugin.cpp
8+ timezonemodel.cpp
9+ Status.cpp
5)
10)
6
11
7−qt5_use_modules(Wizard-qml DBus Qml)
12+qt5_use_modules(Wizard-qml DBus Qml Concurrent)
13+target_link_libraries(Wizard-qml ${GLIB_LDFLAGS} ${GEONAMES_LDFLAGS})
8add_unity8_plugin(Wizard 0.1 Wizard TARGETS Wizard-qml)
14add_unity8_plugin(Wizard 0.1 Wizard TARGETS Wizard-qml)
9
15
10set(POLKIT_LIB_DIR "${CMAKE_INSTALL_LOCALSTATEDIR}/lib/polkit-1")
16set(POLKIT_LIB_DIR "${CMAKE_INSTALL_LOCALSTATEDIR}/lib/polkit-1")
plugins/Wizard/LocalePlugin.cppnew file+291
@@ -0,0 +1,291 @@
1+/*
2+ * Copyright (C) 2015 Canonical Ltd.
3+ *
4+ * This program is free software: you can redistribute it and/or modify it
5+ * under the terms of the GNU General Public License version 3, as published
6+ * by the Free Software Foundation.
7+ *
8+ * This program is distributed in the hope that it will be useful, but
9+ * WITHOUT ANY WARRANTY; without even the implied warranties of
10+ * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
11+ * PURPOSE. See the GNU General Public License for more details.
12+ *
13+ * You should have received a copy of the GNU General Public License along
14+ * with this program. If not, see <http://www.gnu.org/licenses/>.
15+ */
16+
17+#include <QLocale>
18+#include <QStringList>
19+
20+#include <libintl.h>
21+
22+#include "LocalePlugin.h"
23+
24+class LocalePrivate {
25+public:
26+ LocalePrivate() {
27+ m_mccCodes = QHash<int, QString>
28+ ({{202,"gr"},
29+ {204,"nl"},
30+ {206,"be"},
31+ {208,"fr"},
32+ {212,"mc"},
33+ {213,"ad"},
34+ {214,"es"},
35+ {216,"hu"},
36+ {218,"ba"},
37+ {219,"hr"},
38+ {220,"rs"},
39+ {222,"it"},
40+ {226,"ro"},
41+ {228,"ch"},
42+ {230,"cz"},
43+ {231,"sk"},
44+ {232,"at"},
45+ {234,"gb"},
46+ {235,"gb"},
47+ {238,"dk"},
48+ {240,"se"},
49+ {242,"no"},
50+ {244,"fi"},
51+ {246,"lt"},
52+ {247,"lv"},
53+ {248,"ee"},
54+ {250,"ru"},
55+ {255,"ua"},
56+ {257,"by"},
57+ {259,"md"},
58+ {260,"pl"},
59+ {262,"de"},
60+ {266,"gi"},
61+ {268,"pt"},
62+ {270,"lu"},
63+ {272,"ie"},
64+ {274,"is"},
65+ {276,"al"},
66+ {278,"mt"},
67+ {280,"cy"},
68+ {282,"ge"},
69+ {283,"am"},
70+ {284,"bg"},
71+ {286,"tr"},
72+ {288,"fo"},
73+ {289,"ge"},
74+ {290,"gl"},
75+ {292,"sm"},
76+ {293,"si"},
77+ {294,"mk"},
78+ {295,"li"},
79+ {297,"me"},
80+ {302,"ca"},
81+ {308,"pm"},
82+ {310,"gu"},
83+ {310,"us"},
84+ {311,"gu"},
85+ {311,"us"},
86+ {312,"us"},
87+ {316,"us"},
88+ {330,"pr"},
89+ {334,"mx"},
90+ {338,"jm"},
91+ {340,"fg"},
92+ {340,"gp"},
93+ {340,"mq"},
94+ {342,"bb"},
95+ {344,"ag"},
96+ {346,"ky"},
97+ {348,"vg"},
98+ {350,"bm"},
99+ {352,"gd"},
100+ {354,"ms"},
101+ {356,"kn"},
102+ {358,"lc"},
103+ {360,"vc"},
104+ {362,"an"},
105+ {362,"cw"},
106+ {363,"aw"},
107+ {364,"bs"},
108+ {365,"ai"},
109+ {366,"dm"},
110+ {368,"cu"},
111+ {370,"do"},
112+ {372,"ht"},
113+ {374,"tt"},
114+ {376,"tc"},
115+ {376,"vi"},
116+ {400,"az"},
117+ {401,"kz"},
118+ {402,"bt"},
119+ {404,"in"},
120+ {405,"in"},
121+ {410,"pk"},
122+ {412,"af"},
123+ {413,"lk"},
124+ {414,"mm"},
125+ {415,"lb"},
126+ {416,"jo"},
127+ {417,"sy"},
128+ {418,"iq"},
129+ {419,"kw"},
130+ {420,"sa"},
131+ {421,"ye"},
132+ {422,"om"},
133+ {424,"ae"},
134+ {425,"il"},
135+ {425,"ps"},
136+ {426,"bh"},
137+ {427,"qa"},
138+ {428,"mn"},
139+ {429,"np"},
140+ {430,"ae"},
141+ {431,"ae"},
142+ {432,"ir"},
143+ {434,"uz"},
144+ {436,"tk"},
145+ {437,"kg"},
146+ {438,"tm"},
147+ {440,"jp"},
148+ {441,"jp"},
149+ {450,"kr"},
150+ {452,"vn"},
151+ {454,"hk"},
152+ {455,"mo"},
153+ {456,"kh"},
154+ {457,"la"},
155+ {460,"cn"},
156+ {466,"tw"},
157+ {467,"kp"},
158+ {470,"bd"},
159+ {472,"mv"},
160+ {502,"my"},
161+ {505,"au"},
162+ {510,"id"},
163+ {514,"tp"},
164+ {515,"ph"},
165+ {520,"th"},
166+ {525,"sg"},
167+ {528,"bn"},
168+ {530,"nz"},
169+ {537,"pg"},
170+ {539,"to"},
171+ {540,"sb"},
172+ {541,"vu"},
173+ {542,"fj"},
174+ {544,"as"},
175+ {545,"ki"},
176+ {546,"nc"},
177+ {547,"pf"},
178+ {548,"ck"},
179+ {549,"ws"},
180+ {550,"fm"},
181+ {552,"pw"},
182+ {553,"tv"},
183+ {555,"nu"},
184+ {602,"eg"},
185+ {603,"dz"},
186+ {604,"ma"},
187+ {605,"tn"},
188+ {606,"ly"},
189+ {607,"gm"},
190+ {608,"sn"},
191+ {609,"mr"},
192+ {610,"ml"},
193+ {611,"gn"},
194+ {612,"ci"},
195+ {613,"bf"},
196+ {614,"ne"},
197+ {615,"tg"},
198+ {616,"bj"},
199+ {617,"mu"},
200+ {618,"lr"},
201+ {619,"sl"},
202+ {620,"gh"},
203+ {621,"ng"},
204+ {622,"td"},
205+ {623,"cf"},
206+ {624,"cm"},
207+ {625,"cv"},
208+ {626,"st"},
209+ {627,"gq"},
210+ {628,"ga"},
211+ {629,"cg"},
212+ {630,"cd"},
213+ {631,"ao"},
214+ {632,"gw"},
215+ {633,"sc"},
216+ {634,"sd"},
217+ {635,"rw"},
218+ {636,"et"},
219+ {637,"so"},
220+ {638,"dj"},
221+ {639,"ke"},
222+ {640,"tz"},
223+ {641,"ug"},
224+ {642,"bi"},
225+ {643,"mz"},
226+ {645,"zm"},
227+ {646,"mg"},
228+ {647,"re"},
229+ {648,"zw"},
230+ {649,"na"},
231+ {650,"mw"},
232+ {651,"ls"},
233+ {652,"bw"},
234+ {653,"sz"},
235+ {654,"km"},
236+ {655,"za"},
237+ {657,"er"},
238+ {659,"ss"},
239+ {702,"bz"},
240+ {704,"gt"},
241+ {706,"sv"},
242+ {708,"hn"},
243+ {710,"ni"},
244+ {712,"cr"},
245+ {714,"pa"},
246+ {716,"pe"},
247+ {722,"ar"},
248+ {724,"br"},
249+ {730,"cl"},
250+ {732,"co"},
251+ {734,"ve"},
252+ {736,"bo"},
253+ {738,"gy"},
254+ {740,"ec"},
255+ {744,"py"},
256+ {746,"sr"},
257+ {748,"uy"},
258+ {750,"fk"}}
259+ );
260+ }
261+
262+ QString mccToCountryCode(int mcc) const {
263+ return m_mccCodes.value(mcc, "us").toUpper();
264+ }
265+
266+private:
267+ // MCC = Mobile Country Code, see https://en.wikipedia.org/wiki/Mobile_country_code
268+ QHash<int,QString> m_mccCodes;
269+};
270+
271+Q_GLOBAL_STATIC(LocalePrivate, d)
272+
273+LocaleAttached::LocaleAttached(QObject* parent)
274+ : QObject(parent)
275+{
276+}
277+
278+QString LocaleAttached::mccToCountryCode(int mcc) const
279+{
280+ return d->mccToCountryCode(mcc);
281+}
282+
283+LocalePlugin::LocalePlugin(QObject* parent)
284+ : QObject(parent)
285+{
286+}
287+
288+LocaleAttached* LocalePlugin::qmlAttachedProperties(QObject* parent)
289+{
290+ return new LocaleAttached(parent);
291+}
plugins/Wizard/LocalePlugin.hnew file+58
@@ -0,0 +1,58 @@
1+/*
2+ * Copyright (C) 2015 Canonical Ltd.
3+ *
4+ * This program is free software: you can redistribute it and/or modify it
5+ * under the terms of the GNU General Public License version 3, as published
6+ * by the Free Software Foundation.
7+ *
8+ * This program is distributed in the hope that it will be useful, but
9+ * WITHOUT ANY WARRANTY; without even the implied warranties of
10+ * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
11+ * PURPOSE. See the GNU General Public License for more details.
12+ *
13+ * You should have received a copy of the GNU General Public License along
14+ * with this program. If not, see <http://www.gnu.org/licenses/>.
15+ */
16+
17+#ifndef LOCALE_PLUGIN_H
18+#define LOCALE_PLUGIN_H
19+
20+#include <QObject>
21+#include <QString>
22+#include <QJsonObject>
23+#include <QtQml>
24+
25+class LocaleAttached: public QObject
26+{
27+ Q_OBJECT
28+protected:
29+ explicit LocaleAttached(QObject *parent = 0);
30+
31+public:
32+ Q_INVOKABLE QString mccToCountryCode(int mcc) const;
33+
34+ friend class LocalePlugin;
35+};
36+
37+/**
38+ * A simplified wrapper around QLocale.
39+ *
40+ * The wrapper is implemented as an attached property, which makes it possible
41+ * to use it as if its methods were static:
42+ *
43+ * @code
44+ * var langs = LocalePlugin.languages();
45+ * @endcode
46+ */
47+class LocalePlugin: public QObject
48+{
49+ Q_OBJECT
50+public:
51+ explicit LocalePlugin(QObject *parent = 0);
52+
53+ static LocaleAttached* qmlAttachedProperties(QObject *parent);
54+};
55+
56+QML_DECLARE_TYPEINFO(LocalePlugin, QML_HAS_ATTACHED_PROPERTIES)
57+
58+#endif // LOCALE_PLUGIN_H
plugins/Wizard/PageList.cpp+4−4
@@ -40,20 +40,20 @@ PageList::PageList(QObject *parent)
40 m_index(-1),
40 m_index(-1),
41 m_pages()
41 m_pages()
42{
42{
43− QString qmlSuffix = QStringLiteral(".qml");
43+ const QString qmlSuffix = QStringLiteral(".qml");
44− QString disabledSuffix = QStringLiteral(".disabled");
44+ const QString disabledSuffix = QStringLiteral(".disabled");
45 QSet<QString> disabledPages;
45 QSet<QString> disabledPages;
46 QStringList dataDirs;
46 QStringList dataDirs;
47
47
48 if (!isRunningInstalled() && getenv("WIZARD_TESTING") == nullptr) {
48 if (!isRunningInstalled() && getenv("WIZARD_TESTING") == nullptr) {
49− dataDirs = QStringList() << qmlDirectory();
49+ dataDirs << qmlDirectory();
50 } else {
50 } else {
51 dataDirs = shellDataDirs();
51 dataDirs = shellDataDirs();
52 }
52 }
53
53
54 Q_FOREACH(const QString &dataDir, dataDirs) {
54 Q_FOREACH(const QString &dataDir, dataDirs) {
55 QDir dir(dataDir + "/Wizard/Pages");
55 QDir dir(dataDir + "/Wizard/Pages");
56− QStringList entries = dir.entryList(QStringList(QStringLiteral("[0-9]*")), QDir::Files | QDir::Readable);
56+ const QStringList entries = dir.entryList(QStringList(QStringLiteral("[0-9]*")), QDir::Files | QDir::Readable);
57 Q_FOREACH(const QString &entry, entries) {
57 Q_FOREACH(const QString &entry, entries) {
58 if (!m_pages.contains(entry) && entry.endsWith(qmlSuffix))
58 if (!m_pages.contains(entry) && entry.endsWith(qmlSuffix))
59 m_pages.insert(entry, dir.absoluteFilePath(entry));
59 m_pages.insert(entry, dir.absoluteFilePath(entry));
plugins/Wizard/Status.cppnew file+143
@@ -0,0 +1,143 @@
1+/*
2+ * Copyright (C) 2015 Canonical Ltd.
3+ *
4+ * This program is free software: you can redistribute it and/or modify it
5+ * under the terms of the GNU General Public License version 3, as published
6+ * by the Free Software Foundation.
7+ *
8+ * This program is distributed in the hope that it will be useful, but
9+ * WITHOUT ANY WARRANTY; without even the implied warranties of
10+ * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
11+ * PURPOSE. See the GNU General Public License for more details.
12+ *
13+ * You should have received a copy of the GNU General Public License along
14+ * with this program. If not, see <http://www.gnu.org/licenses/>.
15+ */
16+
17+#include <QDebug>
18+#include <QDBusConnection>
19+
20+#include "Status.h"
21+
22+Status::Status()
23+{
24+ initNM();
25+ initUPower();
26+}
27+
28+void Status::initNM()
29+{
30+ m_nmIface = new QDBusInterface("org.freedesktop.NetworkManager", "/org/freedesktop/NetworkManager", "org.freedesktop.NetworkManager",
31+ QDBusConnection::systemBus(), this);
32+
33+ QDBusConnection::systemBus().connect("org.freedesktop.NetworkManager", "/org/freedesktop/NetworkManager", "org.freedesktop.NetworkManager", "PropertiesChanged",
34+ this, SLOT(onNMPropertiesChanged(QVariantMap)));
35+}
36+
37+void Status::onNMPropertiesChanged(const QVariantMap &changedProps)
38+{
39+ if (changedProps.contains("State") || changedProps.contains("Connectivity")) {
40+ Q_EMIT onlineChanged();
41+ Q_EMIT networkIconChanged();
42+ }
43+
44+ if (changedProps.contains("PrimaryConnection") || changedProps.contains("SpecificObject") || changedProps.contains("Strength")) {
45+ Q_EMIT networkIconChanged();
46+ }
47+}
48+
49+bool Status::online() const
50+{
51+ if (!m_nmIface->isValid())
52+ return false;
53+
54+ return m_nmIface->property("State").toUInt() == 70;
55+}
56+
57+QString Status::networkIcon()
58+{
59+ QString iconName = QStringLiteral("nm-no-connection");
60+
61+ if (!online()) {
62+ return iconName;
63+ }
64+
65+ const QString primaryConn = m_nmIface->property("PrimaryConnection").value<QDBusObjectPath>().path();
66+ const QString primaryConnType = m_nmIface->property("PrimaryConnectionType").toString();
67+
68+ if (primaryConn.isEmpty()) {
69+ qWarning() << "Empty primary connection";
70+ return iconName;
71+ }
72+
73+ if (primaryConnType == "802-11-wireless") {
74+ QDBusInterface activeConn("org.freedesktop.NetworkManager", primaryConn, "org.freedesktop.NetworkManager.Connection.Active", QDBusConnection::systemBus());
75+
76+ if (activeConn.isValid()) {
77+ const QString apPath = activeConn.property("SpecificObject").value<QDBusObjectPath>().path();
78+
79+ if (apPath.isEmpty()) {
80+ qWarning() << "No AP path";
81+ return iconName;
82+ }
83+
84+ QDBusConnection::systemBus().connect("org.freedesktop.NetworkManager", primaryConn, "org.freedesktop.NetworkManager.Connection.Active", "PropertiesChanged",
85+ this, SLOT(onNMPropertiesChanged(QVariantMap)));
86+
87+ QDBusInterface ap("org.freedesktop.NetworkManager", apPath, "org.freedesktop.NetworkManager.AccessPoint", QDBusConnection::systemBus());
88+
89+ if (!ap.isValid()) {
90+ qWarning() << "Invalid AP";
91+ return iconName;
92+ }
93+
94+ QDBusConnection::systemBus().connect("org.freedesktop.NetworkManager", apPath, "org.freedesktop.NetworkManager.AccessPoint", "PropertiesChanged",
95+ this, SLOT(onNMPropertiesChanged(QVariantMap)));
96+
97+ const uint strength = ap.property("Strength").toUInt();
98+ const uint flags = ap.property("Flags").toUInt();
99+
100+ if (strength == 0) {
101+ iconName = "nm-signal-00";
102+ } else if (strength <= 25) {
103+ iconName = "nm-signal-25";
104+ } else if (strength <= 50) {
105+ iconName = "nm-signal-50";
106+ } else if (strength <= 75) {
107+ iconName = "nm-signal-75";
108+ } else if (strength <= 100) {
109+ iconName = "nm-signal-100";
110+ }
111+
112+ if (flags >= 1) {
113+ iconName += "-secure";
114+ }
115+ }
116+ }
117+
118+ return iconName;
119+}
120+
121+void Status::initUPower()
122+{
123+ m_upowerIface = new QDBusInterface("org.freedesktop.UPower", "/org/freedesktop/UPower/devices/DisplayDevice", "org.freedesktop.UPower.Device",
124+ QDBusConnection::systemBus(), this);
125+ QDBusConnection::systemBus().connect("org.freedesktop.UPower", "/org/freedesktop/UPower/devices/DisplayDevice", "org.freedesktop.DBus.Properties",
126+ "PropertiesChanged", this, SLOT(onUPowerPropertiesChanged(QString,QVariantMap,QStringList)));
127+}
128+
129+void Status::onUPowerPropertiesChanged(const QString &iface, const QVariantMap &changedProps, const QStringList &invalidatedProps)
130+{
131+ Q_UNUSED(iface)
132+ Q_UNUSED(invalidatedProps)
133+
134+ if (changedProps.contains("IconName")) {
135+ Q_EMIT batteryIconChanged();
136+ }
137+}
138+
139+QString Status::batteryIcon() const
140+{
141+ const QString iconName = m_upowerIface->property("IconName").toString();
142+ return iconName;
143+}
plugins/Wizard/Status.hnew file+60
@@ -0,0 +1,60 @@
1+/*
2+ * Copyright (C) 2015 Canonical Ltd.
3+ *
4+ * This program is free software: you can redistribute it and/or modify it
5+ * under the terms of the GNU General Public License version 3, as published
6+ * by the Free Software Foundation.
7+ *
8+ * This program is distributed in the hope that it will be useful, but
9+ * WITHOUT ANY WARRANTY; without even the implied warranties of
10+ * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
11+ * PURPOSE. See the GNU General Public License for more details.
12+ *
13+ * You should have received a copy of the GNU General Public License along
14+ * with this program. If not, see <http://www.gnu.org/licenses/>.
15+ */
16+
17+#ifndef WIZARD_STATUS_H
18+#define WIZARD_STATUS_H
19+
20+#include <QObject>
21+#include <QString>
22+#include <QDBusInterface>
23+
24+class Status: public QObject
25+{
26+ Q_OBJECT
27+ Q_PROPERTY(bool online READ online NOTIFY onlineChanged)
28+ Q_PROPERTY(QString networkIcon READ networkIcon NOTIFY networkIconChanged)
29+ Q_PROPERTY(QString batteryIcon READ batteryIcon NOTIFY batteryIconChanged)
30+public:
31+ Status();
32+ ~Status() = default;
33+
34+ bool online() const;
35+ QString networkIcon();
36+
37+ QString batteryIcon() const;
38+
39+Q_SIGNALS:
40+ void networkIconChanged();
41+ void onlineChanged();
42+ void batteryIconChanged();
43+
44+private Q_SLOTS:
45+ void onNMPropertiesChanged(const QVariantMap &changedProps);
46+ void onUPowerPropertiesChanged(const QString &iface, const QVariantMap &changedProps, const QStringList &invalidatedProps);
47+
48+private:
49+ Q_DISABLE_COPY(Status)
50+
51+ // network status
52+ void initNM();
53+ QDBusInterface * m_nmIface = nullptr;
54+
55+ // battery status
56+ void initUPower();
57+ QDBusInterface * m_upowerIface = nullptr;
58+};
59+
60+#endif
plugins/Wizard/System.cpp+5−4
@@ -1,5 +1,5 @@
1/*
1/*
2− * Copyright (C) 2014 Canonical Ltd.
2+ * Copyright (C) 2014-2015 Canonical Ltd.
3 *
3 *
4 * This program is free software: you can redistribute it and/or modify it
4 * This program is free software: you can redistribute it and/or modify it
5 * under the terms of the GNU General Public License version 3, as published
5 * under the terms of the GNU General Public License version 3, as published
@@ -25,10 +25,10 @@
25#include <QLocale>
25#include <QLocale>
26#include <QMap>
26#include <QMap>
27#include <QProcess>
27#include <QProcess>
28+#include <QDebug>
28
29
29System::System()
30System::System()
30− : QObject(),
31+ : QObject()
31− m_fsWatcher()
32{
32{
33 // Register the argument needed for UpdateActivationEnvironment below
33 // Register the argument needed for UpdateActivationEnvironment below
34 qDBusRegisterMetaType<QMap<QString,QString>>();
34 qDBusRegisterMetaType<QMap<QString,QString>>();
@@ -88,7 +88,7 @@ void System::setSessionVariable(const QString &variable, const QString &value)
88 QDBusConnection::sessionBus().asyncCall(msg);
88 QDBusConnection::sessionBus().asyncCall(msg);
89}
89}
90
90
91−void System::updateSessionLanguage(const QString &locale)
91+void System::updateSessionLocale(const QString &locale)
92{
92{
93 const QString language = locale.split(QStringLiteral("."))[0];
93 const QString language = locale.split(QStringLiteral("."))[0];
94
94
@@ -106,5 +106,6 @@ void System::updateSessionLanguage(const QString &locale)
106 initctl stop smart-scopes-proxy; \
106 initctl stop smart-scopes-proxy; \
107 initctl emit --no-wait indicator-services-start; \
107 initctl emit --no-wait indicator-services-start; \
108 initctl restart --no-wait maliit-server; \
108 initctl restart --no-wait maliit-server; \
109+ initctl restart --no-wait indicator-messages; \
109 initctl restart --no-wait unity8-dash\""));
110 initctl restart --no-wait unity8-dash\""));
110}
111}
plugins/Wizard/System.h+3−2
@@ -1,5 +1,5 @@
1/*
1/*
2− * Copyright (C) 2014 Canonical Ltd.
2+ * Copyright (C) 2014-2015 Canonical Ltd.
3 *
3 *
4 * This program is free software: you can redistribute it and/or modify it
4 * This program is free software: you can redistribute it and/or modify it
5 * under the terms of the GNU General Public License version 3, as published
5 * under the terms of the GNU General Public License version 3, as published
@@ -28,12 +28,13 @@ class System : public QObject
28
28
29public:
29public:
30 System();
30 System();
31+ ~System() = default;
31
32
32 bool wizardEnabled() const;
33 bool wizardEnabled() const;
33 void setWizardEnabled(bool enabled);
34 void setWizardEnabled(bool enabled);
34
35
35public Q_SLOTS:
36public Q_SLOTS:
36− void updateSessionLanguage(const QString &locale);
37+ void updateSessionLocale(const QString &locale);
37
38
38Q_SIGNALS:
39Q_SIGNALS:
39 void wizardEnabledChanged();
40 void wizardEnabledChanged();
plugins/Wizard/plugin.cpp+7−8
@@ -17,19 +17,18 @@
17#include "plugin.h"
17#include "plugin.h"
18#include "PageList.h"
18#include "PageList.h"
19#include "System.h"
19#include "System.h"
20+#include "timezonemodel.h"
21+#include "LocalePlugin.h"
22+#include "Status.h"
20
23
21#include <QtQml/qqml.h>
24#include <QtQml/qqml.h>
22
25
23−static QObject *system_provider(QQmlEngine *engine, QJSEngine *scriptEngine)
24−{
25− Q_UNUSED(engine)
26− Q_UNUSED(scriptEngine)
27− return new System();
28−}
29−
30void WizardPlugin::registerTypes(const char *uri)
26void WizardPlugin::registerTypes(const char *uri)
31{
27{
32 Q_ASSERT(uri == QLatin1String("Wizard"));
28 Q_ASSERT(uri == QLatin1String("Wizard"));
33 qmlRegisterType<PageList>(uri, 0, 1, "PageList");
29 qmlRegisterType<PageList>(uri, 0, 1, "PageList");
34− qmlRegisterSingletonType<System>(uri, 0, 1, "System", system_provider);
30+ qmlRegisterSingletonType<System>(uri, 0, 1, "System", [](QQmlEngine*, QJSEngine*) -> QObject* { return new System; });
31+ qmlRegisterSingletonType<Status>(uri, 0, 1, "Status", [](QQmlEngine*, QJSEngine*) -> QObject* { return new Status; });
32+ qmlRegisterType<TimeZoneLocationModel>(uri, 0, 1, "TimeZoneModel");
33+ qmlRegisterType<LocalePlugin>(uri, 0, 1, "LocalePlugin");
35}
34}
plugins/Wizard/plugin.h+1−2
@@ -17,13 +17,12 @@
17#ifndef WIZARD_PLUGIN_H
17#ifndef WIZARD_PLUGIN_H
18#define WIZARD_PLUGIN_H
18#define WIZARD_PLUGIN_H
19
19
20−#include <QtQml/QQmlEngine>
21#include <QtQml/QQmlExtensionPlugin>
20#include <QtQml/QQmlExtensionPlugin>
22
21
23class WizardPlugin : public QQmlExtensionPlugin
22class WizardPlugin : public QQmlExtensionPlugin
24{
23{
25 Q_OBJECT
24 Q_OBJECT
26− Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface")
25+ Q_PLUGIN_METADATA(IID QQmlExtensionInterface_iid)
27
26
28public:
27public:
29 void registerTypes(const char *uri) override;
28 void registerTypes(const char *uri) override;
plugins/Wizard/timezonemodel.cppnew file+244
@@ -0,0 +1,244 @@
1+/*
2+ * Copyright (C) 2016 Canonical Ltd.
3+ *
4+ * This program is free software: you can redistribute it and/or modify it
5+ * under the terms of the GNU General Public License version 3, as published
6+ * by the Free Software Foundation.
7+ *
8+ * This program is distributed in the hope that it will be useful, but
9+ * WITHOUT ANY WARRANTY; without even the implied warranties of
10+ * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
11+ * PURPOSE. See the GNU General Public License for more details.
12+ *
13+ * You should have received a copy of the GNU General Public License along
14+ * with this program. If not, see <http://www.gnu.org/licenses/>.
15+ */
16+
17+#include <QDebug>
18+
19+#include <glib.h>
20+#include <glib-object.h>
21+
22+#include "LocalePlugin.h"
23+#include "timezonemodel.h"
24+
25+TimeZoneLocationModel::TimeZoneLocationModel(QObject *parent):
26+ QAbstractListModel(parent),
27+ m_listUpdating(false),
28+ m_cancellable(nullptr)
29+{
30+ m_roleNames[Qt::DisplayRole] = "displayName";
31+ m_roleNames[TimeZoneRole] = "timeZone";
32+ m_roleNames[CityRole] = "city";
33+ m_roleNames[CountryRole] = "country";
34+ m_roleNames[OffsetRole] = "offset";
35+ m_roleNames[LatitudeRole] = "latitude";
36+ m_roleNames[LongitudeRole] = "longitude";
37+}
38+
39+int TimeZoneLocationModel::rowCount(const QModelIndex &parent) const
40+{
41+ if (parent.isValid()) {
42+ return 0;
43+ } else if (m_filter.isEmpty()) {
44+ return m_countryLocations.count();
45+ } else {
46+ return m_locations.count();
47+ }
48+}
49+
50+QVariant TimeZoneLocationModel::data(const QModelIndex &index, int role) const
51+{
52+ GeonamesCity *city;
53+ if (m_filter.isEmpty()) {
54+ city = m_countryLocations.value(index.row());
55+ } else {
56+ city = m_locations.value(index.row());
57+ }
58+ if (!city)
59+ return QVariant();
60+
61+ switch (role) {
62+ case Qt::DisplayRole:
63+ return QStringLiteral("%1, %2, %3").arg(geonames_city_get_name(city))
64+ .arg(geonames_city_get_state(city))
65+ .arg(geonames_city_get_country(city));
66+ case SimpleRole:
67+ return QStringLiteral("%1, %2").arg(geonames_city_get_name(city))
68+ .arg(geonames_city_get_country(city));
69+ case TimeZoneRole:
70+ return geonames_city_get_timezone(city);
71+ case CountryRole:
72+ return geonames_city_get_country(city);
73+ case CityRole:
74+ return geonames_city_get_name(city);
75+ case OffsetRole: {
76+ QTimeZone tmp(geonames_city_get_timezone(city));
77+ return static_cast<double>(tmp.standardTimeOffset(QDateTime::currentDateTime())) / 3600;
78+ }
79+ case LatitudeRole:
80+ return geonames_city_get_latitude(city);
81+ case LongitudeRole:
82+ return geonames_city_get_longitude(city);
83+ default:
84+ qWarning() << Q_FUNC_INFO << "Unknown role";
85+ return QVariant();
86+ }
87+}
88+
89+QHash<int, QByteArray> TimeZoneLocationModel::roleNames() const
90+{
91+ return m_roleNames;
92+}
93+
94+void TimeZoneLocationModel::setModel(const QList<GeonamesCity *> &locations)
95+{
96+ beginResetModel();
97+
98+ Q_FOREACH(GeonamesCity *city, m_locations) {
99+ geonames_city_free(city);
100+ }
101+
102+ m_locations = locations;
103+ endResetModel();
104+}
105+
106+void TimeZoneLocationModel::filterFinished(GObject *source_object,
107+ GAsyncResult *res,
108+ gpointer user_data)
109+{
110+ Q_UNUSED(source_object);
111+
112+ g_autofree gint *cities = nullptr;
113+ guint cities_len = 0;
114+ g_autoptr(GError) error = nullptr;
115+
116+ cities = geonames_query_cities_finish(res, &cities_len, &error);
117+ if (error) {
118+ if (!g_error_matches(error, G_IO_ERROR, G_IO_ERROR_CANCELLED)) {
119+ TimeZoneLocationModel *model = static_cast<TimeZoneLocationModel *>(user_data);
120+ g_clear_object(&model->m_cancellable);
121+ model->setListUpdating(false);
122+ qWarning() << "Could not filter timezones:" << error->message;
123+ }
124+ return;
125+ }
126+
127+ QList<GeonamesCity *> locations;
128+
129+ for (guint i = 0; i < cities_len; ++i) {
130+ GeonamesCity *city = geonames_get_city(cities[i]);
131+ if (city) {
132+ locations.append(city);
133+ }
134+ }
135+
136+ TimeZoneLocationModel *model = static_cast<TimeZoneLocationModel *>(user_data);
137+
138+ g_clear_object(&model->m_cancellable);
139+
140+ model->setModel(locations);
141+ model->setListUpdating(false);
142+}
143+
144+bool TimeZoneLocationModel::listUpdating() const
145+{
146+ return m_listUpdating;
147+}
148+
149+void TimeZoneLocationModel::setListUpdating(bool listUpdating)
150+{
151+ if (m_listUpdating != listUpdating) {
152+ m_listUpdating = listUpdating;
153+ Q_EMIT listUpdatingChanged();
154+ }
155+}
156+
157+QString TimeZoneLocationModel::filter() const
158+{
159+ return m_filter;
160+}
161+
162+void TimeZoneLocationModel::setFilter(const QString &filter)
163+{
164+ if (filter != m_filter) {
165+ m_filter = filter;
166+ Q_EMIT filterChanged();
167+ }
168+
169+ setListUpdating(true);
170+
171+ if (m_cancellable) {
172+ g_cancellable_cancel(m_cancellable);
173+ g_clear_object(&m_cancellable);
174+ }
175+
176+ setModel(QList<GeonamesCity *>());
177+
178+ if (filter.isEmpty()) {
179+ setListUpdating(false);
180+ return;
181+ }
182+
183+ m_cancellable = g_cancellable_new();
184+ geonames_query_cities(filter.toUtf8().data(),
185+ GEONAMES_QUERY_DEFAULT,
186+ m_cancellable,
187+ filterFinished,
188+ this);
189+}
190+
191+QString TimeZoneLocationModel::country() const
192+{
193+ return m_country;
194+}
195+
196+static bool citycmp(GeonamesCity *a, GeonamesCity *b)
197+{
198+ return geonames_city_get_population(b) < geonames_city_get_population(a);
199+}
200+
201+void TimeZoneLocationModel::setCountry(const QString &country)
202+{
203+ if (m_country == country)
204+ return;
205+
206+ beginResetModel();
207+
208+ m_country = country;
209+
210+ Q_FOREACH(GeonamesCity *city, m_countryLocations) {
211+ geonames_city_free(city);
212+ }
213+ m_countryLocations.clear();
214+
215+ gint num_cities = geonames_get_n_cities();
216+ for (gint i = 0; i < num_cities; i++) {
217+ GeonamesCity *city = geonames_get_city(i);
218+ if (city && m_country == geonames_city_get_country_code(city)) {
219+ m_countryLocations.append(city);
220+ }
221+ }
222+
223+ std::sort(m_countryLocations.begin(), m_countryLocations.end(), citycmp);
224+
225+ endResetModel();
226+
227+ Q_EMIT countryChanged(country);
228+}
229+
230+TimeZoneLocationModel::~TimeZoneLocationModel()
231+{
232+ if (m_cancellable) {
233+ g_cancellable_cancel(m_cancellable);
234+ g_clear_object(&m_cancellable);
235+ }
236+
237+ Q_FOREACH(GeonamesCity *city, m_countryLocations) {
238+ geonames_city_free(city);
239+ }
240+
241+ Q_FOREACH(GeonamesCity *city, m_locations) {
242+ geonames_city_free(city);
243+ }
244+}
plugins/Wizard/timezonemodel.hnew file+80
@@ -0,0 +1,80 @@
1+/*
2+ * Copyright (C) 2016 Canonical Ltd.
3+ *
4+ * This program is free software: you can redistribute it and/or modify it
5+ * under the terms of the GNU General Public License version 3, as published
6+ * by the Free Software Foundation.
7+ *
8+ * This program is distributed in the hope that it will be useful, but
9+ * WITHOUT ANY WARRANTY; without even the implied warranties of
10+ * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
11+ * PURPOSE. See the GNU General Public License for more details.
12+ *
13+ * You should have received a copy of the GNU General Public License along
14+ * with this program. If not, see <http://www.gnu.org/licenses/>.
15+ */
16+
17+#ifndef TIMEZONEMODEL_H
18+#define TIMEZONEMODEL_H
19+
20+#include <geonames.h>
21+#include <glib.h>
22+#include <QAbstractListModel>
23+
24+class TimeZoneLocationModel: public QAbstractListModel
25+{
26+ Q_OBJECT
27+ Q_PROPERTY(bool listUpdating READ listUpdating NOTIFY listUpdatingChanged)
28+ Q_PROPERTY(QString filter READ filter WRITE setFilter NOTIFY filterChanged)
29+ Q_PROPERTY(QString country READ country WRITE setCountry NOTIFY countryChanged)
30+ Q_ENUMS(Roles)
31+
32+public:
33+ explicit TimeZoneLocationModel(QObject *parent = nullptr);
34+ ~TimeZoneLocationModel();
35+
36+ enum Roles {
37+ TimeZoneRole = Qt::UserRole + 1,
38+ CityRole,
39+ CountryRole,
40+ SimpleRole,
41+ OffsetRole,
42+ LatitudeRole,
43+ LongitudeRole
44+ };
45+
46+ int rowCount(const QModelIndex &parent = QModelIndex()) const override;
47+ QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override;
48+ QHash<int, QByteArray> roleNames() const override;
49+
50+ bool listUpdating() const;
51+
52+ QString filter() const;
53+ void setFilter(const QString &filter);
54+
55+ QString country() const;
56+ void setCountry(const QString &country);
57+
58+Q_SIGNALS:
59+ void listUpdatingChanged();
60+ void filterChanged();
61+ void countryChanged(const QString &country);
62+
63+private:
64+ void setModel(const QList<GeonamesCity *> &locations);
65+ void setListUpdating(bool listUpdating);
66+ static void filterFinished(GObject *source_object,
67+ GAsyncResult *res,
68+ gpointer user_data);
69+
70+
71+ bool m_listUpdating;
72+ QString m_filter;
73+ QString m_country;
74+ GCancellable *m_cancellable;
75+ QHash<int, QByteArray> m_roleNames;
76+ QList<GeonamesCity *> m_locations;
77+ QList<GeonamesCity *> m_countryLocations;
78+};
79+
80+#endif
po/aa.po+290−184
@@ -7,7 +7,7 @@ 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: 2016-03-10 22:48+0000\n"
10+"POT-Creation-Date: 2016-03-23 10:01+0000\n"
11"PO-Revision-Date: 2016-02-12 10:18+0000\n"
11"PO-Revision-Date: 2016-02-12 10:18+0000\n"
12"Last-Translator: Charif AYFARAH <ayfarah@ymail.com>\n"
12"Last-Translator: Charif AYFARAH <ayfarah@ymail.com>\n"
13"Language-Team: Afar <aa@li.org>\n"
13"Language-Team: Afar <aa@li.org>\n"
@@ -15,8 +15,8 @@ msgstr ""
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"Plural-Forms: nplurals=2; plural=n != 1;\n"
18−"X-Launchpad-Export-Date: 2016-03-13 05:50+0000\n"
18+"X-Launchpad-Export-Date: 2016-03-24 06:07+0000\n"
19−"X-Generator: Launchpad (build 17939)\n"
19+"X-Generator: Launchpad (build 17958)\n"
20
20
21#: plugins/IntegratedLightDM/Greeter.cpp:112
21#: plugins/IntegratedLightDM/Greeter.cpp:112
22msgid "Password: "
22msgid "Password: "
@@ -73,64 +73,46 @@ msgctxt "Button: Log out from the system"
73msgid "Log Out"
73msgid "Log Out"
74msgstr "Eweq"
74msgstr "Eweq"
75
75
76−#: qml/Components/Dialogs.qml:161 qml/Components/Dialogs.qml:194
76+#: qml/Components/Dialogs.qml:161 qml/Components/Dialogs.qml:219
77−#: qml/Components/Dialogs.qml:253
77+#: qml/Dash/DashPageHeader.qml:298 qml/Wizard/Pages/passcode-confirm.qml:32
78+#: qml/Wizard/Pages/passcode-set.qml:32
78msgid "Cancel"
79msgid "Cancel"
79msgstr "Bayis"
80msgstr "Bayis"
80
81
81#: qml/Components/Dialogs.qml:173
82#: qml/Components/Dialogs.qml:173
82−msgctxt "Title: Reboot/Shut down dialog"
83−msgid "Shut down"
84−msgstr "Bargus"
85−
86−#: qml/Components/Dialogs.qml:174
87−msgid "Are you sure you want to shut down?"
88−msgstr "Bargussuh digga maay litoo?"
89−
90−#: qml/Components/Dialogs.qml:176
91−msgctxt "Button: Reboot the system"
92−msgid "Reboot"
93−msgstr "Wadir-ugus"
94−
95−#: qml/Components/Dialogs.qml:185
96−msgctxt "Button: Shut down the system"
97−msgid "Shut down"
98−msgstr "Bargus"
99−
100−#: qml/Components/Dialogs.qml:207
101msgctxt "Title: Reboot dialog"
83msgctxt "Title: Reboot dialog"
102msgid "Reboot"
84msgid "Reboot"
103msgstr "Wadir-ugus"
85msgstr "Wadir-ugus"
104
86
105−#: qml/Components/Dialogs.qml:208
87+#: qml/Components/Dialogs.qml:174
106msgid "Are you sure you want to reboot?"
88msgid "Are you sure you want to reboot?"
107msgstr "Wadir-ugussuh digga maay litoo?"
89msgstr "Wadir-ugussuh digga maay litoo?"
108
90
109−#: qml/Components/Dialogs.qml:210
91+#: qml/Components/Dialogs.qml:176
110msgid "No"
92msgid "No"
111msgstr "Maleey"
93msgstr "Maleey"
112
94
113−#: qml/Components/Dialogs.qml:217
95+#: qml/Components/Dialogs.qml:183
114msgid "Yes"
96msgid "Yes"
115msgstr "Yeey"
97msgstr "Yeey"
116
98
117−#: qml/Components/Dialogs.qml:232
99+#: qml/Components/Dialogs.qml:198
118msgctxt "Title: Power off/Restart dialog"
100msgctxt "Title: Power off/Restart dialog"
119msgid "Power"
101msgid "Power"
120msgstr "Cayla"
102msgstr "Cayla"
121
103
122−#: qml/Components/Dialogs.qml:233
104+#: qml/Components/Dialogs.qml:199
123msgid ""
105msgid ""
124"Are you sure you would like\n"
106"Are you sure you would like\n"
125"to power off?"
107"to power off?"
126msgstr "Timmi haytuh digga maay litoo?"
108msgstr "Timmi haytuh digga maay litoo?"
127
109
128−#: qml/Components/Dialogs.qml:235
110+#: qml/Components/Dialogs.qml:201
129msgctxt "Button: Power off the system"
111msgctxt "Button: Power off the system"
130msgid "Power off"
112msgid "Power off"
131msgstr "Timmi hayis"
113msgstr "Timmi hayis"
132
114
133−#: qml/Components/Dialogs.qml:244
115+#: qml/Components/Dialogs.qml:210
134msgctxt "Button: Restart the system"
116msgctxt "Button: Restart the system"
135msgid "Restart"
117msgid "Restart"
136msgstr "Wadir-qimbis"
118msgstr "Wadir-qimbis"
@@ -173,42 +155,58 @@ msgstr ""
173msgid "Close all"
155msgid "Close all"
174msgstr "Inkih alif"
156msgstr "Inkih alif"
175
157
176−#: qml/Dash/DashPageHeader.qml:270
158+#: qml/Dash/DashPageHeader.qml:337
177msgctxt "Button: Open the Ubuntu Store"
159msgctxt "Button: Open the Ubuntu Store"
178msgid "Store"
160msgid "Store"
179msgstr ""
161msgstr ""
180
162
181−#: qml/Dash/DashPageHeader.qml:277
163+#: qml/Dash/DashPageHeader.qml:344
182msgctxt "Button: Start a search in the current dash scope"
164msgctxt "Button: Start a search in the current dash scope"
183msgid "Search"
165msgid "Search"
184msgstr "Goranto"
166msgstr "Goranto"
185
167
186−#: qml/Dash/DashPageHeader.qml:287
168+#: qml/Dash/DashPageHeader.qml:354
187msgctxt "Button: Show the current dash scope settings"
169msgctxt "Button: Show the current dash scope settings"
188msgid "Settings"
170msgid "Settings"
189msgstr "Massosu"
171msgstr "Massosu"
190
172
191−#: qml/Dash/DashPageHeader.qml:294
173+#: qml/Dash/DashPageHeader.qml:361
192msgid "Remove from Favorites"
174msgid "Remove from Favorites"
193msgstr ""
175msgstr ""
194
176
195−#: qml/Dash/DashPageHeader.qml:294
177+#: qml/Dash/DashPageHeader.qml:361
196msgid "Add to Favorites"
178msgid "Add to Favorites"
197msgstr ""
179msgstr ""
198
180
181+#: qml/Dash/FiltersPopover.qml:60
182+msgid "Refine your results"
183+msgstr ""
184+
185+#: qml/Dash/FiltersPopover.qml:69
186+msgid "Reset"
187+msgstr ""
188+
199−#: qml/Dash/GenericScopeView.qml:567 qml/Dash/GenericScopeView.qml:725
189+#: qml/Dash/GenericScopeView.qml:570 qml/Dash/GenericScopeView.qml:755
200msgid "See less"
190msgid "See less"
201msgstr ""
191msgstr ""
202
192
203−#: qml/Dash/GenericScopeView.qml:567
193+#: qml/Dash/GenericScopeView.qml:570
204msgid "See all"
194msgid "See all"
205msgstr ""
195msgstr ""
206
196
207−#: qml/Dash/GenericScopeView.qml:629
197+#: qml/Dash/GenericScopeView.qml:627
208msgctxt "Label: Hint for dash search line edit"
198msgctxt "Label: Hint for dash search line edit"
209msgid "Search"
199msgid "Search"
210msgstr "Goranto"
200msgstr "Goranto"
211
201
202+#: qml/Dash/PageHeaderExtraPanel.qml:55
203+msgid "Recent Searches"
204+msgstr ""
205+
206+#: qml/Dash/PageHeaderExtraPanel.qml:66
207+msgid "Clear All"
208+msgstr ""
209+
212#: qml/Dash/Previews/PreviewActionCombo.qml:35
210#: qml/Dash/Previews/PreviewActionCombo.qml:35
213msgid "More..."
211msgid "More..."
214msgstr ""
212msgstr ""
@@ -276,11 +274,11 @@ msgstr "Qagis"
276msgid "Tap to unlock"
274msgid "Tap to unlock"
277msgstr ""
275msgstr ""
278
276
279−#: qml/Greeter/NarrowView.qml:54 qml/Wizard/Pages/passwd-confirm.qml:53
277+#: qml/Greeter/NarrowView.qml:54
280msgid "Sorry, incorrect passphrase."
278msgid "Sorry, incorrect passphrase."
281msgstr ""
279msgstr ""
282
280
283−#: qml/Greeter/NarrowView.qml:55 qml/Wizard/Pages/passwd-confirm.qml:54
281+#: qml/Greeter/NarrowView.qml:55
284msgid "Sorry, incorrect passcode."
282msgid "Sorry, incorrect passcode."
285msgstr ""
283msgstr ""
286
284
@@ -305,7 +303,7 @@ msgstr ""
305msgid "Enter %1"
303msgid "Enter %1"
306msgstr "%1 culus"
304msgstr "%1 culus"
307
305
308−#: qml/Greeter/NarrowView.qml:117 qml/Wizard/Pages/passwd-set.qml:60
306+#: qml/Greeter/NarrowView.qml:117
309msgid "Enter passphrase"
307msgid "Enter passphrase"
310msgstr "Tatur-maxco culus"
308msgstr "Tatur-maxco culus"
311
309
@@ -343,62 +341,62 @@ msgstr ""
343msgid "Conference"
341msgid "Conference"
344msgstr "Koboxu"
342msgstr "Koboxu"
345
343
346−#: qml/Panel/Indicators/MenuItemFactory.qml:752
344+#: qml/Panel/Indicators/MenuItemFactory.qml:761
347msgid "Nothing is playing"
345msgid "Nothing is playing"
348msgstr ""
346msgstr ""
349
347
350−#: qml/Panel/Indicators/MenuItemFactory.qml:881
348+#: qml/Panel/Indicators/MenuItemFactory.qml:890
351#, qt-format
349#, qt-format
352msgid "%1 hour"
350msgid "%1 hour"
353msgid_plural "%1 hours"
351msgid_plural "%1 hours"
354msgstr[0] "%1 saaqata"
352msgstr[0] "%1 saaqata"
355msgstr[1] "%1 saaqata"
353msgstr[1] "%1 saaqata"
356
354
357−#: qml/Panel/Indicators/MenuItemFactory.qml:885
355+#: qml/Panel/Indicators/MenuItemFactory.qml:894
358#, qt-format
356#, qt-format
359msgid "%1 minute"
357msgid "%1 minute"
360msgid_plural "%1 minutes"
358msgid_plural "%1 minutes"
361msgstr[0] "%1 miniti"
359msgstr[0] "%1 miniti"
362msgstr[1] "%1 miniti"
360msgstr[1] "%1 miniti"
363
361
364−#: qml/Panel/Indicators/MenuItemFactory.qml:890
362+#: qml/Panel/Indicators/MenuItemFactory.qml:899
365#, qt-format
363#, qt-format
366msgid "%1 second"
364msgid "%1 second"
367msgid_plural "%1 seconds"
365msgid_plural "%1 seconds"
368msgstr[0] "%1 nammayye"
366msgstr[0] "%1 nammayye"
369msgstr[1] "%1 nammayye"
367msgstr[1] "%1 nammayye"
370
368
371−#: qml/Panel/Indicators/MenuItemFactory.qml:893
369+#: qml/Panel/Indicators/MenuItemFactory.qml:902
372msgid "0 seconds"
370msgid "0 seconds"
373msgstr "0 nammayye"
371msgstr "0 nammayye"
374
372
375#. Translators: String like "1 hour, 2 minutes, 3 seconds remaining"
373#. Translators: String like "1 hour, 2 minutes, 3 seconds remaining"
376−#: qml/Panel/Indicators/MenuItemFactory.qml:895
374+#: qml/Panel/Indicators/MenuItemFactory.qml:904
377#, qt-format
375#, qt-format
378msgid "%1 remaining"
376msgid "%1 remaining"
379msgstr "%1 raaqe"
377msgstr "%1 raaqe"
380
378
381−#: qml/Panel/Indicators/MenuItemFactory.qml:901
379+#: qml/Panel/Indicators/MenuItemFactory.qml:910
382msgid "In queue…"
380msgid "In queue…"
383msgstr ""
381msgstr ""
384
382
385−#: qml/Panel/Indicators/MenuItemFactory.qml:905
383+#: qml/Panel/Indicators/MenuItemFactory.qml:914
386msgid "Downloading"
384msgid "Downloading"
387msgstr "Qulluumah"
385msgstr "Qulluumah"
388
386
389−#: qml/Panel/Indicators/MenuItemFactory.qml:907
387+#: qml/Panel/Indicators/MenuItemFactory.qml:916
390msgid "Paused, tap to resume"
388msgid "Paused, tap to resume"
391msgstr ""
389msgstr ""
392
390
393−#: qml/Panel/Indicators/MenuItemFactory.qml:909
391+#: qml/Panel/Indicators/MenuItemFactory.qml:918
394msgid "Canceled"
392msgid "Canceled"
395msgstr "Bayteh"
393msgstr "Bayteh"
396
394
397−#: qml/Panel/Indicators/MenuItemFactory.qml:911
395+#: qml/Panel/Indicators/MenuItemFactory.qml:920
398msgid "Finished"
396msgid "Finished"
399msgstr "Duudumteh"
397msgstr "Duudumteh"
400
398
401−#: qml/Panel/Indicators/MenuItemFactory.qml:913
399+#: qml/Panel/Indicators/MenuItemFactory.qml:922
402msgid "Failed, tap to retry"
400msgid "Failed, tap to retry"
403msgstr ""
401msgstr ""
404
402
@@ -418,244 +416,352 @@ msgctxt "Button: Call back on phone"
418msgid "Call back"
416msgid "Call back"
419msgstr ""
417msgstr ""
420
418
421−#: qml/Tutorial/TutorialBottom.qml:28
419+#: qml/Stages/SideStage.qml:76
422−msgid "Open special menus"
420+msgid "Drag using 3 fingers any application from one window to the other"
423−msgstr ""
424−
425−#: qml/Tutorial/TutorialBottom.qml:29
426−msgid "Swipe up from the bottom edge."
427msgstr ""
421msgstr ""
428
422
429−#: qml/Tutorial/TutorialBottomFinish.qml:24
423+#: qml/Tutorial/TutorialBottom.qml:78
430−msgid "This action does different things for different apps"
424+msgid "Swipe up to add a contact"
431msgstr ""
425msgstr ""
432
426
433−#: qml/Tutorial/TutorialBottomFinish.qml:25
427+#: qml/Tutorial/TutorialBottom.qml:80
434−msgid "Tap here to finish."
428+msgid "Swipe up for favorite calculations"
435msgstr ""
429msgstr ""
436
430
437−#: qml/Tutorial/TutorialContent.qml:80 qml/Tutorial/TutorialLeftFinish.qml:25
431+#: qml/Tutorial/TutorialBottom.qml:82
438−#: qml/Tutorial/TutorialRight.qml:144
432+msgid "Swipe up for recent calls"
439−msgid "Tap here to continue."
440msgstr ""
433msgstr ""
441
434
442−#: qml/Tutorial/TutorialLeft.qml:26
435+#: qml/Tutorial/TutorialBottom.qml:84
443−msgid "Open the launcher"
436+msgid "Swipe up to create a message"
444msgstr ""
437msgstr ""
445
438
446−#: qml/Tutorial/TutorialLeft.qml:27
439+#: qml/Tutorial/TutorialBottom.qml:85
447−msgid "Short swipe from the left edge."
440+msgid "Swipe up to manage the app"
448msgstr ""
441msgstr ""
449
442
450−#: qml/Tutorial/TutorialLeftFinish.qml:24
443+#: qml/Tutorial/TutorialLeft.qml:47
451−msgid "These are the shortcuts to favorite apps"
444+msgid "Swipe from the left edge to open the launcher"
452msgstr ""
445msgstr ""
453
446
454−#: qml/Tutorial/TutorialPage.qml:178
447+#: qml/Tutorial/TutorialLeftLong.qml:47
455−msgid "You almost got it!"
448+msgid "Long swipe from the left edge to open the Today scope"
456msgstr ""
449msgstr ""
457
450
458−#: qml/Tutorial/TutorialPage.qml:195
451+#: qml/Tutorial/TutorialRight.qml:54
459−msgid "Try again."
452+msgid "Hover your mouse on the right edge to view your open apps"
460msgstr ""
453msgstr ""
461
454
462−#: qml/Tutorial/TutorialRight.qml:31
455+#: qml/Tutorial/TutorialRight.qml:55
463−msgid "To view open apps"
456+msgid "Short or long swipe from the right edge to view your open apps"
464msgstr ""
457msgstr ""
465
458
466−#: qml/Tutorial/TutorialRight.qml:32
459+#: qml/Tutorial/TutorialTop.qml:53
467−msgid "Long swipe from the right edge."
460+msgid "Swipe from the top right edge to open the notification bar"
468msgstr ""
461msgstr ""
469
462
470−#: qml/Tutorial/TutorialRight.qml:122
463+#: qml/Tutorial/TutorialTop.qml:54
471−msgid "View all your running tasks."
464+msgid "Swipe from the top edge to open the notification bar"
472msgstr ""
465msgstr ""
473
466
474−#: qml/Wizard/Page.qml:89
467+#: qml/Wizard/Page.qml:54
475msgctxt "Button: Go back one page in the Wizard"
468msgctxt "Button: Go back one page in the Wizard"
476msgid "Back"
469msgid "Back"
477msgstr "Derre"
470msgstr "Derre"
478
471
479#: qml/Wizard/Pages/10-welcome.qml:27
472#: qml/Wizard/Pages/10-welcome.qml:27
480−msgid "Hi!"
473+msgid "Language"
481−msgstr "Nagaale!"
474+msgstr ""
482
475
483−#: qml/Wizard/Pages/10-welcome.qml:44
476+#: qml/Wizard/Pages/10-welcome.qml:156 qml/Wizard/Pages/30-wifi.qml:206
484−msgid "Welcome to your Ubuntu device."
477+#: qml/Wizard/Pages/40-location.qml:271 qml/Wizard/Pages/50-timezone.qml:267
478+#: qml/Wizard/Pages/60-account.qml:65 qml/Wizard/Pages/70-passwd-type.qml:144
479+#: qml/Wizard/Pages/75-report-check.qml:84
480+#: qml/Wizard/Pages/passcode-desktop.qml:124
481+#: qml/Wizard/Pages/password-set.qml:141
482+msgid "Next"
485msgstr ""
483msgstr ""
486
484
487−#: qml/Wizard/Pages/10-welcome.qml:52
485+#: qml/Wizard/Pages/30-wifi.qml:29
488−msgid "Let’s get started."
486+msgid "Connect to Wi‑Fi"
489−msgstr "Hayya qimbisnay."
487+msgstr ""
490
488
491−#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:133
489+#: qml/Wizard/Pages/30-wifi.qml:130
492−#: qml/Wizard/Pages/40-wifi.qml:215 qml/Wizard/Pages/50-location.qml:131
490+msgid "Connected"
493−#: qml/Wizard/Pages/60-reporting.qml:60 qml/Wizard/Pages/passwd-confirm.qml:82
494−#: qml/Wizard/Pages/passwd-set.qml:90
495−msgid "Continue"
496−msgstr "Tatur"
491+msgstr ""
497
492
498−#: qml/Wizard/Pages/20-sim.qml:25
493+#: qml/Wizard/Pages/30-wifi.qml:163
499−msgid "Add a SIM card and restart your device"
494+msgid "Available Wi-Fi networks"
500msgstr ""
495msgstr ""
501
496
502−#: qml/Wizard/Pages/20-sim.qml:59
497+#: qml/Wizard/Pages/30-wifi.qml:164
503−msgid "Without it, you won’t be able to make calls or use text messaging."
498+msgid "No available Wi-Fi networks"
504msgstr ""
499msgstr ""
505
500
506−#: qml/Wizard/Pages/20-sim.qml:73 qml/Wizard/Pages/40-wifi.qml:215
501+#: qml/Wizard/Pages/30-wifi.qml:206 qml/Wizard/Pages/60-account.qml:65
502+#: qml/Wizard/Pages/sim.qml:101
507msgid "Skip"
503msgid "Skip"
508msgstr "Kaqit"
504msgstr "Kaqit"
509
505
510−#: qml/Wizard/Pages/30-passwd-type.qml:39
506+#: qml/Wizard/Pages/40-location.qml:27
511−msgid "Lock security"
507+msgid "Location Services"
512msgstr ""
508msgstr ""
513
509
514−#: qml/Wizard/Pages/30-passwd-type.qml:79
510+#: qml/Wizard/Pages/40-location.qml:83
515−msgid "Please select how you’d like to unlock your device."
511+msgid ""
512+"Use GPS, Wi-Fi hotspots and mobile network anonymously to detect location "
513+"(recommended)"
516msgstr ""
514msgstr ""
517
515
518−#: qml/Wizard/Pages/30-passwd-type.qml:102
516+#: qml/Wizard/Pages/40-location.qml:105
519−msgctxt "Label: Type of security method"
517+#, qt-format
518+msgid "By selecting this option you agree to the Nokia HERE %1."
519+msgstr ""
520+
521+#: qml/Wizard/Pages/40-location.qml:106
522+msgctxt "part of: Nokia HERE terms and conditions"
523+msgid "terms and conditions"
524+msgstr ""
525+
526+#: qml/Wizard/Pages/40-location.qml:160
527+msgid "GPS only"
528+msgstr ""
529+
530+#: qml/Wizard/Pages/40-location.qml:214
531+msgid "Don't use my location"
532+msgstr ""
533+
534+#: qml/Wizard/Pages/40-location.qml:260
535+msgid "You can change it later in System Settings."
536+msgstr ""
537+
538+#: qml/Wizard/Pages/50-timezone.qml:29
520−msgid "Swipe"
539+msgid "Time Zone"
521−msgstr "Uysuttuc"
540+msgstr ""
541+
542+#: qml/Wizard/Pages/50-timezone.qml:178
543+msgid "Enter your city"
544+msgstr ""
545+
546+#: qml/Wizard/Pages/60-account.qml:24
547+msgid "Personalize Your Device"
548+msgstr ""
549+
550+#: qml/Wizard/Pages/60-account.qml:48
551+msgid "Preferred Name"
552+msgstr ""
522
553
523−#: qml/Wizard/Pages/30-passwd-type.qml:103
554+#: qml/Wizard/Pages/70-passwd-type.qml:39
524−msgctxt "Label: Description of security method"
555+msgid "Lock Screen"
525−msgid "No security"
526msgstr ""
556msgstr ""
527
557
528−#: qml/Wizard/Pages/30-passwd-type.qml:105
558+#: qml/Wizard/Pages/70-passwd-type.qml:101
529msgctxt "Label: Type of security method"
559msgctxt "Label: Type of security method"
530−msgid "Passcode"
560+msgid "Create new password"
531msgstr ""
561msgstr ""
532
562
533−#: qml/Wizard/Pages/30-passwd-type.qml:106
563+#: qml/Wizard/Pages/70-passwd-type.qml:103
534−msgctxt "Label: Description of security method"
564+msgctxt "Label: Type of security method"
535−msgid "4 digits only"
565+msgid "Create passcode (numbers only)"
536msgstr ""
566msgstr ""
537
567
538−#: qml/Wizard/Pages/30-passwd-type.qml:108
568+#: qml/Wizard/Pages/70-passwd-type.qml:105
539msgctxt "Label: Type of security method"
569msgctxt "Label: Type of security method"
540−msgid "Passphrase"
570+msgid "No lock code"
541msgstr ""
571msgstr ""
542
572
543−#: qml/Wizard/Pages/30-passwd-type.qml:109
573+#: qml/Wizard/Pages/75-report-check.qml:26 qml/Wizard/Pages/here-terms.qml:108
544−msgctxt "Label: Description of security method"
574+msgid "Privacy Policy"
545−msgid "Numbers and letters"
546msgstr ""
575msgstr ""
547
576
548−#: qml/Wizard/Pages/40-wifi.qml:29
577+#: qml/Wizard/Pages/75-report-check.qml:26
549−msgid "Connect to Wi‑Fi"
578+msgid "Help Us Improve"
579+msgstr ""
580+
581+#: qml/Wizard/Pages/75-report-check.qml:59
582+msgid "Improve system performance by sending us crashes and error reports."
550msgstr ""
583msgstr ""
551
584
552−#: qml/Wizard/Pages/40-wifi.qml:168
585+#: qml/Wizard/Pages/75-report-check.qml:60
553−msgid "Available networks…"
586+msgid "Privacy policy"
554msgstr ""
587msgstr ""
555
588
556−#: qml/Wizard/Pages/40-wifi.qml:169
589+#: qml/Wizard/Pages/80-finished.qml:89
557−msgid "No available networks."
590+msgid "Welcome to Ubuntu"
558msgstr ""
591msgstr ""
559
592
560−#: qml/Wizard/Pages/50-location.qml:27
593+#: qml/Wizard/Pages/80-finished.qml:104
561−msgid "Location"
594+msgid "You are ready to use your device now"
562msgstr ""
595msgstr ""
563
596
564−#: qml/Wizard/Pages/50-location.qml:62
597+#: qml/Wizard/Pages/80-finished.qml:124
565−msgid "Let the phone detect your location:"
598+msgid "Get Started"
566msgstr ""
599msgstr ""
567
600
568−#: qml/Wizard/Pages/50-location.qml:69
601+#: qml/Wizard/Pages/here-terms.qml:25
569−msgid "Using GPS only (less accurate)"
602+msgid "Terms & Conditions"
570msgstr ""
603msgstr ""
571
604
572−#: qml/Wizard/Pages/50-location.qml:86
605+#: qml/Wizard/Pages/here-terms.qml:69
573−msgid "Using GPS, anonymized Wi-Fi and cellular network info (recommended)"
606+msgid "Your device uses positioning technologies provided by HERE."
574msgstr ""
607msgstr ""
575
608
576−#. Translators: HERE is a trademark for Nokia's location service, you probably shouldn't translate it
577−#: qml/Wizard/Pages/50-location.qml:103
609+#: qml/Wizard/Pages/here-terms.qml:81
578msgid ""
610msgid ""
579−"By selecting this option you agree to the Nokia HERE <a href='#'>terms and "
611+"To provide you with positioning services and to improve their quality, HERE "
580−"conditions</a>."
612+"collects information about nearby cell towers and Wi-Fi hotspots around your "
613+"current location whenever your position is being found."
581msgstr ""
614msgstr ""
582
615
583−#: qml/Wizard/Pages/50-location.qml:112
616+#: qml/Wizard/Pages/here-terms.qml:93
584−msgid "Not at all"
617+msgid ""
618+"The information collected is used to analyze the service and to improve the "
619+"use of service, but not to identify you personally."
585msgstr ""
620msgstr ""
586
621
587−#: qml/Wizard/Pages/50-location.qml:124
622+#: qml/Wizard/Pages/here-terms.qml:106
588−msgid "You can change your mind later in <b>System Settings</b>."
623+#, qt-format
624+msgid "By continuing, you agree to the HERE platform %1 and %2."
589msgstr ""
625msgstr ""
590
626
591−#: qml/Wizard/Pages/60-reporting.qml:26
627+#: qml/Wizard/Pages/here-terms.qml:107
592−msgid "Improving your experience"
628+msgid "Service Terms"
593msgstr ""
629msgstr ""
594
630
595−#: qml/Wizard/Pages/60-reporting.qml:46
631+#: qml/Wizard/Pages/passcode-confirm.qml:43
632+#: qml/Wizard/Pages/passcode-desktop.qml:80
596−msgid ""
633+msgid "Confirm passcode"
597−"Your phone is set up to automatically report errors to Canonical and its "
598−"partners, the makers of the operating system."
599msgstr ""
634msgstr ""
600
635
601−#: qml/Wizard/Pages/60-reporting.qml:53
636+#: qml/Wizard/Pages/passcode-confirm.qml:45
602−msgid ""
637+msgid "Incorrect passcode."
603−"This can be disabled in <b>System Settings</b> under <b>Security &amp; "
604−"Privacy</b>"
605msgstr ""
638msgstr ""
606
639
607−#: qml/Wizard/Pages/80-finished.qml:24
640+#: qml/Wizard/Pages/passcode-confirm.qml:45
608−msgid "All done"
641+msgctxt "Enter the passcode again"
642+msgid "Please re-enter."
609msgstr ""
643msgstr ""
610
644
611−#: qml/Wizard/Pages/80-finished.qml:39
645+#: qml/Wizard/Pages/passcode-desktop.qml:30
612−msgid "Nice work!"
646+msgid "Lock Screen Passcode"
613msgstr ""
647msgstr ""
614
648
615−#: qml/Wizard/Pages/80-finished.qml:46
649+#: qml/Wizard/Pages/passcode-desktop.qml:56
616−msgid "Your device is now ready to use."
650+msgid "Enter 4 numbers to setup your passcode"
617msgstr ""
651msgstr ""
618
652
619−#: qml/Wizard/Pages/80-finished.qml:53
653+#: qml/Wizard/Pages/passcode-desktop.qml:65
620−msgid "Finish"
654+#: qml/Wizard/Pages/passcode-set.qml:54
655+msgid "Choose passcode"
621msgstr ""
656msgstr ""
622
657
623−#: qml/Wizard/Pages/here-terms.qml:27
658+#: qml/Wizard/Pages/passcode-desktop.qml:105
624−msgid "Terms & Conditions"
659+msgid "Passcode too short"
625msgstr ""
660msgstr ""
626
661
627−#: qml/Wizard/Pages/passwd-confirm.qml:49
662+#: qml/Wizard/Pages/passcode-desktop.qml:107
628−msgid "Confirm passphrase"
663+msgid "Passcodes match"
629msgstr ""
664msgstr ""
630
665
631−#: qml/Wizard/Pages/passwd-confirm.qml:50
666+#: qml/Wizard/Pages/passcode-desktop.qml:109
632−msgid "Confirm passcode"
667+msgid "Passcodes do not match"
633msgstr ""
668msgstr ""
634
669
635−#: qml/Wizard/Pages/passwd-confirm.qml:53
670+#: qml/Wizard/Pages/passcode-set.qml:62
636−#: qml/Wizard/Pages/passwd-confirm.qml:54
671+msgid "Passcode must be 4 characters long"
637−msgid "Please try again."
638msgstr ""
672msgstr ""
639
673
640−#: qml/Wizard/Pages/passwd-set.qml:61
674+#: qml/Wizard/Pages/password-set.qml:30
641−msgid "Choose your passcode"
675+msgid "Lock Screen Password"
642msgstr ""
676msgstr ""
643
677
644−#: qml/Wizard/Pages/passwd-set.qml:68
678+#: qml/Wizard/Pages/password-set.qml:61
645−msgid "Passphrase must be 4 characters long"
679+msgid "Enter at least 8 characters"
646msgstr ""
680msgstr ""
647
681
648−#. Translators: This is the arrow for "Back" buttons
682+#: qml/Wizard/Pages/password-set.qml:73
649−#: qml/Wizard/StackButton.qml:39
650−#, qt-format
651−msgid "〈 %1"
683+msgid "Choose password"
652msgstr ""
684msgstr ""
653
685
654−#. Translators: This is the arrow for "Forward" buttons
686+#: qml/Wizard/Pages/password-set.qml:103
655−#: qml/Wizard/StackButton.qml:42
687+msgid "Confirm password"
656−#, qt-format
688+msgstr ""
657−msgid "%1 〉"
689+
690+#: qml/Wizard/Pages/sim.qml:27
691+msgid "No SIM card installed"
692+msgstr ""
693+
694+#: qml/Wizard/Pages/sim.qml:54
695+msgid "SIM card added"
658msgstr ""
696msgstr ""
659
697
698+#: qml/Wizard/Pages/sim.qml:55
699+msgid "You must restart the device to access the mobile network."
700+msgstr ""
701+
702+#: qml/Wizard/Pages/sim.qml:59
703+msgid "Restart"
704+msgstr ""
705+
706+#: qml/Wizard/Pages/sim.qml:78
707+msgid "You won’t be able to make calls or use text messaging without a SIM."
708+msgstr ""
709+
710+#: qml/Wizard/Pages/sim.qml:90
711+msgid "To proceed with no SIM tap Skip."
712+msgstr ""
713+
714+#: qml/Wizard/PasswordMeter.qml:87
715+msgid "Passwords match"
716+msgstr ""
717+
718+#: qml/Wizard/PasswordMeter.qml:89
719+msgid "Passwords do not match"
720+msgstr ""
721+
722+#: qml/Wizard/PasswordMeter.qml:93
723+msgid "Strong password"
724+msgstr ""
725+
726+#: qml/Wizard/PasswordMeter.qml:95
727+msgid "Fair password"
728+msgstr ""
729+
730+#: qml/Wizard/PasswordMeter.qml:97
731+msgid "Weak password"
732+msgstr ""
733+
734+#: qml/Wizard/PasswordMeter.qml:99
735+msgid "Very weak password"
736+msgstr ""
737+
738+#~ msgctxt "Title: Reboot/Shut down dialog"
739+#~ msgid "Shut down"
740+#~ msgstr "Bargus"
741+
742+#~ msgid "Are you sure you want to shut down?"
743+#~ msgstr "Bargussuh digga maay litoo?"
744+
745+#~ msgctxt "Button: Shut down the system"
746+#~ msgid "Shut down"
747+#~ msgstr "Bargus"
748+
749+#~ msgctxt "Button: Reboot the system"
750+#~ msgid "Reboot"
751+#~ msgstr "Wadir-ugus"
752+
753+#~ msgctxt "Label: Type of security method"
754+#~ msgid "Swipe"
755+#~ msgstr "Uysuttuc"
756+
757+#~ msgid "Hi!"
758+#~ msgstr "Nagaale!"
759+
660#~ msgid "Welcome to your Ubuntu phone."
760#~ msgid "Welcome to your Ubuntu phone."
661#~ msgstr "Ubuntu Telefoonul arcib"
761#~ msgstr "Ubuntu Telefoonul arcib"
762+
763+#~ msgid "Let’s get started."
764+#~ msgstr "Hayya qimbisnay."
765+
766+#~ msgid "Continue"
767+#~ msgstr "Tatur"
po/am.po+493−249
@@ -7,16 +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: 2016-03-10 22:48+0000\n"
10+"POT-Creation-Date: 2016-03-23 10:01+0000\n"
11−"PO-Revision-Date: 2015-11-19 19:27+0000\n"
11+"PO-Revision-Date: 2016-03-24 19:07+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"Plural-Forms: nplurals=2; plural=n > 1;\n"
18−"X-Launchpad-Export-Date: 2016-03-13 05:50+0000\n"
18+"X-Launchpad-Export-Date: 2016-03-25 05:54+0000\n"
19−"X-Generator: Launchpad (build 17939)\n"
19+"X-Generator: Launchpad (build 17967)\n"
20
20
21#: plugins/IntegratedLightDM/Greeter.cpp:112
21#: plugins/IntegratedLightDM/Greeter.cpp:112
22msgid "Password: "
22msgid "Password: "
@@ -73,53 +73,35 @@ msgctxt "Button: Log out from the system"
73msgid "Log Out"
73msgid "Log Out"
74msgstr "መውጫ"
74msgstr "መውጫ"
75
75
76−#: qml/Components/Dialogs.qml:161 qml/Components/Dialogs.qml:194
76+#: qml/Components/Dialogs.qml:161 qml/Components/Dialogs.qml:219
77−#: qml/Components/Dialogs.qml:253
77+#: qml/Dash/DashPageHeader.qml:298 qml/Wizard/Pages/passcode-confirm.qml:32
78+#: qml/Wizard/Pages/passcode-set.qml:32
78msgid "Cancel"
79msgid "Cancel"
79msgstr "መሰረዣ"
80msgstr "መሰረዣ"
80
81
81#: qml/Components/Dialogs.qml:173
82#: qml/Components/Dialogs.qml:173
82−msgctxt "Title: Reboot/Shut down dialog"
83−msgid "Shut down"
84−msgstr "ማጥፊያ"
85−
86−#: qml/Components/Dialogs.qml:174
87−msgid "Are you sure you want to shut down?"
88−msgstr "በእርግጥ ማጥፋት ይፈልጋሉ?"
89−
90−#: qml/Components/Dialogs.qml:176
91−msgctxt "Button: Reboot the system"
92−msgid "Reboot"
93−msgstr "እንደገና ማስነሻ"
94−
95−#: qml/Components/Dialogs.qml:185
96−msgctxt "Button: Shut down the system"
97−msgid "Shut down"
98−msgstr "ማጥፊያ"
99−
100−#: qml/Components/Dialogs.qml:207
101msgctxt "Title: Reboot dialog"
83msgctxt "Title: Reboot dialog"
102msgid "Reboot"
84msgid "Reboot"
103msgstr "እንደገና ማስነሻ"
85msgstr "እንደገና ማስነሻ"
104
86
105−#: qml/Components/Dialogs.qml:208
87+#: qml/Components/Dialogs.qml:174
106msgid "Are you sure you want to reboot?"
88msgid "Are you sure you want to reboot?"
107msgstr "በእርግጥ እንደገና ማስነሳት ይፈልጋሉ?"
89msgstr "በእርግጥ እንደገና ማስነሳት ይፈልጋሉ?"
108
90
109−#: qml/Components/Dialogs.qml:210
91+#: qml/Components/Dialogs.qml:176
110msgid "No"
92msgid "No"
111msgstr "አይ"
93msgstr "አይ"
112
94
113−#: qml/Components/Dialogs.qml:217
95+#: qml/Components/Dialogs.qml:183
114msgid "Yes"
96msgid "Yes"
115msgstr "አዎ"
97msgstr "አዎ"
116
98
117−#: qml/Components/Dialogs.qml:232
99+#: qml/Components/Dialogs.qml:198
118msgctxt "Title: Power off/Restart dialog"
100msgctxt "Title: Power off/Restart dialog"
119msgid "Power"
101msgid "Power"
120msgstr "ሐይል"
102msgstr "ሐይል"
121
103
122−#: qml/Components/Dialogs.qml:233
104+#: qml/Components/Dialogs.qml:199
123msgid ""
105msgid ""
124"Are you sure you would like\n"
106"Are you sure you would like\n"
125"to power off?"
107"to power off?"
@@ -127,12 +109,12 @@ msgstr ""
127"በእርግጥ ሐይሉን ማጥፋት\n"
109"በእርግጥ ሐይሉን ማጥፋት\n"
128"ይፈልጋሉ?"
110"ይፈልጋሉ?"
129
111
130−#: qml/Components/Dialogs.qml:235
112+#: qml/Components/Dialogs.qml:201
131msgctxt "Button: Power off the system"
113msgctxt "Button: Power off the system"
132msgid "Power off"
114msgid "Power off"
133msgstr "ሐይል ማጥፊያ"
115msgstr "ሐይል ማጥፊያ"
134
116
135−#: qml/Components/Dialogs.qml:244
117+#: qml/Components/Dialogs.qml:210
136msgctxt "Button: Restart the system"
118msgctxt "Button: Restart the system"
137msgid "Restart"
119msgid "Restart"
138msgstr "እንደገና ማስጀመሪያ"
120msgstr "እንደገና ማስጀመሪያ"
@@ -157,7 +139,7 @@ msgstr "መተግበሪያው ያልተቀመጠ ዳታ ይዟል:"
157msgctxt ""
139msgctxt ""
158"Re-dock means connect the device again to an external screen/mouse/keyboard"
140"Re-dock means connect the device again to an external screen/mouse/keyboard"
159msgid "Re-dock, save your work and close these apps to continue."
141msgid "Re-dock, save your work and close these apps to continue."
160−msgstr ""
142+msgstr "እንደገና-ማሳረፊያ: ስራዎትን ያስቀምጡ እና ይዝጉ መተግበሪያው እንዲቀጥል"
161
143
162#: qml/Components/ModeSwitchWarningDialog.qml:63
144#: qml/Components/ModeSwitchWarningDialog.qml:63
163msgid "Or force close now (unsaved data will be lost)."
145msgid "Or force close now (unsaved data will be lost)."
@@ -175,42 +157,58 @@ msgstr "አሁን እንደገና መገናኛ!"
175msgid "Close all"
157msgid "Close all"
176msgstr "ሁሉንም መዝጊያ"
158msgstr "ሁሉንም መዝጊያ"
177
159
178−#: qml/Dash/DashPageHeader.qml:270
160+#: qml/Dash/DashPageHeader.qml:337
179msgctxt "Button: Open the Ubuntu Store"
161msgctxt "Button: Open the Ubuntu Store"
180msgid "Store"
162msgid "Store"
181msgstr "ማስቀመጫ"
163msgstr "ማስቀመጫ"
182
164
183−#: qml/Dash/DashPageHeader.qml:277
165+#: qml/Dash/DashPageHeader.qml:344
184msgctxt "Button: Start a search in the current dash scope"
166msgctxt "Button: Start a search in the current dash scope"
185msgid "Search"
167msgid "Search"
186msgstr "መፈለጊያ"
168msgstr "መፈለጊያ"
187
169
188−#: qml/Dash/DashPageHeader.qml:287
170+#: qml/Dash/DashPageHeader.qml:354
189msgctxt "Button: Show the current dash scope settings"
171msgctxt "Button: Show the current dash scope settings"
190msgid "Settings"
172msgid "Settings"
191msgstr "ማሰናጃዎች"
173msgstr "ማሰናጃዎች"
192
174
193−#: qml/Dash/DashPageHeader.qml:294
175+#: qml/Dash/DashPageHeader.qml:361
194msgid "Remove from Favorites"
176msgid "Remove from Favorites"
195msgstr "ከምወዳቸው ማስወገጃ"
177msgstr "ከምወዳቸው ማስወገጃ"
196
178
197−#: qml/Dash/DashPageHeader.qml:294
179+#: qml/Dash/DashPageHeader.qml:361
198msgid "Add to Favorites"
180msgid "Add to Favorites"
199msgstr "ወደምወዳቸው መጨመሪያ"
181msgstr "ወደምወዳቸው መጨመሪያ"
200
182
183+#: qml/Dash/FiltersPopover.qml:60
184+msgid "Refine your results"
185+msgstr "የ እርስዎን ውጤቶች እንደገና ማጣሪያ"
186+
187+#: qml/Dash/FiltersPopover.qml:69
188+msgid "Reset"
189+msgstr "እንደ ነበረ መመለሻ"
190+
201−#: qml/Dash/GenericScopeView.qml:567 qml/Dash/GenericScopeView.qml:725
191+#: qml/Dash/GenericScopeView.qml:570 qml/Dash/GenericScopeView.qml:755
202msgid "See less"
192msgid "See less"
203msgstr "አነስተኛ መመልከቻ"
193msgstr "አነስተኛ መመልከቻ"
204
194
205−#: qml/Dash/GenericScopeView.qml:567
195+#: qml/Dash/GenericScopeView.qml:570
206msgid "See all"
196msgid "See all"
207msgstr "ሁሉንም መመልከቻ"
197msgstr "ሁሉንም መመልከቻ"
208
198
209−#: qml/Dash/GenericScopeView.qml:629
199+#: qml/Dash/GenericScopeView.qml:627
210msgctxt "Label: Hint for dash search line edit"
200msgctxt "Label: Hint for dash search line edit"
211msgid "Search"
201msgid "Search"
212msgstr "መፈለጊያ"
202msgstr "መፈለጊያ"
213
203
204+#: qml/Dash/PageHeaderExtraPanel.qml:55
205+msgid "Recent Searches"
206+msgstr "የ ቅርብ ጊዜ ፍለጋዎች"
207+
208+#: qml/Dash/PageHeaderExtraPanel.qml:66
209+msgid "Clear All"
210+msgstr "ሁሉንም ማጽጃ"
211+
214#: qml/Dash/Previews/PreviewActionCombo.qml:35
212#: qml/Dash/Previews/PreviewActionCombo.qml:35
215msgid "More..."
213msgid "More..."
216msgstr "ተጨማሪ..."
214msgstr "ተጨማሪ..."
@@ -264,7 +262,7 @@ msgstr "እንዲሁም የተገጠሙ"
264msgid ""
262msgid ""
265"Your device is now connected to an external display. Use this screen as a "
263"Your device is now connected to an external display. Use this screen as a "
266"touch pad to interact with the pointer."
264"touch pad to interact with the pointer."
267−msgstr ""
265+msgstr "የ እርስዎ አካል አሁን ከ ውጪ ማሳያ ጋር ተገናኝቷል: ይህን መመልከቻ እንደ ተችፓድ መጠቀሚያ"
268
266
269#: qml/Greeter/CoverPage.qml:118
267#: qml/Greeter/CoverPage.qml:118
270msgid "Unlock"
268msgid "Unlock"
@@ -278,11 +276,11 @@ msgstr "እንደገና ይሞክሩ"
278msgid "Tap to unlock"
276msgid "Tap to unlock"
279msgstr "ለመክፈት መታ ያድርጉ"
277msgstr "ለመክፈት መታ ያድርጉ"
280
278
281−#: qml/Greeter/NarrowView.qml:54 qml/Wizard/Pages/passwd-confirm.qml:53
279+#: qml/Greeter/NarrowView.qml:54
282msgid "Sorry, incorrect passphrase."
280msgid "Sorry, incorrect passphrase."
283msgstr "አዝናለሁ የተሳሳተ የማለፊያ ሐረግ"
281msgstr "አዝናለሁ የተሳሳተ የማለፊያ ሐረግ"
284
282
285−#: qml/Greeter/NarrowView.qml:55 qml/Wizard/Pages/passwd-confirm.qml:54
283+#: qml/Greeter/NarrowView.qml:55
286msgid "Sorry, incorrect passcode."
284msgid "Sorry, incorrect passcode."
287msgstr "አዝናለሁ የተሳሳተ የማለፊያ ኮድ"
285msgstr "አዝናለሁ የተሳሳተ የማለፊያ ኮድ"
288
286
@@ -311,7 +309,7 @@ msgstr ""
311msgid "Enter %1"
309msgid "Enter %1"
312msgstr "ማስገቢያ %1"
310msgstr "ማስገቢያ %1"
313
311
314−#: qml/Greeter/NarrowView.qml:117 qml/Wizard/Pages/passwd-set.qml:60
312+#: qml/Greeter/NarrowView.qml:117
315msgid "Enter passphrase"
313msgid "Enter passphrase"
316msgstr "የ ማለፊያ ሀረግ ያስገቡ"
314msgstr "የ ማለፊያ ሀረግ ያስገቡ"
317
315
@@ -349,62 +347,62 @@ msgstr "ወደ ጥሪው ለመመለስ መታ ያድርጉ..."
349msgid "Conference"
347msgid "Conference"
350msgstr "ስብሰባ"
348msgstr "ስብሰባ"
351
349
352−#: qml/Panel/Indicators/MenuItemFactory.qml:752
350+#: qml/Panel/Indicators/MenuItemFactory.qml:761
353msgid "Nothing is playing"
351msgid "Nothing is playing"
354msgstr "ምንም አይጫወትም"
352msgstr "ምንም አይጫወትም"
355
353
356−#: qml/Panel/Indicators/MenuItemFactory.qml:881
354+#: qml/Panel/Indicators/MenuItemFactory.qml:890
357#, qt-format
355#, qt-format
358msgid "%1 hour"
356msgid "%1 hour"
359msgid_plural "%1 hours"
357msgid_plural "%1 hours"
360msgstr[0] "%1 ሰአት"
358msgstr[0] "%1 ሰአት"
361msgstr[1] "%1 ሰአቶች"
359msgstr[1] "%1 ሰአቶች"
362
360
363−#: qml/Panel/Indicators/MenuItemFactory.qml:885
361+#: qml/Panel/Indicators/MenuItemFactory.qml:894
364#, qt-format
362#, qt-format
365msgid "%1 minute"
363msgid "%1 minute"
366msgid_plural "%1 minutes"
364msgid_plural "%1 minutes"
367msgstr[0] "%1 ደቂቃ"
365msgstr[0] "%1 ደቂቃ"
368msgstr[1] "%1 ደቂቃዎች"
366msgstr[1] "%1 ደቂቃዎች"
369
367
370−#: qml/Panel/Indicators/MenuItemFactory.qml:890
368+#: qml/Panel/Indicators/MenuItemFactory.qml:899
371#, qt-format
369#, qt-format
372msgid "%1 second"
370msgid "%1 second"
373msgid_plural "%1 seconds"
371msgid_plural "%1 seconds"
374msgstr[0] "%1 ሰከንድ"
372msgstr[0] "%1 ሰከንድ"
375msgstr[1] "%1 ሰከንዶች"
373msgstr[1] "%1 ሰከንዶች"
376
374
377−#: qml/Panel/Indicators/MenuItemFactory.qml:893
375+#: qml/Panel/Indicators/MenuItemFactory.qml:902
378msgid "0 seconds"
376msgid "0 seconds"
379msgstr "0 ሰከንዶች"
377msgstr "0 ሰከንዶች"
380
378
381#. Translators: String like "1 hour, 2 minutes, 3 seconds remaining"
379#. Translators: String like "1 hour, 2 minutes, 3 seconds remaining"
382−#: qml/Panel/Indicators/MenuItemFactory.qml:895
380+#: qml/Panel/Indicators/MenuItemFactory.qml:904
383#, qt-format
381#, qt-format
384msgid "%1 remaining"
382msgid "%1 remaining"
385msgstr "%1 የቀረው"
383msgstr "%1 የቀረው"
386
384
387−#: qml/Panel/Indicators/MenuItemFactory.qml:901
385+#: qml/Panel/Indicators/MenuItemFactory.qml:910
388msgid "In queue…"
386msgid "In queue…"
389msgstr "ወረፋ በመጠበቅ ላይ…"
387msgstr "ወረፋ በመጠበቅ ላይ…"
390
388
391−#: qml/Panel/Indicators/MenuItemFactory.qml:905
389+#: qml/Panel/Indicators/MenuItemFactory.qml:914
392msgid "Downloading"
390msgid "Downloading"
393msgstr "በማውረድ ላይ"
391msgstr "በማውረድ ላይ"
394
392
395−#: qml/Panel/Indicators/MenuItemFactory.qml:907
393+#: qml/Panel/Indicators/MenuItemFactory.qml:916
396msgid "Paused, tap to resume"
394msgid "Paused, tap to resume"
397msgstr "ማስቆሚያ: ለመቀጠል መታ ያድርጉ"
395msgstr "ማስቆሚያ: ለመቀጠል መታ ያድርጉ"
398
396
399−#: qml/Panel/Indicators/MenuItemFactory.qml:909
397+#: qml/Panel/Indicators/MenuItemFactory.qml:918
400msgid "Canceled"
398msgid "Canceled"
401msgstr "ተሰርዟል"
399msgstr "ተሰርዟል"
402
400
403−#: qml/Panel/Indicators/MenuItemFactory.qml:911
401+#: qml/Panel/Indicators/MenuItemFactory.qml:920
404msgid "Finished"
402msgid "Finished"
405msgstr "ጨርሷል"
403msgstr "ጨርሷል"
406
404
407−#: qml/Panel/Indicators/MenuItemFactory.qml:913
405+#: qml/Panel/Indicators/MenuItemFactory.qml:922
408msgid "Failed, tap to retry"
406msgid "Failed, tap to retry"
409msgstr "አልተቻለም: እንደገና ለመሞከር መታ ያድርጉ"
407msgstr "አልተቻለም: እንደገና ለመሞከር መታ ያድርጉ"
410
408
@@ -424,247 +422,326 @@ msgctxt "Button: Call back on phone"
424msgid "Call back"
422msgid "Call back"
425msgstr "መልሶ መደወያ"
423msgstr "መልሶ መደወያ"
426
424
427−#: qml/Tutorial/TutorialBottom.qml:28
425+#: qml/Stages/SideStage.qml:76
428−msgid "Open special menus"
426+msgid "Drag using 3 fingers any application from one window to the other"
429−msgstr "የተለዩ ዝርዝሮች መክፈቻ"
427+msgstr "መጎተቻ 3 ጣቶች በ መጠቀም ማንኛውንም መተግበሪያ ከ አንድ መስኮት ወደ ሌላ"
430
428
431−#: qml/Tutorial/TutorialBottom.qml:29
429+#: qml/Tutorial/TutorialBottom.qml:78
432−msgid "Swipe up from the bottom edge."
430+msgid "Swipe up to add a contact"
433−msgstr "ከ ታች ጠርዝ በኩል ወደ ላይ ይጥረጉ"
431+msgstr "ወደ ላይ ይጥረጉ ግንኙነት ለ መጨመር"
434
432
435−#: qml/Tutorial/TutorialBottomFinish.qml:24
433+#: qml/Tutorial/TutorialBottom.qml:80
436−msgid "This action does different things for different apps"
434+msgid "Swipe up for favorite calculations"
437−msgstr "ይህ ተግባር ለተለያዩ መተግበሪያዎች የተለያየ ነገር ይሰራል"
435+msgstr "ወደ ላይ ይጥረጉ የሚወዱትን ለማስላት"
438
436
439−#: qml/Tutorial/TutorialBottomFinish.qml:25
437+#: qml/Tutorial/TutorialBottom.qml:82
440−msgid "Tap here to finish."
438+msgid "Swipe up for recent calls"
441−msgstr "እዚህ መታ ይድርጉ ለመጨረስ"
439+msgstr "ወደ ላይ ይጥረጉ ለ ቅርብ ጊዜ ጥሪዎች"
442
440
443−#: qml/Tutorial/TutorialContent.qml:80 qml/Tutorial/TutorialLeftFinish.qml:25
441+#: qml/Tutorial/TutorialBottom.qml:84
444−#: qml/Tutorial/TutorialRight.qml:144
442+msgid "Swipe up to create a message"
445−msgid "Tap here to continue."
443+msgstr "ወደ ላይ ይጥረጉ መልእክት ለ መፍጠር"
446−msgstr "እዚህ መታ ይድርጉ ለመቀጠል"
447
444
448−#: qml/Tutorial/TutorialLeft.qml:26
445+#: qml/Tutorial/TutorialBottom.qml:85
449−msgid "Open the launcher"
446+msgid "Swipe up to manage the app"
450−msgstr "ማስጀመሪያውን መክፈቻ"
447+msgstr "ወደ ላይ ይጥረጉ መተግበሪያ ለማስተዳደር"
451
448
452−#: qml/Tutorial/TutorialLeft.qml:27
449+#: qml/Tutorial/TutorialLeft.qml:47
453−msgid "Short swipe from the left edge."
450+msgid "Swipe from the left edge to open the launcher"
454−msgstr "ከ ግራ ጠርዝ በኩል በትንሹ ይጥረጉ"
451+msgstr "ከ ግራ ጠርዝ በኩል ይጥረጉ ማስጀመሪያውን ለ መክፈት"
455
452
456−#: qml/Tutorial/TutorialLeftFinish.qml:24
453+#: qml/Tutorial/TutorialLeftLong.qml:47
457−msgid "These are the shortcuts to favorite apps"
454+msgid "Long swipe from the left edge to open the Today scope"
458−msgstr "እነዚህ አቋራጮች ናቸው እርስዎ ለሚወዷቸው መተግበሪያዎች"
455+msgstr "በ ረጅሙ ከ ግራ ጠርዝ በኩል ይጥረጉ የ ዛሬን ክልል ለ መክፈት"
459
456
460−#: qml/Tutorial/TutorialPage.qml:178
457+#: qml/Tutorial/TutorialRight.qml:54
461−msgid "You almost got it!"
458+msgid "Hover your mouse on the right edge to view your open apps"
462−msgstr "እርስዎ አሁን እያገኙት ነው!"
459+msgstr "የ እርስዎን አይጥ ወደ ቀኝ ጠርዝ በኩል ሲያደርጉ የ ተከፈቱ መተግበሪያዎች መመልከቻ"
463
460
464−#: qml/Tutorial/TutorialPage.qml:195
461+#: qml/Tutorial/TutorialRight.qml:55
465−msgid "Try again."
462+msgid "Short or long swipe from the right edge to view your open apps"
466−msgstr "እንደገና ይሞክሩ"
463+msgstr "በ አጭሩ ወይንም በ ረጅሙ ይጥረጉ ከ ቀኝ ጠረዝ በኩል የ ተከፈቱ መተግበሪያዎችን ለማየት"
467
464
468−#: qml/Tutorial/TutorialRight.qml:31
465+#: qml/Tutorial/TutorialTop.qml:53
469−msgid "To view open apps"
466+msgid "Swipe from the top right edge to open the notification bar"
470−msgstr "ለመመልከት መተግበሪያዎች ይክፈቱ"
467+msgstr "ከ ላይ ቀኝ ጠርዝ በኩል ይጥረጉ የ ማስታወቂያ መደርደሪያ ለ መክፈት"
471
468
472−#: qml/Tutorial/TutorialRight.qml:32
469+#: qml/Tutorial/TutorialTop.qml:54
473−msgid "Long swipe from the right edge."
470+msgid "Swipe from the top edge to open the notification bar"
474−msgstr "ከ ቀኝ ጠርዝ በኩል በረጅሙ ይጥረጉ"
471+msgstr "ከ ላይ ጠርዝ በኩል ይጥረጉ የ ማስታወቂያ መደርደሪያ ለ መክፈት"
475
472
476−#: qml/Tutorial/TutorialRight.qml:122
477−msgid "View all your running tasks."
478−msgstr "እርስዎ የሚያስኬዱትን ተግባሮች በሙሉ መመልከቻ"
479−
480−#: qml/Wizard/Page.qml:89
473+#: qml/Wizard/Page.qml:54
481msgctxt "Button: Go back one page in the Wizard"
474msgctxt "Button: Go back one page in the Wizard"
482msgid "Back"
475msgid "Back"
483msgstr "ወደ ኋላ"
476msgstr "ወደ ኋላ"
484
477
485#: qml/Wizard/Pages/10-welcome.qml:27
478#: qml/Wizard/Pages/10-welcome.qml:27
486−msgid "Hi!"
479+msgid "Language"
487−msgstr "ሰላም"
480+msgstr "ቋንቋ"
488−
481+
489−#: qml/Wizard/Pages/10-welcome.qml:44
490−msgid "Welcome to your Ubuntu device."
491−msgstr "እንኳን ድህና መጡ ወደ ኡቡንቱ"
492−
493−#: qml/Wizard/Pages/10-welcome.qml:52
494−msgid "Let’s get started."
495−msgstr "ስራ እንጀምር"
496−
497−#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:133
482+#: qml/Wizard/Pages/10-welcome.qml:156 qml/Wizard/Pages/30-wifi.qml:206
498−#: qml/Wizard/Pages/40-wifi.qml:215 qml/Wizard/Pages/50-location.qml:131
483+#: qml/Wizard/Pages/40-location.qml:271 qml/Wizard/Pages/50-timezone.qml:267
499−#: qml/Wizard/Pages/60-reporting.qml:60 qml/Wizard/Pages/passwd-confirm.qml:82
484+#: qml/Wizard/Pages/60-account.qml:65 qml/Wizard/Pages/70-passwd-type.qml:144
485+#: qml/Wizard/Pages/75-report-check.qml:84
486+#: qml/Wizard/Pages/passcode-desktop.qml:124
500−#: qml/Wizard/Pages/passwd-set.qml:90
487+#: qml/Wizard/Pages/password-set.qml:141
501−msgid "Continue"
488+msgid "Next"
502msgstr "ይቀጥሉ"
489msgstr "ይቀጥሉ"
503
490
504−#: qml/Wizard/Pages/20-sim.qml:25
491+#: qml/Wizard/Pages/30-wifi.qml:29
505−msgid "Add a SIM card and restart your device"
492+msgid "Connect to Wi‑Fi"
506−msgstr "የ ሲም ካርድ ይጨምሩ እና አካሉን እንደገና ያስነሱ"
493+msgstr "ወደ ዋይ‑ፋይ መገናኛ"
494+
495+#: qml/Wizard/Pages/30-wifi.qml:130
496+msgid "Connected"
497+msgstr "ተገናኝቷል"
507
498
508−#: qml/Wizard/Pages/20-sim.qml:59
499+#: qml/Wizard/Pages/30-wifi.qml:163
509−msgid "Without it, you won’t be able to make calls or use text messaging."
500+msgid "Available Wi-Fi networks"
510−msgstr "ያለ እሱ ጥሪ መፈጸም ወይንም የ ጽሁፍ መልእክት መላክ አይችሉም"
501+msgstr "ዝግጁ የ ዋይ-ፋይ ኔትዎርኮች"
511
502
512−#: qml/Wizard/Pages/20-sim.qml:73 qml/Wizard/Pages/40-wifi.qml:215
503+#: qml/Wizard/Pages/30-wifi.qml:164
504+msgid "No available Wi-Fi networks"
505+msgstr "ምንም ዝግጁ ዋይ-ፋይ ኔትዎርኮች አልተገኙም"
506+
507+#: qml/Wizard/Pages/30-wifi.qml:206 qml/Wizard/Pages/60-account.qml:65
508+#: qml/Wizard/Pages/sim.qml:101
513msgid "Skip"
509msgid "Skip"
514msgstr "መዝለያ"
510msgstr "መዝለያ"
515
511
516−#: qml/Wizard/Pages/30-passwd-type.qml:39
512+#: qml/Wizard/Pages/40-location.qml:27
517−msgid "Lock security"
513+msgid "Location Services"
518−msgstr "ደህንነት መቆለፊያ"
514+msgstr "የ አካባቢ ግልጋሎት"
519
515
520−#: qml/Wizard/Pages/30-passwd-type.qml:79
516+#: qml/Wizard/Pages/40-location.qml:83
521−msgid "Please select how you’d like to unlock your device."
517+msgid ""
522−msgstr "እባክዎን የ እርስዎን አካል እንዴት እንደሚከፈት ይምረጡ"
518+"Use GPS, Wi-Fi hotspots and mobile network anonymously to detect location "
519+"(recommended)"
520+msgstr "ይጠቀሙ ጂፒኤስ: ዋይ-ፋይ: hotspots እና ተንቀሳቃሽ ኔትዎርክ ሳይታወቁ አካባቢ ለማግኘት (ይመከራሉ)"
523
521
524−#: qml/Wizard/Pages/30-passwd-type.qml:102
522+#: qml/Wizard/Pages/40-location.qml:105
525−msgctxt "Label: Type of security method"
523+#, qt-format
526−msgid "Swipe"
524+msgid "By selecting this option you agree to the Nokia HERE %1."
527−msgstr "መጥረጊያ"
525+msgstr "ይህን ምርጫ በ መምረጥ እርስዎ ተስማምተዋል ከ Nokia HERE %1."
528
526
529−#: qml/Wizard/Pages/30-passwd-type.qml:103
527+#: qml/Wizard/Pages/40-location.qml:106
530−msgctxt "Label: Description of security method"
528+msgctxt "part of: Nokia HERE terms and conditions"
531−msgid "No security"
529+msgid "terms and conditions"
532−msgstr "ደህንነት አልተገኘም"
530+msgstr "ስምምነት እና ሁኔታዎች"
533
531
534−#: qml/Wizard/Pages/30-passwd-type.qml:105
532+#: qml/Wizard/Pages/40-location.qml:160
535−msgctxt "Label: Type of security method"
536−msgid "Passcode"
533+msgid "GPS only"
537−msgstr "ማለፊያ ኮድ"
534+msgstr "ጂፒኤስ ብቻ"
538
535
539−#: qml/Wizard/Pages/30-passwd-type.qml:106
536+#: qml/Wizard/Pages/40-location.qml:214
540−msgctxt "Label: Description of security method"
537+msgid "Don't use my location"
541−msgid "4 digits only"
538+msgstr "የ እኔን አካባቢ አትጠቀም"
542−msgstr "4 ዲጂት ብቻ"
543
539
544−#: qml/Wizard/Pages/30-passwd-type.qml:108
540+#: qml/Wizard/Pages/40-location.qml:260
545−msgctxt "Label: Type of security method"
541+msgid "You can change it later in System Settings."
546−msgid "Passphrase"
542+msgstr "እርስዎ በኋላ በ ስርአት ማሰናጃ ውስጥ መቀየር ይችላሉ"
547−msgstr "የማለፊያ ሐረግ"
548
543
549−#: qml/Wizard/Pages/30-passwd-type.qml:109
544+#: qml/Wizard/Pages/50-timezone.qml:29
550−msgctxt "Label: Description of security method"
545+msgid "Time Zone"
551−msgid "Numbers and letters"
546+msgstr "የ ሰአት ክልል"
552−msgstr "ቁጥሮች እና ፊደሎች"
553
547
554−#: qml/Wizard/Pages/40-wifi.qml:29
548+#: qml/Wizard/Pages/50-timezone.qml:178
555−msgid "Connect to Wi‑Fi"
549+msgid "Enter your city"
556−msgstr "ወደ ዋይ‑ፋይ መገናኛ"
550+msgstr "የ እርስዎን ከተማ ያስገቡ"
557
551
558−#: qml/Wizard/Pages/40-wifi.qml:168
552+#: qml/Wizard/Pages/60-account.qml:24
559−msgid "Available networks…"
553+msgid "Personalize Your Device"
560−msgstr "ዝግጁ ኔትዎርኮች…"
554+msgstr "የ እርስዎን አካል የ ግልዎ ያድርጉ"
561
555
562−#: qml/Wizard/Pages/40-wifi.qml:169
556+#: qml/Wizard/Pages/60-account.qml:48
563−msgid "No available networks."
557+msgid "Preferred Name"
564−msgstr "ዝግጁ ኔትዎርኮች አልተገኙም"
558+msgstr "የመረጡት ስም"
565
559
566−#: qml/Wizard/Pages/50-location.qml:27
560+#: qml/Wizard/Pages/70-passwd-type.qml:39
567−msgid "Location"
561+msgid "Lock Screen"
568−msgstr "አካባቢ"
562+msgstr "መመልከቻውን መቆለፊያ"
569
563
570−#: qml/Wizard/Pages/50-location.qml:62
564+#: qml/Wizard/Pages/70-passwd-type.qml:101
571−msgid "Let the phone detect your location:"
565+msgctxt "Label: Type of security method"
572−msgstr "እባክዎን እርስዎ ያሉበትን አካባቢ ስልኩ እራሱ ይፈልግ:"
566+msgid "Create new password"
567+msgstr "አዲስ የ መግቢያ ቃል መፍጠሪያ"
573
568
574−#: qml/Wizard/Pages/50-location.qml:69
569+#: qml/Wizard/Pages/70-passwd-type.qml:103
575−msgid "Using GPS only (less accurate)"
570+msgctxt "Label: Type of security method"
576−msgstr "ጂፒኤስን ብቻ መጠቀሚያ(በጣም ቅርብ)"
571+msgid "Create passcode (numbers only)"
572+msgstr "አዲስ የ ማለፊያ ኮድ መፍጠሪያ (ቁጥር ብቻ)"
577
573
578−#: qml/Wizard/Pages/50-location.qml:86
574+#: qml/Wizard/Pages/70-passwd-type.qml:105
579−msgid "Using GPS, anonymized Wi-Fi and cellular network info (recommended)"
575+msgctxt "Label: Type of security method"
580−msgstr "ይጠቀሙ ጂፒኤስ ግልጽ ያልሆነ ዋይ-ፋይ እና ተንቀሳቃሽ ኔትዎርክ መረጃ (ይመከራሉ)"
576+msgid "No lock code"
577+msgstr "ምንም መቆለፊያ ኮድ አልተገኘም"
581
578
582−#. Translators: HERE is a trademark for Nokia's location service, you probably shouldn't translate it
579+#: qml/Wizard/Pages/75-report-check.qml:26 qml/Wizard/Pages/here-terms.qml:108
583−#: qml/Wizard/Pages/50-location.qml:103
580+msgid "Privacy Policy"
584−msgid ""
581+msgstr "የ ግላዊነት መመሪያ"
585−"By selecting this option you agree to the Nokia HERE <a href='#'>terms and "
582+
586−"conditions</a>."
583+#: qml/Wizard/Pages/75-report-check.qml:26
587−msgstr "ይህን ምርጫ በመምረጥ ተስማምቻለሁ ከ Nokia HERE <a href='#'>ውሎች እና ሁኔታዎች ጋር</a>."
584+msgid "Help Us Improve"
585+msgstr "እንድንሻሻል ይርዱን"
586+
587+#: qml/Wizard/Pages/75-report-check.qml:59
588+msgid "Improve system performance by sending us crashes and error reports."
589+msgstr "የ ስርአቱን አፈጻጸም ለማሻሻል የ ግጭት እና የ ስህተት መልእክቶች ይላኩልን"
588
590
589−#: qml/Wizard/Pages/50-location.qml:112
591+#: qml/Wizard/Pages/75-report-check.qml:60
590−msgid "Not at all"
592+msgid "Privacy policy"
591−msgstr "አይደለም"
593+msgstr "የ ግላዊነት መመሪያ"
592
594
593−#: qml/Wizard/Pages/50-location.qml:124
595+#: qml/Wizard/Pages/80-finished.qml:89
594−msgid "You can change your mind later in <b>System Settings</b>."
596+msgid "Welcome to Ubuntu"
595−msgstr "እርስዎ በኋላ መቀየር ይችላሉ ከ <b>ስርአት ማሰናጃዎች</b>."
597+msgstr "እንኳን ደህና መጡ ወደ ኡቡንቱ"
598+
599+#: qml/Wizard/Pages/80-finished.qml:104
600+msgid "You are ready to use your device now"
601+msgstr "የ እርስዎን አካል ለ መጠቀም አሁን ዝግጁ ነው"
602+
603+#: qml/Wizard/Pages/80-finished.qml:124
604+msgid "Get Started"
605+msgstr "እንጀምር"
606+
607+#: qml/Wizard/Pages/here-terms.qml:25
608+msgid "Terms & Conditions"
609+msgstr "ውሎች & ሁኔታዎች"
596
610
597−#: qml/Wizard/Pages/60-reporting.qml:26
611+#: qml/Wizard/Pages/here-terms.qml:69
598−msgid "Improving your experience"
612+msgid "Your device uses positioning technologies provided by HERE."
599−msgstr "የ እርስዎን ልምምድ ማሻሻያ"
613+msgstr "የ እርስዎ አካል ይጠቀማል ያሉበትን አካባቢ ቴክኖሎጂ የቀረበውን በ HERE."
600
614
601−#: qml/Wizard/Pages/60-reporting.qml:46
615+#: qml/Wizard/Pages/here-terms.qml:81
602msgid ""
616msgid ""
603−"Your phone is set up to automatically report errors to Canonical and its "
617+"To provide you with positioning services and to improve their quality, HERE "
604−"partners, the makers of the operating system."
618+"collects information about nearby cell towers and Wi-Fi hotspots around your "
619+"current location whenever your position is being found."
605msgstr ""
620msgstr ""
606−"የ እርስዎ ስልክ ራሱ በራሱ የ ስህተት መግለጫዎች ወደ Canonical and its partners, የ መስሪያ ስርአት "
621+"እርስዎ ያሉበትን አካባቢ ግልጋሎት ለ መስጠት እና ለማሻሻል: HERE መረጃ ይሰበስባል በቅርብ ያሉ የ ሴል ምሶሶዎች እና "
607−"አምራቾች"
622+"ዋይ-ፋይ hotspots እርስዎ አሁን ያሉበትን አካባቢ ሲታወቅ"
608
623
609−#: qml/Wizard/Pages/60-reporting.qml:53
624+#: qml/Wizard/Pages/here-terms.qml:93
610msgid ""
625msgid ""
611−"This can be disabled in <b>System Settings</b> under <b>Security &amp; "
626+"The information collected is used to analyze the service and to improve the "
612−"Privacy</b>"
627+"use of service, but not to identify you personally."
613−msgstr ""
628+msgstr "የ ተሰበሰበው መረጃ የሚጠቅመው ግልጋሎት ለማሻሻል ነው: ነገር ግን እርስዎን በ ግል ለ መለየት አይደለም"
614−"ይህን ግልጋሎት ማሰናከል ይችላሉ ከ <b>ስርአት ማሰናጃዎች</b> under <b>Security &amp; Privacy</b>"
615
629
616−#: qml/Wizard/Pages/80-finished.qml:24
630+#: qml/Wizard/Pages/here-terms.qml:106
617−msgid "All done"
631+#, qt-format
618−msgstr "ሁሉም ተፈጽሟል"
632+msgid "By continuing, you agree to the HERE platform %1 and %2."
633+msgstr "በ መቀጠል እርስዎ ተስማምተዋል ከ HERE platform %1 እና %2."
619
634
620−#: qml/Wizard/Pages/80-finished.qml:39
635+#: qml/Wizard/Pages/here-terms.qml:107
621−msgid "Nice work!"
636+msgid "Service Terms"
622−msgstr "ጥሩ ሰርተዋል!"
637+msgstr "የ ግልጋሎት ስምምነቶች"
623
638
624−#: qml/Wizard/Pages/80-finished.qml:46
639+#: qml/Wizard/Pages/passcode-confirm.qml:43
625−msgid "Your device is now ready to use."
640+#: qml/Wizard/Pages/passcode-desktop.qml:80
626−msgstr "የ እርስዎ አካል አሁን ዝግጁ ነው"
641+msgid "Confirm passcode"
642+msgstr "የማለፊያ ኮድ ማረጋገጫ"
627
643
628−#: qml/Wizard/Pages/80-finished.qml:53
644+#: qml/Wizard/Pages/passcode-confirm.qml:45
629−msgid "Finish"
645+msgid "Incorrect passcode."
630−msgstr "መጨረሻ"
646+msgstr "የ ተሳሳተ የማለፊያ ኮድ"
631
647
632−#: qml/Wizard/Pages/here-terms.qml:27
648+#: qml/Wizard/Pages/passcode-confirm.qml:45
633−msgid "Terms & Conditions"
649+msgctxt "Enter the passcode again"
634−msgstr "ውሎች & ሁኔታዎች"
650+msgid "Please re-enter."
651+msgstr "እባክዎን እንደገና-ያስገቡ"
635
652
636−#: qml/Wizard/Pages/passwd-confirm.qml:49
653+#: qml/Wizard/Pages/passcode-desktop.qml:30
637−msgid "Confirm passphrase"
654+msgid "Lock Screen Passcode"
638−msgstr "የ ማለፊያ ሐረግ ማረጋገጫ"
655+msgstr "የ መመልከቻው መቆለፊያ የ ማለፊያ ኮድ"
639
656
640−#: qml/Wizard/Pages/passwd-confirm.qml:50
657+#: qml/Wizard/Pages/passcode-desktop.qml:56
641−msgid "Confirm passcode"
658+msgid "Enter 4 numbers to setup your passcode"
642−msgstr "የማለፊያ ኮድ ማረጋገጫ"
659+msgstr "ያስገቡ 4 ቁጥሮች የ እርስዎን የ ማለፊያ ኮድ ለማሰናዳት"
643
660
644−#: qml/Wizard/Pages/passwd-confirm.qml:53
661+#: qml/Wizard/Pages/passcode-desktop.qml:65
645−#: qml/Wizard/Pages/passwd-confirm.qml:54
662+#: qml/Wizard/Pages/passcode-set.qml:54
646−msgid "Please try again."
663+msgid "Choose passcode"
647−msgstr "እባክዎን እንደገና ይሞክሩ"
664+msgstr "የ ማለፊያ ኮድ ይምረጡ"
648
665
649−#: qml/Wizard/Pages/passwd-set.qml:61
666+#: qml/Wizard/Pages/passcode-desktop.qml:105
650−msgid "Choose your passcode"
667+msgid "Passcode too short"
651−msgstr "የ እርስዎን የማለፊያ ኮድ ይምረጡ"
668+msgstr "የ ማለፊያ ኮዱ በጣም አጭር ነው"
652
669
653−#: qml/Wizard/Pages/passwd-set.qml:68
670+#: qml/Wizard/Pages/passcode-desktop.qml:107
654−msgid "Passphrase must be 4 characters long"
671+msgid "Passcodes match"
655−msgstr "የ ማለፊያ ሀረግ ቢያንስ 4 ባህሪዎች መሆን አለበት"
672+msgstr "የ ማለፊያ ኮዶቹ ተመሳሳይ ናቸው"
656
673
657−#. Translators: This is the arrow for "Back" buttons
674+#: qml/Wizard/Pages/passcode-desktop.qml:109
658−#: qml/Wizard/StackButton.qml:39
675+msgid "Passcodes do not match"
659−#, qt-format
676+msgstr "የ ማለፊያ ኮዶቹ አይመሳሰሉም"
660−msgid "〈 %1"
661−msgstr "〈 %1"
662
677
663−#. Translators: This is the arrow for "Forward" buttons
678+#: qml/Wizard/Pages/passcode-set.qml:62
679+msgid "Passcode must be 4 characters long"
680+msgstr "የ ማለፊያ ኮድ 4 ባህሪዎች መሆን አለበት"
681+
682+#: qml/Wizard/Pages/password-set.qml:30
683+msgid "Lock Screen Password"
684+msgstr "የ መመልከቻ መቆለፊያ የ መግቢያ ቃል"
685+
686+#: qml/Wizard/Pages/password-set.qml:61
687+msgid "Enter at least 8 characters"
688+msgstr "ያስገቡ ቢያንስ 8 ባህሪዎች"
689+
664−#: qml/Wizard/StackButton.qml:42
690+#: qml/Wizard/Pages/password-set.qml:73
665−#, qt-format
691+msgid "Choose password"
666−msgid "%1 〉"
692+msgstr "የ መግቢያ ቃል ይምረጡ"
667−msgstr "%1 〉"
693+
694+#: qml/Wizard/Pages/password-set.qml:103
695+msgid "Confirm password"
696+msgstr "የ መግቢያ ቃሉን ያረጋግጡ"
697+
698+#: qml/Wizard/Pages/sim.qml:27
699+msgid "No SIM card installed"
700+msgstr "ምንም ሲም ካርድ አልተገጠመም"
701+
702+#: qml/Wizard/Pages/sim.qml:54
703+msgid "SIM card added"
704+msgstr "ሲም ካርድ ተጨምሯል"
705+
706+#: qml/Wizard/Pages/sim.qml:55
707+msgid "You must restart the device to access the mobile network."
708+msgstr "እርስዎ አካሉን እንደገና ማስጀመር አለብዎት ተንቀሳቃሽ ኔትዎርክ ጋር ለ መድረስ"
709+
710+#: qml/Wizard/Pages/sim.qml:59
711+msgid "Restart"
712+msgstr "እንደገና ማስጀመሪያ"
713+
714+#: qml/Wizard/Pages/sim.qml:78
715+msgid "You won’t be able to make calls or use text messaging without a SIM."
716+msgstr "ያለ ሲም ካርድ እርስዎ ጥሪ መፈጸም ወይንም በ ጽሁፍ መልእክት መላክ አይችሉም"
717+
718+#: qml/Wizard/Pages/sim.qml:90
719+msgid "To proceed with no SIM tap Skip."
720+msgstr "ያለ ሲም ለ መቀጠል መዝለያውን መታ ያድርጉ"
721+
722+#: qml/Wizard/PasswordMeter.qml:87
723+msgid "Passwords match"
724+msgstr "የ መግቢያ ቃሎቹ ተመሳሳይ ናቸው"
725+
726+#: qml/Wizard/PasswordMeter.qml:89
727+msgid "Passwords do not match"
728+msgstr "የ መግቢያ ቃሎቹ ተመሳሳይ አይደሉም"
729+
730+#: qml/Wizard/PasswordMeter.qml:93
731+msgid "Strong password"
732+msgstr "ጠንካራ የ መግቢያ ቃል"
733+
734+#: qml/Wizard/PasswordMeter.qml:95
735+msgid "Fair password"
736+msgstr "ደህና የ መግቢያ ቃል"
737+
738+#: qml/Wizard/PasswordMeter.qml:97
739+msgid "Weak password"
740+msgstr "ደካማ የ መግቢያ ቃል"
741+
742+#: qml/Wizard/PasswordMeter.qml:99
743+msgid "Very weak password"
744+msgstr "በጣም ደካማ የ መግቢያ ቃል"
668
745
669#~ msgid "Top edge"
746#~ msgid "Top edge"
670#~ msgstr "የላይ ጠርዝ"
747#~ msgstr "የላይ ጠርዝ"
@@ -735,6 +812,9 @@ msgstr "%1 〉"
735#~ msgid "Log out"
812#~ msgid "Log out"
736#~ msgstr "መውጫ"
813#~ msgstr "መውጫ"
737
814
815+#~ msgid "Are you sure you want to shut down?"
816+#~ msgstr "በእርግጥ ማጥፋት ይፈልጋሉ?"
817+
738#~ msgid "Shut down"
818#~ msgid "Shut down"
739#~ msgstr "ማጥፊያ"
819#~ msgstr "ማጥፊያ"
740
820
@@ -756,24 +836,188 @@ msgstr "%1 〉"
756#~ msgid "Roaming"
836#~ msgid "Roaming"
757#~ msgstr "ማዘዋወሪያ"
837#~ msgstr "ማዘዋወሪያ"
758
838
759−#~ msgid "Restart"
760−#~ msgstr "እንደገና ማስጀመሪያ"
761−
762#~ msgid "Manage Scopes"
839#~ msgid "Manage Scopes"
763#~ msgstr "የ ክልል አስተዳዳሪ"
840#~ msgstr "የ ክልል አስተዳዳሪ"
764
841
765#~ msgid "Please re-enter"
842#~ msgid "Please re-enter"
766#~ msgstr "እባክዎን እንደገና-ያስገቡ"
843#~ msgstr "እባክዎን እንደገና-ያስገቡ"
767
844
845+#~ msgid "Lock security"
846+#~ msgstr "ደህንነት መቆለፊያ"
847+
768#~ msgid "Please select how you’d like to unlock your phone."
848#~ msgid "Please select how you’d like to unlock your phone."
769#~ msgstr "እባክዎን የ እርስዎን ስልክ እንዴት እንደሚከፍቱ ይምረጡ"
849#~ msgstr "እባክዎን የ እርስዎን ስልክ እንዴት እንደሚከፍቱ ይምረጡ"
770
850
851+#~ msgid "Improving your experience"
852+#~ msgstr "የ እርስዎን ልምምድ ማሻሻያ"
853+
854+#~ msgid "Available networks…"
855+#~ msgstr "ዝግጁ ኔትዎርኮች…"
856+
857+#~ msgid "No available networks."
858+#~ msgstr "ዝግጁ ኔትዎርኮች አልተገኙም"
859+
860+#~ msgid "Location"
861+#~ msgstr "አካባቢ"
862+
863+#~ msgid ""
864+#~ "This can be disabled in <b>System Settings</b> under <b>Security &amp; "
865+#~ "Privacy</b>"
866+#~ msgstr ""
867+#~ "ይህን ግልጋሎት ማሰናከል ይችላሉ ከ <b>ስርአት ማሰናጃዎች</b> under <b>Security &amp; Privacy</b>"
868+
869+#~ msgid "Nice work!"
870+#~ msgstr "ጥሩ ሰርተዋል!"
871+
872+#~ msgid "All done"
873+#~ msgstr "ሁሉም ተፈጽሟል"
874+
875+#~ msgid "Finish"
876+#~ msgstr "መጨረሻ"
877+
771#~ msgid "Your phone is now ready to use."
878#~ msgid "Your phone is now ready to use."
772#~ msgstr "ስልኩ አሁን ለመጠቀም ዝግጁ ነው"
879#~ msgstr "ስልኩ አሁን ለመጠቀም ዝግጁ ነው"
773
880
881+#~ msgid "Confirm passphrase"
882+#~ msgstr "የ ማለፊያ ሐረግ ማረጋገጫ"
883+
884+#~ msgid "Please try again."
885+#~ msgstr "እባክዎን እንደገና ይሞክሩ"
886+
887+#~ msgid "Add a SIM card and restart your device"
888+#~ msgstr "የ ሲም ካርድ ይጨምሩ እና አካሉን እንደገና ያስነሱ"
889+
890+#~ msgid "Without it, you won’t be able to make calls or use text messaging."
891+#~ msgstr "ያለ እሱ ጥሪ መፈጸም ወይንም የ ጽሁፍ መልእክት መላክ አይችሉም"
892+
893+#~ msgid "Hi!"
894+#~ msgstr "ሰላም"
895+
774#~ msgid "Welcome to your Ubuntu phone."
896#~ msgid "Welcome to your Ubuntu phone."
775#~ msgstr "እንኳን ደህና መጡ ወደ እርስዎ ኡቡንቱ ስልክ"
897#~ msgstr "እንኳን ደህና መጡ ወደ እርስዎ ኡቡንቱ ስልክ"
776
898
899+#~ msgid "Let’s get started."
900+#~ msgstr "ስራ እንጀምር"
901+
902+#~ msgid "Continue"
903+#~ msgstr "ይቀጥሉ"
904+
905+#~ msgid "Passphrase must be 4 characters long"
906+#~ msgstr "የ ማለፊያ ሀረግ ቢያንስ 4 ባህሪዎች መሆን አለበት"
907+
908+#~ msgid "Choose your passcode"
909+#~ msgstr "የ እርስዎን የማለፊያ ኮድ ይምረጡ"
910+
911+#~ msgid "Let the phone detect your location:"
912+#~ msgstr "እባክዎን እርስዎ ያሉበትን አካባቢ ስልኩ እራሱ ይፈልግ:"
913+
914+#, qt-format
915+#~ msgid "〈 %1"
916+#~ msgstr "〈 %1"
917+
918+#, qt-format
919+#~ msgid "%1 〉"
920+#~ msgstr "%1 〉"
921+
922+#~ msgid "You can change your mind later in <b>System Settings</b>."
923+#~ msgstr "እርስዎ በኋላ መቀየር ይችላሉ ከ <b>ስርአት ማሰናጃዎች</b>."
924+
925+#~ msgid "Not at all"
926+#~ msgstr "አይደለም"
927+
928+#~ msgid "Using GPS only (less accurate)"
929+#~ msgstr "ጂፒኤስን ብቻ መጠቀሚያ(በጣም ቅርብ)"
930+
931+#~ msgid ""
932+#~ "Your phone is set up to automatically report errors to Canonical and its "
933+#~ "partners, the makers of the operating system."
934+#~ msgstr ""
935+#~ "የ እርስዎ ስልክ ራሱ በራሱ የ ስህተት መግለጫዎች ወደ Canonical and its partners, የ መስሪያ ስርአት "
936+#~ "አምራቾች"
937+
938+#~ msgid ""
939+#~ "By selecting this option you agree to the Nokia HERE <a href='#'>terms and "
940+#~ "conditions</a>."
941+#~ msgstr "ይህን ምርጫ በመምረጥ ተስማምቻለሁ ከ Nokia HERE <a href='#'>ውሎች እና ሁኔታዎች ጋር</a>."
942+
943+#~ msgid "Using GPS, anonymized Wi-Fi and cellular network info (recommended)"
944+#~ msgstr "ይጠቀሙ ጂፒኤስ ግልጽ ያልሆነ ዋይ-ፋይ እና ተንቀሳቃሽ ኔትዎርክ መረጃ (ይመከራሉ)"
945+
946+#~ msgid "This action does different things for different apps"
947+#~ msgstr "ይህ ተግባር ለተለያዩ መተግበሪያዎች የተለያየ ነገር ይሰራል"
948+
949+#~ msgid "Tap here to finish."
950+#~ msgstr "እዚህ መታ ይድርጉ ለመጨረስ"
951+
952+#~ msgid "Short swipe from the left edge."
953+#~ msgstr "ከ ግራ ጠርዝ በኩል በትንሹ ይጥረጉ"
954+
955+#~ msgid "Open the launcher"
956+#~ msgstr "ማስጀመሪያውን መክፈቻ"
957+
958+#~ msgid "Tap here to continue."
959+#~ msgstr "እዚህ መታ ይድርጉ ለመቀጠል"
960+
961+#~ msgid "These are the shortcuts to favorite apps"
962+#~ msgstr "እነዚህ አቋራጮች ናቸው እርስዎ ለሚወዷቸው መተግበሪያዎች"
963+
964+#~ msgid "Swipe up from the bottom edge."
965+#~ msgstr "ከ ታች ጠርዝ በኩል ወደ ላይ ይጥረጉ"
966+
967+#~ msgid "Open special menus"
968+#~ msgstr "የተለዩ ዝርዝሮች መክፈቻ"
969+
970+#~ msgid "To view open apps"
971+#~ msgstr "ለመመልከት መተግበሪያዎች ይክፈቱ"
972+
973+#~ msgid "Try again."
974+#~ msgstr "እንደገና ይሞክሩ"
975+
976+#~ msgid "You almost got it!"
977+#~ msgstr "እርስዎ አሁን እያገኙት ነው!"
978+
979+#~ msgid "Long swipe from the right edge."
980+#~ msgstr "ከ ቀኝ ጠርዝ በኩል በረጅሙ ይጥረጉ"
981+
982+#~ msgid "View all your running tasks."
983+#~ msgstr "እርስዎ የሚያስኬዱትን ተግባሮች በሙሉ መመልከቻ"
984+
985+#~ msgctxt "Button: Shut down the system"
986+#~ msgid "Shut down"
987+#~ msgstr "ማጥፊያ"
988+
989+#~ msgctxt "Title: Reboot/Shut down dialog"
990+#~ msgid "Shut down"
991+#~ msgstr "ማጥፊያ"
992+
993+#~ msgctxt "Button: Reboot the system"
994+#~ msgid "Reboot"
995+#~ msgstr "እንደገና ማስነሻ"
996+
997+#~ msgctxt "Label: Type of security method"
998+#~ msgid "Passcode"
999+#~ msgstr "ማለፊያ ኮድ"
1000+
1001+#~ msgctxt "Label: Description of security method"
1002+#~ msgid "No security"
1003+#~ msgstr "ደህንነት አልተገኘም"
1004+
1005+#~ msgctxt "Label: Description of security method"
1006+#~ msgid "4 digits only"
1007+#~ msgstr "4 ዲጂት ብቻ"
1008+
1009+#~ msgctxt "Label: Type of security method"
1010+#~ msgid "Swipe"
1011+#~ msgstr "መጥረጊያ"
1012+
1013+#~ msgctxt "Label: Type of security method"
1014+#~ msgid "Passphrase"
1015+#~ msgstr "የማለፊያ ሐረግ"
1016+
1017+#~ msgctxt "Label: Description of security method"
1018+#~ msgid "Numbers and letters"
1019+#~ msgstr "ቁጥሮች እና ፊደሎች"
1020+
777#~ msgid "%a %d %b %H:%M"
1021#~ msgid "%a %d %b %H:%M"
778#~ msgstr "%a %d %b %ሰ:%ደ"
1022#~ msgstr "%a %d %b %ሰ:%ደ"
779
1023
@@ -807,11 +1051,11 @@ msgstr "%1 〉"
807#~ msgid "Call back"
1051#~ msgid "Call back"
808#~ msgstr "መልሶ መደወያ"
1052#~ msgstr "መልሶ መደወያ"
809
1053
810−#~ msgid "Re-dock, save your work and close these apps to continue."
1054+#~ msgid "Welcome to your Ubuntu device."
811−#~ msgstr "እንደገና-ማሳረፊያ: ስራዎትን ያስቀምጡ እና ይዝጉ መተግበሪያው እንዲቀጥል"
1055+#~ msgstr "እንኳን ድህና መጡ ወደ ኡቡንቱ"
812
1056
813−#~ msgid ""
1057+#~ msgid "Please select how you’d like to unlock your device."
814−#~ "Your device is now connected to an external display. Use this screen as a "
1058+#~ msgstr "እባክዎን የ እርስዎን አካል እንዴት እንደሚከፈት ይምረጡ"
815−#~ "touch pad to interact with the mouse."
1059+
816−#~ msgstr ""
1060+#~ msgid "Your device is now ready to use."
817−#~ "የ እርስዎ አካል አሁን ከ ውጪ ማሳያ ጋር ተገናኝቷል: ይህን መመልከቻ እንደ ተችፓድ ከ አይጥ ጋር ተባብሮ ይሰራል"
1061+#~ msgstr "የ እርስዎ አካል አሁን ዝግጁ ነው"
po/ar.po+455−227
@@ -7,7 +7,7 @@ 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: 2016-03-10 22:48+0000\n"
10+"POT-Creation-Date: 2016-03-23 10:01+0000\n"
11"PO-Revision-Date: 2015-07-29 09:41+0000\n"
11"PO-Revision-Date: 2015-07-29 09:41+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"
@@ -16,8 +16,8 @@ msgstr ""
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 >= "
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"
18"3 && n % 100 <= 10 ? 3 : n % 100 >= 11 && n % 100 <= 99 ? 4 : 5;\n"
19−"X-Launchpad-Export-Date: 2016-03-13 05:50+0000\n"
19+"X-Launchpad-Export-Date: 2016-03-24 06:07+0000\n"
20−"X-Generator: Launchpad (build 17939)\n"
20+"X-Generator: Launchpad (build 17958)\n"
21
21
22#: plugins/IntegratedLightDM/Greeter.cpp:112
22#: plugins/IntegratedLightDM/Greeter.cpp:112
23msgid "Password: "
23msgid "Password: "
@@ -80,53 +80,35 @@ msgctxt "Button: Log out from the system"
80msgid "Log Out"
80msgid "Log Out"
81msgstr "خروج"
81msgstr "خروج"
82
82
83−#: qml/Components/Dialogs.qml:161 qml/Components/Dialogs.qml:194
83+#: qml/Components/Dialogs.qml:161 qml/Components/Dialogs.qml:219
84−#: qml/Components/Dialogs.qml:253
84+#: qml/Dash/DashPageHeader.qml:298 qml/Wizard/Pages/passcode-confirm.qml:32
85+#: qml/Wizard/Pages/passcode-set.qml:32
85msgid "Cancel"
86msgid "Cancel"
86msgstr "إلغاء"
87msgstr "إلغاء"
87
88
88#: qml/Components/Dialogs.qml:173
89#: qml/Components/Dialogs.qml:173
89−msgctxt "Title: Reboot/Shut down dialog"
90−msgid "Shut down"
91−msgstr "إطفاء الجهاز"
92−
93−#: qml/Components/Dialogs.qml:174
94−msgid "Are you sure you want to shut down?"
95−msgstr "هل أنت متأكد من رغبتك في إطفاء الجهاز؟"
96−
97−#: qml/Components/Dialogs.qml:176
98−msgctxt "Button: Reboot the system"
99−msgid "Reboot"
100−msgstr "إعادة التشغيل"
101−
102−#: qml/Components/Dialogs.qml:185
103−msgctxt "Button: Shut down the system"
104−msgid "Shut down"
105−msgstr "إطفاء الجهاز"
106−
107−#: qml/Components/Dialogs.qml:207
108msgctxt "Title: Reboot dialog"
90msgctxt "Title: Reboot dialog"
109msgid "Reboot"
91msgid "Reboot"
110msgstr "إعادة التشغيل"
92msgstr "إعادة التشغيل"
111
93
112−#: qml/Components/Dialogs.qml:208
94+#: qml/Components/Dialogs.qml:174
113msgid "Are you sure you want to reboot?"
95msgid "Are you sure you want to reboot?"
114msgstr "هل أنت متأكد من رغبتك في إعادة تشغيل الجهاز؟"
96msgstr "هل أنت متأكد من رغبتك في إعادة تشغيل الجهاز؟"
115
97
116−#: qml/Components/Dialogs.qml:210
98+#: qml/Components/Dialogs.qml:176
117msgid "No"
99msgid "No"
118msgstr "لا"
100msgstr "لا"
119
101
120−#: qml/Components/Dialogs.qml:217
102+#: qml/Components/Dialogs.qml:183
121msgid "Yes"
103msgid "Yes"
122msgstr "نعم"
104msgstr "نعم"
123
105
124−#: qml/Components/Dialogs.qml:232
106+#: qml/Components/Dialogs.qml:198
125msgctxt "Title: Power off/Restart dialog"
107msgctxt "Title: Power off/Restart dialog"
126msgid "Power"
108msgid "Power"
127msgstr "الطاقة"
109msgstr "الطاقة"
128
110
129−#: qml/Components/Dialogs.qml:233
111+#: qml/Components/Dialogs.qml:199
130msgid ""
112msgid ""
131"Are you sure you would like\n"
113"Are you sure you would like\n"
132"to power off?"
114"to power off?"
@@ -134,12 +116,12 @@ msgstr ""
134"هل أنت متأكد من رغبتك\n"
116"هل أنت متأكد من رغبتك\n"
135"في إيقاف التشغيل؟"
117"في إيقاف التشغيل؟"
136
118
137−#: qml/Components/Dialogs.qml:235
119+#: qml/Components/Dialogs.qml:201
138msgctxt "Button: Power off the system"
120msgctxt "Button: Power off the system"
139msgid "Power off"
121msgid "Power off"
140msgstr "إيقاف التشغيل"
122msgstr "إيقاف التشغيل"
141
123
142−#: qml/Components/Dialogs.qml:244
124+#: qml/Components/Dialogs.qml:210
143msgctxt "Button: Restart the system"
125msgctxt "Button: Restart the system"
144msgid "Restart"
126msgid "Restart"
145msgstr "إعادة التشغيل"
127msgstr "إعادة التشغيل"
@@ -182,42 +164,58 @@ msgstr ""
182msgid "Close all"
164msgid "Close all"
183msgstr ""
165msgstr ""
184
166
185−#: qml/Dash/DashPageHeader.qml:270
167+#: qml/Dash/DashPageHeader.qml:337
186msgctxt "Button: Open the Ubuntu Store"
168msgctxt "Button: Open the Ubuntu Store"
187msgid "Store"
169msgid "Store"
188msgstr "المتجر"
170msgstr "المتجر"
189
171
190−#: qml/Dash/DashPageHeader.qml:277
172+#: qml/Dash/DashPageHeader.qml:344
191msgctxt "Button: Start a search in the current dash scope"
173msgctxt "Button: Start a search in the current dash scope"
192msgid "Search"
174msgid "Search"
193msgstr "بحث"
175msgstr "بحث"
194
176
195−#: qml/Dash/DashPageHeader.qml:287
177+#: qml/Dash/DashPageHeader.qml:354
196msgctxt "Button: Show the current dash scope settings"
178msgctxt "Button: Show the current dash scope settings"
197msgid "Settings"
179msgid "Settings"
198msgstr "الإعدادات"
180msgstr "الإعدادات"
199
181
200−#: qml/Dash/DashPageHeader.qml:294
182+#: qml/Dash/DashPageHeader.qml:361
201msgid "Remove from Favorites"
183msgid "Remove from Favorites"
202msgstr "حذف من المفضلات"
184msgstr "حذف من المفضلات"
203
185
204−#: qml/Dash/DashPageHeader.qml:294
186+#: qml/Dash/DashPageHeader.qml:361
205msgid "Add to Favorites"
187msgid "Add to Favorites"
206msgstr "إضافة إلى المفضلات"
188msgstr "إضافة إلى المفضلات"
207
189
190+#: qml/Dash/FiltersPopover.qml:60
191+msgid "Refine your results"
192+msgstr ""
193+
194+#: qml/Dash/FiltersPopover.qml:69
195+msgid "Reset"
196+msgstr ""
197+
208−#: qml/Dash/GenericScopeView.qml:567 qml/Dash/GenericScopeView.qml:725
198+#: qml/Dash/GenericScopeView.qml:570 qml/Dash/GenericScopeView.qml:755
209msgid "See less"
199msgid "See less"
210msgstr "شاهد أقل"
200msgstr "شاهد أقل"
211
201
212−#: qml/Dash/GenericScopeView.qml:567
202+#: qml/Dash/GenericScopeView.qml:570
213msgid "See all"
203msgid "See all"
214msgstr "عرض الكل"
204msgstr "عرض الكل"
215
205
216−#: qml/Dash/GenericScopeView.qml:629
206+#: qml/Dash/GenericScopeView.qml:627
217msgctxt "Label: Hint for dash search line edit"
207msgctxt "Label: Hint for dash search line edit"
218msgid "Search"
208msgid "Search"
219msgstr "بحث"
209msgstr "بحث"
220
210
211+#: qml/Dash/PageHeaderExtraPanel.qml:55
212+msgid "Recent Searches"
213+msgstr ""
214+
215+#: qml/Dash/PageHeaderExtraPanel.qml:66
216+msgid "Clear All"
217+msgstr ""
218+
221#: qml/Dash/Previews/PreviewActionCombo.qml:35
219#: qml/Dash/Previews/PreviewActionCombo.qml:35
222msgid "More..."
220msgid "More..."
223msgstr "المزيد..."
221msgstr "المزيد..."
@@ -285,11 +283,11 @@ msgstr "إعادة المحاولة"
285msgid "Tap to unlock"
283msgid "Tap to unlock"
286msgstr "انقر لفك القفل"
284msgstr "انقر لفك القفل"
287
285
288−#: qml/Greeter/NarrowView.qml:54 qml/Wizard/Pages/passwd-confirm.qml:53
286+#: qml/Greeter/NarrowView.qml:54
289msgid "Sorry, incorrect passphrase."
287msgid "Sorry, incorrect passphrase."
290msgstr "عذرًا، عبارة سرّية خاطئة."
288msgstr "عذرًا، عبارة سرّية خاطئة."
291
289
292−#: qml/Greeter/NarrowView.qml:55 qml/Wizard/Pages/passwd-confirm.qml:54
290+#: qml/Greeter/NarrowView.qml:55
293msgid "Sorry, incorrect passcode."
291msgid "Sorry, incorrect passcode."
294msgstr "عذرًا، رمز سرّي خاطيء."
292msgstr "عذرًا، رمز سرّي خاطيء."
295
293
@@ -318,7 +316,7 @@ msgstr ""
318msgid "Enter %1"
316msgid "Enter %1"
319msgstr "أدخِل %1"
317msgstr "أدخِل %1"
320
318
321−#: qml/Greeter/NarrowView.qml:117 qml/Wizard/Pages/passwd-set.qml:60
319+#: qml/Greeter/NarrowView.qml:117
322msgid "Enter passphrase"
320msgid "Enter passphrase"
323msgstr "أدخِل العبارة السرية"
321msgstr "أدخِل العبارة السرية"
324
322
@@ -356,11 +354,11 @@ msgstr "انقر للعودة إلى المكالمة..."
356msgid "Conference"
354msgid "Conference"
357msgstr "مؤتمر"
355msgstr "مؤتمر"
358
356
359−#: qml/Panel/Indicators/MenuItemFactory.qml:752
357+#: qml/Panel/Indicators/MenuItemFactory.qml:761
360msgid "Nothing is playing"
358msgid "Nothing is playing"
361msgstr "لا شيء مُشغّل"
359msgstr "لا شيء مُشغّل"
362
360
363−#: qml/Panel/Indicators/MenuItemFactory.qml:881
361+#: qml/Panel/Indicators/MenuItemFactory.qml:890
364#, qt-format
362#, qt-format
365msgid "%1 hour"
363msgid "%1 hour"
366msgid_plural "%1 hours"
364msgid_plural "%1 hours"
@@ -371,7 +369,7 @@ msgstr[3] "%1 ساعات"
371msgstr[4] "%1 ساعة"
369msgstr[4] "%1 ساعة"
372msgstr[5] "%1 ساعة"
370msgstr[5] "%1 ساعة"
373
371
374−#: qml/Panel/Indicators/MenuItemFactory.qml:885
372+#: qml/Panel/Indicators/MenuItemFactory.qml:894
375#, qt-format
373#, qt-format
376msgid "%1 minute"
374msgid "%1 minute"
377msgid_plural "%1 minutes"
375msgid_plural "%1 minutes"
@@ -382,7 +380,7 @@ msgstr[3] "%1 دقائق"
382msgstr[4] "%1 دقيقة"
380msgstr[4] "%1 دقيقة"
383msgstr[5] "%1 دقيقة"
381msgstr[5] "%1 دقيقة"
384
382
385−#: qml/Panel/Indicators/MenuItemFactory.qml:890
383+#: qml/Panel/Indicators/MenuItemFactory.qml:899
386#, qt-format
384#, qt-format
387msgid "%1 second"
385msgid "%1 second"
388msgid_plural "%1 seconds"
386msgid_plural "%1 seconds"
@@ -393,37 +391,37 @@ msgstr[3] "%1 ثوان"
393msgstr[4] "%1 ثانية"
391msgstr[4] "%1 ثانية"
394msgstr[5] "%1 ثانية"
392msgstr[5] "%1 ثانية"
395
393
396−#: qml/Panel/Indicators/MenuItemFactory.qml:893
394+#: qml/Panel/Indicators/MenuItemFactory.qml:902
397msgid "0 seconds"
395msgid "0 seconds"
398msgstr "أقل من ثانية"
396msgstr "أقل من ثانية"
399
397
400#. Translators: String like "1 hour, 2 minutes, 3 seconds remaining"
398#. Translators: String like "1 hour, 2 minutes, 3 seconds remaining"
401−#: qml/Panel/Indicators/MenuItemFactory.qml:895
399+#: qml/Panel/Indicators/MenuItemFactory.qml:904
402#, qt-format
400#, qt-format
403msgid "%1 remaining"
401msgid "%1 remaining"
404msgstr "باق %1"
402msgstr "باق %1"
405
403
406−#: qml/Panel/Indicators/MenuItemFactory.qml:901
404+#: qml/Panel/Indicators/MenuItemFactory.qml:910
407msgid "In queue…"
405msgid "In queue…"
408msgstr "في الانتظار..."
406msgstr "في الانتظار..."
409
407
410−#: qml/Panel/Indicators/MenuItemFactory.qml:905
408+#: qml/Panel/Indicators/MenuItemFactory.qml:914
411msgid "Downloading"
409msgid "Downloading"
412msgstr "التنزيل"
410msgstr "التنزيل"
413
411
414−#: qml/Panel/Indicators/MenuItemFactory.qml:907
412+#: qml/Panel/Indicators/MenuItemFactory.qml:916
415msgid "Paused, tap to resume"
413msgid "Paused, tap to resume"
416msgstr "مُلبث، انقر للاستئناف"
414msgstr "مُلبث، انقر للاستئناف"
417
415
418−#: qml/Panel/Indicators/MenuItemFactory.qml:909
416+#: qml/Panel/Indicators/MenuItemFactory.qml:918
419msgid "Canceled"
417msgid "Canceled"
420msgstr "تم إلغائه"
418msgstr "تم إلغائه"
421
419
422−#: qml/Panel/Indicators/MenuItemFactory.qml:911
420+#: qml/Panel/Indicators/MenuItemFactory.qml:920
423msgid "Finished"
421msgid "Finished"
424msgstr "انتهى"
422msgstr "انتهى"
425
423
426−#: qml/Panel/Indicators/MenuItemFactory.qml:913
424+#: qml/Panel/Indicators/MenuItemFactory.qml:922
427msgid "Failed, tap to retry"
425msgid "Failed, tap to retry"
428msgstr "فشل، انقل لإعادة المحاولة"
426msgstr "فشل، انقل لإعادة المحاولة"
429
427
@@ -443,252 +441,323 @@ msgctxt "Button: Call back on phone"
443msgid "Call back"
441msgid "Call back"
444msgstr ""
442msgstr ""
445
443
446−#: qml/Tutorial/TutorialBottom.qml:28
444+#: qml/Stages/SideStage.qml:76
447−msgid "Open special menus"
445+msgid "Drag using 3 fingers any application from one window to the other"
448−msgstr "فتح قوائم خاصة"
446+msgstr ""
449−
450−#: qml/Tutorial/TutorialBottom.qml:29
451−msgid "Swipe up from the bottom edge."
452−msgstr "اسحب لأعلى من الحافة السفلى."
453
447
454−#: qml/Tutorial/TutorialBottomFinish.qml:24
448+#: qml/Tutorial/TutorialBottom.qml:78
455−msgid "This action does different things for different apps"
449+msgid "Swipe up to add a contact"
456−msgstr "هذا الإجراء يقوم بأشياء مختلفة على التطبيقات المختلفة"
450+msgstr ""
457
451
458−#: qml/Tutorial/TutorialBottomFinish.qml:25
452+#: qml/Tutorial/TutorialBottom.qml:80
459−msgid "Tap here to finish."
453+msgid "Swipe up for favorite calculations"
460−msgstr "انقر هنا للإنهاء."
454+msgstr ""
461
455
462−#: qml/Tutorial/TutorialContent.qml:80 qml/Tutorial/TutorialLeftFinish.qml:25
456+#: qml/Tutorial/TutorialBottom.qml:82
463−#: qml/Tutorial/TutorialRight.qml:144
457+msgid "Swipe up for recent calls"
464−msgid "Tap here to continue."
458+msgstr ""
465−msgstr "انقر هنا للمتابعة."
466
459
467−#: qml/Tutorial/TutorialLeft.qml:26
460+#: qml/Tutorial/TutorialBottom.qml:84
468−msgid "Open the launcher"
461+msgid "Swipe up to create a message"
469msgstr ""
462msgstr ""
470
463
471−#: qml/Tutorial/TutorialLeft.qml:27
464+#: qml/Tutorial/TutorialBottom.qml:85
472−msgid "Short swipe from the left edge."
465+msgid "Swipe up to manage the app"
473−msgstr "اسحب سحبة قصيرة من الحافة اليسرى."
466+msgstr ""
474
467
475−#: qml/Tutorial/TutorialLeftFinish.qml:24
468+#: qml/Tutorial/TutorialLeft.qml:47
476−msgid "These are the shortcuts to favorite apps"
469+msgid "Swipe from the left edge to open the launcher"
477−msgstr "هذه اختصارات للتطبيقات المُفضلة"
470+msgstr ""
478
471
479−#: qml/Tutorial/TutorialPage.qml:178
472+#: qml/Tutorial/TutorialLeftLong.qml:47
480−msgid "You almost got it!"
473+msgid "Long swipe from the left edge to open the Today scope"
481−msgstr "انت حصلت على ذلك تقريبا!"
474+msgstr ""
482
475
483−#: qml/Tutorial/TutorialPage.qml:195
476+#: qml/Tutorial/TutorialRight.qml:54
484−msgid "Try again."
477+msgid "Hover your mouse on the right edge to view your open apps"
485−msgstr "حاول مجددًا."
478+msgstr ""
486
479
487−#: qml/Tutorial/TutorialRight.qml:31
480+#: qml/Tutorial/TutorialRight.qml:55
488−msgid "To view open apps"
481+msgid "Short or long swipe from the right edge to view your open apps"
489msgstr ""
482msgstr ""
490
483
491−#: qml/Tutorial/TutorialRight.qml:32
484+#: qml/Tutorial/TutorialTop.qml:53
492−msgid "Long swipe from the right edge."
485+msgid "Swipe from the top right edge to open the notification bar"
493−msgstr "سحبة طويلة من الحافة اليمنى."
486+msgstr ""
494
487
495−#: qml/Tutorial/TutorialRight.qml:122
488+#: qml/Tutorial/TutorialTop.qml:54
496−msgid "View all your running tasks."
489+msgid "Swipe from the top edge to open the notification bar"
497−msgstr "عرض جميع المهام النشطة."
490+msgstr ""
498
491
499−#: qml/Wizard/Page.qml:89
492+#: qml/Wizard/Page.qml:54
500msgctxt "Button: Go back one page in the Wizard"
493msgctxt "Button: Go back one page in the Wizard"
501msgid "Back"
494msgid "Back"
502msgstr "عودة"
495msgstr "عودة"
503
496
504#: qml/Wizard/Pages/10-welcome.qml:27
497#: qml/Wizard/Pages/10-welcome.qml:27
505−msgid "Hi!"
498+msgid "Language"
506−msgstr "أهلا!"
499+msgstr ""
507
500
508−#: qml/Wizard/Pages/10-welcome.qml:44
501+#: qml/Wizard/Pages/10-welcome.qml:156 qml/Wizard/Pages/30-wifi.qml:206
509−msgid "Welcome to your Ubuntu device."
502+#: qml/Wizard/Pages/40-location.qml:271 qml/Wizard/Pages/50-timezone.qml:267
503+#: qml/Wizard/Pages/60-account.qml:65 qml/Wizard/Pages/70-passwd-type.qml:144
504+#: qml/Wizard/Pages/75-report-check.qml:84
505+#: qml/Wizard/Pages/passcode-desktop.qml:124
506+#: qml/Wizard/Pages/password-set.qml:141
507+msgid "Next"
510msgstr ""
508msgstr ""
511
509
512−#: qml/Wizard/Pages/10-welcome.qml:52
510+#: qml/Wizard/Pages/30-wifi.qml:29
513−msgid "Let’s get started."
511+msgid "Connect to Wi‑Fi"
514−msgstr "هيا بنا نبدأ."
512+msgstr "اتصل بالواي فاي"
515
513
516−#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:133
514+#: qml/Wizard/Pages/30-wifi.qml:130
517−#: qml/Wizard/Pages/40-wifi.qml:215 qml/Wizard/Pages/50-location.qml:131
515+msgid "Connected"
518−#: qml/Wizard/Pages/60-reporting.qml:60 qml/Wizard/Pages/passwd-confirm.qml:82
519−#: qml/Wizard/Pages/passwd-set.qml:90
520−msgid "Continue"
521−msgstr "متابعة"
516+msgstr ""
522
517
523−#: qml/Wizard/Pages/20-sim.qml:25
518+#: qml/Wizard/Pages/30-wifi.qml:163
524−msgid "Add a SIM card and restart your device"
519+msgid "Available Wi-Fi networks"
525−msgstr "أدخِل شريحة SIM ثم أعِد تشغيل الجهاز"
520+msgstr ""
526
521
527−#: qml/Wizard/Pages/20-sim.qml:59
522+#: qml/Wizard/Pages/30-wifi.qml:164
528−msgid "Without it, you won’t be able to make calls or use text messaging."
523+msgid "No available Wi-Fi networks"
529msgstr ""
524msgstr ""
530−"بدونها لن تتمكن من إجراء أي مكالمات هاتفية أو استخدام الرسائل النصية."
531
525
532−#: qml/Wizard/Pages/20-sim.qml:73 qml/Wizard/Pages/40-wifi.qml:215
526+#: qml/Wizard/Pages/30-wifi.qml:206 qml/Wizard/Pages/60-account.qml:65
527+#: qml/Wizard/Pages/sim.qml:101
533msgid "Skip"
528msgid "Skip"
534msgstr "تخطي"
529msgstr "تخطي"
535
530
536−#: qml/Wizard/Pages/30-passwd-type.qml:39
531+#: qml/Wizard/Pages/40-location.qml:27
537−msgid "Lock security"
532+msgid "Location Services"
538−msgstr "قِفل الأمان"
533+msgstr ""
539
534
540−#: qml/Wizard/Pages/30-passwd-type.qml:79
535+#: qml/Wizard/Pages/40-location.qml:83
541−msgid "Please select how you’d like to unlock your device."
536+msgid ""
537+"Use GPS, Wi-Fi hotspots and mobile network anonymously to detect location "
538+"(recommended)"
542msgstr ""
539msgstr ""
543
540
544−#: qml/Wizard/Pages/30-passwd-type.qml:102
541+#: qml/Wizard/Pages/40-location.qml:105
545−msgctxt "Label: Type of security method"
542+#, qt-format
546−msgid "Swipe"
543+msgid "By selecting this option you agree to the Nokia HERE %1."
544+msgstr ""
545+
546+#: qml/Wizard/Pages/40-location.qml:106
547+msgctxt "part of: Nokia HERE terms and conditions"
548+msgid "terms and conditions"
549+msgstr ""
550+
551+#: qml/Wizard/Pages/40-location.qml:160
552+msgid "GPS only"
553+msgstr ""
554+
555+#: qml/Wizard/Pages/40-location.qml:214
556+msgid "Don't use my location"
557+msgstr ""
558+
559+#: qml/Wizard/Pages/40-location.qml:260
560+msgid "You can change it later in System Settings."
561+msgstr ""
562+
563+#: qml/Wizard/Pages/50-timezone.qml:29
564+msgid "Time Zone"
565+msgstr ""
566+
567+#: qml/Wizard/Pages/50-timezone.qml:178
568+msgid "Enter your city"
547−msgstr "سحبة"
569+msgstr ""
548
570
549−#: qml/Wizard/Pages/30-passwd-type.qml:103
571+#: qml/Wizard/Pages/60-account.qml:24
550−msgctxt "Label: Description of security method"
572+msgid "Personalize Your Device"
551−msgid "No security"
573+msgstr ""
574+
575+#: qml/Wizard/Pages/60-account.qml:48
576+msgid "Preferred Name"
552−msgstr "بدون أمان"
577+msgstr ""
553
578
554−#: qml/Wizard/Pages/30-passwd-type.qml:105
579+#: qml/Wizard/Pages/70-passwd-type.qml:39
580+msgid "Lock Screen"
581+msgstr ""
582+
583+#: qml/Wizard/Pages/70-passwd-type.qml:101
555msgctxt "Label: Type of security method"
584msgctxt "Label: Type of security method"
556−msgid "Passcode"
585+msgid "Create new password"
557−msgstr "رمز سري"
586+msgstr ""
558
587
559−#: qml/Wizard/Pages/30-passwd-type.qml:106
588+#: qml/Wizard/Pages/70-passwd-type.qml:103
560−msgctxt "Label: Description of security method"
589+msgctxt "Label: Type of security method"
561−msgid "4 digits only"
590+msgid "Create passcode (numbers only)"
562−msgstr "4 أرقام فقط"
591+msgstr ""
563
592
564−#: qml/Wizard/Pages/30-passwd-type.qml:108
593+#: qml/Wizard/Pages/70-passwd-type.qml:105
565msgctxt "Label: Type of security method"
594msgctxt "Label: Type of security method"
566−msgid "Passphrase"
595+msgid "No lock code"
567−msgstr "عبارة سرية"
596+msgstr ""
568
597
569−#: qml/Wizard/Pages/30-passwd-type.qml:109
598+#: qml/Wizard/Pages/75-report-check.qml:26 qml/Wizard/Pages/here-terms.qml:108
570−msgctxt "Label: Description of security method"
599+msgid "Privacy Policy"
571−msgid "Numbers and letters"
600+msgstr ""
572−msgstr "أرقام وحروف"
573
601
574−#: qml/Wizard/Pages/40-wifi.qml:29
602+#: qml/Wizard/Pages/75-report-check.qml:26
575−msgid "Connect to Wi‑Fi"
603+msgid "Help Us Improve"
576−msgstr "اتصل بالواي فاي"
604+msgstr ""
577
605
578−#: qml/Wizard/Pages/40-wifi.qml:168
606+#: qml/Wizard/Pages/75-report-check.qml:59
579−msgid "Available networks…"
607+msgid "Improve system performance by sending us crashes and error reports."
580−msgstr "الشبكات المتاحة..."
608+msgstr ""
581
609
582−#: qml/Wizard/Pages/40-wifi.qml:169
610+#: qml/Wizard/Pages/75-report-check.qml:60
583−msgid "No available networks."
611+msgid "Privacy policy"
584−msgstr "لا توجد شبكات متاحة."
612+msgstr ""
585
613
586−#: qml/Wizard/Pages/50-location.qml:27
614+#: qml/Wizard/Pages/80-finished.qml:89
587−msgid "Location"
615+msgid "Welcome to Ubuntu"
588−msgstr "الموقع"
616+msgstr ""
589
617
590−#: qml/Wizard/Pages/50-location.qml:62
618+#: qml/Wizard/Pages/80-finished.qml:104
591−msgid "Let the phone detect your location:"
619+msgid "You are ready to use your device now"
592−msgstr "دع هاتفك يحدد موقعك:"
620+msgstr ""
621+
622+#: qml/Wizard/Pages/80-finished.qml:124
623+msgid "Get Started"
624+msgstr ""
625+
626+#: qml/Wizard/Pages/here-terms.qml:25
627+msgid "Terms & Conditions"
628+msgstr "الشروط والأحكام"
593
629
594−#: qml/Wizard/Pages/50-location.qml:69
630+#: qml/Wizard/Pages/here-terms.qml:69
595−msgid "Using GPS only (less accurate)"
631+msgid "Your device uses positioning technologies provided by HERE."
596−msgstr "باستخدام نظام تحديد المواقع (GPS) فقط (أقل دقّة)"
632+msgstr ""
597
633
598−#: qml/Wizard/Pages/50-location.qml:86
634+#: qml/Wizard/Pages/here-terms.qml:81
599−msgid "Using GPS, anonymized Wi-Fi and cellular network info (recommended)"
635+msgid ""
636+"To provide you with positioning services and to improve their quality, HERE "
637+"collects information about nearby cell towers and Wi-Fi hotspots around your "
638+"current location whenever your position is being found."
600msgstr ""
639msgstr ""
601−"باستخدام نظام تحديد المواقع (GPS)، والواي فاي، وبيانات الشبكة الخلوية "
602−"(مستحسن)"
603
640
604−#. Translators: HERE is a trademark for Nokia's location service, you probably shouldn't translate it
605−#: qml/Wizard/Pages/50-location.qml:103
641+#: qml/Wizard/Pages/here-terms.qml:93
606msgid ""
642msgid ""
607−"By selecting this option you agree to the Nokia HERE <a href='#'>terms and "
643+"The information collected is used to analyze the service and to improve the "
608−"conditions</a>."
644+"use of service, but not to identify you personally."
609msgstr ""
645msgstr ""
610−"باختيارك لهذا الخيار فإنك توافق على <a href='#'>الشروط والأحكام</a> الخاصة "
611−"بـ Nokia HERE."
612
646
613−#: qml/Wizard/Pages/50-location.qml:112
647+#: qml/Wizard/Pages/here-terms.qml:106
614−msgid "Not at all"
648+#, qt-format
649+msgid "By continuing, you agree to the HERE platform %1 and %2."
615msgstr ""
650msgstr ""
616
651
617−#: qml/Wizard/Pages/50-location.qml:124
652+#: qml/Wizard/Pages/here-terms.qml:107
618−msgid "You can change your mind later in <b>System Settings</b>."
653+msgid "Service Terms"
619−msgstr "يمكنك تغيير رأيك في وقت لاحق عن طريق <b>إعدادات النظام</b>."
654+msgstr ""
620
655
621−#: qml/Wizard/Pages/60-reporting.qml:26
656+#: qml/Wizard/Pages/passcode-confirm.qml:43
622−msgid "Improving your experience"
657+#: qml/Wizard/Pages/passcode-desktop.qml:80
623−msgstr "تحسين تجربتك"
658+msgid "Confirm passcode"
659+msgstr "تأكيد الرمز السري"
624
660
625−#: qml/Wizard/Pages/60-reporting.qml:46
661+#: qml/Wizard/Pages/passcode-confirm.qml:45
626−msgid ""
662+msgid "Incorrect passcode."
627−"Your phone is set up to automatically report errors to Canonical and its "
628−"partners, the makers of the operating system."
629msgstr ""
663msgstr ""
630−"هاتفك مُعدّ لإرسال تقارير آلية بالأخطاء إلى كانونيكال وشركائها (صانعي نظام "
631−"التشغيل)."
632
664
633−#: qml/Wizard/Pages/60-reporting.qml:53
665+#: qml/Wizard/Pages/passcode-confirm.qml:45
666+msgctxt "Enter the passcode again"
634−msgid ""
667+msgid "Please re-enter."
635−"This can be disabled in <b>System Settings</b> under <b>Security &amp; "
668+msgstr ""
636−"Privacy</b>"
669+
670+#: qml/Wizard/Pages/passcode-desktop.qml:30
671+msgid "Lock Screen Passcode"
672+msgstr ""
673+
674+#: qml/Wizard/Pages/passcode-desktop.qml:56
675+msgid "Enter 4 numbers to setup your passcode"
637msgstr ""
676msgstr ""
638−"يمكن تعطيل ذلك بالذهاب إلى <b>إعدادات النظام</b> من خلال <b>الأمان "
639−"والخصوصية</b>"
640
677
641−#: qml/Wizard/Pages/80-finished.qml:24
678+#: qml/Wizard/Pages/passcode-desktop.qml:65
642−msgid "All done"
679+#: qml/Wizard/Pages/passcode-set.qml:54
680+msgid "Choose passcode"
643−msgstr "تم ذلك"
681+msgstr ""
644
682
645−#: qml/Wizard/Pages/80-finished.qml:39
683+#: qml/Wizard/Pages/passcode-desktop.qml:105
646−msgid "Nice work!"
684+msgid "Passcode too short"
647−msgstr "عمل جيد!"
685+msgstr ""
648
686
649−#: qml/Wizard/Pages/80-finished.qml:46
687+#: qml/Wizard/Pages/passcode-desktop.qml:107
650−msgid "Your device is now ready to use."
688+msgid "Passcodes match"
651msgstr ""
689msgstr ""
652
690
653−#: qml/Wizard/Pages/80-finished.qml:53
691+#: qml/Wizard/Pages/passcode-desktop.qml:109
654−msgid "Finish"
692+msgid "Passcodes do not match"
655−msgstr "إنهاء"
693+msgstr ""
656
694
657−#: qml/Wizard/Pages/here-terms.qml:27
695+#: qml/Wizard/Pages/passcode-set.qml:62
658−msgid "Terms & Conditions"
696+msgid "Passcode must be 4 characters long"
659−msgstr "الشروط والأحكام"
697+msgstr ""
660
698
661−#: qml/Wizard/Pages/passwd-confirm.qml:49
699+#: qml/Wizard/Pages/password-set.qml:30
662−msgid "Confirm passphrase"
700+msgid "Lock Screen Password"
663−msgstr "تأكيد العبارة السرية"
701+msgstr ""
664
702
665−#: qml/Wizard/Pages/passwd-confirm.qml:50
703+#: qml/Wizard/Pages/password-set.qml:61
666−msgid "Confirm passcode"
704+msgid "Enter at least 8 characters"
667−msgstr "تأكيد الرمز السري"
705+msgstr ""
668
706
669−#: qml/Wizard/Pages/passwd-confirm.qml:53
707+#: qml/Wizard/Pages/password-set.qml:73
670−#: qml/Wizard/Pages/passwd-confirm.qml:54
708+msgid "Choose password"
671−msgid "Please try again."
672−msgstr "حاول مجددا."
709+msgstr ""
673
710
674−#: qml/Wizard/Pages/passwd-set.qml:61
711+#: qml/Wizard/Pages/password-set.qml:103
675−msgid "Choose your passcode"
712+msgid "Confirm password"
676−msgstr "اختر الرمز السري خاصتك"
713+msgstr ""
677
714
678−#: qml/Wizard/Pages/passwd-set.qml:68
715+#: qml/Wizard/Pages/sim.qml:27
679−msgid "Passphrase must be 4 characters long"
716+msgid "No SIM card installed"
680−msgstr "يجب أن تحتوي العبارة السرية على 4 أحرف على الأقل"
717+msgstr ""
681
718
682−#. Translators: This is the arrow for "Back" buttons
683−#: qml/Wizard/StackButton.qml:39
719+#: qml/Wizard/Pages/sim.qml:54
684−#, qt-format
685−msgid "〈 %1"
720+msgid "SIM card added"
686msgstr ""
721msgstr ""
687
722
688−#. Translators: This is the arrow for "Forward" buttons
723+#: qml/Wizard/Pages/sim.qml:55
724+msgid "You must restart the device to access the mobile network."
725+msgstr ""
726+
727+#: qml/Wizard/Pages/sim.qml:59
728+msgid "Restart"
729+msgstr ""
730+
731+#: qml/Wizard/Pages/sim.qml:78
732+msgid "You won’t be able to make calls or use text messaging without a SIM."
733+msgstr ""
734+
735+#: qml/Wizard/Pages/sim.qml:90
736+msgid "To proceed with no SIM tap Skip."
737+msgstr ""
738+
739+#: qml/Wizard/PasswordMeter.qml:87
740+msgid "Passwords match"
741+msgstr ""
742+
743+#: qml/Wizard/PasswordMeter.qml:89
744+msgid "Passwords do not match"
745+msgstr ""
746+
747+#: qml/Wizard/PasswordMeter.qml:93
748+msgid "Strong password"
749+msgstr ""
750+
751+#: qml/Wizard/PasswordMeter.qml:95
752+msgid "Fair password"
753+msgstr ""
754+
689−#: qml/Wizard/StackButton.qml:42
755+#: qml/Wizard/PasswordMeter.qml:97
690−#, qt-format
756+msgid "Weak password"
691−msgid "%1 〉"
757+msgstr ""
758+
759+#: qml/Wizard/PasswordMeter.qml:99
760+msgid "Very weak password"
692msgstr ""
761msgstr ""
693
762
694#~ msgid "Confirm"
763#~ msgid "Confirm"
@@ -777,20 +846,179 @@ msgstr ""
777#~ msgid "Tomorrow %H:%M"
846#~ msgid "Tomorrow %H:%M"
778#~ msgstr "غدًا %H:%M"
847#~ msgstr "غدًا %H:%M"
779
848
849+#~ msgid "Are you sure you want to shut down?"
850+#~ msgstr "هل أنت متأكد من رغبتك في إطفاء الجهاز؟"
851+
852+#~ msgctxt "Button: Shut down the system"
853+#~ msgid "Shut down"
854+#~ msgstr "إطفاء الجهاز"
855+
856+#~ msgctxt "Title: Reboot/Shut down dialog"
857+#~ msgid "Shut down"
858+#~ msgstr "إطفاء الجهاز"
859+
860+#~ msgctxt "Button: Reboot the system"
861+#~ msgid "Reboot"
862+#~ msgstr "إعادة التشغيل"
863+
780#~ msgid "Please re-enter"
864#~ msgid "Please re-enter"
781#~ msgstr "برجاء إعادة إدخالها"
865#~ msgstr "برجاء إعادة إدخالها"
782
866
867+#~ msgid "This action does different things for different apps"
868+#~ msgstr "هذا الإجراء يقوم بأشياء مختلفة على التطبيقات المختلفة"
869+
870+#~ msgid "These are the shortcuts to favorite apps"
871+#~ msgstr "هذه اختصارات للتطبيقات المُفضلة"
872+
783#~ msgid "Roaming"
873#~ msgid "Roaming"
784#~ msgstr "التجوال"
874#~ msgstr "التجوال"
785
875
876+#~ msgid "Short swipe from the left edge."
877+#~ msgstr "اسحب سحبة قصيرة من الحافة اليسرى."
878+
879+#~ msgid "Tap here to continue."
880+#~ msgstr "انقر هنا للمتابعة."
881+
882+#~ msgid "Swipe up from the bottom edge."
883+#~ msgstr "اسحب لأعلى من الحافة السفلى."
884+
885+#~ msgid "Open special menus"
886+#~ msgstr "فتح قوائم خاصة"
887+
888+#~ msgid "Tap here to finish."
889+#~ msgstr "انقر هنا للإنهاء."
890+
891+#~ msgid "Long swipe from the right edge."
892+#~ msgstr "سحبة طويلة من الحافة اليمنى."
893+
894+#~ msgid "View all your running tasks."
895+#~ msgstr "عرض جميع المهام النشطة."
896+
897+#~ msgid "Confirm passphrase"
898+#~ msgstr "تأكيد العبارة السرية"
899+
900+#~ msgid "Try again."
901+#~ msgstr "حاول مجددًا."
902+
903+#~ msgid "Please try again."
904+#~ msgstr "حاول مجددا."
905+
906+#~ msgid "Lock security"
907+#~ msgstr "قِفل الأمان"
908+
909+#~ msgid "Without it, you won’t be able to make calls or use text messaging."
910+#~ msgstr ""
911+#~ "بدونها لن تتمكن من إجراء أي مكالمات هاتفية أو استخدام الرسائل النصية."
912+
913+#~ msgid "Add a SIM card and restart your device"
914+#~ msgstr "أدخِل شريحة SIM ثم أعِد تشغيل الجهاز"
915+
916+#~ msgid "Hi!"
917+#~ msgstr "أهلا!"
918+
786#~ msgid "Welcome to your Ubuntu phone."
919#~ msgid "Welcome to your Ubuntu phone."
787#~ msgstr "مرحبا بك في أوبونتو للهواتف."
920#~ msgstr "مرحبا بك في أوبونتو للهواتف."
788
921
922+#~ msgid "Let’s get started."
923+#~ msgstr "هيا بنا نبدأ."
924+
925+#~ msgid "Continue"
926+#~ msgstr "متابعة"
927+
928+#~ msgid "Choose your passcode"
929+#~ msgstr "اختر الرمز السري خاصتك"
930+
931+#~ msgid "Passphrase must be 4 characters long"
932+#~ msgstr "يجب أن تحتوي العبارة السرية على 4 أحرف على الأقل"
933+
934+#~ msgid "Available networks…"
935+#~ msgstr "الشبكات المتاحة..."
936+
789#~ msgid "Please select how you’d like to unlock your phone."
937#~ msgid "Please select how you’d like to unlock your phone."
790#~ msgstr "رجاءً اختر الطريقة التي ترغب بأن توصد هاتفك بها."
938#~ msgstr "رجاءً اختر الطريقة التي ترغب بأن توصد هاتفك بها."
791
939
940+#~ msgctxt "Label: Description of security method"
941+#~ msgid "No security"
942+#~ msgstr "بدون أمان"
943+
944+#~ msgctxt "Label: Type of security method"
945+#~ msgid "Swipe"
946+#~ msgstr "سحبة"
947+
948+#~ msgctxt "Label: Description of security method"
949+#~ msgid "4 digits only"
950+#~ msgstr "4 أرقام فقط"
951+
952+#~ msgctxt "Label: Type of security method"
953+#~ msgid "Passcode"
954+#~ msgstr "رمز سري"
955+
956+#~ msgid "No available networks."
957+#~ msgstr "لا توجد شبكات متاحة."
958+
959+#~ msgctxt "Label: Type of security method"
960+#~ msgid "Passphrase"
961+#~ msgstr "عبارة سرية"
962+
963+#~ msgctxt "Label: Description of security method"
964+#~ msgid "Numbers and letters"
965+#~ msgstr "أرقام وحروف"
966+
967+#~ msgid "Improving your experience"
968+#~ msgstr "تحسين تجربتك"
969+
970+#~ msgid "You can change your mind later in <b>System Settings</b>."
971+#~ msgstr "يمكنك تغيير رأيك في وقت لاحق عن طريق <b>إعدادات النظام</b>."
972+
973+#~ msgid "Location"
974+#~ msgstr "الموقع"
975+
976+#~ msgid "Let the phone detect your location:"
977+#~ msgstr "دع هاتفك يحدد موقعك:"
978+
979+#~ msgid "Using GPS only (less accurate)"
980+#~ msgstr "باستخدام نظام تحديد المواقع (GPS) فقط (أقل دقّة)"
981+
982+#~ msgid "Using GPS, anonymized Wi-Fi and cellular network info (recommended)"
983+#~ msgstr ""
984+#~ "باستخدام نظام تحديد المواقع (GPS)، والواي فاي، وبيانات الشبكة الخلوية "
985+#~ "(مستحسن)"
986+
987+#~ msgid ""
988+#~ "This can be disabled in <b>System Settings</b> under <b>Security &amp; "
989+#~ "Privacy</b>"
990+#~ msgstr ""
991+#~ "يمكن تعطيل ذلك بالذهاب إلى <b>إعدادات النظام</b> من خلال <b>الأمان "
992+#~ "والخصوصية</b>"
993+
994+#~ msgid "Nice work!"
995+#~ msgstr "عمل جيد!"
996+
997+#~ msgid "All done"
998+#~ msgstr "تم ذلك"
999+
1000+#~ msgid "Finish"
1001+#~ msgstr "إنهاء"
1002+
792#~ msgid "Your phone is now ready to use."
1003#~ msgid "Your phone is now ready to use."
793#~ msgstr "هاتفك جاهز الآن للاستخدام."
1004#~ msgstr "هاتفك جاهز الآن للاستخدام."
794
1005
1006+#~ msgid "You almost got it!"
1007+#~ msgstr "انت حصلت على ذلك تقريبا!"
1008+
1009+#~ msgid ""
1010+#~ "Your phone is set up to automatically report errors to Canonical and its "
1011+#~ "partners, the makers of the operating system."
1012+#~ msgstr ""
1013+#~ "هاتفك مُعدّ لإرسال تقارير آلية بالأخطاء إلى كانونيكال وشركائها (صانعي نظام "
1014+#~ "التشغيل)."
1015+
795#~ msgid "Unlock SIM"
1016#~ msgid "Unlock SIM"
796#~ msgstr "فتح قفل بطاقة SIM"
1017#~ msgstr "فتح قفل بطاقة SIM"
1018+
1019+#~ msgid ""
1020+#~ "By selecting this option you agree to the Nokia HERE <a href='#'>terms and "
1021+#~ "conditions</a>."
1022+#~ msgstr ""
1023+#~ "باختيارك لهذا الخيار فإنك توافق على <a href='#'>الشروط والأحكام</a> الخاصة "
1024+#~ "بـ Nokia HERE."
po/ast.po+486−247
@@ -7,7 +7,7 @@ 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: 2016-03-10 22:48+0000\n"
10+"POT-Creation-Date: 2016-03-23 10:01+0000\n"
11"PO-Revision-Date: 2016-03-12 00:17+0000\n"
11"PO-Revision-Date: 2016-03-12 00:17+0000\n"
12"Last-Translator: enolp <enolp@softastur.org>\n"
12"Last-Translator: enolp <enolp@softastur.org>\n"
13"Language-Team: Asturian <ast@li.org>\n"
13"Language-Team: Asturian <ast@li.org>\n"
@@ -15,8 +15,8 @@ msgstr ""
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"Plural-Forms: nplurals=2; plural=n != 1;\n"
18−"X-Launchpad-Export-Date: 2016-03-13 05:50+0000\n"
18+"X-Launchpad-Export-Date: 2016-03-24 06:07+0000\n"
19−"X-Generator: Launchpad (build 17939)\n"
19+"X-Generator: Launchpad (build 17958)\n"
20
20
21#: plugins/IntegratedLightDM/Greeter.cpp:112
21#: plugins/IntegratedLightDM/Greeter.cpp:112
22msgid "Password: "
22msgid "Password: "
@@ -74,53 +74,35 @@ msgctxt "Button: Log out from the system"
74msgid "Log Out"
74msgid "Log Out"
75msgstr "Zarrar sesión"
75msgstr "Zarrar sesión"
76
76
77−#: qml/Components/Dialogs.qml:161 qml/Components/Dialogs.qml:194
77+#: qml/Components/Dialogs.qml:161 qml/Components/Dialogs.qml:219
78−#: qml/Components/Dialogs.qml:253
78+#: qml/Dash/DashPageHeader.qml:298 qml/Wizard/Pages/passcode-confirm.qml:32
79+#: qml/Wizard/Pages/passcode-set.qml:32
79msgid "Cancel"
80msgid "Cancel"
80msgstr "Encaboxar"
81msgstr "Encaboxar"
81
82
82#: qml/Components/Dialogs.qml:173
83#: qml/Components/Dialogs.qml:173
83−msgctxt "Title: Reboot/Shut down dialog"
84−msgid "Shut down"
85−msgstr "Apagáu"
86−
87−#: qml/Components/Dialogs.qml:174
88−msgid "Are you sure you want to shut down?"
89−msgstr "¿De xuru que quies apagar?"
90−
91−#: qml/Components/Dialogs.qml:176
92−msgctxt "Button: Reboot the system"
93−msgid "Reboot"
94−msgstr "Reaniciar"
95−
96−#: qml/Components/Dialogs.qml:185
97−msgctxt "Button: Shut down the system"
98−msgid "Shut down"
99−msgstr "Apagar"
100−
101−#: qml/Components/Dialogs.qml:207
102msgctxt "Title: Reboot dialog"
84msgctxt "Title: Reboot dialog"
103msgid "Reboot"
85msgid "Reboot"
104msgstr "Reaniciu"
86msgstr "Reaniciu"
105
87
106−#: qml/Components/Dialogs.qml:208
88+#: qml/Components/Dialogs.qml:174
107msgid "Are you sure you want to reboot?"
89msgid "Are you sure you want to reboot?"
108msgstr "¿De xuru que quies reaniciar?"
90msgstr "¿De xuru que quies reaniciar?"
109
91
110−#: qml/Components/Dialogs.qml:210
92+#: qml/Components/Dialogs.qml:176
111msgid "No"
93msgid "No"
112msgstr "Non"
94msgstr "Non"
113
95
114−#: qml/Components/Dialogs.qml:217
96+#: qml/Components/Dialogs.qml:183
115msgid "Yes"
97msgid "Yes"
116msgstr "Sí"
98msgstr "Sí"
117
99
118−#: qml/Components/Dialogs.qml:232
100+#: qml/Components/Dialogs.qml:198
119msgctxt "Title: Power off/Restart dialog"
101msgctxt "Title: Power off/Restart dialog"
120msgid "Power"
102msgid "Power"
121msgstr "Apagáu"
103msgstr "Apagáu"
122
104
123−#: qml/Components/Dialogs.qml:233
105+#: qml/Components/Dialogs.qml:199
124msgid ""
106msgid ""
125"Are you sure you would like\n"
107"Are you sure you would like\n"
126"to power off?"
108"to power off?"
@@ -128,12 +110,12 @@ msgstr ""
128"¿De xuru que te prestaría\n"
110"¿De xuru que te prestaría\n"
129"apagar?"
111"apagar?"
130
112
131−#: qml/Components/Dialogs.qml:235
113+#: qml/Components/Dialogs.qml:201
132msgctxt "Button: Power off the system"
114msgctxt "Button: Power off the system"
133msgid "Power off"
115msgid "Power off"
134msgstr "Apagar"
116msgstr "Apagar"
135
117
136−#: qml/Components/Dialogs.qml:244
118+#: qml/Components/Dialogs.qml:210
137msgctxt "Button: Restart the system"
119msgctxt "Button: Restart the system"
138msgid "Restart"
120msgid "Restart"
139msgstr "Reaniciar"
121msgstr "Reaniciar"
@@ -176,42 +158,58 @@ msgstr "Reconeutar agora."
176msgid "Close all"
158msgid "Close all"
177msgstr "Zarrar too"
159msgstr "Zarrar too"
178
160
179−#: qml/Dash/DashPageHeader.qml:270
161+#: qml/Dash/DashPageHeader.qml:337
180msgctxt "Button: Open the Ubuntu Store"
162msgctxt "Button: Open the Ubuntu Store"
181msgid "Store"
163msgid "Store"
182msgstr "Tienda"
164msgstr "Tienda"
183
165
184−#: qml/Dash/DashPageHeader.qml:277
166+#: qml/Dash/DashPageHeader.qml:344
185msgctxt "Button: Start a search in the current dash scope"
167msgctxt "Button: Start a search in the current dash scope"
186msgid "Search"
168msgid "Search"
187msgstr "Guetar"
169msgstr "Guetar"
188
170
189−#: qml/Dash/DashPageHeader.qml:287
171+#: qml/Dash/DashPageHeader.qml:354
190msgctxt "Button: Show the current dash scope settings"
172msgctxt "Button: Show the current dash scope settings"
191msgid "Settings"
173msgid "Settings"
192msgstr "Axustes"
174msgstr "Axustes"
193
175
194−#: qml/Dash/DashPageHeader.qml:294
176+#: qml/Dash/DashPageHeader.qml:361
195msgid "Remove from Favorites"
177msgid "Remove from Favorites"
196msgstr "Desaniciar de favoritos"
178msgstr "Desaniciar de favoritos"
197
179
198−#: qml/Dash/DashPageHeader.qml:294
180+#: qml/Dash/DashPageHeader.qml:361
199msgid "Add to Favorites"
181msgid "Add to Favorites"
200msgstr "Amestar a favoritos"
182msgstr "Amestar a favoritos"
201
183
184+#: qml/Dash/FiltersPopover.qml:60
185+msgid "Refine your results"
186+msgstr ""
187+
188+#: qml/Dash/FiltersPopover.qml:69
189+msgid "Reset"
190+msgstr ""
191+
202−#: qml/Dash/GenericScopeView.qml:567 qml/Dash/GenericScopeView.qml:725
192+#: qml/Dash/GenericScopeView.qml:570 qml/Dash/GenericScopeView.qml:755
203msgid "See less"
193msgid "See less"
204msgstr "Ver menos"
194msgstr "Ver menos"
205
195
206−#: qml/Dash/GenericScopeView.qml:567
196+#: qml/Dash/GenericScopeView.qml:570
207msgid "See all"
197msgid "See all"
208msgstr "Ver too"
198msgstr "Ver too"
209
199
210−#: qml/Dash/GenericScopeView.qml:629
200+#: qml/Dash/GenericScopeView.qml:627
211msgctxt "Label: Hint for dash search line edit"
201msgctxt "Label: Hint for dash search line edit"
212msgid "Search"
202msgid "Search"
213msgstr "Guetar"
203msgstr "Guetar"
214
204
205+#: qml/Dash/PageHeaderExtraPanel.qml:55
206+msgid "Recent Searches"
207+msgstr ""
208+
209+#: qml/Dash/PageHeaderExtraPanel.qml:66
210+msgid "Clear All"
211+msgstr ""
212+
215#: qml/Dash/Previews/PreviewActionCombo.qml:35
213#: qml/Dash/Previews/PreviewActionCombo.qml:35
216msgid "More..."
214msgid "More..."
217msgstr "Más…"
215msgstr "Más…"
@@ -279,11 +277,11 @@ msgstr "Reintentar"
279msgid "Tap to unlock"
277msgid "Tap to unlock"
280msgstr "Calca pa desbloquiar"
278msgstr "Calca pa desbloquiar"
281
279
282−#: qml/Greeter/NarrowView.qml:54 qml/Wizard/Pages/passwd-confirm.qml:53
280+#: qml/Greeter/NarrowView.qml:54
283msgid "Sorry, incorrect passphrase."
281msgid "Sorry, incorrect passphrase."
284msgstr "Perdón, fras de pasu incorreuta"
282msgstr "Perdón, fras de pasu incorreuta"
285
283
286−#: qml/Greeter/NarrowView.qml:55 qml/Wizard/Pages/passwd-confirm.qml:54
284+#: qml/Greeter/NarrowView.qml:55
287msgid "Sorry, incorrect passcode."
285msgid "Sorry, incorrect passcode."
288msgstr "Perdón, códigu de pasu incorreutu."
286msgstr "Perdón, códigu de pasu incorreutu."
289
287
@@ -312,7 +310,7 @@ msgstr ""
312msgid "Enter %1"
310msgid "Enter %1"
313msgstr "Introduz %1"
311msgstr "Introduz %1"
314
312
315−#: qml/Greeter/NarrowView.qml:117 qml/Wizard/Pages/passwd-set.qml:60
313+#: qml/Greeter/NarrowView.qml:117
316msgid "Enter passphrase"
314msgid "Enter passphrase"
317msgstr "Introduz la fras de pasu"
315msgstr "Introduz la fras de pasu"
318
316
@@ -350,62 +348,62 @@ msgstr "Toca pa tornar a la llamada..."
350msgid "Conference"
348msgid "Conference"
351msgstr "Conferencia"
349msgstr "Conferencia"
352
350
353−#: qml/Panel/Indicators/MenuItemFactory.qml:752
351+#: qml/Panel/Indicators/MenuItemFactory.qml:761
354msgid "Nothing is playing"
352msgid "Nothing is playing"
355msgstr "Nun ta reproduciéndose nada"
353msgstr "Nun ta reproduciéndose nada"
356
354
357−#: qml/Panel/Indicators/MenuItemFactory.qml:881
355+#: qml/Panel/Indicators/MenuItemFactory.qml:890
358#, qt-format
356#, qt-format
359msgid "%1 hour"
357msgid "%1 hour"
360msgid_plural "%1 hours"
358msgid_plural "%1 hours"
361msgstr[0] "%1 hora"
359msgstr[0] "%1 hora"
362msgstr[1] "%1 hores"
360msgstr[1] "%1 hores"
363
361
364−#: qml/Panel/Indicators/MenuItemFactory.qml:885
362+#: qml/Panel/Indicators/MenuItemFactory.qml:894
365#, qt-format
363#, qt-format
366msgid "%1 minute"
364msgid "%1 minute"
367msgid_plural "%1 minutes"
365msgid_plural "%1 minutes"
368msgstr[0] "%1 minutu"
366msgstr[0] "%1 minutu"
369msgstr[1] "%1 minutos"
367msgstr[1] "%1 minutos"
370
368
371−#: qml/Panel/Indicators/MenuItemFactory.qml:890
369+#: qml/Panel/Indicators/MenuItemFactory.qml:899
372#, qt-format
370#, qt-format
373msgid "%1 second"
371msgid "%1 second"
374msgid_plural "%1 seconds"
372msgid_plural "%1 seconds"
375msgstr[0] "%1 segundu"
373msgstr[0] "%1 segundu"
376msgstr[1] "%1 segundos"
374msgstr[1] "%1 segundos"
377
375
378−#: qml/Panel/Indicators/MenuItemFactory.qml:893
376+#: qml/Panel/Indicators/MenuItemFactory.qml:902
379msgid "0 seconds"
377msgid "0 seconds"
380msgstr "0 segundos"
378msgstr "0 segundos"
381
379
382#. Translators: String like "1 hour, 2 minutes, 3 seconds remaining"
380#. Translators: String like "1 hour, 2 minutes, 3 seconds remaining"
383−#: qml/Panel/Indicators/MenuItemFactory.qml:895
381+#: qml/Panel/Indicators/MenuItemFactory.qml:904
384#, qt-format
382#, qt-format
385msgid "%1 remaining"
383msgid "%1 remaining"
386msgstr "Queden %1"
384msgstr "Queden %1"
387
385
388−#: qml/Panel/Indicators/MenuItemFactory.qml:901
386+#: qml/Panel/Indicators/MenuItemFactory.qml:910
389msgid "In queue…"
387msgid "In queue…"
390msgstr "Na cola..."
388msgstr "Na cola..."
391
389
392−#: qml/Panel/Indicators/MenuItemFactory.qml:905
390+#: qml/Panel/Indicators/MenuItemFactory.qml:914
393msgid "Downloading"
391msgid "Downloading"
394msgstr "Baxando"
392msgstr "Baxando"
395
393
396−#: qml/Panel/Indicators/MenuItemFactory.qml:907
394+#: qml/Panel/Indicators/MenuItemFactory.qml:916
397msgid "Paused, tap to resume"
395msgid "Paused, tap to resume"
398msgstr "Posáu, toca pa reanudar"
396msgstr "Posáu, toca pa reanudar"
399
397
400−#: qml/Panel/Indicators/MenuItemFactory.qml:909
398+#: qml/Panel/Indicators/MenuItemFactory.qml:918
401msgid "Canceled"
399msgid "Canceled"
402msgstr "Encaboxáu"
400msgstr "Encaboxáu"
403
401
404−#: qml/Panel/Indicators/MenuItemFactory.qml:911
402+#: qml/Panel/Indicators/MenuItemFactory.qml:920
405msgid "Finished"
403msgid "Finished"
406msgstr "Finó"
404msgstr "Finó"
407
405
408−#: qml/Panel/Indicators/MenuItemFactory.qml:913
406+#: qml/Panel/Indicators/MenuItemFactory.qml:922
409msgid "Failed, tap to retry"
407msgid "Failed, tap to retry"
410msgstr "Falló, toca pa reintentar"
408msgstr "Falló, toca pa reintentar"
411
409
@@ -425,251 +423,324 @@ msgctxt "Button: Call back on phone"
425msgid "Call back"
423msgid "Call back"
426msgstr "Devolver llamada"
424msgstr "Devolver llamada"
427
425
428−#: qml/Tutorial/TutorialBottom.qml:28
426+#: qml/Stages/SideStage.qml:76
429−msgid "Open special menus"
427+msgid "Drag using 3 fingers any application from one window to the other"
430−msgstr "Abrir menús especiales"
428+msgstr ""
431−
432−#: qml/Tutorial/TutorialBottom.qml:29
433−msgid "Swipe up from the bottom edge."
434−msgstr "Esliza dende'l berbesu d'embaxo."
435
429
436−#: qml/Tutorial/TutorialBottomFinish.qml:24
430+#: qml/Tutorial/TutorialBottom.qml:78
437−msgid "This action does different things for different apps"
431+msgid "Swipe up to add a contact"
438−msgstr "Esta aición fai coses distintes p'aplicaciones estremaes"
432+msgstr ""
439
433
440−#: qml/Tutorial/TutorialBottomFinish.qml:25
434+#: qml/Tutorial/TutorialBottom.qml:80
441−msgid "Tap here to finish."
435+msgid "Swipe up for favorite calculations"
442−msgstr "Toca equí pa finar."
436+msgstr ""
443
437
444−#: qml/Tutorial/TutorialContent.qml:80 qml/Tutorial/TutorialLeftFinish.qml:25
438+#: qml/Tutorial/TutorialBottom.qml:82
445−#: qml/Tutorial/TutorialRight.qml:144
439+msgid "Swipe up for recent calls"
446−msgid "Tap here to continue."
447−msgstr "Toca equí pa siguir."
440+msgstr ""
448
441
449−#: qml/Tutorial/TutorialLeft.qml:26
442+#: qml/Tutorial/TutorialBottom.qml:84
450−msgid "Open the launcher"
443+msgid "Swipe up to create a message"
451−msgstr "Abrir el llanzador"
444+msgstr ""
452
445
453−#: qml/Tutorial/TutorialLeft.qml:27
446+#: qml/Tutorial/TutorialBottom.qml:85
454−msgid "Short swipe from the left edge."
447+msgid "Swipe up to manage the app"
455−msgstr "Esliza un poco dende'l berbesu esquierdu."
448+msgstr ""
456
449
457−#: qml/Tutorial/TutorialLeftFinish.qml:24
450+#: qml/Tutorial/TutorialLeft.qml:47
458−msgid "These are the shortcuts to favorite apps"
451+msgid "Swipe from the left edge to open the launcher"
459−msgstr "Estos son los atayos a les aplicaciones favorites"
452+msgstr ""
460
453
461−#: qml/Tutorial/TutorialPage.qml:178
454+#: qml/Tutorial/TutorialLeftLong.qml:47
462−msgid "You almost got it!"
455+msgid "Long swipe from the left edge to open the Today scope"
463−msgstr "¡Yá cuasi finamos!"
456+msgstr ""
464
457
465−#: qml/Tutorial/TutorialPage.qml:195
458+#: qml/Tutorial/TutorialRight.qml:54
466−msgid "Try again."
459+msgid "Hover your mouse on the right edge to view your open apps"
467−msgstr "Intentar de nueves"
460+msgstr ""
468
461
469−#: qml/Tutorial/TutorialRight.qml:31
462+#: qml/Tutorial/TutorialRight.qml:55
470−msgid "To view open apps"
463+msgid "Short or long swipe from the right edge to view your open apps"
471−msgstr "Pa ver aplicaciones abiertes"
464+msgstr ""
472
465
473−#: qml/Tutorial/TutorialRight.qml:32
466+#: qml/Tutorial/TutorialTop.qml:53
474−msgid "Long swipe from the right edge."
467+msgid "Swipe from the top right edge to open the notification bar"
475−msgstr "Eslizamientu llargu dende'l berbesu drechu."
468+msgstr ""
476
469
477−#: qml/Tutorial/TutorialRight.qml:122
470+#: qml/Tutorial/TutorialTop.qml:54
478−msgid "View all your running tasks."
471+msgid "Swipe from the top edge to open the notification bar"
479−msgstr "Mira toles tos aplicaciones n'execución."
472+msgstr ""
480
473
481−#: qml/Wizard/Page.qml:89
474+#: qml/Wizard/Page.qml:54
482msgctxt "Button: Go back one page in the Wizard"
475msgctxt "Button: Go back one page in the Wizard"
483msgid "Back"
476msgid "Back"
484msgstr "Atrás"
477msgstr "Atrás"
485
478
486#: qml/Wizard/Pages/10-welcome.qml:27
479#: qml/Wizard/Pages/10-welcome.qml:27
487−msgid "Hi!"
480+msgid "Language"
488−msgstr "¡Hola!"
481+msgstr ""
489
482
490−#: qml/Wizard/Pages/10-welcome.qml:44
483+#: qml/Wizard/Pages/10-welcome.qml:156 qml/Wizard/Pages/30-wifi.qml:206
491−msgid "Welcome to your Ubuntu device."
484+#: qml/Wizard/Pages/40-location.qml:271 qml/Wizard/Pages/50-timezone.qml:267
492−msgstr "Bienllegáu/ada al to preséu d'Ubuntu."
485+#: qml/Wizard/Pages/60-account.qml:65 qml/Wizard/Pages/70-passwd-type.qml:144
486+#: qml/Wizard/Pages/75-report-check.qml:84
487+#: qml/Wizard/Pages/passcode-desktop.qml:124
488+#: qml/Wizard/Pages/password-set.qml:141
489+msgid "Next"
490+msgstr ""
493
491
494−#: qml/Wizard/Pages/10-welcome.qml:52
492+#: qml/Wizard/Pages/30-wifi.qml:29
495−msgid "Let’s get started."
493+msgid "Connect to Wi‑Fi"
496−msgstr "Entamemos."
494+msgstr "Coneutase al WiFi"
497
495
498−#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:133
496+#: qml/Wizard/Pages/30-wifi.qml:130
499−#: qml/Wizard/Pages/40-wifi.qml:215 qml/Wizard/Pages/50-location.qml:131
497+msgid "Connected"
500−#: qml/Wizard/Pages/60-reporting.qml:60 qml/Wizard/Pages/passwd-confirm.qml:82
501−#: qml/Wizard/Pages/passwd-set.qml:90
502−msgid "Continue"
503−msgstr "Siguir"
498+msgstr ""
504
499
505−#: qml/Wizard/Pages/20-sim.qml:25
500+#: qml/Wizard/Pages/30-wifi.qml:163
506−msgid "Add a SIM card and restart your device"
501+msgid "Available Wi-Fi networks"
507−msgstr "Amiesta una tarxeta SIM y reanicia'l to preséu"
502+msgstr ""
508
503
509−#: qml/Wizard/Pages/20-sim.qml:59
504+#: qml/Wizard/Pages/30-wifi.qml:164
510−msgid "Without it, you won’t be able to make calls or use text messaging."
505+msgid "No available Wi-Fi networks"
511−msgstr "Ensin ella, nun vas poder facer llamaes nin unviar mensaxes."
506+msgstr ""
512
507
513−#: qml/Wizard/Pages/20-sim.qml:73 qml/Wizard/Pages/40-wifi.qml:215
508+#: qml/Wizard/Pages/30-wifi.qml:206 qml/Wizard/Pages/60-account.qml:65
509+#: qml/Wizard/Pages/sim.qml:101
514msgid "Skip"
510msgid "Skip"
515msgstr "Saltar"
511msgstr "Saltar"
516
512
517−#: qml/Wizard/Pages/30-passwd-type.qml:39
513+#: qml/Wizard/Pages/40-location.qml:27
518−msgid "Lock security"
514+msgid "Location Services"
519−msgstr "Seguranza del bloquéu"
515+msgstr ""
516+
517+#: qml/Wizard/Pages/40-location.qml:83
518+msgid ""
519+"Use GPS, Wi-Fi hotspots and mobile network anonymously to detect location "
520+"(recommended)"
521+msgstr ""
520
522
521−#: qml/Wizard/Pages/30-passwd-type.qml:79
523+#: qml/Wizard/Pages/40-location.qml:105
522−msgid "Please select how you’d like to unlock your device."
524+#, qt-format
523−msgstr "Esbilla cómo te prestaría desbloquiar el to preséu, por favor."
525+msgid "By selecting this option you agree to the Nokia HERE %1."
526+msgstr ""
524
527
525−#: qml/Wizard/Pages/30-passwd-type.qml:102
528+#: qml/Wizard/Pages/40-location.qml:106
526−msgctxt "Label: Type of security method"
529+msgctxt "part of: Nokia HERE terms and conditions"
527−msgid "Swipe"
530+msgid "terms and conditions"
531+msgstr ""
532+
533+#: qml/Wizard/Pages/40-location.qml:160
534+msgid "GPS only"
535+msgstr ""
536+
537+#: qml/Wizard/Pages/40-location.qml:214
538+msgid "Don't use my location"
528−msgstr "Eslizar"
539+msgstr ""
540+
541+#: qml/Wizard/Pages/40-location.qml:260
542+msgid "You can change it later in System Settings."
543+msgstr ""
544+
545+#: qml/Wizard/Pages/50-timezone.qml:29
546+msgid "Time Zone"
547+msgstr ""
548+
549+#: qml/Wizard/Pages/50-timezone.qml:178
550+msgid "Enter your city"
551+msgstr ""
552+
553+#: qml/Wizard/Pages/60-account.qml:24
554+msgid "Personalize Your Device"
555+msgstr ""
529
556
530−#: qml/Wizard/Pages/30-passwd-type.qml:103
557+#: qml/Wizard/Pages/60-account.qml:48
531−msgctxt "Label: Description of security method"
558+msgid "Preferred Name"
532−msgid "No security"
559+msgstr ""
560+
561+#: qml/Wizard/Pages/70-passwd-type.qml:39
562+msgid "Lock Screen"
533−msgstr "Ensin seguranza"
563+msgstr ""
534
564
535−#: qml/Wizard/Pages/30-passwd-type.qml:105
565+#: qml/Wizard/Pages/70-passwd-type.qml:101
536msgctxt "Label: Type of security method"
566msgctxt "Label: Type of security method"
537−msgid "Passcode"
567+msgid "Create new password"
538−msgstr "Códigu de pasu"
568+msgstr ""
539
569
540−#: qml/Wizard/Pages/30-passwd-type.qml:106
570+#: qml/Wizard/Pages/70-passwd-type.qml:103
541−msgctxt "Label: Description of security method"
571+msgctxt "Label: Type of security method"
542−msgid "4 digits only"
572+msgid "Create passcode (numbers only)"
543−msgstr "Namái 4 díxitos"
573+msgstr ""
544
574
545−#: qml/Wizard/Pages/30-passwd-type.qml:108
575+#: qml/Wizard/Pages/70-passwd-type.qml:105
546msgctxt "Label: Type of security method"
576msgctxt "Label: Type of security method"
547−msgid "Passphrase"
577+msgid "No lock code"
548−msgstr "Fras de pasu"
578+msgstr ""
549
579
550−#: qml/Wizard/Pages/30-passwd-type.qml:109
580+#: qml/Wizard/Pages/75-report-check.qml:26 qml/Wizard/Pages/here-terms.qml:108
551−msgctxt "Label: Description of security method"
581+msgid "Privacy Policy"
552−msgid "Numbers and letters"
553−msgstr "Númberos y lletres"
582+msgstr ""
554
583
555−#: qml/Wizard/Pages/40-wifi.qml:29
584+#: qml/Wizard/Pages/75-report-check.qml:26
556−msgid "Connect to Wi‑Fi"
585+msgid "Help Us Improve"
557−msgstr "Coneutase al WiFi"
586+msgstr ""
558
587
559−#: qml/Wizard/Pages/40-wifi.qml:168
588+#: qml/Wizard/Pages/75-report-check.qml:59
560−msgid "Available networks…"
589+msgid "Improve system performance by sending us crashes and error reports."
561−msgstr "Redes disponibles..."
590+msgstr ""
562
591
563−#: qml/Wizard/Pages/40-wifi.qml:169
592+#: qml/Wizard/Pages/75-report-check.qml:60
564−msgid "No available networks."
593+msgid "Privacy policy"
565−msgstr "Nun hai redes disponibles"
594+msgstr ""
566
595
567−#: qml/Wizard/Pages/50-location.qml:27
596+#: qml/Wizard/Pages/80-finished.qml:89
568−msgid "Location"
597+msgid "Welcome to Ubuntu"
569−msgstr "Allugamientu"
598+msgstr ""
570
599
571−#: qml/Wizard/Pages/50-location.qml:62
600+#: qml/Wizard/Pages/80-finished.qml:104
572−msgid "Let the phone detect your location:"
601+msgid "You are ready to use your device now"
573−msgstr "Dexar al teléfonu deteutar l'allugamientu:"
602+msgstr ""
574
603
575−#: qml/Wizard/Pages/50-location.qml:69
604+#: qml/Wizard/Pages/80-finished.qml:124
576−msgid "Using GPS only (less accurate)"
605+msgid "Get Started"
577−msgstr "Namái usando GPS (menos precisión)"
606+msgstr ""
578
607
579−#: qml/Wizard/Pages/50-location.qml:86
608+#: qml/Wizard/Pages/here-terms.qml:25
580−msgid "Using GPS, anonymized Wi-Fi and cellular network info (recommended)"
609+msgid "Terms & Conditions"
610+msgstr "Términos y condiciones"
611+
612+#: qml/Wizard/Pages/here-terms.qml:69
613+msgid "Your device uses positioning technologies provided by HERE."
581msgstr ""
614msgstr ""
582−"Usando GPS, Wi-fi anónimes ya información de redes móviles (aconseyao)"
583
615
584−#. Translators: HERE is a trademark for Nokia's location service, you probably shouldn't translate it
585−#: qml/Wizard/Pages/50-location.qml:103
616+#: qml/Wizard/Pages/here-terms.qml:81
586msgid ""
617msgid ""
587−"By selecting this option you agree to the Nokia HERE <a href='#'>terms and "
618+"To provide you with positioning services and to improve their quality, HERE "
588−"conditions</a>."
619+"collects information about nearby cell towers and Wi-Fi hotspots around your "
620+"current location whenever your position is being found."
589msgstr ""
621msgstr ""
590−"Esbillando esta opción aceutes los <a href='#'>términos y condiciones</a> de "
591−"Nokia HERE."
592
622
593−#: qml/Wizard/Pages/50-location.qml:112
623+#: qml/Wizard/Pages/here-terms.qml:93
594−msgid "Not at all"
624+msgid ""
625+"The information collected is used to analyze the service and to improve the "
626+"use of service, but not to identify you personally."
595−msgstr "De nengún mou"
627+msgstr ""
596
628
597−#: qml/Wizard/Pages/50-location.qml:124
629+#: qml/Wizard/Pages/here-terms.qml:106
598−msgid "You can change your mind later in <b>System Settings</b>."
630+#, qt-format
599−msgstr "Pues cambialo dempués n'<b>Axustes del sistema</b>."
631+msgid "By continuing, you agree to the HERE platform %1 and %2."
632+msgstr ""
600
633
601−#: qml/Wizard/Pages/60-reporting.qml:26
634+#: qml/Wizard/Pages/here-terms.qml:107
602−msgid "Improving your experience"
635+msgid "Service Terms"
603−msgstr "Ameyorando la to esperiencia"
636+msgstr ""
604
637
605−#: qml/Wizard/Pages/60-reporting.qml:46
638+#: qml/Wizard/Pages/passcode-confirm.qml:43
639+#: qml/Wizard/Pages/passcode-desktop.qml:80
606−msgid ""
640+msgid "Confirm passcode"
607−"Your phone is set up to automatically report errors to Canonical and its "
641+msgstr "Confirmar códigu de pasu"
608−"partners, the makers of the operating system."
642+
643+#: qml/Wizard/Pages/passcode-confirm.qml:45
644+msgid "Incorrect passcode."
609msgstr ""
645msgstr ""
610−"El teléfonu ta configuráu pa informar automáticamente de los fallos a "
611−"Canonical y asociaos, los fabricantes del sistema operativu."
612
646
613−#: qml/Wizard/Pages/60-reporting.qml:53
647+#: qml/Wizard/Pages/passcode-confirm.qml:45
648+msgctxt "Enter the passcode again"
614−msgid ""
649+msgid "Please re-enter."
615−"This can be disabled in <b>System Settings</b> under <b>Security &amp; "
616−"Privacy</b>"
617msgstr ""
650msgstr ""
618−"Esto pue deshabilitase nos <b>Axustes del sistema</b> en <b>Seguranza y "
619−"privacidá</b>"
620
651
621−#: qml/Wizard/Pages/80-finished.qml:24
652+#: qml/Wizard/Pages/passcode-desktop.qml:30
622−msgid "All done"
653+msgid "Lock Screen Passcode"
623−msgstr "Too fecho"
654+msgstr ""
624
655
625−#: qml/Wizard/Pages/80-finished.qml:39
656+#: qml/Wizard/Pages/passcode-desktop.qml:56
626−msgid "Nice work!"
657+msgid "Enter 4 numbers to setup your passcode"
627−msgstr "¡Bon trabayu!"
658+msgstr ""
628
659
629−#: qml/Wizard/Pages/80-finished.qml:46
660+#: qml/Wizard/Pages/passcode-desktop.qml:65
630−msgid "Your device is now ready to use."
661+#: qml/Wizard/Pages/passcode-set.qml:54
631−msgstr "Agora'l to preséu ta preparáu pa usase."
662+msgid "Choose passcode"
663+msgstr ""
632
664
633−#: qml/Wizard/Pages/80-finished.qml:53
665+#: qml/Wizard/Pages/passcode-desktop.qml:105
634−msgid "Finish"
666+msgid "Passcode too short"
635−msgstr "Finar"
667+msgstr ""
636
668
637−#: qml/Wizard/Pages/here-terms.qml:27
669+#: qml/Wizard/Pages/passcode-desktop.qml:107
638−msgid "Terms & Conditions"
670+msgid "Passcodes match"
639−msgstr "Términos y condiciones"
671+msgstr ""
640
672
641−#: qml/Wizard/Pages/passwd-confirm.qml:49
673+#: qml/Wizard/Pages/passcode-desktop.qml:109
642−msgid "Confirm passphrase"
674+msgid "Passcodes do not match"
643−msgstr "Confirmar frase de pasu"
675+msgstr ""
644
676
645−#: qml/Wizard/Pages/passwd-confirm.qml:50
677+#: qml/Wizard/Pages/passcode-set.qml:62
646−msgid "Confirm passcode"
678+msgid "Passcode must be 4 characters long"
647−msgstr "Confirmar códigu de pasu"
679+msgstr ""
648
680
649−#: qml/Wizard/Pages/passwd-confirm.qml:53
681+#: qml/Wizard/Pages/password-set.qml:30
650−#: qml/Wizard/Pages/passwd-confirm.qml:54
682+msgid "Lock Screen Password"
651−msgid "Please try again."
683+msgstr ""
652−msgstr "Por favor, vuelvi a intentalo."
653
684
654−#: qml/Wizard/Pages/passwd-set.qml:61
685+#: qml/Wizard/Pages/password-set.qml:61
655−msgid "Choose your passcode"
686+msgid "Enter at least 8 characters"
656−msgstr "Escueyi'l to códigu de pasu"
687+msgstr ""
657
688
658−#: qml/Wizard/Pages/passwd-set.qml:68
689+#: qml/Wizard/Pages/password-set.qml:73
659−msgid "Passphrase must be 4 characters long"
690+msgid "Choose password"
660−msgstr "La fras de pasu tien de ser 4 caráuteres de llargor"
691+msgstr ""
661
692
662−#. Translators: This is the arrow for "Back" buttons
693+#: qml/Wizard/Pages/password-set.qml:103
663−#: qml/Wizard/StackButton.qml:39
694+msgid "Confirm password"
664−#, qt-format
665−msgid "〈 %1"
666−msgstr "〈 %1"
695+msgstr ""
667
696
668−#. Translators: This is the arrow for "Forward" buttons
697+#: qml/Wizard/Pages/sim.qml:27
698+msgid "No SIM card installed"
699+msgstr ""
700+
701+#: qml/Wizard/Pages/sim.qml:54
702+msgid "SIM card added"
703+msgstr ""
704+
705+#: qml/Wizard/Pages/sim.qml:55
706+msgid "You must restart the device to access the mobile network."
707+msgstr ""
708+
709+#: qml/Wizard/Pages/sim.qml:59
710+msgid "Restart"
711+msgstr "Reaniciar"
712+
669−#: qml/Wizard/StackButton.qml:42
713+#: qml/Wizard/Pages/sim.qml:78
670−#, qt-format
714+msgid "You won’t be able to make calls or use text messaging without a SIM."
671−msgid "%1 〉"
715+msgstr ""
716+
717+#: qml/Wizard/Pages/sim.qml:90
718+msgid "To proceed with no SIM tap Skip."
719+msgstr ""
720+
721+#: qml/Wizard/PasswordMeter.qml:87
722+msgid "Passwords match"
723+msgstr ""
724+
725+#: qml/Wizard/PasswordMeter.qml:89
726+msgid "Passwords do not match"
672−msgstr "%1 〉"
727+msgstr ""
728+
729+#: qml/Wizard/PasswordMeter.qml:93
730+msgid "Strong password"
731+msgstr ""
732+
733+#: qml/Wizard/PasswordMeter.qml:95
734+msgid "Fair password"
735+msgstr ""
736+
737+#: qml/Wizard/PasswordMeter.qml:97
738+msgid "Weak password"
739+msgstr ""
740+
741+#: qml/Wizard/PasswordMeter.qml:99
742+msgid "Very weak password"
743+msgstr ""
673
744
674#~ msgid "Skip intro"
745#~ msgid "Skip intro"
675#~ msgstr "Omitir la intro"
746#~ msgstr "Omitir la intro"
@@ -764,24 +835,195 @@ msgstr "%1 〉"
764#~ msgid "Roaming"
835#~ msgid "Roaming"
765#~ msgstr "Roaming"
836#~ msgstr "Roaming"
766
837
767−#~ msgid "Restart"
768−#~ msgstr "Reaniciar"
769−
770#~ msgid "Manage Scopes"
838#~ msgid "Manage Scopes"
771#~ msgstr "Xestionar ámbitos"
839#~ msgstr "Xestionar ámbitos"
772
840
841+#~ msgid "Continue"
842+#~ msgstr "Siguir"
843+
844+#~ msgid "Without it, you won’t be able to make calls or use text messaging."
845+#~ msgstr "Ensin ella, nun vas poder facer llamaes nin unviar mensaxes."
846+
847+#~ msgid "You can change your mind later in <b>System Settings</b>."
848+#~ msgstr "Pues cambialo dempués n'<b>Axustes del sistema</b>."
849+
850+#~ msgid "Available networks…"
851+#~ msgstr "Redes disponibles..."
852+
853+#~ msgid "No available networks."
854+#~ msgstr "Nun hai redes disponibles"
855+
856+#~ msgid "Using GPS only (less accurate)"
857+#~ msgstr "Namái usando GPS (menos precisión)"
858+
859+#~ msgid ""
860+#~ "Your phone is set up to automatically report errors to Canonical and its "
861+#~ "partners, the makers of the operating system."
862+#~ msgstr ""
863+#~ "El teléfonu ta configuráu pa informar automáticamente de los fallos a "
864+#~ "Canonical y asociaos, los fabricantes del sistema operativu."
865+
866+#~ msgid "All done"
867+#~ msgstr "Too fecho"
868+
869+#~ msgid "Finish"
870+#~ msgstr "Finar"
871+
872+#~ msgid "Not at all"
873+#~ msgstr "De nengún mou"
874+
875+#, qt-format
876+#~ msgid "〈 %1"
877+#~ msgstr "〈 %1"
878+
879+#, qt-format
880+#~ msgid "%1 〉"
881+#~ msgstr "%1 〉"
882+
883+#~ msgid "Open the launcher"
884+#~ msgstr "Abrir el llanzador"
885+
886+#~ msgid "Tap here to continue."
887+#~ msgstr "Toca equí pa siguir."
888+
889+#~ msgid "Open special menus"
890+#~ msgstr "Abrir menús especiales"
891+
892+#~ msgid "Tap here to finish."
893+#~ msgstr "Toca equí pa finar."
894+
895+#~ msgctxt "Button: Shut down the system"
896+#~ msgid "Shut down"
897+#~ msgstr "Apagar"
898+
899+#~ msgctxt "Button: Reboot the system"
900+#~ msgid "Reboot"
901+#~ msgstr "Reaniciar"
902+
903+#~ msgid "These are the shortcuts to favorite apps"
904+#~ msgstr "Estos son los atayos a les aplicaciones favorites"
905+
906+#~ msgctxt "Label: Type of security method"
907+#~ msgid "Passcode"
908+#~ msgstr "Códigu de pasu"
909+
910+#~ msgid "To view open apps"
911+#~ msgstr "Pa ver aplicaciones abiertes"
912+
913+#~ msgid "Are you sure you want to shut down?"
914+#~ msgstr "¿De xuru que quies apagar?"
915+
916+#~ msgctxt "Title: Reboot/Shut down dialog"
917+#~ msgid "Shut down"
918+#~ msgstr "Apagáu"
919+
773#~ msgid "Please re-enter"
920#~ msgid "Please re-enter"
774#~ msgstr "Por favor, reintroduzla"
921#~ msgstr "Por favor, reintroduzla"
775
922
923+#~ msgid "This action does different things for different apps"
924+#~ msgstr "Esta aición fai coses distintes p'aplicaciones estremaes"
925+
926+#~ msgid "Swipe up from the bottom edge."
927+#~ msgstr "Esliza dende'l berbesu d'embaxo."
928+
929+#~ msgid "Long swipe from the right edge."
930+#~ msgstr "Eslizamientu llargu dende'l berbesu drechu."
931+
932+#~ msgid "View all your running tasks."
933+#~ msgstr "Mira toles tos aplicaciones n'execución."
934+
935+#~ msgid "Try again."
936+#~ msgstr "Intentar de nueves"
937+
938+#~ msgid "You almost got it!"
939+#~ msgstr "¡Yá cuasi finamos!"
940+
941+#~ msgid "Short swipe from the left edge."
942+#~ msgstr "Esliza un poco dende'l berbesu esquierdu."
943+
944+#~ msgid "Hi!"
945+#~ msgstr "¡Hola!"
946+
947+#~ msgid "Lock security"
948+#~ msgstr "Seguranza del bloquéu"
949+
950+#~ msgid "Add a SIM card and restart your device"
951+#~ msgstr "Amiesta una tarxeta SIM y reanicia'l to preséu"
952+
776#~ msgid "Please select how you’d like to unlock your phone."
953#~ msgid "Please select how you’d like to unlock your phone."
777#~ msgstr "Por favor, esbilla como te prestaría desbloquiar el teléfonu."
954#~ msgstr "Por favor, esbilla como te prestaría desbloquiar el teléfonu."
778
955
956+#~ msgctxt "Label: Description of security method"
957+#~ msgid "No security"
958+#~ msgstr "Ensin seguranza"
959+
960+#~ msgctxt "Label: Type of security method"
961+#~ msgid "Swipe"
962+#~ msgstr "Eslizar"
963+
779#~ msgid "Welcome to your Ubuntu phone."
964#~ msgid "Welcome to your Ubuntu phone."
780#~ msgstr "Bienllegáu/ada al to teléfonu d'Ubuntu"
965#~ msgstr "Bienllegáu/ada al to teléfonu d'Ubuntu"
781
966
967+#~ msgid "Let’s get started."
968+#~ msgstr "Entamemos."
969+
970+#~ msgctxt "Label: Description of security method"
971+#~ msgid "4 digits only"
972+#~ msgstr "Namái 4 díxitos"
973+
974+#~ msgid "Let the phone detect your location:"
975+#~ msgstr "Dexar al teléfonu deteutar l'allugamientu:"
976+
977+#~ msgid "Location"
978+#~ msgstr "Allugamientu"
979+
980+#~ msgctxt "Label: Type of security method"
981+#~ msgid "Passphrase"
982+#~ msgstr "Fras de pasu"
983+
984+#~ msgctxt "Label: Description of security method"
985+#~ msgid "Numbers and letters"
986+#~ msgstr "Númberos y lletres"
987+
988+#~ msgid "Improving your experience"
989+#~ msgstr "Ameyorando la to esperiencia"
990+
991+#~ msgid ""
992+#~ "This can be disabled in <b>System Settings</b> under <b>Security &amp; "
993+#~ "Privacy</b>"
994+#~ msgstr ""
995+#~ "Esto pue deshabilitase nos <b>Axustes del sistema</b> en <b>Seguranza y "
996+#~ "privacidá</b>"
997+
998+#~ msgid "Nice work!"
999+#~ msgstr "¡Bon trabayu!"
1000+
1001+#~ msgid ""
1002+#~ "By selecting this option you agree to the Nokia HERE <a href='#'>terms and "
1003+#~ "conditions</a>."
1004+#~ msgstr ""
1005+#~ "Esbillando esta opción aceutes los <a href='#'>términos y condiciones</a> de "
1006+#~ "Nokia HERE."
1007+
1008+#~ msgid "Using GPS, anonymized Wi-Fi and cellular network info (recommended)"
1009+#~ msgstr ""
1010+#~ "Usando GPS, Wi-fi anónimes ya información de redes móviles (aconseyao)"
1011+
782#~ msgid "Your phone is now ready to use."
1012#~ msgid "Your phone is now ready to use."
783#~ msgstr "El teléfonu yá ta tresnáu pa usase."
1013#~ msgstr "El teléfonu yá ta tresnáu pa usase."
784
1014
1015+#~ msgid "Confirm passphrase"
1016+#~ msgstr "Confirmar frase de pasu"
1017+
1018+#~ msgid "Passphrase must be 4 characters long"
1019+#~ msgstr "La fras de pasu tien de ser 4 caráuteres de llargor"
1020+
1021+#~ msgid "Choose your passcode"
1022+#~ msgstr "Escueyi'l to códigu de pasu"
1023+
1024+#~ msgid "Please try again."
1025+#~ msgstr "Por favor, vuelvi a intentalo."
1026+
785#~ msgid "%a %H:%M"
1027#~ msgid "%a %H:%M"
786#~ msgstr "%a %H:%M"
1028#~ msgstr "%a %H:%M"
787
1029
@@ -815,14 +1057,11 @@ msgstr "%1 〉"
815#~ msgid "Call back"
1057#~ msgid "Call back"
816#~ msgstr "Devolver llamada"
1058#~ msgstr "Devolver llamada"
817
1059
818−#~ msgid "Re-dock, save your work and close these apps to continue."
1060+#~ msgid "Your device is now ready to use."
819−#~ msgstr ""
1061+#~ msgstr "Agora'l to preséu ta preparáu pa usase."
820−#~ "Pa siguir coneuta nuevamente'l preséu, guarda'l trabayu y zarra estes "
821−#~ "aplicaciones."
822
1062
823−#~ msgid ""
1063+#~ msgid "Welcome to your Ubuntu device."
824−#~ "Your device is now connected to an external display. Use this screen as a "
1064+#~ msgstr "Bienllegáu/ada al to preséu d'Ubuntu."
825−#~ "touch pad to interact with the mouse."
1065+
826−#~ msgstr ""
1066+#~ msgid "Please select how you’d like to unlock your device."
827−#~ "Agora'l to preséu ta coneutáu a una pantalla esterna. Usa esta pantalla como "
1067+#~ msgstr "Esbilla cómo te prestaría desbloquiar el to preséu, por favor."
828−#~ "panel táutil pa interactuar col mur."
po/az.po+261−180
@@ -7,7 +7,7 @@ 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: 2016-03-10 22:48+0000\n"
10+"POT-Creation-Date: 2016-03-23 10:01+0000\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"
@@ -15,8 +15,8 @@ msgstr ""
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"Plural-Forms: nplurals=2; plural=n != 1;\n"
18−"X-Launchpad-Export-Date: 2016-03-13 05:50+0000\n"
18+"X-Launchpad-Export-Date: 2016-03-24 06:07+0000\n"
19−"X-Generator: Launchpad (build 17939)\n"
19+"X-Generator: Launchpad (build 17958)\n"
20
20
21#: plugins/IntegratedLightDM/Greeter.cpp:112
21#: plugins/IntegratedLightDM/Greeter.cpp:112
22msgid "Password: "
22msgid "Password: "
@@ -73,64 +73,46 @@ msgctxt "Button: Log out from the system"
73msgid "Log Out"
73msgid "Log Out"
74msgstr ""
74msgstr ""
75
75
76−#: qml/Components/Dialogs.qml:161 qml/Components/Dialogs.qml:194
76+#: qml/Components/Dialogs.qml:161 qml/Components/Dialogs.qml:219
77−#: qml/Components/Dialogs.qml:253
77+#: qml/Dash/DashPageHeader.qml:298 qml/Wizard/Pages/passcode-confirm.qml:32
78+#: qml/Wizard/Pages/passcode-set.qml:32
78msgid "Cancel"
79msgid "Cancel"
79msgstr "İmtina"
80msgstr "İmtina"
80
81
81#: qml/Components/Dialogs.qml:173
82#: qml/Components/Dialogs.qml:173
82−msgctxt "Title: Reboot/Shut down dialog"
83−msgid "Shut down"
84−msgstr ""
85−
86−#: qml/Components/Dialogs.qml:174
87−msgid "Are you sure you want to shut down?"
88−msgstr "Sistemi söndürmәk istәdiyinizә әminsiniz?"
89−
90−#: qml/Components/Dialogs.qml:176
91−msgctxt "Button: Reboot the system"
92−msgid "Reboot"
93−msgstr ""
94−
95−#: qml/Components/Dialogs.qml:185
96−msgctxt "Button: Shut down the system"
97−msgid "Shut down"
98−msgstr ""
99−
100−#: qml/Components/Dialogs.qml:207
101msgctxt "Title: Reboot dialog"
83msgctxt "Title: Reboot dialog"
102msgid "Reboot"
84msgid "Reboot"
103msgstr ""
85msgstr ""
104
86
105−#: qml/Components/Dialogs.qml:208
87+#: qml/Components/Dialogs.qml:174
106msgid "Are you sure you want to reboot?"
88msgid "Are you sure you want to reboot?"
107msgstr "Yenidәn başlatmaq istәdiyinizә әminsiniz?"
89msgstr "Yenidәn başlatmaq istәdiyinizә әminsiniz?"
108
90
109−#: qml/Components/Dialogs.qml:210
91+#: qml/Components/Dialogs.qml:176
110msgid "No"
92msgid "No"
111msgstr "Yox"
93msgstr "Yox"
112
94
113−#: qml/Components/Dialogs.qml:217
95+#: qml/Components/Dialogs.qml:183
114msgid "Yes"
96msgid "Yes"
115msgstr "Hə"
97msgstr "Hə"
116
98
117−#: qml/Components/Dialogs.qml:232
99+#: qml/Components/Dialogs.qml:198
118msgctxt "Title: Power off/Restart dialog"
100msgctxt "Title: Power off/Restart dialog"
119msgid "Power"
101msgid "Power"
120msgstr ""
102msgstr ""
121
103
122−#: qml/Components/Dialogs.qml:233
104+#: qml/Components/Dialogs.qml:199
123msgid ""
105msgid ""
124"Are you sure you would like\n"
106"Are you sure you would like\n"
125"to power off?"
107"to power off?"
126msgstr ""
108msgstr ""
127
109
128−#: qml/Components/Dialogs.qml:235
110+#: qml/Components/Dialogs.qml:201
129msgctxt "Button: Power off the system"
111msgctxt "Button: Power off the system"
130msgid "Power off"
112msgid "Power off"
131msgstr ""
113msgstr ""
132
114
133−#: qml/Components/Dialogs.qml:244
115+#: qml/Components/Dialogs.qml:210
134msgctxt "Button: Restart the system"
116msgctxt "Button: Restart the system"
135msgid "Restart"
117msgid "Restart"
136msgstr ""
118msgstr ""
@@ -173,42 +155,58 @@ msgstr ""
173msgid "Close all"
155msgid "Close all"
174msgstr ""
156msgstr ""
175
157
176−#: qml/Dash/DashPageHeader.qml:270
158+#: qml/Dash/DashPageHeader.qml:337
177msgctxt "Button: Open the Ubuntu Store"
159msgctxt "Button: Open the Ubuntu Store"
178msgid "Store"
160msgid "Store"
179msgstr ""
161msgstr ""
180
162
181−#: qml/Dash/DashPageHeader.qml:277
163+#: qml/Dash/DashPageHeader.qml:344
182msgctxt "Button: Start a search in the current dash scope"
164msgctxt "Button: Start a search in the current dash scope"
183msgid "Search"
165msgid "Search"
184msgstr ""
166msgstr ""
185
167
186−#: qml/Dash/DashPageHeader.qml:287
168+#: qml/Dash/DashPageHeader.qml:354
187msgctxt "Button: Show the current dash scope settings"
169msgctxt "Button: Show the current dash scope settings"
188msgid "Settings"
170msgid "Settings"
189msgstr ""
171msgstr ""
190
172
191−#: qml/Dash/DashPageHeader.qml:294
173+#: qml/Dash/DashPageHeader.qml:361
192msgid "Remove from Favorites"
174msgid "Remove from Favorites"
193msgstr "Seçilmişlәrdәn çıxart"
175msgstr "Seçilmişlәrdәn çıxart"
194
176
195−#: qml/Dash/DashPageHeader.qml:294
177+#: qml/Dash/DashPageHeader.qml:361
196msgid "Add to Favorites"
178msgid "Add to Favorites"
197msgstr "Seçilmişlәrә әlavә et"
179msgstr "Seçilmişlәrә әlavә et"
198
180
181+#: qml/Dash/FiltersPopover.qml:60
182+msgid "Refine your results"
183+msgstr ""
184+
185+#: qml/Dash/FiltersPopover.qml:69
186+msgid "Reset"
187+msgstr ""
188+
199−#: qml/Dash/GenericScopeView.qml:567 qml/Dash/GenericScopeView.qml:725
189+#: qml/Dash/GenericScopeView.qml:570 qml/Dash/GenericScopeView.qml:755
200msgid "See less"
190msgid "See less"
201msgstr "Daha azını gör"
191msgstr "Daha azını gör"
202
192
203−#: qml/Dash/GenericScopeView.qml:567
193+#: qml/Dash/GenericScopeView.qml:570
204msgid "See all"
194msgid "See all"
205msgstr "Hamısını gör"
195msgstr "Hamısını gör"
206
196
207−#: qml/Dash/GenericScopeView.qml:629
197+#: qml/Dash/GenericScopeView.qml:627
208msgctxt "Label: Hint for dash search line edit"
198msgctxt "Label: Hint for dash search line edit"
209msgid "Search"
199msgid "Search"
210msgstr ""
200msgstr ""
211
201
202+#: qml/Dash/PageHeaderExtraPanel.qml:55
203+msgid "Recent Searches"
204+msgstr ""
205+
206+#: qml/Dash/PageHeaderExtraPanel.qml:66
207+msgid "Clear All"
208+msgstr ""
209+
212#: qml/Dash/Previews/PreviewActionCombo.qml:35
210#: qml/Dash/Previews/PreviewActionCombo.qml:35
213msgid "More..."
211msgid "More..."
214msgstr "Daha çox..."
212msgstr "Daha çox..."
@@ -276,11 +274,11 @@ msgstr ""
276msgid "Tap to unlock"
274msgid "Tap to unlock"
277msgstr ""
275msgstr ""
278
276
279−#: qml/Greeter/NarrowView.qml:54 qml/Wizard/Pages/passwd-confirm.qml:53
277+#: qml/Greeter/NarrowView.qml:54
280msgid "Sorry, incorrect passphrase."
278msgid "Sorry, incorrect passphrase."
281msgstr "Bağışlayın, açar söz yanlışdır."
279msgstr "Bağışlayın, açar söz yanlışdır."
282
280
283−#: qml/Greeter/NarrowView.qml:55 qml/Wizard/Pages/passwd-confirm.qml:54
281+#: qml/Greeter/NarrowView.qml:55
284msgid "Sorry, incorrect passcode."
282msgid "Sorry, incorrect passcode."
285msgstr "Təəssüf ki, açar kod yanlışdır."
283msgstr "Təəssüf ki, açar kod yanlışdır."
286
284
@@ -309,7 +307,7 @@ msgstr ""
309msgid "Enter %1"
307msgid "Enter %1"
310msgstr ""
308msgstr ""
311
309
312−#: qml/Greeter/NarrowView.qml:117 qml/Wizard/Pages/passwd-set.qml:60
310+#: qml/Greeter/NarrowView.qml:117
313msgid "Enter passphrase"
311msgid "Enter passphrase"
314msgstr ""
312msgstr ""
315
313
@@ -347,62 +345,62 @@ msgstr "Zəngə qayıtmaq üçün toxunun..."
347msgid "Conference"
345msgid "Conference"
348msgstr "Konfrans"
346msgstr "Konfrans"
349
347
350−#: qml/Panel/Indicators/MenuItemFactory.qml:752
348+#: qml/Panel/Indicators/MenuItemFactory.qml:761
351msgid "Nothing is playing"
349msgid "Nothing is playing"
352msgstr ""
350msgstr ""
353
351
354−#: qml/Panel/Indicators/MenuItemFactory.qml:881
352+#: qml/Panel/Indicators/MenuItemFactory.qml:890
355#, qt-format
353#, qt-format
356msgid "%1 hour"
354msgid "%1 hour"
357msgid_plural "%1 hours"
355msgid_plural "%1 hours"
358msgstr[0] ""
356msgstr[0] ""
359msgstr[1] ""
357msgstr[1] ""
360
358
361−#: qml/Panel/Indicators/MenuItemFactory.qml:885
359+#: qml/Panel/Indicators/MenuItemFactory.qml:894
362#, qt-format
360#, qt-format
363msgid "%1 minute"
361msgid "%1 minute"
364msgid_plural "%1 minutes"
362msgid_plural "%1 minutes"
365msgstr[0] ""
363msgstr[0] ""
366msgstr[1] ""
364msgstr[1] ""
367
365
368−#: qml/Panel/Indicators/MenuItemFactory.qml:890
366+#: qml/Panel/Indicators/MenuItemFactory.qml:899
369#, qt-format
367#, qt-format
370msgid "%1 second"
368msgid "%1 second"
371msgid_plural "%1 seconds"
369msgid_plural "%1 seconds"
372msgstr[0] ""
370msgstr[0] ""
373msgstr[1] ""
371msgstr[1] ""
374
372
375−#: qml/Panel/Indicators/MenuItemFactory.qml:893
373+#: qml/Panel/Indicators/MenuItemFactory.qml:902
376msgid "0 seconds"
374msgid "0 seconds"
377msgstr ""
375msgstr ""
378
376
379#. Translators: String like "1 hour, 2 minutes, 3 seconds remaining"
377#. Translators: String like "1 hour, 2 minutes, 3 seconds remaining"
380−#: qml/Panel/Indicators/MenuItemFactory.qml:895
378+#: qml/Panel/Indicators/MenuItemFactory.qml:904
381#, qt-format
379#, qt-format
382msgid "%1 remaining"
380msgid "%1 remaining"
383msgstr ""
381msgstr ""
384
382
385−#: qml/Panel/Indicators/MenuItemFactory.qml:901
383+#: qml/Panel/Indicators/MenuItemFactory.qml:910
386msgid "In queue…"
384msgid "In queue…"
387msgstr "Növbədədir..."
385msgstr "Növbədədir..."
388
386
389−#: qml/Panel/Indicators/MenuItemFactory.qml:905
387+#: qml/Panel/Indicators/MenuItemFactory.qml:914
390msgid "Downloading"
388msgid "Downloading"
391msgstr "Endirilir"
389msgstr "Endirilir"
392
390
393−#: qml/Panel/Indicators/MenuItemFactory.qml:907
391+#: qml/Panel/Indicators/MenuItemFactory.qml:916
394msgid "Paused, tap to resume"
392msgid "Paused, tap to resume"
395msgstr "Dayandırıldı. Davam etmək üçün toxunun"
393msgstr "Dayandırıldı. Davam etmək üçün toxunun"
396
394
397−#: qml/Panel/Indicators/MenuItemFactory.qml:909
395+#: qml/Panel/Indicators/MenuItemFactory.qml:918
398msgid "Canceled"
396msgid "Canceled"
399msgstr "İmtina edildi"
397msgstr "İmtina edildi"
400
398
401−#: qml/Panel/Indicators/MenuItemFactory.qml:911
399+#: qml/Panel/Indicators/MenuItemFactory.qml:920
402msgid "Finished"
400msgid "Finished"
403msgstr "Bitdi"
401msgstr "Bitdi"
404
402
405−#: qml/Panel/Indicators/MenuItemFactory.qml:913
403+#: qml/Panel/Indicators/MenuItemFactory.qml:922
406msgid "Failed, tap to retry"
404msgid "Failed, tap to retry"
407msgstr "Alınmadı. Yenidәn cәhd etmək üçün toxunun"
405msgstr "Alınmadı. Yenidәn cәhd etmək üçün toxunun"
408
406
@@ -422,243 +420,323 @@ msgctxt "Button: Call back on phone"
422msgid "Call back"
420msgid "Call back"
423msgstr ""
421msgstr ""
424
422
425−#: qml/Tutorial/TutorialBottom.qml:28
423+#: qml/Stages/SideStage.qml:76
426−msgid "Open special menus"
424+msgid "Drag using 3 fingers any application from one window to the other"
427−msgstr ""
428−
429−#: qml/Tutorial/TutorialBottom.qml:29
430−msgid "Swipe up from the bottom edge."
431msgstr ""
425msgstr ""
432
426
433−#: qml/Tutorial/TutorialBottomFinish.qml:24
427+#: qml/Tutorial/TutorialBottom.qml:78
434−msgid "This action does different things for different apps"
428+msgid "Swipe up to add a contact"
435msgstr ""
429msgstr ""
436
430
437−#: qml/Tutorial/TutorialBottomFinish.qml:25
431+#: qml/Tutorial/TutorialBottom.qml:80
438−msgid "Tap here to finish."
432+msgid "Swipe up for favorite calculations"
439msgstr ""
433msgstr ""
440
434
441−#: qml/Tutorial/TutorialContent.qml:80 qml/Tutorial/TutorialLeftFinish.qml:25
435+#: qml/Tutorial/TutorialBottom.qml:82
442−#: qml/Tutorial/TutorialRight.qml:144
436+msgid "Swipe up for recent calls"
443−msgid "Tap here to continue."
444msgstr ""
437msgstr ""
445
438
446−#: qml/Tutorial/TutorialLeft.qml:26
439+#: qml/Tutorial/TutorialBottom.qml:84
447−msgid "Open the launcher"
440+msgid "Swipe up to create a message"
448msgstr ""
441msgstr ""
449
442
450−#: qml/Tutorial/TutorialLeft.qml:27
443+#: qml/Tutorial/TutorialBottom.qml:85
451−msgid "Short swipe from the left edge."
444+msgid "Swipe up to manage the app"
452msgstr ""
445msgstr ""
453
446
454−#: qml/Tutorial/TutorialLeftFinish.qml:24
447+#: qml/Tutorial/TutorialLeft.qml:47
455−msgid "These are the shortcuts to favorite apps"
448+msgid "Swipe from the left edge to open the launcher"
456msgstr ""
449msgstr ""
457
450
458−#: qml/Tutorial/TutorialPage.qml:178
451+#: qml/Tutorial/TutorialLeftLong.qml:47
459−msgid "You almost got it!"
452+msgid "Long swipe from the left edge to open the Today scope"
460msgstr ""
453msgstr ""
461
454
462−#: qml/Tutorial/TutorialPage.qml:195
455+#: qml/Tutorial/TutorialRight.qml:54
463−msgid "Try again."
456+msgid "Hover your mouse on the right edge to view your open apps"
464msgstr ""
457msgstr ""
465
458
466−#: qml/Tutorial/TutorialRight.qml:31
459+#: qml/Tutorial/TutorialRight.qml:55
467−msgid "To view open apps"
460+msgid "Short or long swipe from the right edge to view your open apps"
468msgstr ""
461msgstr ""
469
462
470−#: qml/Tutorial/TutorialRight.qml:32
463+#: qml/Tutorial/TutorialTop.qml:53
471−msgid "Long swipe from the right edge."
464+msgid "Swipe from the top right edge to open the notification bar"
472msgstr ""
465msgstr ""
473
466
474−#: qml/Tutorial/TutorialRight.qml:122
467+#: qml/Tutorial/TutorialTop.qml:54
475−msgid "View all your running tasks."
468+msgid "Swipe from the top edge to open the notification bar"
476msgstr ""
469msgstr ""
477
470
478−#: qml/Wizard/Page.qml:89
471+#: qml/Wizard/Page.qml:54
479msgctxt "Button: Go back one page in the Wizard"
472msgctxt "Button: Go back one page in the Wizard"
480msgid "Back"
473msgid "Back"
481msgstr ""
474msgstr ""
482
475
483#: qml/Wizard/Pages/10-welcome.qml:27
476#: qml/Wizard/Pages/10-welcome.qml:27
484−msgid "Hi!"
477+msgid "Language"
485msgstr ""
478msgstr ""
486
479
487−#: qml/Wizard/Pages/10-welcome.qml:44
480+#: qml/Wizard/Pages/10-welcome.qml:156 qml/Wizard/Pages/30-wifi.qml:206
488−msgid "Welcome to your Ubuntu device."
481+#: qml/Wizard/Pages/40-location.qml:271 qml/Wizard/Pages/50-timezone.qml:267
482+#: qml/Wizard/Pages/60-account.qml:65 qml/Wizard/Pages/70-passwd-type.qml:144
483+#: qml/Wizard/Pages/75-report-check.qml:84
484+#: qml/Wizard/Pages/passcode-desktop.qml:124
485+#: qml/Wizard/Pages/password-set.qml:141
486+msgid "Next"
489msgstr ""
487msgstr ""
490
488
491−#: qml/Wizard/Pages/10-welcome.qml:52
489+#: qml/Wizard/Pages/30-wifi.qml:29
492−msgid "Let’s get started."
490+msgid "Connect to Wi‑Fi"
493msgstr ""
491msgstr ""
494
492
495−#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:133
493+#: qml/Wizard/Pages/30-wifi.qml:130
496−#: qml/Wizard/Pages/40-wifi.qml:215 qml/Wizard/Pages/50-location.qml:131
494+msgid "Connected"
497−#: qml/Wizard/Pages/60-reporting.qml:60 qml/Wizard/Pages/passwd-confirm.qml:82
498−#: qml/Wizard/Pages/passwd-set.qml:90
499−msgid "Continue"
500msgstr ""
495msgstr ""
501
496
502−#: qml/Wizard/Pages/20-sim.qml:25
497+#: qml/Wizard/Pages/30-wifi.qml:163
503−msgid "Add a SIM card and restart your device"
498+msgid "Available Wi-Fi networks"
504msgstr ""
499msgstr ""
505
500
506−#: qml/Wizard/Pages/20-sim.qml:59
501+#: qml/Wizard/Pages/30-wifi.qml:164
507−msgid "Without it, you won’t be able to make calls or use text messaging."
502+msgid "No available Wi-Fi networks"
508msgstr ""
503msgstr ""
509
504
510−#: qml/Wizard/Pages/20-sim.qml:73 qml/Wizard/Pages/40-wifi.qml:215
505+#: qml/Wizard/Pages/30-wifi.qml:206 qml/Wizard/Pages/60-account.qml:65
506+#: qml/Wizard/Pages/sim.qml:101
511msgid "Skip"
507msgid "Skip"
512msgstr ""
508msgstr ""
513
509
514−#: qml/Wizard/Pages/30-passwd-type.qml:39
510+#: qml/Wizard/Pages/40-location.qml:27
515−msgid "Lock security"
511+msgid "Location Services"
516msgstr ""
512msgstr ""
517
513
518−#: qml/Wizard/Pages/30-passwd-type.qml:79
514+#: qml/Wizard/Pages/40-location.qml:83
519−msgid "Please select how you’d like to unlock your device."
515+msgid ""
516+"Use GPS, Wi-Fi hotspots and mobile network anonymously to detect location "
517+"(recommended)"
520msgstr ""
518msgstr ""
521
519
522−#: qml/Wizard/Pages/30-passwd-type.qml:102
520+#: qml/Wizard/Pages/40-location.qml:105
523−msgctxt "Label: Type of security method"
521+#, qt-format
524−msgid "Swipe"
522+msgid "By selecting this option you agree to the Nokia HERE %1."
523+msgstr ""
524+
525+#: qml/Wizard/Pages/40-location.qml:106
526+msgctxt "part of: Nokia HERE terms and conditions"
527+msgid "terms and conditions"
528+msgstr ""
529+
530+#: qml/Wizard/Pages/40-location.qml:160
531+msgid "GPS only"
532+msgstr ""
533+
534+#: qml/Wizard/Pages/40-location.qml:214
535+msgid "Don't use my location"
536+msgstr ""
537+
538+#: qml/Wizard/Pages/40-location.qml:260
539+msgid "You can change it later in System Settings."
540+msgstr ""
541+
542+#: qml/Wizard/Pages/50-timezone.qml:29
543+msgid "Time Zone"
544+msgstr ""
545+
546+#: qml/Wizard/Pages/50-timezone.qml:178
547+msgid "Enter your city"
548+msgstr ""
549+
550+#: qml/Wizard/Pages/60-account.qml:24
551+msgid "Personalize Your Device"
552+msgstr ""
553+
554+#: qml/Wizard/Pages/60-account.qml:48
555+msgid "Preferred Name"
525msgstr ""
556msgstr ""
526
557
527−#: qml/Wizard/Pages/30-passwd-type.qml:103
558+#: qml/Wizard/Pages/70-passwd-type.qml:39
528−msgctxt "Label: Description of security method"
559+msgid "Lock Screen"
529−msgid "No security"
530msgstr ""
560msgstr ""
531
561
532−#: qml/Wizard/Pages/30-passwd-type.qml:105
562+#: qml/Wizard/Pages/70-passwd-type.qml:101
533msgctxt "Label: Type of security method"
563msgctxt "Label: Type of security method"
534−msgid "Passcode"
564+msgid "Create new password"
535msgstr ""
565msgstr ""
536
566
537−#: qml/Wizard/Pages/30-passwd-type.qml:106
567+#: qml/Wizard/Pages/70-passwd-type.qml:103
538−msgctxt "Label: Description of security method"
568+msgctxt "Label: Type of security method"
539−msgid "4 digits only"
569+msgid "Create passcode (numbers only)"
540msgstr ""
570msgstr ""
541
571
542−#: qml/Wizard/Pages/30-passwd-type.qml:108
572+#: qml/Wizard/Pages/70-passwd-type.qml:105
543msgctxt "Label: Type of security method"
573msgctxt "Label: Type of security method"
544−msgid "Passphrase"
574+msgid "No lock code"
545msgstr ""
575msgstr ""
546
576
547−#: qml/Wizard/Pages/30-passwd-type.qml:109
577+#: qml/Wizard/Pages/75-report-check.qml:26 qml/Wizard/Pages/here-terms.qml:108
548−msgctxt "Label: Description of security method"
578+msgid "Privacy Policy"
549−msgid "Numbers and letters"
550msgstr ""
579msgstr ""
551
580
552−#: qml/Wizard/Pages/40-wifi.qml:29
581+#: qml/Wizard/Pages/75-report-check.qml:26
553−msgid "Connect to Wi‑Fi"
582+msgid "Help Us Improve"
554msgstr ""
583msgstr ""
555
584
556−#: qml/Wizard/Pages/40-wifi.qml:168
585+#: qml/Wizard/Pages/75-report-check.qml:59
557−msgid "Available networks…"
586+msgid "Improve system performance by sending us crashes and error reports."
558msgstr ""
587msgstr ""
559
588
560−#: qml/Wizard/Pages/40-wifi.qml:169
589+#: qml/Wizard/Pages/75-report-check.qml:60
561−msgid "No available networks."
590+msgid "Privacy policy"
562msgstr ""
591msgstr ""
563
592
564−#: qml/Wizard/Pages/50-location.qml:27
593+#: qml/Wizard/Pages/80-finished.qml:89
565−msgid "Location"
594+msgid "Welcome to Ubuntu"
566msgstr ""
595msgstr ""
567
596
568−#: qml/Wizard/Pages/50-location.qml:62
597+#: qml/Wizard/Pages/80-finished.qml:104
569−msgid "Let the phone detect your location:"
598+msgid "You are ready to use your device now"
570msgstr ""
599msgstr ""
571
600
572−#: qml/Wizard/Pages/50-location.qml:69
601+#: qml/Wizard/Pages/80-finished.qml:124
573−msgid "Using GPS only (less accurate)"
602+msgid "Get Started"
574msgstr ""
603msgstr ""
575
604
576−#: qml/Wizard/Pages/50-location.qml:86
605+#: qml/Wizard/Pages/here-terms.qml:25
577−msgid "Using GPS, anonymized Wi-Fi and cellular network info (recommended)"
606+msgid "Terms & Conditions"
578msgstr ""
607msgstr ""
579
608
580−#. Translators: HERE is a trademark for Nokia's location service, you probably shouldn't translate it
609+#: qml/Wizard/Pages/here-terms.qml:69
610+msgid "Your device uses positioning technologies provided by HERE."
611+msgstr ""
612+
581−#: qml/Wizard/Pages/50-location.qml:103
613+#: qml/Wizard/Pages/here-terms.qml:81
582msgid ""
614msgid ""
583−"By selecting this option you agree to the Nokia HERE <a href='#'>terms and "
615+"To provide you with positioning services and to improve their quality, HERE "
584−"conditions</a>."
616+"collects information about nearby cell towers and Wi-Fi hotspots around your "
617+"current location whenever your position is being found."
585msgstr ""
618msgstr ""
586
619
587−#: qml/Wizard/Pages/50-location.qml:112
620+#: qml/Wizard/Pages/here-terms.qml:93
588−msgid "Not at all"
621+msgid ""
622+"The information collected is used to analyze the service and to improve the "
623+"use of service, but not to identify you personally."
589msgstr ""
624msgstr ""
590
625
591−#: qml/Wizard/Pages/50-location.qml:124
626+#: qml/Wizard/Pages/here-terms.qml:106
592−msgid "You can change your mind later in <b>System Settings</b>."
627+#, qt-format
628+msgid "By continuing, you agree to the HERE platform %1 and %2."
593msgstr ""
629msgstr ""
594
630
595−#: qml/Wizard/Pages/60-reporting.qml:26
631+#: qml/Wizard/Pages/here-terms.qml:107
596−msgid "Improving your experience"
632+msgid "Service Terms"
597msgstr ""
633msgstr ""
598
634
599−#: qml/Wizard/Pages/60-reporting.qml:46
635+#: qml/Wizard/Pages/passcode-confirm.qml:43
636+#: qml/Wizard/Pages/passcode-desktop.qml:80
600−msgid ""
637+msgid "Confirm passcode"
601−"Your phone is set up to automatically report errors to Canonical and its "
602−"partners, the makers of the operating system."
603msgstr ""
638msgstr ""
604
639
605−#: qml/Wizard/Pages/60-reporting.qml:53
640+#: qml/Wizard/Pages/passcode-confirm.qml:45
606−msgid ""
641+msgid "Incorrect passcode."
607−"This can be disabled in <b>System Settings</b> under <b>Security &amp; "
608−"Privacy</b>"
609msgstr ""
642msgstr ""
610
643
611−#: qml/Wizard/Pages/80-finished.qml:24
644+#: qml/Wizard/Pages/passcode-confirm.qml:45
612−msgid "All done"
645+msgctxt "Enter the passcode again"
646+msgid "Please re-enter."
613msgstr ""
647msgstr ""
614
648
615−#: qml/Wizard/Pages/80-finished.qml:39
649+#: qml/Wizard/Pages/passcode-desktop.qml:30
616−msgid "Nice work!"
650+msgid "Lock Screen Passcode"
617msgstr ""
651msgstr ""
618
652
619−#: qml/Wizard/Pages/80-finished.qml:46
653+#: qml/Wizard/Pages/passcode-desktop.qml:56
620−msgid "Your device is now ready to use."
654+msgid "Enter 4 numbers to setup your passcode"
621msgstr ""
655msgstr ""
622
656
623−#: qml/Wizard/Pages/80-finished.qml:53
657+#: qml/Wizard/Pages/passcode-desktop.qml:65
624−msgid "Finish"
658+#: qml/Wizard/Pages/passcode-set.qml:54
659+msgid "Choose passcode"
625msgstr ""
660msgstr ""
626
661
627−#: qml/Wizard/Pages/here-terms.qml:27
662+#: qml/Wizard/Pages/passcode-desktop.qml:105
628−msgid "Terms & Conditions"
663+msgid "Passcode too short"
629msgstr ""
664msgstr ""
630
665
631−#: qml/Wizard/Pages/passwd-confirm.qml:49
666+#: qml/Wizard/Pages/passcode-desktop.qml:107
632−msgid "Confirm passphrase"
667+msgid "Passcodes match"
633msgstr ""
668msgstr ""
634
669
635−#: qml/Wizard/Pages/passwd-confirm.qml:50
670+#: qml/Wizard/Pages/passcode-desktop.qml:109
636−msgid "Confirm passcode"
671+msgid "Passcodes do not match"
637msgstr ""
672msgstr ""
638
673
639−#: qml/Wizard/Pages/passwd-confirm.qml:53
674+#: qml/Wizard/Pages/passcode-set.qml:62
640−#: qml/Wizard/Pages/passwd-confirm.qml:54
675+msgid "Passcode must be 4 characters long"
641−msgid "Please try again."
642msgstr ""
676msgstr ""
643
677
644−#: qml/Wizard/Pages/passwd-set.qml:61
678+#: qml/Wizard/Pages/password-set.qml:30
645−msgid "Choose your passcode"
679+msgid "Lock Screen Password"
646msgstr ""
680msgstr ""
647
681
648−#: qml/Wizard/Pages/passwd-set.qml:68
682+#: qml/Wizard/Pages/password-set.qml:61
649−msgid "Passphrase must be 4 characters long"
683+msgid "Enter at least 8 characters"
650msgstr ""
684msgstr ""
651
685
652−#. Translators: This is the arrow for "Back" buttons
686+#: qml/Wizard/Pages/password-set.qml:73
653−#: qml/Wizard/StackButton.qml:39
654−#, qt-format
655−msgid "〈 %1"
687+msgid "Choose password"
656msgstr ""
688msgstr ""
657
689
658−#. Translators: This is the arrow for "Forward" buttons
690+#: qml/Wizard/Pages/password-set.qml:103
659−#: qml/Wizard/StackButton.qml:42
691+msgid "Confirm password"
660−#, qt-format
692+msgstr ""
661−msgid "%1 〉"
693+
694+#: qml/Wizard/Pages/sim.qml:27
695+msgid "No SIM card installed"
696+msgstr ""
697+
698+#: qml/Wizard/Pages/sim.qml:54
699+msgid "SIM card added"
700+msgstr ""
701+
702+#: qml/Wizard/Pages/sim.qml:55
703+msgid "You must restart the device to access the mobile network."
704+msgstr ""
705+
706+#: qml/Wizard/Pages/sim.qml:59
707+msgid "Restart"
708+msgstr ""
709+
710+#: qml/Wizard/Pages/sim.qml:78
711+msgid "You won’t be able to make calls or use text messaging without a SIM."
712+msgstr ""
713+
714+#: qml/Wizard/Pages/sim.qml:90
715+msgid "To proceed with no SIM tap Skip."
716+msgstr ""
717+
718+#: qml/Wizard/PasswordMeter.qml:87
719+msgid "Passwords match"
720+msgstr ""
721+
722+#: qml/Wizard/PasswordMeter.qml:89
723+msgid "Passwords do not match"
724+msgstr ""
725+
726+#: qml/Wizard/PasswordMeter.qml:93
727+msgid "Strong password"
728+msgstr ""
729+
730+#: qml/Wizard/PasswordMeter.qml:95
731+msgid "Fair password"
732+msgstr ""
733+
734+#: qml/Wizard/PasswordMeter.qml:97
735+msgid "Weak password"
736+msgstr ""
737+
738+#: qml/Wizard/PasswordMeter.qml:99
739+msgid "Very weak password"
662msgstr ""
740msgstr ""
663
741
664#~ msgid "Confirm"
742#~ msgid "Confirm"
@@ -716,6 +794,9 @@ msgstr ""
716#~ msgid "Log out"
794#~ msgid "Log out"
717#~ msgstr "Çıxış"
795#~ msgstr "Çıxış"
718
796
797+#~ msgid "Are you sure you want to shut down?"
798+#~ msgstr "Sistemi söndürmәk istәdiyinizә әminsiniz?"
799+
719#~ msgid "Shut down"
800#~ msgid "Shut down"
720#~ msgstr "Sistemi Söndür"
801#~ msgstr "Sistemi Söndür"
721
802
po/be.po+475−236
@@ -7,7 +7,7 @@ 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: 2016-03-10 22:48+0000\n"
10+"POT-Creation-Date: 2016-03-23 10:01+0000\n"
11"PO-Revision-Date: 2015-12-13 13:12+0000\n"
11"PO-Revision-Date: 2015-12-13 13:12+0000\n"
12"Last-Translator: Mikhail_SaTuRn <mikhail_saturn@tut.by>\n"
12"Last-Translator: Mikhail_SaTuRn <mikhail_saturn@tut.by>\n"
13"Language-Team: Belarusian <be@li.org>\n"
13"Language-Team: Belarusian <be@li.org>\n"
@@ -16,8 +16,8 @@ msgstr ""
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 && "
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"
18"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
19−"X-Launchpad-Export-Date: 2016-03-13 05:50+0000\n"
19+"X-Launchpad-Export-Date: 2016-03-24 06:07+0000\n"
20−"X-Generator: Launchpad (build 17939)\n"
20+"X-Generator: Launchpad (build 17958)\n"
21
21
22#: plugins/IntegratedLightDM/Greeter.cpp:112
22#: plugins/IntegratedLightDM/Greeter.cpp:112
23msgid "Password: "
23msgid "Password: "
@@ -78,53 +78,35 @@ msgctxt "Button: Log out from the system"
78msgid "Log Out"
78msgid "Log Out"
79msgstr "Выйсці"
79msgstr "Выйсці"
80
80
81−#: qml/Components/Dialogs.qml:161 qml/Components/Dialogs.qml:194
81+#: qml/Components/Dialogs.qml:161 qml/Components/Dialogs.qml:219
82−#: qml/Components/Dialogs.qml:253
82+#: qml/Dash/DashPageHeader.qml:298 qml/Wizard/Pages/passcode-confirm.qml:32
83+#: qml/Wizard/Pages/passcode-set.qml:32
83msgid "Cancel"
84msgid "Cancel"
84msgstr "Скасаваць"
85msgstr "Скасаваць"
85
86
86#: qml/Components/Dialogs.qml:173
87#: qml/Components/Dialogs.qml:173
87−msgctxt "Title: Reboot/Shut down dialog"
88−msgid "Shut down"
89−msgstr "Выключыць"
90−
91−#: qml/Components/Dialogs.qml:174
92−msgid "Are you sure you want to shut down?"
93−msgstr "Вы ўпэўненыя, што жадаеце выключыць прыладу?"
94−
95−#: qml/Components/Dialogs.qml:176
96−msgctxt "Button: Reboot the system"
97−msgid "Reboot"
98−msgstr "Перазагрузіць"
99−
100−#: qml/Components/Dialogs.qml:185
101−msgctxt "Button: Shut down the system"
102−msgid "Shut down"
103−msgstr "Выключыць"
104−
105−#: qml/Components/Dialogs.qml:207
106msgctxt "Title: Reboot dialog"
88msgctxt "Title: Reboot dialog"
107msgid "Reboot"
89msgid "Reboot"
108msgstr "Перазагрузіць"
90msgstr "Перазагрузіць"
109
91
110−#: qml/Components/Dialogs.qml:208
92+#: qml/Components/Dialogs.qml:174
111msgid "Are you sure you want to reboot?"
93msgid "Are you sure you want to reboot?"
112msgstr "Вы ўпэўнены, што жадаеце перазагрузіць?"
94msgstr "Вы ўпэўнены, што жадаеце перазагрузіць?"
113
95
114−#: qml/Components/Dialogs.qml:210
96+#: qml/Components/Dialogs.qml:176
115msgid "No"
97msgid "No"
116msgstr "Не"
98msgstr "Не"
117
99
118−#: qml/Components/Dialogs.qml:217
100+#: qml/Components/Dialogs.qml:183
119msgid "Yes"
101msgid "Yes"
120msgstr "Так"
102msgstr "Так"
121
103
122−#: qml/Components/Dialogs.qml:232
104+#: qml/Components/Dialogs.qml:198
123msgctxt "Title: Power off/Restart dialog"
105msgctxt "Title: Power off/Restart dialog"
124msgid "Power"
106msgid "Power"
125msgstr "Сілкаванне"
107msgstr "Сілкаванне"
126
108
127−#: qml/Components/Dialogs.qml:233
109+#: qml/Components/Dialogs.qml:199
128msgid ""
110msgid ""
129"Are you sure you would like\n"
111"Are you sure you would like\n"
130"to power off?"
112"to power off?"
@@ -132,12 +114,12 @@ msgstr ""
132"Вы ўпэўнены, што хочаце\n"
114"Вы ўпэўнены, што хочаце\n"
133"выключыць камп'ютэр?"
115"выключыць камп'ютэр?"
134
116
135−#: qml/Components/Dialogs.qml:235
117+#: qml/Components/Dialogs.qml:201
136msgctxt "Button: Power off the system"
118msgctxt "Button: Power off the system"
137msgid "Power off"
119msgid "Power off"
138msgstr "Выключыць"
120msgstr "Выключыць"
139
121
140−#: qml/Components/Dialogs.qml:244
122+#: qml/Components/Dialogs.qml:210
141msgctxt "Button: Restart the system"
123msgctxt "Button: Restart the system"
142msgid "Restart"
124msgid "Restart"
143msgstr "Перазапуск"
125msgstr "Перазапуск"
@@ -180,42 +162,58 @@ msgstr "Перападлучыцца зараз!"
180msgid "Close all"
162msgid "Close all"
181msgstr "Зачыніць усё"
163msgstr "Зачыніць усё"
182
164
183−#: qml/Dash/DashPageHeader.qml:270
165+#: qml/Dash/DashPageHeader.qml:337
184msgctxt "Button: Open the Ubuntu Store"
166msgctxt "Button: Open the Ubuntu Store"
185msgid "Store"
167msgid "Store"
186msgstr "Крама"
168msgstr "Крама"
187
169
188−#: qml/Dash/DashPageHeader.qml:277
170+#: qml/Dash/DashPageHeader.qml:344
189msgctxt "Button: Start a search in the current dash scope"
171msgctxt "Button: Start a search in the current dash scope"
190msgid "Search"
172msgid "Search"
191msgstr "Пошук"
173msgstr "Пошук"
192
174
193−#: qml/Dash/DashPageHeader.qml:287
175+#: qml/Dash/DashPageHeader.qml:354
194msgctxt "Button: Show the current dash scope settings"
176msgctxt "Button: Show the current dash scope settings"
195msgid "Settings"
177msgid "Settings"
196msgstr "Налады"
178msgstr "Налады"
197
179
198−#: qml/Dash/DashPageHeader.qml:294
180+#: qml/Dash/DashPageHeader.qml:361
199msgid "Remove from Favorites"
181msgid "Remove from Favorites"
200msgstr "Выдаліць з абранага"
182msgstr "Выдаліць з абранага"
201
183
202−#: qml/Dash/DashPageHeader.qml:294
184+#: qml/Dash/DashPageHeader.qml:361
203msgid "Add to Favorites"
185msgid "Add to Favorites"
204msgstr "Дадаць да абранага"
186msgstr "Дадаць да абранага"
205
187
188+#: qml/Dash/FiltersPopover.qml:60
189+msgid "Refine your results"
190+msgstr ""
191+
192+#: qml/Dash/FiltersPopover.qml:69
193+msgid "Reset"
194+msgstr ""
195+
206−#: qml/Dash/GenericScopeView.qml:567 qml/Dash/GenericScopeView.qml:725
196+#: qml/Dash/GenericScopeView.qml:570 qml/Dash/GenericScopeView.qml:755
207msgid "See less"
197msgid "See less"
208msgstr "Карацей"
198msgstr "Карацей"
209
199
210−#: qml/Dash/GenericScopeView.qml:567
200+#: qml/Dash/GenericScopeView.qml:570
211msgid "See all"
201msgid "See all"
212msgstr "Больш падрабязна"
202msgstr "Больш падрабязна"
213
203
214−#: qml/Dash/GenericScopeView.qml:629
204+#: qml/Dash/GenericScopeView.qml:627
215msgctxt "Label: Hint for dash search line edit"
205msgctxt "Label: Hint for dash search line edit"
216msgid "Search"
206msgid "Search"
217msgstr "Пошук"
207msgstr "Пошук"
218
208
209+#: qml/Dash/PageHeaderExtraPanel.qml:55
210+msgid "Recent Searches"
211+msgstr ""
212+
213+#: qml/Dash/PageHeaderExtraPanel.qml:66
214+msgid "Clear All"
215+msgstr ""
216+
219#: qml/Dash/Previews/PreviewActionCombo.qml:35
217#: qml/Dash/Previews/PreviewActionCombo.qml:35
220msgid "More..."
218msgid "More..."
221msgstr "Болей…"
219msgstr "Болей…"
@@ -283,11 +281,11 @@ msgstr "Паспрабаваць зноў"
283msgid "Tap to unlock"
281msgid "Tap to unlock"
284msgstr "Націсніце, каб разблакаваць"
282msgstr "Націсніце, каб разблакаваць"
285
283
286−#: qml/Greeter/NarrowView.qml:54 qml/Wizard/Pages/passwd-confirm.qml:53
284+#: qml/Greeter/NarrowView.qml:54
287msgid "Sorry, incorrect passphrase."
285msgid "Sorry, incorrect passphrase."
288msgstr "Даруйце, няслушны пароль."
286msgstr "Даруйце, няслушны пароль."
289
287
290−#: qml/Greeter/NarrowView.qml:55 qml/Wizard/Pages/passwd-confirm.qml:54
288+#: qml/Greeter/NarrowView.qml:55
291msgid "Sorry, incorrect passcode."
289msgid "Sorry, incorrect passcode."
292msgstr "Даруйце, няслушны код."
290msgstr "Даруйце, няслушны код."
293
291
@@ -316,7 +314,7 @@ msgstr ""
316msgid "Enter %1"
314msgid "Enter %1"
317msgstr "Увядзіце %1"
315msgstr "Увядзіце %1"
318
316
319−#: qml/Greeter/NarrowView.qml:117 qml/Wizard/Pages/passwd-set.qml:60
317+#: qml/Greeter/NarrowView.qml:117
320msgid "Enter passphrase"
318msgid "Enter passphrase"
321msgstr "Увядзіце пароль"
319msgstr "Увядзіце пароль"
322
320
@@ -354,11 +352,11 @@ msgstr "Націсніце, каб вярнуцца да выкліку..."
354msgid "Conference"
352msgid "Conference"
355msgstr "Канферэнцыя"
353msgstr "Канферэнцыя"
356
354
357−#: qml/Panel/Indicators/MenuItemFactory.qml:752
355+#: qml/Panel/Indicators/MenuItemFactory.qml:761
358msgid "Nothing is playing"
356msgid "Nothing is playing"
359msgstr "Нічога не грае"
357msgstr "Нічога не грае"
360
358
361−#: qml/Panel/Indicators/MenuItemFactory.qml:881
359+#: qml/Panel/Indicators/MenuItemFactory.qml:890
362#, qt-format
360#, qt-format
363msgid "%1 hour"
361msgid "%1 hour"
364msgid_plural "%1 hours"
362msgid_plural "%1 hours"
@@ -366,7 +364,7 @@ msgstr[0] "%1 гадзіна"
366msgstr[1] "%1 гадзіны"
364msgstr[1] "%1 гадзіны"
367msgstr[2] "%1 гадзінаў"
365msgstr[2] "%1 гадзінаў"
368
366
369−#: qml/Panel/Indicators/MenuItemFactory.qml:885
367+#: qml/Panel/Indicators/MenuItemFactory.qml:894
370#, qt-format
368#, qt-format
371msgid "%1 minute"
369msgid "%1 minute"
372msgid_plural "%1 minutes"
370msgid_plural "%1 minutes"
@@ -374,7 +372,7 @@ msgstr[0] "%1 хвіліна"
374msgstr[1] "%1 хвіліны"
372msgstr[1] "%1 хвіліны"
375msgstr[2] "%1 хвілінаў"
373msgstr[2] "%1 хвілінаў"
376
374
377−#: qml/Panel/Indicators/MenuItemFactory.qml:890
375+#: qml/Panel/Indicators/MenuItemFactory.qml:899
378#, qt-format
376#, qt-format
379msgid "%1 second"
377msgid "%1 second"
380msgid_plural "%1 seconds"
378msgid_plural "%1 seconds"
@@ -382,37 +380,37 @@ msgstr[0] "%1 секунда"
382msgstr[1] "%1 секунды"
380msgstr[1] "%1 секунды"
383msgstr[2] "%1 секундаў"
381msgstr[2] "%1 секундаў"
384
382
385−#: qml/Panel/Indicators/MenuItemFactory.qml:893
383+#: qml/Panel/Indicators/MenuItemFactory.qml:902
386msgid "0 seconds"
384msgid "0 seconds"
387msgstr "0 секунд"
385msgstr "0 секунд"
388
386
389#. Translators: String like "1 hour, 2 minutes, 3 seconds remaining"
387#. Translators: String like "1 hour, 2 minutes, 3 seconds remaining"
390−#: qml/Panel/Indicators/MenuItemFactory.qml:895
388+#: qml/Panel/Indicators/MenuItemFactory.qml:904
391#, qt-format
389#, qt-format
392msgid "%1 remaining"
390msgid "%1 remaining"
393msgstr "%1 засталося"
391msgstr "%1 засталося"
394
392
395−#: qml/Panel/Indicators/MenuItemFactory.qml:901
393+#: qml/Panel/Indicators/MenuItemFactory.qml:910
396msgid "In queue…"
394msgid "In queue…"
397msgstr "У чарзе..."
395msgstr "У чарзе..."
398
396
399−#: qml/Panel/Indicators/MenuItemFactory.qml:905
397+#: qml/Panel/Indicators/MenuItemFactory.qml:914
400msgid "Downloading"
398msgid "Downloading"
401msgstr "Запампоўка"
399msgstr "Запампоўка"
402
400
403−#: qml/Panel/Indicators/MenuItemFactory.qml:907
401+#: qml/Panel/Indicators/MenuItemFactory.qml:916
404msgid "Paused, tap to resume"
402msgid "Paused, tap to resume"
405msgstr "Прыпынена, націсніце для працягу"
403msgstr "Прыпынена, націсніце для працягу"
406
404
407−#: qml/Panel/Indicators/MenuItemFactory.qml:909
405+#: qml/Panel/Indicators/MenuItemFactory.qml:918
408msgid "Canceled"
406msgid "Canceled"
409msgstr "Скасавана"
407msgstr "Скасавана"
410
408
411−#: qml/Panel/Indicators/MenuItemFactory.qml:911
409+#: qml/Panel/Indicators/MenuItemFactory.qml:920
412msgid "Finished"
410msgid "Finished"
413msgstr "Скончана"
411msgstr "Скончана"
414
412
415−#: qml/Panel/Indicators/MenuItemFactory.qml:913
413+#: qml/Panel/Indicators/MenuItemFactory.qml:922
416msgid "Failed, tap to retry"
414msgid "Failed, tap to retry"
417msgstr "Не атрымалася, націсніце, каб паўтарыць спробу"
415msgstr "Не атрымалася, націсніце, каб паўтарыць спробу"
418
416
@@ -432,251 +430,324 @@ msgctxt "Button: Call back on phone"
432msgid "Call back"
430msgid "Call back"
433msgstr "Патэлефанаваць"
431msgstr "Патэлефанаваць"
434
432
435−#: qml/Tutorial/TutorialBottom.qml:28
433+#: qml/Stages/SideStage.qml:76
436−msgid "Open special menus"
434+msgid "Drag using 3 fingers any application from one window to the other"
437−msgstr "Адкрыць спецыяльныя меню"
435+msgstr ""
438−
439−#: qml/Tutorial/TutorialBottom.qml:29
440−msgid "Swipe up from the bottom edge."
441−msgstr "Правесці уверх ад ніжняга краю."
442
436
443−#: qml/Tutorial/TutorialBottomFinish.qml:24
437+#: qml/Tutorial/TutorialBottom.qml:78
444−msgid "This action does different things for different apps"
438+msgid "Swipe up to add a contact"
445−msgstr "Гэта дзеянне мае розныя наступствы для розных праграм"
439+msgstr ""
446
440
447−#: qml/Tutorial/TutorialBottomFinish.qml:25
441+#: qml/Tutorial/TutorialBottom.qml:80
448−msgid "Tap here to finish."
442+msgid "Swipe up for favorite calculations"
449−msgstr "Націсніце тут, каб завяршыць."
443+msgstr ""
450
444
451−#: qml/Tutorial/TutorialContent.qml:80 qml/Tutorial/TutorialLeftFinish.qml:25
445+#: qml/Tutorial/TutorialBottom.qml:82
452−#: qml/Tutorial/TutorialRight.qml:144
446+msgid "Swipe up for recent calls"
453−msgid "Tap here to continue."
447+msgstr ""
454−msgstr "Націсніце тут, каб працягнуць."
455
448
456−#: qml/Tutorial/TutorialLeft.qml:26
449+#: qml/Tutorial/TutorialBottom.qml:84
457−msgid "Open the launcher"
450+msgid "Swipe up to create a message"
458−msgstr "Адкрыць панэль запуску"
451+msgstr ""
459
452
460−#: qml/Tutorial/TutorialLeft.qml:27
453+#: qml/Tutorial/TutorialBottom.qml:85
461−msgid "Short swipe from the left edge."
454+msgid "Swipe up to manage the app"
462−msgstr "Кароткі рух з левага краю."
455+msgstr ""
463
456
464−#: qml/Tutorial/TutorialLeftFinish.qml:24
457+#: qml/Tutorial/TutorialLeft.qml:47
465−msgid "These are the shortcuts to favorite apps"
458+msgid "Swipe from the left edge to open the launcher"
466−msgstr "Гэта скарачэнні для абраных праграм"
459+msgstr ""
467
460
468−#: qml/Tutorial/TutorialPage.qml:178
461+#: qml/Tutorial/TutorialLeftLong.qml:47
469−msgid "You almost got it!"
462+msgid "Long swipe from the left edge to open the Today scope"
470−msgstr "Амаль усё!"
463+msgstr ""
471
464
472−#: qml/Tutorial/TutorialPage.qml:195
465+#: qml/Tutorial/TutorialRight.qml:54
473−msgid "Try again."
466+msgid "Hover your mouse on the right edge to view your open apps"
474−msgstr "Паспрабуйце яшчэ."
467+msgstr ""
475
468
476−#: qml/Tutorial/TutorialRight.qml:31
469+#: qml/Tutorial/TutorialRight.qml:55
477−msgid "To view open apps"
470+msgid "Short or long swipe from the right edge to view your open apps"
478−msgstr "Паглядзець адкрытыя праграмы"
471+msgstr ""
479
472
480−#: qml/Tutorial/TutorialRight.qml:32
473+#: qml/Tutorial/TutorialTop.qml:53
481−msgid "Long swipe from the right edge."
474+msgid "Swipe from the top right edge to open the notification bar"
482−msgstr "Доўгі рух ад правага краю."
475+msgstr ""
483
476
484−#: qml/Tutorial/TutorialRight.qml:122
477+#: qml/Tutorial/TutorialTop.qml:54
485−msgid "View all your running tasks."
478+msgid "Swipe from the top edge to open the notification bar"
486−msgstr "Паказаць усе запушчаныя задачы."
479+msgstr ""
487
480
488−#: qml/Wizard/Page.qml:89
481+#: qml/Wizard/Page.qml:54
489msgctxt "Button: Go back one page in the Wizard"
482msgctxt "Button: Go back one page in the Wizard"
490msgid "Back"
483msgid "Back"
491msgstr "Вярнуцца"
484msgstr "Вярнуцца"
492
485
493#: qml/Wizard/Pages/10-welcome.qml:27
486#: qml/Wizard/Pages/10-welcome.qml:27
494−msgid "Hi!"
487+msgid "Language"
495−msgstr "Вітай!"
488+msgstr ""
496
489
497−#: qml/Wizard/Pages/10-welcome.qml:44
490+#: qml/Wizard/Pages/10-welcome.qml:156 qml/Wizard/Pages/30-wifi.qml:206
498−msgid "Welcome to your Ubuntu device."
491+#: qml/Wizard/Pages/40-location.qml:271 qml/Wizard/Pages/50-timezone.qml:267
492+#: qml/Wizard/Pages/60-account.qml:65 qml/Wizard/Pages/70-passwd-type.qml:144
493+#: qml/Wizard/Pages/75-report-check.qml:84
494+#: qml/Wizard/Pages/passcode-desktop.qml:124
495+#: qml/Wizard/Pages/password-set.qml:141
496+msgid "Next"
499msgstr ""
497msgstr ""
500
498
501−#: qml/Wizard/Pages/10-welcome.qml:52
499+#: qml/Wizard/Pages/30-wifi.qml:29
502−msgid "Let’s get started."
500+msgid "Connect to Wi‑Fi"
503−msgstr "Пачнем."
501+msgstr "Злучыцца з Wi-Fi"
504
502
505−#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:133
503+#: qml/Wizard/Pages/30-wifi.qml:130
506−#: qml/Wizard/Pages/40-wifi.qml:215 qml/Wizard/Pages/50-location.qml:131
504+msgid "Connected"
507−#: qml/Wizard/Pages/60-reporting.qml:60 qml/Wizard/Pages/passwd-confirm.qml:82
505+msgstr ""
508−#: qml/Wizard/Pages/passwd-set.qml:90
509−msgid "Continue"
510−msgstr "Працягнуць"
511
506
512−#: qml/Wizard/Pages/20-sim.qml:25
507+#: qml/Wizard/Pages/30-wifi.qml:163
513−msgid "Add a SIM card and restart your device"
508+msgid "Available Wi-Fi networks"
514−msgstr "Дадайце SIM-карту і перазагрузіце Вашую прыладу"
509+msgstr ""
515
510
516−#: qml/Wizard/Pages/20-sim.qml:59
511+#: qml/Wizard/Pages/30-wifi.qml:164
517−msgid "Without it, you won’t be able to make calls or use text messaging."
512+msgid "No available Wi-Fi networks"
518−msgstr "Без яе Вы не зможаце тэлефанаваць ці адпраўляць паведамленні."
513+msgstr ""
519
514
520−#: qml/Wizard/Pages/20-sim.qml:73 qml/Wizard/Pages/40-wifi.qml:215
515+#: qml/Wizard/Pages/30-wifi.qml:206 qml/Wizard/Pages/60-account.qml:65
516+#: qml/Wizard/Pages/sim.qml:101
521msgid "Skip"
517msgid "Skip"
522msgstr "Прапусціць"
518msgstr "Прапусціць"
523
519
524−#: qml/Wizard/Pages/30-passwd-type.qml:39
520+#: qml/Wizard/Pages/40-location.qml:27
525−msgid "Lock security"
521+msgid "Location Services"
526−msgstr "Блакіроўка"
522+msgstr ""
527
523
528−#: qml/Wizard/Pages/30-passwd-type.qml:79
524+#: qml/Wizard/Pages/40-location.qml:83
529−msgid "Please select how you’d like to unlock your device."
525+msgid ""
526+"Use GPS, Wi-Fi hotspots and mobile network anonymously to detect location "
527+"(recommended)"
530msgstr ""
528msgstr ""
531
529
532−#: qml/Wizard/Pages/30-passwd-type.qml:102
530+#: qml/Wizard/Pages/40-location.qml:105
533−msgctxt "Label: Type of security method"
531+#, qt-format
534−msgid "Swipe"
532+msgid "By selecting this option you agree to the Nokia HERE %1."
533+msgstr ""
534+
535+#: qml/Wizard/Pages/40-location.qml:106
536+msgctxt "part of: Nokia HERE terms and conditions"
537+msgid "terms and conditions"
535−msgstr "Рух"
538+msgstr ""
539+
540+#: qml/Wizard/Pages/40-location.qml:160
541+msgid "GPS only"
542+msgstr ""
536
543
537−#: qml/Wizard/Pages/30-passwd-type.qml:103
544+#: qml/Wizard/Pages/40-location.qml:214
538−msgctxt "Label: Description of security method"
545+msgid "Don't use my location"
539−msgid "No security"
546+msgstr ""
540−msgstr "Без бяспекі"
541
547
542−#: qml/Wizard/Pages/30-passwd-type.qml:105
548+#: qml/Wizard/Pages/40-location.qml:260
549+msgid "You can change it later in System Settings."
550+msgstr ""
551+
552+#: qml/Wizard/Pages/50-timezone.qml:29
553+msgid "Time Zone"
554+msgstr ""
555+
556+#: qml/Wizard/Pages/50-timezone.qml:178
557+msgid "Enter your city"
558+msgstr ""
559+
560+#: qml/Wizard/Pages/60-account.qml:24
561+msgid "Personalize Your Device"
562+msgstr ""
563+
564+#: qml/Wizard/Pages/60-account.qml:48
565+msgid "Preferred Name"
566+msgstr ""
567+
568+#: qml/Wizard/Pages/70-passwd-type.qml:39
569+msgid "Lock Screen"
570+msgstr ""
571+
572+#: qml/Wizard/Pages/70-passwd-type.qml:101
543msgctxt "Label: Type of security method"
573msgctxt "Label: Type of security method"
544−msgid "Passcode"
574+msgid "Create new password"
545−msgstr "Код-пароль"
575+msgstr ""
546
576
547−#: qml/Wizard/Pages/30-passwd-type.qml:106
577+#: qml/Wizard/Pages/70-passwd-type.qml:103
548−msgctxt "Label: Description of security method"
578+msgctxt "Label: Type of security method"
549−msgid "4 digits only"
579+msgid "Create passcode (numbers only)"
550−msgstr "Толькі 4 лічбы"
580+msgstr ""
551
581
552−#: qml/Wizard/Pages/30-passwd-type.qml:108
582+#: qml/Wizard/Pages/70-passwd-type.qml:105
553msgctxt "Label: Type of security method"
583msgctxt "Label: Type of security method"
554−msgid "Passphrase"
584+msgid "No lock code"
555−msgstr "Пароль"
585+msgstr ""
556
586
557−#: qml/Wizard/Pages/30-passwd-type.qml:109
587+#: qml/Wizard/Pages/75-report-check.qml:26 qml/Wizard/Pages/here-terms.qml:108
558−msgctxt "Label: Description of security method"
588+msgid "Privacy Policy"
559−msgid "Numbers and letters"
589+msgstr ""
560−msgstr "Літары і лічбы"
561
590
562−#: qml/Wizard/Pages/40-wifi.qml:29
591+#: qml/Wizard/Pages/75-report-check.qml:26
563−msgid "Connect to Wi‑Fi"
592+msgid "Help Us Improve"
564−msgstr "Злучыцца з Wi-Fi"
593+msgstr ""
565
594
566−#: qml/Wizard/Pages/40-wifi.qml:168
595+#: qml/Wizard/Pages/75-report-check.qml:59
567−msgid "Available networks…"
596+msgid "Improve system performance by sending us crashes and error reports."
568−msgstr "Даступныя сеткі..."
597+msgstr ""
569
598
570−#: qml/Wizard/Pages/40-wifi.qml:169
599+#: qml/Wizard/Pages/75-report-check.qml:60
571−msgid "No available networks."
600+msgid "Privacy policy"
572−msgstr "Няма даступных сетак."
601+msgstr ""
602+
603+#: qml/Wizard/Pages/80-finished.qml:89
604+msgid "Welcome to Ubuntu"
605+msgstr ""
573
606
574−#: qml/Wizard/Pages/50-location.qml:27
607+#: qml/Wizard/Pages/80-finished.qml:104
575−msgid "Location"
608+msgid "You are ready to use your device now"
609+msgstr ""
610+
611+#: qml/Wizard/Pages/80-finished.qml:124
612+msgid "Get Started"
576−msgstr "Месца"
613+msgstr ""
577
614
578−#: qml/Wizard/Pages/50-location.qml:62
615+#: qml/Wizard/Pages/here-terms.qml:25
579−msgid "Let the phone detect your location:"
616+msgid "Terms & Conditions"
580−msgstr "Дазволіць тэлефону вызначаць месцазнаходжанне:"
617+msgstr "Умовы карыстання"
581
618
582−#: qml/Wizard/Pages/50-location.qml:69
619+#: qml/Wizard/Pages/here-terms.qml:69
583−msgid "Using GPS only (less accurate)"
620+msgid "Your device uses positioning technologies provided by HERE."
584−msgstr "З дапамогай толькі GPS (найменш дакладна)"
621+msgstr ""
585
622
586−#: qml/Wizard/Pages/50-location.qml:86
623+#: qml/Wizard/Pages/here-terms.qml:81
587−msgid "Using GPS, anonymized Wi-Fi and cellular network info (recommended)"
624+msgid ""
625+"To provide you with positioning services and to improve their quality, HERE "
626+"collects information about nearby cell towers and Wi-Fi hotspots around your "
627+"current location whenever your position is being found."
588msgstr ""
628msgstr ""
589−"На аснове GPS, ананімізаванага Wi-Fi і дадзеных сотавай сеткі (рэкамендуецца)"
590
629
591−#. Translators: HERE is a trademark for Nokia's location service, you probably shouldn't translate it
592−#: qml/Wizard/Pages/50-location.qml:103
630+#: qml/Wizard/Pages/here-terms.qml:93
593msgid ""
631msgid ""
594−"By selecting this option you agree to the Nokia HERE <a href='#'>terms and "
632+"The information collected is used to analyze the service and to improve the "
595−"conditions</a>."
633+"use of service, but not to identify you personally."
596msgstr ""
634msgstr ""
597−"Выбарам гэтага варыянту дзеянняў вы згаджаецеся з <a href='#'> умовамі "
598−"прадстаўлення паслуг Nokia HERE</a>."
599
635
600−#: qml/Wizard/Pages/50-location.qml:112
636+#: qml/Wizard/Pages/here-terms.qml:106
601−msgid "Not at all"
637+#, qt-format
602−msgstr "Не дазваляць"
638+msgid "By continuing, you agree to the HERE platform %1 and %2."
639+msgstr ""
603
640
604−#: qml/Wizard/Pages/50-location.qml:124
641+#: qml/Wizard/Pages/here-terms.qml:107
605−msgid "You can change your mind later in <b>System Settings</b>."
642+msgid "Service Terms"
606−msgstr "Пасля змяніць налады можна з дапамогай <b>Сістэмных наладкаў</b>."
643+msgstr ""
607
644
608−#: qml/Wizard/Pages/60-reporting.qml:26
645+#: qml/Wizard/Pages/passcode-confirm.qml:43
609−msgid "Improving your experience"
646+#: qml/Wizard/Pages/passcode-desktop.qml:80
610−msgstr "Спрашчэнне вашай працы"
647+msgid "Confirm passcode"
648+msgstr "Пацвердзіце код-пароль"
611
649
612−#: qml/Wizard/Pages/60-reporting.qml:46
650+#: qml/Wizard/Pages/passcode-confirm.qml:45
613−msgid ""
651+msgid "Incorrect passcode."
614−"Your phone is set up to automatically report errors to Canonical and its "
615−"partners, the makers of the operating system."
616msgstr ""
652msgstr ""
617−"Ваш тэлефон настроены на аўтаматычную адпраўку справаздач пра памылкі ў "
618−"Canonical і партнёрскія установы, вытворцам аперацыйнай сістэмы."
619
653
620−#: qml/Wizard/Pages/60-reporting.qml:53
654+#: qml/Wizard/Pages/passcode-confirm.qml:45
655+msgctxt "Enter the passcode again"
621−msgid ""
656+msgid "Please re-enter."
622−"This can be disabled in <b>System Settings</b> under <b>Security &amp; "
623−"Privacy</b>"
624msgstr ""
657msgstr ""
625−"Гэтае можна адключыць у <b>Сістэмных наладках</b>, дзе <b>Бяспека &amp; "
626−"канфедэнцыйнасці</b>"
627
658
628−#: qml/Wizard/Pages/80-finished.qml:24
659+#: qml/Wizard/Pages/passcode-desktop.qml:30
629−msgid "All done"
660+msgid "Lock Screen Passcode"
630−msgstr "Зроблена"
661+msgstr ""
631
662
632−#: qml/Wizard/Pages/80-finished.qml:39
663+#: qml/Wizard/Pages/passcode-desktop.qml:56
633−msgid "Nice work!"
664+msgid "Enter 4 numbers to setup your passcode"
634−msgstr "Выдатная праца!"
665+msgstr ""
635
666
636−#: qml/Wizard/Pages/80-finished.qml:46
667+#: qml/Wizard/Pages/passcode-desktop.qml:65
637−msgid "Your device is now ready to use."
668+#: qml/Wizard/Pages/passcode-set.qml:54
669+msgid "Choose passcode"
638msgstr ""
670msgstr ""
639
671
640−#: qml/Wizard/Pages/80-finished.qml:53
672+#: qml/Wizard/Pages/passcode-desktop.qml:105
641−msgid "Finish"
673+msgid "Passcode too short"
642−msgstr "Скончыць"
674+msgstr ""
643
675
644−#: qml/Wizard/Pages/here-terms.qml:27
676+#: qml/Wizard/Pages/passcode-desktop.qml:107
645−msgid "Terms & Conditions"
677+msgid "Passcodes match"
646−msgstr "Умовы карыстання"
678+msgstr ""
647
679
648−#: qml/Wizard/Pages/passwd-confirm.qml:49
680+#: qml/Wizard/Pages/passcode-desktop.qml:109
649−msgid "Confirm passphrase"
681+msgid "Passcodes do not match"
650−msgstr "Пацвердзіце пароль"
682+msgstr ""
651
683
652−#: qml/Wizard/Pages/passwd-confirm.qml:50
684+#: qml/Wizard/Pages/passcode-set.qml:62
653−msgid "Confirm passcode"
685+msgid "Passcode must be 4 characters long"
654−msgstr "Пацвердзіце код-пароль"
686+msgstr ""
655
687
656−#: qml/Wizard/Pages/passwd-confirm.qml:53
688+#: qml/Wizard/Pages/password-set.qml:30
657−#: qml/Wizard/Pages/passwd-confirm.qml:54
689+msgid "Lock Screen Password"
658−msgid "Please try again."
690+msgstr ""
659−msgstr "Калі ласка, паспрабуйце яшчэ раз."
660
691
661−#: qml/Wizard/Pages/passwd-set.qml:61
692+#: qml/Wizard/Pages/password-set.qml:61
662−msgid "Choose your passcode"
693+msgid "Enter at least 8 characters"
663−msgstr "Выберыце код"
694+msgstr ""
664
695
665−#: qml/Wizard/Pages/passwd-set.qml:68
696+#: qml/Wizard/Pages/password-set.qml:73
666−msgid "Passphrase must be 4 characters long"
697+msgid "Choose password"
667−msgstr "Код мусіць складацца з 4 сімвалаў"
698+msgstr ""
668
699
669−#. Translators: This is the arrow for "Back" buttons
700+#: qml/Wizard/Pages/password-set.qml:103
670−#: qml/Wizard/StackButton.qml:39
701+msgid "Confirm password"
671−#, qt-format
672−msgid "〈 %1"
673−msgstr "〈 %1"
702+msgstr ""
674
703
675−#. Translators: This is the arrow for "Forward" buttons
704+#: qml/Wizard/Pages/sim.qml:27
705+msgid "No SIM card installed"
706+msgstr ""
707+
708+#: qml/Wizard/Pages/sim.qml:54
709+msgid "SIM card added"
710+msgstr ""
711+
712+#: qml/Wizard/Pages/sim.qml:55
713+msgid "You must restart the device to access the mobile network."
714+msgstr ""
715+
716+#: qml/Wizard/Pages/sim.qml:59
717+msgid "Restart"
718+msgstr "Перазапусціць"
719+
676−#: qml/Wizard/StackButton.qml:42
720+#: qml/Wizard/Pages/sim.qml:78
677−#, qt-format
721+msgid "You won’t be able to make calls or use text messaging without a SIM."
678−msgid "%1 〉"
722+msgstr ""
723+
724+#: qml/Wizard/Pages/sim.qml:90
725+msgid "To proceed with no SIM tap Skip."
726+msgstr ""
727+
728+#: qml/Wizard/PasswordMeter.qml:87
729+msgid "Passwords match"
730+msgstr ""
731+
732+#: qml/Wizard/PasswordMeter.qml:89
733+msgid "Passwords do not match"
679−msgstr "%1 〉"
734+msgstr ""
735+
736+#: qml/Wizard/PasswordMeter.qml:93
737+msgid "Strong password"
738+msgstr ""
739+
740+#: qml/Wizard/PasswordMeter.qml:95
741+msgid "Fair password"
742+msgstr ""
743+
744+#: qml/Wizard/PasswordMeter.qml:97
745+msgid "Weak password"
746+msgstr ""
747+
748+#: qml/Wizard/PasswordMeter.qml:99
749+msgid "Very weak password"
750+msgstr ""
680
751
681#~ msgid "Reboot"
752#~ msgid "Reboot"
682#~ msgstr "Перазагрузіць"
753#~ msgstr "Перазагрузіць"
@@ -723,6 +794,9 @@ msgstr "%1 〉"
723#~ msgid "Log out"
794#~ msgid "Log out"
724#~ msgstr "Выйсці"
795#~ msgstr "Выйсці"
725
796
797+#~ msgid "Are you sure you want to shut down?"
798+#~ msgstr "Вы ўпэўненыя, што жадаеце выключыць прыладу?"
799+
726#~ msgid "Power"
800#~ msgid "Power"
727#~ msgstr "Сілкаванне"
801#~ msgstr "Сілкаванне"
728
802
@@ -746,17 +820,88 @@ msgstr "%1 〉"
746#~ msgid "Store"
820#~ msgid "Store"
747#~ msgstr "Крама"
821#~ msgstr "Крама"
748
822
823+#~ msgid "Add a SIM card and restart your device"
824+#~ msgstr "Дадайце SIM-карту і перазагрузіце Вашую прыладу"
825+
826+#~ msgid "Hi!"
827+#~ msgstr "Вітай!"
828+
749#~ msgid "Welcome to your Ubuntu phone."
829#~ msgid "Welcome to your Ubuntu phone."
750#~ msgstr "Вітаем Вас у сістэме тэлефона Ubuntu."
830#~ msgstr "Вітаем Вас у сістэме тэлефона Ubuntu."
751
831
832+#~ msgid "Let’s get started."
833+#~ msgstr "Пачнем."
834+
835+#~ msgid "Continue"
836+#~ msgstr "Працягнуць"
837+
752#~ msgid "Please select how you’d like to unlock your phone."
838#~ msgid "Please select how you’d like to unlock your phone."
753#~ msgstr "Калі ласка, абярыце спосаб разблакавання тэлефона."
839#~ msgstr "Калі ласка, абярыце спосаб разблакавання тэлефона."
754
840
841+#~ msgid "Using GPS only (less accurate)"
842+#~ msgstr "З дапамогай толькі GPS (найменш дакладна)"
843+
844+#~ msgid "Available networks…"
845+#~ msgstr "Даступныя сеткі..."
846+
847+#~ msgid "No available networks."
848+#~ msgstr "Няма даступных сетак."
849+
850+#~ msgid "Location"
851+#~ msgstr "Месца"
852+
853+#~ msgid "Let the phone detect your location:"
854+#~ msgstr "Дазволіць тэлефону вызначаць месцазнаходжанне:"
855+
856+#~ msgid "Using GPS, anonymized Wi-Fi and cellular network info (recommended)"
857+#~ msgstr ""
858+#~ "На аснове GPS, ананімізаванага Wi-Fi і дадзеных сотавай сеткі (рэкамендуецца)"
859+
860+#~ msgid "Improving your experience"
861+#~ msgstr "Спрашчэнне вашай працы"
862+
863+#~ msgid ""
864+#~ "Your phone is set up to automatically report errors to Canonical and its "
865+#~ "partners, the makers of the operating system."
866+#~ msgstr ""
867+#~ "Ваш тэлефон настроены на аўтаматычную адпраўку справаздач пра памылкі ў "
868+#~ "Canonical і партнёрскія установы, вытворцам аперацыйнай сістэмы."
869+
870+#~ msgid "Nice work!"
871+#~ msgstr "Выдатная праца!"
872+
873+#~ msgid "All done"
874+#~ msgstr "Зроблена"
875+
876+#~ msgid "Finish"
877+#~ msgstr "Скончыць"
878+
755#~ msgid "Your phone is now ready to use."
879#~ msgid "Your phone is now ready to use."
756#~ msgstr "Цяпер Вашым тэлефонам можна карыстацца."
880#~ msgstr "Цяпер Вашым тэлефонам можна карыстацца."
757
881
758−#~ msgid "Restart"
882+#~ msgid ""
759−#~ msgstr "Перазапусціць"
883+#~ "By selecting this option you agree to the Nokia HERE <a href='#'>terms and "
884+#~ "conditions</a>."
885+#~ msgstr ""
886+#~ "Выбарам гэтага варыянту дзеянняў вы згаджаецеся з <a href='#'> умовамі "
887+#~ "прадстаўлення паслуг Nokia HERE</a>."
888+
889+#~ msgid "Not at all"
890+#~ msgstr "Не дазваляць"
891+
892+#, qt-format
893+#~ msgid "〈 %1"
894+#~ msgstr "〈 %1"
895+
896+#~ msgid "Confirm passphrase"
897+#~ msgstr "Пацвердзіце пароль"
898+
899+#, qt-format
900+#~ msgid "%1 〉"
901+#~ msgstr "%1 〉"
902+
903+#~ msgid "Please try again."
904+#~ msgstr "Калі ласка, паспрабуйце яшчэ раз."
760
905
761#~ msgid "Close"
906#~ msgid "Close"
762#~ msgstr "Закрыць"
907#~ msgstr "Закрыць"
@@ -778,6 +923,103 @@ msgstr "%1 〉"
778#~ msgid "Please re-enter"
923#~ msgid "Please re-enter"
779#~ msgstr "Калі ласка, паўтарыце ўвод"
924#~ msgstr "Калі ласка, паўтарыце ўвод"
780
925
926+#~ msgid "Lock security"
927+#~ msgstr "Блакіроўка"
928+
929+#~ msgid "You can change your mind later in <b>System Settings</b>."
930+#~ msgstr "Пасля змяніць налады можна з дапамогай <b>Сістэмных наладкаў</b>."
931+
932+#~ msgid ""
933+#~ "This can be disabled in <b>System Settings</b> under <b>Security &amp; "
934+#~ "Privacy</b>"
935+#~ msgstr ""
936+#~ "Гэтае можна адключыць у <b>Сістэмных наладках</b>, дзе <b>Бяспека &amp; "
937+#~ "канфедэнцыйнасці</b>"
938+
939+#~ msgid "Choose your passcode"
940+#~ msgstr "Выберыце код"
941+
942+#~ msgctxt "Button: Shut down the system"
943+#~ msgid "Shut down"
944+#~ msgstr "Выключыць"
945+
946+#~ msgctxt "Title: Reboot/Shut down dialog"
947+#~ msgid "Shut down"
948+#~ msgstr "Выключыць"
949+
950+#~ msgctxt "Button: Reboot the system"
951+#~ msgid "Reboot"
952+#~ msgstr "Перазагрузіць"
953+
954+#~ msgid "Swipe up from the bottom edge."
955+#~ msgstr "Правесці уверх ад ніжняга краю."
956+
957+#~ msgid "Open special menus"
958+#~ msgstr "Адкрыць спецыяльныя меню"
959+
960+#~ msgid "Tap here to finish."
961+#~ msgstr "Націсніце тут, каб завяршыць."
962+
963+#~ msgid "This action does different things for different apps"
964+#~ msgstr "Гэта дзеянне мае розныя наступствы для розных праграм"
965+
966+#~ msgid "To view open apps"
967+#~ msgstr "Паглядзець адкрытыя праграмы"
968+
969+#~ msgid "You almost got it!"
970+#~ msgstr "Амаль усё!"
971+
972+#~ msgid "Short swipe from the left edge."
973+#~ msgstr "Кароткі рух з левага краю."
974+
975+#~ msgid "Long swipe from the right edge."
976+#~ msgstr "Доўгі рух ад правага краю."
977+
978+#~ msgid "View all your running tasks."
979+#~ msgstr "Паказаць усе запушчаныя задачы."
980+
981+#~ msgid "Try again."
982+#~ msgstr "Паспрабуйце яшчэ."
983+
984+#~ msgid "Open the launcher"
985+#~ msgstr "Адкрыць панэль запуску"
986+
987+#~ msgid "Tap here to continue."
988+#~ msgstr "Націсніце тут, каб працягнуць."
989+
990+#~ msgid "These are the shortcuts to favorite apps"
991+#~ msgstr "Гэта скарачэнні для абраных праграм"
992+
993+#~ msgctxt "Label: Description of security method"
994+#~ msgid "No security"
995+#~ msgstr "Без бяспекі"
996+
997+#~ msgctxt "Label: Type of security method"
998+#~ msgid "Swipe"
999+#~ msgstr "Рух"
1000+
1001+#~ msgctxt "Label: Description of security method"
1002+#~ msgid "4 digits only"
1003+#~ msgstr "Толькі 4 лічбы"
1004+
1005+#~ msgctxt "Label: Type of security method"
1006+#~ msgid "Passphrase"
1007+#~ msgstr "Пароль"
1008+
1009+#~ msgctxt "Label: Description of security method"
1010+#~ msgid "Numbers and letters"
1011+#~ msgstr "Літары і лічбы"
1012+
1013+#~ msgid "Without it, you won’t be able to make calls or use text messaging."
1014+#~ msgstr "Без яе Вы не зможаце тэлефанаваць ці адпраўляць паведамленні."
1015+
1016+#~ msgid "Passphrase must be 4 characters long"
1017+#~ msgstr "Код мусіць складацца з 4 сімвалаў"
1018+
1019+#~ msgctxt "Label: Type of security method"
1020+#~ msgid "Passcode"
1021+#~ msgstr "Код-пароль"
1022+
781#~ msgid "%a %l:%M %p"
1023#~ msgid "%a %l:%M %p"
782#~ msgstr "%a a %H:%M"
1024#~ msgstr "%a a %H:%M"
783
1025
@@ -810,6 +1052,3 @@ msgstr "%1 〉"
810
1052
811#~ msgid "Call back"
1053#~ msgid "Call back"
812#~ msgstr "Зваротны выклік"
1054#~ msgstr "Зваротны выклік"
813−
814−#~ msgid "Re-dock, save your work and close these apps to continue."
815−#~ msgstr "Захавайце сваю працу і зачыніце прылады, каб працягнуць."
po/bg.po+258−180
@@ -7,7 +7,7 @@ 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: 2016-03-10 22:48+0000\n"
10+"POT-Creation-Date: 2016-03-23 10:01+0000\n"
11"PO-Revision-Date: 2015-04-12 14:43+0000\n"
11"PO-Revision-Date: 2015-04-12 14:43+0000\n"
12"Last-Translator: George Karavasilev <kokoto-java@ubuntu.com>\n"
12"Last-Translator: George Karavasilev <kokoto-java@ubuntu.com>\n"
13"Language-Team: Bulgarian <bg@li.org>\n"
13"Language-Team: Bulgarian <bg@li.org>\n"
@@ -15,8 +15,8 @@ msgstr ""
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"Plural-Forms: nplurals=2; plural=n != 1;\n"
18−"X-Launchpad-Export-Date: 2016-03-13 05:50+0000\n"
18+"X-Launchpad-Export-Date: 2016-03-24 06:07+0000\n"
19−"X-Generator: Launchpad (build 17939)\n"
19+"X-Generator: Launchpad (build 17958)\n"
20
20
21#: plugins/IntegratedLightDM/Greeter.cpp:112
21#: plugins/IntegratedLightDM/Greeter.cpp:112
22msgid "Password: "
22msgid "Password: "
@@ -73,53 +73,35 @@ msgctxt "Button: Log out from the system"
73msgid "Log Out"
73msgid "Log Out"
74msgstr ""
74msgstr ""
75
75
76−#: qml/Components/Dialogs.qml:161 qml/Components/Dialogs.qml:194
76+#: qml/Components/Dialogs.qml:161 qml/Components/Dialogs.qml:219
77−#: qml/Components/Dialogs.qml:253
77+#: qml/Dash/DashPageHeader.qml:298 qml/Wizard/Pages/passcode-confirm.qml:32
78+#: qml/Wizard/Pages/passcode-set.qml:32
78msgid "Cancel"
79msgid "Cancel"
79msgstr ""
80msgstr ""
80
81
81#: qml/Components/Dialogs.qml:173
82#: qml/Components/Dialogs.qml:173
82−msgctxt "Title: Reboot/Shut down dialog"
83−msgid "Shut down"
84−msgstr ""
85−
86−#: qml/Components/Dialogs.qml:174
87−msgid "Are you sure you want to shut down?"
88−msgstr ""
89−
90−#: qml/Components/Dialogs.qml:176
91−msgctxt "Button: Reboot the system"
92−msgid "Reboot"
93−msgstr ""
94−
95−#: qml/Components/Dialogs.qml:185
96−msgctxt "Button: Shut down the system"
97−msgid "Shut down"
98−msgstr ""
99−
100−#: qml/Components/Dialogs.qml:207
101msgctxt "Title: Reboot dialog"
83msgctxt "Title: Reboot dialog"
102msgid "Reboot"
84msgid "Reboot"
103msgstr ""
85msgstr ""
104
86
105−#: qml/Components/Dialogs.qml:208
87+#: qml/Components/Dialogs.qml:174
106msgid "Are you sure you want to reboot?"
88msgid "Are you sure you want to reboot?"
107msgstr ""
89msgstr ""
108
90
109−#: qml/Components/Dialogs.qml:210
91+#: qml/Components/Dialogs.qml:176
110msgid "No"
92msgid "No"
111msgstr ""
93msgstr ""
112
94
113−#: qml/Components/Dialogs.qml:217
95+#: qml/Components/Dialogs.qml:183
114msgid "Yes"
96msgid "Yes"
115msgstr ""
97msgstr ""
116
98
117−#: qml/Components/Dialogs.qml:232
99+#: qml/Components/Dialogs.qml:198
118msgctxt "Title: Power off/Restart dialog"
100msgctxt "Title: Power off/Restart dialog"
119msgid "Power"
101msgid "Power"
120msgstr ""
102msgstr ""
121
103
122−#: qml/Components/Dialogs.qml:233
104+#: qml/Components/Dialogs.qml:199
123msgid ""
105msgid ""
124"Are you sure you would like\n"
106"Are you sure you would like\n"
125"to power off?"
107"to power off?"
@@ -127,12 +109,12 @@ msgstr ""
127"Искате ли да \n"
109"Искате ли да \n"
128"изключите захранването на устройството?"
110"изключите захранването на устройството?"
129
111
130−#: qml/Components/Dialogs.qml:235
112+#: qml/Components/Dialogs.qml:201
131msgctxt "Button: Power off the system"
113msgctxt "Button: Power off the system"
132msgid "Power off"
114msgid "Power off"
133msgstr ""
115msgstr ""
134
116
135−#: qml/Components/Dialogs.qml:244
117+#: qml/Components/Dialogs.qml:210
136msgctxt "Button: Restart the system"
118msgctxt "Button: Restart the system"
137msgid "Restart"
119msgid "Restart"
138msgstr ""
120msgstr ""
@@ -175,42 +157,58 @@ msgstr ""
175msgid "Close all"
157msgid "Close all"
176msgstr ""
158msgstr ""
177
159
178−#: qml/Dash/DashPageHeader.qml:270
160+#: qml/Dash/DashPageHeader.qml:337
179msgctxt "Button: Open the Ubuntu Store"
161msgctxt "Button: Open the Ubuntu Store"
180msgid "Store"
162msgid "Store"
181msgstr ""
163msgstr ""
182
164
183−#: qml/Dash/DashPageHeader.qml:277
165+#: qml/Dash/DashPageHeader.qml:344
184msgctxt "Button: Start a search in the current dash scope"
166msgctxt "Button: Start a search in the current dash scope"
185msgid "Search"
167msgid "Search"
186msgstr ""
168msgstr ""
187
169
188−#: qml/Dash/DashPageHeader.qml:287
170+#: qml/Dash/DashPageHeader.qml:354
189msgctxt "Button: Show the current dash scope settings"
171msgctxt "Button: Show the current dash scope settings"
190msgid "Settings"
172msgid "Settings"
191msgstr ""
173msgstr ""
192
174
193−#: qml/Dash/DashPageHeader.qml:294
175+#: qml/Dash/DashPageHeader.qml:361
194msgid "Remove from Favorites"
176msgid "Remove from Favorites"
195msgstr ""
177msgstr ""
196
178
197−#: qml/Dash/DashPageHeader.qml:294
179+#: qml/Dash/DashPageHeader.qml:361
198msgid "Add to Favorites"
180msgid "Add to Favorites"
199msgstr ""
181msgstr ""
200
182
183+#: qml/Dash/FiltersPopover.qml:60
184+msgid "Refine your results"
185+msgstr ""
186+
187+#: qml/Dash/FiltersPopover.qml:69
188+msgid "Reset"
189+msgstr ""
190+
201−#: qml/Dash/GenericScopeView.qml:567 qml/Dash/GenericScopeView.qml:725
191+#: qml/Dash/GenericScopeView.qml:570 qml/Dash/GenericScopeView.qml:755
202msgid "See less"
192msgid "See less"
203msgstr ""
193msgstr ""
204
194
205−#: qml/Dash/GenericScopeView.qml:567
195+#: qml/Dash/GenericScopeView.qml:570
206msgid "See all"
196msgid "See all"
207msgstr ""
197msgstr ""
208
198
209−#: qml/Dash/GenericScopeView.qml:629
199+#: qml/Dash/GenericScopeView.qml:627
210msgctxt "Label: Hint for dash search line edit"
200msgctxt "Label: Hint for dash search line edit"
211msgid "Search"
201msgid "Search"
212msgstr ""
202msgstr ""
213
203
204+#: qml/Dash/PageHeaderExtraPanel.qml:55
205+msgid "Recent Searches"
206+msgstr ""
207+
208+#: qml/Dash/PageHeaderExtraPanel.qml:66
209+msgid "Clear All"
210+msgstr ""
211+
214#: qml/Dash/Previews/PreviewActionCombo.qml:35
212#: qml/Dash/Previews/PreviewActionCombo.qml:35
215msgid "More..."
213msgid "More..."
216msgstr ""
214msgstr ""
@@ -278,11 +276,11 @@ msgstr ""
278msgid "Tap to unlock"
276msgid "Tap to unlock"
279msgstr ""
277msgstr ""
280
278
281−#: qml/Greeter/NarrowView.qml:54 qml/Wizard/Pages/passwd-confirm.qml:53
279+#: qml/Greeter/NarrowView.qml:54
282msgid "Sorry, incorrect passphrase."
280msgid "Sorry, incorrect passphrase."
283msgstr ""
281msgstr ""
284
282
285−#: qml/Greeter/NarrowView.qml:55 qml/Wizard/Pages/passwd-confirm.qml:54
283+#: qml/Greeter/NarrowView.qml:55
286msgid "Sorry, incorrect passcode."
284msgid "Sorry, incorrect passcode."
287msgstr ""
285msgstr ""
288
286
@@ -307,7 +305,7 @@ msgstr ""
307msgid "Enter %1"
305msgid "Enter %1"
308msgstr ""
306msgstr ""
309
307
310−#: qml/Greeter/NarrowView.qml:117 qml/Wizard/Pages/passwd-set.qml:60
308+#: qml/Greeter/NarrowView.qml:117
311msgid "Enter passphrase"
309msgid "Enter passphrase"
312msgstr ""
310msgstr ""
313
311
@@ -345,62 +343,62 @@ msgstr ""
345msgid "Conference"
343msgid "Conference"
346msgstr ""
344msgstr ""
347
345
348−#: qml/Panel/Indicators/MenuItemFactory.qml:752
346+#: qml/Panel/Indicators/MenuItemFactory.qml:761
349msgid "Nothing is playing"
347msgid "Nothing is playing"
350msgstr ""
348msgstr ""
351
349
352−#: qml/Panel/Indicators/MenuItemFactory.qml:881
350+#: qml/Panel/Indicators/MenuItemFactory.qml:890
353#, qt-format
351#, qt-format
354msgid "%1 hour"
352msgid "%1 hour"
355msgid_plural "%1 hours"
353msgid_plural "%1 hours"
356msgstr[0] ""
354msgstr[0] ""
357msgstr[1] ""
355msgstr[1] ""
358
356
359−#: qml/Panel/Indicators/MenuItemFactory.qml:885
357+#: qml/Panel/Indicators/MenuItemFactory.qml:894
360#, qt-format
358#, qt-format
361msgid "%1 minute"
359msgid "%1 minute"
362msgid_plural "%1 minutes"
360msgid_plural "%1 minutes"
363msgstr[0] ""
361msgstr[0] ""
364msgstr[1] ""
362msgstr[1] ""
365
363
366−#: qml/Panel/Indicators/MenuItemFactory.qml:890
364+#: qml/Panel/Indicators/MenuItemFactory.qml:899
367#, qt-format
365#, qt-format
368msgid "%1 second"
366msgid "%1 second"
369msgid_plural "%1 seconds"
367msgid_plural "%1 seconds"
370msgstr[0] ""
368msgstr[0] ""
371msgstr[1] ""
369msgstr[1] ""
372
370
373−#: qml/Panel/Indicators/MenuItemFactory.qml:893
371+#: qml/Panel/Indicators/MenuItemFactory.qml:902
374msgid "0 seconds"
372msgid "0 seconds"
375msgstr ""
373msgstr ""
376
374
377#. Translators: String like "1 hour, 2 minutes, 3 seconds remaining"
375#. Translators: String like "1 hour, 2 minutes, 3 seconds remaining"
378−#: qml/Panel/Indicators/MenuItemFactory.qml:895
376+#: qml/Panel/Indicators/MenuItemFactory.qml:904
379#, qt-format
377#, qt-format
380msgid "%1 remaining"
378msgid "%1 remaining"
381msgstr ""
379msgstr ""
382
380
383−#: qml/Panel/Indicators/MenuItemFactory.qml:901
381+#: qml/Panel/Indicators/MenuItemFactory.qml:910
384msgid "In queue…"
382msgid "In queue…"
385msgstr ""
383msgstr ""
386
384
387−#: qml/Panel/Indicators/MenuItemFactory.qml:905
385+#: qml/Panel/Indicators/MenuItemFactory.qml:914
388msgid "Downloading"
386msgid "Downloading"
389msgstr ""
387msgstr ""
390
388
391−#: qml/Panel/Indicators/MenuItemFactory.qml:907
389+#: qml/Panel/Indicators/MenuItemFactory.qml:916
392msgid "Paused, tap to resume"
390msgid "Paused, tap to resume"
393msgstr ""
391msgstr ""
394
392
395−#: qml/Panel/Indicators/MenuItemFactory.qml:909
393+#: qml/Panel/Indicators/MenuItemFactory.qml:918
396msgid "Canceled"
394msgid "Canceled"
397msgstr ""
395msgstr ""
398
396
399−#: qml/Panel/Indicators/MenuItemFactory.qml:911
397+#: qml/Panel/Indicators/MenuItemFactory.qml:920
400msgid "Finished"
398msgid "Finished"
401msgstr ""
399msgstr ""
402
400
403−#: qml/Panel/Indicators/MenuItemFactory.qml:913
401+#: qml/Panel/Indicators/MenuItemFactory.qml:922
404msgid "Failed, tap to retry"
402msgid "Failed, tap to retry"
405msgstr ""
403msgstr ""
406
404
@@ -420,243 +418,323 @@ msgctxt "Button: Call back on phone"
420msgid "Call back"
418msgid "Call back"
421msgstr ""
419msgstr ""
422
420
423−#: qml/Tutorial/TutorialBottom.qml:28
421+#: qml/Stages/SideStage.qml:76
424−msgid "Open special menus"
422+msgid "Drag using 3 fingers any application from one window to the other"
425msgstr ""
423msgstr ""
426
424
427−#: qml/Tutorial/TutorialBottom.qml:29
425+#: qml/Tutorial/TutorialBottom.qml:78
428−msgid "Swipe up from the bottom edge."
426+msgid "Swipe up to add a contact"
429msgstr ""
427msgstr ""
430
428
431−#: qml/Tutorial/TutorialBottomFinish.qml:24
429+#: qml/Tutorial/TutorialBottom.qml:80
432−msgid "This action does different things for different apps"
430+msgid "Swipe up for favorite calculations"
433msgstr ""
431msgstr ""
434
432
435−#: qml/Tutorial/TutorialBottomFinish.qml:25
433+#: qml/Tutorial/TutorialBottom.qml:82
436−msgid "Tap here to finish."
434+msgid "Swipe up for recent calls"
437msgstr ""
435msgstr ""
438
436
439−#: qml/Tutorial/TutorialContent.qml:80 qml/Tutorial/TutorialLeftFinish.qml:25
437+#: qml/Tutorial/TutorialBottom.qml:84
440−#: qml/Tutorial/TutorialRight.qml:144
438+msgid "Swipe up to create a message"
441−msgid "Tap here to continue."
442msgstr ""
439msgstr ""
443
440
444−#: qml/Tutorial/TutorialLeft.qml:26
441+#: qml/Tutorial/TutorialBottom.qml:85
445−msgid "Open the launcher"
442+msgid "Swipe up to manage the app"
446msgstr ""
443msgstr ""
447
444
448−#: qml/Tutorial/TutorialLeft.qml:27
445+#: qml/Tutorial/TutorialLeft.qml:47
449−msgid "Short swipe from the left edge."
446+msgid "Swipe from the left edge to open the launcher"
450msgstr ""
447msgstr ""
451
448
452−#: qml/Tutorial/TutorialLeftFinish.qml:24
449+#: qml/Tutorial/TutorialLeftLong.qml:47
453−msgid "These are the shortcuts to favorite apps"
450+msgid "Long swipe from the left edge to open the Today scope"
454msgstr ""
451msgstr ""
455
452
456−#: qml/Tutorial/TutorialPage.qml:178
453+#: qml/Tutorial/TutorialRight.qml:54
457−msgid "You almost got it!"
454+msgid "Hover your mouse on the right edge to view your open apps"
458msgstr ""
455msgstr ""
459
456
460−#: qml/Tutorial/TutorialPage.qml:195
457+#: qml/Tutorial/TutorialRight.qml:55
461−msgid "Try again."
458+msgid "Short or long swipe from the right edge to view your open apps"
462msgstr ""
459msgstr ""
463
460
464−#: qml/Tutorial/TutorialRight.qml:31
461+#: qml/Tutorial/TutorialTop.qml:53
465−msgid "To view open apps"
462+msgid "Swipe from the top right edge to open the notification bar"
466msgstr ""
463msgstr ""
467
464
468−#: qml/Tutorial/TutorialRight.qml:32
465+#: qml/Tutorial/TutorialTop.qml:54
469−msgid "Long swipe from the right edge."
466+msgid "Swipe from the top edge to open the notification bar"
470msgstr ""
467msgstr ""
471
468
472−#: qml/Tutorial/TutorialRight.qml:122
473−msgid "View all your running tasks."
474−msgstr ""
475−
476−#: qml/Wizard/Page.qml:89
469+#: qml/Wizard/Page.qml:54
477msgctxt "Button: Go back one page in the Wizard"
470msgctxt "Button: Go back one page in the Wizard"
478msgid "Back"
471msgid "Back"
479msgstr ""
472msgstr ""
480
473
481#: qml/Wizard/Pages/10-welcome.qml:27
474#: qml/Wizard/Pages/10-welcome.qml:27
482−msgid "Hi!"
475+msgid "Language"
483msgstr ""
476msgstr ""
484
477
485−#: qml/Wizard/Pages/10-welcome.qml:44
478+#: qml/Wizard/Pages/10-welcome.qml:156 qml/Wizard/Pages/30-wifi.qml:206
486−msgid "Welcome to your Ubuntu device."
479+#: qml/Wizard/Pages/40-location.qml:271 qml/Wizard/Pages/50-timezone.qml:267
480+#: qml/Wizard/Pages/60-account.qml:65 qml/Wizard/Pages/70-passwd-type.qml:144
481+#: qml/Wizard/Pages/75-report-check.qml:84
482+#: qml/Wizard/Pages/passcode-desktop.qml:124
483+#: qml/Wizard/Pages/password-set.qml:141
484+msgid "Next"
487msgstr ""
485msgstr ""
488
486
489−#: qml/Wizard/Pages/10-welcome.qml:52
487+#: qml/Wizard/Pages/30-wifi.qml:29
490−msgid "Let’s get started."
488+msgid "Connect to Wi‑Fi"
491msgstr ""
489msgstr ""
492
490
493−#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:133
491+#: qml/Wizard/Pages/30-wifi.qml:130
494−#: qml/Wizard/Pages/40-wifi.qml:215 qml/Wizard/Pages/50-location.qml:131
492+msgid "Connected"
495−#: qml/Wizard/Pages/60-reporting.qml:60 qml/Wizard/Pages/passwd-confirm.qml:82
496−#: qml/Wizard/Pages/passwd-set.qml:90
497−msgid "Continue"
498msgstr ""
493msgstr ""
499
494
500−#: qml/Wizard/Pages/20-sim.qml:25
495+#: qml/Wizard/Pages/30-wifi.qml:163
501−msgid "Add a SIM card and restart your device"
496+msgid "Available Wi-Fi networks"
502msgstr ""
497msgstr ""
503
498
504−#: qml/Wizard/Pages/20-sim.qml:59
499+#: qml/Wizard/Pages/30-wifi.qml:164
505−msgid "Without it, you won’t be able to make calls or use text messaging."
500+msgid "No available Wi-Fi networks"
506msgstr ""
501msgstr ""
507
502
508−#: qml/Wizard/Pages/20-sim.qml:73 qml/Wizard/Pages/40-wifi.qml:215
503+#: qml/Wizard/Pages/30-wifi.qml:206 qml/Wizard/Pages/60-account.qml:65
504+#: qml/Wizard/Pages/sim.qml:101
509msgid "Skip"
505msgid "Skip"
510msgstr ""
506msgstr ""
511
507
512−#: qml/Wizard/Pages/30-passwd-type.qml:39
508+#: qml/Wizard/Pages/40-location.qml:27
513−msgid "Lock security"
509+msgid "Location Services"
514msgstr ""
510msgstr ""
515
511
516−#: qml/Wizard/Pages/30-passwd-type.qml:79
512+#: qml/Wizard/Pages/40-location.qml:83
517−msgid "Please select how you’d like to unlock your device."
513+msgid ""
514+"Use GPS, Wi-Fi hotspots and mobile network anonymously to detect location "
515+"(recommended)"
518msgstr ""
516msgstr ""
519
517
520−#: qml/Wizard/Pages/30-passwd-type.qml:102
518+#: qml/Wizard/Pages/40-location.qml:105
521−msgctxt "Label: Type of security method"
519+#, qt-format
522−msgid "Swipe"
520+msgid "By selecting this option you agree to the Nokia HERE %1."
521+msgstr ""
522+
523+#: qml/Wizard/Pages/40-location.qml:106
524+msgctxt "part of: Nokia HERE terms and conditions"
525+msgid "terms and conditions"
526+msgstr ""
527+
528+#: qml/Wizard/Pages/40-location.qml:160
529+msgid "GPS only"
530+msgstr ""
531+
532+#: qml/Wizard/Pages/40-location.qml:214
533+msgid "Don't use my location"
534+msgstr ""
535+
536+#: qml/Wizard/Pages/40-location.qml:260
537+msgid "You can change it later in System Settings."
538+msgstr ""
539+
540+#: qml/Wizard/Pages/50-timezone.qml:29
541+msgid "Time Zone"
542+msgstr ""
543+
544+#: qml/Wizard/Pages/50-timezone.qml:178
545+msgid "Enter your city"
523msgstr ""
546msgstr ""
524
547
525−#: qml/Wizard/Pages/30-passwd-type.qml:103
548+#: qml/Wizard/Pages/60-account.qml:24
526−msgctxt "Label: Description of security method"
549+msgid "Personalize Your Device"
527−msgid "No security"
528msgstr ""
550msgstr ""
529
551
530−#: qml/Wizard/Pages/30-passwd-type.qml:105
552+#: qml/Wizard/Pages/60-account.qml:48
553+msgid "Preferred Name"
554+msgstr ""
555+
556+#: qml/Wizard/Pages/70-passwd-type.qml:39
557+msgid "Lock Screen"
558+msgstr ""
559+
560+#: qml/Wizard/Pages/70-passwd-type.qml:101
531msgctxt "Label: Type of security method"
561msgctxt "Label: Type of security method"
532−msgid "Passcode"
562+msgid "Create new password"
533msgstr ""
563msgstr ""
534
564
535−#: qml/Wizard/Pages/30-passwd-type.qml:106
565+#: qml/Wizard/Pages/70-passwd-type.qml:103
536−msgctxt "Label: Description of security method"
566+msgctxt "Label: Type of security method"
537−msgid "4 digits only"
567+msgid "Create passcode (numbers only)"
538msgstr ""
568msgstr ""
539
569
540−#: qml/Wizard/Pages/30-passwd-type.qml:108
570+#: qml/Wizard/Pages/70-passwd-type.qml:105
541msgctxt "Label: Type of security method"
571msgctxt "Label: Type of security method"
542−msgid "Passphrase"
572+msgid "No lock code"
543msgstr ""
573msgstr ""
544
574
545−#: qml/Wizard/Pages/30-passwd-type.qml:109
575+#: qml/Wizard/Pages/75-report-check.qml:26 qml/Wizard/Pages/here-terms.qml:108
546−msgctxt "Label: Description of security method"
576+msgid "Privacy Policy"
547−msgid "Numbers and letters"
548msgstr ""
577msgstr ""
549
578
550−#: qml/Wizard/Pages/40-wifi.qml:29
579+#: qml/Wizard/Pages/75-report-check.qml:26
551−msgid "Connect to Wi‑Fi"
580+msgid "Help Us Improve"
552msgstr ""
581msgstr ""
553
582
554−#: qml/Wizard/Pages/40-wifi.qml:168
583+#: qml/Wizard/Pages/75-report-check.qml:59
555−msgid "Available networks…"
584+msgid "Improve system performance by sending us crashes and error reports."
556msgstr ""
585msgstr ""
557
586
558−#: qml/Wizard/Pages/40-wifi.qml:169
587+#: qml/Wizard/Pages/75-report-check.qml:60
559−msgid "No available networks."
588+msgid "Privacy policy"
560msgstr ""
589msgstr ""
561
590
562−#: qml/Wizard/Pages/50-location.qml:27
591+#: qml/Wizard/Pages/80-finished.qml:89
563−msgid "Location"
592+msgid "Welcome to Ubuntu"
564msgstr ""
593msgstr ""
565
594
566−#: qml/Wizard/Pages/50-location.qml:62
595+#: qml/Wizard/Pages/80-finished.qml:104
567−msgid "Let the phone detect your location:"
596+msgid "You are ready to use your device now"
597+msgstr ""
598+
599+#: qml/Wizard/Pages/80-finished.qml:124
600+msgid "Get Started"
601+msgstr ""
602+
603+#: qml/Wizard/Pages/here-terms.qml:25
604+msgid "Terms & Conditions"
568msgstr ""
605msgstr ""
569
606
570−#: qml/Wizard/Pages/50-location.qml:69
607+#: qml/Wizard/Pages/here-terms.qml:69
571−msgid "Using GPS only (less accurate)"
608+msgid "Your device uses positioning technologies provided by HERE."
572msgstr ""
609msgstr ""
573
610
574−#: qml/Wizard/Pages/50-location.qml:86
611+#: qml/Wizard/Pages/here-terms.qml:81
575−msgid "Using GPS, anonymized Wi-Fi and cellular network info (recommended)"
612+msgid ""
613+"To provide you with positioning services and to improve their quality, HERE "
614+"collects information about nearby cell towers and Wi-Fi hotspots around your "
615+"current location whenever your position is being found."
576msgstr ""
616msgstr ""
577
617
578−#. Translators: HERE is a trademark for Nokia's location service, you probably shouldn't translate it
579−#: qml/Wizard/Pages/50-location.qml:103
618+#: qml/Wizard/Pages/here-terms.qml:93
580msgid ""
619msgid ""
581−"By selecting this option you agree to the Nokia HERE <a href='#'>terms and "
620+"The information collected is used to analyze the service and to improve the "
582−"conditions</a>."
621+"use of service, but not to identify you personally."
583msgstr ""
622msgstr ""
584
623
585−#: qml/Wizard/Pages/50-location.qml:112
624+#: qml/Wizard/Pages/here-terms.qml:106
586−msgid "Not at all"
625+#, qt-format
626+msgid "By continuing, you agree to the HERE platform %1 and %2."
587msgstr ""
627msgstr ""
588
628
589−#: qml/Wizard/Pages/50-location.qml:124
629+#: qml/Wizard/Pages/here-terms.qml:107
590−msgid "You can change your mind later in <b>System Settings</b>."
630+msgid "Service Terms"
591msgstr ""
631msgstr ""
592
632
593−#: qml/Wizard/Pages/60-reporting.qml:26
633+#: qml/Wizard/Pages/passcode-confirm.qml:43
594−msgid "Improving your experience"
634+#: qml/Wizard/Pages/passcode-desktop.qml:80
635+msgid "Confirm passcode"
595msgstr ""
636msgstr ""
596
637
597−#: qml/Wizard/Pages/60-reporting.qml:46
638+#: qml/Wizard/Pages/passcode-confirm.qml:45
598−msgid ""
639+msgid "Incorrect passcode."
599−"Your phone is set up to automatically report errors to Canonical and its "
600−"partners, the makers of the operating system."
601msgstr ""
640msgstr ""
602
641
603−#: qml/Wizard/Pages/60-reporting.qml:53
642+#: qml/Wizard/Pages/passcode-confirm.qml:45
643+msgctxt "Enter the passcode again"
604−msgid ""
644+msgid "Please re-enter."
605−"This can be disabled in <b>System Settings</b> under <b>Security &amp; "
606−"Privacy</b>"
607msgstr ""
645msgstr ""
608
646
609−#: qml/Wizard/Pages/80-finished.qml:24
647+#: qml/Wizard/Pages/passcode-desktop.qml:30
610−msgid "All done"
648+msgid "Lock Screen Passcode"
611msgstr ""
649msgstr ""
612
650
613−#: qml/Wizard/Pages/80-finished.qml:39
651+#: qml/Wizard/Pages/passcode-desktop.qml:56
614−msgid "Nice work!"
652+msgid "Enter 4 numbers to setup your passcode"
615msgstr ""
653msgstr ""
616
654
617−#: qml/Wizard/Pages/80-finished.qml:46
655+#: qml/Wizard/Pages/passcode-desktop.qml:65
618−msgid "Your device is now ready to use."
656+#: qml/Wizard/Pages/passcode-set.qml:54
657+msgid "Choose passcode"
619msgstr ""
658msgstr ""
620
659
621−#: qml/Wizard/Pages/80-finished.qml:53
660+#: qml/Wizard/Pages/passcode-desktop.qml:105
622−msgid "Finish"
661+msgid "Passcode too short"
623msgstr ""
662msgstr ""
624
663
625−#: qml/Wizard/Pages/here-terms.qml:27
664+#: qml/Wizard/Pages/passcode-desktop.qml:107
626−msgid "Terms & Conditions"
665+msgid "Passcodes match"
627msgstr ""
666msgstr ""
628
667
629−#: qml/Wizard/Pages/passwd-confirm.qml:49
668+#: qml/Wizard/Pages/passcode-desktop.qml:109
630−msgid "Confirm passphrase"
669+msgid "Passcodes do not match"
631msgstr ""
670msgstr ""
632
671
633−#: qml/Wizard/Pages/passwd-confirm.qml:50
672+#: qml/Wizard/Pages/passcode-set.qml:62
634−msgid "Confirm passcode"
673+msgid "Passcode must be 4 characters long"
635msgstr ""
674msgstr ""
636
675
637−#: qml/Wizard/Pages/passwd-confirm.qml:53
676+#: qml/Wizard/Pages/password-set.qml:30
638−#: qml/Wizard/Pages/passwd-confirm.qml:54
677+msgid "Lock Screen Password"
639−msgid "Please try again."
640msgstr ""
678msgstr ""
641
679
642−#: qml/Wizard/Pages/passwd-set.qml:61
680+#: qml/Wizard/Pages/password-set.qml:61
643−msgid "Choose your passcode"
681+msgid "Enter at least 8 characters"
644msgstr ""
682msgstr ""
645
683
646−#: qml/Wizard/Pages/passwd-set.qml:68
684+#: qml/Wizard/Pages/password-set.qml:73
647−msgid "Passphrase must be 4 characters long"
685+msgid "Choose password"
648msgstr ""
686msgstr ""
649
687
650−#. Translators: This is the arrow for "Back" buttons
688+#: qml/Wizard/Pages/password-set.qml:103
651−#: qml/Wizard/StackButton.qml:39
689+msgid "Confirm password"
652−#, qt-format
653−msgid "〈 %1"
654msgstr ""
690msgstr ""
655
691
656−#. Translators: This is the arrow for "Forward" buttons
692+#: qml/Wizard/Pages/sim.qml:27
693+msgid "No SIM card installed"
694+msgstr ""
695+
696+#: qml/Wizard/Pages/sim.qml:54
697+msgid "SIM card added"
698+msgstr ""
699+
700+#: qml/Wizard/Pages/sim.qml:55
701+msgid "You must restart the device to access the mobile network."
702+msgstr ""
703+
704+#: qml/Wizard/Pages/sim.qml:59
705+msgid "Restart"
706+msgstr ""
707+
708+#: qml/Wizard/Pages/sim.qml:78
709+msgid "You won’t be able to make calls or use text messaging without a SIM."
710+msgstr ""
711+
712+#: qml/Wizard/Pages/sim.qml:90
713+msgid "To proceed with no SIM tap Skip."
714+msgstr ""
715+
716+#: qml/Wizard/PasswordMeter.qml:87
717+msgid "Passwords match"
718+msgstr ""
719+
657−#: qml/Wizard/StackButton.qml:42
720+#: qml/Wizard/PasswordMeter.qml:89
658−#, qt-format
721+msgid "Passwords do not match"
722+msgstr ""
723+
724+#: qml/Wizard/PasswordMeter.qml:93
725+msgid "Strong password"
726+msgstr ""
727+
728+#: qml/Wizard/PasswordMeter.qml:95
729+msgid "Fair password"
730+msgstr ""
731+
732+#: qml/Wizard/PasswordMeter.qml:97
659−msgid "%1 〉"
733+msgid "Weak password"
734+msgstr ""
735+
736+#: qml/Wizard/PasswordMeter.qml:99
737+msgid "Very weak password"
660msgstr ""
738msgstr ""
661
739
662#~ msgid "Confirm"
740#~ msgid "Confirm"
po/bn.po+339−198
@@ -7,7 +7,7 @@ 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: 2016-03-10 22:48+0000\n"
10+"POT-Creation-Date: 2016-03-23 10:01+0000\n"
11"PO-Revision-Date: 2015-11-27 19:38+0000\n"
11"PO-Revision-Date: 2015-11-27 19:38+0000\n"
12"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
12"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
13"Language-Team: Bengali <bn@li.org>\n"
13"Language-Team: Bengali <bn@li.org>\n"
@@ -15,8 +15,8 @@ msgstr ""
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"Plural-Forms: nplurals=2; plural=n != 1;\n"
18−"X-Launchpad-Export-Date: 2016-03-13 05:50+0000\n"
18+"X-Launchpad-Export-Date: 2016-03-24 06:07+0000\n"
19−"X-Generator: Launchpad (build 17939)\n"
19+"X-Generator: Launchpad (build 17958)\n"
20
20
21#: plugins/IntegratedLightDM/Greeter.cpp:112
21#: plugins/IntegratedLightDM/Greeter.cpp:112
22msgid "Password: "
22msgid "Password: "
@@ -73,53 +73,35 @@ msgctxt "Button: Log out from the system"
73msgid "Log Out"
73msgid "Log Out"
74msgstr ""
74msgstr ""
75
75
76−#: qml/Components/Dialogs.qml:161 qml/Components/Dialogs.qml:194
76+#: qml/Components/Dialogs.qml:161 qml/Components/Dialogs.qml:219
77−#: qml/Components/Dialogs.qml:253
77+#: qml/Dash/DashPageHeader.qml:298 qml/Wizard/Pages/passcode-confirm.qml:32
78+#: qml/Wizard/Pages/passcode-set.qml:32
78msgid "Cancel"
79msgid "Cancel"
79msgstr "বাতিল"
80msgstr "বাতিল"
80
81
81#: qml/Components/Dialogs.qml:173
82#: qml/Components/Dialogs.qml:173
82−msgctxt "Title: Reboot/Shut down dialog"
83−msgid "Shut down"
84−msgstr "বন্ধ করুন"
85−
86−#: qml/Components/Dialogs.qml:174
87−msgid "Are you sure you want to shut down?"
88−msgstr "আপনি কি কম্পিউটার বন্ধ করতে চান?"
89−
90−#: qml/Components/Dialogs.qml:176
91−msgctxt "Button: Reboot the system"
92−msgid "Reboot"
93−msgstr "পুনরায় চালু করুন"
94−
95−#: qml/Components/Dialogs.qml:185
96−msgctxt "Button: Shut down the system"
97−msgid "Shut down"
98−msgstr "বন্ধ করুন"
99−
100−#: qml/Components/Dialogs.qml:207
101msgctxt "Title: Reboot dialog"
83msgctxt "Title: Reboot dialog"
102msgid "Reboot"
84msgid "Reboot"
103msgstr "পুনরায় চালু"
85msgstr "পুনরায় চালু"
104
86
105−#: qml/Components/Dialogs.qml:208
87+#: qml/Components/Dialogs.qml:174
106msgid "Are you sure you want to reboot?"
88msgid "Are you sure you want to reboot?"
107msgstr "আপনি কি পুনরায় চালু করতে চান?"
89msgstr "আপনি কি পুনরায় চালু করতে চান?"
108
90
109−#: qml/Components/Dialogs.qml:210
91+#: qml/Components/Dialogs.qml:176
110msgid "No"
92msgid "No"
111msgstr "না"
93msgstr "না"
112
94
113−#: qml/Components/Dialogs.qml:217
95+#: qml/Components/Dialogs.qml:183
114msgid "Yes"
96msgid "Yes"
115msgstr "হ্যাঁ"
97msgstr "হ্যাঁ"
116
98
117−#: qml/Components/Dialogs.qml:232
99+#: qml/Components/Dialogs.qml:198
118msgctxt "Title: Power off/Restart dialog"
100msgctxt "Title: Power off/Restart dialog"
119msgid "Power"
101msgid "Power"
120msgstr ""
102msgstr ""
121
103
122−#: qml/Components/Dialogs.qml:233
104+#: qml/Components/Dialogs.qml:199
123msgid ""
105msgid ""
124"Are you sure you would like\n"
106"Are you sure you would like\n"
125"to power off?"
107"to power off?"
@@ -127,12 +109,12 @@ msgstr ""
127"আপনি নিশ্চিত যে আপনি\n"
109"আপনি নিশ্চিত যে আপনি\n"
128"বন্ধ করতে চান?"
110"বন্ধ করতে চান?"
129
111
130−#: qml/Components/Dialogs.qml:235
112+#: qml/Components/Dialogs.qml:201
131msgctxt "Button: Power off the system"
113msgctxt "Button: Power off the system"
132msgid "Power off"
114msgid "Power off"
133msgstr "বন্ধ করুন"
115msgstr "বন্ধ করুন"
134
116
135−#: qml/Components/Dialogs.qml:244
117+#: qml/Components/Dialogs.qml:210
136msgctxt "Button: Restart the system"
118msgctxt "Button: Restart the system"
137msgid "Restart"
119msgid "Restart"
138msgstr "পুনরায় চালু"
120msgstr "পুনরায় চালু"
@@ -175,42 +157,58 @@ msgstr ""
175msgid "Close all"
157msgid "Close all"
176msgstr ""
158msgstr ""
177
159
178−#: qml/Dash/DashPageHeader.qml:270
160+#: qml/Dash/DashPageHeader.qml:337
179msgctxt "Button: Open the Ubuntu Store"
161msgctxt "Button: Open the Ubuntu Store"
180msgid "Store"
162msgid "Store"
181msgstr "স্টোর"
163msgstr "স্টোর"
182
164
183−#: qml/Dash/DashPageHeader.qml:277
165+#: qml/Dash/DashPageHeader.qml:344
184msgctxt "Button: Start a search in the current dash scope"
166msgctxt "Button: Start a search in the current dash scope"
185msgid "Search"
167msgid "Search"
186msgstr "খুঁজুন"
168msgstr "খুঁজুন"
187
169
188−#: qml/Dash/DashPageHeader.qml:287
170+#: qml/Dash/DashPageHeader.qml:354
189msgctxt "Button: Show the current dash scope settings"
171msgctxt "Button: Show the current dash scope settings"
190msgid "Settings"
172msgid "Settings"
191msgstr "সেটিংস"
173msgstr "সেটিংস"
192
174
193−#: qml/Dash/DashPageHeader.qml:294
175+#: qml/Dash/DashPageHeader.qml:361
194msgid "Remove from Favorites"
176msgid "Remove from Favorites"
195msgstr "পছন্দ থেকে মুছে ফেলুন"
177msgstr "পছন্দ থেকে মুছে ফেলুন"
196
178
197−#: qml/Dash/DashPageHeader.qml:294
179+#: qml/Dash/DashPageHeader.qml:361
198msgid "Add to Favorites"
180msgid "Add to Favorites"
199msgstr "পছন্দতে যোগ করুন"
181msgstr "পছন্দতে যোগ করুন"
200
182
183+#: qml/Dash/FiltersPopover.qml:60
184+msgid "Refine your results"
185+msgstr ""
186+
187+#: qml/Dash/FiltersPopover.qml:69
188+msgid "Reset"
189+msgstr ""
190+
201−#: qml/Dash/GenericScopeView.qml:567 qml/Dash/GenericScopeView.qml:725
191+#: qml/Dash/GenericScopeView.qml:570 qml/Dash/GenericScopeView.qml:755
202msgid "See less"
192msgid "See less"
203msgstr "কম দেখুন"
193msgstr "কম দেখুন"
204
194
205−#: qml/Dash/GenericScopeView.qml:567
195+#: qml/Dash/GenericScopeView.qml:570
206msgid "See all"
196msgid "See all"
207msgstr "সব দেখুন"
197msgstr "সব দেখুন"
208
198
209−#: qml/Dash/GenericScopeView.qml:629
199+#: qml/Dash/GenericScopeView.qml:627
210msgctxt "Label: Hint for dash search line edit"
200msgctxt "Label: Hint for dash search line edit"
211msgid "Search"
201msgid "Search"
212msgstr "খুঁজুন"
202msgstr "খুঁজুন"
213
203
204+#: qml/Dash/PageHeaderExtraPanel.qml:55
205+msgid "Recent Searches"
206+msgstr ""
207+
208+#: qml/Dash/PageHeaderExtraPanel.qml:66
209+msgid "Clear All"
210+msgstr ""
211+
214#: qml/Dash/Previews/PreviewActionCombo.qml:35
212#: qml/Dash/Previews/PreviewActionCombo.qml:35
215msgid "More..."
213msgid "More..."
216msgstr "আরো..."
214msgstr "আরো..."
@@ -278,11 +276,11 @@ msgstr ""
278msgid "Tap to unlock"
276msgid "Tap to unlock"
279msgstr "লক খোলার জন্য চাপ দিন"
277msgstr "লক খোলার জন্য চাপ দিন"
280
278
281−#: qml/Greeter/NarrowView.qml:54 qml/Wizard/Pages/passwd-confirm.qml:53
279+#: qml/Greeter/NarrowView.qml:54
282msgid "Sorry, incorrect passphrase."
280msgid "Sorry, incorrect passphrase."
283msgstr "দুঃখিত, পাসওয়ার্ডটি ভুল হয়েছে।"
281msgstr "দুঃখিত, পাসওয়ার্ডটি ভুল হয়েছে।"
284
282
285−#: qml/Greeter/NarrowView.qml:55 qml/Wizard/Pages/passwd-confirm.qml:54
283+#: qml/Greeter/NarrowView.qml:55
286msgid "Sorry, incorrect passcode."
284msgid "Sorry, incorrect passcode."
287msgstr "দুঃখিত, পাসকোডটি ভুল হয়েছে।"
285msgstr "দুঃখিত, পাসকোডটি ভুল হয়েছে।"
288
286
@@ -308,7 +306,7 @@ msgstr "ভুল পাসকোড প্রদান করলে, আপন
308msgid "Enter %1"
306msgid "Enter %1"
309msgstr "%1 লিখুন"
307msgstr "%1 লিখুন"
310
308
311−#: qml/Greeter/NarrowView.qml:117 qml/Wizard/Pages/passwd-set.qml:60
309+#: qml/Greeter/NarrowView.qml:117
312msgid "Enter passphrase"
310msgid "Enter passphrase"
313msgstr "পাসওয়ার্ড লিখুন"
311msgstr "পাসওয়ার্ড লিখুন"
314
312
@@ -346,62 +344,62 @@ msgstr "কলে ফিরে যেতে চাপ দিন..."
346msgid "Conference"
344msgid "Conference"
347msgstr "কনফারেন্স"
345msgstr "কনফারেন্স"
348
346
349−#: qml/Panel/Indicators/MenuItemFactory.qml:752
347+#: qml/Panel/Indicators/MenuItemFactory.qml:761
350msgid "Nothing is playing"
348msgid "Nothing is playing"
351msgstr "কোন কিছু বাজছে না।"
349msgstr "কোন কিছু বাজছে না।"
352
350
353−#: qml/Panel/Indicators/MenuItemFactory.qml:881
351+#: qml/Panel/Indicators/MenuItemFactory.qml:890
354#, qt-format
352#, qt-format
355msgid "%1 hour"
353msgid "%1 hour"
356msgid_plural "%1 hours"
354msgid_plural "%1 hours"
357msgstr[0] "%1 ঘণ্টা"
355msgstr[0] "%1 ঘণ্টা"
358msgstr[1] "%1 ঘণ্টা"
356msgstr[1] "%1 ঘণ্টা"
359
357
360−#: qml/Panel/Indicators/MenuItemFactory.qml:885
358+#: qml/Panel/Indicators/MenuItemFactory.qml:894
361#, qt-format
359#, qt-format
362msgid "%1 minute"
360msgid "%1 minute"
363msgid_plural "%1 minutes"
361msgid_plural "%1 minutes"
364msgstr[0] "%1 মিনিট"
362msgstr[0] "%1 মিনিট"
365msgstr[1] "%1 মিনিট"
363msgstr[1] "%1 মিনিট"
366
364
367−#: qml/Panel/Indicators/MenuItemFactory.qml:890
365+#: qml/Panel/Indicators/MenuItemFactory.qml:899
368#, qt-format
366#, qt-format
369msgid "%1 second"
367msgid "%1 second"
370msgid_plural "%1 seconds"
368msgid_plural "%1 seconds"
371msgstr[0] "%1 সেকেন্ড"
369msgstr[0] "%1 সেকেন্ড"
372msgstr[1] "%1 সেকেন্ড"
370msgstr[1] "%1 সেকেন্ড"
373
371
374−#: qml/Panel/Indicators/MenuItemFactory.qml:893
372+#: qml/Panel/Indicators/MenuItemFactory.qml:902
375msgid "0 seconds"
373msgid "0 seconds"
376msgstr "0 সেকেন্ড"
374msgstr "0 সেকেন্ড"
377
375
378#. Translators: String like "1 hour, 2 minutes, 3 seconds remaining"
376#. Translators: String like "1 hour, 2 minutes, 3 seconds remaining"
379−#: qml/Panel/Indicators/MenuItemFactory.qml:895
377+#: qml/Panel/Indicators/MenuItemFactory.qml:904
380#, qt-format
378#, qt-format
381msgid "%1 remaining"
379msgid "%1 remaining"
382msgstr "%1 বাকি"
380msgstr "%1 বাকি"
383
381
384−#: qml/Panel/Indicators/MenuItemFactory.qml:901
382+#: qml/Panel/Indicators/MenuItemFactory.qml:910
385msgid "In queue…"
383msgid "In queue…"
386msgstr "অপেক্ষায় রয়েছে..."
384msgstr "অপেক্ষায় রয়েছে..."
387
385
388−#: qml/Panel/Indicators/MenuItemFactory.qml:905
386+#: qml/Panel/Indicators/MenuItemFactory.qml:914
389msgid "Downloading"
387msgid "Downloading"
390msgstr "ডাউনলোড হচ্ছে"
388msgstr "ডাউনলোড হচ্ছে"
391
389
392−#: qml/Panel/Indicators/MenuItemFactory.qml:907
390+#: qml/Panel/Indicators/MenuItemFactory.qml:916
393msgid "Paused, tap to resume"
391msgid "Paused, tap to resume"
394msgstr "থামানো, শুরু করতে চাপ দিন"
392msgstr "থামানো, শুরু করতে চাপ দিন"
395
393
396−#: qml/Panel/Indicators/MenuItemFactory.qml:909
394+#: qml/Panel/Indicators/MenuItemFactory.qml:918
397msgid "Canceled"
395msgid "Canceled"
398msgstr "বাতিল হয়েছে"
396msgstr "বাতিল হয়েছে"
399
397
400−#: qml/Panel/Indicators/MenuItemFactory.qml:911
398+#: qml/Panel/Indicators/MenuItemFactory.qml:920
401msgid "Finished"
399msgid "Finished"
402msgstr "শেষ"
400msgstr "শেষ"
403
401
404−#: qml/Panel/Indicators/MenuItemFactory.qml:913
402+#: qml/Panel/Indicators/MenuItemFactory.qml:922
405msgid "Failed, tap to retry"
403msgid "Failed, tap to retry"
406msgstr "ব্যার্থ হয়েছে, পুনরায় চেষ্টা করতে চাপ দিন"
404msgstr "ব্যার্থ হয়েছে, পুনরায় চেষ্টা করতে চাপ দিন"
407
405
@@ -421,251 +419,373 @@ msgctxt "Button: Call back on phone"
421msgid "Call back"
419msgid "Call back"
422msgstr "কল ব্যাক"
420msgstr "কল ব্যাক"
423
421
424−#: qml/Tutorial/TutorialBottom.qml:28
422+#: qml/Stages/SideStage.qml:76
425−msgid "Open special menus"
423+msgid "Drag using 3 fingers any application from one window to the other"
426msgstr ""
424msgstr ""
427
425
428−#: qml/Tutorial/TutorialBottom.qml:29
426+#: qml/Tutorial/TutorialBottom.qml:78
429−msgid "Swipe up from the bottom edge."
427+msgid "Swipe up to add a contact"
430−msgstr "নিচের প্রান্ত হতে উপরের দিকে সোয়াইপ করুন।"
428+msgstr ""
431−
432−#: qml/Tutorial/TutorialBottomFinish.qml:24
433−msgid "This action does different things for different apps"
434−msgstr "এই কাজটি বিভিন্ন অ্যাপের জন্য ভিন্ন ভিন্ন ভাবে কাজ করে।"
435
429
436−#: qml/Tutorial/TutorialBottomFinish.qml:25
430+#: qml/Tutorial/TutorialBottom.qml:80
437−msgid "Tap here to finish."
431+msgid "Swipe up for favorite calculations"
438msgstr ""
432msgstr ""
439
433
440−#: qml/Tutorial/TutorialContent.qml:80 qml/Tutorial/TutorialLeftFinish.qml:25
434+#: qml/Tutorial/TutorialBottom.qml:82
441−#: qml/Tutorial/TutorialRight.qml:144
435+msgid "Swipe up for recent calls"
442−msgid "Tap here to continue."
436+msgstr ""
443−msgstr "অগ্রসর হওয়ার জন্য এখানে চাপ দিন।"
444
437
445−#: qml/Tutorial/TutorialLeft.qml:26
438+#: qml/Tutorial/TutorialBottom.qml:84
446−msgid "Open the launcher"
439+msgid "Swipe up to create a message"
447−msgstr "লঞ্চার খুলুন"
440+msgstr ""
448
441
449−#: qml/Tutorial/TutorialLeft.qml:27
442+#: qml/Tutorial/TutorialBottom.qml:85
450−msgid "Short swipe from the left edge."
443+msgid "Swipe up to manage the app"
451msgstr ""
444msgstr ""
452
445
453−#: qml/Tutorial/TutorialLeftFinish.qml:24
446+#: qml/Tutorial/TutorialLeft.qml:47
454−msgid "These are the shortcuts to favorite apps"
447+msgid "Swipe from the left edge to open the launcher"
455−msgstr "এগুলো আপনার প্রিয় অ্যাপেরর শর্টকাট"
448+msgstr ""
456
449
457−#: qml/Tutorial/TutorialPage.qml:178
450+#: qml/Tutorial/TutorialLeftLong.qml:47
458−msgid "You almost got it!"
451+msgid "Long swipe from the left edge to open the Today scope"
459−msgstr "আপনি প্রায় পেরে গেছেন!"
452+msgstr ""
460
453
461−#: qml/Tutorial/TutorialPage.qml:195
454+#: qml/Tutorial/TutorialRight.qml:54
462−msgid "Try again."
455+msgid "Hover your mouse on the right edge to view your open apps"
463−msgstr "আবার চেষ্টা করুন"
456+msgstr ""
464
457
465−#: qml/Tutorial/TutorialRight.qml:31
458+#: qml/Tutorial/TutorialRight.qml:55
466−msgid "To view open apps"
459+msgid "Short or long swipe from the right edge to view your open apps"
467−msgstr "সচল অ্যাপগুলো দেখার জন্য"
460+msgstr ""
468
461
469−#: qml/Tutorial/TutorialRight.qml:32
462+#: qml/Tutorial/TutorialTop.qml:53
470−msgid "Long swipe from the right edge."
463+msgid "Swipe from the top right edge to open the notification bar"
471msgstr ""
464msgstr ""
472
465
473−#: qml/Tutorial/TutorialRight.qml:122
466+#: qml/Tutorial/TutorialTop.qml:54
474−msgid "View all your running tasks."
467+msgid "Swipe from the top edge to open the notification bar"
475msgstr ""
468msgstr ""
476
469
477−#: qml/Wizard/Page.qml:89
470+#: qml/Wizard/Page.qml:54
478msgctxt "Button: Go back one page in the Wizard"
471msgctxt "Button: Go back one page in the Wizard"
479msgid "Back"
472msgid "Back"
480msgstr ""
473msgstr ""
481
474
482#: qml/Wizard/Pages/10-welcome.qml:27
475#: qml/Wizard/Pages/10-welcome.qml:27
483−msgid "Hi!"
476+msgid "Language"
484msgstr ""
477msgstr ""
485
478
486−#: qml/Wizard/Pages/10-welcome.qml:44
479+#: qml/Wizard/Pages/10-welcome.qml:156 qml/Wizard/Pages/30-wifi.qml:206
487−msgid "Welcome to your Ubuntu device."
480+#: qml/Wizard/Pages/40-location.qml:271 qml/Wizard/Pages/50-timezone.qml:267
481+#: qml/Wizard/Pages/60-account.qml:65 qml/Wizard/Pages/70-passwd-type.qml:144
482+#: qml/Wizard/Pages/75-report-check.qml:84
483+#: qml/Wizard/Pages/passcode-desktop.qml:124
484+#: qml/Wizard/Pages/password-set.qml:141
485+msgid "Next"
488msgstr ""
486msgstr ""
489
487
490−#: qml/Wizard/Pages/10-welcome.qml:52
488+#: qml/Wizard/Pages/30-wifi.qml:29
491−msgid "Let’s get started."
489+msgid "Connect to Wi‑Fi"
492−msgstr "আসুন শুরু করা যাক।"
490+msgstr ""
493
491
494−#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:133
492+#: qml/Wizard/Pages/30-wifi.qml:130
495−#: qml/Wizard/Pages/40-wifi.qml:215 qml/Wizard/Pages/50-location.qml:131
493+msgid "Connected"
496−#: qml/Wizard/Pages/60-reporting.qml:60 qml/Wizard/Pages/passwd-confirm.qml:82
497−#: qml/Wizard/Pages/passwd-set.qml:90
498−msgid "Continue"
499−msgstr "পরবর্তী"
494+msgstr ""
500
495
501−#: qml/Wizard/Pages/20-sim.qml:25
496+#: qml/Wizard/Pages/30-wifi.qml:163
502−msgid "Add a SIM card and restart your device"
497+msgid "Available Wi-Fi networks"
503−msgstr "সিম কার্ড যোগ করুন এবং ফোন পুনরায় চালু করুন।"
498+msgstr ""
504
499
505−#: qml/Wizard/Pages/20-sim.qml:59
500+#: qml/Wizard/Pages/30-wifi.qml:164
506−msgid "Without it, you won’t be able to make calls or use text messaging."
501+msgid "No available Wi-Fi networks"
507−msgstr "এটি ছাড়া, আপনি ফোন কল বা টেক্সট মেসেজ ব্যবহার করতে পারবেন না।"
502+msgstr ""
508
503
509−#: qml/Wizard/Pages/20-sim.qml:73 qml/Wizard/Pages/40-wifi.qml:215
504+#: qml/Wizard/Pages/30-wifi.qml:206 qml/Wizard/Pages/60-account.qml:65
505+#: qml/Wizard/Pages/sim.qml:101
510msgid "Skip"
506msgid "Skip"
511msgstr "এড়িয়ে যান"
507msgstr "এড়িয়ে যান"
512
508
513−#: qml/Wizard/Pages/30-passwd-type.qml:39
509+#: qml/Wizard/Pages/40-location.qml:27
514−msgid "Lock security"
510+msgid "Location Services"
515−msgstr "নিরাপত্তা লক"
511+msgstr ""
516
512
517−#: qml/Wizard/Pages/30-passwd-type.qml:79
513+#: qml/Wizard/Pages/40-location.qml:83
518−msgid "Please select how you’d like to unlock your device."
514+msgid ""
515+"Use GPS, Wi-Fi hotspots and mobile network anonymously to detect location "
516+"(recommended)"
519msgstr ""
517msgstr ""
520
518
521−#: qml/Wizard/Pages/30-passwd-type.qml:102
519+#: qml/Wizard/Pages/40-location.qml:105
522−msgctxt "Label: Type of security method"
520+#, qt-format
523−msgid "Swipe"
521+msgid "By selecting this option you agree to the Nokia HERE %1."
524msgstr ""
522msgstr ""
525
523
526−#: qml/Wizard/Pages/30-passwd-type.qml:103
524+#: qml/Wizard/Pages/40-location.qml:106
527−msgctxt "Label: Description of security method"
525+msgctxt "part of: Nokia HERE terms and conditions"
528−msgid "No security"
526+msgid "terms and conditions"
529−msgstr "কোন নিরাপত্তা নেই"
527+msgstr ""
528+
529+#: qml/Wizard/Pages/40-location.qml:160
530+msgid "GPS only"
531+msgstr ""
532+
533+#: qml/Wizard/Pages/40-location.qml:214
534+msgid "Don't use my location"
535+msgstr ""
536+
537+#: qml/Wizard/Pages/40-location.qml:260
538+msgid "You can change it later in System Settings."
539+msgstr ""
530
540
531−#: qml/Wizard/Pages/30-passwd-type.qml:105
541+#: qml/Wizard/Pages/50-timezone.qml:29
542+msgid "Time Zone"
543+msgstr ""
544+
545+#: qml/Wizard/Pages/50-timezone.qml:178
546+msgid "Enter your city"
547+msgstr ""
548+
549+#: qml/Wizard/Pages/60-account.qml:24
550+msgid "Personalize Your Device"
551+msgstr ""
552+
553+#: qml/Wizard/Pages/60-account.qml:48
554+msgid "Preferred Name"
555+msgstr ""
556+
557+#: qml/Wizard/Pages/70-passwd-type.qml:39
558+msgid "Lock Screen"
559+msgstr ""
560+
561+#: qml/Wizard/Pages/70-passwd-type.qml:101
532msgctxt "Label: Type of security method"
562msgctxt "Label: Type of security method"
533−msgid "Passcode"
563+msgid "Create new password"
534−msgstr "পাসকোড"
564+msgstr ""
535
565
536−#: qml/Wizard/Pages/30-passwd-type.qml:106
566+#: qml/Wizard/Pages/70-passwd-type.qml:103
537−msgctxt "Label: Description of security method"
567+msgctxt "Label: Type of security method"
538−msgid "4 digits only"
568+msgid "Create passcode (numbers only)"
539−msgstr "কেবল মাত্র ৪টি সংখ্যা"
569+msgstr ""
540
570
541−#: qml/Wizard/Pages/30-passwd-type.qml:108
571+#: qml/Wizard/Pages/70-passwd-type.qml:105
542msgctxt "Label: Type of security method"
572msgctxt "Label: Type of security method"
543−msgid "Passphrase"
573+msgid "No lock code"
544msgstr ""
574msgstr ""
545
575
546−#: qml/Wizard/Pages/30-passwd-type.qml:109
576+#: qml/Wizard/Pages/75-report-check.qml:26 qml/Wizard/Pages/here-terms.qml:108
547−msgctxt "Label: Description of security method"
577+msgid "Privacy Policy"
548−msgid "Numbers and letters"
549msgstr ""
578msgstr ""
550
579
551−#: qml/Wizard/Pages/40-wifi.qml:29
580+#: qml/Wizard/Pages/75-report-check.qml:26
552−msgid "Connect to Wi‑Fi"
581+msgid "Help Us Improve"
553msgstr ""
582msgstr ""
554
583
555−#: qml/Wizard/Pages/40-wifi.qml:168
584+#: qml/Wizard/Pages/75-report-check.qml:59
556−msgid "Available networks…"
585+msgid "Improve system performance by sending us crashes and error reports."
557msgstr ""
586msgstr ""
558
587
559−#: qml/Wizard/Pages/40-wifi.qml:169
588+#: qml/Wizard/Pages/75-report-check.qml:60
560−msgid "No available networks."
589+msgid "Privacy policy"
561msgstr ""
590msgstr ""
562
591
563−#: qml/Wizard/Pages/50-location.qml:27
592+#: qml/Wizard/Pages/80-finished.qml:89
564−msgid "Location"
593+msgid "Welcome to Ubuntu"
565msgstr ""
594msgstr ""
566
595
567−#: qml/Wizard/Pages/50-location.qml:62
596+#: qml/Wizard/Pages/80-finished.qml:104
568−msgid "Let the phone detect your location:"
597+msgid "You are ready to use your device now"
569msgstr ""
598msgstr ""
570
599
571−#: qml/Wizard/Pages/50-location.qml:69
600+#: qml/Wizard/Pages/80-finished.qml:124
572−msgid "Using GPS only (less accurate)"
601+msgid "Get Started"
573msgstr ""
602msgstr ""
574
603
575−#: qml/Wizard/Pages/50-location.qml:86
604+#: qml/Wizard/Pages/here-terms.qml:25
576−msgid "Using GPS, anonymized Wi-Fi and cellular network info (recommended)"
605+msgid "Terms & Conditions"
577msgstr ""
606msgstr ""
578
607
579−#. Translators: HERE is a trademark for Nokia's location service, you probably shouldn't translate it
608+#: qml/Wizard/Pages/here-terms.qml:69
609+msgid "Your device uses positioning technologies provided by HERE."
610+msgstr ""
611+
580−#: qml/Wizard/Pages/50-location.qml:103
612+#: qml/Wizard/Pages/here-terms.qml:81
581msgid ""
613msgid ""
582−"By selecting this option you agree to the Nokia HERE <a href='#'>terms and "
614+"To provide you with positioning services and to improve their quality, HERE "
583−"conditions</a>."
615+"collects information about nearby cell towers and Wi-Fi hotspots around your "
616+"current location whenever your position is being found."
584msgstr ""
617msgstr ""
585
618
586−#: qml/Wizard/Pages/50-location.qml:112
619+#: qml/Wizard/Pages/here-terms.qml:93
587−msgid "Not at all"
620+msgid ""
621+"The information collected is used to analyze the service and to improve the "
622+"use of service, but not to identify you personally."
588msgstr ""
623msgstr ""
589
624
590−#: qml/Wizard/Pages/50-location.qml:124
625+#: qml/Wizard/Pages/here-terms.qml:106
591−msgid "You can change your mind later in <b>System Settings</b>."
626+#, qt-format
627+msgid "By continuing, you agree to the HERE platform %1 and %2."
592msgstr ""
628msgstr ""
593
629
594−#: qml/Wizard/Pages/60-reporting.qml:26
630+#: qml/Wizard/Pages/here-terms.qml:107
595−msgid "Improving your experience"
631+msgid "Service Terms"
596msgstr ""
632msgstr ""
597
633
598−#: qml/Wizard/Pages/60-reporting.qml:46
634+#: qml/Wizard/Pages/passcode-confirm.qml:43
635+#: qml/Wizard/Pages/passcode-desktop.qml:80
599−msgid ""
636+msgid "Confirm passcode"
600−"Your phone is set up to automatically report errors to Canonical and its "
601−"partners, the makers of the operating system."
602msgstr ""
637msgstr ""
603
638
604−#: qml/Wizard/Pages/60-reporting.qml:53
639+#: qml/Wizard/Pages/passcode-confirm.qml:45
605−msgid ""
640+msgid "Incorrect passcode."
606−"This can be disabled in <b>System Settings</b> under <b>Security &amp; "
607−"Privacy</b>"
608msgstr ""
641msgstr ""
609
642
610−#: qml/Wizard/Pages/80-finished.qml:24
643+#: qml/Wizard/Pages/passcode-confirm.qml:45
611−msgid "All done"
644+msgctxt "Enter the passcode again"
645+msgid "Please re-enter."
612msgstr ""
646msgstr ""
613
647
614−#: qml/Wizard/Pages/80-finished.qml:39
648+#: qml/Wizard/Pages/passcode-desktop.qml:30
615−msgid "Nice work!"
649+msgid "Lock Screen Passcode"
616msgstr ""
650msgstr ""
617
651
618−#: qml/Wizard/Pages/80-finished.qml:46
652+#: qml/Wizard/Pages/passcode-desktop.qml:56
619−msgid "Your device is now ready to use."
653+msgid "Enter 4 numbers to setup your passcode"
620msgstr ""
654msgstr ""
621
655
622−#: qml/Wizard/Pages/80-finished.qml:53
656+#: qml/Wizard/Pages/passcode-desktop.qml:65
623−msgid "Finish"
657+#: qml/Wizard/Pages/passcode-set.qml:54
658+msgid "Choose passcode"
624msgstr ""
659msgstr ""
625
660
626−#: qml/Wizard/Pages/here-terms.qml:27
661+#: qml/Wizard/Pages/passcode-desktop.qml:105
627−msgid "Terms & Conditions"
662+msgid "Passcode too short"
628msgstr ""
663msgstr ""
629
664
630−#: qml/Wizard/Pages/passwd-confirm.qml:49
665+#: qml/Wizard/Pages/passcode-desktop.qml:107
631−msgid "Confirm passphrase"
666+msgid "Passcodes match"
632msgstr ""
667msgstr ""
633
668
634−#: qml/Wizard/Pages/passwd-confirm.qml:50
669+#: qml/Wizard/Pages/passcode-desktop.qml:109
635−msgid "Confirm passcode"
670+msgid "Passcodes do not match"
636msgstr ""
671msgstr ""
637
672
638−#: qml/Wizard/Pages/passwd-confirm.qml:53
673+#: qml/Wizard/Pages/passcode-set.qml:62
639−#: qml/Wizard/Pages/passwd-confirm.qml:54
674+msgid "Passcode must be 4 characters long"
640−msgid "Please try again."
641msgstr ""
675msgstr ""
642
676
643−#: qml/Wizard/Pages/passwd-set.qml:61
677+#: qml/Wizard/Pages/password-set.qml:30
644−msgid "Choose your passcode"
678+msgid "Lock Screen Password"
645msgstr ""
679msgstr ""
646
680
647−#: qml/Wizard/Pages/passwd-set.qml:68
681+#: qml/Wizard/Pages/password-set.qml:61
648−msgid "Passphrase must be 4 characters long"
682+msgid "Enter at least 8 characters"
649msgstr ""
683msgstr ""
650
684
651−#. Translators: This is the arrow for "Back" buttons
685+#: qml/Wizard/Pages/password-set.qml:73
652−#: qml/Wizard/StackButton.qml:39
653−#, qt-format
654−msgid "〈 %1"
686+msgid "Choose password"
655msgstr ""
687msgstr ""
656
688
657−#. Translators: This is the arrow for "Forward" buttons
689+#: qml/Wizard/Pages/password-set.qml:103
658−#: qml/Wizard/StackButton.qml:42
690+msgid "Confirm password"
659−#, qt-format
691+msgstr ""
660−msgid "%1 〉"
692+
693+#: qml/Wizard/Pages/sim.qml:27
694+msgid "No SIM card installed"
695+msgstr ""
696+
697+#: qml/Wizard/Pages/sim.qml:54
698+msgid "SIM card added"
699+msgstr ""
700+
701+#: qml/Wizard/Pages/sim.qml:55
702+msgid "You must restart the device to access the mobile network."
703+msgstr ""
704+
705+#: qml/Wizard/Pages/sim.qml:59
706+msgid "Restart"
707+msgstr "পুনরায় চালু"
708+
709+#: qml/Wizard/Pages/sim.qml:78
710+msgid "You won’t be able to make calls or use text messaging without a SIM."
711+msgstr ""
712+
713+#: qml/Wizard/Pages/sim.qml:90
714+msgid "To proceed with no SIM tap Skip."
715+msgstr ""
716+
717+#: qml/Wizard/PasswordMeter.qml:87
718+msgid "Passwords match"
719+msgstr ""
720+
721+#: qml/Wizard/PasswordMeter.qml:89
722+msgid "Passwords do not match"
723+msgstr ""
724+
725+#: qml/Wizard/PasswordMeter.qml:93
726+msgid "Strong password"
727+msgstr ""
728+
729+#: qml/Wizard/PasswordMeter.qml:95
730+msgid "Fair password"
661msgstr ""
731msgstr ""
662
732
733+#: qml/Wizard/PasswordMeter.qml:97
734+msgid "Weak password"
735+msgstr ""
736+
737+#: qml/Wizard/PasswordMeter.qml:99
738+msgid "Very weak password"
739+msgstr ""
740+
741+#~ msgctxt "Button: Reboot the system"
742+#~ msgid "Reboot"
743+#~ msgstr "পুনরায় চালু করুন"
744+
745+#~ msgid "This action does different things for different apps"
746+#~ msgstr "এই কাজটি বিভিন্ন অ্যাপের জন্য ভিন্ন ভিন্ন ভাবে কাজ করে।"
747+
748+#~ msgid "To view open apps"
749+#~ msgstr "সচল অ্যাপগুলো দেখার জন্য"
750+
663#~ msgid "Welcome to your Ubuntu phone."
751#~ msgid "Welcome to your Ubuntu phone."
664#~ msgstr "আপনার উবুন্টু ফোনে স্বাগতম।"
752#~ msgstr "আপনার উবুন্টু ফোনে স্বাগতম।"
665
753
754+#~ msgid "Try again."
755+#~ msgstr "আবার চেষ্টা করুন"
756+
757+#~ msgid "You almost got it!"
758+#~ msgstr "আপনি প্রায় পেরে গেছেন!"
759+
760+#~ msgid "Open the launcher"
761+#~ msgstr "লঞ্চার খুলুন"
762+
763+#~ msgctxt "Label: Type of security method"
764+#~ msgid "Passcode"
765+#~ msgstr "পাসকোড"
766+
767+#~ msgid "Add a SIM card and restart your device"
768+#~ msgstr "সিম কার্ড যোগ করুন এবং ফোন পুনরায় চালু করুন।"
769+
770+#~ msgid "Without it, you won’t be able to make calls or use text messaging."
771+#~ msgstr "এটি ছাড়া, আপনি ফোন কল বা টেক্সট মেসেজ ব্যবহার করতে পারবেন না।"
772+
773+#~ msgid "Tap here to continue."
774+#~ msgstr "অগ্রসর হওয়ার জন্য এখানে চাপ দিন।"
775+
776+#~ msgid "Swipe up from the bottom edge."
777+#~ msgstr "নিচের প্রান্ত হতে উপরের দিকে সোয়াইপ করুন।"
778+
779+#~ msgctxt "Label: Description of security method"
780+#~ msgid "No security"
781+#~ msgstr "কোন নিরাপত্তা নেই"
782+
666#~ msgid "Log out"
783#~ msgid "Log out"
667#~ msgstr "লগ অাউট"
784#~ msgstr "লগ অাউট"
668
785
786+#~ msgid "Are you sure you want to shut down?"
787+#~ msgstr "আপনি কি কম্পিউটার বন্ধ করতে চান?"
788+
669#~ msgid "Reboot"
789#~ msgid "Reboot"
670#~ msgstr "পুনরায় চালু করুন"
790#~ msgstr "পুনরায় চালু করুন"
671
791
@@ -675,9 +795,6 @@ msgstr ""
675#~ msgid "Power off"
795#~ msgid "Power off"
676#~ msgstr "বন্ধ করুন"
796#~ msgstr "বন্ধ করুন"
677
797
678−#~ msgid "Restart"
679−#~ msgstr "পুনরায় চালু"
680−
681#~ msgid "Top edge"
798#~ msgid "Top edge"
682#~ msgstr "উপরের প্রান্ত"
799#~ msgstr "উপরের প্রান্ত"
683
800
@@ -729,5 +846,29 @@ msgstr ""
729#~ msgid "Please re-enter"
846#~ msgid "Please re-enter"
730#~ msgstr "অনুগ্রহ করে আবার লিখুন"
847#~ msgstr "অনুগ্রহ করে আবার লিখুন"
731
848
849+#~ msgctxt "Button: Shut down the system"
850+#~ msgid "Shut down"
851+#~ msgstr "বন্ধ করুন"
852+
853+#~ msgctxt "Title: Reboot/Shut down dialog"
854+#~ msgid "Shut down"
855+#~ msgstr "বন্ধ করুন"
856+
857+#~ msgid "Let’s get started."
858+#~ msgstr "আসুন শুরু করা যাক।"
859+
860+#~ msgid "These are the shortcuts to favorite apps"
861+#~ msgstr "এগুলো আপনার প্রিয় অ্যাপেরর শর্টকাট"
862+
863+#~ msgid "Lock security"
864+#~ msgstr "নিরাপত্তা লক"
865+
732#~ msgid "Please select how you’d like to unlock your phone."
866#~ msgid "Please select how you’d like to unlock your phone."
733#~ msgstr "আপনি কিভাবে ফোনের লক খুলতে চান তা নির্ধারণ করুন।"
867#~ msgstr "আপনি কিভাবে ফোনের লক খুলতে চান তা নির্ধারণ করুন।"
868+
869+#~ msgctxt "Label: Description of security method"
870+#~ msgid "4 digits only"
871+#~ msgstr "কেবল মাত্র ৪টি সংখ্যা"
872+
873+#~ msgid "Continue"
874+#~ msgstr "পরবর্তী"
po/br.po+485−245
@@ -7,7 +7,7 @@ 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: 2016-03-10 22:48+0000\n"
10+"POT-Creation-Date: 2016-03-23 10:01+0000\n"
11"PO-Revision-Date: 2016-02-22 12:29+0000\n"
11"PO-Revision-Date: 2016-02-22 12:29+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"
@@ -15,8 +15,8 @@ msgstr ""
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"Plural-Forms: nplurals=2; plural=n > 1;\n"
18−"X-Launchpad-Export-Date: 2016-03-13 05:50+0000\n"
18+"X-Launchpad-Export-Date: 2016-03-24 06:07+0000\n"
19−"X-Generator: Launchpad (build 17939)\n"
19+"X-Generator: Launchpad (build 17958)\n"
20
20
21#: plugins/IntegratedLightDM/Greeter.cpp:112
21#: plugins/IntegratedLightDM/Greeter.cpp:112
22msgid "Password: "
22msgid "Password: "
@@ -77,53 +77,35 @@ msgctxt "Button: Log out from the system"
77msgid "Log Out"
77msgid "Log Out"
78msgstr "Digevreañ"
78msgstr "Digevreañ"
79
79
80−#: qml/Components/Dialogs.qml:161 qml/Components/Dialogs.qml:194
80+#: qml/Components/Dialogs.qml:161 qml/Components/Dialogs.qml:219
81−#: qml/Components/Dialogs.qml:253
81+#: qml/Dash/DashPageHeader.qml:298 qml/Wizard/Pages/passcode-confirm.qml:32
82+#: qml/Wizard/Pages/passcode-set.qml:32
82msgid "Cancel"
83msgid "Cancel"
83msgstr "Nullañ"
84msgstr "Nullañ"
84
85
85#: qml/Components/Dialogs.qml:173
86#: qml/Components/Dialogs.qml:173
86−msgctxt "Title: Reboot/Shut down dialog"
87−msgid "Shut down"
88−msgstr "Lazhañ ar benveg"
89−
90−#: qml/Components/Dialogs.qml:174
91−msgid "Are you sure you want to shut down?"
92−msgstr "Ha sur oc'h e fell deoc'h lazhañ ar benveg ?"
93−
94−#: qml/Components/Dialogs.qml:176
95−msgctxt "Button: Reboot the system"
96−msgid "Reboot"
97−msgstr "Adloc'hañ"
98−
99−#: qml/Components/Dialogs.qml:185
100−msgctxt "Button: Shut down the system"
101−msgid "Shut down"
102−msgstr "Lazhañ ar benveg"
103−
104−#: qml/Components/Dialogs.qml:207
105msgctxt "Title: Reboot dialog"
87msgctxt "Title: Reboot dialog"
106msgid "Reboot"
88msgid "Reboot"
107msgstr "Adloc'hañ"
89msgstr "Adloc'hañ"
108
90
109−#: qml/Components/Dialogs.qml:208
91+#: qml/Components/Dialogs.qml:174
110msgid "Are you sure you want to reboot?"
92msgid "Are you sure you want to reboot?"
111msgstr "Ha sur oc'h e fell deoc'h adloc'hañ ?"
93msgstr "Ha sur oc'h e fell deoc'h adloc'hañ ?"
112
94
113−#: qml/Components/Dialogs.qml:210
95+#: qml/Components/Dialogs.qml:176
114msgid "No"
96msgid "No"
115msgstr "N'on ket"
97msgstr "N'on ket"
116
98
117−#: qml/Components/Dialogs.qml:217
99+#: qml/Components/Dialogs.qml:183
118msgid "Yes"
100msgid "Yes"
119msgstr "Ya"
101msgstr "Ya"
120
102
121−#: qml/Components/Dialogs.qml:232
103+#: qml/Components/Dialogs.qml:198
122msgctxt "Title: Power off/Restart dialog"
104msgctxt "Title: Power off/Restart dialog"
123msgid "Power"
105msgid "Power"
124msgstr "Enaouiñ"
106msgstr "Enaouiñ"
125
107
126−#: qml/Components/Dialogs.qml:233
108+#: qml/Components/Dialogs.qml:199
127msgid ""
109msgid ""
128"Are you sure you would like\n"
110"Are you sure you would like\n"
129"to power off?"
111"to power off?"
@@ -131,12 +113,12 @@ msgstr ""
131"Ha sur oc'h e fell deoc'h\n"
113"Ha sur oc'h e fell deoc'h\n"
132"troc'hañ an tredan ?"
114"troc'hañ an tredan ?"
133
115
134−#: qml/Components/Dialogs.qml:235
116+#: qml/Components/Dialogs.qml:201
135msgctxt "Button: Power off the system"
117msgctxt "Button: Power off the system"
136msgid "Power off"
118msgid "Power off"
137msgstr "Lazhañ"
119msgstr "Lazhañ"
138
120
139−#: qml/Components/Dialogs.qml:244
121+#: qml/Components/Dialogs.qml:210
140msgctxt "Button: Restart the system"
122msgctxt "Button: Restart the system"
141msgid "Restart"
123msgid "Restart"
142msgstr "Adloc'hañ"
124msgstr "Adloc'hañ"
@@ -180,42 +162,58 @@ msgstr "Adkevreañ bremañ !"
180msgid "Close all"
162msgid "Close all"
181msgstr "Serriñ pep tra"
163msgstr "Serriñ pep tra"
182
164
183−#: qml/Dash/DashPageHeader.qml:270
165+#: qml/Dash/DashPageHeader.qml:337
184msgctxt "Button: Open the Ubuntu Store"
166msgctxt "Button: Open the Ubuntu Store"
185msgid "Store"
167msgid "Store"
186msgstr "Stal"
168msgstr "Stal"
187
169
188−#: qml/Dash/DashPageHeader.qml:277
170+#: qml/Dash/DashPageHeader.qml:344
189msgctxt "Button: Start a search in the current dash scope"
171msgctxt "Button: Start a search in the current dash scope"
190msgid "Search"
172msgid "Search"
191msgstr "Klask"
173msgstr "Klask"
192
174
193−#: qml/Dash/DashPageHeader.qml:287
175+#: qml/Dash/DashPageHeader.qml:354
194msgctxt "Button: Show the current dash scope settings"
176msgctxt "Button: Show the current dash scope settings"
195msgid "Settings"
177msgid "Settings"
196msgstr "Arventennoù"
178msgstr "Arventennoù"
197
179
198−#: qml/Dash/DashPageHeader.qml:294
180+#: qml/Dash/DashPageHeader.qml:361
199msgid "Remove from Favorites"
181msgid "Remove from Favorites"
200msgstr "Lemel eus ar sinedoù"
182msgstr "Lemel eus ar sinedoù"
201
183
202−#: qml/Dash/DashPageHeader.qml:294
184+#: qml/Dash/DashPageHeader.qml:361
203msgid "Add to Favorites"
185msgid "Add to Favorites"
204msgstr "Ouzhpennañ d'ar sinedoù"
186msgstr "Ouzhpennañ d'ar sinedoù"
205
187
188+#: qml/Dash/FiltersPopover.qml:60
189+msgid "Refine your results"
190+msgstr ""
191+
192+#: qml/Dash/FiltersPopover.qml:69
193+msgid "Reset"
194+msgstr ""
195+
206−#: qml/Dash/GenericScopeView.qml:567 qml/Dash/GenericScopeView.qml:725
196+#: qml/Dash/GenericScopeView.qml:570 qml/Dash/GenericScopeView.qml:755
207msgid "See less"
197msgid "See less"
208msgstr "Gwelet nebeutoc'h"
198msgstr "Gwelet nebeutoc'h"
209
199
210−#: qml/Dash/GenericScopeView.qml:567
200+#: qml/Dash/GenericScopeView.qml:570
211msgid "See all"
201msgid "See all"
212msgstr "Gwelet pep tra"
202msgstr "Gwelet pep tra"
213
203
214−#: qml/Dash/GenericScopeView.qml:629
204+#: qml/Dash/GenericScopeView.qml:627
215msgctxt "Label: Hint for dash search line edit"
205msgctxt "Label: Hint for dash search line edit"
216msgid "Search"
206msgid "Search"
217msgstr "Klask"
207msgstr "Klask"
218
208
209+#: qml/Dash/PageHeaderExtraPanel.qml:55
210+msgid "Recent Searches"
211+msgstr ""
212+
213+#: qml/Dash/PageHeaderExtraPanel.qml:66
214+msgid "Clear All"
215+msgstr ""
216+
219#: qml/Dash/Previews/PreviewActionCombo.qml:35
217#: qml/Dash/Previews/PreviewActionCombo.qml:35
220msgid "More..."
218msgid "More..."
221msgstr "Muioc'h..."
219msgstr "Muioc'h..."
@@ -283,11 +281,11 @@ msgstr "Esaeañ en-dro"
283msgid "Tap to unlock"
281msgid "Tap to unlock"
284msgstr "Pouezañ evit dibrennañ"
282msgstr "Pouezañ evit dibrennañ"
285
283
286−#: qml/Greeter/NarrowView.qml:54 qml/Wizard/Pages/passwd-confirm.qml:53
284+#: qml/Greeter/NarrowView.qml:54
287msgid "Sorry, incorrect passphrase."
285msgid "Sorry, incorrect passphrase."
288msgstr "Siwazh, frazenn-dremen direizh"
286msgstr "Siwazh, frazenn-dremen direizh"
289
287
290−#: qml/Greeter/NarrowView.qml:55 qml/Wizard/Pages/passwd-confirm.qml:54
288+#: qml/Greeter/NarrowView.qml:55
291msgid "Sorry, incorrect passcode."
289msgid "Sorry, incorrect passcode."
292msgstr "Siwazh, kod-tremen direizh"
290msgstr "Siwazh, kod-tremen direizh"
293
291
@@ -316,7 +314,7 @@ msgstr ""
316msgid "Enter %1"
314msgid "Enter %1"
317msgstr "Merkañ %1"
315msgstr "Merkañ %1"
318
316
319−#: qml/Greeter/NarrowView.qml:117 qml/Wizard/Pages/passwd-set.qml:60
317+#: qml/Greeter/NarrowView.qml:117
320msgid "Enter passphrase"
318msgid "Enter passphrase"
321msgstr "Merkañ ar frazenn-dremen"
319msgstr "Merkañ ar frazenn-dremen"
322
320
@@ -354,62 +352,62 @@ msgstr "Touchit evit distreiñ d'ar bellgomzadenn..."
354msgid "Conference"
352msgid "Conference"
355msgstr "Kendiviz"
353msgstr "Kendiviz"
356
354
357−#: qml/Panel/Indicators/MenuItemFactory.qml:752
355+#: qml/Panel/Indicators/MenuItemFactory.qml:761
358msgid "Nothing is playing"
356msgid "Nothing is playing"
359msgstr "Ne lenner netra bremañ"
357msgstr "Ne lenner netra bremañ"
360
358
361−#: qml/Panel/Indicators/MenuItemFactory.qml:881
359+#: qml/Panel/Indicators/MenuItemFactory.qml:890
362#, qt-format
360#, qt-format
363msgid "%1 hour"
361msgid "%1 hour"
364msgid_plural "%1 hours"
362msgid_plural "%1 hours"
365msgstr[0] "%1 eur"
363msgstr[0] "%1 eur"
366msgstr[1] "%1 eur"
364msgstr[1] "%1 eur"
367
365
368−#: qml/Panel/Indicators/MenuItemFactory.qml:885
366+#: qml/Panel/Indicators/MenuItemFactory.qml:894
369#, qt-format
367#, qt-format
370msgid "%1 minute"
368msgid "%1 minute"
371msgid_plural "%1 minutes"
369msgid_plural "%1 minutes"
372msgstr[0] "%1 vunutenn"
370msgstr[0] "%1 vunutenn"
373msgstr[1] "%1 vunutenn"
371msgstr[1] "%1 vunutenn"
374
372
375−#: qml/Panel/Indicators/MenuItemFactory.qml:890
373+#: qml/Panel/Indicators/MenuItemFactory.qml:899
376#, qt-format
374#, qt-format
377msgid "%1 second"
375msgid "%1 second"
378msgid_plural "%1 seconds"
376msgid_plural "%1 seconds"
379msgstr[0] "%1 eilenn"
377msgstr[0] "%1 eilenn"
380msgstr[1] "%1 eilenn"
378msgstr[1] "%1 eilenn"
381
379
382−#: qml/Panel/Indicators/MenuItemFactory.qml:893
380+#: qml/Panel/Indicators/MenuItemFactory.qml:902
383msgid "0 seconds"
381msgid "0 seconds"
384msgstr "0 eilenn"
382msgstr "0 eilenn"
385
383
386#. Translators: String like "1 hour, 2 minutes, 3 seconds remaining"
384#. Translators: String like "1 hour, 2 minutes, 3 seconds remaining"
387−#: qml/Panel/Indicators/MenuItemFactory.qml:895
385+#: qml/Panel/Indicators/MenuItemFactory.qml:904
388#, qt-format
386#, qt-format
389msgid "%1 remaining"
387msgid "%1 remaining"
390msgstr "%1 o chom"
388msgstr "%1 o chom"
391
389
392−#: qml/Panel/Indicators/MenuItemFactory.qml:901
390+#: qml/Panel/Indicators/MenuItemFactory.qml:910
393msgid "In queue…"
391msgid "In queue…"
394msgstr "El lostennad..."
392msgstr "El lostennad..."
395
393
396−#: qml/Panel/Indicators/MenuItemFactory.qml:905
394+#: qml/Panel/Indicators/MenuItemFactory.qml:914
397msgid "Downloading"
395msgid "Downloading"
398msgstr "O pellgargañ"
396msgstr "O pellgargañ"
399
397
400−#: qml/Panel/Indicators/MenuItemFactory.qml:907
398+#: qml/Panel/Indicators/MenuItemFactory.qml:916
401msgid "Paused, tap to resume"
399msgid "Paused, tap to resume"
402msgstr "Ehanet, touchit evit adkregiñ"
400msgstr "Ehanet, touchit evit adkregiñ"
403
401
404−#: qml/Panel/Indicators/MenuItemFactory.qml:909
402+#: qml/Panel/Indicators/MenuItemFactory.qml:918
405msgid "Canceled"
403msgid "Canceled"
406msgstr "Nullet"
404msgstr "Nullet"
407
405
408−#: qml/Panel/Indicators/MenuItemFactory.qml:911
406+#: qml/Panel/Indicators/MenuItemFactory.qml:920
409msgid "Finished"
407msgid "Finished"
410msgstr "Echu"
408msgstr "Echu"
411
409
412−#: qml/Panel/Indicators/MenuItemFactory.qml:913
410+#: qml/Panel/Indicators/MenuItemFactory.qml:922
413msgid "Failed, tap to retry"
411msgid "Failed, tap to retry"
414msgstr "C'hwitet, touchit evit adkregiñ"
412msgstr "C'hwitet, touchit evit adkregiñ"
415
413
@@ -429,251 +427,324 @@ msgctxt "Button: Call back on phone"
429msgid "Call back"
427msgid "Call back"
430msgstr "Gervel en-dro"
428msgstr "Gervel en-dro"
431
429
432−#: qml/Tutorial/TutorialBottom.qml:28
430+#: qml/Stages/SideStage.qml:76
433−msgid "Open special menus"
431+msgid "Drag using 3 fingers any application from one window to the other"
434−msgstr "Digeriñ al lañserioù ispisial"
432+msgstr ""
435−
436−#: qml/Tutorial/TutorialBottom.qml:29
437−msgid "Swipe up from the bottom edge."
438−msgstr "Riklit war-du an nec'h adalek an traoñ"
439
433
440−#: qml/Tutorial/TutorialBottomFinish.qml:24
434+#: qml/Tutorial/TutorialBottom.qml:78
441−msgid "This action does different things for different apps"
435+msgid "Swipe up to add a contact"
442−msgstr "An ober-mañ a ra meur a dra evit meur a arload"
436+msgstr ""
443
437
444−#: qml/Tutorial/TutorialBottomFinish.qml:25
438+#: qml/Tutorial/TutorialBottom.qml:80
445−msgid "Tap here to finish."
439+msgid "Swipe up for favorite calculations"
446−msgstr "Pouezañ amañ evit echuiñ."
440+msgstr ""
447
441
448−#: qml/Tutorial/TutorialContent.qml:80 qml/Tutorial/TutorialLeftFinish.qml:25
442+#: qml/Tutorial/TutorialBottom.qml:82
449−#: qml/Tutorial/TutorialRight.qml:144
443+msgid "Swipe up for recent calls"
450−msgid "Tap here to continue."
444+msgstr ""
451−msgstr "Pouzañ amañ evit kenderc'hel"
452
445
453−#: qml/Tutorial/TutorialLeft.qml:26
446+#: qml/Tutorial/TutorialBottom.qml:84
454−msgid "Open the launcher"
447+msgid "Swipe up to create a message"
455−msgstr "Digeriñ al lañser"
448+msgstr ""
456
449
457−#: qml/Tutorial/TutorialLeft.qml:27
450+#: qml/Tutorial/TutorialBottom.qml:85
458−msgid "Short swipe from the left edge."
451+msgid "Swipe up to manage the app"
459−msgstr "Riklik dousik adalek ar bord kleiz."
452+msgstr ""
460
453
461−#: qml/Tutorial/TutorialLeftFinish.qml:24
454+#: qml/Tutorial/TutorialLeft.qml:47
462−msgid "These are the shortcuts to favorite apps"
455+msgid "Swipe from the left edge to open the launcher"
463−msgstr "Berradennoù war-du hoc'h arloadoù gwellañ-deuet eo ar re-mañ"
456+msgstr ""
464
457
465−#: qml/Tutorial/TutorialPage.qml:178
458+#: qml/Tutorial/TutorialLeftLong.qml:47
466−msgid "You almost got it!"
459+msgid "Long swipe from the left edge to open the Today scope"
467−msgstr "Deuet eo ganeoc'h pe dost ?"
460+msgstr ""
468
461
469−#: qml/Tutorial/TutorialPage.qml:195
462+#: qml/Tutorial/TutorialRight.qml:54
470−msgid "Try again."
463+msgid "Hover your mouse on the right edge to view your open apps"
471−msgstr "Esaeit en-dro."
464+msgstr ""
472
465
473−#: qml/Tutorial/TutorialRight.qml:31
466+#: qml/Tutorial/TutorialRight.qml:55
474−msgid "To view open apps"
467+msgid "Short or long swipe from the right edge to view your open apps"
475−msgstr "Evit gwelet an arloadoù digor"
468+msgstr ""
476
469
477−#: qml/Tutorial/TutorialRight.qml:32
470+#: qml/Tutorial/TutorialTop.qml:53
478−msgid "Long swipe from the right edge."
471+msgid "Swipe from the top right edge to open the notification bar"
479−msgstr "Riklit pell adalek ar bord dehoù."
472+msgstr ""
480
473
481−#: qml/Tutorial/TutorialRight.qml:122
474+#: qml/Tutorial/TutorialTop.qml:54
482−msgid "View all your running tasks."
475+msgid "Swipe from the top edge to open the notification bar"
483−msgstr "Gwelet an holl drevelloù a ya en-dro."
476+msgstr ""
484
477
485−#: qml/Wizard/Page.qml:89
478+#: qml/Wizard/Page.qml:54
486msgctxt "Button: Go back one page in the Wizard"
479msgctxt "Button: Go back one page in the Wizard"
487msgid "Back"
480msgid "Back"
488msgstr "Distreiñ"
481msgstr "Distreiñ"
489
482
490#: qml/Wizard/Pages/10-welcome.qml:27
483#: qml/Wizard/Pages/10-welcome.qml:27
491−msgid "Hi!"
484+msgid "Language"
492−msgstr "Salud deoc'h !"
485+msgstr ""
493
486
494−#: qml/Wizard/Pages/10-welcome.qml:44
487+#: qml/Wizard/Pages/10-welcome.qml:156 qml/Wizard/Pages/30-wifi.qml:206
495−msgid "Welcome to your Ubuntu device."
488+#: qml/Wizard/Pages/40-location.qml:271 qml/Wizard/Pages/50-timezone.qml:267
496−msgstr "Donemat en ho penveg Ubuntu"
489+#: qml/Wizard/Pages/60-account.qml:65 qml/Wizard/Pages/70-passwd-type.qml:144
490+#: qml/Wizard/Pages/75-report-check.qml:84
491+#: qml/Wizard/Pages/passcode-desktop.qml:124
492+#: qml/Wizard/Pages/password-set.qml:141
493+msgid "Next"
494+msgstr ""
497
495
498−#: qml/Wizard/Pages/10-welcome.qml:52
496+#: qml/Wizard/Pages/30-wifi.qml:29
499−msgid "Let’s get started."
497+msgid "Connect to Wi‑Fi"
500−msgstr "Krogomp ganti."
498+msgstr "Kevreañ ouzh ar Wi-Fi"
501
499
502−#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:133
500+#: qml/Wizard/Pages/30-wifi.qml:130
503−#: qml/Wizard/Pages/40-wifi.qml:215 qml/Wizard/Pages/50-location.qml:131
501+msgid "Connected"
504−#: qml/Wizard/Pages/60-reporting.qml:60 qml/Wizard/Pages/passwd-confirm.qml:82
505−#: qml/Wizard/Pages/passwd-set.qml:90
506−msgid "Continue"
507−msgstr "Kenderc'hel"
502+msgstr ""
508
503
509−#: qml/Wizard/Pages/20-sim.qml:25
504+#: qml/Wizard/Pages/30-wifi.qml:163
510−msgid "Add a SIM card and restart your device"
505+msgid "Available Wi-Fi networks"
511−msgstr "Lakait ur gartenn SIM hag adloc'hit ho penveg"
506+msgstr ""
512
507
513−#: qml/Wizard/Pages/20-sim.qml:59
508+#: qml/Wizard/Pages/30-wifi.qml:164
514−msgid "Without it, you won’t be able to make calls or use text messaging."
509+msgid "No available Wi-Fi networks"
515−msgstr "Ne vioc'h ket evit pellgomz pe kas kemennadennoù hepti."
510+msgstr ""
516
511
517−#: qml/Wizard/Pages/20-sim.qml:73 qml/Wizard/Pages/40-wifi.qml:215
512+#: qml/Wizard/Pages/30-wifi.qml:206 qml/Wizard/Pages/60-account.qml:65
513+#: qml/Wizard/Pages/sim.qml:101
518msgid "Skip"
514msgid "Skip"
519msgstr "Tremen hebiou"
515msgstr "Tremen hebiou"
520
516
521−#: qml/Wizard/Pages/30-passwd-type.qml:39
517+#: qml/Wizard/Pages/40-location.qml:27
518+msgid "Location Services"
519+msgstr ""
520+
521+#: qml/Wizard/Pages/40-location.qml:83
522−msgid "Lock security"
522+msgid ""
523+"Use GPS, Wi-Fi hotspots and mobile network anonymously to detect location "
524+"(recommended)"
523−msgstr "Surentez ar prennañ"
525+msgstr ""
526+
527+#: qml/Wizard/Pages/40-location.qml:105
528+#, qt-format
529+msgid "By selecting this option you agree to the Nokia HERE %1."
530+msgstr ""
524
531
525−#: qml/Wizard/Pages/30-passwd-type.qml:79
532+#: qml/Wizard/Pages/40-location.qml:106
526−msgid "Please select how you’d like to unlock your device."
533+msgctxt "part of: Nokia HERE terms and conditions"
527−msgstr "Diuzit penaos e fell deoc'h dibrennañ ho penveg, mar plij."
534+msgid "terms and conditions"
535+msgstr ""
528
536
529−#: qml/Wizard/Pages/30-passwd-type.qml:102
537+#: qml/Wizard/Pages/40-location.qml:160
530−msgctxt "Label: Type of security method"
538+msgid "GPS only"
531−msgid "Swipe"
539+msgstr ""
540+
541+#: qml/Wizard/Pages/40-location.qml:214
542+msgid "Don't use my location"
543+msgstr ""
544+
545+#: qml/Wizard/Pages/40-location.qml:260
546+msgid "You can change it later in System Settings."
547+msgstr ""
548+
549+#: qml/Wizard/Pages/50-timezone.qml:29
550+msgid "Time Zone"
551+msgstr ""
552+
553+#: qml/Wizard/Pages/50-timezone.qml:178
554+msgid "Enter your city"
555+msgstr ""
556+
557+#: qml/Wizard/Pages/60-account.qml:24
558+msgid "Personalize Your Device"
559+msgstr ""
560+
561+#: qml/Wizard/Pages/60-account.qml:48
562+msgid "Preferred Name"
532−msgstr "Riklañ"
563+msgstr ""
533
564
534−#: qml/Wizard/Pages/30-passwd-type.qml:103
565+#: qml/Wizard/Pages/70-passwd-type.qml:39
535−msgctxt "Label: Description of security method"
566+msgid "Lock Screen"
536−msgid "No security"
537−msgstr "Tamm surentez ebet"
567+msgstr ""
538
568
539−#: qml/Wizard/Pages/30-passwd-type.qml:105
569+#: qml/Wizard/Pages/70-passwd-type.qml:101
540msgctxt "Label: Type of security method"
570msgctxt "Label: Type of security method"
541−msgid "Passcode"
571+msgid "Create new password"
542−msgstr "Kod-tremen"
572+msgstr ""
543
573
544−#: qml/Wizard/Pages/30-passwd-type.qml:106
574+#: qml/Wizard/Pages/70-passwd-type.qml:103
545−msgctxt "Label: Description of security method"
575+msgctxt "Label: Type of security method"
546−msgid "4 digits only"
576+msgid "Create passcode (numbers only)"
547−msgstr "4 sifr hepken"
577+msgstr ""
548
578
549−#: qml/Wizard/Pages/30-passwd-type.qml:108
579+#: qml/Wizard/Pages/70-passwd-type.qml:105
550msgctxt "Label: Type of security method"
580msgctxt "Label: Type of security method"
551−msgid "Passphrase"
581+msgid "No lock code"
552−msgstr "Frazenn-dremen"
582+msgstr ""
553
583
554−#: qml/Wizard/Pages/30-passwd-type.qml:109
584+#: qml/Wizard/Pages/75-report-check.qml:26 qml/Wizard/Pages/here-terms.qml:108
555−msgctxt "Label: Description of security method"
585+msgid "Privacy Policy"
556−msgid "Numbers and letters"
586+msgstr ""
557−msgstr "Sifroù ha lizherennoù"
558
587
559−#: qml/Wizard/Pages/40-wifi.qml:29
588+#: qml/Wizard/Pages/75-report-check.qml:26
560−msgid "Connect to Wi‑Fi"
589+msgid "Help Us Improve"
561−msgstr "Kevreañ ouzh ar Wi-Fi"
590+msgstr ""
562
591
563−#: qml/Wizard/Pages/40-wifi.qml:168
592+#: qml/Wizard/Pages/75-report-check.qml:59
564−msgid "Available networks…"
593+msgid "Improve system performance by sending us crashes and error reports."
565−msgstr "Rouedadoù a c'haller kaout..."
594+msgstr ""
566
595
567−#: qml/Wizard/Pages/40-wifi.qml:169
596+#: qml/Wizard/Pages/75-report-check.qml:60
568−msgid "No available networks."
597+msgid "Privacy policy"
569−msgstr "N'eus rouedad ebet da gaout."
598+msgstr ""
570
599
571−#: qml/Wizard/Pages/50-location.qml:27
600+#: qml/Wizard/Pages/80-finished.qml:89
572−msgid "Location"
601+msgid "Welcome to Ubuntu"
573−msgstr "Lec'h"
602+msgstr ""
574
603
575−#: qml/Wizard/Pages/50-location.qml:62
604+#: qml/Wizard/Pages/80-finished.qml:104
576−msgid "Let the phone detect your location:"
605+msgid "You are ready to use your device now"
577−msgstr "Lezel ar pellgomzer da gavout pelec'h emaoc'h :"
606+msgstr ""
578
607
579−#: qml/Wizard/Pages/50-location.qml:69
608+#: qml/Wizard/Pages/80-finished.qml:124
580−msgid "Using GPS only (less accurate)"
609+msgid "Get Started"
581−msgstr "Implijout ar GPS hepken (n'eo ket ken resis)"
610+msgstr ""
611+
612+#: qml/Wizard/Pages/here-terms.qml:25
613+msgid "Terms & Conditions"
614+msgstr "Penndivizoù implij"
582
615
583−#: qml/Wizard/Pages/50-location.qml:86
616+#: qml/Wizard/Pages/here-terms.qml:69
584−msgid "Using GPS, anonymized Wi-Fi and cellular network info (recommended)"
617+msgid "Your device uses positioning technologies provided by HERE."
585msgstr ""
618msgstr ""
586−"Implijout ar GPS, Wi-Fi dizanv pe titouroù ar rouedad kelligel (aliet)"
587
619
588−#. Translators: HERE is a trademark for Nokia's location service, you probably shouldn't translate it
589−#: qml/Wizard/Pages/50-location.qml:103
620+#: qml/Wizard/Pages/here-terms.qml:81
590msgid ""
621msgid ""
591−"By selecting this option you agree to the Nokia HERE <a href='#'>terms and "
622+"To provide you with positioning services and to improve their quality, HERE "
592−"conditions</a>."
623+"collects information about nearby cell towers and Wi-Fi hotspots around your "
624+"current location whenever your position is being found."
593msgstr ""
625msgstr ""
594−"Pa ziuzit an dibarzh-mañ ez asantit da <a href='#'>zivizoù implij</a> Nokia."
595
626
596−#: qml/Wizard/Pages/50-location.qml:112
627+#: qml/Wizard/Pages/here-terms.qml:93
597−msgid "Not at all"
628+msgid ""
629+"The information collected is used to analyze the service and to improve the "
630+"use of service, but not to identify you personally."
598−msgstr "Tamm ebet"
631+msgstr ""
599
632
600−#: qml/Wizard/Pages/50-location.qml:124
633+#: qml/Wizard/Pages/here-terms.qml:106
601−msgid "You can change your mind later in <b>System Settings</b>."
634+#, qt-format
635+msgid "By continuing, you agree to the HERE platform %1 and %2."
602msgstr ""
636msgstr ""
603−"Gallout a rit cheñch soñj diwezhatoc'h en <b>Arventennoù ar reizhad</b>."
604
637
605−#: qml/Wizard/Pages/60-reporting.qml:26
638+#: qml/Wizard/Pages/here-terms.qml:107
606−msgid "Improving your experience"
639+msgid "Service Terms"
607−msgstr "Gwellaat ho skiant-prenet"
640+msgstr ""
608
641
609−#: qml/Wizard/Pages/60-reporting.qml:46
642+#: qml/Wizard/Pages/passcode-confirm.qml:43
643+#: qml/Wizard/Pages/passcode-desktop.qml:80
610−msgid ""
644+msgid "Confirm passcode"
611−"Your phone is set up to automatically report errors to Canonical and its "
645+msgstr "Kadarnaat ar c'hod-tremen"
612−"partners, the makers of the operating system."
646+
647+#: qml/Wizard/Pages/passcode-confirm.qml:45
648+msgid "Incorrect passcode."
613msgstr ""
649msgstr ""
614−"Arventennet eo ho pellgomzer evit titourañ ent emgefre ar fazioù da "
615−"gCanonical ha d'e gevelerien, ar re o deus savet ar reizhiad korvoiñ."
616
650
617−#: qml/Wizard/Pages/60-reporting.qml:53
651+#: qml/Wizard/Pages/passcode-confirm.qml:45
652+msgctxt "Enter the passcode again"
618−msgid ""
653+msgid "Please re-enter."
619−"This can be disabled in <b>System Settings</b> under <b>Security &amp; "
620−"Privacy</b>"
621msgstr ""
654msgstr ""
622−"Gallout a ra bezañ diweredekaet e-barzh <b>Arventennoù ar reizhiad</b> "
623−"dindan <b>Surentez &amp; Prevezded</b>"
624
655
625−#: qml/Wizard/Pages/80-finished.qml:24
656+#: qml/Wizard/Pages/passcode-desktop.qml:30
626−msgid "All done"
657+msgid "Lock Screen Passcode"
627−msgstr "Echu penn-da-benn"
658+msgstr ""
628
659
629−#: qml/Wizard/Pages/80-finished.qml:39
660+#: qml/Wizard/Pages/passcode-desktop.qml:56
630−msgid "Nice work!"
661+msgid "Enter 4 numbers to setup your passcode"
631−msgstr "Gwellat labour !"
662+msgstr ""
632
663
633−#: qml/Wizard/Pages/80-finished.qml:46
664+#: qml/Wizard/Pages/passcode-desktop.qml:65
634−msgid "Your device is now ready to use."
665+#: qml/Wizard/Pages/passcode-set.qml:54
635−msgstr "Prest eo ho penveg da vezañ implijet bremañ."
666+msgid "Choose passcode"
667+msgstr ""
636
668
637−#: qml/Wizard/Pages/80-finished.qml:53
669+#: qml/Wizard/Pages/passcode-desktop.qml:105
638−msgid "Finish"
670+msgid "Passcode too short"
639−msgstr "Echuiñ"
671+msgstr ""
640
672
641−#: qml/Wizard/Pages/here-terms.qml:27
673+#: qml/Wizard/Pages/passcode-desktop.qml:107
642−msgid "Terms & Conditions"
674+msgid "Passcodes match"
643−msgstr "Penndivizoù implij"
675+msgstr ""
644
676
645−#: qml/Wizard/Pages/passwd-confirm.qml:49
677+#: qml/Wizard/Pages/passcode-desktop.qml:109
646−msgid "Confirm passphrase"
678+msgid "Passcodes do not match"
647−msgstr "Kadarnaat ar frazenn-dremen"
679+msgstr ""
648
680
649−#: qml/Wizard/Pages/passwd-confirm.qml:50
681+#: qml/Wizard/Pages/passcode-set.qml:62
650−msgid "Confirm passcode"
682+msgid "Passcode must be 4 characters long"
651−msgstr "Kadarnaat ar c'hod-tremen"
683+msgstr ""
652
684
653−#: qml/Wizard/Pages/passwd-confirm.qml:53
685+#: qml/Wizard/Pages/password-set.qml:30
654−#: qml/Wizard/Pages/passwd-confirm.qml:54
686+msgid "Lock Screen Password"
655−msgid "Please try again."
656−msgstr "Esaeit en-dro, mar plij."
687+msgstr ""
657
688
658−#: qml/Wizard/Pages/passwd-set.qml:61
689+#: qml/Wizard/Pages/password-set.qml:61
659−msgid "Choose your passcode"
690+msgid "Enter at least 8 characters"
660−msgstr "Choaz ho kod-tremen"
691+msgstr ""
661
692
662−#: qml/Wizard/Pages/passwd-set.qml:68
693+#: qml/Wizard/Pages/password-set.qml:73
663−msgid "Passphrase must be 4 characters long"
694+msgid "Choose password"
664−msgstr "4 arouezenn a rank bezañ er frazenn-dremen"
695+msgstr ""
665
696
666−#. Translators: This is the arrow for "Back" buttons
697+#: qml/Wizard/Pages/password-set.qml:103
667−#: qml/Wizard/StackButton.qml:39
698+msgid "Confirm password"
668−#, qt-format
669−msgid "〈 %1"
670−msgstr "〈 %1"
699+msgstr ""
671
700
672−#. Translators: This is the arrow for "Forward" buttons
701+#: qml/Wizard/Pages/sim.qml:27
702+msgid "No SIM card installed"
703+msgstr ""
704+
705+#: qml/Wizard/Pages/sim.qml:54
706+msgid "SIM card added"
707+msgstr ""
708+
709+#: qml/Wizard/Pages/sim.qml:55
710+msgid "You must restart the device to access the mobile network."
711+msgstr ""
712+
713+#: qml/Wizard/Pages/sim.qml:59
714+msgid "Restart"
715+msgstr "Adloc'hañ"
716+
673−#: qml/Wizard/StackButton.qml:42
717+#: qml/Wizard/Pages/sim.qml:78
674−#, qt-format
718+msgid "You won’t be able to make calls or use text messaging without a SIM."
675−msgid "%1 〉"
719+msgstr ""
720+
721+#: qml/Wizard/Pages/sim.qml:90
722+msgid "To proceed with no SIM tap Skip."
723+msgstr ""
724+
725+#: qml/Wizard/PasswordMeter.qml:87
726+msgid "Passwords match"
727+msgstr ""
728+
729+#: qml/Wizard/PasswordMeter.qml:89
730+msgid "Passwords do not match"
731+msgstr ""
732+
733+#: qml/Wizard/PasswordMeter.qml:93
734+msgid "Strong password"
735+msgstr ""
736+
737+#: qml/Wizard/PasswordMeter.qml:95
738+msgid "Fair password"
739+msgstr ""
740+
741+#: qml/Wizard/PasswordMeter.qml:97
742+msgid "Weak password"
743+msgstr ""
744+
745+#: qml/Wizard/PasswordMeter.qml:99
746+msgid "Very weak password"
676−msgstr "%1 〉"
747+msgstr ""
677
748
678#~ msgid "Close"
749#~ msgid "Close"
679#~ msgstr "Serriñ"
750#~ msgstr "Serriñ"
@@ -762,6 +833,9 @@ msgstr "%1 〉"
762#~ msgid "Log out"
833#~ msgid "Log out"
763#~ msgstr "Digevreañ"
834#~ msgstr "Digevreañ"
764
835
836+#~ msgid "Are you sure you want to shut down?"
837+#~ msgstr "Ha sur oc'h e fell deoc'h lazhañ ar benveg ?"
838+
765#~ msgid "Reboot"
839#~ msgid "Reboot"
766#~ msgstr "Adloc'hañ"
840#~ msgstr "Adloc'hañ"
767
841
@@ -771,25 +845,193 @@ msgstr "%1 〉"
771#~ msgid "Settings"
845#~ msgid "Settings"
772#~ msgstr "Arventennoù"
846#~ msgstr "Arventennoù"
773
847
774−#~ msgid "Restart"
775−#~ msgstr "Adloc'hañ"
776−
777#~ msgid "Manage Scopes"
848#~ msgid "Manage Scopes"
778#~ msgstr "Merañ ar c'hefluskerioù enklask"
849#~ msgstr "Merañ ar c'hefluskerioù enklask"
779
850
780#~ msgid "Please re-enter"
851#~ msgid "Please re-enter"
781#~ msgstr "Adverkañ, mar plij"
852#~ msgstr "Adverkañ, mar plij"
782
853
854+#~ msgid "Lock security"
855+#~ msgstr "Surentez ar prennañ"
856+
857+#~ msgid "Without it, you won’t be able to make calls or use text messaging."
858+#~ msgstr "Ne vioc'h ket evit pellgomz pe kas kemennadennoù hepti."
859+
860+#~ msgid "Add a SIM card and restart your device"
861+#~ msgstr "Lakait ur gartenn SIM hag adloc'hit ho penveg"
862+
783#~ msgid "Please select how you’d like to unlock your phone."
863#~ msgid "Please select how you’d like to unlock your phone."
784#~ msgstr ""
864#~ msgstr ""
785#~ "Diuzit e peseurt mod e fell deoc'h dibrennañ ho pellgomzer, mar plij."
865#~ "Diuzit e peseurt mod e fell deoc'h dibrennañ ho pellgomzer, mar plij."
786
866
867+#~ msgid "Hi!"
868+#~ msgstr "Salud deoc'h !"
869+
870+#~ msgid "Let’s get started."
871+#~ msgstr "Krogomp ganti."
872+
873+#~ msgid "Continue"
874+#~ msgstr "Kenderc'hel"
875+
787#~ msgid "Welcome to your Ubuntu phone."
876#~ msgid "Welcome to your Ubuntu phone."
788#~ msgstr "Deuet-mat oc'h en ho pellgomzer Ubuntu."
877#~ msgstr "Deuet-mat oc'h en ho pellgomzer Ubuntu."
789
878
879+#~ msgid "Available networks…"
880+#~ msgstr "Rouedadoù a c'haller kaout..."
881+
882+#~ msgid "No available networks."
883+#~ msgstr "N'eus rouedad ebet da gaout."
884+
885+#~ msgid "Location"
886+#~ msgstr "Lec'h"
887+
888+#~ msgid "You can change your mind later in <b>System Settings</b>."
889+#~ msgstr ""
890+#~ "Gallout a rit cheñch soñj diwezhatoc'h en <b>Arventennoù ar reizhad</b>."
891+
892+#~ msgid ""
893+#~ "This can be disabled in <b>System Settings</b> under <b>Security &amp; "
894+#~ "Privacy</b>"
895+#~ msgstr ""
896+#~ "Gallout a ra bezañ diweredekaet e-barzh <b>Arventennoù ar reizhiad</b> "
897+#~ "dindan <b>Surentez &amp; Prevezded</b>"
898+
899+#~ msgid ""
900+#~ "Your phone is set up to automatically report errors to Canonical and its "
901+#~ "partners, the makers of the operating system."
902+#~ msgstr ""
903+#~ "Arventennet eo ho pellgomzer evit titourañ ent emgefre ar fazioù da "
904+#~ "gCanonical ha d'e gevelerien, ar re o deus savet ar reizhiad korvoiñ."
905+
906+#~ msgid "All done"
907+#~ msgstr "Echu penn-da-benn"
908+
909+#~ msgid "Improving your experience"
910+#~ msgstr "Gwellaat ho skiant-prenet"
911+
912+#~ msgid ""
913+#~ "By selecting this option you agree to the Nokia HERE <a href='#'>terms and "
914+#~ "conditions</a>."
915+#~ msgstr ""
916+#~ "Pa ziuzit an dibarzh-mañ ez asantit da <a href='#'>zivizoù implij</a> Nokia."
917+
918+#~ msgid "Not at all"
919+#~ msgstr "Tamm ebet"
920+
921+#~ msgid "Let the phone detect your location:"
922+#~ msgstr "Lezel ar pellgomzer da gavout pelec'h emaoc'h :"
923+
924+#~ msgid "Using GPS only (less accurate)"
925+#~ msgstr "Implijout ar GPS hepken (n'eo ket ken resis)"
926+
927+#~ msgid "Using GPS, anonymized Wi-Fi and cellular network info (recommended)"
928+#~ msgstr ""
929+#~ "Implijout ar GPS, Wi-Fi dizanv pe titouroù ar rouedad kelligel (aliet)"
930+
931+#~ msgid "Nice work!"
932+#~ msgstr "Gwellat labour !"
933+
934+#~ msgid "Finish"
935+#~ msgstr "Echuiñ"
936+
937+#~ msgid "Confirm passphrase"
938+#~ msgstr "Kadarnaat ar frazenn-dremen"
939+
940+#, qt-format
941+#~ msgid "〈 %1"
942+#~ msgstr "〈 %1"
943+
944+#~ msgid "Choose your passcode"
945+#~ msgstr "Choaz ho kod-tremen"
946+
947+#~ msgid "Passphrase must be 4 characters long"
948+#~ msgstr "4 arouezenn a rank bezañ er frazenn-dremen"
949+
950+#~ msgid "Please try again."
951+#~ msgstr "Esaeit en-dro, mar plij."
952+
790#~ msgid "Your phone is now ready to use."
953#~ msgid "Your phone is now ready to use."
791#~ msgstr "Prest eo ho pellgomzer da vezañ implijet bremañ."
954#~ msgstr "Prest eo ho pellgomzer da vezañ implijet bremañ."
792
955
956+#, qt-format
957+#~ msgid "%1 〉"
958+#~ msgstr "%1 〉"
959+
960+#~ msgid "This action does different things for different apps"
961+#~ msgstr "An ober-mañ a ra meur a dra evit meur a arload"
962+
963+#~ msgid "Open special menus"
964+#~ msgstr "Digeriñ al lañserioù ispisial"
965+
966+#~ msgid "Tap here to finish."
967+#~ msgstr "Pouezañ amañ evit echuiñ."
968+
969+#~ msgid "To view open apps"
970+#~ msgstr "Evit gwelet an arloadoù digor"
971+
972+#~ msgid "Long swipe from the right edge."
973+#~ msgstr "Riklit pell adalek ar bord dehoù."
974+
975+#~ msgid "View all your running tasks."
976+#~ msgstr "Gwelet an holl drevelloù a ya en-dro."
977+
978+#~ msgid "Try again."
979+#~ msgstr "Esaeit en-dro."
980+
981+#~ msgid "You almost got it!"
982+#~ msgstr "Deuet eo ganeoc'h pe dost ?"
983+
984+#~ msgid "Short swipe from the left edge."
985+#~ msgstr "Riklik dousik adalek ar bord kleiz."
986+
987+#~ msgid "Open the launcher"
988+#~ msgstr "Digeriñ al lañser"
989+
990+#~ msgid "Tap here to continue."
991+#~ msgstr "Pouzañ amañ evit kenderc'hel"
992+
993+#~ msgid "These are the shortcuts to favorite apps"
994+#~ msgstr "Berradennoù war-du hoc'h arloadoù gwellañ-deuet eo ar re-mañ"
995+
996+#~ msgid "Swipe up from the bottom edge."
997+#~ msgstr "Riklit war-du an nec'h adalek an traoñ"
998+
999+#~ msgctxt "Button: Shut down the system"
1000+#~ msgid "Shut down"
1001+#~ msgstr "Lazhañ ar benveg"
1002+
1003+#~ msgctxt "Title: Reboot/Shut down dialog"
1004+#~ msgid "Shut down"
1005+#~ msgstr "Lazhañ ar benveg"
1006+
1007+#~ msgctxt "Button: Reboot the system"
1008+#~ msgid "Reboot"
1009+#~ msgstr "Adloc'hañ"
1010+
1011+#~ msgctxt "Label: Type of security method"
1012+#~ msgid "Passcode"
1013+#~ msgstr "Kod-tremen"
1014+
1015+#~ msgctxt "Label: Description of security method"
1016+#~ msgid "No security"
1017+#~ msgstr "Tamm surentez ebet"
1018+
1019+#~ msgctxt "Label: Type of security method"
1020+#~ msgid "Swipe"
1021+#~ msgstr "Riklañ"
1022+
1023+#~ msgctxt "Label: Description of security method"
1024+#~ msgid "4 digits only"
1025+#~ msgstr "4 sifr hepken"
1026+
1027+#~ msgctxt "Label: Type of security method"
1028+#~ msgid "Passphrase"
1029+#~ msgstr "Frazenn-dremen"
1030+
1031+#~ msgctxt "Label: Description of security method"
1032+#~ msgid "Numbers and letters"
1033+#~ msgstr "Sifroù ha lizherennoù"
1034+
793#~ msgid "%a %d %b %H:%M"
1035#~ msgid "%a %d %b %H:%M"
794#~ msgstr "%a %b %d %H:%M"
1036#~ msgstr "%a %b %d %H:%M"
795
1037
@@ -823,13 +1065,11 @@ msgstr "%1 〉"
823#~ msgid "Call back"
1065#~ msgid "Call back"
824#~ msgstr "Gervel en-dro"
1066#~ msgstr "Gervel en-dro"
825
1067
826−#~ msgid ""
1068+#~ msgid "Welcome to your Ubuntu device."
827−#~ "Your device is now connected to an external display. Use this screen as a "
1069+#~ msgstr "Donemat en ho penveg Ubuntu"
828−#~ "touch pad to interact with the mouse."
829−#~ msgstr ""
830−#~ "N'eo ket kevreet ho penveg ouzh un diskwel diavaez. Implijit ar skramm-mañ "
831−#~ "da douch evit ober gant al logodenn."
832
1070
833−#~ msgid "Re-dock, save your work and close these apps to continue."
1071+#~ msgid "Please select how you’d like to unlock your device."
834−#~ msgstr ""
1072+#~ msgstr "Diuzit penaos e fell deoc'h dibrennañ ho penveg, mar plij."
835−#~ "Adlugit, enrollit ho labour ha serrit an arloadoù-mañ evit kenderc'hel."
1073+
1074+#~ msgid "Your device is now ready to use."
1075+#~ msgstr "Prest eo ho penveg da vezañ implijet bremañ."
po/bs.po+476−234
@@ -7,7 +7,7 @@ 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: 2016-03-10 22:48+0000\n"
10+"POT-Creation-Date: 2016-03-23 10:01+0000\n"
11"PO-Revision-Date: 2015-12-01 20:06+0000\n"
11"PO-Revision-Date: 2015-12-01 20:06+0000\n"
12"Last-Translator: Kenan Gutić <Unknown>\n"
12"Last-Translator: Kenan Gutić <Unknown>\n"
13"Language-Team: Bosnian <bs@li.org>\n"
13"Language-Team: Bosnian <bs@li.org>\n"
@@ -16,8 +16,8 @@ msgstr ""
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 && "
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"
18"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
19−"X-Launchpad-Export-Date: 2016-03-13 05:50+0000\n"
19+"X-Launchpad-Export-Date: 2016-03-24 06:07+0000\n"
20−"X-Generator: Launchpad (build 17939)\n"
20+"X-Generator: Launchpad (build 17958)\n"
21
21
22#: plugins/IntegratedLightDM/Greeter.cpp:112
22#: plugins/IntegratedLightDM/Greeter.cpp:112
23msgid "Password: "
23msgid "Password: "
@@ -75,53 +75,35 @@ msgctxt "Button: Log out from the system"
75msgid "Log Out"
75msgid "Log Out"
76msgstr "Odjavi se"
76msgstr "Odjavi se"
77
77
78−#: qml/Components/Dialogs.qml:161 qml/Components/Dialogs.qml:194
78+#: qml/Components/Dialogs.qml:161 qml/Components/Dialogs.qml:219
79−#: qml/Components/Dialogs.qml:253
79+#: qml/Dash/DashPageHeader.qml:298 qml/Wizard/Pages/passcode-confirm.qml:32
80+#: qml/Wizard/Pages/passcode-set.qml:32
80msgid "Cancel"
81msgid "Cancel"
81msgstr "Otkaži"
82msgstr "Otkaži"
82
83
83#: qml/Components/Dialogs.qml:173
84#: qml/Components/Dialogs.qml:173
84−msgctxt "Title: Reboot/Shut down dialog"
85−msgid "Shut down"
86−msgstr "Ugasi"
87−
88−#: qml/Components/Dialogs.qml:174
89−msgid "Are you sure you want to shut down?"
90−msgstr "Da li ste sigurni da želite ugasiti?"
91−
92−#: qml/Components/Dialogs.qml:176
93−msgctxt "Button: Reboot the system"
94−msgid "Reboot"
95−msgstr "Ponovo pokreni"
96−
97−#: qml/Components/Dialogs.qml:185
98−msgctxt "Button: Shut down the system"
99−msgid "Shut down"
100−msgstr "Gašenje sistema"
101−
102−#: qml/Components/Dialogs.qml:207
103msgctxt "Title: Reboot dialog"
85msgctxt "Title: Reboot dialog"
104msgid "Reboot"
86msgid "Reboot"
105msgstr "Ponovo pokreni"
87msgstr "Ponovo pokreni"
106
88
107−#: qml/Components/Dialogs.qml:208
89+#: qml/Components/Dialogs.qml:174
108msgid "Are you sure you want to reboot?"
90msgid "Are you sure you want to reboot?"
109msgstr "Da li ste sigurni da želite ponovo pokrenuti?"
91msgstr "Da li ste sigurni da želite ponovo pokrenuti?"
110
92
111−#: qml/Components/Dialogs.qml:210
93+#: qml/Components/Dialogs.qml:176
112msgid "No"
94msgid "No"
113msgstr "Ne"
95msgstr "Ne"
114
96
115−#: qml/Components/Dialogs.qml:217
97+#: qml/Components/Dialogs.qml:183
116msgid "Yes"
98msgid "Yes"
117msgstr "Da"
99msgstr "Da"
118
100
119−#: qml/Components/Dialogs.qml:232
101+#: qml/Components/Dialogs.qml:198
120msgctxt "Title: Power off/Restart dialog"
102msgctxt "Title: Power off/Restart dialog"
121msgid "Power"
103msgid "Power"
122msgstr "Napajanje"
104msgstr "Napajanje"
123
105
124−#: qml/Components/Dialogs.qml:233
106+#: qml/Components/Dialogs.qml:199
125msgid ""
107msgid ""
126"Are you sure you would like\n"
108"Are you sure you would like\n"
127"to power off?"
109"to power off?"
@@ -129,12 +111,12 @@ msgstr ""
129"Da li ste sigurni da želite\n"
111"Da li ste sigurni da želite\n"
130"isključiti?"
112"isključiti?"
131
113
132−#: qml/Components/Dialogs.qml:235
114+#: qml/Components/Dialogs.qml:201
133msgctxt "Button: Power off the system"
115msgctxt "Button: Power off the system"
134msgid "Power off"
116msgid "Power off"
135msgstr "Isključi"
117msgstr "Isključi"
136
118
137−#: qml/Components/Dialogs.qml:244
119+#: qml/Components/Dialogs.qml:210
138msgctxt "Button: Restart the system"
120msgctxt "Button: Restart the system"
139msgid "Restart"
121msgid "Restart"
140msgstr "Restartuj"
122msgstr "Restartuj"
@@ -179,42 +161,58 @@ msgstr "Ponovo poveži sada"
179msgid "Close all"
161msgid "Close all"
180msgstr "Zatvori sve"
162msgstr "Zatvori sve"
181
163
182−#: qml/Dash/DashPageHeader.qml:270
164+#: qml/Dash/DashPageHeader.qml:337
183msgctxt "Button: Open the Ubuntu Store"
165msgctxt "Button: Open the Ubuntu Store"
184msgid "Store"
166msgid "Store"
185msgstr "Trgovina"
167msgstr "Trgovina"
186
168
187−#: qml/Dash/DashPageHeader.qml:277
169+#: qml/Dash/DashPageHeader.qml:344
188msgctxt "Button: Start a search in the current dash scope"
170msgctxt "Button: Start a search in the current dash scope"
189msgid "Search"
171msgid "Search"
190msgstr "Pretraživanje"
172msgstr "Pretraživanje"
191
173
192−#: qml/Dash/DashPageHeader.qml:287
174+#: qml/Dash/DashPageHeader.qml:354
193msgctxt "Button: Show the current dash scope settings"
175msgctxt "Button: Show the current dash scope settings"
194msgid "Settings"
176msgid "Settings"
195msgstr "Podešavanja"
177msgstr "Podešavanja"
196
178
197−#: qml/Dash/DashPageHeader.qml:294
179+#: qml/Dash/DashPageHeader.qml:361
198msgid "Remove from Favorites"
180msgid "Remove from Favorites"
199msgstr "Ukloni iz Omiljenih"
181msgstr "Ukloni iz Omiljenih"
200
182
201−#: qml/Dash/DashPageHeader.qml:294
183+#: qml/Dash/DashPageHeader.qml:361
202msgid "Add to Favorites"
184msgid "Add to Favorites"
203msgstr "Dodaj u Omiljene"
185msgstr "Dodaj u Omiljene"
204
186
187+#: qml/Dash/FiltersPopover.qml:60
188+msgid "Refine your results"
189+msgstr ""
190+
191+#: qml/Dash/FiltersPopover.qml:69
192+msgid "Reset"
193+msgstr ""
194+
205−#: qml/Dash/GenericScopeView.qml:567 qml/Dash/GenericScopeView.qml:725
195+#: qml/Dash/GenericScopeView.qml:570 qml/Dash/GenericScopeView.qml:755
206msgid "See less"
196msgid "See less"
207msgstr "Pogledati manje"
197msgstr "Pogledati manje"
208
198
209−#: qml/Dash/GenericScopeView.qml:567
199+#: qml/Dash/GenericScopeView.qml:570
210msgid "See all"
200msgid "See all"
211msgstr "Pogledati sve"
201msgstr "Pogledati sve"
212
202
213−#: qml/Dash/GenericScopeView.qml:629
203+#: qml/Dash/GenericScopeView.qml:627
214msgctxt "Label: Hint for dash search line edit"
204msgctxt "Label: Hint for dash search line edit"
215msgid "Search"
205msgid "Search"
216msgstr "Pretraži"
206msgstr "Pretraži"
217
207
208+#: qml/Dash/PageHeaderExtraPanel.qml:55
209+msgid "Recent Searches"
210+msgstr ""
211+
212+#: qml/Dash/PageHeaderExtraPanel.qml:66
213+msgid "Clear All"
214+msgstr ""
215+
218#: qml/Dash/Previews/PreviewActionCombo.qml:35
216#: qml/Dash/Previews/PreviewActionCombo.qml:35
219msgid "More..."
217msgid "More..."
220msgstr "Više..."
218msgstr "Više..."
@@ -282,11 +280,11 @@ msgstr "Ponovi"
282msgid "Tap to unlock"
280msgid "Tap to unlock"
283msgstr "Kucnite za otključavanje"
281msgstr "Kucnite za otključavanje"
284
282
285−#: qml/Greeter/NarrowView.qml:54 qml/Wizard/Pages/passwd-confirm.qml:53
283+#: qml/Greeter/NarrowView.qml:54
286msgid "Sorry, incorrect passphrase."
284msgid "Sorry, incorrect passphrase."
287msgstr "Izvinite, pogrešna pristupna fraza."
285msgstr "Izvinite, pogrešna pristupna fraza."
288
286
289−#: qml/Greeter/NarrowView.qml:55 qml/Wizard/Pages/passwd-confirm.qml:54
287+#: qml/Greeter/NarrowView.qml:55
290msgid "Sorry, incorrect passcode."
288msgid "Sorry, incorrect passcode."
291msgstr "Izvinite, pogrešan pristupni kod."
289msgstr "Izvinite, pogrešan pristupni kod."
292
290
@@ -315,7 +313,7 @@ msgstr ""
315msgid "Enter %1"
313msgid "Enter %1"
316msgstr "Unesite %1"
314msgstr "Unesite %1"
317
315
318−#: qml/Greeter/NarrowView.qml:117 qml/Wizard/Pages/passwd-set.qml:60
316+#: qml/Greeter/NarrowView.qml:117
319msgid "Enter passphrase"
317msgid "Enter passphrase"
320msgstr "Unesite propusnu frazu"
318msgstr "Unesite propusnu frazu"
321
319
@@ -353,11 +351,11 @@ msgstr "Kucnite da uzvratite poziv..."
353msgid "Conference"
351msgid "Conference"
354msgstr "Savjetovanje"
352msgstr "Savjetovanje"
355
353
356−#: qml/Panel/Indicators/MenuItemFactory.qml:752
354+#: qml/Panel/Indicators/MenuItemFactory.qml:761
357msgid "Nothing is playing"
355msgid "Nothing is playing"
358msgstr "Ništa nije pokrenuto"
356msgstr "Ništa nije pokrenuto"
359
357
360−#: qml/Panel/Indicators/MenuItemFactory.qml:881
358+#: qml/Panel/Indicators/MenuItemFactory.qml:890
361#, qt-format
359#, qt-format
362msgid "%1 hour"
360msgid "%1 hour"
363msgid_plural "%1 hours"
361msgid_plural "%1 hours"
@@ -365,7 +363,7 @@ msgstr[0] "%1 sat"
365msgstr[1] "%1 sata"
363msgstr[1] "%1 sata"
366msgstr[2] "%1 sati"
364msgstr[2] "%1 sati"
367
365
368−#: qml/Panel/Indicators/MenuItemFactory.qml:885
366+#: qml/Panel/Indicators/MenuItemFactory.qml:894
369#, qt-format
367#, qt-format
370msgid "%1 minute"
368msgid "%1 minute"
371msgid_plural "%1 minutes"
369msgid_plural "%1 minutes"
@@ -373,7 +371,7 @@ msgstr[0] "%1 minut"
373msgstr[1] "%1 minuta"
371msgstr[1] "%1 minuta"
374msgstr[2] "%1 minuta"
372msgstr[2] "%1 minuta"
375
373
376−#: qml/Panel/Indicators/MenuItemFactory.qml:890
374+#: qml/Panel/Indicators/MenuItemFactory.qml:899
377#, qt-format
375#, qt-format
378msgid "%1 second"
376msgid "%1 second"
379msgid_plural "%1 seconds"
377msgid_plural "%1 seconds"
@@ -381,37 +379,37 @@ msgstr[0] "%1 sekunda"
381msgstr[1] "%1 sekunde"
379msgstr[1] "%1 sekunde"
382msgstr[2] "%1 sekundi"
380msgstr[2] "%1 sekundi"
383
381
384−#: qml/Panel/Indicators/MenuItemFactory.qml:893
382+#: qml/Panel/Indicators/MenuItemFactory.qml:902
385msgid "0 seconds"
383msgid "0 seconds"
386msgstr "0 sekundi"
384msgstr "0 sekundi"
387
385
388#. Translators: String like "1 hour, 2 minutes, 3 seconds remaining"
386#. Translators: String like "1 hour, 2 minutes, 3 seconds remaining"
389−#: qml/Panel/Indicators/MenuItemFactory.qml:895
387+#: qml/Panel/Indicators/MenuItemFactory.qml:904
390#, qt-format
388#, qt-format
391msgid "%1 remaining"
389msgid "%1 remaining"
392msgstr "%1 preostalo"
390msgstr "%1 preostalo"
393
391
394−#: qml/Panel/Indicators/MenuItemFactory.qml:901
392+#: qml/Panel/Indicators/MenuItemFactory.qml:910
395msgid "In queue…"
393msgid "In queue…"
396msgstr "U red..."
394msgstr "U red..."
397
395
398−#: qml/Panel/Indicators/MenuItemFactory.qml:905
396+#: qml/Panel/Indicators/MenuItemFactory.qml:914
399msgid "Downloading"
397msgid "Downloading"
400msgstr "Preuzimanje"
398msgstr "Preuzimanje"
401
399
402−#: qml/Panel/Indicators/MenuItemFactory.qml:907
400+#: qml/Panel/Indicators/MenuItemFactory.qml:916
403msgid "Paused, tap to resume"
401msgid "Paused, tap to resume"
404msgstr "Pauzirano, kucnuti za nastavak"
402msgstr "Pauzirano, kucnuti za nastavak"
405
403
406−#: qml/Panel/Indicators/MenuItemFactory.qml:909
404+#: qml/Panel/Indicators/MenuItemFactory.qml:918
407msgid "Canceled"
405msgid "Canceled"
408msgstr "Otkazano"
406msgstr "Otkazano"
409
407
410−#: qml/Panel/Indicators/MenuItemFactory.qml:911
408+#: qml/Panel/Indicators/MenuItemFactory.qml:920
411msgid "Finished"
409msgid "Finished"
412msgstr "Završeno"
410msgstr "Završeno"
413
411
414−#: qml/Panel/Indicators/MenuItemFactory.qml:913
412+#: qml/Panel/Indicators/MenuItemFactory.qml:922
415msgid "Failed, tap to retry"
413msgid "Failed, tap to retry"
416msgstr "Neuspjelo, kucnuti za ponavljanje"
414msgstr "Neuspjelo, kucnuti za ponavljanje"
417
415
@@ -431,252 +429,324 @@ msgctxt "Button: Call back on phone"
431msgid "Call back"
429msgid "Call back"
432msgstr "Uzvrati poziv"
430msgstr "Uzvrati poziv"
433
431
434−#: qml/Tutorial/TutorialBottom.qml:28
432+#: qml/Stages/SideStage.qml:76
435−msgid "Open special menus"
433+msgid "Drag using 3 fingers any application from one window to the other"
436−msgstr "Otvorite posebne menije"
434+msgstr ""
437−
438−#: qml/Tutorial/TutorialBottom.qml:29
439−msgid "Swipe up from the bottom edge."
440−msgstr "Prevucite od donje ivice."
441
435
442−#: qml/Tutorial/TutorialBottomFinish.qml:24
436+#: qml/Tutorial/TutorialBottom.qml:78
443−msgid "This action does different things for different apps"
437+msgid "Swipe up to add a contact"
444−msgstr "Ova radnja čini različite stvari za različite aplikacije"
438+msgstr ""
445
439
446−#: qml/Tutorial/TutorialBottomFinish.qml:25
440+#: qml/Tutorial/TutorialBottom.qml:80
447−msgid "Tap here to finish."
441+msgid "Swipe up for favorite calculations"
448−msgstr "Kucnite ovdje za kraj."
442+msgstr ""
449
443
450−#: qml/Tutorial/TutorialContent.qml:80 qml/Tutorial/TutorialLeftFinish.qml:25
444+#: qml/Tutorial/TutorialBottom.qml:82
451−#: qml/Tutorial/TutorialRight.qml:144
445+msgid "Swipe up for recent calls"
452−msgid "Tap here to continue."
446+msgstr ""
453−msgstr "Kucnite ovdje za nastavak."
454
447
455−#: qml/Tutorial/TutorialLeft.qml:26
448+#: qml/Tutorial/TutorialBottom.qml:84
456−msgid "Open the launcher"
449+msgid "Swipe up to create a message"
457−msgstr "Otvorite pokretač"
450+msgstr ""
458
451
459−#: qml/Tutorial/TutorialLeft.qml:27
452+#: qml/Tutorial/TutorialBottom.qml:85
460−msgid "Short swipe from the left edge."
453+msgid "Swipe up to manage the app"
461−msgstr "Kratko prevlačenje od lijeve ivice."
454+msgstr ""
462
455
463−#: qml/Tutorial/TutorialLeftFinish.qml:24
456+#: qml/Tutorial/TutorialLeft.qml:47
464−msgid "These are the shortcuts to favorite apps"
457+msgid "Swipe from the left edge to open the launcher"
465−msgstr "Ovo su kratice za omiljene aplikacije"
458+msgstr ""
466
459
467−#: qml/Tutorial/TutorialPage.qml:178
460+#: qml/Tutorial/TutorialLeftLong.qml:47
468−msgid "You almost got it!"
461+msgid "Long swipe from the left edge to open the Today scope"
469−msgstr "Skoro ste uspjeli!"
462+msgstr ""
470
463
471−#: qml/Tutorial/TutorialPage.qml:195
464+#: qml/Tutorial/TutorialRight.qml:54
472−msgid "Try again."
465+msgid "Hover your mouse on the right edge to view your open apps"
473−msgstr "Pokušajte ponovo."
466+msgstr ""
474
467
475−#: qml/Tutorial/TutorialRight.qml:31
468+#: qml/Tutorial/TutorialRight.qml:55
476−msgid "To view open apps"
469+msgid "Short or long swipe from the right edge to view your open apps"
477−msgstr "Za pregled pokrenutih aplikacija"
470+msgstr ""
478
471
479−#: qml/Tutorial/TutorialRight.qml:32
472+#: qml/Tutorial/TutorialTop.qml:53
480−msgid "Long swipe from the right edge."
473+msgid "Swipe from the top right edge to open the notification bar"
481−msgstr "Dugo prevlačenje od desne ivice."
474+msgstr ""
482
475
483−#: qml/Tutorial/TutorialRight.qml:122
476+#: qml/Tutorial/TutorialTop.qml:54
484−msgid "View all your running tasks."
477+msgid "Swipe from the top edge to open the notification bar"
485−msgstr "Pogledajte sve pokrenute zadatke."
478+msgstr ""
486
479
487−#: qml/Wizard/Page.qml:89
480+#: qml/Wizard/Page.qml:54
488msgctxt "Button: Go back one page in the Wizard"
481msgctxt "Button: Go back one page in the Wizard"
489msgid "Back"
482msgid "Back"
490msgstr "Nazad"
483msgstr "Nazad"
491
484
492#: qml/Wizard/Pages/10-welcome.qml:27
485#: qml/Wizard/Pages/10-welcome.qml:27
493−msgid "Hi!"
486+msgid "Language"
494−msgstr "Ćao!"
487+msgstr ""
495
488
496−#: qml/Wizard/Pages/10-welcome.qml:44
489+#: qml/Wizard/Pages/10-welcome.qml:156 qml/Wizard/Pages/30-wifi.qml:206
497−msgid "Welcome to your Ubuntu device."
490+#: qml/Wizard/Pages/40-location.qml:271 qml/Wizard/Pages/50-timezone.qml:267
491+#: qml/Wizard/Pages/60-account.qml:65 qml/Wizard/Pages/70-passwd-type.qml:144
492+#: qml/Wizard/Pages/75-report-check.qml:84
493+#: qml/Wizard/Pages/passcode-desktop.qml:124
494+#: qml/Wizard/Pages/password-set.qml:141
495+msgid "Next"
498msgstr ""
496msgstr ""
499
497
500−#: qml/Wizard/Pages/10-welcome.qml:52
498+#: qml/Wizard/Pages/30-wifi.qml:29
501−msgid "Let’s get started."
499+msgid "Connect to Wi‑Fi"
502−msgstr "Započnimo"
500+msgstr "Povezati na Wi-Fi"
503
501
504−#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:133
502+#: qml/Wizard/Pages/30-wifi.qml:130
505−#: qml/Wizard/Pages/40-wifi.qml:215 qml/Wizard/Pages/50-location.qml:131
503+msgid "Connected"
506−#: qml/Wizard/Pages/60-reporting.qml:60 qml/Wizard/Pages/passwd-confirm.qml:82
507−#: qml/Wizard/Pages/passwd-set.qml:90
508−msgid "Continue"
509−msgstr "Nastavite"
504+msgstr ""
510
505
511−#: qml/Wizard/Pages/20-sim.qml:25
506+#: qml/Wizard/Pages/30-wifi.qml:163
512−msgid "Add a SIM card and restart your device"
507+msgid "Available Wi-Fi networks"
513−msgstr "Dodajte SIM karticu i restartujte vaš uređaj"
508+msgstr ""
514
509
515−#: qml/Wizard/Pages/20-sim.qml:59
510+#: qml/Wizard/Pages/30-wifi.qml:164
516−msgid "Without it, you won’t be able to make calls or use text messaging."
511+msgid "No available Wi-Fi networks"
517msgstr ""
512msgstr ""
518−"Bez nje, nećete biti u mogućnosti da uspostavite pozive ili koristite "
519−"tekstualne poruke."
520
513
521−#: qml/Wizard/Pages/20-sim.qml:73 qml/Wizard/Pages/40-wifi.qml:215
514+#: qml/Wizard/Pages/30-wifi.qml:206 qml/Wizard/Pages/60-account.qml:65
515+#: qml/Wizard/Pages/sim.qml:101
522msgid "Skip"
516msgid "Skip"
523msgstr "Preskočite"
517msgstr "Preskočite"
524
518
525−#: qml/Wizard/Pages/30-passwd-type.qml:39
519+#: qml/Wizard/Pages/40-location.qml:27
526−msgid "Lock security"
520+msgid "Location Services"
527−msgstr "Sigurnost zaključavanja"
521+msgstr ""
528
522
529−#: qml/Wizard/Pages/30-passwd-type.qml:79
523+#: qml/Wizard/Pages/40-location.qml:83
530−msgid "Please select how you’d like to unlock your device."
524+msgid ""
525+"Use GPS, Wi-Fi hotspots and mobile network anonymously to detect location "
526+"(recommended)"
531msgstr ""
527msgstr ""
532
528
533−#: qml/Wizard/Pages/30-passwd-type.qml:102
529+#: qml/Wizard/Pages/40-location.qml:105
534−msgctxt "Label: Type of security method"
530+#, qt-format
535−msgid "Swipe"
531+msgid "By selecting this option you agree to the Nokia HERE %1."
536−msgstr "Prevlačenje"
532+msgstr ""
537
533
538−#: qml/Wizard/Pages/30-passwd-type.qml:103
534+#: qml/Wizard/Pages/40-location.qml:106
539−msgctxt "Label: Description of security method"
535+msgctxt "part of: Nokia HERE terms and conditions"
540−msgid "No security"
536+msgid "terms and conditions"
541−msgstr "Bez sigurnosti"
537+msgstr ""
538+
539+#: qml/Wizard/Pages/40-location.qml:160
540+msgid "GPS only"
541+msgstr ""
542+
543+#: qml/Wizard/Pages/40-location.qml:214
544+msgid "Don't use my location"
545+msgstr ""
546+
547+#: qml/Wizard/Pages/40-location.qml:260
548+msgid "You can change it later in System Settings."
549+msgstr ""
550+
551+#: qml/Wizard/Pages/50-timezone.qml:29
552+msgid "Time Zone"
553+msgstr ""
542
554
543−#: qml/Wizard/Pages/30-passwd-type.qml:105
555+#: qml/Wizard/Pages/50-timezone.qml:178
556+msgid "Enter your city"
557+msgstr ""
558+
559+#: qml/Wizard/Pages/60-account.qml:24
560+msgid "Personalize Your Device"
561+msgstr ""
562+
563+#: qml/Wizard/Pages/60-account.qml:48
564+msgid "Preferred Name"
565+msgstr ""
566+
567+#: qml/Wizard/Pages/70-passwd-type.qml:39
568+msgid "Lock Screen"
569+msgstr ""
570+
571+#: qml/Wizard/Pages/70-passwd-type.qml:101
544msgctxt "Label: Type of security method"
572msgctxt "Label: Type of security method"
545−msgid "Passcode"
573+msgid "Create new password"
546−msgstr "Pristupni kod"
574+msgstr ""
547
575
548−#: qml/Wizard/Pages/30-passwd-type.qml:106
576+#: qml/Wizard/Pages/70-passwd-type.qml:103
549−msgctxt "Label: Description of security method"
577+msgctxt "Label: Type of security method"
550−msgid "4 digits only"
578+msgid "Create passcode (numbers only)"
551−msgstr "samo 4 cifre"
579+msgstr ""
552
580
553−#: qml/Wizard/Pages/30-passwd-type.qml:108
581+#: qml/Wizard/Pages/70-passwd-type.qml:105
554msgctxt "Label: Type of security method"
582msgctxt "Label: Type of security method"
555−msgid "Passphrase"
583+msgid "No lock code"
556−msgstr "Pristupna fraza"
584+msgstr ""
557
585
558−#: qml/Wizard/Pages/30-passwd-type.qml:109
586+#: qml/Wizard/Pages/75-report-check.qml:26 qml/Wizard/Pages/here-terms.qml:108
559−msgctxt "Label: Description of security method"
587+msgid "Privacy Policy"
560−msgid "Numbers and letters"
561−msgstr "Brojevi i slova"
588+msgstr ""
562
589
563−#: qml/Wizard/Pages/40-wifi.qml:29
590+#: qml/Wizard/Pages/75-report-check.qml:26
564−msgid "Connect to Wi‑Fi"
591+msgid "Help Us Improve"
565−msgstr "Povezati na Wi-Fi"
592+msgstr ""
566
593
567−#: qml/Wizard/Pages/40-wifi.qml:168
594+#: qml/Wizard/Pages/75-report-check.qml:59
568−msgid "Available networks…"
595+msgid "Improve system performance by sending us crashes and error reports."
569−msgstr "Dostupne mreže..."
596+msgstr ""
570
597
571−#: qml/Wizard/Pages/40-wifi.qml:169
598+#: qml/Wizard/Pages/75-report-check.qml:60
572−msgid "No available networks."
599+msgid "Privacy policy"
573−msgstr "Nema dostupnih mreža."
600+msgstr ""
574
601
575−#: qml/Wizard/Pages/50-location.qml:27
602+#: qml/Wizard/Pages/80-finished.qml:89
576−msgid "Location"
603+msgid "Welcome to Ubuntu"
577−msgstr "Lokacija"
604+msgstr ""
578
605
579−#: qml/Wizard/Pages/50-location.qml:62
606+#: qml/Wizard/Pages/80-finished.qml:104
580−msgid "Let the phone detect your location:"
607+msgid "You are ready to use your device now"
581−msgstr "Dopustite da telefon otkrije Vašu lokaciju:"
608+msgstr ""
609+
610+#: qml/Wizard/Pages/80-finished.qml:124
611+msgid "Get Started"
612+msgstr ""
613+
614+#: qml/Wizard/Pages/here-terms.qml:25
615+msgid "Terms & Conditions"
616+msgstr "Uslovi i odredbe"
582
617
583−#: qml/Wizard/Pages/50-location.qml:69
618+#: qml/Wizard/Pages/here-terms.qml:69
584−msgid "Using GPS only (less accurate)"
619+msgid "Your device uses positioning technologies provided by HERE."
585−msgstr "Samo pomoću GPS (manje precizno)"
620+msgstr ""
586
621
587−#: qml/Wizard/Pages/50-location.qml:86
622+#: qml/Wizard/Pages/here-terms.qml:81
588−msgid "Using GPS, anonymized Wi-Fi and cellular network info (recommended)"
623+msgid ""
589−msgstr "Pomoću GPS, anonimnog Wi-Fi i podataka mobilne mreže (preporučeno)"
624+"To provide you with positioning services and to improve their quality, HERE "
625+"collects information about nearby cell towers and Wi-Fi hotspots around your "
626+"current location whenever your position is being found."
627+msgstr ""
590
628
591−#. Translators: HERE is a trademark for Nokia's location service, you probably shouldn't translate it
592−#: qml/Wizard/Pages/50-location.qml:103
629+#: qml/Wizard/Pages/here-terms.qml:93
593msgid ""
630msgid ""
594−"By selecting this option you agree to the Nokia HERE <a href='#'>terms and "
631+"The information collected is used to analyze the service and to improve the "
595−"conditions</a>."
632+"use of service, but not to identify you personally."
596msgstr ""
633msgstr ""
597−"Birajući ovu opciju prihvatate za Nokia OVDJE <a href='#'>terms and "
598−"conditions</a>."
599
634
600−#: qml/Wizard/Pages/50-location.qml:112
635+#: qml/Wizard/Pages/here-terms.qml:106
601−msgid "Not at all"
636+#, qt-format
637+msgid "By continuing, you agree to the HERE platform %1 and %2."
602−msgstr "Nipošto"
638+msgstr ""
603
639
604−#: qml/Wizard/Pages/50-location.qml:124
640+#: qml/Wizard/Pages/here-terms.qml:107
605−msgid "You can change your mind later in <b>System Settings</b>."
641+msgid "Service Terms"
606−msgstr "Možete se predomisliti kasnije u <b>System Settings</b>."
642+msgstr ""
607
643
608−#: qml/Wizard/Pages/60-reporting.qml:26
644+#: qml/Wizard/Pages/passcode-confirm.qml:43
609−msgid "Improving your experience"
645+#: qml/Wizard/Pages/passcode-desktop.qml:80
610−msgstr "Poboljšavajući vaše iskustvo"
646+msgid "Confirm passcode"
647+msgstr "Potvrdi pristupni kod"
611
648
612−#: qml/Wizard/Pages/60-reporting.qml:46
649+#: qml/Wizard/Pages/passcode-confirm.qml:45
613−msgid ""
650+msgid "Incorrect passcode."
614−"Your phone is set up to automatically report errors to Canonical and its "
615−"partners, the makers of the operating system."
616msgstr ""
651msgstr ""
617−"Vaš telefon je podešen da automatski prijavljuje greške Canonical i "
618−"njegovim partnerima, tvorcima operativnog sistema."
619
652
620−#: qml/Wizard/Pages/60-reporting.qml:53
653+#: qml/Wizard/Pages/passcode-confirm.qml:45
621−msgid ""
654+msgctxt "Enter the passcode again"
622−"This can be disabled in <b>System Settings</b> under <b>Security &amp; "
655+msgid "Please re-enter."
623−"Privacy</b>"
656+msgstr ""
657+
658+#: qml/Wizard/Pages/passcode-desktop.qml:30
659+msgid "Lock Screen Passcode"
624msgstr ""
660msgstr ""
625−"Ovo može biti isključeno u <b>System Settings</b> under <b>Security &amp; "
626−"Privacy</b>"
627
661
628−#: qml/Wizard/Pages/80-finished.qml:24
662+#: qml/Wizard/Pages/passcode-desktop.qml:56
629−msgid "All done"
663+msgid "Enter 4 numbers to setup your passcode"
630−msgstr "Sve urađeno"
664+msgstr ""
631
665
632−#: qml/Wizard/Pages/80-finished.qml:39
666+#: qml/Wizard/Pages/passcode-desktop.qml:65
633−msgid "Nice work!"
667+#: qml/Wizard/Pages/passcode-set.qml:54
668+msgid "Choose passcode"
634−msgstr "Dobro urađeno!"
669+msgstr ""
635
670
636−#: qml/Wizard/Pages/80-finished.qml:46
671+#: qml/Wizard/Pages/passcode-desktop.qml:105
637−msgid "Your device is now ready to use."
672+msgid "Passcode too short"
638msgstr ""
673msgstr ""
639
674
640−#: qml/Wizard/Pages/80-finished.qml:53
675+#: qml/Wizard/Pages/passcode-desktop.qml:107
641−msgid "Finish"
676+msgid "Passcodes match"
642−msgstr "Završiti"
677+msgstr ""
643
678
644−#: qml/Wizard/Pages/here-terms.qml:27
679+#: qml/Wizard/Pages/passcode-desktop.qml:109
645−msgid "Terms & Conditions"
680+msgid "Passcodes do not match"
646−msgstr "Uslovi i odredbe"
681+msgstr ""
647
682
648−#: qml/Wizard/Pages/passwd-confirm.qml:49
683+#: qml/Wizard/Pages/passcode-set.qml:62
649−msgid "Confirm passphrase"
684+msgid "Passcode must be 4 characters long"
650−msgstr "Potvrditi pristupnu rečenicu"
685+msgstr ""
651
686
652−#: qml/Wizard/Pages/passwd-confirm.qml:50
687+#: qml/Wizard/Pages/password-set.qml:30
653−msgid "Confirm passcode"
688+msgid "Lock Screen Password"
654−msgstr "Potvrdi pristupni kod"
689+msgstr ""
655
690
656−#: qml/Wizard/Pages/passwd-confirm.qml:53
691+#: qml/Wizard/Pages/password-set.qml:61
657−#: qml/Wizard/Pages/passwd-confirm.qml:54
692+msgid "Enter at least 8 characters"
658−msgid "Please try again."
693+msgstr ""
659−msgstr "Molimo pokušajte ponovo."
660
694
661−#: qml/Wizard/Pages/passwd-set.qml:61
695+#: qml/Wizard/Pages/password-set.qml:73
662−msgid "Choose your passcode"
696+msgid "Choose password"
663−msgstr "Izaberite vaš pristupni kod"
697+msgstr ""
664
698
665−#: qml/Wizard/Pages/passwd-set.qml:68
699+#: qml/Wizard/Pages/password-set.qml:103
666−msgid "Passphrase must be 4 characters long"
700+msgid "Confirm password"
667−msgstr "Pristupna fraza mora sadržavati 4 slova"
701+msgstr ""
668
702
669−#. Translators: This is the arrow for "Back" buttons
670−#: qml/Wizard/StackButton.qml:39
703+#: qml/Wizard/Pages/sim.qml:27
671−#, qt-format
704+msgid "No SIM card installed"
672−msgid "〈 %1"
673−msgstr "〈 %1"
705+msgstr ""
674
706
675−#. Translators: This is the arrow for "Forward" buttons
707+#: qml/Wizard/Pages/sim.qml:54
708+msgid "SIM card added"
709+msgstr ""
710+
711+#: qml/Wizard/Pages/sim.qml:55
712+msgid "You must restart the device to access the mobile network."
713+msgstr ""
714+
715+#: qml/Wizard/Pages/sim.qml:59
716+msgid "Restart"
717+msgstr ""
718+
676−#: qml/Wizard/StackButton.qml:42
719+#: qml/Wizard/Pages/sim.qml:78
677−#, qt-format
720+msgid "You won’t be able to make calls or use text messaging without a SIM."
678−msgid "%1 〉"
721+msgstr ""
722+
723+#: qml/Wizard/Pages/sim.qml:90
724+msgid "To proceed with no SIM tap Skip."
725+msgstr ""
726+
727+#: qml/Wizard/PasswordMeter.qml:87
728+msgid "Passwords match"
729+msgstr ""
730+
731+#: qml/Wizard/PasswordMeter.qml:89
732+msgid "Passwords do not match"
733+msgstr ""
734+
735+#: qml/Wizard/PasswordMeter.qml:93
736+msgid "Strong password"
679−msgstr "%1 〉"
737+msgstr ""
738+
739+#: qml/Wizard/PasswordMeter.qml:95
740+msgid "Fair password"
741+msgstr ""
742+
743+#: qml/Wizard/PasswordMeter.qml:97
744+msgid "Weak password"
745+msgstr ""
746+
747+#: qml/Wizard/PasswordMeter.qml:99
748+msgid "Very weak password"
749+msgstr ""
680
750
681#~ msgid "Top edge"
751#~ msgid "Top edge"
682#~ msgstr "Gornja ivica"
752#~ msgstr "Gornja ivica"
@@ -690,23 +760,195 @@ msgstr "%1 〉"
690#~ msgid "Right edge"
760#~ msgid "Right edge"
691#~ msgstr "Desna ivica"
761#~ msgstr "Desna ivica"
692
762
763+#~ msgid "Are you sure you want to shut down?"
764+#~ msgstr "Da li ste sigurni da želite ugasiti?"
765+
766+#~ msgctxt "Button: Shut down the system"
767+#~ msgid "Shut down"
768+#~ msgstr "Gašenje sistema"
769+
693#~ msgid "Please re-enter"
770#~ msgid "Please re-enter"
694#~ msgstr "Molimo ponovo unesite"
771#~ msgstr "Molimo ponovo unesite"
695
772
773+#~ msgid "This action does different things for different apps"
774+#~ msgstr "Ova radnja čini različite stvari za različite aplikacije"
775+
696#~ msgid "Unlock SIM"
776#~ msgid "Unlock SIM"
697#~ msgstr "Otključajte SIM"
777#~ msgstr "Otključajte SIM"
698
778
699#~ msgid "Roaming"
779#~ msgid "Roaming"
700#~ msgstr "Roaming"
780#~ msgstr "Roaming"
701
781
782+#~ msgid "Tap here to continue."
783+#~ msgstr "Kucnite ovdje za nastavak."
784+
785+#~ msgid "These are the shortcuts to favorite apps"
786+#~ msgstr "Ovo su kratice za omiljene aplikacije"
787+
788+#~ msgid "Swipe up from the bottom edge."
789+#~ msgstr "Prevucite od donje ivice."
790+
791+#~ msgid "Open special menus"
792+#~ msgstr "Otvorite posebne menije"
793+
794+#~ msgid "Tap here to finish."
795+#~ msgstr "Kucnite ovdje za kraj."
796+
797+#~ msgid "Long swipe from the right edge."
798+#~ msgstr "Dugo prevlačenje od desne ivice."
799+
800+#~ msgid "View all your running tasks."
801+#~ msgstr "Pogledajte sve pokrenute zadatke."
802+
803+#~ msgid "Hi!"
804+#~ msgstr "Ćao!"
805+
702#~ msgid "Welcome to your Ubuntu phone."
806#~ msgid "Welcome to your Ubuntu phone."
703#~ msgstr "Dobrodošli u vaš Ubuntu telefon."
807#~ msgstr "Dobrodošli u vaš Ubuntu telefon."
704
808
809+#~ msgid "To view open apps"
810+#~ msgstr "Za pregled pokrenutih aplikacija"
811+
812+#~ msgid "Try again."
813+#~ msgstr "Pokušajte ponovo."
814+
815+#~ msgid "You almost got it!"
816+#~ msgstr "Skoro ste uspjeli!"
817+
818+#~ msgid "Short swipe from the left edge."
819+#~ msgstr "Kratko prevlačenje od lijeve ivice."
820+
821+#~ msgid "Open the launcher"
822+#~ msgstr "Otvorite pokretač"
823+
824+#~ msgid "Lock security"
825+#~ msgstr "Sigurnost zaključavanja"
826+
827+#~ msgid "Without it, you won’t be able to make calls or use text messaging."
828+#~ msgstr ""
829+#~ "Bez nje, nećete biti u mogućnosti da uspostavite pozive ili koristite "
830+#~ "tekstualne poruke."
831+
832+#~ msgid "Add a SIM card and restart your device"
833+#~ msgstr "Dodajte SIM karticu i restartujte vaš uređaj"
834+
705#~ msgid "Please select how you’d like to unlock your phone."
835#~ msgid "Please select how you’d like to unlock your phone."
706#~ msgstr "Molimo izaberite kako biste željeli da otključavate vaš telefon."
836#~ msgstr "Molimo izaberite kako biste željeli da otključavate vaš telefon."
707
837
838+#~ msgctxt "Label: Description of security method"
839+#~ msgid "No security"
840+#~ msgstr "Bez sigurnosti"
841+
842+#~ msgctxt "Label: Type of security method"
843+#~ msgid "Swipe"
844+#~ msgstr "Prevlačenje"
845+
846+#~ msgctxt "Label: Type of security method"
847+#~ msgid "Passcode"
848+#~ msgstr "Pristupni kod"
849+
850+#~ msgid "Let’s get started."
851+#~ msgstr "Započnimo"
852+
853+#~ msgid "Continue"
854+#~ msgstr "Nastavite"
855+
856+#~ msgctxt "Label: Description of security method"
857+#~ msgid "4 digits only"
858+#~ msgstr "samo 4 cifre"
859+
860+#~ msgid "Let the phone detect your location:"
861+#~ msgstr "Dopustite da telefon otkrije Vašu lokaciju:"
862+
863+#~ msgid "Available networks…"
864+#~ msgstr "Dostupne mreže..."
865+
866+#~ msgid "No available networks."
867+#~ msgstr "Nema dostupnih mreža."
868+
869+#~ msgid "Location"
870+#~ msgstr "Lokacija"
871+
872+#~ msgid "Using GPS only (less accurate)"
873+#~ msgstr "Samo pomoću GPS (manje precizno)"
874+
875+#~ msgid "Using GPS, anonymized Wi-Fi and cellular network info (recommended)"
876+#~ msgstr "Pomoću GPS, anonimnog Wi-Fi i podataka mobilne mreže (preporučeno)"
877+
878+#~ msgctxt "Label: Description of security method"
879+#~ msgid "Numbers and letters"
880+#~ msgstr "Brojevi i slova"
881+
882+#~ msgid "Improving your experience"
883+#~ msgstr "Poboljšavajući vaše iskustvo"
884+
885+#~ msgid "You can change your mind later in <b>System Settings</b>."
886+#~ msgstr "Možete se predomisliti kasnije u <b>System Settings</b>."
887+
888+#~ msgid ""
889+#~ "This can be disabled in <b>System Settings</b> under <b>Security &amp; "
890+#~ "Privacy</b>"
891+#~ msgstr ""
892+#~ "Ovo može biti isključeno u <b>System Settings</b> under <b>Security &amp; "
893+#~ "Privacy</b>"
894+
895+#~ msgid ""
896+#~ "Your phone is set up to automatically report errors to Canonical and its "
897+#~ "partners, the makers of the operating system."
898+#~ msgstr ""
899+#~ "Vaš telefon je podešen da automatski prijavljuje greške Canonical i "
900+#~ "njegovim partnerima, tvorcima operativnog sistema."
901+
902+#~ msgid "Nice work!"
903+#~ msgstr "Dobro urađeno!"
904+
905+#~ msgid "All done"
906+#~ msgstr "Sve urađeno"
907+
908+#~ msgid "Finish"
909+#~ msgstr "Završiti"
910+
911+#~ msgid ""
912+#~ "By selecting this option you agree to the Nokia HERE <a href='#'>terms and "
913+#~ "conditions</a>."
914+#~ msgstr ""
915+#~ "Birajući ovu opciju prihvatate za Nokia OVDJE <a href='#'>terms and "
916+#~ "conditions</a>."
917+
918+#~ msgid "Not at all"
919+#~ msgstr "Nipošto"
920+
708#~ msgid "Your phone is now ready to use."
921#~ msgid "Your phone is now ready to use."
709#~ msgstr "Vaš telefon je sada spreman za upotrebu."
922#~ msgstr "Vaš telefon je sada spreman za upotrebu."
710
923
711−#~ msgid "Re-dock, save your work and close these apps to continue."
924+#~ msgid "Confirm passphrase"
712−#~ msgstr "Postavi opet, snimi svoj rad i zatvori ove aplikacije za nastavak."
925+#~ msgstr "Potvrditi pristupnu rečenicu"
926+
927+#, qt-format
928+#~ msgid "〈 %1"
929+#~ msgstr "〈 %1"
930+
931+#, qt-format
932+#~ msgid "%1 〉"
933+#~ msgstr "%1 〉"
934+
935+#~ msgid "Choose your passcode"
936+#~ msgstr "Izaberite vaš pristupni kod"
937+
938+#~ msgid "Please try again."
939+#~ msgstr "Molimo pokušajte ponovo."
940+
941+#~ msgid "Passphrase must be 4 characters long"
942+#~ msgstr "Pristupna fraza mora sadržavati 4 slova"
943+
944+#~ msgctxt "Label: Type of security method"
945+#~ msgid "Passphrase"
946+#~ msgstr "Pristupna fraza"
947+
948+#~ msgctxt "Title: Reboot/Shut down dialog"
949+#~ msgid "Shut down"
950+#~ msgstr "Ugasi"
951+
952+#~ msgctxt "Button: Reboot the system"
953+#~ msgid "Reboot"
954+#~ msgstr "Ponovo pokreni"
po/ca.po+477−240
@@ -7,7 +7,7 @@ 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: 2016-03-10 22:48+0000\n"
10+"POT-Creation-Date: 2016-03-23 10:01+0000\n"
11"PO-Revision-Date: 2015-07-04 09:48+0000\n"
11"PO-Revision-Date: 2015-07-04 09:48+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"
@@ -15,8 +15,8 @@ msgstr ""
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"Plural-Forms: nplurals=2; plural=n != 1;\n"
18−"X-Launchpad-Export-Date: 2016-03-13 05:50+0000\n"
18+"X-Launchpad-Export-Date: 2016-03-24 06:07+0000\n"
19−"X-Generator: Launchpad (build 17939)\n"
19+"X-Generator: Launchpad (build 17958)\n"
20
20
21#: plugins/IntegratedLightDM/Greeter.cpp:112
21#: plugins/IntegratedLightDM/Greeter.cpp:112
22msgid "Password: "
22msgid "Password: "
@@ -77,53 +77,35 @@ msgctxt "Button: Log out from the system"
77msgid "Log Out"
77msgid "Log Out"
78msgstr "Surt"
78msgstr "Surt"
79
79
80−#: qml/Components/Dialogs.qml:161 qml/Components/Dialogs.qml:194
80+#: qml/Components/Dialogs.qml:161 qml/Components/Dialogs.qml:219
81−#: qml/Components/Dialogs.qml:253
81+#: qml/Dash/DashPageHeader.qml:298 qml/Wizard/Pages/passcode-confirm.qml:32
82+#: qml/Wizard/Pages/passcode-set.qml:32
82msgid "Cancel"
83msgid "Cancel"
83msgstr "Cancel·la"
84msgstr "Cancel·la"
84
85
85#: qml/Components/Dialogs.qml:173
86#: qml/Components/Dialogs.qml:173
86−msgctxt "Title: Reboot/Shut down dialog"
87−msgid "Shut down"
88−msgstr "Apaga"
89−
90−#: qml/Components/Dialogs.qml:174
91−msgid "Are you sure you want to shut down?"
92−msgstr "Segur que voleu apagar?"
93−
94−#: qml/Components/Dialogs.qml:176
95−msgctxt "Button: Reboot the system"
96−msgid "Reboot"
97−msgstr "Reinicia"
98−
99−#: qml/Components/Dialogs.qml:185
100−msgctxt "Button: Shut down the system"
101−msgid "Shut down"
102−msgstr "Apaga"
103−
104−#: qml/Components/Dialogs.qml:207
105msgctxt "Title: Reboot dialog"
87msgctxt "Title: Reboot dialog"
106msgid "Reboot"
88msgid "Reboot"
107msgstr "Reinicia"
89msgstr "Reinicia"
108
90
109−#: qml/Components/Dialogs.qml:208
91+#: qml/Components/Dialogs.qml:174
110msgid "Are you sure you want to reboot?"
92msgid "Are you sure you want to reboot?"
111msgstr "Segur que voleu reiniciar?"
93msgstr "Segur que voleu reiniciar?"
112
94
113−#: qml/Components/Dialogs.qml:210
95+#: qml/Components/Dialogs.qml:176
114msgid "No"
96msgid "No"
115msgstr "No"
97msgstr "No"
116
98
117−#: qml/Components/Dialogs.qml:217
99+#: qml/Components/Dialogs.qml:183
118msgid "Yes"
100msgid "Yes"
119msgstr "Sí"
101msgstr "Sí"
120
102
121−#: qml/Components/Dialogs.qml:232
103+#: qml/Components/Dialogs.qml:198
122msgctxt "Title: Power off/Restart dialog"
104msgctxt "Title: Power off/Restart dialog"
123msgid "Power"
105msgid "Power"
124msgstr "Energia"
106msgstr "Energia"
125
107
126−#: qml/Components/Dialogs.qml:233
108+#: qml/Components/Dialogs.qml:199
127msgid ""
109msgid ""
128"Are you sure you would like\n"
110"Are you sure you would like\n"
129"to power off?"
111"to power off?"
@@ -131,12 +113,12 @@ msgstr ""
131"Segur que voleu\n"
113"Segur que voleu\n"
132"apagar?"
114"apagar?"
133
115
134−#: qml/Components/Dialogs.qml:235
116+#: qml/Components/Dialogs.qml:201
135msgctxt "Button: Power off the system"
117msgctxt "Button: Power off the system"
136msgid "Power off"
118msgid "Power off"
137msgstr "Apaga"
119msgstr "Apaga"
138
120
139−#: qml/Components/Dialogs.qml:244
121+#: qml/Components/Dialogs.qml:210
140msgctxt "Button: Restart the system"
122msgctxt "Button: Restart the system"
141msgid "Restart"
123msgid "Restart"
142msgstr "Reinicia"
124msgstr "Reinicia"
@@ -179,42 +161,58 @@ msgstr "Torna a connectar"
179msgid "Close all"
161msgid "Close all"
180msgstr "Tanca-ho tot"
162msgstr "Tanca-ho tot"
181
163
182−#: qml/Dash/DashPageHeader.qml:270
164+#: qml/Dash/DashPageHeader.qml:337
183msgctxt "Button: Open the Ubuntu Store"
165msgctxt "Button: Open the Ubuntu Store"
184msgid "Store"
166msgid "Store"
185msgstr "Botiga"
167msgstr "Botiga"
186
168
187−#: qml/Dash/DashPageHeader.qml:277
169+#: qml/Dash/DashPageHeader.qml:344
188msgctxt "Button: Start a search in the current dash scope"
170msgctxt "Button: Start a search in the current dash scope"
189msgid "Search"
171msgid "Search"
190msgstr "Cerca"
172msgstr "Cerca"
191
173
192−#: qml/Dash/DashPageHeader.qml:287
174+#: qml/Dash/DashPageHeader.qml:354
193msgctxt "Button: Show the current dash scope settings"
175msgctxt "Button: Show the current dash scope settings"
194msgid "Settings"
176msgid "Settings"
195msgstr "Paràmetres"
177msgstr "Paràmetres"
196
178
197−#: qml/Dash/DashPageHeader.qml:294
179+#: qml/Dash/DashPageHeader.qml:361
198msgid "Remove from Favorites"
180msgid "Remove from Favorites"
199msgstr "Suprimeix dels preferits"
181msgstr "Suprimeix dels preferits"
200
182
201−#: qml/Dash/DashPageHeader.qml:294
183+#: qml/Dash/DashPageHeader.qml:361
202msgid "Add to Favorites"
184msgid "Add to Favorites"
203msgstr "Afegeix als preferits"
185msgstr "Afegeix als preferits"
204
186
187+#: qml/Dash/FiltersPopover.qml:60
188+msgid "Refine your results"
189+msgstr ""
190+
191+#: qml/Dash/FiltersPopover.qml:69
192+msgid "Reset"
193+msgstr ""
194+
205−#: qml/Dash/GenericScopeView.qml:567 qml/Dash/GenericScopeView.qml:725
195+#: qml/Dash/GenericScopeView.qml:570 qml/Dash/GenericScopeView.qml:755
206msgid "See less"
196msgid "See less"
207msgstr "Mostra'n menys"
197msgstr "Mostra'n menys"
208
198
209−#: qml/Dash/GenericScopeView.qml:567
199+#: qml/Dash/GenericScopeView.qml:570
210msgid "See all"
200msgid "See all"
211msgstr "Mostra-ho tot"
201msgstr "Mostra-ho tot"
212
202
213−#: qml/Dash/GenericScopeView.qml:629
203+#: qml/Dash/GenericScopeView.qml:627
214msgctxt "Label: Hint for dash search line edit"
204msgctxt "Label: Hint for dash search line edit"
215msgid "Search"
205msgid "Search"
216msgstr "Cerca"
206msgstr "Cerca"
217
207
208+#: qml/Dash/PageHeaderExtraPanel.qml:55
209+msgid "Recent Searches"
210+msgstr ""
211+
212+#: qml/Dash/PageHeaderExtraPanel.qml:66
213+msgid "Clear All"
214+msgstr ""
215+
218#: qml/Dash/Previews/PreviewActionCombo.qml:35
216#: qml/Dash/Previews/PreviewActionCombo.qml:35
219msgid "More..."
217msgid "More..."
220msgstr "Més..."
218msgstr "Més..."
@@ -282,11 +280,11 @@ msgstr "Torna-ho a provar"
282msgid "Tap to unlock"
280msgid "Tap to unlock"
283msgstr "Feu un toc per desblocar"
281msgstr "Feu un toc per desblocar"
284
282
285−#: qml/Greeter/NarrowView.qml:54 qml/Wizard/Pages/passwd-confirm.qml:53
283+#: qml/Greeter/NarrowView.qml:54
286msgid "Sorry, incorrect passphrase."
284msgid "Sorry, incorrect passphrase."
287msgstr "La contrasenya és incorrecta"
285msgstr "La contrasenya és incorrecta"
288
286
289−#: qml/Greeter/NarrowView.qml:55 qml/Wizard/Pages/passwd-confirm.qml:54
287+#: qml/Greeter/NarrowView.qml:55
290msgid "Sorry, incorrect passcode."
288msgid "Sorry, incorrect passcode."
291msgstr "El codi d'accés no és correcte"
289msgstr "El codi d'accés no és correcte"
292
290
@@ -317,7 +315,7 @@ msgstr ""
317msgid "Enter %1"
315msgid "Enter %1"
318msgstr "Introduïu: %1"
316msgstr "Introduïu: %1"
319
317
320−#: qml/Greeter/NarrowView.qml:117 qml/Wizard/Pages/passwd-set.qml:60
318+#: qml/Greeter/NarrowView.qml:117
321msgid "Enter passphrase"
319msgid "Enter passphrase"
322msgstr "Introduïu la contrasenya"
320msgstr "Introduïu la contrasenya"
323
321
@@ -355,62 +353,62 @@ msgstr "Feu un toc per tornar a la trucada..."
355msgid "Conference"
353msgid "Conference"
356msgstr "Conferència"
354msgstr "Conferència"
357
355
358−#: qml/Panel/Indicators/MenuItemFactory.qml:752
356+#: qml/Panel/Indicators/MenuItemFactory.qml:761
359msgid "Nothing is playing"
357msgid "Nothing is playing"
360msgstr "No s'està reproduint res"
358msgstr "No s'està reproduint res"
361
359
362−#: qml/Panel/Indicators/MenuItemFactory.qml:881
360+#: qml/Panel/Indicators/MenuItemFactory.qml:890
363#, qt-format
361#, qt-format
364msgid "%1 hour"
362msgid "%1 hour"
365msgid_plural "%1 hours"
363msgid_plural "%1 hours"
366msgstr[0] "%1 hora"
364msgstr[0] "%1 hora"
367msgstr[1] "%1 hores"
365msgstr[1] "%1 hores"
368
366
369−#: qml/Panel/Indicators/MenuItemFactory.qml:885
367+#: qml/Panel/Indicators/MenuItemFactory.qml:894
370#, qt-format
368#, qt-format
371msgid "%1 minute"
369msgid "%1 minute"
372msgid_plural "%1 minutes"
370msgid_plural "%1 minutes"
373msgstr[0] "%1 minut"
371msgstr[0] "%1 minut"
374msgstr[1] "%1 minuts"
372msgstr[1] "%1 minuts"
375
373
376−#: qml/Panel/Indicators/MenuItemFactory.qml:890
374+#: qml/Panel/Indicators/MenuItemFactory.qml:899
377#, qt-format
375#, qt-format
378msgid "%1 second"
376msgid "%1 second"
379msgid_plural "%1 seconds"
377msgid_plural "%1 seconds"
380msgstr[0] "%1 segon"
378msgstr[0] "%1 segon"
381msgstr[1] "%1 segons"
379msgstr[1] "%1 segons"
382
380
383−#: qml/Panel/Indicators/MenuItemFactory.qml:893
381+#: qml/Panel/Indicators/MenuItemFactory.qml:902
384msgid "0 seconds"
382msgid "0 seconds"
385msgstr "0 segons"
383msgstr "0 segons"
386
384
387#. Translators: String like "1 hour, 2 minutes, 3 seconds remaining"
385#. Translators: String like "1 hour, 2 minutes, 3 seconds remaining"
388−#: qml/Panel/Indicators/MenuItemFactory.qml:895
386+#: qml/Panel/Indicators/MenuItemFactory.qml:904
389#, qt-format
387#, qt-format
390msgid "%1 remaining"
388msgid "%1 remaining"
391msgstr "Resta %1"
389msgstr "Resta %1"
392
390
393−#: qml/Panel/Indicators/MenuItemFactory.qml:901
391+#: qml/Panel/Indicators/MenuItemFactory.qml:910
394msgid "In queue…"
392msgid "In queue…"
395msgstr "A la cua..."
393msgstr "A la cua..."
396
394
397−#: qml/Panel/Indicators/MenuItemFactory.qml:905
395+#: qml/Panel/Indicators/MenuItemFactory.qml:914
398msgid "Downloading"
396msgid "Downloading"
399msgstr "S'està baixant"
397msgstr "S'està baixant"
400
398
401−#: qml/Panel/Indicators/MenuItemFactory.qml:907
399+#: qml/Panel/Indicators/MenuItemFactory.qml:916
402msgid "Paused, tap to resume"
400msgid "Paused, tap to resume"
403msgstr "En pausa, feu un toc per continuar"
401msgstr "En pausa, feu un toc per continuar"
404
402
405−#: qml/Panel/Indicators/MenuItemFactory.qml:909
403+#: qml/Panel/Indicators/MenuItemFactory.qml:918
406msgid "Canceled"
404msgid "Canceled"
407msgstr "S'ha cancel·lat"
405msgstr "S'ha cancel·lat"
408
406
409−#: qml/Panel/Indicators/MenuItemFactory.qml:911
407+#: qml/Panel/Indicators/MenuItemFactory.qml:920
410msgid "Finished"
408msgid "Finished"
411msgstr "S'ha finalitzat"
409msgstr "S'ha finalitzat"
412
410
413−#: qml/Panel/Indicators/MenuItemFactory.qml:913
411+#: qml/Panel/Indicators/MenuItemFactory.qml:922
414msgid "Failed, tap to retry"
412msgid "Failed, tap to retry"
415msgstr "Ha fallat, feu un toc per tornar-ho a intentar"
413msgstr "Ha fallat, feu un toc per tornar-ho a intentar"
416
414
@@ -430,253 +428,324 @@ msgctxt "Button: Call back on phone"
430msgid "Call back"
428msgid "Call back"
431msgstr "Retorna la trucada"
429msgstr "Retorna la trucada"
432
430
433−#: qml/Tutorial/TutorialBottom.qml:28
431+#: qml/Stages/SideStage.qml:76
434−msgid "Open special menus"
432+msgid "Drag using 3 fingers any application from one window to the other"
435−msgstr "Obre els menús especials"
433+msgstr ""
436−
437−#: qml/Tutorial/TutorialBottom.qml:29
438−msgid "Swipe up from the bottom edge."
439−msgstr "Llisqueu el dit des de la vora inferior."
440
434
441−#: qml/Tutorial/TutorialBottomFinish.qml:24
435+#: qml/Tutorial/TutorialBottom.qml:78
442−msgid "This action does different things for different apps"
436+msgid "Swipe up to add a contact"
443−msgstr "Aquesta acció fa coses diferents depenent de l'aplicació"
437+msgstr ""
444
438
445−#: qml/Tutorial/TutorialBottomFinish.qml:25
439+#: qml/Tutorial/TutorialBottom.qml:80
446−msgid "Tap here to finish."
440+msgid "Swipe up for favorite calculations"
447−msgstr "Feu un toc per finalitzar."
441+msgstr ""
448
442
449−#: qml/Tutorial/TutorialContent.qml:80 qml/Tutorial/TutorialLeftFinish.qml:25
443+#: qml/Tutorial/TutorialBottom.qml:82
450−#: qml/Tutorial/TutorialRight.qml:144
444+msgid "Swipe up for recent calls"
451−msgid "Tap here to continue."
445+msgstr ""
452−msgstr "Feu un toc per continuar."
453
446
454−#: qml/Tutorial/TutorialLeft.qml:26
447+#: qml/Tutorial/TutorialBottom.qml:84
455−msgid "Open the launcher"
448+msgid "Swipe up to create a message"
456−msgstr "Obre el llançador"
449+msgstr ""
457
450
458−#: qml/Tutorial/TutorialLeft.qml:27
451+#: qml/Tutorial/TutorialBottom.qml:85
459−msgid "Short swipe from the left edge."
452+msgid "Swipe up to manage the app"
460−msgstr "Lliscament curt des de la vora esquerra."
453+msgstr ""
461
454
462−#: qml/Tutorial/TutorialLeftFinish.qml:24
455+#: qml/Tutorial/TutorialLeft.qml:47
463−msgid "These are the shortcuts to favorite apps"
456+msgid "Swipe from the left edge to open the launcher"
464−msgstr "Aquestes són les dreceres a les aplicacions preferides"
457+msgstr ""
465
458
466−#: qml/Tutorial/TutorialPage.qml:178
459+#: qml/Tutorial/TutorialLeftLong.qml:47
467−msgid "You almost got it!"
460+msgid "Long swipe from the left edge to open the Today scope"
468−msgstr "Ja gairebé ho teniu!"
461+msgstr ""
469
462
470−#: qml/Tutorial/TutorialPage.qml:195
463+#: qml/Tutorial/TutorialRight.qml:54
471−msgid "Try again."
464+msgid "Hover your mouse on the right edge to view your open apps"
472−msgstr "Torneu-ho a provar."
465+msgstr ""
473
466
474−#: qml/Tutorial/TutorialRight.qml:31
467+#: qml/Tutorial/TutorialRight.qml:55
475−msgid "To view open apps"
468+msgid "Short or long swipe from the right edge to view your open apps"
476−msgstr "Per veure les aplicacions obertes"
469+msgstr ""
477
470
478−#: qml/Tutorial/TutorialRight.qml:32
471+#: qml/Tutorial/TutorialTop.qml:53
479−msgid "Long swipe from the right edge."
472+msgid "Swipe from the top right edge to open the notification bar"
480−msgstr "Lliscament llarg des de la vora dreta."
473+msgstr ""
481
474
482−#: qml/Tutorial/TutorialRight.qml:122
475+#: qml/Tutorial/TutorialTop.qml:54
483−msgid "View all your running tasks."
476+msgid "Swipe from the top edge to open the notification bar"
484−msgstr "Mostra totes les tasques en execució."
477+msgstr ""
485
478
486−#: qml/Wizard/Page.qml:89
479+#: qml/Wizard/Page.qml:54
487msgctxt "Button: Go back one page in the Wizard"
480msgctxt "Button: Go back one page in the Wizard"
488msgid "Back"
481msgid "Back"
489msgstr "Enrere"
482msgstr "Enrere"
490
483
491#: qml/Wizard/Pages/10-welcome.qml:27
484#: qml/Wizard/Pages/10-welcome.qml:27
492−msgid "Hi!"
485+msgid "Language"
493−msgstr "Hola!"
486+msgstr ""
494
487
495−#: qml/Wizard/Pages/10-welcome.qml:44
488+#: qml/Wizard/Pages/10-welcome.qml:156 qml/Wizard/Pages/30-wifi.qml:206
496−msgid "Welcome to your Ubuntu device."
489+#: qml/Wizard/Pages/40-location.qml:271 qml/Wizard/Pages/50-timezone.qml:267
490+#: qml/Wizard/Pages/60-account.qml:65 qml/Wizard/Pages/70-passwd-type.qml:144
491+#: qml/Wizard/Pages/75-report-check.qml:84
492+#: qml/Wizard/Pages/passcode-desktop.qml:124
493+#: qml/Wizard/Pages/password-set.qml:141
494+msgid "Next"
497msgstr ""
495msgstr ""
498
496
499−#: qml/Wizard/Pages/10-welcome.qml:52
497+#: qml/Wizard/Pages/30-wifi.qml:29
500−msgid "Let’s get started."
498+msgid "Connect to Wi‑Fi"
501−msgstr "Comencem."
499+msgstr "Connecta't a la Wi-Fi"
502
500
503−#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:133
501+#: qml/Wizard/Pages/30-wifi.qml:130
504−#: qml/Wizard/Pages/40-wifi.qml:215 qml/Wizard/Pages/50-location.qml:131
502+msgid "Connected"
505−#: qml/Wizard/Pages/60-reporting.qml:60 qml/Wizard/Pages/passwd-confirm.qml:82
506−#: qml/Wizard/Pages/passwd-set.qml:90
507−msgid "Continue"
508−msgstr "Continua"
503+msgstr ""
509
504
510−#: qml/Wizard/Pages/20-sim.qml:25
505+#: qml/Wizard/Pages/30-wifi.qml:163
511−msgid "Add a SIM card and restart your device"
506+msgid "Available Wi-Fi networks"
512−msgstr "Afegiu una targeta SIM i reinicieu el dispositiu"
507+msgstr ""
513
508
514−#: qml/Wizard/Pages/20-sim.qml:59
509+#: qml/Wizard/Pages/30-wifi.qml:164
515−msgid "Without it, you won’t be able to make calls or use text messaging."
510+msgid "No available Wi-Fi networks"
516−msgstr "Sense ella, no podreu fer trucades o enviar missatges de text."
511+msgstr ""
517
512
518−#: qml/Wizard/Pages/20-sim.qml:73 qml/Wizard/Pages/40-wifi.qml:215
513+#: qml/Wizard/Pages/30-wifi.qml:206 qml/Wizard/Pages/60-account.qml:65
514+#: qml/Wizard/Pages/sim.qml:101
519msgid "Skip"
515msgid "Skip"
520msgstr "Omet"
516msgstr "Omet"
521
517
522−#: qml/Wizard/Pages/30-passwd-type.qml:39
518+#: qml/Wizard/Pages/40-location.qml:27
523−msgid "Lock security"
519+msgid "Location Services"
524−msgstr "Seguretat del bloqueig"
520+msgstr ""
521+
522+#: qml/Wizard/Pages/40-location.qml:83
523+msgid ""
524+"Use GPS, Wi-Fi hotspots and mobile network anonymously to detect location "
525+"(recommended)"
526+msgstr ""
525
527
526−#: qml/Wizard/Pages/30-passwd-type.qml:79
528+#: qml/Wizard/Pages/40-location.qml:105
527−msgid "Please select how you’d like to unlock your device."
529+#, qt-format
530+msgid "By selecting this option you agree to the Nokia HERE %1."
528msgstr ""
531msgstr ""
529
532
530−#: qml/Wizard/Pages/30-passwd-type.qml:102
533+#: qml/Wizard/Pages/40-location.qml:106
531−msgctxt "Label: Type of security method"
534+msgctxt "part of: Nokia HERE terms and conditions"
532−msgid "Swipe"
535+msgid "terms and conditions"
533−msgstr "Lliscament amb el dit"
536+msgstr ""
534
537
535−#: qml/Wizard/Pages/30-passwd-type.qml:103
538+#: qml/Wizard/Pages/40-location.qml:160
536−msgctxt "Label: Description of security method"
539+msgid "GPS only"
537−msgid "No security"
538−msgstr "Sense seguretat"
540+msgstr ""
539
541
540−#: qml/Wizard/Pages/30-passwd-type.qml:105
542+#: qml/Wizard/Pages/40-location.qml:214
543+msgid "Don't use my location"
544+msgstr ""
545+
546+#: qml/Wizard/Pages/40-location.qml:260
547+msgid "You can change it later in System Settings."
548+msgstr ""
549+
550+#: qml/Wizard/Pages/50-timezone.qml:29
551+msgid "Time Zone"
552+msgstr ""
553+
554+#: qml/Wizard/Pages/50-timezone.qml:178
555+msgid "Enter your city"
556+msgstr ""
557+
558+#: qml/Wizard/Pages/60-account.qml:24
559+msgid "Personalize Your Device"
560+msgstr ""
561+
562+#: qml/Wizard/Pages/60-account.qml:48
563+msgid "Preferred Name"
564+msgstr ""
565+
566+#: qml/Wizard/Pages/70-passwd-type.qml:39
567+msgid "Lock Screen"
568+msgstr ""
569+
570+#: qml/Wizard/Pages/70-passwd-type.qml:101
541msgctxt "Label: Type of security method"
571msgctxt "Label: Type of security method"
542−msgid "Passcode"
572+msgid "Create new password"
543−msgstr "Codi d'accés"
573+msgstr ""
544
574
545−#: qml/Wizard/Pages/30-passwd-type.qml:106
575+#: qml/Wizard/Pages/70-passwd-type.qml:103
546−msgctxt "Label: Description of security method"
576+msgctxt "Label: Type of security method"
547−msgid "4 digits only"
577+msgid "Create passcode (numbers only)"
548−msgstr "Només 4 dígits"
578+msgstr ""
549
579
550−#: qml/Wizard/Pages/30-passwd-type.qml:108
580+#: qml/Wizard/Pages/70-passwd-type.qml:105
551msgctxt "Label: Type of security method"
581msgctxt "Label: Type of security method"
552−msgid "Passphrase"
582+msgid "No lock code"
583+msgstr ""
584+
585+#: qml/Wizard/Pages/75-report-check.qml:26 qml/Wizard/Pages/here-terms.qml:108
586+msgid "Privacy Policy"
553−msgstr "Contrasenya"
587+msgstr ""
554
588
555−#: qml/Wizard/Pages/30-passwd-type.qml:109
589+#: qml/Wizard/Pages/75-report-check.qml:26
556−msgctxt "Label: Description of security method"
590+msgid "Help Us Improve"
557−msgid "Numbers and letters"
558−msgstr "Números i lletres"
591+msgstr ""
559
592
560−#: qml/Wizard/Pages/40-wifi.qml:29
593+#: qml/Wizard/Pages/75-report-check.qml:59
561−msgid "Connect to Wi‑Fi"
594+msgid "Improve system performance by sending us crashes and error reports."
562−msgstr "Connecta't a la Wi-Fi"
595+msgstr ""
596+
597+#: qml/Wizard/Pages/75-report-check.qml:60
598+msgid "Privacy policy"
599+msgstr ""
563
600
564−#: qml/Wizard/Pages/40-wifi.qml:168
601+#: qml/Wizard/Pages/80-finished.qml:89
565−msgid "Available networks…"
602+msgid "Welcome to Ubuntu"
566−msgstr "Xarxes disponibles..."
603+msgstr ""
567
604
568−#: qml/Wizard/Pages/40-wifi.qml:169
605+#: qml/Wizard/Pages/80-finished.qml:104
569−msgid "No available networks."
606+msgid "You are ready to use your device now"
570−msgstr "No hi ha xarxes disponibles"
607+msgstr ""
571
608
572−#: qml/Wizard/Pages/50-location.qml:27
609+#: qml/Wizard/Pages/80-finished.qml:124
573−msgid "Location"
610+msgid "Get Started"
574−msgstr "Ubicació"
611+msgstr ""
575
612
576−#: qml/Wizard/Pages/50-location.qml:62
613+#: qml/Wizard/Pages/here-terms.qml:25
577−msgid "Let the phone detect your location:"
614+msgid "Terms & Conditions"
578−msgstr "Fes que el telèfon detecti la meva ubicació:"
615+msgstr "Condicions generals"
579
616
580−#: qml/Wizard/Pages/50-location.qml:69
617+#: qml/Wizard/Pages/here-terms.qml:69
581−msgid "Using GPS only (less accurate)"
618+msgid "Your device uses positioning technologies provided by HERE."
582−msgstr "Utilitza només el GPS (menys precís)"
619+msgstr ""
583
620
584−#: qml/Wizard/Pages/50-location.qml:86
621+#: qml/Wizard/Pages/here-terms.qml:81
585−msgid "Using GPS, anonymized Wi-Fi and cellular network info (recommended)"
622+msgid ""
623+"To provide you with positioning services and to improve their quality, HERE "
624+"collects information about nearby cell towers and Wi-Fi hotspots around your "
625+"current location whenever your position is being found."
586msgstr ""
626msgstr ""
587−"Utilitza GPS, Wi-Fi anonimitzada i informació de la xarxa telefònica "
588−"(recomanat)"
589
627
590−#. Translators: HERE is a trademark for Nokia's location service, you probably shouldn't translate it
591−#: qml/Wizard/Pages/50-location.qml:103
628+#: qml/Wizard/Pages/here-terms.qml:93
592msgid ""
629msgid ""
593−"By selecting this option you agree to the Nokia HERE <a href='#'>terms and "
630+"The information collected is used to analyze the service and to improve the "
594−"conditions</a>."
631+"use of service, but not to identify you personally."
595msgstr ""
632msgstr ""
596−"Si seleccioneu aquesta opció, accepteu <a href='#'>les condicions generals "
597−"del servei Nokia HERE</a>."
598
633
599−#: qml/Wizard/Pages/50-location.qml:112
634+#: qml/Wizard/Pages/here-terms.qml:106
600−msgid "Not at all"
635+#, qt-format
636+msgid "By continuing, you agree to the HERE platform %1 and %2."
601−msgstr "No"
637+msgstr ""
602
638
603−#: qml/Wizard/Pages/50-location.qml:124
639+#: qml/Wizard/Pages/here-terms.qml:107
604−msgid "You can change your mind later in <b>System Settings</b>."
640+msgid "Service Terms"
605msgstr ""
641msgstr ""
606−"Podeu canviar-ho més endavant a l'aplicació <b>Paràmetres del sistema</b>"
607
642
608−#: qml/Wizard/Pages/60-reporting.qml:26
643+#: qml/Wizard/Pages/passcode-confirm.qml:43
609−msgid "Improving your experience"
644+#: qml/Wizard/Pages/passcode-desktop.qml:80
610−msgstr "Millora de l'experiència"
645+msgid "Confirm passcode"
646+msgstr "Confirmeu el codi d'accés"
611
647
612−#: qml/Wizard/Pages/60-reporting.qml:46
648+#: qml/Wizard/Pages/passcode-confirm.qml:45
613−msgid ""
649+msgid "Incorrect passcode."
614−"Your phone is set up to automatically report errors to Canonical and its "
615−"partners, the makers of the operating system."
616msgstr ""
650msgstr ""
617−"Aquest telèfon està configurat per enviar errors de manera automàtica a "
618−"Canonical i associats, els creadors del sistema operatiu."
619
651
620−#: qml/Wizard/Pages/60-reporting.qml:53
652+#: qml/Wizard/Pages/passcode-confirm.qml:45
653+msgctxt "Enter the passcode again"
621−msgid ""
654+msgid "Please re-enter."
622−"This can be disabled in <b>System Settings</b> under <b>Security &amp; "
623−"Privacy</b>"
624msgstr ""
655msgstr ""
625−"Podeu inhabilitar-ho a <b>Configuració del sistema</b>, a la secció "
626−"<b>Seguretat i privadesa</b>"
627
656
628−#: qml/Wizard/Pages/80-finished.qml:24
657+#: qml/Wizard/Pages/passcode-desktop.qml:30
629−msgid "All done"
658+msgid "Lock Screen Passcode"
630−msgstr "Tot fet"
659+msgstr ""
631
660
632−#: qml/Wizard/Pages/80-finished.qml:39
661+#: qml/Wizard/Pages/passcode-desktop.qml:56
633−msgid "Nice work!"
662+msgid "Enter 4 numbers to setup your passcode"
634−msgstr "Bona feina!"
663+msgstr ""
635
664
636−#: qml/Wizard/Pages/80-finished.qml:46
665+#: qml/Wizard/Pages/passcode-desktop.qml:65
637−msgid "Your device is now ready to use."
666+#: qml/Wizard/Pages/passcode-set.qml:54
667+msgid "Choose passcode"
638msgstr ""
668msgstr ""
639
669
640−#: qml/Wizard/Pages/80-finished.qml:53
670+#: qml/Wizard/Pages/passcode-desktop.qml:105
641−msgid "Finish"
671+msgid "Passcode too short"
642−msgstr "Finalitza"
672+msgstr ""
643
673
644−#: qml/Wizard/Pages/here-terms.qml:27
674+#: qml/Wizard/Pages/passcode-desktop.qml:107
645−msgid "Terms & Conditions"
675+msgid "Passcodes match"
646−msgstr "Condicions generals"
676+msgstr ""
647
677
648−#: qml/Wizard/Pages/passwd-confirm.qml:49
678+#: qml/Wizard/Pages/passcode-desktop.qml:109
649−msgid "Confirm passphrase"
679+msgid "Passcodes do not match"
650−msgstr "Confirmeu la contrasenya"
680+msgstr ""
651
681
652−#: qml/Wizard/Pages/passwd-confirm.qml:50
682+#: qml/Wizard/Pages/passcode-set.qml:62
653−msgid "Confirm passcode"
683+msgid "Passcode must be 4 characters long"
654−msgstr "Confirmeu el codi d'accés"
684+msgstr ""
655
685
656−#: qml/Wizard/Pages/passwd-confirm.qml:53
686+#: qml/Wizard/Pages/password-set.qml:30
657−#: qml/Wizard/Pages/passwd-confirm.qml:54
687+msgid "Lock Screen Password"
658−msgid "Please try again."
659−msgstr "Torneu-ho a intentar."
688+msgstr ""
660
689
661−#: qml/Wizard/Pages/passwd-set.qml:61
690+#: qml/Wizard/Pages/password-set.qml:61
662−msgid "Choose your passcode"
691+msgid "Enter at least 8 characters"
663−msgstr "Trieu el codi d'accés"
692+msgstr ""
664
693
665−#: qml/Wizard/Pages/passwd-set.qml:68
694+#: qml/Wizard/Pages/password-set.qml:73
666−msgid "Passphrase must be 4 characters long"
695+msgid "Choose password"
667−msgstr "La contrasenya ha de tenir 4 caràcters com a mínim"
696+msgstr ""
668
697
669−#. Translators: This is the arrow for "Back" buttons
698+#: qml/Wizard/Pages/password-set.qml:103
670−#: qml/Wizard/StackButton.qml:39
699+msgid "Confirm password"
671−#, qt-format
672−msgid "〈 %1"
673−msgstr "〈 %1"
700+msgstr ""
674
701
675−#. Translators: This is the arrow for "Forward" buttons
702+#: qml/Wizard/Pages/sim.qml:27
703+msgid "No SIM card installed"
704+msgstr ""
705+
706+#: qml/Wizard/Pages/sim.qml:54
707+msgid "SIM card added"
708+msgstr ""
709+
710+#: qml/Wizard/Pages/sim.qml:55
711+msgid "You must restart the device to access the mobile network."
712+msgstr ""
713+
714+#: qml/Wizard/Pages/sim.qml:59
715+msgid "Restart"
716+msgstr "Reinicia"
717+
676−#: qml/Wizard/StackButton.qml:42
718+#: qml/Wizard/Pages/sim.qml:78
677−#, qt-format
719+msgid "You won’t be able to make calls or use text messaging without a SIM."
678−msgid "%1 〉"
720+msgstr ""
721+
722+#: qml/Wizard/Pages/sim.qml:90
723+msgid "To proceed with no SIM tap Skip."
724+msgstr ""
725+
726+#: qml/Wizard/PasswordMeter.qml:87
727+msgid "Passwords match"
728+msgstr ""
729+
730+#: qml/Wizard/PasswordMeter.qml:89
731+msgid "Passwords do not match"
679−msgstr "%1 〉"
732+msgstr ""
733+
734+#: qml/Wizard/PasswordMeter.qml:93
735+msgid "Strong password"
736+msgstr ""
737+
738+#: qml/Wizard/PasswordMeter.qml:95
739+msgid "Fair password"
740+msgstr ""
741+
742+#: qml/Wizard/PasswordMeter.qml:97
743+msgid "Weak password"
744+msgstr ""
745+
746+#: qml/Wizard/PasswordMeter.qml:99
747+msgid "Very weak password"
748+msgstr ""
680
749
681#~ msgid "Confirm"
750#~ msgid "Confirm"
682#~ msgstr "Confirma"
751#~ msgstr "Confirma"
@@ -772,27 +841,200 @@ msgstr "%1 〉"
772#~ msgid "Power off"
841#~ msgid "Power off"
773#~ msgstr "Apaga"
842#~ msgstr "Apaga"
774
843
844+#~ msgid "Are you sure you want to shut down?"
845+#~ msgstr "Segur que voleu apagar?"
846+
775#~ msgid "Shut down"
847#~ msgid "Shut down"
776#~ msgstr "Apaga"
848#~ msgstr "Apaga"
777
849
778−#~ msgid "Restart"
779−#~ msgstr "Reinicia"
780−
781#~ msgid "Please re-enter"
850#~ msgid "Please re-enter"
782#~ msgstr "Torneu-ho a introduir"
851#~ msgstr "Torneu-ho a introduir"
783
852
784#~ msgid "Manage Scopes"
853#~ msgid "Manage Scopes"
785#~ msgstr "Gestioneu les lents"
854#~ msgstr "Gestioneu les lents"
786
855
856+#~ msgid "Add a SIM card and restart your device"
857+#~ msgstr "Afegiu una targeta SIM i reinicieu el dispositiu"
858+
859+#~ msgid "Without it, you won’t be able to make calls or use text messaging."
860+#~ msgstr "Sense ella, no podreu fer trucades o enviar missatges de text."
861+
862+#~ msgid "Hi!"
863+#~ msgstr "Hola!"
864+
787#~ msgid "Welcome to your Ubuntu phone."
865#~ msgid "Welcome to your Ubuntu phone."
788#~ msgstr "Us donem la benvinguda al vostre telèfon Ubuntu."
866#~ msgstr "Us donem la benvinguda al vostre telèfon Ubuntu."
789
867
868+#~ msgid "Let’s get started."
869+#~ msgstr "Comencem."
870+
871+#~ msgid "Continue"
872+#~ msgstr "Continua"
873+
874+#~ msgid "Lock security"
875+#~ msgstr "Seguretat del bloqueig"
876+
790#~ msgid "Please select how you’d like to unlock your phone."
877#~ msgid "Please select how you’d like to unlock your phone."
791#~ msgstr "Seleccioneu com voleu desblocar el telèfon."
878#~ msgstr "Seleccioneu com voleu desblocar el telèfon."
792
879
880+#~ msgid "Improving your experience"
881+#~ msgstr "Millora de l'experiència"
882+
883+#~ msgid "Available networks…"
884+#~ msgstr "Xarxes disponibles..."
885+
886+#~ msgid "No available networks."
887+#~ msgstr "No hi ha xarxes disponibles"
888+
889+#~ msgid "Location"
890+#~ msgstr "Ubicació"
891+
892+#~ msgid ""
893+#~ "This can be disabled in <b>System Settings</b> under <b>Security &amp; "
894+#~ "Privacy</b>"
895+#~ msgstr ""
896+#~ "Podeu inhabilitar-ho a <b>Configuració del sistema</b>, a la secció "
897+#~ "<b>Seguretat i privadesa</b>"
898+
899+#~ msgid ""
900+#~ "Your phone is set up to automatically report errors to Canonical and its "
901+#~ "partners, the makers of the operating system."
902+#~ msgstr ""
903+#~ "Aquest telèfon està configurat per enviar errors de manera automàtica a "
904+#~ "Canonical i associats, els creadors del sistema operatiu."
905+
906+#~ msgid "Finish"
907+#~ msgstr "Finalitza"
908+
793#~ msgid "Your phone is now ready to use."
909#~ msgid "Your phone is now ready to use."
794#~ msgstr "Ja podeu utilitzar el vostre telèfon."
910#~ msgstr "Ja podeu utilitzar el vostre telèfon."
795
911
912+#~ msgid "Confirm passphrase"
913+#~ msgstr "Confirmeu la contrasenya"
914+
915+#~ msgid "Please try again."
916+#~ msgstr "Torneu-ho a intentar."
917+
918+#~ msgid "Nice work!"
919+#~ msgstr "Bona feina!"
920+
921+#~ msgid "All done"
922+#~ msgstr "Tot fet"
923+
924+#~ msgid "Choose your passcode"
925+#~ msgstr "Trieu el codi d'accés"
926+
927+#, qt-format
928+#~ msgid "%1 〉"
929+#~ msgstr "%1 〉"
930+
931+#~ msgid "Passphrase must be 4 characters long"
932+#~ msgstr "La contrasenya ha de tenir 4 caràcters com a mínim"
933+
934+#, qt-format
935+#~ msgid "〈 %1"
936+#~ msgstr "〈 %1"
937+
938+#~ msgid "Let the phone detect your location:"
939+#~ msgstr "Fes que el telèfon detecti la meva ubicació:"
940+
941+#~ msgid "Using GPS only (less accurate)"
942+#~ msgstr "Utilitza només el GPS (menys precís)"
943+
944+#~ msgid "Using GPS, anonymized Wi-Fi and cellular network info (recommended)"
945+#~ msgstr ""
946+#~ "Utilitza GPS, Wi-Fi anonimitzada i informació de la xarxa telefònica "
947+#~ "(recomanat)"
948+
949+#~ msgid "You can change your mind later in <b>System Settings</b>."
950+#~ msgstr ""
951+#~ "Podeu canviar-ho més endavant a l'aplicació <b>Paràmetres del sistema</b>"
952+
953+#~ msgid ""
954+#~ "By selecting this option you agree to the Nokia HERE <a href='#'>terms and "
955+#~ "conditions</a>."
956+#~ msgstr ""
957+#~ "Si seleccioneu aquesta opció, accepteu <a href='#'>les condicions generals "
958+#~ "del servei Nokia HERE</a>."
959+
960+#~ msgid "Not at all"
961+#~ msgstr "No"
962+
963+#~ msgid "You almost got it!"
964+#~ msgstr "Ja gairebé ho teniu!"
965+
966+#~ msgid "Open the launcher"
967+#~ msgstr "Obre el llançador"
968+
969+#~ msgid "Tap here to continue."
970+#~ msgstr "Feu un toc per continuar."
971+
972+#~ msgid "Open special menus"
973+#~ msgstr "Obre els menús especials"
974+
975+#~ msgid "To view open apps"
976+#~ msgstr "Per veure les aplicacions obertes"
977+
978+#~ msgid "Long swipe from the right edge."
979+#~ msgstr "Lliscament llarg des de la vora dreta."
980+
981+#~ msgid "View all your running tasks."
982+#~ msgstr "Mostra totes les tasques en execució."
983+
984+#~ msgid "This action does different things for different apps"
985+#~ msgstr "Aquesta acció fa coses diferents depenent de l'aplicació"
986+
987+#~ msgid "Try again."
988+#~ msgstr "Torneu-ho a provar."
989+
990+#~ msgid "Short swipe from the left edge."
991+#~ msgstr "Lliscament curt des de la vora esquerra."
992+
993+#~ msgid "These are the shortcuts to favorite apps"
994+#~ msgstr "Aquestes són les dreceres a les aplicacions preferides"
995+
996+#~ msgid "Swipe up from the bottom edge."
997+#~ msgstr "Llisqueu el dit des de la vora inferior."
998+
999+#~ msgid "Tap here to finish."
1000+#~ msgstr "Feu un toc per finalitzar."
1001+
1002+#~ msgctxt "Label: Description of security method"
1003+#~ msgid "4 digits only"
1004+#~ msgstr "Només 4 dígits"
1005+
1006+#~ msgctxt "Button: Shut down the system"
1007+#~ msgid "Shut down"
1008+#~ msgstr "Apaga"
1009+
1010+#~ msgctxt "Title: Reboot/Shut down dialog"
1011+#~ msgid "Shut down"
1012+#~ msgstr "Apaga"
1013+
1014+#~ msgctxt "Button: Reboot the system"
1015+#~ msgid "Reboot"
1016+#~ msgstr "Reinicia"
1017+
1018+#~ msgctxt "Label: Type of security method"
1019+#~ msgid "Swipe"
1020+#~ msgstr "Lliscament amb el dit"
1021+
1022+#~ msgctxt "Label: Type of security method"
1023+#~ msgid "Passcode"
1024+#~ msgstr "Codi d'accés"
1025+
1026+#~ msgctxt "Label: Description of security method"
1027+#~ msgid "No security"
1028+#~ msgstr "Sense seguretat"
1029+
1030+#~ msgctxt "Label: Type of security method"
1031+#~ msgid "Passphrase"
1032+#~ msgstr "Contrasenya"
1033+
1034+#~ msgctxt "Label: Description of security method"
1035+#~ msgid "Numbers and letters"
1036+#~ msgstr "Números i lletres"
1037+
796#~ msgid "Yesterday %l:%M %p"
1038#~ msgid "Yesterday %l:%M %p"
797#~ msgstr "Ahir %l.%M %p"
1039#~ msgstr "Ahir %l.%M %p"
798
1040
@@ -825,8 +1067,3 @@ msgstr "%1 〉"
825
1067
826#~ msgid "Call back"
1068#~ msgid "Call back"
827#~ msgstr "Retorna la trucada"
1069#~ msgstr "Retorna la trucada"
828−
829−#~ msgid "Re-dock, save your work and close these apps to continue."
830−#~ msgstr ""
831−#~ "Torneu a connectar, deseu la feina i tanqueu aquestes aplicacions per "
832−#~ "continuar."
po/ca@valencia.po+384−217
@@ -7,7 +7,7 @@ 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: 2016-03-10 22:48+0000\n"
10+"POT-Creation-Date: 2016-03-23 10:01+0000\n"
11"PO-Revision-Date: 2015-02-22 15:22+0000\n"
11"PO-Revision-Date: 2015-02-22 15:22+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"
@@ -15,8 +15,8 @@ msgstr ""
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"Plural-Forms: nplurals=2; plural=n != 1;\n"
18−"X-Launchpad-Export-Date: 2016-03-13 05:51+0000\n"
18+"X-Launchpad-Export-Date: 2016-03-24 06:08+0000\n"
19−"X-Generator: Launchpad (build 17939)\n"
19+"X-Generator: Launchpad (build 17958)\n"
20
20
21#: plugins/IntegratedLightDM/Greeter.cpp:112
21#: plugins/IntegratedLightDM/Greeter.cpp:112
22msgid "Password: "
22msgid "Password: "
@@ -77,53 +77,35 @@ msgctxt "Button: Log out from the system"
77msgid "Log Out"
77msgid "Log Out"
78msgstr ""
78msgstr ""
79
79
80−#: qml/Components/Dialogs.qml:161 qml/Components/Dialogs.qml:194
80+#: qml/Components/Dialogs.qml:161 qml/Components/Dialogs.qml:219
81−#: qml/Components/Dialogs.qml:253
81+#: qml/Dash/DashPageHeader.qml:298 qml/Wizard/Pages/passcode-confirm.qml:32
82+#: qml/Wizard/Pages/passcode-set.qml:32
82msgid "Cancel"
83msgid "Cancel"
83msgstr "Cancel·la"
84msgstr "Cancel·la"
84
85
85#: qml/Components/Dialogs.qml:173
86#: qml/Components/Dialogs.qml:173
86−msgctxt "Title: Reboot/Shut down dialog"
87−msgid "Shut down"
88−msgstr ""
89−
90−#: qml/Components/Dialogs.qml:174
91−msgid "Are you sure you want to shut down?"
92−msgstr "Segur que voleu apagar?"
93−
94−#: qml/Components/Dialogs.qml:176
95−msgctxt "Button: Reboot the system"
96−msgid "Reboot"
97−msgstr ""
98−
99−#: qml/Components/Dialogs.qml:185
100−msgctxt "Button: Shut down the system"
101−msgid "Shut down"
102−msgstr ""
103−
104−#: qml/Components/Dialogs.qml:207
105msgctxt "Title: Reboot dialog"
87msgctxt "Title: Reboot dialog"
106msgid "Reboot"
88msgid "Reboot"
107msgstr ""
89msgstr ""
108
90
109−#: qml/Components/Dialogs.qml:208
91+#: qml/Components/Dialogs.qml:174
110msgid "Are you sure you want to reboot?"
92msgid "Are you sure you want to reboot?"
111msgstr "Segur que voleu reiniciar?"
93msgstr "Segur que voleu reiniciar?"
112
94
113−#: qml/Components/Dialogs.qml:210
95+#: qml/Components/Dialogs.qml:176
114msgid "No"
96msgid "No"
115msgstr "No"
97msgstr "No"
116
98
117−#: qml/Components/Dialogs.qml:217
99+#: qml/Components/Dialogs.qml:183
118msgid "Yes"
100msgid "Yes"
119msgstr "Sí"
101msgstr "Sí"
120
102
121−#: qml/Components/Dialogs.qml:232
103+#: qml/Components/Dialogs.qml:198
122msgctxt "Title: Power off/Restart dialog"
104msgctxt "Title: Power off/Restart dialog"
123msgid "Power"
105msgid "Power"
124msgstr ""
106msgstr ""
125
107
126−#: qml/Components/Dialogs.qml:233
108+#: qml/Components/Dialogs.qml:199
127msgid ""
109msgid ""
128"Are you sure you would like\n"
110"Are you sure you would like\n"
129"to power off?"
111"to power off?"
@@ -131,12 +113,12 @@ msgstr ""
131"Segur que voleu\n"
113"Segur que voleu\n"
132"apagar?"
114"apagar?"
133
115
134−#: qml/Components/Dialogs.qml:235
116+#: qml/Components/Dialogs.qml:201
135msgctxt "Button: Power off the system"
117msgctxt "Button: Power off the system"
136msgid "Power off"
118msgid "Power off"
137msgstr ""
119msgstr ""
138
120
139−#: qml/Components/Dialogs.qml:244
121+#: qml/Components/Dialogs.qml:210
140msgctxt "Button: Restart the system"
122msgctxt "Button: Restart the system"
141msgid "Restart"
123msgid "Restart"
142msgstr ""
124msgstr ""
@@ -179,42 +161,58 @@ msgstr ""
179msgid "Close all"
161msgid "Close all"
180msgstr ""
162msgstr ""
181
163
182−#: qml/Dash/DashPageHeader.qml:270
164+#: qml/Dash/DashPageHeader.qml:337
183msgctxt "Button: Open the Ubuntu Store"
165msgctxt "Button: Open the Ubuntu Store"
184msgid "Store"
166msgid "Store"
185msgstr ""
167msgstr ""
186
168
187−#: qml/Dash/DashPageHeader.qml:277
169+#: qml/Dash/DashPageHeader.qml:344
188msgctxt "Button: Start a search in the current dash scope"
170msgctxt "Button: Start a search in the current dash scope"
189msgid "Search"
171msgid "Search"
190msgstr ""
172msgstr ""
191
173
192−#: qml/Dash/DashPageHeader.qml:287
174+#: qml/Dash/DashPageHeader.qml:354
193msgctxt "Button: Show the current dash scope settings"
175msgctxt "Button: Show the current dash scope settings"
194msgid "Settings"
176msgid "Settings"
195msgstr ""
177msgstr ""
196
178
197−#: qml/Dash/DashPageHeader.qml:294
179+#: qml/Dash/DashPageHeader.qml:361
198msgid "Remove from Favorites"
180msgid "Remove from Favorites"
199msgstr "Suprimeix dels preferits"
181msgstr "Suprimeix dels preferits"
200
182
201−#: qml/Dash/DashPageHeader.qml:294
183+#: qml/Dash/DashPageHeader.qml:361
202msgid "Add to Favorites"
184msgid "Add to Favorites"
203msgstr "Afig als preferits"
185msgstr "Afig als preferits"
204
186
187+#: qml/Dash/FiltersPopover.qml:60
188+msgid "Refine your results"
189+msgstr ""
190+
191+#: qml/Dash/FiltersPopover.qml:69
192+msgid "Reset"
193+msgstr ""
194+
205−#: qml/Dash/GenericScopeView.qml:567 qml/Dash/GenericScopeView.qml:725
195+#: qml/Dash/GenericScopeView.qml:570 qml/Dash/GenericScopeView.qml:755
206msgid "See less"
196msgid "See less"
207msgstr "Mostra'n menys"
197msgstr "Mostra'n menys"
208
198
209−#: qml/Dash/GenericScopeView.qml:567
199+#: qml/Dash/GenericScopeView.qml:570
210msgid "See all"
200msgid "See all"
211msgstr "Mostra-ho tot"
201msgstr "Mostra-ho tot"
212
202
213−#: qml/Dash/GenericScopeView.qml:629
203+#: qml/Dash/GenericScopeView.qml:627
214msgctxt "Label: Hint for dash search line edit"
204msgctxt "Label: Hint for dash search line edit"
215msgid "Search"
205msgid "Search"
216msgstr ""
206msgstr ""
217
207
208+#: qml/Dash/PageHeaderExtraPanel.qml:55
209+msgid "Recent Searches"
210+msgstr ""
211+
212+#: qml/Dash/PageHeaderExtraPanel.qml:66
213+msgid "Clear All"
214+msgstr ""
215+
218#: qml/Dash/Previews/PreviewActionCombo.qml:35
216#: qml/Dash/Previews/PreviewActionCombo.qml:35
219msgid "More..."
217msgid "More..."
220msgstr "Més..."
218msgstr "Més..."
@@ -282,11 +280,11 @@ msgstr ""
282msgid "Tap to unlock"
280msgid "Tap to unlock"
283msgstr ""
281msgstr ""
284
282
285−#: qml/Greeter/NarrowView.qml:54 qml/Wizard/Pages/passwd-confirm.qml:53
283+#: qml/Greeter/NarrowView.qml:54
286msgid "Sorry, incorrect passphrase."
284msgid "Sorry, incorrect passphrase."
287msgstr "La contrasenya és incorrecta"
285msgstr "La contrasenya és incorrecta"
288
286
289−#: qml/Greeter/NarrowView.qml:55 qml/Wizard/Pages/passwd-confirm.qml:54
287+#: qml/Greeter/NarrowView.qml:55
290msgid "Sorry, incorrect passcode."
288msgid "Sorry, incorrect passcode."
291msgstr "El codi d'accés no és correcte"
289msgstr "El codi d'accés no és correcte"
292
290
@@ -317,7 +315,7 @@ msgstr ""
317msgid "Enter %1"
315msgid "Enter %1"
318msgstr "Introduïu: %1"
316msgstr "Introduïu: %1"
319
317
320−#: qml/Greeter/NarrowView.qml:117 qml/Wizard/Pages/passwd-set.qml:60
318+#: qml/Greeter/NarrowView.qml:117
321msgid "Enter passphrase"
319msgid "Enter passphrase"
322msgstr "Introduïu la contrasenya"
320msgstr "Introduïu la contrasenya"
323
321
@@ -355,62 +353,62 @@ msgstr "Feu un toc per tornar a la cridada..."
355msgid "Conference"
353msgid "Conference"
356msgstr "Conferència"
354msgstr "Conferència"
357
355
358−#: qml/Panel/Indicators/MenuItemFactory.qml:752
356+#: qml/Panel/Indicators/MenuItemFactory.qml:761
359msgid "Nothing is playing"
357msgid "Nothing is playing"
360msgstr "No s'està reproduint res"
358msgstr "No s'està reproduint res"
361
359
362−#: qml/Panel/Indicators/MenuItemFactory.qml:881
360+#: qml/Panel/Indicators/MenuItemFactory.qml:890
363#, qt-format
361#, qt-format
364msgid "%1 hour"
362msgid "%1 hour"
365msgid_plural "%1 hours"
363msgid_plural "%1 hours"
366msgstr[0] ""
364msgstr[0] ""
367msgstr[1] ""
365msgstr[1] ""
368
366
369−#: qml/Panel/Indicators/MenuItemFactory.qml:885
367+#: qml/Panel/Indicators/MenuItemFactory.qml:894
370#, qt-format
368#, qt-format
371msgid "%1 minute"
369msgid "%1 minute"
372msgid_plural "%1 minutes"
370msgid_plural "%1 minutes"
373msgstr[0] ""
371msgstr[0] ""
374msgstr[1] ""
372msgstr[1] ""
375
373
376−#: qml/Panel/Indicators/MenuItemFactory.qml:890
374+#: qml/Panel/Indicators/MenuItemFactory.qml:899
377#, qt-format
375#, qt-format
378msgid "%1 second"
376msgid "%1 second"
379msgid_plural "%1 seconds"
377msgid_plural "%1 seconds"
380msgstr[0] ""
378msgstr[0] ""
381msgstr[1] ""
379msgstr[1] ""
382
380
383−#: qml/Panel/Indicators/MenuItemFactory.qml:893
381+#: qml/Panel/Indicators/MenuItemFactory.qml:902
384msgid "0 seconds"
382msgid "0 seconds"
385msgstr ""
383msgstr ""
386
384
387#. Translators: String like "1 hour, 2 minutes, 3 seconds remaining"
385#. Translators: String like "1 hour, 2 minutes, 3 seconds remaining"
388−#: qml/Panel/Indicators/MenuItemFactory.qml:895
386+#: qml/Panel/Indicators/MenuItemFactory.qml:904
389#, qt-format
387#, qt-format
390msgid "%1 remaining"
388msgid "%1 remaining"
391msgstr ""
389msgstr ""
392
390
393−#: qml/Panel/Indicators/MenuItemFactory.qml:901
391+#: qml/Panel/Indicators/MenuItemFactory.qml:910
394msgid "In queue…"
392msgid "In queue…"
395msgstr "A la cua..."
393msgstr "A la cua..."
396
394
397−#: qml/Panel/Indicators/MenuItemFactory.qml:905
395+#: qml/Panel/Indicators/MenuItemFactory.qml:914
398msgid "Downloading"
396msgid "Downloading"
399msgstr "S'està baixant"
397msgstr "S'està baixant"
400
398
401−#: qml/Panel/Indicators/MenuItemFactory.qml:907
399+#: qml/Panel/Indicators/MenuItemFactory.qml:916
402msgid "Paused, tap to resume"
400msgid "Paused, tap to resume"
403msgstr "En pausa, feu un toc per continuar"
401msgstr "En pausa, feu un toc per continuar"
404
402
405−#: qml/Panel/Indicators/MenuItemFactory.qml:909
403+#: qml/Panel/Indicators/MenuItemFactory.qml:918
406msgid "Canceled"
404msgid "Canceled"
407msgstr "S'ha cancel·lat"
405msgstr "S'ha cancel·lat"
408
406
409−#: qml/Panel/Indicators/MenuItemFactory.qml:911
407+#: qml/Panel/Indicators/MenuItemFactory.qml:920
410msgid "Finished"
408msgid "Finished"
411msgstr "S'ha finalitzat"
409msgstr "S'ha finalitzat"
412
410
413−#: qml/Panel/Indicators/MenuItemFactory.qml:913
411+#: qml/Panel/Indicators/MenuItemFactory.qml:922
414msgid "Failed, tap to retry"
412msgid "Failed, tap to retry"
415msgstr "Ha fallat, feu un toc per tornar-ho a intentar"
413msgstr "Ha fallat, feu un toc per tornar-ho a intentar"
416
414
@@ -430,253 +428,324 @@ msgctxt "Button: Call back on phone"
430msgid "Call back"
428msgid "Call back"
431msgstr ""
429msgstr ""
432
430
433−#: qml/Tutorial/TutorialBottom.qml:28
431+#: qml/Stages/SideStage.qml:76
434−msgid "Open special menus"
432+msgid "Drag using 3 fingers any application from one window to the other"
435−msgstr ""
436−
437−#: qml/Tutorial/TutorialBottom.qml:29
438−msgid "Swipe up from the bottom edge."
439msgstr ""
433msgstr ""
440
434
441−#: qml/Tutorial/TutorialBottomFinish.qml:24
435+#: qml/Tutorial/TutorialBottom.qml:78
442−msgid "This action does different things for different apps"
436+msgid "Swipe up to add a contact"
443msgstr ""
437msgstr ""
444
438
445−#: qml/Tutorial/TutorialBottomFinish.qml:25
439+#: qml/Tutorial/TutorialBottom.qml:80
446−msgid "Tap here to finish."
440+msgid "Swipe up for favorite calculations"
447msgstr ""
441msgstr ""
448
442
449−#: qml/Tutorial/TutorialContent.qml:80 qml/Tutorial/TutorialLeftFinish.qml:25
443+#: qml/Tutorial/TutorialBottom.qml:82
450−#: qml/Tutorial/TutorialRight.qml:144
444+msgid "Swipe up for recent calls"
451−msgid "Tap here to continue."
452msgstr ""
445msgstr ""
453
446
454−#: qml/Tutorial/TutorialLeft.qml:26
447+#: qml/Tutorial/TutorialBottom.qml:84
455−msgid "Open the launcher"
448+msgid "Swipe up to create a message"
456msgstr ""
449msgstr ""
457
450
458−#: qml/Tutorial/TutorialLeft.qml:27
451+#: qml/Tutorial/TutorialBottom.qml:85
459−msgid "Short swipe from the left edge."
452+msgid "Swipe up to manage the app"
460msgstr ""
453msgstr ""
461
454
462−#: qml/Tutorial/TutorialLeftFinish.qml:24
455+#: qml/Tutorial/TutorialLeft.qml:47
463−msgid "These are the shortcuts to favorite apps"
456+msgid "Swipe from the left edge to open the launcher"
464msgstr ""
457msgstr ""
465
458
466−#: qml/Tutorial/TutorialPage.qml:178
459+#: qml/Tutorial/TutorialLeftLong.qml:47
467−msgid "You almost got it!"
460+msgid "Long swipe from the left edge to open the Today scope"
468msgstr ""
461msgstr ""
469
462
470−#: qml/Tutorial/TutorialPage.qml:195
463+#: qml/Tutorial/TutorialRight.qml:54
471−msgid "Try again."
464+msgid "Hover your mouse on the right edge to view your open apps"
472msgstr ""
465msgstr ""
473
466
474−#: qml/Tutorial/TutorialRight.qml:31
467+#: qml/Tutorial/TutorialRight.qml:55
475−msgid "To view open apps"
468+msgid "Short or long swipe from the right edge to view your open apps"
476msgstr ""
469msgstr ""
477
470
478−#: qml/Tutorial/TutorialRight.qml:32
471+#: qml/Tutorial/TutorialTop.qml:53
479−msgid "Long swipe from the right edge."
472+msgid "Swipe from the top right edge to open the notification bar"
480msgstr ""
473msgstr ""
481
474
482−#: qml/Tutorial/TutorialRight.qml:122
475+#: qml/Tutorial/TutorialTop.qml:54
483−msgid "View all your running tasks."
476+msgid "Swipe from the top edge to open the notification bar"
484msgstr ""
477msgstr ""
485
478
486−#: qml/Wizard/Page.qml:89
479+#: qml/Wizard/Page.qml:54
487msgctxt "Button: Go back one page in the Wizard"
480msgctxt "Button: Go back one page in the Wizard"
488msgid "Back"
481msgid "Back"
489msgstr ""
482msgstr ""
490
483
491#: qml/Wizard/Pages/10-welcome.qml:27
484#: qml/Wizard/Pages/10-welcome.qml:27
492−msgid "Hi!"
485+msgid "Language"
493−msgstr "Hola!"
486+msgstr ""
494
487
495−#: qml/Wizard/Pages/10-welcome.qml:44
488+#: qml/Wizard/Pages/10-welcome.qml:156 qml/Wizard/Pages/30-wifi.qml:206
496−msgid "Welcome to your Ubuntu device."
489+#: qml/Wizard/Pages/40-location.qml:271 qml/Wizard/Pages/50-timezone.qml:267
490+#: qml/Wizard/Pages/60-account.qml:65 qml/Wizard/Pages/70-passwd-type.qml:144
491+#: qml/Wizard/Pages/75-report-check.qml:84
492+#: qml/Wizard/Pages/passcode-desktop.qml:124
493+#: qml/Wizard/Pages/password-set.qml:141
494+msgid "Next"
497msgstr ""
495msgstr ""
498
496
499−#: qml/Wizard/Pages/10-welcome.qml:52
497+#: qml/Wizard/Pages/30-wifi.qml:29
500−msgid "Let’s get started."
498+msgid "Connect to Wi‑Fi"
501−msgstr "Comencem."
499+msgstr "Connecta't a la Wi-Fi"
502
500
503−#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:133
501+#: qml/Wizard/Pages/30-wifi.qml:130
504−#: qml/Wizard/Pages/40-wifi.qml:215 qml/Wizard/Pages/50-location.qml:131
502+msgid "Connected"
505−#: qml/Wizard/Pages/60-reporting.qml:60 qml/Wizard/Pages/passwd-confirm.qml:82
506−#: qml/Wizard/Pages/passwd-set.qml:90
507−msgid "Continue"
508−msgstr "Continua"
503+msgstr ""
509
504
510−#: qml/Wizard/Pages/20-sim.qml:25
505+#: qml/Wizard/Pages/30-wifi.qml:163
511−msgid "Add a SIM card and restart your device"
506+msgid "Available Wi-Fi networks"
512−msgstr "Afegiu una targeta SIM i reinicieu el dispositiu"
507+msgstr ""
513
508
514−#: qml/Wizard/Pages/20-sim.qml:59
509+#: qml/Wizard/Pages/30-wifi.qml:164
515−msgid "Without it, you won’t be able to make calls or use text messaging."
510+msgid "No available Wi-Fi networks"
516−msgstr "Sense ella, no podreu fer cridades o enviar missatges de text."
511+msgstr ""
517
512
518−#: qml/Wizard/Pages/20-sim.qml:73 qml/Wizard/Pages/40-wifi.qml:215
513+#: qml/Wizard/Pages/30-wifi.qml:206 qml/Wizard/Pages/60-account.qml:65
514+#: qml/Wizard/Pages/sim.qml:101
519msgid "Skip"
515msgid "Skip"
520msgstr "Omet"
516msgstr "Omet"
521
517
522−#: qml/Wizard/Pages/30-passwd-type.qml:39
518+#: qml/Wizard/Pages/40-location.qml:27
523−msgid "Lock security"
519+msgid "Location Services"
524−msgstr "Seguretat del bloqueig"
520+msgstr ""
525
521
526−#: qml/Wizard/Pages/30-passwd-type.qml:79
522+#: qml/Wizard/Pages/40-location.qml:83
527−msgid "Please select how you’d like to unlock your device."
523+msgid ""
524+"Use GPS, Wi-Fi hotspots and mobile network anonymously to detect location "
525+"(recommended)"
528msgstr ""
526msgstr ""
529
527
530−#: qml/Wizard/Pages/30-passwd-type.qml:102
528+#: qml/Wizard/Pages/40-location.qml:105
531−msgctxt "Label: Type of security method"
529+#, qt-format
532−msgid "Swipe"
530+msgid "By selecting this option you agree to the Nokia HERE %1."
531+msgstr ""
532+
533+#: qml/Wizard/Pages/40-location.qml:106
534+msgctxt "part of: Nokia HERE terms and conditions"
535+msgid "terms and conditions"
533msgstr ""
536msgstr ""
534
537
535−#: qml/Wizard/Pages/30-passwd-type.qml:103
538+#: qml/Wizard/Pages/40-location.qml:160
536−msgctxt "Label: Description of security method"
539+msgid "GPS only"
537−msgid "No security"
538msgstr ""
540msgstr ""
539
541
540−#: qml/Wizard/Pages/30-passwd-type.qml:105
542+#: qml/Wizard/Pages/40-location.qml:214
543+msgid "Don't use my location"
544+msgstr ""
545+
546+#: qml/Wizard/Pages/40-location.qml:260
547+msgid "You can change it later in System Settings."
548+msgstr ""
549+
550+#: qml/Wizard/Pages/50-timezone.qml:29
551+msgid "Time Zone"
552+msgstr ""
553+
554+#: qml/Wizard/Pages/50-timezone.qml:178
555+msgid "Enter your city"
556+msgstr ""
557+
558+#: qml/Wizard/Pages/60-account.qml:24
559+msgid "Personalize Your Device"
560+msgstr ""
561+
562+#: qml/Wizard/Pages/60-account.qml:48
563+msgid "Preferred Name"
564+msgstr ""
565+
566+#: qml/Wizard/Pages/70-passwd-type.qml:39
567+msgid "Lock Screen"
568+msgstr ""
569+
570+#: qml/Wizard/Pages/70-passwd-type.qml:101
541msgctxt "Label: Type of security method"
571msgctxt "Label: Type of security method"
542−msgid "Passcode"
572+msgid "Create new password"
543msgstr ""
573msgstr ""
544
574
545−#: qml/Wizard/Pages/30-passwd-type.qml:106
575+#: qml/Wizard/Pages/70-passwd-type.qml:103
546−msgctxt "Label: Description of security method"
576+msgctxt "Label: Type of security method"
547−msgid "4 digits only"
577+msgid "Create passcode (numbers only)"
548msgstr ""
578msgstr ""
549
579
550−#: qml/Wizard/Pages/30-passwd-type.qml:108
580+#: qml/Wizard/Pages/70-passwd-type.qml:105
551msgctxt "Label: Type of security method"
581msgctxt "Label: Type of security method"
552−msgid "Passphrase"
582+msgid "No lock code"
553msgstr ""
583msgstr ""
554
584
555−#: qml/Wizard/Pages/30-passwd-type.qml:109
585+#: qml/Wizard/Pages/75-report-check.qml:26 qml/Wizard/Pages/here-terms.qml:108
556−msgctxt "Label: Description of security method"
586+msgid "Privacy Policy"
557−msgid "Numbers and letters"
558msgstr ""
587msgstr ""
559
588
560−#: qml/Wizard/Pages/40-wifi.qml:29
589+#: qml/Wizard/Pages/75-report-check.qml:26
561−msgid "Connect to Wi‑Fi"
590+msgid "Help Us Improve"
562−msgstr "Connecta't a la Wi-Fi"
591+msgstr ""
592+
593+#: qml/Wizard/Pages/75-report-check.qml:59
594+msgid "Improve system performance by sending us crashes and error reports."
595+msgstr ""
563
596
564−#: qml/Wizard/Pages/40-wifi.qml:168
597+#: qml/Wizard/Pages/75-report-check.qml:60
565−msgid "Available networks…"
598+msgid "Privacy policy"
566−msgstr "Xarxes disponibles..."
599+msgstr ""
567
600
568−#: qml/Wizard/Pages/40-wifi.qml:169
601+#: qml/Wizard/Pages/80-finished.qml:89
569−msgid "No available networks."
602+msgid "Welcome to Ubuntu"
570−msgstr "No hi ha xarxes disponibles"
603+msgstr ""
571
604
572−#: qml/Wizard/Pages/50-location.qml:27
605+#: qml/Wizard/Pages/80-finished.qml:104
573−msgid "Location"
606+msgid "You are ready to use your device now"
574−msgstr "Ubicació"
607+msgstr ""
575
608
576−#: qml/Wizard/Pages/50-location.qml:62
609+#: qml/Wizard/Pages/80-finished.qml:124
577−msgid "Let the phone detect your location:"
610+msgid "Get Started"
578−msgstr "Fes que el telèfon detecti la meua ubicació:"
611+msgstr ""
579
612
580−#: qml/Wizard/Pages/50-location.qml:69
613+#: qml/Wizard/Pages/here-terms.qml:25
581−msgid "Using GPS only (less accurate)"
614+msgid "Terms & Conditions"
582−msgstr "Utilitza només el GPS (menys precís)"
615+msgstr "Condicions generals"
583
616
584−#: qml/Wizard/Pages/50-location.qml:86
617+#: qml/Wizard/Pages/here-terms.qml:69
585−msgid "Using GPS, anonymized Wi-Fi and cellular network info (recommended)"
618+msgid "Your device uses positioning technologies provided by HERE."
586msgstr ""
619msgstr ""
587−"Utilitza GPS, Wi-Fi anonimitzada i informació de la xarxa telefònica "
588−"(recomanat)"
589
620
590−#. Translators: HERE is a trademark for Nokia's location service, you probably shouldn't translate it
591−#: qml/Wizard/Pages/50-location.qml:103
621+#: qml/Wizard/Pages/here-terms.qml:81
592msgid ""
622msgid ""
593−"By selecting this option you agree to the Nokia HERE <a href='#'>terms and "
623+"To provide you with positioning services and to improve their quality, HERE "
594−"conditions</a>."
624+"collects information about nearby cell towers and Wi-Fi hotspots around your "
625+"current location whenever your position is being found."
595msgstr ""
626msgstr ""
596−"Si seleccioneu esta opció, accepteu <a href='#'>les condicions generals del "
597−"servei Nokia HERE</a>."
598
627
599−#: qml/Wizard/Pages/50-location.qml:112
628+#: qml/Wizard/Pages/here-terms.qml:93
600−msgid "Not at all"
629+msgid ""
630+"The information collected is used to analyze the service and to improve the "
631+"use of service, but not to identify you personally."
601−msgstr "No"
632+msgstr ""
602
633
603−#: qml/Wizard/Pages/50-location.qml:124
634+#: qml/Wizard/Pages/here-terms.qml:106
604−msgid "You can change your mind later in <b>System Settings</b>."
635+#, qt-format
636+msgid "By continuing, you agree to the HERE platform %1 and %2."
605msgstr ""
637msgstr ""
606−"Podeu canviar-ho més avant a l'aplicació <b>Paràmetres del sistema</b>"
607
638
608−#: qml/Wizard/Pages/60-reporting.qml:26
639+#: qml/Wizard/Pages/here-terms.qml:107
609−msgid "Improving your experience"
640+msgid "Service Terms"
610−msgstr "Millora de l'experiència"
641+msgstr ""
611
642
612−#: qml/Wizard/Pages/60-reporting.qml:46
643+#: qml/Wizard/Pages/passcode-confirm.qml:43
644+#: qml/Wizard/Pages/passcode-desktop.qml:80
613−msgid ""
645+msgid "Confirm passcode"
614−"Your phone is set up to automatically report errors to Canonical and its "
646+msgstr "Confirmeu el codi d'accés"
615−"partners, the makers of the operating system."
647+
648+#: qml/Wizard/Pages/passcode-confirm.qml:45
649+msgid "Incorrect passcode."
616msgstr ""
650msgstr ""
617−"Este telèfon està configurat per enviar errors de manera automàtica a "
618−"Canonical i associats, els creadors del sistema operatiu."
619
651
620−#: qml/Wizard/Pages/60-reporting.qml:53
652+#: qml/Wizard/Pages/passcode-confirm.qml:45
653+msgctxt "Enter the passcode again"
621−msgid ""
654+msgid "Please re-enter."
622−"This can be disabled in <b>System Settings</b> under <b>Security &amp; "
623−"Privacy</b>"
624msgstr ""
655msgstr ""
625−"Podeu inhabilitar-ho a <b>Configuració del sistema</b>, a la secció "
626−"<b>Seguretat i privadesa</b>"
627
656
628−#: qml/Wizard/Pages/80-finished.qml:24
657+#: qml/Wizard/Pages/passcode-desktop.qml:30
629−msgid "All done"
658+msgid "Lock Screen Passcode"
630−msgstr "Tot fet"
659+msgstr ""
631
660
632−#: qml/Wizard/Pages/80-finished.qml:39
661+#: qml/Wizard/Pages/passcode-desktop.qml:56
633−msgid "Nice work!"
662+msgid "Enter 4 numbers to setup your passcode"
634−msgstr "Bona faena!"
663+msgstr ""
635
664
636−#: qml/Wizard/Pages/80-finished.qml:46
665+#: qml/Wizard/Pages/passcode-desktop.qml:65
637−msgid "Your device is now ready to use."
666+#: qml/Wizard/Pages/passcode-set.qml:54
667+msgid "Choose passcode"
638msgstr ""
668msgstr ""
639
669
640−#: qml/Wizard/Pages/80-finished.qml:53
670+#: qml/Wizard/Pages/passcode-desktop.qml:105
641−msgid "Finish"
671+msgid "Passcode too short"
642−msgstr "Finalitza"
672+msgstr ""
643
673
644−#: qml/Wizard/Pages/here-terms.qml:27
674+#: qml/Wizard/Pages/passcode-desktop.qml:107
645−msgid "Terms & Conditions"
675+msgid "Passcodes match"
646−msgstr "Condicions generals"
676+msgstr ""
647
677
648−#: qml/Wizard/Pages/passwd-confirm.qml:49
678+#: qml/Wizard/Pages/passcode-desktop.qml:109
649−msgid "Confirm passphrase"
679+msgid "Passcodes do not match"
650−msgstr "Confirmeu la contrasenya"
680+msgstr ""
651
681
652−#: qml/Wizard/Pages/passwd-confirm.qml:50
682+#: qml/Wizard/Pages/passcode-set.qml:62
653−msgid "Confirm passcode"
683+msgid "Passcode must be 4 characters long"
654−msgstr "Confirmeu el codi d'accés"
684+msgstr ""
655
685
656−#: qml/Wizard/Pages/passwd-confirm.qml:53
686+#: qml/Wizard/Pages/password-set.qml:30
657−#: qml/Wizard/Pages/passwd-confirm.qml:54
687+msgid "Lock Screen Password"
658−msgid "Please try again."
659−msgstr "Torneu-ho a intentar."
688+msgstr ""
660
689
661−#: qml/Wizard/Pages/passwd-set.qml:61
690+#: qml/Wizard/Pages/password-set.qml:61
662−msgid "Choose your passcode"
691+msgid "Enter at least 8 characters"
663−msgstr "Trieu el codi d'accés"
692+msgstr ""
664
693
665−#: qml/Wizard/Pages/passwd-set.qml:68
694+#: qml/Wizard/Pages/password-set.qml:73
666−msgid "Passphrase must be 4 characters long"
695+msgid "Choose password"
667−msgstr "La contrasenya ha de tindre 4 caràcters com a mínim"
696+msgstr ""
668
697
669−#. Translators: This is the arrow for "Back" buttons
698+#: qml/Wizard/Pages/password-set.qml:103
670−#: qml/Wizard/StackButton.qml:39
699+msgid "Confirm password"
671−#, qt-format
672−msgid "〈 %1"
673−msgstr "〈 %1"
700+msgstr ""
674
701
675−#. Translators: This is the arrow for "Forward" buttons
702+#: qml/Wizard/Pages/sim.qml:27
703+msgid "No SIM card installed"
704+msgstr ""
705+
706+#: qml/Wizard/Pages/sim.qml:54
707+msgid "SIM card added"
708+msgstr ""
709+
710+#: qml/Wizard/Pages/sim.qml:55
711+msgid "You must restart the device to access the mobile network."
712+msgstr ""
713+
714+#: qml/Wizard/Pages/sim.qml:59
715+msgid "Restart"
716+msgstr "Reinicia"
717+
676−#: qml/Wizard/StackButton.qml:42
718+#: qml/Wizard/Pages/sim.qml:78
677−#, qt-format
719+msgid "You won’t be able to make calls or use text messaging without a SIM."
678−msgid "%1 〉"
720+msgstr ""
721+
722+#: qml/Wizard/Pages/sim.qml:90
723+msgid "To proceed with no SIM tap Skip."
724+msgstr ""
725+
726+#: qml/Wizard/PasswordMeter.qml:87
727+msgid "Passwords match"
728+msgstr ""
729+
730+#: qml/Wizard/PasswordMeter.qml:89
731+msgid "Passwords do not match"
679−msgstr "%1 〉"
732+msgstr ""
733+
734+#: qml/Wizard/PasswordMeter.qml:93
735+msgid "Strong password"
736+msgstr ""
737+
738+#: qml/Wizard/PasswordMeter.qml:95
739+msgid "Fair password"
740+msgstr ""
741+
742+#: qml/Wizard/PasswordMeter.qml:97
743+msgid "Weak password"
744+msgstr ""
745+
746+#: qml/Wizard/PasswordMeter.qml:99
747+msgid "Very weak password"
748+msgstr ""
680
749
681#~ msgid "Log out"
750#~ msgid "Log out"
682#~ msgstr "Ix"
751#~ msgstr "Ix"
@@ -684,6 +753,9 @@ msgstr "%1 〉"
684#~ msgid "Shut down"
753#~ msgid "Shut down"
685#~ msgstr "Apaga"
754#~ msgstr "Apaga"
686
755
756+#~ msgid "Are you sure you want to shut down?"
757+#~ msgstr "Segur que voleu apagar?"
758+
687#~ msgid "Reboot"
759#~ msgid "Reboot"
688#~ msgstr "Reinicia"
760#~ msgstr "Reinicia"
689
761
@@ -693,9 +765,6 @@ msgstr "%1 〉"
693#~ msgid "Power off"
765#~ msgid "Power off"
694#~ msgstr "Apaga"
766#~ msgstr "Apaga"
695
767
696−#~ msgid "Restart"
697−#~ msgstr "Reinicia"
698−
699#~ msgid "Skip intro"
768#~ msgid "Skip intro"
700#~ msgstr "Omet la introducció"
769#~ msgstr "Omet la introducció"
701
770
@@ -774,15 +843,113 @@ msgstr "%1 〉"
774#~ msgid "Please re-enter"
843#~ msgid "Please re-enter"
775#~ msgstr "Torneu-ho a introduir"
844#~ msgstr "Torneu-ho a introduir"
776
845
846+#~ msgid "Hi!"
847+#~ msgstr "Hola!"
848+
777#~ msgid "Welcome to your Ubuntu phone."
849#~ msgid "Welcome to your Ubuntu phone."
778#~ msgstr "Vos donem la benvinguda al vostre telèfon Ubuntu."
850#~ msgstr "Vos donem la benvinguda al vostre telèfon Ubuntu."
779
851
852+#~ msgid "Let’s get started."
853+#~ msgstr "Comencem."
854+
855+#~ msgid "Continue"
856+#~ msgstr "Continua"
857+
858+#~ msgid "Add a SIM card and restart your device"
859+#~ msgstr "Afegiu una targeta SIM i reinicieu el dispositiu"
860+
861+#~ msgid "Without it, you won’t be able to make calls or use text messaging."
862+#~ msgstr "Sense ella, no podreu fer cridades o enviar missatges de text."
863+
864+#~ msgid "Lock security"
865+#~ msgstr "Seguretat del bloqueig"
866+
780#~ msgid "Please select how you’d like to unlock your phone."
867#~ msgid "Please select how you’d like to unlock your phone."
781#~ msgstr "Seleccioneu com voleu desblocar el telèfon."
868#~ msgstr "Seleccioneu com voleu desblocar el telèfon."
782
869
870+#~ msgid "Available networks…"
871+#~ msgstr "Xarxes disponibles..."
872+
873+#~ msgid "No available networks."
874+#~ msgstr "No hi ha xarxes disponibles"
875+
876+#~ msgid "Location"
877+#~ msgstr "Ubicació"
878+
879+#~ msgid "Let the phone detect your location:"
880+#~ msgstr "Fes que el telèfon detecti la meua ubicació:"
881+
882+#~ msgid "Using GPS only (less accurate)"
883+#~ msgstr "Utilitza només el GPS (menys precís)"
884+
885+#~ msgid "Using GPS, anonymized Wi-Fi and cellular network info (recommended)"
886+#~ msgstr ""
887+#~ "Utilitza GPS, Wi-Fi anonimitzada i informació de la xarxa telefònica "
888+#~ "(recomanat)"
889+
890+#~ msgid ""
891+#~ "By selecting this option you agree to the Nokia HERE <a href='#'>terms and "
892+#~ "conditions</a>."
893+#~ msgstr ""
894+#~ "Si seleccioneu esta opció, accepteu <a href='#'>les condicions generals del "
895+#~ "servei Nokia HERE</a>."
896+
897+#~ msgid "Not at all"
898+#~ msgstr "No"
899+
900+#~ msgid "You can change your mind later in <b>System Settings</b>."
901+#~ msgstr ""
902+#~ "Podeu canviar-ho més avant a l'aplicació <b>Paràmetres del sistema</b>"
903+
904+#~ msgid "Improving your experience"
905+#~ msgstr "Millora de l'experiència"
906+
907+#~ msgid ""
908+#~ "Your phone is set up to automatically report errors to Canonical and its "
909+#~ "partners, the makers of the operating system."
910+#~ msgstr ""
911+#~ "Este telèfon està configurat per enviar errors de manera automàtica a "
912+#~ "Canonical i associats, els creadors del sistema operatiu."
913+
914+#~ msgid ""
915+#~ "This can be disabled in <b>System Settings</b> under <b>Security &amp; "
916+#~ "Privacy</b>"
917+#~ msgstr ""
918+#~ "Podeu inhabilitar-ho a <b>Configuració del sistema</b>, a la secció "
919+#~ "<b>Seguretat i privadesa</b>"
920+
921+#~ msgid "All done"
922+#~ msgstr "Tot fet"
923+
924+#~ msgid "Nice work!"
925+#~ msgstr "Bona faena!"
926+
783#~ msgid "Your phone is now ready to use."
927#~ msgid "Your phone is now ready to use."
784#~ msgstr "Ja podeu utilitzar el vostre telèfon."
928#~ msgstr "Ja podeu utilitzar el vostre telèfon."
785
929
930+#~ msgid "Finish"
931+#~ msgstr "Finalitza"
932+
933+#~ msgid "Confirm passphrase"
934+#~ msgstr "Confirmeu la contrasenya"
935+
936+#~ msgid "Please try again."
937+#~ msgstr "Torneu-ho a intentar."
938+
939+#~ msgid "Choose your passcode"
940+#~ msgstr "Trieu el codi d'accés"
941+
942+#~ msgid "Passphrase must be 4 characters long"
943+#~ msgstr "La contrasenya ha de tindre 4 caràcters com a mínim"
944+
945+#, qt-format
946+#~ msgid "〈 %1"
947+#~ msgstr "〈 %1"
948+
949+#, qt-format
950+#~ msgid "%1 〉"
951+#~ msgstr "%1 〉"
952+
786#~ msgid "Type or say a command"
953#~ msgid "Type or say a command"
787#~ msgstr "Escriviu o pronuncieu una ordre"
954#~ msgstr "Escriviu o pronuncieu una ordre"
788
955
po/ce.po+258−180
@@ -7,7 +7,7 @@ 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: 2016-03-10 22:48+0000\n"
10+"POT-Creation-Date: 2016-03-23 10:01+0000\n"
11"PO-Revision-Date: 2015-02-15 04:01+0000\n"
11"PO-Revision-Date: 2015-02-15 04:01+0000\n"
12"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
12"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
13"Language-Team: Chechen <ce@li.org>\n"
13"Language-Team: Chechen <ce@li.org>\n"
@@ -15,8 +15,8 @@ msgstr ""
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"Plural-Forms: nplurals=2; plural=n != 1;\n"
18−"X-Launchpad-Export-Date: 2016-03-13 05:50+0000\n"
18+"X-Launchpad-Export-Date: 2016-03-24 06:07+0000\n"
19−"X-Generator: Launchpad (build 17939)\n"
19+"X-Generator: Launchpad (build 17958)\n"
20
20
21#: plugins/IntegratedLightDM/Greeter.cpp:112
21#: plugins/IntegratedLightDM/Greeter.cpp:112
22msgid "Password: "
22msgid "Password: "
@@ -73,64 +73,46 @@ msgctxt "Button: Log out from the system"
73msgid "Log Out"
73msgid "Log Out"
74msgstr ""
74msgstr ""
75
75
76−#: qml/Components/Dialogs.qml:161 qml/Components/Dialogs.qml:194
76+#: qml/Components/Dialogs.qml:161 qml/Components/Dialogs.qml:219
77−#: qml/Components/Dialogs.qml:253
77+#: qml/Dash/DashPageHeader.qml:298 qml/Wizard/Pages/passcode-confirm.qml:32
78+#: qml/Wizard/Pages/passcode-set.qml:32
78msgid "Cancel"
79msgid "Cancel"
79msgstr ""
80msgstr ""
80
81
81#: qml/Components/Dialogs.qml:173
82#: qml/Components/Dialogs.qml:173
82−msgctxt "Title: Reboot/Shut down dialog"
83−msgid "Shut down"
84−msgstr ""
85−
86−#: qml/Components/Dialogs.qml:174
87−msgid "Are you sure you want to shut down?"
88−msgstr ""
89−
90−#: qml/Components/Dialogs.qml:176
91−msgctxt "Button: Reboot the system"
92−msgid "Reboot"
93−msgstr ""
94−
95−#: qml/Components/Dialogs.qml:185
96−msgctxt "Button: Shut down the system"
97−msgid "Shut down"
98−msgstr ""
99−
100−#: qml/Components/Dialogs.qml:207
101msgctxt "Title: Reboot dialog"
83msgctxt "Title: Reboot dialog"
102msgid "Reboot"
84msgid "Reboot"
103msgstr ""
85msgstr ""
104
86
105−#: qml/Components/Dialogs.qml:208
87+#: qml/Components/Dialogs.qml:174
106msgid "Are you sure you want to reboot?"
88msgid "Are you sure you want to reboot?"
107msgstr ""
89msgstr ""
108
90
109−#: qml/Components/Dialogs.qml:210
91+#: qml/Components/Dialogs.qml:176
110msgid "No"
92msgid "No"
111msgstr ""
93msgstr ""
112
94
113−#: qml/Components/Dialogs.qml:217
95+#: qml/Components/Dialogs.qml:183
114msgid "Yes"
96msgid "Yes"
115msgstr ""
97msgstr ""
116
98
117−#: qml/Components/Dialogs.qml:232
99+#: qml/Components/Dialogs.qml:198
118msgctxt "Title: Power off/Restart dialog"
100msgctxt "Title: Power off/Restart dialog"
119msgid "Power"
101msgid "Power"
120msgstr ""
102msgstr ""
121
103
122−#: qml/Components/Dialogs.qml:233
104+#: qml/Components/Dialogs.qml:199
123msgid ""
105msgid ""
124"Are you sure you would like\n"
106"Are you sure you would like\n"
125"to power off?"
107"to power off?"
126msgstr ""
108msgstr ""
127
109
128−#: qml/Components/Dialogs.qml:235
110+#: qml/Components/Dialogs.qml:201
129msgctxt "Button: Power off the system"
111msgctxt "Button: Power off the system"
130msgid "Power off"
112msgid "Power off"
131msgstr ""
113msgstr ""
132
114
133−#: qml/Components/Dialogs.qml:244
115+#: qml/Components/Dialogs.qml:210
134msgctxt "Button: Restart the system"
116msgctxt "Button: Restart the system"
135msgid "Restart"
117msgid "Restart"
136msgstr ""
118msgstr ""
@@ -173,42 +155,58 @@ msgstr ""
173msgid "Close all"
155msgid "Close all"
174msgstr ""
156msgstr ""
175
157
176−#: qml/Dash/DashPageHeader.qml:270
158+#: qml/Dash/DashPageHeader.qml:337
177msgctxt "Button: Open the Ubuntu Store"
159msgctxt "Button: Open the Ubuntu Store"
178msgid "Store"
160msgid "Store"
179msgstr ""
161msgstr ""
180
162
181−#: qml/Dash/DashPageHeader.qml:277
163+#: qml/Dash/DashPageHeader.qml:344
182msgctxt "Button: Start a search in the current dash scope"
164msgctxt "Button: Start a search in the current dash scope"
183msgid "Search"
165msgid "Search"
184msgstr ""
166msgstr ""
185
167
186−#: qml/Dash/DashPageHeader.qml:287
168+#: qml/Dash/DashPageHeader.qml:354
187msgctxt "Button: Show the current dash scope settings"
169msgctxt "Button: Show the current dash scope settings"
188msgid "Settings"
170msgid "Settings"
189msgstr ""
171msgstr ""
190
172
191−#: qml/Dash/DashPageHeader.qml:294
173+#: qml/Dash/DashPageHeader.qml:361
192msgid "Remove from Favorites"
174msgid "Remove from Favorites"
193msgstr ""
175msgstr ""
194
176
195−#: qml/Dash/DashPageHeader.qml:294
177+#: qml/Dash/DashPageHeader.qml:361
196msgid "Add to Favorites"
178msgid "Add to Favorites"
197msgstr ""
179msgstr ""
198
180
181+#: qml/Dash/FiltersPopover.qml:60
182+msgid "Refine your results"
183+msgstr ""
184+
185+#: qml/Dash/FiltersPopover.qml:69
186+msgid "Reset"
187+msgstr ""
188+
199−#: qml/Dash/GenericScopeView.qml:567 qml/Dash/GenericScopeView.qml:725
189+#: qml/Dash/GenericScopeView.qml:570 qml/Dash/GenericScopeView.qml:755
200msgid "See less"
190msgid "See less"
201msgstr ""
191msgstr ""
202
192
203−#: qml/Dash/GenericScopeView.qml:567
193+#: qml/Dash/GenericScopeView.qml:570
204msgid "See all"
194msgid "See all"
205msgstr ""
195msgstr ""
206
196
207−#: qml/Dash/GenericScopeView.qml:629
197+#: qml/Dash/GenericScopeView.qml:627
208msgctxt "Label: Hint for dash search line edit"
198msgctxt "Label: Hint for dash search line edit"
209msgid "Search"
199msgid "Search"
210msgstr ""
200msgstr ""
211
201
202+#: qml/Dash/PageHeaderExtraPanel.qml:55
203+msgid "Recent Searches"
204+msgstr ""
205+
206+#: qml/Dash/PageHeaderExtraPanel.qml:66
207+msgid "Clear All"
208+msgstr ""
209+
212#: qml/Dash/Previews/PreviewActionCombo.qml:35
210#: qml/Dash/Previews/PreviewActionCombo.qml:35
213msgid "More..."
211msgid "More..."
214msgstr ""
212msgstr ""
@@ -276,11 +274,11 @@ msgstr ""
276msgid "Tap to unlock"
274msgid "Tap to unlock"
277msgstr ""
275msgstr ""
278
276
279−#: qml/Greeter/NarrowView.qml:54 qml/Wizard/Pages/passwd-confirm.qml:53
277+#: qml/Greeter/NarrowView.qml:54
280msgid "Sorry, incorrect passphrase."
278msgid "Sorry, incorrect passphrase."
281msgstr ""
279msgstr ""
282
280
283−#: qml/Greeter/NarrowView.qml:55 qml/Wizard/Pages/passwd-confirm.qml:54
281+#: qml/Greeter/NarrowView.qml:55
284msgid "Sorry, incorrect passcode."
282msgid "Sorry, incorrect passcode."
285msgstr ""
283msgstr ""
286
284
@@ -305,7 +303,7 @@ msgstr ""
305msgid "Enter %1"
303msgid "Enter %1"
306msgstr ""
304msgstr ""
307
305
308−#: qml/Greeter/NarrowView.qml:117 qml/Wizard/Pages/passwd-set.qml:60
306+#: qml/Greeter/NarrowView.qml:117
309msgid "Enter passphrase"
307msgid "Enter passphrase"
310msgstr ""
308msgstr ""
311
309
@@ -343,62 +341,62 @@ msgstr ""
343msgid "Conference"
341msgid "Conference"
344msgstr ""
342msgstr ""
345
343
346−#: qml/Panel/Indicators/MenuItemFactory.qml:752
344+#: qml/Panel/Indicators/MenuItemFactory.qml:761
347msgid "Nothing is playing"
345msgid "Nothing is playing"
348msgstr ""
346msgstr ""
349
347
350−#: qml/Panel/Indicators/MenuItemFactory.qml:881
348+#: qml/Panel/Indicators/MenuItemFactory.qml:890
351#, qt-format
349#, qt-format
352msgid "%1 hour"
350msgid "%1 hour"
353msgid_plural "%1 hours"
351msgid_plural "%1 hours"
354msgstr[0] ""
352msgstr[0] ""
355msgstr[1] ""
353msgstr[1] ""
356
354
357−#: qml/Panel/Indicators/MenuItemFactory.qml:885
355+#: qml/Panel/Indicators/MenuItemFactory.qml:894
358#, qt-format
356#, qt-format
359msgid "%1 minute"
357msgid "%1 minute"
360msgid_plural "%1 minutes"
358msgid_plural "%1 minutes"
361msgstr[0] ""
359msgstr[0] ""
362msgstr[1] ""
360msgstr[1] ""
363
361
364−#: qml/Panel/Indicators/MenuItemFactory.qml:890
362+#: qml/Panel/Indicators/MenuItemFactory.qml:899
365#, qt-format
363#, qt-format
366msgid "%1 second"
364msgid "%1 second"
367msgid_plural "%1 seconds"
365msgid_plural "%1 seconds"
368msgstr[0] ""
366msgstr[0] ""
369msgstr[1] ""
367msgstr[1] ""
370
368
371−#: qml/Panel/Indicators/MenuItemFactory.qml:893
369+#: qml/Panel/Indicators/MenuItemFactory.qml:902
372msgid "0 seconds"
370msgid "0 seconds"
373msgstr ""
371msgstr ""
374
372
375#. Translators: String like "1 hour, 2 minutes, 3 seconds remaining"
373#. Translators: String like "1 hour, 2 minutes, 3 seconds remaining"
376−#: qml/Panel/Indicators/MenuItemFactory.qml:895
374+#: qml/Panel/Indicators/MenuItemFactory.qml:904
377#, qt-format
375#, qt-format
378msgid "%1 remaining"
376msgid "%1 remaining"
379msgstr ""
377msgstr ""
380
378
381−#: qml/Panel/Indicators/MenuItemFactory.qml:901
379+#: qml/Panel/Indicators/MenuItemFactory.qml:910
382msgid "In queue…"
380msgid "In queue…"
383msgstr ""
381msgstr ""
384
382
385−#: qml/Panel/Indicators/MenuItemFactory.qml:905
383+#: qml/Panel/Indicators/MenuItemFactory.qml:914
386msgid "Downloading"
384msgid "Downloading"
387msgstr ""
385msgstr ""
388
386
389−#: qml/Panel/Indicators/MenuItemFactory.qml:907
387+#: qml/Panel/Indicators/MenuItemFactory.qml:916
390msgid "Paused, tap to resume"
388msgid "Paused, tap to resume"
391msgstr ""
389msgstr ""
392
390
393−#: qml/Panel/Indicators/MenuItemFactory.qml:909
391+#: qml/Panel/Indicators/MenuItemFactory.qml:918
394msgid "Canceled"
392msgid "Canceled"
395msgstr ""
393msgstr ""
396
394
397−#: qml/Panel/Indicators/MenuItemFactory.qml:911
395+#: qml/Panel/Indicators/MenuItemFactory.qml:920
398msgid "Finished"
396msgid "Finished"
399msgstr ""
397msgstr ""
400
398
401−#: qml/Panel/Indicators/MenuItemFactory.qml:913
399+#: qml/Panel/Indicators/MenuItemFactory.qml:922
402msgid "Failed, tap to retry"
400msgid "Failed, tap to retry"
403msgstr ""
401msgstr ""
404
402
@@ -418,241 +416,321 @@ msgctxt "Button: Call back on phone"
418msgid "Call back"
416msgid "Call back"
419msgstr ""
417msgstr ""
420
418
421−#: qml/Tutorial/TutorialBottom.qml:28
419+#: qml/Stages/SideStage.qml:76
422−msgid "Open special menus"
420+msgid "Drag using 3 fingers any application from one window to the other"
423msgstr ""
421msgstr ""
424
422
425−#: qml/Tutorial/TutorialBottom.qml:29
423+#: qml/Tutorial/TutorialBottom.qml:78
426−msgid "Swipe up from the bottom edge."
424+msgid "Swipe up to add a contact"
427msgstr ""
425msgstr ""
428
426
429−#: qml/Tutorial/TutorialBottomFinish.qml:24
427+#: qml/Tutorial/TutorialBottom.qml:80
430−msgid "This action does different things for different apps"
428+msgid "Swipe up for favorite calculations"
431msgstr ""
429msgstr ""
432
430
433−#: qml/Tutorial/TutorialBottomFinish.qml:25
431+#: qml/Tutorial/TutorialBottom.qml:82
434−msgid "Tap here to finish."
432+msgid "Swipe up for recent calls"
435msgstr ""
433msgstr ""
436
434
437−#: qml/Tutorial/TutorialContent.qml:80 qml/Tutorial/TutorialLeftFinish.qml:25
435+#: qml/Tutorial/TutorialBottom.qml:84
438−#: qml/Tutorial/TutorialRight.qml:144
436+msgid "Swipe up to create a message"
439−msgid "Tap here to continue."
440msgstr ""
437msgstr ""
441
438
442−#: qml/Tutorial/TutorialLeft.qml:26
439+#: qml/Tutorial/TutorialBottom.qml:85
443−msgid "Open the launcher"
440+msgid "Swipe up to manage the app"
444msgstr ""
441msgstr ""
445
442
446−#: qml/Tutorial/TutorialLeft.qml:27
443+#: qml/Tutorial/TutorialLeft.qml:47
447−msgid "Short swipe from the left edge."
444+msgid "Swipe from the left edge to open the launcher"
448msgstr ""
445msgstr ""
449
446
450−#: qml/Tutorial/TutorialLeftFinish.qml:24
447+#: qml/Tutorial/TutorialLeftLong.qml:47
451−msgid "These are the shortcuts to favorite apps"
448+msgid "Long swipe from the left edge to open the Today scope"
452msgstr ""
449msgstr ""
453
450
454−#: qml/Tutorial/TutorialPage.qml:178
451+#: qml/Tutorial/TutorialRight.qml:54
455−msgid "You almost got it!"
452+msgid "Hover your mouse on the right edge to view your open apps"
456msgstr ""
453msgstr ""
457
454
458−#: qml/Tutorial/TutorialPage.qml:195
455+#: qml/Tutorial/TutorialRight.qml:55
459−msgid "Try again."
456+msgid "Short or long swipe from the right edge to view your open apps"
460msgstr ""
457msgstr ""
461
458
462−#: qml/Tutorial/TutorialRight.qml:31
459+#: qml/Tutorial/TutorialTop.qml:53
463−msgid "To view open apps"
460+msgid "Swipe from the top right edge to open the notification bar"
464msgstr ""
461msgstr ""
465
462
466−#: qml/Tutorial/TutorialRight.qml:32
463+#: qml/Tutorial/TutorialTop.qml:54
467−msgid "Long swipe from the right edge."
464+msgid "Swipe from the top edge to open the notification bar"
468msgstr ""
465msgstr ""
469
466
470−#: qml/Tutorial/TutorialRight.qml:122
471−msgid "View all your running tasks."
472−msgstr ""
473−
474−#: qml/Wizard/Page.qml:89
467+#: qml/Wizard/Page.qml:54
475msgctxt "Button: Go back one page in the Wizard"
468msgctxt "Button: Go back one page in the Wizard"
476msgid "Back"
469msgid "Back"
477msgstr ""
470msgstr ""
478
471
479#: qml/Wizard/Pages/10-welcome.qml:27
472#: qml/Wizard/Pages/10-welcome.qml:27
480−msgid "Hi!"
473+msgid "Language"
481msgstr ""
474msgstr ""
482
475
483−#: qml/Wizard/Pages/10-welcome.qml:44
476+#: qml/Wizard/Pages/10-welcome.qml:156 qml/Wizard/Pages/30-wifi.qml:206
484−msgid "Welcome to your Ubuntu device."
477+#: qml/Wizard/Pages/40-location.qml:271 qml/Wizard/Pages/50-timezone.qml:267
478+#: qml/Wizard/Pages/60-account.qml:65 qml/Wizard/Pages/70-passwd-type.qml:144
479+#: qml/Wizard/Pages/75-report-check.qml:84
480+#: qml/Wizard/Pages/passcode-desktop.qml:124
481+#: qml/Wizard/Pages/password-set.qml:141
482+msgid "Next"
485msgstr ""
483msgstr ""
486
484
487−#: qml/Wizard/Pages/10-welcome.qml:52
485+#: qml/Wizard/Pages/30-wifi.qml:29
488−msgid "Let’s get started."
486+msgid "Connect to Wi‑Fi"
489msgstr ""
487msgstr ""
490
488
491−#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:133
489+#: qml/Wizard/Pages/30-wifi.qml:130
492−#: qml/Wizard/Pages/40-wifi.qml:215 qml/Wizard/Pages/50-location.qml:131
490+msgid "Connected"
493−#: qml/Wizard/Pages/60-reporting.qml:60 qml/Wizard/Pages/passwd-confirm.qml:82
494−#: qml/Wizard/Pages/passwd-set.qml:90
495−msgid "Continue"
496msgstr ""
491msgstr ""
497
492
498−#: qml/Wizard/Pages/20-sim.qml:25
493+#: qml/Wizard/Pages/30-wifi.qml:163
499−msgid "Add a SIM card and restart your device"
494+msgid "Available Wi-Fi networks"
500msgstr ""
495msgstr ""
501
496
502−#: qml/Wizard/Pages/20-sim.qml:59
497+#: qml/Wizard/Pages/30-wifi.qml:164
503−msgid "Without it, you won’t be able to make calls or use text messaging."
498+msgid "No available Wi-Fi networks"
504msgstr ""
499msgstr ""
505
500
506−#: qml/Wizard/Pages/20-sim.qml:73 qml/Wizard/Pages/40-wifi.qml:215
501+#: qml/Wizard/Pages/30-wifi.qml:206 qml/Wizard/Pages/60-account.qml:65
502+#: qml/Wizard/Pages/sim.qml:101
507msgid "Skip"
503msgid "Skip"
508msgstr ""
504msgstr ""
509
505
510−#: qml/Wizard/Pages/30-passwd-type.qml:39
506+#: qml/Wizard/Pages/40-location.qml:27
511−msgid "Lock security"
507+msgid "Location Services"
512msgstr ""
508msgstr ""
513
509
514−#: qml/Wizard/Pages/30-passwd-type.qml:79
510+#: qml/Wizard/Pages/40-location.qml:83
515−msgid "Please select how you’d like to unlock your device."
511+msgid ""
512+"Use GPS, Wi-Fi hotspots and mobile network anonymously to detect location "
513+"(recommended)"
516msgstr ""
514msgstr ""
517
515
518−#: qml/Wizard/Pages/30-passwd-type.qml:102
516+#: qml/Wizard/Pages/40-location.qml:105
519−msgctxt "Label: Type of security method"
517+#, qt-format
520−msgid "Swipe"
518+msgid "By selecting this option you agree to the Nokia HERE %1."
519+msgstr ""
520+
521+#: qml/Wizard/Pages/40-location.qml:106
522+msgctxt "part of: Nokia HERE terms and conditions"
523+msgid "terms and conditions"
524+msgstr ""
525+
526+#: qml/Wizard/Pages/40-location.qml:160
527+msgid "GPS only"
528+msgstr ""
529+
530+#: qml/Wizard/Pages/40-location.qml:214
531+msgid "Don't use my location"
532+msgstr ""
533+
534+#: qml/Wizard/Pages/40-location.qml:260
535+msgid "You can change it later in System Settings."
536+msgstr ""
537+
538+#: qml/Wizard/Pages/50-timezone.qml:29
539+msgid "Time Zone"
540+msgstr ""
541+
542+#: qml/Wizard/Pages/50-timezone.qml:178
543+msgid "Enter your city"
521msgstr ""
544msgstr ""
522
545
523−#: qml/Wizard/Pages/30-passwd-type.qml:103
546+#: qml/Wizard/Pages/60-account.qml:24
524−msgctxt "Label: Description of security method"
547+msgid "Personalize Your Device"
525−msgid "No security"
526msgstr ""
548msgstr ""
527
549
528−#: qml/Wizard/Pages/30-passwd-type.qml:105
550+#: qml/Wizard/Pages/60-account.qml:48
551+msgid "Preferred Name"
552+msgstr ""
553+
554+#: qml/Wizard/Pages/70-passwd-type.qml:39
555+msgid "Lock Screen"
556+msgstr ""
557+
558+#: qml/Wizard/Pages/70-passwd-type.qml:101
529msgctxt "Label: Type of security method"
559msgctxt "Label: Type of security method"
530−msgid "Passcode"
560+msgid "Create new password"
531msgstr ""
561msgstr ""
532
562
533−#: qml/Wizard/Pages/30-passwd-type.qml:106
563+#: qml/Wizard/Pages/70-passwd-type.qml:103
534−msgctxt "Label: Description of security method"
564+msgctxt "Label: Type of security method"
535−msgid "4 digits only"
565+msgid "Create passcode (numbers only)"
536msgstr ""
566msgstr ""
537
567
538−#: qml/Wizard/Pages/30-passwd-type.qml:108
568+#: qml/Wizard/Pages/70-passwd-type.qml:105
539msgctxt "Label: Type of security method"
569msgctxt "Label: Type of security method"
540−msgid "Passphrase"
570+msgid "No lock code"
541msgstr ""
571msgstr ""
542
572
543−#: qml/Wizard/Pages/30-passwd-type.qml:109
573+#: qml/Wizard/Pages/75-report-check.qml:26 qml/Wizard/Pages/here-terms.qml:108
544−msgctxt "Label: Description of security method"
574+msgid "Privacy Policy"
545−msgid "Numbers and letters"
546msgstr ""
575msgstr ""
547
576
548−#: qml/Wizard/Pages/40-wifi.qml:29
577+#: qml/Wizard/Pages/75-report-check.qml:26
549−msgid "Connect to Wi‑Fi"
578+msgid "Help Us Improve"
550msgstr ""
579msgstr ""
551
580
552−#: qml/Wizard/Pages/40-wifi.qml:168
581+#: qml/Wizard/Pages/75-report-check.qml:59
553−msgid "Available networks…"
582+msgid "Improve system performance by sending us crashes and error reports."
554msgstr ""
583msgstr ""
555
584
556−#: qml/Wizard/Pages/40-wifi.qml:169
585+#: qml/Wizard/Pages/75-report-check.qml:60
557−msgid "No available networks."
586+msgid "Privacy policy"
558msgstr ""
587msgstr ""
559
588
560−#: qml/Wizard/Pages/50-location.qml:27
589+#: qml/Wizard/Pages/80-finished.qml:89
561−msgid "Location"
590+msgid "Welcome to Ubuntu"
562msgstr ""
591msgstr ""
563
592
564−#: qml/Wizard/Pages/50-location.qml:62
593+#: qml/Wizard/Pages/80-finished.qml:104
565−msgid "Let the phone detect your location:"
594+msgid "You are ready to use your device now"
595+msgstr ""
596+
597+#: qml/Wizard/Pages/80-finished.qml:124
598+msgid "Get Started"
599+msgstr ""
600+
601+#: qml/Wizard/Pages/here-terms.qml:25
602+msgid "Terms & Conditions"
566msgstr ""
603msgstr ""
567
604
568−#: qml/Wizard/Pages/50-location.qml:69
605+#: qml/Wizard/Pages/here-terms.qml:69
569−msgid "Using GPS only (less accurate)"
606+msgid "Your device uses positioning technologies provided by HERE."
570msgstr ""
607msgstr ""
571
608
572−#: qml/Wizard/Pages/50-location.qml:86
609+#: qml/Wizard/Pages/here-terms.qml:81
573−msgid "Using GPS, anonymized Wi-Fi and cellular network info (recommended)"
610+msgid ""
611+"To provide you with positioning services and to improve their quality, HERE "
612+"collects information about nearby cell towers and Wi-Fi hotspots around your "
613+"current location whenever your position is being found."
574msgstr ""
614msgstr ""
575
615
576−#. Translators: HERE is a trademark for Nokia's location service, you probably shouldn't translate it
577−#: qml/Wizard/Pages/50-location.qml:103
616+#: qml/Wizard/Pages/here-terms.qml:93
578msgid ""
617msgid ""
579−"By selecting this option you agree to the Nokia HERE <a href='#'>terms and "
618+"The information collected is used to analyze the service and to improve the "
580−"conditions</a>."
619+"use of service, but not to identify you personally."
581msgstr ""
620msgstr ""
582
621
583−#: qml/Wizard/Pages/50-location.qml:112
622+#: qml/Wizard/Pages/here-terms.qml:106
584−msgid "Not at all"
623+#, qt-format
624+msgid "By continuing, you agree to the HERE platform %1 and %2."
585msgstr ""
625msgstr ""
586
626
587−#: qml/Wizard/Pages/50-location.qml:124
627+#: qml/Wizard/Pages/here-terms.qml:107
588−msgid "You can change your mind later in <b>System Settings</b>."
628+msgid "Service Terms"
589msgstr ""
629msgstr ""
590
630
591−#: qml/Wizard/Pages/60-reporting.qml:26
631+#: qml/Wizard/Pages/passcode-confirm.qml:43
592−msgid "Improving your experience"
632+#: qml/Wizard/Pages/passcode-desktop.qml:80
633+msgid "Confirm passcode"
593msgstr ""
634msgstr ""
594
635
595−#: qml/Wizard/Pages/60-reporting.qml:46
636+#: qml/Wizard/Pages/passcode-confirm.qml:45
596−msgid ""
637+msgid "Incorrect passcode."
597−"Your phone is set up to automatically report errors to Canonical and its "
598−"partners, the makers of the operating system."
599msgstr ""
638msgstr ""
600
639
601−#: qml/Wizard/Pages/60-reporting.qml:53
640+#: qml/Wizard/Pages/passcode-confirm.qml:45
641+msgctxt "Enter the passcode again"
602−msgid ""
642+msgid "Please re-enter."
603−"This can be disabled in <b>System Settings</b> under <b>Security &amp; "
604−"Privacy</b>"
605msgstr ""
643msgstr ""
606
644
607−#: qml/Wizard/Pages/80-finished.qml:24
645+#: qml/Wizard/Pages/passcode-desktop.qml:30
608−msgid "All done"
646+msgid "Lock Screen Passcode"
609msgstr ""
647msgstr ""
610
648
611−#: qml/Wizard/Pages/80-finished.qml:39
649+#: qml/Wizard/Pages/passcode-desktop.qml:56
612−msgid "Nice work!"
650+msgid "Enter 4 numbers to setup your passcode"
613msgstr ""
651msgstr ""
614
652
615−#: qml/Wizard/Pages/80-finished.qml:46
653+#: qml/Wizard/Pages/passcode-desktop.qml:65
616−msgid "Your device is now ready to use."
654+#: qml/Wizard/Pages/passcode-set.qml:54
655+msgid "Choose passcode"
617msgstr ""
656msgstr ""
618
657
619−#: qml/Wizard/Pages/80-finished.qml:53
658+#: qml/Wizard/Pages/passcode-desktop.qml:105
620−msgid "Finish"
659+msgid "Passcode too short"
621msgstr ""
660msgstr ""
622
661
623−#: qml/Wizard/Pages/here-terms.qml:27
662+#: qml/Wizard/Pages/passcode-desktop.qml:107
624−msgid "Terms & Conditions"
663+msgid "Passcodes match"
625msgstr ""
664msgstr ""
626
665
627−#: qml/Wizard/Pages/passwd-confirm.qml:49
666+#: qml/Wizard/Pages/passcode-desktop.qml:109
628−msgid "Confirm passphrase"
667+msgid "Passcodes do not match"
629msgstr ""
668msgstr ""
630
669
631−#: qml/Wizard/Pages/passwd-confirm.qml:50
670+#: qml/Wizard/Pages/passcode-set.qml:62
632−msgid "Confirm passcode"
671+msgid "Passcode must be 4 characters long"
633msgstr ""
672msgstr ""
634
673
635−#: qml/Wizard/Pages/passwd-confirm.qml:53
674+#: qml/Wizard/Pages/password-set.qml:30
636−#: qml/Wizard/Pages/passwd-confirm.qml:54
675+msgid "Lock Screen Password"
637−msgid "Please try again."
638msgstr ""
676msgstr ""
639
677
640−#: qml/Wizard/Pages/passwd-set.qml:61
678+#: qml/Wizard/Pages/password-set.qml:61
641−msgid "Choose your passcode"
679+msgid "Enter at least 8 characters"
642msgstr ""
680msgstr ""
643
681
644−#: qml/Wizard/Pages/passwd-set.qml:68
682+#: qml/Wizard/Pages/password-set.qml:73
645−msgid "Passphrase must be 4 characters long"
683+msgid "Choose password"
646msgstr ""
684msgstr ""
647
685
648−#. Translators: This is the arrow for "Back" buttons
686+#: qml/Wizard/Pages/password-set.qml:103
649−#: qml/Wizard/StackButton.qml:39
687+msgid "Confirm password"
650−#, qt-format
651−msgid "〈 %1"
652msgstr ""
688msgstr ""
653
689
654−#. Translators: This is the arrow for "Forward" buttons
690+#: qml/Wizard/Pages/sim.qml:27
691+msgid "No SIM card installed"
692+msgstr ""
693+
694+#: qml/Wizard/Pages/sim.qml:54
695+msgid "SIM card added"
696+msgstr ""
697+
698+#: qml/Wizard/Pages/sim.qml:55
699+msgid "You must restart the device to access the mobile network."
700+msgstr ""
701+
702+#: qml/Wizard/Pages/sim.qml:59
703+msgid "Restart"
704+msgstr ""
705+
706+#: qml/Wizard/Pages/sim.qml:78
707+msgid "You won’t be able to make calls or use text messaging without a SIM."
708+msgstr ""
709+
710+#: qml/Wizard/Pages/sim.qml:90
711+msgid "To proceed with no SIM tap Skip."
712+msgstr ""
713+
714+#: qml/Wizard/PasswordMeter.qml:87
715+msgid "Passwords match"
716+msgstr ""
717+
655−#: qml/Wizard/StackButton.qml:42
718+#: qml/Wizard/PasswordMeter.qml:89
656−#, qt-format
719+msgid "Passwords do not match"
720+msgstr ""
721+
722+#: qml/Wizard/PasswordMeter.qml:93
723+msgid "Strong password"
724+msgstr ""
725+
726+#: qml/Wizard/PasswordMeter.qml:95
727+msgid "Fair password"
728+msgstr ""
729+
730+#: qml/Wizard/PasswordMeter.qml:97
657−msgid "%1 〉"
731+msgid "Weak password"
732+msgstr ""
733+
734+#: qml/Wizard/PasswordMeter.qml:99
735+msgid "Very weak password"
658msgstr ""
736msgstr ""
po/ckb.po+258−180
@@ -7,7 +7,7 @@ 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: 2016-03-10 22:48+0000\n"
10+"POT-Creation-Date: 2016-03-23 10:01+0000\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"
@@ -15,8 +15,8 @@ msgstr ""
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"Plural-Forms: nplurals=2; plural=n != 1;\n"
18−"X-Launchpad-Export-Date: 2016-03-13 05:51+0000\n"
18+"X-Launchpad-Export-Date: 2016-03-24 06:08+0000\n"
19−"X-Generator: Launchpad (build 17939)\n"
19+"X-Generator: Launchpad (build 17958)\n"
20
20
21#: plugins/IntegratedLightDM/Greeter.cpp:112
21#: plugins/IntegratedLightDM/Greeter.cpp:112
22msgid "Password: "
22msgid "Password: "
@@ -73,64 +73,46 @@ msgctxt "Button: Log out from the system"
73msgid "Log Out"
73msgid "Log Out"
74msgstr ""
74msgstr ""
75
75
76−#: qml/Components/Dialogs.qml:161 qml/Components/Dialogs.qml:194
76+#: qml/Components/Dialogs.qml:161 qml/Components/Dialogs.qml:219
77−#: qml/Components/Dialogs.qml:253
77+#: qml/Dash/DashPageHeader.qml:298 qml/Wizard/Pages/passcode-confirm.qml:32
78+#: qml/Wizard/Pages/passcode-set.qml:32
78msgid "Cancel"
79msgid "Cancel"
79msgstr ""
80msgstr ""
80
81
81#: qml/Components/Dialogs.qml:173
82#: qml/Components/Dialogs.qml:173
82−msgctxt "Title: Reboot/Shut down dialog"
83−msgid "Shut down"
84−msgstr ""
85−
86−#: qml/Components/Dialogs.qml:174
87−msgid "Are you sure you want to shut down?"
88−msgstr ""
89−
90−#: qml/Components/Dialogs.qml:176
91−msgctxt "Button: Reboot the system"
92−msgid "Reboot"
93−msgstr ""
94−
95−#: qml/Components/Dialogs.qml:185
96−msgctxt "Button: Shut down the system"
97−msgid "Shut down"
98−msgstr ""
99−
100−#: qml/Components/Dialogs.qml:207
101msgctxt "Title: Reboot dialog"
83msgctxt "Title: Reboot dialog"
102msgid "Reboot"
84msgid "Reboot"
103msgstr ""
85msgstr ""
104
86
105−#: qml/Components/Dialogs.qml:208
87+#: qml/Components/Dialogs.qml:174
106msgid "Are you sure you want to reboot?"
88msgid "Are you sure you want to reboot?"
107msgstr ""
89msgstr ""
108
90
109−#: qml/Components/Dialogs.qml:210
91+#: qml/Components/Dialogs.qml:176
110msgid "No"
92msgid "No"
111msgstr ""
93msgstr ""
112
94
113−#: qml/Components/Dialogs.qml:217
95+#: qml/Components/Dialogs.qml:183
114msgid "Yes"
96msgid "Yes"
115msgstr ""
97msgstr ""
116
98
117−#: qml/Components/Dialogs.qml:232
99+#: qml/Components/Dialogs.qml:198
118msgctxt "Title: Power off/Restart dialog"
100msgctxt "Title: Power off/Restart dialog"
119msgid "Power"
101msgid "Power"
120msgstr ""
102msgstr ""
121
103
122−#: qml/Components/Dialogs.qml:233
104+#: qml/Components/Dialogs.qml:199
123msgid ""
105msgid ""
124"Are you sure you would like\n"
106"Are you sure you would like\n"
125"to power off?"
107"to power off?"
126msgstr ""
108msgstr ""
127
109
128−#: qml/Components/Dialogs.qml:235
110+#: qml/Components/Dialogs.qml:201
129msgctxt "Button: Power off the system"
111msgctxt "Button: Power off the system"
130msgid "Power off"
112msgid "Power off"
131msgstr ""
113msgstr ""
132
114
133−#: qml/Components/Dialogs.qml:244
115+#: qml/Components/Dialogs.qml:210
134msgctxt "Button: Restart the system"
116msgctxt "Button: Restart the system"
135msgid "Restart"
117msgid "Restart"
136msgstr ""
118msgstr ""
@@ -173,42 +155,58 @@ msgstr ""
173msgid "Close all"
155msgid "Close all"
174msgstr ""
156msgstr ""
175
157
176−#: qml/Dash/DashPageHeader.qml:270
158+#: qml/Dash/DashPageHeader.qml:337
177msgctxt "Button: Open the Ubuntu Store"
159msgctxt "Button: Open the Ubuntu Store"
178msgid "Store"
160msgid "Store"
179msgstr ""
161msgstr ""
180
162
181−#: qml/Dash/DashPageHeader.qml:277
163+#: qml/Dash/DashPageHeader.qml:344
182msgctxt "Button: Start a search in the current dash scope"
164msgctxt "Button: Start a search in the current dash scope"
183msgid "Search"
165msgid "Search"
184msgstr ""
166msgstr ""
185
167
186−#: qml/Dash/DashPageHeader.qml:287
168+#: qml/Dash/DashPageHeader.qml:354
187msgctxt "Button: Show the current dash scope settings"
169msgctxt "Button: Show the current dash scope settings"
188msgid "Settings"
170msgid "Settings"
189msgstr ""
171msgstr ""
190
172
191−#: qml/Dash/DashPageHeader.qml:294
173+#: qml/Dash/DashPageHeader.qml:361
192msgid "Remove from Favorites"
174msgid "Remove from Favorites"
193msgstr ""
175msgstr ""
194
176
195−#: qml/Dash/DashPageHeader.qml:294
177+#: qml/Dash/DashPageHeader.qml:361
196msgid "Add to Favorites"
178msgid "Add to Favorites"
197msgstr ""
179msgstr ""
198
180
181+#: qml/Dash/FiltersPopover.qml:60
182+msgid "Refine your results"
183+msgstr ""
184+
185+#: qml/Dash/FiltersPopover.qml:69
186+msgid "Reset"
187+msgstr ""
188+
199−#: qml/Dash/GenericScopeView.qml:567 qml/Dash/GenericScopeView.qml:725
189+#: qml/Dash/GenericScopeView.qml:570 qml/Dash/GenericScopeView.qml:755
200msgid "See less"
190msgid "See less"
201msgstr ""
191msgstr ""
202
192
203−#: qml/Dash/GenericScopeView.qml:567
193+#: qml/Dash/GenericScopeView.qml:570
204msgid "See all"
194msgid "See all"
205msgstr ""
195msgstr ""
206
196
207−#: qml/Dash/GenericScopeView.qml:629
197+#: qml/Dash/GenericScopeView.qml:627
208msgctxt "Label: Hint for dash search line edit"
198msgctxt "Label: Hint for dash search line edit"
209msgid "Search"
199msgid "Search"
210msgstr ""
200msgstr ""
211
201
202+#: qml/Dash/PageHeaderExtraPanel.qml:55
203+msgid "Recent Searches"
204+msgstr ""
205+
206+#: qml/Dash/PageHeaderExtraPanel.qml:66
207+msgid "Clear All"
208+msgstr ""
209+
212#: qml/Dash/Previews/PreviewActionCombo.qml:35
210#: qml/Dash/Previews/PreviewActionCombo.qml:35
213msgid "More..."
211msgid "More..."
214msgstr ""
212msgstr ""
@@ -276,11 +274,11 @@ msgstr ""
276msgid "Tap to unlock"
274msgid "Tap to unlock"
277msgstr ""
275msgstr ""
278
276
279−#: qml/Greeter/NarrowView.qml:54 qml/Wizard/Pages/passwd-confirm.qml:53
277+#: qml/Greeter/NarrowView.qml:54
280msgid "Sorry, incorrect passphrase."
278msgid "Sorry, incorrect passphrase."
281msgstr ""
279msgstr ""
282
280
283−#: qml/Greeter/NarrowView.qml:55 qml/Wizard/Pages/passwd-confirm.qml:54
281+#: qml/Greeter/NarrowView.qml:55
284msgid "Sorry, incorrect passcode."
282msgid "Sorry, incorrect passcode."
285msgstr ""
283msgstr ""
286
284
@@ -305,7 +303,7 @@ msgstr ""
305msgid "Enter %1"
303msgid "Enter %1"
306msgstr ""
304msgstr ""
307
305
308−#: qml/Greeter/NarrowView.qml:117 qml/Wizard/Pages/passwd-set.qml:60
306+#: qml/Greeter/NarrowView.qml:117
309msgid "Enter passphrase"
307msgid "Enter passphrase"
310msgstr ""
308msgstr ""
311
309
@@ -343,62 +341,62 @@ msgstr ""
343msgid "Conference"
341msgid "Conference"
344msgstr ""
342msgstr ""
345
343
346−#: qml/Panel/Indicators/MenuItemFactory.qml:752
344+#: qml/Panel/Indicators/MenuItemFactory.qml:761
347msgid "Nothing is playing"
345msgid "Nothing is playing"
348msgstr ""
346msgstr ""
349
347
350−#: qml/Panel/Indicators/MenuItemFactory.qml:881
348+#: qml/Panel/Indicators/MenuItemFactory.qml:890
351#, qt-format
349#, qt-format
352msgid "%1 hour"
350msgid "%1 hour"
353msgid_plural "%1 hours"
351msgid_plural "%1 hours"
354msgstr[0] ""
352msgstr[0] ""
355msgstr[1] ""
353msgstr[1] ""
356
354
357−#: qml/Panel/Indicators/MenuItemFactory.qml:885
355+#: qml/Panel/Indicators/MenuItemFactory.qml:894
358#, qt-format
356#, qt-format
359msgid "%1 minute"
357msgid "%1 minute"
360msgid_plural "%1 minutes"
358msgid_plural "%1 minutes"
361msgstr[0] ""
359msgstr[0] ""
362msgstr[1] ""
360msgstr[1] ""
363
361
364−#: qml/Panel/Indicators/MenuItemFactory.qml:890
362+#: qml/Panel/Indicators/MenuItemFactory.qml:899
365#, qt-format
363#, qt-format
366msgid "%1 second"
364msgid "%1 second"
367msgid_plural "%1 seconds"
365msgid_plural "%1 seconds"
368msgstr[0] ""
366msgstr[0] ""
369msgstr[1] ""
367msgstr[1] ""
370
368
371−#: qml/Panel/Indicators/MenuItemFactory.qml:893
369+#: qml/Panel/Indicators/MenuItemFactory.qml:902
372msgid "0 seconds"
370msgid "0 seconds"
373msgstr ""
371msgstr ""
374
372
375#. Translators: String like "1 hour, 2 minutes, 3 seconds remaining"
373#. Translators: String like "1 hour, 2 minutes, 3 seconds remaining"
376−#: qml/Panel/Indicators/MenuItemFactory.qml:895
374+#: qml/Panel/Indicators/MenuItemFactory.qml:904
377#, qt-format
375#, qt-format
378msgid "%1 remaining"
376msgid "%1 remaining"
379msgstr ""
377msgstr ""
380
378
381−#: qml/Panel/Indicators/MenuItemFactory.qml:901
379+#: qml/Panel/Indicators/MenuItemFactory.qml:910
382msgid "In queue…"
380msgid "In queue…"
383msgstr ""
381msgstr ""
384
382
385−#: qml/Panel/Indicators/MenuItemFactory.qml:905
383+#: qml/Panel/Indicators/MenuItemFactory.qml:914
386msgid "Downloading"
384msgid "Downloading"
387msgstr ""
385msgstr ""
388
386
389−#: qml/Panel/Indicators/MenuItemFactory.qml:907
387+#: qml/Panel/Indicators/MenuItemFactory.qml:916
390msgid "Paused, tap to resume"
388msgid "Paused, tap to resume"
391msgstr ""
389msgstr ""
392
390
393−#: qml/Panel/Indicators/MenuItemFactory.qml:909
391+#: qml/Panel/Indicators/MenuItemFactory.qml:918
394msgid "Canceled"
392msgid "Canceled"
395msgstr ""
393msgstr ""
396
394
397−#: qml/Panel/Indicators/MenuItemFactory.qml:911
395+#: qml/Panel/Indicators/MenuItemFactory.qml:920
398msgid "Finished"
396msgid "Finished"
399msgstr ""
397msgstr ""
400
398
401−#: qml/Panel/Indicators/MenuItemFactory.qml:913
399+#: qml/Panel/Indicators/MenuItemFactory.qml:922
402msgid "Failed, tap to retry"
400msgid "Failed, tap to retry"
403msgstr ""
401msgstr ""
404
402
@@ -418,243 +416,323 @@ msgctxt "Button: Call back on phone"
418msgid "Call back"
416msgid "Call back"
419msgstr ""
417msgstr ""
420
418
421−#: qml/Tutorial/TutorialBottom.qml:28
419+#: qml/Stages/SideStage.qml:76
422−msgid "Open special menus"
420+msgid "Drag using 3 fingers any application from one window to the other"
423msgstr ""
421msgstr ""
424
422
425−#: qml/Tutorial/TutorialBottom.qml:29
423+#: qml/Tutorial/TutorialBottom.qml:78
426−msgid "Swipe up from the bottom edge."
424+msgid "Swipe up to add a contact"
427msgstr ""
425msgstr ""
428
426
429−#: qml/Tutorial/TutorialBottomFinish.qml:24
427+#: qml/Tutorial/TutorialBottom.qml:80
430−msgid "This action does different things for different apps"
428+msgid "Swipe up for favorite calculations"
431msgstr ""
429msgstr ""
432
430
433−#: qml/Tutorial/TutorialBottomFinish.qml:25
431+#: qml/Tutorial/TutorialBottom.qml:82
434−msgid "Tap here to finish."
432+msgid "Swipe up for recent calls"
435msgstr ""
433msgstr ""
436
434
437−#: qml/Tutorial/TutorialContent.qml:80 qml/Tutorial/TutorialLeftFinish.qml:25
435+#: qml/Tutorial/TutorialBottom.qml:84
438−#: qml/Tutorial/TutorialRight.qml:144
436+msgid "Swipe up to create a message"
439−msgid "Tap here to continue."
440msgstr ""
437msgstr ""
441
438
442−#: qml/Tutorial/TutorialLeft.qml:26
439+#: qml/Tutorial/TutorialBottom.qml:85
443−msgid "Open the launcher"
440+msgid "Swipe up to manage the app"
444msgstr ""
441msgstr ""
445
442
446−#: qml/Tutorial/TutorialLeft.qml:27
443+#: qml/Tutorial/TutorialLeft.qml:47
447−msgid "Short swipe from the left edge."
444+msgid "Swipe from the left edge to open the launcher"
448msgstr ""
445msgstr ""
449
446
450−#: qml/Tutorial/TutorialLeftFinish.qml:24
447+#: qml/Tutorial/TutorialLeftLong.qml:47
451−msgid "These are the shortcuts to favorite apps"
448+msgid "Long swipe from the left edge to open the Today scope"
452msgstr ""
449msgstr ""
453
450
454−#: qml/Tutorial/TutorialPage.qml:178
451+#: qml/Tutorial/TutorialRight.qml:54
455−msgid "You almost got it!"
452+msgid "Hover your mouse on the right edge to view your open apps"
456msgstr ""
453msgstr ""
457
454
458−#: qml/Tutorial/TutorialPage.qml:195
455+#: qml/Tutorial/TutorialRight.qml:55
459−msgid "Try again."
456+msgid "Short or long swipe from the right edge to view your open apps"
460msgstr ""
457msgstr ""
461
458
462−#: qml/Tutorial/TutorialRight.qml:31
459+#: qml/Tutorial/TutorialTop.qml:53
463−msgid "To view open apps"
460+msgid "Swipe from the top right edge to open the notification bar"
464msgstr ""
461msgstr ""
465
462
466−#: qml/Tutorial/TutorialRight.qml:32
463+#: qml/Tutorial/TutorialTop.qml:54
467−msgid "Long swipe from the right edge."
464+msgid "Swipe from the top edge to open the notification bar"
468msgstr ""
465msgstr ""
469
466
470−#: qml/Tutorial/TutorialRight.qml:122
471−msgid "View all your running tasks."
472−msgstr ""
473−
474−#: qml/Wizard/Page.qml:89
467+#: qml/Wizard/Page.qml:54
475msgctxt "Button: Go back one page in the Wizard"
468msgctxt "Button: Go back one page in the Wizard"
476msgid "Back"
469msgid "Back"
477msgstr ""
470msgstr ""
478
471
479#: qml/Wizard/Pages/10-welcome.qml:27
472#: qml/Wizard/Pages/10-welcome.qml:27
480−msgid "Hi!"
473+msgid "Language"
481msgstr ""
474msgstr ""
482
475
483−#: qml/Wizard/Pages/10-welcome.qml:44
476+#: qml/Wizard/Pages/10-welcome.qml:156 qml/Wizard/Pages/30-wifi.qml:206
484−msgid "Welcome to your Ubuntu device."
477+#: qml/Wizard/Pages/40-location.qml:271 qml/Wizard/Pages/50-timezone.qml:267
478+#: qml/Wizard/Pages/60-account.qml:65 qml/Wizard/Pages/70-passwd-type.qml:144
479+#: qml/Wizard/Pages/75-report-check.qml:84
480+#: qml/Wizard/Pages/passcode-desktop.qml:124
481+#: qml/Wizard/Pages/password-set.qml:141
482+msgid "Next"
485msgstr ""
483msgstr ""
486
484
487−#: qml/Wizard/Pages/10-welcome.qml:52
485+#: qml/Wizard/Pages/30-wifi.qml:29
488−msgid "Let’s get started."
486+msgid "Connect to Wi‑Fi"
489msgstr ""
487msgstr ""
490
488
491−#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:133
489+#: qml/Wizard/Pages/30-wifi.qml:130
492−#: qml/Wizard/Pages/40-wifi.qml:215 qml/Wizard/Pages/50-location.qml:131
490+msgid "Connected"
493−#: qml/Wizard/Pages/60-reporting.qml:60 qml/Wizard/Pages/passwd-confirm.qml:82
494−#: qml/Wizard/Pages/passwd-set.qml:90
495−msgid "Continue"
496msgstr ""
491msgstr ""
497
492
498−#: qml/Wizard/Pages/20-sim.qml:25
493+#: qml/Wizard/Pages/30-wifi.qml:163
499−msgid "Add a SIM card and restart your device"
494+msgid "Available Wi-Fi networks"
500msgstr ""
495msgstr ""
501
496
502−#: qml/Wizard/Pages/20-sim.qml:59
497+#: qml/Wizard/Pages/30-wifi.qml:164
503−msgid "Without it, you won’t be able to make calls or use text messaging."
498+msgid "No available Wi-Fi networks"
504msgstr ""
499msgstr ""
505
500
506−#: qml/Wizard/Pages/20-sim.qml:73 qml/Wizard/Pages/40-wifi.qml:215
501+#: qml/Wizard/Pages/30-wifi.qml:206 qml/Wizard/Pages/60-account.qml:65
502+#: qml/Wizard/Pages/sim.qml:101
507msgid "Skip"
503msgid "Skip"
508msgstr ""
504msgstr ""
509
505
510−#: qml/Wizard/Pages/30-passwd-type.qml:39
506+#: qml/Wizard/Pages/40-location.qml:27
511−msgid "Lock security"
507+msgid "Location Services"
512msgstr ""
508msgstr ""
513
509
514−#: qml/Wizard/Pages/30-passwd-type.qml:79
510+#: qml/Wizard/Pages/40-location.qml:83
515−msgid "Please select how you’d like to unlock your device."
511+msgid ""
512+"Use GPS, Wi-Fi hotspots and mobile network anonymously to detect location "
513+"(recommended)"
516msgstr ""
514msgstr ""
517
515
518−#: qml/Wizard/Pages/30-passwd-type.qml:102
516+#: qml/Wizard/Pages/40-location.qml:105
519−msgctxt "Label: Type of security method"
517+#, qt-format
520−msgid "Swipe"
518+msgid "By selecting this option you agree to the Nokia HERE %1."
519+msgstr ""
520+
521+#: qml/Wizard/Pages/40-location.qml:106
522+msgctxt "part of: Nokia HERE terms and conditions"
523+msgid "terms and conditions"
524+msgstr ""
525+
526+#: qml/Wizard/Pages/40-location.qml:160
527+msgid "GPS only"
528+msgstr ""
529+
530+#: qml/Wizard/Pages/40-location.qml:214
531+msgid "Don't use my location"
532+msgstr ""
533+
534+#: qml/Wizard/Pages/40-location.qml:260
535+msgid "You can change it later in System Settings."
536+msgstr ""
537+
538+#: qml/Wizard/Pages/50-timezone.qml:29
539+msgid "Time Zone"
540+msgstr ""
541+
542+#: qml/Wizard/Pages/50-timezone.qml:178
543+msgid "Enter your city"
521msgstr ""
544msgstr ""
522
545
523−#: qml/Wizard/Pages/30-passwd-type.qml:103
546+#: qml/Wizard/Pages/60-account.qml:24
524−msgctxt "Label: Description of security method"
547+msgid "Personalize Your Device"
525−msgid "No security"
526msgstr ""
548msgstr ""
527
549
528−#: qml/Wizard/Pages/30-passwd-type.qml:105
550+#: qml/Wizard/Pages/60-account.qml:48
551+msgid "Preferred Name"
552+msgstr ""
553+
554+#: qml/Wizard/Pages/70-passwd-type.qml:39
555+msgid "Lock Screen"
556+msgstr ""
557+
558+#: qml/Wizard/Pages/70-passwd-type.qml:101
529msgctxt "Label: Type of security method"
559msgctxt "Label: Type of security method"
530−msgid "Passcode"
560+msgid "Create new password"
531msgstr ""
561msgstr ""
532
562
533−#: qml/Wizard/Pages/30-passwd-type.qml:106
563+#: qml/Wizard/Pages/70-passwd-type.qml:103
534−msgctxt "Label: Description of security method"
564+msgctxt "Label: Type of security method"
535−msgid "4 digits only"
565+msgid "Create passcode (numbers only)"
536msgstr ""
566msgstr ""
537
567
538−#: qml/Wizard/Pages/30-passwd-type.qml:108
568+#: qml/Wizard/Pages/70-passwd-type.qml:105
539msgctxt "Label: Type of security method"
569msgctxt "Label: Type of security method"
540−msgid "Passphrase"
570+msgid "No lock code"
541msgstr ""
571msgstr ""
542
572
543−#: qml/Wizard/Pages/30-passwd-type.qml:109
573+#: qml/Wizard/Pages/75-report-check.qml:26 qml/Wizard/Pages/here-terms.qml:108
544−msgctxt "Label: Description of security method"
574+msgid "Privacy Policy"
545−msgid "Numbers and letters"
546msgstr ""
575msgstr ""
547
576
548−#: qml/Wizard/Pages/40-wifi.qml:29
577+#: qml/Wizard/Pages/75-report-check.qml:26
549−msgid "Connect to Wi‑Fi"
578+msgid "Help Us Improve"
550msgstr ""
579msgstr ""
551
580
552−#: qml/Wizard/Pages/40-wifi.qml:168
581+#: qml/Wizard/Pages/75-report-check.qml:59
553−msgid "Available networks…"
582+msgid "Improve system performance by sending us crashes and error reports."
554msgstr ""
583msgstr ""
555
584
556−#: qml/Wizard/Pages/40-wifi.qml:169
585+#: qml/Wizard/Pages/75-report-check.qml:60
557−msgid "No available networks."
586+msgid "Privacy policy"
558msgstr ""
587msgstr ""
559
588
560−#: qml/Wizard/Pages/50-location.qml:27
589+#: qml/Wizard/Pages/80-finished.qml:89
561−msgid "Location"
590+msgid "Welcome to Ubuntu"
562msgstr ""
591msgstr ""
563
592
564−#: qml/Wizard/Pages/50-location.qml:62
593+#: qml/Wizard/Pages/80-finished.qml:104
565−msgid "Let the phone detect your location:"
594+msgid "You are ready to use your device now"
595+msgstr ""
596+
597+#: qml/Wizard/Pages/80-finished.qml:124
598+msgid "Get Started"
599+msgstr ""
600+
601+#: qml/Wizard/Pages/here-terms.qml:25
602+msgid "Terms & Conditions"
566msgstr ""
603msgstr ""
567
604
568−#: qml/Wizard/Pages/50-location.qml:69
605+#: qml/Wizard/Pages/here-terms.qml:69
569−msgid "Using GPS only (less accurate)"
606+msgid "Your device uses positioning technologies provided by HERE."
570msgstr ""
607msgstr ""
571
608
572−#: qml/Wizard/Pages/50-location.qml:86
609+#: qml/Wizard/Pages/here-terms.qml:81
573−msgid "Using GPS, anonymized Wi-Fi and cellular network info (recommended)"
610+msgid ""
611+"To provide you with positioning services and to improve their quality, HERE "
612+"collects information about nearby cell towers and Wi-Fi hotspots around your "
613+"current location whenever your position is being found."
574msgstr ""
614msgstr ""
575
615
576−#. Translators: HERE is a trademark for Nokia's location service, you probably shouldn't translate it
577−#: qml/Wizard/Pages/50-location.qml:103
616+#: qml/Wizard/Pages/here-terms.qml:93
578msgid ""
617msgid ""
579−"By selecting this option you agree to the Nokia HERE <a href='#'>terms and "
618+"The information collected is used to analyze the service and to improve the "
580−"conditions</a>."
619+"use of service, but not to identify you personally."
581msgstr ""
620msgstr ""
582
621
583−#: qml/Wizard/Pages/50-location.qml:112
622+#: qml/Wizard/Pages/here-terms.qml:106
584−msgid "Not at all"
623+#, qt-format
624+msgid "By continuing, you agree to the HERE platform %1 and %2."
585msgstr ""
625msgstr ""
586
626
587−#: qml/Wizard/Pages/50-location.qml:124
627+#: qml/Wizard/Pages/here-terms.qml:107
588−msgid "You can change your mind later in <b>System Settings</b>."
628+msgid "Service Terms"
589msgstr ""
629msgstr ""
590
630
591−#: qml/Wizard/Pages/60-reporting.qml:26
631+#: qml/Wizard/Pages/passcode-confirm.qml:43
592−msgid "Improving your experience"
632+#: qml/Wizard/Pages/passcode-desktop.qml:80
633+msgid "Confirm passcode"
593msgstr ""
634msgstr ""
594
635
595−#: qml/Wizard/Pages/60-reporting.qml:46
636+#: qml/Wizard/Pages/passcode-confirm.qml:45
596−msgid ""
637+msgid "Incorrect passcode."
597−"Your phone is set up to automatically report errors to Canonical and its "
598−"partners, the makers of the operating system."
599msgstr ""
638msgstr ""
600
639
601−#: qml/Wizard/Pages/60-reporting.qml:53
640+#: qml/Wizard/Pages/passcode-confirm.qml:45
641+msgctxt "Enter the passcode again"
602−msgid ""
642+msgid "Please re-enter."
603−"This can be disabled in <b>System Settings</b> under <b>Security &amp; "
604−"Privacy</b>"
605msgstr ""
643msgstr ""
606
644
607−#: qml/Wizard/Pages/80-finished.qml:24
645+#: qml/Wizard/Pages/passcode-desktop.qml:30
608−msgid "All done"
646+msgid "Lock Screen Passcode"
609msgstr ""
647msgstr ""
610
648
611−#: qml/Wizard/Pages/80-finished.qml:39
649+#: qml/Wizard/Pages/passcode-desktop.qml:56
612−msgid "Nice work!"
650+msgid "Enter 4 numbers to setup your passcode"
613msgstr ""
651msgstr ""
614
652
615−#: qml/Wizard/Pages/80-finished.qml:46
653+#: qml/Wizard/Pages/passcode-desktop.qml:65
616−msgid "Your device is now ready to use."
654+#: qml/Wizard/Pages/passcode-set.qml:54
655+msgid "Choose passcode"
617msgstr ""
656msgstr ""
618
657
619−#: qml/Wizard/Pages/80-finished.qml:53
658+#: qml/Wizard/Pages/passcode-desktop.qml:105
620−msgid "Finish"
659+msgid "Passcode too short"
621msgstr ""
660msgstr ""
622
661
623−#: qml/Wizard/Pages/here-terms.qml:27
662+#: qml/Wizard/Pages/passcode-desktop.qml:107
624−msgid "Terms & Conditions"
663+msgid "Passcodes match"
625msgstr ""
664msgstr ""
626
665
627−#: qml/Wizard/Pages/passwd-confirm.qml:49
666+#: qml/Wizard/Pages/passcode-desktop.qml:109
628−msgid "Confirm passphrase"
667+msgid "Passcodes do not match"
629msgstr ""
668msgstr ""
630
669
631−#: qml/Wizard/Pages/passwd-confirm.qml:50
670+#: qml/Wizard/Pages/passcode-set.qml:62
632−msgid "Confirm passcode"
671+msgid "Passcode must be 4 characters long"
633msgstr ""
672msgstr ""
634
673
635−#: qml/Wizard/Pages/passwd-confirm.qml:53
674+#: qml/Wizard/Pages/password-set.qml:30
636−#: qml/Wizard/Pages/passwd-confirm.qml:54
675+msgid "Lock Screen Password"
637−msgid "Please try again."
638msgstr ""
676msgstr ""
639
677
640−#: qml/Wizard/Pages/passwd-set.qml:61
678+#: qml/Wizard/Pages/password-set.qml:61
641−msgid "Choose your passcode"
679+msgid "Enter at least 8 characters"
642msgstr ""
680msgstr ""
643
681
644−#: qml/Wizard/Pages/passwd-set.qml:68
682+#: qml/Wizard/Pages/password-set.qml:73
645−msgid "Passphrase must be 4 characters long"
683+msgid "Choose password"
646msgstr ""
684msgstr ""
647
685
648−#. Translators: This is the arrow for "Back" buttons
686+#: qml/Wizard/Pages/password-set.qml:103
649−#: qml/Wizard/StackButton.qml:39
687+msgid "Confirm password"
650−#, qt-format
651−msgid "〈 %1"
652msgstr ""
688msgstr ""
653
689
654−#. Translators: This is the arrow for "Forward" buttons
690+#: qml/Wizard/Pages/sim.qml:27
691+msgid "No SIM card installed"
692+msgstr ""
693+
694+#: qml/Wizard/Pages/sim.qml:54
695+msgid "SIM card added"
696+msgstr ""
697+
698+#: qml/Wizard/Pages/sim.qml:55
699+msgid "You must restart the device to access the mobile network."
700+msgstr ""
701+
702+#: qml/Wizard/Pages/sim.qml:59
703+msgid "Restart"
704+msgstr ""
705+
706+#: qml/Wizard/Pages/sim.qml:78
707+msgid "You won’t be able to make calls or use text messaging without a SIM."
708+msgstr ""
709+
710+#: qml/Wizard/Pages/sim.qml:90
711+msgid "To proceed with no SIM tap Skip."
712+msgstr ""
713+
714+#: qml/Wizard/PasswordMeter.qml:87
715+msgid "Passwords match"
716+msgstr ""
717+
655−#: qml/Wizard/StackButton.qml:42
718+#: qml/Wizard/PasswordMeter.qml:89
656−#, qt-format
719+msgid "Passwords do not match"
720+msgstr ""
721+
722+#: qml/Wizard/PasswordMeter.qml:93
723+msgid "Strong password"
724+msgstr ""
725+
726+#: qml/Wizard/PasswordMeter.qml:95
727+msgid "Fair password"
728+msgstr ""
729+
730+#: qml/Wizard/PasswordMeter.qml:97
657−msgid "%1 〉"
731+msgid "Weak password"
732+msgstr ""
733+
734+#: qml/Wizard/PasswordMeter.qml:99
735+msgid "Very weak password"
658msgstr ""
736msgstr ""
659
737
660#~ msgid "Top edge"
738#~ msgid "Top edge"
po/cs.po+476−234
@@ -7,7 +7,7 @@ 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: 2016-03-10 22:48+0000\n"
10+"POT-Creation-Date: 2016-03-23 10:01+0000\n"
11"PO-Revision-Date: 2015-07-07 10:44+0000\n"
11"PO-Revision-Date: 2015-07-07 10:44+0000\n"
12"Last-Translator: Vojtěch Daněk <vdanek@outlook.com>\n"
12"Last-Translator: Vojtěch Daněk <vdanek@outlook.com>\n"
13"Language-Team: Czech <cs@li.org>\n"
13"Language-Team: Czech <cs@li.org>\n"
@@ -15,8 +15,8 @@ msgstr ""
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"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
18−"X-Launchpad-Export-Date: 2016-03-13 05:50+0000\n"
18+"X-Launchpad-Export-Date: 2016-03-24 06:07+0000\n"
19−"X-Generator: Launchpad (build 17939)\n"
19+"X-Generator: Launchpad (build 17958)\n"
20"Language: cs\n"
20"Language: cs\n"
21
21
22#: plugins/IntegratedLightDM/Greeter.cpp:112
22#: plugins/IntegratedLightDM/Greeter.cpp:112
@@ -77,53 +77,35 @@ msgctxt "Button: Log out from the system"
77msgid "Log Out"
77msgid "Log Out"
78msgstr "Odhlásit"
78msgstr "Odhlásit"
79
79
80−#: qml/Components/Dialogs.qml:161 qml/Components/Dialogs.qml:194
80+#: qml/Components/Dialogs.qml:161 qml/Components/Dialogs.qml:219
81−#: qml/Components/Dialogs.qml:253
81+#: qml/Dash/DashPageHeader.qml:298 qml/Wizard/Pages/passcode-confirm.qml:32
82+#: qml/Wizard/Pages/passcode-set.qml:32
82msgid "Cancel"
83msgid "Cancel"
83msgstr "Zrušit"
84msgstr "Zrušit"
84
85
85#: qml/Components/Dialogs.qml:173
86#: qml/Components/Dialogs.qml:173
86−msgctxt "Title: Reboot/Shut down dialog"
87−msgid "Shut down"
88−msgstr "Vypnout"
89−
90−#: qml/Components/Dialogs.qml:174
91−msgid "Are you sure you want to shut down?"
92−msgstr "Jste si jistí, že chcete zařízení vypnout?"
93−
94−#: qml/Components/Dialogs.qml:176
95−msgctxt "Button: Reboot the system"
96−msgid "Reboot"
97−msgstr "Restartovat"
98−
99−#: qml/Components/Dialogs.qml:185
100−msgctxt "Button: Shut down the system"
101−msgid "Shut down"
102−msgstr "Vypnout"
103−
104−#: qml/Components/Dialogs.qml:207
105msgctxt "Title: Reboot dialog"
87msgctxt "Title: Reboot dialog"
106msgid "Reboot"
88msgid "Reboot"
107msgstr "Restartovat"
89msgstr "Restartovat"
108
90
109−#: qml/Components/Dialogs.qml:208
91+#: qml/Components/Dialogs.qml:174
110msgid "Are you sure you want to reboot?"
92msgid "Are you sure you want to reboot?"
111msgstr "Jste si jistí, že chcete zařízení restartovat?"
93msgstr "Jste si jistí, že chcete zařízení restartovat?"
112
94
113−#: qml/Components/Dialogs.qml:210
95+#: qml/Components/Dialogs.qml:176
114msgid "No"
96msgid "No"
115msgstr "Ne"
97msgstr "Ne"
116
98
117−#: qml/Components/Dialogs.qml:217
99+#: qml/Components/Dialogs.qml:183
118msgid "Yes"
100msgid "Yes"
119msgstr "Ano"
101msgstr "Ano"
120
102
121−#: qml/Components/Dialogs.qml:232
103+#: qml/Components/Dialogs.qml:198
122msgctxt "Title: Power off/Restart dialog"
104msgctxt "Title: Power off/Restart dialog"
123msgid "Power"
105msgid "Power"
124msgstr "Vypnutí"
106msgstr "Vypnutí"
125
107
126−#: qml/Components/Dialogs.qml:233
108+#: qml/Components/Dialogs.qml:199
127msgid ""
109msgid ""
128"Are you sure you would like\n"
110"Are you sure you would like\n"
129"to power off?"
111"to power off?"
@@ -131,12 +113,12 @@ msgstr ""
131"Jste si jistí, že chcete\n"
113"Jste si jistí, že chcete\n"
132"telefon vypnout?"
114"telefon vypnout?"
133
115
134−#: qml/Components/Dialogs.qml:235
116+#: qml/Components/Dialogs.qml:201
135msgctxt "Button: Power off the system"
117msgctxt "Button: Power off the system"
136msgid "Power off"
118msgid "Power off"
137msgstr "Vypnutí"
119msgstr "Vypnutí"
138
120
139−#: qml/Components/Dialogs.qml:244
121+#: qml/Components/Dialogs.qml:210
140msgctxt "Button: Restart the system"
122msgctxt "Button: Restart the system"
141msgid "Restart"
123msgid "Restart"
142msgstr "Reboot"
124msgstr "Reboot"
@@ -179,42 +161,58 @@ msgstr ""
179msgid "Close all"
161msgid "Close all"
180msgstr ""
162msgstr ""
181
163
182−#: qml/Dash/DashPageHeader.qml:270
164+#: qml/Dash/DashPageHeader.qml:337
183msgctxt "Button: Open the Ubuntu Store"
165msgctxt "Button: Open the Ubuntu Store"
184msgid "Store"
166msgid "Store"
185msgstr "Obchod"
167msgstr "Obchod"
186
168
187−#: qml/Dash/DashPageHeader.qml:277
169+#: qml/Dash/DashPageHeader.qml:344
188msgctxt "Button: Start a search in the current dash scope"
170msgctxt "Button: Start a search in the current dash scope"
189msgid "Search"
171msgid "Search"
190msgstr "Hledat"
172msgstr "Hledat"
191
173
192−#: qml/Dash/DashPageHeader.qml:287
174+#: qml/Dash/DashPageHeader.qml:354
193msgctxt "Button: Show the current dash scope settings"
175msgctxt "Button: Show the current dash scope settings"
194msgid "Settings"
176msgid "Settings"
195msgstr "Nastavení"
177msgstr "Nastavení"
196
178
197−#: qml/Dash/DashPageHeader.qml:294
179+#: qml/Dash/DashPageHeader.qml:361
198msgid "Remove from Favorites"
180msgid "Remove from Favorites"
199msgstr "Odstranit z oblíbených"
181msgstr "Odstranit z oblíbených"
200
182
201−#: qml/Dash/DashPageHeader.qml:294
183+#: qml/Dash/DashPageHeader.qml:361
202msgid "Add to Favorites"
184msgid "Add to Favorites"
203msgstr "Přidat do oblíbených"
185msgstr "Přidat do oblíbených"
204
186
187+#: qml/Dash/FiltersPopover.qml:60
188+msgid "Refine your results"
189+msgstr ""
190+
191+#: qml/Dash/FiltersPopover.qml:69
192+msgid "Reset"
193+msgstr ""
194+
205−#: qml/Dash/GenericScopeView.qml:567 qml/Dash/GenericScopeView.qml:725
195+#: qml/Dash/GenericScopeView.qml:570 qml/Dash/GenericScopeView.qml:755
206msgid "See less"
196msgid "See less"
207msgstr "Zobrazit méně"
197msgstr "Zobrazit méně"
208
198
209−#: qml/Dash/GenericScopeView.qml:567
199+#: qml/Dash/GenericScopeView.qml:570
210msgid "See all"
200msgid "See all"
211msgstr "Zobrazit vše"
201msgstr "Zobrazit vše"
212
202
213−#: qml/Dash/GenericScopeView.qml:629
203+#: qml/Dash/GenericScopeView.qml:627
214msgctxt "Label: Hint for dash search line edit"
204msgctxt "Label: Hint for dash search line edit"
215msgid "Search"
205msgid "Search"
216msgstr "Hledat"
206msgstr "Hledat"
217
207
208+#: qml/Dash/PageHeaderExtraPanel.qml:55
209+msgid "Recent Searches"
210+msgstr ""
211+
212+#: qml/Dash/PageHeaderExtraPanel.qml:66
213+msgid "Clear All"
214+msgstr ""
215+
218#: qml/Dash/Previews/PreviewActionCombo.qml:35
216#: qml/Dash/Previews/PreviewActionCombo.qml:35
219msgid "More..."
217msgid "More..."
220msgstr "Více..."
218msgstr "Více..."
@@ -282,11 +280,11 @@ msgstr "Znovu"
282msgid "Tap to unlock"
280msgid "Tap to unlock"
283msgstr "Klepnout pro odemčení"
281msgstr "Klepnout pro odemčení"
284
282
285−#: qml/Greeter/NarrowView.qml:54 qml/Wizard/Pages/passwd-confirm.qml:53
283+#: qml/Greeter/NarrowView.qml:54
286msgid "Sorry, incorrect passphrase."
284msgid "Sorry, incorrect passphrase."
287msgstr "Zadali jste špatné heslo."
285msgstr "Zadali jste špatné heslo."
288
286
289−#: qml/Greeter/NarrowView.qml:55 qml/Wizard/Pages/passwd-confirm.qml:54
287+#: qml/Greeter/NarrowView.qml:55
290msgid "Sorry, incorrect passcode."
288msgid "Sorry, incorrect passcode."
291msgstr "Zadali jste špatné heslo."
289msgstr "Zadali jste špatné heslo."
292
290
@@ -315,7 +313,7 @@ msgstr ""
315msgid "Enter %1"
313msgid "Enter %1"
316msgstr "Vložte %1"
314msgstr "Vložte %1"
317
315
318−#: qml/Greeter/NarrowView.qml:117 qml/Wizard/Pages/passwd-set.qml:60
316+#: qml/Greeter/NarrowView.qml:117
319msgid "Enter passphrase"
317msgid "Enter passphrase"
320msgstr "Vložte heslo"
318msgstr "Vložte heslo"
321
319
@@ -353,11 +351,11 @@ msgstr "Klepnutím se vrátíte k hovoru..."
353msgid "Conference"
351msgid "Conference"
354msgstr "Konferenční hovor"
352msgstr "Konferenční hovor"
355
353
356−#: qml/Panel/Indicators/MenuItemFactory.qml:752
354+#: qml/Panel/Indicators/MenuItemFactory.qml:761
357msgid "Nothing is playing"
355msgid "Nothing is playing"
358msgstr "Nic se nepřehrává"
356msgstr "Nic se nepřehrává"
359
357
360−#: qml/Panel/Indicators/MenuItemFactory.qml:881
358+#: qml/Panel/Indicators/MenuItemFactory.qml:890
361#, qt-format
359#, qt-format
362msgid "%1 hour"
360msgid "%1 hour"
363msgid_plural "%1 hours"
361msgid_plural "%1 hours"
@@ -365,7 +363,7 @@ msgstr[0] "%1 hodina"
365msgstr[1] "%1 hodiny"
363msgstr[1] "%1 hodiny"
366msgstr[2] "%1 hodin"
364msgstr[2] "%1 hodin"
367
365
368−#: qml/Panel/Indicators/MenuItemFactory.qml:885
366+#: qml/Panel/Indicators/MenuItemFactory.qml:894
369#, qt-format
367#, qt-format
370msgid "%1 minute"
368msgid "%1 minute"
371msgid_plural "%1 minutes"
369msgid_plural "%1 minutes"
@@ -373,7 +371,7 @@ msgstr[0] "%1 minuta"
373msgstr[1] "%1 minuty"
371msgstr[1] "%1 minuty"
374msgstr[2] "%1 minut"
372msgstr[2] "%1 minut"
375
373
376−#: qml/Panel/Indicators/MenuItemFactory.qml:890
374+#: qml/Panel/Indicators/MenuItemFactory.qml:899
377#, qt-format
375#, qt-format
378msgid "%1 second"
376msgid "%1 second"
379msgid_plural "%1 seconds"
377msgid_plural "%1 seconds"
@@ -381,37 +379,37 @@ msgstr[0] "%1 sekunda"
381msgstr[1] "%1 sekundy"
379msgstr[1] "%1 sekundy"
382msgstr[2] "%1 sekund"
380msgstr[2] "%1 sekund"
383
381
384−#: qml/Panel/Indicators/MenuItemFactory.qml:893
382+#: qml/Panel/Indicators/MenuItemFactory.qml:902
385msgid "0 seconds"
383msgid "0 seconds"
386msgstr "0 sekund"
384msgstr "0 sekund"
387
385
388#. Translators: String like "1 hour, 2 minutes, 3 seconds remaining"
386#. Translators: String like "1 hour, 2 minutes, 3 seconds remaining"
389−#: qml/Panel/Indicators/MenuItemFactory.qml:895
387+#: qml/Panel/Indicators/MenuItemFactory.qml:904
390#, qt-format
388#, qt-format
391msgid "%1 remaining"
389msgid "%1 remaining"
392msgstr "Zbývá %1"
390msgstr "Zbývá %1"
393
391
394−#: qml/Panel/Indicators/MenuItemFactory.qml:901
392+#: qml/Panel/Indicators/MenuItemFactory.qml:910
395msgid "In queue…"
393msgid "In queue…"
396msgstr "Ve frontě..."
394msgstr "Ve frontě..."
397
395
398−#: qml/Panel/Indicators/MenuItemFactory.qml:905
396+#: qml/Panel/Indicators/MenuItemFactory.qml:914
399msgid "Downloading"
397msgid "Downloading"
400msgstr "Stahování"
398msgstr "Stahování"
401
399
402−#: qml/Panel/Indicators/MenuItemFactory.qml:907
400+#: qml/Panel/Indicators/MenuItemFactory.qml:916
403msgid "Paused, tap to resume"
401msgid "Paused, tap to resume"
404msgstr "Pauza, pro pokračování klepněte"
402msgstr "Pauza, pro pokračování klepněte"
405
403
406−#: qml/Panel/Indicators/MenuItemFactory.qml:909
404+#: qml/Panel/Indicators/MenuItemFactory.qml:918
407msgid "Canceled"
405msgid "Canceled"
408msgstr "Zrušeno"
406msgstr "Zrušeno"
409
407
410−#: qml/Panel/Indicators/MenuItemFactory.qml:911
408+#: qml/Panel/Indicators/MenuItemFactory.qml:920
411msgid "Finished"
409msgid "Finished"
412msgstr "Dokončeno"
410msgstr "Dokončeno"
413
411
414−#: qml/Panel/Indicators/MenuItemFactory.qml:913
412+#: qml/Panel/Indicators/MenuItemFactory.qml:922
415msgid "Failed, tap to retry"
413msgid "Failed, tap to retry"
416msgstr "Nezdařilo se, opakujte klepnutím"
414msgstr "Nezdařilo se, opakujte klepnutím"
417
415
@@ -431,251 +429,324 @@ msgctxt "Button: Call back on phone"
431msgid "Call back"
429msgid "Call back"
432msgstr ""
430msgstr ""
433
431
434−#: qml/Tutorial/TutorialBottom.qml:28
432+#: qml/Stages/SideStage.qml:76
435−msgid "Open special menus"
433+msgid "Drag using 3 fingers any application from one window to the other"
436−msgstr "Otevřít speciální menu"
434+msgstr ""
437−
438−#: qml/Tutorial/TutorialBottom.qml:29
439−msgid "Swipe up from the bottom edge."
440−msgstr "Potáhněte prstem z dola nahoru."
441
435
442−#: qml/Tutorial/TutorialBottomFinish.qml:24
436+#: qml/Tutorial/TutorialBottom.qml:78
443−msgid "This action does different things for different apps"
437+msgid "Swipe up to add a contact"
444−msgstr "Tato akce vyvolá různé reakce v rozdílných aplikacích"
438+msgstr ""
445
439
446−#: qml/Tutorial/TutorialBottomFinish.qml:25
440+#: qml/Tutorial/TutorialBottom.qml:80
447−msgid "Tap here to finish."
441+msgid "Swipe up for favorite calculations"
448−msgstr "Klepněte zde pro dokončení."
442+msgstr ""
449
443
450−#: qml/Tutorial/TutorialContent.qml:80 qml/Tutorial/TutorialLeftFinish.qml:25
444+#: qml/Tutorial/TutorialBottom.qml:82
451−#: qml/Tutorial/TutorialRight.qml:144
445+msgid "Swipe up for recent calls"
452−msgid "Tap here to continue."
446+msgstr ""
453−msgstr "Klepněte zde pro pokračování."
454
447
455−#: qml/Tutorial/TutorialLeft.qml:26
448+#: qml/Tutorial/TutorialBottom.qml:84
456−msgid "Open the launcher"
449+msgid "Swipe up to create a message"
457−msgstr "Otevřete launcher"
450+msgstr ""
458
451
459−#: qml/Tutorial/TutorialLeft.qml:27
452+#: qml/Tutorial/TutorialBottom.qml:85
460−msgid "Short swipe from the left edge."
453+msgid "Swipe up to manage the app"
461−msgstr "Potáhněte krátce z levého okraje."
454+msgstr ""
462
455
463−#: qml/Tutorial/TutorialLeftFinish.qml:24
456+#: qml/Tutorial/TutorialLeft.qml:47
464−msgid "These are the shortcuts to favorite apps"
457+msgid "Swipe from the left edge to open the launcher"
465−msgstr "Zde jsou odkazy na vaše oblíbené aplikace"
458+msgstr ""
466
459
467−#: qml/Tutorial/TutorialPage.qml:178
460+#: qml/Tutorial/TutorialLeftLong.qml:47
468−msgid "You almost got it!"
461+msgid "Long swipe from the left edge to open the Today scope"
469−msgstr "Už to skoro máte!"
462+msgstr ""
470
463
471−#: qml/Tutorial/TutorialPage.qml:195
464+#: qml/Tutorial/TutorialRight.qml:54
472−msgid "Try again."
465+msgid "Hover your mouse on the right edge to view your open apps"
473−msgstr "Zkuste to znovu."
466+msgstr ""
474
467
475−#: qml/Tutorial/TutorialRight.qml:31
468+#: qml/Tutorial/TutorialRight.qml:55
476−msgid "To view open apps"
469+msgid "Short or long swipe from the right edge to view your open apps"
477−msgstr "K zobrazení otevřených aplikací"
470+msgstr ""
478
471
479−#: qml/Tutorial/TutorialRight.qml:32
472+#: qml/Tutorial/TutorialTop.qml:53
480−msgid "Long swipe from the right edge."
473+msgid "Swipe from the top right edge to open the notification bar"
481−msgstr "Potáhněte dlouho z pravého okraje."
474+msgstr ""
482
475
483−#: qml/Tutorial/TutorialRight.qml:122
476+#: qml/Tutorial/TutorialTop.qml:54
484−msgid "View all your running tasks."
477+msgid "Swipe from the top edge to open the notification bar"
485−msgstr "Zobrazíte všechny běžící procesy."
478+msgstr ""
486
479
487−#: qml/Wizard/Page.qml:89
480+#: qml/Wizard/Page.qml:54
488msgctxt "Button: Go back one page in the Wizard"
481msgctxt "Button: Go back one page in the Wizard"
489msgid "Back"
482msgid "Back"
490msgstr "Zpět"
483msgstr "Zpět"
491
484
492#: qml/Wizard/Pages/10-welcome.qml:27
485#: qml/Wizard/Pages/10-welcome.qml:27
493−msgid "Hi!"
486+msgid "Language"
494−msgstr "Ahoj!"
487+msgstr ""
495
488
496−#: qml/Wizard/Pages/10-welcome.qml:44
489+#: qml/Wizard/Pages/10-welcome.qml:156 qml/Wizard/Pages/30-wifi.qml:206
497−msgid "Welcome to your Ubuntu device."
490+#: qml/Wizard/Pages/40-location.qml:271 qml/Wizard/Pages/50-timezone.qml:267
491+#: qml/Wizard/Pages/60-account.qml:65 qml/Wizard/Pages/70-passwd-type.qml:144
492+#: qml/Wizard/Pages/75-report-check.qml:84
493+#: qml/Wizard/Pages/passcode-desktop.qml:124
494+#: qml/Wizard/Pages/password-set.qml:141
495+msgid "Next"
498msgstr ""
496msgstr ""
499
497
500−#: qml/Wizard/Pages/10-welcome.qml:52
498+#: qml/Wizard/Pages/30-wifi.qml:29
501−msgid "Let’s get started."
499+msgid "Connect to Wi‑Fi"
502−msgstr "Začněme."
500+msgstr "Připojte se k Wi-Fi"
503
501
504−#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:133
502+#: qml/Wizard/Pages/30-wifi.qml:130
505−#: qml/Wizard/Pages/40-wifi.qml:215 qml/Wizard/Pages/50-location.qml:131
503+msgid "Connected"
506−#: qml/Wizard/Pages/60-reporting.qml:60 qml/Wizard/Pages/passwd-confirm.qml:82
507−#: qml/Wizard/Pages/passwd-set.qml:90
508−msgid "Continue"
509−msgstr "Pokračovat"
504+msgstr ""
510
505
511−#: qml/Wizard/Pages/20-sim.qml:25
506+#: qml/Wizard/Pages/30-wifi.qml:163
512−msgid "Add a SIM card and restart your device"
507+msgid "Available Wi-Fi networks"
513−msgstr "Vložte SIM kartu a restartujte své zařízení"
508+msgstr ""
514
509
515−#: qml/Wizard/Pages/20-sim.qml:59
510+#: qml/Wizard/Pages/30-wifi.qml:164
516−msgid "Without it, you won’t be able to make calls or use text messaging."
511+msgid "No available Wi-Fi networks"
517−msgstr "Bez ni nebudete moci telefonovat nebo posílat textové zprávy."
512+msgstr ""
518
513
519−#: qml/Wizard/Pages/20-sim.qml:73 qml/Wizard/Pages/40-wifi.qml:215
514+#: qml/Wizard/Pages/30-wifi.qml:206 qml/Wizard/Pages/60-account.qml:65
515+#: qml/Wizard/Pages/sim.qml:101
520msgid "Skip"
516msgid "Skip"
521msgstr "Přeskočit"
517msgstr "Přeskočit"
522
518
523−#: qml/Wizard/Pages/30-passwd-type.qml:39
519+#: qml/Wizard/Pages/40-location.qml:27
520+msgid "Location Services"
521+msgstr ""
522+
523+#: qml/Wizard/Pages/40-location.qml:83
524−msgid "Lock security"
524+msgid ""
525−msgstr "Bezpečnostní uzamčení"
525+"Use GPS, Wi-Fi hotspots and mobile network anonymously to detect location "
526+"(recommended)"
527+msgstr ""
528+
529+#: qml/Wizard/Pages/40-location.qml:105
530+#, qt-format
531+msgid "By selecting this option you agree to the Nokia HERE %1."
532+msgstr ""
526
533
527−#: qml/Wizard/Pages/30-passwd-type.qml:79
534+#: qml/Wizard/Pages/40-location.qml:106
528−msgid "Please select how you’d like to unlock your device."
535+msgctxt "part of: Nokia HERE terms and conditions"
536+msgid "terms and conditions"
529msgstr ""
537msgstr ""
530
538
531−#: qml/Wizard/Pages/30-passwd-type.qml:102
539+#: qml/Wizard/Pages/40-location.qml:160
532−msgctxt "Label: Type of security method"
540+msgid "GPS only"
533−msgid "Swipe"
541+msgstr ""
542+
543+#: qml/Wizard/Pages/40-location.qml:214
544+msgid "Don't use my location"
534−msgstr "Potažením prstu"
545+msgstr ""
535
546
536−#: qml/Wizard/Pages/30-passwd-type.qml:103
547+#: qml/Wizard/Pages/40-location.qml:260
537−msgctxt "Label: Description of security method"
548+msgid "You can change it later in System Settings."
538−msgid "No security"
539−msgstr "Bez zabezpečení"
549+msgstr ""
540
550
541−#: qml/Wizard/Pages/30-passwd-type.qml:105
551+#: qml/Wizard/Pages/50-timezone.qml:29
552+msgid "Time Zone"
553+msgstr ""
554+
555+#: qml/Wizard/Pages/50-timezone.qml:178
556+msgid "Enter your city"
557+msgstr ""
558+
559+#: qml/Wizard/Pages/60-account.qml:24
560+msgid "Personalize Your Device"
561+msgstr ""
562+
563+#: qml/Wizard/Pages/60-account.qml:48
564+msgid "Preferred Name"
565+msgstr ""
566+
567+#: qml/Wizard/Pages/70-passwd-type.qml:39
568+msgid "Lock Screen"
569+msgstr ""
570+
571+#: qml/Wizard/Pages/70-passwd-type.qml:101
542msgctxt "Label: Type of security method"
572msgctxt "Label: Type of security method"
543−msgid "Passcode"
573+msgid "Create new password"
544−msgstr "Číselné heslo"
574+msgstr ""
545
575
546−#: qml/Wizard/Pages/30-passwd-type.qml:106
576+#: qml/Wizard/Pages/70-passwd-type.qml:103
547−msgctxt "Label: Description of security method"
577+msgctxt "Label: Type of security method"
548−msgid "4 digits only"
578+msgid "Create passcode (numbers only)"
549−msgstr "Pouze 4 čísla"
579+msgstr ""
550
580
551−#: qml/Wizard/Pages/30-passwd-type.qml:108
581+#: qml/Wizard/Pages/70-passwd-type.qml:105
552msgctxt "Label: Type of security method"
582msgctxt "Label: Type of security method"
553−msgid "Passphrase"
583+msgid "No lock code"
554−msgstr "Heslo"
584+msgstr ""
555
585
556−#: qml/Wizard/Pages/30-passwd-type.qml:109
586+#: qml/Wizard/Pages/75-report-check.qml:26 qml/Wizard/Pages/here-terms.qml:108
557−msgctxt "Label: Description of security method"
587+msgid "Privacy Policy"
558−msgid "Numbers and letters"
559−msgstr "Čísla a písmena"
588+msgstr ""
560
589
561−#: qml/Wizard/Pages/40-wifi.qml:29
590+#: qml/Wizard/Pages/75-report-check.qml:26
562−msgid "Connect to Wi‑Fi"
591+msgid "Help Us Improve"
563−msgstr "Připojte se k Wi-Fi"
592+msgstr ""
564
593
565−#: qml/Wizard/Pages/40-wifi.qml:168
594+#: qml/Wizard/Pages/75-report-check.qml:59
566−msgid "Available networks…"
595+msgid "Improve system performance by sending us crashes and error reports."
567−msgstr "Dostupné sítě..."
596+msgstr ""
568
597
569−#: qml/Wizard/Pages/40-wifi.qml:169
598+#: qml/Wizard/Pages/75-report-check.qml:60
570−msgid "No available networks."
599+msgid "Privacy policy"
571−msgstr "Žádná dostupná síť."
600+msgstr ""
572
601
573−#: qml/Wizard/Pages/50-location.qml:27
602+#: qml/Wizard/Pages/80-finished.qml:89
574−msgid "Location"
603+msgid "Welcome to Ubuntu"
575−msgstr "Umístění"
604+msgstr ""
576
605
577−#: qml/Wizard/Pages/50-location.qml:62
606+#: qml/Wizard/Pages/80-finished.qml:104
578−msgid "Let the phone detect your location:"
607+msgid "You are ready to use your device now"
579−msgstr "Povolte telefonu zjistit, kde se zrovna nacházíte:"
608+msgstr ""
609+
610+#: qml/Wizard/Pages/80-finished.qml:124
611+msgid "Get Started"
612+msgstr ""
580
613
581−#: qml/Wizard/Pages/50-location.qml:69
614+#: qml/Wizard/Pages/here-terms.qml:25
582−msgid "Using GPS only (less accurate)"
615+msgid "Terms & Conditions"
583−msgstr "Používat pouze GPS (méně přesné)"
616+msgstr "Pravidla a podmínky"
584
617
585−#: qml/Wizard/Pages/50-location.qml:86
618+#: qml/Wizard/Pages/here-terms.qml:69
586−msgid "Using GPS, anonymized Wi-Fi and cellular network info (recommended)"
619+msgid "Your device uses positioning technologies provided by HERE."
587−msgstr "Používat GPS, anonymní Wi-Fi a datovou síť (doporučeno)"
620+msgstr ""
588
621
589−#. Translators: HERE is a trademark for Nokia's location service, you probably shouldn't translate it
590−#: qml/Wizard/Pages/50-location.qml:103
622+#: qml/Wizard/Pages/here-terms.qml:81
591msgid ""
623msgid ""
592−"By selecting this option you agree to the Nokia HERE <a href='#'>terms and "
624+"To provide you with positioning services and to improve their quality, HERE "
593−"conditions</a>."
625+"collects information about nearby cell towers and Wi-Fi hotspots around your "
626+"current location whenever your position is being found."
594msgstr ""
627msgstr ""
595−"Zvolením této možnosti souhlasíte s <a href='#'>pravidly a podmínkami</a> "
596−"Nokia HERE."
597
628
598−#: qml/Wizard/Pages/50-location.qml:112
629+#: qml/Wizard/Pages/here-terms.qml:93
599−msgid "Not at all"
630+msgid ""
600−msgstr "V žádném případě"
631+"The information collected is used to analyze the service and to improve the "
632+"use of service, but not to identify you personally."
633+msgstr ""
601
634
602−#: qml/Wizard/Pages/50-location.qml:124
635+#: qml/Wizard/Pages/here-terms.qml:106
603−msgid "You can change your mind later in <b>System Settings</b>."
636+#, qt-format
637+msgid "By continuing, you agree to the HERE platform %1 and %2."
604msgstr ""
638msgstr ""
605−"Pokud změníte názor, můžete nastavení změnit v <b>Nastavení systému</b>."
606
639
607−#: qml/Wizard/Pages/60-reporting.qml:26
640+#: qml/Wizard/Pages/here-terms.qml:107
608−msgid "Improving your experience"
641+msgid "Service Terms"
609−msgstr "Zlepšete své zkušenosti"
642+msgstr ""
610
643
611−#: qml/Wizard/Pages/60-reporting.qml:46
644+#: qml/Wizard/Pages/passcode-confirm.qml:43
645+#: qml/Wizard/Pages/passcode-desktop.qml:80
612−msgid ""
646+msgid "Confirm passcode"
613−"Your phone is set up to automatically report errors to Canonical and its "
647+msgstr "Potvrdit číselné heslo"
614−"partners, the makers of the operating system."
648+
649+#: qml/Wizard/Pages/passcode-confirm.qml:45
650+msgid "Incorrect passcode."
615msgstr ""
651msgstr ""
616−"Váš telefon je nastaven tak, aby automaticky odesílal informace o chybách "
617−"společnosti Canonical a partnerům, kteří stvořili tento operační systém."
618
652
619−#: qml/Wizard/Pages/60-reporting.qml:53
653+#: qml/Wizard/Pages/passcode-confirm.qml:45
654+msgctxt "Enter the passcode again"
620−msgid ""
655+msgid "Please re-enter."
621−"This can be disabled in <b>System Settings</b> under <b>Security &amp; "
622−"Privacy</b>"
623msgstr ""
656msgstr ""
624−"To může být vypnuto v <b>Nastavení systému</b> v <b>Zabezpečení a "
625−"soukromí</b>"
626
657
627−#: qml/Wizard/Pages/80-finished.qml:24
658+#: qml/Wizard/Pages/passcode-desktop.qml:30
628−msgid "All done"
659+msgid "Lock Screen Passcode"
629−msgstr "Vše je hotovo"
660+msgstr ""
630
661
631−#: qml/Wizard/Pages/80-finished.qml:39
662+#: qml/Wizard/Pages/passcode-desktop.qml:56
632−msgid "Nice work!"
663+msgid "Enter 4 numbers to setup your passcode"
633−msgstr "Skvělá práce!"
664+msgstr ""
634
665
635−#: qml/Wizard/Pages/80-finished.qml:46
666+#: qml/Wizard/Pages/passcode-desktop.qml:65
636−msgid "Your device is now ready to use."
667+#: qml/Wizard/Pages/passcode-set.qml:54
668+msgid "Choose passcode"
637msgstr ""
669msgstr ""
638
670
639−#: qml/Wizard/Pages/80-finished.qml:53
671+#: qml/Wizard/Pages/passcode-desktop.qml:105
640−msgid "Finish"
672+msgid "Passcode too short"
641−msgstr "Dokončit"
673+msgstr ""
642
674
643−#: qml/Wizard/Pages/here-terms.qml:27
675+#: qml/Wizard/Pages/passcode-desktop.qml:107
644−msgid "Terms & Conditions"
676+msgid "Passcodes match"
645−msgstr "Pravidla a podmínky"
677+msgstr ""
646
678
647−#: qml/Wizard/Pages/passwd-confirm.qml:49
679+#: qml/Wizard/Pages/passcode-desktop.qml:109
648−msgid "Confirm passphrase"
680+msgid "Passcodes do not match"
649−msgstr "Potvrdit heslo"
681+msgstr ""
650
682
651−#: qml/Wizard/Pages/passwd-confirm.qml:50
683+#: qml/Wizard/Pages/passcode-set.qml:62
652−msgid "Confirm passcode"
684+msgid "Passcode must be 4 characters long"
653−msgstr "Potvrdit číselné heslo"
685+msgstr ""
654
686
655−#: qml/Wizard/Pages/passwd-confirm.qml:53
687+#: qml/Wizard/Pages/password-set.qml:30
656−#: qml/Wizard/Pages/passwd-confirm.qml:54
688+msgid "Lock Screen Password"
657−msgid "Please try again."
689+msgstr ""
658−msgstr "Zkuste to, prosím, znovu."
659
690
660−#: qml/Wizard/Pages/passwd-set.qml:61
691+#: qml/Wizard/Pages/password-set.qml:61
661−msgid "Choose your passcode"
692+msgid "Enter at least 8 characters"
662−msgstr "Zvolte své heslo"
693+msgstr ""
663
694
664−#: qml/Wizard/Pages/passwd-set.qml:68
695+#: qml/Wizard/Pages/password-set.qml:73
665−msgid "Passphrase must be 4 characters long"
696+msgid "Choose password"
666−msgstr "Heslo musí být alespoň 4 znaky dlouhé"
697+msgstr ""
667
698
668−#. Translators: This is the arrow for "Back" buttons
699+#: qml/Wizard/Pages/password-set.qml:103
669−#: qml/Wizard/StackButton.qml:39
700+msgid "Confirm password"
670−#, qt-format
671−msgid "〈 %1"
672−msgstr "〈 %1"
701+msgstr ""
673
702
674−#. Translators: This is the arrow for "Forward" buttons
703+#: qml/Wizard/Pages/sim.qml:27
704+msgid "No SIM card installed"
705+msgstr ""
706+
707+#: qml/Wizard/Pages/sim.qml:54
708+msgid "SIM card added"
709+msgstr ""
710+
711+#: qml/Wizard/Pages/sim.qml:55
712+msgid "You must restart the device to access the mobile network."
713+msgstr ""
714+
715+#: qml/Wizard/Pages/sim.qml:59
716+msgid "Restart"
717+msgstr "Reboot"
718+
675−#: qml/Wizard/StackButton.qml:42
719+#: qml/Wizard/Pages/sim.qml:78
676−#, qt-format
720+msgid "You won’t be able to make calls or use text messaging without a SIM."
677−msgid "%1 〉"
721+msgstr ""
722+
723+#: qml/Wizard/Pages/sim.qml:90
724+msgid "To proceed with no SIM tap Skip."
725+msgstr ""
726+
727+#: qml/Wizard/PasswordMeter.qml:87
728+msgid "Passwords match"
729+msgstr ""
730+
731+#: qml/Wizard/PasswordMeter.qml:89
732+msgid "Passwords do not match"
678−msgstr "%1 〉"
733+msgstr ""
734+
735+#: qml/Wizard/PasswordMeter.qml:93
736+msgid "Strong password"
737+msgstr ""
738+
739+#: qml/Wizard/PasswordMeter.qml:95
740+msgid "Fair password"
741+msgstr ""
742+
743+#: qml/Wizard/PasswordMeter.qml:97
744+msgid "Weak password"
745+msgstr ""
746+
747+#: qml/Wizard/PasswordMeter.qml:99
748+msgid "Very weak password"
749+msgstr ""
679
750
680#~ msgid "Try swiping from the right edge to unlock the phone"
751#~ msgid "Try swiping from the right edge to unlock the phone"
681#~ msgstr "Pokuste se odemknout telefon potažením prstu z pravého okraje."
752#~ msgstr "Pokuste se odemknout telefon potažením prstu z pravého okraje."
@@ -728,6 +799,21 @@ msgstr "%1 〉"
728#~ msgid "Store"
799#~ msgid "Store"
729#~ msgstr "Obchod"
800#~ msgstr "Obchod"
730
801
802+#~ msgctxt "Title: Reboot/Shut down dialog"
803+#~ msgid "Shut down"
804+#~ msgstr "Vypnout"
805+
806+#~ msgid "Are you sure you want to shut down?"
807+#~ msgstr "Jste si jistí, že chcete zařízení vypnout?"
808+
809+#~ msgctxt "Button: Reboot the system"
810+#~ msgid "Reboot"
811+#~ msgstr "Restartovat"
812+
813+#~ msgctxt "Button: Shut down the system"
814+#~ msgid "Shut down"
815+#~ msgstr "Vypnout"
816+
731#~ msgid "Please re-enter"
817#~ msgid "Please re-enter"
732#~ msgstr "Vložte znovu"
818#~ msgstr "Vložte znovu"
733
819
@@ -737,15 +823,174 @@ msgstr "%1 〉"
737#~ msgid "Roaming"
823#~ msgid "Roaming"
738#~ msgstr "Roaming"
824#~ msgstr "Roaming"
739
825
826+#~ msgid "This action does different things for different apps"
827+#~ msgstr "Tato akce vyvolá různé reakce v rozdílných aplikacích"
828+
829+#~ msgid "Tap here to finish."
830+#~ msgstr "Klepněte zde pro dokončení."
831+
832+#~ msgid "Open special menus"
833+#~ msgstr "Otevřít speciální menu"
834+
835+#~ msgid "Swipe up from the bottom edge."
836+#~ msgstr "Potáhněte prstem z dola nahoru."
837+
838+#~ msgid "Tap here to continue."
839+#~ msgstr "Klepněte zde pro pokračování."
840+
841+#~ msgid "These are the shortcuts to favorite apps"
842+#~ msgstr "Zde jsou odkazy na vaše oblíbené aplikace"
843+
844+#~ msgid "Open the launcher"
845+#~ msgstr "Otevřete launcher"
846+
847+#~ msgid "Short swipe from the left edge."
848+#~ msgstr "Potáhněte krátce z levého okraje."
849+
850+#~ msgid "You almost got it!"
851+#~ msgstr "Už to skoro máte!"
852+
853+#~ msgid "Try again."
854+#~ msgstr "Zkuste to znovu."
855+
856+#~ msgid "To view open apps"
857+#~ msgstr "K zobrazení otevřených aplikací"
858+
859+#~ msgid "Long swipe from the right edge."
860+#~ msgstr "Potáhněte dlouho z pravého okraje."
861+
862+#~ msgid "View all your running tasks."
863+#~ msgstr "Zobrazíte všechny běžící procesy."
864+
865+#~ msgid "Hi!"
866+#~ msgstr "Ahoj!"
867+
740#~ msgid "Welcome to your Ubuntu phone."
868#~ msgid "Welcome to your Ubuntu phone."
741#~ msgstr "Vítejte ve vašem Ubuntu telefonu."
869#~ msgstr "Vítejte ve vašem Ubuntu telefonu."
742
870
871+#~ msgid "Let’s get started."
872+#~ msgstr "Začněme."
873+
874+#~ msgid "Continue"
875+#~ msgstr "Pokračovat"
876+
877+#~ msgid "Add a SIM card and restart your device"
878+#~ msgstr "Vložte SIM kartu a restartujte své zařízení"
879+
880+#~ msgid "Without it, you won’t be able to make calls or use text messaging."
881+#~ msgstr "Bez ni nebudete moci telefonovat nebo posílat textové zprávy."
882+
883+#~ msgid "Lock security"
884+#~ msgstr "Bezpečnostní uzamčení"
885+
743#~ msgid "Please select how you’d like to unlock your phone."
886#~ msgid "Please select how you’d like to unlock your phone."
744#~ msgstr "Zvolte, prosím, jak chcete svůj telefon odemykat."
887#~ msgstr "Zvolte, prosím, jak chcete svůj telefon odemykat."
745
888
889+#~ msgctxt "Label: Type of security method"
890+#~ msgid "Swipe"
891+#~ msgstr "Potažením prstu"
892+
893+#~ msgctxt "Label: Description of security method"
894+#~ msgid "No security"
895+#~ msgstr "Bez zabezpečení"
896+
897+#~ msgctxt "Label: Type of security method"
898+#~ msgid "Passcode"
899+#~ msgstr "Číselné heslo"
900+
901+#~ msgctxt "Label: Description of security method"
902+#~ msgid "4 digits only"
903+#~ msgstr "Pouze 4 čísla"
904+
905+#~ msgctxt "Label: Type of security method"
906+#~ msgid "Passphrase"
907+#~ msgstr "Heslo"
908+
909+#~ msgctxt "Label: Description of security method"
910+#~ msgid "Numbers and letters"
911+#~ msgstr "Čísla a písmena"
912+
913+#~ msgid "Available networks…"
914+#~ msgstr "Dostupné sítě..."
915+
916+#~ msgid "No available networks."
917+#~ msgstr "Žádná dostupná síť."
918+
919+#~ msgid "Location"
920+#~ msgstr "Umístění"
921+
922+#~ msgid "Let the phone detect your location:"
923+#~ msgstr "Povolte telefonu zjistit, kde se zrovna nacházíte:"
924+
925+#~ msgid "Using GPS only (less accurate)"
926+#~ msgstr "Používat pouze GPS (méně přesné)"
927+
928+#~ msgid "Using GPS, anonymized Wi-Fi and cellular network info (recommended)"
929+#~ msgstr "Používat GPS, anonymní Wi-Fi a datovou síť (doporučeno)"
930+
931+#~ msgid ""
932+#~ "By selecting this option you agree to the Nokia HERE <a href='#'>terms and "
933+#~ "conditions</a>."
934+#~ msgstr ""
935+#~ "Zvolením této možnosti souhlasíte s <a href='#'>pravidly a podmínkami</a> "
936+#~ "Nokia HERE."
937+
938+#~ msgid "Not at all"
939+#~ msgstr "V žádném případě"
940+
941+#~ msgid "You can change your mind later in <b>System Settings</b>."
942+#~ msgstr ""
943+#~ "Pokud změníte názor, můžete nastavení změnit v <b>Nastavení systému</b>."
944+
945+#~ msgid "Improving your experience"
946+#~ msgstr "Zlepšete své zkušenosti"
947+
948+#~ msgid ""
949+#~ "Your phone is set up to automatically report errors to Canonical and its "
950+#~ "partners, the makers of the operating system."
951+#~ msgstr ""
952+#~ "Váš telefon je nastaven tak, aby automaticky odesílal informace o chybách "
953+#~ "společnosti Canonical a partnerům, kteří stvořili tento operační systém."
954+
955+#~ msgid ""
956+#~ "This can be disabled in <b>System Settings</b> under <b>Security &amp; "
957+#~ "Privacy</b>"
958+#~ msgstr ""
959+#~ "To může být vypnuto v <b>Nastavení systému</b> v <b>Zabezpečení a "
960+#~ "soukromí</b>"
961+
962+#~ msgid "All done"
963+#~ msgstr "Vše je hotovo"
964+
965+#~ msgid "Nice work!"
966+#~ msgstr "Skvělá práce!"
967+
746#~ msgid "Your phone is now ready to use."
968#~ msgid "Your phone is now ready to use."
747#~ msgstr "Váš telefon je nyní připraven k použití."
969#~ msgstr "Váš telefon je nyní připraven k použití."
748
970
971+#~ msgid "Finish"
972+#~ msgstr "Dokončit"
973+
974+#~ msgid "Confirm passphrase"
975+#~ msgstr "Potvrdit heslo"
976+
977+#~ msgid "Please try again."
978+#~ msgstr "Zkuste to, prosím, znovu."
979+
980+#~ msgid "Choose your passcode"
981+#~ msgstr "Zvolte své heslo"
982+
983+#~ msgid "Passphrase must be 4 characters long"
984+#~ msgstr "Heslo musí být alespoň 4 znaky dlouhé"
985+
986+#, qt-format
987+#~ msgid "〈 %1"
988+#~ msgstr "〈 %1"
989+
990+#, qt-format
991+#~ msgid "%1 〉"
992+#~ msgstr "%1 〉"
993+
749#~ msgid "Log out"
994#~ msgid "Log out"
750#~ msgstr "Odhlásit se"
995#~ msgstr "Odhlásit se"
751
996
@@ -785,9 +1030,6 @@ msgstr "%1 〉"
785#~ msgid "%a %d %b %l:%M %p"
1030#~ msgid "%a %d %b %l:%M %p"
786#~ msgstr "%a %b. %d %l:%M %p"
1031#~ msgstr "%a %b. %d %l:%M %p"
787
1032
788−#~ msgid "Restart"
789−#~ msgstr "Reboot"
790−
791#~ msgid "Settings"
1033#~ msgid "Settings"
792#~ msgstr "Nastavení"
1034#~ msgstr "Nastavení"
793
1035
po/cy.po+476−231
@@ -7,7 +7,7 @@ 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: 2016-03-10 22:48+0000\n"
10+"POT-Creation-Date: 2016-03-23 10:01+0000\n"
11"PO-Revision-Date: 2015-07-31 13:21+0000\n"
11"PO-Revision-Date: 2015-07-31 13:21+0000\n"
12"Last-Translator: Owen Llywelyn <owen.llywelyn@gmail.com>\n"
12"Last-Translator: Owen Llywelyn <owen.llywelyn@gmail.com>\n"
13"Language-Team: Welsh <cy@li.org>\n"
13"Language-Team: Welsh <cy@li.org>\n"
@@ -16,8 +16,8 @@ msgstr ""
16"Content-Transfer-Encoding: 8bit\n"
16"Content-Transfer-Encoding: 8bit\n"
17"Plural-Forms: nplurals=4; plural=n==1 ? 0 : n==2 ? 1 : (n != 8 && n != 11) ? "
17"Plural-Forms: nplurals=4; plural=n==1 ? 0 : n==2 ? 1 : (n != 8 && n != 11) ? "
18"2 : 3;\n"
18"2 : 3;\n"
19−"X-Launchpad-Export-Date: 2016-03-13 05:51+0000\n"
19+"X-Launchpad-Export-Date: 2016-03-24 06:08+0000\n"
20−"X-Generator: Launchpad (build 17939)\n"
20+"X-Generator: Launchpad (build 17958)\n"
21
21
22#: plugins/IntegratedLightDM/Greeter.cpp:112
22#: plugins/IntegratedLightDM/Greeter.cpp:112
23msgid "Password: "
23msgid "Password: "
@@ -78,53 +78,35 @@ msgctxt "Button: Log out from the system"
78msgid "Log Out"
78msgid "Log Out"
79msgstr "Allgofnodi"
79msgstr "Allgofnodi"
80
80
81−#: qml/Components/Dialogs.qml:161 qml/Components/Dialogs.qml:194
81+#: qml/Components/Dialogs.qml:161 qml/Components/Dialogs.qml:219
82−#: qml/Components/Dialogs.qml:253
82+#: qml/Dash/DashPageHeader.qml:298 qml/Wizard/Pages/passcode-confirm.qml:32
83+#: qml/Wizard/Pages/passcode-set.qml:32
83msgid "Cancel"
84msgid "Cancel"
84msgstr "Diddymu"
85msgstr "Diddymu"
85
86
86#: qml/Components/Dialogs.qml:173
87#: qml/Components/Dialogs.qml:173
87−msgctxt "Title: Reboot/Shut down dialog"
88−msgid "Shut down"
89−msgstr "Diffodd"
90−
91−#: qml/Components/Dialogs.qml:174
92−msgid "Are you sure you want to shut down?"
93−msgstr "Ydych chi'n sicr eich bod am ddiffodd?"
94−
95−#: qml/Components/Dialogs.qml:176
96−msgctxt "Button: Reboot the system"
97−msgid "Reboot"
98−msgstr "Ailgychwyn"
99−
100−#: qml/Components/Dialogs.qml:185
101−msgctxt "Button: Shut down the system"
102−msgid "Shut down"
103−msgstr "Diffodd"
104−
105−#: qml/Components/Dialogs.qml:207
106msgctxt "Title: Reboot dialog"
88msgctxt "Title: Reboot dialog"
107msgid "Reboot"
89msgid "Reboot"
108msgstr "Ailgychwyn"
90msgstr "Ailgychwyn"
109
91
110−#: qml/Components/Dialogs.qml:208
92+#: qml/Components/Dialogs.qml:174
111msgid "Are you sure you want to reboot?"
93msgid "Are you sure you want to reboot?"
112msgstr "Ydych chi'n sicr eich bod am ailgychwyn?"
94msgstr "Ydych chi'n sicr eich bod am ailgychwyn?"
113
95
114−#: qml/Components/Dialogs.qml:210
96+#: qml/Components/Dialogs.qml:176
115msgid "No"
97msgid "No"
116msgstr "Na"
98msgstr "Na"
117
99
118−#: qml/Components/Dialogs.qml:217
100+#: qml/Components/Dialogs.qml:183
119msgid "Yes"
101msgid "Yes"
120msgstr "Ydw"
102msgstr "Ydw"
121
103
122−#: qml/Components/Dialogs.qml:232
104+#: qml/Components/Dialogs.qml:198
123msgctxt "Title: Power off/Restart dialog"
105msgctxt "Title: Power off/Restart dialog"
124msgid "Power"
106msgid "Power"
125msgstr "Pŵer"
107msgstr "Pŵer"
126
108
127−#: qml/Components/Dialogs.qml:233
109+#: qml/Components/Dialogs.qml:199
128msgid ""
110msgid ""
129"Are you sure you would like\n"
111"Are you sure you would like\n"
130"to power off?"
112"to power off?"
@@ -132,12 +114,12 @@ msgstr ""
132"Ydych chi'n sicr eich bod am\n"
114"Ydych chi'n sicr eich bod am\n"
133"ddiffodd y pŵer?"
115"ddiffodd y pŵer?"
134
116
135−#: qml/Components/Dialogs.qml:235
117+#: qml/Components/Dialogs.qml:201
136msgctxt "Button: Power off the system"
118msgctxt "Button: Power off the system"
137msgid "Power off"
119msgid "Power off"
138msgstr "Diffodd y pŵer"
120msgstr "Diffodd y pŵer"
139
121
140−#: qml/Components/Dialogs.qml:244
122+#: qml/Components/Dialogs.qml:210
141msgctxt "Button: Restart the system"
123msgctxt "Button: Restart the system"
142msgid "Restart"
124msgid "Restart"
143msgstr "Ailgychwyn"
125msgstr "Ailgychwyn"
@@ -180,42 +162,58 @@ msgstr ""
180msgid "Close all"
162msgid "Close all"
181msgstr ""
163msgstr ""
182
164
183−#: qml/Dash/DashPageHeader.qml:270
165+#: qml/Dash/DashPageHeader.qml:337
184msgctxt "Button: Open the Ubuntu Store"
166msgctxt "Button: Open the Ubuntu Store"
185msgid "Store"
167msgid "Store"
186msgstr "Marchnad"
168msgstr "Marchnad"
187
169
188−#: qml/Dash/DashPageHeader.qml:277
170+#: qml/Dash/DashPageHeader.qml:344
189msgctxt "Button: Start a search in the current dash scope"
171msgctxt "Button: Start a search in the current dash scope"
190msgid "Search"
172msgid "Search"
191msgstr "Chwilio"
173msgstr "Chwilio"
192
174
193−#: qml/Dash/DashPageHeader.qml:287
175+#: qml/Dash/DashPageHeader.qml:354
194msgctxt "Button: Show the current dash scope settings"
176msgctxt "Button: Show the current dash scope settings"
195msgid "Settings"
177msgid "Settings"
196msgstr "Gosodiadau"
178msgstr "Gosodiadau"
197
179
198−#: qml/Dash/DashPageHeader.qml:294
180+#: qml/Dash/DashPageHeader.qml:361
199msgid "Remove from Favorites"
181msgid "Remove from Favorites"
200msgstr "Tynnu o Ffefrynnau"
182msgstr "Tynnu o Ffefrynnau"
201
183
202−#: qml/Dash/DashPageHeader.qml:294
184+#: qml/Dash/DashPageHeader.qml:361
203msgid "Add to Favorites"
185msgid "Add to Favorites"
204msgstr "Ychwanegu at Ffefrynnau"
186msgstr "Ychwanegu at Ffefrynnau"
205
187
188+#: qml/Dash/FiltersPopover.qml:60
189+msgid "Refine your results"
190+msgstr ""
191+
192+#: qml/Dash/FiltersPopover.qml:69
193+msgid "Reset"
194+msgstr ""
195+
206−#: qml/Dash/GenericScopeView.qml:567 qml/Dash/GenericScopeView.qml:725
196+#: qml/Dash/GenericScopeView.qml:570 qml/Dash/GenericScopeView.qml:755
207msgid "See less"
197msgid "See less"
208msgstr "Gweld llai"
198msgstr "Gweld llai"
209
199
210−#: qml/Dash/GenericScopeView.qml:567
200+#: qml/Dash/GenericScopeView.qml:570
211msgid "See all"
201msgid "See all"
212msgstr "Gweld y cyfan"
202msgstr "Gweld y cyfan"
213
203
214−#: qml/Dash/GenericScopeView.qml:629
204+#: qml/Dash/GenericScopeView.qml:627
215msgctxt "Label: Hint for dash search line edit"
205msgctxt "Label: Hint for dash search line edit"
216msgid "Search"
206msgid "Search"
217msgstr "Chwilio"
207msgstr "Chwilio"
218
208
209+#: qml/Dash/PageHeaderExtraPanel.qml:55
210+msgid "Recent Searches"
211+msgstr ""
212+
213+#: qml/Dash/PageHeaderExtraPanel.qml:66
214+msgid "Clear All"
215+msgstr ""
216+
219#: qml/Dash/Previews/PreviewActionCombo.qml:35
217#: qml/Dash/Previews/PreviewActionCombo.qml:35
220msgid "More..."
218msgid "More..."
221msgstr "Mwy..."
219msgstr "Mwy..."
@@ -283,11 +281,11 @@ msgstr "Ailgynnig"
283msgid "Tap to unlock"
281msgid "Tap to unlock"
284msgstr "Tapiwch i ddatgloi"
282msgstr "Tapiwch i ddatgloi"
285
283
286−#: qml/Greeter/NarrowView.qml:54 qml/Wizard/Pages/passwd-confirm.qml:53
284+#: qml/Greeter/NarrowView.qml:54
287msgid "Sorry, incorrect passphrase."
285msgid "Sorry, incorrect passphrase."
288msgstr "Cyfrinair anghywir"
286msgstr "Cyfrinair anghywir"
289
287
290−#: qml/Greeter/NarrowView.qml:55 qml/Wizard/Pages/passwd-confirm.qml:54
288+#: qml/Greeter/NarrowView.qml:55
291msgid "Sorry, incorrect passcode."
289msgid "Sorry, incorrect passcode."
292msgstr "Cod cyfrinachol anghywir"
290msgstr "Cod cyfrinachol anghywir"
293
291
@@ -316,7 +314,7 @@ msgstr ""
316msgid "Enter %1"
314msgid "Enter %1"
317msgstr "Rhowch %1"
315msgstr "Rhowch %1"
318
316
319−#: qml/Greeter/NarrowView.qml:117 qml/Wizard/Pages/passwd-set.qml:60
317+#: qml/Greeter/NarrowView.qml:117
320msgid "Enter passphrase"
318msgid "Enter passphrase"
321msgstr "Rhowch gyfrinair"
319msgstr "Rhowch gyfrinair"
322
320
@@ -354,11 +352,11 @@ msgstr "Tapiwch i ffonio nôl"
354msgid "Conference"
352msgid "Conference"
355msgstr "Cydalwad"
353msgstr "Cydalwad"
356
354
357−#: qml/Panel/Indicators/MenuItemFactory.qml:752
355+#: qml/Panel/Indicators/MenuItemFactory.qml:761
358msgid "Nothing is playing"
356msgid "Nothing is playing"
359msgstr "Dim byd yn chwarae"
357msgstr "Dim byd yn chwarae"
360
358
361−#: qml/Panel/Indicators/MenuItemFactory.qml:881
359+#: qml/Panel/Indicators/MenuItemFactory.qml:890
362#, qt-format
360#, qt-format
363msgid "%1 hour"
361msgid "%1 hour"
364msgid_plural "%1 hours"
362msgid_plural "%1 hours"
@@ -367,7 +365,7 @@ msgstr[1] "%1 awr"
367msgstr[2] "%1 awr"
365msgstr[2] "%1 awr"
368msgstr[3] "%1 awr"
366msgstr[3] "%1 awr"
369
367
370−#: qml/Panel/Indicators/MenuItemFactory.qml:885
368+#: qml/Panel/Indicators/MenuItemFactory.qml:894
371#, qt-format
369#, qt-format
372msgid "%1 minute"
370msgid "%1 minute"
373msgid_plural "%1 minutes"
371msgid_plural "%1 minutes"
@@ -376,7 +374,7 @@ msgstr[1] "%1 munud"
376msgstr[2] "%1 munud"
374msgstr[2] "%1 munud"
377msgstr[3] "%1 munud"
375msgstr[3] "%1 munud"
378
376
379−#: qml/Panel/Indicators/MenuItemFactory.qml:890
377+#: qml/Panel/Indicators/MenuItemFactory.qml:899
380#, qt-format
378#, qt-format
381msgid "%1 second"
379msgid "%1 second"
382msgid_plural "%1 seconds"
380msgid_plural "%1 seconds"
@@ -385,37 +383,37 @@ msgstr[1] "%1 eiliad"
385msgstr[2] "%1 eiliad"
383msgstr[2] "%1 eiliad"
386msgstr[3] "%1 eiliad"
384msgstr[3] "%1 eiliad"
387
385
388−#: qml/Panel/Indicators/MenuItemFactory.qml:893
386+#: qml/Panel/Indicators/MenuItemFactory.qml:902
389msgid "0 seconds"
387msgid "0 seconds"
390msgstr "0 eiliad"
388msgstr "0 eiliad"
391
389
392#. Translators: String like "1 hour, 2 minutes, 3 seconds remaining"
390#. Translators: String like "1 hour, 2 minutes, 3 seconds remaining"
393−#: qml/Panel/Indicators/MenuItemFactory.qml:895
391+#: qml/Panel/Indicators/MenuItemFactory.qml:904
394#, qt-format
392#, qt-format
395msgid "%1 remaining"
393msgid "%1 remaining"
396msgstr "%1 yn weddill"
394msgstr "%1 yn weddill"
397
395
398−#: qml/Panel/Indicators/MenuItemFactory.qml:901
396+#: qml/Panel/Indicators/MenuItemFactory.qml:910
399msgid "In queue…"
397msgid "In queue…"
400msgstr "Mewn ciw..."
398msgstr "Mewn ciw..."
401
399
402−#: qml/Panel/Indicators/MenuItemFactory.qml:905
400+#: qml/Panel/Indicators/MenuItemFactory.qml:914
403msgid "Downloading"
401msgid "Downloading"
404msgstr "Yn llwytho i lawr"
402msgstr "Yn llwytho i lawr"
405
403
406−#: qml/Panel/Indicators/MenuItemFactory.qml:907
404+#: qml/Panel/Indicators/MenuItemFactory.qml:916
407msgid "Paused, tap to resume"
405msgid "Paused, tap to resume"
408msgstr "Seibiwyd, tapiwch i ailafael ynddi"
406msgstr "Seibiwyd, tapiwch i ailafael ynddi"
409
407
410−#: qml/Panel/Indicators/MenuItemFactory.qml:909
408+#: qml/Panel/Indicators/MenuItemFactory.qml:918
411msgid "Canceled"
409msgid "Canceled"
412msgstr "Diddymwyd"
410msgstr "Diddymwyd"
413
411
414−#: qml/Panel/Indicators/MenuItemFactory.qml:911
412+#: qml/Panel/Indicators/MenuItemFactory.qml:920
415msgid "Finished"
413msgid "Finished"
416msgstr "Wedi gorffen"
414msgstr "Wedi gorffen"
417
415
418−#: qml/Panel/Indicators/MenuItemFactory.qml:913
416+#: qml/Panel/Indicators/MenuItemFactory.qml:922
419msgid "Failed, tap to retry"
417msgid "Failed, tap to retry"
420msgstr "Methwyd, tapiwch i geisio eto"
418msgstr "Methwyd, tapiwch i geisio eto"
421
419
@@ -435,251 +433,324 @@ msgctxt "Button: Call back on phone"
435msgid "Call back"
433msgid "Call back"
436msgstr ""
434msgstr ""
437
435
438−#: qml/Tutorial/TutorialBottom.qml:28
436+#: qml/Stages/SideStage.qml:76
439−msgid "Open special menus"
437+msgid "Drag using 3 fingers any application from one window to the other"
440−msgstr "Agor dewislenni arbennig"
438+msgstr ""
441−
442−#: qml/Tutorial/TutorialBottom.qml:29
443−msgid "Swipe up from the bottom edge."
444−msgstr "Trawiwch i fyny o'r ymyl gwaelod."
445
439
446−#: qml/Tutorial/TutorialBottomFinish.qml:24
440+#: qml/Tutorial/TutorialBottom.qml:78
447−msgid "This action does different things for different apps"
441+msgid "Swipe up to add a contact"
448−msgstr "Mae'r weithred hon yn gwneud pethau gwahanol mewn apiau gwahanol"
442+msgstr ""
449
443
450−#: qml/Tutorial/TutorialBottomFinish.qml:25
444+#: qml/Tutorial/TutorialBottom.qml:80
451−msgid "Tap here to finish."
445+msgid "Swipe up for favorite calculations"
452−msgstr "Tapiwch yma i orffen"
446+msgstr ""
453
447
454−#: qml/Tutorial/TutorialContent.qml:80 qml/Tutorial/TutorialLeftFinish.qml:25
448+#: qml/Tutorial/TutorialBottom.qml:82
455−#: qml/Tutorial/TutorialRight.qml:144
449+msgid "Swipe up for recent calls"
456−msgid "Tap here to continue."
457−msgstr "Tapiwch yma i barhau."
450+msgstr ""
458
451
459−#: qml/Tutorial/TutorialLeft.qml:26
452+#: qml/Tutorial/TutorialBottom.qml:84
460−msgid "Open the launcher"
453+msgid "Swipe up to create a message"
461−msgstr "Agor y lansiwr"
454+msgstr ""
462
455
463−#: qml/Tutorial/TutorialLeft.qml:27
456+#: qml/Tutorial/TutorialBottom.qml:85
464−msgid "Short swipe from the left edge."
457+msgid "Swipe up to manage the app"
465−msgstr "Trawiad byr o'r ymyl chwith."
458+msgstr ""
466
459
467−#: qml/Tutorial/TutorialLeftFinish.qml:24
460+#: qml/Tutorial/TutorialLeft.qml:47
468−msgid "These are the shortcuts to favorite apps"
461+msgid "Swipe from the left edge to open the launcher"
469−msgstr "Rhain yw'r llwybrau byr i'ch hoff apiau"
462+msgstr ""
470
463
471−#: qml/Tutorial/TutorialPage.qml:178
464+#: qml/Tutorial/TutorialLeftLong.qml:47
472−msgid "You almost got it!"
465+msgid "Long swipe from the left edge to open the Today scope"
473−msgstr "Bron â bod!"
466+msgstr ""
474
467
475−#: qml/Tutorial/TutorialPage.qml:195
468+#: qml/Tutorial/TutorialRight.qml:54
476−msgid "Try again."
469+msgid "Hover your mouse on the right edge to view your open apps"
477−msgstr "Ceisiwch eto."
470+msgstr ""
478
471
479−#: qml/Tutorial/TutorialRight.qml:31
472+#: qml/Tutorial/TutorialRight.qml:55
480−msgid "To view open apps"
473+msgid "Short or long swipe from the right edge to view your open apps"
481−msgstr "I weld apiau sydd ar agor"
474+msgstr ""
482
475
483−#: qml/Tutorial/TutorialRight.qml:32
476+#: qml/Tutorial/TutorialTop.qml:53
484−msgid "Long swipe from the right edge."
477+msgid "Swipe from the top right edge to open the notification bar"
485−msgstr "Trawiad hir o'r ymyl dde."
478+msgstr ""
486
479
487−#: qml/Tutorial/TutorialRight.qml:122
480+#: qml/Tutorial/TutorialTop.qml:54
488−msgid "View all your running tasks."
481+msgid "Swipe from the top edge to open the notification bar"
489−msgstr "Gweld pob tasg sy'n rhedeg."
482+msgstr ""
490
483
491−#: qml/Wizard/Page.qml:89
484+#: qml/Wizard/Page.qml:54
492msgctxt "Button: Go back one page in the Wizard"
485msgctxt "Button: Go back one page in the Wizard"
493msgid "Back"
486msgid "Back"
494msgstr "Nôl"
487msgstr "Nôl"
495
488
496#: qml/Wizard/Pages/10-welcome.qml:27
489#: qml/Wizard/Pages/10-welcome.qml:27
497−msgid "Hi!"
490+msgid "Language"
498−msgstr "Shwmae!"
491+msgstr ""
499
492
500−#: qml/Wizard/Pages/10-welcome.qml:44
493+#: qml/Wizard/Pages/10-welcome.qml:156 qml/Wizard/Pages/30-wifi.qml:206
501−msgid "Welcome to your Ubuntu device."
494+#: qml/Wizard/Pages/40-location.qml:271 qml/Wizard/Pages/50-timezone.qml:267
495+#: qml/Wizard/Pages/60-account.qml:65 qml/Wizard/Pages/70-passwd-type.qml:144
496+#: qml/Wizard/Pages/75-report-check.qml:84
497+#: qml/Wizard/Pages/passcode-desktop.qml:124
498+#: qml/Wizard/Pages/password-set.qml:141
499+msgid "Next"
502msgstr ""
500msgstr ""
503
501
504−#: qml/Wizard/Pages/10-welcome.qml:52
502+#: qml/Wizard/Pages/30-wifi.qml:29
505−msgid "Let’s get started."
503+msgid "Connect to Wi‑Fi"
506−msgstr "Beth am gychwyn."
504+msgstr "Cysylltu â diwifr"
507
505
508−#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:133
506+#: qml/Wizard/Pages/30-wifi.qml:130
509−#: qml/Wizard/Pages/40-wifi.qml:215 qml/Wizard/Pages/50-location.qml:131
507+msgid "Connected"
510−#: qml/Wizard/Pages/60-reporting.qml:60 qml/Wizard/Pages/passwd-confirm.qml:82
511−#: qml/Wizard/Pages/passwd-set.qml:90
512−msgid "Continue"
513−msgstr "Parhau"
508+msgstr ""
514
509
515−#: qml/Wizard/Pages/20-sim.qml:25
510+#: qml/Wizard/Pages/30-wifi.qml:163
516−msgid "Add a SIM card and restart your device"
511+msgid "Available Wi-Fi networks"
517−msgstr "Ychwanegwch gerdyn SIM ac ailgychwyn y ddyfais"
512+msgstr ""
518
513
519−#: qml/Wizard/Pages/20-sim.qml:59
514+#: qml/Wizard/Pages/30-wifi.qml:164
520−msgid "Without it, you won’t be able to make calls or use text messaging."
515+msgid "No available Wi-Fi networks"
521−msgstr "Hebddo bydd dim modd gwneud galwadau na defnyddio negeseuon testun."
516+msgstr ""
522
517
523−#: qml/Wizard/Pages/20-sim.qml:73 qml/Wizard/Pages/40-wifi.qml:215
518+#: qml/Wizard/Pages/30-wifi.qml:206 qml/Wizard/Pages/60-account.qml:65
519+#: qml/Wizard/Pages/sim.qml:101
524msgid "Skip"
520msgid "Skip"
525msgstr "Neidio"
521msgstr "Neidio"
526
522
527−#: qml/Wizard/Pages/30-passwd-type.qml:39
523+#: qml/Wizard/Pages/40-location.qml:27
528−msgid "Lock security"
524+msgid "Location Services"
529−msgstr "Diogelwch cloi"
525+msgstr ""
530
526
531−#: qml/Wizard/Pages/30-passwd-type.qml:79
527+#: qml/Wizard/Pages/40-location.qml:83
532−msgid "Please select how you’d like to unlock your device."
528+msgid ""
529+"Use GPS, Wi-Fi hotspots and mobile network anonymously to detect location "
530+"(recommended)"
533msgstr ""
531msgstr ""
534
532
535−#: qml/Wizard/Pages/30-passwd-type.qml:102
533+#: qml/Wizard/Pages/40-location.qml:105
536−msgctxt "Label: Type of security method"
534+#, qt-format
537−msgid "Swipe"
535+msgid "By selecting this option you agree to the Nokia HERE %1."
538−msgstr "Trawio"
536+msgstr ""
539
537
540−#: qml/Wizard/Pages/30-passwd-type.qml:103
538+#: qml/Wizard/Pages/40-location.qml:106
541−msgctxt "Label: Description of security method"
539+msgctxt "part of: Nokia HERE terms and conditions"
542−msgid "No security"
540+msgid "terms and conditions"
543−msgstr "Dim diogelwch"
541+msgstr ""
542+
543+#: qml/Wizard/Pages/40-location.qml:160
544+msgid "GPS only"
545+msgstr ""
546+
547+#: qml/Wizard/Pages/40-location.qml:214
548+msgid "Don't use my location"
549+msgstr ""
550+
551+#: qml/Wizard/Pages/40-location.qml:260
552+msgid "You can change it later in System Settings."
553+msgstr ""
554+
555+#: qml/Wizard/Pages/50-timezone.qml:29
556+msgid "Time Zone"
557+msgstr ""
544
558
545−#: qml/Wizard/Pages/30-passwd-type.qml:105
559+#: qml/Wizard/Pages/50-timezone.qml:178
560+msgid "Enter your city"
561+msgstr ""
562+
563+#: qml/Wizard/Pages/60-account.qml:24
564+msgid "Personalize Your Device"
565+msgstr ""
566+
567+#: qml/Wizard/Pages/60-account.qml:48
568+msgid "Preferred Name"
569+msgstr ""
570+
571+#: qml/Wizard/Pages/70-passwd-type.qml:39
572+msgid "Lock Screen"
573+msgstr ""
574+
575+#: qml/Wizard/Pages/70-passwd-type.qml:101
546msgctxt "Label: Type of security method"
576msgctxt "Label: Type of security method"
547−msgid "Passcode"
577+msgid "Create new password"
548−msgstr "Cod cyfrinachol"
578+msgstr ""
549
579
550−#: qml/Wizard/Pages/30-passwd-type.qml:106
580+#: qml/Wizard/Pages/70-passwd-type.qml:103
551−msgctxt "Label: Description of security method"
581+msgctxt "Label: Type of security method"
552−msgid "4 digits only"
582+msgid "Create passcode (numbers only)"
553−msgstr "4 digid yn unig"
583+msgstr ""
554
584
555−#: qml/Wizard/Pages/30-passwd-type.qml:108
585+#: qml/Wizard/Pages/70-passwd-type.qml:105
556msgctxt "Label: Type of security method"
586msgctxt "Label: Type of security method"
557−msgid "Passphrase"
587+msgid "No lock code"
558−msgstr "Cyfrinair"
588+msgstr ""
559
589
560−#: qml/Wizard/Pages/30-passwd-type.qml:109
590+#: qml/Wizard/Pages/75-report-check.qml:26 qml/Wizard/Pages/here-terms.qml:108
561−msgctxt "Label: Description of security method"
591+msgid "Privacy Policy"
562−msgid "Numbers and letters"
563−msgstr "Rhifau a llythrennau"
592+msgstr ""
564
593
565−#: qml/Wizard/Pages/40-wifi.qml:29
594+#: qml/Wizard/Pages/75-report-check.qml:26
566−msgid "Connect to Wi‑Fi"
595+msgid "Help Us Improve"
567−msgstr "Cysylltu â diwifr"
596+msgstr ""
568
597
569−#: qml/Wizard/Pages/40-wifi.qml:168
598+#: qml/Wizard/Pages/75-report-check.qml:59
570−msgid "Available networks…"
599+msgid "Improve system performance by sending us crashes and error reports."
571−msgstr "Rhwydweithiau sydd ar gael..."
600+msgstr ""
572
601
573−#: qml/Wizard/Pages/40-wifi.qml:169
602+#: qml/Wizard/Pages/75-report-check.qml:60
574−msgid "No available networks."
603+msgid "Privacy policy"
575−msgstr "Dim rhwydweithiau ar gael"
604+msgstr ""
576
605
577−#: qml/Wizard/Pages/50-location.qml:27
606+#: qml/Wizard/Pages/80-finished.qml:89
578−msgid "Location"
607+msgid "Welcome to Ubuntu"
579−msgstr "Lleoliad"
608+msgstr ""
580
609
581−#: qml/Wizard/Pages/50-location.qml:62
610+#: qml/Wizard/Pages/80-finished.qml:104
582−msgid "Let the phone detect your location:"
611+msgid "You are ready to use your device now"
583−msgstr "Caniatáu'r ffôn i ganfod eich lleoliad:"
612+msgstr ""
613+
614+#: qml/Wizard/Pages/80-finished.qml:124
615+msgid "Get Started"
616+msgstr ""
617+
618+#: qml/Wizard/Pages/here-terms.qml:25
619+msgid "Terms & Conditions"
620+msgstr "Amodau a Thelerau"
584
621
585−#: qml/Wizard/Pages/50-location.qml:69
622+#: qml/Wizard/Pages/here-terms.qml:69
586−msgid "Using GPS only (less accurate)"
623+msgid "Your device uses positioning technologies provided by HERE."
587−msgstr "Defnyddio GPS yn unig (llai cywir)"
624+msgstr ""
588
625
589−#: qml/Wizard/Pages/50-location.qml:86
626+#: qml/Wizard/Pages/here-terms.qml:81
590−msgid "Using GPS, anonymized Wi-Fi and cellular network info (recommended)"
627+msgid ""
628+"To provide you with positioning services and to improve their quality, HERE "
629+"collects information about nearby cell towers and Wi-Fi hotspots around your "
630+"current location whenever your position is being found."
591msgstr ""
631msgstr ""
592−"Defnyddio GPS, diwifr dienw a gwybodaeth rhwydwaith cellog (argymellir hwn)"
593
632
594−#. Translators: HERE is a trademark for Nokia's location service, you probably shouldn't translate it
595−#: qml/Wizard/Pages/50-location.qml:103
633+#: qml/Wizard/Pages/here-terms.qml:93
596msgid ""
634msgid ""
597−"By selecting this option you agree to the Nokia HERE <a href='#'>terms and "
635+"The information collected is used to analyze the service and to improve the "
598−"conditions</a>."
636+"use of service, but not to identify you personally."
599msgstr ""
637msgstr ""
600−"Drwy ddewis yr opsiwn yma rydych yn cytuno i <a href='#'>dermau ac "
601−"amodau</a> Nokia HERE."
602
638
603−#: qml/Wizard/Pages/50-location.qml:112
639+#: qml/Wizard/Pages/here-terms.qml:106
604−msgid "Not at all"
640+#, qt-format
641+msgid "By continuing, you agree to the HERE platform %1 and %2."
605−msgstr "Dim o gwbl"
642+msgstr ""
606
643
607−#: qml/Wizard/Pages/50-location.qml:124
644+#: qml/Wizard/Pages/here-terms.qml:107
608−msgid "You can change your mind later in <b>System Settings</b>."
645+msgid "Service Terms"
609−msgstr "Gallwch newid hwn eto yn <b>Gosodiadau System</b>."
646+msgstr ""
610
647
611−#: qml/Wizard/Pages/60-reporting.qml:26
648+#: qml/Wizard/Pages/passcode-confirm.qml:43
612−msgid "Improving your experience"
649+#: qml/Wizard/Pages/passcode-desktop.qml:80
613−msgstr "Gwella eich profiad"
650+msgid "Confirm passcode"
651+msgstr "Cadarnhau cod cyfrinachol"
614
652
615−#: qml/Wizard/Pages/60-reporting.qml:46
653+#: qml/Wizard/Pages/passcode-confirm.qml:45
616−msgid ""
654+msgid "Incorrect passcode."
617−"Your phone is set up to automatically report errors to Canonical and its "
618−"partners, the makers of the operating system."
619msgstr ""
655msgstr ""
620−"Cyfluniwyd eich ffôn i adrodd gwallau i Canonical a'i bartneriaid, "
621−"gwneuthurwyr y system weithredu."
622
656
623−#: qml/Wizard/Pages/60-reporting.qml:53
657+#: qml/Wizard/Pages/passcode-confirm.qml:45
658+msgctxt "Enter the passcode again"
624−msgid ""
659+msgid "Please re-enter."
625−"This can be disabled in <b>System Settings</b> under <b>Security &amp; "
626−"Privacy</b>"
627msgstr ""
660msgstr ""
628−"Gellir analluogi hwn yn <b>Gosodiadau System</b> dan <b>Diogelwch a "
629−"Phreifatwydd</b>"
630
661
631−#: qml/Wizard/Pages/80-finished.qml:24
662+#: qml/Wizard/Pages/passcode-desktop.qml:30
632−msgid "All done"
663+msgid "Lock Screen Passcode"
633−msgstr "Wedi gorffen"
664+msgstr ""
634
665
635−#: qml/Wizard/Pages/80-finished.qml:39
666+#: qml/Wizard/Pages/passcode-desktop.qml:56
636−msgid "Nice work!"
667+msgid "Enter 4 numbers to setup your passcode"
637−msgstr "Da iawn!"
668+msgstr ""
638
669
639−#: qml/Wizard/Pages/80-finished.qml:46
670+#: qml/Wizard/Pages/passcode-desktop.qml:65
640−msgid "Your device is now ready to use."
671+#: qml/Wizard/Pages/passcode-set.qml:54
672+msgid "Choose passcode"
641msgstr ""
673msgstr ""
642
674
643−#: qml/Wizard/Pages/80-finished.qml:53
675+#: qml/Wizard/Pages/passcode-desktop.qml:105
644−msgid "Finish"
676+msgid "Passcode too short"
645−msgstr "Gorffen"
677+msgstr ""
646
678
647−#: qml/Wizard/Pages/here-terms.qml:27
679+#: qml/Wizard/Pages/passcode-desktop.qml:107
648−msgid "Terms & Conditions"
680+msgid "Passcodes match"
649−msgstr "Amodau a Thelerau"
681+msgstr ""
650
682
651−#: qml/Wizard/Pages/passwd-confirm.qml:49
683+#: qml/Wizard/Pages/passcode-desktop.qml:109
652−msgid "Confirm passphrase"
684+msgid "Passcodes do not match"
653−msgstr "Cadarnhau cyfrinair"
685+msgstr ""
654
686
655−#: qml/Wizard/Pages/passwd-confirm.qml:50
687+#: qml/Wizard/Pages/passcode-set.qml:62
656−msgid "Confirm passcode"
688+msgid "Passcode must be 4 characters long"
657−msgstr "Cadarnhau cod cyfrinachol"
689+msgstr ""
658
690
659−#: qml/Wizard/Pages/passwd-confirm.qml:53
691+#: qml/Wizard/Pages/password-set.qml:30
660−#: qml/Wizard/Pages/passwd-confirm.qml:54
692+msgid "Lock Screen Password"
661−msgid "Please try again."
693+msgstr ""
662−msgstr "Rhowch gynnig arall arni"
663
694
664−#: qml/Wizard/Pages/passwd-set.qml:61
695+#: qml/Wizard/Pages/password-set.qml:61
665−msgid "Choose your passcode"
696+msgid "Enter at least 8 characters"
666−msgstr "Dewiswch eich cod cyfrinachol"
697+msgstr ""
667
698
668−#: qml/Wizard/Pages/passwd-set.qml:68
699+#: qml/Wizard/Pages/password-set.qml:73
669−msgid "Passphrase must be 4 characters long"
700+msgid "Choose password"
670−msgstr "Dylai cyfrinair fod yn bedwar nod"
701+msgstr ""
671
702
672−#. Translators: This is the arrow for "Back" buttons
703+#: qml/Wizard/Pages/password-set.qml:103
673−#: qml/Wizard/StackButton.qml:39
704+msgid "Confirm password"
674−#, qt-format
675−msgid "〈 %1"
676−msgstr "〈 %1"
705+msgstr ""
677
706
678−#. Translators: This is the arrow for "Forward" buttons
707+#: qml/Wizard/Pages/sim.qml:27
708+msgid "No SIM card installed"
709+msgstr ""
710+
711+#: qml/Wizard/Pages/sim.qml:54
712+msgid "SIM card added"
713+msgstr ""
714+
715+#: qml/Wizard/Pages/sim.qml:55
716+msgid "You must restart the device to access the mobile network."
717+msgstr ""
718+
719+#: qml/Wizard/Pages/sim.qml:59
720+msgid "Restart"
721+msgstr ""
722+
723+#: qml/Wizard/Pages/sim.qml:78
724+msgid "You won’t be able to make calls or use text messaging without a SIM."
725+msgstr ""
726+
727+#: qml/Wizard/Pages/sim.qml:90
728+msgid "To proceed with no SIM tap Skip."
729+msgstr ""
730+
731+#: qml/Wizard/PasswordMeter.qml:87
732+msgid "Passwords match"
733+msgstr ""
734+
679−#: qml/Wizard/StackButton.qml:42
735+#: qml/Wizard/PasswordMeter.qml:89
680−#, qt-format
736+msgid "Passwords do not match"
737+msgstr ""
738+
739+#: qml/Wizard/PasswordMeter.qml:93
740+msgid "Strong password"
741+msgstr ""
742+
743+#: qml/Wizard/PasswordMeter.qml:95
681−msgid "%1 〉"
744+msgid "Fair password"
682−msgstr "%1 〉"
745+msgstr ""
746+
747+#: qml/Wizard/PasswordMeter.qml:97
748+msgid "Weak password"
749+msgstr ""
750+
751+#: qml/Wizard/PasswordMeter.qml:99
752+msgid "Very weak password"
753+msgstr ""
683
754
684#~ msgid "%a %l:%M %p"
755#~ msgid "%a %l:%M %p"
685#~ msgstr "%a %l:%M %p"
756#~ msgstr "%a %l:%M %p"
@@ -711,17 +782,191 @@ msgstr "%1 〉"
711#~ msgid "Tomorrow %H:%M"
782#~ msgid "Tomorrow %H:%M"
712#~ msgstr "Yfory %H:%M"
783#~ msgstr "Yfory %H:%M"
713
784
785+#~ msgid "Are you sure you want to shut down?"
786+#~ msgstr "Ydych chi'n sicr eich bod am ddiffodd?"
787+
788+#~ msgctxt "Button: Shut down the system"
789+#~ msgid "Shut down"
790+#~ msgstr "Diffodd"
791+
792+#~ msgctxt "Title: Reboot/Shut down dialog"
793+#~ msgid "Shut down"
794+#~ msgstr "Diffodd"
795+
796+#~ msgctxt "Button: Reboot the system"
797+#~ msgid "Reboot"
798+#~ msgstr "Ailgychwyn"
799+
800+#~ msgid "This action does different things for different apps"
801+#~ msgstr "Mae'r weithred hon yn gwneud pethau gwahanol mewn apiau gwahanol"
802+
714#~ msgid "Unlock SIM"
803#~ msgid "Unlock SIM"
715#~ msgstr "Datgloi SIM"
804#~ msgstr "Datgloi SIM"
716
805
717#~ msgid "Roaming"
806#~ msgid "Roaming"
718#~ msgstr "Crwydrol"
807#~ msgstr "Crwydrol"
719
808
809+#~ msgid "Try again."
810+#~ msgstr "Ceisiwch eto."
811+
812+#~ msgid "Short swipe from the left edge."
813+#~ msgstr "Trawiad byr o'r ymyl chwith."
814+
815+#~ msgid "Open the launcher"
816+#~ msgstr "Agor y lansiwr"
817+
818+#~ msgid "Tap here to continue."
819+#~ msgstr "Tapiwch yma i barhau."
820+
821+#~ msgid "These are the shortcuts to favorite apps"
822+#~ msgstr "Rhain yw'r llwybrau byr i'ch hoff apiau"
823+
824+#~ msgid "Swipe up from the bottom edge."
825+#~ msgstr "Trawiwch i fyny o'r ymyl gwaelod."
826+
827+#~ msgid "Open special menus"
828+#~ msgstr "Agor dewislenni arbennig"
829+
830+#~ msgid "Tap here to finish."
831+#~ msgstr "Tapiwch yma i orffen"
832+
833+#~ msgid "You almost got it!"
834+#~ msgstr "Bron â bod!"
835+
836+#~ msgid "To view open apps"
837+#~ msgstr "I weld apiau sydd ar agor"
838+
839+#~ msgid "Without it, you won’t be able to make calls or use text messaging."
840+#~ msgstr "Hebddo bydd dim modd gwneud galwadau na defnyddio negeseuon testun."
841+
842+#~ msgid "Add a SIM card and restart your device"
843+#~ msgstr "Ychwanegwch gerdyn SIM ac ailgychwyn y ddyfais"
844+
845+#~ msgid "View all your running tasks."
846+#~ msgstr "Gweld pob tasg sy'n rhedeg."
847+
848+#~ msgid "Long swipe from the right edge."
849+#~ msgstr "Trawiad hir o'r ymyl dde."
850+
851+#~ msgid "Hi!"
852+#~ msgstr "Shwmae!"
853+
854+#~ msgid "Let’s get started."
855+#~ msgstr "Beth am gychwyn."
856+
857+#~ msgid "Continue"
858+#~ msgstr "Parhau"
859+
720#~ msgid "Welcome to your Ubuntu phone."
860#~ msgid "Welcome to your Ubuntu phone."
721#~ msgstr "Croeso i'ch ffôn Ubuntu."
861#~ msgstr "Croeso i'ch ffôn Ubuntu."
722
862
863+#~ msgid "Lock security"
864+#~ msgstr "Diogelwch cloi"
865+
723#~ msgid "Please select how you’d like to unlock your phone."
866#~ msgid "Please select how you’d like to unlock your phone."
724#~ msgstr "Dewiswch sut yr hoffech ddatgloi'r ffôn."
867#~ msgstr "Dewiswch sut yr hoffech ddatgloi'r ffôn."
725
868
869+#~ msgctxt "Label: Description of security method"
870+#~ msgid "No security"
871+#~ msgstr "Dim diogelwch"
872+
873+#~ msgctxt "Label: Type of security method"
874+#~ msgid "Swipe"
875+#~ msgstr "Trawio"
876+
877+#~ msgctxt "Label: Description of security method"
878+#~ msgid "4 digits only"
879+#~ msgstr "4 digid yn unig"
880+
881+#~ msgctxt "Label: Type of security method"
882+#~ msgid "Passcode"
883+#~ msgstr "Cod cyfrinachol"
884+
885+#~ msgctxt "Label: Type of security method"
886+#~ msgid "Passphrase"
887+#~ msgstr "Cyfrinair"
888+
889+#~ msgctxt "Label: Description of security method"
890+#~ msgid "Numbers and letters"
891+#~ msgstr "Rhifau a llythrennau"
892+
893+#~ msgid "Improving your experience"
894+#~ msgstr "Gwella eich profiad"
895+
896+#~ msgid "You can change your mind later in <b>System Settings</b>."
897+#~ msgstr "Gallwch newid hwn eto yn <b>Gosodiadau System</b>."
898+
899+#~ msgid ""
900+#~ "By selecting this option you agree to the Nokia HERE <a href='#'>terms and "
901+#~ "conditions</a>."
902+#~ msgstr ""
903+#~ "Drwy ddewis yr opsiwn yma rydych yn cytuno i <a href='#'>dermau ac "
904+#~ "amodau</a> Nokia HERE."
905+
906+#~ msgid "Not at all"
907+#~ msgstr "Dim o gwbl"
908+
909+#~ msgid "Available networks…"
910+#~ msgstr "Rhwydweithiau sydd ar gael..."
911+
912+#~ msgid "No available networks."
913+#~ msgstr "Dim rhwydweithiau ar gael"
914+
915+#~ msgid "Location"
916+#~ msgstr "Lleoliad"
917+
918+#~ msgid "Let the phone detect your location:"
919+#~ msgstr "Caniatáu'r ffôn i ganfod eich lleoliad:"
920+
921+#~ msgid "Using GPS only (less accurate)"
922+#~ msgstr "Defnyddio GPS yn unig (llai cywir)"
923+
924+#~ msgid "Using GPS, anonymized Wi-Fi and cellular network info (recommended)"
925+#~ msgstr ""
926+#~ "Defnyddio GPS, diwifr dienw a gwybodaeth rhwydwaith cellog (argymellir hwn)"
927+
928+#~ msgid ""
929+#~ "This can be disabled in <b>System Settings</b> under <b>Security &amp; "
930+#~ "Privacy</b>"
931+#~ msgstr ""
932+#~ "Gellir analluogi hwn yn <b>Gosodiadau System</b> dan <b>Diogelwch a "
933+#~ "Phreifatwydd</b>"
934+
935+#~ msgid ""
936+#~ "Your phone is set up to automatically report errors to Canonical and its "
937+#~ "partners, the makers of the operating system."
938+#~ msgstr ""
939+#~ "Cyfluniwyd eich ffôn i adrodd gwallau i Canonical a'i bartneriaid, "
940+#~ "gwneuthurwyr y system weithredu."
941+
942+#~ msgid "Nice work!"
943+#~ msgstr "Da iawn!"
944+
945+#~ msgid "All done"
946+#~ msgstr "Wedi gorffen"
947+
948+#~ msgid "Finish"
949+#~ msgstr "Gorffen"
950+
726#~ msgid "Your phone is now ready to use."
951#~ msgid "Your phone is now ready to use."
727#~ msgstr "Mae eich ffôn yn barod i'w ddefnyddio"
952#~ msgstr "Mae eich ffôn yn barod i'w ddefnyddio"
953+
954+#~ msgid "Confirm passphrase"
955+#~ msgstr "Cadarnhau cyfrinair"
956+
957+#~ msgid "Please try again."
958+#~ msgstr "Rhowch gynnig arall arni"
959+
960+#, qt-format
961+#~ msgid "〈 %1"
962+#~ msgstr "〈 %1"
963+
964+#, qt-format
965+#~ msgid "%1 〉"
966+#~ msgstr "%1 〉"
967+
968+#~ msgid "Choose your passcode"
969+#~ msgstr "Dewiswch eich cod cyfrinachol"
970+
971+#~ msgid "Passphrase must be 4 characters long"
972+#~ msgstr "Dylai cyfrinair fod yn bedwar nod"
po/da.po+477−232
@@ -8,7 +8,7 @@ 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: 2016-03-10 22:48+0000\n"
11+"POT-Creation-Date: 2016-03-23 10:01+0000\n"
12"PO-Revision-Date: 2015-07-06 12:05+0000\n"
12"PO-Revision-Date: 2015-07-06 12:05+0000\n"
13"Last-Translator: Folmer Fredslund <Unknown>\n"
13"Last-Translator: Folmer Fredslund <Unknown>\n"
14"Language-Team: Danish <dansk@dansk-gruppen.dk>\n"
14"Language-Team: Danish <dansk@dansk-gruppen.dk>\n"
@@ -16,8 +16,8 @@ msgstr ""
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"Plural-Forms: nplurals=2; plural=n != 1;\n"
19−"X-Launchpad-Export-Date: 2016-03-13 05:50+0000\n"
19+"X-Launchpad-Export-Date: 2016-03-24 06:07+0000\n"
20−"X-Generator: Launchpad (build 17939)\n"
20+"X-Generator: Launchpad (build 17958)\n"
21
21
22#: plugins/IntegratedLightDM/Greeter.cpp:112
22#: plugins/IntegratedLightDM/Greeter.cpp:112
23msgid "Password: "
23msgid "Password: "
@@ -78,53 +78,35 @@ msgctxt "Button: Log out from the system"
78msgid "Log Out"
78msgid "Log Out"
79msgstr "Log af"
79msgstr "Log af"
80
80
81−#: qml/Components/Dialogs.qml:161 qml/Components/Dialogs.qml:194
81+#: qml/Components/Dialogs.qml:161 qml/Components/Dialogs.qml:219
82−#: qml/Components/Dialogs.qml:253
82+#: qml/Dash/DashPageHeader.qml:298 qml/Wizard/Pages/passcode-confirm.qml:32
83+#: qml/Wizard/Pages/passcode-set.qml:32
83msgid "Cancel"
84msgid "Cancel"
84msgstr "Annullér"
85msgstr "Annullér"
85
86
86#: qml/Components/Dialogs.qml:173
87#: qml/Components/Dialogs.qml:173
87−msgctxt "Title: Reboot/Shut down dialog"
88−msgid "Shut down"
89−msgstr "Luk ned"
90−
91−#: qml/Components/Dialogs.qml:174
92−msgid "Are you sure you want to shut down?"
93−msgstr "Er du sikker på du vil lukke ned?"
94−
95−#: qml/Components/Dialogs.qml:176
96−msgctxt "Button: Reboot the system"
97−msgid "Reboot"
98−msgstr "Genstart"
99−
100−#: qml/Components/Dialogs.qml:185
101−msgctxt "Button: Shut down the system"
102−msgid "Shut down"
103−msgstr "Luk ned"
104−
105−#: qml/Components/Dialogs.qml:207
106msgctxt "Title: Reboot dialog"
88msgctxt "Title: Reboot dialog"
107msgid "Reboot"
89msgid "Reboot"
108msgstr "Genstart"
90msgstr "Genstart"
109
91
110−#: qml/Components/Dialogs.qml:208
92+#: qml/Components/Dialogs.qml:174
111msgid "Are you sure you want to reboot?"
93msgid "Are you sure you want to reboot?"
112msgstr "Er du sikker på du vil genstarte?"
94msgstr "Er du sikker på du vil genstarte?"
113
95
114−#: qml/Components/Dialogs.qml:210
96+#: qml/Components/Dialogs.qml:176
115msgid "No"
97msgid "No"
116msgstr "Nej"
98msgstr "Nej"
117
99
118−#: qml/Components/Dialogs.qml:217
100+#: qml/Components/Dialogs.qml:183
119msgid "Yes"
101msgid "Yes"
120msgstr "Ja"
102msgstr "Ja"
121
103
122−#: qml/Components/Dialogs.qml:232
104+#: qml/Components/Dialogs.qml:198
123msgctxt "Title: Power off/Restart dialog"
105msgctxt "Title: Power off/Restart dialog"
124msgid "Power"
106msgid "Power"
125msgstr "Sluk/genstart"
107msgstr "Sluk/genstart"
126
108
127−#: qml/Components/Dialogs.qml:233
109+#: qml/Components/Dialogs.qml:199
128msgid ""
110msgid ""
129"Are you sure you would like\n"
111"Are you sure you would like\n"
130"to power off?"
112"to power off?"
@@ -132,12 +114,12 @@ msgstr ""
132"Er du sikker på at du vil\n"
114"Er du sikker på at du vil\n"
133"slukke enheden?"
115"slukke enheden?"
134
116
135−#: qml/Components/Dialogs.qml:235
117+#: qml/Components/Dialogs.qml:201
136msgctxt "Button: Power off the system"
118msgctxt "Button: Power off the system"
137msgid "Power off"
119msgid "Power off"
138msgstr "Luk ned"
120msgstr "Luk ned"
139
121
140−#: qml/Components/Dialogs.qml:244
122+#: qml/Components/Dialogs.qml:210
141msgctxt "Button: Restart the system"
123msgctxt "Button: Restart the system"
142msgid "Restart"
124msgid "Restart"
143msgstr "Genstart"
125msgstr "Genstart"
@@ -180,42 +162,58 @@ msgstr ""
180msgid "Close all"
162msgid "Close all"
181msgstr ""
163msgstr ""
182
164
183−#: qml/Dash/DashPageHeader.qml:270
165+#: qml/Dash/DashPageHeader.qml:337
184msgctxt "Button: Open the Ubuntu Store"
166msgctxt "Button: Open the Ubuntu Store"
185msgid "Store"
167msgid "Store"
186msgstr "Butik"
168msgstr "Butik"
187
169
188−#: qml/Dash/DashPageHeader.qml:277
170+#: qml/Dash/DashPageHeader.qml:344
189msgctxt "Button: Start a search in the current dash scope"
171msgctxt "Button: Start a search in the current dash scope"
190msgid "Search"
172msgid "Search"
191msgstr "Søg"
173msgstr "Søg"
192
174
193−#: qml/Dash/DashPageHeader.qml:287
175+#: qml/Dash/DashPageHeader.qml:354
194msgctxt "Button: Show the current dash scope settings"
176msgctxt "Button: Show the current dash scope settings"
195msgid "Settings"
177msgid "Settings"
196msgstr "Indstillinger"
178msgstr "Indstillinger"
197
179
198−#: qml/Dash/DashPageHeader.qml:294
180+#: qml/Dash/DashPageHeader.qml:361
199msgid "Remove from Favorites"
181msgid "Remove from Favorites"
200msgstr "Fjern fra Favoritter"
182msgstr "Fjern fra Favoritter"
201
183
202−#: qml/Dash/DashPageHeader.qml:294
184+#: qml/Dash/DashPageHeader.qml:361
203msgid "Add to Favorites"
185msgid "Add to Favorites"
204msgstr "Tilføj til Favoritter"
186msgstr "Tilføj til Favoritter"
205
187
188+#: qml/Dash/FiltersPopover.qml:60
189+msgid "Refine your results"
190+msgstr ""
191+
192+#: qml/Dash/FiltersPopover.qml:69
193+msgid "Reset"
194+msgstr ""
195+
206−#: qml/Dash/GenericScopeView.qml:567 qml/Dash/GenericScopeView.qml:725
196+#: qml/Dash/GenericScopeView.qml:570 qml/Dash/GenericScopeView.qml:755
207msgid "See less"
197msgid "See less"
208msgstr "Vis mindre"
198msgstr "Vis mindre"
209
199
210−#: qml/Dash/GenericScopeView.qml:567
200+#: qml/Dash/GenericScopeView.qml:570
211msgid "See all"
201msgid "See all"
212msgstr "Se alle"
202msgstr "Se alle"
213
203
214−#: qml/Dash/GenericScopeView.qml:629
204+#: qml/Dash/GenericScopeView.qml:627
215msgctxt "Label: Hint for dash search line edit"
205msgctxt "Label: Hint for dash search line edit"
216msgid "Search"
206msgid "Search"
217msgstr "Søg"
207msgstr "Søg"
218
208
209+#: qml/Dash/PageHeaderExtraPanel.qml:55
210+msgid "Recent Searches"
211+msgstr ""
212+
213+#: qml/Dash/PageHeaderExtraPanel.qml:66
214+msgid "Clear All"
215+msgstr ""
216+
219#: qml/Dash/Previews/PreviewActionCombo.qml:35
217#: qml/Dash/Previews/PreviewActionCombo.qml:35
220msgid "More..."
218msgid "More..."
221msgstr "Mere..."
219msgstr "Mere..."
@@ -283,11 +281,11 @@ msgstr "Forsøg igen"
283msgid "Tap to unlock"
281msgid "Tap to unlock"
284msgstr "Tap for at låse op"
282msgstr "Tap for at låse op"
285
283
286−#: qml/Greeter/NarrowView.qml:54 qml/Wizard/Pages/passwd-confirm.qml:53
284+#: qml/Greeter/NarrowView.qml:54
287msgid "Sorry, incorrect passphrase."
285msgid "Sorry, incorrect passphrase."
288msgstr "Beklager, forkert adgangsfrase."
286msgstr "Beklager, forkert adgangsfrase."
289
287
290−#: qml/Greeter/NarrowView.qml:55 qml/Wizard/Pages/passwd-confirm.qml:54
288+#: qml/Greeter/NarrowView.qml:55
291msgid "Sorry, incorrect passcode."
289msgid "Sorry, incorrect passcode."
292msgstr "Beklager, forkert adgangskode."
290msgstr "Beklager, forkert adgangskode."
293
291
@@ -316,7 +314,7 @@ msgstr ""
316msgid "Enter %1"
314msgid "Enter %1"
317msgstr "Indtast %1"
315msgstr "Indtast %1"
318
316
319−#: qml/Greeter/NarrowView.qml:117 qml/Wizard/Pages/passwd-set.qml:60
317+#: qml/Greeter/NarrowView.qml:117
320msgid "Enter passphrase"
318msgid "Enter passphrase"
321msgstr "Angiv adgangsfrase"
319msgstr "Angiv adgangsfrase"
322
320
@@ -354,62 +352,62 @@ msgstr "Tryk for at vende tilbage til opkaldet..."
354msgid "Conference"
352msgid "Conference"
355msgstr "Konference"
353msgstr "Konference"
356
354
357−#: qml/Panel/Indicators/MenuItemFactory.qml:752
355+#: qml/Panel/Indicators/MenuItemFactory.qml:761
358msgid "Nothing is playing"
356msgid "Nothing is playing"
359msgstr "Intet afspilles"
357msgstr "Intet afspilles"
360
358
361−#: qml/Panel/Indicators/MenuItemFactory.qml:881
359+#: qml/Panel/Indicators/MenuItemFactory.qml:890
362#, qt-format
360#, qt-format
363msgid "%1 hour"
361msgid "%1 hour"
364msgid_plural "%1 hours"
362msgid_plural "%1 hours"
365msgstr[0] "%1 time"
363msgstr[0] "%1 time"
366msgstr[1] "%1 timer"
364msgstr[1] "%1 timer"
367
365
368−#: qml/Panel/Indicators/MenuItemFactory.qml:885
366+#: qml/Panel/Indicators/MenuItemFactory.qml:894
369#, qt-format
367#, qt-format
370msgid "%1 minute"
368msgid "%1 minute"
371msgid_plural "%1 minutes"
369msgid_plural "%1 minutes"
372msgstr[0] "%1 minut"
370msgstr[0] "%1 minut"
373msgstr[1] "%1 minutter"
371msgstr[1] "%1 minutter"
374
372
375−#: qml/Panel/Indicators/MenuItemFactory.qml:890
373+#: qml/Panel/Indicators/MenuItemFactory.qml:899
376#, qt-format
374#, qt-format
377msgid "%1 second"
375msgid "%1 second"
378msgid_plural "%1 seconds"
376msgid_plural "%1 seconds"
379msgstr[0] "%1 sekund"
377msgstr[0] "%1 sekund"
380msgstr[1] "%1 sekunder"
378msgstr[1] "%1 sekunder"
381
379
382−#: qml/Panel/Indicators/MenuItemFactory.qml:893
380+#: qml/Panel/Indicators/MenuItemFactory.qml:902
383msgid "0 seconds"
381msgid "0 seconds"
384msgstr "0 sekunder"
382msgstr "0 sekunder"
385
383
386#. Translators: String like "1 hour, 2 minutes, 3 seconds remaining"
384#. Translators: String like "1 hour, 2 minutes, 3 seconds remaining"
387−#: qml/Panel/Indicators/MenuItemFactory.qml:895
385+#: qml/Panel/Indicators/MenuItemFactory.qml:904
388#, qt-format
386#, qt-format
389msgid "%1 remaining"
387msgid "%1 remaining"
390msgstr "%1 tilbage"
388msgstr "%1 tilbage"
391
389
392−#: qml/Panel/Indicators/MenuItemFactory.qml:901
390+#: qml/Panel/Indicators/MenuItemFactory.qml:910
393msgid "In queue…"
391msgid "In queue…"
394msgstr "I kø…"
392msgstr "I kø…"
395
393
396−#: qml/Panel/Indicators/MenuItemFactory.qml:905
394+#: qml/Panel/Indicators/MenuItemFactory.qml:914
397msgid "Downloading"
395msgid "Downloading"
398msgstr "Henter"
396msgstr "Henter"
399
397
400−#: qml/Panel/Indicators/MenuItemFactory.qml:907
398+#: qml/Panel/Indicators/MenuItemFactory.qml:916
401msgid "Paused, tap to resume"
399msgid "Paused, tap to resume"
402msgstr "På pause - tryk for at fortsætte"
400msgstr "På pause - tryk for at fortsætte"
403
401
404−#: qml/Panel/Indicators/MenuItemFactory.qml:909
402+#: qml/Panel/Indicators/MenuItemFactory.qml:918
405msgid "Canceled"
403msgid "Canceled"
406msgstr "Annulleret"
404msgstr "Annulleret"
407
405
408−#: qml/Panel/Indicators/MenuItemFactory.qml:911
406+#: qml/Panel/Indicators/MenuItemFactory.qml:920
409msgid "Finished"
407msgid "Finished"
410msgstr "Færdig"
408msgstr "Færdig"
411
409
412−#: qml/Panel/Indicators/MenuItemFactory.qml:913
410+#: qml/Panel/Indicators/MenuItemFactory.qml:922
413msgid "Failed, tap to retry"
411msgid "Failed, tap to retry"
414msgstr "Mislykkedes - tryk for at prøve igen"
412msgstr "Mislykkedes - tryk for at prøve igen"
415
413
@@ -429,253 +427,324 @@ msgctxt "Button: Call back on phone"
429msgid "Call back"
427msgid "Call back"
430msgstr ""
428msgstr ""
431
429
432−#: qml/Tutorial/TutorialBottom.qml:28
430+#: qml/Stages/SideStage.qml:76
433−msgid "Open special menus"
431+msgid "Drag using 3 fingers any application from one window to the other"
434−msgstr "Åben specialmenuer"
432+msgstr ""
435−
436−#: qml/Tutorial/TutorialBottom.qml:29
437−msgid "Swipe up from the bottom edge."
438−msgstr "Swipe op fra den nedre kant."
439
433
440−#: qml/Tutorial/TutorialBottomFinish.qml:24
434+#: qml/Tutorial/TutorialBottom.qml:78
441−msgid "This action does different things for different apps"
435+msgid "Swipe up to add a contact"
442−msgstr "Denne handling gør forskellige ting i forskellige apps"
436+msgstr ""
443
437
444−#: qml/Tutorial/TutorialBottomFinish.qml:25
438+#: qml/Tutorial/TutorialBottom.qml:80
445−msgid "Tap here to finish."
439+msgid "Swipe up for favorite calculations"
446−msgstr "Tryk her for at afslutte."
440+msgstr ""
447
441
448−#: qml/Tutorial/TutorialContent.qml:80 qml/Tutorial/TutorialLeftFinish.qml:25
442+#: qml/Tutorial/TutorialBottom.qml:82
449−#: qml/Tutorial/TutorialRight.qml:144
443+msgid "Swipe up for recent calls"
450−msgid "Tap here to continue."
444+msgstr ""
451−msgstr "Tryk her for at fortsætte."
452
445
453−#: qml/Tutorial/TutorialLeft.qml:26
446+#: qml/Tutorial/TutorialBottom.qml:84
454−msgid "Open the launcher"
447+msgid "Swipe up to create a message"
455−msgstr "Åbn opstarteren"
448+msgstr ""
456
449
457−#: qml/Tutorial/TutorialLeft.qml:27
450+#: qml/Tutorial/TutorialBottom.qml:85
458−msgid "Short swipe from the left edge."
451+msgid "Swipe up to manage the app"
459−msgstr "Kort swipe fra den venstre kant."
452+msgstr ""
460
453
461−#: qml/Tutorial/TutorialLeftFinish.qml:24
454+#: qml/Tutorial/TutorialLeft.qml:47
462−msgid "These are the shortcuts to favorite apps"
455+msgid "Swipe from the left edge to open the launcher"
463−msgstr "Disse er genveje til favorit-apps"
456+msgstr ""
464
457
465−#: qml/Tutorial/TutorialPage.qml:178
458+#: qml/Tutorial/TutorialLeftLong.qml:47
466−msgid "You almost got it!"
459+msgid "Long swipe from the left edge to open the Today scope"
467−msgstr "Du havde den næsten!"
460+msgstr ""
468
461
469−#: qml/Tutorial/TutorialPage.qml:195
462+#: qml/Tutorial/TutorialRight.qml:54
470−msgid "Try again."
463+msgid "Hover your mouse on the right edge to view your open apps"
471−msgstr "Prøv igen."
464+msgstr ""
472
465
473−#: qml/Tutorial/TutorialRight.qml:31
466+#: qml/Tutorial/TutorialRight.qml:55
474−msgid "To view open apps"
467+msgid "Short or long swipe from the right edge to view your open apps"
475−msgstr "For at se åbne apps"
468+msgstr ""
476
469
477−#: qml/Tutorial/TutorialRight.qml:32
470+#: qml/Tutorial/TutorialTop.qml:53
478−msgid "Long swipe from the right edge."
471+msgid "Swipe from the top right edge to open the notification bar"
479−msgstr "Langt swipe fra den højre kant."
472+msgstr ""
480
473
481−#: qml/Tutorial/TutorialRight.qml:122
474+#: qml/Tutorial/TutorialTop.qml:54
482−msgid "View all your running tasks."
475+msgid "Swipe from the top edge to open the notification bar"
483−msgstr "Se alle dine kørende opgaver."
476+msgstr ""
484
477
485−#: qml/Wizard/Page.qml:89
478+#: qml/Wizard/Page.qml:54
486msgctxt "Button: Go back one page in the Wizard"
479msgctxt "Button: Go back one page in the Wizard"
487msgid "Back"
480msgid "Back"
488msgstr "Tilbage"
481msgstr "Tilbage"
489
482
490#: qml/Wizard/Pages/10-welcome.qml:27
483#: qml/Wizard/Pages/10-welcome.qml:27
491−msgid "Hi!"
484+msgid "Language"
492−msgstr "Hej!"
485+msgstr ""
493
486
494−#: qml/Wizard/Pages/10-welcome.qml:44
487+#: qml/Wizard/Pages/10-welcome.qml:156 qml/Wizard/Pages/30-wifi.qml:206
495−msgid "Welcome to your Ubuntu device."
488+#: qml/Wizard/Pages/40-location.qml:271 qml/Wizard/Pages/50-timezone.qml:267
489+#: qml/Wizard/Pages/60-account.qml:65 qml/Wizard/Pages/70-passwd-type.qml:144
490+#: qml/Wizard/Pages/75-report-check.qml:84
491+#: qml/Wizard/Pages/passcode-desktop.qml:124
492+#: qml/Wizard/Pages/password-set.qml:141
493+msgid "Next"
496msgstr ""
494msgstr ""
497
495
498−#: qml/Wizard/Pages/10-welcome.qml:52
496+#: qml/Wizard/Pages/30-wifi.qml:29
499−msgid "Let’s get started."
497+msgid "Connect to Wi‑Fi"
500−msgstr "Lad os komme i gang."
498+msgstr "Tilslut til Wi-Fi"
501
499
502−#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:133
500+#: qml/Wizard/Pages/30-wifi.qml:130
503−#: qml/Wizard/Pages/40-wifi.qml:215 qml/Wizard/Pages/50-location.qml:131
501+msgid "Connected"
504−#: qml/Wizard/Pages/60-reporting.qml:60 qml/Wizard/Pages/passwd-confirm.qml:82
505−#: qml/Wizard/Pages/passwd-set.qml:90
506−msgid "Continue"
507−msgstr "Fortsæt"
502+msgstr ""
508
503
509−#: qml/Wizard/Pages/20-sim.qml:25
504+#: qml/Wizard/Pages/30-wifi.qml:163
510−msgid "Add a SIM card and restart your device"
505+msgid "Available Wi-Fi networks"
511−msgstr "Indsæt et SIM-kort og genstart din enhed"
506+msgstr ""
512
507
513−#: qml/Wizard/Pages/20-sim.qml:59
508+#: qml/Wizard/Pages/30-wifi.qml:164
514−msgid "Without it, you won’t be able to make calls or use text messaging."
509+msgid "No available Wi-Fi networks"
515msgstr ""
510msgstr ""
516−"Uden denne vil du ikke være i stand til at foretage opkald eller sende "
517−"tekstbeskeder."
518
511
519−#: qml/Wizard/Pages/20-sim.qml:73 qml/Wizard/Pages/40-wifi.qml:215
512+#: qml/Wizard/Pages/30-wifi.qml:206 qml/Wizard/Pages/60-account.qml:65
513+#: qml/Wizard/Pages/sim.qml:101
520msgid "Skip"
514msgid "Skip"
521msgstr "Spring over"
515msgstr "Spring over"
522
516
523−#: qml/Wizard/Pages/30-passwd-type.qml:39
517+#: qml/Wizard/Pages/40-location.qml:27
524−msgid "Lock security"
518+msgid "Location Services"
525−msgstr "Låsesikkerhed"
519+msgstr ""
526
520
527−#: qml/Wizard/Pages/30-passwd-type.qml:79
521+#: qml/Wizard/Pages/40-location.qml:83
528−msgid "Please select how you’d like to unlock your device."
522+msgid ""
523+"Use GPS, Wi-Fi hotspots and mobile network anonymously to detect location "
524+"(recommended)"
529msgstr ""
525msgstr ""
530
526
531−#: qml/Wizard/Pages/30-passwd-type.qml:102
527+#: qml/Wizard/Pages/40-location.qml:105
532−msgctxt "Label: Type of security method"
528+#, qt-format
533−msgid "Swipe"
529+msgid "By selecting this option you agree to the Nokia HERE %1."
534−msgstr "Swipe"
530+msgstr ""
535
531
536−#: qml/Wizard/Pages/30-passwd-type.qml:103
532+#: qml/Wizard/Pages/40-location.qml:106
537−msgctxt "Label: Description of security method"
533+msgctxt "part of: Nokia HERE terms and conditions"
538−msgid "No security"
534+msgid "terms and conditions"
539−msgstr "Ingen sikkerhed"
535+msgstr ""
540
536
541−#: qml/Wizard/Pages/30-passwd-type.qml:105
537+#: qml/Wizard/Pages/40-location.qml:160
538+msgid "GPS only"
539+msgstr ""
540+
541+#: qml/Wizard/Pages/40-location.qml:214
542+msgid "Don't use my location"
543+msgstr ""
544+
545+#: qml/Wizard/Pages/40-location.qml:260
546+msgid "You can change it later in System Settings."
547+msgstr ""
548+
549+#: qml/Wizard/Pages/50-timezone.qml:29
550+msgid "Time Zone"
551+msgstr ""
552+
553+#: qml/Wizard/Pages/50-timezone.qml:178
554+msgid "Enter your city"
555+msgstr ""
556+
557+#: qml/Wizard/Pages/60-account.qml:24
558+msgid "Personalize Your Device"
559+msgstr ""
560+
561+#: qml/Wizard/Pages/60-account.qml:48
562+msgid "Preferred Name"
563+msgstr ""
564+
565+#: qml/Wizard/Pages/70-passwd-type.qml:39
566+msgid "Lock Screen"
567+msgstr ""
568+
569+#: qml/Wizard/Pages/70-passwd-type.qml:101
542msgctxt "Label: Type of security method"
570msgctxt "Label: Type of security method"
543−msgid "Passcode"
571+msgid "Create new password"
544−msgstr "Adgangskode"
572+msgstr ""
545
573
546−#: qml/Wizard/Pages/30-passwd-type.qml:106
574+#: qml/Wizard/Pages/70-passwd-type.qml:103
547−msgctxt "Label: Description of security method"
575+msgctxt "Label: Type of security method"
548−msgid "4 digits only"
576+msgid "Create passcode (numbers only)"
549−msgstr "Kun 4 tal"
577+msgstr ""
550
578
551−#: qml/Wizard/Pages/30-passwd-type.qml:108
579+#: qml/Wizard/Pages/70-passwd-type.qml:105
552msgctxt "Label: Type of security method"
580msgctxt "Label: Type of security method"
553−msgid "Passphrase"
581+msgid "No lock code"
554−msgstr "Adgangsfrase"
582+msgstr ""
555
583
556−#: qml/Wizard/Pages/30-passwd-type.qml:109
584+#: qml/Wizard/Pages/75-report-check.qml:26 qml/Wizard/Pages/here-terms.qml:108
557−msgctxt "Label: Description of security method"
585+msgid "Privacy Policy"
558−msgid "Numbers and letters"
559−msgstr "Tal og bogstaver"
586+msgstr ""
560
587
561−#: qml/Wizard/Pages/40-wifi.qml:29
588+#: qml/Wizard/Pages/75-report-check.qml:26
562−msgid "Connect to Wi‑Fi"
589+msgid "Help Us Improve"
563−msgstr "Tilslut til Wi-Fi"
590+msgstr ""
564
591
565−#: qml/Wizard/Pages/40-wifi.qml:168
592+#: qml/Wizard/Pages/75-report-check.qml:59
566−msgid "Available networks…"
593+msgid "Improve system performance by sending us crashes and error reports."
567−msgstr "Tilgængelige netværk..."
594+msgstr ""
595+
596+#: qml/Wizard/Pages/75-report-check.qml:60
597+msgid "Privacy policy"
598+msgstr ""
568
599
569−#: qml/Wizard/Pages/40-wifi.qml:169
600+#: qml/Wizard/Pages/80-finished.qml:89
570−msgid "No available networks."
601+msgid "Welcome to Ubuntu"
571−msgstr "Ingen tilgængelige netværk."
602+msgstr ""
572
603
573−#: qml/Wizard/Pages/50-location.qml:27
604+#: qml/Wizard/Pages/80-finished.qml:104
574−msgid "Location"
605+msgid "You are ready to use your device now"
575−msgstr "Placering"
606+msgstr ""
576
607
577−#: qml/Wizard/Pages/50-location.qml:62
608+#: qml/Wizard/Pages/80-finished.qml:124
578−msgid "Let the phone detect your location:"
609+msgid "Get Started"
579−msgstr "Lad telefonen bestemme din placering:"
610+msgstr ""
580
611
581−#: qml/Wizard/Pages/50-location.qml:69
612+#: qml/Wizard/Pages/here-terms.qml:25
582−msgid "Using GPS only (less accurate)"
613+msgid "Terms & Conditions"
583−msgstr "Kun ved brug af GPS (mindre præcis)"
614+msgstr "Betingelser og vilkår"
584
615
585−#: qml/Wizard/Pages/50-location.qml:86
616+#: qml/Wizard/Pages/here-terms.qml:69
586−msgid "Using GPS, anonymized Wi-Fi and cellular network info (recommended)"
617+msgid "Your device uses positioning technologies provided by HERE."
587msgstr ""
618msgstr ""
588−"Ved brug af GPS, anonymiseret Wi-Fi og telenetværksinformation (anbefalet)"
589
619
590−#. Translators: HERE is a trademark for Nokia's location service, you probably shouldn't translate it
591−#: qml/Wizard/Pages/50-location.qml:103
620+#: qml/Wizard/Pages/here-terms.qml:81
592msgid ""
621msgid ""
593−"By selecting this option you agree to the Nokia HERE <a href='#'>terms and "
622+"To provide you with positioning services and to improve their quality, HERE "
594−"conditions</a>."
623+"collects information about nearby cell towers and Wi-Fi hotspots around your "
624+"current location whenever your position is being found."
595msgstr ""
625msgstr ""
596−"Ved at vælge dette siger du ja til Nokia HERE's <a href='#'>betingelser og "
597−"vilkår</a>."
598
626
599−#: qml/Wizard/Pages/50-location.qml:112
627+#: qml/Wizard/Pages/here-terms.qml:93
600−msgid "Not at all"
628+msgid ""
629+"The information collected is used to analyze the service and to improve the "
630+"use of service, but not to identify you personally."
601−msgstr "Slet ikke"
631+msgstr ""
602
632
603−#: qml/Wizard/Pages/50-location.qml:124
633+#: qml/Wizard/Pages/here-terms.qml:106
604−msgid "You can change your mind later in <b>System Settings</b>."
634+#, qt-format
605−msgstr "Du kan fortryde senere i <b>Systemindstillinger</b>."
635+msgid "By continuing, you agree to the HERE platform %1 and %2."
636+msgstr ""
606
637
607−#: qml/Wizard/Pages/60-reporting.qml:26
638+#: qml/Wizard/Pages/here-terms.qml:107
608−msgid "Improving your experience"
639+msgid "Service Terms"
609−msgstr "Forbedrer din oplevelse"
640+msgstr ""
610
641
611−#: qml/Wizard/Pages/60-reporting.qml:46
642+#: qml/Wizard/Pages/passcode-confirm.qml:43
643+#: qml/Wizard/Pages/passcode-desktop.qml:80
612−msgid ""
644+msgid "Confirm passcode"
613−"Your phone is set up to automatically report errors to Canonical and its "
645+msgstr "Bekræft adgangskode"
614−"partners, the makers of the operating system."
646+
647+#: qml/Wizard/Pages/passcode-confirm.qml:45
648+msgid "Incorrect passcode."
615msgstr ""
649msgstr ""
616−"Din telefon er sat op til automatisk at rapportere fejl til Canonical og "
617−"deres partnere, skaberne af operativsystemet."
618
650
619−#: qml/Wizard/Pages/60-reporting.qml:53
651+#: qml/Wizard/Pages/passcode-confirm.qml:45
652+msgctxt "Enter the passcode again"
620−msgid ""
653+msgid "Please re-enter."
621−"This can be disabled in <b>System Settings</b> under <b>Security &amp; "
622−"Privacy</b>"
623msgstr ""
654msgstr ""
624−"Dette kan slås fra i <b>Systemindstillinger</b> under <b>Sikkerhed &amp; "
625−"privatliv</b>"
626
655
627−#: qml/Wizard/Pages/80-finished.qml:24
656+#: qml/Wizard/Pages/passcode-desktop.qml:30
628−msgid "All done"
657+msgid "Lock Screen Passcode"
629−msgstr "Helt færdig"
658+msgstr ""
630
659
631−#: qml/Wizard/Pages/80-finished.qml:39
660+#: qml/Wizard/Pages/passcode-desktop.qml:56
632−msgid "Nice work!"
661+msgid "Enter 4 numbers to setup your passcode"
633−msgstr "Godt arbejde!"
662+msgstr ""
634
663
635−#: qml/Wizard/Pages/80-finished.qml:46
664+#: qml/Wizard/Pages/passcode-desktop.qml:65
636−msgid "Your device is now ready to use."
665+#: qml/Wizard/Pages/passcode-set.qml:54
666+msgid "Choose passcode"
637msgstr ""
667msgstr ""
638
668
639−#: qml/Wizard/Pages/80-finished.qml:53
669+#: qml/Wizard/Pages/passcode-desktop.qml:105
640−msgid "Finish"
670+msgid "Passcode too short"
641−msgstr "Afslut"
671+msgstr ""
642
672
643−#: qml/Wizard/Pages/here-terms.qml:27
673+#: qml/Wizard/Pages/passcode-desktop.qml:107
644−msgid "Terms & Conditions"
674+msgid "Passcodes match"
645−msgstr "Betingelser og vilkår"
675+msgstr ""
646
676
647−#: qml/Wizard/Pages/passwd-confirm.qml:49
677+#: qml/Wizard/Pages/passcode-desktop.qml:109
648−msgid "Confirm passphrase"
678+msgid "Passcodes do not match"
649−msgstr "Bekæft adgangsfrase"
679+msgstr ""
650
680
651−#: qml/Wizard/Pages/passwd-confirm.qml:50
681+#: qml/Wizard/Pages/passcode-set.qml:62
652−msgid "Confirm passcode"
682+msgid "Passcode must be 4 characters long"
653−msgstr "Bekræft adgangskode"
683+msgstr ""
654
684
655−#: qml/Wizard/Pages/passwd-confirm.qml:53
685+#: qml/Wizard/Pages/password-set.qml:30
656−#: qml/Wizard/Pages/passwd-confirm.qml:54
686+msgid "Lock Screen Password"
657−msgid "Please try again."
687+msgstr ""
658−msgstr "Forsøg venligst igen."
659
688
660−#: qml/Wizard/Pages/passwd-set.qml:61
689+#: qml/Wizard/Pages/password-set.qml:61
661−msgid "Choose your passcode"
690+msgid "Enter at least 8 characters"
662−msgstr "Vælg din adgangskode"
691+msgstr ""
663
692
664−#: qml/Wizard/Pages/passwd-set.qml:68
693+#: qml/Wizard/Pages/password-set.qml:73
665−msgid "Passphrase must be 4 characters long"
694+msgid "Choose password"
666−msgstr "Adgangsfrasen skal være mindst 4 tegn"
695+msgstr ""
667
696
668−#. Translators: This is the arrow for "Back" buttons
697+#: qml/Wizard/Pages/password-set.qml:103
669−#: qml/Wizard/StackButton.qml:39
698+msgid "Confirm password"
670−#, qt-format
671−msgid "〈 %1"
672−msgstr "〈 %1"
699+msgstr ""
673
700
674−#. Translators: This is the arrow for "Forward" buttons
701+#: qml/Wizard/Pages/sim.qml:27
702+msgid "No SIM card installed"
703+msgstr ""
704+
705+#: qml/Wizard/Pages/sim.qml:54
706+msgid "SIM card added"
707+msgstr ""
708+
709+#: qml/Wizard/Pages/sim.qml:55
710+msgid "You must restart the device to access the mobile network."
711+msgstr ""
712+
713+#: qml/Wizard/Pages/sim.qml:59
714+msgid "Restart"
715+msgstr ""
716+
717+#: qml/Wizard/Pages/sim.qml:78
718+msgid "You won’t be able to make calls or use text messaging without a SIM."
719+msgstr ""
720+
721+#: qml/Wizard/Pages/sim.qml:90
722+msgid "To proceed with no SIM tap Skip."
723+msgstr ""
724+
725+#: qml/Wizard/PasswordMeter.qml:87
726+msgid "Passwords match"
727+msgstr ""
728+
729+#: qml/Wizard/PasswordMeter.qml:89
730+msgid "Passwords do not match"
731+msgstr ""
732+
733+#: qml/Wizard/PasswordMeter.qml:93
734+msgid "Strong password"
735+msgstr ""
736+
675−#: qml/Wizard/StackButton.qml:42
737+#: qml/Wizard/PasswordMeter.qml:95
676−#, qt-format
738+msgid "Fair password"
739+msgstr ""
740+
741+#: qml/Wizard/PasswordMeter.qml:97
677−msgid "%1 〉"
742+msgid "Weak password"
678−msgstr "%1 〉"
743+msgstr ""
744+
745+#: qml/Wizard/PasswordMeter.qml:99
746+msgid "Very weak password"
747+msgstr ""
679
748
680#~ msgid "Close"
749#~ msgid "Close"
681#~ msgstr "Luk"
750#~ msgstr "Luk"
@@ -732,24 +801,200 @@ msgstr "%1 〉"
732#~ "Du mestrer nu kantbevægelserne og kan begynde at bruge telefonen<br><br>Tryk "
801#~ "Du mestrer nu kantbevægelserne og kan begynde at bruge telefonen<br><br>Tryk "
733#~ "på skærmen for at starte"
802#~ "på skærmen for at starte"
734
803
804+#~ msgid "Are you sure you want to shut down?"
805+#~ msgstr "Er du sikker på du vil lukke ned?"
806+
735#~ msgid "Unlock SIM"
807#~ msgid "Unlock SIM"
736#~ msgstr "Lås SIM-kort op"
808#~ msgstr "Lås SIM-kort op"
737
809
810+#~ msgid "This action does different things for different apps"
811+#~ msgstr "Denne handling gør forskellige ting i forskellige apps"
812+
738#~ msgid "Please re-enter"
813#~ msgid "Please re-enter"
739#~ msgstr "Vær venlig at genindtaste"
814#~ msgstr "Vær venlig at genindtaste"
740
815
816+#~ msgid "To view open apps"
817+#~ msgstr "For at se åbne apps"
818+
819+#~ msgid "You almost got it!"
820+#~ msgstr "Du havde den næsten!"
821+
741#~ msgid "Please select how you’d like to unlock your phone."
822#~ msgid "Please select how you’d like to unlock your phone."
742#~ msgstr "Vælg venligst hvordan du ønsker at låse din telefon op."
823#~ msgstr "Vælg venligst hvordan du ønsker at låse din telefon op."
743
824
825+#~ msgid "Available networks…"
826+#~ msgstr "Tilgængelige netværk..."
827+
828+#~ msgid "No available networks."
829+#~ msgstr "Ingen tilgængelige netværk."
830+
831+#~ msgid "Improving your experience"
832+#~ msgstr "Forbedrer din oplevelse"
833+
834+#~ msgid ""
835+#~ "Your phone is set up to automatically report errors to Canonical and its "
836+#~ "partners, the makers of the operating system."
837+#~ msgstr ""
838+#~ "Din telefon er sat op til automatisk at rapportere fejl til Canonical og "
839+#~ "deres partnere, skaberne af operativsystemet."
840+
841+#~ msgid "All done"
842+#~ msgstr "Helt færdig"
843+
844+#~ msgid "Using GPS, anonymized Wi-Fi and cellular network info (recommended)"
845+#~ msgstr ""
846+#~ "Ved brug af GPS, anonymiseret Wi-Fi og telenetværksinformation (anbefalet)"
847+
848+#~ msgid "Not at all"
849+#~ msgstr "Slet ikke"
850+
851+#~ msgid "Using GPS only (less accurate)"
852+#~ msgstr "Kun ved brug af GPS (mindre præcis)"
853+
854+#~ msgid "Nice work!"
855+#~ msgstr "Godt arbejde!"
856+
744#~ msgid "Your phone is now ready to use."
857#~ msgid "Your phone is now ready to use."
745#~ msgstr "Din telefon er nu klar til brug."
858#~ msgstr "Din telefon er nu klar til brug."
746
859
860+#~ msgid ""
861+#~ "By selecting this option you agree to the Nokia HERE <a href='#'>terms and "
862+#~ "conditions</a>."
863+#~ msgstr ""
864+#~ "Ved at vælge dette siger du ja til Nokia HERE's <a href='#'>betingelser og "
865+#~ "vilkår</a>."
866+
867+#~ msgid "Choose your passcode"
868+#~ msgstr "Vælg din adgangskode"
869+
870+#, qt-format
871+#~ msgid "%1 〉"
872+#~ msgstr "%1 〉"
873+
874+#, qt-format
875+#~ msgid "〈 %1"
876+#~ msgstr "〈 %1"
877+
878+#~ msgid "Swipe up from the bottom edge."
879+#~ msgstr "Swipe op fra den nedre kant."
880+
881+#~ msgid "Short swipe from the left edge."
882+#~ msgstr "Kort swipe fra den venstre kant."
883+
884+#~ msgid "Tap here to continue."
885+#~ msgstr "Tryk her for at fortsætte."
886+
887+#~ msgid "These are the shortcuts to favorite apps"
888+#~ msgstr "Disse er genveje til favorit-apps"
889+
890+#~ msgid "Open special menus"
891+#~ msgstr "Åben specialmenuer"
892+
893+#~ msgid "Tap here to finish."
894+#~ msgstr "Tryk her for at afslutte."
895+
896+#~ msgid "Add a SIM card and restart your device"
897+#~ msgstr "Indsæt et SIM-kort og genstart din enhed"
898+
899+#~ msgid "Long swipe from the right edge."
900+#~ msgstr "Langt swipe fra den højre kant."
901+
902+#~ msgid "View all your running tasks."
903+#~ msgstr "Se alle dine kørende opgaver."
904+
905+#~ msgid "Try again."
906+#~ msgstr "Prøv igen."
907+
908+#~ msgid "Let’s get started."
909+#~ msgstr "Lad os komme i gang."
910+
747#~ msgid "Welcome to your Ubuntu phone."
911#~ msgid "Welcome to your Ubuntu phone."
748#~ msgstr "Velkommen til din Ubuntu-telefon."
912#~ msgstr "Velkommen til din Ubuntu-telefon."
749
913
914+#~ msgid "You can change your mind later in <b>System Settings</b>."
915+#~ msgstr "Du kan fortryde senere i <b>Systemindstillinger</b>."
916+
917+#~ msgid "Let the phone detect your location:"
918+#~ msgstr "Lad telefonen bestemme din placering:"
919+
920+#~ msgid ""
921+#~ "This can be disabled in <b>System Settings</b> under <b>Security &amp; "
922+#~ "Privacy</b>"
923+#~ msgstr ""
924+#~ "Dette kan slås fra i <b>Systemindstillinger</b> under <b>Sikkerhed &amp; "
925+#~ "privatliv</b>"
926+
927+#~ msgctxt "Button: Shut down the system"
928+#~ msgid "Shut down"
929+#~ msgstr "Luk ned"
930+
931+#~ msgctxt "Title: Reboot/Shut down dialog"
932+#~ msgid "Shut down"
933+#~ msgstr "Luk ned"
934+
935+#~ msgctxt "Button: Reboot the system"
936+#~ msgid "Reboot"
937+#~ msgstr "Genstart"
938+
750#~ msgid "Roaming"
939#~ msgid "Roaming"
751#~ msgstr "Roaming"
940#~ msgstr "Roaming"
752
941
942+#~ msgctxt "Label: Type of security method"
943+#~ msgid "Passcode"
944+#~ msgstr "Adgangskode"
945+
946+#~ msgid "Lock security"
947+#~ msgstr "Låsesikkerhed"
948+
949+#~ msgctxt "Label: Description of security method"
950+#~ msgid "No security"
951+#~ msgstr "Ingen sikkerhed"
952+
953+#~ msgctxt "Label: Type of security method"
954+#~ msgid "Swipe"
955+#~ msgstr "Swipe"
956+
957+#~ msgid "Hi!"
958+#~ msgstr "Hej!"
959+
960+#~ msgid "Finish"
961+#~ msgstr "Afslut"
962+
963+#~ msgid "Confirm passphrase"
964+#~ msgstr "Bekæft adgangsfrase"
965+
966+#~ msgctxt "Label: Description of security method"
967+#~ msgid "4 digits only"
968+#~ msgstr "Kun 4 tal"
969+
970+#~ msgid "Location"
971+#~ msgstr "Placering"
972+
973+#~ msgid "Passphrase must be 4 characters long"
974+#~ msgstr "Adgangsfrasen skal være mindst 4 tegn"
975+
976+#~ msgid "Please try again."
977+#~ msgstr "Forsøg venligst igen."
978+
979+#~ msgctxt "Label: Type of security method"
980+#~ msgid "Passphrase"
981+#~ msgstr "Adgangsfrase"
982+
983+#~ msgctxt "Label: Description of security method"
984+#~ msgid "Numbers and letters"
985+#~ msgstr "Tal og bogstaver"
986+
987+#~ msgid "Open the launcher"
988+#~ msgstr "Åbn opstarteren"
989+
990+#~ msgid "Without it, you won’t be able to make calls or use text messaging."
991+#~ msgstr ""
992+#~ "Uden denne vil du ikke være i stand til at foretage opkald eller sende "
993+#~ "tekstbeskeder."
994+
995+#~ msgid "Continue"
996+#~ msgstr "Fortsæt"
997+
753#~ msgid "%a %d %b %H:%M"
998#~ msgid "%a %d %b %H:%M"
754#~ msgstr "%a %b. %d %H:%M"
999#~ msgstr "%a %b. %d %H:%M"
755
1000
po/de.po+485−246
@@ -7,7 +7,7 @@ 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: 2016-03-10 22:48+0000\n"
10+"POT-Creation-Date: 2016-03-23 10:01+0000\n"
11"PO-Revision-Date: 2016-03-13 15:41+0000\n"
11"PO-Revision-Date: 2016-03-13 15:41+0000\n"
12"Last-Translator: schuko24 <gerdsaenger@t-online.de>\n"
12"Last-Translator: schuko24 <gerdsaenger@t-online.de>\n"
13"Language-Team: German <de@li.org>\n"
13"Language-Team: German <de@li.org>\n"
@@ -15,8 +15,8 @@ msgstr ""
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"Plural-Forms: nplurals=2; plural=n != 1;\n"
18−"X-Launchpad-Export-Date: 2016-03-14 05:42+0000\n"
18+"X-Launchpad-Export-Date: 2016-03-24 06:07+0000\n"
19−"X-Generator: Launchpad (build 17939)\n"
19+"X-Generator: Launchpad (build 17958)\n"
20
20
21#: plugins/IntegratedLightDM/Greeter.cpp:112
21#: plugins/IntegratedLightDM/Greeter.cpp:112
22msgid "Password: "
22msgid "Password: "
@@ -77,53 +77,35 @@ msgctxt "Button: Log out from the system"
77msgid "Log Out"
77msgid "Log Out"
78msgstr "Abmelden"
78msgstr "Abmelden"
79
79
80−#: qml/Components/Dialogs.qml:161 qml/Components/Dialogs.qml:194
80+#: qml/Components/Dialogs.qml:161 qml/Components/Dialogs.qml:219
81−#: qml/Components/Dialogs.qml:253
81+#: qml/Dash/DashPageHeader.qml:298 qml/Wizard/Pages/passcode-confirm.qml:32
82+#: qml/Wizard/Pages/passcode-set.qml:32
82msgid "Cancel"
83msgid "Cancel"
83msgstr "Abbrechen"
84msgstr "Abbrechen"
84
85
85#: qml/Components/Dialogs.qml:173
86#: qml/Components/Dialogs.qml:173
86−msgctxt "Title: Reboot/Shut down dialog"
87−msgid "Shut down"
88−msgstr "Ausschalten"
89−
90−#: qml/Components/Dialogs.qml:174
91−msgid "Are you sure you want to shut down?"
92−msgstr "Sind Sie sicher, dass Sie herunterfahren wollen?"
93−
94−#: qml/Components/Dialogs.qml:176
95−msgctxt "Button: Reboot the system"
96−msgid "Reboot"
97−msgstr "Neustarten"
98−
99−#: qml/Components/Dialogs.qml:185
100−msgctxt "Button: Shut down the system"
101−msgid "Shut down"
102−msgstr "Ausschalten"
103−
104−#: qml/Components/Dialogs.qml:207
105msgctxt "Title: Reboot dialog"
87msgctxt "Title: Reboot dialog"
106msgid "Reboot"
88msgid "Reboot"
107msgstr "Neustarten"
89msgstr "Neustarten"
108
90
109−#: qml/Components/Dialogs.qml:208
91+#: qml/Components/Dialogs.qml:174
110msgid "Are you sure you want to reboot?"
92msgid "Are you sure you want to reboot?"
111msgstr "Sind Sie sicher, dass Sie neu starten wollen?"
93msgstr "Sind Sie sicher, dass Sie neu starten wollen?"
112
94
113−#: qml/Components/Dialogs.qml:210
95+#: qml/Components/Dialogs.qml:176
114msgid "No"
96msgid "No"
115msgstr "Nein"
97msgstr "Nein"
116
98
117−#: qml/Components/Dialogs.qml:217
99+#: qml/Components/Dialogs.qml:183
118msgid "Yes"
100msgid "Yes"
119msgstr "Ja"
101msgstr "Ja"
120
102
121−#: qml/Components/Dialogs.qml:232
103+#: qml/Components/Dialogs.qml:198
122msgctxt "Title: Power off/Restart dialog"
104msgctxt "Title: Power off/Restart dialog"
123msgid "Power"
105msgid "Power"
124msgstr "Ausschalten"
106msgstr "Ausschalten"
125
107
126−#: qml/Components/Dialogs.qml:233
108+#: qml/Components/Dialogs.qml:199
127msgid ""
109msgid ""
128"Are you sure you would like\n"
110"Are you sure you would like\n"
129"to power off?"
111"to power off?"
@@ -131,12 +113,12 @@ msgstr ""
131"Sind Sie sicher, dass Sie das\n"
113"Sind Sie sicher, dass Sie das\n"
132"Gerät ausschalten wollen?"
114"Gerät ausschalten wollen?"
133
115
134−#: qml/Components/Dialogs.qml:235
116+#: qml/Components/Dialogs.qml:201
135msgctxt "Button: Power off the system"
117msgctxt "Button: Power off the system"
136msgid "Power off"
118msgid "Power off"
137msgstr "Ausschalten"
119msgstr "Ausschalten"
138
120
139−#: qml/Components/Dialogs.qml:244
121+#: qml/Components/Dialogs.qml:210
140msgctxt "Button: Restart the system"
122msgctxt "Button: Restart the system"
141msgid "Restart"
123msgid "Restart"
142msgstr "Neustarten"
124msgstr "Neustarten"
@@ -181,42 +163,58 @@ msgstr "Jetzt verbinden!"
181msgid "Close all"
163msgid "Close all"
182msgstr "Alle schließen"
164msgstr "Alle schließen"
183
165
184−#: qml/Dash/DashPageHeader.qml:270
166+#: qml/Dash/DashPageHeader.qml:337
185msgctxt "Button: Open the Ubuntu Store"
167msgctxt "Button: Open the Ubuntu Store"
186msgid "Store"
168msgid "Store"
187msgstr "Speichern"
169msgstr "Speichern"
188
170
189−#: qml/Dash/DashPageHeader.qml:277
171+#: qml/Dash/DashPageHeader.qml:344
190msgctxt "Button: Start a search in the current dash scope"
172msgctxt "Button: Start a search in the current dash scope"
191msgid "Search"
173msgid "Search"
192msgstr "Suchen"
174msgstr "Suchen"
193
175
194−#: qml/Dash/DashPageHeader.qml:287
176+#: qml/Dash/DashPageHeader.qml:354
195msgctxt "Button: Show the current dash scope settings"
177msgctxt "Button: Show the current dash scope settings"
196msgid "Settings"
178msgid "Settings"
197msgstr "Einstellungen"
179msgstr "Einstellungen"
198
180
199−#: qml/Dash/DashPageHeader.qml:294
181+#: qml/Dash/DashPageHeader.qml:361
200msgid "Remove from Favorites"
182msgid "Remove from Favorites"
201msgstr "Aus den Favoriten entfernen"
183msgstr "Aus den Favoriten entfernen"
202
184
203−#: qml/Dash/DashPageHeader.qml:294
185+#: qml/Dash/DashPageHeader.qml:361
204msgid "Add to Favorites"
186msgid "Add to Favorites"
205msgstr "Zu Favoriten hinzufügen"
187msgstr "Zu Favoriten hinzufügen"
206
188
189+#: qml/Dash/FiltersPopover.qml:60
190+msgid "Refine your results"
191+msgstr ""
192+
193+#: qml/Dash/FiltersPopover.qml:69
194+msgid "Reset"
195+msgstr ""
196+
207−#: qml/Dash/GenericScopeView.qml:567 qml/Dash/GenericScopeView.qml:725
197+#: qml/Dash/GenericScopeView.qml:570 qml/Dash/GenericScopeView.qml:755
208msgid "See less"
198msgid "See less"
209msgstr "Weniger ansehen"
199msgstr "Weniger ansehen"
210
200
211−#: qml/Dash/GenericScopeView.qml:567
201+#: qml/Dash/GenericScopeView.qml:570
212msgid "See all"
202msgid "See all"
213msgstr "Alle anzeigen"
203msgstr "Alle anzeigen"
214
204
215−#: qml/Dash/GenericScopeView.qml:629
205+#: qml/Dash/GenericScopeView.qml:627
216msgctxt "Label: Hint for dash search line edit"
206msgctxt "Label: Hint for dash search line edit"
217msgid "Search"
207msgid "Search"
218msgstr "Suchen"
208msgstr "Suchen"
219
209
210+#: qml/Dash/PageHeaderExtraPanel.qml:55
211+msgid "Recent Searches"
212+msgstr ""
213+
214+#: qml/Dash/PageHeaderExtraPanel.qml:66
215+msgid "Clear All"
216+msgstr ""
217+
220#: qml/Dash/Previews/PreviewActionCombo.qml:35
218#: qml/Dash/Previews/PreviewActionCombo.qml:35
221msgid "More..."
219msgid "More..."
222msgstr "Mehr …"
220msgstr "Mehr …"
@@ -286,11 +284,11 @@ msgstr "Erneut versuchen"
286msgid "Tap to unlock"
284msgid "Tap to unlock"
287msgstr "Zum Entsperren tippen"
285msgstr "Zum Entsperren tippen"
288
286
289−#: qml/Greeter/NarrowView.qml:54 qml/Wizard/Pages/passwd-confirm.qml:53
287+#: qml/Greeter/NarrowView.qml:54
290msgid "Sorry, incorrect passphrase."
288msgid "Sorry, incorrect passphrase."
291msgstr "Entschuldigung, falsches Passwort."
289msgstr "Entschuldigung, falsches Passwort."
292
290
293−#: qml/Greeter/NarrowView.qml:55 qml/Wizard/Pages/passwd-confirm.qml:54
291+#: qml/Greeter/NarrowView.qml:55
294msgid "Sorry, incorrect passcode."
292msgid "Sorry, incorrect passcode."
295msgstr "Falsche PIN"
293msgstr "Falsche PIN"
296
294
@@ -319,7 +317,7 @@ msgstr ""
319msgid "Enter %1"
317msgid "Enter %1"
320msgstr "%1 eingeben"
318msgstr "%1 eingeben"
321
319
322−#: qml/Greeter/NarrowView.qml:117 qml/Wizard/Pages/passwd-set.qml:60
320+#: qml/Greeter/NarrowView.qml:117
323msgid "Enter passphrase"
321msgid "Enter passphrase"
324msgstr "Passphrase eingeben"
322msgstr "Passphrase eingeben"
325
323
@@ -357,62 +355,62 @@ msgstr "Tippen, um zum Anruf zurückzugehen …"
357msgid "Conference"
355msgid "Conference"
358msgstr "Konferenz"
356msgstr "Konferenz"
359
357
360−#: qml/Panel/Indicators/MenuItemFactory.qml:752
358+#: qml/Panel/Indicators/MenuItemFactory.qml:761
361msgid "Nothing is playing"
359msgid "Nothing is playing"
362msgstr "Nichts wird abgespielt"
360msgstr "Nichts wird abgespielt"
363
361
364−#: qml/Panel/Indicators/MenuItemFactory.qml:881
362+#: qml/Panel/Indicators/MenuItemFactory.qml:890
365#, qt-format
363#, qt-format
366msgid "%1 hour"
364msgid "%1 hour"
367msgid_plural "%1 hours"
365msgid_plural "%1 hours"
368msgstr[0] "%1 Stunde"
366msgstr[0] "%1 Stunde"
369msgstr[1] "%1 Stunden"
367msgstr[1] "%1 Stunden"
370
368
371−#: qml/Panel/Indicators/MenuItemFactory.qml:885
369+#: qml/Panel/Indicators/MenuItemFactory.qml:894
372#, qt-format
370#, qt-format
373msgid "%1 minute"
371msgid "%1 minute"
374msgid_plural "%1 minutes"
372msgid_plural "%1 minutes"
375msgstr[0] "%1 Minute"
373msgstr[0] "%1 Minute"
376msgstr[1] "%1 Minuten"
374msgstr[1] "%1 Minuten"
377
375
378−#: qml/Panel/Indicators/MenuItemFactory.qml:890
376+#: qml/Panel/Indicators/MenuItemFactory.qml:899
379#, qt-format
377#, qt-format
380msgid "%1 second"
378msgid "%1 second"
381msgid_plural "%1 seconds"
379msgid_plural "%1 seconds"
382msgstr[0] "%1 Sekunde"
380msgstr[0] "%1 Sekunde"
383msgstr[1] "%1 Sekunden"
381msgstr[1] "%1 Sekunden"
384
382
385−#: qml/Panel/Indicators/MenuItemFactory.qml:893
383+#: qml/Panel/Indicators/MenuItemFactory.qml:902
386msgid "0 seconds"
384msgid "0 seconds"
387msgstr "0 Sekunden"
385msgstr "0 Sekunden"
388
386
389#. Translators: String like "1 hour, 2 minutes, 3 seconds remaining"
387#. Translators: String like "1 hour, 2 minutes, 3 seconds remaining"
390−#: qml/Panel/Indicators/MenuItemFactory.qml:895
388+#: qml/Panel/Indicators/MenuItemFactory.qml:904
391#, qt-format
389#, qt-format
392msgid "%1 remaining"
390msgid "%1 remaining"
393msgstr "%1 verbleibend"
391msgstr "%1 verbleibend"
394
392
395−#: qml/Panel/Indicators/MenuItemFactory.qml:901
393+#: qml/Panel/Indicators/MenuItemFactory.qml:910
396msgid "In queue…"
394msgid "In queue…"
397msgstr "In Warteschlange …"
395msgstr "In Warteschlange …"
398
396
399−#: qml/Panel/Indicators/MenuItemFactory.qml:905
397+#: qml/Panel/Indicators/MenuItemFactory.qml:914
400msgid "Downloading"
398msgid "Downloading"
401msgstr "Wird heruntergeladen"
399msgstr "Wird heruntergeladen"
402
400
403−#: qml/Panel/Indicators/MenuItemFactory.qml:907
401+#: qml/Panel/Indicators/MenuItemFactory.qml:916
404msgid "Paused, tap to resume"
402msgid "Paused, tap to resume"
405msgstr "Pausiert, tippen Sie zum fortsetzen"
403msgstr "Pausiert, tippen Sie zum fortsetzen"
406
404
407−#: qml/Panel/Indicators/MenuItemFactory.qml:909
405+#: qml/Panel/Indicators/MenuItemFactory.qml:918
408msgid "Canceled"
406msgid "Canceled"
409msgstr "Abgebrochen"
407msgstr "Abgebrochen"
410
408
411−#: qml/Panel/Indicators/MenuItemFactory.qml:911
409+#: qml/Panel/Indicators/MenuItemFactory.qml:920
412msgid "Finished"
410msgid "Finished"
413msgstr "Erledigt"
411msgstr "Erledigt"
414
412
415−#: qml/Panel/Indicators/MenuItemFactory.qml:913
413+#: qml/Panel/Indicators/MenuItemFactory.qml:922
416msgid "Failed, tap to retry"
414msgid "Failed, tap to retry"
417msgstr "Fehlgeschlagen, tippen Sie zum Wiederholen"
415msgstr "Fehlgeschlagen, tippen Sie zum Wiederholen"
418
416
@@ -432,253 +430,324 @@ msgctxt "Button: Call back on phone"
432msgid "Call back"
430msgid "Call back"
433msgstr "Zurückrufen"
431msgstr "Zurückrufen"
434
432
435−#: qml/Tutorial/TutorialBottom.qml:28
433+#: qml/Stages/SideStage.qml:76
436−msgid "Open special menus"
434+msgid "Drag using 3 fingers any application from one window to the other"
437−msgstr "Spezielle Menüs öffnen"
435+msgstr ""
438−
439−#: qml/Tutorial/TutorialBottom.qml:29
440−msgid "Swipe up from the bottom edge."
441−msgstr "Wischen Sie von der unteren Bildschirmkante nach oben."
442
436
443−#: qml/Tutorial/TutorialBottomFinish.qml:24
437+#: qml/Tutorial/TutorialBottom.qml:78
444−msgid "This action does different things for different apps"
438+msgid "Swipe up to add a contact"
445msgstr ""
439msgstr ""
446−"Diese Aktion bewirkt verschiedene Dinge in verschiedenen Anwendungen."
447
440
448−#: qml/Tutorial/TutorialBottomFinish.qml:25
441+#: qml/Tutorial/TutorialBottom.qml:80
449−msgid "Tap here to finish."
442+msgid "Swipe up for favorite calculations"
450−msgstr "Zum Beenden hier tippen."
443+msgstr ""
451
444
452−#: qml/Tutorial/TutorialContent.qml:80 qml/Tutorial/TutorialLeftFinish.qml:25
445+#: qml/Tutorial/TutorialBottom.qml:82
453−#: qml/Tutorial/TutorialRight.qml:144
446+msgid "Swipe up for recent calls"
454−msgid "Tap here to continue."
447+msgstr ""
455−msgstr "Zum Fortfahren hier tippen."
456
448
457−#: qml/Tutorial/TutorialLeft.qml:26
449+#: qml/Tutorial/TutorialBottom.qml:84
458−msgid "Open the launcher"
450+msgid "Swipe up to create a message"
459−msgstr "Öffnen Sie den Starter."
451+msgstr ""
460
452
461−#: qml/Tutorial/TutorialLeft.qml:27
453+#: qml/Tutorial/TutorialBottom.qml:85
462−msgid "Short swipe from the left edge."
454+msgid "Swipe up to manage the app"
463−msgstr "Kurzer Wisch von der linken Bildschirmkante."
455+msgstr ""
464
456
465−#: qml/Tutorial/TutorialLeftFinish.qml:24
457+#: qml/Tutorial/TutorialLeft.qml:47
466−msgid "These are the shortcuts to favorite apps"
458+msgid "Swipe from the left edge to open the launcher"
467−msgstr "Dies sind die Verknüpfungen zu Ihren favorisierten Anwendungen."
459+msgstr ""
468
460
469−#: qml/Tutorial/TutorialPage.qml:178
461+#: qml/Tutorial/TutorialLeftLong.qml:47
470−msgid "You almost got it!"
462+msgid "Long swipe from the left edge to open the Today scope"
471−msgstr "Fast geschafft!"
463+msgstr ""
472
464
473−#: qml/Tutorial/TutorialPage.qml:195
465+#: qml/Tutorial/TutorialRight.qml:54
474−msgid "Try again."
466+msgid "Hover your mouse on the right edge to view your open apps"
475−msgstr "Versuchen Sie es noch einmal."
467+msgstr ""
476
468
477−#: qml/Tutorial/TutorialRight.qml:31
469+#: qml/Tutorial/TutorialRight.qml:55
478−msgid "To view open apps"
470+msgid "Short or long swipe from the right edge to view your open apps"
479−msgstr "Zum Ansehen offener Anwendungen"
471+msgstr ""
480
472
481−#: qml/Tutorial/TutorialRight.qml:32
473+#: qml/Tutorial/TutorialTop.qml:53
482−msgid "Long swipe from the right edge."
474+msgid "Swipe from the top right edge to open the notification bar"
483−msgstr "Langer Wisch von der rechten Bildschirmkante."
475+msgstr ""
484
476
485−#: qml/Tutorial/TutorialRight.qml:122
477+#: qml/Tutorial/TutorialTop.qml:54
486−msgid "View all your running tasks."
478+msgid "Swipe from the top edge to open the notification bar"
487−msgstr "Sehen Sie alle Ihre laufenden Anwendungen."
479+msgstr ""
488
480
489−#: qml/Wizard/Page.qml:89
481+#: qml/Wizard/Page.qml:54
490msgctxt "Button: Go back one page in the Wizard"
482msgctxt "Button: Go back one page in the Wizard"
491msgid "Back"
483msgid "Back"
492msgstr "Zurück"
484msgstr "Zurück"
493
485
494#: qml/Wizard/Pages/10-welcome.qml:27
486#: qml/Wizard/Pages/10-welcome.qml:27
495−msgid "Hi!"
487+msgid "Language"
496−msgstr "Hallo!"
488+msgstr ""
497
489
498−#: qml/Wizard/Pages/10-welcome.qml:44
490+#: qml/Wizard/Pages/10-welcome.qml:156 qml/Wizard/Pages/30-wifi.qml:206
499−msgid "Welcome to your Ubuntu device."
491+#: qml/Wizard/Pages/40-location.qml:271 qml/Wizard/Pages/50-timezone.qml:267
500−msgstr "Willkommen auf Ihrem Ubuntu-Gerät."
492+#: qml/Wizard/Pages/60-account.qml:65 qml/Wizard/Pages/70-passwd-type.qml:144
493+#: qml/Wizard/Pages/75-report-check.qml:84
494+#: qml/Wizard/Pages/passcode-desktop.qml:124
495+#: qml/Wizard/Pages/password-set.qml:141
496+msgid "Next"
497+msgstr ""
501
498
502−#: qml/Wizard/Pages/10-welcome.qml:52
499+#: qml/Wizard/Pages/30-wifi.qml:29
503−msgid "Let’s get started."
500+msgid "Connect to Wi‑Fi"
504−msgstr "Fangen wir an!"
501+msgstr "Mit WLAN verbinden"
505
502
506−#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:133
503+#: qml/Wizard/Pages/30-wifi.qml:130
507−#: qml/Wizard/Pages/40-wifi.qml:215 qml/Wizard/Pages/50-location.qml:131
504+msgid "Connected"
508−#: qml/Wizard/Pages/60-reporting.qml:60 qml/Wizard/Pages/passwd-confirm.qml:82
509−#: qml/Wizard/Pages/passwd-set.qml:90
510−msgid "Continue"
511−msgstr "Weiter"
505+msgstr ""
512
506
513−#: qml/Wizard/Pages/20-sim.qml:25
507+#: qml/Wizard/Pages/30-wifi.qml:163
514−msgid "Add a SIM card and restart your device"
508+msgid "Available Wi-Fi networks"
515−msgstr "SIM-Karte einlegen und Gerät neustarten"
509+msgstr ""
516
510
517−#: qml/Wizard/Pages/20-sim.qml:59
511+#: qml/Wizard/Pages/30-wifi.qml:164
518−msgid "Without it, you won’t be able to make calls or use text messaging."
512+msgid "No available Wi-Fi networks"
519−msgstr "Ohne SIM funktionieren Anrufe und Nachrichten nicht."
513+msgstr ""
520
514
521−#: qml/Wizard/Pages/20-sim.qml:73 qml/Wizard/Pages/40-wifi.qml:215
515+#: qml/Wizard/Pages/30-wifi.qml:206 qml/Wizard/Pages/60-account.qml:65
516+#: qml/Wizard/Pages/sim.qml:101
522msgid "Skip"
517msgid "Skip"
523msgstr "Überspringen"
518msgstr "Überspringen"
524
519
525−#: qml/Wizard/Pages/30-passwd-type.qml:39
520+#: qml/Wizard/Pages/40-location.qml:27
526−msgid "Lock security"
521+msgid "Location Services"
527−msgstr "Sicherheit nach dem Sperren"
522+msgstr ""
523+
524+#: qml/Wizard/Pages/40-location.qml:83
525+msgid ""
526+"Use GPS, Wi-Fi hotspots and mobile network anonymously to detect location "
527+"(recommended)"
528+msgstr ""
528
529
529−#: qml/Wizard/Pages/30-passwd-type.qml:79
530+#: qml/Wizard/Pages/40-location.qml:105
530−msgid "Please select how you’d like to unlock your device."
531+#, qt-format
531−msgstr "Bitte wählen Sie, wie Sie dieses Gerät entsperren möchten."
532+msgid "By selecting this option you agree to the Nokia HERE %1."
533+msgstr ""
532
534
533−#: qml/Wizard/Pages/30-passwd-type.qml:102
535+#: qml/Wizard/Pages/40-location.qml:106
534−msgctxt "Label: Type of security method"
536+msgctxt "part of: Nokia HERE terms and conditions"
535−msgid "Swipe"
537+msgid "terms and conditions"
536−msgstr "Wischen"
538+msgstr ""
537
539
538−#: qml/Wizard/Pages/30-passwd-type.qml:103
540+#: qml/Wizard/Pages/40-location.qml:160
539−msgctxt "Label: Description of security method"
541+msgid "GPS only"
540−msgid "No security"
542+msgstr ""
541−msgstr "Keine Sicherheitssperre"
543+
544+#: qml/Wizard/Pages/40-location.qml:214
545+msgid "Don't use my location"
546+msgstr ""
547+
548+#: qml/Wizard/Pages/40-location.qml:260
549+msgid "You can change it later in System Settings."
550+msgstr ""
551+
552+#: qml/Wizard/Pages/50-timezone.qml:29
553+msgid "Time Zone"
554+msgstr ""
555+
556+#: qml/Wizard/Pages/50-timezone.qml:178
557+msgid "Enter your city"
558+msgstr ""
559+
560+#: qml/Wizard/Pages/60-account.qml:24
561+msgid "Personalize Your Device"
562+msgstr ""
563+
564+#: qml/Wizard/Pages/60-account.qml:48
565+msgid "Preferred Name"
566+msgstr ""
542
567
543−#: qml/Wizard/Pages/30-passwd-type.qml:105
568+#: qml/Wizard/Pages/70-passwd-type.qml:39
569+msgid "Lock Screen"
570+msgstr ""
571+
572+#: qml/Wizard/Pages/70-passwd-type.qml:101
544msgctxt "Label: Type of security method"
573msgctxt "Label: Type of security method"
545−msgid "Passcode"
574+msgid "Create new password"
546−msgstr "PIN"
575+msgstr ""
547
576
548−#: qml/Wizard/Pages/30-passwd-type.qml:106
577+#: qml/Wizard/Pages/70-passwd-type.qml:103
549−msgctxt "Label: Description of security method"
578+msgctxt "Label: Type of security method"
550−msgid "4 digits only"
579+msgid "Create passcode (numbers only)"
551−msgstr "nur vier Ziffern"
580+msgstr ""
552
581
553−#: qml/Wizard/Pages/30-passwd-type.qml:108
582+#: qml/Wizard/Pages/70-passwd-type.qml:105
554msgctxt "Label: Type of security method"
583msgctxt "Label: Type of security method"
555−msgid "Passphrase"
584+msgid "No lock code"
556−msgstr "Kennwort"
585+msgstr ""
557
586
558−#: qml/Wizard/Pages/30-passwd-type.qml:109
587+#: qml/Wizard/Pages/75-report-check.qml:26 qml/Wizard/Pages/here-terms.qml:108
559−msgctxt "Label: Description of security method"
588+msgid "Privacy Policy"
560−msgid "Numbers and letters"
589+msgstr ""
561−msgstr "Ziffern und Buchstaben"
562
590
563−#: qml/Wizard/Pages/40-wifi.qml:29
591+#: qml/Wizard/Pages/75-report-check.qml:26
564−msgid "Connect to Wi‑Fi"
592+msgid "Help Us Improve"
565−msgstr "Mit WLAN verbinden"
593+msgstr ""
566
594
567−#: qml/Wizard/Pages/40-wifi.qml:168
595+#: qml/Wizard/Pages/75-report-check.qml:59
568−msgid "Available networks…"
596+msgid "Improve system performance by sending us crashes and error reports."
569−msgstr "Verfügbare Netzwerke …"
597+msgstr ""
570
598
571−#: qml/Wizard/Pages/40-wifi.qml:169
599+#: qml/Wizard/Pages/75-report-check.qml:60
572−msgid "No available networks."
600+msgid "Privacy policy"
573−msgstr "Keine verfügbaren Netzwerke."
601+msgstr ""
574
602
575−#: qml/Wizard/Pages/50-location.qml:27
603+#: qml/Wizard/Pages/80-finished.qml:89
576−msgid "Location"
604+msgid "Welcome to Ubuntu"
577−msgstr "Position"
605+msgstr ""
578
606
579−#: qml/Wizard/Pages/50-location.qml:62
607+#: qml/Wizard/Pages/80-finished.qml:104
580−msgid "Let the phone detect your location:"
608+msgid "You are ready to use your device now"
581−msgstr "Dem Telefon erlauben, Ihre Position zu bestimmen:"
609+msgstr ""
582
610
583−#: qml/Wizard/Pages/50-location.qml:69
611+#: qml/Wizard/Pages/80-finished.qml:124
584−msgid "Using GPS only (less accurate)"
612+msgid "Get Started"
585−msgstr "Nur durch GPS (ungenauer)"
613+msgstr ""
586
614
587−#: qml/Wizard/Pages/50-location.qml:86
615+#: qml/Wizard/Pages/here-terms.qml:25
588−msgid "Using GPS, anonymized Wi-Fi and cellular network info (recommended)"
616+msgid "Terms & Conditions"
617+msgstr "Nutzungsbedingungen"
618+
619+#: qml/Wizard/Pages/here-terms.qml:69
620+msgid "Your device uses positioning technologies provided by HERE."
589msgstr ""
621msgstr ""
590−"Durch GPS sowie anonymisierte WLAN- und Mobilfunknetz-Daten (empfohlen)"
591
622
592−#. Translators: HERE is a trademark for Nokia's location service, you probably shouldn't translate it
593−#: qml/Wizard/Pages/50-location.qml:103
623+#: qml/Wizard/Pages/here-terms.qml:81
594msgid ""
624msgid ""
595−"By selecting this option you agree to the Nokia HERE <a href='#'>terms and "
625+"To provide you with positioning services and to improve their quality, HERE "
596−"conditions</a>."
626+"collects information about nearby cell towers and Wi-Fi hotspots around your "
627+"current location whenever your position is being found."
597msgstr ""
628msgstr ""
598−"Mit dem Auswählen dieser Option stimmen Sie den Nokia HERE <a "
599−"href='#'>allgemeinen Geschäftsbedingungen</a> zu."
600
629
601−#: qml/Wizard/Pages/50-location.qml:112
630+#: qml/Wizard/Pages/here-terms.qml:93
602−msgid "Not at all"
631+msgid ""
632+"The information collected is used to analyze the service and to improve the "
633+"use of service, but not to identify you personally."
603−msgstr "Gar nicht"
634+msgstr ""
604
635
605−#: qml/Wizard/Pages/50-location.qml:124
636+#: qml/Wizard/Pages/here-terms.qml:106
606−msgid "You can change your mind later in <b>System Settings</b>."
637+#, qt-format
638+msgid "By continuing, you agree to the HERE platform %1 and %2."
607msgstr ""
639msgstr ""
608−"Sie können Ihre Meinung später in den <b>Systemeinstellungen</b> ändern."
609
640
610−#: qml/Wizard/Pages/60-reporting.qml:26
641+#: qml/Wizard/Pages/here-terms.qml:107
611−msgid "Improving your experience"
642+msgid "Service Terms"
612−msgstr "Verbessert Ihre Erfahrung mit diesem Produkt"
643+msgstr ""
613
644
614−#: qml/Wizard/Pages/60-reporting.qml:46
645+#: qml/Wizard/Pages/passcode-confirm.qml:43
646+#: qml/Wizard/Pages/passcode-desktop.qml:80
615−msgid ""
647+msgid "Confirm passcode"
616−"Your phone is set up to automatically report errors to Canonical and its "
648+msgstr "PIN bestätigen"
617−"partners, the makers of the operating system."
649+
650+#: qml/Wizard/Pages/passcode-confirm.qml:45
651+msgid "Incorrect passcode."
618msgstr ""
652msgstr ""
619−"Ihr Telefon ist so eingestellt, dass es automatisch Fehlerberichte an "
620−"Canonical und seine Partner, die Hersteller des Betriebssystems, sendet."
621
653
622−#: qml/Wizard/Pages/60-reporting.qml:53
654+#: qml/Wizard/Pages/passcode-confirm.qml:45
655+msgctxt "Enter the passcode again"
623−msgid ""
656+msgid "Please re-enter."
624−"This can be disabled in <b>System Settings</b> under <b>Security &amp; "
625−"Privacy</b>"
626msgstr ""
657msgstr ""
627−"Dies kann in den <b>Systemeinstellungen</b> unter <b>Sicherheit &amp; "
628−"Datenschutz</b> deaktiviert werden"
629
658
630−#: qml/Wizard/Pages/80-finished.qml:24
659+#: qml/Wizard/Pages/passcode-desktop.qml:30
631−msgid "All done"
660+msgid "Lock Screen Passcode"
632−msgstr "Alles erledigt"
661+msgstr ""
633
662
634−#: qml/Wizard/Pages/80-finished.qml:39
663+#: qml/Wizard/Pages/passcode-desktop.qml:56
635−msgid "Nice work!"
664+msgid "Enter 4 numbers to setup your passcode"
636−msgstr "Gute Arbeit!"
665+msgstr ""
637
666
638−#: qml/Wizard/Pages/80-finished.qml:46
667+#: qml/Wizard/Pages/passcode-desktop.qml:65
639−msgid "Your device is now ready to use."
668+#: qml/Wizard/Pages/passcode-set.qml:54
640−msgstr "Ihr Gerät ist nun einsatzbereit."
669+msgid "Choose passcode"
670+msgstr ""
641
671
642−#: qml/Wizard/Pages/80-finished.qml:53
672+#: qml/Wizard/Pages/passcode-desktop.qml:105
643−msgid "Finish"
673+msgid "Passcode too short"
644−msgstr "Beenden"
674+msgstr ""
645
675
646−#: qml/Wizard/Pages/here-terms.qml:27
676+#: qml/Wizard/Pages/passcode-desktop.qml:107
647−msgid "Terms & Conditions"
677+msgid "Passcodes match"
648−msgstr "Nutzungsbedingungen"
678+msgstr ""
649
679
650−#: qml/Wizard/Pages/passwd-confirm.qml:49
680+#: qml/Wizard/Pages/passcode-desktop.qml:109
651−msgid "Confirm passphrase"
681+msgid "Passcodes do not match"
652−msgstr "Passwort bestätigen"
682+msgstr ""
653
683
654−#: qml/Wizard/Pages/passwd-confirm.qml:50
684+#: qml/Wizard/Pages/passcode-set.qml:62
655−msgid "Confirm passcode"
685+msgid "Passcode must be 4 characters long"
656−msgstr "PIN bestätigen"
686+msgstr ""
657
687
658−#: qml/Wizard/Pages/passwd-confirm.qml:53
688+#: qml/Wizard/Pages/password-set.qml:30
659−#: qml/Wizard/Pages/passwd-confirm.qml:54
689+msgid "Lock Screen Password"
660−msgid "Please try again."
690+msgstr ""
661−msgstr "Bitte versuchen Sie es erneut."
662
691
663−#: qml/Wizard/Pages/passwd-set.qml:61
692+#: qml/Wizard/Pages/password-set.qml:61
664−msgid "Choose your passcode"
693+msgid "Enter at least 8 characters"
665−msgstr "Wählen Sie Ihre PIN"
694+msgstr ""
666
695
667−#: qml/Wizard/Pages/passwd-set.qml:68
696+#: qml/Wizard/Pages/password-set.qml:73
668−msgid "Passphrase must be 4 characters long"
697+msgid "Choose password"
669−msgstr "Passwörter müssen 4 Buchstaben lang sein"
698+msgstr ""
670
699
671−#. Translators: This is the arrow for "Back" buttons
700+#: qml/Wizard/Pages/password-set.qml:103
672−#: qml/Wizard/StackButton.qml:39
701+msgid "Confirm password"
673−#, qt-format
674−msgid "〈 %1"
675−msgstr "〈 %1"
702+msgstr ""
676
703
677−#. Translators: This is the arrow for "Forward" buttons
704+#: qml/Wizard/Pages/sim.qml:27
705+msgid "No SIM card installed"
706+msgstr ""
707+
708+#: qml/Wizard/Pages/sim.qml:54
709+msgid "SIM card added"
710+msgstr ""
711+
712+#: qml/Wizard/Pages/sim.qml:55
713+msgid "You must restart the device to access the mobile network."
714+msgstr ""
715+
716+#: qml/Wizard/Pages/sim.qml:59
717+msgid "Restart"
718+msgstr "Neustarten"
719+
678−#: qml/Wizard/StackButton.qml:42
720+#: qml/Wizard/Pages/sim.qml:78
679−#, qt-format
721+msgid "You won’t be able to make calls or use text messaging without a SIM."
680−msgid "%1 〉"
722+msgstr ""
723+
724+#: qml/Wizard/Pages/sim.qml:90
725+msgid "To proceed with no SIM tap Skip."
726+msgstr ""
727+
728+#: qml/Wizard/PasswordMeter.qml:87
729+msgid "Passwords match"
730+msgstr ""
731+
732+#: qml/Wizard/PasswordMeter.qml:89
733+msgid "Passwords do not match"
681−msgstr "%1 〉"
734+msgstr ""
735+
736+#: qml/Wizard/PasswordMeter.qml:93
737+msgid "Strong password"
738+msgstr ""
739+
740+#: qml/Wizard/PasswordMeter.qml:95
741+msgid "Fair password"
742+msgstr ""
743+
744+#: qml/Wizard/PasswordMeter.qml:97
745+msgid "Weak password"
746+msgstr ""
747+
748+#: qml/Wizard/PasswordMeter.qml:99
749+msgid "Very weak password"
750+msgstr ""
682
751
683#~ msgid "Confirm"
752#~ msgid "Confirm"
684#~ msgstr "Bestätigen"
753#~ msgstr "Bestätigen"
@@ -771,8 +840,8 @@ msgstr "%1 〉"
771#~ msgid "Settings"
840#~ msgid "Settings"
772#~ msgstr "Einstellungen"
841#~ msgstr "Einstellungen"
773
842
774−#~ msgid "Restart"
843+#~ msgid "Are you sure you want to shut down?"
775−#~ msgstr "Neustarten"
844+#~ msgstr "Sind Sie sicher, dass Sie herunterfahren wollen?"
776
845
777#~ msgid "Unlock SIM"
846#~ msgid "Unlock SIM"
778#~ msgstr "SIM-Karte entsperren"
847#~ msgstr "SIM-Karte entsperren"
@@ -783,15 +852,188 @@ msgstr "%1 〉"
783#~ msgid "Please re-enter"
852#~ msgid "Please re-enter"
784#~ msgstr "Bitte erneut eingeben"
853#~ msgstr "Bitte erneut eingeben"
785
854
855+#~ msgid "Without it, you won’t be able to make calls or use text messaging."
856+#~ msgstr "Ohne SIM funktionieren Anrufe und Nachrichten nicht."
857+
858+#~ msgid "Add a SIM card and restart your device"
859+#~ msgstr "SIM-Karte einlegen und Gerät neustarten"
860+
861+#~ msgid "Hi!"
862+#~ msgstr "Hallo!"
863+
786#~ msgid "Welcome to your Ubuntu phone."
864#~ msgid "Welcome to your Ubuntu phone."
787#~ msgstr "Willkommen zu Ihrem Ubuntu-Telefon."
865#~ msgstr "Willkommen zu Ihrem Ubuntu-Telefon."
788
866
867+#~ msgid "Let’s get started."
868+#~ msgstr "Fangen wir an!"
869+
870+#~ msgid "Continue"
871+#~ msgstr "Weiter"
872+
789#~ msgid "Please select how you’d like to unlock your phone."
873#~ msgid "Please select how you’d like to unlock your phone."
790#~ msgstr "Bitte wählen Sie aus, wie Sie Ihr Telefon entsperren wollen."
874#~ msgstr "Bitte wählen Sie aus, wie Sie Ihr Telefon entsperren wollen."
791
875
876+#~ msgid "Available networks…"
877+#~ msgstr "Verfügbare Netzwerke …"
878+
879+#~ msgid "Improving your experience"
880+#~ msgstr "Verbessert Ihre Erfahrung mit diesem Produkt"
881+
882+#~ msgid "You can change your mind later in <b>System Settings</b>."
883+#~ msgstr ""
884+#~ "Sie können Ihre Meinung später in den <b>Systemeinstellungen</b> ändern."
885+
886+#~ msgid ""
887+#~ "By selecting this option you agree to the Nokia HERE <a href='#'>terms and "
888+#~ "conditions</a>."
889+#~ msgstr ""
890+#~ "Mit dem Auswählen dieser Option stimmen Sie den Nokia HERE <a "
891+#~ "href='#'>allgemeinen Geschäftsbedingungen</a> zu."
892+
893+#~ msgid "Not at all"
894+#~ msgstr "Gar nicht"
895+
896+#~ msgid ""
897+#~ "Your phone is set up to automatically report errors to Canonical and its "
898+#~ "partners, the makers of the operating system."
899+#~ msgstr ""
900+#~ "Ihr Telefon ist so eingestellt, dass es automatisch Fehlerberichte an "
901+#~ "Canonical und seine Partner, die Hersteller des Betriebssystems, sendet."
902+
903+#~ msgid "No available networks."
904+#~ msgstr "Keine verfügbaren Netzwerke."
905+
906+#~ msgid "Location"
907+#~ msgstr "Position"
908+
909+#~ msgid "Let the phone detect your location:"
910+#~ msgstr "Dem Telefon erlauben, Ihre Position zu bestimmen:"
911+
912+#~ msgid "Using GPS only (less accurate)"
913+#~ msgstr "Nur durch GPS (ungenauer)"
914+
915+#~ msgid "Using GPS, anonymized Wi-Fi and cellular network info (recommended)"
916+#~ msgstr ""
917+#~ "Durch GPS sowie anonymisierte WLAN- und Mobilfunknetz-Daten (empfohlen)"
918+
919+#~ msgid "Nice work!"
920+#~ msgstr "Gute Arbeit!"
921+
792#~ msgid "Your phone is now ready to use."
922#~ msgid "Your phone is now ready to use."
793#~ msgstr "Ihr Telefon ist nun einsatzbereit."
923#~ msgstr "Ihr Telefon ist nun einsatzbereit."
794
924
925+#~ msgid "Confirm passphrase"
926+#~ msgstr "Passwort bestätigen"
927+
928+#~ msgid "Choose your passcode"
929+#~ msgstr "Wählen Sie Ihre PIN"
930+
931+#~ msgid "Please try again."
932+#~ msgstr "Bitte versuchen Sie es erneut."
933+
934+#, qt-format
935+#~ msgid "〈 %1"
936+#~ msgstr "〈 %1"
937+
938+#, qt-format
939+#~ msgid "%1 〉"
940+#~ msgstr "%1 〉"
941+
942+#~ msgid "Passphrase must be 4 characters long"
943+#~ msgstr "Passwörter müssen 4 Buchstaben lang sein"
944+
945+#~ msgid "Lock security"
946+#~ msgstr "Sicherheit nach dem Sperren"
947+
948+#~ msgid ""
949+#~ "This can be disabled in <b>System Settings</b> under <b>Security &amp; "
950+#~ "Privacy</b>"
951+#~ msgstr ""
952+#~ "Dies kann in den <b>Systemeinstellungen</b> unter <b>Sicherheit &amp; "
953+#~ "Datenschutz</b> deaktiviert werden"
954+
955+#~ msgid "All done"
956+#~ msgstr "Alles erledigt"
957+
958+#~ msgid "Finish"
959+#~ msgstr "Beenden"
960+
961+#~ msgid "Try again."
962+#~ msgstr "Versuchen Sie es noch einmal."
963+
964+#~ msgid "This action does different things for different apps"
965+#~ msgstr ""
966+#~ "Diese Aktion bewirkt verschiedene Dinge in verschiedenen Anwendungen."
967+
968+#~ msgid "View all your running tasks."
969+#~ msgstr "Sehen Sie alle Ihre laufenden Anwendungen."
970+
971+#~ msgid "Open special menus"
972+#~ msgstr "Spezielle Menüs öffnen"
973+
974+#~ msgid "You almost got it!"
975+#~ msgstr "Fast geschafft!"
976+
977+#~ msgid "To view open apps"
978+#~ msgstr "Zum Ansehen offener Anwendungen"
979+
980+#~ msgid "Tap here to finish."
981+#~ msgstr "Zum Beenden hier tippen."
982+
983+#~ msgid "Tap here to continue."
984+#~ msgstr "Zum Fortfahren hier tippen."
985+
986+#~ msgid "Long swipe from the right edge."
987+#~ msgstr "Langer Wisch von der rechten Bildschirmkante."
988+
989+#~ msgid "Short swipe from the left edge."
990+#~ msgstr "Kurzer Wisch von der linken Bildschirmkante."
991+
992+#~ msgid "Open the launcher"
993+#~ msgstr "Öffnen Sie den Starter."
994+
995+#~ msgid "These are the shortcuts to favorite apps"
996+#~ msgstr "Dies sind die Verknüpfungen zu Ihren favorisierten Anwendungen."
997+
998+#~ msgid "Swipe up from the bottom edge."
999+#~ msgstr "Wischen Sie von der unteren Bildschirmkante nach oben."
1000+
1001+#~ msgctxt "Button: Shut down the system"
1002+#~ msgid "Shut down"
1003+#~ msgstr "Ausschalten"
1004+
1005+#~ msgctxt "Title: Reboot/Shut down dialog"
1006+#~ msgid "Shut down"
1007+#~ msgstr "Ausschalten"
1008+
1009+#~ msgctxt "Label: Description of security method"
1010+#~ msgid "No security"
1011+#~ msgstr "Keine Sicherheitssperre"
1012+
1013+#~ msgctxt "Label: Type of security method"
1014+#~ msgid "Swipe"
1015+#~ msgstr "Wischen"
1016+
1017+#~ msgctxt "Label: Description of security method"
1018+#~ msgid "4 digits only"
1019+#~ msgstr "nur vier Ziffern"
1020+
1021+#~ msgctxt "Label: Type of security method"
1022+#~ msgid "Passcode"
1023+#~ msgstr "PIN"
1024+
1025+#~ msgctxt "Label: Type of security method"
1026+#~ msgid "Passphrase"
1027+#~ msgstr "Kennwort"
1028+
1029+#~ msgctxt "Label: Description of security method"
1030+#~ msgid "Numbers and letters"
1031+#~ msgstr "Ziffern und Buchstaben"
1032+
1033+#~ msgctxt "Button: Reboot the system"
1034+#~ msgid "Reboot"
1035+#~ msgstr "Neustarten"
1036+
795#~ msgid "%a %H:%M"
1037#~ msgid "%a %H:%M"
796#~ msgstr "%a %k:%M"
1038#~ msgstr "%a %k:%M"
797
1039
@@ -825,14 +1067,11 @@ msgstr "%1 〉"
825#~ msgid "Call back"
1067#~ msgid "Call back"
826#~ msgstr "Zurückrufen"
1068#~ msgstr "Zurückrufen"
827
1069
828−#~ msgid "Re-dock, save your work and close these apps to continue."
1070+#~ msgid "Your device is now ready to use."
829−#~ msgstr ""
1071+#~ msgstr "Ihr Gerät ist nun einsatzbereit."
830−#~ "Wieder andocken, Änderungen speichern und die Anwendungen zum Fortfahren "
831−#~ "schließen"
832
1072
833−#~ msgid ""
1073+#~ msgid "Welcome to your Ubuntu device."
834−#~ "Your device is now connected to an external display. Use this screen as a "
1074+#~ msgstr "Willkommen auf Ihrem Ubuntu-Gerät."
835−#~ "touch pad to interact with the mouse."
1075+
836−#~ msgstr ""
1076+#~ msgid "Please select how you’d like to unlock your device."
837−#~ "Ihr Gerät ist nun mit einer externen Anzeige verbunden. Benutzen Sie diesen "
1077+#~ msgstr "Bitte wählen Sie, wie Sie dieses Gerät entsperren möchten."
838−#~ "Bildschirm als Touchpad zur Steuerung des Mauszeigers."
po/el.po+479−237

This diff is too big to show here.

po/en_AU.po+476−244

This diff is too big to show here.

po/en_GB.po+489−246

This diff is too big to show here.

po/eo.po+303−191

This diff is too big to show here.

po/es.po+481−220

This diff is too big to show here.

po/eu.po+476−234

This diff is too big to show here.

po/fa.po+486−246

This diff is too big to show here.

po/fi.po+486−247

This diff is too big to show here.

po/fo.po+258−180

This diff is too big to show here.

po/fr.po+493−252

This diff is too big to show here.

po/ga.po+461−232

This diff is too big to show here.

po/gd.po+492−249

This diff is too big to show here.

po/gl.po+490−247

This diff is too big to show here.

po/gv.po+261−183

This diff is too big to show here.

po/he.po+401−212

This diff is too big to show here.

po/hi.po+258−180

This diff is too big to show here.

po/hr.po+489−242

This diff is too big to show here.

po/hu.po+485−223

This diff is too big to show here.

po/hy.po+261−183

This diff is too big to show here.

po/ia.po+488−239

This diff is too big to show here.

po/id.po+261−183

This diff is too big to show here.

po/is.po+261−183

This diff is too big to show here.

po/it.po+490−240

This diff is too big to show here.

po/ja.po+273−183

This diff is too big to show here.

po/km.po+333−197

This diff is too big to show here.

po/kn.po+258−180

This diff is too big to show here.

po/ko.po+485−242

This diff is too big to show here.

po/ku.po+261−180

This diff is too big to show here.

po/ky.po+258−180

This diff is too big to show here.

po/lo.po+258−180

This diff is too big to show here.

po/lt.po+258−180

This diff is too big to show here.

po/lv.po+474−232

This diff is too big to show here.

po/ml.po+258−180

This diff is too big to show here.

po/mr.po+258−180

This diff is too big to show here.

po/ms.po+476−237

This diff is too big to show here.

po/my.po+266−181

This diff is too big to show here.

po/nb.po+486−247

This diff is too big to show here.

po/ne.po+258−180

This diff is too big to show here.

po/nl.po+497−241

This diff is too big to show here.

po/nn.po+258−180

This diff is too big to show here.

po/oc.po+258−180

This diff is too big to show here.

po/or.po+258−180

This diff is too big to show here.

po/pa.po+476−234

This diff is too big to show here.

po/pl.po+492−251

This diff is too big to show here.

po/pt.po+495−251

This diff is too big to show here.

po/pt_BR.po+476−234

This diff is too big to show here.

po/ro.po+478−236

This diff is too big to show here.

po/ru.po+476−239

This diff is too big to show here.

po/shn.po+258−180

This diff is too big to show here.

po/si.po+261−183

This diff is too big to show here.

po/sk.po+488−234

This diff is too big to show here.

po/sl.po+477−247

This diff is too big to show here.

po/sq.po+395−210

This diff is too big to show here.

po/sr.po+500−249

This diff is too big to show here.

po/sv.po+497−253

This diff is too big to show here.

po/sw.po+409−214

This diff is too big to show here.

po/ta.po+258−180

This diff is too big to show here.

po/te.po+258−180

This diff is too big to show here.

po/th.po+258−180

This diff is too big to show here.

po/tr.po+477−235

This diff is too big to show here.

po/ug.po+458−230

This diff is too big to show here.

po/uk.po+491−247

This diff is too big to show here.

po/unity8.pot+256−178

This diff is too big to show here.

po/ur.po+258−180

This diff is too big to show here.

po/uz.po+258−180

This diff is too big to show here.

po/vi.po+258−180

This diff is too big to show here.

po/wo.po+476−234

This diff is too big to show here.

po/xh.po+258−180

This diff is too big to show here.

po/zh_CN.po+483−237

This diff is too big to show here.

po/zh_HK.po+258−180

This diff is too big to show here.

po/zh_TW.po+484−236

This diff is too big to show here.

qml/Components/Dialogs.qml+6−47

This diff is too big to show here.

qml/Components/InputMethod.qml+4−1

This diff is too big to show here.

qml/Components/Showable.qml+10

This diff is too big to show here.

qml/Components/Unity8Settings.qmldeleted−50

This diff is too big to show here.

qml/Dash/DashContent.qml+2−2

This diff is too big to show here.

qml/Dash/DashNavigation.qml+159−78

This diff is too big to show here.

qml/Dash/DashNavigationButton.qmldeleted−233

This diff is too big to show here.

qml/Dash/DashNavigationHeader.qmlnew file+73

This diff is too big to show here.

qml/Dash/DashNavigationList.qml+33−85

This diff is too big to show here.

qml/Dash/DashPageHeader.qml+140−131

This diff is too big to show here.

qml/Dash/Filters/FilterOptionSelector.qmlnew file+91

This diff is too big to show here.

qml/Dash/Filters/FilterRangeInput.qmlnew file+136

This diff is too big to show here.

qml/Dash/Filters/FilterValueSlider.qmlnew file+87

This diff is too big to show here.

qml/Dash/Filters/FilterWidget.qmlnew file+29

This diff is too big to show here.

qml/Dash/Filters/FilterWidgetFactory.qmlnew file+80

This diff is too big to show here.

qml/Dash/FiltersPopover.qmlnew file+105

This diff is too big to show here.

qml/Dash/GenericScopeView.qml+77−47

This diff is too big to show here.

qml/Dash/PageHeaderExtraPanel.qmlnew file+176

This diff is too big to show here.

qml/Greeter/Greeter.qml+17−6

This diff is too big to show here.

qml/Launcher/Launcher.qml+2−3

This diff is too big to show here.

qml/OrientedShell.qml+27−17

This diff is too big to show here.

qml/Panel/IndicatorItemRow.qml+5−2

This diff is too big to show here.

qml/Panel/Indicators/MenuItemFactory.qml+16−3

This diff is too big to show here.

qml/Panel/IndicatorsMenu.qml−2

This diff is too big to show here.

qml/Shell.qml+84−53

This diff is too big to show here.

qml/Stages/AbstractStage.qml+5−1

This diff is too big to show here.

qml/Stages/ApplicationWindow.qml+7−3

This diff is too big to show here.

qml/Stages/DesktopStage.qml+75−12

This diff is too big to show here.

qml/Stages/PhoneStage.qml+15−6

This diff is too big to show here.

qml/Stages/SideStage.qmlnew file+118

This diff is too big to show here.

qml/Stages/SpreadDelegate.qml+11−1

This diff is too big to show here.

qml/Stages/StagedFullscreenPolicy.qmlnew file+58

This diff is too big to show here.

qml/Stages/SurfaceContainer.qml+14

This diff is too big to show here.

qml/Stages/TabletSideStageTouchGesture.qmlnew file+154

This diff is too big to show here.

qml/Stages/TabletStage.qml+405−172

This diff is too big to show here.

qml/Stages/TransformedTabletSpreadDelegate.qml+84−56

This diff is too big to show here.

qml/Stages/WindowResizeArea.qml+2−2

This diff is too big to show here.

qml/Stages/WindowedFullscreenPolicy.qmlnew file+41

This diff is too big to show here.

qml/Stages/graphics/sidestage_drag.svgnew file+207

This diff is too big to show here.

qml/Stages/graphics/sidestage_open.svgnew file+181

This diff is too big to show here.

qml/Tutorial/Arrow.qmldeleted−56

This diff is too big to show here.

qml/Tutorial/InactivityTimer.qmlnew file+62

This diff is too big to show here.

qml/Tutorial/Slider.qmldeleted−123

This diff is too big to show here.

qml/Tutorial/Tutorial.qml+39−14

This diff is too big to show here.

qml/Tutorial/TutorialBottom.qml+86−66

This diff is too big to show here.

qml/Tutorial/TutorialBottomFinish.qmldeleted−41

This diff is too big to show here.

qml/Tutorial/TutorialContent.qml+227−55

This diff is too big to show here.

qml/Tutorial/TutorialLeft.qml+21−68

This diff is too big to show here.

qml/Tutorial/TutorialLeftLong.qmlnew file+54

This diff is too big to show here.

qml/Tutorial/TutorialPage.qml+62−186

This diff is too big to show here.

qml/Tutorial/TutorialRight.qml+30−192

This diff is too big to show here.

qml/Tutorial/TutorialTop.qmlnew file+61

This diff is too big to show here.

qml/Tutorial/graphics/arrow.svgnew file+19

This diff is too big to show here.

qml/Tutorial/graphics/background1.pngnew file

Binary file not shown.

qml/Tutorial/graphics/background2.pngnew file

Binary file not shown.

qml/Tutorial/graphics/camera.pngdeleted

Binary file not shown.

qml/Tutorial/graphics/chevron.pngdeleted

Binary file not shown.

qml/Tutorial/graphics/dialer.pngdeleted

Binary file not shown.

qml/Tutorial/graphics/facebook.pngdeleted

Binary file not shown.

qml/Tutorial/graphics/gallery.pngdeleted

Binary file not shown.

qml/Tutorial/graphics/tick.pngdeleted

Binary file not shown.

qml/Wizard/CheckableSetting.qml+11−3

This diff is too big to show here.

qml/Wizard/Page.qml+261−44

This diff is too big to show here.

qml/Wizard/Pages.qml+75−31

This diff is too big to show here.

qml/Wizard/Pages/10-welcome.qml+128−48

This diff is too big to show here.

qml/Wizard/Pages/20-sim.qmldeleted−77

This diff is too big to show here.

qml/Wizard/Pages/30-passwd-type.qmldeleted−140

This diff is too big to show here.

qml/Wizard/Pages/30-wifi.qmlnew file+210

This diff is too big to show here.

qml/Wizard/Pages/40-location.qmlnew file+290

This diff is too big to show here.

qml/Wizard/Pages/40-wifi.qmldeleted−219

This diff is too big to show here.

qml/Wizard/Pages/50-location.qmldeleted−150

This diff is too big to show here.

qml/Wizard/Pages/50-timezone.qmlnew file+275

This diff is too big to show here.

qml/Wizard/Pages/60-reporting.qml → qml/Wizard/Pages/60-account.qmlrenamed+30−20

This diff is too big to show here.

qml/Wizard/Pages/70-passwd-type.qmlnew file+166

This diff is too big to show here.

qml/Wizard/Pages/75-report-check.qmlnew file+91

This diff is too big to show here.

qml/Wizard/Pages/80-finished.qml+94−16

This diff is too big to show here.

qml/Wizard/Pages/data/Desktop_header_bkg.pngnew file

Binary file not shown.

qml/Wizard/Pages/data/Desktop_splash_screen_bkg.pngnew file

Binary file not shown.

qml/Wizard/Pages/data/Phone_header_bkg.pngnew file

Binary file not shown.

qml/Wizard/Pages/data/Phone_splash_screen_bkg.pngnew file

Binary file not shown.

qml/Wizard/Pages/data/Tick@30.pngnew file

Binary file not shown.

qml/Wizard/Pages/data/meet_ubuntu_simcard@30.pngdeleted

Binary file not shown.

qml/Wizard/Pages/data/timezonemap/map.pngnew file

Binary file not shown.

qml/Wizard/Pages/data/timezonemap/pin.pngnew file

Binary file not shown.

qml/Wizard/Pages/data/timezonemap/timezone_-1.pngnew file

Binary file not shown.

qml/Wizard/Pages/data/timezonemap/timezone_-10.pngnew file

Binary file not shown.

qml/Wizard/Pages/data/timezonemap/timezone_-11.pngnew file

Binary file not shown.

qml/Wizard/Pages/data/timezonemap/timezone_-2.pngnew file

Binary file not shown.

qml/Wizard/Pages/data/timezonemap/timezone_-3.5.pngnew file

Binary file not shown.

qml/Wizard/Pages/data/timezonemap/timezone_-3.pngnew file

Binary file not shown.

qml/Wizard/Pages/data/timezonemap/timezone_-4.5.pngnew file

Binary file not shown.

qml/Wizard/Pages/data/timezonemap/timezone_-4.pngnew file

Binary file not shown.

qml/Wizard/Pages/data/timezonemap/timezone_-5.pngnew file

Binary file not shown.

qml/Wizard/Pages/data/timezonemap/timezone_-6.pngnew file

Binary file not shown.

qml/Wizard/Pages/data/timezonemap/timezone_-7.pngnew file

Binary file not shown.

qml/Wizard/Pages/data/timezonemap/timezone_-8.pngnew file

Binary file not shown.

qml/Wizard/Pages/data/timezonemap/timezone_-9.5.pngnew file

Binary file not shown.

qml/Wizard/Pages/data/timezonemap/timezone_-9.pngnew file

Binary file not shown.

qml/Wizard/Pages/data/timezonemap/timezone_0.pngnew file

Binary file not shown.

qml/Wizard/Pages/data/timezonemap/timezone_1.pngnew file

Binary file not shown.

qml/Wizard/Pages/data/timezonemap/timezone_10.5.pngnew file

Binary file not shown.

qml/Wizard/Pages/data/timezonemap/timezone_10.pngnew file

Binary file not shown.

qml/Wizard/Pages/data/timezonemap/timezone_11.pngnew file

Binary file not shown.

qml/Wizard/Pages/data/timezonemap/timezone_12.75.pngnew file

Binary file not shown.

qml/Wizard/Pages/data/timezonemap/timezone_12.pngnew file

Binary file not shown.

qml/Wizard/Pages/data/timezonemap/timezone_13.pngnew file

Binary file not shown.

qml/Wizard/Pages/data/timezonemap/timezone_2.pngnew file

Binary file not shown.

qml/Wizard/Pages/data/timezonemap/timezone_3.5.pngnew file

Binary file not shown.

qml/Wizard/Pages/data/timezonemap/timezone_3.pngnew file

Binary file not shown.

qml/Wizard/Pages/data/timezonemap/timezone_4.5.pngnew file

Binary file not shown.

qml/Wizard/Pages/data/timezonemap/timezone_4.pngnew file

Binary file not shown.

qml/Wizard/Pages/data/timezonemap/timezone_5.5.pngnew file

Binary file not shown.

qml/Wizard/Pages/data/timezonemap/timezone_5.75.pngnew file

Binary file not shown.

qml/Wizard/Pages/data/timezonemap/timezone_5.pngnew file

Binary file not shown.

qml/Wizard/Pages/data/timezonemap/timezone_6.5.pngnew file

Binary file not shown.

qml/Wizard/Pages/data/timezonemap/timezone_6.pngnew file

Binary file not shown.

qml/Wizard/Pages/data/timezonemap/timezone_7.pngnew file

Binary file not shown.

qml/Wizard/Pages/data/timezonemap/timezone_8.5.pngnew file

Binary file not shown.

qml/Wizard/Pages/data/timezonemap/timezone_8.pngnew file

Binary file not shown.

qml/Wizard/Pages/data/timezonemap/timezone_9.5.pngnew file

Binary file not shown.

qml/Wizard/Pages/data/timezonemap/timezone_9.pngnew file

Binary file not shown.

qml/Wizard/Pages/here-terms.qml+71−66

This diff is too big to show here.

qml/Wizard/Pages/passwd-confirm.qml → qml/Wizard/Pages/passcode-confirm.qmlrenamed+13−30

This diff is too big to show here.

qml/Wizard/Pages/passcode-desktop.qmlnew file+132

This diff is too big to show here.

qml/Wizard/Pages/passwd-set.qml → qml/Wizard/Pages/passcode-set.qmlrenamed+13−29

This diff is too big to show here.

qml/Wizard/Pages/password-set.qmlnew file+149

This diff is too big to show here.

qml/Wizard/Pages/sim.qmlnew file+108

This diff is too big to show here.

qml/Wizard/PasswordMeter.qmlnew file+106

This diff is too big to show here.

qml/Wizard/StackButton.qml+7−12

This diff is too big to show here.

qml/Wizard/Wizard.qml−9

This diff is too big to show here.

qml/Tutorial/TutorialLeftFinish.qml → qml/Wizard/WizardTextField.qmlrenamed+5−21

This diff is too big to show here.

src/MouseTouchAdaptor.cpp+53−9

This diff is too big to show here.

src/MouseTouchAdaptor.h+5−3

This diff is too big to show here.

tests/autopilot/unity8/shell/emulators.py−2

This diff is too big to show here.

tests/autopilot/unity8/shell/tests/test_tutorial.pydeleted−57

This diff is too big to show here.

tests/autopilot/unity8/tutorial.pydeleted−73

This diff is too big to show here.

tests/libs/UbuntuGestures/tst_TouchRegistry.cpp+59

This diff is too big to show here.

tests/mocks/AccountsService/AccountsService.cpp+60−3

This diff is too big to show here.

tests/mocks/AccountsService/AccountsService.h+30−5

This diff is too big to show here.

tests/mocks/AccountsService/AccountsService.qmltypes+5

This diff is too big to show here.

tests/mocks/MeeGo/QOfono/MockOfonoSimManager.qml+1

This diff is too big to show here.

tests/mocks/QMenuModel/QDBusActionGroup.qml+5−5

This diff is too big to show here.

tests/mocks/Ubuntu/Connectivity/plugin.cpp+1

This diff is too big to show here.

tests/mocks/Ubuntu/SystemSettings/CMakeLists.txt+2

This diff is too big to show here.

tests/mocks/Ubuntu/SystemSettings/Diagnostics/CMakeLists.txtnew file+1

This diff is too big to show here.

qml/Tutorial/Tick.qml → tests/mocks/Ubuntu/SystemSettings/Diagnostics/MockDiagnostics.qmlrenamed+4−9

This diff is too big to show here.

tests/mocks/Ubuntu/SystemSettings/Diagnostics/qmldirnew file+2

This diff is too big to show here.

tests/mocks/Ubuntu/SystemSettings/LanguagePlugin/MockKeyboardPlugin.qmlnew file+21

This diff is too big to show here.

tests/mocks/Ubuntu/SystemSettings/LanguagePlugin/MockLanguagePlugin.qml+2−2

This diff is too big to show here.

tests/mocks/Ubuntu/SystemSettings/LanguagePlugin/qmldir+1

This diff is too big to show here.

tests/mocks/Ubuntu/SystemSettings/SecurityPrivacy/MockSecurityPrivacy.cpp+1−1

This diff is too big to show here.

tests/mocks/Ubuntu/SystemSettings/TimeDate/CMakeLists.txtnew file+1

This diff is too big to show here.

tests/mocks/Ubuntu/SystemSettings/TimeDate/MockTimeDate.qmlnew file+25

This diff is too big to show here.

tests/mocks/Ubuntu/SystemSettings/TimeDate/qmldirnew file+2

This diff is too big to show here.

tests/mocks/Unity/Application/ApplicationInfo.cpp+21−3

This diff is too big to show here.

tests/mocks/Unity/Application/ApplicationInfo.h+6−2

This diff is too big to show here.

tests/mocks/Unity/Application/ApplicationManager.cpp+13−26

This diff is too big to show here.

tests/mocks/Unity/Application/ApplicationManager.h−8

This diff is too big to show here.

tests/mocks/Unity/Application/MirSurface.cpp+32

This diff is too big to show here.

tests/mocks/Unity/Application/MirSurface.h+10−3

This diff is too big to show here.

tests/mocks/Unity/Application/MirSurfaceItem.cpp+28−5

This diff is too big to show here.

tests/mocks/Unity/Application/MirSurfaceItem.h+2

This diff is too big to show here.

tests/mocks/Unity/Application/Session.cpp+26−1

This diff is too big to show here.

tests/mocks/Unity/Application/Session.h+7

This diff is too big to show here.

tests/mocks/Unity/Application/resources/MirSurfaceItem.qml+59

This diff is too big to show here.

tests/mocks/Unity/CMakeLists.txt+14−1

This diff is too big to show here.

tests/mocks/Unity/Indicators/ModelActionRootState.qml+26−4

This diff is too big to show here.

tests/mocks/Unity/fake_filters.cppnew file+125

This diff is too big to show here.

tests/mocks/Unity/fake_filters.hnew file+46

This diff is too big to show here.

tests/mocks/Unity/fake_navigation.cpp+9−10

This diff is too big to show here.

tests/mocks/Unity/fake_optionselectorfilter.cppnew file+65

This diff is too big to show here.

tests/mocks/Unity/fake_optionselectorfilter.hnew file+52

This diff is too big to show here.

tests/mocks/Unity/fake_optionselectoroptions.cppnew file+77

This diff is too big to show here.

tests/mocks/Unity/fake_optionselectoroptions.hnew file+47

This diff is too big to show here.

tests/mocks/Unity/fake_rangeinputfilter.cppnew file+167

This diff is too big to show here.

tests/mocks/Unity/fake_rangeinputfilter.hnew file+79

This diff is too big to show here.

tests/mocks/Unity/fake_scope.cpp+52−27

This diff is too big to show here.

tests/mocks/Unity/fake_scope.h+20−7

This diff is too big to show here.

tests/mocks/Unity/fake_unity_plugin.cpp+7

This diff is too big to show here.

tests/mocks/Unity/fake_valuesliderfilter.cppnew file+84

This diff is too big to show here.

tests/mocks/Unity/fake_valuesliderfilter.hnew file+55

This diff is too big to show here.

tests/mocks/Unity/fake_valueslidervalues.cppnew file+51

This diff is too big to show here.

tests/mocks/Unity/fake_valueslidervalues.hnew file+36

This diff is too big to show here.

tests/mocks/Utils/CMakeLists.txt+3−2

This diff is too big to show here.

tests/mocks/Utils/Utils.qmltypes+2−2

This diff is too big to show here.

tests/mocks/Utils/plugin.cpp+14−2

This diff is too big to show here.

tests/mocks/Utils/windowstatestorage.cpp+13

This diff is too big to show here.

tests/mocks/Utils/windowstatestorage.h+4

This diff is too big to show here.

tests/mocks/Wizard/CMakeLists.txt+6−1

This diff is too big to show here.

tests/mocks/Wizard/MockSystem.cpp+4−2

This diff is too big to show here.

tests/mocks/Wizard/MockSystem.h+2−2

This diff is too big to show here.

tests/mocks/Wizard/mockplugin.cpp+7−8

This diff is too big to show here.

tests/plugins/AccountsService/PropertiesServer.cpp+10

This diff is too big to show here.

tests/plugins/AccountsService/PropertiesServer.h−1

This diff is too big to show here.

tests/plugins/AccountsService/client.cpp+67

This diff is too big to show here.

tests/plugins/Dash/tst_ScopeStyle.qml+1−1

This diff is too big to show here.

tests/plugins/Ubuntu/Gestures/CMakeLists.txt+7−1

This diff is too big to show here.

tests/plugins/Ubuntu/Gestures/GestureTest.cpp+44

This diff is too big to show here.

tests/plugins/Ubuntu/Gestures/GestureTest.h+13−1

This diff is too big to show here.

tests/plugins/Ubuntu/Gestures/tst_DirectionalDragArea.cpp−56

This diff is too big to show here.

tests/plugins/Ubuntu/Gestures/tst_TouchGestureArea.cppnew file+270

This diff is too big to show here.

tests/plugins/Ubuntu/Gestures/tst_TouchGestureArea.qmlnew file+90

This diff is too big to show here.

tests/plugins/Unity/Launcher/launchermodeltest.cpp+1

This diff is too big to show here.

tests/qmltests/CMakeLists.txt+4

This diff is too big to show here.

tests/qmltests/Components/tst_PhysicalKeysMapper.qml+3−3

This diff is too big to show here.

tests/qmltests/Dash/Filters/tst_FilterOptionSelector.qmlnew file+96

This diff is too big to show here.

tests/qmltests/Dash/Filters/tst_FilterRangeInput.qmlnew file+247

This diff is too big to show here.

tests/qmltests/Dash/Filters/tst_FilterValueSlider.qmlnew file+101

This diff is too big to show here.

tests/qmltests/Dash/Filters/tst_FilterWidgetFactory.qmlnew file+58

This diff is too big to show here.

tests/qmltests/Dash/Previews/tst_Preview.qml+1

This diff is too big to show here.

tests/qmltests/Dash/tst_DashContent.qml+165−152

This diff is too big to show here.

tests/qmltests/Dash/tst_DashPageHeader.qml+24−15

This diff is too big to show here.

tests/qmltests/Dash/tst_GenericScopeView.qml+3−3

This diff is too big to show here.

tests/qmltests/Greeter/tst_Greeter.qml+7−1

This diff is too big to show here.

tests/qmltests/Stages/tst_DesktopStage.qml−2

This diff is too big to show here.

tests/qmltests/Stages/tst_TabletStage.qml+143

This diff is too big to show here.

tests/qmltests/Stages/tst_WindowResizeArea.qml+7

This diff is too big to show here.

tests/qmltests/Tutorial/tst_Tutorial.qml+611−193

This diff is too big to show here.

tests/qmltests/Wizard/tst_Wizard.qml+126−214

This diff is too big to show here.

tests/qmltests/tst_OrientedShell.qml+126−15

This diff is too big to show here.

tests/qmltests/tst_Shell.qml+129−8

This diff is too big to show here.

tests/qmltests/tst_ShellWithPin.qml−22

This diff is too big to show here.

tests/utils/modules/Unity/Test/UnityTestCase.qml+67−11

This diff is too big to show here.