git.iko.soy/unity8
on xenial help sign in
Merge from trunk
9104147Michael Terry
debian/changelog+83
compare with xenial
unifiedsplit
@@ -1,3 +1,86 @@
1+unity8 (8.00+14.10.20140825.3-0ubuntu1) utopic; urgency=low
2+
3+ [ Daniel d'Andrada ]
4+ * SpreadDelegate - properly transition between splash screen, surface
5+ and screenshot
6+
7+ [ Michał Sawicz ]
8+ * Rename Ubuntu.Connectivity to Unity.Connectivity to avoid name clash
9+
10+ -- Ubuntu daily release <ps-jenkins@lists.canonical.com> Mon, 25 Aug 2014 13:10:57 +0000
11+
12+unity8 (8.00+14.10.20140822-0ubuntu1) utopic; urgency=low
13+
14+ [ Albert Astals ]
15+ * More stable dash overview tests
16+ * PreviewExpandable: "widgets" is a model, not an array
17+
18+ [ Alberto Aguirre ]
19+ * Proxy inactivity timeout values from gsettings into Unity.Screen
20+ (LP: #1230345)
21+
22+ [ Gerry Boland ]
23+ * Cancel open PAM interactions on shutdown - fixes hang on logout on
24+ desktop (LP: #1353041)
25+
26+ [ Diego Sarmentero ]
27+ * Show progress bar on payment button click The payment process has a
28+ small delay before the UI comes up which might cause confusion. Show
29+ a progress bar with unknown value to indicate activity. (LP:
30+ #1354139)
31+
32+ [ Mirco Müller ]
33+ * Made notification qml-test pass again by using Component.onCompleted
34+ instead of onOpacityChanged for the time being.
35+
36+ [ Michael Zanetti ]
37+ * Implement new lockscreen designs
38+
39+ [ Michael Terry ]
40+ * Show the SIM unlock dialog immediately after booting, and enable its
41+ emergency call button.
42+ * Always keep indicator/launcher locked state in sync with whether the
43+ user is authenticated. (LP:# 1357230) (LP: #1357230)
44+ * Allow logging into a desktop or tablet session again, by properly
45+ dismissing old PAM conversations. (LP: #1350878) In a desktop or
46+ tablet, we were accidentally starting two PAM conversations in
47+ sequence on startup. Which is a small bug; it shouldn't normally be
48+ a problem, since each new PAM conversation should kill the old
49+ one.But the way we were killing the old one was subject to a thread
50+ race condition. See, a PAM conversation thread won't exit until all
51+ its prompts are answered. And what we do when we kill a PAM
52+ conversation is to answer all prompts with empty strings.But it's
53+ possible that when we want to kill a PAM conversation that it hasn't
54+ actually gotten to the point of prompting us yet. And when those
55+ prompts do come through, we were treating them as prompts for the
56+ new PAM conversation.So I've changed the PAM conversation logic to
57+ include a pam_handle and compare the handle with the current handle
58+ when being prompted. If it's an old handle, we just dismiss the
59+ prompt with an empty string response.Oh, and I fixed the bug that
60+ caused two prompts on startup in the first place. (But we still need
61+ the above logic anyway, for when you switch users quickly.) (LP:
62+ #1350878)
63+
64+ [ Martin Pitt ]
65+ * Mark for using language packs.
66+
67+ -- Ubuntu daily release <ps-jenkins@lists.canonical.com> Fri, 22 Aug 2014 09:29:41 +0000
68+
69+unity8 (8.00+14.10.20140820-0ubuntu1) utopic; urgency=low
70+
71+ [ CI bot ]
72+ * Resync trunk
73+
74+ [ Nick Dedekind ]
75+ * Fixed CachedUnityMenuModel destruction unhinging indicators. (LP:
76+ #1328646)
77+
78+ [ Mirco Müller ]
79+ * Temporarily disable any opacity-animation for notifications to
80+ unblock the train due to LP: 1354406. (LP: #1354406)
81+
82+ -- Ubuntu daily release <ps-jenkins@lists.canonical.com> Wed, 20 Aug 2014 20:03:55 +0000
83+
1unity8 (8.00+14.10.20140817-0ubuntu1) utopic; urgency=low
84unity8 (8.00+14.10.20140817-0ubuntu1) utopic; urgency=low
2
85
3 [ CI bot ]
86 [ CI bot ]
debian/control+5−4
@@ -24,7 +24,7 @@ Build-Depends: cmake,
24 libpulse-dev,
24 libpulse-dev,
25 libqmenumodel-dev (>= 0.2.8),
25 libqmenumodel-dev (>= 0.2.8),
26 libqt5xmlpatterns5-dev,
26 libqt5xmlpatterns5-dev,
27− libunity-api-dev (>= 7.88),
27+ libunity-api-dev (>= 7.89),
28 libusermetricsoutput1-dev,
28 libusermetricsoutput1-dev,
29 libxcb1-dev,
29 libxcb1-dev,
30 pkg-config,
30 pkg-config,
@@ -54,6 +54,7 @@ Homepage: http://launchpad.net/unity
54# and sync up the code again.
54# and sync up the code again.
55Vcs-Bzr: https://code.launchpad.net/unity8
55Vcs-Bzr: https://code.launchpad.net/unity8
56Vcs-Browser: https://bazaar.launchpad.net/~unity-team/unity8/trunk
56Vcs-Browser: https://bazaar.launchpad.net/~unity-team/unity8/trunk
57+X-Ubuntu-Use-Langpack: yes
57
58
58Package: indicators-client
59Package: indicators-client
59Architecture: amd64 armhf i386
60Architecture: amd64 armhf i386
@@ -111,7 +112,7 @@ Depends: qml-module-qtquick-layouts,
111 qtdeclarative5-ubuntu-ui-toolkit-plugin (>= 0.1.49) | qtdeclarative5-ubuntu-ui-toolkit-plugin-gles (>= 0.1.49),
112 qtdeclarative5-ubuntu-ui-toolkit-plugin (>= 0.1.49) | qtdeclarative5-ubuntu-ui-toolkit-plugin-gles (>= 0.1.49),
112 qtdeclarative5-unity-notifications-plugin (>= 0.1.2) | unity-notifications-impl,
113 qtdeclarative5-unity-notifications-plugin (>= 0.1.2) | unity-notifications-impl,
113 ubuntu-thumbnailer-impl-0,
114 ubuntu-thumbnailer-impl-0,
114− unity-application-impl-2,
115+ unity-application-impl-3,
115 unity-notifications-impl-3,
116 unity-notifications-impl-3,
116 unity-plugin-scopes | unity-scopes-impl,
117 unity-plugin-scopes | unity-scopes-impl,
117 unity-scopes-impl-4,
118 unity-scopes-impl-4,
@@ -158,7 +159,7 @@ Pre-Depends: ${misc:Pre-Depends},
158Depends: ${misc:Depends},
159Depends: ${misc:Depends},
159 ${shlibs:Depends},
160 ${shlibs:Depends},
160Provides: unity-application-impl,
161Provides: unity-application-impl,
161− unity-application-impl-2,
162+ unity-application-impl-3,
162Description: Fake environment for running Unity 8 shell
163Description: Fake environment for running Unity 8 shell
163 Provides fake implementations of some QML modules used by Unity 8 shell
164 Provides fake implementations of some QML modules used by Unity 8 shell
164 (e.g Ubuntu.Application) so that you can run it in a sandboxed environment.
165 (e.g Ubuntu.Application) so that you can run it in a sandboxed environment.
@@ -168,7 +169,7 @@ Architecture: any
168Multi-Arch: same
169Multi-Arch: same
169Pre-Depends: ${misc:Pre-Depends},
170Pre-Depends: ${misc:Pre-Depends},
170Depends: accountsservice-ubuntu-schemas (>= 0.0.3),
171Depends: accountsservice-ubuntu-schemas (>= 0.0.3),
171− gsettings-ubuntu-schemas,
172+ gsettings-ubuntu-schemas (>= 0.0.2+14.10.20140815),
172 libhardware2,
173 libhardware2,
173 libunity-core-6.0-9,
174 libunity-core-6.0-9,
174 pay-service,
175 pay-service,
include/paths.h.in+8
@@ -80,6 +80,14 @@ inline QStringList fallbackImportPaths() {
80 return paths;
80 return paths;
81}
81}
82
82
83+inline QString mockPluginsDir() {
84+ if (isRunningInstalled()) {
85+ return QString("@CMAKE_INSTALL_PREFIX@/@SHELL_INSTALL_QML@/mocks");
86+ } else {
87+ return QString("@CMAKE_BINARY_DIR@/tests/mocks");
88+ }
89+}
90+
83inline QStringList shellDataDirs() {
91inline QStringList shellDataDirs() {
84 QStringList dirs = QStandardPaths::standardLocations(QStandardPaths::GenericDataLocation);
92 QStringList dirs = QStandardPaths::standardLocations(QStandardPaths::GenericDataLocation);
85 if (!isRunningInstalled()) {
93 if (!isRunningInstalled()) {
plugins/LightDM/Greeter.cpp+2
@@ -106,6 +106,7 @@ void Greeter::authenticate(const QString &username)
106 }
106 }
107
107
108 d->m_greeter->authenticate(username);
108 d->m_greeter->authenticate(username);
109+ Q_EMIT isAuthenticatedChanged();
109 Q_EMIT authenticationUserChanged(username);
110 Q_EMIT authenticationUserChanged(username);
110}
111}
111
112
@@ -150,5 +151,6 @@ void Greeter::authenticationCompleteFilter()
150 Q_EMIT promptlessChanged();
151 Q_EMIT promptlessChanged();
151 }
152 }
152
153
154+ Q_EMIT isAuthenticatedChanged();
153 Q_EMIT authenticationComplete();
155 Q_EMIT authenticationComplete();
154}
156}
plugins/LightDM/Greeter.h+2−1
@@ -35,7 +35,7 @@ class Greeter : public QObject
35 Q_OBJECT
35 Q_OBJECT
36
36
37 Q_PROPERTY(bool active READ isActive WRITE setIsActive NOTIFY isActiveChanged)
37 Q_PROPERTY(bool active READ isActive WRITE setIsActive NOTIFY isActiveChanged)
38− Q_PROPERTY(bool authenticated READ isAuthenticated)
38+ Q_PROPERTY(bool authenticated READ isAuthenticated NOTIFY isAuthenticatedChanged)
39 Q_PROPERTY(QString authenticationUser READ authenticationUser NOTIFY authenticationUserChanged)
39 Q_PROPERTY(QString authenticationUser READ authenticationUser NOTIFY authenticationUserChanged)
40 Q_PROPERTY(bool promptless READ promptless NOTIFY promptlessChanged)
40 Q_PROPERTY(bool promptless READ promptless NOTIFY promptlessChanged)
41
41
@@ -59,6 +59,7 @@ Q_SIGNALS:
59 void authenticationComplete();
59 void authenticationComplete();
60 void authenticationUserChanged(const QString &user);
60 void authenticationUserChanged(const QString &user);
61 void isActiveChanged();
61 void isActiveChanged();
62+ void isAuthenticatedChanged();
62 void promptlessChanged();
63 void promptlessChanged();
63 void showGreeter();
64 void showGreeter();
64
65
plugins/Powerd/Powerd.cpp+16
@@ -25,6 +25,18 @@ void autoBrightnessChanged(GSettings *settings, const gchar *key, QDBusInterface
25 unityScreen->asyncCall("userAutobrightnessEnable", QVariant(value));
25 unityScreen->asyncCall("userAutobrightnessEnable", QVariant(value));
26}
26}
27
27
28+void activityTimeoutChanged(GSettings *settings, const gchar *key, QDBusInterface *unityScreen)
29+{
30+ int value = g_settings_get_uint(settings, key);
31+ unityScreen->asyncCall("setInactivityTimeouts", QVariant(value), QVariant(-1));
32+}
33+
34+void dimTimeoutChanged(GSettings *settings, const gchar *key, QDBusInterface *unityScreen)
35+{
36+ int value = g_settings_get_uint(settings, key);
37+ unityScreen->asyncCall("setInactivityTimeouts", QVariant(-1), QVariant(value));
38+}
39+
28Powerd::Powerd(QObject* parent)
40Powerd::Powerd(QObject* parent)
29 : QObject(parent),
41 : QObject(parent),
30 unityScreen(NULL)
42 unityScreen(NULL)
@@ -43,7 +55,11 @@ Powerd::Powerd(QObject* parent)
43
55
44 systemSettings = g_settings_new("com.ubuntu.touch.system");
56 systemSettings = g_settings_new("com.ubuntu.touch.system");
45 g_signal_connect(systemSettings, "changed::auto-brightness", G_CALLBACK(autoBrightnessChanged), unityScreen);
57 g_signal_connect(systemSettings, "changed::auto-brightness", G_CALLBACK(autoBrightnessChanged), unityScreen);
58+ g_signal_connect(systemSettings, "changed::activity-timeout", G_CALLBACK(activityTimeoutChanged), unityScreen);
59+ g_signal_connect(systemSettings, "changed::dim-timeout", G_CALLBACK(dimTimeoutChanged), unityScreen);
46 autoBrightnessChanged(systemSettings, "auto-brightness", unityScreen);
60 autoBrightnessChanged(systemSettings, "auto-brightness", unityScreen);
61+ activityTimeoutChanged(systemSettings, "activity-timeout", unityScreen);
62+ dimTimeoutChanged(systemSettings, "dim-timeout", unityScreen);
47}
63}
48
64
49Powerd::~Powerd()
65Powerd::~Powerd()
plugins/Unity/CMakeLists.txt+1
@@ -1,3 +1,4 @@
1+add_subdirectory(Connectivity)
1add_subdirectory(Indicators)
2add_subdirectory(Indicators)
2add_subdirectory(Launcher)
3add_subdirectory(Launcher)
3add_subdirectory(Session)
4add_subdirectory(Session)
plugins/Unity/Connectivity/CMakeLists.txtnew file+10
@@ -0,0 +1,10 @@
1+set(CONNECTIVITY_SOURCES
2+ plugin.cpp
3+ Connectivity.cpp
4+)
5+
6+add_library(Connectivity MODULE ${CONNECTIVITY_SOURCES})
7+
8+qt5_use_modules(Connectivity Qml DBus Core)
9+
10+add_unity8_plugin(Unity.Connectivity 0.1 Unity/Connectivity TARGETS Connectivity)
plugins/Unity/Connectivity/Connectivity.cppnew file+33
@@ -0,0 +1,33 @@
1+/*
2+ * Copyright (C) 2014 Canonical, Ltd.
3+ *
4+ * This program is free software; you can redistribute it and/or modify
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 "Connectivity.h"
18+#include <QDBusConnection>
19+#include <QDBusInterface>
20+#include <QDBusPendingCall>
21+
22+Connectivity::Connectivity(QObject *parent)
23+ : QObject(parent)
24+{
25+}
26+
27+void Connectivity::unlockAllModems()
28+{
29+ QDBusInterface iface("com.ubuntu.connectivity1",
30+ "/com/ubuntu/connectivity1/Private",
31+ "com.ubuntu.connectivity1.Private");
32+ iface.asyncCall("UnlockAllModems");
33+}
tests/mocks/Unity/Application/VirtualKeyboard.h → plugins/Unity/Connectivity/Connectivity.hrenamed+9−11
@@ -14,22 +14,20 @@
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 */
15 */
16
16
17−#ifndef VIRTUALKEYBOARD_H
17+#ifndef CONNECTIVITY_H
18−#define VIRTUALKEYBOARD_H
18+#define CONNECTIVITY_H
19
19
20−#include "MirSurfaceItem.h"
20+#include <QObject>
21
21
22−class VirtualKeyboard : public MirSurfaceItem
22+class Connectivity : public QObject
23{
23{
24 Q_OBJECT
24 Q_OBJECT
25−public:
25+ Q_DISABLE_COPY(Connectivity)
26− VirtualKeyboard(State state,
27− QQuickItem *parent = 0);
28
26
29− void touchEvent(QTouchEvent * event) override;
27+public:
28+ explicit Connectivity(QObject *parent = 0);
30
29
31−private:
30+ Q_INVOKABLE void unlockAllModems();
32− bool hasTouchInsideKeyboard(QTouchEvent *event);
33};
31};
34
32
35−#endif // VIRTUALKEYBOARD_H
33+#endif // CONNECTIVITY_H
plugins/Unity/Connectivity/Connectivity.qmltypesnew file+19
@@ -0,0 +1,19 @@
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.Connectivity 0.1 plugins'
8+
9+Module {
10+ Component {
11+ name: "Connectivity"
12+ prototype: "QObject"
13+ exports: ["Unity.Connectivity/Connectivity 0.1"]
14+ isCreatable: false
15+ isSingleton: true
16+ exportMetaObjectRevisions: [0]
17+ Method { name: "unlockAllModems" }
18+ }
19+}
plugins/Unity/Connectivity/plugin.cppnew file+34
@@ -0,0 +1,34 @@
1+/*
2+ * Copyright (C) 2014 Canonical, Ltd.
3+ *
4+ * This program is free software; you can redistribute it and/or modify
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 "plugin.h"
18+#include "Connectivity.h"
19+
20+#include <QtQml>
21+
22+static QObject *service_provider(QQmlEngine *engine, QJSEngine *scriptEngine)
23+{
24+ Q_UNUSED(engine)
25+ Q_UNUSED(scriptEngine)
26+ return new Connectivity();
27+}
28+
29+void BackendPlugin::registerTypes(const char *uri)
30+{
31+ Q_ASSERT(uri == QLatin1String("Unity.Connectivity"));
32+
33+ qmlRegisterSingletonType<Connectivity>(uri, 0, 1, "Connectivity", service_provider);
34+}
tests/mocks/Unity/Application/OSKController.qml → plugins/Unity/Connectivity/plugin.hrenamed+15−4
@@ -1,5 +1,5 @@
1/*
1/*
2− * Copyright (C) 2013 Canonical, Ltd.
2+ * Copyright (C) 2014 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
@@ -14,7 +14,18 @@
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 */
15 */
16
16
17−import QtQuick 2.0;
17+#ifndef CONNECTIVITY_PLUGIN_H
18+#define CONNECTIVITY_PLUGIN_H
18
19
19−Item {
20+#include <QQmlExtensionPlugin>
21+
22+class BackendPlugin : public QQmlExtensionPlugin
23+{
24+ Q_OBJECT
25+ Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface")
26+
27+public:
28+ void registerTypes(const char *uri);
20−}
29+};
30+
31+#endif // CONNECTIVITY_PLUGIN_H
plugins/Unity/Connectivity/qmldirnew file+3
@@ -0,0 +1,3 @@
1+module Unity.Connectivity
2+plugin Connectivity
3+typeinfo Connectivity.qmltypes
plugins/Unity/Indicators/CachedUnityMenuModel.qmldeleted−60
@@ -1,60 +0,0 @@
1−/*
2− * Copyright 2013 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− * Authors:
17− * Nick Dedekind <nick.dedekind@canonical.com>
18− */
19−
20−import QtQuick 2.0
21−import QMenuModel 0.1 as QMenuModel
22−import Unity.Indicators 0.1 as Indicators
23−
24−// Make sure we don't duplicate models.
25−Item {
26− id: cachedModel
27− property string busName: ""
28− property string actionsObjectPath: ""
29− property string menuObjectPath: ""
30−
31− readonly property bool ready: busName!=="" && actionsObjectPath!=="" && menuObjectPath!==""
32−
33− property QtObject model: {
34− if (!ready) {
35− return null;
36− }
37−
38− var component = Indicators.UnityMenuModelCache.model(menuObjectPath);
39− if (!component) {
40− component = modelComponent.createObject(cachedModel);
41− return component;
42− }
43− return component;
44− }
45−
46− Component {
47− id: modelComponent
48−
49− QMenuModel.UnityMenuModel {
50− id: unityModel
51− busName: cachedModel.busName
52− actions: { "indicator": cachedModel.actionsObjectPath }
53− menuObjectPath: cachedModel.menuObjectPath
54−
55− Component.onCompleted: {
56− Indicators.UnityMenuModelCache.registerModel(cachedModel.menuObjectPath, unityModel);
57− }
58− }
59− }
60−}
plugins/Unity/Indicators/qmldir−3
@@ -1,6 +1,3 @@
1module Unity.Indicators
1module Unity.Indicators
2plugin IndicatorsQml
2plugin IndicatorsQml
3typeinfo Indicators.qmltypes
3typeinfo Indicators.qmltypes
4−
5−CachedUnityMenuModel 0.1 CachedUnityMenuModel.qml
6−IndicatorBase 0.1 IndicatorBase.qml
plugins/Unity/Indicators/unitymenumodelcache.cpp+22−7
@@ -29,14 +29,29 @@ UnityMenuModelCache::~UnityMenuModelCache()
29{
29{
30}
30}
31
31
32−
33−UnityMenuModel* UnityMenuModelCache::model(const QString& path) const
32+UnityMenuModel* UnityMenuModelCache::model(const QByteArray& bus,
33+ const QByteArray& path,
34+ const QVariantMap& actions)
34{
35{
35− return m_menuModels.value(path, NULL);
36+ if (m_registry.contains(path))
37+ return m_registry[path];
38+
39+ UnityMenuModel* menuModel = new UnityMenuModel;
40+ connect(menuModel, &QObject::destroyed, this, [menuModel, this](QObject*) {
41+ QList<QByteArray> keys = m_registry.keys(menuModel);
42+ Q_FOREACH(const QByteArray& key, keys) {
43+ m_registry.remove(key);
44+ }
45+ });
46+ m_registry[path] = menuModel;
47+
48+ menuModel->setBusName(bus);
49+ menuModel->setMenuObjectPath(path);
50+ menuModel->setActions(actions);
51+ return menuModel;
36}
52}
37
53
38−void UnityMenuModelCache::registerModel(const QString& path, UnityMenuModel* menuModel)
54+bool UnityMenuModelCache::contains(const QByteArray& path)
39{
55{
40− menuModel->setParent(this);
56+ return m_registry.contains(path);
41− m_menuModels[path] = menuModel;
42−}
57+}
plugins/Unity/Indicators/unitymenumodelcache.h+5−3
@@ -34,11 +34,13 @@ public:
34 UnityMenuModelCache(QObject*parent=NULL);
34 UnityMenuModelCache(QObject*parent=NULL);
35 ~UnityMenuModelCache();
35 ~UnityMenuModelCache();
36
36
37− Q_INVOKABLE UnityMenuModel* model(const QString& path) const;
37+ Q_INVOKABLE UnityMenuModel* model(const QByteArray& bus,
38− Q_INVOKABLE void registerModel(const QString& path, UnityMenuModel* menuModel);
38+ const QByteArray& path,
39+ const QVariantMap& actions);
40+ Q_INVOKABLE bool contains(const QByteArray& path);
39
41
40private:
42private:
41− QHash<QString, UnityMenuModel*> m_menuModels;
43+ QHash<QByteArray, UnityMenuModel*> m_registry;
42};
44};
43
45
44#endif // UNITYMENUMODELCACHE_H
46#endif // UNITYMENUMODELCACHE_H
plugins/Unity/Launcher/CMakeLists.txt+1−1
@@ -1,6 +1,6 @@
1include(FindPkgConfig)
1include(FindPkgConfig)
2pkg_check_modules(LAUNCHER_API REQUIRED unity-shell-launcher=3)
2pkg_check_modules(LAUNCHER_API REQUIRED unity-shell-launcher=3)
3−pkg_check_modules(APPLICATION_API REQUIRED unity-shell-application=1)
3+pkg_check_modules(APPLICATION_API REQUIRED unity-shell-application=3)
4pkg_check_modules(GSETTINGS_QT REQUIRED gsettings-qt)
4pkg_check_modules(GSETTINGS_QT REQUIRED gsettings-qt)
5
5
6add_definitions(-DSM_BUSNAME=systemBus)
6add_definitions(-DSM_BUSNAME=systemBus)
po/am.po+49−40
@@ -7,15 +7,15 @@ msgid ""
7msgstr ""
7msgstr ""
8"Project-Id-Version: unity8\n"
8"Project-Id-Version: unity8\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2014-08-13 14:09-0400\n"
10+"POT-Creation-Date: 2014-08-21 11:36+0200\n"
11−"PO-Revision-Date: 2014-08-16 20:11+0000\n"
11+"PO-Revision-Date: 2014-08-23 17:14+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−"X-Launchpad-Export-Date: 2014-08-18 07:20+0000\n"
17+"X-Launchpad-Export-Date: 2014-08-24 06:46+0000\n"
18−"X-Generator: Launchpad (build 17156)\n"
18+"X-Generator: Launchpad (build 17163)\n"
19
19
20#: plugins/LightDM/Greeter.cpp:129
20#: plugins/LightDM/Greeter.cpp:129
21msgid "Password: "
21msgid "Password: "
@@ -92,19 +92,19 @@ msgid ""
92"phone<br><br>Tap on the screen to start"
92"phone<br><br>Tap on the screen to start"
93msgstr ""
93msgstr ""
94
94
95−#: qml/Components/Lockscreen.qml:161
95+#: qml/Components/Lockscreen.qml:167
96−msgid "Too many incorrect attempts"
97−msgstr "በርካታ የተሳሳቱ ሙከራዎች"
98−
99−#: qml/Components/Lockscreen.qml:163
100msgid "Please wait"
96msgid "Please wait"
101msgstr "እባክዎን ይቆዩ"
97msgstr "እባክዎን ይቆዩ"
102
98
103−#: qml/Components/Lockscreen.qml:245
99+#: qml/Components/Lockscreen.qml:172
100+msgid "Too many incorrect attempts"
101+msgstr "በርካታ የተሳሳቱ ሙከራዎች"
102+
103+#: qml/Components/Lockscreen.qml:206
104msgid "Emergency Call"
104msgid "Emergency Call"
105msgstr "የ ድንገተኛ ጥሪ"
105msgstr "የ ድንገተኛ ጥሪ"
106
106
107−#: qml/Components/Lockscreen.qml:268
107+#: qml/Components/Lockscreen.qml:226
108msgid "OK"
108msgid "OK"
109msgstr "እሺ"
109msgstr "እሺ"
110
110
@@ -117,23 +117,15 @@ msgstr "ሰላም %1"
117msgid "Hello"
117msgid "Hello"
118msgstr "ሰላም"
118msgstr "ሰላም"
119
119
120−#: qml/Components/PinLockscreen.qml:197
121−msgid "CANCEL"
122−msgstr "መሰረዣ"
123−
124−#: qml/Components/PinLockscreen.qml:215
125−msgid "DONE"
126−msgstr "ጨርሷል"
127−
128−#: qml/Dash/GenericScopeView.qml:360
120+#: qml/Dash/GenericScopeView.qml:361
129msgid "See less"
121msgid "See less"
130msgstr "አነስተኛ መመልከቻ"
122msgstr "አነስተኛ መመልከቻ"
131
123
132−#: qml/Dash/GenericScopeView.qml:360
124+#: qml/Dash/GenericScopeView.qml:361
133msgid "See all"
125msgid "See all"
134msgstr "ሁሉንም መመልከቻ"
126msgstr "ሁሉንም መመልከቻ"
135
127
136−#: qml/Dash/GenericScopeView.qml:423 qml/Panel/SearchIndicator.qml:27
128+#: qml/Dash/GenericScopeView.qml:424 qml/Panel/SearchIndicator.qml:27
137msgid "Search"
129msgid "Search"
138msgstr "መፈለጊያ"
130msgstr "መፈለጊያ"
139
131
@@ -201,12 +193,16 @@ msgstr "አሁን ይናገሩ..."
201msgid "Speaking..."
193msgid "Speaking..."
202msgstr "በመናገር ላይ..."
194msgstr "በመናገር ላይ..."
203
195
204−#: qml/Notifications/NotificationMenuItemFactory.qml:100
196+#: qml/Notifications/NotificationMenuItemFactory.qml:105
205msgid "Show password"
197msgid "Show password"
206msgstr "የመግቢያ ቃል ማሳያ"
198msgstr "የመግቢያ ቃል ማሳያ"
207
199
208−#: qml/Notifications/NotificationMenuItemFactory.qml:115
200+#: qml/Notifications/NotificationMenuItemFactory.qml:120
209−msgid "Please enter SIM PIN"
201+msgid "Enter SIM PIN"
202+msgstr ""
203+
204+#: qml/Notifications/NotificationMenuItemFactory.qml:121 qml/Shell.qml:270
205+msgid "Sorry, incorrect PIN"
210msgstr ""
206msgstr ""
211
207
212#: qml/Panel/ActiveCallHint.qml:77
208#: qml/Panel/ActiveCallHint.qml:77
@@ -249,48 +245,61 @@ msgstr ""
249msgid "Roaming"
245msgid "Roaming"
250msgstr ""
246msgstr ""
251
247
252−#: qml/Shell.qml:267
248+#: qml/Shell.qml:266
253−msgid "passphrase"
249+msgid "Enter your passphrase"
254msgstr ""
250msgstr ""
255
251
256#: qml/Shell.qml:267
252#: qml/Shell.qml:267
257−msgid "passcode"
253+msgid "Sorry, incorrect passphrase"
258msgstr ""
254msgstr ""
259
255
260#: qml/Shell.qml:269
256#: qml/Shell.qml:269
257+msgid "Enter your PIN"
258+msgstr ""
259+
260+#: qml/Shell.qml:273
261#, qt-format
261#, qt-format
262msgid "Enter your %1"
262msgid "Enter your %1"
263msgstr "ያስገቡ የ እርስዎን %1"
263msgstr "ያስገቡ የ እርስዎን %1"
264
264
265−#: qml/Shell.qml:270
265+#: qml/Shell.qml:274
266#, qt-format
266#, qt-format
267−msgid "Incorrect %1"
267+msgid "Sorry, incorrect %1"
268−msgstr "የተሳሳተ %1"
268+msgstr "አዝናለሁ: የተሳሳተ%1"
269−
270−#: qml/Shell.qml:272
271−msgid "Please re-enter"
272−msgstr "እባክዎን እንደ ገና-ያስገቡ"
273
269
274−#: qml/Shell.qml:306
270+#: qml/Shell.qml:310
275msgid "Sorry, incorrect passphrase."
271msgid "Sorry, incorrect passphrase."
276msgstr ""
272msgstr ""
277
273
278−#: qml/Shell.qml:307
274+#: qml/Shell.qml:311
279msgid "Sorry, incorrect passcode."
275msgid "Sorry, incorrect passcode."
280msgstr ""
276msgstr ""
281
277
282−#: qml/Shell.qml:308
278+#: qml/Shell.qml:312
283msgid "This will be your last attempt."
279msgid "This will be your last attempt."
284msgstr "ይህ የመጨረሻ ሙከራዎ ነው"
280msgstr "ይህ የመጨረሻ ሙከራዎ ነው"
285
281
286−#: qml/Shell.qml:310
282+#: qml/Shell.qml:314
287msgid ""
283msgid ""
288"If passphrase is entered incorrectly, your phone will conduct a factory "
284"If passphrase is entered incorrectly, your phone will conduct a factory "
289"reset and all personal data will be deleted."
285"reset and all personal data will be deleted."
290msgstr ""
286msgstr ""
291
287
292−#: qml/Shell.qml:311
288+#: qml/Shell.qml:315
293msgid ""
289msgid ""
294"If passcode is entered incorrectly, your phone will conduct a factory reset "
290"If passcode is entered incorrectly, your phone will conduct a factory reset "
295"and all personal data will be deleted."
291"and all personal data will be deleted."
296msgstr ""
292msgstr ""
293+
294+#~ msgid "CANCEL"
295+#~ msgstr "መሰረዣ"
296+
297+#~ msgid "DONE"
298+#~ msgstr "ጨርሷል"
299+
300+#, qt-format
301+#~ msgid "Incorrect %1"
302+#~ msgstr "የተሳሳተ %1"
303+
304+#~ msgid "Please re-enter"
305+#~ msgstr "እባክዎን እንደ ገና-ያስገቡ"
po/ar.po+37−38
@@ -7,15 +7,15 @@ msgid ""
7msgstr ""
7msgstr ""
8"Project-Id-Version: unity\n"
8"Project-Id-Version: unity\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2014-08-13 14:09-0400\n"
10+"POT-Creation-Date: 2014-08-21 11:36+0200\n"
11"PO-Revision-Date: 2014-05-22 08:22+0000\n"
11"PO-Revision-Date: 2014-05-22 08:22+0000\n"
12"Last-Translator: Ibrahim Saed <ibraheem5000@gmail.com>\n"
12"Last-Translator: Ibrahim Saed <ibraheem5000@gmail.com>\n"
13"Language-Team: Arabic <ar@li.org>\n"
13"Language-Team: Arabic <ar@li.org>\n"
14"MIME-Version: 1.0\n"
14"MIME-Version: 1.0\n"
15"Content-Type: text/plain; charset=UTF-8\n"
15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n"
16"Content-Transfer-Encoding: 8bit\n"
17−"X-Launchpad-Export-Date: 2014-08-15 06:28+0000\n"
17+"X-Launchpad-Export-Date: 2014-08-23 07:16+0000\n"
18−"X-Generator: Launchpad (build 17156)\n"
18+"X-Generator: Launchpad (build 17163)\n"
19
19
20#: plugins/LightDM/Greeter.cpp:129
20#: plugins/LightDM/Greeter.cpp:129
21msgid "Password: "
21msgid "Password: "
@@ -95,19 +95,19 @@ msgstr ""
95"أنت الآن بارع في إيماءات الحواف ويمكنك البدء باستخدام هاتفك<br><br>انقر على "
95"أنت الآن بارع في إيماءات الحواف ويمكنك البدء باستخدام هاتفك<br><br>انقر على "
96"الشاشة للبدء"
96"الشاشة للبدء"
97
97
98−#: qml/Components/Lockscreen.qml:161
98+#: qml/Components/Lockscreen.qml:167
99−msgid "Too many incorrect attempts"
99+msgid "Please wait"
100msgstr ""
100msgstr ""
101
101
102−#: qml/Components/Lockscreen.qml:163
102+#: qml/Components/Lockscreen.qml:172
103−msgid "Please wait"
103+msgid "Too many incorrect attempts"
104msgstr ""
104msgstr ""
105
105
106−#: qml/Components/Lockscreen.qml:245
106+#: qml/Components/Lockscreen.qml:206
107msgid "Emergency Call"
107msgid "Emergency Call"
108msgstr "مكالمة طوارئ"
108msgstr "مكالمة طوارئ"
109
109
110−#: qml/Components/Lockscreen.qml:268
110+#: qml/Components/Lockscreen.qml:226
111msgid "OK"
111msgid "OK"
112msgstr ""
112msgstr ""
113
113
@@ -120,23 +120,15 @@ msgstr "مرحبا %1"
120msgid "Hello"
120msgid "Hello"
121msgstr "مرحبًا"
121msgstr "مرحبًا"
122
122
123−#: qml/Components/PinLockscreen.qml:197
124−msgid "CANCEL"
125−msgstr ""
126−
127−#: qml/Components/PinLockscreen.qml:215
128−msgid "DONE"
129−msgstr ""
130−
131−#: qml/Dash/GenericScopeView.qml:360
123+#: qml/Dash/GenericScopeView.qml:361
132msgid "See less"
124msgid "See less"
133msgstr "شاهد أقل"
125msgstr "شاهد أقل"
134
126
135−#: qml/Dash/GenericScopeView.qml:360
127+#: qml/Dash/GenericScopeView.qml:361
136msgid "See all"
128msgid "See all"
137msgstr ""
129msgstr ""
138
130
139−#: qml/Dash/GenericScopeView.qml:423 qml/Panel/SearchIndicator.qml:27
131+#: qml/Dash/GenericScopeView.qml:424 qml/Panel/SearchIndicator.qml:27
140msgid "Search"
132msgid "Search"
141msgstr "ابحث"
133msgstr "ابحث"
142
134
@@ -204,13 +196,17 @@ msgstr "تكلم الآن..."
204msgid "Speaking..."
196msgid "Speaking..."
205msgstr "تتكلم الآن..."
197msgstr "تتكلم الآن..."
206
198
207−#: qml/Notifications/NotificationMenuItemFactory.qml:100
199+#: qml/Notifications/NotificationMenuItemFactory.qml:105
208msgid "Show password"
200msgid "Show password"
209msgstr "عرض كلمة السر"
201msgstr "عرض كلمة السر"
210
202
211−#: qml/Notifications/NotificationMenuItemFactory.qml:115
203+#: qml/Notifications/NotificationMenuItemFactory.qml:120
212−msgid "Please enter SIM PIN"
204+msgid "Enter SIM PIN"
213−msgstr "من فضلك أدخِل رقم التعريف الشخصي لبطاقة SIM"
205+msgstr ""
206+
207+#: qml/Notifications/NotificationMenuItemFactory.qml:121 qml/Shell.qml:270
208+msgid "Sorry, incorrect PIN"
209+msgstr ""
214
210
215#: qml/Panel/ActiveCallHint.qml:77
211#: qml/Panel/ActiveCallHint.qml:77
216msgid "Tap to return to call..."
212msgid "Tap to return to call..."
@@ -252,48 +248,51 @@ msgstr ""
252msgid "Roaming"
248msgid "Roaming"
253msgstr ""
249msgstr ""
254
250
255−#: qml/Shell.qml:267
251+#: qml/Shell.qml:266
256−msgid "passphrase"
252+msgid "Enter your passphrase"
257msgstr ""
253msgstr ""
258
254
259#: qml/Shell.qml:267
255#: qml/Shell.qml:267
260−msgid "passcode"
256+msgid "Sorry, incorrect passphrase"
261msgstr ""
257msgstr ""
262
258
263#: qml/Shell.qml:269
259#: qml/Shell.qml:269
264−#, qt-format
265−msgid "Enter your %1"
260+msgid "Enter your PIN"
266msgstr ""
261msgstr ""
267
262
268−#: qml/Shell.qml:270
263+#: qml/Shell.qml:273
269#, qt-format
264#, qt-format
270−msgid "Incorrect %1"
265+msgid "Enter your %1"
271msgstr ""
266msgstr ""
272
267
273−#: qml/Shell.qml:272
268+#: qml/Shell.qml:274
274−msgid "Please re-enter"
269+#, qt-format
270+msgid "Sorry, incorrect %1"
275msgstr ""
271msgstr ""
276
272
277−#: qml/Shell.qml:306
273+#: qml/Shell.qml:310
278msgid "Sorry, incorrect passphrase."
274msgid "Sorry, incorrect passphrase."
279msgstr ""
275msgstr ""
280
276
281−#: qml/Shell.qml:307
277+#: qml/Shell.qml:311
282msgid "Sorry, incorrect passcode."
278msgid "Sorry, incorrect passcode."
283msgstr ""
279msgstr ""
284
280
285−#: qml/Shell.qml:308
281+#: qml/Shell.qml:312
286msgid "This will be your last attempt."
282msgid "This will be your last attempt."
287msgstr ""
283msgstr ""
288
284
289−#: qml/Shell.qml:310
285+#: qml/Shell.qml:314
290msgid ""
286msgid ""
291"If passphrase is entered incorrectly, your phone will conduct a factory "
287"If passphrase is entered incorrectly, your phone will conduct a factory "
292"reset and all personal data will be deleted."
288"reset and all personal data will be deleted."
293msgstr ""
289msgstr ""
294
290
295−#: qml/Shell.qml:311
291+#: qml/Shell.qml:315
296msgid ""
292msgid ""
297"If passcode is entered incorrectly, your phone will conduct a factory reset "
293"If passcode is entered incorrectly, your phone will conduct a factory reset "
298"and all personal data will be deleted."
294"and all personal data will be deleted."
299msgstr ""
295msgstr ""
296+
297+#~ msgid "Please enter SIM PIN"
298+#~ msgstr "من فضلك أدخِل رقم التعريف الشخصي لبطاقة SIM"
po/ast.po+43−38
@@ -7,15 +7,15 @@ msgid ""
7msgstr ""
7msgstr ""
8"Project-Id-Version: unity8\n"
8"Project-Id-Version: unity8\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2014-08-13 14:09-0400\n"
10+"POT-Creation-Date: 2014-08-21 11:36+0200\n"
11"PO-Revision-Date: 2014-07-25 16:51+0000\n"
11"PO-Revision-Date: 2014-07-25 16:51+0000\n"
12"Last-Translator: ivarela <ivarela@ubuntu.com>\n"
12"Last-Translator: ivarela <ivarela@ubuntu.com>\n"
13"Language-Team: Asturian <ast@li.org>\n"
13"Language-Team: Asturian <ast@li.org>\n"
14"MIME-Version: 1.0\n"
14"MIME-Version: 1.0\n"
15"Content-Type: text/plain; charset=UTF-8\n"
15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n"
16"Content-Transfer-Encoding: 8bit\n"
17−"X-Launchpad-Export-Date: 2014-08-15 06:28+0000\n"
17+"X-Launchpad-Export-Date: 2014-08-23 07:16+0000\n"
18−"X-Generator: Launchpad (build 17156)\n"
18+"X-Generator: Launchpad (build 17163)\n"
19
19
20#: plugins/LightDM/Greeter.cpp:129
20#: plugins/LightDM/Greeter.cpp:129
21msgid "Password: "
21msgid "Password: "
@@ -96,19 +96,19 @@ msgstr ""
96"Agora yá domines los xestos de los berbesos y pues entamar a usar el "
96"Agora yá domines los xestos de los berbesos y pues entamar a usar el "
97"teléfonu<br><br>Toca la pantalla pa comenzar"
97"teléfonu<br><br>Toca la pantalla pa comenzar"
98
98
99−#: qml/Components/Lockscreen.qml:161
99+#: qml/Components/Lockscreen.qml:167
100−msgid "Too many incorrect attempts"
100+msgid "Please wait"
101msgstr ""
101msgstr ""
102
102
103−#: qml/Components/Lockscreen.qml:163
103+#: qml/Components/Lockscreen.qml:172
104−msgid "Please wait"
104+msgid "Too many incorrect attempts"
105msgstr ""
105msgstr ""
106
106
107−#: qml/Components/Lockscreen.qml:245
107+#: qml/Components/Lockscreen.qml:206
108msgid "Emergency Call"
108msgid "Emergency Call"
109msgstr "Llamada d'emerxencia"
109msgstr "Llamada d'emerxencia"
110
110
111−#: qml/Components/Lockscreen.qml:268
111+#: qml/Components/Lockscreen.qml:226
112msgid "OK"
112msgid "OK"
113msgstr "Aceutar"
113msgstr "Aceutar"
114
114
@@ -121,23 +121,15 @@ msgstr "Hola %1"
121msgid "Hello"
121msgid "Hello"
122msgstr "Hola"
122msgstr "Hola"
123
123
124−#: qml/Components/PinLockscreen.qml:197
125−msgid "CANCEL"
126−msgstr "ENCABOXAR"
127−
128−#: qml/Components/PinLockscreen.qml:215
129−msgid "DONE"
130−msgstr "FECHO"
131−
132−#: qml/Dash/GenericScopeView.qml:360
124+#: qml/Dash/GenericScopeView.qml:361
133msgid "See less"
125msgid "See less"
134msgstr "Ver menos"
126msgstr "Ver menos"
135
127
136−#: qml/Dash/GenericScopeView.qml:360
128+#: qml/Dash/GenericScopeView.qml:361
137msgid "See all"
129msgid "See all"
138msgstr "Ver too"
130msgstr "Ver too"
139
131
140−#: qml/Dash/GenericScopeView.qml:423 qml/Panel/SearchIndicator.qml:27
132+#: qml/Dash/GenericScopeView.qml:424 qml/Panel/SearchIndicator.qml:27
141msgid "Search"
133msgid "Search"
142msgstr "Guetar"
134msgstr "Guetar"
143
135
@@ -205,13 +197,17 @@ msgstr "Fala agora…"
205msgid "Speaking..."
197msgid "Speaking..."
206msgstr "Falando…"
198msgstr "Falando…"
207
199
208−#: qml/Notifications/NotificationMenuItemFactory.qml:100
200+#: qml/Notifications/NotificationMenuItemFactory.qml:105
209msgid "Show password"
201msgid "Show password"
210msgstr "Amosar contraseña"
202msgstr "Amosar contraseña"
211
203
212−#: qml/Notifications/NotificationMenuItemFactory.qml:115
204+#: qml/Notifications/NotificationMenuItemFactory.qml:120
213−msgid "Please enter SIM PIN"
205+msgid "Enter SIM PIN"
214−msgstr "Escribi'l PIN de la SIM"
206+msgstr ""
207+
208+#: qml/Notifications/NotificationMenuItemFactory.qml:121 qml/Shell.qml:270
209+msgid "Sorry, incorrect PIN"
210+msgstr ""
215
211
216#: qml/Panel/ActiveCallHint.qml:77
212#: qml/Panel/ActiveCallHint.qml:77
217msgid "Tap to return to call..."
213msgid "Tap to return to call..."
@@ -253,48 +249,57 @@ msgstr ""
253msgid "Roaming"
249msgid "Roaming"
254msgstr ""
250msgstr ""
255
251
256−#: qml/Shell.qml:267
252+#: qml/Shell.qml:266
257−msgid "passphrase"
253+msgid "Enter your passphrase"
258msgstr ""
254msgstr ""
259
255
260#: qml/Shell.qml:267
256#: qml/Shell.qml:267
261−msgid "passcode"
257+msgid "Sorry, incorrect passphrase"
262msgstr ""
258msgstr ""
263
259
264#: qml/Shell.qml:269
260#: qml/Shell.qml:269
265−#, qt-format
266−msgid "Enter your %1"
261+msgid "Enter your PIN"
267msgstr ""
262msgstr ""
268
263
269−#: qml/Shell.qml:270
264+#: qml/Shell.qml:273
270#, qt-format
265#, qt-format
271−msgid "Incorrect %1"
266+msgid "Enter your %1"
272msgstr ""
267msgstr ""
273
268
274−#: qml/Shell.qml:272
269+#: qml/Shell.qml:274
275−msgid "Please re-enter"
270+#, qt-format
271+msgid "Sorry, incorrect %1"
276msgstr ""
272msgstr ""
277
273
278−#: qml/Shell.qml:306
274+#: qml/Shell.qml:310
279msgid "Sorry, incorrect passphrase."
275msgid "Sorry, incorrect passphrase."
280msgstr ""
276msgstr ""
281
277
282−#: qml/Shell.qml:307
278+#: qml/Shell.qml:311
283msgid "Sorry, incorrect passcode."
279msgid "Sorry, incorrect passcode."
284msgstr ""
280msgstr ""
285
281
286−#: qml/Shell.qml:308
282+#: qml/Shell.qml:312
287msgid "This will be your last attempt."
283msgid "This will be your last attempt."
288msgstr ""
284msgstr ""
289
285
290−#: qml/Shell.qml:310
286+#: qml/Shell.qml:314
291msgid ""
287msgid ""
292"If passphrase is entered incorrectly, your phone will conduct a factory "
288"If passphrase is entered incorrectly, your phone will conduct a factory "
293"reset and all personal data will be deleted."
289"reset and all personal data will be deleted."
294msgstr ""
290msgstr ""
295
291
296−#: qml/Shell.qml:311
292+#: qml/Shell.qml:315
297msgid ""
293msgid ""
298"If passcode is entered incorrectly, your phone will conduct a factory reset "
294"If passcode is entered incorrectly, your phone will conduct a factory reset "
299"and all personal data will be deleted."
295"and all personal data will be deleted."
300msgstr ""
296msgstr ""
297+
298+#~ msgid "CANCEL"
299+#~ msgstr "ENCABOXAR"
300+
301+#~ msgid "DONE"
302+#~ msgstr "FECHO"
303+
304+#~ msgid "Please enter SIM PIN"
305+#~ msgstr "Escribi'l PIN de la SIM"
po/az.po+33−37
@@ -7,15 +7,15 @@ msgid ""
7msgstr ""
7msgstr ""
8"Project-Id-Version: unity\n"
8"Project-Id-Version: unity\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2014-08-13 14:09-0400\n"
10+"POT-Creation-Date: 2014-08-21 11:36+0200\n"
11"PO-Revision-Date: 2014-01-15 09:50+0000\n"
11"PO-Revision-Date: 2014-01-15 09:50+0000\n"
12"Last-Translator: Turan Mahmudov <turan.mahmudov@gmail.com>\n"
12"Last-Translator: Turan Mahmudov <turan.mahmudov@gmail.com>\n"
13"Language-Team: Azerbaijani <az@li.org>\n"
13"Language-Team: Azerbaijani <az@li.org>\n"
14"MIME-Version: 1.0\n"
14"MIME-Version: 1.0\n"
15"Content-Type: text/plain; charset=UTF-8\n"
15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n"
16"Content-Transfer-Encoding: 8bit\n"
17−"X-Launchpad-Export-Date: 2014-08-15 06:28+0000\n"
17+"X-Launchpad-Export-Date: 2014-08-23 07:16+0000\n"
18−"X-Generator: Launchpad (build 17156)\n"
18+"X-Generator: Launchpad (build 17163)\n"
19
19
20#: plugins/LightDM/Greeter.cpp:129
20#: plugins/LightDM/Greeter.cpp:129
21msgid "Password: "
21msgid "Password: "
@@ -93,19 +93,19 @@ msgid ""
93"phone<br><br>Tap on the screen to start"
93"phone<br><br>Tap on the screen to start"
94msgstr ""
94msgstr ""
95
95
96−#: qml/Components/Lockscreen.qml:161
96+#: qml/Components/Lockscreen.qml:167
97−msgid "Too many incorrect attempts"
97+msgid "Please wait"
98msgstr ""
98msgstr ""
99
99
100−#: qml/Components/Lockscreen.qml:163
100+#: qml/Components/Lockscreen.qml:172
101−msgid "Please wait"
101+msgid "Too many incorrect attempts"
102msgstr ""
102msgstr ""
103
103
104−#: qml/Components/Lockscreen.qml:245
104+#: qml/Components/Lockscreen.qml:206
105msgid "Emergency Call"
105msgid "Emergency Call"
106msgstr "Zərurət zəngi"
106msgstr "Zərurət zəngi"
107
107
108−#: qml/Components/Lockscreen.qml:268
108+#: qml/Components/Lockscreen.qml:226
109msgid "OK"
109msgid "OK"
110msgstr ""
110msgstr ""
111
111
@@ -118,23 +118,15 @@ msgstr "Xoş gördük %1"
118msgid "Hello"
118msgid "Hello"
119msgstr "Xoş gördük"
119msgstr "Xoş gördük"
120
120
121−#: qml/Components/PinLockscreen.qml:197
122−msgid "CANCEL"
123−msgstr ""
124−
125−#: qml/Components/PinLockscreen.qml:215
126−msgid "DONE"
127−msgstr ""
128−
129−#: qml/Dash/GenericScopeView.qml:360
121+#: qml/Dash/GenericScopeView.qml:361
130msgid "See less"
122msgid "See less"
131msgstr ""
123msgstr ""
132
124
133−#: qml/Dash/GenericScopeView.qml:360
125+#: qml/Dash/GenericScopeView.qml:361
134msgid "See all"
126msgid "See all"
135msgstr ""
127msgstr ""
136
128
137−#: qml/Dash/GenericScopeView.qml:423 qml/Panel/SearchIndicator.qml:27
129+#: qml/Dash/GenericScopeView.qml:424 qml/Panel/SearchIndicator.qml:27
138msgid "Search"
130msgid "Search"
139msgstr "Axtar"
131msgstr "Axtar"
140
132
@@ -202,12 +194,16 @@ msgstr "Danışın..."
202msgid "Speaking..."
194msgid "Speaking..."
203msgstr "Danışır..."
195msgstr "Danışır..."
204
196
205−#: qml/Notifications/NotificationMenuItemFactory.qml:100
197+#: qml/Notifications/NotificationMenuItemFactory.qml:105
206msgid "Show password"
198msgid "Show password"
207msgstr "Parolu göstər"
199msgstr "Parolu göstər"
208
200
209−#: qml/Notifications/NotificationMenuItemFactory.qml:115
201+#: qml/Notifications/NotificationMenuItemFactory.qml:120
210−msgid "Please enter SIM PIN"
202+msgid "Enter SIM PIN"
203+msgstr ""
204+
205+#: qml/Notifications/NotificationMenuItemFactory.qml:121 qml/Shell.qml:270
206+msgid "Sorry, incorrect PIN"
211msgstr ""
207msgstr ""
212
208
213#: qml/Panel/ActiveCallHint.qml:77
209#: qml/Panel/ActiveCallHint.qml:77
@@ -250,47 +246,47 @@ msgstr ""
250msgid "Roaming"
246msgid "Roaming"
251msgstr ""
247msgstr ""
252
248
253−#: qml/Shell.qml:267
249+#: qml/Shell.qml:266
254−msgid "passphrase"
250+msgid "Enter your passphrase"
255msgstr ""
251msgstr ""
256
252
257#: qml/Shell.qml:267
253#: qml/Shell.qml:267
258−msgid "passcode"
254+msgid "Sorry, incorrect passphrase"
259msgstr ""
255msgstr ""
260
256
261#: qml/Shell.qml:269
257#: qml/Shell.qml:269
262−#, qt-format
263−msgid "Enter your %1"
258+msgid "Enter your PIN"
264msgstr ""
259msgstr ""
265
260
266−#: qml/Shell.qml:270
261+#: qml/Shell.qml:273
267#, qt-format
262#, qt-format
268−msgid "Incorrect %1"
263+msgid "Enter your %1"
269msgstr ""
264msgstr ""
270
265
271−#: qml/Shell.qml:272
266+#: qml/Shell.qml:274
272−msgid "Please re-enter"
267+#, qt-format
268+msgid "Sorry, incorrect %1"
273msgstr ""
269msgstr ""
274
270
275−#: qml/Shell.qml:306
271+#: qml/Shell.qml:310
276msgid "Sorry, incorrect passphrase."
272msgid "Sorry, incorrect passphrase."
277msgstr ""
273msgstr ""
278
274
279−#: qml/Shell.qml:307
275+#: qml/Shell.qml:311
280msgid "Sorry, incorrect passcode."
276msgid "Sorry, incorrect passcode."
281msgstr ""
277msgstr ""
282
278
283−#: qml/Shell.qml:308
279+#: qml/Shell.qml:312
284msgid "This will be your last attempt."
280msgid "This will be your last attempt."
285msgstr ""
281msgstr ""
286
282
287−#: qml/Shell.qml:310
283+#: qml/Shell.qml:314
288msgid ""
284msgid ""
289"If passphrase is entered incorrectly, your phone will conduct a factory "
285"If passphrase is entered incorrectly, your phone will conduct a factory "
290"reset and all personal data will be deleted."
286"reset and all personal data will be deleted."
291msgstr ""
287msgstr ""
292
288
293−#: qml/Shell.qml:311
289+#: qml/Shell.qml:315
294msgid ""
290msgid ""
295"If passcode is entered incorrectly, your phone will conduct a factory reset "
291"If passcode is entered incorrectly, your phone will conduct a factory reset "
296"and all personal data will be deleted."
292"and all personal data will be deleted."
po/bg.po+33−37
@@ -7,15 +7,15 @@ msgid ""
7msgstr ""
7msgstr ""
8"Project-Id-Version: unity\n"
8"Project-Id-Version: unity\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2014-08-13 14:09-0400\n"
10+"POT-Creation-Date: 2014-08-21 11:36+0200\n"
11"PO-Revision-Date: 2014-04-01 14:08+0000\n"
11"PO-Revision-Date: 2014-04-01 14:08+0000\n"
12"Last-Translator: Atanas Kovachki <Unknown>\n"
12"Last-Translator: Atanas Kovachki <Unknown>\n"
13"Language-Team: Bulgarian <bg@li.org>\n"
13"Language-Team: Bulgarian <bg@li.org>\n"
14"MIME-Version: 1.0\n"
14"MIME-Version: 1.0\n"
15"Content-Type: text/plain; charset=UTF-8\n"
15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n"
16"Content-Transfer-Encoding: 8bit\n"
17−"X-Launchpad-Export-Date: 2014-08-15 06:28+0000\n"
17+"X-Launchpad-Export-Date: 2014-08-23 07:16+0000\n"
18−"X-Generator: Launchpad (build 17156)\n"
18+"X-Generator: Launchpad (build 17163)\n"
19
19
20#: plugins/LightDM/Greeter.cpp:129
20#: plugins/LightDM/Greeter.cpp:129
21msgid "Password: "
21msgid "Password: "
@@ -99,19 +99,19 @@ msgid ""
99"phone<br><br>Tap on the screen to start"
99"phone<br><br>Tap on the screen to start"
100msgstr ""
100msgstr ""
101
101
102−#: qml/Components/Lockscreen.qml:161
102+#: qml/Components/Lockscreen.qml:167
103−msgid "Too many incorrect attempts"
103+msgid "Please wait"
104msgstr ""
104msgstr ""
105
105
106−#: qml/Components/Lockscreen.qml:163
106+#: qml/Components/Lockscreen.qml:172
107−msgid "Please wait"
107+msgid "Too many incorrect attempts"
108msgstr ""
108msgstr ""
109
109
110−#: qml/Components/Lockscreen.qml:245
110+#: qml/Components/Lockscreen.qml:206
111msgid "Emergency Call"
111msgid "Emergency Call"
112msgstr "Спешно повикване"
112msgstr "Спешно повикване"
113
113
114−#: qml/Components/Lockscreen.qml:268
114+#: qml/Components/Lockscreen.qml:226
115msgid "OK"
115msgid "OK"
116msgstr ""
116msgstr ""
117
117
@@ -124,23 +124,15 @@ msgstr "Здравей, %1"
124msgid "Hello"
124msgid "Hello"
125msgstr "Здравей"
125msgstr "Здравей"
126
126
127−#: qml/Components/PinLockscreen.qml:197
128−msgid "CANCEL"
129−msgstr ""
130−
131−#: qml/Components/PinLockscreen.qml:215
132−msgid "DONE"
133−msgstr ""
134−
135−#: qml/Dash/GenericScopeView.qml:360
127+#: qml/Dash/GenericScopeView.qml:361
136msgid "See less"
128msgid "See less"
137msgstr ""
129msgstr ""
138
130
139−#: qml/Dash/GenericScopeView.qml:360
131+#: qml/Dash/GenericScopeView.qml:361
140msgid "See all"
132msgid "See all"
141msgstr ""
133msgstr ""
142
134
143−#: qml/Dash/GenericScopeView.qml:423 qml/Panel/SearchIndicator.qml:27
135+#: qml/Dash/GenericScopeView.qml:424 qml/Panel/SearchIndicator.qml:27
144msgid "Search"
136msgid "Search"
145msgstr "Търсене"
137msgstr "Търсене"
146
138
@@ -208,12 +200,16 @@ msgstr "Говорете сега..."
208msgid "Speaking..."
200msgid "Speaking..."
209msgstr "Говорете..."
201msgstr "Говорете..."
210
202
211−#: qml/Notifications/NotificationMenuItemFactory.qml:100
203+#: qml/Notifications/NotificationMenuItemFactory.qml:105
212msgid "Show password"
204msgid "Show password"
213msgstr "Покажи паролата"
205msgstr "Покажи паролата"
214
206
215−#: qml/Notifications/NotificationMenuItemFactory.qml:115
207+#: qml/Notifications/NotificationMenuItemFactory.qml:120
216−msgid "Please enter SIM PIN"
208+msgid "Enter SIM PIN"
209+msgstr ""
210+
211+#: qml/Notifications/NotificationMenuItemFactory.qml:121 qml/Shell.qml:270
212+msgid "Sorry, incorrect PIN"
217msgstr ""
213msgstr ""
218
214
219#: qml/Panel/ActiveCallHint.qml:77
215#: qml/Panel/ActiveCallHint.qml:77
@@ -256,47 +252,47 @@ msgstr ""
256msgid "Roaming"
252msgid "Roaming"
257msgstr ""
253msgstr ""
258
254
259−#: qml/Shell.qml:267
255+#: qml/Shell.qml:266
260−msgid "passphrase"
256+msgid "Enter your passphrase"
261msgstr ""
257msgstr ""
262
258
263#: qml/Shell.qml:267
259#: qml/Shell.qml:267
264−msgid "passcode"
260+msgid "Sorry, incorrect passphrase"
265msgstr ""
261msgstr ""
266
262
267#: qml/Shell.qml:269
263#: qml/Shell.qml:269
268−#, qt-format
269−msgid "Enter your %1"
264+msgid "Enter your PIN"
270msgstr ""
265msgstr ""
271
266
272−#: qml/Shell.qml:270
267+#: qml/Shell.qml:273
273#, qt-format
268#, qt-format
274−msgid "Incorrect %1"
269+msgid "Enter your %1"
275msgstr ""
270msgstr ""
276
271
277−#: qml/Shell.qml:272
272+#: qml/Shell.qml:274
278−msgid "Please re-enter"
273+#, qt-format
274+msgid "Sorry, incorrect %1"
279msgstr ""
275msgstr ""
280
276
281−#: qml/Shell.qml:306
277+#: qml/Shell.qml:310
282msgid "Sorry, incorrect passphrase."
278msgid "Sorry, incorrect passphrase."
283msgstr ""
279msgstr ""
284
280
285−#: qml/Shell.qml:307
281+#: qml/Shell.qml:311
286msgid "Sorry, incorrect passcode."
282msgid "Sorry, incorrect passcode."
287msgstr ""
283msgstr ""
288
284
289−#: qml/Shell.qml:308
285+#: qml/Shell.qml:312
290msgid "This will be your last attempt."
286msgid "This will be your last attempt."
291msgstr ""
287msgstr ""
292
288
293−#: qml/Shell.qml:310
289+#: qml/Shell.qml:314
294msgid ""
290msgid ""
295"If passphrase is entered incorrectly, your phone will conduct a factory "
291"If passphrase is entered incorrectly, your phone will conduct a factory "
296"reset and all personal data will be deleted."
292"reset and all personal data will be deleted."
297msgstr ""
293msgstr ""
298
294
299−#: qml/Shell.qml:311
295+#: qml/Shell.qml:315
300msgid ""
296msgid ""
301"If passcode is entered incorrectly, your phone will conduct a factory reset "
297"If passcode is entered incorrectly, your phone will conduct a factory reset "
302"and all personal data will be deleted."
298"and all personal data will be deleted."
po/br.po+43−38
@@ -7,15 +7,15 @@ msgid ""
7msgstr ""
7msgstr ""
8"Project-Id-Version: unity8\n"
8"Project-Id-Version: unity8\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2014-08-13 14:09-0400\n"
10+"POT-Creation-Date: 2014-08-21 11:36+0200\n"
11"PO-Revision-Date: 2014-07-28 06:44+0000\n"
11"PO-Revision-Date: 2014-07-28 06:44+0000\n"
12"Last-Translator: Fohanno Thierry <thierry.fohanno@ofis-bzh.org>\n"
12"Last-Translator: Fohanno Thierry <thierry.fohanno@ofis-bzh.org>\n"
13"Language-Team: Breton <br@li.org>\n"
13"Language-Team: Breton <br@li.org>\n"
14"MIME-Version: 1.0\n"
14"MIME-Version: 1.0\n"
15"Content-Type: text/plain; charset=UTF-8\n"
15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n"
16"Content-Transfer-Encoding: 8bit\n"
17−"X-Launchpad-Export-Date: 2014-08-15 06:28+0000\n"
17+"X-Launchpad-Export-Date: 2014-08-23 07:16+0000\n"
18−"X-Generator: Launchpad (build 17156)\n"
18+"X-Generator: Launchpad (build 17163)\n"
19
19
20#: plugins/LightDM/Greeter.cpp:129
20#: plugins/LightDM/Greeter.cpp:129
21msgid "Password: "
21msgid "Password: "
@@ -99,19 +99,19 @@ msgstr ""
99"Mestroniañ a rit ar jestroù ha gallout a rit kregiñ da implijout ar "
99"Mestroniañ a rit ar jestroù ha gallout a rit kregiñ da implijout ar "
100"pellgomzer<br><br>Touchit d'ar skramm evit kregiñ ganti"
100"pellgomzer<br><br>Touchit d'ar skramm evit kregiñ ganti"
101
101
102−#: qml/Components/Lockscreen.qml:161
102+#: qml/Components/Lockscreen.qml:167
103−msgid "Too many incorrect attempts"
103+msgid "Please wait"
104msgstr ""
104msgstr ""
105
105
106−#: qml/Components/Lockscreen.qml:163
106+#: qml/Components/Lockscreen.qml:172
107−msgid "Please wait"
107+msgid "Too many incorrect attempts"
108msgstr ""
108msgstr ""
109
109
110−#: qml/Components/Lockscreen.qml:245
110+#: qml/Components/Lockscreen.qml:206
111msgid "Emergency Call"
111msgid "Emergency Call"
112msgstr "Pellgomzadenn vallus"
112msgstr "Pellgomzadenn vallus"
113
113
114−#: qml/Components/Lockscreen.qml:268
114+#: qml/Components/Lockscreen.qml:226
115msgid "OK"
115msgid "OK"
116msgstr "Mat eo"
116msgstr "Mat eo"
117
117
@@ -124,23 +124,15 @@ msgstr "Demat %1"
124msgid "Hello"
124msgid "Hello"
125msgstr "Demat"
125msgstr "Demat"
126
126
127−#: qml/Components/PinLockscreen.qml:197
128−msgid "CANCEL"
129−msgstr "NULLAÑ"
130−
131−#: qml/Components/PinLockscreen.qml:215
132−msgid "DONE"
133−msgstr "ECHU"
134−
135−#: qml/Dash/GenericScopeView.qml:360
127+#: qml/Dash/GenericScopeView.qml:361
136msgid "See less"
128msgid "See less"
137msgstr "Gwelet nebeutoc'h"
129msgstr "Gwelet nebeutoc'h"
138
130
139−#: qml/Dash/GenericScopeView.qml:360
131+#: qml/Dash/GenericScopeView.qml:361
140msgid "See all"
132msgid "See all"
141msgstr "Gwelet pep tra"
133msgstr "Gwelet pep tra"
142
134
143−#: qml/Dash/GenericScopeView.qml:423 qml/Panel/SearchIndicator.qml:27
135+#: qml/Dash/GenericScopeView.qml:424 qml/Panel/SearchIndicator.qml:27
144msgid "Search"
136msgid "Search"
145msgstr "Klask"
137msgstr "Klask"
146
138
@@ -208,13 +200,17 @@ msgstr "Komzit bremañ..."
208msgid "Speaking..."
200msgid "Speaking..."
209msgstr "O komz..."
201msgstr "O komz..."
210
202
211−#: qml/Notifications/NotificationMenuItemFactory.qml:100
203+#: qml/Notifications/NotificationMenuItemFactory.qml:105
212msgid "Show password"
204msgid "Show password"
213msgstr "Diskouez ar ger-tremen"
205msgstr "Diskouez ar ger-tremen"
214
206
215−#: qml/Notifications/NotificationMenuItemFactory.qml:115
207+#: qml/Notifications/NotificationMenuItemFactory.qml:120
216−msgid "Please enter SIM PIN"
208+msgid "Enter SIM PIN"
217−msgstr "Ebarzhit kod PIN ho kartenn SIM, mar plij"
209+msgstr ""
210+
211+#: qml/Notifications/NotificationMenuItemFactory.qml:121 qml/Shell.qml:270
212+msgid "Sorry, incorrect PIN"
213+msgstr ""
218
214
219#: qml/Panel/ActiveCallHint.qml:77
215#: qml/Panel/ActiveCallHint.qml:77
220msgid "Tap to return to call..."
216msgid "Tap to return to call..."
@@ -256,48 +252,57 @@ msgstr ""
256msgid "Roaming"
252msgid "Roaming"
257msgstr ""
253msgstr ""
258
254
259−#: qml/Shell.qml:267
255+#: qml/Shell.qml:266
260−msgid "passphrase"
256+msgid "Enter your passphrase"
261msgstr ""
257msgstr ""
262
258
263#: qml/Shell.qml:267
259#: qml/Shell.qml:267
264−msgid "passcode"
260+msgid "Sorry, incorrect passphrase"
265msgstr ""
261msgstr ""
266
262
267#: qml/Shell.qml:269
263#: qml/Shell.qml:269
268−#, qt-format
269−msgid "Enter your %1"
264+msgid "Enter your PIN"
270msgstr ""
265msgstr ""
271
266
272−#: qml/Shell.qml:270
267+#: qml/Shell.qml:273
273#, qt-format
268#, qt-format
274−msgid "Incorrect %1"
269+msgid "Enter your %1"
275msgstr ""
270msgstr ""
276
271
277−#: qml/Shell.qml:272
272+#: qml/Shell.qml:274
278−msgid "Please re-enter"
273+#, qt-format
274+msgid "Sorry, incorrect %1"
279msgstr ""
275msgstr ""
280
276
281−#: qml/Shell.qml:306
277+#: qml/Shell.qml:310
282msgid "Sorry, incorrect passphrase."
278msgid "Sorry, incorrect passphrase."
283msgstr ""
279msgstr ""
284
280
285−#: qml/Shell.qml:307
281+#: qml/Shell.qml:311
286msgid "Sorry, incorrect passcode."
282msgid "Sorry, incorrect passcode."
287msgstr ""
283msgstr ""
288
284
289−#: qml/Shell.qml:308
285+#: qml/Shell.qml:312
290msgid "This will be your last attempt."
286msgid "This will be your last attempt."
291msgstr ""
287msgstr ""
292
288
293−#: qml/Shell.qml:310
289+#: qml/Shell.qml:314
294msgid ""
290msgid ""
295"If passphrase is entered incorrectly, your phone will conduct a factory "
291"If passphrase is entered incorrectly, your phone will conduct a factory "
296"reset and all personal data will be deleted."
292"reset and all personal data will be deleted."
297msgstr ""
293msgstr ""
298
294
299−#: qml/Shell.qml:311
295+#: qml/Shell.qml:315
300msgid ""
296msgid ""
301"If passcode is entered incorrectly, your phone will conduct a factory reset "
297"If passcode is entered incorrectly, your phone will conduct a factory reset "
302"and all personal data will be deleted."
298"and all personal data will be deleted."
303msgstr ""
299msgstr ""
300+
301+#~ msgid "CANCEL"
302+#~ msgstr "NULLAÑ"
303+
304+#~ msgid "DONE"
305+#~ msgstr "ECHU"
306+
307+#~ msgid "Please enter SIM PIN"
308+#~ msgstr "Ebarzhit kod PIN ho kartenn SIM, mar plij"
po/bs.po+33−37
@@ -7,15 +7,15 @@ msgid ""
7msgstr ""
7msgstr ""
8"Project-Id-Version: unity8\n"
8"Project-Id-Version: unity8\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2014-08-13 14:09-0400\n"
10+"POT-Creation-Date: 2014-08-21 11:36+0200\n"
11"PO-Revision-Date: 2014-01-16 22:33+0000\n"
11"PO-Revision-Date: 2014-01-16 22:33+0000\n"
12"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
12"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
13"Language-Team: Bosnian <bs@li.org>\n"
13"Language-Team: Bosnian <bs@li.org>\n"
14"MIME-Version: 1.0\n"
14"MIME-Version: 1.0\n"
15"Content-Type: text/plain; charset=UTF-8\n"
15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n"
16"Content-Transfer-Encoding: 8bit\n"
17−"X-Launchpad-Export-Date: 2014-08-15 06:28+0000\n"
17+"X-Launchpad-Export-Date: 2014-08-23 07:16+0000\n"
18−"X-Generator: Launchpad (build 17156)\n"
18+"X-Generator: Launchpad (build 17163)\n"
19
19
20#: plugins/LightDM/Greeter.cpp:129
20#: plugins/LightDM/Greeter.cpp:129
21msgid "Password: "
21msgid "Password: "
@@ -92,19 +92,19 @@ msgid ""
92"phone<br><br>Tap on the screen to start"
92"phone<br><br>Tap on the screen to start"
93msgstr ""
93msgstr ""
94
94
95−#: qml/Components/Lockscreen.qml:161
95+#: qml/Components/Lockscreen.qml:167
96−msgid "Too many incorrect attempts"
96+msgid "Please wait"
97msgstr ""
97msgstr ""
98
98
99−#: qml/Components/Lockscreen.qml:163
99+#: qml/Components/Lockscreen.qml:172
100−msgid "Please wait"
100+msgid "Too many incorrect attempts"
101msgstr ""
101msgstr ""
102
102
103−#: qml/Components/Lockscreen.qml:245
103+#: qml/Components/Lockscreen.qml:206
104msgid "Emergency Call"
104msgid "Emergency Call"
105msgstr ""
105msgstr ""
106
106
107−#: qml/Components/Lockscreen.qml:268
107+#: qml/Components/Lockscreen.qml:226
108msgid "OK"
108msgid "OK"
109msgstr ""
109msgstr ""
110
110
@@ -117,23 +117,15 @@ msgstr ""
117msgid "Hello"
117msgid "Hello"
118msgstr ""
118msgstr ""
119
119
120−#: qml/Components/PinLockscreen.qml:197
121−msgid "CANCEL"
122−msgstr ""
123−
124−#: qml/Components/PinLockscreen.qml:215
125−msgid "DONE"
126−msgstr ""
127−
128−#: qml/Dash/GenericScopeView.qml:360
120+#: qml/Dash/GenericScopeView.qml:361
129msgid "See less"
121msgid "See less"
130msgstr ""
122msgstr ""
131
123
132−#: qml/Dash/GenericScopeView.qml:360
124+#: qml/Dash/GenericScopeView.qml:361
133msgid "See all"
125msgid "See all"
134msgstr ""
126msgstr ""
135
127
136−#: qml/Dash/GenericScopeView.qml:423 qml/Panel/SearchIndicator.qml:27
128+#: qml/Dash/GenericScopeView.qml:424 qml/Panel/SearchIndicator.qml:27
137msgid "Search"
129msgid "Search"
138msgstr ""
130msgstr ""
139
131
@@ -201,12 +193,16 @@ msgstr ""
201msgid "Speaking..."
193msgid "Speaking..."
202msgstr ""
194msgstr ""
203
195
204−#: qml/Notifications/NotificationMenuItemFactory.qml:100
196+#: qml/Notifications/NotificationMenuItemFactory.qml:105
205msgid "Show password"
197msgid "Show password"
206msgstr ""
198msgstr ""
207
199
208−#: qml/Notifications/NotificationMenuItemFactory.qml:115
200+#: qml/Notifications/NotificationMenuItemFactory.qml:120
209−msgid "Please enter SIM PIN"
201+msgid "Enter SIM PIN"
202+msgstr ""
203+
204+#: qml/Notifications/NotificationMenuItemFactory.qml:121 qml/Shell.qml:270
205+msgid "Sorry, incorrect PIN"
210msgstr ""
206msgstr ""
211
207
212#: qml/Panel/ActiveCallHint.qml:77
208#: qml/Panel/ActiveCallHint.qml:77
@@ -249,47 +245,47 @@ msgstr ""
249msgid "Roaming"
245msgid "Roaming"
250msgstr ""
246msgstr ""
251
247
252−#: qml/Shell.qml:267
248+#: qml/Shell.qml:266
253−msgid "passphrase"
249+msgid "Enter your passphrase"
254msgstr ""
250msgstr ""
255
251
256#: qml/Shell.qml:267
252#: qml/Shell.qml:267
257−msgid "passcode"
253+msgid "Sorry, incorrect passphrase"
258msgstr ""
254msgstr ""
259
255
260#: qml/Shell.qml:269
256#: qml/Shell.qml:269
261−#, qt-format
262−msgid "Enter your %1"
257+msgid "Enter your PIN"
263msgstr ""
258msgstr ""
264
259
265−#: qml/Shell.qml:270
260+#: qml/Shell.qml:273
266#, qt-format
261#, qt-format
267−msgid "Incorrect %1"
262+msgid "Enter your %1"
268msgstr ""
263msgstr ""
269
264
270−#: qml/Shell.qml:272
265+#: qml/Shell.qml:274
271−msgid "Please re-enter"
266+#, qt-format
267+msgid "Sorry, incorrect %1"
272msgstr ""
268msgstr ""
273
269
274−#: qml/Shell.qml:306
270+#: qml/Shell.qml:310
275msgid "Sorry, incorrect passphrase."
271msgid "Sorry, incorrect passphrase."
276msgstr ""
272msgstr ""
277
273
278−#: qml/Shell.qml:307
274+#: qml/Shell.qml:311
279msgid "Sorry, incorrect passcode."
275msgid "Sorry, incorrect passcode."
280msgstr ""
276msgstr ""
281
277
282−#: qml/Shell.qml:308
278+#: qml/Shell.qml:312
283msgid "This will be your last attempt."
279msgid "This will be your last attempt."
284msgstr ""
280msgstr ""
285
281
286−#: qml/Shell.qml:310
282+#: qml/Shell.qml:314
287msgid ""
283msgid ""
288"If passphrase is entered incorrectly, your phone will conduct a factory "
284"If passphrase is entered incorrectly, your phone will conduct a factory "
289"reset and all personal data will be deleted."
285"reset and all personal data will be deleted."
290msgstr ""
286msgstr ""
291
287
292−#: qml/Shell.qml:311
288+#: qml/Shell.qml:315
293msgid ""
289msgid ""
294"If passcode is entered incorrectly, your phone will conduct a factory reset "
290"If passcode is entered incorrectly, your phone will conduct a factory reset "
295"and all personal data will be deleted."
291"and all personal data will be deleted."
po/ca.po+60−42
@@ -7,15 +7,15 @@ msgid ""
7msgstr ""
7msgstr ""
8"Project-Id-Version: unity\n"
8"Project-Id-Version: unity\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2014-08-13 14:09-0400\n"
10+"POT-Creation-Date: 2014-08-21 11:36+0200\n"
11"PO-Revision-Date: 2014-08-17 03:42+0000\n"
11"PO-Revision-Date: 2014-08-17 03:42+0000\n"
12"Last-Translator: David Planella <david.planella@ubuntu.com>\n"
12"Last-Translator: David Planella <david.planella@ubuntu.com>\n"
13"Language-Team: Catalan <ca@li.org>\n"
13"Language-Team: Catalan <ca@li.org>\n"
14"MIME-Version: 1.0\n"
14"MIME-Version: 1.0\n"
15"Content-Type: text/plain; charset=UTF-8\n"
15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n"
16"Content-Transfer-Encoding: 8bit\n"
17−"X-Launchpad-Export-Date: 2014-08-18 07:20+0000\n"
17+"X-Launchpad-Export-Date: 2014-08-23 07:16+0000\n"
18−"X-Generator: Launchpad (build 17156)\n"
18+"X-Generator: Launchpad (build 17163)\n"
19
19
20#: plugins/LightDM/Greeter.cpp:129
20#: plugins/LightDM/Greeter.cpp:129
21msgid "Password: "
21msgid "Password: "
@@ -100,19 +100,19 @@ msgstr ""
100"Ja heu après com utilitzar els gestos de les vores per fer servir el "
100"Ja heu après com utilitzar els gestos de les vores per fer servir el "
101"telèfon<br><br>Feu un toc a la pantalla per començar"
101"telèfon<br><br>Feu un toc a la pantalla per començar"
102
102
103−#: qml/Components/Lockscreen.qml:161
103+#: qml/Components/Lockscreen.qml:167
104−msgid "Too many incorrect attempts"
105−msgstr "Massa intents incorrectes"
106−
107−#: qml/Components/Lockscreen.qml:163
108msgid "Please wait"
104msgid "Please wait"
109msgstr "Espereu"
105msgstr "Espereu"
110
106
111−#: qml/Components/Lockscreen.qml:245
107+#: qml/Components/Lockscreen.qml:172
108+msgid "Too many incorrect attempts"
109+msgstr "Massa intents incorrectes"
110+
111+#: qml/Components/Lockscreen.qml:206
112msgid "Emergency Call"
112msgid "Emergency Call"
113msgstr "Trucada d'emergència"
113msgstr "Trucada d'emergència"
114
114
115−#: qml/Components/Lockscreen.qml:268
115+#: qml/Components/Lockscreen.qml:226
116msgid "OK"
116msgid "OK"
117msgstr "D'acord"
117msgstr "D'acord"
118
118
@@ -125,23 +125,15 @@ msgstr "Hola %1"
125msgid "Hello"
125msgid "Hello"
126msgstr "Hola"
126msgstr "Hola"
127
127
128−#: qml/Components/PinLockscreen.qml:197
129−msgid "CANCEL"
130−msgstr "Cancel·la"
131−
132−#: qml/Components/PinLockscreen.qml:215
133−msgid "DONE"
134−msgstr "Fet"
135−
136−#: qml/Dash/GenericScopeView.qml:360
128+#: qml/Dash/GenericScopeView.qml:361
137msgid "See less"
129msgid "See less"
138msgstr "Mostra'n menys"
130msgstr "Mostra'n menys"
139
131
140−#: qml/Dash/GenericScopeView.qml:360
132+#: qml/Dash/GenericScopeView.qml:361
141msgid "See all"
133msgid "See all"
142msgstr "Mostra-ho tot"
134msgstr "Mostra-ho tot"
143
135
144−#: qml/Dash/GenericScopeView.qml:423 qml/Panel/SearchIndicator.qml:27
136+#: qml/Dash/GenericScopeView.qml:424 qml/Panel/SearchIndicator.qml:27
145msgid "Search"
137msgid "Search"
146msgstr "Cerca"
138msgstr "Cerca"
147
139
@@ -209,13 +201,17 @@ msgstr "Parleu..."
209msgid "Speaking..."
201msgid "Speaking..."
210msgstr "S'està parlant..."
202msgstr "S'està parlant..."
211
203
212−#: qml/Notifications/NotificationMenuItemFactory.qml:100
204+#: qml/Notifications/NotificationMenuItemFactory.qml:105
213msgid "Show password"
205msgid "Show password"
214msgstr "Mostra la contrasenya"
206msgstr "Mostra la contrasenya"
215
207
216−#: qml/Notifications/NotificationMenuItemFactory.qml:115
208+#: qml/Notifications/NotificationMenuItemFactory.qml:120
217−msgid "Please enter SIM PIN"
209+msgid "Enter SIM PIN"
218−msgstr "Introduïu el PIN de la targeta SIM"
210+msgstr ""
211+
212+#: qml/Notifications/NotificationMenuItemFactory.qml:121 qml/Shell.qml:270
213+msgid "Sorry, incorrect PIN"
214+msgstr ""
219
215
220#: qml/Panel/ActiveCallHint.qml:77
216#: qml/Panel/ActiveCallHint.qml:77
221msgid "Tap to return to call..."
217msgid "Tap to return to call..."
@@ -257,41 +253,41 @@ msgstr "Desbloca la SIM"
257msgid "Roaming"
253msgid "Roaming"
258msgstr "Itinerància"
254msgstr "Itinerància"
259
255
260−#: qml/Shell.qml:267
256+#: qml/Shell.qml:266
261−msgid "passphrase"
257+msgid "Enter your passphrase"
262−msgstr "contrasenya"
258+msgstr ""
263
259
264#: qml/Shell.qml:267
260#: qml/Shell.qml:267
265−msgid "passcode"
261+msgid "Sorry, incorrect passphrase"
266−msgstr "clau"
262+msgstr ""
267
263
268#: qml/Shell.qml:269
264#: qml/Shell.qml:269
265+msgid "Enter your PIN"
266+msgstr ""
267+
268+#: qml/Shell.qml:273
269#, qt-format
269#, qt-format
270msgid "Enter your %1"
270msgid "Enter your %1"
271msgstr "Introduïu la %1"
271msgstr "Introduïu la %1"
272
272
273−#: qml/Shell.qml:270
273+#: qml/Shell.qml:274
274#, qt-format
274#, qt-format
275−msgid "Incorrect %1"
275+msgid "Sorry, incorrect %1"
276−msgstr "La %1 és incorrecta"
277−
278−#: qml/Shell.qml:272
279−msgid "Please re-enter"
280−msgstr "Torneu-la a introduir"
276+msgstr ""
281
277
282−#: qml/Shell.qml:306
278+#: qml/Shell.qml:310
283msgid "Sorry, incorrect passphrase."
279msgid "Sorry, incorrect passphrase."
284msgstr "La contrasenya és incorrecta"
280msgstr "La contrasenya és incorrecta"
285
281
286−#: qml/Shell.qml:307
282+#: qml/Shell.qml:311
287msgid "Sorry, incorrect passcode."
283msgid "Sorry, incorrect passcode."
288msgstr "La clau és incorrecta"
284msgstr "La clau és incorrecta"
289
285
290−#: qml/Shell.qml:308
286+#: qml/Shell.qml:312
291msgid "This will be your last attempt."
287msgid "This will be your last attempt."
292msgstr "Aquest serà el darrer intent."
288msgstr "Aquest serà el darrer intent."
293
289
294−#: qml/Shell.qml:310
290+#: qml/Shell.qml:314
295msgid ""
291msgid ""
296"If passphrase is entered incorrectly, your phone will conduct a factory "
292"If passphrase is entered incorrectly, your phone will conduct a factory "
297"reset and all personal data will be deleted."
293"reset and all personal data will be deleted."
@@ -300,10 +296,32 @@ msgstr ""
300"reinicialitzarà a l'estat de fàbrica i se suprimiran totes les dades "
296"reinicialitzarà a l'estat de fàbrica i se suprimiran totes les dades "
301"personals."
297"personals."
302
298
303−#: qml/Shell.qml:311
299+#: qml/Shell.qml:315
304msgid ""
300msgid ""
305"If passcode is entered incorrectly, your phone will conduct a factory reset "
301"If passcode is entered incorrectly, your phone will conduct a factory reset "
306"and all personal data will be deleted."
302"and all personal data will be deleted."
307msgstr ""
303msgstr ""
308"Si la clau s'introdueix de manera incorrecta, el telèfon es reinicialitzarà "
304"Si la clau s'introdueix de manera incorrecta, el telèfon es reinicialitzarà "
309"a l'estat de fàbrica i se suprimiran totes les dades personals."
305"a l'estat de fàbrica i se suprimiran totes les dades personals."
306+
307+#~ msgid "Please enter SIM PIN"
308+#~ msgstr "Introduïu el PIN de la targeta SIM"
309+
310+#~ msgid "DONE"
311+#~ msgstr "Fet"
312+
313+#~ msgid "CANCEL"
314+#~ msgstr "Cancel·la"
315+
316+#~ msgid "passphrase"
317+#~ msgstr "contrasenya"
318+
319+#~ msgid "Please re-enter"
320+#~ msgstr "Torneu-la a introduir"
321+
322+#~ msgid "passcode"
323+#~ msgstr "clau"
324+
325+#, qt-format
326+#~ msgid "Incorrect %1"
327+#~ msgstr "La %1 és incorrecta"
po/ckb.po+33−37
@@ -7,15 +7,15 @@ msgid ""
7msgstr ""
7msgstr ""
8"Project-Id-Version: unity8\n"
8"Project-Id-Version: unity8\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2014-08-13 14:09-0400\n"
10+"POT-Creation-Date: 2014-08-21 11:36+0200\n"
11"PO-Revision-Date: 2014-01-21 11:05+0000\n"
11"PO-Revision-Date: 2014-01-21 11:05+0000\n"
12"Last-Translator: Aras <aras.noori@gmail.com>\n"
12"Last-Translator: Aras <aras.noori@gmail.com>\n"
13"Language-Team: Kurdish (Sorani) <ckb@li.org>\n"
13"Language-Team: Kurdish (Sorani) <ckb@li.org>\n"
14"MIME-Version: 1.0\n"
14"MIME-Version: 1.0\n"
15"Content-Type: text/plain; charset=UTF-8\n"
15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n"
16"Content-Transfer-Encoding: 8bit\n"
17−"X-Launchpad-Export-Date: 2014-08-15 06:29+0000\n"
17+"X-Launchpad-Export-Date: 2014-08-23 07:17+0000\n"
18−"X-Generator: Launchpad (build 17156)\n"
18+"X-Generator: Launchpad (build 17163)\n"
19
19
20#: plugins/LightDM/Greeter.cpp:129
20#: plugins/LightDM/Greeter.cpp:129
21msgid "Password: "
21msgid "Password: "
@@ -92,19 +92,19 @@ msgid ""
92"phone<br><br>Tap on the screen to start"
92"phone<br><br>Tap on the screen to start"
93msgstr ""
93msgstr ""
94
94
95−#: qml/Components/Lockscreen.qml:161
95+#: qml/Components/Lockscreen.qml:167
96−msgid "Too many incorrect attempts"
96+msgid "Please wait"
97msgstr ""
97msgstr ""
98
98
99−#: qml/Components/Lockscreen.qml:163
99+#: qml/Components/Lockscreen.qml:172
100−msgid "Please wait"
100+msgid "Too many incorrect attempts"
101msgstr ""
101msgstr ""
102
102
103−#: qml/Components/Lockscreen.qml:245
103+#: qml/Components/Lockscreen.qml:206
104msgid "Emergency Call"
104msgid "Emergency Call"
105msgstr "هێڵی فریاگوزاری"
105msgstr "هێڵی فریاگوزاری"
106
106
107−#: qml/Components/Lockscreen.qml:268
107+#: qml/Components/Lockscreen.qml:226
108msgid "OK"
108msgid "OK"
109msgstr ""
109msgstr ""
110
110
@@ -117,23 +117,15 @@ msgstr "سڵاو %1"
117msgid "Hello"
117msgid "Hello"
118msgstr "سڵاو"
118msgstr "سڵاو"
119
119
120−#: qml/Components/PinLockscreen.qml:197
121−msgid "CANCEL"
122−msgstr ""
123−
124−#: qml/Components/PinLockscreen.qml:215
125−msgid "DONE"
126−msgstr ""
127−
128−#: qml/Dash/GenericScopeView.qml:360
120+#: qml/Dash/GenericScopeView.qml:361
129msgid "See less"
121msgid "See less"
130msgstr ""
122msgstr ""
131
123
132−#: qml/Dash/GenericScopeView.qml:360
124+#: qml/Dash/GenericScopeView.qml:361
133msgid "See all"
125msgid "See all"
134msgstr ""
126msgstr ""
135
127
136−#: qml/Dash/GenericScopeView.qml:423 qml/Panel/SearchIndicator.qml:27
128+#: qml/Dash/GenericScopeView.qml:424 qml/Panel/SearchIndicator.qml:27
137msgid "Search"
129msgid "Search"
138msgstr "گەڕان"
130msgstr "گەڕان"
139
131
@@ -201,12 +193,16 @@ msgstr "ئێستا قسە بکە"
201msgid "Speaking..."
193msgid "Speaking..."
202msgstr "قسە دەکات..."
194msgstr "قسە دەکات..."
203
195
204−#: qml/Notifications/NotificationMenuItemFactory.qml:100
196+#: qml/Notifications/NotificationMenuItemFactory.qml:105
205msgid "Show password"
197msgid "Show password"
206msgstr "تێپەڕەوشە پیشان بدە"
198msgstr "تێپەڕەوشە پیشان بدە"
207
199
208−#: qml/Notifications/NotificationMenuItemFactory.qml:115
200+#: qml/Notifications/NotificationMenuItemFactory.qml:120
209−msgid "Please enter SIM PIN"
201+msgid "Enter SIM PIN"
202+msgstr ""
203+
204+#: qml/Notifications/NotificationMenuItemFactory.qml:121 qml/Shell.qml:270
205+msgid "Sorry, incorrect PIN"
210msgstr ""
206msgstr ""
211
207
212#: qml/Panel/ActiveCallHint.qml:77
208#: qml/Panel/ActiveCallHint.qml:77
@@ -249,47 +245,47 @@ msgstr ""
249msgid "Roaming"
245msgid "Roaming"
250msgstr ""
246msgstr ""
251
247
252−#: qml/Shell.qml:267
248+#: qml/Shell.qml:266
253−msgid "passphrase"
249+msgid "Enter your passphrase"
254msgstr ""
250msgstr ""
255
251
256#: qml/Shell.qml:267
252#: qml/Shell.qml:267
257−msgid "passcode"
253+msgid "Sorry, incorrect passphrase"
258msgstr ""
254msgstr ""
259
255
260#: qml/Shell.qml:269
256#: qml/Shell.qml:269
261−#, qt-format
262−msgid "Enter your %1"
257+msgid "Enter your PIN"
263msgstr ""
258msgstr ""
264
259
265−#: qml/Shell.qml:270
260+#: qml/Shell.qml:273
266#, qt-format
261#, qt-format
267−msgid "Incorrect %1"
262+msgid "Enter your %1"
268msgstr ""
263msgstr ""
269
264
270−#: qml/Shell.qml:272
265+#: qml/Shell.qml:274
271−msgid "Please re-enter"
266+#, qt-format
267+msgid "Sorry, incorrect %1"
272msgstr ""
268msgstr ""
273
269
274−#: qml/Shell.qml:306
270+#: qml/Shell.qml:310
275msgid "Sorry, incorrect passphrase."
271msgid "Sorry, incorrect passphrase."
276msgstr ""
272msgstr ""
277
273
278−#: qml/Shell.qml:307
274+#: qml/Shell.qml:311
279msgid "Sorry, incorrect passcode."
275msgid "Sorry, incorrect passcode."
280msgstr ""
276msgstr ""
281
277
282−#: qml/Shell.qml:308
278+#: qml/Shell.qml:312
283msgid "This will be your last attempt."
279msgid "This will be your last attempt."
284msgstr ""
280msgstr ""
285
281
286−#: qml/Shell.qml:310
282+#: qml/Shell.qml:314
287msgid ""
283msgid ""
288"If passphrase is entered incorrectly, your phone will conduct a factory "
284"If passphrase is entered incorrectly, your phone will conduct a factory "
289"reset and all personal data will be deleted."
285"reset and all personal data will be deleted."
290msgstr ""
286msgstr ""
291
287
292−#: qml/Shell.qml:311
288+#: qml/Shell.qml:315
293msgid ""
289msgid ""
294"If passcode is entered incorrectly, your phone will conduct a factory reset "
290"If passcode is entered incorrectly, your phone will conduct a factory reset "
295"and all personal data will be deleted."
291"and all personal data will be deleted."
po/cs.po+33−37
@@ -7,15 +7,15 @@ msgid ""
7msgstr ""
7msgstr ""
8"Project-Id-Version: unity8\n"
8"Project-Id-Version: unity8\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2014-08-13 14:09-0400\n"
10+"POT-Creation-Date: 2014-08-21 11:36+0200\n"
11"PO-Revision-Date: 2014-01-08 10:11+0000\n"
11"PO-Revision-Date: 2014-01-08 10:11+0000\n"
12"Last-Translator: Tadeáš Pařík <tadeas.parik@gmail.com>\n"
12"Last-Translator: Tadeáš Pařík <tadeas.parik@gmail.com>\n"
13"Language-Team: Czech <cs@li.org>\n"
13"Language-Team: Czech <cs@li.org>\n"
14"MIME-Version: 1.0\n"
14"MIME-Version: 1.0\n"
15"Content-Type: text/plain; charset=UTF-8\n"
15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n"
16"Content-Transfer-Encoding: 8bit\n"
17−"X-Launchpad-Export-Date: 2014-08-15 06:28+0000\n"
17+"X-Launchpad-Export-Date: 2014-08-23 07:16+0000\n"
18−"X-Generator: Launchpad (build 17156)\n"
18+"X-Generator: Launchpad (build 17163)\n"
19
19
20#: plugins/LightDM/Greeter.cpp:129
20#: plugins/LightDM/Greeter.cpp:129
21msgid "Password: "
21msgid "Password: "
@@ -92,19 +92,19 @@ msgid ""
92"phone<br><br>Tap on the screen to start"
92"phone<br><br>Tap on the screen to start"
93msgstr ""
93msgstr ""
94
94
95−#: qml/Components/Lockscreen.qml:161
95+#: qml/Components/Lockscreen.qml:167
96−msgid "Too many incorrect attempts"
96+msgid "Please wait"
97msgstr ""
97msgstr ""
98
98
99−#: qml/Components/Lockscreen.qml:163
99+#: qml/Components/Lockscreen.qml:172
100−msgid "Please wait"
100+msgid "Too many incorrect attempts"
101msgstr ""
101msgstr ""
102
102
103−#: qml/Components/Lockscreen.qml:245
103+#: qml/Components/Lockscreen.qml:206
104msgid "Emergency Call"
104msgid "Emergency Call"
105msgstr "Tísňové volání"
105msgstr "Tísňové volání"
106
106
107−#: qml/Components/Lockscreen.qml:268
107+#: qml/Components/Lockscreen.qml:226
108msgid "OK"
108msgid "OK"
109msgstr ""
109msgstr ""
110
110
@@ -117,23 +117,15 @@ msgstr "Ahoj %1"
117msgid "Hello"
117msgid "Hello"
118msgstr "Ahoj"
118msgstr "Ahoj"
119
119
120−#: qml/Components/PinLockscreen.qml:197
121−msgid "CANCEL"
122−msgstr ""
123−
124−#: qml/Components/PinLockscreen.qml:215
125−msgid "DONE"
126−msgstr ""
127−
128−#: qml/Dash/GenericScopeView.qml:360
120+#: qml/Dash/GenericScopeView.qml:361
129msgid "See less"
121msgid "See less"
130msgstr ""
122msgstr ""
131
123
132−#: qml/Dash/GenericScopeView.qml:360
124+#: qml/Dash/GenericScopeView.qml:361
133msgid "See all"
125msgid "See all"
134msgstr ""
126msgstr ""
135
127
136−#: qml/Dash/GenericScopeView.qml:423 qml/Panel/SearchIndicator.qml:27
128+#: qml/Dash/GenericScopeView.qml:424 qml/Panel/SearchIndicator.qml:27
137msgid "Search"
129msgid "Search"
138msgstr "Hledat"
130msgstr "Hledat"
139
131
@@ -201,12 +193,16 @@ msgstr "Mluvte..."
201msgid "Speaking..."
193msgid "Speaking..."
202msgstr "Mluvte..."
194msgstr "Mluvte..."
203
195
204−#: qml/Notifications/NotificationMenuItemFactory.qml:100
196+#: qml/Notifications/NotificationMenuItemFactory.qml:105
205msgid "Show password"
197msgid "Show password"
206msgstr "Zobrazit heslo"
198msgstr "Zobrazit heslo"
207
199
208−#: qml/Notifications/NotificationMenuItemFactory.qml:115
200+#: qml/Notifications/NotificationMenuItemFactory.qml:120
209−msgid "Please enter SIM PIN"
201+msgid "Enter SIM PIN"
202+msgstr ""
203+
204+#: qml/Notifications/NotificationMenuItemFactory.qml:121 qml/Shell.qml:270
205+msgid "Sorry, incorrect PIN"
210msgstr ""
206msgstr ""
211
207
212#: qml/Panel/ActiveCallHint.qml:77
208#: qml/Panel/ActiveCallHint.qml:77
@@ -249,47 +245,47 @@ msgstr ""
249msgid "Roaming"
245msgid "Roaming"
250msgstr ""
246msgstr ""
251
247
252−#: qml/Shell.qml:267
248+#: qml/Shell.qml:266
253−msgid "passphrase"
249+msgid "Enter your passphrase"
254msgstr ""
250msgstr ""
255
251
256#: qml/Shell.qml:267
252#: qml/Shell.qml:267
257−msgid "passcode"
253+msgid "Sorry, incorrect passphrase"
258msgstr ""
254msgstr ""
259
255
260#: qml/Shell.qml:269
256#: qml/Shell.qml:269
261−#, qt-format
262−msgid "Enter your %1"
257+msgid "Enter your PIN"
263msgstr ""
258msgstr ""
264
259
265−#: qml/Shell.qml:270
260+#: qml/Shell.qml:273
266#, qt-format
261#, qt-format
267−msgid "Incorrect %1"
262+msgid "Enter your %1"
268msgstr ""
263msgstr ""
269
264
270−#: qml/Shell.qml:272
265+#: qml/Shell.qml:274
271−msgid "Please re-enter"
266+#, qt-format
267+msgid "Sorry, incorrect %1"
272msgstr ""
268msgstr ""
273
269
274−#: qml/Shell.qml:306
270+#: qml/Shell.qml:310
275msgid "Sorry, incorrect passphrase."
271msgid "Sorry, incorrect passphrase."
276msgstr ""
272msgstr ""
277
273
278−#: qml/Shell.qml:307
274+#: qml/Shell.qml:311
279msgid "Sorry, incorrect passcode."
275msgid "Sorry, incorrect passcode."
280msgstr ""
276msgstr ""
281
277
282−#: qml/Shell.qml:308
278+#: qml/Shell.qml:312
283msgid "This will be your last attempt."
279msgid "This will be your last attempt."
284msgstr ""
280msgstr ""
285
281
286−#: qml/Shell.qml:310
282+#: qml/Shell.qml:314
287msgid ""
283msgid ""
288"If passphrase is entered incorrectly, your phone will conduct a factory "
284"If passphrase is entered incorrectly, your phone will conduct a factory "
289"reset and all personal data will be deleted."
285"reset and all personal data will be deleted."
290msgstr ""
286msgstr ""
291
287
292−#: qml/Shell.qml:311
288+#: qml/Shell.qml:315
293msgid ""
289msgid ""
294"If passcode is entered incorrectly, your phone will conduct a factory reset "
290"If passcode is entered incorrectly, your phone will conduct a factory reset "
295"and all personal data will be deleted."
291"and all personal data will be deleted."
po/da.po+43−38
@@ -8,15 +8,15 @@ msgid ""
8msgstr ""
8msgstr ""
9"Project-Id-Version: unity8\n"
9"Project-Id-Version: unity8\n"
10"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
11−"POT-Creation-Date: 2014-08-13 14:09-0400\n"
11+"POT-Creation-Date: 2014-08-21 11:36+0200\n"
12"PO-Revision-Date: 2014-07-30 12:37+0000\n"
12"PO-Revision-Date: 2014-07-30 12:37+0000\n"
13"Last-Translator: Ask Hjorth Larsen <asklarsen@gmail.com>\n"
13"Last-Translator: Ask Hjorth Larsen <asklarsen@gmail.com>\n"
14"Language-Team: Danish <dansk@dansk-gruppen.dk>\n"
14"Language-Team: Danish <dansk@dansk-gruppen.dk>\n"
15"MIME-Version: 1.0\n"
15"MIME-Version: 1.0\n"
16"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Type: text/plain; charset=UTF-8\n"
17"Content-Transfer-Encoding: 8bit\n"
17"Content-Transfer-Encoding: 8bit\n"
18−"X-Launchpad-Export-Date: 2014-08-15 06:28+0000\n"
18+"X-Launchpad-Export-Date: 2014-08-23 07:16+0000\n"
19−"X-Generator: Launchpad (build 17156)\n"
19+"X-Generator: Launchpad (build 17163)\n"
20
20
21#: plugins/LightDM/Greeter.cpp:129
21#: plugins/LightDM/Greeter.cpp:129
22msgid "Password: "
22msgid "Password: "
@@ -95,19 +95,19 @@ msgstr ""
95"Du mestrer nu kantbevægelserne og kan begynde at bruge telefonen<br><br>Tryk "
95"Du mestrer nu kantbevægelserne og kan begynde at bruge telefonen<br><br>Tryk "
96"på skærmen for at starte"
96"på skærmen for at starte"
97
97
98−#: qml/Components/Lockscreen.qml:161
98+#: qml/Components/Lockscreen.qml:167
99−msgid "Too many incorrect attempts"
99+msgid "Please wait"
100msgstr ""
100msgstr ""
101
101
102−#: qml/Components/Lockscreen.qml:163
102+#: qml/Components/Lockscreen.qml:172
103−msgid "Please wait"
103+msgid "Too many incorrect attempts"
104msgstr ""
104msgstr ""
105
105
106−#: qml/Components/Lockscreen.qml:245
106+#: qml/Components/Lockscreen.qml:206
107msgid "Emergency Call"
107msgid "Emergency Call"
108msgstr "Nødopkald"
108msgstr "Nødopkald"
109
109
110−#: qml/Components/Lockscreen.qml:268
110+#: qml/Components/Lockscreen.qml:226
111msgid "OK"
111msgid "OK"
112msgstr "O.k."
112msgstr "O.k."
113
113
@@ -120,23 +120,15 @@ msgstr "Hej %1"
120msgid "Hello"
120msgid "Hello"
121msgstr "Hej"
121msgstr "Hej"
122
122
123−#: qml/Components/PinLockscreen.qml:197
124−msgid "CANCEL"
125−msgstr "ANNULLÉR"
126−
127−#: qml/Components/PinLockscreen.qml:215
128−msgid "DONE"
129−msgstr "FÆRDIG"
130−
131−#: qml/Dash/GenericScopeView.qml:360
123+#: qml/Dash/GenericScopeView.qml:361
132msgid "See less"
124msgid "See less"
133msgstr "Vis mindre"
125msgstr "Vis mindre"
134
126
135−#: qml/Dash/GenericScopeView.qml:360
127+#: qml/Dash/GenericScopeView.qml:361
136msgid "See all"
128msgid "See all"
137msgstr "Se alle"
129msgstr "Se alle"
138
130
139−#: qml/Dash/GenericScopeView.qml:423 qml/Panel/SearchIndicator.qml:27
131+#: qml/Dash/GenericScopeView.qml:424 qml/Panel/SearchIndicator.qml:27
140msgid "Search"
132msgid "Search"
141msgstr "Søg"
133msgstr "Søg"
142
134
@@ -204,13 +196,17 @@ msgstr "Tal nu..."
204msgid "Speaking..."
196msgid "Speaking..."
205msgstr "Taler..."
197msgstr "Taler..."
206
198
207−#: qml/Notifications/NotificationMenuItemFactory.qml:100
199+#: qml/Notifications/NotificationMenuItemFactory.qml:105
208msgid "Show password"
200msgid "Show password"
209msgstr "Vis adgangskode"
201msgstr "Vis adgangskode"
210
202
211−#: qml/Notifications/NotificationMenuItemFactory.qml:115
203+#: qml/Notifications/NotificationMenuItemFactory.qml:120
212−msgid "Please enter SIM PIN"
204+msgid "Enter SIM PIN"
213−msgstr "Indtast venligst PIN for SIM"
205+msgstr ""
206+
207+#: qml/Notifications/NotificationMenuItemFactory.qml:121 qml/Shell.qml:270
208+msgid "Sorry, incorrect PIN"
209+msgstr ""
214
210
215#: qml/Panel/ActiveCallHint.qml:77
211#: qml/Panel/ActiveCallHint.qml:77
216msgid "Tap to return to call..."
212msgid "Tap to return to call..."
@@ -252,48 +248,57 @@ msgstr ""
252msgid "Roaming"
248msgid "Roaming"
253msgstr ""
249msgstr ""
254
250
255−#: qml/Shell.qml:267
251+#: qml/Shell.qml:266
256−msgid "passphrase"
252+msgid "Enter your passphrase"
257msgstr ""
253msgstr ""
258
254
259#: qml/Shell.qml:267
255#: qml/Shell.qml:267
260−msgid "passcode"
256+msgid "Sorry, incorrect passphrase"
261msgstr ""
257msgstr ""
262
258
263#: qml/Shell.qml:269
259#: qml/Shell.qml:269
264−#, qt-format
265−msgid "Enter your %1"
260+msgid "Enter your PIN"
266msgstr ""
261msgstr ""
267
262
268−#: qml/Shell.qml:270
263+#: qml/Shell.qml:273
269#, qt-format
264#, qt-format
270−msgid "Incorrect %1"
265+msgid "Enter your %1"
271msgstr ""
266msgstr ""
272
267
273−#: qml/Shell.qml:272
268+#: qml/Shell.qml:274
274−msgid "Please re-enter"
269+#, qt-format
270+msgid "Sorry, incorrect %1"
275msgstr ""
271msgstr ""
276
272
277−#: qml/Shell.qml:306
273+#: qml/Shell.qml:310
278msgid "Sorry, incorrect passphrase."
274msgid "Sorry, incorrect passphrase."
279msgstr ""
275msgstr ""
280
276
281−#: qml/Shell.qml:307
277+#: qml/Shell.qml:311
282msgid "Sorry, incorrect passcode."
278msgid "Sorry, incorrect passcode."
283msgstr ""
279msgstr ""
284
280
285−#: qml/Shell.qml:308
281+#: qml/Shell.qml:312
286msgid "This will be your last attempt."
282msgid "This will be your last attempt."
287msgstr ""
283msgstr ""
288
284
289−#: qml/Shell.qml:310
285+#: qml/Shell.qml:314
290msgid ""
286msgid ""
291"If passphrase is entered incorrectly, your phone will conduct a factory "
287"If passphrase is entered incorrectly, your phone will conduct a factory "
292"reset and all personal data will be deleted."
288"reset and all personal data will be deleted."
293msgstr ""
289msgstr ""
294
290
295−#: qml/Shell.qml:311
291+#: qml/Shell.qml:315
296msgid ""
292msgid ""
297"If passcode is entered incorrectly, your phone will conduct a factory reset "
293"If passcode is entered incorrectly, your phone will conduct a factory reset "
298"and all personal data will be deleted."
294"and all personal data will be deleted."
299msgstr ""
295msgstr ""
296+
297+#~ msgid "CANCEL"
298+#~ msgstr "ANNULLÉR"
299+
300+#~ msgid "DONE"
301+#~ msgstr "FÆRDIG"
302+
303+#~ msgid "Please enter SIM PIN"
304+#~ msgstr "Indtast venligst PIN for SIM"
po/de.po+72−50
@@ -7,15 +7,15 @@ msgid ""
7msgstr ""
7msgstr ""
8"Project-Id-Version: unity\n"
8"Project-Id-Version: unity\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2014-08-13 14:09-0400\n"
10+"POT-Creation-Date: 2014-08-21 11:36+0200\n"
11−"PO-Revision-Date: 2014-08-17 21:46+0000\n"
11+"PO-Revision-Date: 2014-08-21 16:18+0000\n"
12−"Last-Translator: Phillip Sz <Unknown>\n"
12+"Last-Translator: Martin Pitt <martin.pitt@ubuntu.com>\n"
13"Language-Team: German <de@li.org>\n"
13"Language-Team: German <de@li.org>\n"
14"MIME-Version: 1.0\n"
14"MIME-Version: 1.0\n"
15"Content-Type: text/plain; charset=UTF-8\n"
15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n"
16"Content-Transfer-Encoding: 8bit\n"
17−"X-Launchpad-Export-Date: 2014-08-18 07:20+0000\n"
17+"X-Launchpad-Export-Date: 2014-08-23 07:17+0000\n"
18−"X-Generator: Launchpad (build 17156)\n"
18+"X-Generator: Launchpad (build 17163)\n"
19
19
20#: plugins/LightDM/Greeter.cpp:129
20#: plugins/LightDM/Greeter.cpp:129
21msgid "Password: "
21msgid "Password: "
@@ -32,7 +32,7 @@ msgstr "Verknüpfung entfernen"
32
32
33#: qml/Components/Dialogs.qml:142
33#: qml/Components/Dialogs.qml:142
34msgid "Are you sure you would like to turn power off?"
34msgid "Are you sure you would like to turn power off?"
35−msgstr ""
35+msgstr "Sind Sie sicher dass das Telefon ausgeschaltet werden soll?"
36
36
37#: qml/Components/Dialogs.qml:144
37#: qml/Components/Dialogs.qml:144
38msgid "Power off"
38msgid "Power off"
@@ -97,19 +97,19 @@ msgstr ""
97"Sie haben nun die Kantengesten erfolgreich erlernt und können das Telefon "
97"Sie haben nun die Kantengesten erfolgreich erlernt und können das Telefon "
98"nun nutzen<br><br>Zum Starten auf den Bildschirm tippen"
98"nun nutzen<br><br>Zum Starten auf den Bildschirm tippen"
99
99
100−#: qml/Components/Lockscreen.qml:161
100+#: qml/Components/Lockscreen.qml:167
101−msgid "Too many incorrect attempts"
102−msgstr ""
103−
104−#: qml/Components/Lockscreen.qml:163
105msgid "Please wait"
101msgid "Please wait"
106msgstr "Bitte warten"
102msgstr "Bitte warten"
107
103
108−#: qml/Components/Lockscreen.qml:245
104+#: qml/Components/Lockscreen.qml:172
105+msgid "Too many incorrect attempts"
106+msgstr "Zu viele falsche Versuche"
107+
108+#: qml/Components/Lockscreen.qml:206
109msgid "Emergency Call"
109msgid "Emergency Call"
110msgstr "Notruf"
110msgstr "Notruf"
111
111
112−#: qml/Components/Lockscreen.qml:268
112+#: qml/Components/Lockscreen.qml:226
113msgid "OK"
113msgid "OK"
114msgstr "OK"
114msgstr "OK"
115
115
@@ -122,23 +122,15 @@ msgstr "Hallo %1"
122msgid "Hello"
122msgid "Hello"
123msgstr "Hallo"
123msgstr "Hallo"
124
124
125−#: qml/Components/PinLockscreen.qml:197
126−msgid "CANCEL"
127−msgstr "ABBRECHEN"
128−
129−#: qml/Components/PinLockscreen.qml:215
130−msgid "DONE"
131−msgstr "ERLEDIGT"
132−
133−#: qml/Dash/GenericScopeView.qml:360
125+#: qml/Dash/GenericScopeView.qml:361
134msgid "See less"
126msgid "See less"
135msgstr "Weniger ansehen"
127msgstr "Weniger ansehen"
136
128
137−#: qml/Dash/GenericScopeView.qml:360
129+#: qml/Dash/GenericScopeView.qml:361
138msgid "See all"
130msgid "See all"
139msgstr "Alle anzeigen"
131msgstr "Alle anzeigen"
140
132
141−#: qml/Dash/GenericScopeView.qml:423 qml/Panel/SearchIndicator.qml:27
133+#: qml/Dash/GenericScopeView.qml:424 qml/Panel/SearchIndicator.qml:27
142msgid "Search"
134msgid "Search"
143msgstr "Suchen"
135msgstr "Suchen"
144
136
@@ -164,7 +156,7 @@ msgstr "Senden"
164
156
165#: qml/Dash/ScopesOverview.qml:201
157#: qml/Dash/ScopesOverview.qml:201
166msgid "Manage Dash"
158msgid "Manage Dash"
167−msgstr ""
159+msgstr "Dash verwalten"
168
160
169#: qml/Dash/ScopesOverview.qml:408
161#: qml/Dash/ScopesOverview.qml:408
170msgid "Done"
162msgid "Done"
@@ -172,7 +164,7 @@ msgstr "Erledigt"
172
164
173#: qml/Dash/ScopesOverview.qml:434
165#: qml/Dash/ScopesOverview.qml:434
174msgid "Store"
166msgid "Store"
175−msgstr ""
167+msgstr "Store"
176
168
177#: qml/Dash/ScopesOverviewTab.qml:36
169#: qml/Dash/ScopesOverviewTab.qml:36
178msgid "Favorites"
170msgid "Favorites"
@@ -206,13 +198,17 @@ msgstr "Sprechen Sie jetzt …"
206msgid "Speaking..."
198msgid "Speaking..."
207msgstr "Sprechen Sie …"
199msgstr "Sprechen Sie …"
208
200
209−#: qml/Notifications/NotificationMenuItemFactory.qml:100
201+#: qml/Notifications/NotificationMenuItemFactory.qml:105
210msgid "Show password"
202msgid "Show password"
211msgstr "Passwort anzeigen"
203msgstr "Passwort anzeigen"
212
204
213−#: qml/Notifications/NotificationMenuItemFactory.qml:115
205+#: qml/Notifications/NotificationMenuItemFactory.qml:120
214−msgid "Please enter SIM PIN"
206+msgid "Enter SIM PIN"
215−msgstr "Bitte die PIN der SIM eingeben"
207+msgstr ""
208+
209+#: qml/Notifications/NotificationMenuItemFactory.qml:121 qml/Shell.qml:270
210+msgid "Sorry, incorrect PIN"
211+msgstr ""
216
212
217#: qml/Panel/ActiveCallHint.qml:77
213#: qml/Panel/ActiveCallHint.qml:77
218msgid "Tap to return to call..."
214msgid "Tap to return to call..."
@@ -248,54 +244,80 @@ msgstr "Fehlgeschlagen, tippen Sie zum Wiederholen"
248
244
249#: qml/Panel/Indicators/ModemInfoItem.qml:105
245#: qml/Panel/Indicators/ModemInfoItem.qml:105
250msgid "Unlock SIM"
246msgid "Unlock SIM"
251−msgstr ""
247+msgstr "SIM-Karte entsprerren"
252
248
253#: qml/Panel/Indicators/RoamingIndication.qml:27
249#: qml/Panel/Indicators/RoamingIndication.qml:27
254msgid "Roaming"
250msgid "Roaming"
255msgstr "Roaming"
251msgstr "Roaming"
256
252
257−#: qml/Shell.qml:267
253+#: qml/Shell.qml:266
258−msgid "passphrase"
254+msgid "Enter your passphrase"
259−msgstr "Passwort"
255+msgstr ""
260
256
261#: qml/Shell.qml:267
257#: qml/Shell.qml:267
262−msgid "passcode"
258+msgid "Sorry, incorrect passphrase"
263msgstr ""
259msgstr ""
264
260
265#: qml/Shell.qml:269
261#: qml/Shell.qml:269
266−#, qt-format
267−msgid "Enter your %1"
262+msgid "Enter your PIN"
268msgstr ""
263msgstr ""
269
264
270−#: qml/Shell.qml:270
265+#: qml/Shell.qml:273
271#, qt-format
266#, qt-format
272−msgid "Incorrect %1"
267+msgid "Enter your %1"
273−msgstr ""
268+msgstr "%1 eingeben"
274
269
275−#: qml/Shell.qml:272
270+#: qml/Shell.qml:274
276−msgid "Please re-enter"
271+#, qt-format
272+msgid "Sorry, incorrect %1"
277msgstr ""
273msgstr ""
278
274
279−#: qml/Shell.qml:306
275+#: qml/Shell.qml:310
280msgid "Sorry, incorrect passphrase."
276msgid "Sorry, incorrect passphrase."
281−msgstr ""
277+msgstr "Falsches Passwort."
282
278
283−#: qml/Shell.qml:307
279+#: qml/Shell.qml:311
284msgid "Sorry, incorrect passcode."
280msgid "Sorry, incorrect passcode."
285−msgstr ""
281+msgstr "Falsche PIN"
286
282
287−#: qml/Shell.qml:308
283+#: qml/Shell.qml:312
288msgid "This will be your last attempt."
284msgid "This will be your last attempt."
289−msgstr ""
285+msgstr "Dies ist Ihr letzter Versuch."
290
286
291−#: qml/Shell.qml:310
287+#: qml/Shell.qml:314
292msgid ""
288msgid ""
293"If passphrase is entered incorrectly, your phone will conduct a factory "
289"If passphrase is entered incorrectly, your phone will conduct a factory "
294"reset and all personal data will be deleted."
290"reset and all personal data will be deleted."
295msgstr ""
291msgstr ""
292+"Wird das Passwort falsch eingegeben, wird das Telefon auf den Werkszustand "
293+"zurückgesetzt und alle Daten werden gelöscht."
296
294
297−#: qml/Shell.qml:311
295+#: qml/Shell.qml:315
298msgid ""
296msgid ""
299"If passcode is entered incorrectly, your phone will conduct a factory reset "
297"If passcode is entered incorrectly, your phone will conduct a factory reset "
300"and all personal data will be deleted."
298"and all personal data will be deleted."
301msgstr ""
299msgstr ""
300+"Wird die PIN falsch eingegeben, wird das Telefon auf den Werkszustand "
301+"zurückgesetzt und alle Daten werden gelöscht."
302+
303+#~ msgid "Please enter SIM PIN"
304+#~ msgstr "Bitte die PIN der SIM eingeben"
305+
306+#~ msgid "CANCEL"
307+#~ msgstr "ABBRECHEN"
308+
309+#~ msgid "DONE"
310+#~ msgstr "ERLEDIGT"
311+
312+#~ msgid "passphrase"
313+#~ msgstr "Passwort"
314+
315+#, qt-format
316+#~ msgid "Incorrect %1"
317+#~ msgstr "%1 falsch"
318+
319+#~ msgid "passcode"
320+#~ msgstr "Passwort"
321+
322+#~ msgid "Please re-enter"
323+#~ msgstr "Bitte neu eingeben"
po/el.po+61−53
@@ -7,19 +7,19 @@ msgid ""
7msgstr ""
7msgstr ""
8"Project-Id-Version: unity\n"
8"Project-Id-Version: unity\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2014-08-13 14:09-0400\n"
10+"POT-Creation-Date: 2014-08-21 11:36+0200\n"
11−"PO-Revision-Date: 2014-08-08 13:03+0000\n"
11+"PO-Revision-Date: 2014-08-21 12:06+0000\n"
12−"Last-Translator: Simos Xenitellis <Unknown>\n"
12+"Last-Translator: Chris Taklis (aka Kailor) <ctaklis@gmail.com>\n"
13"Language-Team: Greek <el@li.org>\n"
13"Language-Team: Greek <el@li.org>\n"
14"MIME-Version: 1.0\n"
14"MIME-Version: 1.0\n"
15"Content-Type: text/plain; charset=UTF-8\n"
15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n"
16"Content-Transfer-Encoding: 8bit\n"
17−"X-Launchpad-Export-Date: 2014-08-15 06:28+0000\n"
17+"X-Launchpad-Export-Date: 2014-08-23 07:17+0000\n"
18−"X-Generator: Launchpad (build 17156)\n"
18+"X-Generator: Launchpad (build 17163)\n"
19
19
20#: plugins/LightDM/Greeter.cpp:129
20#: plugins/LightDM/Greeter.cpp:129
21msgid "Password: "
21msgid "Password: "
22−msgstr ""
22+msgstr "Κωδικός πρόσβασης: "
23
23
24#: plugins/Unity/Launcher/launcheritem.cpp:43
24#: plugins/Unity/Launcher/launcheritem.cpp:43
25#: plugins/Unity/Launcher/launcheritem.cpp:73
25#: plugins/Unity/Launcher/launcheritem.cpp:73
@@ -36,15 +36,15 @@ msgstr ""
36
36
37#: qml/Components/Dialogs.qml:144
37#: qml/Components/Dialogs.qml:144
38msgid "Power off"
38msgid "Power off"
39−msgstr ""
39+msgstr "Τερματισμός"
40
40
41#: qml/Components/Dialogs.qml:153
41#: qml/Components/Dialogs.qml:153
42msgid "Restart"
42msgid "Restart"
43−msgstr ""
43+msgstr "Επανεκκίνηση"
44
44
45#: qml/Components/Dialogs.qml:162
45#: qml/Components/Dialogs.qml:162
46msgid "Cancel"
46msgid "Cancel"
47−msgstr ""
47+msgstr "Ακύρωση"
48
48
49#: qml/Components/EdgeDemoOverlay.qml:151
49#: qml/Components/EdgeDemoOverlay.qml:151
50msgid "Skip intro"
50msgid "Skip intro"
@@ -96,19 +96,19 @@ msgstr ""
96"Πλέον γνωρίζετε τις χειρονομίες από τα άκρα και μπορείτε να ξεκινήσετε να "
96"Πλέον γνωρίζετε τις χειρονομίες από τα άκρα και μπορείτε να ξεκινήσετε να "
97"χρησιμοποιείτε το τηλέφωνο<br><br>Αγγίξτε την οθόνη για να ξεκινήσετε"
97"χρησιμοποιείτε το τηλέφωνο<br><br>Αγγίξτε την οθόνη για να ξεκινήσετε"
98
98
99−#: qml/Components/Lockscreen.qml:161
99+#: qml/Components/Lockscreen.qml:167
100−msgid "Too many incorrect attempts"
101−msgstr ""
102−
103−#: qml/Components/Lockscreen.qml:163
104msgid "Please wait"
100msgid "Please wait"
105−msgstr ""
101+msgstr "Παρακαλώ περιμένετε"
102+
103+#: qml/Components/Lockscreen.qml:172
104+msgid "Too many incorrect attempts"
105+msgstr "Πολλές άκυρες προσπάθειες"
106
106
107−#: qml/Components/Lockscreen.qml:245
107+#: qml/Components/Lockscreen.qml:206
108msgid "Emergency Call"
108msgid "Emergency Call"
109msgstr "Κλήση έκτακτης ανάγκης"
109msgstr "Κλήση έκτακτης ανάγκης"
110
110
111−#: qml/Components/Lockscreen.qml:268
111+#: qml/Components/Lockscreen.qml:226
112msgid "OK"
112msgid "OK"
113msgstr "OK"
113msgstr "OK"
114
114
@@ -121,23 +121,15 @@ msgstr "Γεια σας %1"
121msgid "Hello"
121msgid "Hello"
122msgstr "Γεια σας"
122msgstr "Γεια σας"
123
123
124−#: qml/Components/PinLockscreen.qml:197
125−msgid "CANCEL"
126−msgstr "ΑΚΥΡΩΣΗ"
127−
128−#: qml/Components/PinLockscreen.qml:215
129−msgid "DONE"
130−msgstr "ΟΛΟΚΛΗΡΩΣΗ"
131−
132−#: qml/Dash/GenericScopeView.qml:360
124+#: qml/Dash/GenericScopeView.qml:361
133msgid "See less"
125msgid "See less"
134msgstr "Λιγότερα"
126msgstr "Λιγότερα"
135
127
136−#: qml/Dash/GenericScopeView.qml:360
128+#: qml/Dash/GenericScopeView.qml:361
137msgid "See all"
129msgid "See all"
138msgstr "Εμφάνιση όλων"
130msgstr "Εμφάνιση όλων"
139
131
140−#: qml/Dash/GenericScopeView.qml:423 qml/Panel/SearchIndicator.qml:27
132+#: qml/Dash/GenericScopeView.qml:424 qml/Panel/SearchIndicator.qml:27
141msgid "Search"
133msgid "Search"
142msgstr "Αναζήτηση"
134msgstr "Αναζήτηση"
143
135
@@ -167,19 +159,19 @@ msgstr ""
167
159
168#: qml/Dash/ScopesOverview.qml:408
160#: qml/Dash/ScopesOverview.qml:408
169msgid "Done"
161msgid "Done"
170−msgstr ""
162+msgstr "Ολοκληρώθηκε"
171
163
172#: qml/Dash/ScopesOverview.qml:434
164#: qml/Dash/ScopesOverview.qml:434
173msgid "Store"
165msgid "Store"
174−msgstr ""
166+msgstr "Κατάστημα"
175
167
176#: qml/Dash/ScopesOverviewTab.qml:36
168#: qml/Dash/ScopesOverviewTab.qml:36
177msgid "Favorites"
169msgid "Favorites"
178−msgstr ""
170+msgstr "Αγαπημένα"
179
171
180#: qml/Dash/ScopesOverviewTab.qml:54
172#: qml/Dash/ScopesOverviewTab.qml:54
181msgid "All"
173msgid "All"
182−msgstr ""
174+msgstr "Όλα"
183
175
184#: qml/Greeter/Greeter.qml:157
176#: qml/Greeter/Greeter.qml:157
185msgid "Swipe to unlock"
177msgid "Swipe to unlock"
@@ -205,13 +197,17 @@ msgstr "Μιλήστε τώρα..."
205msgid "Speaking..."
197msgid "Speaking..."
206msgstr "Ομιλία..."
198msgstr "Ομιλία..."
207
199
208−#: qml/Notifications/NotificationMenuItemFactory.qml:100
200+#: qml/Notifications/NotificationMenuItemFactory.qml:105
209msgid "Show password"
201msgid "Show password"
210msgstr "Εμφάνιση κωδικού"
202msgstr "Εμφάνιση κωδικού"
211
203
212−#: qml/Notifications/NotificationMenuItemFactory.qml:115
204+#: qml/Notifications/NotificationMenuItemFactory.qml:120
213−msgid "Please enter SIM PIN"
205+msgid "Enter SIM PIN"
214−msgstr "Παρακαλώ εισάγετε το PIN της κάρτας SIM"
206+msgstr ""
207+
208+#: qml/Notifications/NotificationMenuItemFactory.qml:121 qml/Shell.qml:270
209+msgid "Sorry, incorrect PIN"
210+msgstr ""
215
211
216#: qml/Panel/ActiveCallHint.qml:77
212#: qml/Panel/ActiveCallHint.qml:77
217msgid "Tap to return to call..."
213msgid "Tap to return to call..."
@@ -247,54 +243,66 @@ msgstr "Αποτυχία, πατήστε για να ξαναπροσπαθήσ
247
243
248#: qml/Panel/Indicators/ModemInfoItem.qml:105
244#: qml/Panel/Indicators/ModemInfoItem.qml:105
249msgid "Unlock SIM"
245msgid "Unlock SIM"
250−msgstr ""
246+msgstr "Ξεκλείδωμα SIM"
251
247
252#: qml/Panel/Indicators/RoamingIndication.qml:27
248#: qml/Panel/Indicators/RoamingIndication.qml:27
253msgid "Roaming"
249msgid "Roaming"
254−msgstr ""
250+msgstr "Περιαγωγή"
255
251
256−#: qml/Shell.qml:267
252+#: qml/Shell.qml:266
257−msgid "passphrase"
253+msgid "Enter your passphrase"
258msgstr ""
254msgstr ""
259
255
260#: qml/Shell.qml:267
256#: qml/Shell.qml:267
261−msgid "passcode"
257+msgid "Sorry, incorrect passphrase"
262msgstr ""
258msgstr ""
263
259
264#: qml/Shell.qml:269
260#: qml/Shell.qml:269
265−#, qt-format
266−msgid "Enter your %1"
261+msgid "Enter your PIN"
267msgstr ""
262msgstr ""
268
263
269−#: qml/Shell.qml:270
264+#: qml/Shell.qml:273
270#, qt-format
265#, qt-format
271−msgid "Incorrect %1"
266+msgid "Enter your %1"
272−msgstr ""
267+msgstr "Εισάγετε το %1"
273
268
274−#: qml/Shell.qml:272
269+#: qml/Shell.qml:274
275−msgid "Please re-enter"
270+#, qt-format
271+msgid "Sorry, incorrect %1"
276msgstr ""
272msgstr ""
277
273
278−#: qml/Shell.qml:306
274+#: qml/Shell.qml:310
279msgid "Sorry, incorrect passphrase."
275msgid "Sorry, incorrect passphrase."
280msgstr ""
276msgstr ""
281
277
282−#: qml/Shell.qml:307
278+#: qml/Shell.qml:311
283msgid "Sorry, incorrect passcode."
279msgid "Sorry, incorrect passcode."
284msgstr ""
280msgstr ""
285
281
286−#: qml/Shell.qml:308
282+#: qml/Shell.qml:312
287msgid "This will be your last attempt."
283msgid "This will be your last attempt."
288msgstr ""
284msgstr ""
289
285
290−#: qml/Shell.qml:310
286+#: qml/Shell.qml:314
291msgid ""
287msgid ""
292"If passphrase is entered incorrectly, your phone will conduct a factory "
288"If passphrase is entered incorrectly, your phone will conduct a factory "
293"reset and all personal data will be deleted."
289"reset and all personal data will be deleted."
294msgstr ""
290msgstr ""
295
291
296−#: qml/Shell.qml:311
292+#: qml/Shell.qml:315
297msgid ""
293msgid ""
298"If passcode is entered incorrectly, your phone will conduct a factory reset "
294"If passcode is entered incorrectly, your phone will conduct a factory reset "
299"and all personal data will be deleted."
295"and all personal data will be deleted."
300msgstr ""
296msgstr ""
297+
298+#~ msgid "Please enter SIM PIN"
299+#~ msgstr "Παρακαλώ εισάγετε το PIN της κάρτας SIM"
300+
301+#~ msgid "DONE"
302+#~ msgstr "ΟΛΟΚΛΗΡΩΣΗ"
303+
304+#~ msgid "CANCEL"
305+#~ msgstr "ΑΚΥΡΩΣΗ"
306+
307+#~ msgid "Please re-enter"
308+#~ msgstr "Παρακαλούμε εισάγετε ξανά"
po/en_AU.po+60−42
@@ -7,15 +7,15 @@ msgid ""
7msgstr ""
7msgstr ""
8"Project-Id-Version: unity\n"
8"Project-Id-Version: unity\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2014-08-13 14:09-0400\n"
10+"POT-Creation-Date: 2014-08-21 11:36+0200\n"
11"PO-Revision-Date: 2014-08-17 09:06+0000\n"
11"PO-Revision-Date: 2014-08-17 09:06+0000\n"
12"Last-Translator: Jared Norris <jarednorris@ubuntu.com>\n"
12"Last-Translator: Jared Norris <jarednorris@ubuntu.com>\n"
13"Language-Team: English (Australia) <en_AU@li.org>\n"
13"Language-Team: English (Australia) <en_AU@li.org>\n"
14"MIME-Version: 1.0\n"
14"MIME-Version: 1.0\n"
15"Content-Type: text/plain; charset=UTF-8\n"
15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n"
16"Content-Transfer-Encoding: 8bit\n"
17−"X-Launchpad-Export-Date: 2014-08-18 07:20+0000\n"
17+"X-Launchpad-Export-Date: 2014-08-23 07:17+0000\n"
18−"X-Generator: Launchpad (build 17156)\n"
18+"X-Generator: Launchpad (build 17163)\n"
19
19
20#: plugins/LightDM/Greeter.cpp:129
20#: plugins/LightDM/Greeter.cpp:129
21msgid "Password: "
21msgid "Password: "
@@ -94,19 +94,19 @@ msgstr ""
94"You have now mastered the edge gestures and can start using the "
94"You have now mastered the edge gestures and can start using the "
95"phone<br><br>Tap on the screen to start"
95"phone<br><br>Tap on the screen to start"
96
96
97−#: qml/Components/Lockscreen.qml:161
97+#: qml/Components/Lockscreen.qml:167
98−msgid "Too many incorrect attempts"
99−msgstr "Too many incorrect attempts"
100−
101−#: qml/Components/Lockscreen.qml:163
102msgid "Please wait"
98msgid "Please wait"
103msgstr "Please wait"
99msgstr "Please wait"
104
100
105−#: qml/Components/Lockscreen.qml:245
101+#: qml/Components/Lockscreen.qml:172
102+msgid "Too many incorrect attempts"
103+msgstr "Too many incorrect attempts"
104+
105+#: qml/Components/Lockscreen.qml:206
106msgid "Emergency Call"
106msgid "Emergency Call"
107msgstr "Emergency Call"
107msgstr "Emergency Call"
108
108
109−#: qml/Components/Lockscreen.qml:268
109+#: qml/Components/Lockscreen.qml:226
110msgid "OK"
110msgid "OK"
111msgstr "OK"
111msgstr "OK"
112
112
@@ -119,23 +119,15 @@ msgstr "Hello %1"
119msgid "Hello"
119msgid "Hello"
120msgstr "Hello"
120msgstr "Hello"
121
121
122−#: qml/Components/PinLockscreen.qml:197
123−msgid "CANCEL"
124−msgstr "CANCEL"
125−
126−#: qml/Components/PinLockscreen.qml:215
127−msgid "DONE"
128−msgstr "DONE"
129−
130−#: qml/Dash/GenericScopeView.qml:360
122+#: qml/Dash/GenericScopeView.qml:361
131msgid "See less"
123msgid "See less"
132msgstr "See less"
124msgstr "See less"
133
125
134−#: qml/Dash/GenericScopeView.qml:360
126+#: qml/Dash/GenericScopeView.qml:361
135msgid "See all"
127msgid "See all"
136msgstr "See all"
128msgstr "See all"
137
129
138−#: qml/Dash/GenericScopeView.qml:423 qml/Panel/SearchIndicator.qml:27
130+#: qml/Dash/GenericScopeView.qml:424 qml/Panel/SearchIndicator.qml:27
139msgid "Search"
131msgid "Search"
140msgstr "Search"
132msgstr "Search"
141
133
@@ -203,13 +195,17 @@ msgstr "Speak Now..."
203msgid "Speaking..."
195msgid "Speaking..."
204msgstr "Speaking..."
196msgstr "Speaking..."
205
197
206−#: qml/Notifications/NotificationMenuItemFactory.qml:100
198+#: qml/Notifications/NotificationMenuItemFactory.qml:105
207msgid "Show password"
199msgid "Show password"
208msgstr "Show password"
200msgstr "Show password"
209
201
210−#: qml/Notifications/NotificationMenuItemFactory.qml:115
202+#: qml/Notifications/NotificationMenuItemFactory.qml:120
211−msgid "Please enter SIM PIN"
203+msgid "Enter SIM PIN"
212−msgstr "Please enter SIM PIN"
204+msgstr ""
205+
206+#: qml/Notifications/NotificationMenuItemFactory.qml:121 qml/Shell.qml:270
207+msgid "Sorry, incorrect PIN"
208+msgstr ""
213
209
214#: qml/Panel/ActiveCallHint.qml:77
210#: qml/Panel/ActiveCallHint.qml:77
215msgid "Tap to return to call..."
211msgid "Tap to return to call..."
@@ -251,41 +247,41 @@ msgstr "Unlock SIM"
251msgid "Roaming"
247msgid "Roaming"
252msgstr "Roaming"
248msgstr "Roaming"
253
249
254−#: qml/Shell.qml:267
250+#: qml/Shell.qml:266
255−msgid "passphrase"
251+msgid "Enter your passphrase"
256−msgstr "passphrase"
252+msgstr ""
257
253
258#: qml/Shell.qml:267
254#: qml/Shell.qml:267
259−msgid "passcode"
255+msgid "Sorry, incorrect passphrase"
260−msgstr "passcode"
256+msgstr ""
261
257
262#: qml/Shell.qml:269
258#: qml/Shell.qml:269
259+msgid "Enter your PIN"
260+msgstr ""
261+
262+#: qml/Shell.qml:273
263#, qt-format
263#, qt-format
264msgid "Enter your %1"
264msgid "Enter your %1"
265msgstr "Enter your %1"
265msgstr "Enter your %1"
266
266
267−#: qml/Shell.qml:270
267+#: qml/Shell.qml:274
268#, qt-format
268#, qt-format
269−msgid "Incorrect %1"
269+msgid "Sorry, incorrect %1"
270−msgstr "Incorrect %1"
271−
272−#: qml/Shell.qml:272
273−msgid "Please re-enter"
274−msgstr "Please re-enter"
270+msgstr ""
275
271
276−#: qml/Shell.qml:306
272+#: qml/Shell.qml:310
277msgid "Sorry, incorrect passphrase."
273msgid "Sorry, incorrect passphrase."
278msgstr "Sorry, incorrect passphrase."
274msgstr "Sorry, incorrect passphrase."
279
275
280−#: qml/Shell.qml:307
276+#: qml/Shell.qml:311
281msgid "Sorry, incorrect passcode."
277msgid "Sorry, incorrect passcode."
282msgstr "Sorry, incorrect passcode."
278msgstr "Sorry, incorrect passcode."
283
279
284−#: qml/Shell.qml:308
280+#: qml/Shell.qml:312
285msgid "This will be your last attempt."
281msgid "This will be your last attempt."
286msgstr "This will be your last attempt."
282msgstr "This will be your last attempt."
287
283
288−#: qml/Shell.qml:310
284+#: qml/Shell.qml:314
289msgid ""
285msgid ""
290"If passphrase is entered incorrectly, your phone will conduct a factory "
286"If passphrase is entered incorrectly, your phone will conduct a factory "
291"reset and all personal data will be deleted."
287"reset and all personal data will be deleted."
@@ -293,10 +289,32 @@ msgstr ""
293"If passphrase is entered incorrectly, your phone will conduct a factory "
289"If passphrase is entered incorrectly, your phone will conduct a factory "
294"reset and all personal data will be deleted."
290"reset and all personal data will be deleted."
295
291
296−#: qml/Shell.qml:311
292+#: qml/Shell.qml:315
297msgid ""
293msgid ""
298"If passcode is entered incorrectly, your phone will conduct a factory reset "
294"If passcode is entered incorrectly, your phone will conduct a factory reset "
299"and all personal data will be deleted."
295"and all personal data will be deleted."
300msgstr ""
296msgstr ""
301"If passcode is entered incorrectly, your phone will conduct a factory reset "
297"If passcode is entered incorrectly, your phone will conduct a factory reset "
302"and all personal data will be deleted."
298"and all personal data will be deleted."
299+
300+#~ msgid "CANCEL"
301+#~ msgstr "CANCEL"
302+
303+#~ msgid "DONE"
304+#~ msgstr "DONE"
305+
306+#~ msgid "Please enter SIM PIN"
307+#~ msgstr "Please enter SIM PIN"
308+
309+#~ msgid "passphrase"
310+#~ msgstr "passphrase"
311+
312+#, qt-format
313+#~ msgid "Incorrect %1"
314+#~ msgstr "Incorrect %1"
315+
316+#~ msgid "Please re-enter"
317+#~ msgstr "Please re-enter"
318+
319+#~ msgid "passcode"
320+#~ msgstr "passcode"
po/en_GB.po+61−43
@@ -7,15 +7,15 @@ msgid ""
7msgstr ""
7msgstr ""
8"Project-Id-Version: unity\n"
8"Project-Id-Version: unity\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2014-08-13 14:09-0400\n"
10+"POT-Creation-Date: 2014-08-21 11:36+0200\n"
11−"PO-Revision-Date: 2014-08-15 10:01+0000\n"
11+"PO-Revision-Date: 2014-08-23 13:48+0000\n"
12"Last-Translator: Alan Pope ㋛ <alan@ubuntu.com>\n"
12"Last-Translator: Alan Pope ㋛ <alan@ubuntu.com>\n"
13"Language-Team: English (United Kingdom) <en_GB@li.org>\n"
13"Language-Team: English (United Kingdom) <en_GB@li.org>\n"
14"MIME-Version: 1.0\n"
14"MIME-Version: 1.0\n"
15"Content-Type: text/plain; charset=UTF-8\n"
15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n"
16"Content-Transfer-Encoding: 8bit\n"
17−"X-Launchpad-Export-Date: 2014-08-18 07:20+0000\n"
17+"X-Launchpad-Export-Date: 2014-08-24 06:46+0000\n"
18−"X-Generator: Launchpad (build 17156)\n"
18+"X-Generator: Launchpad (build 17163)\n"
19
19
20#: plugins/LightDM/Greeter.cpp:129
20#: plugins/LightDM/Greeter.cpp:129
21msgid "Password: "
21msgid "Password: "
@@ -94,19 +94,19 @@ msgstr ""
94"You have now mastered the edge gestures and can start using the "
94"You have now mastered the edge gestures and can start using the "
95"phone<br><br>Tap on the screen to start"
95"phone<br><br>Tap on the screen to start"
96
96
97−#: qml/Components/Lockscreen.qml:161
97+#: qml/Components/Lockscreen.qml:167
98−msgid "Too many incorrect attempts"
99−msgstr "Too many incorrect attempts"
100−
101−#: qml/Components/Lockscreen.qml:163
102msgid "Please wait"
98msgid "Please wait"
103msgstr "Please wait"
99msgstr "Please wait"
104
100
105−#: qml/Components/Lockscreen.qml:245
101+#: qml/Components/Lockscreen.qml:172
102+msgid "Too many incorrect attempts"
103+msgstr "Too many incorrect attempts"
104+
105+#: qml/Components/Lockscreen.qml:206
106msgid "Emergency Call"
106msgid "Emergency Call"
107msgstr "Emergency Call"
107msgstr "Emergency Call"
108
108
109−#: qml/Components/Lockscreen.qml:268
109+#: qml/Components/Lockscreen.qml:226
110msgid "OK"
110msgid "OK"
111msgstr "OK"
111msgstr "OK"
112
112
@@ -119,23 +119,15 @@ msgstr "Hello %1"
119msgid "Hello"
119msgid "Hello"
120msgstr "Hello"
120msgstr "Hello"
121
121
122−#: qml/Components/PinLockscreen.qml:197
123−msgid "CANCEL"
124−msgstr "CANCEL"
125−
126−#: qml/Components/PinLockscreen.qml:215
127−msgid "DONE"
128−msgstr "DONE"
129−
130−#: qml/Dash/GenericScopeView.qml:360
122+#: qml/Dash/GenericScopeView.qml:361
131msgid "See less"
123msgid "See less"
132msgstr "See less"
124msgstr "See less"
133
125
134−#: qml/Dash/GenericScopeView.qml:360
126+#: qml/Dash/GenericScopeView.qml:361
135msgid "See all"
127msgid "See all"
136msgstr "See all"
128msgstr "See all"
137
129
138−#: qml/Dash/GenericScopeView.qml:423 qml/Panel/SearchIndicator.qml:27
130+#: qml/Dash/GenericScopeView.qml:424 qml/Panel/SearchIndicator.qml:27
139msgid "Search"
131msgid "Search"
140msgstr "Search"
132msgstr "Search"
141
133
@@ -203,13 +195,17 @@ msgstr "Speak Now..."
203msgid "Speaking..."
195msgid "Speaking..."
204msgstr "Speaking..."
196msgstr "Speaking..."
205
197
206−#: qml/Notifications/NotificationMenuItemFactory.qml:100
198+#: qml/Notifications/NotificationMenuItemFactory.qml:105
207msgid "Show password"
199msgid "Show password"
208msgstr "Show password"
200msgstr "Show password"
209
201
210−#: qml/Notifications/NotificationMenuItemFactory.qml:115
202+#: qml/Notifications/NotificationMenuItemFactory.qml:120
211−msgid "Please enter SIM PIN"
203+msgid "Enter SIM PIN"
212−msgstr "Please enter SIM PIN"
204+msgstr "Enter SIM PIN"
205+
206+#: qml/Notifications/NotificationMenuItemFactory.qml:121 qml/Shell.qml:270
207+msgid "Sorry, incorrect PIN"
208+msgstr "Sorry, incorrect PIN"
213
209
214#: qml/Panel/ActiveCallHint.qml:77
210#: qml/Panel/ActiveCallHint.qml:77
215msgid "Tap to return to call..."
211msgid "Tap to return to call..."
@@ -251,41 +247,41 @@ msgstr "Unlock SIM"
251msgid "Roaming"
247msgid "Roaming"
252msgstr "Roaming"
248msgstr "Roaming"
253
249
254−#: qml/Shell.qml:267
250+#: qml/Shell.qml:266
255−msgid "passphrase"
251+msgid "Enter your passphrase"
256−msgstr "passphrase"
252+msgstr "Enter your passphrase"
257
253
258#: qml/Shell.qml:267
254#: qml/Shell.qml:267
259−msgid "passcode"
255+msgid "Sorry, incorrect passphrase"
260−msgstr "passcode"
256+msgstr "Sorry, incorrect passphrase"
261
257
262#: qml/Shell.qml:269
258#: qml/Shell.qml:269
259+msgid "Enter your PIN"
260+msgstr "Enter your PIN"
261+
262+#: qml/Shell.qml:273
263#, qt-format
263#, qt-format
264msgid "Enter your %1"
264msgid "Enter your %1"
265msgstr "Enter your %1"
265msgstr "Enter your %1"
266
266
267−#: qml/Shell.qml:270
267+#: qml/Shell.qml:274
268#, qt-format
268#, qt-format
269−msgid "Incorrect %1"
269+msgid "Sorry, incorrect %1"
270−msgstr "Incorrect %1"
270+msgstr "Sorry, incorrect %1"
271−
272−#: qml/Shell.qml:272
273−msgid "Please re-enter"
274−msgstr "Please re-enter"
275
271
276−#: qml/Shell.qml:306
272+#: qml/Shell.qml:310
277msgid "Sorry, incorrect passphrase."
273msgid "Sorry, incorrect passphrase."
278msgstr "Sorry, incorrect passphrase."
274msgstr "Sorry, incorrect passphrase."
279
275
280−#: qml/Shell.qml:307
276+#: qml/Shell.qml:311
281msgid "Sorry, incorrect passcode."
277msgid "Sorry, incorrect passcode."
282msgstr "Sorry, incorrect passcode."
278msgstr "Sorry, incorrect passcode."
283
279
284−#: qml/Shell.qml:308
280+#: qml/Shell.qml:312
285msgid "This will be your last attempt."
281msgid "This will be your last attempt."
286msgstr "This will be your last attempt."
282msgstr "This will be your last attempt."
287
283
288−#: qml/Shell.qml:310
284+#: qml/Shell.qml:314
289msgid ""
285msgid ""
290"If passphrase is entered incorrectly, your phone will conduct a factory "
286"If passphrase is entered incorrectly, your phone will conduct a factory "
291"reset and all personal data will be deleted."
287"reset and all personal data will be deleted."
@@ -293,10 +289,32 @@ msgstr ""
293"If passphrase is entered incorrectly, your phone will conduct a factory "
289"If passphrase is entered incorrectly, your phone will conduct a factory "
294"reset and all personal data will be deleted."
290"reset and all personal data will be deleted."
295
291
296−#: qml/Shell.qml:311
292+#: qml/Shell.qml:315
297msgid ""
293msgid ""
298"If passcode is entered incorrectly, your phone will conduct a factory reset "
294"If passcode is entered incorrectly, your phone will conduct a factory reset "
299"and all personal data will be deleted."
295"and all personal data will be deleted."
300msgstr ""
296msgstr ""
301"If passcode is entered incorrectly, your phone will conduct a factory reset "
297"If passcode is entered incorrectly, your phone will conduct a factory reset "
302"and all personal data will be deleted."
298"and all personal data will be deleted."
299+
300+#~ msgid "Please enter SIM PIN"
301+#~ msgstr "Please enter SIM PIN"
302+
303+#~ msgid "CANCEL"
304+#~ msgstr "CANCEL"
305+
306+#~ msgid "DONE"
307+#~ msgstr "DONE"
308+
309+#~ msgid "passphrase"
310+#~ msgstr "passphrase"
311+
312+#, qt-format
313+#~ msgid "Incorrect %1"
314+#~ msgstr "Incorrect %1"
315+
316+#~ msgid "Please re-enter"
317+#~ msgstr "Please re-enter"
318+
319+#~ msgid "passcode"
320+#~ msgstr "passcode"
po/eo.po+33−37
@@ -7,15 +7,15 @@ msgid ""
7msgstr ""
7msgstr ""
8"Project-Id-Version: unity\n"
8"Project-Id-Version: unity\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2014-08-13 14:09-0400\n"
10+"POT-Creation-Date: 2014-08-21 11:36+0200\n"
11"PO-Revision-Date: 2013-06-26 22:35+0000\n"
11"PO-Revision-Date: 2013-06-26 22:35+0000\n"
12"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
12"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
13"Language-Team: Esperanto <eo@li.org>\n"
13"Language-Team: Esperanto <eo@li.org>\n"
14"MIME-Version: 1.0\n"
14"MIME-Version: 1.0\n"
15"Content-Type: text/plain; charset=UTF-8\n"
15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n"
16"Content-Transfer-Encoding: 8bit\n"
17−"X-Launchpad-Export-Date: 2014-08-15 06:28+0000\n"
17+"X-Launchpad-Export-Date: 2014-08-23 07:17+0000\n"
18−"X-Generator: Launchpad (build 17156)\n"
18+"X-Generator: Launchpad (build 17163)\n"
19
19
20#: plugins/LightDM/Greeter.cpp:129
20#: plugins/LightDM/Greeter.cpp:129
21msgid "Password: "
21msgid "Password: "
@@ -92,19 +92,19 @@ msgid ""
92"phone<br><br>Tap on the screen to start"
92"phone<br><br>Tap on the screen to start"
93msgstr ""
93msgstr ""
94
94
95−#: qml/Components/Lockscreen.qml:161
95+#: qml/Components/Lockscreen.qml:167
96−msgid "Too many incorrect attempts"
96+msgid "Please wait"
97msgstr ""
97msgstr ""
98
98
99−#: qml/Components/Lockscreen.qml:163
99+#: qml/Components/Lockscreen.qml:172
100−msgid "Please wait"
100+msgid "Too many incorrect attempts"
101msgstr ""
101msgstr ""
102
102
103−#: qml/Components/Lockscreen.qml:245
103+#: qml/Components/Lockscreen.qml:206
104msgid "Emergency Call"
104msgid "Emergency Call"
105msgstr ""
105msgstr ""
106
106
107−#: qml/Components/Lockscreen.qml:268
107+#: qml/Components/Lockscreen.qml:226
108msgid "OK"
108msgid "OK"
109msgstr ""
109msgstr ""
110
110
@@ -117,23 +117,15 @@ msgstr ""
117msgid "Hello"
117msgid "Hello"
118msgstr ""
118msgstr ""
119
119
120−#: qml/Components/PinLockscreen.qml:197
121−msgid "CANCEL"
122−msgstr ""
123−
124−#: qml/Components/PinLockscreen.qml:215
125−msgid "DONE"
126−msgstr ""
127−
128−#: qml/Dash/GenericScopeView.qml:360
120+#: qml/Dash/GenericScopeView.qml:361
129msgid "See less"
121msgid "See less"
130msgstr ""
122msgstr ""
131
123
132−#: qml/Dash/GenericScopeView.qml:360
124+#: qml/Dash/GenericScopeView.qml:361
133msgid "See all"
125msgid "See all"
134msgstr ""
126msgstr ""
135
127
136−#: qml/Dash/GenericScopeView.qml:423 qml/Panel/SearchIndicator.qml:27
128+#: qml/Dash/GenericScopeView.qml:424 qml/Panel/SearchIndicator.qml:27
137msgid "Search"
129msgid "Search"
138msgstr ""
130msgstr ""
139
131
@@ -201,12 +193,16 @@ msgstr ""
201msgid "Speaking..."
193msgid "Speaking..."
202msgstr ""
194msgstr ""
203
195
204−#: qml/Notifications/NotificationMenuItemFactory.qml:100
196+#: qml/Notifications/NotificationMenuItemFactory.qml:105
205msgid "Show password"
197msgid "Show password"
206msgstr ""
198msgstr ""
207
199
208−#: qml/Notifications/NotificationMenuItemFactory.qml:115
200+#: qml/Notifications/NotificationMenuItemFactory.qml:120
209−msgid "Please enter SIM PIN"
201+msgid "Enter SIM PIN"
202+msgstr ""
203+
204+#: qml/Notifications/NotificationMenuItemFactory.qml:121 qml/Shell.qml:270
205+msgid "Sorry, incorrect PIN"
210msgstr ""
206msgstr ""
211
207
212#: qml/Panel/ActiveCallHint.qml:77
208#: qml/Panel/ActiveCallHint.qml:77
@@ -249,47 +245,47 @@ msgstr ""
249msgid "Roaming"
245msgid "Roaming"
250msgstr ""
246msgstr ""
251
247
252−#: qml/Shell.qml:267
248+#: qml/Shell.qml:266
253−msgid "passphrase"
249+msgid "Enter your passphrase"
254msgstr ""
250msgstr ""
255
251
256#: qml/Shell.qml:267
252#: qml/Shell.qml:267
257−msgid "passcode"
253+msgid "Sorry, incorrect passphrase"
258msgstr ""
254msgstr ""
259
255
260#: qml/Shell.qml:269
256#: qml/Shell.qml:269
261−#, qt-format
262−msgid "Enter your %1"
257+msgid "Enter your PIN"
263msgstr ""
258msgstr ""
264
259
265−#: qml/Shell.qml:270
260+#: qml/Shell.qml:273
266#, qt-format
261#, qt-format
267−msgid "Incorrect %1"
262+msgid "Enter your %1"
268msgstr ""
263msgstr ""
269
264
270−#: qml/Shell.qml:272
265+#: qml/Shell.qml:274
271−msgid "Please re-enter"
266+#, qt-format
267+msgid "Sorry, incorrect %1"
272msgstr ""
268msgstr ""
273
269
274−#: qml/Shell.qml:306
270+#: qml/Shell.qml:310
275msgid "Sorry, incorrect passphrase."
271msgid "Sorry, incorrect passphrase."
276msgstr ""
272msgstr ""
277
273
278−#: qml/Shell.qml:307
274+#: qml/Shell.qml:311
279msgid "Sorry, incorrect passcode."
275msgid "Sorry, incorrect passcode."
280msgstr ""
276msgstr ""
281
277
282−#: qml/Shell.qml:308
278+#: qml/Shell.qml:312
283msgid "This will be your last attempt."
279msgid "This will be your last attempt."
284msgstr ""
280msgstr ""
285
281
286−#: qml/Shell.qml:310
282+#: qml/Shell.qml:314
287msgid ""
283msgid ""
288"If passphrase is entered incorrectly, your phone will conduct a factory "
284"If passphrase is entered incorrectly, your phone will conduct a factory "
289"reset and all personal data will be deleted."
285"reset and all personal data will be deleted."
290msgstr ""
286msgstr ""
291
287
292−#: qml/Shell.qml:311
288+#: qml/Shell.qml:315
293msgid ""
289msgid ""
294"If passcode is entered incorrectly, your phone will conduct a factory reset "
290"If passcode is entered incorrectly, your phone will conduct a factory reset "
295"and all personal data will be deleted."
291"and all personal data will be deleted."
po/es.po+60−42
@@ -7,15 +7,15 @@ msgid ""
7msgstr ""
7msgstr ""
8"Project-Id-Version: unity\n"
8"Project-Id-Version: unity\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2014-08-13 14:09-0400\n"
10+"POT-Creation-Date: 2014-08-21 11:36+0200\n"
11"PO-Revision-Date: 2014-08-17 04:37+0000\n"
11"PO-Revision-Date: 2014-08-17 04:37+0000\n"
12"Last-Translator: Adolfo Jayme <fitoschido@gmail.com>\n"
12"Last-Translator: Adolfo Jayme <fitoschido@gmail.com>\n"
13"Language-Team: Spanish <es@li.org>\n"
13"Language-Team: Spanish <es@li.org>\n"
14"MIME-Version: 1.0\n"
14"MIME-Version: 1.0\n"
15"Content-Type: text/plain; charset=UTF-8\n"
15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n"
16"Content-Transfer-Encoding: 8bit\n"
17−"X-Launchpad-Export-Date: 2014-08-18 07:20+0000\n"
17+"X-Launchpad-Export-Date: 2014-08-23 07:17+0000\n"
18−"X-Generator: Launchpad (build 17156)\n"
18+"X-Generator: Launchpad (build 17163)\n"
19
19
20#: plugins/LightDM/Greeter.cpp:129
20#: plugins/LightDM/Greeter.cpp:129
21msgid "Password: "
21msgid "Password: "
@@ -97,19 +97,19 @@ msgstr ""
97"Ahora domina los gestos de los bordes y puede usar el teléfono<br><br>Toque "
97"Ahora domina los gestos de los bordes y puede usar el teléfono<br><br>Toque "
98"la pantalla para comenzar"
98"la pantalla para comenzar"
99
99
100−#: qml/Components/Lockscreen.qml:161
100+#: qml/Components/Lockscreen.qml:167
101−msgid "Too many incorrect attempts"
102−msgstr "Demasiados intentos incorrectos"
103−
104−#: qml/Components/Lockscreen.qml:163
105msgid "Please wait"
101msgid "Please wait"
106msgstr "Espere un momento"
102msgstr "Espere un momento"
107
103
108−#: qml/Components/Lockscreen.qml:245
104+#: qml/Components/Lockscreen.qml:172
105+msgid "Too many incorrect attempts"
106+msgstr "Demasiados intentos incorrectos"
107+
108+#: qml/Components/Lockscreen.qml:206
109msgid "Emergency Call"
109msgid "Emergency Call"
110msgstr "Llamada de emergencia"
110msgstr "Llamada de emergencia"
111
111
112−#: qml/Components/Lockscreen.qml:268
112+#: qml/Components/Lockscreen.qml:226
113msgid "OK"
113msgid "OK"
114msgstr "Aceptar"
114msgstr "Aceptar"
115
115
@@ -122,23 +122,15 @@ msgstr "Hola, %1"
122msgid "Hello"
122msgid "Hello"
123msgstr "Hola"
123msgstr "Hola"
124
124
125−#: qml/Components/PinLockscreen.qml:197
126−msgid "CANCEL"
127−msgstr "CANCELAR"
128−
129−#: qml/Components/PinLockscreen.qml:215
130−msgid "DONE"
131−msgstr "HECHO"
132−
133−#: qml/Dash/GenericScopeView.qml:360
125+#: qml/Dash/GenericScopeView.qml:361
134msgid "See less"
126msgid "See less"
135msgstr "Ver menos"
127msgstr "Ver menos"
136
128
137−#: qml/Dash/GenericScopeView.qml:360
129+#: qml/Dash/GenericScopeView.qml:361
138msgid "See all"
130msgid "See all"
139msgstr "Ver todo"
131msgstr "Ver todo"
140
132
141−#: qml/Dash/GenericScopeView.qml:423 qml/Panel/SearchIndicator.qml:27
133+#: qml/Dash/GenericScopeView.qml:424 qml/Panel/SearchIndicator.qml:27
142msgid "Search"
134msgid "Search"
143msgstr "Buscar"
135msgstr "Buscar"
144
136
@@ -206,13 +198,17 @@ msgstr "Hable ahora…"
206msgid "Speaking..."
198msgid "Speaking..."
207msgstr "Hablando…"
199msgstr "Hablando…"
208
200
209−#: qml/Notifications/NotificationMenuItemFactory.qml:100
201+#: qml/Notifications/NotificationMenuItemFactory.qml:105
210msgid "Show password"
202msgid "Show password"
211msgstr "Mostrar contraseña"
203msgstr "Mostrar contraseña"
212
204
213−#: qml/Notifications/NotificationMenuItemFactory.qml:115
205+#: qml/Notifications/NotificationMenuItemFactory.qml:120
214−msgid "Please enter SIM PIN"
206+msgid "Enter SIM PIN"
215−msgstr "Escriba el PIN de la SIM"
207+msgstr ""
208+
209+#: qml/Notifications/NotificationMenuItemFactory.qml:121 qml/Shell.qml:270
210+msgid "Sorry, incorrect PIN"
211+msgstr ""
216
212
217#: qml/Panel/ActiveCallHint.qml:77
213#: qml/Panel/ActiveCallHint.qml:77
218msgid "Tap to return to call..."
214msgid "Tap to return to call..."
@@ -254,41 +250,41 @@ msgstr "Desbloquear SIM"
254msgid "Roaming"
250msgid "Roaming"
255msgstr "Itinerancia"
251msgstr "Itinerancia"
256
252
257−#: qml/Shell.qml:267
253+#: qml/Shell.qml:266
258−msgid "passphrase"
254+msgid "Enter your passphrase"
259−msgstr "frase de paso"
255+msgstr ""
260
256
261#: qml/Shell.qml:267
257#: qml/Shell.qml:267
262−msgid "passcode"
258+msgid "Sorry, incorrect passphrase"
263−msgstr "Código de paso"
259+msgstr ""
264
260
265#: qml/Shell.qml:269
261#: qml/Shell.qml:269
262+msgid "Enter your PIN"
263+msgstr ""
264+
265+#: qml/Shell.qml:273
266#, qt-format
266#, qt-format
267msgid "Enter your %1"
267msgid "Enter your %1"
268msgstr "Introduzca su %1"
268msgstr "Introduzca su %1"
269
269
270−#: qml/Shell.qml:270
270+#: qml/Shell.qml:274
271#, qt-format
271#, qt-format
272−msgid "Incorrect %1"
272+msgid "Sorry, incorrect %1"
273−msgstr "%1 incorrecta"
273+msgstr ""
274−
275−#: qml/Shell.qml:272
276−msgid "Please re-enter"
277−msgstr "Vuelva a introducirla"
278
274
279−#: qml/Shell.qml:306
275+#: qml/Shell.qml:310
280msgid "Sorry, incorrect passphrase."
276msgid "Sorry, incorrect passphrase."
281msgstr "Frase de paso incorrecta"
277msgstr "Frase de paso incorrecta"
282
278
283−#: qml/Shell.qml:307
279+#: qml/Shell.qml:311
284msgid "Sorry, incorrect passcode."
280msgid "Sorry, incorrect passcode."
285msgstr "Código de paso incorrecto"
281msgstr "Código de paso incorrecto"
286
282
287−#: qml/Shell.qml:308
283+#: qml/Shell.qml:312
288msgid "This will be your last attempt."
284msgid "This will be your last attempt."
289msgstr "Este será su último intento."
285msgstr "Este será su último intento."
290
286
291−#: qml/Shell.qml:310
287+#: qml/Shell.qml:314
292msgid ""
288msgid ""
293"If passphrase is entered incorrectly, your phone will conduct a factory "
289"If passphrase is entered incorrectly, your phone will conduct a factory "
294"reset and all personal data will be deleted."
290"reset and all personal data will be deleted."
@@ -296,10 +292,32 @@ msgstr ""
296"Si se introduce la frase incorrectamente, el teléfono volverá a la "
292"Si se introduce la frase incorrectamente, el teléfono volverá a la "
297"configuración de fábrica y se perderán todos los datos personales."
293"configuración de fábrica y se perderán todos los datos personales."
298
294
299−#: qml/Shell.qml:311
295+#: qml/Shell.qml:315
300msgid ""
296msgid ""
301"If passcode is entered incorrectly, your phone will conduct a factory reset "
297"If passcode is entered incorrectly, your phone will conduct a factory reset "
302"and all personal data will be deleted."
298"and all personal data will be deleted."
303msgstr ""
299msgstr ""
304"Si se introduce el código incorrectamente, el teléfono volverá a la "
300"Si se introduce el código incorrectamente, el teléfono volverá a la "
305"configuración de fábrica y se perderán todos los datos personales."
301"configuración de fábrica y se perderán todos los datos personales."
302+
303+#~ msgid "Please enter SIM PIN"
304+#~ msgstr "Escriba el PIN de la SIM"
305+
306+#~ msgid "DONE"
307+#~ msgstr "HECHO"
308+
309+#~ msgid "CANCEL"
310+#~ msgstr "CANCELAR"
311+
312+#~ msgid "passphrase"
313+#~ msgstr "frase de paso"
314+
315+#~ msgid "Please re-enter"
316+#~ msgstr "Vuelva a introducirla"
317+
318+#~ msgid "passcode"
319+#~ msgstr "Código de paso"
320+
321+#, qt-format
322+#~ msgid "Incorrect %1"
323+#~ msgstr "%1 incorrecta"
po/eu.po+43−38
@@ -7,15 +7,15 @@ msgid ""
7msgstr ""
7msgstr ""
8"Project-Id-Version: unity8\n"
8"Project-Id-Version: unity8\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2014-08-13 14:09-0400\n"
10+"POT-Creation-Date: 2014-08-21 11:36+0200\n"
11"PO-Revision-Date: 2014-08-06 22:51+0000\n"
11"PO-Revision-Date: 2014-08-06 22:51+0000\n"
12"Last-Translator: Ibai Oihanguren Sala <Unknown>\n"
12"Last-Translator: Ibai Oihanguren Sala <Unknown>\n"
13"Language-Team: Basque <eu@li.org>\n"
13"Language-Team: Basque <eu@li.org>\n"
14"MIME-Version: 1.0\n"
14"MIME-Version: 1.0\n"
15"Content-Type: text/plain; charset=UTF-8\n"
15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n"
16"Content-Transfer-Encoding: 8bit\n"
17−"X-Launchpad-Export-Date: 2014-08-15 06:28+0000\n"
17+"X-Launchpad-Export-Date: 2014-08-23 07:16+0000\n"
18−"X-Generator: Launchpad (build 17156)\n"
18+"X-Generator: Launchpad (build 17163)\n"
19
19
20#: plugins/LightDM/Greeter.cpp:129
20#: plugins/LightDM/Greeter.cpp:129
21msgid "Password: "
21msgid "Password: "
@@ -97,19 +97,19 @@ msgstr ""
97"Jadanik ezagutzen dituzu ertzetako keinuak, eta mugikorra erabiltzen has "
97"Jadanik ezagutzen dituzu ertzetako keinuak, eta mugikorra erabiltzen has "
98"zaitezke<br><br>Sakatu pantailan hasteko"
98"zaitezke<br><br>Sakatu pantailan hasteko"
99
99
100−#: qml/Components/Lockscreen.qml:161
100+#: qml/Components/Lockscreen.qml:167
101−msgid "Too many incorrect attempts"
101+msgid "Please wait"
102msgstr ""
102msgstr ""
103
103
104−#: qml/Components/Lockscreen.qml:163
104+#: qml/Components/Lockscreen.qml:172
105−msgid "Please wait"
105+msgid "Too many incorrect attempts"
106msgstr ""
106msgstr ""
107
107
108−#: qml/Components/Lockscreen.qml:245
108+#: qml/Components/Lockscreen.qml:206
109msgid "Emergency Call"
109msgid "Emergency Call"
110msgstr "Larrialdi-deia"
110msgstr "Larrialdi-deia"
111
111
112−#: qml/Components/Lockscreen.qml:268
112+#: qml/Components/Lockscreen.qml:226
113msgid "OK"
113msgid "OK"
114msgstr "Ados"
114msgstr "Ados"
115
115
@@ -122,23 +122,15 @@ msgstr "Kaixo %1"
122msgid "Hello"
122msgid "Hello"
123msgstr "Kaixo"
123msgstr "Kaixo"
124
124
125−#: qml/Components/PinLockscreen.qml:197
126−msgid "CANCEL"
127−msgstr "UTZI"
128−
129−#: qml/Components/PinLockscreen.qml:215
130−msgid "DONE"
131−msgstr "EGINDA"
132−
133−#: qml/Dash/GenericScopeView.qml:360
125+#: qml/Dash/GenericScopeView.qml:361
134msgid "See less"
126msgid "See less"
135msgstr "Ikusi gutxiago"
127msgstr "Ikusi gutxiago"
136
128
137−#: qml/Dash/GenericScopeView.qml:360
129+#: qml/Dash/GenericScopeView.qml:361
138msgid "See all"
130msgid "See all"
139msgstr "Ikusi guztiak"
131msgstr "Ikusi guztiak"
140
132
141−#: qml/Dash/GenericScopeView.qml:423 qml/Panel/SearchIndicator.qml:27
133+#: qml/Dash/GenericScopeView.qml:424 qml/Panel/SearchIndicator.qml:27
142msgid "Search"
134msgid "Search"
143msgstr "Bilatu"
135msgstr "Bilatu"
144
136
@@ -206,13 +198,17 @@ msgstr "Hitz egin orain..."
206msgid "Speaking..."
198msgid "Speaking..."
207msgstr "Hitz egiten..."
199msgstr "Hitz egiten..."
208
200
209−#: qml/Notifications/NotificationMenuItemFactory.qml:100
201+#: qml/Notifications/NotificationMenuItemFactory.qml:105
210msgid "Show password"
202msgid "Show password"
211msgstr "Erakutsi pasahitza"
203msgstr "Erakutsi pasahitza"
212
204
213−#: qml/Notifications/NotificationMenuItemFactory.qml:115
205+#: qml/Notifications/NotificationMenuItemFactory.qml:120
214−msgid "Please enter SIM PIN"
206+msgid "Enter SIM PIN"
215−msgstr "Sartu SIMaren PINa"
207+msgstr ""
208+
209+#: qml/Notifications/NotificationMenuItemFactory.qml:121 qml/Shell.qml:270
210+msgid "Sorry, incorrect PIN"
211+msgstr ""
216
212
217#: qml/Panel/ActiveCallHint.qml:77
213#: qml/Panel/ActiveCallHint.qml:77
218msgid "Tap to return to call..."
214msgid "Tap to return to call..."
@@ -254,48 +250,57 @@ msgstr ""
254msgid "Roaming"
250msgid "Roaming"
255msgstr ""
251msgstr ""
256
252
257−#: qml/Shell.qml:267
253+#: qml/Shell.qml:266
258−msgid "passphrase"
254+msgid "Enter your passphrase"
259msgstr ""
255msgstr ""
260
256
261#: qml/Shell.qml:267
257#: qml/Shell.qml:267
262−msgid "passcode"
258+msgid "Sorry, incorrect passphrase"
263msgstr ""
259msgstr ""
264
260
265#: qml/Shell.qml:269
261#: qml/Shell.qml:269
266−#, qt-format
267−msgid "Enter your %1"
262+msgid "Enter your PIN"
268msgstr ""
263msgstr ""
269
264
270−#: qml/Shell.qml:270
265+#: qml/Shell.qml:273
271#, qt-format
266#, qt-format
272−msgid "Incorrect %1"
267+msgid "Enter your %1"
273msgstr ""
268msgstr ""
274
269
275−#: qml/Shell.qml:272
270+#: qml/Shell.qml:274
276−msgid "Please re-enter"
271+#, qt-format
272+msgid "Sorry, incorrect %1"
277msgstr ""
273msgstr ""
278
274
279−#: qml/Shell.qml:306
275+#: qml/Shell.qml:310
280msgid "Sorry, incorrect passphrase."
276msgid "Sorry, incorrect passphrase."
281msgstr ""
277msgstr ""
282
278
283−#: qml/Shell.qml:307
279+#: qml/Shell.qml:311
284msgid "Sorry, incorrect passcode."
280msgid "Sorry, incorrect passcode."
285msgstr ""
281msgstr ""
286
282
287−#: qml/Shell.qml:308
283+#: qml/Shell.qml:312
288msgid "This will be your last attempt."
284msgid "This will be your last attempt."
289msgstr ""
285msgstr ""
290
286
291−#: qml/Shell.qml:310
287+#: qml/Shell.qml:314
292msgid ""
288msgid ""
293"If passphrase is entered incorrectly, your phone will conduct a factory "
289"If passphrase is entered incorrectly, your phone will conduct a factory "
294"reset and all personal data will be deleted."
290"reset and all personal data will be deleted."
295msgstr ""
291msgstr ""
296
292
297−#: qml/Shell.qml:311
293+#: qml/Shell.qml:315
298msgid ""
294msgid ""
299"If passcode is entered incorrectly, your phone will conduct a factory reset "
295"If passcode is entered incorrectly, your phone will conduct a factory reset "
300"and all personal data will be deleted."
296"and all personal data will be deleted."
301msgstr ""
297msgstr ""
298+
299+#~ msgid "Please enter SIM PIN"
300+#~ msgstr "Sartu SIMaren PINa"
301+
302+#~ msgid "CANCEL"
303+#~ msgstr "UTZI"
304+
305+#~ msgid "DONE"
306+#~ msgstr "EGINDA"
po/fa.po+60−42
@@ -7,15 +7,15 @@ msgid ""
7msgstr ""
7msgstr ""
8"Project-Id-Version: unity8\n"
8"Project-Id-Version: unity8\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2014-08-13 14:09-0400\n"
10+"POT-Creation-Date: 2014-08-21 11:36+0200\n"
11"PO-Revision-Date: 2014-08-15 14:00+0000\n"
11"PO-Revision-Date: 2014-08-15 14:00+0000\n"
12"Last-Translator: Danial Behzadi <dani.behzi@gmail.com>\n"
12"Last-Translator: Danial Behzadi <dani.behzi@gmail.com>\n"
13"Language-Team: Persian <fa@li.org>\n"
13"Language-Team: Persian <fa@li.org>\n"
14"MIME-Version: 1.0\n"
14"MIME-Version: 1.0\n"
15"Content-Type: text/plain; charset=UTF-8\n"
15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n"
16"Content-Transfer-Encoding: 8bit\n"
17−"X-Launchpad-Export-Date: 2014-08-18 07:20+0000\n"
17+"X-Launchpad-Export-Date: 2014-08-23 07:17+0000\n"
18−"X-Generator: Launchpad (build 17156)\n"
18+"X-Generator: Launchpad (build 17163)\n"
19
19
20#: plugins/LightDM/Greeter.cpp:129
20#: plugins/LightDM/Greeter.cpp:129
21msgid "Password: "
21msgid "Password: "
@@ -94,19 +94,19 @@ msgstr ""
94"هم اکنون در استفاده از ژست های حرکتی مهارت لازم را دارید و می‌توانید استفاده "
94"هم اکنون در استفاده از ژست های حرکتی مهارت لازم را دارید و می‌توانید استفاده "
95"از تلفن را آغاز کنید<br><br>برای شروع صفحه را لمس کنید"
95"از تلفن را آغاز کنید<br><br>برای شروع صفحه را لمس کنید"
96
96
97−#: qml/Components/Lockscreen.qml:161
97+#: qml/Components/Lockscreen.qml:167
98−msgid "Too many incorrect attempts"
99−msgstr "تلاش‌های ناموفّق زیاد"
100−
101−#: qml/Components/Lockscreen.qml:163
102msgid "Please wait"
98msgid "Please wait"
103msgstr "لطفاً صبر کنید"
99msgstr "لطفاً صبر کنید"
104
100
105−#: qml/Components/Lockscreen.qml:245
101+#: qml/Components/Lockscreen.qml:172
102+msgid "Too many incorrect attempts"
103+msgstr "تلاش‌های ناموفّق زیاد"
104+
105+#: qml/Components/Lockscreen.qml:206
106msgid "Emergency Call"
106msgid "Emergency Call"
107msgstr "تماس اضطراری"
107msgstr "تماس اضطراری"
108
108
109−#: qml/Components/Lockscreen.qml:268
109+#: qml/Components/Lockscreen.qml:226
110msgid "OK"
110msgid "OK"
111msgstr "قبول"
111msgstr "قبول"
112
112
@@ -119,23 +119,15 @@ msgstr "سلام %1"
119msgid "Hello"
119msgid "Hello"
120msgstr "سلام"
120msgstr "سلام"
121
121
122−#: qml/Components/PinLockscreen.qml:197
123−msgid "CANCEL"
124−msgstr "لغو"
125−
126−#: qml/Components/PinLockscreen.qml:215
127−msgid "DONE"
128−msgstr "انجام شد"
129−
130−#: qml/Dash/GenericScopeView.qml:360
122+#: qml/Dash/GenericScopeView.qml:361
131msgid "See less"
123msgid "See less"
132msgstr "کم‌تر ببینید"
124msgstr "کم‌تر ببینید"
133
125
134−#: qml/Dash/GenericScopeView.qml:360
126+#: qml/Dash/GenericScopeView.qml:361
135msgid "See all"
127msgid "See all"
136msgstr "دیدن همه"
128msgstr "دیدن همه"
137
129
138−#: qml/Dash/GenericScopeView.qml:423 qml/Panel/SearchIndicator.qml:27
130+#: qml/Dash/GenericScopeView.qml:424 qml/Panel/SearchIndicator.qml:27
139msgid "Search"
131msgid "Search"
140msgstr "جست‌وجو"
132msgstr "جست‌وجو"
141
133
@@ -203,13 +195,17 @@ msgstr "اکنون صحبت کنید…"
203msgid "Speaking..."
195msgid "Speaking..."
204msgstr "در حال صحبت کردن…"
196msgstr "در حال صحبت کردن…"
205
197
206−#: qml/Notifications/NotificationMenuItemFactory.qml:100
198+#: qml/Notifications/NotificationMenuItemFactory.qml:105
207msgid "Show password"
199msgid "Show password"
208msgstr "نمایش گذرواژه"
200msgstr "نمایش گذرواژه"
209
201
210−#: qml/Notifications/NotificationMenuItemFactory.qml:115
202+#: qml/Notifications/NotificationMenuItemFactory.qml:120
211−msgid "Please enter SIM PIN"
203+msgid "Enter SIM PIN"
212−msgstr "لطفاً PIN سیم‌کارت را وارد کنید"
204+msgstr ""
205+
206+#: qml/Notifications/NotificationMenuItemFactory.qml:121 qml/Shell.qml:270
207+msgid "Sorry, incorrect PIN"
208+msgstr ""
213
209
214#: qml/Panel/ActiveCallHint.qml:77
210#: qml/Panel/ActiveCallHint.qml:77
215msgid "Tap to return to call..."
211msgid "Tap to return to call..."
@@ -251,41 +247,41 @@ msgstr "باز کردن قفل سیم‌کارت"
251msgid "Roaming"
247msgid "Roaming"
252msgstr "رومینگ"
248msgstr "رومینگ"
253
249
254−#: qml/Shell.qml:267
250+#: qml/Shell.qml:266
255−msgid "passphrase"
251+msgid "Enter your passphrase"
256−msgstr "عبارت‌عبور"
252+msgstr ""
257
253
258#: qml/Shell.qml:267
254#: qml/Shell.qml:267
259−msgid "passcode"
255+msgid "Sorry, incorrect passphrase"
260−msgstr "رمزعبور"
256+msgstr ""
261
257
262#: qml/Shell.qml:269
258#: qml/Shell.qml:269
259+msgid "Enter your PIN"
260+msgstr ""
261+
262+#: qml/Shell.qml:273
263#, qt-format
263#, qt-format
264msgid "Enter your %1"
264msgid "Enter your %1"
265msgstr "%1 خود را وارد کنید"
265msgstr "%1 خود را وارد کنید"
266
266
267−#: qml/Shell.qml:270
267+#: qml/Shell.qml:274
268#, qt-format
268#, qt-format
269−msgid "Incorrect %1"
269+msgid "Sorry, incorrect %1"
270−msgstr "%1 نادرست"
270+msgstr ""
271−
272−#: qml/Shell.qml:272
273−msgid "Please re-enter"
274−msgstr "لطفاً دوباره وارد کنید"
275
271
276−#: qml/Shell.qml:306
272+#: qml/Shell.qml:310
277msgid "Sorry, incorrect passphrase."
273msgid "Sorry, incorrect passphrase."
278msgstr "متأسّفیم، عبارت‌عبور نادرست است."
274msgstr "متأسّفیم، عبارت‌عبور نادرست است."
279
275
280−#: qml/Shell.qml:307
276+#: qml/Shell.qml:311
281msgid "Sorry, incorrect passcode."
277msgid "Sorry, incorrect passcode."
282msgstr "متأسّفیم، رمزعبور نادرست است."
278msgstr "متأسّفیم، رمزعبور نادرست است."
283
279
284−#: qml/Shell.qml:308
280+#: qml/Shell.qml:312
285msgid "This will be your last attempt."
281msgid "This will be your last attempt."
286msgstr "این آخرین تلاش شما خواهد بود."
282msgstr "این آخرین تلاش شما خواهد بود."
287
283
288−#: qml/Shell.qml:310
284+#: qml/Shell.qml:314
289msgid ""
285msgid ""
290"If passphrase is entered incorrectly, your phone will conduct a factory "
286"If passphrase is entered incorrectly, your phone will conduct a factory "
291"reset and all personal data will be deleted."
287"reset and all personal data will be deleted."
@@ -293,10 +289,32 @@ msgstr ""
293"اگر عبارت‌عبور نادرست وارد شود، تلفن شما بازنشانی کارخانه خواهد شد و تمامی "
289"اگر عبارت‌عبور نادرست وارد شود، تلفن شما بازنشانی کارخانه خواهد شد و تمامی "
294"اطّلاعات شخصی حذف خواهند شد."
290"اطّلاعات شخصی حذف خواهند شد."
295
291
296−#: qml/Shell.qml:311
292+#: qml/Shell.qml:315
297msgid ""
293msgid ""
298"If passcode is entered incorrectly, your phone will conduct a factory reset "
294"If passcode is entered incorrectly, your phone will conduct a factory reset "
299"and all personal data will be deleted."
295"and all personal data will be deleted."
300msgstr ""
296msgstr ""
301"اگر رمزعبور نادرست وارد شود، تلفن شما بازنشانی کارخانه خواهد شد و تمامی "
297"اگر رمزعبور نادرست وارد شود، تلفن شما بازنشانی کارخانه خواهد شد و تمامی "
302"اطّلاعات شخصی حذف خواهند شد."
298"اطّلاعات شخصی حذف خواهند شد."
299+
300+#~ msgid "DONE"
301+#~ msgstr "انجام شد"
302+
303+#~ msgid "CANCEL"
304+#~ msgstr "لغو"
305+
306+#~ msgid "Please enter SIM PIN"
307+#~ msgstr "لطفاً PIN سیم‌کارت را وارد کنید"
308+
309+#~ msgid "passphrase"
310+#~ msgstr "عبارت‌عبور"
311+
312+#, qt-format
313+#~ msgid "Incorrect %1"
314+#~ msgstr "%1 نادرست"
315+
316+#~ msgid "Please re-enter"
317+#~ msgstr "لطفاً دوباره وارد کنید"
318+
319+#~ msgid "passcode"
320+#~ msgstr "رمزعبور"
po/fi.po+63−45
@@ -7,15 +7,15 @@ msgid ""
7msgstr ""
7msgstr ""
8"Project-Id-Version: unity\n"
8"Project-Id-Version: unity\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2014-08-13 14:09-0400\n"
10+"POT-Creation-Date: 2014-08-21 11:36+0200\n"
11−"PO-Revision-Date: 2014-08-17 16:53+0000\n"
11+"PO-Revision-Date: 2014-08-22 08:55+0000\n"
12−"Last-Translator: Jiri Grönroos <Unknown>\n"
12+"Last-Translator: Timo Jyrinki <timo.jyrinki@canonical.com>\n"
13"Language-Team: Finnish <fi@li.org>\n"
13"Language-Team: Finnish <fi@li.org>\n"
14"MIME-Version: 1.0\n"
14"MIME-Version: 1.0\n"
15"Content-Type: text/plain; charset=UTF-8\n"
15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n"
16"Content-Transfer-Encoding: 8bit\n"
17−"X-Launchpad-Export-Date: 2014-08-18 07:20+0000\n"
17+"X-Launchpad-Export-Date: 2014-08-23 07:17+0000\n"
18−"X-Generator: Launchpad (build 17156)\n"
18+"X-Generator: Launchpad (build 17163)\n"
19
19
20#: plugins/LightDM/Greeter.cpp:129
20#: plugins/LightDM/Greeter.cpp:129
21msgid "Password: "
21msgid "Password: "
@@ -94,19 +94,19 @@ msgstr ""
94"Hallitset nyt reunaeleet, joten voit aloittaa puhelimen "
94"Hallitset nyt reunaeleet, joten voit aloittaa puhelimen "
95"käytön<br><br>Napauta näyttöä aloittaaksesi"
95"käytön<br><br>Napauta näyttöä aloittaaksesi"
96
96
97−#: qml/Components/Lockscreen.qml:161
97+#: qml/Components/Lockscreen.qml:167
98−msgid "Too many incorrect attempts"
99−msgstr "Liian monta virheellistä yritystä"
100−
101−#: qml/Components/Lockscreen.qml:163
102msgid "Please wait"
98msgid "Please wait"
103msgstr "Odota hetki"
99msgstr "Odota hetki"
104
100
105−#: qml/Components/Lockscreen.qml:245
101+#: qml/Components/Lockscreen.qml:172
102+msgid "Too many incorrect attempts"
103+msgstr "Liian monta virheellistä yritystä"
104+
105+#: qml/Components/Lockscreen.qml:206
106msgid "Emergency Call"
106msgid "Emergency Call"
107msgstr "Hätäpuhelu"
107msgstr "Hätäpuhelu"
108
108
109−#: qml/Components/Lockscreen.qml:268
109+#: qml/Components/Lockscreen.qml:226
110msgid "OK"
110msgid "OK"
111msgstr "OK"
111msgstr "OK"
112
112
@@ -119,23 +119,15 @@ msgstr "Hei %1!"
119msgid "Hello"
119msgid "Hello"
120msgstr "Hei"
120msgstr "Hei"
121
121
122−#: qml/Components/PinLockscreen.qml:197
123−msgid "CANCEL"
124−msgstr "PERU"
125−
126−#: qml/Components/PinLockscreen.qml:215
127−msgid "DONE"
128−msgstr "VALMIS"
129−
130−#: qml/Dash/GenericScopeView.qml:360
122+#: qml/Dash/GenericScopeView.qml:361
131msgid "See less"
123msgid "See less"
132msgstr "Näytä vähemmän"
124msgstr "Näytä vähemmän"
133
125
134−#: qml/Dash/GenericScopeView.qml:360
126+#: qml/Dash/GenericScopeView.qml:361
135msgid "See all"
127msgid "See all"
136msgstr "Näytä kaikki"
128msgstr "Näytä kaikki"
137
129
138−#: qml/Dash/GenericScopeView.qml:423 qml/Panel/SearchIndicator.qml:27
130+#: qml/Dash/GenericScopeView.qml:424 qml/Panel/SearchIndicator.qml:27
139msgid "Search"
131msgid "Search"
140msgstr "Hae"
132msgstr "Hae"
141
133
@@ -161,7 +153,7 @@ msgstr "Lähetä"
161
153
162#: qml/Dash/ScopesOverview.qml:201
154#: qml/Dash/ScopesOverview.qml:201
163msgid "Manage Dash"
155msgid "Manage Dash"
164−msgstr "Dashin hallinta"
156+msgstr "Unityn hallinta"
165
157
166#: qml/Dash/ScopesOverview.qml:408
158#: qml/Dash/ScopesOverview.qml:408
167msgid "Done"
159msgid "Done"
@@ -203,13 +195,17 @@ msgstr "Puhu nyt..."
203msgid "Speaking..."
195msgid "Speaking..."
204msgstr "Puhutaan..."
196msgstr "Puhutaan..."
205
197
206−#: qml/Notifications/NotificationMenuItemFactory.qml:100
198+#: qml/Notifications/NotificationMenuItemFactory.qml:105
207msgid "Show password"
199msgid "Show password"
208msgstr "Näytä salasana"
200msgstr "Näytä salasana"
209
201
210−#: qml/Notifications/NotificationMenuItemFactory.qml:115
202+#: qml/Notifications/NotificationMenuItemFactory.qml:120
211−msgid "Please enter SIM PIN"
203+msgid "Enter SIM PIN"
212−msgstr "Anna SIM-kortin PIN-koodi"
204+msgstr ""
205+
206+#: qml/Notifications/NotificationMenuItemFactory.qml:121 qml/Shell.qml:270
207+msgid "Sorry, incorrect PIN"
208+msgstr ""
213
209
214#: qml/Panel/ActiveCallHint.qml:77
210#: qml/Panel/ActiveCallHint.qml:77
215msgid "Tap to return to call..."
211msgid "Tap to return to call..."
@@ -251,41 +247,41 @@ msgstr "Avaa SIM-kortin lukitus"
251msgid "Roaming"
247msgid "Roaming"
252msgstr "Verkkovierailu"
248msgstr "Verkkovierailu"
253
249
254−#: qml/Shell.qml:267
250+#: qml/Shell.qml:266
255−msgid "passphrase"
251+msgid "Enter your passphrase"
256−msgstr "tunnuslause"
252+msgstr ""
257
253
258#: qml/Shell.qml:267
254#: qml/Shell.qml:267
259−msgid "passcode"
255+msgid "Sorry, incorrect passphrase"
260−msgstr "tunnuskoodi"
256+msgstr ""
261
257
262#: qml/Shell.qml:269
258#: qml/Shell.qml:269
259+msgid "Enter your PIN"
260+msgstr ""
261+
262+#: qml/Shell.qml:273
263#, qt-format
263#, qt-format
264msgid "Enter your %1"
264msgid "Enter your %1"
265msgstr "Anna %1"
265msgstr "Anna %1"
266
266
267−#: qml/Shell.qml:270
267+#: qml/Shell.qml:274
268#, qt-format
268#, qt-format
269−msgid "Incorrect %1"
269+msgid "Sorry, incorrect %1"
270−msgstr "Virheellinen %1"
271−
272−#: qml/Shell.qml:272
273−msgid "Please re-enter"
274−msgstr "Anna uudelleen"
270+msgstr ""
275
271
276−#: qml/Shell.qml:306
272+#: qml/Shell.qml:310
277msgid "Sorry, incorrect passphrase."
273msgid "Sorry, incorrect passphrase."
278msgstr "Virheellinen tunnuslause."
274msgstr "Virheellinen tunnuslause."
279
275
280−#: qml/Shell.qml:307
276+#: qml/Shell.qml:311
281msgid "Sorry, incorrect passcode."
277msgid "Sorry, incorrect passcode."
282msgstr "Virheellinen tunnuskoodi."
278msgstr "Virheellinen tunnuskoodi."
283
279
284−#: qml/Shell.qml:308
280+#: qml/Shell.qml:312
285msgid "This will be your last attempt."
281msgid "This will be your last attempt."
286msgstr "Tämä on viimeinen yritys."
282msgstr "Tämä on viimeinen yritys."
287
283
288−#: qml/Shell.qml:310
284+#: qml/Shell.qml:314
289msgid ""
285msgid ""
290"If passphrase is entered incorrectly, your phone will conduct a factory "
286"If passphrase is entered incorrectly, your phone will conduct a factory "
291"reset and all personal data will be deleted."
287"reset and all personal data will be deleted."
@@ -293,10 +289,32 @@ msgstr ""
293"Jos kirjoitat tunnuslauseen virheellisesti, puhelimesi palautetaan "
289"Jos kirjoitat tunnuslauseen virheellisesti, puhelimesi palautetaan "
294"tehdastilaan ja kaikki henkilökohtaiset tietosi poistetaan."
290"tehdastilaan ja kaikki henkilökohtaiset tietosi poistetaan."
295
291
296−#: qml/Shell.qml:311
292+#: qml/Shell.qml:315
297msgid ""
293msgid ""
298"If passcode is entered incorrectly, your phone will conduct a factory reset "
294"If passcode is entered incorrectly, your phone will conduct a factory reset "
299"and all personal data will be deleted."
295"and all personal data will be deleted."
300msgstr ""
296msgstr ""
301"Jos kirjoitat tunnuskoodin virheellisesti, puhelimesi palautetaan "
297"Jos kirjoitat tunnuskoodin virheellisesti, puhelimesi palautetaan "
302"tehdastilaan ja kaikki henkilökohtaiset tietosi poistetaan."
298"tehdastilaan ja kaikki henkilökohtaiset tietosi poistetaan."
299+
300+#~ msgid "Please enter SIM PIN"
301+#~ msgstr "Anna SIM-kortin PIN-koodi"
302+
303+#~ msgid "CANCEL"
304+#~ msgstr "PERU"
305+
306+#~ msgid "DONE"
307+#~ msgstr "VALMIS"
308+
309+#, qt-format
310+#~ msgid "Incorrect %1"
311+#~ msgstr "Virheellinen %1"
312+
313+#~ msgid "passphrase"
314+#~ msgstr "tunnuslause"
315+
316+#~ msgid "passcode"
317+#~ msgstr "tunnuskoodi"
318+
319+#~ msgid "Please re-enter"
320+#~ msgstr "Anna uudelleen"
po/fo.po+33−37
@@ -7,15 +7,15 @@ msgid ""
7msgstr ""
7msgstr ""
8"Project-Id-Version: unity\n"
8"Project-Id-Version: unity\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2014-08-13 14:09-0400\n"
10+"POT-Creation-Date: 2014-08-21 11:36+0200\n"
11"PO-Revision-Date: 2014-01-14 20:08+0000\n"
11"PO-Revision-Date: 2014-01-14 20:08+0000\n"
12"Last-Translator: Jógvan Olsen <jeggy@jebster.net>\n"
12"Last-Translator: Jógvan Olsen <jeggy@jebster.net>\n"
13"Language-Team: Faroese <fo@li.org>\n"
13"Language-Team: Faroese <fo@li.org>\n"
14"MIME-Version: 1.0\n"
14"MIME-Version: 1.0\n"
15"Content-Type: text/plain; charset=UTF-8\n"
15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n"
16"Content-Transfer-Encoding: 8bit\n"
17−"X-Launchpad-Export-Date: 2014-08-15 06:28+0000\n"
17+"X-Launchpad-Export-Date: 2014-08-23 07:17+0000\n"
18−"X-Generator: Launchpad (build 17156)\n"
18+"X-Generator: Launchpad (build 17163)\n"
19
19
20#: plugins/LightDM/Greeter.cpp:129
20#: plugins/LightDM/Greeter.cpp:129
21msgid "Password: "
21msgid "Password: "
@@ -92,19 +92,19 @@ msgid ""
92"phone<br><br>Tap on the screen to start"
92"phone<br><br>Tap on the screen to start"
93msgstr ""
93msgstr ""
94
94
95−#: qml/Components/Lockscreen.qml:161
95+#: qml/Components/Lockscreen.qml:167
96−msgid "Too many incorrect attempts"
96+msgid "Please wait"
97msgstr ""
97msgstr ""
98
98
99−#: qml/Components/Lockscreen.qml:163
99+#: qml/Components/Lockscreen.qml:172
100−msgid "Please wait"
100+msgid "Too many incorrect attempts"
101msgstr ""
101msgstr ""
102
102
103−#: qml/Components/Lockscreen.qml:245
103+#: qml/Components/Lockscreen.qml:206
104msgid "Emergency Call"
104msgid "Emergency Call"
105msgstr ""
105msgstr ""
106
106
107−#: qml/Components/Lockscreen.qml:268
107+#: qml/Components/Lockscreen.qml:226
108msgid "OK"
108msgid "OK"
109msgstr ""
109msgstr ""
110
110
@@ -117,23 +117,15 @@ msgstr ""
117msgid "Hello"
117msgid "Hello"
118msgstr ""
118msgstr ""
119
119
120−#: qml/Components/PinLockscreen.qml:197
121−msgid "CANCEL"
122−msgstr ""
123−
124−#: qml/Components/PinLockscreen.qml:215
125−msgid "DONE"
126−msgstr ""
127−
128−#: qml/Dash/GenericScopeView.qml:360
120+#: qml/Dash/GenericScopeView.qml:361
129msgid "See less"
121msgid "See less"
130msgstr ""
122msgstr ""
131
123
132−#: qml/Dash/GenericScopeView.qml:360
124+#: qml/Dash/GenericScopeView.qml:361
133msgid "See all"
125msgid "See all"
134msgstr ""
126msgstr ""
135
127
136−#: qml/Dash/GenericScopeView.qml:423 qml/Panel/SearchIndicator.qml:27
128+#: qml/Dash/GenericScopeView.qml:424 qml/Panel/SearchIndicator.qml:27
137msgid "Search"
129msgid "Search"
138msgstr "Leita"
130msgstr "Leita"
139
131
@@ -201,12 +193,16 @@ msgstr "Snakka nú..."
201msgid "Speaking..."
193msgid "Speaking..."
202msgstr "Snakkar..."
194msgstr "Snakkar..."
203
195
204−#: qml/Notifications/NotificationMenuItemFactory.qml:100
196+#: qml/Notifications/NotificationMenuItemFactory.qml:105
205msgid "Show password"
197msgid "Show password"
206msgstr ""
198msgstr ""
207
199
208−#: qml/Notifications/NotificationMenuItemFactory.qml:115
200+#: qml/Notifications/NotificationMenuItemFactory.qml:120
209−msgid "Please enter SIM PIN"
201+msgid "Enter SIM PIN"
202+msgstr ""
203+
204+#: qml/Notifications/NotificationMenuItemFactory.qml:121 qml/Shell.qml:270
205+msgid "Sorry, incorrect PIN"
210msgstr ""
206msgstr ""
211
207
212#: qml/Panel/ActiveCallHint.qml:77
208#: qml/Panel/ActiveCallHint.qml:77
@@ -249,47 +245,47 @@ msgstr ""
249msgid "Roaming"
245msgid "Roaming"
250msgstr ""
246msgstr ""
251
247
252−#: qml/Shell.qml:267
248+#: qml/Shell.qml:266
253−msgid "passphrase"
249+msgid "Enter your passphrase"
254msgstr ""
250msgstr ""
255
251
256#: qml/Shell.qml:267
252#: qml/Shell.qml:267
257−msgid "passcode"
253+msgid "Sorry, incorrect passphrase"
258msgstr ""
254msgstr ""
259
255
260#: qml/Shell.qml:269
256#: qml/Shell.qml:269
261−#, qt-format
262−msgid "Enter your %1"
257+msgid "Enter your PIN"
263msgstr ""
258msgstr ""
264
259
265−#: qml/Shell.qml:270
260+#: qml/Shell.qml:273
266#, qt-format
261#, qt-format
267−msgid "Incorrect %1"
262+msgid "Enter your %1"
268msgstr ""
263msgstr ""
269
264
270−#: qml/Shell.qml:272
265+#: qml/Shell.qml:274
271−msgid "Please re-enter"
266+#, qt-format
267+msgid "Sorry, incorrect %1"
272msgstr ""
268msgstr ""
273
269
274−#: qml/Shell.qml:306
270+#: qml/Shell.qml:310
275msgid "Sorry, incorrect passphrase."
271msgid "Sorry, incorrect passphrase."
276msgstr ""
272msgstr ""
277
273
278−#: qml/Shell.qml:307
274+#: qml/Shell.qml:311
279msgid "Sorry, incorrect passcode."
275msgid "Sorry, incorrect passcode."
280msgstr ""
276msgstr ""
281
277
282−#: qml/Shell.qml:308
278+#: qml/Shell.qml:312
283msgid "This will be your last attempt."
279msgid "This will be your last attempt."
284msgstr ""
280msgstr ""
285
281
286−#: qml/Shell.qml:310
282+#: qml/Shell.qml:314
287msgid ""
283msgid ""
288"If passphrase is entered incorrectly, your phone will conduct a factory "
284"If passphrase is entered incorrectly, your phone will conduct a factory "
289"reset and all personal data will be deleted."
285"reset and all personal data will be deleted."
290msgstr ""
286msgstr ""
291
287
292−#: qml/Shell.qml:311
288+#: qml/Shell.qml:315
293msgid ""
289msgid ""
294"If passcode is entered incorrectly, your phone will conduct a factory reset "
290"If passcode is entered incorrectly, your phone will conduct a factory reset "
295"and all personal data will be deleted."
291"and all personal data will be deleted."
po/fr.po+60−42
@@ -7,15 +7,15 @@ msgid ""
7msgstr ""
7msgstr ""
8"Project-Id-Version: unity\n"
8"Project-Id-Version: unity\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2014-08-13 14:09-0400\n"
10+"POT-Creation-Date: 2014-08-21 11:36+0200\n"
11"PO-Revision-Date: 2014-08-16 12:13+0000\n"
11"PO-Revision-Date: 2014-08-16 12:13+0000\n"
12"Last-Translator: Jean Marc <Unknown>\n"
12"Last-Translator: Jean Marc <Unknown>\n"
13"Language-Team: French <fr@li.org>\n"
13"Language-Team: French <fr@li.org>\n"
14"MIME-Version: 1.0\n"
14"MIME-Version: 1.0\n"
15"Content-Type: text/plain; charset=UTF-8\n"
15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n"
16"Content-Transfer-Encoding: 8bit\n"
17−"X-Launchpad-Export-Date: 2014-08-18 07:20+0000\n"
17+"X-Launchpad-Export-Date: 2014-08-23 07:17+0000\n"
18−"X-Generator: Launchpad (build 17156)\n"
18+"X-Generator: Launchpad (build 17163)\n"
19
19
20#: plugins/LightDM/Greeter.cpp:129
20#: plugins/LightDM/Greeter.cpp:129
21msgid "Password: "
21msgid "Password: "
@@ -101,19 +101,19 @@ msgstr ""
101"Vous maîtrisez maintenant les différents gestes et pouvez commencer à "
101"Vous maîtrisez maintenant les différents gestes et pouvez commencer à "
102"utiliser le téléphone<br><br>Appuyez sur l'écran pour commencer"
102"utiliser le téléphone<br><br>Appuyez sur l'écran pour commencer"
103
103
104−#: qml/Components/Lockscreen.qml:161
104+#: qml/Components/Lockscreen.qml:167
105−msgid "Too many incorrect attempts"
106−msgstr "Trop de tentatives incorrectes"
107−
108−#: qml/Components/Lockscreen.qml:163
109msgid "Please wait"
105msgid "Please wait"
110msgstr "Veuillez patienter"
106msgstr "Veuillez patienter"
111
107
112−#: qml/Components/Lockscreen.qml:245
108+#: qml/Components/Lockscreen.qml:172
109+msgid "Too many incorrect attempts"
110+msgstr "Trop de tentatives incorrectes"
111+
112+#: qml/Components/Lockscreen.qml:206
113msgid "Emergency Call"
113msgid "Emergency Call"
114msgstr "Appel d'urgence"
114msgstr "Appel d'urgence"
115
115
116−#: qml/Components/Lockscreen.qml:268
116+#: qml/Components/Lockscreen.qml:226
117msgid "OK"
117msgid "OK"
118msgstr "OK"
118msgstr "OK"
119
119
@@ -126,23 +126,15 @@ msgstr "Bonjour %1"
126msgid "Hello"
126msgid "Hello"
127msgstr "Bonjour"
127msgstr "Bonjour"
128
128
129−#: qml/Components/PinLockscreen.qml:197
130−msgid "CANCEL"
131−msgstr "ANNULER"
132−
133−#: qml/Components/PinLockscreen.qml:215
134−msgid "DONE"
135−msgstr "VALIDER"
136−
137−#: qml/Dash/GenericScopeView.qml:360
129+#: qml/Dash/GenericScopeView.qml:361
138msgid "See less"
130msgid "See less"
139msgstr "Voir moins"
131msgstr "Voir moins"
140
132
141−#: qml/Dash/GenericScopeView.qml:360
133+#: qml/Dash/GenericScopeView.qml:361
142msgid "See all"
134msgid "See all"
143msgstr "Tout voir"
135msgstr "Tout voir"
144
136
145−#: qml/Dash/GenericScopeView.qml:423 qml/Panel/SearchIndicator.qml:27
137+#: qml/Dash/GenericScopeView.qml:424 qml/Panel/SearchIndicator.qml:27
146msgid "Search"
138msgid "Search"
147msgstr "Rechercher"
139msgstr "Rechercher"
148
140
@@ -210,13 +202,17 @@ msgstr "Parlez maintenant…"
210msgid "Speaking..."
202msgid "Speaking..."
211msgstr "En cours d'écoute..."
203msgstr "En cours d'écoute..."
212
204
213−#: qml/Notifications/NotificationMenuItemFactory.qml:100
205+#: qml/Notifications/NotificationMenuItemFactory.qml:105
214msgid "Show password"
206msgid "Show password"
215msgstr "Afficher le mot de passe"
207msgstr "Afficher le mot de passe"
216
208
217−#: qml/Notifications/NotificationMenuItemFactory.qml:115
209+#: qml/Notifications/NotificationMenuItemFactory.qml:120
218−msgid "Please enter SIM PIN"
210+msgid "Enter SIM PIN"
219−msgstr "Entrez le code PIN"
211+msgstr ""
212+
213+#: qml/Notifications/NotificationMenuItemFactory.qml:121 qml/Shell.qml:270
214+msgid "Sorry, incorrect PIN"
215+msgstr ""
220
216
221#: qml/Panel/ActiveCallHint.qml:77
217#: qml/Panel/ActiveCallHint.qml:77
222msgid "Tap to return to call..."
218msgid "Tap to return to call..."
@@ -258,41 +254,41 @@ msgstr "Déverrouiller la carte SIM"
258msgid "Roaming"
254msgid "Roaming"
259msgstr "Roaming"
255msgstr "Roaming"
260
256
261−#: qml/Shell.qml:267
257+#: qml/Shell.qml:266
262−msgid "passphrase"
258+msgid "Enter your passphrase"
263−msgstr "phrase secrète"
259+msgstr ""
264
260
265#: qml/Shell.qml:267
261#: qml/Shell.qml:267
266−msgid "passcode"
262+msgid "Sorry, incorrect passphrase"
267−msgstr "code"
263+msgstr ""
268
264
269#: qml/Shell.qml:269
265#: qml/Shell.qml:269
266+msgid "Enter your PIN"
267+msgstr ""
268+
269+#: qml/Shell.qml:273
270#, qt-format
270#, qt-format
271msgid "Enter your %1"
271msgid "Enter your %1"
272msgstr "Saisissez votre %1"
272msgstr "Saisissez votre %1"
273
273
274−#: qml/Shell.qml:270
274+#: qml/Shell.qml:274
275#, qt-format
275#, qt-format
276−msgid "Incorrect %1"
276+msgid "Sorry, incorrect %1"
277−msgstr "%1 non valide"
277+msgstr ""
278−
279−#: qml/Shell.qml:272
280−msgid "Please re-enter"
281−msgstr "Veuillez recommencer"
282
278
283−#: qml/Shell.qml:306
279+#: qml/Shell.qml:310
284msgid "Sorry, incorrect passphrase."
280msgid "Sorry, incorrect passphrase."
285msgstr "Désolé, phrase secrète incorrecte."
281msgstr "Désolé, phrase secrète incorrecte."
286
282
287−#: qml/Shell.qml:307
283+#: qml/Shell.qml:311
288msgid "Sorry, incorrect passcode."
284msgid "Sorry, incorrect passcode."
289msgstr "Désolé, code incorrect."
285msgstr "Désolé, code incorrect."
290
286
291−#: qml/Shell.qml:308
287+#: qml/Shell.qml:312
292msgid "This will be your last attempt."
288msgid "This will be your last attempt."
293msgstr "Ceci sera votre dernière tentative."
289msgstr "Ceci sera votre dernière tentative."
294
290
295−#: qml/Shell.qml:310
291+#: qml/Shell.qml:314
296msgid ""
292msgid ""
297"If passphrase is entered incorrectly, your phone will conduct a factory "
293"If passphrase is entered incorrectly, your phone will conduct a factory "
298"reset and all personal data will be deleted."
294"reset and all personal data will be deleted."
@@ -301,7 +297,7 @@ msgstr ""
301"effectuera une réinitialisation aux paramètres d'usine et toutes les données "
297"effectuera une réinitialisation aux paramètres d'usine et toutes les données "
302"personnelles seront supprimées."
298"personnelles seront supprimées."
303
299
304−#: qml/Shell.qml:311
300+#: qml/Shell.qml:315
305msgid ""
301msgid ""
306"If passcode is entered incorrectly, your phone will conduct a factory reset "
302"If passcode is entered incorrectly, your phone will conduct a factory reset "
307"and all personal data will be deleted."
303"and all personal data will be deleted."
@@ -309,3 +305,25 @@ msgstr ""
309"Si le code est saisi de manière incorrecte, votre téléphone effectuera une "
305"Si le code est saisi de manière incorrecte, votre téléphone effectuera une "
310"réinitialisation aux paramètres d'usine et toutes les données personnelles "
306"réinitialisation aux paramètres d'usine et toutes les données personnelles "
311"seront supprimées."
307"seront supprimées."
308+
309+#~ msgid "CANCEL"
310+#~ msgstr "ANNULER"
311+
312+#~ msgid "DONE"
313+#~ msgstr "VALIDER"
314+
315+#~ msgid "Please enter SIM PIN"
316+#~ msgstr "Entrez le code PIN"
317+
318+#~ msgid "passphrase"
319+#~ msgstr "phrase secrète"
320+
321+#~ msgid "passcode"
322+#~ msgstr "code"
323+
324+#, qt-format
325+#~ msgid "Incorrect %1"
326+#~ msgstr "%1 non valide"
327+
328+#~ msgid "Please re-enter"
329+#~ msgstr "Veuillez recommencer"
po/gd.po+43−38
@@ -7,15 +7,15 @@ msgid ""
7msgstr ""
7msgstr ""
8"Project-Id-Version: unity8\n"
8"Project-Id-Version: unity8\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2014-08-13 14:09-0400\n"
10+"POT-Creation-Date: 2014-08-21 11:36+0200\n"
11"PO-Revision-Date: 2014-08-13 00:21+0000\n"
11"PO-Revision-Date: 2014-08-13 00:21+0000\n"
12"Last-Translator: Akerbeltz <fios@akerbeltz.org>\n"
12"Last-Translator: Akerbeltz <fios@akerbeltz.org>\n"
13"Language-Team: Fòram na Gàidhlig http://www.foramnagaidhlig.net\n"
13"Language-Team: Fòram na Gàidhlig http://www.foramnagaidhlig.net\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−"X-Launchpad-Export-Date: 2014-08-15 06:28+0000\n"
17+"X-Launchpad-Export-Date: 2014-08-23 07:17+0000\n"
18−"X-Generator: Launchpad (build 17156)\n"
18+"X-Generator: Launchpad (build 17163)\n"
19"Language: gd\n"
19"Language: gd\n"
20
20
21#: plugins/LightDM/Greeter.cpp:129
21#: plugins/LightDM/Greeter.cpp:129
@@ -101,19 +101,19 @@ msgstr ""
101"Fhuair thu air na gluasadan oire ceart a dhèanamh a-nis agus is urrainn dhut "
101"Fhuair thu air na gluasadan oire ceart a dhèanamh a-nis agus is urrainn dhut "
102"am fòn a chleachdadh<br><br>Thoir gnogag air an sgrìn airson tòiseachadh"
102"am fòn a chleachdadh<br><br>Thoir gnogag air an sgrìn airson tòiseachadh"
103
103
104−#: qml/Components/Lockscreen.qml:161
104+#: qml/Components/Lockscreen.qml:167
105−msgid "Too many incorrect attempts"
105+msgid "Please wait"
106msgstr ""
106msgstr ""
107
107
108−#: qml/Components/Lockscreen.qml:163
108+#: qml/Components/Lockscreen.qml:172
109−msgid "Please wait"
109+msgid "Too many incorrect attempts"
110msgstr ""
110msgstr ""
111
111
112−#: qml/Components/Lockscreen.qml:245
112+#: qml/Components/Lockscreen.qml:206
113msgid "Emergency Call"
113msgid "Emergency Call"
114msgstr "Gairm èiginn"
114msgstr "Gairm èiginn"
115
115
116−#: qml/Components/Lockscreen.qml:268
116+#: qml/Components/Lockscreen.qml:226
117msgid "OK"
117msgid "OK"
118msgstr "Ceart ma-thà"
118msgstr "Ceart ma-thà"
119
119
@@ -126,23 +126,15 @@ msgstr "Shin thu, %1"
126msgid "Hello"
126msgid "Hello"
127msgstr "Shin thu"
127msgstr "Shin thu"
128
128
129−#: qml/Components/PinLockscreen.qml:197
130−msgid "CANCEL"
131−msgstr "SGUIR DHETH"
132−
133−#: qml/Components/PinLockscreen.qml:215
134−msgid "DONE"
135−msgstr "DÈANTA"
136−
137−#: qml/Dash/GenericScopeView.qml:360
129+#: qml/Dash/GenericScopeView.qml:361
138msgid "See less"
130msgid "See less"
139msgstr "Seall nas lugha"
131msgstr "Seall nas lugha"
140
132
141−#: qml/Dash/GenericScopeView.qml:360
133+#: qml/Dash/GenericScopeView.qml:361
142msgid "See all"
134msgid "See all"
143msgstr "Seall na h-uile"
135msgstr "Seall na h-uile"
144
136
145−#: qml/Dash/GenericScopeView.qml:423 qml/Panel/SearchIndicator.qml:27
137+#: qml/Dash/GenericScopeView.qml:424 qml/Panel/SearchIndicator.qml:27
146msgid "Search"
138msgid "Search"
147msgstr "Lorg"
139msgstr "Lorg"
148
140
@@ -210,13 +202,17 @@ msgstr "Can rud a-nis..."
210msgid "Speaking..."
202msgid "Speaking..."
211msgstr "A' bruidhinn..."
203msgstr "A' bruidhinn..."
212
204
213−#: qml/Notifications/NotificationMenuItemFactory.qml:100
205+#: qml/Notifications/NotificationMenuItemFactory.qml:105
214msgid "Show password"
206msgid "Show password"
215msgstr "Seall am facal-faire"
207msgstr "Seall am facal-faire"
216
208
217−#: qml/Notifications/NotificationMenuItemFactory.qml:115
209+#: qml/Notifications/NotificationMenuItemFactory.qml:120
218−msgid "Please enter SIM PIN"
210+msgid "Enter SIM PIN"
219−msgstr "Cuir a-steach SIM PIN"
211+msgstr ""
212+
213+#: qml/Notifications/NotificationMenuItemFactory.qml:121 qml/Shell.qml:270
214+msgid "Sorry, incorrect PIN"
215+msgstr ""
220
216
221#: qml/Panel/ActiveCallHint.qml:77
217#: qml/Panel/ActiveCallHint.qml:77
222msgid "Tap to return to call..."
218msgid "Tap to return to call..."
@@ -258,48 +254,57 @@ msgstr "Thoir a' ghlas far an SIM"
258msgid "Roaming"
254msgid "Roaming"
259msgstr "Air fàrsan"
255msgstr "Air fàrsan"
260
256
261−#: qml/Shell.qml:267
257+#: qml/Shell.qml:266
262−msgid "passphrase"
258+msgid "Enter your passphrase"
263msgstr ""
259msgstr ""
264
260
265#: qml/Shell.qml:267
261#: qml/Shell.qml:267
266−msgid "passcode"
262+msgid "Sorry, incorrect passphrase"
267msgstr ""
263msgstr ""
268
264
269#: qml/Shell.qml:269
265#: qml/Shell.qml:269
270−#, qt-format
271−msgid "Enter your %1"
266+msgid "Enter your PIN"
272msgstr ""
267msgstr ""
273
268
274−#: qml/Shell.qml:270
269+#: qml/Shell.qml:273
275#, qt-format
270#, qt-format
276−msgid "Incorrect %1"
271+msgid "Enter your %1"
277msgstr ""
272msgstr ""
278
273
279−#: qml/Shell.qml:272
274+#: qml/Shell.qml:274
280−msgid "Please re-enter"
275+#, qt-format
276+msgid "Sorry, incorrect %1"
281msgstr ""
277msgstr ""
282
278
283−#: qml/Shell.qml:306
279+#: qml/Shell.qml:310
284msgid "Sorry, incorrect passphrase."
280msgid "Sorry, incorrect passphrase."
285msgstr ""
281msgstr ""
286
282
287−#: qml/Shell.qml:307
283+#: qml/Shell.qml:311
288msgid "Sorry, incorrect passcode."
284msgid "Sorry, incorrect passcode."
289msgstr ""
285msgstr ""
290
286
291−#: qml/Shell.qml:308
287+#: qml/Shell.qml:312
292msgid "This will be your last attempt."
288msgid "This will be your last attempt."
293msgstr ""
289msgstr ""
294
290
295−#: qml/Shell.qml:310
291+#: qml/Shell.qml:314
296msgid ""
292msgid ""
297"If passphrase is entered incorrectly, your phone will conduct a factory "
293"If passphrase is entered incorrectly, your phone will conduct a factory "
298"reset and all personal data will be deleted."
294"reset and all personal data will be deleted."
299msgstr ""
295msgstr ""
300
296
301−#: qml/Shell.qml:311
297+#: qml/Shell.qml:315
302msgid ""
298msgid ""
303"If passcode is entered incorrectly, your phone will conduct a factory reset "
299"If passcode is entered incorrectly, your phone will conduct a factory reset "
304"and all personal data will be deleted."
300"and all personal data will be deleted."
305msgstr ""
301msgstr ""
302+
303+#~ msgid "Please enter SIM PIN"
304+#~ msgstr "Cuir a-steach SIM PIN"
305+
306+#~ msgid "CANCEL"
307+#~ msgstr "SGUIR DHETH"
308+
309+#~ msgid "DONE"
310+#~ msgstr "DÈANTA"
po/gl.po+64−46
@@ -7,15 +7,15 @@ msgid ""
7msgstr ""
7msgstr ""
8"Project-Id-Version: unity\n"
8"Project-Id-Version: unity\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2014-08-13 14:09-0400\n"
10+"POT-Creation-Date: 2014-08-21 11:36+0200\n"
11−"PO-Revision-Date: 2014-08-14 14:23+0000\n"
11+"PO-Revision-Date: 2014-08-22 15:16+0000\n"
12"Last-Translator: Marcos Lans <Unknown>\n"
12"Last-Translator: Marcos Lans <Unknown>\n"
13"Language-Team: Galician <gl@li.org>\n"
13"Language-Team: Galician <gl@li.org>\n"
14"MIME-Version: 1.0\n"
14"MIME-Version: 1.0\n"
15"Content-Type: text/plain; charset=UTF-8\n"
15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n"
16"Content-Transfer-Encoding: 8bit\n"
17−"X-Launchpad-Export-Date: 2014-08-15 06:28+0000\n"
17+"X-Launchpad-Export-Date: 2014-08-23 07:17+0000\n"
18−"X-Generator: Launchpad (build 17156)\n"
18+"X-Generator: Launchpad (build 17163)\n"
19
19
20#: plugins/LightDM/Greeter.cpp:129
20#: plugins/LightDM/Greeter.cpp:129
21msgid "Password: "
21msgid "Password: "
@@ -96,19 +96,19 @@ msgstr ""
96"Agora xa domina os xestos dos bordos e pode comezar a usar o "
96"Agora xa domina os xestos dos bordos e pode comezar a usar o "
97"teléfono<br><br>Toque na pantalla para comezar"
97"teléfono<br><br>Toque na pantalla para comezar"
98
98
99−#: qml/Components/Lockscreen.qml:161
99+#: qml/Components/Lockscreen.qml:167
100−msgid "Too many incorrect attempts"
101−msgstr "Demasiados erros"
102−
103−#: qml/Components/Lockscreen.qml:163
104msgid "Please wait"
100msgid "Please wait"
105msgstr "Agarde"
101msgstr "Agarde"
106
102
107−#: qml/Components/Lockscreen.qml:245
103+#: qml/Components/Lockscreen.qml:172
104+msgid "Too many incorrect attempts"
105+msgstr "Demasiados erros"
106+
107+#: qml/Components/Lockscreen.qml:206
108msgid "Emergency Call"
108msgid "Emergency Call"
109msgstr "Chamada de emerxencia"
109msgstr "Chamada de emerxencia"
110
110
111−#: qml/Components/Lockscreen.qml:268
111+#: qml/Components/Lockscreen.qml:226
112msgid "OK"
112msgid "OK"
113msgstr "Aceptar"
113msgstr "Aceptar"
114
114
@@ -121,23 +121,15 @@ msgstr "Ola %1"
121msgid "Hello"
121msgid "Hello"
122msgstr "Ola"
122msgstr "Ola"
123
123
124−#: qml/Components/PinLockscreen.qml:197
125−msgid "CANCEL"
126−msgstr "CANCELAR"
127−
128−#: qml/Components/PinLockscreen.qml:215
129−msgid "DONE"
130−msgstr "FEITO"
131−
132−#: qml/Dash/GenericScopeView.qml:360
124+#: qml/Dash/GenericScopeView.qml:361
133msgid "See less"
125msgid "See less"
134msgstr "Ver menos"
126msgstr "Ver menos"
135
127
136−#: qml/Dash/GenericScopeView.qml:360
128+#: qml/Dash/GenericScopeView.qml:361
137msgid "See all"
129msgid "See all"
138msgstr "Ver todo"
130msgstr "Ver todo"
139
131
140−#: qml/Dash/GenericScopeView.qml:423 qml/Panel/SearchIndicator.qml:27
132+#: qml/Dash/GenericScopeView.qml:424 qml/Panel/SearchIndicator.qml:27
141msgid "Search"
133msgid "Search"
142msgstr "Buscar"
134msgstr "Buscar"
143
135
@@ -163,7 +155,7 @@ msgstr "Enviar"
163
155
164#: qml/Dash/ScopesOverview.qml:201
156#: qml/Dash/ScopesOverview.qml:201
165msgid "Manage Dash"
157msgid "Manage Dash"
166−msgstr "Xestionar o Panel"
158+msgstr "Xestión do Panel"
167
159
168#: qml/Dash/ScopesOverview.qml:408
160#: qml/Dash/ScopesOverview.qml:408
169msgid "Done"
161msgid "Done"
@@ -205,14 +197,18 @@ msgstr "Fale agora…"
205msgid "Speaking..."
197msgid "Speaking..."
206msgstr "Falando…"
198msgstr "Falando…"
207
199
208−#: qml/Notifications/NotificationMenuItemFactory.qml:100
200+#: qml/Notifications/NotificationMenuItemFactory.qml:105
209msgid "Show password"
201msgid "Show password"
210msgstr "Mostrar contrasinal"
202msgstr "Mostrar contrasinal"
211
203
212−#: qml/Notifications/NotificationMenuItemFactory.qml:115
204+#: qml/Notifications/NotificationMenuItemFactory.qml:120
213−msgid "Please enter SIM PIN"
205+msgid "Enter SIM PIN"
214msgstr "Introduza o PIN da SIM"
206msgstr "Introduza o PIN da SIM"
215
207
208+#: qml/Notifications/NotificationMenuItemFactory.qml:121 qml/Shell.qml:270
209+msgid "Sorry, incorrect PIN"
210+msgstr "Sentímolo, o PIN é incorrecto"
211+
216#: qml/Panel/ActiveCallHint.qml:77
212#: qml/Panel/ActiveCallHint.qml:77
217msgid "Tap to return to call..."
213msgid "Tap to return to call..."
218msgstr "Toque para volver a chamar..."
214msgstr "Toque para volver a chamar..."
@@ -253,41 +249,41 @@ msgstr "Desbloquear a SIM"
253msgid "Roaming"
249msgid "Roaming"
254msgstr "Itinerancia"
250msgstr "Itinerancia"
255
251
256−#: qml/Shell.qml:267
252+#: qml/Shell.qml:266
257−msgid "passphrase"
253+msgid "Enter your passphrase"
258−msgstr "Frase de paso"
254+msgstr "Introduza a frase de paso"
259
255
260#: qml/Shell.qml:267
256#: qml/Shell.qml:267
261−msgid "passcode"
257+msgid "Sorry, incorrect passphrase"
262−msgstr "código"
258+msgstr "Sentímolo a frase é incorrecta"
263
259
264#: qml/Shell.qml:269
260#: qml/Shell.qml:269
261+msgid "Enter your PIN"
262+msgstr "Introduza o PIN"
263+
264+#: qml/Shell.qml:273
265#, qt-format
265#, qt-format
266msgid "Enter your %1"
266msgid "Enter your %1"
267−msgstr "Introduza %1"
267+msgstr "Introducir %1"
268
268
269−#: qml/Shell.qml:270
269+#: qml/Shell.qml:274
270#, qt-format
270#, qt-format
271−msgid "Incorrect %1"
271+msgid "Sorry, incorrect %1"
272−msgstr "Incorrecto %1"
272+msgstr "Sentímolo, %1 incorrecto"
273−
274−#: qml/Shell.qml:272
275−msgid "Please re-enter"
276−msgstr "Introducir de novo"
277
273
278−#: qml/Shell.qml:306
274+#: qml/Shell.qml:310
279msgid "Sorry, incorrect passphrase."
275msgid "Sorry, incorrect passphrase."
280msgstr "Sentímolo é incorrecta."
276msgstr "Sentímolo é incorrecta."
281
277
282−#: qml/Shell.qml:307
278+#: qml/Shell.qml:311
283msgid "Sorry, incorrect passcode."
279msgid "Sorry, incorrect passcode."
284−msgstr "Sentímolo é incorrecto."
280+msgstr "Sentímolo, a clave é incorrecta."
285
281
286−#: qml/Shell.qml:308
282+#: qml/Shell.qml:312
287msgid "This will be your last attempt."
283msgid "This will be your last attempt."
288msgstr "Este será o seu último intento."
284msgstr "Este será o seu último intento."
289
285
290−#: qml/Shell.qml:310
286+#: qml/Shell.qml:314
291msgid ""
287msgid ""
292"If passphrase is entered incorrectly, your phone will conduct a factory "
288"If passphrase is entered incorrectly, your phone will conduct a factory "
293"reset and all personal data will be deleted."
289"reset and all personal data will be deleted."
@@ -295,10 +291,32 @@ msgstr ""
295"Se a frase de paso introducida é incorrecta, o teléfono restabelecerá os "
291"Se a frase de paso introducida é incorrecta, o teléfono restabelecerá os "
296"valores de fábrica e perderá todos os datos persoais."
292"valores de fábrica e perderá todos os datos persoais."
297
293
298−#: qml/Shell.qml:311
294+#: qml/Shell.qml:315
299msgid ""
295msgid ""
300"If passcode is entered incorrectly, your phone will conduct a factory reset "
296"If passcode is entered incorrectly, your phone will conduct a factory reset "
301"and all personal data will be deleted."
297"and all personal data will be deleted."
302msgstr ""
298msgstr ""
303−"Se o código introducido é incorrecto, o teléfono restabelecerá os valores de "
299+"Se a clave introducida é incorrecta, o teléfono restabelecerá os valores de "
304"fábrica e perderá todos os datos persoais."
300"fábrica e perderá todos os datos persoais."
301+
302+#~ msgid "Please enter SIM PIN"
303+#~ msgstr "Introduza o PIN da SIM"
304+
305+#~ msgid "DONE"
306+#~ msgstr "FEITO"
307+
308+#~ msgid "CANCEL"
309+#~ msgstr "CANCELAR"
310+
311+#~ msgid "passphrase"
312+#~ msgstr "Frase de paso"
313+
314+#, qt-format
315+#~ msgid "Incorrect %1"
316+#~ msgstr "Incorrecto %1"
317+
318+#~ msgid "Please re-enter"
319+#~ msgstr "Introducir de novo"
320+
321+#~ msgid "passcode"
322+#~ msgstr "código"
po/he.po+61−56
@@ -7,19 +7,19 @@ msgid ""
7msgstr ""
7msgstr ""
8"Project-Id-Version: unity\n"
8"Project-Id-Version: unity\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2014-08-13 14:09-0400\n"
10+"POT-Creation-Date: 2014-08-21 11:36+0200\n"
11−"PO-Revision-Date: 2014-07-25 16:26+0000\n"
11+"PO-Revision-Date: 2014-08-23 14:19+0000\n"
12"Last-Translator: Yaron <sh.yaron@gmail.com>\n"
12"Last-Translator: Yaron <sh.yaron@gmail.com>\n"
13"Language-Team: Hebrew <he@li.org>\n"
13"Language-Team: Hebrew <he@li.org>\n"
14"MIME-Version: 1.0\n"
14"MIME-Version: 1.0\n"
15"Content-Type: text/plain; charset=UTF-8\n"
15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n"
16"Content-Transfer-Encoding: 8bit\n"
17−"X-Launchpad-Export-Date: 2014-08-15 06:28+0000\n"
17+"X-Launchpad-Export-Date: 2014-08-24 06:46+0000\n"
18−"X-Generator: Launchpad (build 17156)\n"
18+"X-Generator: Launchpad (build 17163)\n"
19
19
20#: plugins/LightDM/Greeter.cpp:129
20#: plugins/LightDM/Greeter.cpp:129
21msgid "Password: "
21msgid "Password: "
22−msgstr ""
22+msgstr "ססמה: "
23
23
24#: plugins/Unity/Launcher/launcheritem.cpp:43
24#: plugins/Unity/Launcher/launcheritem.cpp:43
25#: plugins/Unity/Launcher/launcheritem.cpp:73
25#: plugins/Unity/Launcher/launcheritem.cpp:73
@@ -32,19 +32,19 @@ msgstr "הפרדת קיצור הדרך"
32
32
33#: qml/Components/Dialogs.qml:142
33#: qml/Components/Dialogs.qml:142
34msgid "Are you sure you would like to turn power off?"
34msgid "Are you sure you would like to turn power off?"
35−msgstr ""
35+msgstr "האם ברצונך לכבות את המכשיר?"
36
36
37#: qml/Components/Dialogs.qml:144
37#: qml/Components/Dialogs.qml:144
38msgid "Power off"
38msgid "Power off"
39−msgstr ""
39+msgstr "כיבוי"
40
40
41#: qml/Components/Dialogs.qml:153
41#: qml/Components/Dialogs.qml:153
42msgid "Restart"
42msgid "Restart"
43−msgstr ""
43+msgstr "הפעלה מחדש"
44
44
45#: qml/Components/Dialogs.qml:162
45#: qml/Components/Dialogs.qml:162
46msgid "Cancel"
46msgid "Cancel"
47−msgstr ""
47+msgstr "ביטול"
48
48
49#: qml/Components/EdgeDemoOverlay.qml:151
49#: qml/Components/EdgeDemoOverlay.qml:151
50msgid "Skip intro"
50msgid "Skip intro"
@@ -94,19 +94,19 @@ msgstr ""
94"ברגעים אלו סיימת את התמחותך בשימוש במחוות קצה והטלפון פתוח לשימושך<br><br>נא "
94"ברגעים אלו סיימת את התמחותך בשימוש במחוות קצה והטלפון פתוח לשימושך<br><br>נא "
95"לגעת במסך כדי להתחיל"
95"לגעת במסך כדי להתחיל"
96
96
97−#: qml/Components/Lockscreen.qml:161
97+#: qml/Components/Lockscreen.qml:167
98−msgid "Too many incorrect attempts"
99−msgstr ""
100−
101−#: qml/Components/Lockscreen.qml:163
102msgid "Please wait"
98msgid "Please wait"
103−msgstr ""
99+msgstr "נא להמתין"
104
100
105−#: qml/Components/Lockscreen.qml:245
101+#: qml/Components/Lockscreen.qml:172
102+msgid "Too many incorrect attempts"
103+msgstr "יותר מדי ניסיונות שגויים"
104+
105+#: qml/Components/Lockscreen.qml:206
106msgid "Emergency Call"
106msgid "Emergency Call"
107msgstr "שיחת חירום"
107msgstr "שיחת חירום"
108
108
109−#: qml/Components/Lockscreen.qml:268
109+#: qml/Components/Lockscreen.qml:226
110msgid "OK"
110msgid "OK"
111msgstr "אישור"
111msgstr "אישור"
112
112
@@ -119,23 +119,15 @@ msgstr "שלום %1"
119msgid "Hello"
119msgid "Hello"
120msgstr "שלום"
120msgstr "שלום"
121
121
122−#: qml/Components/PinLockscreen.qml:197
123−msgid "CANCEL"
124−msgstr "ביטול"
125−
126−#: qml/Components/PinLockscreen.qml:215
127−msgid "DONE"
128−msgstr "בוצע"
129−
130−#: qml/Dash/GenericScopeView.qml:360
122+#: qml/Dash/GenericScopeView.qml:361
131msgid "See less"
123msgid "See less"
132msgstr "לראות פחות"
124msgstr "לראות פחות"
133
125
134−#: qml/Dash/GenericScopeView.qml:360
126+#: qml/Dash/GenericScopeView.qml:361
135msgid "See all"
127msgid "See all"
136msgstr "להציג הכול"
128msgstr "להציג הכול"
137
129
138−#: qml/Dash/GenericScopeView.qml:423 qml/Panel/SearchIndicator.qml:27
130+#: qml/Dash/GenericScopeView.qml:424 qml/Panel/SearchIndicator.qml:27
139msgid "Search"
131msgid "Search"
140msgstr "חיפוש"
132msgstr "חיפוש"
141
133
@@ -165,19 +157,19 @@ msgstr ""
165
157
166#: qml/Dash/ScopesOverview.qml:408
158#: qml/Dash/ScopesOverview.qml:408
167msgid "Done"
159msgid "Done"
168−msgstr ""
160+msgstr "סיימתי"
169
161
170#: qml/Dash/ScopesOverview.qml:434
162#: qml/Dash/ScopesOverview.qml:434
171msgid "Store"
163msgid "Store"
172−msgstr ""
164+msgstr "אחסון"
173
165
174#: qml/Dash/ScopesOverviewTab.qml:36
166#: qml/Dash/ScopesOverviewTab.qml:36
175msgid "Favorites"
167msgid "Favorites"
176−msgstr ""
168+msgstr "מועדפים"
177
169
178#: qml/Dash/ScopesOverviewTab.qml:54
170#: qml/Dash/ScopesOverviewTab.qml:54
179msgid "All"
171msgid "All"
180−msgstr ""
172+msgstr "הכול"
181
173
182#: qml/Greeter/Greeter.qml:157
174#: qml/Greeter/Greeter.qml:157
183msgid "Swipe to unlock"
175msgid "Swipe to unlock"
@@ -203,13 +195,17 @@ msgstr "יש לדבר כעת..."
203msgid "Speaking..."
195msgid "Speaking..."
204msgstr "הדיבור מושמע…"
196msgstr "הדיבור מושמע…"
205
197
206−#: qml/Notifications/NotificationMenuItemFactory.qml:100
198+#: qml/Notifications/NotificationMenuItemFactory.qml:105
207msgid "Show password"
199msgid "Show password"
208msgstr "הצגת הססמה"
200msgstr "הצגת הססמה"
209
201
210−#: qml/Notifications/NotificationMenuItemFactory.qml:115
202+#: qml/Notifications/NotificationMenuItemFactory.qml:120
211−msgid "Please enter SIM PIN"
203+msgid "Enter SIM PIN"
212−msgstr "נא להזין את קוד ה־<U+200F>SIM"
204+msgstr ""
205+
206+#: qml/Notifications/NotificationMenuItemFactory.qml:121 qml/Shell.qml:270
207+msgid "Sorry, incorrect PIN"
208+msgstr ""
213
209
214#: qml/Panel/ActiveCallHint.qml:77
210#: qml/Panel/ActiveCallHint.qml:77
215msgid "Tap to return to call..."
211msgid "Tap to return to call..."
@@ -249,50 +245,59 @@ msgstr ""
249
245
250#: qml/Panel/Indicators/RoamingIndication.qml:27
246#: qml/Panel/Indicators/RoamingIndication.qml:27
251msgid "Roaming"
247msgid "Roaming"
252−msgstr ""
248+msgstr "נדידה"
253
249
254−#: qml/Shell.qml:267
250+#: qml/Shell.qml:266
255−msgid "passphrase"
251+msgid "Enter your passphrase"
256−msgstr ""
252+msgstr "נא להזין את מילת הצופן שלך"
257
253
258#: qml/Shell.qml:267
254#: qml/Shell.qml:267
259−msgid "passcode"
255+msgid "Sorry, incorrect passphrase"
260−msgstr ""
256+msgstr "מילת הצופן שגויה, עמך הסליחה."
261
257
262#: qml/Shell.qml:269
258#: qml/Shell.qml:269
263−#, qt-format
264−msgid "Enter your %1"
259+msgid "Enter your PIN"
265msgstr ""
260msgstr ""
266
261
267−#: qml/Shell.qml:270
262+#: qml/Shell.qml:273
268#, qt-format
263#, qt-format
269−msgid "Incorrect %1"
264+msgid "Enter your %1"
270msgstr ""
265msgstr ""
271
266
272−#: qml/Shell.qml:272
267+#: qml/Shell.qml:274
273−msgid "Please re-enter"
268+#, qt-format
269+msgid "Sorry, incorrect %1"
274msgstr ""
270msgstr ""
275
271
276−#: qml/Shell.qml:306
272+#: qml/Shell.qml:310
277msgid "Sorry, incorrect passphrase."
273msgid "Sorry, incorrect passphrase."
278−msgstr ""
274+msgstr "מילת הצופן שגויה, עמך הסליחה."
279
275
280−#: qml/Shell.qml:307
276+#: qml/Shell.qml:311
281msgid "Sorry, incorrect passcode."
277msgid "Sorry, incorrect passcode."
282−msgstr ""
278+msgstr "הצופן שגוי, עם הסליחה."
283
279
284−#: qml/Shell.qml:308
280+#: qml/Shell.qml:312
285msgid "This will be your last attempt."
281msgid "This will be your last attempt."
286−msgstr ""
282+msgstr "זה יהיה הניסיון האחרון שלך."
287
283
288−#: qml/Shell.qml:310
284+#: qml/Shell.qml:314
289msgid ""
285msgid ""
290"If passphrase is entered incorrectly, your phone will conduct a factory "
286"If passphrase is entered incorrectly, your phone will conduct a factory "
291"reset and all personal data will be deleted."
287"reset and all personal data will be deleted."
292msgstr ""
288msgstr ""
293
289
294−#: qml/Shell.qml:311
290+#: qml/Shell.qml:315
295msgid ""
291msgid ""
296"If passcode is entered incorrectly, your phone will conduct a factory reset "
292"If passcode is entered incorrectly, your phone will conduct a factory reset "
297"and all personal data will be deleted."
293"and all personal data will be deleted."
298msgstr ""
294msgstr ""
295+
296+#~ msgid "Please enter SIM PIN"
297+#~ msgstr "נא להזין את קוד ה־<U+200F>SIM"
298+
299+#~ msgid "CANCEL"
300+#~ msgstr "ביטול"
301+
302+#~ msgid "DONE"
303+#~ msgstr "בוצע"
po/hi.po+33−37
@@ -7,15 +7,15 @@ msgid ""
7msgstr ""
7msgstr ""
8"Project-Id-Version: unity8\n"
8"Project-Id-Version: unity8\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2014-08-13 14:09-0400\n"
10+"POT-Creation-Date: 2014-08-21 11:36+0200\n"
11"PO-Revision-Date: 2014-01-15 01:49+0000\n"
11"PO-Revision-Date: 2014-01-15 01:49+0000\n"
12"Last-Translator: Siddhanathan S. <Unknown>\n"
12"Last-Translator: Siddhanathan S. <Unknown>\n"
13"Language-Team: Hindi <hi@li.org>\n"
13"Language-Team: Hindi <hi@li.org>\n"
14"MIME-Version: 1.0\n"
14"MIME-Version: 1.0\n"
15"Content-Type: text/plain; charset=UTF-8\n"
15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n"
16"Content-Transfer-Encoding: 8bit\n"
17−"X-Launchpad-Export-Date: 2014-08-15 06:28+0000\n"
17+"X-Launchpad-Export-Date: 2014-08-23 07:17+0000\n"
18−"X-Generator: Launchpad (build 17156)\n"
18+"X-Generator: Launchpad (build 17163)\n"
19
19
20#: plugins/LightDM/Greeter.cpp:129
20#: plugins/LightDM/Greeter.cpp:129
21msgid "Password: "
21msgid "Password: "
@@ -92,19 +92,19 @@ msgid ""
92"phone<br><br>Tap on the screen to start"
92"phone<br><br>Tap on the screen to start"
93msgstr ""
93msgstr ""
94
94
95−#: qml/Components/Lockscreen.qml:161
95+#: qml/Components/Lockscreen.qml:167
96−msgid "Too many incorrect attempts"
96+msgid "Please wait"
97msgstr ""
97msgstr ""
98
98
99−#: qml/Components/Lockscreen.qml:163
99+#: qml/Components/Lockscreen.qml:172
100−msgid "Please wait"
100+msgid "Too many incorrect attempts"
101msgstr ""
101msgstr ""
102
102
103−#: qml/Components/Lockscreen.qml:245
103+#: qml/Components/Lockscreen.qml:206
104msgid "Emergency Call"
104msgid "Emergency Call"
105msgstr "आपातकालीन कॉल"
105msgstr "आपातकालीन कॉल"
106
106
107−#: qml/Components/Lockscreen.qml:268
107+#: qml/Components/Lockscreen.qml:226
108msgid "OK"
108msgid "OK"
109msgstr ""
109msgstr ""
110
110
@@ -117,23 +117,15 @@ msgstr ""
117msgid "Hello"
117msgid "Hello"
118msgstr "नमस्ते"
118msgstr "नमस्ते"
119
119
120−#: qml/Components/PinLockscreen.qml:197
121−msgid "CANCEL"
122−msgstr ""
123−
124−#: qml/Components/PinLockscreen.qml:215
125−msgid "DONE"
126−msgstr ""
127−
128−#: qml/Dash/GenericScopeView.qml:360
120+#: qml/Dash/GenericScopeView.qml:361
129msgid "See less"
121msgid "See less"
130msgstr ""
122msgstr ""
131
123
132−#: qml/Dash/GenericScopeView.qml:360
124+#: qml/Dash/GenericScopeView.qml:361
133msgid "See all"
125msgid "See all"
134msgstr ""
126msgstr ""
135
127
136−#: qml/Dash/GenericScopeView.qml:423 qml/Panel/SearchIndicator.qml:27
128+#: qml/Dash/GenericScopeView.qml:424 qml/Panel/SearchIndicator.qml:27
137msgid "Search"
129msgid "Search"
138msgstr "खोजें"
130msgstr "खोजें"
139
131
@@ -201,12 +193,16 @@ msgstr "अब बात करें"
201msgid "Speaking..."
193msgid "Speaking..."
202msgstr "अब बोल रहे हैं"
194msgstr "अब बोल रहे हैं"
203
195
204−#: qml/Notifications/NotificationMenuItemFactory.qml:100
196+#: qml/Notifications/NotificationMenuItemFactory.qml:105
205msgid "Show password"
197msgid "Show password"
206msgstr ""
198msgstr ""
207
199
208−#: qml/Notifications/NotificationMenuItemFactory.qml:115
200+#: qml/Notifications/NotificationMenuItemFactory.qml:120
209−msgid "Please enter SIM PIN"
201+msgid "Enter SIM PIN"
202+msgstr ""
203+
204+#: qml/Notifications/NotificationMenuItemFactory.qml:121 qml/Shell.qml:270
205+msgid "Sorry, incorrect PIN"
210msgstr ""
206msgstr ""
211
207
212#: qml/Panel/ActiveCallHint.qml:77
208#: qml/Panel/ActiveCallHint.qml:77
@@ -249,47 +245,47 @@ msgstr ""
249msgid "Roaming"
245msgid "Roaming"
250msgstr ""
246msgstr ""
251
247
252−#: qml/Shell.qml:267
248+#: qml/Shell.qml:266
253−msgid "passphrase"
249+msgid "Enter your passphrase"
254msgstr ""
250msgstr ""
255
251
256#: qml/Shell.qml:267
252#: qml/Shell.qml:267
257−msgid "passcode"
253+msgid "Sorry, incorrect passphrase"
258msgstr ""
254msgstr ""
259
255
260#: qml/Shell.qml:269
256#: qml/Shell.qml:269
261−#, qt-format
262−msgid "Enter your %1"
257+msgid "Enter your PIN"
263msgstr ""
258msgstr ""
264
259
265−#: qml/Shell.qml:270
260+#: qml/Shell.qml:273
266#, qt-format
261#, qt-format
267−msgid "Incorrect %1"
262+msgid "Enter your %1"
268msgstr ""
263msgstr ""
269
264
270−#: qml/Shell.qml:272
265+#: qml/Shell.qml:274
271−msgid "Please re-enter"
266+#, qt-format
267+msgid "Sorry, incorrect %1"
272msgstr ""
268msgstr ""
273
269
274−#: qml/Shell.qml:306
270+#: qml/Shell.qml:310
275msgid "Sorry, incorrect passphrase."
271msgid "Sorry, incorrect passphrase."
276msgstr ""
272msgstr ""
277
273
278−#: qml/Shell.qml:307
274+#: qml/Shell.qml:311
279msgid "Sorry, incorrect passcode."
275msgid "Sorry, incorrect passcode."
280msgstr ""
276msgstr ""
281
277
282−#: qml/Shell.qml:308
278+#: qml/Shell.qml:312
283msgid "This will be your last attempt."
279msgid "This will be your last attempt."
284msgstr ""
280msgstr ""
285
281
286−#: qml/Shell.qml:310
282+#: qml/Shell.qml:314
287msgid ""
283msgid ""
288"If passphrase is entered incorrectly, your phone will conduct a factory "
284"If passphrase is entered incorrectly, your phone will conduct a factory "
289"reset and all personal data will be deleted."
285"reset and all personal data will be deleted."
290msgstr ""
286msgstr ""
291
287
292−#: qml/Shell.qml:311
288+#: qml/Shell.qml:315
293msgid ""
289msgid ""
294"If passcode is entered incorrectly, your phone will conduct a factory reset "
290"If passcode is entered incorrectly, your phone will conduct a factory reset "
295"and all personal data will be deleted."
291"and all personal data will be deleted."
po/hr.po+33−37
@@ -7,15 +7,15 @@ msgid ""
7msgstr ""
7msgstr ""
8"Project-Id-Version: unity\n"
8"Project-Id-Version: unity\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2014-08-13 14:09-0400\n"
10+"POT-Creation-Date: 2014-08-21 11:36+0200\n"
11"PO-Revision-Date: 2013-06-27 04:14+0000\n"
11"PO-Revision-Date: 2013-06-27 04:14+0000\n"
12"Last-Translator: Michał Sawicz <michal.sawicz@canonical.com>\n"
12"Last-Translator: Michał Sawicz <michal.sawicz@canonical.com>\n"
13"Language-Team: Croatian <hr@li.org>\n"
13"Language-Team: Croatian <hr@li.org>\n"
14"MIME-Version: 1.0\n"
14"MIME-Version: 1.0\n"
15"Content-Type: text/plain; charset=UTF-8\n"
15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n"
16"Content-Transfer-Encoding: 8bit\n"
17−"X-Launchpad-Export-Date: 2014-08-15 06:28+0000\n"
17+"X-Launchpad-Export-Date: 2014-08-23 07:17+0000\n"
18−"X-Generator: Launchpad (build 17156)\n"
18+"X-Generator: Launchpad (build 17163)\n"
19
19
20#: plugins/LightDM/Greeter.cpp:129
20#: plugins/LightDM/Greeter.cpp:129
21msgid "Password: "
21msgid "Password: "
@@ -92,19 +92,19 @@ msgid ""
92"phone<br><br>Tap on the screen to start"
92"phone<br><br>Tap on the screen to start"
93msgstr ""
93msgstr ""
94
94
95−#: qml/Components/Lockscreen.qml:161
95+#: qml/Components/Lockscreen.qml:167
96−msgid "Too many incorrect attempts"
96+msgid "Please wait"
97msgstr ""
97msgstr ""
98
98
99−#: qml/Components/Lockscreen.qml:163
99+#: qml/Components/Lockscreen.qml:172
100−msgid "Please wait"
100+msgid "Too many incorrect attempts"
101msgstr ""
101msgstr ""
102
102
103−#: qml/Components/Lockscreen.qml:245
103+#: qml/Components/Lockscreen.qml:206
104msgid "Emergency Call"
104msgid "Emergency Call"
105msgstr ""
105msgstr ""
106
106
107−#: qml/Components/Lockscreen.qml:268
107+#: qml/Components/Lockscreen.qml:226
108msgid "OK"
108msgid "OK"
109msgstr ""
109msgstr ""
110
110
@@ -117,23 +117,15 @@ msgstr ""
117msgid "Hello"
117msgid "Hello"
118msgstr ""
118msgstr ""
119
119
120−#: qml/Components/PinLockscreen.qml:197
121−msgid "CANCEL"
122−msgstr ""
123−
124−#: qml/Components/PinLockscreen.qml:215
125−msgid "DONE"
126−msgstr ""
127−
128−#: qml/Dash/GenericScopeView.qml:360
120+#: qml/Dash/GenericScopeView.qml:361
129msgid "See less"
121msgid "See less"
130msgstr ""
122msgstr ""
131
123
132−#: qml/Dash/GenericScopeView.qml:360
124+#: qml/Dash/GenericScopeView.qml:361
133msgid "See all"
125msgid "See all"
134msgstr ""
126msgstr ""
135
127
136−#: qml/Dash/GenericScopeView.qml:423 qml/Panel/SearchIndicator.qml:27
128+#: qml/Dash/GenericScopeView.qml:424 qml/Panel/SearchIndicator.qml:27
137msgid "Search"
129msgid "Search"
138msgstr "Pretraživanje"
130msgstr "Pretraživanje"
139
131
@@ -201,12 +193,16 @@ msgstr "Recite..."
201msgid "Speaking..."
193msgid "Speaking..."
202msgstr "Govor..."
194msgstr "Govor..."
203
195
204−#: qml/Notifications/NotificationMenuItemFactory.qml:100
196+#: qml/Notifications/NotificationMenuItemFactory.qml:105
205msgid "Show password"
197msgid "Show password"
206msgstr ""
198msgstr ""
207
199
208−#: qml/Notifications/NotificationMenuItemFactory.qml:115
200+#: qml/Notifications/NotificationMenuItemFactory.qml:120
209−msgid "Please enter SIM PIN"
201+msgid "Enter SIM PIN"
202+msgstr ""
203+
204+#: qml/Notifications/NotificationMenuItemFactory.qml:121 qml/Shell.qml:270
205+msgid "Sorry, incorrect PIN"
210msgstr ""
206msgstr ""
211
207
212#: qml/Panel/ActiveCallHint.qml:77
208#: qml/Panel/ActiveCallHint.qml:77
@@ -249,47 +245,47 @@ msgstr ""
249msgid "Roaming"
245msgid "Roaming"
250msgstr ""
246msgstr ""
251
247
252−#: qml/Shell.qml:267
248+#: qml/Shell.qml:266
253−msgid "passphrase"
249+msgid "Enter your passphrase"
254msgstr ""
250msgstr ""
255
251
256#: qml/Shell.qml:267
252#: qml/Shell.qml:267
257−msgid "passcode"
253+msgid "Sorry, incorrect passphrase"
258msgstr ""
254msgstr ""
259
255
260#: qml/Shell.qml:269
256#: qml/Shell.qml:269
261−#, qt-format
262−msgid "Enter your %1"
257+msgid "Enter your PIN"
263msgstr ""
258msgstr ""
264
259
265−#: qml/Shell.qml:270
260+#: qml/Shell.qml:273
266#, qt-format
261#, qt-format
267−msgid "Incorrect %1"
262+msgid "Enter your %1"
268msgstr ""
263msgstr ""
269
264
270−#: qml/Shell.qml:272
265+#: qml/Shell.qml:274
271−msgid "Please re-enter"
266+#, qt-format
267+msgid "Sorry, incorrect %1"
272msgstr ""
268msgstr ""
273
269
274−#: qml/Shell.qml:306
270+#: qml/Shell.qml:310
275msgid "Sorry, incorrect passphrase."
271msgid "Sorry, incorrect passphrase."
276msgstr ""
272msgstr ""
277
273
278−#: qml/Shell.qml:307
274+#: qml/Shell.qml:311
279msgid "Sorry, incorrect passcode."
275msgid "Sorry, incorrect passcode."
280msgstr ""
276msgstr ""
281
277
282−#: qml/Shell.qml:308
278+#: qml/Shell.qml:312
283msgid "This will be your last attempt."
279msgid "This will be your last attempt."
284msgstr ""
280msgstr ""
285
281
286−#: qml/Shell.qml:310
282+#: qml/Shell.qml:314
287msgid ""
283msgid ""
288"If passphrase is entered incorrectly, your phone will conduct a factory "
284"If passphrase is entered incorrectly, your phone will conduct a factory "
289"reset and all personal data will be deleted."
285"reset and all personal data will be deleted."
290msgstr ""
286msgstr ""
291
287
292−#: qml/Shell.qml:311
288+#: qml/Shell.qml:315
293msgid ""
289msgid ""
294"If passcode is entered incorrectly, your phone will conduct a factory reset "
290"If passcode is entered incorrectly, your phone will conduct a factory reset "
295"and all personal data will be deleted."
291"and all personal data will be deleted."
po/hu.po+73−51
@@ -7,15 +7,15 @@ msgid ""
7msgstr ""
7msgstr ""
8"Project-Id-Version: unity\n"
8"Project-Id-Version: unity\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2014-08-13 14:09-0400\n"
10+"POT-Creation-Date: 2014-08-21 11:36+0200\n"
11−"PO-Revision-Date: 2014-08-16 12:36+0000\n"
11+"PO-Revision-Date: 2014-08-24 11:17+0000\n"
12"Last-Translator: Richard Somlói <ricsipontaz@gmail.com>\n"
12"Last-Translator: Richard Somlói <ricsipontaz@gmail.com>\n"
13"Language-Team: Hungarian <hu@li.org>\n"
13"Language-Team: Hungarian <hu@li.org>\n"
14"MIME-Version: 1.0\n"
14"MIME-Version: 1.0\n"
15"Content-Type: text/plain; charset=UTF-8\n"
15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n"
16"Content-Transfer-Encoding: 8bit\n"
17−"X-Launchpad-Export-Date: 2014-08-18 07:20+0000\n"
17+"X-Launchpad-Export-Date: 2014-08-25 08:06+0000\n"
18−"X-Generator: Launchpad (build 17156)\n"
18+"X-Generator: Launchpad (build 17163)\n"
19
19
20#: plugins/LightDM/Greeter.cpp:129
20#: plugins/LightDM/Greeter.cpp:129
21msgid "Password: "
21msgid "Password: "
@@ -32,7 +32,7 @@ msgstr "Indító feloldása"
32
32
33#: qml/Components/Dialogs.qml:142
33#: qml/Components/Dialogs.qml:142
34msgid "Are you sure you would like to turn power off?"
34msgid "Are you sure you would like to turn power off?"
35−msgstr ""
35+msgstr "Biztos benne, hogy ki szeretné kapcsolni?"
36
36
37#: qml/Components/Dialogs.qml:144
37#: qml/Components/Dialogs.qml:144
38msgid "Power off"
38msgid "Power off"
@@ -44,7 +44,7 @@ msgstr "Újraindítás"
44
44
45#: qml/Components/Dialogs.qml:162
45#: qml/Components/Dialogs.qml:162
46msgid "Cancel"
46msgid "Cancel"
47−msgstr ""
47+msgstr "Mégse"
48
48
49#: qml/Components/EdgeDemoOverlay.qml:151
49#: qml/Components/EdgeDemoOverlay.qml:151
50msgid "Skip intro"
50msgid "Skip intro"
@@ -96,19 +96,19 @@ msgstr ""
96"Elsajátította a gesztusokat, és megkezdheti a telefon "
96"Elsajátította a gesztusokat, és megkezdheti a telefon "
97"használatát.<br><br>Koppintson a képernyőre a kezdéshez."
97"használatát.<br><br>Koppintson a képernyőre a kezdéshez."
98
98
99−#: qml/Components/Lockscreen.qml:161
99+#: qml/Components/Lockscreen.qml:167
100−msgid "Too many incorrect attempts"
101−msgstr ""
102−
103−#: qml/Components/Lockscreen.qml:163
104msgid "Please wait"
100msgid "Please wait"
105msgstr "Kérem várjon"
101msgstr "Kérem várjon"
106
102
107−#: qml/Components/Lockscreen.qml:245
103+#: qml/Components/Lockscreen.qml:172
104+msgid "Too many incorrect attempts"
105+msgstr "Túl sok sikertelen kísérlet"
106+
107+#: qml/Components/Lockscreen.qml:206
108msgid "Emergency Call"
108msgid "Emergency Call"
109msgstr "Vészhívás"
109msgstr "Vészhívás"
110
110
111−#: qml/Components/Lockscreen.qml:268
111+#: qml/Components/Lockscreen.qml:226
112msgid "OK"
112msgid "OK"
113msgstr "Ok"
113msgstr "Ok"
114
114
@@ -121,23 +121,15 @@ msgstr "Üdv %1"
121msgid "Hello"
121msgid "Hello"
122msgstr "Üdvözöljük"
122msgstr "Üdvözöljük"
123
123
124−#: qml/Components/PinLockscreen.qml:197
125−msgid "CANCEL"
126−msgstr "MÉGSE"
127−
128−#: qml/Components/PinLockscreen.qml:215
129−msgid "DONE"
130−msgstr "KÉSZ"
131−
132−#: qml/Dash/GenericScopeView.qml:360
124+#: qml/Dash/GenericScopeView.qml:361
133msgid "See less"
125msgid "See less"
134msgstr "Kevesebb"
126msgstr "Kevesebb"
135
127
136−#: qml/Dash/GenericScopeView.qml:360
128+#: qml/Dash/GenericScopeView.qml:361
137msgid "See all"
129msgid "See all"
138msgstr "Összes megtekintése"
130msgstr "Összes megtekintése"
139
131
140−#: qml/Dash/GenericScopeView.qml:423 qml/Panel/SearchIndicator.qml:27
132+#: qml/Dash/GenericScopeView.qml:424 qml/Panel/SearchIndicator.qml:27
141msgid "Search"
133msgid "Search"
142msgstr "Keresés"
134msgstr "Keresés"
143
135
@@ -163,15 +155,15 @@ msgstr "Küldés"
163
155
164#: qml/Dash/ScopesOverview.qml:201
156#: qml/Dash/ScopesOverview.qml:201
165msgid "Manage Dash"
157msgid "Manage Dash"
166−msgstr ""
158+msgstr "Dash kezelése"
167
159
168#: qml/Dash/ScopesOverview.qml:408
160#: qml/Dash/ScopesOverview.qml:408
169msgid "Done"
161msgid "Done"
170−msgstr ""
162+msgstr "Kész"
171
163
172#: qml/Dash/ScopesOverview.qml:434
164#: qml/Dash/ScopesOverview.qml:434
173msgid "Store"
165msgid "Store"
174−msgstr ""
166+msgstr "Áruház"
175
167
176#: qml/Dash/ScopesOverviewTab.qml:36
168#: qml/Dash/ScopesOverviewTab.qml:36
177msgid "Favorites"
169msgid "Favorites"
@@ -205,14 +197,18 @@ msgstr "Most beszéljen…"
205msgid "Speaking..."
197msgid "Speaking..."
206msgstr "Beszéd…"
198msgstr "Beszéd…"
207
199
208−#: qml/Notifications/NotificationMenuItemFactory.qml:100
200+#: qml/Notifications/NotificationMenuItemFactory.qml:105
209msgid "Show password"
201msgid "Show password"
210msgstr "Jelszó megjelenítése"
202msgstr "Jelszó megjelenítése"
211
203
212−#: qml/Notifications/NotificationMenuItemFactory.qml:115
204+#: qml/Notifications/NotificationMenuItemFactory.qml:120
213−msgid "Please enter SIM PIN"
205+msgid "Enter SIM PIN"
214msgstr "Adja meg a SIM PIN kódját"
206msgstr "Adja meg a SIM PIN kódját"
215
207
208+#: qml/Notifications/NotificationMenuItemFactory.qml:121 qml/Shell.qml:270
209+msgid "Sorry, incorrect PIN"
210+msgstr "Sajnáljuk, helytelen PIN"
211+
216#: qml/Panel/ActiveCallHint.qml:77
212#: qml/Panel/ActiveCallHint.qml:77
217msgid "Tap to return to call..."
213msgid "Tap to return to call..."
218msgstr "Érintse meg, hogy visszatérjen a híváshoz..."
214msgstr "Érintse meg, hogy visszatérjen a híváshoz..."
@@ -253,48 +249,74 @@ msgstr "SIM feloldása"
253msgid "Roaming"
249msgid "Roaming"
254msgstr "Barangolás"
250msgstr "Barangolás"
255
251
256−#: qml/Shell.qml:267
252+#: qml/Shell.qml:266
257−msgid "passphrase"
253+msgid "Enter your passphrase"
258−msgstr ""
254+msgstr "Adja meg a jelmondatot"
259
255
260#: qml/Shell.qml:267
256#: qml/Shell.qml:267
261−msgid "passcode"
257+msgid "Sorry, incorrect passphrase"
262−msgstr ""
258+msgstr "Sajnáljuk, helytelen jelmondat"
263
259
264#: qml/Shell.qml:269
260#: qml/Shell.qml:269
261+msgid "Enter your PIN"
262+msgstr "Adja meg a PIN kódot"
263+
264+#: qml/Shell.qml:273
265#, qt-format
265#, qt-format
266msgid "Enter your %1"
266msgid "Enter your %1"
267−msgstr ""
267+msgstr "Adja meg a következőt: %1"
268
268
269−#: qml/Shell.qml:270
269+#: qml/Shell.qml:274
270#, qt-format
270#, qt-format
271−msgid "Incorrect %1"
271+msgid "Sorry, incorrect %1"
272−msgstr ""
272+msgstr "Sajnáljuk, helytelen %1"
273−
274−#: qml/Shell.qml:272
275−msgid "Please re-enter"
276−msgstr ""
277
273
278−#: qml/Shell.qml:306
274+#: qml/Shell.qml:310
279msgid "Sorry, incorrect passphrase."
275msgid "Sorry, incorrect passphrase."
280−msgstr ""
276+msgstr "Sajnáljuk, helytelen jelmondat."
281
277
282−#: qml/Shell.qml:307
278+#: qml/Shell.qml:311
283msgid "Sorry, incorrect passcode."
279msgid "Sorry, incorrect passcode."
284−msgstr ""
280+msgstr "Sajnáljuk, helytelen jelkód."
285
281
286−#: qml/Shell.qml:308
282+#: qml/Shell.qml:312
287msgid "This will be your last attempt."
283msgid "This will be your last attempt."
288−msgstr ""
284+msgstr "Ez az utolsó próbálkozási lehetősége."
289
285
290−#: qml/Shell.qml:310
286+#: qml/Shell.qml:314
291msgid ""
287msgid ""
292"If passphrase is entered incorrectly, your phone will conduct a factory "
288"If passphrase is entered incorrectly, your phone will conduct a factory "
293"reset and all personal data will be deleted."
289"reset and all personal data will be deleted."
294msgstr ""
290msgstr ""
291+"Ha helytelen jelmondatot ad meg, a telefonja visszaállítja a gyári "
292+"beállításokat és törli minden személyes adatát."
295
293
296−#: qml/Shell.qml:311
294+#: qml/Shell.qml:315
297msgid ""
295msgid ""
298"If passcode is entered incorrectly, your phone will conduct a factory reset "
296"If passcode is entered incorrectly, your phone will conduct a factory reset "
299"and all personal data will be deleted."
297"and all personal data will be deleted."
300msgstr ""
298msgstr ""
299+"Ha helytelen jelkódot ad meg, a telefonja visszaállítja a gyári "
300+"beállításokat és törli minden személyes adatát."
301+
302+#~ msgid "CANCEL"
303+#~ msgstr "MÉGSE"
304+
305+#~ msgid "DONE"
306+#~ msgstr "KÉSZ"
307+
308+#~ msgid "Please enter SIM PIN"
309+#~ msgstr "Adja meg a SIM PIN kódját"
310+
311+#~ msgid "passphrase"
312+#~ msgstr "jelmondat"
313+
314+#, qt-format
315+#~ msgid "Incorrect %1"
316+#~ msgstr "Helytelen %1"
317+
318+#~ msgid "Please re-enter"
319+#~ msgstr "Kérjük adja meg újra"
320+
321+#~ msgid "passcode"
322+#~ msgstr "jelkód"
po/hy.po+33−37
@@ -7,15 +7,15 @@ msgid ""
7msgstr ""
7msgstr ""
8"Project-Id-Version: unity\n"
8"Project-Id-Version: unity\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2014-08-13 14:09-0400\n"
10+"POT-Creation-Date: 2014-08-21 11:36+0200\n"
11"PO-Revision-Date: 2013-06-27 04:43+0000\n"
11"PO-Revision-Date: 2013-06-27 04:43+0000\n"
12"Last-Translator: iAbaS <sosabazyan@yandex.ru>\n"
12"Last-Translator: iAbaS <sosabazyan@yandex.ru>\n"
13"Language-Team: Armenian <hy@li.org>\n"
13"Language-Team: Armenian <hy@li.org>\n"
14"MIME-Version: 1.0\n"
14"MIME-Version: 1.0\n"
15"Content-Type: text/plain; charset=UTF-8\n"
15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n"
16"Content-Transfer-Encoding: 8bit\n"
17−"X-Launchpad-Export-Date: 2014-08-15 06:28+0000\n"
17+"X-Launchpad-Export-Date: 2014-08-23 07:16+0000\n"
18−"X-Generator: Launchpad (build 17156)\n"
18+"X-Generator: Launchpad (build 17163)\n"
19
19
20#: plugins/LightDM/Greeter.cpp:129
20#: plugins/LightDM/Greeter.cpp:129
21msgid "Password: "
21msgid "Password: "
@@ -92,19 +92,19 @@ msgid ""
92"phone<br><br>Tap on the screen to start"
92"phone<br><br>Tap on the screen to start"
93msgstr ""
93msgstr ""
94
94
95−#: qml/Components/Lockscreen.qml:161
95+#: qml/Components/Lockscreen.qml:167
96−msgid "Too many incorrect attempts"
96+msgid "Please wait"
97msgstr ""
97msgstr ""
98
98
99−#: qml/Components/Lockscreen.qml:163
99+#: qml/Components/Lockscreen.qml:172
100−msgid "Please wait"
100+msgid "Too many incorrect attempts"
101msgstr ""
101msgstr ""
102
102
103−#: qml/Components/Lockscreen.qml:245
103+#: qml/Components/Lockscreen.qml:206
104msgid "Emergency Call"
104msgid "Emergency Call"
105msgstr ""
105msgstr ""
106
106
107−#: qml/Components/Lockscreen.qml:268
107+#: qml/Components/Lockscreen.qml:226
108msgid "OK"
108msgid "OK"
109msgstr ""
109msgstr ""
110
110
@@ -117,23 +117,15 @@ msgstr ""
117msgid "Hello"
117msgid "Hello"
118msgstr ""
118msgstr ""
119
119
120−#: qml/Components/PinLockscreen.qml:197
121−msgid "CANCEL"
122−msgstr ""
123−
124−#: qml/Components/PinLockscreen.qml:215
125−msgid "DONE"
126−msgstr ""
127−
128−#: qml/Dash/GenericScopeView.qml:360
120+#: qml/Dash/GenericScopeView.qml:361
129msgid "See less"
121msgid "See less"
130msgstr ""
122msgstr ""
131
123
132−#: qml/Dash/GenericScopeView.qml:360
124+#: qml/Dash/GenericScopeView.qml:361
133msgid "See all"
125msgid "See all"
134msgstr ""
126msgstr ""
135
127
136−#: qml/Dash/GenericScopeView.qml:423 qml/Panel/SearchIndicator.qml:27
128+#: qml/Dash/GenericScopeView.qml:424 qml/Panel/SearchIndicator.qml:27
137msgid "Search"
129msgid "Search"
138msgstr "Որոնում"
130msgstr "Որոնում"
139
131
@@ -201,12 +193,16 @@ msgstr "Խոսի՛ր"
201msgid "Speaking..."
193msgid "Speaking..."
202msgstr "Խոսում եմ..."
194msgstr "Խոսում եմ..."
203
195
204−#: qml/Notifications/NotificationMenuItemFactory.qml:100
196+#: qml/Notifications/NotificationMenuItemFactory.qml:105
205msgid "Show password"
197msgid "Show password"
206msgstr ""
198msgstr ""
207
199
208−#: qml/Notifications/NotificationMenuItemFactory.qml:115
200+#: qml/Notifications/NotificationMenuItemFactory.qml:120
209−msgid "Please enter SIM PIN"
201+msgid "Enter SIM PIN"
202+msgstr ""
203+
204+#: qml/Notifications/NotificationMenuItemFactory.qml:121 qml/Shell.qml:270
205+msgid "Sorry, incorrect PIN"
210msgstr ""
206msgstr ""
211
207
212#: qml/Panel/ActiveCallHint.qml:77
208#: qml/Panel/ActiveCallHint.qml:77
@@ -249,47 +245,47 @@ msgstr ""
249msgid "Roaming"
245msgid "Roaming"
250msgstr ""
246msgstr ""
251
247
252−#: qml/Shell.qml:267
248+#: qml/Shell.qml:266
253−msgid "passphrase"
249+msgid "Enter your passphrase"
254msgstr ""
250msgstr ""
255
251
256#: qml/Shell.qml:267
252#: qml/Shell.qml:267
257−msgid "passcode"
253+msgid "Sorry, incorrect passphrase"
258msgstr ""
254msgstr ""
259
255
260#: qml/Shell.qml:269
256#: qml/Shell.qml:269
261−#, qt-format
262−msgid "Enter your %1"
257+msgid "Enter your PIN"
263msgstr ""
258msgstr ""
264
259
265−#: qml/Shell.qml:270
260+#: qml/Shell.qml:273
266#, qt-format
261#, qt-format
267−msgid "Incorrect %1"
262+msgid "Enter your %1"
268msgstr ""
263msgstr ""
269
264
270−#: qml/Shell.qml:272
265+#: qml/Shell.qml:274
271−msgid "Please re-enter"
266+#, qt-format
267+msgid "Sorry, incorrect %1"
272msgstr ""
268msgstr ""
273
269
274−#: qml/Shell.qml:306
270+#: qml/Shell.qml:310
275msgid "Sorry, incorrect passphrase."
271msgid "Sorry, incorrect passphrase."
276msgstr ""
272msgstr ""
277
273
278−#: qml/Shell.qml:307
274+#: qml/Shell.qml:311
279msgid "Sorry, incorrect passcode."
275msgid "Sorry, incorrect passcode."
280msgstr ""
276msgstr ""
281
277
282−#: qml/Shell.qml:308
278+#: qml/Shell.qml:312
283msgid "This will be your last attempt."
279msgid "This will be your last attempt."
284msgstr ""
280msgstr ""
285
281
286−#: qml/Shell.qml:310
282+#: qml/Shell.qml:314
287msgid ""
283msgid ""
288"If passphrase is entered incorrectly, your phone will conduct a factory "
284"If passphrase is entered incorrectly, your phone will conduct a factory "
289"reset and all personal data will be deleted."
285"reset and all personal data will be deleted."
290msgstr ""
286msgstr ""
291
287
292−#: qml/Shell.qml:311
288+#: qml/Shell.qml:315
293msgid ""
289msgid ""
294"If passcode is entered incorrectly, your phone will conduct a factory reset "
290"If passcode is entered incorrectly, your phone will conduct a factory reset "
295"and all personal data will be deleted."
291"and all personal data will be deleted."
po/id.po+33−37
@@ -7,15 +7,15 @@ msgid ""
7msgstr ""
7msgstr ""
8"Project-Id-Version: unity\n"
8"Project-Id-Version: unity\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2014-08-13 14:09-0400\n"
10+"POT-Creation-Date: 2014-08-21 11:36+0200\n"
11"PO-Revision-Date: 2013-06-26 22:35+0000\n"
11"PO-Revision-Date: 2013-06-26 22:35+0000\n"
12"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
12"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
13"Language-Team: Indonesian <id@li.org>\n"
13"Language-Team: Indonesian <id@li.org>\n"
14"MIME-Version: 1.0\n"
14"MIME-Version: 1.0\n"
15"Content-Type: text/plain; charset=UTF-8\n"
15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n"
16"Content-Transfer-Encoding: 8bit\n"
17−"X-Launchpad-Export-Date: 2014-08-15 06:28+0000\n"
17+"X-Launchpad-Export-Date: 2014-08-23 07:17+0000\n"
18−"X-Generator: Launchpad (build 17156)\n"
18+"X-Generator: Launchpad (build 17163)\n"
19
19
20#: plugins/LightDM/Greeter.cpp:129
20#: plugins/LightDM/Greeter.cpp:129
21msgid "Password: "
21msgid "Password: "
@@ -92,19 +92,19 @@ msgid ""
92"phone<br><br>Tap on the screen to start"
92"phone<br><br>Tap on the screen to start"
93msgstr ""
93msgstr ""
94
94
95−#: qml/Components/Lockscreen.qml:161
95+#: qml/Components/Lockscreen.qml:167
96−msgid "Too many incorrect attempts"
96+msgid "Please wait"
97msgstr ""
97msgstr ""
98
98
99−#: qml/Components/Lockscreen.qml:163
99+#: qml/Components/Lockscreen.qml:172
100−msgid "Please wait"
100+msgid "Too many incorrect attempts"
101msgstr ""
101msgstr ""
102
102
103−#: qml/Components/Lockscreen.qml:245
103+#: qml/Components/Lockscreen.qml:206
104msgid "Emergency Call"
104msgid "Emergency Call"
105msgstr ""
105msgstr ""
106
106
107−#: qml/Components/Lockscreen.qml:268
107+#: qml/Components/Lockscreen.qml:226
108msgid "OK"
108msgid "OK"
109msgstr ""
109msgstr ""
110
110
@@ -117,23 +117,15 @@ msgstr ""
117msgid "Hello"
117msgid "Hello"
118msgstr ""
118msgstr ""
119
119
120−#: qml/Components/PinLockscreen.qml:197
121−msgid "CANCEL"
122−msgstr ""
123−
124−#: qml/Components/PinLockscreen.qml:215
125−msgid "DONE"
126−msgstr ""
127−
128−#: qml/Dash/GenericScopeView.qml:360
120+#: qml/Dash/GenericScopeView.qml:361
129msgid "See less"
121msgid "See less"
130msgstr ""
122msgstr ""
131
123
132−#: qml/Dash/GenericScopeView.qml:360
124+#: qml/Dash/GenericScopeView.qml:361
133msgid "See all"
125msgid "See all"
134msgstr ""
126msgstr ""
135
127
136−#: qml/Dash/GenericScopeView.qml:423 qml/Panel/SearchIndicator.qml:27
128+#: qml/Dash/GenericScopeView.qml:424 qml/Panel/SearchIndicator.qml:27
137msgid "Search"
129msgid "Search"
138msgstr ""
130msgstr ""
139
131
@@ -201,12 +193,16 @@ msgstr ""
201msgid "Speaking..."
193msgid "Speaking..."
202msgstr ""
194msgstr ""
203
195
204−#: qml/Notifications/NotificationMenuItemFactory.qml:100
196+#: qml/Notifications/NotificationMenuItemFactory.qml:105
205msgid "Show password"
197msgid "Show password"
206msgstr ""
198msgstr ""
207
199
208−#: qml/Notifications/NotificationMenuItemFactory.qml:115
200+#: qml/Notifications/NotificationMenuItemFactory.qml:120
209−msgid "Please enter SIM PIN"
201+msgid "Enter SIM PIN"
202+msgstr ""
203+
204+#: qml/Notifications/NotificationMenuItemFactory.qml:121 qml/Shell.qml:270
205+msgid "Sorry, incorrect PIN"
210msgstr ""
206msgstr ""
211
207
212#: qml/Panel/ActiveCallHint.qml:77
208#: qml/Panel/ActiveCallHint.qml:77
@@ -249,47 +245,47 @@ msgstr ""
249msgid "Roaming"
245msgid "Roaming"
250msgstr ""
246msgstr ""
251
247
252−#: qml/Shell.qml:267
248+#: qml/Shell.qml:266
253−msgid "passphrase"
249+msgid "Enter your passphrase"
254msgstr ""
250msgstr ""
255
251
256#: qml/Shell.qml:267
252#: qml/Shell.qml:267
257−msgid "passcode"
253+msgid "Sorry, incorrect passphrase"
258msgstr ""
254msgstr ""
259
255
260#: qml/Shell.qml:269
256#: qml/Shell.qml:269
261−#, qt-format
262−msgid "Enter your %1"
257+msgid "Enter your PIN"
263msgstr ""
258msgstr ""
264
259
265−#: qml/Shell.qml:270
260+#: qml/Shell.qml:273
266#, qt-format
261#, qt-format
267−msgid "Incorrect %1"
262+msgid "Enter your %1"
268msgstr ""
263msgstr ""
269
264
270−#: qml/Shell.qml:272
265+#: qml/Shell.qml:274
271−msgid "Please re-enter"
266+#, qt-format
267+msgid "Sorry, incorrect %1"
272msgstr ""
268msgstr ""
273
269
274−#: qml/Shell.qml:306
270+#: qml/Shell.qml:310
275msgid "Sorry, incorrect passphrase."
271msgid "Sorry, incorrect passphrase."
276msgstr ""
272msgstr ""
277
273
278−#: qml/Shell.qml:307
274+#: qml/Shell.qml:311
279msgid "Sorry, incorrect passcode."
275msgid "Sorry, incorrect passcode."
280msgstr ""
276msgstr ""
281
277
282−#: qml/Shell.qml:308
278+#: qml/Shell.qml:312
283msgid "This will be your last attempt."
279msgid "This will be your last attempt."
284msgstr ""
280msgstr ""
285
281
286−#: qml/Shell.qml:310
282+#: qml/Shell.qml:314
287msgid ""
283msgid ""
288"If passphrase is entered incorrectly, your phone will conduct a factory "
284"If passphrase is entered incorrectly, your phone will conduct a factory "
289"reset and all personal data will be deleted."
285"reset and all personal data will be deleted."
290msgstr ""
286msgstr ""
291
287
292−#: qml/Shell.qml:311
288+#: qml/Shell.qml:315
293msgid ""
289msgid ""
294"If passcode is entered incorrectly, your phone will conduct a factory reset "
290"If passcode is entered incorrectly, your phone will conduct a factory reset "
295"and all personal data will be deleted."
291"and all personal data will be deleted."
po/is.po+43−38
@@ -9,15 +9,15 @@ msgid ""
9msgstr ""
9msgstr ""
10"Project-Id-Version: po_unity8-is\n"
10"Project-Id-Version: po_unity8-is\n"
11"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
11"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
12−"POT-Creation-Date: 2014-08-13 14:09-0400\n"
12+"POT-Creation-Date: 2014-08-21 11:36+0200\n"
13"PO-Revision-Date: 2014-07-31 16:10+0000\n"
13"PO-Revision-Date: 2014-07-31 16:10+0000\n"
14"Last-Translator: Sveinn í Felli <sv1@fellsnet.is>\n"
14"Last-Translator: Sveinn í Felli <sv1@fellsnet.is>\n"
15"Language-Team: Icelandic <translation-team-is@lists.sourceforge.net>\n"
15"Language-Team: Icelandic <translation-team-is@lists.sourceforge.net>\n"
16"MIME-Version: 1.0\n"
16"MIME-Version: 1.0\n"
17"Content-Type: text/plain; charset=UTF-8\n"
17"Content-Type: text/plain; charset=UTF-8\n"
18"Content-Transfer-Encoding: 8bit\n"
18"Content-Transfer-Encoding: 8bit\n"
19−"X-Launchpad-Export-Date: 2014-08-15 06:28+0000\n"
19+"X-Launchpad-Export-Date: 2014-08-23 07:17+0000\n"
20−"X-Generator: Launchpad (build 17156)\n"
20+"X-Generator: Launchpad (build 17163)\n"
21"Language: is\n"
21"Language: is\n"
22
22
23#: plugins/LightDM/Greeter.cpp:129
23#: plugins/LightDM/Greeter.cpp:129
@@ -98,19 +98,19 @@ msgstr ""
98"Þú ert núna með æfingu í að nota skjáhreyfingar og getur því farið að nota "
98"Þú ert núna með æfingu í að nota skjáhreyfingar og getur því farið að nota "
99"símann<br><br>Sláðu létt á skjáinn til að byrja"
99"símann<br><br>Sláðu létt á skjáinn til að byrja"
100
100
101−#: qml/Components/Lockscreen.qml:161
101+#: qml/Components/Lockscreen.qml:167
102−msgid "Too many incorrect attempts"
102+msgid "Please wait"
103msgstr ""
103msgstr ""
104
104
105−#: qml/Components/Lockscreen.qml:163
105+#: qml/Components/Lockscreen.qml:172
106−msgid "Please wait"
106+msgid "Too many incorrect attempts"
107msgstr ""
107msgstr ""
108
108
109−#: qml/Components/Lockscreen.qml:245
109+#: qml/Components/Lockscreen.qml:206
110msgid "Emergency Call"
110msgid "Emergency Call"
111msgstr "Neyðarsímtal"
111msgstr "Neyðarsímtal"
112
112
113−#: qml/Components/Lockscreen.qml:268
113+#: qml/Components/Lockscreen.qml:226
114msgid "OK"
114msgid "OK"
115msgstr "Í lagi"
115msgstr "Í lagi"
116
116
@@ -123,23 +123,15 @@ msgstr "Hæ %1"
123msgid "Hello"
123msgid "Hello"
124msgstr "Hæ"
124msgstr "Hæ"
125
125
126−#: qml/Components/PinLockscreen.qml:197
127−msgid "CANCEL"
128−msgstr "HÆTTA VIÐ"
129−
130−#: qml/Components/PinLockscreen.qml:215
131−msgid "DONE"
132−msgstr "BÚIÐ"
133−
134−#: qml/Dash/GenericScopeView.qml:360
126+#: qml/Dash/GenericScopeView.qml:361
135msgid "See less"
127msgid "See less"
136msgstr "Sjá minna"
128msgstr "Sjá minna"
137
129
138−#: qml/Dash/GenericScopeView.qml:360
130+#: qml/Dash/GenericScopeView.qml:361
139msgid "See all"
131msgid "See all"
140msgstr "Sjá allt"
132msgstr "Sjá allt"
141
133
142−#: qml/Dash/GenericScopeView.qml:423 qml/Panel/SearchIndicator.qml:27
134+#: qml/Dash/GenericScopeView.qml:424 qml/Panel/SearchIndicator.qml:27
143msgid "Search"
135msgid "Search"
144msgstr "Leita"
136msgstr "Leita"
145
137
@@ -207,13 +199,17 @@ msgstr "Tala núna..."
207msgid "Speaking..."
199msgid "Speaking..."
208msgstr "Tala..."
200msgstr "Tala..."
209
201
210−#: qml/Notifications/NotificationMenuItemFactory.qml:100
202+#: qml/Notifications/NotificationMenuItemFactory.qml:105
211msgid "Show password"
203msgid "Show password"
212msgstr "Birta lykilorð"
204msgstr "Birta lykilorð"
213
205
214−#: qml/Notifications/NotificationMenuItemFactory.qml:115
206+#: qml/Notifications/NotificationMenuItemFactory.qml:120
215−msgid "Please enter SIM PIN"
207+msgid "Enter SIM PIN"
216−msgstr "Settu inn PIN fyrir SIM"
208+msgstr ""
209+
210+#: qml/Notifications/NotificationMenuItemFactory.qml:121 qml/Shell.qml:270
211+msgid "Sorry, incorrect PIN"
212+msgstr ""
217
213
218#: qml/Panel/ActiveCallHint.qml:77
214#: qml/Panel/ActiveCallHint.qml:77
219msgid "Tap to return to call..."
215msgid "Tap to return to call..."
@@ -255,48 +251,57 @@ msgstr ""
255msgid "Roaming"
251msgid "Roaming"
256msgstr ""
252msgstr ""
257
253
258−#: qml/Shell.qml:267
254+#: qml/Shell.qml:266
259−msgid "passphrase"
255+msgid "Enter your passphrase"
260msgstr ""
256msgstr ""
261
257
262#: qml/Shell.qml:267
258#: qml/Shell.qml:267
263−msgid "passcode"
259+msgid "Sorry, incorrect passphrase"
264msgstr ""
260msgstr ""
265
261
266#: qml/Shell.qml:269
262#: qml/Shell.qml:269
267−#, qt-format
268−msgid "Enter your %1"
263+msgid "Enter your PIN"
269msgstr ""
264msgstr ""
270
265
271−#: qml/Shell.qml:270
266+#: qml/Shell.qml:273
272#, qt-format
267#, qt-format
273−msgid "Incorrect %1"
268+msgid "Enter your %1"
274msgstr ""
269msgstr ""
275
270
276−#: qml/Shell.qml:272
271+#: qml/Shell.qml:274
277−msgid "Please re-enter"
272+#, qt-format
273+msgid "Sorry, incorrect %1"
278msgstr ""
274msgstr ""
279
275
280−#: qml/Shell.qml:306
276+#: qml/Shell.qml:310
281msgid "Sorry, incorrect passphrase."
277msgid "Sorry, incorrect passphrase."
282msgstr ""
278msgstr ""
283
279
284−#: qml/Shell.qml:307
280+#: qml/Shell.qml:311
285msgid "Sorry, incorrect passcode."
281msgid "Sorry, incorrect passcode."
286msgstr ""
282msgstr ""
287
283
288−#: qml/Shell.qml:308
284+#: qml/Shell.qml:312
289msgid "This will be your last attempt."
285msgid "This will be your last attempt."
290msgstr ""
286msgstr ""
291
287
292−#: qml/Shell.qml:310
288+#: qml/Shell.qml:314
293msgid ""
289msgid ""
294"If passphrase is entered incorrectly, your phone will conduct a factory "
290"If passphrase is entered incorrectly, your phone will conduct a factory "
295"reset and all personal data will be deleted."
291"reset and all personal data will be deleted."
296msgstr ""
292msgstr ""
297
293
298−#: qml/Shell.qml:311
294+#: qml/Shell.qml:315
299msgid ""
295msgid ""
300"If passcode is entered incorrectly, your phone will conduct a factory reset "
296"If passcode is entered incorrectly, your phone will conduct a factory reset "
301"and all personal data will be deleted."
297"and all personal data will be deleted."
302msgstr ""
298msgstr ""
299+
300+#~ msgid "DONE"
301+#~ msgstr "BÚIÐ"
302+
303+#~ msgid "CANCEL"
304+#~ msgstr "HÆTTA VIÐ"
305+
306+#~ msgid "Please enter SIM PIN"
307+#~ msgstr "Settu inn PIN fyrir SIM"
po/it.po+61−43
@@ -7,15 +7,15 @@ msgid ""
7msgstr ""
7msgstr ""
8"Project-Id-Version: unity\n"
8"Project-Id-Version: unity\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2014-08-13 14:09-0400\n"
10+"POT-Creation-Date: 2014-08-21 11:36+0200\n"
11−"PO-Revision-Date: 2014-08-14 11:35+0000\n"
11+"PO-Revision-Date: 2014-08-23 07:47+0000\n"
12"Last-Translator: Claudio Arseni <claudio.arseni@gmail.com>\n"
12"Last-Translator: Claudio Arseni <claudio.arseni@gmail.com>\n"
13"Language-Team: Italian <it@li.org>\n"
13"Language-Team: Italian <it@li.org>\n"
14"MIME-Version: 1.0\n"
14"MIME-Version: 1.0\n"
15"Content-Type: text/plain; charset=UTF-8\n"
15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n"
16"Content-Transfer-Encoding: 8bit\n"
17−"X-Launchpad-Export-Date: 2014-08-15 06:28+0000\n"
17+"X-Launchpad-Export-Date: 2014-08-24 06:46+0000\n"
18−"X-Generator: Launchpad (build 17156)\n"
18+"X-Generator: Launchpad (build 17163)\n"
19
19
20#: plugins/LightDM/Greeter.cpp:129
20#: plugins/LightDM/Greeter.cpp:129
21msgid "Password: "
21msgid "Password: "
@@ -99,19 +99,19 @@ msgstr ""
99"L'apprendimento dei gesti è stato completato. È ora possibile iniziare a "
99"L'apprendimento dei gesti è stato completato. È ora possibile iniziare a "
100"usare il telefono.<br><br>Toccare lo schermo per iniziare"
100"usare il telefono.<br><br>Toccare lo schermo per iniziare"
101
101
102−#: qml/Components/Lockscreen.qml:161
102+#: qml/Components/Lockscreen.qml:167
103−msgid "Too many incorrect attempts"
104−msgstr "Troppi tentativi errati"
105−
106−#: qml/Components/Lockscreen.qml:163
107msgid "Please wait"
103msgid "Please wait"
108msgstr "Attendere"
104msgstr "Attendere"
109
105
110−#: qml/Components/Lockscreen.qml:245
106+#: qml/Components/Lockscreen.qml:172
107+msgid "Too many incorrect attempts"
108+msgstr "Troppi tentativi errati"
109+
110+#: qml/Components/Lockscreen.qml:206
111msgid "Emergency Call"
111msgid "Emergency Call"
112msgstr "Chiamata di emergenza"
112msgstr "Chiamata di emergenza"
113
113
114−#: qml/Components/Lockscreen.qml:268
114+#: qml/Components/Lockscreen.qml:226
115msgid "OK"
115msgid "OK"
116msgstr "OK"
116msgstr "OK"
117
117
@@ -124,23 +124,15 @@ msgstr "Ciao %1"
124msgid "Hello"
124msgid "Hello"
125msgstr "Ciao"
125msgstr "Ciao"
126
126
127−#: qml/Components/PinLockscreen.qml:197
128−msgid "CANCEL"
129−msgstr "Annulla"
130−
131−#: qml/Components/PinLockscreen.qml:215
132−msgid "DONE"
133−msgstr "Fatto"
134−
135−#: qml/Dash/GenericScopeView.qml:360
127+#: qml/Dash/GenericScopeView.qml:361
136msgid "See less"
128msgid "See less"
137msgstr "Mostra meno"
129msgstr "Mostra meno"
138
130
139−#: qml/Dash/GenericScopeView.qml:360
131+#: qml/Dash/GenericScopeView.qml:361
140msgid "See all"
132msgid "See all"
141msgstr "Mostra tutto"
133msgstr "Mostra tutto"
142
134
143−#: qml/Dash/GenericScopeView.qml:423 qml/Panel/SearchIndicator.qml:27
135+#: qml/Dash/GenericScopeView.qml:424 qml/Panel/SearchIndicator.qml:27
144msgid "Search"
136msgid "Search"
145msgstr "Cerca"
137msgstr "Cerca"
146
138
@@ -208,13 +200,17 @@ msgstr "Parla ora..."
208msgid "Speaking..."
200msgid "Speaking..."
209msgstr "Sto parlando..."
201msgstr "Sto parlando..."
210
202
211−#: qml/Notifications/NotificationMenuItemFactory.qml:100
203+#: qml/Notifications/NotificationMenuItemFactory.qml:105
212msgid "Show password"
204msgid "Show password"
213msgstr "Mostra password"
205msgstr "Mostra password"
214
206
215−#: qml/Notifications/NotificationMenuItemFactory.qml:115
207+#: qml/Notifications/NotificationMenuItemFactory.qml:120
216−msgid "Please enter SIM PIN"
208+msgid "Enter SIM PIN"
217−msgstr "Inserire il codice PIN"
209+msgstr "Inserire il PIN della SIM"
210+
211+#: qml/Notifications/NotificationMenuItemFactory.qml:121 qml/Shell.qml:270
212+msgid "Sorry, incorrect PIN"
213+msgstr "PIN errato"
218
214
219#: qml/Panel/ActiveCallHint.qml:77
215#: qml/Panel/ActiveCallHint.qml:77
220msgid "Tap to return to call..."
216msgid "Tap to return to call..."
@@ -256,41 +252,41 @@ msgstr "Sblocca SIM"
256msgid "Roaming"
252msgid "Roaming"
257msgstr "Roaming"
253msgstr "Roaming"
258
254
259−#: qml/Shell.qml:267
255+#: qml/Shell.qml:266
260−msgid "passphrase"
256+msgid "Enter your passphrase"
261−msgstr "passphrase"
257+msgstr "Digitare la passphrase"
262
258
263#: qml/Shell.qml:267
259#: qml/Shell.qml:267
264−msgid "passcode"
260+msgid "Sorry, incorrect passphrase"
265−msgstr "passcode"
261+msgstr "Passphrase errata"
266
262
267#: qml/Shell.qml:269
263#: qml/Shell.qml:269
264+msgid "Enter your PIN"
265+msgstr "Inserire il PIN"
266+
267+#: qml/Shell.qml:273
268#, qt-format
268#, qt-format
269msgid "Enter your %1"
269msgid "Enter your %1"
270msgstr "Inserire %1"
270msgstr "Inserire %1"
271
271
272−#: qml/Shell.qml:270
272+#: qml/Shell.qml:274
273#, qt-format
273#, qt-format
274−msgid "Incorrect %1"
274+msgid "Sorry, incorrect %1"
275−msgstr "Errore %1"
275+msgstr "%1 non corretto"
276
276
277−#: qml/Shell.qml:272
277+#: qml/Shell.qml:310
278−msgid "Please re-enter"
279−msgstr "Inserire nuovamente"
280−
281−#: qml/Shell.qml:306
282msgid "Sorry, incorrect passphrase."
278msgid "Sorry, incorrect passphrase."
283msgstr "Passphrase non corretta"
279msgstr "Passphrase non corretta"
284
280
285−#: qml/Shell.qml:307
281+#: qml/Shell.qml:311
286msgid "Sorry, incorrect passcode."
282msgid "Sorry, incorrect passcode."
287msgstr "Passcode non corretto"
283msgstr "Passcode non corretto"
288
284
289−#: qml/Shell.qml:308
285+#: qml/Shell.qml:312
290msgid "This will be your last attempt."
286msgid "This will be your last attempt."
291msgstr "Questo sarà l'ultimo tentativo."
287msgstr "Questo sarà l'ultimo tentativo."
292
288
293−#: qml/Shell.qml:310
289+#: qml/Shell.qml:314
294msgid ""
290msgid ""
295"If passphrase is entered incorrectly, your phone will conduct a factory "
291"If passphrase is entered incorrectly, your phone will conduct a factory "
296"reset and all personal data will be deleted."
292"reset and all personal data will be deleted."
@@ -298,10 +294,32 @@ msgstr ""
298"Se verrà inserita una passphrase errata, il telefono eseguirà un ripristino "
294"Se verrà inserita una passphrase errata, il telefono eseguirà un ripristino "
299"delle impostazioni di fabbrica e tutti i dati personali verranno eliminati."
295"delle impostazioni di fabbrica e tutti i dati personali verranno eliminati."
300
296
301−#: qml/Shell.qml:311
297+#: qml/Shell.qml:315
302msgid ""
298msgid ""
303"If passcode is entered incorrectly, your phone will conduct a factory reset "
299"If passcode is entered incorrectly, your phone will conduct a factory reset "
304"and all personal data will be deleted."
300"and all personal data will be deleted."
305msgstr ""
301msgstr ""
306"Se verrà inserito una passcode errato, il telefono eseguirà un ripristino "
302"Se verrà inserito una passcode errato, il telefono eseguirà un ripristino "
307"delle impostazioni di fabbrica e tutti i dati personali verranno eliminati."
303"delle impostazioni di fabbrica e tutti i dati personali verranno eliminati."
304+
305+#~ msgid "Please enter SIM PIN"
306+#~ msgstr "Inserire il codice PIN"
307+
308+#~ msgid "CANCEL"
309+#~ msgstr "Annulla"
310+
311+#~ msgid "DONE"
312+#~ msgstr "Fatto"
313+
314+#~ msgid "passphrase"
315+#~ msgstr "passphrase"
316+
317+#, qt-format
318+#~ msgid "Incorrect %1"
319+#~ msgstr "Errore %1"
320+
321+#~ msgid "Please re-enter"
322+#~ msgstr "Inserire nuovamente"
323+
324+#~ msgid "passcode"
325+#~ msgstr "passcode"
po/ja.po+88−69
@@ -7,44 +7,44 @@ msgid ""
7msgstr ""
7msgstr ""
8"Project-Id-Version: unity\n"
8"Project-Id-Version: unity\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2014-08-13 14:09-0400\n"
10+"POT-Creation-Date: 2014-08-21 11:36+0200\n"
11−"PO-Revision-Date: 2014-08-12 07:14+0000\n"
11+"PO-Revision-Date: 2014-08-18 15:03+0000\n"
12−"Last-Translator: Shushi Kurose <md81bird@hitaki.net>\n"
12+"Last-Translator: Mitsuya Shibata <mty.shibata@gmail.com>\n"
13"Language-Team: Japanese <ja@li.org>\n"
13"Language-Team: Japanese <ja@li.org>\n"
14"MIME-Version: 1.0\n"
14"MIME-Version: 1.0\n"
15"Content-Type: text/plain; charset=UTF-8\n"
15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n"
16"Content-Transfer-Encoding: 8bit\n"
17−"X-Launchpad-Export-Date: 2014-08-15 06:28+0000\n"
17+"X-Launchpad-Export-Date: 2014-08-23 07:17+0000\n"
18−"X-Generator: Launchpad (build 17156)\n"
18+"X-Generator: Launchpad (build 17163)\n"
19
19
20#: plugins/LightDM/Greeter.cpp:129
20#: plugins/LightDM/Greeter.cpp:129
21msgid "Password: "
21msgid "Password: "
22−msgstr ""
22+msgstr "パスワード： "
23
23
24#: plugins/Unity/Launcher/launcheritem.cpp:43
24#: plugins/Unity/Launcher/launcheritem.cpp:43
25#: plugins/Unity/Launcher/launcheritem.cpp:73
25#: plugins/Unity/Launcher/launcheritem.cpp:73
26msgid "Pin shortcut"
26msgid "Pin shortcut"
27−msgstr ""
27+msgstr "ショートカットを追加する"
28
28
29#: plugins/Unity/Launcher/launcheritem.cpp:73
29#: plugins/Unity/Launcher/launcheritem.cpp:73
30msgid "Unpin shortcut"
30msgid "Unpin shortcut"
31−msgstr ""
31+msgstr "ショートカットを削除する"
32
32
33#: qml/Components/Dialogs.qml:142
33#: qml/Components/Dialogs.qml:142
34msgid "Are you sure you would like to turn power off?"
34msgid "Are you sure you would like to turn power off?"
35−msgstr ""
35+msgstr "本当に電源を切りますか？"
36
36
37#: qml/Components/Dialogs.qml:144
37#: qml/Components/Dialogs.qml:144
38msgid "Power off"
38msgid "Power off"
39−msgstr ""
39+msgstr "電源を切る"
40
40
41#: qml/Components/Dialogs.qml:153
41#: qml/Components/Dialogs.qml:153
42msgid "Restart"
42msgid "Restart"
43−msgstr ""
43+msgstr "再起動"
44
44
45#: qml/Components/Dialogs.qml:162
45#: qml/Components/Dialogs.qml:162
46msgid "Cancel"
46msgid "Cancel"
47−msgstr ""
47+msgstr "キャンセル"
48
48
49#: qml/Components/EdgeDemoOverlay.qml:151
49#: qml/Components/EdgeDemoOverlay.qml:151
50msgid "Skip intro"
50msgid "Skip intro"
@@ -56,7 +56,7 @@ msgstr "右端"
56
56
57#: qml/Components/EdgeDemo.qml:113
57#: qml/Components/EdgeDemo.qml:113
58msgid "Try swiping from the right edge to unlock the phone"
58msgid "Try swiping from the right edge to unlock the phone"
59−msgstr ""
59+msgstr "アンロックするには右端からスワイプしてみてください"
60
60
61#: qml/Components/EdgeDemo.qml:144
61#: qml/Components/EdgeDemo.qml:144
62msgid "Top edge"
62msgid "Top edge"
@@ -91,20 +91,21 @@ msgid ""
91"You have now mastered the edge gestures and can start using the "
91"You have now mastered the edge gestures and can start using the "
92"phone<br><br>Tap on the screen to start"
92"phone<br><br>Tap on the screen to start"
93msgstr ""
93msgstr ""
94+"これでスマートフォンの操作に必要な、画面端を用いたジェスチャーを習得できました。<br><br>利用を開始するなら画面をタップしてください"
94
95
95−#: qml/Components/Lockscreen.qml:161
96+#: qml/Components/Lockscreen.qml:167
96−msgid "Too many incorrect attempts"
97−msgstr ""
98−
99−#: qml/Components/Lockscreen.qml:163
100msgid "Please wait"
97msgid "Please wait"
101−msgstr ""
98+msgstr "お待ちください"
102
99
103−#: qml/Components/Lockscreen.qml:245
100+#: qml/Components/Lockscreen.qml:172
101+msgid "Too many incorrect attempts"
102+msgstr "失敗回数が上限に達しました"
103+
104+#: qml/Components/Lockscreen.qml:206
104msgid "Emergency Call"
105msgid "Emergency Call"
105msgstr "緊急通報"
106msgstr "緊急通報"
106
107
107−#: qml/Components/Lockscreen.qml:268
108+#: qml/Components/Lockscreen.qml:226
108msgid "OK"
109msgid "OK"
109msgstr "OK"
110msgstr "OK"
110
111
@@ -117,37 +118,29 @@ msgstr "こんにちは %1 さん"
117msgid "Hello"
118msgid "Hello"
118msgstr "こんにちは"
119msgstr "こんにちは"
119
120
120−#: qml/Components/PinLockscreen.qml:197
121−msgid "CANCEL"
122−msgstr ""
123−
124−#: qml/Components/PinLockscreen.qml:215
125−msgid "DONE"
126−msgstr ""
127−
128−#: qml/Dash/GenericScopeView.qml:360
121+#: qml/Dash/GenericScopeView.qml:361
129msgid "See less"
122msgid "See less"
130msgstr ""
123msgstr ""
131
124
132−#: qml/Dash/GenericScopeView.qml:360
125+#: qml/Dash/GenericScopeView.qml:361
133msgid "See all"
126msgid "See all"
134−msgstr ""
127+msgstr "すべて表示する"
135
128
136−#: qml/Dash/GenericScopeView.qml:423 qml/Panel/SearchIndicator.qml:27
129+#: qml/Dash/GenericScopeView.qml:424 qml/Panel/SearchIndicator.qml:27
137msgid "Search"
130msgid "Search"
138msgstr "検索"
131msgstr "検索"
139
132
140#: qml/Dash/Previews/PreviewActionCombo.qml:34
133#: qml/Dash/Previews/PreviewActionCombo.qml:34
141msgid "More..."
134msgid "More..."
142−msgstr ""
135+msgstr "さらに ..."
143
136
144#: qml/Dash/Previews/PreviewActionCombo.qml:34
137#: qml/Dash/Previews/PreviewActionCombo.qml:34
145msgid "Less..."
138msgid "Less..."
146−msgstr ""
139+msgstr "隠す..."
147
140
148#: qml/Dash/Previews/PreviewRatingInput.qml:81
141#: qml/Dash/Previews/PreviewRatingInput.qml:81
149msgid "Rate this"
142msgid "Rate this"
150−msgstr ""
143+msgstr "評価する"
151
144
152#: qml/Dash/Previews/PreviewRatingInput.qml:126
145#: qml/Dash/Previews/PreviewRatingInput.qml:126
153msgid "Add a review"
146msgid "Add a review"
@@ -159,19 +152,19 @@ msgstr "送信"
159
152
160#: qml/Dash/ScopesOverview.qml:201
153#: qml/Dash/ScopesOverview.qml:201
161msgid "Manage Dash"
154msgid "Manage Dash"
162−msgstr ""
155+msgstr "Dashの管理"
163
156
164#: qml/Dash/ScopesOverview.qml:408
157#: qml/Dash/ScopesOverview.qml:408
165msgid "Done"
158msgid "Done"
166−msgstr ""
159+msgstr "完了"
167
160
168#: qml/Dash/ScopesOverview.qml:434
161#: qml/Dash/ScopesOverview.qml:434
169msgid "Store"
162msgid "Store"
170−msgstr ""
163+msgstr "保存"
171
164
172#: qml/Dash/ScopesOverviewTab.qml:36
165#: qml/Dash/ScopesOverviewTab.qml:36
173msgid "Favorites"
166msgid "Favorites"
174−msgstr ""
167+msgstr "お気に入り"
175
168
176#: qml/Dash/ScopesOverviewTab.qml:54
169#: qml/Dash/ScopesOverviewTab.qml:54
177msgid "All"
170msgid "All"
@@ -179,7 +172,7 @@ msgstr "すべて"
179
172
180#: qml/Greeter/Greeter.qml:157
173#: qml/Greeter/Greeter.qml:157
181msgid "Swipe to unlock"
174msgid "Swipe to unlock"
182−msgstr ""
175+msgstr "スワイプしてロック解除"
183
176
184#: qml/Hud/HudParametrizedActionsPage.qml:132
177#: qml/Hud/HudParametrizedActionsPage.qml:132
185msgid "Confirm"
178msgid "Confirm"
@@ -187,7 +180,7 @@ msgstr "確認"
187
180
188#: qml/Hud/Hud.qml:61 qml/Hud/Hud.qml:99 qml/Hud/Hud.qml:372
181#: qml/Hud/Hud.qml:61 qml/Hud/Hud.qml:99 qml/Hud/Hud.qml:372
189msgid "Type or say a command"
182msgid "Type or say a command"
190−msgstr ""
183+msgstr "コマンドを音声かキーボードから入力"
191
184
192#: qml/Hud/Hud.qml:84
185#: qml/Hud/Hud.qml:84
193msgid "Loading. Please Wait..."
186msgid "Loading. Please Wait..."
@@ -201,17 +194,21 @@ msgstr "音声入力を開始..."
201msgid "Speaking..."
194msgid "Speaking..."
202msgstr "入力中..."
195msgstr "入力中..."
203
196
204−#: qml/Notifications/NotificationMenuItemFactory.qml:100
197+#: qml/Notifications/NotificationMenuItemFactory.qml:105
205msgid "Show password"
198msgid "Show password"
206msgstr "パスワードを表示"
199msgstr "パスワードを表示"
207
200
208−#: qml/Notifications/NotificationMenuItemFactory.qml:115
201+#: qml/Notifications/NotificationMenuItemFactory.qml:120
209−msgid "Please enter SIM PIN"
202+msgid "Enter SIM PIN"
203+msgstr ""
204+
205+#: qml/Notifications/NotificationMenuItemFactory.qml:121 qml/Shell.qml:270
206+msgid "Sorry, incorrect PIN"
210msgstr ""
207msgstr ""
211
208
212#: qml/Panel/ActiveCallHint.qml:77
209#: qml/Panel/ActiveCallHint.qml:77
213msgid "Tap to return to call..."
210msgid "Tap to return to call..."
214−msgstr ""
211+msgstr "タップすると通話に戻ります..."
215
212
216#: qml/Panel/ActiveCallHint.qml:90
213#: qml/Panel/ActiveCallHint.qml:90
217msgid "Conference"
214msgid "Conference"
@@ -223,11 +220,11 @@ msgstr ""
223
220
224#: qml/Panel/Indicators/MenuItemFactory.qml:655
221#: qml/Panel/Indicators/MenuItemFactory.qml:655
225msgid "Downloading"
222msgid "Downloading"
226−msgstr ""
223+msgstr "ダウンロード中"
227
224
228#: qml/Panel/Indicators/MenuItemFactory.qml:657
225#: qml/Panel/Indicators/MenuItemFactory.qml:657
229msgid "Paused, tap to resume"
226msgid "Paused, tap to resume"
230−msgstr ""
227+msgstr "停止中、再開するにはタップしてください"
231
228
232#: qml/Panel/Indicators/MenuItemFactory.qml:659
229#: qml/Panel/Indicators/MenuItemFactory.qml:659
233msgid "Canceled"
230msgid "Canceled"
@@ -239,58 +236,80 @@ msgstr ""
239
236
240#: qml/Panel/Indicators/MenuItemFactory.qml:663
237#: qml/Panel/Indicators/MenuItemFactory.qml:663
241msgid "Failed, tap to retry"
238msgid "Failed, tap to retry"
242−msgstr ""
239+msgstr "失敗しました、再試行するにはタップしてください"
243
240
244#: qml/Panel/Indicators/ModemInfoItem.qml:105
241#: qml/Panel/Indicators/ModemInfoItem.qml:105
245msgid "Unlock SIM"
242msgid "Unlock SIM"
246−msgstr ""
243+msgstr "SIMのアンロック"
247
244
248#: qml/Panel/Indicators/RoamingIndication.qml:27
245#: qml/Panel/Indicators/RoamingIndication.qml:27
249msgid "Roaming"
246msgid "Roaming"
250−msgstr ""
247+msgstr "ローミング"
251
248
252−#: qml/Shell.qml:267
249+#: qml/Shell.qml:266
253−msgid "passphrase"
250+msgid "Enter your passphrase"
254msgstr ""
251msgstr ""
255
252
256#: qml/Shell.qml:267
253#: qml/Shell.qml:267
257−msgid "passcode"
254+msgid "Sorry, incorrect passphrase"
258msgstr ""
255msgstr ""
259
256
260#: qml/Shell.qml:269
257#: qml/Shell.qml:269
261−#, qt-format
262−msgid "Enter your %1"
258+msgid "Enter your PIN"
263msgstr ""
259msgstr ""
264
260
265−#: qml/Shell.qml:270
261+#: qml/Shell.qml:273
266#, qt-format
262#, qt-format
267−msgid "Incorrect %1"
263+msgid "Enter your %1"
268−msgstr ""
264+msgstr "%1を入力してください"
269
265
270−#: qml/Shell.qml:272
266+#: qml/Shell.qml:274
271−msgid "Please re-enter"
267+#, qt-format
268+msgid "Sorry, incorrect %1"
272msgstr ""
269msgstr ""
273
270
274−#: qml/Shell.qml:306
271+#: qml/Shell.qml:310
275msgid "Sorry, incorrect passphrase."
272msgid "Sorry, incorrect passphrase."
276−msgstr ""
273+msgstr "パスフレーズが間違っています。"
277
274
278−#: qml/Shell.qml:307
275+#: qml/Shell.qml:311
279msgid "Sorry, incorrect passcode."
276msgid "Sorry, incorrect passcode."
280−msgstr ""
277+msgstr "パスコードが間違っています。"
281
278
282−#: qml/Shell.qml:308
279+#: qml/Shell.qml:312
283msgid "This will be your last attempt."
280msgid "This will be your last attempt."
284−msgstr ""
281+msgstr "これが最後のチャンスです。"
285
282
286−#: qml/Shell.qml:310
283+#: qml/Shell.qml:314
287msgid ""
284msgid ""
288"If passphrase is entered incorrectly, your phone will conduct a factory "
285"If passphrase is entered incorrectly, your phone will conduct a factory "
289"reset and all personal data will be deleted."
286"reset and all personal data will be deleted."
290msgstr ""
287msgstr ""
291
288
292−#: qml/Shell.qml:311
289+#: qml/Shell.qml:315
293msgid ""
290msgid ""
294"If passcode is entered incorrectly, your phone will conduct a factory reset "
291"If passcode is entered incorrectly, your phone will conduct a factory reset "
295"and all personal data will be deleted."
292"and all personal data will be deleted."
296msgstr ""
293msgstr ""
294+
295+#~ msgid "CANCEL"
296+#~ msgstr "キャンセル"
297+
298+#~ msgid "DONE"
299+#~ msgstr "完了"
300+
301+#~ msgid "Please enter SIM PIN"
302+#~ msgstr "SIM PINを入力してください"
303+
304+#~ msgid "passphrase"
305+#~ msgstr "パスフレーズ"
306+
307+#, qt-format
308+#~ msgid "Incorrect %1"
309+#~ msgstr "%1が間違っています"
310+
311+#~ msgid "passcode"
312+#~ msgstr "パスコード"
313+
314+#~ msgid "Please re-enter"
315+#~ msgstr "再入力してください"
po/km.po+70−46
@@ -7,19 +7,19 @@ msgid ""
7msgstr ""
7msgstr ""
8"Project-Id-Version: unity8\n"
8"Project-Id-Version: unity8\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2014-08-13 14:09-0400\n"
10+"POT-Creation-Date: 2014-08-21 11:36+0200\n"
11−"PO-Revision-Date: 2014-08-13 04:57+0000\n"
11+"PO-Revision-Date: 2014-08-20 02:48+0000\n"
12"Last-Translator: Sok Sophea <sksophea@gmail.com>\n"
12"Last-Translator: Sok Sophea <sksophea@gmail.com>\n"
13"Language-Team: Khmer <km@li.org>\n"
13"Language-Team: Khmer <km@li.org>\n"
14"MIME-Version: 1.0\n"
14"MIME-Version: 1.0\n"
15"Content-Type: text/plain; charset=UTF-8\n"
15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n"
16"Content-Transfer-Encoding: 8bit\n"
17−"X-Launchpad-Export-Date: 2014-08-15 06:28+0000\n"
17+"X-Launchpad-Export-Date: 2014-08-23 07:17+0000\n"
18−"X-Generator: Launchpad (build 17156)\n"
18+"X-Generator: Launchpad (build 17163)\n"
19
19
20#: plugins/LightDM/Greeter.cpp:129
20#: plugins/LightDM/Greeter.cpp:129
21msgid "Password: "
21msgid "Password: "
22−msgstr ""
22+msgstr "ពាក្យសម្ងាត់៖ "
23
23
24#: plugins/Unity/Launcher/launcheritem.cpp:43
24#: plugins/Unity/Launcher/launcheritem.cpp:43
25#: plugins/Unity/Launcher/launcheritem.cpp:73
25#: plugins/Unity/Launcher/launcheritem.cpp:73
@@ -96,19 +96,19 @@ msgstr ""
96"ឥឡូវ​អ្នក​បាន​ពិនិត្យ​កាយវិការ​គែម​ "
96"ឥឡូវ​អ្នក​បាន​ពិនិត្យ​កាយវិការ​គែម​ "
97"និង​អាច​ចាប់ផ្ដើម​ប្រើ​ទូរស័ព្ទ<br><br>ប៉ះ លើ​អេក្រង់​ដើម្បី​ចាប់ផ្ដើម"
97"និង​អាច​ចាប់ផ្ដើម​ប្រើ​ទូរស័ព្ទ<br><br>ប៉ះ លើ​អេក្រង់​ដើម្បី​ចាប់ផ្ដើម"
98
98
99−#: qml/Components/Lockscreen.qml:161
99+#: qml/Components/Lockscreen.qml:167
100−msgid "Too many incorrect attempts"
101−msgstr ""
102−
103−#: qml/Components/Lockscreen.qml:163
104msgid "Please wait"
100msgid "Please wait"
105−msgstr ""
101+msgstr "សូមរង់ចាំ"
106
102
107−#: qml/Components/Lockscreen.qml:245
103+#: qml/Components/Lockscreen.qml:172
104+msgid "Too many incorrect attempts"
105+msgstr "បាន​ព្យាយាម​ខុស​ច្រើន​ដង​ពេក"
106+
107+#: qml/Components/Lockscreen.qml:206
108msgid "Emergency Call"
108msgid "Emergency Call"
109msgstr "ការ​ហៅ​ពេល​អាសន្ន"
109msgstr "ការ​ហៅ​ពេល​អាសន្ន"
110
110
111−#: qml/Components/Lockscreen.qml:268
111+#: qml/Components/Lockscreen.qml:226
112msgid "OK"
112msgid "OK"
113msgstr "យល់ព្រម"
113msgstr "យល់ព្រម"
114
114
@@ -121,23 +121,15 @@ msgstr "សួស្ដី %1"
121msgid "Hello"
121msgid "Hello"
122msgstr "សួស្តី"
122msgstr "សួស្តី"
123
123
124−#: qml/Components/PinLockscreen.qml:197
125−msgid "CANCEL"
126−msgstr "បោះបង់"
127−
128−#: qml/Components/PinLockscreen.qml:215
129−msgid "DONE"
130−msgstr "រួចរាល់"
131−
132−#: qml/Dash/GenericScopeView.qml:360
124+#: qml/Dash/GenericScopeView.qml:361
133msgid "See less"
125msgid "See less"
134msgstr "មើល​តិច​ជាង"
126msgstr "មើល​តិច​ជាង"
135
127
136−#: qml/Dash/GenericScopeView.qml:360
128+#: qml/Dash/GenericScopeView.qml:361
137msgid "See all"
129msgid "See all"
138msgstr "មើល​ទាំងអស់"
130msgstr "មើល​ទាំងអស់"
139
131
140−#: qml/Dash/GenericScopeView.qml:423 qml/Panel/SearchIndicator.qml:27
132+#: qml/Dash/GenericScopeView.qml:424 qml/Panel/SearchIndicator.qml:27
141msgid "Search"
133msgid "Search"
142msgstr "ស្វែង​រក"
134msgstr "ស្វែង​រក"
143
135
@@ -205,13 +197,17 @@ msgstr "និយាយ​ឥឡូវ..."
205msgid "Speaking..."
197msgid "Speaking..."
206msgstr "កំពុង​និយាយ..."
198msgstr "កំពុង​និយាយ..."
207
199
208−#: qml/Notifications/NotificationMenuItemFactory.qml:100
200+#: qml/Notifications/NotificationMenuItemFactory.qml:105
209msgid "Show password"
201msgid "Show password"
210msgstr "បង្ហាញ​ពាក្យ​សម្ងាត់"
202msgstr "បង្ហាញ​ពាក្យ​សម្ងាត់"
211
203
212−#: qml/Notifications/NotificationMenuItemFactory.qml:115
204+#: qml/Notifications/NotificationMenuItemFactory.qml:120
213−msgid "Please enter SIM PIN"
205+msgid "Enter SIM PIN"
214−msgstr "បញ្ចូល​កូដ PIN របស់​ស៊ីមកាត"
206+msgstr ""
207+
208+#: qml/Notifications/NotificationMenuItemFactory.qml:121 qml/Shell.qml:270
209+msgid "Sorry, incorrect PIN"
210+msgstr ""
215
211
216#: qml/Panel/ActiveCallHint.qml:77
212#: qml/Panel/ActiveCallHint.qml:77
217msgid "Tap to return to call..."
213msgid "Tap to return to call..."
@@ -253,48 +249,76 @@ msgstr "ដោះ​សោ​ស៊ីម"
253msgid "Roaming"
249msgid "Roaming"
254msgstr "រ៉ូមីង"
250msgstr "រ៉ូមីង"
255
251
256−#: qml/Shell.qml:267
252+#: qml/Shell.qml:266
257−msgid "passphrase"
253+msgid "Enter your passphrase"
258msgstr ""
254msgstr ""
259
255
260#: qml/Shell.qml:267
256#: qml/Shell.qml:267
261−msgid "passcode"
257+msgid "Sorry, incorrect passphrase"
262msgstr ""
258msgstr ""
263
259
264#: qml/Shell.qml:269
260#: qml/Shell.qml:269
265−#, qt-format
266−msgid "Enter your %1"
261+msgid "Enter your PIN"
267msgstr ""
262msgstr ""
268
263
269−#: qml/Shell.qml:270
264+#: qml/Shell.qml:273
270#, qt-format
265#, qt-format
271−msgid "Incorrect %1"
266+msgid "Enter your %1"
272−msgstr ""
267+msgstr "បញ្ចូល %1 របស់​អ្នក"
273
268
274−#: qml/Shell.qml:272
269+#: qml/Shell.qml:274
275−msgid "Please re-enter"
270+#, qt-format
271+msgid "Sorry, incorrect %1"
276msgstr ""
272msgstr ""
277
273
278−#: qml/Shell.qml:306
274+#: qml/Shell.qml:310
279msgid "Sorry, incorrect passphrase."
275msgid "Sorry, incorrect passphrase."
280−msgstr ""
276+msgstr "សូមទោស! ឃ្លា​សម្ងាត់​មិន​ត្រឹមត្រូវ។"
281
277
282−#: qml/Shell.qml:307
278+#: qml/Shell.qml:311
283msgid "Sorry, incorrect passcode."
279msgid "Sorry, incorrect passcode."
284−msgstr ""
280+msgstr "សូមទោស! កូដ​សម្ងាត់​មិន​ត្រឹមត្រូវ។"
285
281
286−#: qml/Shell.qml:308
282+#: qml/Shell.qml:312
287msgid "This will be your last attempt."
283msgid "This will be your last attempt."
288−msgstr ""
284+msgstr "នេះ​គឺ​ការ​ព្យាយាម​លើក​ចុងក្រោយ។"
289
285
290−#: qml/Shell.qml:310
286+#: qml/Shell.qml:314
291msgid ""
287msgid ""
292"If passphrase is entered incorrectly, your phone will conduct a factory "
288"If passphrase is entered incorrectly, your phone will conduct a factory "
293"reset and all personal data will be deleted."
289"reset and all personal data will be deleted."
294msgstr ""
290msgstr ""
291+"បើ​បញ្ចូល​ឃ្លា​សម្ងាត់​មិន​ត្រឹមត្រូវ "
292+"ទូរស័ព្ទ​របស់​អ្នក​នឹង​កំណត់​ទៅ​ទិន្នន័យ​ពី​រោងចក្រ​វិញ "
293+"ហើយ​ទិន្នន័យ​ផ្ទាល់ខ្លួន​ទាំងអស់​របស់​អ្នក​នឹង​ត្រូវ​បាន​លុប។"
295
294
296−#: qml/Shell.qml:311
295+#: qml/Shell.qml:315
297msgid ""
296msgid ""
298"If passcode is entered incorrectly, your phone will conduct a factory reset "
297"If passcode is entered incorrectly, your phone will conduct a factory reset "
299"and all personal data will be deleted."
298"and all personal data will be deleted."
300msgstr ""
299msgstr ""
300+"បើ​បញ្ចូល​កូដ​សម្ងាត់​មិន​ត្រឹមត្រូវ "
301+"ទូរស័ព្ទ​របស់​អ្នក​នឹង​កំណត់​ទៅ​ទិន្នន័យ​ពី​រោងចក្រ​វិញ "
302+"ហើយ​ទិន្នន័យ​ផ្ទាល់ខ្លួន​ទាំងអស់​របស់​អ្នក​នឹង​ត្រូវ​បាន​លុប។"
303+
304+#~ msgid "Please enter SIM PIN"
305+#~ msgstr "បញ្ចូល​កូដ PIN របស់​ស៊ីមកាត"
306+
307+#~ msgid "CANCEL"
308+#~ msgstr "បោះបង់"
309+
310+#~ msgid "DONE"
311+#~ msgstr "រួចរាល់"
312+
313+#~ msgid "passphrase"
314+#~ msgstr "ឃ្លា​សម្ងាត់"
315+
316+#, qt-format
317+#~ msgid "Incorrect %1"
318+#~ msgstr "មិន​ត្រឹមត្រូវ %1"
319+
320+#~ msgid "Please re-enter"
321+#~ msgstr "សូម​បញ្ចូល​ឡើងវិញ"
322+
323+#~ msgid "passcode"
324+#~ msgstr "កូដ​សម្ងាត់"
po/kn.po+33−37
@@ -7,15 +7,15 @@ msgid ""
7msgstr ""
7msgstr ""
8"Project-Id-Version: unity\n"
8"Project-Id-Version: unity\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2014-08-13 14:09-0400\n"
10+"POT-Creation-Date: 2014-08-21 11:36+0200\n"
11"PO-Revision-Date: 2013-06-27 05:43+0000\n"
11"PO-Revision-Date: 2013-06-27 05:43+0000\n"
12"Last-Translator: Michał Sawicz <michal.sawicz@canonical.com>\n"
12"Last-Translator: Michał Sawicz <michal.sawicz@canonical.com>\n"
13"Language-Team: Kannada <kn@li.org>\n"
13"Language-Team: Kannada <kn@li.org>\n"
14"MIME-Version: 1.0\n"
14"MIME-Version: 1.0\n"
15"Content-Type: text/plain; charset=UTF-8\n"
15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n"
16"Content-Transfer-Encoding: 8bit\n"
17−"X-Launchpad-Export-Date: 2014-08-15 06:28+0000\n"
17+"X-Launchpad-Export-Date: 2014-08-23 07:17+0000\n"
18−"X-Generator: Launchpad (build 17156)\n"
18+"X-Generator: Launchpad (build 17163)\n"
19
19
20#: plugins/LightDM/Greeter.cpp:129
20#: plugins/LightDM/Greeter.cpp:129
21msgid "Password: "
21msgid "Password: "
@@ -92,19 +92,19 @@ msgid ""
92"phone<br><br>Tap on the screen to start"
92"phone<br><br>Tap on the screen to start"
93msgstr ""
93msgstr ""
94
94
95−#: qml/Components/Lockscreen.qml:161
95+#: qml/Components/Lockscreen.qml:167
96−msgid "Too many incorrect attempts"
96+msgid "Please wait"
97msgstr ""
97msgstr ""
98
98
99−#: qml/Components/Lockscreen.qml:163
99+#: qml/Components/Lockscreen.qml:172
100−msgid "Please wait"
100+msgid "Too many incorrect attempts"
101msgstr ""
101msgstr ""
102
102
103−#: qml/Components/Lockscreen.qml:245
103+#: qml/Components/Lockscreen.qml:206
104msgid "Emergency Call"
104msgid "Emergency Call"
105msgstr ""
105msgstr ""
106
106
107−#: qml/Components/Lockscreen.qml:268
107+#: qml/Components/Lockscreen.qml:226
108msgid "OK"
108msgid "OK"
109msgstr ""
109msgstr ""
110
110
@@ -117,23 +117,15 @@ msgstr ""
117msgid "Hello"
117msgid "Hello"
118msgstr ""
118msgstr ""
119
119
120−#: qml/Components/PinLockscreen.qml:197
121−msgid "CANCEL"
122−msgstr ""
123−
124−#: qml/Components/PinLockscreen.qml:215
125−msgid "DONE"
126−msgstr ""
127−
128−#: qml/Dash/GenericScopeView.qml:360
120+#: qml/Dash/GenericScopeView.qml:361
129msgid "See less"
121msgid "See less"
130msgstr ""
122msgstr ""
131
123
132−#: qml/Dash/GenericScopeView.qml:360
124+#: qml/Dash/GenericScopeView.qml:361
133msgid "See all"
125msgid "See all"
134msgstr ""
126msgstr ""
135
127
136−#: qml/Dash/GenericScopeView.qml:423 qml/Panel/SearchIndicator.qml:27
128+#: qml/Dash/GenericScopeView.qml:424 qml/Panel/SearchIndicator.qml:27
137msgid "Search"
129msgid "Search"
138msgstr "ಹುಡುಕು"
130msgstr "ಹುಡುಕು"
139
131
@@ -201,12 +193,16 @@ msgstr "ಈಗ ಮಾತನಾಡಿ ..."
201msgid "Speaking..."
193msgid "Speaking..."
202msgstr "ಮಾತನಾಡುತಿದ್ದೀರಿ"
194msgstr "ಮಾತನಾಡುತಿದ್ದೀರಿ"
203
195
204−#: qml/Notifications/NotificationMenuItemFactory.qml:100
196+#: qml/Notifications/NotificationMenuItemFactory.qml:105
205msgid "Show password"
197msgid "Show password"
206msgstr ""
198msgstr ""
207
199
208−#: qml/Notifications/NotificationMenuItemFactory.qml:115
200+#: qml/Notifications/NotificationMenuItemFactory.qml:120
209−msgid "Please enter SIM PIN"
201+msgid "Enter SIM PIN"
202+msgstr ""
203+
204+#: qml/Notifications/NotificationMenuItemFactory.qml:121 qml/Shell.qml:270
205+msgid "Sorry, incorrect PIN"
210msgstr ""
206msgstr ""
211
207
212#: qml/Panel/ActiveCallHint.qml:77
208#: qml/Panel/ActiveCallHint.qml:77
@@ -249,47 +245,47 @@ msgstr ""
249msgid "Roaming"
245msgid "Roaming"
250msgstr ""
246msgstr ""
251
247
252−#: qml/Shell.qml:267
248+#: qml/Shell.qml:266
253−msgid "passphrase"
249+msgid "Enter your passphrase"
254msgstr ""
250msgstr ""
255
251
256#: qml/Shell.qml:267
252#: qml/Shell.qml:267
257−msgid "passcode"
253+msgid "Sorry, incorrect passphrase"
258msgstr ""
254msgstr ""
259
255
260#: qml/Shell.qml:269
256#: qml/Shell.qml:269
261−#, qt-format
262−msgid "Enter your %1"
257+msgid "Enter your PIN"
263msgstr ""
258msgstr ""
264
259
265−#: qml/Shell.qml:270
260+#: qml/Shell.qml:273
266#, qt-format
261#, qt-format
267−msgid "Incorrect %1"
262+msgid "Enter your %1"
268msgstr ""
263msgstr ""
269
264
270−#: qml/Shell.qml:272
265+#: qml/Shell.qml:274
271−msgid "Please re-enter"
266+#, qt-format
267+msgid "Sorry, incorrect %1"
272msgstr ""
268msgstr ""
273
269
274−#: qml/Shell.qml:306
270+#: qml/Shell.qml:310
275msgid "Sorry, incorrect passphrase."
271msgid "Sorry, incorrect passphrase."
276msgstr ""
272msgstr ""
277
273
278−#: qml/Shell.qml:307
274+#: qml/Shell.qml:311
279msgid "Sorry, incorrect passcode."
275msgid "Sorry, incorrect passcode."
280msgstr ""
276msgstr ""
281
277
282−#: qml/Shell.qml:308
278+#: qml/Shell.qml:312
283msgid "This will be your last attempt."
279msgid "This will be your last attempt."
284msgstr ""
280msgstr ""
285
281
286−#: qml/Shell.qml:310
282+#: qml/Shell.qml:314
287msgid ""
283msgid ""
288"If passphrase is entered incorrectly, your phone will conduct a factory "
284"If passphrase is entered incorrectly, your phone will conduct a factory "
289"reset and all personal data will be deleted."
285"reset and all personal data will be deleted."
290msgstr ""
286msgstr ""
291
287
292−#: qml/Shell.qml:311
288+#: qml/Shell.qml:315
293msgid ""
289msgid ""
294"If passcode is entered incorrectly, your phone will conduct a factory reset "
290"If passcode is entered incorrectly, your phone will conduct a factory reset "
295"and all personal data will be deleted."
291"and all personal data will be deleted."
po/ko.po+80−60
@@ -7,19 +7,19 @@ msgid ""
7msgstr ""
7msgstr ""
8"Project-Id-Version: unity\n"
8"Project-Id-Version: unity\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2014-08-13 14:09-0400\n"
10+"POT-Creation-Date: 2014-08-21 11:36+0200\n"
11−"PO-Revision-Date: 2014-07-17 03:56+0000\n"
11+"PO-Revision-Date: 2014-08-19 13:02+0000\n"
12"Last-Translator: MinSik CHO <Unknown>\n"
12"Last-Translator: MinSik CHO <Unknown>\n"
13"Language-Team: Korean <ko@li.org>\n"
13"Language-Team: Korean <ko@li.org>\n"
14"MIME-Version: 1.0\n"
14"MIME-Version: 1.0\n"
15"Content-Type: text/plain; charset=UTF-8\n"
15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n"
16"Content-Transfer-Encoding: 8bit\n"
17−"X-Launchpad-Export-Date: 2014-08-15 06:28+0000\n"
17+"X-Launchpad-Export-Date: 2014-08-23 07:17+0000\n"
18−"X-Generator: Launchpad (build 17156)\n"
18+"X-Generator: Launchpad (build 17163)\n"
19
19
20#: plugins/LightDM/Greeter.cpp:129
20#: plugins/LightDM/Greeter.cpp:129
21msgid "Password: "
21msgid "Password: "
22−msgstr ""
22+msgstr "열쇠글: "
23
23
24#: plugins/Unity/Launcher/launcheritem.cpp:43
24#: plugins/Unity/Launcher/launcheritem.cpp:43
25#: plugins/Unity/Launcher/launcheritem.cpp:73
25#: plugins/Unity/Launcher/launcheritem.cpp:73
@@ -32,19 +32,19 @@ msgstr "바로가기를 고정 해제하기"
32
32
33#: qml/Components/Dialogs.qml:142
33#: qml/Components/Dialogs.qml:142
34msgid "Are you sure you would like to turn power off?"
34msgid "Are you sure you would like to turn power off?"
35−msgstr ""
35+msgstr "정말로 전원을 끌까요?"
36
36
37#: qml/Components/Dialogs.qml:144
37#: qml/Components/Dialogs.qml:144
38msgid "Power off"
38msgid "Power off"
39−msgstr ""
39+msgstr "전원 끄기"
40
40
41#: qml/Components/Dialogs.qml:153
41#: qml/Components/Dialogs.qml:153
42msgid "Restart"
42msgid "Restart"
43−msgstr ""
43+msgstr "재시작"
44
44
45#: qml/Components/Dialogs.qml:162
45#: qml/Components/Dialogs.qml:162
46msgid "Cancel"
46msgid "Cancel"
47−msgstr ""
47+msgstr "취소"
48
48
49#: qml/Components/EdgeDemoOverlay.qml:151
49#: qml/Components/EdgeDemoOverlay.qml:151
50msgid "Skip intro"
50msgid "Skip intro"
@@ -94,19 +94,19 @@ msgstr ""
94"여러분은 끝에서 끌어오기 제스쳐를 완벽히 익히셨기 때문에 휴대 전화를 사용하기 시작할 수 있습니다. <br><br> 스크린을 터치해서 "
94"여러분은 끝에서 끌어오기 제스쳐를 완벽히 익히셨기 때문에 휴대 전화를 사용하기 시작할 수 있습니다. <br><br> 스크린을 터치해서 "
95"시작하세요."
95"시작하세요."
96
96
97−#: qml/Components/Lockscreen.qml:161
97+#: qml/Components/Lockscreen.qml:167
98−msgid "Too many incorrect attempts"
99−msgstr ""
100−
101−#: qml/Components/Lockscreen.qml:163
102msgid "Please wait"
98msgid "Please wait"
103−msgstr ""
99+msgstr "기다려주십시오"
104
100
105−#: qml/Components/Lockscreen.qml:245
101+#: qml/Components/Lockscreen.qml:172
102+msgid "Too many incorrect attempts"
103+msgstr "너무 많이 틀리셨습니다"
104+
105+#: qml/Components/Lockscreen.qml:206
106msgid "Emergency Call"
106msgid "Emergency Call"
107msgstr "긴급 통화"
107msgstr "긴급 통화"
108
108
109−#: qml/Components/Lockscreen.qml:268
109+#: qml/Components/Lockscreen.qml:226
110msgid "OK"
110msgid "OK"
111msgstr "확인"
111msgstr "확인"
112
112
@@ -119,23 +119,15 @@ msgstr "안녕하세요 %1"
119msgid "Hello"
119msgid "Hello"
120msgstr "안녕하세요"
120msgstr "안녕하세요"
121
121
122−#: qml/Components/PinLockscreen.qml:197
123−msgid "CANCEL"
124−msgstr "취소"
125−
126−#: qml/Components/PinLockscreen.qml:215
127−msgid "DONE"
128−msgstr "완료"
129−
130−#: qml/Dash/GenericScopeView.qml:360
122+#: qml/Dash/GenericScopeView.qml:361
131msgid "See less"
123msgid "See less"
132msgstr "간단히 표시하기"
124msgstr "간단히 표시하기"
133
125
134−#: qml/Dash/GenericScopeView.qml:360
126+#: qml/Dash/GenericScopeView.qml:361
135msgid "See all"
127msgid "See all"
136−msgstr ""
128+msgstr "모두 보기"
137
129
138−#: qml/Dash/GenericScopeView.qml:423 qml/Panel/SearchIndicator.qml:27
130+#: qml/Dash/GenericScopeView.qml:424 qml/Panel/SearchIndicator.qml:27
139msgid "Search"
131msgid "Search"
140msgstr "검색"
132msgstr "검색"
141
133
@@ -161,23 +153,23 @@ msgstr "보내기"
161
153
162#: qml/Dash/ScopesOverview.qml:201
154#: qml/Dash/ScopesOverview.qml:201
163msgid "Manage Dash"
155msgid "Manage Dash"
164−msgstr ""
156+msgstr "대시 관리"
165
157
166#: qml/Dash/ScopesOverview.qml:408
158#: qml/Dash/ScopesOverview.qml:408
167msgid "Done"
159msgid "Done"
168−msgstr ""
160+msgstr "완료"
169
161
170#: qml/Dash/ScopesOverview.qml:434
162#: qml/Dash/ScopesOverview.qml:434
171msgid "Store"
163msgid "Store"
172−msgstr ""
164+msgstr "장터"
173
165
174#: qml/Dash/ScopesOverviewTab.qml:36
166#: qml/Dash/ScopesOverviewTab.qml:36
175msgid "Favorites"
167msgid "Favorites"
176−msgstr ""
168+msgstr "즐겨찾기"
177
169
178#: qml/Dash/ScopesOverviewTab.qml:54
170#: qml/Dash/ScopesOverviewTab.qml:54
179msgid "All"
171msgid "All"
180−msgstr ""
172+msgstr "모두"
181
173
182#: qml/Greeter/Greeter.qml:157
174#: qml/Greeter/Greeter.qml:157
183msgid "Swipe to unlock"
175msgid "Swipe to unlock"
@@ -203,21 +195,25 @@ msgstr "지금 말하세요..."
203msgid "Speaking..."
195msgid "Speaking..."
204msgstr "말하는 중..."
196msgstr "말하는 중..."
205
197
206−#: qml/Notifications/NotificationMenuItemFactory.qml:100
198+#: qml/Notifications/NotificationMenuItemFactory.qml:105
207msgid "Show password"
199msgid "Show password"
208msgstr "비밀 번호 보기"
200msgstr "비밀 번호 보기"
209
201
210−#: qml/Notifications/NotificationMenuItemFactory.qml:115
202+#: qml/Notifications/NotificationMenuItemFactory.qml:120
211−msgid "Please enter SIM PIN"
203+msgid "Enter SIM PIN"
212−msgstr "심카드의 PIN 번호를 입력하세요."
204+msgstr ""
205+
206+#: qml/Notifications/NotificationMenuItemFactory.qml:121 qml/Shell.qml:270
207+msgid "Sorry, incorrect PIN"
208+msgstr ""
213
209
214#: qml/Panel/ActiveCallHint.qml:77
210#: qml/Panel/ActiveCallHint.qml:77
215msgid "Tap to return to call..."
211msgid "Tap to return to call..."
216−msgstr ""
212+msgstr "통화로 돌아가려면 터치하세요..."
217
213
218#: qml/Panel/ActiveCallHint.qml:90
214#: qml/Panel/ActiveCallHint.qml:90
219msgid "Conference"
215msgid "Conference"
220−msgstr ""
216+msgstr "회의"
221
217
222#: qml/Panel/Indicators/MenuItemFactory.qml:651
218#: qml/Panel/Indicators/MenuItemFactory.qml:651
223msgid "In queue…"
219msgid "In queue…"
@@ -245,54 +241,78 @@ msgstr "실패하였습니다. 재시도하려면 누르세요."
245
241
246#: qml/Panel/Indicators/ModemInfoItem.qml:105
242#: qml/Panel/Indicators/ModemInfoItem.qml:105
247msgid "Unlock SIM"
243msgid "Unlock SIM"
248−msgstr ""
244+msgstr "SIM 카드 보안 해제"
249
245
250#: qml/Panel/Indicators/RoamingIndication.qml:27
246#: qml/Panel/Indicators/RoamingIndication.qml:27
251msgid "Roaming"
247msgid "Roaming"
252−msgstr ""
248+msgstr "로밍"
253
249
254−#: qml/Shell.qml:267
250+#: qml/Shell.qml:266
255−msgid "passphrase"
251+msgid "Enter your passphrase"
256msgstr ""
252msgstr ""
257
253
258#: qml/Shell.qml:267
254#: qml/Shell.qml:267
259−msgid "passcode"
255+msgid "Sorry, incorrect passphrase"
260msgstr ""
256msgstr ""
261
257
262#: qml/Shell.qml:269
258#: qml/Shell.qml:269
263−#, qt-format
264−msgid "Enter your %1"
259+msgid "Enter your PIN"
265msgstr ""
260msgstr ""
266
261
267−#: qml/Shell.qml:270
262+#: qml/Shell.qml:273
268#, qt-format
263#, qt-format
269−msgid "Incorrect %1"
264+msgid "Enter your %1"
270−msgstr ""
265+msgstr "%1를 입력하세요"
271
266
272−#: qml/Shell.qml:272
267+#: qml/Shell.qml:274
273−msgid "Please re-enter"
268+#, qt-format
269+msgid "Sorry, incorrect %1"
274msgstr ""
270msgstr ""
275
271
276−#: qml/Shell.qml:306
272+#: qml/Shell.qml:310
277msgid "Sorry, incorrect passphrase."
273msgid "Sorry, incorrect passphrase."
278−msgstr ""
274+msgstr "잘못된 비밀번호입니다."
279
275
280−#: qml/Shell.qml:307
276+#: qml/Shell.qml:311
281msgid "Sorry, incorrect passcode."
277msgid "Sorry, incorrect passcode."
282−msgstr ""
278+msgstr "잘못된 비밀번호입니다."
283
279
284−#: qml/Shell.qml:308
280+#: qml/Shell.qml:312
285msgid "This will be your last attempt."
281msgid "This will be your last attempt."
286−msgstr ""
282+msgstr "마지막 시도입니다."
287
283
288−#: qml/Shell.qml:310
284+#: qml/Shell.qml:314
289msgid ""
285msgid ""
290"If passphrase is entered incorrectly, your phone will conduct a factory "
286"If passphrase is entered incorrectly, your phone will conduct a factory "
291"reset and all personal data will be deleted."
287"reset and all personal data will be deleted."
292msgstr ""
288msgstr ""
289+"만약 이번 시도에서 잘못 입력하면, 보안을 위해 휴대 전화가 공장 초기화 과정을 거쳐 모든 사용자 데이터를 삭제할 것입니다."
293
290
294−#: qml/Shell.qml:311
291+#: qml/Shell.qml:315
295msgid ""
292msgid ""
296"If passcode is entered incorrectly, your phone will conduct a factory reset "
293"If passcode is entered incorrectly, your phone will conduct a factory reset "
297"and all personal data will be deleted."
294"and all personal data will be deleted."
298msgstr ""
295msgstr ""
296+"만약 이번 시도에서 잘못 입력하면, 보안을 위해 휴대 전화가 공장 초기화 과정을 거쳐 모든 사용자 데이터를 삭제할 것입니다."
297+
298+#~ msgid "CANCEL"
299+#~ msgstr "취소"
300+
301+#~ msgid "DONE"
302+#~ msgstr "완료"
303+
304+#~ msgid "Please enter SIM PIN"
305+#~ msgstr "심카드의 PIN 번호를 입력하세요."
306+
307+#~ msgid "passphrase"
308+#~ msgstr "비밀번호"
309+
310+#~ msgid "passcode"
311+#~ msgstr "비밀번호"
312+
313+#, qt-format
314+#~ msgid "Incorrect %1"
315+#~ msgstr "잘못된 %1입니다"
316+
317+#~ msgid "Please re-enter"
318+#~ msgstr "다시 입력하세요"
po/ky.po+33−37
@@ -7,15 +7,15 @@ msgid ""
7msgstr ""
7msgstr ""
8"Project-Id-Version: unity\n"
8"Project-Id-Version: unity\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2014-08-13 14:09-0400\n"
10+"POT-Creation-Date: 2014-08-21 11:36+0200\n"
11"PO-Revision-Date: 2013-06-27 06:17+0000\n"
11"PO-Revision-Date: 2013-06-27 06:17+0000\n"
12"Last-Translator: Michał Sawicz <michal.sawicz@canonical.com>\n"
12"Last-Translator: Michał Sawicz <michal.sawicz@canonical.com>\n"
13"Language-Team: Kirghiz <ky@li.org>\n"
13"Language-Team: Kirghiz <ky@li.org>\n"
14"MIME-Version: 1.0\n"
14"MIME-Version: 1.0\n"
15"Content-Type: text/plain; charset=UTF-8\n"
15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n"
16"Content-Transfer-Encoding: 8bit\n"
17−"X-Launchpad-Export-Date: 2014-08-15 06:28+0000\n"
17+"X-Launchpad-Export-Date: 2014-08-23 07:17+0000\n"
18−"X-Generator: Launchpad (build 17156)\n"
18+"X-Generator: Launchpad (build 17163)\n"
19
19
20#: plugins/LightDM/Greeter.cpp:129
20#: plugins/LightDM/Greeter.cpp:129
21msgid "Password: "
21msgid "Password: "
@@ -92,19 +92,19 @@ msgid ""
92"phone<br><br>Tap on the screen to start"
92"phone<br><br>Tap on the screen to start"
93msgstr ""
93msgstr ""
94
94
95−#: qml/Components/Lockscreen.qml:161
95+#: qml/Components/Lockscreen.qml:167
96−msgid "Too many incorrect attempts"
96+msgid "Please wait"
97msgstr ""
97msgstr ""
98
98
99−#: qml/Components/Lockscreen.qml:163
99+#: qml/Components/Lockscreen.qml:172
100−msgid "Please wait"
100+msgid "Too many incorrect attempts"
101msgstr ""
101msgstr ""
102
102
103−#: qml/Components/Lockscreen.qml:245
103+#: qml/Components/Lockscreen.qml:206
104msgid "Emergency Call"
104msgid "Emergency Call"
105msgstr ""
105msgstr ""
106
106
107−#: qml/Components/Lockscreen.qml:268
107+#: qml/Components/Lockscreen.qml:226
108msgid "OK"
108msgid "OK"
109msgstr ""
109msgstr ""
110
110
@@ -117,23 +117,15 @@ msgstr ""
117msgid "Hello"
117msgid "Hello"
118msgstr ""
118msgstr ""
119
119
120−#: qml/Components/PinLockscreen.qml:197
121−msgid "CANCEL"
122−msgstr ""
123−
124−#: qml/Components/PinLockscreen.qml:215
125−msgid "DONE"
126−msgstr ""
127−
128−#: qml/Dash/GenericScopeView.qml:360
120+#: qml/Dash/GenericScopeView.qml:361
129msgid "See less"
121msgid "See less"
130msgstr ""
122msgstr ""
131
123
132−#: qml/Dash/GenericScopeView.qml:360
124+#: qml/Dash/GenericScopeView.qml:361
133msgid "See all"
125msgid "See all"
134msgstr ""
126msgstr ""
135
127
136−#: qml/Dash/GenericScopeView.qml:423 qml/Panel/SearchIndicator.qml:27
128+#: qml/Dash/GenericScopeView.qml:424 qml/Panel/SearchIndicator.qml:27
137msgid "Search"
129msgid "Search"
138msgstr "Издөө"
130msgstr "Издөө"
139
131
@@ -201,12 +193,16 @@ msgstr "Азыр сүйлөңүз..."
201msgid "Speaking..."
193msgid "Speaking..."
202msgstr "Сүйлөнүүдө..."
194msgstr "Сүйлөнүүдө..."
203
195
204−#: qml/Notifications/NotificationMenuItemFactory.qml:100
196+#: qml/Notifications/NotificationMenuItemFactory.qml:105
205msgid "Show password"
197msgid "Show password"
206msgstr ""
198msgstr ""
207
199
208−#: qml/Notifications/NotificationMenuItemFactory.qml:115
200+#: qml/Notifications/NotificationMenuItemFactory.qml:120
209−msgid "Please enter SIM PIN"
201+msgid "Enter SIM PIN"
202+msgstr ""
203+
204+#: qml/Notifications/NotificationMenuItemFactory.qml:121 qml/Shell.qml:270
205+msgid "Sorry, incorrect PIN"
210msgstr ""
206msgstr ""
211
207
212#: qml/Panel/ActiveCallHint.qml:77
208#: qml/Panel/ActiveCallHint.qml:77
@@ -249,47 +245,47 @@ msgstr ""
249msgid "Roaming"
245msgid "Roaming"
250msgstr ""
246msgstr ""
251
247
252−#: qml/Shell.qml:267
248+#: qml/Shell.qml:266
253−msgid "passphrase"
249+msgid "Enter your passphrase"
254msgstr ""
250msgstr ""
255
251
256#: qml/Shell.qml:267
252#: qml/Shell.qml:267
257−msgid "passcode"
253+msgid "Sorry, incorrect passphrase"
258msgstr ""
254msgstr ""
259
255
260#: qml/Shell.qml:269
256#: qml/Shell.qml:269
261−#, qt-format
262−msgid "Enter your %1"
257+msgid "Enter your PIN"
263msgstr ""
258msgstr ""
264
259
265−#: qml/Shell.qml:270
260+#: qml/Shell.qml:273
266#, qt-format
261#, qt-format
267−msgid "Incorrect %1"
262+msgid "Enter your %1"
268msgstr ""
263msgstr ""
269
264
270−#: qml/Shell.qml:272
265+#: qml/Shell.qml:274
271−msgid "Please re-enter"
266+#, qt-format
267+msgid "Sorry, incorrect %1"
272msgstr ""
268msgstr ""
273
269
274−#: qml/Shell.qml:306
270+#: qml/Shell.qml:310
275msgid "Sorry, incorrect passphrase."
271msgid "Sorry, incorrect passphrase."
276msgstr ""
272msgstr ""
277
273
278−#: qml/Shell.qml:307
274+#: qml/Shell.qml:311
279msgid "Sorry, incorrect passcode."
275msgid "Sorry, incorrect passcode."
280msgstr ""
276msgstr ""
281
277
282−#: qml/Shell.qml:308
278+#: qml/Shell.qml:312
283msgid "This will be your last attempt."
279msgid "This will be your last attempt."
284msgstr ""
280msgstr ""
285
281
286−#: qml/Shell.qml:310
282+#: qml/Shell.qml:314
287msgid ""
283msgid ""
288"If passphrase is entered incorrectly, your phone will conduct a factory "
284"If passphrase is entered incorrectly, your phone will conduct a factory "
289"reset and all personal data will be deleted."
285"reset and all personal data will be deleted."
290msgstr ""
286msgstr ""
291
287
292−#: qml/Shell.qml:311
288+#: qml/Shell.qml:315
293msgid ""
289msgid ""
294"If passcode is entered incorrectly, your phone will conduct a factory reset "
290"If passcode is entered incorrectly, your phone will conduct a factory reset "
295"and all personal data will be deleted."
291"and all personal data will be deleted."
po/lo.po+33−37
@@ -7,15 +7,15 @@ msgid ""
7msgstr ""
7msgstr ""
8"Project-Id-Version: unity8\n"
8"Project-Id-Version: unity8\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2014-08-13 14:09-0400\n"
10+"POT-Creation-Date: 2014-08-21 11:36+0200\n"
11"PO-Revision-Date: 2013-10-02 10:00+0000\n"
11"PO-Revision-Date: 2013-10-02 10:00+0000\n"
12"Last-Translator: Anousak <anousak@gmail.com>\n"
12"Last-Translator: Anousak <anousak@gmail.com>\n"
13"Language-Team: Lao <lo@li.org>\n"
13"Language-Team: Lao <lo@li.org>\n"
14"MIME-Version: 1.0\n"
14"MIME-Version: 1.0\n"
15"Content-Type: text/plain; charset=UTF-8\n"
15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n"
16"Content-Transfer-Encoding: 8bit\n"
17−"X-Launchpad-Export-Date: 2014-08-15 06:28+0000\n"
17+"X-Launchpad-Export-Date: 2014-08-23 07:17+0000\n"
18−"X-Generator: Launchpad (build 17156)\n"
18+"X-Generator: Launchpad (build 17163)\n"
19
19
20#: plugins/LightDM/Greeter.cpp:129
20#: plugins/LightDM/Greeter.cpp:129
21msgid "Password: "
21msgid "Password: "
@@ -92,19 +92,19 @@ msgid ""
92"phone<br><br>Tap on the screen to start"
92"phone<br><br>Tap on the screen to start"
93msgstr ""
93msgstr ""
94
94
95−#: qml/Components/Lockscreen.qml:161
95+#: qml/Components/Lockscreen.qml:167
96−msgid "Too many incorrect attempts"
96+msgid "Please wait"
97msgstr ""
97msgstr ""
98
98
99−#: qml/Components/Lockscreen.qml:163
99+#: qml/Components/Lockscreen.qml:172
100−msgid "Please wait"
100+msgid "Too many incorrect attempts"
101msgstr ""
101msgstr ""
102
102
103−#: qml/Components/Lockscreen.qml:245
103+#: qml/Components/Lockscreen.qml:206
104msgid "Emergency Call"
104msgid "Emergency Call"
105msgstr ""
105msgstr ""
106
106
107−#: qml/Components/Lockscreen.qml:268
107+#: qml/Components/Lockscreen.qml:226
108msgid "OK"
108msgid "OK"
109msgstr ""
109msgstr ""
110
110
@@ -117,23 +117,15 @@ msgstr "ສະບາຍດີ %1"
117msgid "Hello"
117msgid "Hello"
118msgstr "ສະບາຍດີ"
118msgstr "ສະບາຍດີ"
119
119
120−#: qml/Components/PinLockscreen.qml:197
121−msgid "CANCEL"
122−msgstr ""
123−
124−#: qml/Components/PinLockscreen.qml:215
125−msgid "DONE"
126−msgstr ""
127−
128−#: qml/Dash/GenericScopeView.qml:360
120+#: qml/Dash/GenericScopeView.qml:361
129msgid "See less"
121msgid "See less"
130msgstr ""
122msgstr ""
131
123
132−#: qml/Dash/GenericScopeView.qml:360
124+#: qml/Dash/GenericScopeView.qml:361
133msgid "See all"
125msgid "See all"
134msgstr ""
126msgstr ""
135
127
136−#: qml/Dash/GenericScopeView.qml:423 qml/Panel/SearchIndicator.qml:27
128+#: qml/Dash/GenericScopeView.qml:424 qml/Panel/SearchIndicator.qml:27
137msgid "Search"
129msgid "Search"
138msgstr "ຊອກຫາ"
130msgstr "ຊອກຫາ"
139
131
@@ -201,12 +193,16 @@ msgstr "ເວົ້າໂລດ"
201msgid "Speaking..."
193msgid "Speaking..."
202msgstr "ກໍາລັງເວົ້າ"
194msgstr "ກໍາລັງເວົ້າ"
203
195
204−#: qml/Notifications/NotificationMenuItemFactory.qml:100
196+#: qml/Notifications/NotificationMenuItemFactory.qml:105
205msgid "Show password"
197msgid "Show password"
206msgstr ""
198msgstr ""
207
199
208−#: qml/Notifications/NotificationMenuItemFactory.qml:115
200+#: qml/Notifications/NotificationMenuItemFactory.qml:120
209−msgid "Please enter SIM PIN"
201+msgid "Enter SIM PIN"
202+msgstr ""
203+
204+#: qml/Notifications/NotificationMenuItemFactory.qml:121 qml/Shell.qml:270
205+msgid "Sorry, incorrect PIN"
210msgstr ""
206msgstr ""
211
207
212#: qml/Panel/ActiveCallHint.qml:77
208#: qml/Panel/ActiveCallHint.qml:77
@@ -249,47 +245,47 @@ msgstr ""
249msgid "Roaming"
245msgid "Roaming"
250msgstr ""
246msgstr ""
251
247
252−#: qml/Shell.qml:267
248+#: qml/Shell.qml:266
253−msgid "passphrase"
249+msgid "Enter your passphrase"
254msgstr ""
250msgstr ""
255
251
256#: qml/Shell.qml:267
252#: qml/Shell.qml:267
257−msgid "passcode"
253+msgid "Sorry, incorrect passphrase"
258msgstr ""
254msgstr ""
259
255
260#: qml/Shell.qml:269
256#: qml/Shell.qml:269
261−#, qt-format
262−msgid "Enter your %1"
257+msgid "Enter your PIN"
263msgstr ""
258msgstr ""
264
259
265−#: qml/Shell.qml:270
260+#: qml/Shell.qml:273
266#, qt-format
261#, qt-format
267−msgid "Incorrect %1"
262+msgid "Enter your %1"
268msgstr ""
263msgstr ""
269
264
270−#: qml/Shell.qml:272
265+#: qml/Shell.qml:274
271−msgid "Please re-enter"
266+#, qt-format
267+msgid "Sorry, incorrect %1"
272msgstr ""
268msgstr ""
273
269
274−#: qml/Shell.qml:306
270+#: qml/Shell.qml:310
275msgid "Sorry, incorrect passphrase."
271msgid "Sorry, incorrect passphrase."
276msgstr ""
272msgstr ""
277
273
278−#: qml/Shell.qml:307
274+#: qml/Shell.qml:311
279msgid "Sorry, incorrect passcode."
275msgid "Sorry, incorrect passcode."
280msgstr ""
276msgstr ""
281
277
282−#: qml/Shell.qml:308
278+#: qml/Shell.qml:312
283msgid "This will be your last attempt."
279msgid "This will be your last attempt."
284msgstr ""
280msgstr ""
285
281
286−#: qml/Shell.qml:310
282+#: qml/Shell.qml:314
287msgid ""
283msgid ""
288"If passphrase is entered incorrectly, your phone will conduct a factory "
284"If passphrase is entered incorrectly, your phone will conduct a factory "
289"reset and all personal data will be deleted."
285"reset and all personal data will be deleted."
290msgstr ""
286msgstr ""
291
287
292−#: qml/Shell.qml:311
288+#: qml/Shell.qml:315
293msgid ""
289msgid ""
294"If passcode is entered incorrectly, your phone will conduct a factory reset "
290"If passcode is entered incorrectly, your phone will conduct a factory reset "
295"and all personal data will be deleted."
291"and all personal data will be deleted."
po/lt.po+37−38
@@ -7,15 +7,15 @@ msgid ""
7msgstr ""
7msgstr ""
8"Project-Id-Version: unity8\n"
8"Project-Id-Version: unity8\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2014-08-13 14:09-0400\n"
10+"POT-Creation-Date: 2014-08-21 11:36+0200\n"
11"PO-Revision-Date: 2014-05-19 17:15+0000\n"
11"PO-Revision-Date: 2014-05-19 17:15+0000\n"
12"Last-Translator: Mantas Kriaučiūnas <mantas@akl.lt>\n"
12"Last-Translator: Mantas Kriaučiūnas <mantas@akl.lt>\n"
13"Language-Team: Lithuanian <lt@li.org>\n"
13"Language-Team: Lithuanian <lt@li.org>\n"
14"MIME-Version: 1.0\n"
14"MIME-Version: 1.0\n"
15"Content-Type: text/plain; charset=UTF-8\n"
15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n"
16"Content-Transfer-Encoding: 8bit\n"
17−"X-Launchpad-Export-Date: 2014-08-15 06:28+0000\n"
17+"X-Launchpad-Export-Date: 2014-08-23 07:17+0000\n"
18−"X-Generator: Launchpad (build 17156)\n"
18+"X-Generator: Launchpad (build 17163)\n"
19
19
20#: plugins/LightDM/Greeter.cpp:129
20#: plugins/LightDM/Greeter.cpp:129
21msgid "Password: "
21msgid "Password: "
@@ -95,19 +95,19 @@ msgid ""
95"phone<br><br>Tap on the screen to start"
95"phone<br><br>Tap on the screen to start"
96msgstr ""
96msgstr ""
97
97
98−#: qml/Components/Lockscreen.qml:161
98+#: qml/Components/Lockscreen.qml:167
99−msgid "Too many incorrect attempts"
99+msgid "Please wait"
100msgstr ""
100msgstr ""
101
101
102−#: qml/Components/Lockscreen.qml:163
102+#: qml/Components/Lockscreen.qml:172
103−msgid "Please wait"
103+msgid "Too many incorrect attempts"
104msgstr ""
104msgstr ""
105
105
106−#: qml/Components/Lockscreen.qml:245
106+#: qml/Components/Lockscreen.qml:206
107msgid "Emergency Call"
107msgid "Emergency Call"
108msgstr "Pagalbos skambutis"
108msgstr "Pagalbos skambutis"
109
109
110−#: qml/Components/Lockscreen.qml:268
110+#: qml/Components/Lockscreen.qml:226
111msgid "OK"
111msgid "OK"
112msgstr ""
112msgstr ""
113
113
@@ -120,23 +120,15 @@ msgstr "Laba diena, %1"
120msgid "Hello"
120msgid "Hello"
121msgstr "Sveiki"
121msgstr "Sveiki"
122
122
123−#: qml/Components/PinLockscreen.qml:197
124−msgid "CANCEL"
125−msgstr ""
126−
127−#: qml/Components/PinLockscreen.qml:215
128−msgid "DONE"
129−msgstr ""
130−
131−#: qml/Dash/GenericScopeView.qml:360
123+#: qml/Dash/GenericScopeView.qml:361
132msgid "See less"
124msgid "See less"
133msgstr ""
125msgstr ""
134
126
135−#: qml/Dash/GenericScopeView.qml:360
127+#: qml/Dash/GenericScopeView.qml:361
136msgid "See all"
128msgid "See all"
137msgstr ""
129msgstr ""
138
130
139−#: qml/Dash/GenericScopeView.qml:423 qml/Panel/SearchIndicator.qml:27
131+#: qml/Dash/GenericScopeView.qml:424 qml/Panel/SearchIndicator.qml:27
140msgid "Search"
132msgid "Search"
141msgstr "Paieška"
133msgstr "Paieška"
142
134
@@ -204,13 +196,17 @@ msgstr "Kalbėkite..."
204msgid "Speaking..."
196msgid "Speaking..."
205msgstr "Kalbama..."
197msgstr "Kalbama..."
206
198
207−#: qml/Notifications/NotificationMenuItemFactory.qml:100
199+#: qml/Notifications/NotificationMenuItemFactory.qml:105
208msgid "Show password"
200msgid "Show password"
209msgstr "Rodyti slaptažodį"
201msgstr "Rodyti slaptažodį"
210
202
211−#: qml/Notifications/NotificationMenuItemFactory.qml:115
203+#: qml/Notifications/NotificationMenuItemFactory.qml:120
212−msgid "Please enter SIM PIN"
204+msgid "Enter SIM PIN"
213−msgstr "Įveskite SIM kortelės PIN kodą"
205+msgstr ""
206+
207+#: qml/Notifications/NotificationMenuItemFactory.qml:121 qml/Shell.qml:270
208+msgid "Sorry, incorrect PIN"
209+msgstr ""
214
210
215#: qml/Panel/ActiveCallHint.qml:77
211#: qml/Panel/ActiveCallHint.qml:77
216msgid "Tap to return to call..."
212msgid "Tap to return to call..."
@@ -252,48 +248,51 @@ msgstr ""
252msgid "Roaming"
248msgid "Roaming"
253msgstr ""
249msgstr ""
254
250
255−#: qml/Shell.qml:267
251+#: qml/Shell.qml:266
256−msgid "passphrase"
252+msgid "Enter your passphrase"
257msgstr ""
253msgstr ""
258
254
259#: qml/Shell.qml:267
255#: qml/Shell.qml:267
260−msgid "passcode"
256+msgid "Sorry, incorrect passphrase"
261msgstr ""
257msgstr ""
262
258
263#: qml/Shell.qml:269
259#: qml/Shell.qml:269
264−#, qt-format
265−msgid "Enter your %1"
260+msgid "Enter your PIN"
266msgstr ""
261msgstr ""
267
262
268−#: qml/Shell.qml:270
263+#: qml/Shell.qml:273
269#, qt-format
264#, qt-format
270−msgid "Incorrect %1"
265+msgid "Enter your %1"
271msgstr ""
266msgstr ""
272
267
273−#: qml/Shell.qml:272
268+#: qml/Shell.qml:274
274−msgid "Please re-enter"
269+#, qt-format
270+msgid "Sorry, incorrect %1"
275msgstr ""
271msgstr ""
276
272
277−#: qml/Shell.qml:306
273+#: qml/Shell.qml:310
278msgid "Sorry, incorrect passphrase."
274msgid "Sorry, incorrect passphrase."
279msgstr ""
275msgstr ""
280
276
281−#: qml/Shell.qml:307
277+#: qml/Shell.qml:311
282msgid "Sorry, incorrect passcode."
278msgid "Sorry, incorrect passcode."
283msgstr ""
279msgstr ""
284
280
285−#: qml/Shell.qml:308
281+#: qml/Shell.qml:312
286msgid "This will be your last attempt."
282msgid "This will be your last attempt."
287msgstr ""
283msgstr ""
288
284
289−#: qml/Shell.qml:310
285+#: qml/Shell.qml:314
290msgid ""
286msgid ""
291"If passphrase is entered incorrectly, your phone will conduct a factory "
287"If passphrase is entered incorrectly, your phone will conduct a factory "
292"reset and all personal data will be deleted."
288"reset and all personal data will be deleted."
293msgstr ""
289msgstr ""
294
290
295−#: qml/Shell.qml:311
291+#: qml/Shell.qml:315
296msgid ""
292msgid ""
297"If passcode is entered incorrectly, your phone will conduct a factory reset "
293"If passcode is entered incorrectly, your phone will conduct a factory reset "
298"and all personal data will be deleted."
294"and all personal data will be deleted."
299msgstr ""
295msgstr ""
296+
297+#~ msgid "Please enter SIM PIN"
298+#~ msgstr "Įveskite SIM kortelės PIN kodą"
po/lv.po+60−48
@@ -7,19 +7,19 @@ msgid ""
7msgstr ""
7msgstr ""
8"Project-Id-Version: unity\n"
8"Project-Id-Version: unity\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2014-08-13 14:09-0400\n"
10+"POT-Creation-Date: 2014-08-21 11:36+0200\n"
11−"PO-Revision-Date: 2014-08-12 19:07+0000\n"
11+"PO-Revision-Date: 2014-08-21 09:46+0000\n"
12"Last-Translator: Jānis-Marks Gailis <jm-gailis@fai-vianet.fr>\n"
12"Last-Translator: Jānis-Marks Gailis <jm-gailis@fai-vianet.fr>\n"
13"Language-Team: Latvian <lv@li.org>\n"
13"Language-Team: Latvian <lv@li.org>\n"
14"MIME-Version: 1.0\n"
14"MIME-Version: 1.0\n"
15"Content-Type: text/plain; charset=UTF-8\n"
15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n"
16"Content-Transfer-Encoding: 8bit\n"
17−"X-Launchpad-Export-Date: 2014-08-15 06:28+0000\n"
17+"X-Launchpad-Export-Date: 2014-08-23 07:17+0000\n"
18−"X-Generator: Launchpad (build 17156)\n"
18+"X-Generator: Launchpad (build 17163)\n"
19
19
20#: plugins/LightDM/Greeter.cpp:129
20#: plugins/LightDM/Greeter.cpp:129
21msgid "Password: "
21msgid "Password: "
22−msgstr ""
22+msgstr "Parole: "
23
23
24#: plugins/Unity/Launcher/launcheritem.cpp:43
24#: plugins/Unity/Launcher/launcheritem.cpp:43
25#: plugins/Unity/Launcher/launcheritem.cpp:73
25#: plugins/Unity/Launcher/launcheritem.cpp:73
@@ -32,7 +32,7 @@ msgstr ""
32
32
33#: qml/Components/Dialogs.qml:142
33#: qml/Components/Dialogs.qml:142
34msgid "Are you sure you would like to turn power off?"
34msgid "Are you sure you would like to turn power off?"
35−msgstr ""
35+msgstr "Vai esat drošs ka vēlaties izslēgt?"
36
36
37#: qml/Components/Dialogs.qml:144
37#: qml/Components/Dialogs.qml:144
38msgid "Power off"
38msgid "Power off"
@@ -92,19 +92,19 @@ msgid ""
92"phone<br><br>Tap on the screen to start"
92"phone<br><br>Tap on the screen to start"
93msgstr ""
93msgstr ""
94
94
95−#: qml/Components/Lockscreen.qml:161
95+#: qml/Components/Lockscreen.qml:167
96−msgid "Too many incorrect attempts"
97−msgstr ""
98−
99−#: qml/Components/Lockscreen.qml:163
100msgid "Please wait"
96msgid "Please wait"
97+msgstr "Lūdzu, uzgaidiet"
98+
99+#: qml/Components/Lockscreen.qml:172
100+msgid "Too many incorrect attempts"
101msgstr ""
101msgstr ""
102
102
103−#: qml/Components/Lockscreen.qml:245
103+#: qml/Components/Lockscreen.qml:206
104msgid "Emergency Call"
104msgid "Emergency Call"
105msgstr "Neatliekamās Palīdzības zvans"
105msgstr "Neatliekamās Palīdzības zvans"
106
106
107−#: qml/Components/Lockscreen.qml:268
107+#: qml/Components/Lockscreen.qml:226
108msgid "OK"
108msgid "OK"
109msgstr "LABI"
109msgstr "LABI"
110
110
@@ -117,23 +117,15 @@ msgstr "Sveiki, %1"
117msgid "Hello"
117msgid "Hello"
118msgstr "Sveiki"
118msgstr "Sveiki"
119
119
120−#: qml/Components/PinLockscreen.qml:197
121−msgid "CANCEL"
122−msgstr "ATCELT"
123−
124−#: qml/Components/PinLockscreen.qml:215
125−msgid "DONE"
126−msgstr "IZDARĪTS"
127−
128−#: qml/Dash/GenericScopeView.qml:360
120+#: qml/Dash/GenericScopeView.qml:361
129msgid "See less"
121msgid "See less"
130msgstr "Redzēt mazāk"
122msgstr "Redzēt mazāk"
131
123
132−#: qml/Dash/GenericScopeView.qml:360
124+#: qml/Dash/GenericScopeView.qml:361
133msgid "See all"
125msgid "See all"
134msgstr "Skatīt visus"
126msgstr "Skatīt visus"
135
127
136−#: qml/Dash/GenericScopeView.qml:423 qml/Panel/SearchIndicator.qml:27
128+#: qml/Dash/GenericScopeView.qml:424 qml/Panel/SearchIndicator.qml:27
137msgid "Search"
129msgid "Search"
138msgstr "Meklēt"
130msgstr "Meklēt"
139
131
@@ -167,7 +159,7 @@ msgstr "Pabeigts"
167
159
168#: qml/Dash/ScopesOverview.qml:434
160#: qml/Dash/ScopesOverview.qml:434
169msgid "Store"
161msgid "Store"
170−msgstr ""
162+msgstr "Veikals"
171
163
172#: qml/Dash/ScopesOverviewTab.qml:36
164#: qml/Dash/ScopesOverviewTab.qml:36
173msgid "Favorites"
165msgid "Favorites"
@@ -201,13 +193,17 @@ msgstr "Runajiet Tagad"
201msgid "Speaking..."
193msgid "Speaking..."
202msgstr "Runa..."
194msgstr "Runa..."
203
195
204−#: qml/Notifications/NotificationMenuItemFactory.qml:100
196+#: qml/Notifications/NotificationMenuItemFactory.qml:105
205msgid "Show password"
197msgid "Show password"
206msgstr "Rādīt paroli"
198msgstr "Rādīt paroli"
207
199
208−#: qml/Notifications/NotificationMenuItemFactory.qml:115
200+#: qml/Notifications/NotificationMenuItemFactory.qml:120
209−msgid "Please enter SIM PIN"
201+msgid "Enter SIM PIN"
210−msgstr "Lūdzu ievadiet SIM PIN"
202+msgstr ""
203+
204+#: qml/Notifications/NotificationMenuItemFactory.qml:121 qml/Shell.qml:270
205+msgid "Sorry, incorrect PIN"
206+msgstr ""
211
207
212#: qml/Panel/ActiveCallHint.qml:77
208#: qml/Panel/ActiveCallHint.qml:77
213msgid "Tap to return to call..."
209msgid "Tap to return to call..."
@@ -219,7 +215,7 @@ msgstr "Konference"
219
215
220#: qml/Panel/Indicators/MenuItemFactory.qml:651
216#: qml/Panel/Indicators/MenuItemFactory.qml:651
221msgid "In queue…"
217msgid "In queue…"
222−msgstr ""
218+msgstr "Sarakstā..."
223
219
224#: qml/Panel/Indicators/MenuItemFactory.qml:655
220#: qml/Panel/Indicators/MenuItemFactory.qml:655
225msgid "Downloading"
221msgid "Downloading"
@@ -239,7 +235,7 @@ msgstr "Pabeigts"
239
235
240#: qml/Panel/Indicators/MenuItemFactory.qml:663
236#: qml/Panel/Indicators/MenuItemFactory.qml:663
241msgid "Failed, tap to retry"
237msgid "Failed, tap to retry"
242−msgstr ""
238+msgstr "Neizdevās, spiest lai mēģināt vēlreiz"
243
239
244#: qml/Panel/Indicators/ModemInfoItem.qml:105
240#: qml/Panel/Indicators/ModemInfoItem.qml:105
245msgid "Unlock SIM"
241msgid "Unlock SIM"
@@ -247,50 +243,66 @@ msgstr "Atbloķēt SIM"
247
243
248#: qml/Panel/Indicators/RoamingIndication.qml:27
244#: qml/Panel/Indicators/RoamingIndication.qml:27
249msgid "Roaming"
245msgid "Roaming"
250−msgstr ""
246+msgstr "Viesabonēšana"
251
247
252−#: qml/Shell.qml:267
248+#: qml/Shell.qml:266
253−msgid "passphrase"
249+msgid "Enter your passphrase"
254msgstr ""
250msgstr ""
255
251
256#: qml/Shell.qml:267
252#: qml/Shell.qml:267
257−msgid "passcode"
253+msgid "Sorry, incorrect passphrase"
258msgstr ""
254msgstr ""
259
255
260#: qml/Shell.qml:269
256#: qml/Shell.qml:269
261−#, qt-format
262−msgid "Enter your %1"
257+msgid "Enter your PIN"
263msgstr ""
258msgstr ""
264
259
265−#: qml/Shell.qml:270
260+#: qml/Shell.qml:273
266#, qt-format
261#, qt-format
267−msgid "Incorrect %1"
262+msgid "Enter your %1"
268−msgstr ""
263+msgstr "Ievadiet jūsu %1"
269
264
270−#: qml/Shell.qml:272
265+#: qml/Shell.qml:274
271−msgid "Please re-enter"
266+#, qt-format
267+msgid "Sorry, incorrect %1"
272msgstr ""
268msgstr ""
273
269
274−#: qml/Shell.qml:306
270+#: qml/Shell.qml:310
275msgid "Sorry, incorrect passphrase."
271msgid "Sorry, incorrect passphrase."
276msgstr ""
272msgstr ""
277
273
278−#: qml/Shell.qml:307
274+#: qml/Shell.qml:311
279msgid "Sorry, incorrect passcode."
275msgid "Sorry, incorrect passcode."
280msgstr ""
276msgstr ""
281
277
282−#: qml/Shell.qml:308
278+#: qml/Shell.qml:312
283msgid "This will be your last attempt."
279msgid "This will be your last attempt."
284−msgstr ""
280+msgstr "Šīs būs jūs pēdējais mēģinājums."
285
281
286−#: qml/Shell.qml:310
282+#: qml/Shell.qml:314
287msgid ""
283msgid ""
288"If passphrase is entered incorrectly, your phone will conduct a factory "
284"If passphrase is entered incorrectly, your phone will conduct a factory "
289"reset and all personal data will be deleted."
285"reset and all personal data will be deleted."
290msgstr ""
286msgstr ""
291
287
292−#: qml/Shell.qml:311
288+#: qml/Shell.qml:315
293msgid ""
289msgid ""
294"If passcode is entered incorrectly, your phone will conduct a factory reset "
290"If passcode is entered incorrectly, your phone will conduct a factory reset "
295"and all personal data will be deleted."
291"and all personal data will be deleted."
296msgstr ""
292msgstr ""
293+
294+#~ msgid "Please enter SIM PIN"
295+#~ msgstr "Lūdzu ievadiet SIM PIN"
296+
297+#~ msgid "DONE"
298+#~ msgstr "IZDARĪTS"
299+
300+#~ msgid "CANCEL"
301+#~ msgstr "ATCELT"
302+
303+#~ msgid "Please re-enter"
304+#~ msgstr "Lūdzu ievadiet vēlreiz"
305+
306+#, qt-format
307+#~ msgid "Incorrect %1"
308+#~ msgstr "Nepareizs %1"
po/ml.po+33−37
@@ -7,15 +7,15 @@ msgid ""
7msgstr ""
7msgstr ""
8"Project-Id-Version: unity8\n"
8"Project-Id-Version: unity8\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2014-08-13 14:09-0400\n"
10+"POT-Creation-Date: 2014-08-21 11:36+0200\n"
11"PO-Revision-Date: 2013-11-23 11:44+0000\n"
11"PO-Revision-Date: 2013-11-23 11:44+0000\n"
12"Last-Translator: ST Alfas <Unknown>\n"
12"Last-Translator: ST Alfas <Unknown>\n"
13"Language-Team: Malayalam <ml@li.org>\n"
13"Language-Team: Malayalam <ml@li.org>\n"
14"MIME-Version: 1.0\n"
14"MIME-Version: 1.0\n"
15"Content-Type: text/plain; charset=UTF-8\n"
15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n"
16"Content-Transfer-Encoding: 8bit\n"
17−"X-Launchpad-Export-Date: 2014-08-15 06:28+0000\n"
17+"X-Launchpad-Export-Date: 2014-08-23 07:17+0000\n"
18−"X-Generator: Launchpad (build 17156)\n"
18+"X-Generator: Launchpad (build 17163)\n"
19
19
20#: plugins/LightDM/Greeter.cpp:129
20#: plugins/LightDM/Greeter.cpp:129
21msgid "Password: "
21msgid "Password: "
@@ -94,19 +94,19 @@ msgid ""
94"phone<br><br>Tap on the screen to start"
94"phone<br><br>Tap on the screen to start"
95msgstr ""
95msgstr ""
96
96
97−#: qml/Components/Lockscreen.qml:161
97+#: qml/Components/Lockscreen.qml:167
98−msgid "Too many incorrect attempts"
98+msgid "Please wait"
99msgstr ""
99msgstr ""
100
100
101−#: qml/Components/Lockscreen.qml:163
101+#: qml/Components/Lockscreen.qml:172
102−msgid "Please wait"
102+msgid "Too many incorrect attempts"
103msgstr ""
103msgstr ""
104
104
105−#: qml/Components/Lockscreen.qml:245
105+#: qml/Components/Lockscreen.qml:206
106msgid "Emergency Call"
106msgid "Emergency Call"
107msgstr "അടിയന്തിര വിളി"
107msgstr "അടിയന്തിര വിളി"
108
108
109−#: qml/Components/Lockscreen.qml:268
109+#: qml/Components/Lockscreen.qml:226
110msgid "OK"
110msgid "OK"
111msgstr ""
111msgstr ""
112
112
@@ -119,23 +119,15 @@ msgstr "ഹലോ %1"
119msgid "Hello"
119msgid "Hello"
120msgstr "ഹലോ"
120msgstr "ഹലോ"
121
121
122−#: qml/Components/PinLockscreen.qml:197
123−msgid "CANCEL"
124−msgstr ""
125−
126−#: qml/Components/PinLockscreen.qml:215
127−msgid "DONE"
128−msgstr ""
129−
130−#: qml/Dash/GenericScopeView.qml:360
122+#: qml/Dash/GenericScopeView.qml:361
131msgid "See less"
123msgid "See less"
132msgstr ""
124msgstr ""
133
125
134−#: qml/Dash/GenericScopeView.qml:360
126+#: qml/Dash/GenericScopeView.qml:361
135msgid "See all"
127msgid "See all"
136msgstr ""
128msgstr ""
137
129
138−#: qml/Dash/GenericScopeView.qml:423 qml/Panel/SearchIndicator.qml:27
130+#: qml/Dash/GenericScopeView.qml:424 qml/Panel/SearchIndicator.qml:27
139msgid "Search"
131msgid "Search"
140msgstr "തിരയുക"
132msgstr "തിരയുക"
141
133
@@ -203,12 +195,16 @@ msgstr "ഇപ്പോള്‍ സംസാരിക്കുക..."
203msgid "Speaking..."
195msgid "Speaking..."
204msgstr "സംസാരിക്കുന്നു..."
196msgstr "സംസാരിക്കുന്നു..."
205
197
206−#: qml/Notifications/NotificationMenuItemFactory.qml:100
198+#: qml/Notifications/NotificationMenuItemFactory.qml:105
207msgid "Show password"
199msgid "Show password"
208msgstr "രഹസ്യവാക്ക് കാണിക്കുക"
200msgstr "രഹസ്യവാക്ക് കാണിക്കുക"
209
201
210−#: qml/Notifications/NotificationMenuItemFactory.qml:115
202+#: qml/Notifications/NotificationMenuItemFactory.qml:120
211−msgid "Please enter SIM PIN"
203+msgid "Enter SIM PIN"
204+msgstr ""
205+
206+#: qml/Notifications/NotificationMenuItemFactory.qml:121 qml/Shell.qml:270
207+msgid "Sorry, incorrect PIN"
212msgstr ""
208msgstr ""
213
209
214#: qml/Panel/ActiveCallHint.qml:77
210#: qml/Panel/ActiveCallHint.qml:77
@@ -251,47 +247,47 @@ msgstr ""
251msgid "Roaming"
247msgid "Roaming"
252msgstr ""
248msgstr ""
253
249
254−#: qml/Shell.qml:267
250+#: qml/Shell.qml:266
255−msgid "passphrase"
251+msgid "Enter your passphrase"
256msgstr ""
252msgstr ""
257
253
258#: qml/Shell.qml:267
254#: qml/Shell.qml:267
259−msgid "passcode"
255+msgid "Sorry, incorrect passphrase"
260msgstr ""
256msgstr ""
261
257
262#: qml/Shell.qml:269
258#: qml/Shell.qml:269
263−#, qt-format
264−msgid "Enter your %1"
259+msgid "Enter your PIN"
265msgstr ""
260msgstr ""
266
261
267−#: qml/Shell.qml:270
262+#: qml/Shell.qml:273
268#, qt-format
263#, qt-format
269−msgid "Incorrect %1"
264+msgid "Enter your %1"
270msgstr ""
265msgstr ""
271
266
272−#: qml/Shell.qml:272
267+#: qml/Shell.qml:274
273−msgid "Please re-enter"
268+#, qt-format
269+msgid "Sorry, incorrect %1"
274msgstr ""
270msgstr ""
275
271
276−#: qml/Shell.qml:306
272+#: qml/Shell.qml:310
277msgid "Sorry, incorrect passphrase."
273msgid "Sorry, incorrect passphrase."
278msgstr ""
274msgstr ""
279
275
280−#: qml/Shell.qml:307
276+#: qml/Shell.qml:311
281msgid "Sorry, incorrect passcode."
277msgid "Sorry, incorrect passcode."
282msgstr ""
278msgstr ""
283
279
284−#: qml/Shell.qml:308
280+#: qml/Shell.qml:312
285msgid "This will be your last attempt."
281msgid "This will be your last attempt."
286msgstr ""
282msgstr ""
287
283
288−#: qml/Shell.qml:310
284+#: qml/Shell.qml:314
289msgid ""
285msgid ""
290"If passphrase is entered incorrectly, your phone will conduct a factory "
286"If passphrase is entered incorrectly, your phone will conduct a factory "
291"reset and all personal data will be deleted."
287"reset and all personal data will be deleted."
292msgstr ""
288msgstr ""
293
289
294−#: qml/Shell.qml:311
290+#: qml/Shell.qml:315
295msgid ""
291msgid ""
296"If passcode is entered incorrectly, your phone will conduct a factory reset "
292"If passcode is entered incorrectly, your phone will conduct a factory reset "
297"and all personal data will be deleted."
293"and all personal data will be deleted."
po/mr.po+33−37
@@ -7,15 +7,15 @@ msgid ""
7msgstr ""
7msgstr ""
8"Project-Id-Version: unity8\n"
8"Project-Id-Version: unity8\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2014-08-13 14:09-0400\n"
10+"POT-Creation-Date: 2014-08-21 11:36+0200\n"
11"PO-Revision-Date: 2014-01-14 19:54+0000\n"
11"PO-Revision-Date: 2014-01-14 19:54+0000\n"
12"Last-Translator: Rohan Deshmukh <Unknown>\n"
12"Last-Translator: Rohan Deshmukh <Unknown>\n"
13"Language-Team: Marathi <mr@li.org>\n"
13"Language-Team: Marathi <mr@li.org>\n"
14"MIME-Version: 1.0\n"
14"MIME-Version: 1.0\n"
15"Content-Type: text/plain; charset=UTF-8\n"
15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n"
16"Content-Transfer-Encoding: 8bit\n"
17−"X-Launchpad-Export-Date: 2014-08-15 06:28+0000\n"
17+"X-Launchpad-Export-Date: 2014-08-23 07:17+0000\n"
18−"X-Generator: Launchpad (build 17156)\n"
18+"X-Generator: Launchpad (build 17163)\n"
19
19
20#: plugins/LightDM/Greeter.cpp:129
20#: plugins/LightDM/Greeter.cpp:129
21msgid "Password: "
21msgid "Password: "
@@ -92,19 +92,19 @@ msgid ""
92"phone<br><br>Tap on the screen to start"
92"phone<br><br>Tap on the screen to start"
93msgstr ""
93msgstr ""
94
94
95−#: qml/Components/Lockscreen.qml:161
95+#: qml/Components/Lockscreen.qml:167
96−msgid "Too many incorrect attempts"
96+msgid "Please wait"
97msgstr ""
97msgstr ""
98
98
99−#: qml/Components/Lockscreen.qml:163
99+#: qml/Components/Lockscreen.qml:172
100−msgid "Please wait"
100+msgid "Too many incorrect attempts"
101msgstr ""
101msgstr ""
102
102
103−#: qml/Components/Lockscreen.qml:245
103+#: qml/Components/Lockscreen.qml:206
104msgid "Emergency Call"
104msgid "Emergency Call"
105msgstr ""
105msgstr ""
106
106
107−#: qml/Components/Lockscreen.qml:268
107+#: qml/Components/Lockscreen.qml:226
108msgid "OK"
108msgid "OK"
109msgstr ""
109msgstr ""
110
110
@@ -117,23 +117,15 @@ msgstr ""
117msgid "Hello"
117msgid "Hello"
118msgstr ""
118msgstr ""
119
119
120−#: qml/Components/PinLockscreen.qml:197
121−msgid "CANCEL"
122−msgstr ""
123−
124−#: qml/Components/PinLockscreen.qml:215
125−msgid "DONE"
126−msgstr ""
127−
128−#: qml/Dash/GenericScopeView.qml:360
120+#: qml/Dash/GenericScopeView.qml:361
129msgid "See less"
121msgid "See less"
130msgstr ""
122msgstr ""
131
123
132−#: qml/Dash/GenericScopeView.qml:360
124+#: qml/Dash/GenericScopeView.qml:361
133msgid "See all"
125msgid "See all"
134msgstr ""
126msgstr ""
135
127
136−#: qml/Dash/GenericScopeView.qml:423 qml/Panel/SearchIndicator.qml:27
128+#: qml/Dash/GenericScopeView.qml:424 qml/Panel/SearchIndicator.qml:27
137msgid "Search"
129msgid "Search"
138msgstr ""
130msgstr ""
139
131
@@ -201,12 +193,16 @@ msgstr ""
201msgid "Speaking..."
193msgid "Speaking..."
202msgstr ""
194msgstr ""
203
195
204−#: qml/Notifications/NotificationMenuItemFactory.qml:100
196+#: qml/Notifications/NotificationMenuItemFactory.qml:105
205msgid "Show password"
197msgid "Show password"
206msgstr ""
198msgstr ""
207
199
208−#: qml/Notifications/NotificationMenuItemFactory.qml:115
200+#: qml/Notifications/NotificationMenuItemFactory.qml:120
209−msgid "Please enter SIM PIN"
201+msgid "Enter SIM PIN"
202+msgstr ""
203+
204+#: qml/Notifications/NotificationMenuItemFactory.qml:121 qml/Shell.qml:270
205+msgid "Sorry, incorrect PIN"
210msgstr ""
206msgstr ""
211
207
212#: qml/Panel/ActiveCallHint.qml:77
208#: qml/Panel/ActiveCallHint.qml:77
@@ -249,47 +245,47 @@ msgstr ""
249msgid "Roaming"
245msgid "Roaming"
250msgstr ""
246msgstr ""
251
247
252−#: qml/Shell.qml:267
248+#: qml/Shell.qml:266
253−msgid "passphrase"
249+msgid "Enter your passphrase"
254msgstr ""
250msgstr ""
255
251
256#: qml/Shell.qml:267
252#: qml/Shell.qml:267
257−msgid "passcode"
253+msgid "Sorry, incorrect passphrase"
258msgstr ""
254msgstr ""
259
255
260#: qml/Shell.qml:269
256#: qml/Shell.qml:269
261−#, qt-format
262−msgid "Enter your %1"
257+msgid "Enter your PIN"
263msgstr ""
258msgstr ""
264
259
265−#: qml/Shell.qml:270
260+#: qml/Shell.qml:273
266#, qt-format
261#, qt-format
267−msgid "Incorrect %1"
262+msgid "Enter your %1"
268msgstr ""
263msgstr ""
269
264
270−#: qml/Shell.qml:272
265+#: qml/Shell.qml:274
271−msgid "Please re-enter"
266+#, qt-format
267+msgid "Sorry, incorrect %1"
272msgstr ""
268msgstr ""
273
269
274−#: qml/Shell.qml:306
270+#: qml/Shell.qml:310
275msgid "Sorry, incorrect passphrase."
271msgid "Sorry, incorrect passphrase."
276msgstr ""
272msgstr ""
277
273
278−#: qml/Shell.qml:307
274+#: qml/Shell.qml:311
279msgid "Sorry, incorrect passcode."
275msgid "Sorry, incorrect passcode."
280msgstr ""
276msgstr ""
281
277
282−#: qml/Shell.qml:308
278+#: qml/Shell.qml:312
283msgid "This will be your last attempt."
279msgid "This will be your last attempt."
284msgstr ""
280msgstr ""
285
281
286−#: qml/Shell.qml:310
282+#: qml/Shell.qml:314
287msgid ""
283msgid ""
288"If passphrase is entered incorrectly, your phone will conduct a factory "
284"If passphrase is entered incorrectly, your phone will conduct a factory "
289"reset and all personal data will be deleted."
285"reset and all personal data will be deleted."
290msgstr ""
286msgstr ""
291
287
292−#: qml/Shell.qml:311
288+#: qml/Shell.qml:315
293msgid ""
289msgid ""
294"If passcode is entered incorrectly, your phone will conduct a factory reset "
290"If passcode is entered incorrectly, your phone will conduct a factory reset "
295"and all personal data will be deleted."
291"and all personal data will be deleted."
po/ms.po+33−37
@@ -7,15 +7,15 @@ msgid ""
7msgstr ""
7msgstr ""
8"Project-Id-Version: unity8\n"
8"Project-Id-Version: unity8\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2014-08-13 14:09-0400\n"
10+"POT-Creation-Date: 2014-08-21 11:36+0200\n"
11"PO-Revision-Date: 2014-01-17 09:05+0000\n"
11"PO-Revision-Date: 2014-01-17 09:05+0000\n"
12"Last-Translator: abuyop <Unknown>\n"
12"Last-Translator: abuyop <Unknown>\n"
13"Language-Team: Malay <ms@li.org>\n"
13"Language-Team: Malay <ms@li.org>\n"
14"MIME-Version: 1.0\n"
14"MIME-Version: 1.0\n"
15"Content-Type: text/plain; charset=UTF-8\n"
15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n"
16"Content-Transfer-Encoding: 8bit\n"
17−"X-Launchpad-Export-Date: 2014-08-15 06:28+0000\n"
17+"X-Launchpad-Export-Date: 2014-08-23 07:17+0000\n"
18−"X-Generator: Launchpad (build 17156)\n"
18+"X-Generator: Launchpad (build 17163)\n"
19
19
20#: plugins/LightDM/Greeter.cpp:129
20#: plugins/LightDM/Greeter.cpp:129
21msgid "Password: "
21msgid "Password: "
@@ -92,19 +92,19 @@ msgid ""
92"phone<br><br>Tap on the screen to start"
92"phone<br><br>Tap on the screen to start"
93msgstr ""
93msgstr ""
94
94
95−#: qml/Components/Lockscreen.qml:161
95+#: qml/Components/Lockscreen.qml:167
96−msgid "Too many incorrect attempts"
96+msgid "Please wait"
97msgstr ""
97msgstr ""
98
98
99−#: qml/Components/Lockscreen.qml:163
99+#: qml/Components/Lockscreen.qml:172
100−msgid "Please wait"
100+msgid "Too many incorrect attempts"
101msgstr ""
101msgstr ""
102
102
103−#: qml/Components/Lockscreen.qml:245
103+#: qml/Components/Lockscreen.qml:206
104msgid "Emergency Call"
104msgid "Emergency Call"
105msgstr "panggilan Kecemasan"
105msgstr "panggilan Kecemasan"
106
106
107−#: qml/Components/Lockscreen.qml:268
107+#: qml/Components/Lockscreen.qml:226
108msgid "OK"
108msgid "OK"
109msgstr ""
109msgstr ""
110
110
@@ -117,23 +117,15 @@ msgstr "Hai %1"
117msgid "Hello"
117msgid "Hello"
118msgstr "Hello"
118msgstr "Hello"
119
119
120−#: qml/Components/PinLockscreen.qml:197
121−msgid "CANCEL"
122−msgstr ""
123−
124−#: qml/Components/PinLockscreen.qml:215
125−msgid "DONE"
126−msgstr ""
127−
128−#: qml/Dash/GenericScopeView.qml:360
120+#: qml/Dash/GenericScopeView.qml:361
129msgid "See less"
121msgid "See less"
130msgstr ""
122msgstr ""
131
123
132−#: qml/Dash/GenericScopeView.qml:360
124+#: qml/Dash/GenericScopeView.qml:361
133msgid "See all"
125msgid "See all"
134msgstr ""
126msgstr ""
135
127
136−#: qml/Dash/GenericScopeView.qml:423 qml/Panel/SearchIndicator.qml:27
128+#: qml/Dash/GenericScopeView.qml:424 qml/Panel/SearchIndicator.qml:27
137msgid "Search"
129msgid "Search"
138msgstr "Gelintar"
130msgstr "Gelintar"
139
131
@@ -201,12 +193,16 @@ msgstr "Cakap Sekarang..."
201msgid "Speaking..."
193msgid "Speaking..."
202msgstr "Bercakap..."
194msgstr "Bercakap..."
203
195
204−#: qml/Notifications/NotificationMenuItemFactory.qml:100
196+#: qml/Notifications/NotificationMenuItemFactory.qml:105
205msgid "Show password"
197msgid "Show password"
206msgstr "Tunjuk kata laluan"
198msgstr "Tunjuk kata laluan"
207
199
208−#: qml/Notifications/NotificationMenuItemFactory.qml:115
200+#: qml/Notifications/NotificationMenuItemFactory.qml:120
209−msgid "Please enter SIM PIN"
201+msgid "Enter SIM PIN"
202+msgstr ""
203+
204+#: qml/Notifications/NotificationMenuItemFactory.qml:121 qml/Shell.qml:270
205+msgid "Sorry, incorrect PIN"
210msgstr ""
206msgstr ""
211
207
212#: qml/Panel/ActiveCallHint.qml:77
208#: qml/Panel/ActiveCallHint.qml:77
@@ -249,47 +245,47 @@ msgstr ""
249msgid "Roaming"
245msgid "Roaming"
250msgstr ""
246msgstr ""
251
247
252−#: qml/Shell.qml:267
248+#: qml/Shell.qml:266
253−msgid "passphrase"
249+msgid "Enter your passphrase"
254msgstr ""
250msgstr ""
255
251
256#: qml/Shell.qml:267
252#: qml/Shell.qml:267
257−msgid "passcode"
253+msgid "Sorry, incorrect passphrase"
258msgstr ""
254msgstr ""
259
255
260#: qml/Shell.qml:269
256#: qml/Shell.qml:269
261−#, qt-format
262−msgid "Enter your %1"
257+msgid "Enter your PIN"
263msgstr ""
258msgstr ""
264
259
265−#: qml/Shell.qml:270
260+#: qml/Shell.qml:273
266#, qt-format
261#, qt-format
267−msgid "Incorrect %1"
262+msgid "Enter your %1"
268msgstr ""
263msgstr ""
269
264
270−#: qml/Shell.qml:272
265+#: qml/Shell.qml:274
271−msgid "Please re-enter"
266+#, qt-format
267+msgid "Sorry, incorrect %1"
272msgstr ""
268msgstr ""
273
269
274−#: qml/Shell.qml:306
270+#: qml/Shell.qml:310
275msgid "Sorry, incorrect passphrase."
271msgid "Sorry, incorrect passphrase."
276msgstr ""
272msgstr ""
277
273
278−#: qml/Shell.qml:307
274+#: qml/Shell.qml:311
279msgid "Sorry, incorrect passcode."
275msgid "Sorry, incorrect passcode."
280msgstr ""
276msgstr ""
281
277
282−#: qml/Shell.qml:308
278+#: qml/Shell.qml:312
283msgid "This will be your last attempt."
279msgid "This will be your last attempt."
284msgstr ""
280msgstr ""
285
281
286−#: qml/Shell.qml:310
282+#: qml/Shell.qml:314
287msgid ""
283msgid ""
288"If passphrase is entered incorrectly, your phone will conduct a factory "
284"If passphrase is entered incorrectly, your phone will conduct a factory "
289"reset and all personal data will be deleted."
285"reset and all personal data will be deleted."
290msgstr ""
286msgstr ""
291
287
292−#: qml/Shell.qml:311
288+#: qml/Shell.qml:315
293msgid ""
289msgid ""
294"If passcode is entered incorrectly, your phone will conduct a factory reset "
290"If passcode is entered incorrectly, your phone will conduct a factory reset "
295"and all personal data will be deleted."
291"and all personal data will be deleted."
po/my.po+33−37
@@ -7,15 +7,15 @@ msgid ""
7msgstr ""
7msgstr ""
8"Project-Id-Version: unity\n"
8"Project-Id-Version: unity\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2014-08-13 14:09-0400\n"
10+"POT-Creation-Date: 2014-08-21 11:36+0200\n"
11"PO-Revision-Date: 2013-12-12 11:12+0000\n"
11"PO-Revision-Date: 2013-12-12 11:12+0000\n"
12"Last-Translator: Pyae Sone <Unknown>\n"
12"Last-Translator: Pyae Sone <Unknown>\n"
13"Language-Team: Burmese <my@li.org>\n"
13"Language-Team: Burmese <my@li.org>\n"
14"MIME-Version: 1.0\n"
14"MIME-Version: 1.0\n"
15"Content-Type: text/plain; charset=UTF-8\n"
15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n"
16"Content-Transfer-Encoding: 8bit\n"
17−"X-Launchpad-Export-Date: 2014-08-15 06:28+0000\n"
17+"X-Launchpad-Export-Date: 2014-08-23 07:16+0000\n"
18−"X-Generator: Launchpad (build 17156)\n"
18+"X-Generator: Launchpad (build 17163)\n"
19
19
20#: plugins/LightDM/Greeter.cpp:129
20#: plugins/LightDM/Greeter.cpp:129
21msgid "Password: "
21msgid "Password: "
@@ -92,19 +92,19 @@ msgid ""
92"phone<br><br>Tap on the screen to start"
92"phone<br><br>Tap on the screen to start"
93msgstr ""
93msgstr ""
94
94
95−#: qml/Components/Lockscreen.qml:161
95+#: qml/Components/Lockscreen.qml:167
96−msgid "Too many incorrect attempts"
96+msgid "Please wait"
97msgstr ""
97msgstr ""
98
98
99−#: qml/Components/Lockscreen.qml:163
99+#: qml/Components/Lockscreen.qml:172
100−msgid "Please wait"
100+msgid "Too many incorrect attempts"
101msgstr ""
101msgstr ""
102
102
103−#: qml/Components/Lockscreen.qml:245
103+#: qml/Components/Lockscreen.qml:206
104msgid "Emergency Call"
104msgid "Emergency Call"
105msgstr "အရေးပေါ်ခေါ်မည်"
105msgstr "အရေးပေါ်ခေါ်မည်"
106
106
107−#: qml/Components/Lockscreen.qml:268
107+#: qml/Components/Lockscreen.qml:226
108msgid "OK"
108msgid "OK"
109msgstr ""
109msgstr ""
110
110
@@ -117,23 +117,15 @@ msgstr "ဟဲလို %1"
117msgid "Hello"
117msgid "Hello"
118msgstr "ဟဲလို"
118msgstr "ဟဲလို"
119
119
120−#: qml/Components/PinLockscreen.qml:197
121−msgid "CANCEL"
122−msgstr ""
123−
124−#: qml/Components/PinLockscreen.qml:215
125−msgid "DONE"
126−msgstr ""
127−
128−#: qml/Dash/GenericScopeView.qml:360
120+#: qml/Dash/GenericScopeView.qml:361
129msgid "See less"
121msgid "See less"
130msgstr ""
122msgstr ""
131
123
132−#: qml/Dash/GenericScopeView.qml:360
124+#: qml/Dash/GenericScopeView.qml:361
133msgid "See all"
125msgid "See all"
134msgstr ""
126msgstr ""
135
127
136−#: qml/Dash/GenericScopeView.qml:423 qml/Panel/SearchIndicator.qml:27
128+#: qml/Dash/GenericScopeView.qml:424 qml/Panel/SearchIndicator.qml:27
137msgid "Search"
129msgid "Search"
138msgstr "ရှာဖွေ"
130msgstr "ရှာဖွေ"
139
131
@@ -201,12 +193,16 @@ msgstr "ယခုပြောပါ"
201msgid "Speaking..."
193msgid "Speaking..."
202msgstr "ပြောနေသည်"
194msgstr "ပြောနေသည်"
203
195
204−#: qml/Notifications/NotificationMenuItemFactory.qml:100
196+#: qml/Notifications/NotificationMenuItemFactory.qml:105
205msgid "Show password"
197msgid "Show password"
206msgstr "စကားဝှက်ကိုပြ"
198msgstr "စကားဝှက်ကိုပြ"
207
199
208−#: qml/Notifications/NotificationMenuItemFactory.qml:115
200+#: qml/Notifications/NotificationMenuItemFactory.qml:120
209−msgid "Please enter SIM PIN"
201+msgid "Enter SIM PIN"
202+msgstr ""
203+
204+#: qml/Notifications/NotificationMenuItemFactory.qml:121 qml/Shell.qml:270
205+msgid "Sorry, incorrect PIN"
210msgstr ""
206msgstr ""
211
207
212#: qml/Panel/ActiveCallHint.qml:77
208#: qml/Panel/ActiveCallHint.qml:77
@@ -249,47 +245,47 @@ msgstr ""
249msgid "Roaming"
245msgid "Roaming"
250msgstr ""
246msgstr ""
251
247
252−#: qml/Shell.qml:267
248+#: qml/Shell.qml:266
253−msgid "passphrase"
249+msgid "Enter your passphrase"
254msgstr ""
250msgstr ""
255
251
256#: qml/Shell.qml:267
252#: qml/Shell.qml:267
257−msgid "passcode"
253+msgid "Sorry, incorrect passphrase"
258msgstr ""
254msgstr ""
259
255
260#: qml/Shell.qml:269
256#: qml/Shell.qml:269
261−#, qt-format
262−msgid "Enter your %1"
257+msgid "Enter your PIN"
263msgstr ""
258msgstr ""
264
259
265−#: qml/Shell.qml:270
260+#: qml/Shell.qml:273
266#, qt-format
261#, qt-format
267−msgid "Incorrect %1"
262+msgid "Enter your %1"
268msgstr ""
263msgstr ""
269
264
270−#: qml/Shell.qml:272
265+#: qml/Shell.qml:274
271−msgid "Please re-enter"
266+#, qt-format
267+msgid "Sorry, incorrect %1"
272msgstr ""
268msgstr ""
273
269
274−#: qml/Shell.qml:306
270+#: qml/Shell.qml:310
275msgid "Sorry, incorrect passphrase."
271msgid "Sorry, incorrect passphrase."
276msgstr ""
272msgstr ""
277
273
278−#: qml/Shell.qml:307
274+#: qml/Shell.qml:311
279msgid "Sorry, incorrect passcode."
275msgid "Sorry, incorrect passcode."
280msgstr ""
276msgstr ""
281
277
282−#: qml/Shell.qml:308
278+#: qml/Shell.qml:312
283msgid "This will be your last attempt."
279msgid "This will be your last attempt."
284msgstr ""
280msgstr ""
285
281
286−#: qml/Shell.qml:310
282+#: qml/Shell.qml:314
287msgid ""
283msgid ""
288"If passphrase is entered incorrectly, your phone will conduct a factory "
284"If passphrase is entered incorrectly, your phone will conduct a factory "
289"reset and all personal data will be deleted."
285"reset and all personal data will be deleted."
290msgstr ""
286msgstr ""
291
287
292−#: qml/Shell.qml:311
288+#: qml/Shell.qml:315
293msgid ""
289msgid ""
294"If passcode is entered incorrectly, your phone will conduct a factory reset "
290"If passcode is entered incorrectly, your phone will conduct a factory reset "
295"and all personal data will be deleted."
291"and all personal data will be deleted."
po/nb.po+60−42
@@ -7,15 +7,15 @@ msgid ""
7msgstr ""
7msgstr ""
8"Project-Id-Version: unity\n"
8"Project-Id-Version: unity\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2014-08-13 14:09-0400\n"
10+"POT-Creation-Date: 2014-08-21 11:36+0200\n"
11"PO-Revision-Date: 2014-08-14 16:56+0000\n"
11"PO-Revision-Date: 2014-08-14 16:56+0000\n"
12"Last-Translator: Åka Sikrom <Unknown>\n"
12"Last-Translator: Åka Sikrom <Unknown>\n"
13"Language-Team: Norwegian Bokmal <nb@li.org>\n"
13"Language-Team: Norwegian Bokmal <nb@li.org>\n"
14"MIME-Version: 1.0\n"
14"MIME-Version: 1.0\n"
15"Content-Type: text/plain; charset=UTF-8\n"
15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n"
16"Content-Transfer-Encoding: 8bit\n"
17−"X-Launchpad-Export-Date: 2014-08-15 06:28+0000\n"
17+"X-Launchpad-Export-Date: 2014-08-23 07:17+0000\n"
18−"X-Generator: Launchpad (build 17156)\n"
18+"X-Generator: Launchpad (build 17163)\n"
19
19
20#: plugins/LightDM/Greeter.cpp:129
20#: plugins/LightDM/Greeter.cpp:129
21msgid "Password: "
21msgid "Password: "
@@ -94,19 +94,19 @@ msgstr ""
94"Du har nå mestret kantbevegelsene, og er klar til å bruke "
94"Du har nå mestret kantbevegelsene, og er klar til å bruke "
95"telefonen<br><br>Trykk på skjermen for å begynne"
95"telefonen<br><br>Trykk på skjermen for å begynne"
96
96
97−#: qml/Components/Lockscreen.qml:161
97+#: qml/Components/Lockscreen.qml:167
98−msgid "Too many incorrect attempts"
99−msgstr "Du har tastet feil for mange ganger"
100−
101−#: qml/Components/Lockscreen.qml:163
102msgid "Please wait"
98msgid "Please wait"
103msgstr "Vent litt"
99msgstr "Vent litt"
104
100
105−#: qml/Components/Lockscreen.qml:245
101+#: qml/Components/Lockscreen.qml:172
102+msgid "Too many incorrect attempts"
103+msgstr "Du har tastet feil for mange ganger"
104+
105+#: qml/Components/Lockscreen.qml:206
106msgid "Emergency Call"
106msgid "Emergency Call"
107msgstr "Nødanrop"
107msgstr "Nødanrop"
108
108
109−#: qml/Components/Lockscreen.qml:268
109+#: qml/Components/Lockscreen.qml:226
110msgid "OK"
110msgid "OK"
111msgstr "OK"
111msgstr "OK"
112
112
@@ -119,23 +119,15 @@ msgstr "Hei, %1"
119msgid "Hello"
119msgid "Hello"
120msgstr "Hei"
120msgstr "Hei"
121
121
122−#: qml/Components/PinLockscreen.qml:197
123−msgid "CANCEL"
124−msgstr "AVBRYT"
125−
126−#: qml/Components/PinLockscreen.qml:215
127−msgid "DONE"
128−msgstr "FERDIG"
129−
130−#: qml/Dash/GenericScopeView.qml:360
122+#: qml/Dash/GenericScopeView.qml:361
131msgid "See less"
123msgid "See less"
132msgstr "Vis mindre"
124msgstr "Vis mindre"
133
125
134−#: qml/Dash/GenericScopeView.qml:360
126+#: qml/Dash/GenericScopeView.qml:361
135msgid "See all"
127msgid "See all"
136msgstr "Vis alt"
128msgstr "Vis alt"
137
129
138−#: qml/Dash/GenericScopeView.qml:423 qml/Panel/SearchIndicator.qml:27
130+#: qml/Dash/GenericScopeView.qml:424 qml/Panel/SearchIndicator.qml:27
139msgid "Search"
131msgid "Search"
140msgstr "Søk"
132msgstr "Søk"
141
133
@@ -203,13 +195,17 @@ msgstr "Snakk nå …"
203msgid "Speaking..."
195msgid "Speaking..."
204msgstr "Snakker …"
196msgstr "Snakker …"
205
197
206−#: qml/Notifications/NotificationMenuItemFactory.qml:100
198+#: qml/Notifications/NotificationMenuItemFactory.qml:105
207msgid "Show password"
199msgid "Show password"
208msgstr "Vis passord"
200msgstr "Vis passord"
209
201
210−#: qml/Notifications/NotificationMenuItemFactory.qml:115
202+#: qml/Notifications/NotificationMenuItemFactory.qml:120
211−msgid "Please enter SIM PIN"
203+msgid "Enter SIM PIN"
212−msgstr "Skriv inn PIN-koden til SIM-kortet"
204+msgstr ""
205+
206+#: qml/Notifications/NotificationMenuItemFactory.qml:121 qml/Shell.qml:270
207+msgid "Sorry, incorrect PIN"
208+msgstr ""
213
209
214#: qml/Panel/ActiveCallHint.qml:77
210#: qml/Panel/ActiveCallHint.qml:77
215msgid "Tap to return to call..."
211msgid "Tap to return to call..."
@@ -251,41 +247,41 @@ msgstr "Lås opp SIM"
251msgid "Roaming"
247msgid "Roaming"
252msgstr "Fremmednett"
248msgstr "Fremmednett"
253
249
254−#: qml/Shell.qml:267
250+#: qml/Shell.qml:266
255−msgid "passphrase"
251+msgid "Enter your passphrase"
256−msgstr "passordfrase"
252+msgstr ""
257
253
258#: qml/Shell.qml:267
254#: qml/Shell.qml:267
259−msgid "passcode"
255+msgid "Sorry, incorrect passphrase"
260−msgstr "kode"
256+msgstr ""
261
257
262#: qml/Shell.qml:269
258#: qml/Shell.qml:269
259+msgid "Enter your PIN"
260+msgstr ""
261+
262+#: qml/Shell.qml:273
263#, qt-format
263#, qt-format
264msgid "Enter your %1"
264msgid "Enter your %1"
265msgstr "Skriv inn %1"
265msgstr "Skriv inn %1"
266
266
267−#: qml/Shell.qml:270
267+#: qml/Shell.qml:274
268#, qt-format
268#, qt-format
269−msgid "Incorrect %1"
269+msgid "Sorry, incorrect %1"
270−msgstr "Feil %1"
271−
272−#: qml/Shell.qml:272
273−msgid "Please re-enter"
274−msgstr "Prøv på nytt"
270+msgstr ""
275
271
276−#: qml/Shell.qml:306
272+#: qml/Shell.qml:310
277msgid "Sorry, incorrect passphrase."
273msgid "Sorry, incorrect passphrase."
278msgstr "Feil passordfrase."
274msgstr "Feil passordfrase."
279
275
280−#: qml/Shell.qml:307
276+#: qml/Shell.qml:311
281msgid "Sorry, incorrect passcode."
277msgid "Sorry, incorrect passcode."
282msgstr "Feil kode."
278msgstr "Feil kode."
283
279
284−#: qml/Shell.qml:308
280+#: qml/Shell.qml:312
285msgid "This will be your last attempt."
281msgid "This will be your last attempt."
286msgstr "Dette er ditt siste forsøk."
282msgstr "Dette er ditt siste forsøk."
287
283
288−#: qml/Shell.qml:310
284+#: qml/Shell.qml:314
289msgid ""
285msgid ""
290"If passphrase is entered incorrectly, your phone will conduct a factory "
286"If passphrase is entered incorrectly, your phone will conduct a factory "
291"reset and all personal data will be deleted."
287"reset and all personal data will be deleted."
@@ -293,10 +289,32 @@ msgstr ""
293"Hvis du skriver feil passordfrase en gang til, tilbakestilles telefonen til "
289"Hvis du skriver feil passordfrase en gang til, tilbakestilles telefonen til "
294"fabrikkinnstillinger, og alle personlige data slettes."
290"fabrikkinnstillinger, og alle personlige data slettes."
295
291
296−#: qml/Shell.qml:311
292+#: qml/Shell.qml:315
297msgid ""
293msgid ""
298"If passcode is entered incorrectly, your phone will conduct a factory reset "
294"If passcode is entered incorrectly, your phone will conduct a factory reset "
299"and all personal data will be deleted."
295"and all personal data will be deleted."
300msgstr ""
296msgstr ""
301"Hvis du skriver feil kode en gang til, tilbakestilles telefonen til "
297"Hvis du skriver feil kode en gang til, tilbakestilles telefonen til "
302"fabrikkinnstillinger, og alle personlige data slettes."
298"fabrikkinnstillinger, og alle personlige data slettes."
299+
300+#~ msgid "Please enter SIM PIN"
301+#~ msgstr "Skriv inn PIN-koden til SIM-kortet"
302+
303+#~ msgid "CANCEL"
304+#~ msgstr "AVBRYT"
305+
306+#~ msgid "DONE"
307+#~ msgstr "FERDIG"
308+
309+#~ msgid "passphrase"
310+#~ msgstr "passordfrase"
311+
312+#, qt-format
313+#~ msgid "Incorrect %1"
314+#~ msgstr "Feil %1"
315+
316+#~ msgid "Please re-enter"
317+#~ msgstr "Prøv på nytt"
318+
319+#~ msgid "passcode"
320+#~ msgstr "kode"
po/nl.po+60−42
@@ -7,15 +7,15 @@ msgid ""
7msgstr ""
7msgstr ""
8"Project-Id-Version: unity\n"
8"Project-Id-Version: unity\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2014-08-13 14:09-0400\n"
10+"POT-Creation-Date: 2014-08-21 11:36+0200\n"
11"PO-Revision-Date: 2014-08-14 19:08+0000\n"
11"PO-Revision-Date: 2014-08-14 19:08+0000\n"
12"Last-Translator: rob <linuxned@gmail.com>\n"
12"Last-Translator: rob <linuxned@gmail.com>\n"
13"Language-Team: Dutch <nl@li.org>\n"
13"Language-Team: Dutch <nl@li.org>\n"
14"MIME-Version: 1.0\n"
14"MIME-Version: 1.0\n"
15"Content-Type: text/plain; charset=UTF-8\n"
15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n"
16"Content-Transfer-Encoding: 8bit\n"
17−"X-Launchpad-Export-Date: 2014-08-15 06:28+0000\n"
17+"X-Launchpad-Export-Date: 2014-08-23 07:16+0000\n"
18−"X-Generator: Launchpad (build 17156)\n"
18+"X-Generator: Launchpad (build 17163)\n"
19
19
20#: plugins/LightDM/Greeter.cpp:129
20#: plugins/LightDM/Greeter.cpp:129
21msgid "Password: "
21msgid "Password: "
@@ -94,19 +94,19 @@ msgstr ""
94"Nu u de bewegingen vanuit de randen onder de knie heeft, kunt u beginnen met "
94"Nu u de bewegingen vanuit de randen onder de knie heeft, kunt u beginnen met "
95"het gebruiken van de telefoon<br><br>Tik op het scherm om te beginnen"
95"het gebruiken van de telefoon<br><br>Tik op het scherm om te beginnen"
96
96
97−#: qml/Components/Lockscreen.qml:161
97+#: qml/Components/Lockscreen.qml:167
98−msgid "Too many incorrect attempts"
99−msgstr "Te veel mislukte pogingen"
100−
101−#: qml/Components/Lockscreen.qml:163
102msgid "Please wait"
98msgid "Please wait"
103msgstr "Even geduld a.u.b."
99msgstr "Even geduld a.u.b."
104
100
105−#: qml/Components/Lockscreen.qml:245
101+#: qml/Components/Lockscreen.qml:172
102+msgid "Too many incorrect attempts"
103+msgstr "Te veel mislukte pogingen"
104+
105+#: qml/Components/Lockscreen.qml:206
106msgid "Emergency Call"
106msgid "Emergency Call"
107msgstr "Noodoproep"
107msgstr "Noodoproep"
108
108
109−#: qml/Components/Lockscreen.qml:268
109+#: qml/Components/Lockscreen.qml:226
110msgid "OK"
110msgid "OK"
111msgstr "Ok"
111msgstr "Ok"
112
112
@@ -119,23 +119,15 @@ msgstr "Hallo %1"
119msgid "Hello"
119msgid "Hello"
120msgstr "Hallo"
120msgstr "Hallo"
121
121
122−#: qml/Components/PinLockscreen.qml:197
123−msgid "CANCEL"
124−msgstr "ANNULEREN"
125−
126−#: qml/Components/PinLockscreen.qml:215
127−msgid "DONE"
128−msgstr "KLAAR"
129−
130−#: qml/Dash/GenericScopeView.qml:360
122+#: qml/Dash/GenericScopeView.qml:361
131msgid "See less"
123msgid "See less"
132msgstr "Minder zien"
124msgstr "Minder zien"
133
125
134−#: qml/Dash/GenericScopeView.qml:360
126+#: qml/Dash/GenericScopeView.qml:361
135msgid "See all"
127msgid "See all"
136msgstr "Alles zien"
128msgstr "Alles zien"
137
129
138−#: qml/Dash/GenericScopeView.qml:423 qml/Panel/SearchIndicator.qml:27
130+#: qml/Dash/GenericScopeView.qml:424 qml/Panel/SearchIndicator.qml:27
139msgid "Search"
131msgid "Search"
140msgstr "Zoeken"
132msgstr "Zoeken"
141
133
@@ -203,13 +195,17 @@ msgstr "Nu inspreken…"
203msgid "Speaking..."
195msgid "Speaking..."
204msgstr "Inspreken…"
196msgstr "Inspreken…"
205
197
206−#: qml/Notifications/NotificationMenuItemFactory.qml:100
198+#: qml/Notifications/NotificationMenuItemFactory.qml:105
207msgid "Show password"
199msgid "Show password"
208msgstr "Wachtwoord tonen"
200msgstr "Wachtwoord tonen"
209
201
210−#: qml/Notifications/NotificationMenuItemFactory.qml:115
202+#: qml/Notifications/NotificationMenuItemFactory.qml:120
211−msgid "Please enter SIM PIN"
203+msgid "Enter SIM PIN"
212−msgstr "Voer SIM-pincode in"
204+msgstr ""
205+
206+#: qml/Notifications/NotificationMenuItemFactory.qml:121 qml/Shell.qml:270
207+msgid "Sorry, incorrect PIN"
208+msgstr ""
213
209
214#: qml/Panel/ActiveCallHint.qml:77
210#: qml/Panel/ActiveCallHint.qml:77
215msgid "Tap to return to call..."
211msgid "Tap to return to call..."
@@ -251,41 +247,41 @@ msgstr "SIM-kaart deblokkeren"
251msgid "Roaming"
247msgid "Roaming"
252msgstr "Roaming"
248msgstr "Roaming"
253
249
254−#: qml/Shell.qml:267
250+#: qml/Shell.qml:266
255−msgid "passphrase"
251+msgid "Enter your passphrase"
256−msgstr "wachtwoordzin"
252+msgstr ""
257
253
258#: qml/Shell.qml:267
254#: qml/Shell.qml:267
259−msgid "passcode"
255+msgid "Sorry, incorrect passphrase"
260−msgstr "toegangscode"
256+msgstr ""
261
257
262#: qml/Shell.qml:269
258#: qml/Shell.qml:269
259+msgid "Enter your PIN"
260+msgstr ""
261+
262+#: qml/Shell.qml:273
263#, qt-format
263#, qt-format
264msgid "Enter your %1"
264msgid "Enter your %1"
265msgstr "Voer uw %1 in"
265msgstr "Voer uw %1 in"
266
266
267−#: qml/Shell.qml:270
267+#: qml/Shell.qml:274
268#, qt-format
268#, qt-format
269−msgid "Incorrect %1"
269+msgid "Sorry, incorrect %1"
270−msgstr "%1 onjuist"
271−
272−#: qml/Shell.qml:272
273−msgid "Please re-enter"
274−msgstr "A.u.b. opnieuw invoeren"
270+msgstr ""
275
271
276−#: qml/Shell.qml:306
272+#: qml/Shell.qml:310
277msgid "Sorry, incorrect passphrase."
273msgid "Sorry, incorrect passphrase."
278msgstr "Sorry, onjuiste wachtwoordzin."
274msgstr "Sorry, onjuiste wachtwoordzin."
279
275
280−#: qml/Shell.qml:307
276+#: qml/Shell.qml:311
281msgid "Sorry, incorrect passcode."
277msgid "Sorry, incorrect passcode."
282msgstr "Sorry, onjuiste toegangscode."
278msgstr "Sorry, onjuiste toegangscode."
283
279
284−#: qml/Shell.qml:308
280+#: qml/Shell.qml:312
285msgid "This will be your last attempt."
281msgid "This will be your last attempt."
286msgstr "Dit zal uw laatste poging worden."
282msgstr "Dit zal uw laatste poging worden."
287
283
288−#: qml/Shell.qml:310
284+#: qml/Shell.qml:314
289msgid ""
285msgid ""
290"If passphrase is entered incorrectly, your phone will conduct a factory "
286"If passphrase is entered incorrectly, your phone will conduct a factory "
291"reset and all personal data will be deleted."
287"reset and all personal data will be deleted."
@@ -293,10 +289,32 @@ msgstr ""
293"Wanneer de wachtwoordzin nu opnieuw onjuist wordt ingevoerd, zal uw telefoon "
289"Wanneer de wachtwoordzin nu opnieuw onjuist wordt ingevoerd, zal uw telefoon "
294"teruggaan naar de fabrieksinstellingen en zal al uw eigen data verloren gaan."
290"teruggaan naar de fabrieksinstellingen en zal al uw eigen data verloren gaan."
295
291
296−#: qml/Shell.qml:311
292+#: qml/Shell.qml:315
297msgid ""
293msgid ""
298"If passcode is entered incorrectly, your phone will conduct a factory reset "
294"If passcode is entered incorrectly, your phone will conduct a factory reset "
299"and all personal data will be deleted."
295"and all personal data will be deleted."
300msgstr ""
296msgstr ""
301"Wanneer de toegangscode nu opnieuw onjuist wordt ingevoerd, zal uw telefoon "
297"Wanneer de toegangscode nu opnieuw onjuist wordt ingevoerd, zal uw telefoon "
302"teruggaan naar de fabrieksinstellingen en zal al uw eigen data verloren gaan."
298"teruggaan naar de fabrieksinstellingen en zal al uw eigen data verloren gaan."
299+
300+#~ msgid "DONE"
301+#~ msgstr "KLAAR"
302+
303+#~ msgid "CANCEL"
304+#~ msgstr "ANNULEREN"
305+
306+#~ msgid "Please enter SIM PIN"
307+#~ msgstr "Voer SIM-pincode in"
308+
309+#~ msgid "passphrase"
310+#~ msgstr "wachtwoordzin"
311+
312+#, qt-format
313+#~ msgid "Incorrect %1"
314+#~ msgstr "%1 onjuist"
315+
316+#~ msgid "Please re-enter"
317+#~ msgstr "A.u.b. opnieuw invoeren"
318+
319+#~ msgid "passcode"
320+#~ msgstr "toegangscode"
po/pl.po+56−42
@@ -7,15 +7,15 @@ msgid ""
7msgstr ""
7msgstr ""
8"Project-Id-Version: unity\n"
8"Project-Id-Version: unity\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2014-08-13 14:09-0400\n"
10+"POT-Creation-Date: 2014-08-21 11:36+0200\n"
11−"PO-Revision-Date: 2014-07-31 13:51+0000\n"
11+"PO-Revision-Date: 2014-08-18 20:25+0000\n"
12−"Last-Translator: Michał Radwański <radwanski.michal@outlook.com>\n"
12+"Last-Translator: Paweł Stroka <pawstr@gmail.com>\n"
13"Language-Team: Polish <pl@li.org>\n"
13"Language-Team: Polish <pl@li.org>\n"
14"MIME-Version: 1.0\n"
14"MIME-Version: 1.0\n"
15"Content-Type: text/plain; charset=UTF-8\n"
15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n"
16"Content-Transfer-Encoding: 8bit\n"
17−"X-Launchpad-Export-Date: 2014-08-15 06:28+0000\n"
17+"X-Launchpad-Export-Date: 2014-08-23 07:17+0000\n"
18−"X-Generator: Launchpad (build 17156)\n"
18+"X-Generator: Launchpad (build 17163)\n"
19
19
20#: plugins/LightDM/Greeter.cpp:129
20#: plugins/LightDM/Greeter.cpp:129
21msgid "Password: "
21msgid "Password: "
@@ -96,19 +96,19 @@ msgstr ""
96"Wydawanie poleceń krawędzi zostało opanowane. Urządzenie gotowe do "
96"Wydawanie poleceń krawędzi zostało opanowane. Urządzenie gotowe do "
97"pracy.<br><br>Dotknij ekranu by rozpocząć"
97"pracy.<br><br>Dotknij ekranu by rozpocząć"
98
98
99−#: qml/Components/Lockscreen.qml:161
99+#: qml/Components/Lockscreen.qml:167
100−msgid "Too many incorrect attempts"
100+msgid "Please wait"
101msgstr ""
101msgstr ""
102
102
103−#: qml/Components/Lockscreen.qml:163
103+#: qml/Components/Lockscreen.qml:172
104−msgid "Please wait"
104+msgid "Too many incorrect attempts"
105msgstr ""
105msgstr ""
106
106
107−#: qml/Components/Lockscreen.qml:245
107+#: qml/Components/Lockscreen.qml:206
108msgid "Emergency Call"
108msgid "Emergency Call"
109msgstr "Telefon ratunkowy"
109msgstr "Telefon ratunkowy"
110
110
111−#: qml/Components/Lockscreen.qml:268
111+#: qml/Components/Lockscreen.qml:226
112msgid "OK"
112msgid "OK"
113msgstr "OK"
113msgstr "OK"
114
114
@@ -121,23 +121,15 @@ msgstr "Witaj %1"
121msgid "Hello"
121msgid "Hello"
122msgstr "Witaj"
122msgstr "Witaj"
123
123
124−#: qml/Components/PinLockscreen.qml:197
125−msgid "CANCEL"
126−msgstr "ANULUJ"
127−
128−#: qml/Components/PinLockscreen.qml:215
129−msgid "DONE"
130−msgstr "ZROBIONE"
131−
132−#: qml/Dash/GenericScopeView.qml:360
124+#: qml/Dash/GenericScopeView.qml:361
133msgid "See less"
125msgid "See less"
134msgstr "Zobacz mniej"
126msgstr "Zobacz mniej"
135
127
136−#: qml/Dash/GenericScopeView.qml:360
128+#: qml/Dash/GenericScopeView.qml:361
137msgid "See all"
129msgid "See all"
138msgstr "Zobacz wszystko"
130msgstr "Zobacz wszystko"
139
131
140−#: qml/Dash/GenericScopeView.qml:423 qml/Panel/SearchIndicator.qml:27
132+#: qml/Dash/GenericScopeView.qml:424 qml/Panel/SearchIndicator.qml:27
141msgid "Search"
133msgid "Search"
142msgstr "Szukaj"
134msgstr "Szukaj"
143
135
@@ -205,13 +197,17 @@ msgstr "Mów teraz..."
205msgid "Speaking..."
197msgid "Speaking..."
206msgstr "Rozpoznanie..."
198msgstr "Rozpoznanie..."
207
199
208−#: qml/Notifications/NotificationMenuItemFactory.qml:100
200+#: qml/Notifications/NotificationMenuItemFactory.qml:105
209msgid "Show password"
201msgid "Show password"
210msgstr "Wyświetl hasło"
202msgstr "Wyświetl hasło"
211
203
212−#: qml/Notifications/NotificationMenuItemFactory.qml:115
204+#: qml/Notifications/NotificationMenuItemFactory.qml:120
213−msgid "Please enter SIM PIN"
205+msgid "Enter SIM PIN"
214−msgstr "Wprowadź kod PIN karty SIM"
206+msgstr ""
207+
208+#: qml/Notifications/NotificationMenuItemFactory.qml:121 qml/Shell.qml:270
209+msgid "Sorry, incorrect PIN"
210+msgstr ""
215
211
216#: qml/Panel/ActiveCallHint.qml:77
212#: qml/Panel/ActiveCallHint.qml:77
217msgid "Tap to return to call..."
213msgid "Tap to return to call..."
@@ -253,48 +249,66 @@ msgstr ""
253msgid "Roaming"
249msgid "Roaming"
254msgstr ""
250msgstr ""
255
251
256−#: qml/Shell.qml:267
252+#: qml/Shell.qml:266
257−msgid "passphrase"
253+msgid "Enter your passphrase"
258msgstr ""
254msgstr ""
259
255
260#: qml/Shell.qml:267
256#: qml/Shell.qml:267
261−msgid "passcode"
257+msgid "Sorry, incorrect passphrase"
262msgstr ""
258msgstr ""
263
259
264#: qml/Shell.qml:269
260#: qml/Shell.qml:269
265−#, qt-format
266−msgid "Enter your %1"
261+msgid "Enter your PIN"
267msgstr ""
262msgstr ""
268
263
269−#: qml/Shell.qml:270
264+#: qml/Shell.qml:273
270#, qt-format
265#, qt-format
271−msgid "Incorrect %1"
266+msgid "Enter your %1"
272msgstr ""
267msgstr ""
273
268
274−#: qml/Shell.qml:272
269+#: qml/Shell.qml:274
275−msgid "Please re-enter"
270+#, qt-format
271+msgid "Sorry, incorrect %1"
276msgstr ""
272msgstr ""
277
273
278−#: qml/Shell.qml:306
274+#: qml/Shell.qml:310
279msgid "Sorry, incorrect passphrase."
275msgid "Sorry, incorrect passphrase."
280−msgstr ""
276+msgstr "Niestety, błędne hasło"
281
277
282−#: qml/Shell.qml:307
278+#: qml/Shell.qml:311
283msgid "Sorry, incorrect passcode."
279msgid "Sorry, incorrect passcode."
284−msgstr ""
280+msgstr "Niestety, błędny kod"
285
281
286−#: qml/Shell.qml:308
282+#: qml/Shell.qml:312
287msgid "This will be your last attempt."
283msgid "This will be your last attempt."
288msgstr ""
284msgstr ""
289
285
290−#: qml/Shell.qml:310
286+#: qml/Shell.qml:314
291msgid ""
287msgid ""
292"If passphrase is entered incorrectly, your phone will conduct a factory "
288"If passphrase is entered incorrectly, your phone will conduct a factory "
293"reset and all personal data will be deleted."
289"reset and all personal data will be deleted."
294msgstr ""
290msgstr ""
295
291
296−#: qml/Shell.qml:311
292+#: qml/Shell.qml:315
297msgid ""
293msgid ""
298"If passcode is entered incorrectly, your phone will conduct a factory reset "
294"If passcode is entered incorrectly, your phone will conduct a factory reset "
299"and all personal data will be deleted."
295"and all personal data will be deleted."
300msgstr ""
296msgstr ""
297+
298+#~ msgid "Please enter SIM PIN"
299+#~ msgstr "Wprowadź kod PIN karty SIM"
300+
301+#~ msgid "CANCEL"
302+#~ msgstr "ANULUJ"
303+
304+#~ msgid "DONE"
305+#~ msgstr "ZROBIONE"
306+
307+#~ msgid "passcode"
308+#~ msgstr "kod"
309+
310+#~ msgid "passphrase"
311+#~ msgstr "hasło"
312+
313+#~ msgid "Please re-enter"
314+#~ msgstr "Proszę wprowadzić ponownie"
po/pt.po+61−44
@@ -7,15 +7,15 @@ msgid ""
7msgstr ""
7msgstr ""
8"Project-Id-Version: unity8\n"
8"Project-Id-Version: unity8\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2014-08-13 14:09-0400\n"
10+"POT-Creation-Date: 2014-08-21 11:36+0200\n"
11−"PO-Revision-Date: 2014-08-17 20:27+0000\n"
11+"PO-Revision-Date: 2014-08-25 16:51+0000\n"
12"Last-Translator: Ivo Xavier <ivofernandes12@gmail.com>\n"
12"Last-Translator: Ivo Xavier <ivofernandes12@gmail.com>\n"
13"Language-Team: Portuguese <pt@li.org>\n"
13"Language-Team: Portuguese <pt@li.org>\n"
14"MIME-Version: 1.0\n"
14"MIME-Version: 1.0\n"
15"Content-Type: text/plain; charset=UTF-8\n"
15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n"
16"Content-Transfer-Encoding: 8bit\n"
17−"X-Launchpad-Export-Date: 2014-08-18 07:20+0000\n"
17+"X-Launchpad-Export-Date: 2014-08-26 07:47+0000\n"
18−"X-Generator: Launchpad (build 17156)\n"
18+"X-Generator: Launchpad (build 17163)\n"
19
19
20#: plugins/LightDM/Greeter.cpp:129
20#: plugins/LightDM/Greeter.cpp:129
21msgid "Password: "
21msgid "Password: "
@@ -95,19 +95,19 @@ msgstr ""
95"Já domina os gestos dos limites e pode começar a usar o "
95"Já domina os gestos dos limites e pode começar a usar o "
96"telefone<br><br>Toque no ecrã para começar"
96"telefone<br><br>Toque no ecrã para começar"
97
97
98−#: qml/Components/Lockscreen.qml:161
98+#: qml/Components/Lockscreen.qml:167
99−msgid "Too many incorrect attempts"
100−msgstr "Demasiadas tentativas incorrectas"
101−
102−#: qml/Components/Lockscreen.qml:163
103msgid "Please wait"
99msgid "Please wait"
104msgstr "Por favor aguarde"
100msgstr "Por favor aguarde"
105
101
106−#: qml/Components/Lockscreen.qml:245
102+#: qml/Components/Lockscreen.qml:172
103+msgid "Too many incorrect attempts"
104+msgstr "Demasiadas tentativas incorrectas"
105+
106+#: qml/Components/Lockscreen.qml:206
107msgid "Emergency Call"
107msgid "Emergency Call"
108msgstr "Chamada de emergência"
108msgstr "Chamada de emergência"
109
109
110−#: qml/Components/Lockscreen.qml:268
110+#: qml/Components/Lockscreen.qml:226
111msgid "OK"
111msgid "OK"
112msgstr "OK"
112msgstr "OK"
113
113
@@ -120,23 +120,15 @@ msgstr "Olá %1"
120msgid "Hello"
120msgid "Hello"
121msgstr "Olá"
121msgstr "Olá"
122
122
123−#: qml/Components/PinLockscreen.qml:197
124−msgid "CANCEL"
125−msgstr "CANCELAR"
126−
127−#: qml/Components/PinLockscreen.qml:215
128−msgid "DONE"
129−msgstr "FEITO"
130−
131−#: qml/Dash/GenericScopeView.qml:360
123+#: qml/Dash/GenericScopeView.qml:361
132msgid "See less"
124msgid "See less"
133msgstr "Ver menos"
125msgstr "Ver menos"
134
126
135−#: qml/Dash/GenericScopeView.qml:360
127+#: qml/Dash/GenericScopeView.qml:361
136msgid "See all"
128msgid "See all"
137msgstr "Ver todos"
129msgstr "Ver todos"
138
130
139−#: qml/Dash/GenericScopeView.qml:423 qml/Panel/SearchIndicator.qml:27
131+#: qml/Dash/GenericScopeView.qml:424 qml/Panel/SearchIndicator.qml:27
140msgid "Search"
132msgid "Search"
141msgstr "Procurar"
133msgstr "Procurar"
142
134
@@ -204,13 +196,17 @@ msgstr "Fale agora..."
204msgid "Speaking..."
196msgid "Speaking..."
205msgstr "A falar..."
197msgstr "A falar..."
206
198
207−#: qml/Notifications/NotificationMenuItemFactory.qml:100
199+#: qml/Notifications/NotificationMenuItemFactory.qml:105
208msgid "Show password"
200msgid "Show password"
209msgstr "Mostrar palavra-passe"
201msgstr "Mostrar palavra-passe"
210
202
211−#: qml/Notifications/NotificationMenuItemFactory.qml:115
203+#: qml/Notifications/NotificationMenuItemFactory.qml:120
212−msgid "Please enter SIM PIN"
204+msgid "Enter SIM PIN"
213−msgstr "Por favor insira o PIN"
205+msgstr "Introduza o PIN do SIM"
206+
207+#: qml/Notifications/NotificationMenuItemFactory.qml:121 qml/Shell.qml:270
208+msgid "Sorry, incorrect PIN"
209+msgstr "Desculpe, PIN incorreto"
214
210
215#: qml/Panel/ActiveCallHint.qml:77
211#: qml/Panel/ActiveCallHint.qml:77
216msgid "Tap to return to call..."
212msgid "Tap to return to call..."
@@ -252,41 +248,41 @@ msgstr "Desbloquear SIM"
252msgid "Roaming"
248msgid "Roaming"
253msgstr "Roaming"
249msgstr "Roaming"
254
250
255−#: qml/Shell.qml:267
251+#: qml/Shell.qml:266
256−msgid "passphrase"
252+msgid "Enter your passphrase"
257−msgstr "frase de acesso"
253+msgstr "Introduza a sua frase-senha"
258
254
259#: qml/Shell.qml:267
255#: qml/Shell.qml:267
260−msgid "passcode"
256+msgid "Sorry, incorrect passphrase"
261−msgstr ""
257+msgstr "Desculpe, frase-senha incorreta"
262
258
263#: qml/Shell.qml:269
259#: qml/Shell.qml:269
260+msgid "Enter your PIN"
261+msgstr "Introduza o seu PIN"
262+
263+#: qml/Shell.qml:273
264#, qt-format
264#, qt-format
265msgid "Enter your %1"
265msgid "Enter your %1"
266msgstr "Introduza o seu %1"
266msgstr "Introduza o seu %1"
267
267
268−#: qml/Shell.qml:270
268+#: qml/Shell.qml:274
269#, qt-format
269#, qt-format
270−msgid "Incorrect %1"
270+msgid "Sorry, incorrect %1"
271−msgstr "Incorreto %1"
271+msgstr "Desculpe, incorreto %1"
272−
273−#: qml/Shell.qml:272
274−msgid "Please re-enter"
275−msgstr "Por favor, volte a reintroduzir"
276
272
277−#: qml/Shell.qml:306
273+#: qml/Shell.qml:310
278msgid "Sorry, incorrect passphrase."
274msgid "Sorry, incorrect passphrase."
279msgstr "Desculpe, frase de acesso incorreta."
275msgstr "Desculpe, frase de acesso incorreta."
280
276
281−#: qml/Shell.qml:307
277+#: qml/Shell.qml:311
282msgid "Sorry, incorrect passcode."
278msgid "Sorry, incorrect passcode."
283−msgstr ""
279+msgstr "Desculpe, senha incorreta."
284
280
285−#: qml/Shell.qml:308
281+#: qml/Shell.qml:312
286msgid "This will be your last attempt."
282msgid "This will be your last attempt."
287msgstr "Esta será a sua última tentativa."
283msgstr "Esta será a sua última tentativa."
288
284
289−#: qml/Shell.qml:310
285+#: qml/Shell.qml:314
290msgid ""
286msgid ""
291"If passphrase is entered incorrectly, your phone will conduct a factory "
287"If passphrase is entered incorrectly, your phone will conduct a factory "
292"reset and all personal data will be deleted."
288"reset and all personal data will be deleted."
@@ -294,8 +290,29 @@ msgstr ""
294"Se a frase de acesso for introduzida incorretamente, o seu telemóvel vai "
290"Se a frase de acesso for introduzida incorretamente, o seu telemóvel vai "
295"proceder ao restauro de fábrica e apagará toda a sua informação pessoal."
291"proceder ao restauro de fábrica e apagará toda a sua informação pessoal."
296
292
297−#: qml/Shell.qml:311
293+#: qml/Shell.qml:315
298msgid ""
294msgid ""
299"If passcode is entered incorrectly, your phone will conduct a factory reset "
295"If passcode is entered incorrectly, your phone will conduct a factory reset "
300"and all personal data will be deleted."
296"and all personal data will be deleted."
301msgstr ""
297msgstr ""
298+"Se a senha for introduzida incorretamente, o seu telemóvel vai apagar todos "
299+"os seus dados pessoais."
300+
301+#~ msgid "Please enter SIM PIN"
302+#~ msgstr "Por favor insira o PIN"
303+
304+#~ msgid "CANCEL"
305+#~ msgstr "CANCELAR"
306+
307+#~ msgid "DONE"
308+#~ msgstr "FEITO"
309+
310+#~ msgid "passphrase"
311+#~ msgstr "frase de acesso"
312+
313+#, qt-format
314+#~ msgid "Incorrect %1"
315+#~ msgstr "Incorreto %1"
316+
317+#~ msgid "Please re-enter"
318+#~ msgstr "Por favor, volte a reintroduzir"
po/pt_BR.po+72−50
@@ -7,19 +7,19 @@ msgid ""
7msgstr ""
7msgstr ""
8"Project-Id-Version: unity\n"
8"Project-Id-Version: unity\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2014-08-13 14:09-0400\n"
10+"POT-Creation-Date: 2014-08-21 11:36+0200\n"
11−"PO-Revision-Date: 2014-08-13 04:53+0000\n"
11+"PO-Revision-Date: 2014-08-18 14:14+0000\n"
12−"Last-Translator: Tiago Hillebrandt <tiagohillebrandt@gmail.com>\n"
12+"Last-Translator: Rafael Neri <Unknown>\n"
13"Language-Team: Brazilian Portuguese <pt_BR@li.org>\n"
13"Language-Team: Brazilian Portuguese <pt_BR@li.org>\n"
14"MIME-Version: 1.0\n"
14"MIME-Version: 1.0\n"
15"Content-Type: text/plain; charset=UTF-8\n"
15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n"
16"Content-Transfer-Encoding: 8bit\n"
17−"X-Launchpad-Export-Date: 2014-08-15 06:28+0000\n"
17+"X-Launchpad-Export-Date: 2014-08-23 07:17+0000\n"
18−"X-Generator: Launchpad (build 17156)\n"
18+"X-Generator: Launchpad (build 17163)\n"
19
19
20#: plugins/LightDM/Greeter.cpp:129
20#: plugins/LightDM/Greeter.cpp:129
21msgid "Password: "
21msgid "Password: "
22−msgstr ""
22+msgstr "Senha: "
23
23
24#: plugins/Unity/Launcher/launcheritem.cpp:43
24#: plugins/Unity/Launcher/launcheritem.cpp:43
25#: plugins/Unity/Launcher/launcheritem.cpp:73
25#: plugins/Unity/Launcher/launcheritem.cpp:73
@@ -96,19 +96,19 @@ msgstr ""
96"Agora você já domina os gestos das bordas e pode começar a usar o "
96"Agora você já domina os gestos das bordas e pode começar a usar o "
97"telefone<br><br>Toque na tela para iniciar"
97"telefone<br><br>Toque na tela para iniciar"
98
98
99−#: qml/Components/Lockscreen.qml:161
99+#: qml/Components/Lockscreen.qml:167
100−msgid "Too many incorrect attempts"
101−msgstr ""
102−
103−#: qml/Components/Lockscreen.qml:163
104msgid "Please wait"
100msgid "Please wait"
105−msgstr ""
101+msgstr "Por favor, aguarde"
106
102
107−#: qml/Components/Lockscreen.qml:245
103+#: qml/Components/Lockscreen.qml:172
104+msgid "Too many incorrect attempts"
105+msgstr "Muitas tentativas incorretas"
106+
107+#: qml/Components/Lockscreen.qml:206
108msgid "Emergency Call"
108msgid "Emergency Call"
109msgstr "Chamada de emergência"
109msgstr "Chamada de emergência"
110
110
111−#: qml/Components/Lockscreen.qml:268
111+#: qml/Components/Lockscreen.qml:226
112msgid "OK"
112msgid "OK"
113msgstr "OK"
113msgstr "OK"
114
114
@@ -121,23 +121,15 @@ msgstr "Olá %1"
121msgid "Hello"
121msgid "Hello"
122msgstr "Olá"
122msgstr "Olá"
123
123
124−#: qml/Components/PinLockscreen.qml:197
125−msgid "CANCEL"
126−msgstr "CANCELAR"
127−
128−#: qml/Components/PinLockscreen.qml:215
129−msgid "DONE"
130−msgstr "FEITO"
131−
132−#: qml/Dash/GenericScopeView.qml:360
124+#: qml/Dash/GenericScopeView.qml:361
133msgid "See less"
125msgid "See less"
134msgstr "Ver menos"
126msgstr "Ver menos"
135
127
136−#: qml/Dash/GenericScopeView.qml:360
128+#: qml/Dash/GenericScopeView.qml:361
137msgid "See all"
129msgid "See all"
138msgstr "Ver todos"
130msgstr "Ver todos"
139
131
140−#: qml/Dash/GenericScopeView.qml:423 qml/Panel/SearchIndicator.qml:27
132+#: qml/Dash/GenericScopeView.qml:424 qml/Panel/SearchIndicator.qml:27
141msgid "Search"
133msgid "Search"
142msgstr "Pesquisar"
134msgstr "Pesquisar"
143
135
@@ -163,11 +155,11 @@ msgstr "Enviar"
163
155
164#: qml/Dash/ScopesOverview.qml:201
156#: qml/Dash/ScopesOverview.qml:201
165msgid "Manage Dash"
157msgid "Manage Dash"
166−msgstr ""
158+msgstr "Gerencia painel"
167
159
168#: qml/Dash/ScopesOverview.qml:408
160#: qml/Dash/ScopesOverview.qml:408
169msgid "Done"
161msgid "Done"
170−msgstr ""
162+msgstr "Concluído"
171
163
172#: qml/Dash/ScopesOverview.qml:434
164#: qml/Dash/ScopesOverview.qml:434
173msgid "Store"
165msgid "Store"
@@ -179,7 +171,7 @@ msgstr "Favoritos"
179
171
180#: qml/Dash/ScopesOverviewTab.qml:54
172#: qml/Dash/ScopesOverviewTab.qml:54
181msgid "All"
173msgid "All"
182−msgstr ""
174+msgstr "Tudo"
183
175
184#: qml/Greeter/Greeter.qml:157
176#: qml/Greeter/Greeter.qml:157
185msgid "Swipe to unlock"
177msgid "Swipe to unlock"
@@ -205,13 +197,17 @@ msgstr "Fale agora..."
205msgid "Speaking..."
197msgid "Speaking..."
206msgstr "Falando..."
198msgstr "Falando..."
207
199
208−#: qml/Notifications/NotificationMenuItemFactory.qml:100
200+#: qml/Notifications/NotificationMenuItemFactory.qml:105
209msgid "Show password"
201msgid "Show password"
210msgstr "Exibir senha"
202msgstr "Exibir senha"
211
203
212−#: qml/Notifications/NotificationMenuItemFactory.qml:115
204+#: qml/Notifications/NotificationMenuItemFactory.qml:120
213−msgid "Please enter SIM PIN"
205+msgid "Enter SIM PIN"
214−msgstr "Por favor, digite o PIN do cartão SIM"
206+msgstr ""
207+
208+#: qml/Notifications/NotificationMenuItemFactory.qml:121 qml/Shell.qml:270
209+msgid "Sorry, incorrect PIN"
210+msgstr ""
215
211
216#: qml/Panel/ActiveCallHint.qml:77
212#: qml/Panel/ActiveCallHint.qml:77
217msgid "Tap to return to call..."
213msgid "Tap to return to call..."
@@ -253,48 +249,74 @@ msgstr "Desbloquear SIM"
253msgid "Roaming"
249msgid "Roaming"
254msgstr "Roaming"
250msgstr "Roaming"
255
251
256−#: qml/Shell.qml:267
252+#: qml/Shell.qml:266
257−msgid "passphrase"
253+msgid "Enter your passphrase"
258msgstr ""
254msgstr ""
259
255
260#: qml/Shell.qml:267
256#: qml/Shell.qml:267
261−msgid "passcode"
257+msgid "Sorry, incorrect passphrase"
262msgstr ""
258msgstr ""
263
259
264#: qml/Shell.qml:269
260#: qml/Shell.qml:269
265−#, qt-format
266−msgid "Enter your %1"
261+msgid "Enter your PIN"
267msgstr ""
262msgstr ""
268
263
269−#: qml/Shell.qml:270
264+#: qml/Shell.qml:273
270#, qt-format
265#, qt-format
271−msgid "Incorrect %1"
266+msgid "Enter your %1"
272−msgstr ""
267+msgstr "Digite o seu %1"
273
268
274−#: qml/Shell.qml:272
269+#: qml/Shell.qml:274
275−msgid "Please re-enter"
270+#, qt-format
271+msgid "Sorry, incorrect %1"
276msgstr ""
272msgstr ""
277
273
278−#: qml/Shell.qml:306
274+#: qml/Shell.qml:310
279msgid "Sorry, incorrect passphrase."
275msgid "Sorry, incorrect passphrase."
280−msgstr ""
276+msgstr "Desculpe, senha incorreta."
281
277
282−#: qml/Shell.qml:307
278+#: qml/Shell.qml:311
283msgid "Sorry, incorrect passcode."
279msgid "Sorry, incorrect passcode."
284−msgstr ""
280+msgstr "Desculpe, código de acesso incorreto."
285
281
286−#: qml/Shell.qml:308
282+#: qml/Shell.qml:312
287msgid "This will be your last attempt."
283msgid "This will be your last attempt."
288−msgstr ""
284+msgstr "Esta será a sua última tentativa."
289
285
290−#: qml/Shell.qml:310
286+#: qml/Shell.qml:314
291msgid ""
287msgid ""
292"If passphrase is entered incorrectly, your phone will conduct a factory "
288"If passphrase is entered incorrectly, your phone will conduct a factory "
293"reset and all personal data will be deleted."
289"reset and all personal data will be deleted."
294msgstr ""
290msgstr ""
291+"Se a senha for digitada incorretamente, o telefone será restaurado aos "
292+"padrões de fábrica e todos os dados pessoais serão apagados."
295
293
296−#: qml/Shell.qml:311
294+#: qml/Shell.qml:315
297msgid ""
295msgid ""
298"If passcode is entered incorrectly, your phone will conduct a factory reset "
296"If passcode is entered incorrectly, your phone will conduct a factory reset "
299"and all personal data will be deleted."
297"and all personal data will be deleted."
300msgstr ""
298msgstr ""
299+"Se o código de acesso for digitado incorretamente, o telefone será "
300+"restaurado aos padrões de fábrica e todos os dados pessoais serão apagados."
301+
302+#~ msgid "Please enter SIM PIN"
303+#~ msgstr "Por favor, digite o PIN do cartão SIM"
304+
305+#~ msgid "CANCEL"
306+#~ msgstr "CANCELAR"
307+
308+#~ msgid "DONE"
309+#~ msgstr "FEITO"
310+
311+#~ msgid "passcode"
312+#~ msgstr "código de acesso"
313+
314+#~ msgid "passphrase"
315+#~ msgstr "senha"
316+
317+#, qt-format
318+#~ msgid "Incorrect %1"
319+#~ msgstr "%1 incorreto"
320+
321+#~ msgid "Please re-enter"
322+#~ msgstr "Por favor, digite novamente"
po/ro.po+60−42
@@ -7,15 +7,15 @@ msgid ""
7msgstr ""
7msgstr ""
8"Project-Id-Version: unity\n"
8"Project-Id-Version: unity\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2014-08-13 14:09-0400\n"
10+"POT-Creation-Date: 2014-08-21 11:36+0200\n"
11"PO-Revision-Date: 2014-08-14 19:34+0000\n"
11"PO-Revision-Date: 2014-08-14 19:34+0000\n"
12"Last-Translator: Marian Vasile <marianvasile1972@gmail.com>\n"
12"Last-Translator: Marian Vasile <marianvasile1972@gmail.com>\n"
13"Language-Team: Romanian <ro@li.org>\n"
13"Language-Team: Romanian <ro@li.org>\n"
14"MIME-Version: 1.0\n"
14"MIME-Version: 1.0\n"
15"Content-Type: text/plain; charset=UTF-8\n"
15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n"
16"Content-Transfer-Encoding: 8bit\n"
17−"X-Launchpad-Export-Date: 2014-08-15 06:28+0000\n"
17+"X-Launchpad-Export-Date: 2014-08-23 07:17+0000\n"
18−"X-Generator: Launchpad (build 17156)\n"
18+"X-Generator: Launchpad (build 17163)\n"
19
19
20#: plugins/LightDM/Greeter.cpp:129
20#: plugins/LightDM/Greeter.cpp:129
21msgid "Password: "
21msgid "Password: "
@@ -97,19 +97,19 @@ msgstr ""
97"De acum stăpâniți gesturile de control și puteți începe să utilizați "
97"De acum stăpâniți gesturile de control și puteți începe să utilizați "
98"telefonul<br><br>Atingeți ecranul pentru a începe"
98"telefonul<br><br>Atingeți ecranul pentru a începe"
99
99
100−#: qml/Components/Lockscreen.qml:161
100+#: qml/Components/Lockscreen.qml:167
101−msgid "Too many incorrect attempts"
102−msgstr "Prea multe încercări greșite"
103−
104−#: qml/Components/Lockscreen.qml:163
105msgid "Please wait"
101msgid "Please wait"
106msgstr "Așteptați"
102msgstr "Așteptați"
107
103
108−#: qml/Components/Lockscreen.qml:245
104+#: qml/Components/Lockscreen.qml:172
105+msgid "Too many incorrect attempts"
106+msgstr "Prea multe încercări greșite"
107+
108+#: qml/Components/Lockscreen.qml:206
109msgid "Emergency Call"
109msgid "Emergency Call"
110msgstr "Apel de urgență"
110msgstr "Apel de urgență"
111
111
112−#: qml/Components/Lockscreen.qml:268
112+#: qml/Components/Lockscreen.qml:226
113msgid "OK"
113msgid "OK"
114msgstr "În regulă"
114msgstr "În regulă"
115
115
@@ -122,23 +122,15 @@ msgstr "Salutări %1"
122msgid "Hello"
122msgid "Hello"
123msgstr "Salutări"
123msgstr "Salutări"
124
124
125−#: qml/Components/PinLockscreen.qml:197
126−msgid "CANCEL"
127−msgstr "ANULEAZĂ"
128−
129−#: qml/Components/PinLockscreen.qml:215
130−msgid "DONE"
131−msgstr "EFECTUAT"
132−
133−#: qml/Dash/GenericScopeView.qml:360
125+#: qml/Dash/GenericScopeView.qml:361
134msgid "See less"
126msgid "See less"
135msgstr "Afișează mai puține"
127msgstr "Afișează mai puține"
136
128
137−#: qml/Dash/GenericScopeView.qml:360
129+#: qml/Dash/GenericScopeView.qml:361
138msgid "See all"
130msgid "See all"
139msgstr "Afișează tot"
131msgstr "Afișează tot"
140
132
141−#: qml/Dash/GenericScopeView.qml:423 qml/Panel/SearchIndicator.qml:27
133+#: qml/Dash/GenericScopeView.qml:424 qml/Panel/SearchIndicator.qml:27
142msgid "Search"
134msgid "Search"
143msgstr "Căutare"
135msgstr "Căutare"
144
136
@@ -206,13 +198,17 @@ msgstr "Vorbiți acum..."
206msgid "Speaking..."
198msgid "Speaking..."
207msgstr "Vorbire..."
199msgstr "Vorbire..."
208
200
209−#: qml/Notifications/NotificationMenuItemFactory.qml:100
201+#: qml/Notifications/NotificationMenuItemFactory.qml:105
210msgid "Show password"
202msgid "Show password"
211msgstr "Arată parola"
203msgstr "Arată parola"
212
204
213−#: qml/Notifications/NotificationMenuItemFactory.qml:115
205+#: qml/Notifications/NotificationMenuItemFactory.qml:120
214−msgid "Please enter SIM PIN"
206+msgid "Enter SIM PIN"
215−msgstr "Introduceți PIN pentru SIM"
207+msgstr ""
208+
209+#: qml/Notifications/NotificationMenuItemFactory.qml:121 qml/Shell.qml:270
210+msgid "Sorry, incorrect PIN"
211+msgstr ""
216
212
217#: qml/Panel/ActiveCallHint.qml:77
213#: qml/Panel/ActiveCallHint.qml:77
218msgid "Tap to return to call..."
214msgid "Tap to return to call..."
@@ -254,41 +250,41 @@ msgstr "Deblocare SIM"
254msgid "Roaming"
250msgid "Roaming"
255msgstr "Roaming"
251msgstr "Roaming"
256
252
257−#: qml/Shell.qml:267
253+#: qml/Shell.qml:266
258−msgid "passphrase"
254+msgid "Enter your passphrase"
259−msgstr "frază parolă"
255+msgstr ""
260
256
261#: qml/Shell.qml:267
257#: qml/Shell.qml:267
262−msgid "passcode"
258+msgid "Sorry, incorrect passphrase"
263−msgstr "parolă"
259+msgstr ""
264
260
265#: qml/Shell.qml:269
261#: qml/Shell.qml:269
262+msgid "Enter your PIN"
263+msgstr ""
264+
265+#: qml/Shell.qml:273
266#, qt-format
266#, qt-format
267msgid "Enter your %1"
267msgid "Enter your %1"
268msgstr "Introduceți %1"
268msgstr "Introduceți %1"
269
269
270−#: qml/Shell.qml:270
270+#: qml/Shell.qml:274
271#, qt-format
271#, qt-format
272−msgid "Incorrect %1"
272+msgid "Sorry, incorrect %1"
273−msgstr "%1 greșit"
273+msgstr ""
274−
275−#: qml/Shell.qml:272
276−msgid "Please re-enter"
277−msgstr "Vă rugăm să încercați din nou"
278
274
279−#: qml/Shell.qml:306
275+#: qml/Shell.qml:310
280msgid "Sorry, incorrect passphrase."
276msgid "Sorry, incorrect passphrase."
281msgstr "Frază parolă greșită"
277msgstr "Frază parolă greșită"
282
278
283−#: qml/Shell.qml:307
279+#: qml/Shell.qml:311
284msgid "Sorry, incorrect passcode."
280msgid "Sorry, incorrect passcode."
285msgstr "Parolă greșită"
281msgstr "Parolă greșită"
286
282
287−#: qml/Shell.qml:308
283+#: qml/Shell.qml:312
288msgid "This will be your last attempt."
284msgid "This will be your last attempt."
289msgstr "Aceasta va fi ultima încercare"
285msgstr "Aceasta va fi ultima încercare"
290
286
291−#: qml/Shell.qml:310
287+#: qml/Shell.qml:314
292msgid ""
288msgid ""
293"If passphrase is entered incorrectly, your phone will conduct a factory "
289"If passphrase is entered incorrectly, your phone will conduct a factory "
294"reset and all personal data will be deleted."
290"reset and all personal data will be deleted."
@@ -297,7 +293,7 @@ msgstr ""
297"configurările inițiale, ale fabricantului, iar toate datele personale vor fi "
293"configurările inițiale, ale fabricantului, iar toate datele personale vor fi "
298"șterse."
294"șterse."
299
295
300−#: qml/Shell.qml:311
296+#: qml/Shell.qml:315
301msgid ""
297msgid ""
302"If passcode is entered incorrectly, your phone will conduct a factory reset "
298"If passcode is entered incorrectly, your phone will conduct a factory reset "
303"and all personal data will be deleted."
299"and all personal data will be deleted."
@@ -305,3 +301,25 @@ msgstr ""
305"Dacă parola este introdusă greșit, telefonul va iniția o resetare la "
301"Dacă parola este introdusă greșit, telefonul va iniția o resetare la "
306"configurările inițiale, ale fabricantului, iar toate datele personale vor fi "
302"configurările inițiale, ale fabricantului, iar toate datele personale vor fi "
307"șterse."
303"șterse."
304+
305+#~ msgid "CANCEL"
306+#~ msgstr "ANULEAZĂ"
307+
308+#~ msgid "DONE"
309+#~ msgstr "EFECTUAT"
310+
311+#~ msgid "Please enter SIM PIN"
312+#~ msgstr "Introduceți PIN pentru SIM"
313+
314+#~ msgid "passphrase"
315+#~ msgstr "frază parolă"
316+
317+#, qt-format
318+#~ msgid "Incorrect %1"
319+#~ msgstr "%1 greșit"
320+
321+#~ msgid "Please re-enter"
322+#~ msgstr "Vă rugăm să încercați din nou"
323+
324+#~ msgid "passcode"
325+#~ msgstr "parolă"
po/ru.po+77−55
@@ -7,19 +7,19 @@ msgid ""
7msgstr ""
7msgstr ""
8"Project-Id-Version: unity\n"
8"Project-Id-Version: unity\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2014-08-13 14:09-0400\n"
10+"POT-Creation-Date: 2014-08-21 11:36+0200\n"
11−"PO-Revision-Date: 2014-07-31 09:39+0000\n"
11+"PO-Revision-Date: 2014-08-20 12:41+0000\n"
12"Last-Translator: Jay ZDLin <Unknown>\n"
12"Last-Translator: Jay ZDLin <Unknown>\n"
13"Language-Team: Russian <ru@li.org>\n"
13"Language-Team: Russian <ru@li.org>\n"
14"MIME-Version: 1.0\n"
14"MIME-Version: 1.0\n"
15"Content-Type: text/plain; charset=UTF-8\n"
15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n"
16"Content-Transfer-Encoding: 8bit\n"
17−"X-Launchpad-Export-Date: 2014-08-15 06:28+0000\n"
17+"X-Launchpad-Export-Date: 2014-08-23 07:17+0000\n"
18−"X-Generator: Launchpad (build 17156)\n"
18+"X-Generator: Launchpad (build 17163)\n"
19
19
20#: plugins/LightDM/Greeter.cpp:129
20#: plugins/LightDM/Greeter.cpp:129
21msgid "Password: "
21msgid "Password: "
22−msgstr ""
22+msgstr "Пароль: "
23
23
24#: plugins/Unity/Launcher/launcheritem.cpp:43
24#: plugins/Unity/Launcher/launcheritem.cpp:43
25#: plugins/Unity/Launcher/launcheritem.cpp:73
25#: plugins/Unity/Launcher/launcheritem.cpp:73
@@ -32,19 +32,19 @@ msgstr "Изъять ярлык"
32
32
33#: qml/Components/Dialogs.qml:142
33#: qml/Components/Dialogs.qml:142
34msgid "Are you sure you would like to turn power off?"
34msgid "Are you sure you would like to turn power off?"
35−msgstr ""
35+msgstr "Отключить питание?"
36
36
37#: qml/Components/Dialogs.qml:144
37#: qml/Components/Dialogs.qml:144
38msgid "Power off"
38msgid "Power off"
39−msgstr ""
39+msgstr "Отключить"
40
40
41#: qml/Components/Dialogs.qml:153
41#: qml/Components/Dialogs.qml:153
42msgid "Restart"
42msgid "Restart"
43−msgstr ""
43+msgstr "Перезапустить"
44
44
45#: qml/Components/Dialogs.qml:162
45#: qml/Components/Dialogs.qml:162
46msgid "Cancel"
46msgid "Cancel"
47−msgstr ""
47+msgstr "Отменить"
48
48
49#: qml/Components/EdgeDemoOverlay.qml:151
49#: qml/Components/EdgeDemoOverlay.qml:151
50msgid "Skip intro"
50msgid "Skip intro"
@@ -99,19 +99,19 @@ msgstr ""
99"Вы научились пользоваться Ubuntu и можете начать использовать свой "
99"Вы научились пользоваться Ubuntu и можете начать использовать свой "
100"телефон<br><br>Нажмите на экран"
100"телефон<br><br>Нажмите на экран"
101
101
102−#: qml/Components/Lockscreen.qml:161
102+#: qml/Components/Lockscreen.qml:167
103−msgid "Too many incorrect attempts"
104−msgstr ""
105−
106−#: qml/Components/Lockscreen.qml:163
107msgid "Please wait"
103msgid "Please wait"
108−msgstr ""
104+msgstr "Подождите"
105+
106+#: qml/Components/Lockscreen.qml:172
107+msgid "Too many incorrect attempts"
108+msgstr "Слишком много ошибок ввода"
109
109
110−#: qml/Components/Lockscreen.qml:245
110+#: qml/Components/Lockscreen.qml:206
111msgid "Emergency Call"
111msgid "Emergency Call"
112msgstr "Экстренный вызов"
112msgstr "Экстренный вызов"
113
113
114−#: qml/Components/Lockscreen.qml:268
114+#: qml/Components/Lockscreen.qml:226
115msgid "OK"
115msgid "OK"
116msgstr "ОК"
116msgstr "ОК"
117
117
@@ -124,23 +124,15 @@ msgstr "Привет, %1"
124msgid "Hello"
124msgid "Hello"
125msgstr "Привет"
125msgstr "Привет"
126
126
127−#: qml/Components/PinLockscreen.qml:197
128−msgid "CANCEL"
129−msgstr "ОТМЕНИТЬ"
130−
131−#: qml/Components/PinLockscreen.qml:215
132−msgid "DONE"
133−msgstr "ГОТОВО"
134−
135−#: qml/Dash/GenericScopeView.qml:360
127+#: qml/Dash/GenericScopeView.qml:361
136msgid "See less"
128msgid "See less"
137msgstr "Вкратце"
129msgstr "Вкратце"
138
130
139−#: qml/Dash/GenericScopeView.qml:360
131+#: qml/Dash/GenericScopeView.qml:361
140msgid "See all"
132msgid "See all"
141msgstr "Показать всё"
133msgstr "Показать всё"
142
134
143−#: qml/Dash/GenericScopeView.qml:423 qml/Panel/SearchIndicator.qml:27
135+#: qml/Dash/GenericScopeView.qml:424 qml/Panel/SearchIndicator.qml:27
144msgid "Search"
136msgid "Search"
145msgstr "Поиск"
137msgstr "Поиск"
146
138
@@ -170,7 +162,7 @@ msgstr ""
170
162
171#: qml/Dash/ScopesOverview.qml:408
163#: qml/Dash/ScopesOverview.qml:408
172msgid "Done"
164msgid "Done"
173−msgstr ""
165+msgstr "Готово"
174
166
175#: qml/Dash/ScopesOverview.qml:434
167#: qml/Dash/ScopesOverview.qml:434
176msgid "Store"
168msgid "Store"
@@ -178,11 +170,11 @@ msgstr ""
178
170
179#: qml/Dash/ScopesOverviewTab.qml:36
171#: qml/Dash/ScopesOverviewTab.qml:36
180msgid "Favorites"
172msgid "Favorites"
181−msgstr ""
173+msgstr "Избранное"
182
174
183#: qml/Dash/ScopesOverviewTab.qml:54
175#: qml/Dash/ScopesOverviewTab.qml:54
184msgid "All"
176msgid "All"
185−msgstr ""
177+msgstr "Все"
186
178
187#: qml/Greeter/Greeter.qml:157
179#: qml/Greeter/Greeter.qml:157
188msgid "Swipe to unlock"
180msgid "Swipe to unlock"
@@ -208,13 +200,17 @@ msgstr "Говорите..."
208msgid "Speaking..."
200msgid "Speaking..."
209msgstr "Говорите..."
201msgstr "Говорите..."
210
202
211−#: qml/Notifications/NotificationMenuItemFactory.qml:100
203+#: qml/Notifications/NotificationMenuItemFactory.qml:105
212msgid "Show password"
204msgid "Show password"
213msgstr "Показать пароль"
205msgstr "Показать пароль"
214
206
215−#: qml/Notifications/NotificationMenuItemFactory.qml:115
207+#: qml/Notifications/NotificationMenuItemFactory.qml:120
216−msgid "Please enter SIM PIN"
208+msgid "Enter SIM PIN"
217−msgstr "Введите PIN код"
209+msgstr ""
210+
211+#: qml/Notifications/NotificationMenuItemFactory.qml:121 qml/Shell.qml:270
212+msgid "Sorry, incorrect PIN"
213+msgstr ""
218
214
219#: qml/Panel/ActiveCallHint.qml:77
215#: qml/Panel/ActiveCallHint.qml:77
220msgid "Tap to return to call..."
216msgid "Tap to return to call..."
@@ -250,54 +246,80 @@ msgstr "Сбой, коснитесь для повтора"
250
246
251#: qml/Panel/Indicators/ModemInfoItem.qml:105
247#: qml/Panel/Indicators/ModemInfoItem.qml:105
252msgid "Unlock SIM"
248msgid "Unlock SIM"
253−msgstr ""
249+msgstr "Разблокировать SIM-карту"
254
250
255#: qml/Panel/Indicators/RoamingIndication.qml:27
251#: qml/Panel/Indicators/RoamingIndication.qml:27
256msgid "Roaming"
252msgid "Roaming"
257−msgstr ""
253+msgstr "Роуминг"
258
254
259−#: qml/Shell.qml:267
255+#: qml/Shell.qml:266
260−msgid "passphrase"
256+msgid "Enter your passphrase"
261msgstr ""
257msgstr ""
262
258
263#: qml/Shell.qml:267
259#: qml/Shell.qml:267
264−msgid "passcode"
260+msgid "Sorry, incorrect passphrase"
265msgstr ""
261msgstr ""
266
262
267#: qml/Shell.qml:269
263#: qml/Shell.qml:269
268−#, qt-format
269−msgid "Enter your %1"
264+msgid "Enter your PIN"
270msgstr ""
265msgstr ""
271
266
272−#: qml/Shell.qml:270
267+#: qml/Shell.qml:273
273#, qt-format
268#, qt-format
274−msgid "Incorrect %1"
269+msgid "Enter your %1"
275−msgstr ""
270+msgstr "Введите %1"
276
271
277−#: qml/Shell.qml:272
272+#: qml/Shell.qml:274
278−msgid "Please re-enter"
273+#, qt-format
274+msgid "Sorry, incorrect %1"
279msgstr ""
275msgstr ""
280
276
281−#: qml/Shell.qml:306
277+#: qml/Shell.qml:310
282msgid "Sorry, incorrect passphrase."
278msgid "Sorry, incorrect passphrase."
283−msgstr ""
279+msgstr "Неверная ключевая фраза."
284
280
285−#: qml/Shell.qml:307
281+#: qml/Shell.qml:311
286msgid "Sorry, incorrect passcode."
282msgid "Sorry, incorrect passcode."
287−msgstr ""
283+msgstr "Неверный секретный код."
288
284
289−#: qml/Shell.qml:308
285+#: qml/Shell.qml:312
290msgid "This will be your last attempt."
286msgid "This will be your last attempt."
291−msgstr ""
287+msgstr "Осталась последняя попытка."
292
288
293−#: qml/Shell.qml:310
289+#: qml/Shell.qml:314
294msgid ""
290msgid ""
295"If passphrase is entered incorrectly, your phone will conduct a factory "
291"If passphrase is entered incorrectly, your phone will conduct a factory "
296"reset and all personal data will be deleted."
292"reset and all personal data will be deleted."
297msgstr ""
293msgstr ""
294+"Если ключевая фраза будет введена неверно, то телефон вернётся к заводским "
295+"настройкам, а все личные данные будут удалены."
298
296
299−#: qml/Shell.qml:311
297+#: qml/Shell.qml:315
300msgid ""
298msgid ""
301"If passcode is entered incorrectly, your phone will conduct a factory reset "
299"If passcode is entered incorrectly, your phone will conduct a factory reset "
302"and all personal data will be deleted."
300"and all personal data will be deleted."
303msgstr ""
301msgstr ""
302+"Если секретный код будет введен неверно, то телефон вернётся к заводским "
303+"настройкам, а все личные данные будут удалены."
304+
305+#~ msgid "Please enter SIM PIN"
306+#~ msgstr "Введите PIN код"
307+
308+#~ msgid "CANCEL"
309+#~ msgstr "ОТМЕНИТЬ"
310+
311+#~ msgid "DONE"
312+#~ msgstr "ГОТОВО"
313+
314+#~ msgid "passphrase"
315+#~ msgstr "ключевая фраза"
316+
317+#~ msgid "passcode"
318+#~ msgstr "секретный код"
319+
320+#~ msgid "Please re-enter"
321+#~ msgstr "Повторите ввод"
322+
323+#, qt-format
324+#~ msgid "Incorrect %1"
325+#~ msgstr "Некорректно введён %1"
po/shn.po+33−37
@@ -7,15 +7,15 @@ msgid ""
7msgstr ""
7msgstr ""
8"Project-Id-Version: unity8\n"
8"Project-Id-Version: unity8\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2014-08-13 14:09-0400\n"
10+"POT-Creation-Date: 2014-08-21 11:36+0200\n"
11"PO-Revision-Date: 2013-10-07 11:46+0000\n"
11"PO-Revision-Date: 2013-10-07 11:46+0000\n"
12"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
12"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
13"Language-Team: Shan <shn@li.org>\n"
13"Language-Team: Shan <shn@li.org>\n"
14"MIME-Version: 1.0\n"
14"MIME-Version: 1.0\n"
15"Content-Type: text/plain; charset=UTF-8\n"
15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n"
16"Content-Transfer-Encoding: 8bit\n"
17−"X-Launchpad-Export-Date: 2014-08-15 06:28+0000\n"
17+"X-Launchpad-Export-Date: 2014-08-23 07:17+0000\n"
18−"X-Generator: Launchpad (build 17156)\n"
18+"X-Generator: Launchpad (build 17163)\n"
19
19
20#: plugins/LightDM/Greeter.cpp:129
20#: plugins/LightDM/Greeter.cpp:129
21msgid "Password: "
21msgid "Password: "
@@ -92,19 +92,19 @@ msgid ""
92"phone<br><br>Tap on the screen to start"
92"phone<br><br>Tap on the screen to start"
93msgstr ""
93msgstr ""
94
94
95−#: qml/Components/Lockscreen.qml:161
95+#: qml/Components/Lockscreen.qml:167
96−msgid "Too many incorrect attempts"
96+msgid "Please wait"
97msgstr ""
97msgstr ""
98
98
99−#: qml/Components/Lockscreen.qml:163
99+#: qml/Components/Lockscreen.qml:172
100−msgid "Please wait"
100+msgid "Too many incorrect attempts"
101msgstr ""
101msgstr ""
102
102
103−#: qml/Components/Lockscreen.qml:245
103+#: qml/Components/Lockscreen.qml:206
104msgid "Emergency Call"
104msgid "Emergency Call"
105msgstr ""
105msgstr ""
106
106
107−#: qml/Components/Lockscreen.qml:268
107+#: qml/Components/Lockscreen.qml:226
108msgid "OK"
108msgid "OK"
109msgstr ""
109msgstr ""
110
110
@@ -117,23 +117,15 @@ msgstr ""
117msgid "Hello"
117msgid "Hello"
118msgstr ""
118msgstr ""
119
119
120−#: qml/Components/PinLockscreen.qml:197
121−msgid "CANCEL"
122−msgstr ""
123−
124−#: qml/Components/PinLockscreen.qml:215
125−msgid "DONE"
126−msgstr ""
127−
128−#: qml/Dash/GenericScopeView.qml:360
120+#: qml/Dash/GenericScopeView.qml:361
129msgid "See less"
121msgid "See less"
130msgstr ""
122msgstr ""
131
123
132−#: qml/Dash/GenericScopeView.qml:360
124+#: qml/Dash/GenericScopeView.qml:361
133msgid "See all"
125msgid "See all"
134msgstr ""
126msgstr ""
135
127
136−#: qml/Dash/GenericScopeView.qml:423 qml/Panel/SearchIndicator.qml:27
128+#: qml/Dash/GenericScopeView.qml:424 qml/Panel/SearchIndicator.qml:27
137msgid "Search"
129msgid "Search"
138msgstr ""
130msgstr ""
139
131
@@ -201,12 +193,16 @@ msgstr ""
201msgid "Speaking..."
193msgid "Speaking..."
202msgstr ""
194msgstr ""
203
195
204−#: qml/Notifications/NotificationMenuItemFactory.qml:100
196+#: qml/Notifications/NotificationMenuItemFactory.qml:105
205msgid "Show password"
197msgid "Show password"
206msgstr ""
198msgstr ""
207
199
208−#: qml/Notifications/NotificationMenuItemFactory.qml:115
200+#: qml/Notifications/NotificationMenuItemFactory.qml:120
209−msgid "Please enter SIM PIN"
201+msgid "Enter SIM PIN"
202+msgstr ""
203+
204+#: qml/Notifications/NotificationMenuItemFactory.qml:121 qml/Shell.qml:270
205+msgid "Sorry, incorrect PIN"
210msgstr ""
206msgstr ""
211
207
212#: qml/Panel/ActiveCallHint.qml:77
208#: qml/Panel/ActiveCallHint.qml:77
@@ -249,47 +245,47 @@ msgstr ""
249msgid "Roaming"
245msgid "Roaming"
250msgstr ""
246msgstr ""
251
247
252−#: qml/Shell.qml:267
248+#: qml/Shell.qml:266
253−msgid "passphrase"
249+msgid "Enter your passphrase"
254msgstr ""
250msgstr ""
255
251
256#: qml/Shell.qml:267
252#: qml/Shell.qml:267
257−msgid "passcode"
253+msgid "Sorry, incorrect passphrase"
258msgstr ""
254msgstr ""
259
255
260#: qml/Shell.qml:269
256#: qml/Shell.qml:269
261−#, qt-format
262−msgid "Enter your %1"
257+msgid "Enter your PIN"
263msgstr ""
258msgstr ""
264
259
265−#: qml/Shell.qml:270
260+#: qml/Shell.qml:273
266#, qt-format
261#, qt-format
267−msgid "Incorrect %1"
262+msgid "Enter your %1"
268msgstr ""
263msgstr ""
269
264
270−#: qml/Shell.qml:272
265+#: qml/Shell.qml:274
271−msgid "Please re-enter"
266+#, qt-format
267+msgid "Sorry, incorrect %1"
272msgstr ""
268msgstr ""
273
269
274−#: qml/Shell.qml:306
270+#: qml/Shell.qml:310
275msgid "Sorry, incorrect passphrase."
271msgid "Sorry, incorrect passphrase."
276msgstr ""
272msgstr ""
277
273
278−#: qml/Shell.qml:307
274+#: qml/Shell.qml:311
279msgid "Sorry, incorrect passcode."
275msgid "Sorry, incorrect passcode."
280msgstr ""
276msgstr ""
281
277
282−#: qml/Shell.qml:308
278+#: qml/Shell.qml:312
283msgid "This will be your last attempt."
279msgid "This will be your last attempt."
284msgstr ""
280msgstr ""
285
281
286−#: qml/Shell.qml:310
282+#: qml/Shell.qml:314
287msgid ""
283msgid ""
288"If passphrase is entered incorrectly, your phone will conduct a factory "
284"If passphrase is entered incorrectly, your phone will conduct a factory "
289"reset and all personal data will be deleted."
285"reset and all personal data will be deleted."
290msgstr ""
286msgstr ""
291
287
292−#: qml/Shell.qml:311
288+#: qml/Shell.qml:315
293msgid ""
289msgid ""
294"If passcode is entered incorrectly, your phone will conduct a factory reset "
290"If passcode is entered incorrectly, your phone will conduct a factory reset "
295"and all personal data will be deleted."
291"and all personal data will be deleted."
po/si.po+33−37
@@ -7,15 +7,15 @@ msgid ""
7msgstr ""
7msgstr ""
8"Project-Id-Version: unity\n"
8"Project-Id-Version: unity\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2014-08-13 14:09-0400\n"
10+"POT-Creation-Date: 2014-08-21 11:36+0200\n"
11"PO-Revision-Date: 2013-06-26 22:36+0000\n"
11"PO-Revision-Date: 2013-06-26 22:36+0000\n"
12"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
12"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
13"Language-Team: Sinhalese <si@li.org>\n"
13"Language-Team: Sinhalese <si@li.org>\n"
14"MIME-Version: 1.0\n"
14"MIME-Version: 1.0\n"
15"Content-Type: text/plain; charset=UTF-8\n"
15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n"
16"Content-Transfer-Encoding: 8bit\n"
17−"X-Launchpad-Export-Date: 2014-08-15 06:28+0000\n"
17+"X-Launchpad-Export-Date: 2014-08-23 07:17+0000\n"
18−"X-Generator: Launchpad (build 17156)\n"
18+"X-Generator: Launchpad (build 17163)\n"
19
19
20#: plugins/LightDM/Greeter.cpp:129
20#: plugins/LightDM/Greeter.cpp:129
21msgid "Password: "
21msgid "Password: "
@@ -92,19 +92,19 @@ msgid ""
92"phone<br><br>Tap on the screen to start"
92"phone<br><br>Tap on the screen to start"
93msgstr ""
93msgstr ""
94
94
95−#: qml/Components/Lockscreen.qml:161
95+#: qml/Components/Lockscreen.qml:167
96−msgid "Too many incorrect attempts"
96+msgid "Please wait"
97msgstr ""
97msgstr ""
98
98
99−#: qml/Components/Lockscreen.qml:163
99+#: qml/Components/Lockscreen.qml:172
100−msgid "Please wait"
100+msgid "Too many incorrect attempts"
101msgstr ""
101msgstr ""
102
102
103−#: qml/Components/Lockscreen.qml:245
103+#: qml/Components/Lockscreen.qml:206
104msgid "Emergency Call"
104msgid "Emergency Call"
105msgstr ""
105msgstr ""
106
106
107−#: qml/Components/Lockscreen.qml:268
107+#: qml/Components/Lockscreen.qml:226
108msgid "OK"
108msgid "OK"
109msgstr ""
109msgstr ""
110
110
@@ -117,23 +117,15 @@ msgstr ""
117msgid "Hello"
117msgid "Hello"
118msgstr ""
118msgstr ""
119
119
120−#: qml/Components/PinLockscreen.qml:197
121−msgid "CANCEL"
122−msgstr ""
123−
124−#: qml/Components/PinLockscreen.qml:215
125−msgid "DONE"
126−msgstr ""
127−
128−#: qml/Dash/GenericScopeView.qml:360
120+#: qml/Dash/GenericScopeView.qml:361
129msgid "See less"
121msgid "See less"
130msgstr ""
122msgstr ""
131
123
132−#: qml/Dash/GenericScopeView.qml:360
124+#: qml/Dash/GenericScopeView.qml:361
133msgid "See all"
125msgid "See all"
134msgstr ""
126msgstr ""
135
127
136−#: qml/Dash/GenericScopeView.qml:423 qml/Panel/SearchIndicator.qml:27
128+#: qml/Dash/GenericScopeView.qml:424 qml/Panel/SearchIndicator.qml:27
137msgid "Search"
129msgid "Search"
138msgstr ""
130msgstr ""
139
131
@@ -201,12 +193,16 @@ msgstr ""
201msgid "Speaking..."
193msgid "Speaking..."
202msgstr ""
194msgstr ""
203
195
204−#: qml/Notifications/NotificationMenuItemFactory.qml:100
196+#: qml/Notifications/NotificationMenuItemFactory.qml:105
205msgid "Show password"
197msgid "Show password"
206msgstr ""
198msgstr ""
207
199
208−#: qml/Notifications/NotificationMenuItemFactory.qml:115
200+#: qml/Notifications/NotificationMenuItemFactory.qml:120
209−msgid "Please enter SIM PIN"
201+msgid "Enter SIM PIN"
202+msgstr ""
203+
204+#: qml/Notifications/NotificationMenuItemFactory.qml:121 qml/Shell.qml:270
205+msgid "Sorry, incorrect PIN"
210msgstr ""
206msgstr ""
211
207
212#: qml/Panel/ActiveCallHint.qml:77
208#: qml/Panel/ActiveCallHint.qml:77
@@ -249,47 +245,47 @@ msgstr ""
249msgid "Roaming"
245msgid "Roaming"
250msgstr ""
246msgstr ""
251
247
252−#: qml/Shell.qml:267
248+#: qml/Shell.qml:266
253−msgid "passphrase"
249+msgid "Enter your passphrase"
254msgstr ""
250msgstr ""
255
251
256#: qml/Shell.qml:267
252#: qml/Shell.qml:267
257−msgid "passcode"
253+msgid "Sorry, incorrect passphrase"
258msgstr ""
254msgstr ""
259
255
260#: qml/Shell.qml:269
256#: qml/Shell.qml:269
261−#, qt-format
262−msgid "Enter your %1"
257+msgid "Enter your PIN"
263msgstr ""
258msgstr ""
264
259
265−#: qml/Shell.qml:270
260+#: qml/Shell.qml:273
266#, qt-format
261#, qt-format
267−msgid "Incorrect %1"
262+msgid "Enter your %1"
268msgstr ""
263msgstr ""
269
264
270−#: qml/Shell.qml:272
265+#: qml/Shell.qml:274
271−msgid "Please re-enter"
266+#, qt-format
267+msgid "Sorry, incorrect %1"
272msgstr ""
268msgstr ""
273
269
274−#: qml/Shell.qml:306
270+#: qml/Shell.qml:310
275msgid "Sorry, incorrect passphrase."
271msgid "Sorry, incorrect passphrase."
276msgstr ""
272msgstr ""
277
273
278−#: qml/Shell.qml:307
274+#: qml/Shell.qml:311
279msgid "Sorry, incorrect passcode."
275msgid "Sorry, incorrect passcode."
280msgstr ""
276msgstr ""
281
277
282−#: qml/Shell.qml:308
278+#: qml/Shell.qml:312
283msgid "This will be your last attempt."
279msgid "This will be your last attempt."
284msgstr ""
280msgstr ""
285
281
286−#: qml/Shell.qml:310
282+#: qml/Shell.qml:314
287msgid ""
283msgid ""
288"If passphrase is entered incorrectly, your phone will conduct a factory "
284"If passphrase is entered incorrectly, your phone will conduct a factory "
289"reset and all personal data will be deleted."
285"reset and all personal data will be deleted."
290msgstr ""
286msgstr ""
291
287
292−#: qml/Shell.qml:311
288+#: qml/Shell.qml:315
293msgid ""
289msgid ""
294"If passcode is entered incorrectly, your phone will conduct a factory reset "
290"If passcode is entered incorrectly, your phone will conduct a factory reset "
295"and all personal data will be deleted."
291"and all personal data will be deleted."
po/sl.po+79−57
@@ -7,19 +7,19 @@ msgid ""
7msgstr ""
7msgstr ""
8"Project-Id-Version: unity\n"
8"Project-Id-Version: unity\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2014-08-13 14:09-0400\n"
10+"POT-Creation-Date: 2014-08-21 11:36+0200\n"
11−"PO-Revision-Date: 2014-08-06 06:11+0000\n"
11+"PO-Revision-Date: 2014-08-19 12:54+0000\n"
12"Last-Translator: Damir Jerovšek <Unknown>\n"
12"Last-Translator: Damir Jerovšek <Unknown>\n"
13"Language-Team: Slovenian <sl@li.org>\n"
13"Language-Team: Slovenian <sl@li.org>\n"
14"MIME-Version: 1.0\n"
14"MIME-Version: 1.0\n"
15"Content-Type: text/plain; charset=UTF-8\n"
15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n"
16"Content-Transfer-Encoding: 8bit\n"
17−"X-Launchpad-Export-Date: 2014-08-15 06:28+0000\n"
17+"X-Launchpad-Export-Date: 2014-08-23 07:17+0000\n"
18−"X-Generator: Launchpad (build 17156)\n"
18+"X-Generator: Launchpad (build 17163)\n"
19
19
20#: plugins/LightDM/Greeter.cpp:129
20#: plugins/LightDM/Greeter.cpp:129
21msgid "Password: "
21msgid "Password: "
22−msgstr ""
22+msgstr "Geslo: "
23
23
24#: plugins/Unity/Launcher/launcheritem.cpp:43
24#: plugins/Unity/Launcher/launcheritem.cpp:43
25#: plugins/Unity/Launcher/launcheritem.cpp:73
25#: plugins/Unity/Launcher/launcheritem.cpp:73
@@ -32,19 +32,19 @@ msgstr "Odpni bližnjico"
32
32
33#: qml/Components/Dialogs.qml:142
33#: qml/Components/Dialogs.qml:142
34msgid "Are you sure you would like to turn power off?"
34msgid "Are you sure you would like to turn power off?"
35−msgstr ""
35+msgstr "Ali ste prepričani, da želite izklopiti?"
36
36
37#: qml/Components/Dialogs.qml:144
37#: qml/Components/Dialogs.qml:144
38msgid "Power off"
38msgid "Power off"
39−msgstr ""
39+msgstr "Izklopi"
40
40
41#: qml/Components/Dialogs.qml:153
41#: qml/Components/Dialogs.qml:153
42msgid "Restart"
42msgid "Restart"
43−msgstr ""
43+msgstr "Ponovno zaženi"
44
44
45#: qml/Components/Dialogs.qml:162
45#: qml/Components/Dialogs.qml:162
46msgid "Cancel"
46msgid "Cancel"
47−msgstr ""
47+msgstr "Prekliči"
48
48
49#: qml/Components/EdgeDemoOverlay.qml:151
49#: qml/Components/EdgeDemoOverlay.qml:151
50msgid "Skip intro"
50msgid "Skip intro"
@@ -96,19 +96,19 @@ msgstr ""
96"Sedaj, ko ste osvojili poteze robov, lahko začnete uporabljati "
96"Sedaj, ko ste osvojili poteze robov, lahko začnete uporabljati "
97"telefon<br><br>Tapnite na zaslon za začetek"
97"telefon<br><br>Tapnite na zaslon za začetek"
98
98
99−#: qml/Components/Lockscreen.qml:161
99+#: qml/Components/Lockscreen.qml:167
100−msgid "Too many incorrect attempts"
101−msgstr ""
102−
103−#: qml/Components/Lockscreen.qml:163
104msgid "Please wait"
100msgid "Please wait"
105−msgstr ""
101+msgstr "Počakajte"
106
102
107−#: qml/Components/Lockscreen.qml:245
103+#: qml/Components/Lockscreen.qml:172
104+msgid "Too many incorrect attempts"
105+msgstr "Preveč nepravilnih poskusov"
106+
107+#: qml/Components/Lockscreen.qml:206
108msgid "Emergency Call"
108msgid "Emergency Call"
109msgstr "Klic v sili"
109msgstr "Klic v sili"
110
110
111−#: qml/Components/Lockscreen.qml:268
111+#: qml/Components/Lockscreen.qml:226
112msgid "OK"
112msgid "OK"
113msgstr "V REDU"
113msgstr "V REDU"
114
114
@@ -121,23 +121,15 @@ msgstr "Pozdravljeni, %1"
121msgid "Hello"
121msgid "Hello"
122msgstr "Pozdravljeni"
122msgstr "Pozdravljeni"
123
123
124−#: qml/Components/PinLockscreen.qml:197
125−msgid "CANCEL"
126−msgstr "PREKLIČI"
127−
128−#: qml/Components/PinLockscreen.qml:215
129−msgid "DONE"
130−msgstr "KONČANO"
131−
132−#: qml/Dash/GenericScopeView.qml:360
124+#: qml/Dash/GenericScopeView.qml:361
133msgid "See less"
125msgid "See less"
134msgstr "Pokaži manj"
126msgstr "Pokaži manj"
135
127
136−#: qml/Dash/GenericScopeView.qml:360
128+#: qml/Dash/GenericScopeView.qml:361
137msgid "See all"
129msgid "See all"
138msgstr "Ogled vsega"
130msgstr "Ogled vsega"
139
131
140−#: qml/Dash/GenericScopeView.qml:423 qml/Panel/SearchIndicator.qml:27
132+#: qml/Dash/GenericScopeView.qml:424 qml/Panel/SearchIndicator.qml:27
141msgid "Search"
133msgid "Search"
142msgstr "Iskanje"
134msgstr "Iskanje"
143
135
@@ -163,23 +155,23 @@ msgstr "Pošlji"
163
155
164#: qml/Dash/ScopesOverview.qml:201
156#: qml/Dash/ScopesOverview.qml:201
165msgid "Manage Dash"
157msgid "Manage Dash"
166−msgstr ""
158+msgstr "Upravljaj s pregledno ploščo"
167
159
168#: qml/Dash/ScopesOverview.qml:408
160#: qml/Dash/ScopesOverview.qml:408
169msgid "Done"
161msgid "Done"
170−msgstr ""
162+msgstr "Končano"
171
163
172#: qml/Dash/ScopesOverview.qml:434
164#: qml/Dash/ScopesOverview.qml:434
173msgid "Store"
165msgid "Store"
174−msgstr ""
166+msgstr "Trgovina"
175
167
176#: qml/Dash/ScopesOverviewTab.qml:36
168#: qml/Dash/ScopesOverviewTab.qml:36
177msgid "Favorites"
169msgid "Favorites"
178−msgstr ""
170+msgstr "Priljubljeni"
179
171
180#: qml/Dash/ScopesOverviewTab.qml:54
172#: qml/Dash/ScopesOverviewTab.qml:54
181msgid "All"
173msgid "All"
182−msgstr ""
174+msgstr "Vse"
183
175
184#: qml/Greeter/Greeter.qml:157
176#: qml/Greeter/Greeter.qml:157
185msgid "Swipe to unlock"
177msgid "Swipe to unlock"
@@ -205,13 +197,17 @@ msgstr "Govorite zdaj ..."
205msgid "Speaking..."
197msgid "Speaking..."
206msgstr "Govorjenje ..."
198msgstr "Govorjenje ..."
207
199
208−#: qml/Notifications/NotificationMenuItemFactory.qml:100
200+#: qml/Notifications/NotificationMenuItemFactory.qml:105
209msgid "Show password"
201msgid "Show password"
210msgstr "Pokaži geslo"
202msgstr "Pokaži geslo"
211
203
212−#: qml/Notifications/NotificationMenuItemFactory.qml:115
204+#: qml/Notifications/NotificationMenuItemFactory.qml:120
213−msgid "Please enter SIM PIN"
205+msgid "Enter SIM PIN"
214−msgstr "Vnesite PIN kartice SIM"
206+msgstr ""
207+
208+#: qml/Notifications/NotificationMenuItemFactory.qml:121 qml/Shell.qml:270
209+msgid "Sorry, incorrect PIN"
210+msgstr ""
215
211
216#: qml/Panel/ActiveCallHint.qml:77
212#: qml/Panel/ActiveCallHint.qml:77
217msgid "Tap to return to call..."
213msgid "Tap to return to call..."
@@ -247,54 +243,80 @@ msgstr "Spodletelo, tapnite za ponovni poskus"
247
243
248#: qml/Panel/Indicators/ModemInfoItem.qml:105
244#: qml/Panel/Indicators/ModemInfoItem.qml:105
249msgid "Unlock SIM"
245msgid "Unlock SIM"
250−msgstr ""
246+msgstr "Odkleni SIM"
251
247
252#: qml/Panel/Indicators/RoamingIndication.qml:27
248#: qml/Panel/Indicators/RoamingIndication.qml:27
253msgid "Roaming"
249msgid "Roaming"
254−msgstr ""
250+msgstr "Gostovanje"
255
251
256−#: qml/Shell.qml:267
252+#: qml/Shell.qml:266
257−msgid "passphrase"
253+msgid "Enter your passphrase"
258msgstr ""
254msgstr ""
259
255
260#: qml/Shell.qml:267
256#: qml/Shell.qml:267
261−msgid "passcode"
257+msgid "Sorry, incorrect passphrase"
262msgstr ""
258msgstr ""
263
259
264#: qml/Shell.qml:269
260#: qml/Shell.qml:269
265−#, qt-format
266−msgid "Enter your %1"
261+msgid "Enter your PIN"
267msgstr ""
262msgstr ""
268
263
269−#: qml/Shell.qml:270
264+#: qml/Shell.qml:273
270#, qt-format
265#, qt-format
271−msgid "Incorrect %1"
266+msgid "Enter your %1"
272−msgstr ""
267+msgstr "Vnesite vaš %1"
273
268
274−#: qml/Shell.qml:272
269+#: qml/Shell.qml:274
275−msgid "Please re-enter"
270+#, qt-format
271+msgid "Sorry, incorrect %1"
276msgstr ""
272msgstr ""
277
273
278−#: qml/Shell.qml:306
274+#: qml/Shell.qml:310
279msgid "Sorry, incorrect passphrase."
275msgid "Sorry, incorrect passphrase."
280−msgstr ""
276+msgstr "Nepravilno geslo."
281
277
282−#: qml/Shell.qml:307
278+#: qml/Shell.qml:311
283msgid "Sorry, incorrect passcode."
279msgid "Sorry, incorrect passcode."
284−msgstr ""
280+msgstr "Nepravilno geslo."
285
281
286−#: qml/Shell.qml:308
282+#: qml/Shell.qml:312
287msgid "This will be your last attempt."
283msgid "This will be your last attempt."
288−msgstr ""
284+msgstr "To je vaš zadnji poskus"
289
285
290−#: qml/Shell.qml:310
286+#: qml/Shell.qml:314
291msgid ""
287msgid ""
292"If passphrase is entered incorrectly, your phone will conduct a factory "
288"If passphrase is entered incorrectly, your phone will conduct a factory "
293"reset and all personal data will be deleted."
289"reset and all personal data will be deleted."
294msgstr ""
290msgstr ""
291+"Če je vneseno nepravilno šifrirno reklo, bo telefon ponastavljen na "
292+"tovarniške nastavitve ter vsi osebni podatki bodo izbrisani."
295
293
296−#: qml/Shell.qml:311
294+#: qml/Shell.qml:315
297msgid ""
295msgid ""
298"If passcode is entered incorrectly, your phone will conduct a factory reset "
296"If passcode is entered incorrectly, your phone will conduct a factory reset "
299"and all personal data will be deleted."
297"and all personal data will be deleted."
300msgstr ""
298msgstr ""
299+"Če je vneseno nepravilno geslo, bo telefon ponastavljen na tovarniške "
300+"nastavitve ter vsi osebni podatki bodo izbrisani."
301+
302+#~ msgid "Please enter SIM PIN"
303+#~ msgstr "Vnesite PIN kartice SIM"
304+
305+#~ msgid "DONE"
306+#~ msgstr "KONČANO"
307+
308+#~ msgid "CANCEL"
309+#~ msgstr "PREKLIČI"
310+
311+#~ msgid "passphrase"
312+#~ msgstr "šifrirno reklo"
313+
314+#, qt-format
315+#~ msgid "Incorrect %1"
316+#~ msgstr "Nepravilen %1"
317+
318+#~ msgid "Please re-enter"
319+#~ msgstr "Ponovno vnesite"
320+
321+#~ msgid "passcode"
322+#~ msgstr "geslo"
po/sq.po+33−37
@@ -7,15 +7,15 @@ msgid ""
7msgstr ""
7msgstr ""
8"Project-Id-Version: unity8\n"
8"Project-Id-Version: unity8\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2014-08-13 14:09-0400\n"
10+"POT-Creation-Date: 2014-08-21 11:36+0200\n"
11"PO-Revision-Date: 2014-01-15 13:51+0000\n"
11"PO-Revision-Date: 2014-01-15 13:51+0000\n"
12"Last-Translator: Besmir Zanaj <besmirzanaj@gmail.com>\n"
12"Last-Translator: Besmir Zanaj <besmirzanaj@gmail.com>\n"
13"Language-Team: Albanian <sq@li.org>\n"
13"Language-Team: Albanian <sq@li.org>\n"
14"MIME-Version: 1.0\n"
14"MIME-Version: 1.0\n"
15"Content-Type: text/plain; charset=UTF-8\n"
15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n"
16"Content-Transfer-Encoding: 8bit\n"
17−"X-Launchpad-Export-Date: 2014-08-15 06:28+0000\n"
17+"X-Launchpad-Export-Date: 2014-08-23 07:16+0000\n"
18−"X-Generator: Launchpad (build 17156)\n"
18+"X-Generator: Launchpad (build 17163)\n"
19
19
20#: plugins/LightDM/Greeter.cpp:129
20#: plugins/LightDM/Greeter.cpp:129
21msgid "Password: "
21msgid "Password: "
@@ -93,19 +93,19 @@ msgid ""
93"phone<br><br>Tap on the screen to start"
93"phone<br><br>Tap on the screen to start"
94msgstr ""
94msgstr ""
95
95
96−#: qml/Components/Lockscreen.qml:161
96+#: qml/Components/Lockscreen.qml:167
97−msgid "Too many incorrect attempts"
97+msgid "Please wait"
98msgstr ""
98msgstr ""
99
99
100−#: qml/Components/Lockscreen.qml:163
100+#: qml/Components/Lockscreen.qml:172
101−msgid "Please wait"
101+msgid "Too many incorrect attempts"
102msgstr ""
102msgstr ""
103
103
104−#: qml/Components/Lockscreen.qml:245
104+#: qml/Components/Lockscreen.qml:206
105msgid "Emergency Call"
105msgid "Emergency Call"
106msgstr ""
106msgstr ""
107
107
108−#: qml/Components/Lockscreen.qml:268
108+#: qml/Components/Lockscreen.qml:226
109msgid "OK"
109msgid "OK"
110msgstr ""
110msgstr ""
111
111
@@ -118,23 +118,15 @@ msgstr ""
118msgid "Hello"
118msgid "Hello"
119msgstr ""
119msgstr ""
120
120
121−#: qml/Components/PinLockscreen.qml:197
122−msgid "CANCEL"
123−msgstr ""
124−
125−#: qml/Components/PinLockscreen.qml:215
126−msgid "DONE"
127−msgstr ""
128−
129−#: qml/Dash/GenericScopeView.qml:360
121+#: qml/Dash/GenericScopeView.qml:361
130msgid "See less"
122msgid "See less"
131msgstr ""
123msgstr ""
132
124
133−#: qml/Dash/GenericScopeView.qml:360
125+#: qml/Dash/GenericScopeView.qml:361
134msgid "See all"
126msgid "See all"
135msgstr ""
127msgstr ""
136
128
137−#: qml/Dash/GenericScopeView.qml:423 qml/Panel/SearchIndicator.qml:27
129+#: qml/Dash/GenericScopeView.qml:424 qml/Panel/SearchIndicator.qml:27
138msgid "Search"
130msgid "Search"
139msgstr ""
131msgstr ""
140
132
@@ -202,12 +194,16 @@ msgstr ""
202msgid "Speaking..."
194msgid "Speaking..."
203msgstr ""
195msgstr ""
204
196
205−#: qml/Notifications/NotificationMenuItemFactory.qml:100
197+#: qml/Notifications/NotificationMenuItemFactory.qml:105
206msgid "Show password"
198msgid "Show password"
207msgstr ""
199msgstr ""
208
200
209−#: qml/Notifications/NotificationMenuItemFactory.qml:115
201+#: qml/Notifications/NotificationMenuItemFactory.qml:120
210−msgid "Please enter SIM PIN"
202+msgid "Enter SIM PIN"
203+msgstr ""
204+
205+#: qml/Notifications/NotificationMenuItemFactory.qml:121 qml/Shell.qml:270
206+msgid "Sorry, incorrect PIN"
211msgstr ""
207msgstr ""
212
208
213#: qml/Panel/ActiveCallHint.qml:77
209#: qml/Panel/ActiveCallHint.qml:77
@@ -250,47 +246,47 @@ msgstr ""
250msgid "Roaming"
246msgid "Roaming"
251msgstr ""
247msgstr ""
252
248
253−#: qml/Shell.qml:267
249+#: qml/Shell.qml:266
254−msgid "passphrase"
250+msgid "Enter your passphrase"
255msgstr ""
251msgstr ""
256
252
257#: qml/Shell.qml:267
253#: qml/Shell.qml:267
258−msgid "passcode"
254+msgid "Sorry, incorrect passphrase"
259msgstr ""
255msgstr ""
260
256
261#: qml/Shell.qml:269
257#: qml/Shell.qml:269
262−#, qt-format
263−msgid "Enter your %1"
258+msgid "Enter your PIN"
264msgstr ""
259msgstr ""
265
260
266−#: qml/Shell.qml:270
261+#: qml/Shell.qml:273
267#, qt-format
262#, qt-format
268−msgid "Incorrect %1"
263+msgid "Enter your %1"
269msgstr ""
264msgstr ""
270
265
271−#: qml/Shell.qml:272
266+#: qml/Shell.qml:274
272−msgid "Please re-enter"
267+#, qt-format
268+msgid "Sorry, incorrect %1"
273msgstr ""
269msgstr ""
274
270
275−#: qml/Shell.qml:306
271+#: qml/Shell.qml:310
276msgid "Sorry, incorrect passphrase."
272msgid "Sorry, incorrect passphrase."
277msgstr ""
273msgstr ""
278
274
279−#: qml/Shell.qml:307
275+#: qml/Shell.qml:311
280msgid "Sorry, incorrect passcode."
276msgid "Sorry, incorrect passcode."
281msgstr ""
277msgstr ""
282
278
283−#: qml/Shell.qml:308
279+#: qml/Shell.qml:312
284msgid "This will be your last attempt."
280msgid "This will be your last attempt."
285msgstr ""
281msgstr ""
286
282
287−#: qml/Shell.qml:310
283+#: qml/Shell.qml:314
288msgid ""
284msgid ""
289"If passphrase is entered incorrectly, your phone will conduct a factory "
285"If passphrase is entered incorrectly, your phone will conduct a factory "
290"reset and all personal data will be deleted."
286"reset and all personal data will be deleted."
291msgstr ""
287msgstr ""
292
288
293−#: qml/Shell.qml:311
289+#: qml/Shell.qml:315
294msgid ""
290msgid ""
295"If passcode is entered incorrectly, your phone will conduct a factory reset "
291"If passcode is entered incorrectly, your phone will conduct a factory reset "
296"and all personal data will be deleted."
292"and all personal data will be deleted."
po/sr.po+33−37
@@ -7,15 +7,15 @@ msgid ""
7msgstr ""
7msgstr ""
8"Project-Id-Version: unity\n"
8"Project-Id-Version: unity\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2014-08-13 14:09-0400\n"
10+"POT-Creation-Date: 2014-08-21 11:36+0200\n"
11"PO-Revision-Date: 2013-06-27 09:19+0000\n"
11"PO-Revision-Date: 2013-06-27 09:19+0000\n"
12"Last-Translator: Michał Sawicz <michal.sawicz@canonical.com>\n"
12"Last-Translator: Michał Sawicz <michal.sawicz@canonical.com>\n"
13"Language-Team: Serbian <sr@li.org>\n"
13"Language-Team: Serbian <sr@li.org>\n"
14"MIME-Version: 1.0\n"
14"MIME-Version: 1.0\n"
15"Content-Type: text/plain; charset=UTF-8\n"
15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n"
16"Content-Transfer-Encoding: 8bit\n"
17−"X-Launchpad-Export-Date: 2014-08-15 06:28+0000\n"
17+"X-Launchpad-Export-Date: 2014-08-23 07:17+0000\n"
18−"X-Generator: Launchpad (build 17156)\n"
18+"X-Generator: Launchpad (build 17163)\n"
19
19
20#: plugins/LightDM/Greeter.cpp:129
20#: plugins/LightDM/Greeter.cpp:129
21msgid "Password: "
21msgid "Password: "
@@ -92,19 +92,19 @@ msgid ""
92"phone<br><br>Tap on the screen to start"
92"phone<br><br>Tap on the screen to start"
93msgstr ""
93msgstr ""
94
94
95−#: qml/Components/Lockscreen.qml:161
95+#: qml/Components/Lockscreen.qml:167
96−msgid "Too many incorrect attempts"
96+msgid "Please wait"
97msgstr ""
97msgstr ""
98
98
99−#: qml/Components/Lockscreen.qml:163
99+#: qml/Components/Lockscreen.qml:172
100−msgid "Please wait"
100+msgid "Too many incorrect attempts"
101msgstr ""
101msgstr ""
102
102
103−#: qml/Components/Lockscreen.qml:245
103+#: qml/Components/Lockscreen.qml:206
104msgid "Emergency Call"
104msgid "Emergency Call"
105msgstr ""
105msgstr ""
106
106
107−#: qml/Components/Lockscreen.qml:268
107+#: qml/Components/Lockscreen.qml:226
108msgid "OK"
108msgid "OK"
109msgstr ""
109msgstr ""
110
110
@@ -117,23 +117,15 @@ msgstr ""
117msgid "Hello"
117msgid "Hello"
118msgstr ""
118msgstr ""
119
119
120−#: qml/Components/PinLockscreen.qml:197
121−msgid "CANCEL"
122−msgstr ""
123−
124−#: qml/Components/PinLockscreen.qml:215
125−msgid "DONE"
126−msgstr ""
127−
128−#: qml/Dash/GenericScopeView.qml:360
120+#: qml/Dash/GenericScopeView.qml:361
129msgid "See less"
121msgid "See less"
130msgstr ""
122msgstr ""
131
123
132−#: qml/Dash/GenericScopeView.qml:360
124+#: qml/Dash/GenericScopeView.qml:361
133msgid "See all"
125msgid "See all"
134msgstr ""
126msgstr ""
135
127
136−#: qml/Dash/GenericScopeView.qml:423 qml/Panel/SearchIndicator.qml:27
128+#: qml/Dash/GenericScopeView.qml:424 qml/Panel/SearchIndicator.qml:27
137msgid "Search"
129msgid "Search"
138msgstr "Претрага"
130msgstr "Претрага"
139
131
@@ -201,12 +193,16 @@ msgstr "Изговорите сада..."
201msgid "Speaking..."
193msgid "Speaking..."
202msgstr "Говор..."
194msgstr "Говор..."
203
195
204−#: qml/Notifications/NotificationMenuItemFactory.qml:100
196+#: qml/Notifications/NotificationMenuItemFactory.qml:105
205msgid "Show password"
197msgid "Show password"
206msgstr ""
198msgstr ""
207
199
208−#: qml/Notifications/NotificationMenuItemFactory.qml:115
200+#: qml/Notifications/NotificationMenuItemFactory.qml:120
209−msgid "Please enter SIM PIN"
201+msgid "Enter SIM PIN"
202+msgstr ""
203+
204+#: qml/Notifications/NotificationMenuItemFactory.qml:121 qml/Shell.qml:270
205+msgid "Sorry, incorrect PIN"
210msgstr ""
206msgstr ""
211
207
212#: qml/Panel/ActiveCallHint.qml:77
208#: qml/Panel/ActiveCallHint.qml:77
@@ -249,47 +245,47 @@ msgstr ""
249msgid "Roaming"
245msgid "Roaming"
250msgstr ""
246msgstr ""
251
247
252−#: qml/Shell.qml:267
248+#: qml/Shell.qml:266
253−msgid "passphrase"
249+msgid "Enter your passphrase"
254msgstr ""
250msgstr ""
255
251
256#: qml/Shell.qml:267
252#: qml/Shell.qml:267
257−msgid "passcode"
253+msgid "Sorry, incorrect passphrase"
258msgstr ""
254msgstr ""
259
255
260#: qml/Shell.qml:269
256#: qml/Shell.qml:269
261−#, qt-format
262−msgid "Enter your %1"
257+msgid "Enter your PIN"
263msgstr ""
258msgstr ""
264
259
265−#: qml/Shell.qml:270
260+#: qml/Shell.qml:273
266#, qt-format
261#, qt-format
267−msgid "Incorrect %1"
262+msgid "Enter your %1"
268msgstr ""
263msgstr ""
269
264
270−#: qml/Shell.qml:272
265+#: qml/Shell.qml:274
271−msgid "Please re-enter"
266+#, qt-format
267+msgid "Sorry, incorrect %1"
272msgstr ""
268msgstr ""
273
269
274−#: qml/Shell.qml:306
270+#: qml/Shell.qml:310
275msgid "Sorry, incorrect passphrase."
271msgid "Sorry, incorrect passphrase."
276msgstr ""
272msgstr ""
277
273
278−#: qml/Shell.qml:307
274+#: qml/Shell.qml:311
279msgid "Sorry, incorrect passcode."
275msgid "Sorry, incorrect passcode."
280msgstr ""
276msgstr ""
281
277
282−#: qml/Shell.qml:308
278+#: qml/Shell.qml:312
283msgid "This will be your last attempt."
279msgid "This will be your last attempt."
284msgstr ""
280msgstr ""
285
281
286−#: qml/Shell.qml:310
282+#: qml/Shell.qml:314
287msgid ""
283msgid ""
288"If passphrase is entered incorrectly, your phone will conduct a factory "
284"If passphrase is entered incorrectly, your phone will conduct a factory "
289"reset and all personal data will be deleted."
285"reset and all personal data will be deleted."
290msgstr ""
286msgstr ""
291
287
292−#: qml/Shell.qml:311
288+#: qml/Shell.qml:315
293msgid ""
289msgid ""
294"If passcode is entered incorrectly, your phone will conduct a factory reset "
290"If passcode is entered incorrectly, your phone will conduct a factory reset "
295"and all personal data will be deleted."
291"and all personal data will be deleted."
po/sv.po+48−39
@@ -7,15 +7,15 @@ msgid ""
7msgstr ""
7msgstr ""
8"Project-Id-Version: unity\n"
8"Project-Id-Version: unity\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2014-08-13 14:09-0400\n"
10+"POT-Creation-Date: 2014-08-21 11:36+0200\n"
11"PO-Revision-Date: 2014-08-14 18:22+0000\n"
11"PO-Revision-Date: 2014-08-14 18:22+0000\n"
12"Last-Translator: Erik Simmesgård <Unknown>\n"
12"Last-Translator: Erik Simmesgård <Unknown>\n"
13"Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
13"Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
14"MIME-Version: 1.0\n"
14"MIME-Version: 1.0\n"
15"Content-Type: text/plain; charset=UTF-8\n"
15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n"
16"Content-Transfer-Encoding: 8bit\n"
17−"X-Launchpad-Export-Date: 2014-08-15 06:28+0000\n"
17+"X-Launchpad-Export-Date: 2014-08-23 07:17+0000\n"
18−"X-Generator: Launchpad (build 17156)\n"
18+"X-Generator: Launchpad (build 17163)\n"
19"Language: sv\n"
19"Language: sv\n"
20
20
21#: plugins/LightDM/Greeter.cpp:129
21#: plugins/LightDM/Greeter.cpp:129
@@ -95,19 +95,19 @@ msgstr ""
95"Du har nu bemästrat kantgesterna och kan börja använda "
95"Du har nu bemästrat kantgesterna och kan börja använda "
96"telefonen<br><br>Tryck på skärmen för att starta"
96"telefonen<br><br>Tryck på skärmen för att starta"
97
97
98−#: qml/Components/Lockscreen.qml:161
98+#: qml/Components/Lockscreen.qml:167
99−msgid "Too many incorrect attempts"
100−msgstr ""
101−
102−#: qml/Components/Lockscreen.qml:163
103msgid "Please wait"
99msgid "Please wait"
104msgstr "Var god vänta"
100msgstr "Var god vänta"
105
101
106−#: qml/Components/Lockscreen.qml:245
102+#: qml/Components/Lockscreen.qml:172
103+msgid "Too many incorrect attempts"
104+msgstr ""
105+
106+#: qml/Components/Lockscreen.qml:206
107msgid "Emergency Call"
107msgid "Emergency Call"
108msgstr "Nödsamtal"
108msgstr "Nödsamtal"
109
109
110−#: qml/Components/Lockscreen.qml:268
110+#: qml/Components/Lockscreen.qml:226
111msgid "OK"
111msgid "OK"
112msgstr "Ok"
112msgstr "Ok"
113
113
@@ -120,23 +120,15 @@ msgstr "Hej %1"
120msgid "Hello"
120msgid "Hello"
121msgstr "Hej"
121msgstr "Hej"
122
122
123−#: qml/Components/PinLockscreen.qml:197
124−msgid "CANCEL"
125−msgstr "AVBRYT"
126−
127−#: qml/Components/PinLockscreen.qml:215
128−msgid "DONE"
129−msgstr "KLAR"
130−
131−#: qml/Dash/GenericScopeView.qml:360
123+#: qml/Dash/GenericScopeView.qml:361
132msgid "See less"
124msgid "See less"
133msgstr "Visa mindre"
125msgstr "Visa mindre"
134
126
135−#: qml/Dash/GenericScopeView.qml:360
127+#: qml/Dash/GenericScopeView.qml:361
136msgid "See all"
128msgid "See all"
137msgstr "Visa alla"
129msgstr "Visa alla"
138
130
139−#: qml/Dash/GenericScopeView.qml:423 qml/Panel/SearchIndicator.qml:27
131+#: qml/Dash/GenericScopeView.qml:424 qml/Panel/SearchIndicator.qml:27
140msgid "Search"
132msgid "Search"
141msgstr "Sök"
133msgstr "Sök"
142
134
@@ -204,13 +196,17 @@ msgstr "Tala nu…"
204msgid "Speaking..."
196msgid "Speaking..."
205msgstr "Talar…"
197msgstr "Talar…"
206
198
207−#: qml/Notifications/NotificationMenuItemFactory.qml:100
199+#: qml/Notifications/NotificationMenuItemFactory.qml:105
208msgid "Show password"
200msgid "Show password"
209msgstr "Visa lösenord"
201msgstr "Visa lösenord"
210
202
211−#: qml/Notifications/NotificationMenuItemFactory.qml:115
203+#: qml/Notifications/NotificationMenuItemFactory.qml:120
212−msgid "Please enter SIM PIN"
204+msgid "Enter SIM PIN"
213−msgstr "Ange SIM PIN-kod"
205+msgstr ""
206+
207+#: qml/Notifications/NotificationMenuItemFactory.qml:121 qml/Shell.qml:270
208+msgid "Sorry, incorrect PIN"
209+msgstr ""
214
210
215#: qml/Panel/ActiveCallHint.qml:77
211#: qml/Panel/ActiveCallHint.qml:77
216msgid "Tap to return to call..."
212msgid "Tap to return to call..."
@@ -252,48 +248,61 @@ msgstr "Lås upp SIM-kort"
252msgid "Roaming"
248msgid "Roaming"
253msgstr "Roaming"
249msgstr "Roaming"
254
250
255−#: qml/Shell.qml:267
251+#: qml/Shell.qml:266
256−msgid "passphrase"
252+msgid "Enter your passphrase"
257msgstr ""
253msgstr ""
258
254
259#: qml/Shell.qml:267
255#: qml/Shell.qml:267
260−msgid "passcode"
256+msgid "Sorry, incorrect passphrase"
261msgstr ""
257msgstr ""
262
258
263#: qml/Shell.qml:269
259#: qml/Shell.qml:269
260+msgid "Enter your PIN"
261+msgstr ""
262+
263+#: qml/Shell.qml:273
264#, qt-format
264#, qt-format
265msgid "Enter your %1"
265msgid "Enter your %1"
266msgstr "Skriv in din %1"
266msgstr "Skriv in din %1"
267
267
268−#: qml/Shell.qml:270
268+#: qml/Shell.qml:274
269#, qt-format
269#, qt-format
270−msgid "Incorrect %1"
270+msgid "Sorry, incorrect %1"
271−msgstr "Inkorrekt %1"
272−
273−#: qml/Shell.qml:272
274−msgid "Please re-enter"
275msgstr ""
271msgstr ""
276
272
277−#: qml/Shell.qml:306
273+#: qml/Shell.qml:310
278msgid "Sorry, incorrect passphrase."
274msgid "Sorry, incorrect passphrase."
279msgstr ""
275msgstr ""
280
276
281−#: qml/Shell.qml:307
277+#: qml/Shell.qml:311
282msgid "Sorry, incorrect passcode."
278msgid "Sorry, incorrect passcode."
283msgstr ""
279msgstr ""
284
280
285−#: qml/Shell.qml:308
281+#: qml/Shell.qml:312
286msgid "This will be your last attempt."
282msgid "This will be your last attempt."
287msgstr ""
283msgstr ""
288
284
289−#: qml/Shell.qml:310
285+#: qml/Shell.qml:314
290msgid ""
286msgid ""
291"If passphrase is entered incorrectly, your phone will conduct a factory "
287"If passphrase is entered incorrectly, your phone will conduct a factory "
292"reset and all personal data will be deleted."
288"reset and all personal data will be deleted."
293msgstr ""
289msgstr ""
294
290
295−#: qml/Shell.qml:311
291+#: qml/Shell.qml:315
296msgid ""
292msgid ""
297"If passcode is entered incorrectly, your phone will conduct a factory reset "
293"If passcode is entered incorrectly, your phone will conduct a factory reset "
298"and all personal data will be deleted."
294"and all personal data will be deleted."
299msgstr ""
295msgstr ""
296+
297+#~ msgid "Please enter SIM PIN"
298+#~ msgstr "Ange SIM PIN-kod"
299+
300+#~ msgid "CANCEL"
301+#~ msgstr "AVBRYT"
302+
303+#~ msgid "DONE"
304+#~ msgstr "KLAR"
305+
306+#, qt-format
307+#~ msgid "Incorrect %1"
308+#~ msgstr "Inkorrekt %1"
po/sw.po+33−37
@@ -7,15 +7,15 @@ msgid ""
7msgstr ""
7msgstr ""
8"Project-Id-Version: unity8\n"
8"Project-Id-Version: unity8\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2014-08-13 14:09-0400\n"
10+"POT-Creation-Date: 2014-08-21 11:36+0200\n"
11"PO-Revision-Date: 2014-01-14 19:28+0000\n"
11"PO-Revision-Date: 2014-01-14 19:28+0000\n"
12"Last-Translator: Damas <Unknown>\n"
12"Last-Translator: Damas <Unknown>\n"
13"Language-Team: Swahili <sw@li.org>\n"
13"Language-Team: Swahili <sw@li.org>\n"
14"MIME-Version: 1.0\n"
14"MIME-Version: 1.0\n"
15"Content-Type: text/plain; charset=UTF-8\n"
15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n"
16"Content-Transfer-Encoding: 8bit\n"
17−"X-Launchpad-Export-Date: 2014-08-15 06:28+0000\n"
17+"X-Launchpad-Export-Date: 2014-08-23 07:17+0000\n"
18−"X-Generator: Launchpad (build 17156)\n"
18+"X-Generator: Launchpad (build 17163)\n"
19
19
20#: plugins/LightDM/Greeter.cpp:129
20#: plugins/LightDM/Greeter.cpp:129
21msgid "Password: "
21msgid "Password: "
@@ -92,19 +92,19 @@ msgid ""
92"phone<br><br>Tap on the screen to start"
92"phone<br><br>Tap on the screen to start"
93msgstr ""
93msgstr ""
94
94
95−#: qml/Components/Lockscreen.qml:161
95+#: qml/Components/Lockscreen.qml:167
96−msgid "Too many incorrect attempts"
96+msgid "Please wait"
97msgstr ""
97msgstr ""
98
98
99−#: qml/Components/Lockscreen.qml:163
99+#: qml/Components/Lockscreen.qml:172
100−msgid "Please wait"
100+msgid "Too many incorrect attempts"
101msgstr ""
101msgstr ""
102
102
103−#: qml/Components/Lockscreen.qml:245
103+#: qml/Components/Lockscreen.qml:206
104msgid "Emergency Call"
104msgid "Emergency Call"
105msgstr ""
105msgstr ""
106
106
107−#: qml/Components/Lockscreen.qml:268
107+#: qml/Components/Lockscreen.qml:226
108msgid "OK"
108msgid "OK"
109msgstr ""
109msgstr ""
110
110
@@ -117,23 +117,15 @@ msgstr ""
117msgid "Hello"
117msgid "Hello"
118msgstr ""
118msgstr ""
119
119
120−#: qml/Components/PinLockscreen.qml:197
121−msgid "CANCEL"
122−msgstr ""
123−
124−#: qml/Components/PinLockscreen.qml:215
125−msgid "DONE"
126−msgstr ""
127−
128−#: qml/Dash/GenericScopeView.qml:360
120+#: qml/Dash/GenericScopeView.qml:361
129msgid "See less"
121msgid "See less"
130msgstr ""
122msgstr ""
131
123
132−#: qml/Dash/GenericScopeView.qml:360
124+#: qml/Dash/GenericScopeView.qml:361
133msgid "See all"
125msgid "See all"
134msgstr ""
126msgstr ""
135
127
136−#: qml/Dash/GenericScopeView.qml:423 qml/Panel/SearchIndicator.qml:27
128+#: qml/Dash/GenericScopeView.qml:424 qml/Panel/SearchIndicator.qml:27
137msgid "Search"
129msgid "Search"
138msgstr "Tafuta"
130msgstr "Tafuta"
139
131
@@ -201,12 +193,16 @@ msgstr ""
201msgid "Speaking..."
193msgid "Speaking..."
202msgstr ""
194msgstr ""
203
195
204−#: qml/Notifications/NotificationMenuItemFactory.qml:100
196+#: qml/Notifications/NotificationMenuItemFactory.qml:105
205msgid "Show password"
197msgid "Show password"
206msgstr ""
198msgstr ""
207
199
208−#: qml/Notifications/NotificationMenuItemFactory.qml:115
200+#: qml/Notifications/NotificationMenuItemFactory.qml:120
209−msgid "Please enter SIM PIN"
201+msgid "Enter SIM PIN"
202+msgstr ""
203+
204+#: qml/Notifications/NotificationMenuItemFactory.qml:121 qml/Shell.qml:270
205+msgid "Sorry, incorrect PIN"
210msgstr ""
206msgstr ""
211
207
212#: qml/Panel/ActiveCallHint.qml:77
208#: qml/Panel/ActiveCallHint.qml:77
@@ -249,47 +245,47 @@ msgstr ""
249msgid "Roaming"
245msgid "Roaming"
250msgstr ""
246msgstr ""
251
247
252−#: qml/Shell.qml:267
248+#: qml/Shell.qml:266
253−msgid "passphrase"
249+msgid "Enter your passphrase"
254msgstr ""
250msgstr ""
255
251
256#: qml/Shell.qml:267
252#: qml/Shell.qml:267
257−msgid "passcode"
253+msgid "Sorry, incorrect passphrase"
258msgstr ""
254msgstr ""
259
255
260#: qml/Shell.qml:269
256#: qml/Shell.qml:269
261−#, qt-format
262−msgid "Enter your %1"
257+msgid "Enter your PIN"
263msgstr ""
258msgstr ""
264
259
265−#: qml/Shell.qml:270
260+#: qml/Shell.qml:273
266#, qt-format
261#, qt-format
267−msgid "Incorrect %1"
262+msgid "Enter your %1"
268msgstr ""
263msgstr ""
269
264
270−#: qml/Shell.qml:272
265+#: qml/Shell.qml:274
271−msgid "Please re-enter"
266+#, qt-format
267+msgid "Sorry, incorrect %1"
272msgstr ""
268msgstr ""
273
269
274−#: qml/Shell.qml:306
270+#: qml/Shell.qml:310
275msgid "Sorry, incorrect passphrase."
271msgid "Sorry, incorrect passphrase."
276msgstr ""
272msgstr ""
277
273
278−#: qml/Shell.qml:307
274+#: qml/Shell.qml:311
279msgid "Sorry, incorrect passcode."
275msgid "Sorry, incorrect passcode."
280msgstr ""
276msgstr ""
281
277
282−#: qml/Shell.qml:308
278+#: qml/Shell.qml:312
283msgid "This will be your last attempt."
279msgid "This will be your last attempt."
284msgstr ""
280msgstr ""
285
281
286−#: qml/Shell.qml:310
282+#: qml/Shell.qml:314
287msgid ""
283msgid ""
288"If passphrase is entered incorrectly, your phone will conduct a factory "
284"If passphrase is entered incorrectly, your phone will conduct a factory "
289"reset and all personal data will be deleted."
285"reset and all personal data will be deleted."
290msgstr ""
286msgstr ""
291
287
292−#: qml/Shell.qml:311
288+#: qml/Shell.qml:315
293msgid ""
289msgid ""
294"If passcode is entered incorrectly, your phone will conduct a factory reset "
290"If passcode is entered incorrectly, your phone will conduct a factory reset "
295"and all personal data will be deleted."
291"and all personal data will be deleted."
po/ta.po+33−37
@@ -7,15 +7,15 @@ msgid ""
7msgstr ""
7msgstr ""
8"Project-Id-Version: unity8\n"
8"Project-Id-Version: unity8\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2014-08-13 14:09-0400\n"
10+"POT-Creation-Date: 2014-08-21 11:36+0200\n"
11"PO-Revision-Date: 2013-10-24 11:36+0000\n"
11"PO-Revision-Date: 2013-10-24 11:36+0000\n"
12"Last-Translator: Arun Kumar - அருண் குமார் <thangam.arunx@gmail.com>\n"
12"Last-Translator: Arun Kumar - அருண் குமார் <thangam.arunx@gmail.com>\n"
13"Language-Team: Ubuntu Tamil Team/Free Tamil Computing/Thamizha\n"
13"Language-Team: Ubuntu Tamil Team/Free Tamil Computing/Thamizha\n"
14"MIME-Version: 1.0\n"
14"MIME-Version: 1.0\n"
15"Content-Type: text/plain; charset=UTF-8\n"
15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n"
16"Content-Transfer-Encoding: 8bit\n"
17−"X-Launchpad-Export-Date: 2014-08-15 06:28+0000\n"
17+"X-Launchpad-Export-Date: 2014-08-23 07:17+0000\n"
18−"X-Generator: Launchpad (build 17156)\n"
18+"X-Generator: Launchpad (build 17163)\n"
19"Language: ta\n"
19"Language: ta\n"
20
20
21#: plugins/LightDM/Greeter.cpp:129
21#: plugins/LightDM/Greeter.cpp:129
@@ -95,19 +95,19 @@ msgid ""
95"phone<br><br>Tap on the screen to start"
95"phone<br><br>Tap on the screen to start"
96msgstr ""
96msgstr ""
97
97
98−#: qml/Components/Lockscreen.qml:161
98+#: qml/Components/Lockscreen.qml:167
99−msgid "Too many incorrect attempts"
99+msgid "Please wait"
100msgstr ""
100msgstr ""
101
101
102−#: qml/Components/Lockscreen.qml:163
102+#: qml/Components/Lockscreen.qml:172
103−msgid "Please wait"
103+msgid "Too many incorrect attempts"
104msgstr ""
104msgstr ""
105
105
106−#: qml/Components/Lockscreen.qml:245
106+#: qml/Components/Lockscreen.qml:206
107msgid "Emergency Call"
107msgid "Emergency Call"
108msgstr "அவசர அழைப்பு"
108msgstr "அவசர அழைப்பு"
109
109
110−#: qml/Components/Lockscreen.qml:268
110+#: qml/Components/Lockscreen.qml:226
111msgid "OK"
111msgid "OK"
112msgstr ""
112msgstr ""
113
113
@@ -120,23 +120,15 @@ msgstr "வணக்கம் %1"
120msgid "Hello"
120msgid "Hello"
121msgstr "வணக்கம்"
121msgstr "வணக்கம்"
122
122
123−#: qml/Components/PinLockscreen.qml:197
124−msgid "CANCEL"
125−msgstr ""
126−
127−#: qml/Components/PinLockscreen.qml:215
128−msgid "DONE"
129−msgstr ""
130−
131−#: qml/Dash/GenericScopeView.qml:360
123+#: qml/Dash/GenericScopeView.qml:361
132msgid "See less"
124msgid "See less"
133msgstr ""
125msgstr ""
134
126
135−#: qml/Dash/GenericScopeView.qml:360
127+#: qml/Dash/GenericScopeView.qml:361
136msgid "See all"
128msgid "See all"
137msgstr ""
129msgstr ""
138
130
139−#: qml/Dash/GenericScopeView.qml:423 qml/Panel/SearchIndicator.qml:27
131+#: qml/Dash/GenericScopeView.qml:424 qml/Panel/SearchIndicator.qml:27
140msgid "Search"
132msgid "Search"
141msgstr "தெடு"
133msgstr "தெடு"
142
134
@@ -204,12 +196,16 @@ msgstr "இப்பொது பேசு..."
204msgid "Speaking..."
196msgid "Speaking..."
205msgstr "பேசுகிறது..."
197msgstr "பேசுகிறது..."
206
198
207−#: qml/Notifications/NotificationMenuItemFactory.qml:100
199+#: qml/Notifications/NotificationMenuItemFactory.qml:105
208msgid "Show password"
200msgid "Show password"
209msgstr ""
201msgstr ""
210
202
211−#: qml/Notifications/NotificationMenuItemFactory.qml:115
203+#: qml/Notifications/NotificationMenuItemFactory.qml:120
212−msgid "Please enter SIM PIN"
204+msgid "Enter SIM PIN"
205+msgstr ""
206+
207+#: qml/Notifications/NotificationMenuItemFactory.qml:121 qml/Shell.qml:270
208+msgid "Sorry, incorrect PIN"
213msgstr ""
209msgstr ""
214
210
215#: qml/Panel/ActiveCallHint.qml:77
211#: qml/Panel/ActiveCallHint.qml:77
@@ -252,47 +248,47 @@ msgstr ""
252msgid "Roaming"
248msgid "Roaming"
253msgstr ""
249msgstr ""
254
250
255−#: qml/Shell.qml:267
251+#: qml/Shell.qml:266
256−msgid "passphrase"
252+msgid "Enter your passphrase"
257msgstr ""
253msgstr ""
258
254
259#: qml/Shell.qml:267
255#: qml/Shell.qml:267
260−msgid "passcode"
256+msgid "Sorry, incorrect passphrase"
261msgstr ""
257msgstr ""
262
258
263#: qml/Shell.qml:269
259#: qml/Shell.qml:269
264−#, qt-format
265−msgid "Enter your %1"
260+msgid "Enter your PIN"
266msgstr ""
261msgstr ""
267
262
268−#: qml/Shell.qml:270
263+#: qml/Shell.qml:273
269#, qt-format
264#, qt-format
270−msgid "Incorrect %1"
265+msgid "Enter your %1"
271msgstr ""
266msgstr ""
272
267
273−#: qml/Shell.qml:272
268+#: qml/Shell.qml:274
274−msgid "Please re-enter"
269+#, qt-format
270+msgid "Sorry, incorrect %1"
275msgstr ""
271msgstr ""
276
272
277−#: qml/Shell.qml:306
273+#: qml/Shell.qml:310
278msgid "Sorry, incorrect passphrase."
274msgid "Sorry, incorrect passphrase."
279msgstr ""
275msgstr ""
280
276
281−#: qml/Shell.qml:307
277+#: qml/Shell.qml:311
282msgid "Sorry, incorrect passcode."
278msgid "Sorry, incorrect passcode."
283msgstr ""
279msgstr ""
284
280
285−#: qml/Shell.qml:308
281+#: qml/Shell.qml:312
286msgid "This will be your last attempt."
282msgid "This will be your last attempt."
287msgstr ""
283msgstr ""
288
284
289−#: qml/Shell.qml:310
285+#: qml/Shell.qml:314
290msgid ""
286msgid ""
291"If passphrase is entered incorrectly, your phone will conduct a factory "
287"If passphrase is entered incorrectly, your phone will conduct a factory "
292"reset and all personal data will be deleted."
288"reset and all personal data will be deleted."
293msgstr ""
289msgstr ""
294
290
295−#: qml/Shell.qml:311
291+#: qml/Shell.qml:315
296msgid ""
292msgid ""
297"If passcode is entered incorrectly, your phone will conduct a factory reset "
293"If passcode is entered incorrectly, your phone will conduct a factory reset "
298"and all personal data will be deleted."
294"and all personal data will be deleted."
po/te.po+43−38
@@ -7,15 +7,15 @@ msgid ""
7msgstr ""
7msgstr ""
8"Project-Id-Version: unity\n"
8"Project-Id-Version: unity\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2014-08-13 14:09-0400\n"
10+"POT-Creation-Date: 2014-08-21 11:36+0200\n"
11"PO-Revision-Date: 2014-07-19 10:04+0000\n"
11"PO-Revision-Date: 2014-07-19 10:04+0000\n"
12"Last-Translator: Praveen Illa <mail2ipn@gmail.com>\n"
12"Last-Translator: Praveen Illa <mail2ipn@gmail.com>\n"
13"Language-Team: Telugu <te@li.org>\n"
13"Language-Team: Telugu <te@li.org>\n"
14"MIME-Version: 1.0\n"
14"MIME-Version: 1.0\n"
15"Content-Type: text/plain; charset=UTF-8\n"
15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n"
16"Content-Transfer-Encoding: 8bit\n"
17−"X-Launchpad-Export-Date: 2014-08-15 06:28+0000\n"
17+"X-Launchpad-Export-Date: 2014-08-23 07:17+0000\n"
18−"X-Generator: Launchpad (build 17156)\n"
18+"X-Generator: Launchpad (build 17163)\n"
19
19
20#: plugins/LightDM/Greeter.cpp:129
20#: plugins/LightDM/Greeter.cpp:129
21msgid "Password: "
21msgid "Password: "
@@ -92,19 +92,19 @@ msgid ""
92"phone<br><br>Tap on the screen to start"
92"phone<br><br>Tap on the screen to start"
93msgstr ""
93msgstr ""
94
94
95−#: qml/Components/Lockscreen.qml:161
95+#: qml/Components/Lockscreen.qml:167
96−msgid "Too many incorrect attempts"
96+msgid "Please wait"
97msgstr ""
97msgstr ""
98
98
99−#: qml/Components/Lockscreen.qml:163
99+#: qml/Components/Lockscreen.qml:172
100−msgid "Please wait"
100+msgid "Too many incorrect attempts"
101msgstr ""
101msgstr ""
102
102
103−#: qml/Components/Lockscreen.qml:245
103+#: qml/Components/Lockscreen.qml:206
104msgid "Emergency Call"
104msgid "Emergency Call"
105msgstr "అత్యవసర పిలుపు"
105msgstr "అత్యవసర పిలుపు"
106
106
107−#: qml/Components/Lockscreen.qml:268
107+#: qml/Components/Lockscreen.qml:226
108msgid "OK"
108msgid "OK"
109msgstr "సరే"
109msgstr "సరే"
110
110
@@ -117,23 +117,15 @@ msgstr "హలో %1"
117msgid "Hello"
117msgid "Hello"
118msgstr "హలో"
118msgstr "హలో"
119
119
120−#: qml/Components/PinLockscreen.qml:197
121−msgid "CANCEL"
122−msgstr "రద్దుచేయి"
123−
124−#: qml/Components/PinLockscreen.qml:215
125−msgid "DONE"
126−msgstr "పూర్తయ్యింది"
127−
128−#: qml/Dash/GenericScopeView.qml:360
120+#: qml/Dash/GenericScopeView.qml:361
129msgid "See less"
121msgid "See less"
130msgstr ""
122msgstr ""
131
123
132−#: qml/Dash/GenericScopeView.qml:360
124+#: qml/Dash/GenericScopeView.qml:361
133msgid "See all"
125msgid "See all"
134msgstr ""
126msgstr ""
135
127
136−#: qml/Dash/GenericScopeView.qml:423 qml/Panel/SearchIndicator.qml:27
128+#: qml/Dash/GenericScopeView.qml:424 qml/Panel/SearchIndicator.qml:27
137msgid "Search"
129msgid "Search"
138msgstr "వెతుకు"
130msgstr "వెతుకు"
139
131
@@ -201,13 +193,17 @@ msgstr "ఇప్పుడు మాట్లాడండి..."
201msgid "Speaking..."
193msgid "Speaking..."
202msgstr "మాట్లాడుతున్నారు..."
194msgstr "మాట్లాడుతున్నారు..."
203
195
204−#: qml/Notifications/NotificationMenuItemFactory.qml:100
196+#: qml/Notifications/NotificationMenuItemFactory.qml:105
205msgid "Show password"
197msgid "Show password"
206msgstr "సంకేతపదాన్ని చూపించు"
198msgstr "సంకేతపదాన్ని చూపించు"
207
199
208−#: qml/Notifications/NotificationMenuItemFactory.qml:115
200+#: qml/Notifications/NotificationMenuItemFactory.qml:120
209−msgid "Please enter SIM PIN"
201+msgid "Enter SIM PIN"
210−msgstr "దయచేసి సిమ్ పిన్ ఇవ్వండి"
202+msgstr ""
203+
204+#: qml/Notifications/NotificationMenuItemFactory.qml:121 qml/Shell.qml:270
205+msgid "Sorry, incorrect PIN"
206+msgstr ""
211
207
212#: qml/Panel/ActiveCallHint.qml:77
208#: qml/Panel/ActiveCallHint.qml:77
213msgid "Tap to return to call..."
209msgid "Tap to return to call..."
@@ -249,48 +245,57 @@ msgstr ""
249msgid "Roaming"
245msgid "Roaming"
250msgstr ""
246msgstr ""
251
247
252−#: qml/Shell.qml:267
248+#: qml/Shell.qml:266
253−msgid "passphrase"
249+msgid "Enter your passphrase"
254msgstr ""
250msgstr ""
255
251
256#: qml/Shell.qml:267
252#: qml/Shell.qml:267
257−msgid "passcode"
253+msgid "Sorry, incorrect passphrase"
258msgstr ""
254msgstr ""
259
255
260#: qml/Shell.qml:269
256#: qml/Shell.qml:269
261−#, qt-format
262−msgid "Enter your %1"
257+msgid "Enter your PIN"
263msgstr ""
258msgstr ""
264
259
265−#: qml/Shell.qml:270
260+#: qml/Shell.qml:273
266#, qt-format
261#, qt-format
267−msgid "Incorrect %1"
262+msgid "Enter your %1"
268msgstr ""
263msgstr ""
269
264
270−#: qml/Shell.qml:272
265+#: qml/Shell.qml:274
271−msgid "Please re-enter"
266+#, qt-format
267+msgid "Sorry, incorrect %1"
272msgstr ""
268msgstr ""
273
269
274−#: qml/Shell.qml:306
270+#: qml/Shell.qml:310
275msgid "Sorry, incorrect passphrase."
271msgid "Sorry, incorrect passphrase."
276msgstr ""
272msgstr ""
277
273
278−#: qml/Shell.qml:307
274+#: qml/Shell.qml:311
279msgid "Sorry, incorrect passcode."
275msgid "Sorry, incorrect passcode."
280msgstr ""
276msgstr ""
281
277
282−#: qml/Shell.qml:308
278+#: qml/Shell.qml:312
283msgid "This will be your last attempt."
279msgid "This will be your last attempt."
284msgstr ""
280msgstr ""
285
281
286−#: qml/Shell.qml:310
282+#: qml/Shell.qml:314
287msgid ""
283msgid ""
288"If passphrase is entered incorrectly, your phone will conduct a factory "
284"If passphrase is entered incorrectly, your phone will conduct a factory "
289"reset and all personal data will be deleted."
285"reset and all personal data will be deleted."
290msgstr ""
286msgstr ""
291
287
292−#: qml/Shell.qml:311
288+#: qml/Shell.qml:315
293msgid ""
289msgid ""
294"If passcode is entered incorrectly, your phone will conduct a factory reset "
290"If passcode is entered incorrectly, your phone will conduct a factory reset "
295"and all personal data will be deleted."
291"and all personal data will be deleted."
296msgstr ""
292msgstr ""
293+
294+#~ msgid "CANCEL"
295+#~ msgstr "రద్దుచేయి"
296+
297+#~ msgid "DONE"
298+#~ msgstr "పూర్తయ్యింది"
299+
300+#~ msgid "Please enter SIM PIN"
301+#~ msgstr "దయచేసి సిమ్ పిన్ ఇవ్వండి"
po/tr.po+43−38
@@ -7,15 +7,15 @@ msgid ""
7msgstr ""
7msgstr ""
8"Project-Id-Version: unity\n"
8"Project-Id-Version: unity\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2014-08-13 14:09-0400\n"
10+"POT-Creation-Date: 2014-08-21 11:36+0200\n"
11"PO-Revision-Date: 2014-07-16 17:58+0000\n"
11"PO-Revision-Date: 2014-07-16 17:58+0000\n"
12"Last-Translator: Volkan Gezer <Unknown>\n"
12"Last-Translator: Volkan Gezer <Unknown>\n"
13"Language-Team: Turkish <tr@li.org>\n"
13"Language-Team: Turkish <tr@li.org>\n"
14"MIME-Version: 1.0\n"
14"MIME-Version: 1.0\n"
15"Content-Type: text/plain; charset=UTF-8\n"
15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n"
16"Content-Transfer-Encoding: 8bit\n"
17−"X-Launchpad-Export-Date: 2014-08-15 06:28+0000\n"
17+"X-Launchpad-Export-Date: 2014-08-23 07:17+0000\n"
18−"X-Generator: Launchpad (build 17156)\n"
18+"X-Generator: Launchpad (build 17163)\n"
19
19
20#: plugins/LightDM/Greeter.cpp:129
20#: plugins/LightDM/Greeter.cpp:129
21msgid "Password: "
21msgid "Password: "
@@ -95,19 +95,19 @@ msgstr ""
95"Kenar haraketlerini öğrendiniz ve telefonu kullanmaya "
95"Kenar haraketlerini öğrendiniz ve telefonu kullanmaya "
96"başlayabilirsiniz<br><br>Başlamak için ekrana dokunun"
96"başlayabilirsiniz<br><br>Başlamak için ekrana dokunun"
97
97
98−#: qml/Components/Lockscreen.qml:161
98+#: qml/Components/Lockscreen.qml:167
99−msgid "Too many incorrect attempts"
99+msgid "Please wait"
100msgstr ""
100msgstr ""
101
101
102−#: qml/Components/Lockscreen.qml:163
102+#: qml/Components/Lockscreen.qml:172
103−msgid "Please wait"
103+msgid "Too many incorrect attempts"
104msgstr ""
104msgstr ""
105
105
106−#: qml/Components/Lockscreen.qml:245
106+#: qml/Components/Lockscreen.qml:206
107msgid "Emergency Call"
107msgid "Emergency Call"
108msgstr "Acil Arama"
108msgstr "Acil Arama"
109
109
110−#: qml/Components/Lockscreen.qml:268
110+#: qml/Components/Lockscreen.qml:226
111msgid "OK"
111msgid "OK"
112msgstr "Tamam"
112msgstr "Tamam"
113
113
@@ -120,23 +120,15 @@ msgstr "Merhaba %1"
120msgid "Hello"
120msgid "Hello"
121msgstr "Merhaba"
121msgstr "Merhaba"
122
122
123−#: qml/Components/PinLockscreen.qml:197
124−msgid "CANCEL"
125−msgstr "İPTAL"
126−
127−#: qml/Components/PinLockscreen.qml:215
128−msgid "DONE"
129−msgstr "BİTTİ"
130−
131−#: qml/Dash/GenericScopeView.qml:360
123+#: qml/Dash/GenericScopeView.qml:361
132msgid "See less"
124msgid "See less"
133msgstr "Daha azını gör"
125msgstr "Daha azını gör"
134
126
135−#: qml/Dash/GenericScopeView.qml:360
127+#: qml/Dash/GenericScopeView.qml:361
136msgid "See all"
128msgid "See all"
137msgstr ""
129msgstr ""
138
130
139−#: qml/Dash/GenericScopeView.qml:423 qml/Panel/SearchIndicator.qml:27
131+#: qml/Dash/GenericScopeView.qml:424 qml/Panel/SearchIndicator.qml:27
140msgid "Search"
132msgid "Search"
141msgstr "Ara"
133msgstr "Ara"
142
134
@@ -204,13 +196,17 @@ msgstr "Şimdi Konuşun..."
204msgid "Speaking..."
196msgid "Speaking..."
205msgstr "Konuşuyor..."
197msgstr "Konuşuyor..."
206
198
207−#: qml/Notifications/NotificationMenuItemFactory.qml:100
199+#: qml/Notifications/NotificationMenuItemFactory.qml:105
208msgid "Show password"
200msgid "Show password"
209msgstr "Parolayı göster"
201msgstr "Parolayı göster"
210
202
211−#: qml/Notifications/NotificationMenuItemFactory.qml:115
203+#: qml/Notifications/NotificationMenuItemFactory.qml:120
212−msgid "Please enter SIM PIN"
204+msgid "Enter SIM PIN"
213−msgstr "Lütfen SIM PIN'inizi girin"
205+msgstr ""
206+
207+#: qml/Notifications/NotificationMenuItemFactory.qml:121 qml/Shell.qml:270
208+msgid "Sorry, incorrect PIN"
209+msgstr ""
214
210
215#: qml/Panel/ActiveCallHint.qml:77
211#: qml/Panel/ActiveCallHint.qml:77
216msgid "Tap to return to call..."
212msgid "Tap to return to call..."
@@ -252,48 +248,57 @@ msgstr ""
252msgid "Roaming"
248msgid "Roaming"
253msgstr ""
249msgstr ""
254
250
255−#: qml/Shell.qml:267
251+#: qml/Shell.qml:266
256−msgid "passphrase"
252+msgid "Enter your passphrase"
257msgstr ""
253msgstr ""
258
254
259#: qml/Shell.qml:267
255#: qml/Shell.qml:267
260−msgid "passcode"
256+msgid "Sorry, incorrect passphrase"
261msgstr ""
257msgstr ""
262
258
263#: qml/Shell.qml:269
259#: qml/Shell.qml:269
264−#, qt-format
265−msgid "Enter your %1"
260+msgid "Enter your PIN"
266msgstr ""
261msgstr ""
267
262
268−#: qml/Shell.qml:270
263+#: qml/Shell.qml:273
269#, qt-format
264#, qt-format
270−msgid "Incorrect %1"
265+msgid "Enter your %1"
271msgstr ""
266msgstr ""
272
267
273−#: qml/Shell.qml:272
268+#: qml/Shell.qml:274
274−msgid "Please re-enter"
269+#, qt-format
270+msgid "Sorry, incorrect %1"
275msgstr ""
271msgstr ""
276
272
277−#: qml/Shell.qml:306
273+#: qml/Shell.qml:310
278msgid "Sorry, incorrect passphrase."
274msgid "Sorry, incorrect passphrase."
279msgstr ""
275msgstr ""
280
276
281−#: qml/Shell.qml:307
277+#: qml/Shell.qml:311
282msgid "Sorry, incorrect passcode."
278msgid "Sorry, incorrect passcode."
283msgstr ""
279msgstr ""
284
280
285−#: qml/Shell.qml:308
281+#: qml/Shell.qml:312
286msgid "This will be your last attempt."
282msgid "This will be your last attempt."
287msgstr ""
283msgstr ""
288
284
289−#: qml/Shell.qml:310
285+#: qml/Shell.qml:314
290msgid ""
286msgid ""
291"If passphrase is entered incorrectly, your phone will conduct a factory "
287"If passphrase is entered incorrectly, your phone will conduct a factory "
292"reset and all personal data will be deleted."
288"reset and all personal data will be deleted."
293msgstr ""
289msgstr ""
294
290
295−#: qml/Shell.qml:311
291+#: qml/Shell.qml:315
296msgid ""
292msgid ""
297"If passcode is entered incorrectly, your phone will conduct a factory reset "
293"If passcode is entered incorrectly, your phone will conduct a factory reset "
298"and all personal data will be deleted."
294"and all personal data will be deleted."
299msgstr ""
295msgstr ""
296+
297+#~ msgid "Please enter SIM PIN"
298+#~ msgstr "Lütfen SIM PIN'inizi girin"
299+
300+#~ msgid "CANCEL"
301+#~ msgstr "İPTAL"
302+
303+#~ msgid "DONE"
304+#~ msgstr "BİTTİ"
po/ug.po+43−38
@@ -7,15 +7,15 @@ msgid ""
7msgstr ""
7msgstr ""
8"Project-Id-Version: unity\n"
8"Project-Id-Version: unity\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2014-08-13 14:09-0400\n"
10+"POT-Creation-Date: 2014-08-21 11:36+0200\n"
11"PO-Revision-Date: 2014-07-29 04:06+0000\n"
11"PO-Revision-Date: 2014-07-29 04:06+0000\n"
12"Last-Translator: Gheyret T.Kenji <Unknown>\n"
12"Last-Translator: Gheyret T.Kenji <Unknown>\n"
13"Language-Team: Uyghur Computer Science Association <UKIJ@yahoogroups.com>\n"
13"Language-Team: Uyghur Computer Science Association <UKIJ@yahoogroups.com>\n"
14"MIME-Version: 1.0\n"
14"MIME-Version: 1.0\n"
15"Content-Type: text/plain; charset=UTF-8\n"
15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n"
16"Content-Transfer-Encoding: 8bit\n"
17−"X-Launchpad-Export-Date: 2014-08-15 06:28+0000\n"
17+"X-Launchpad-Export-Date: 2014-08-23 07:17+0000\n"
18−"X-Generator: Launchpad (build 17156)\n"
18+"X-Generator: Launchpad (build 17163)\n"
19
19
20#: plugins/LightDM/Greeter.cpp:129
20#: plugins/LightDM/Greeter.cpp:129
21msgid "Password: "
21msgid "Password: "
@@ -94,19 +94,19 @@ msgstr ""
94"ئېكراننى چېكىپ باشلاڭ<br><br>سىز ھازىر گىرۋەك بارماق ئىشارەتلىرىنى ئىگىلەپ "
94"ئېكراننى چېكىپ باشلاڭ<br><br>سىز ھازىر گىرۋەك بارماق ئىشارەتلىرىنى ئىگىلەپ "
95"بولدىڭىز،ئەمدى تېلېفوننى ئىشلىتىشنى باشلىسىڭىز بولىدۇ"
95"بولدىڭىز،ئەمدى تېلېفوننى ئىشلىتىشنى باشلىسىڭىز بولىدۇ"
96
96
97−#: qml/Components/Lockscreen.qml:161
97+#: qml/Components/Lockscreen.qml:167
98−msgid "Too many incorrect attempts"
98+msgid "Please wait"
99msgstr ""
99msgstr ""
100
100
101−#: qml/Components/Lockscreen.qml:163
101+#: qml/Components/Lockscreen.qml:172
102−msgid "Please wait"
102+msgid "Too many incorrect attempts"
103msgstr ""
103msgstr ""
104
104
105−#: qml/Components/Lockscreen.qml:245
105+#: qml/Components/Lockscreen.qml:206
106msgid "Emergency Call"
106msgid "Emergency Call"
107msgstr "جىددىي تېلېفون"
107msgstr "جىددىي تېلېفون"
108
108
109−#: qml/Components/Lockscreen.qml:268
109+#: qml/Components/Lockscreen.qml:226
110msgid "OK"
110msgid "OK"
111msgstr "تامام"
111msgstr "تامام"
112
112
@@ -119,23 +119,15 @@ msgstr "سالام %1"
119msgid "Hello"
119msgid "Hello"
120msgstr "ئەسسالامۇئەلەيكۇم"
120msgstr "ئەسسالامۇئەلەيكۇم"
121
121
122−#: qml/Components/PinLockscreen.qml:197
123−msgid "CANCEL"
124−msgstr "ۋاز كەچ"
125−
126−#: qml/Components/PinLockscreen.qml:215
127−msgid "DONE"
128−msgstr "تامام"
129−
130−#: qml/Dash/GenericScopeView.qml:360
122+#: qml/Dash/GenericScopeView.qml:361
131msgid "See less"
123msgid "See less"
132msgstr "ئازراق كۆرۈش"
124msgstr "ئازراق كۆرۈش"
133
125
134−#: qml/Dash/GenericScopeView.qml:360
126+#: qml/Dash/GenericScopeView.qml:361
135msgid "See all"
127msgid "See all"
136msgstr "ھەممىنى كۆرۈش…"
128msgstr "ھەممىنى كۆرۈش…"
137
129
138−#: qml/Dash/GenericScopeView.qml:423 qml/Panel/SearchIndicator.qml:27
130+#: qml/Dash/GenericScopeView.qml:424 qml/Panel/SearchIndicator.qml:27
139msgid "Search"
131msgid "Search"
140msgstr "ئىزدە"
132msgstr "ئىزدە"
141
133
@@ -203,13 +195,17 @@ msgstr "ئەمدى سۆزلەڭ…"
203msgid "Speaking..."
195msgid "Speaking..."
204msgstr "سۆزلەۋاتىسىز…"
196msgstr "سۆزلەۋاتىسىز…"
205
197
206−#: qml/Notifications/NotificationMenuItemFactory.qml:100
198+#: qml/Notifications/NotificationMenuItemFactory.qml:105
207msgid "Show password"
199msgid "Show password"
208msgstr "ئىم كۆرسەت"
200msgstr "ئىم كۆرسەت"
209
201
210−#: qml/Notifications/NotificationMenuItemFactory.qml:115
202+#: qml/Notifications/NotificationMenuItemFactory.qml:120
211−msgid "Please enter SIM PIN"
203+msgid "Enter SIM PIN"
212−msgstr "سىم(SIM) كارتىڭىزنىڭ PIN نومۇرىنى كىرگۈزۈڭ"
204+msgstr ""
205+
206+#: qml/Notifications/NotificationMenuItemFactory.qml:121 qml/Shell.qml:270
207+msgid "Sorry, incorrect PIN"
208+msgstr ""
213
209
214#: qml/Panel/ActiveCallHint.qml:77
210#: qml/Panel/ActiveCallHint.qml:77
215msgid "Tap to return to call..."
211msgid "Tap to return to call..."
@@ -251,48 +247,57 @@ msgstr ""
251msgid "Roaming"
247msgid "Roaming"
252msgstr ""
248msgstr ""
253
249
254−#: qml/Shell.qml:267
250+#: qml/Shell.qml:266
255−msgid "passphrase"
251+msgid "Enter your passphrase"
256msgstr ""
252msgstr ""
257
253
258#: qml/Shell.qml:267
254#: qml/Shell.qml:267
259−msgid "passcode"
255+msgid "Sorry, incorrect passphrase"
260msgstr ""
256msgstr ""
261
257
262#: qml/Shell.qml:269
258#: qml/Shell.qml:269
263−#, qt-format
259+msgid "Enter your PIN"
264−msgid "Enter your %1"
265msgstr ""
260msgstr ""
266
261
267−#: qml/Shell.qml:270
262+#: qml/Shell.qml:273
268#, qt-format
263#, qt-format
269−msgid "Incorrect %1"
264+msgid "Enter your %1"
270msgstr ""
265msgstr ""
271
266
272−#: qml/Shell.qml:272
267+#: qml/Shell.qml:274
273−msgid "Please re-enter"
268+#, qt-format
269+msgid "Sorry, incorrect %1"
274msgstr ""
270msgstr ""
275
271
276−#: qml/Shell.qml:306
272+#: qml/Shell.qml:310
277msgid "Sorry, incorrect passphrase."
273msgid "Sorry, incorrect passphrase."
278msgstr ""
274msgstr ""
279
275
280−#: qml/Shell.qml:307
276+#: qml/Shell.qml:311
281msgid "Sorry, incorrect passcode."
277msgid "Sorry, incorrect passcode."
282msgstr ""
278msgstr ""
283
279
284−#: qml/Shell.qml:308
280+#: qml/Shell.qml:312
285msgid "This will be your last attempt."
281msgid "This will be your last attempt."
286msgstr ""
282msgstr ""
287
283
288−#: qml/Shell.qml:310
284+#: qml/Shell.qml:314
289msgid ""
285msgid ""
290"If passphrase is entered incorrectly, your phone will conduct a factory "
286"If passphrase is entered incorrectly, your phone will conduct a factory "
291"reset and all personal data will be deleted."
287"reset and all personal data will be deleted."
292msgstr ""
288msgstr ""
293
289
294−#: qml/Shell.qml:311
290+#: qml/Shell.qml:315
295msgid ""
291msgid ""
296"If passcode is entered incorrectly, your phone will conduct a factory reset "
292"If passcode is entered incorrectly, your phone will conduct a factory reset "
297"and all personal data will be deleted."
293"and all personal data will be deleted."
298msgstr ""
294msgstr ""
295+
296+#~ msgid "CANCEL"
297+#~ msgstr "ۋاز كەچ"
298+
299+#~ msgid "DONE"
300+#~ msgstr "تامام"
301+
302+#~ msgid "Please enter SIM PIN"
303+#~ msgstr "سىم(SIM) كارتىڭىزنىڭ PIN نومۇرىنى كىرگۈزۈڭ"
po/uk.po+60−42
@@ -7,15 +7,15 @@ msgid ""
7msgstr ""
7msgstr ""
8"Project-Id-Version: unity\n"
8"Project-Id-Version: unity\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2014-08-13 14:09-0400\n"
10+"POT-Creation-Date: 2014-08-21 11:36+0200\n"
11"PO-Revision-Date: 2014-08-17 14:49+0000\n"
11"PO-Revision-Date: 2014-08-17 14:49+0000\n"
12"Last-Translator: Yuri Chornoivan <yurchor@gmail.com>\n"
12"Last-Translator: Yuri Chornoivan <yurchor@gmail.com>\n"
13"Language-Team: Ukrainian <uk@li.org>\n"
13"Language-Team: Ukrainian <uk@li.org>\n"
14"MIME-Version: 1.0\n"
14"MIME-Version: 1.0\n"
15"Content-Type: text/plain; charset=UTF-8\n"
15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n"
16"Content-Transfer-Encoding: 8bit\n"
17−"X-Launchpad-Export-Date: 2014-08-18 07:20+0000\n"
17+"X-Launchpad-Export-Date: 2014-08-23 07:17+0000\n"
18−"X-Generator: Launchpad (build 17156)\n"
18+"X-Generator: Launchpad (build 17163)\n"
19
19
20#: plugins/LightDM/Greeter.cpp:129
20#: plugins/LightDM/Greeter.cpp:129
21msgid "Password: "
21msgid "Password: "
@@ -97,19 +97,19 @@ msgstr ""
97"Вами налаштовано дії у відповідь на дотики на краях екрана. Тепер телефоном "
97"Вами налаштовано дії у відповідь на дотики на краях екрана. Тепер телефоном "
98"можна користуватися.<br><br>Торкніться екрана, щоб розпочати."
98"можна користуватися.<br><br>Торкніться екрана, щоб розпочати."
99
99
100−#: qml/Components/Lockscreen.qml:161
100+#: qml/Components/Lockscreen.qml:167
101−msgid "Too many incorrect attempts"
102−msgstr "Забагато помилкових спроб"
103−
104−#: qml/Components/Lockscreen.qml:163
105msgid "Please wait"
101msgid "Please wait"
106msgstr "Будь ласка, зачекайте"
102msgstr "Будь ласка, зачекайте"
107
103
108−#: qml/Components/Lockscreen.qml:245
104+#: qml/Components/Lockscreen.qml:172
105+msgid "Too many incorrect attempts"
106+msgstr "Забагато помилкових спроб"
107+
108+#: qml/Components/Lockscreen.qml:206
109msgid "Emergency Call"
109msgid "Emergency Call"
110msgstr "Терміновий виклик"
110msgstr "Терміновий виклик"
111
111
112−#: qml/Components/Lockscreen.qml:268
112+#: qml/Components/Lockscreen.qml:226
113msgid "OK"
113msgid "OK"
114msgstr "Гаразд"
114msgstr "Гаразд"
115
115
@@ -122,23 +122,15 @@ msgstr "Привіт, %1"
122msgid "Hello"
122msgid "Hello"
123msgstr "Привіт!"
123msgstr "Привіт!"
124
124
125−#: qml/Components/PinLockscreen.qml:197
125+#: qml/Dash/GenericScopeView.qml:361
126−msgid "CANCEL"
127−msgstr "Скасувати"
128−
129−#: qml/Components/PinLockscreen.qml:215
130−msgid "DONE"
131−msgstr "Виконано"
132−
133−#: qml/Dash/GenericScopeView.qml:360
134msgid "See less"
126msgid "See less"
135msgstr "Стисліше"
127msgstr "Стисліше"
136
128
137−#: qml/Dash/GenericScopeView.qml:360
129+#: qml/Dash/GenericScopeView.qml:361
138msgid "See all"
130msgid "See all"
139msgstr "Детальніше"
131msgstr "Детальніше"
140
132
141−#: qml/Dash/GenericScopeView.qml:423 qml/Panel/SearchIndicator.qml:27
133+#: qml/Dash/GenericScopeView.qml:424 qml/Panel/SearchIndicator.qml:27
142msgid "Search"
134msgid "Search"
143msgstr "Пошук"
135msgstr "Пошук"
144
136
@@ -206,13 +198,17 @@ msgstr "Можна говорити…"
206msgid "Speaking..."
198msgid "Speaking..."
207msgstr "Мовлення…"
199msgstr "Мовлення…"
208
200
209−#: qml/Notifications/NotificationMenuItemFactory.qml:100
201+#: qml/Notifications/NotificationMenuItemFactory.qml:105
210msgid "Show password"
202msgid "Show password"
211msgstr "Показати пароль"
203msgstr "Показати пароль"
212
204
213−#: qml/Notifications/NotificationMenuItemFactory.qml:115
205+#: qml/Notifications/NotificationMenuItemFactory.qml:120
214−msgid "Please enter SIM PIN"
206+msgid "Enter SIM PIN"
215−msgstr "Введіть PIN-код SIM-картки"
207+msgstr ""
208+
209+#: qml/Notifications/NotificationMenuItemFactory.qml:121 qml/Shell.qml:270
210+msgid "Sorry, incorrect PIN"
211+msgstr ""
216
212
217#: qml/Panel/ActiveCallHint.qml:77
213#: qml/Panel/ActiveCallHint.qml:77
218msgid "Tap to return to call..."
214msgid "Tap to return to call..."
@@ -254,41 +250,41 @@ msgstr "Розблокувати SIM"
254msgid "Roaming"
250msgid "Roaming"
255msgstr "Роумінг"
251msgstr "Роумінг"
256
252
257−#: qml/Shell.qml:267
253+#: qml/Shell.qml:266
258−msgid "passphrase"
254+msgid "Enter your passphrase"
259−msgstr "пароль"
255+msgstr ""
260
256
261#: qml/Shell.qml:267
257#: qml/Shell.qml:267
262−msgid "passcode"
258+msgid "Sorry, incorrect passphrase"
263−msgstr "код-пароль"
259+msgstr ""
264
260
265#: qml/Shell.qml:269
261#: qml/Shell.qml:269
262+msgid "Enter your PIN"
263+msgstr ""
264+
265+#: qml/Shell.qml:273
266#, qt-format
266#, qt-format
267msgid "Enter your %1"
267msgid "Enter your %1"
268msgstr "Вкажіть ваш %1"
268msgstr "Вкажіть ваш %1"
269
269
270−#: qml/Shell.qml:270
270+#: qml/Shell.qml:274
271#, qt-format
271#, qt-format
272−msgid "Incorrect %1"
272+msgid "Sorry, incorrect %1"
273−msgstr "Помилковий %1"
273+msgstr ""
274−
275−#: qml/Shell.qml:272
276−msgid "Please re-enter"
277−msgstr "Будь ласка, вкажіть ще раз"
278
274
279−#: qml/Shell.qml:306
275+#: qml/Shell.qml:310
280msgid "Sorry, incorrect passphrase."
276msgid "Sorry, incorrect passphrase."
281msgstr "Вибачте, помилковий пароль."
277msgstr "Вибачте, помилковий пароль."
282
278
283−#: qml/Shell.qml:307
279+#: qml/Shell.qml:311
284msgid "Sorry, incorrect passcode."
280msgid "Sorry, incorrect passcode."
285msgstr "Вибачте, помилковий код-пароль."
281msgstr "Вибачте, помилковий код-пароль."
286
282
287−#: qml/Shell.qml:308
283+#: qml/Shell.qml:312
288msgid "This will be your last attempt."
284msgid "This will be your last attempt."
289msgstr "Ця спроба буде останньою."
285msgstr "Ця спроба буде останньою."
290
286
291−#: qml/Shell.qml:310
287+#: qml/Shell.qml:314
292msgid ""
288msgid ""
293"If passphrase is entered incorrectly, your phone will conduct a factory "
289"If passphrase is entered incorrectly, your phone will conduct a factory "
294"reset and all personal data will be deleted."
290"reset and all personal data will be deleted."
@@ -296,10 +292,32 @@ msgstr ""
296"Якщо пароль буде вказано неправильно, телефон повернеться до початкового "
292"Якщо пароль буде вказано неправильно, телефон повернеться до початкового "
297"стану, усі особисті дані буде вилучено."
293"стану, усі особисті дані буде вилучено."
298
294
299−#: qml/Shell.qml:311
295+#: qml/Shell.qml:315
300msgid ""
296msgid ""
301"If passcode is entered incorrectly, your phone will conduct a factory reset "
297"If passcode is entered incorrectly, your phone will conduct a factory reset "
302"and all personal data will be deleted."
298"and all personal data will be deleted."
303msgstr ""
299msgstr ""
304"Якщо код-пароль буде вказано неправильно, телефон повернеться до початкового "
300"Якщо код-пароль буде вказано неправильно, телефон повернеться до початкового "
305"стану, усі особисті дані буде вилучено."
301"стану, усі особисті дані буде вилучено."
302+
303+#~ msgid "Please enter SIM PIN"
304+#~ msgstr "Введіть PIN-код SIM-картки"
305+
306+#~ msgid "DONE"
307+#~ msgstr "Виконано"
308+
309+#~ msgid "CANCEL"
310+#~ msgstr "Скасувати"
311+
312+#~ msgid "passphrase"
313+#~ msgstr "пароль"
314+
315+#, qt-format
316+#~ msgid "Incorrect %1"
317+#~ msgstr "Помилковий %1"
318+
319+#~ msgid "Please re-enter"
320+#~ msgstr "Будь ласка, вкажіть ще раз"
321+
322+#~ msgid "passcode"
323+#~ msgstr "код-пароль"
po/unity8.pot+31−35
@@ -8,7 +8,7 @@ msgid ""
8msgstr ""
8msgstr ""
9"Project-Id-Version: unity8\n"
9"Project-Id-Version: unity8\n"
10"Report-Msgid-Bugs-To: \n"
10"Report-Msgid-Bugs-To: \n"
11−"POT-Creation-Date: 2014-08-13 14:09-0400\n"
11+"POT-Creation-Date: 2014-08-21 11:36+0200\n"
12"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
12"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
13"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
13"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
14"Language-Team: LANGUAGE <LL@li.org>\n"
14"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -92,19 +92,19 @@ msgid ""
92"phone<br><br>Tap on the screen to start"
92"phone<br><br>Tap on the screen to start"
93msgstr ""
93msgstr ""
94
94
95−#: qml/Components/Lockscreen.qml:161
95+#: qml/Components/Lockscreen.qml:167
96−msgid "Too many incorrect attempts"
96+msgid "Please wait"
97msgstr ""
97msgstr ""
98
98
99−#: qml/Components/Lockscreen.qml:163
99+#: qml/Components/Lockscreen.qml:172
100−msgid "Please wait"
100+msgid "Too many incorrect attempts"
101msgstr ""
101msgstr ""
102
102
103−#: qml/Components/Lockscreen.qml:245
103+#: qml/Components/Lockscreen.qml:206
104msgid "Emergency Call"
104msgid "Emergency Call"
105msgstr ""
105msgstr ""
106
106
107−#: qml/Components/Lockscreen.qml:268
107+#: qml/Components/Lockscreen.qml:226
108msgid "OK"
108msgid "OK"
109msgstr ""
109msgstr ""
110
110
@@ -117,23 +117,15 @@ msgstr ""
117msgid "Hello"
117msgid "Hello"
118msgstr ""
118msgstr ""
119
119
120−#: qml/Components/PinLockscreen.qml:197
120+#: qml/Dash/GenericScopeView.qml:361
121−msgid "CANCEL"
122−msgstr ""
123−
124−#: qml/Components/PinLockscreen.qml:215
125−msgid "DONE"
126−msgstr ""
127−
128−#: qml/Dash/GenericScopeView.qml:360
129msgid "See less"
121msgid "See less"
130msgstr ""
122msgstr ""
131
123
132−#: qml/Dash/GenericScopeView.qml:360
124+#: qml/Dash/GenericScopeView.qml:361
133msgid "See all"
125msgid "See all"
134msgstr ""
126msgstr ""
135
127
136−#: qml/Dash/GenericScopeView.qml:423 qml/Panel/SearchIndicator.qml:27
128+#: qml/Dash/GenericScopeView.qml:424 qml/Panel/SearchIndicator.qml:27
137msgid "Search"
129msgid "Search"
138msgstr ""
130msgstr ""
139
131
@@ -201,12 +193,16 @@ msgstr ""
201msgid "Speaking..."
193msgid "Speaking..."
202msgstr ""
194msgstr ""
203
195
204−#: qml/Notifications/NotificationMenuItemFactory.qml:100
196+#: qml/Notifications/NotificationMenuItemFactory.qml:105
205msgid "Show password"
197msgid "Show password"
206msgstr ""
198msgstr ""
207
199
208−#: qml/Notifications/NotificationMenuItemFactory.qml:115
200+#: qml/Notifications/NotificationMenuItemFactory.qml:120
209−msgid "Please enter SIM PIN"
201+msgid "Enter SIM PIN"
202+msgstr ""
203+
204+#: qml/Notifications/NotificationMenuItemFactory.qml:121 qml/Shell.qml:270
205+msgid "Sorry, incorrect PIN"
210msgstr ""
206msgstr ""
211
207
212#: qml/Panel/ActiveCallHint.qml:77
208#: qml/Panel/ActiveCallHint.qml:77
@@ -249,47 +245,47 @@ msgstr ""
249msgid "Roaming"
245msgid "Roaming"
250msgstr ""
246msgstr ""
251
247
252−#: qml/Shell.qml:267
248+#: qml/Shell.qml:266
253−msgid "passphrase"
249+msgid "Enter your passphrase"
254msgstr ""
250msgstr ""
255
251
256#: qml/Shell.qml:267
252#: qml/Shell.qml:267
257−msgid "passcode"
253+msgid "Sorry, incorrect passphrase"
258msgstr ""
254msgstr ""
259
255
260#: qml/Shell.qml:269
256#: qml/Shell.qml:269
261−#, qt-format
257+msgid "Enter your PIN"
262−msgid "Enter your %1"
263msgstr ""
258msgstr ""
264
259
265−#: qml/Shell.qml:270
260+#: qml/Shell.qml:273
266#, qt-format
261#, qt-format
267−msgid "Incorrect %1"
262+msgid "Enter your %1"
268msgstr ""
263msgstr ""
269
264
270−#: qml/Shell.qml:272
265+#: qml/Shell.qml:274
271−msgid "Please re-enter"
266+#, qt-format
267+msgid "Sorry, incorrect %1"
272msgstr ""
268msgstr ""
273
269
274−#: qml/Shell.qml:306
270+#: qml/Shell.qml:310
275msgid "Sorry, incorrect passphrase."
271msgid "Sorry, incorrect passphrase."
276msgstr ""
272msgstr ""
277
273
278−#: qml/Shell.qml:307
274+#: qml/Shell.qml:311
279msgid "Sorry, incorrect passcode."
275msgid "Sorry, incorrect passcode."
280msgstr ""
276msgstr ""
281
277
282−#: qml/Shell.qml:308
278+#: qml/Shell.qml:312
283msgid "This will be your last attempt."
279msgid "This will be your last attempt."
284msgstr ""
280msgstr ""
285
281
286−#: qml/Shell.qml:310
282+#: qml/Shell.qml:314
287msgid ""
283msgid ""
288"If passphrase is entered incorrectly, your phone will conduct a factory "
284"If passphrase is entered incorrectly, your phone will conduct a factory "
289"reset and all personal data will be deleted."
285"reset and all personal data will be deleted."
290msgstr ""
286msgstr ""
291
287
292−#: qml/Shell.qml:311
288+#: qml/Shell.qml:315
293msgid ""
289msgid ""
294"If passcode is entered incorrectly, your phone will conduct a factory reset "
290"If passcode is entered incorrectly, your phone will conduct a factory reset "
295"and all personal data will be deleted."
291"and all personal data will be deleted."
po/vi.po+33−37
@@ -7,15 +7,15 @@ msgid ""
7msgstr ""
7msgstr ""
8"Project-Id-Version: unity8\n"
8"Project-Id-Version: unity8\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2014-08-13 14:09-0400\n"
10+"POT-Creation-Date: 2014-08-21 11:36+0200\n"
11"PO-Revision-Date: 2014-01-15 01:19+0000\n"
11"PO-Revision-Date: 2014-01-15 01:19+0000\n"
12"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
12"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
13"Language-Team: Vietnamese <vi@li.org>\n"
13"Language-Team: Vietnamese <vi@li.org>\n"
14"MIME-Version: 1.0\n"
14"MIME-Version: 1.0\n"
15"Content-Type: text/plain; charset=UTF-8\n"
15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n"
16"Content-Transfer-Encoding: 8bit\n"
17−"X-Launchpad-Export-Date: 2014-08-15 06:28+0000\n"
17+"X-Launchpad-Export-Date: 2014-08-23 07:17+0000\n"
18−"X-Generator: Launchpad (build 17156)\n"
18+"X-Generator: Launchpad (build 17163)\n"
19
19
20#: plugins/LightDM/Greeter.cpp:129
20#: plugins/LightDM/Greeter.cpp:129
21msgid "Password: "
21msgid "Password: "
@@ -92,19 +92,19 @@ msgid ""
92"phone<br><br>Tap on the screen to start"
92"phone<br><br>Tap on the screen to start"
93msgstr ""
93msgstr ""
94
94
95−#: qml/Components/Lockscreen.qml:161
95+#: qml/Components/Lockscreen.qml:167
96−msgid "Too many incorrect attempts"
96+msgid "Please wait"
97msgstr ""
97msgstr ""
98
98
99−#: qml/Components/Lockscreen.qml:163
99+#: qml/Components/Lockscreen.qml:172
100−msgid "Please wait"
100+msgid "Too many incorrect attempts"
101msgstr ""
101msgstr ""
102
102
103−#: qml/Components/Lockscreen.qml:245
103+#: qml/Components/Lockscreen.qml:206
104msgid "Emergency Call"
104msgid "Emergency Call"
105msgstr ""
105msgstr ""
106
106
107−#: qml/Components/Lockscreen.qml:268
107+#: qml/Components/Lockscreen.qml:226
108msgid "OK"
108msgid "OK"
109msgstr ""
109msgstr ""
110
110
@@ -117,23 +117,15 @@ msgstr ""
117msgid "Hello"
117msgid "Hello"
118msgstr ""
118msgstr ""
119
119
120−#: qml/Components/PinLockscreen.qml:197
120+#: qml/Dash/GenericScopeView.qml:361
121−msgid "CANCEL"
122−msgstr ""
123−
124−#: qml/Components/PinLockscreen.qml:215
125−msgid "DONE"
126−msgstr ""
127−
128−#: qml/Dash/GenericScopeView.qml:360
129msgid "See less"
121msgid "See less"
130msgstr ""
122msgstr ""
131
123
132−#: qml/Dash/GenericScopeView.qml:360
124+#: qml/Dash/GenericScopeView.qml:361
133msgid "See all"
125msgid "See all"
134msgstr ""
126msgstr ""
135
127
136−#: qml/Dash/GenericScopeView.qml:423 qml/Panel/SearchIndicator.qml:27
128+#: qml/Dash/GenericScopeView.qml:424 qml/Panel/SearchIndicator.qml:27
137msgid "Search"
129msgid "Search"
138msgstr ""
130msgstr ""
139
131
@@ -201,12 +193,16 @@ msgstr ""
201msgid "Speaking..."
193msgid "Speaking..."
202msgstr ""
194msgstr ""
203
195
204−#: qml/Notifications/NotificationMenuItemFactory.qml:100
196+#: qml/Notifications/NotificationMenuItemFactory.qml:105
205msgid "Show password"
197msgid "Show password"
206msgstr ""
198msgstr ""
207
199
208−#: qml/Notifications/NotificationMenuItemFactory.qml:115
200+#: qml/Notifications/NotificationMenuItemFactory.qml:120
209−msgid "Please enter SIM PIN"
201+msgid "Enter SIM PIN"
202+msgstr ""
203+
204+#: qml/Notifications/NotificationMenuItemFactory.qml:121 qml/Shell.qml:270
205+msgid "Sorry, incorrect PIN"
210msgstr ""
206msgstr ""
211
207
212#: qml/Panel/ActiveCallHint.qml:77
208#: qml/Panel/ActiveCallHint.qml:77
@@ -249,47 +245,47 @@ msgstr ""
249msgid "Roaming"
245msgid "Roaming"
250msgstr ""
246msgstr ""
251
247
252−#: qml/Shell.qml:267
248+#: qml/Shell.qml:266
253−msgid "passphrase"
249+msgid "Enter your passphrase"
254msgstr ""
250msgstr ""
255
251
256#: qml/Shell.qml:267
252#: qml/Shell.qml:267
257−msgid "passcode"
253+msgid "Sorry, incorrect passphrase"
258msgstr ""
254msgstr ""
259
255
260#: qml/Shell.qml:269
256#: qml/Shell.qml:269
261−#, qt-format
257+msgid "Enter your PIN"
262−msgid "Enter your %1"
263msgstr ""
258msgstr ""
264
259
265−#: qml/Shell.qml:270
260+#: qml/Shell.qml:273
266#, qt-format
261#, qt-format
267−msgid "Incorrect %1"
262+msgid "Enter your %1"
268msgstr ""
263msgstr ""
269
264
270−#: qml/Shell.qml:272
265+#: qml/Shell.qml:274
271−msgid "Please re-enter"
266+#, qt-format
267+msgid "Sorry, incorrect %1"
272msgstr ""
268msgstr ""
273
269
274−#: qml/Shell.qml:306
270+#: qml/Shell.qml:310
275msgid "Sorry, incorrect passphrase."
271msgid "Sorry, incorrect passphrase."
276msgstr ""
272msgstr ""
277
273
278−#: qml/Shell.qml:307
274+#: qml/Shell.qml:311
279msgid "Sorry, incorrect passcode."
275msgid "Sorry, incorrect passcode."
280msgstr ""
276msgstr ""
281
277
282−#: qml/Shell.qml:308
278+#: qml/Shell.qml:312
283msgid "This will be your last attempt."
279msgid "This will be your last attempt."
284msgstr ""
280msgstr ""
285
281
286−#: qml/Shell.qml:310
282+#: qml/Shell.qml:314
287msgid ""
283msgid ""
288"If passphrase is entered incorrectly, your phone will conduct a factory "
284"If passphrase is entered incorrectly, your phone will conduct a factory "
289"reset and all personal data will be deleted."
285"reset and all personal data will be deleted."
290msgstr ""
286msgstr ""
291
287
292−#: qml/Shell.qml:311
288+#: qml/Shell.qml:315
293msgid ""
289msgid ""
294"If passcode is entered incorrectly, your phone will conduct a factory reset "
290"If passcode is entered incorrectly, your phone will conduct a factory reset "
295"and all personal data will be deleted."
291"and all personal data will be deleted."
po/xh.po+33−37
@@ -7,15 +7,15 @@ msgid ""
7msgstr ""
7msgstr ""
8"Project-Id-Version: unity8\n"
8"Project-Id-Version: unity8\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2014-08-13 14:09-0400\n"
10+"POT-Creation-Date: 2014-08-21 11:36+0200\n"
11"PO-Revision-Date: 2013-09-28 13:20+0000\n"
11"PO-Revision-Date: 2013-09-28 13:20+0000\n"
12"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
12"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
13"Language-Team: Xhosa <xh@li.org>\n"
13"Language-Team: Xhosa <xh@li.org>\n"
14"MIME-Version: 1.0\n"
14"MIME-Version: 1.0\n"
15"Content-Type: text/plain; charset=UTF-8\n"
15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n"
16"Content-Transfer-Encoding: 8bit\n"
17−"X-Launchpad-Export-Date: 2014-08-15 06:28+0000\n"
17+"X-Launchpad-Export-Date: 2014-08-23 07:17+0000\n"
18−"X-Generator: Launchpad (build 17156)\n"
18+"X-Generator: Launchpad (build 17163)\n"
19
19
20#: plugins/LightDM/Greeter.cpp:129
20#: plugins/LightDM/Greeter.cpp:129
21msgid "Password: "
21msgid "Password: "
@@ -92,19 +92,19 @@ msgid ""
92"phone<br><br>Tap on the screen to start"
92"phone<br><br>Tap on the screen to start"
93msgstr ""
93msgstr ""
94
94
95−#: qml/Components/Lockscreen.qml:161
95+#: qml/Components/Lockscreen.qml:167
96−msgid "Too many incorrect attempts"
96+msgid "Please wait"
97msgstr ""
97msgstr ""
98
98
99−#: qml/Components/Lockscreen.qml:163
99+#: qml/Components/Lockscreen.qml:172
100−msgid "Please wait"
100+msgid "Too many incorrect attempts"
101msgstr ""
101msgstr ""
102
102
103−#: qml/Components/Lockscreen.qml:245
103+#: qml/Components/Lockscreen.qml:206
104msgid "Emergency Call"
104msgid "Emergency Call"
105msgstr ""
105msgstr ""
106
106
107−#: qml/Components/Lockscreen.qml:268
107+#: qml/Components/Lockscreen.qml:226
108msgid "OK"
108msgid "OK"
109msgstr ""
109msgstr ""
110
110
@@ -117,23 +117,15 @@ msgstr ""
117msgid "Hello"
117msgid "Hello"
118msgstr ""
118msgstr ""
119
119
120−#: qml/Components/PinLockscreen.qml:197
120+#: qml/Dash/GenericScopeView.qml:361
121−msgid "CANCEL"
122−msgstr ""
123−
124−#: qml/Components/PinLockscreen.qml:215
125−msgid "DONE"
126−msgstr ""
127−
128−#: qml/Dash/GenericScopeView.qml:360
129msgid "See less"
121msgid "See less"
130msgstr ""
122msgstr ""
131
123
132−#: qml/Dash/GenericScopeView.qml:360
124+#: qml/Dash/GenericScopeView.qml:361
133msgid "See all"
125msgid "See all"
134msgstr ""
126msgstr ""
135
127
136−#: qml/Dash/GenericScopeView.qml:423 qml/Panel/SearchIndicator.qml:27
128+#: qml/Dash/GenericScopeView.qml:424 qml/Panel/SearchIndicator.qml:27
137msgid "Search"
129msgid "Search"
138msgstr ""
130msgstr ""
139
131
@@ -201,12 +193,16 @@ msgstr ""
201msgid "Speaking..."
193msgid "Speaking..."
202msgstr ""
194msgstr ""
203
195
204−#: qml/Notifications/NotificationMenuItemFactory.qml:100
196+#: qml/Notifications/NotificationMenuItemFactory.qml:105
205msgid "Show password"
197msgid "Show password"
206msgstr ""
198msgstr ""
207
199
208−#: qml/Notifications/NotificationMenuItemFactory.qml:115
200+#: qml/Notifications/NotificationMenuItemFactory.qml:120
209−msgid "Please enter SIM PIN"
201+msgid "Enter SIM PIN"
202+msgstr ""
203+
204+#: qml/Notifications/NotificationMenuItemFactory.qml:121 qml/Shell.qml:270
205+msgid "Sorry, incorrect PIN"
210msgstr ""
206msgstr ""
211
207
212#: qml/Panel/ActiveCallHint.qml:77
208#: qml/Panel/ActiveCallHint.qml:77
@@ -249,47 +245,47 @@ msgstr ""
249msgid "Roaming"
245msgid "Roaming"
250msgstr ""
246msgstr ""
251
247
252−#: qml/Shell.qml:267
248+#: qml/Shell.qml:266
253−msgid "passphrase"
249+msgid "Enter your passphrase"
254msgstr ""
250msgstr ""
255
251
256#: qml/Shell.qml:267
252#: qml/Shell.qml:267
257−msgid "passcode"
253+msgid "Sorry, incorrect passphrase"
258msgstr ""
254msgstr ""
259
255
260#: qml/Shell.qml:269
256#: qml/Shell.qml:269
261−#, qt-format
257+msgid "Enter your PIN"
262−msgid "Enter your %1"
263msgstr ""
258msgstr ""
264
259
265−#: qml/Shell.qml:270
260+#: qml/Shell.qml:273
266#, qt-format
261#, qt-format
267−msgid "Incorrect %1"
262+msgid "Enter your %1"
268msgstr ""
263msgstr ""
269
264
270−#: qml/Shell.qml:272
265+#: qml/Shell.qml:274
271−msgid "Please re-enter"
266+#, qt-format
267+msgid "Sorry, incorrect %1"
272msgstr ""
268msgstr ""
273
269
274−#: qml/Shell.qml:306
270+#: qml/Shell.qml:310
275msgid "Sorry, incorrect passphrase."
271msgid "Sorry, incorrect passphrase."
276msgstr ""
272msgstr ""
277
273
278−#: qml/Shell.qml:307
274+#: qml/Shell.qml:311
279msgid "Sorry, incorrect passcode."
275msgid "Sorry, incorrect passcode."
280msgstr ""
276msgstr ""
281
277
282−#: qml/Shell.qml:308
278+#: qml/Shell.qml:312
283msgid "This will be your last attempt."
279msgid "This will be your last attempt."
284msgstr ""
280msgstr ""
285
281
286−#: qml/Shell.qml:310
282+#: qml/Shell.qml:314
287msgid ""
283msgid ""
288"If passphrase is entered incorrectly, your phone will conduct a factory "
284"If passphrase is entered incorrectly, your phone will conduct a factory "
289"reset and all personal data will be deleted."
285"reset and all personal data will be deleted."
290msgstr ""
286msgstr ""
291
287
292−#: qml/Shell.qml:311
288+#: qml/Shell.qml:315
293msgid ""
289msgid ""
294"If passcode is entered incorrectly, your phone will conduct a factory reset "
290"If passcode is entered incorrectly, your phone will conduct a factory reset "
295"and all personal data will be deleted."
291"and all personal data will be deleted."
po/zh_CN.po+43−38
@@ -7,15 +7,15 @@ msgid ""
7msgstr ""
7msgstr ""
8"Project-Id-Version: unity\n"
8"Project-Id-Version: unity\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2014-08-13 14:09-0400\n"
10+"POT-Creation-Date: 2014-08-21 11:36+0200\n"
11"PO-Revision-Date: 2014-08-12 14:09+0000\n"
11"PO-Revision-Date: 2014-08-12 14:09+0000\n"
12"Last-Translator: Anthony Wong <anthony.wong@ubuntu.com>\n"
12"Last-Translator: Anthony Wong <anthony.wong@ubuntu.com>\n"
13"Language-Team: Chinese (Simplified) <zh_CN@li.org>\n"
13"Language-Team: Chinese (Simplified) <zh_CN@li.org>\n"
14"MIME-Version: 1.0\n"
14"MIME-Version: 1.0\n"
15"Content-Type: text/plain; charset=UTF-8\n"
15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n"
16"Content-Transfer-Encoding: 8bit\n"
17−"X-Launchpad-Export-Date: 2014-08-15 06:29+0000\n"
17+"X-Launchpad-Export-Date: 2014-08-23 07:17+0000\n"
18−"X-Generator: Launchpad (build 17156)\n"
18+"X-Generator: Launchpad (build 17163)\n"
19
19
20#: plugins/LightDM/Greeter.cpp:129
20#: plugins/LightDM/Greeter.cpp:129
21msgid "Password: "
21msgid "Password: "
@@ -92,19 +92,19 @@ msgid ""
92"phone<br><br>Tap on the screen to start"
92"phone<br><br>Tap on the screen to start"
93msgstr "您现在已经掌握了边缘滑动手势，可以开始使用手机了<br><br>请点击屏幕开始使用"
93msgstr "您现在已经掌握了边缘滑动手势，可以开始使用手机了<br><br>请点击屏幕开始使用"
94
94
95−#: qml/Components/Lockscreen.qml:161
95+#: qml/Components/Lockscreen.qml:167
96−msgid "Too many incorrect attempts"
96+msgid "Please wait"
97msgstr ""
97msgstr ""
98
98
99−#: qml/Components/Lockscreen.qml:163
99+#: qml/Components/Lockscreen.qml:172
100−msgid "Please wait"
100+msgid "Too many incorrect attempts"
101msgstr ""
101msgstr ""
102
102
103−#: qml/Components/Lockscreen.qml:245
103+#: qml/Components/Lockscreen.qml:206
104msgid "Emergency Call"
104msgid "Emergency Call"
105msgstr "紧急电话"
105msgstr "紧急电话"
106
106
107−#: qml/Components/Lockscreen.qml:268
107+#: qml/Components/Lockscreen.qml:226
108msgid "OK"
108msgid "OK"
109msgstr "确定"
109msgstr "确定"
110
110
@@ -117,23 +117,15 @@ msgstr "你好，%1"
117msgid "Hello"
117msgid "Hello"
118msgstr "你好"
118msgstr "你好"
119
119
120−#: qml/Components/PinLockscreen.qml:197
120+#: qml/Dash/GenericScopeView.qml:361
121−msgid "CANCEL"
122−msgstr "取消"
123−
124−#: qml/Components/PinLockscreen.qml:215
125−msgid "DONE"
126−msgstr "完成"
127−
128−#: qml/Dash/GenericScopeView.qml:360
129msgid "See less"
121msgid "See less"
130msgstr "显示更少"
122msgstr "显示更少"
131
123
132−#: qml/Dash/GenericScopeView.qml:360
124+#: qml/Dash/GenericScopeView.qml:361
133msgid "See all"
125msgid "See all"
134msgstr "查看全部"
126msgstr "查看全部"
135
127
136−#: qml/Dash/GenericScopeView.qml:423 qml/Panel/SearchIndicator.qml:27
128+#: qml/Dash/GenericScopeView.qml:424 qml/Panel/SearchIndicator.qml:27
137msgid "Search"
129msgid "Search"
138msgstr "搜索"
130msgstr "搜索"
139
131
@@ -201,13 +193,17 @@ msgstr "现在请讲..."
201msgid "Speaking..."
193msgid "Speaking..."
202msgstr "讲话中..."
194msgstr "讲话中..."
203
195
204−#: qml/Notifications/NotificationMenuItemFactory.qml:100
196+#: qml/Notifications/NotificationMenuItemFactory.qml:105
205msgid "Show password"
197msgid "Show password"
206msgstr "显示密码"
198msgstr "显示密码"
207
199
208−#: qml/Notifications/NotificationMenuItemFactory.qml:115
200+#: qml/Notifications/NotificationMenuItemFactory.qml:120
209−msgid "Please enter SIM PIN"
201+msgid "Enter SIM PIN"
210−msgstr "请输入 SIM PIN"
202+msgstr ""
203+
204+#: qml/Notifications/NotificationMenuItemFactory.qml:121 qml/Shell.qml:270
205+msgid "Sorry, incorrect PIN"
206+msgstr ""
211
207
212#: qml/Panel/ActiveCallHint.qml:77
208#: qml/Panel/ActiveCallHint.qml:77
213msgid "Tap to return to call..."
209msgid "Tap to return to call..."
@@ -249,48 +245,57 @@ msgstr "解开 SIM"
249msgid "Roaming"
245msgid "Roaming"
250msgstr "漫游"
246msgstr "漫游"
251
247
252−#: qml/Shell.qml:267
248+#: qml/Shell.qml:266
253−msgid "passphrase"
249+msgid "Enter your passphrase"
254msgstr ""
250msgstr ""
255
251
256#: qml/Shell.qml:267
252#: qml/Shell.qml:267
257−msgid "passcode"
253+msgid "Sorry, incorrect passphrase"
258msgstr ""
254msgstr ""
259
255
260#: qml/Shell.qml:269
256#: qml/Shell.qml:269
261−#, qt-format
257+msgid "Enter your PIN"
262−msgid "Enter your %1"
263msgstr ""
258msgstr ""
264
259
265−#: qml/Shell.qml:270
260+#: qml/Shell.qml:273
266#, qt-format
261#, qt-format
267−msgid "Incorrect %1"
262+msgid "Enter your %1"
268msgstr ""
263msgstr ""
269
264
270−#: qml/Shell.qml:272
265+#: qml/Shell.qml:274
271−msgid "Please re-enter"
266+#, qt-format
267+msgid "Sorry, incorrect %1"
272msgstr ""
268msgstr ""
273
269
274−#: qml/Shell.qml:306
270+#: qml/Shell.qml:310
275msgid "Sorry, incorrect passphrase."
271msgid "Sorry, incorrect passphrase."
276msgstr ""
272msgstr ""
277
273
278−#: qml/Shell.qml:307
274+#: qml/Shell.qml:311
279msgid "Sorry, incorrect passcode."
275msgid "Sorry, incorrect passcode."
280msgstr ""
276msgstr ""
281
277
282−#: qml/Shell.qml:308
278+#: qml/Shell.qml:312
283msgid "This will be your last attempt."
279msgid "This will be your last attempt."
284msgstr ""
280msgstr ""
285
281
286−#: qml/Shell.qml:310
282+#: qml/Shell.qml:314
287msgid ""
283msgid ""
288"If passphrase is entered incorrectly, your phone will conduct a factory "
284"If passphrase is entered incorrectly, your phone will conduct a factory "
289"reset and all personal data will be deleted."
285"reset and all personal data will be deleted."
290msgstr ""
286msgstr ""
291
287
292−#: qml/Shell.qml:311
288+#: qml/Shell.qml:315
293msgid ""
289msgid ""
294"If passcode is entered incorrectly, your phone will conduct a factory reset "
290"If passcode is entered incorrectly, your phone will conduct a factory reset "
295"and all personal data will be deleted."
291"and all personal data will be deleted."
296msgstr ""
292msgstr ""
293+
294+#~ msgid "Please enter SIM PIN"
295+#~ msgstr "请输入 SIM PIN"
296+
297+#~ msgid "CANCEL"
298+#~ msgstr "取消"
299+
300+#~ msgid "DONE"
301+#~ msgstr "完成"
po/zh_HK.po+43−38
@@ -7,15 +7,15 @@ msgid ""
7msgstr ""
7msgstr ""
8"Project-Id-Version: unity8\n"
8"Project-Id-Version: unity8\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2014-08-13 14:09-0400\n"
10+"POT-Creation-Date: 2014-08-21 11:36+0200\n"
11"PO-Revision-Date: 2014-08-10 11:45+0000\n"
11"PO-Revision-Date: 2014-08-10 11:45+0000\n"
12"Last-Translator: Daniel Cheung <daniel.2345@hotmail.com>\n"
12"Last-Translator: Daniel Cheung <daniel.2345@hotmail.com>\n"
13"Language-Team: Chinese (Hong Kong) <zh_HK@li.org>\n"
13"Language-Team: Chinese (Hong Kong) <zh_HK@li.org>\n"
14"MIME-Version: 1.0\n"
14"MIME-Version: 1.0\n"
15"Content-Type: text/plain; charset=UTF-8\n"
15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n"
16"Content-Transfer-Encoding: 8bit\n"
17−"X-Launchpad-Export-Date: 2014-08-15 06:28+0000\n"
17+"X-Launchpad-Export-Date: 2014-08-23 07:17+0000\n"
18−"X-Generator: Launchpad (build 17156)\n"
18+"X-Generator: Launchpad (build 17163)\n"
19
19
20#: plugins/LightDM/Greeter.cpp:129
20#: plugins/LightDM/Greeter.cpp:129
21msgid "Password: "
21msgid "Password: "
@@ -92,19 +92,19 @@ msgid ""
92"phone<br><br>Tap on the screen to start"
92"phone<br><br>Tap on the screen to start"
93msgstr "您現在已熟練邊緣手勢，可以開始使用手機了<br><br>輕觸螢幕開始使用"
93msgstr "您現在已熟練邊緣手勢，可以開始使用手機了<br><br>輕觸螢幕開始使用"
94
94
95−#: qml/Components/Lockscreen.qml:161
95+#: qml/Components/Lockscreen.qml:167
96−msgid "Too many incorrect attempts"
96+msgid "Please wait"
97msgstr ""
97msgstr ""
98
98
99−#: qml/Components/Lockscreen.qml:163
99+#: qml/Components/Lockscreen.qml:172
100−msgid "Please wait"
100+msgid "Too many incorrect attempts"
101msgstr ""
101msgstr ""
102
102
103−#: qml/Components/Lockscreen.qml:245
103+#: qml/Components/Lockscreen.qml:206
104msgid "Emergency Call"
104msgid "Emergency Call"
105msgstr "緊急電話"
105msgstr "緊急電話"
106
106
107−#: qml/Components/Lockscreen.qml:268
107+#: qml/Components/Lockscreen.qml:226
108msgid "OK"
108msgid "OK"
109msgstr "確定"
109msgstr "確定"
110
110
@@ -117,23 +117,15 @@ msgstr "您好 %1"
117msgid "Hello"
117msgid "Hello"
118msgstr "您好"
118msgstr "您好"
119
119
120−#: qml/Components/PinLockscreen.qml:197
120+#: qml/Dash/GenericScopeView.qml:361
121−msgid "CANCEL"
122−msgstr "取消"
123−
124−#: qml/Components/PinLockscreen.qml:215
125−msgid "DONE"
126−msgstr "完成"
127−
128−#: qml/Dash/GenericScopeView.qml:360
129msgid "See less"
121msgid "See less"
130msgstr "縮減查看"
122msgstr "縮減查看"
131
123
132−#: qml/Dash/GenericScopeView.qml:360
124+#: qml/Dash/GenericScopeView.qml:361
133msgid "See all"
125msgid "See all"
134msgstr "查看全部"
126msgstr "查看全部"
135
127
136−#: qml/Dash/GenericScopeView.qml:423 qml/Panel/SearchIndicator.qml:27
128+#: qml/Dash/GenericScopeView.qml:424 qml/Panel/SearchIndicator.qml:27
137msgid "Search"
129msgid "Search"
138msgstr "搜尋"
130msgstr "搜尋"
139
131
@@ -201,13 +193,17 @@ msgstr "請講..."
201msgid "Speaking..."
193msgid "Speaking..."
202msgstr "正在講..."
194msgstr "正在講..."
203
195
204−#: qml/Notifications/NotificationMenuItemFactory.qml:100
196+#: qml/Notifications/NotificationMenuItemFactory.qml:105
205msgid "Show password"
197msgid "Show password"
206msgstr "顯示密碼"
198msgstr "顯示密碼"
207
199
208−#: qml/Notifications/NotificationMenuItemFactory.qml:115
200+#: qml/Notifications/NotificationMenuItemFactory.qml:120
209−msgid "Please enter SIM PIN"
201+msgid "Enter SIM PIN"
210−msgstr "請輸入 SIM 卡 PIN 碼"
202+msgstr ""
203+
204+#: qml/Notifications/NotificationMenuItemFactory.qml:121 qml/Shell.qml:270
205+msgid "Sorry, incorrect PIN"
206+msgstr ""
211
207
212#: qml/Panel/ActiveCallHint.qml:77
208#: qml/Panel/ActiveCallHint.qml:77
213msgid "Tap to return to call..."
209msgid "Tap to return to call..."
@@ -249,48 +245,57 @@ msgstr ""
249msgid "Roaming"
245msgid "Roaming"
250msgstr ""
246msgstr ""
251
247
252−#: qml/Shell.qml:267
248+#: qml/Shell.qml:266
253−msgid "passphrase"
249+msgid "Enter your passphrase"
254msgstr ""
250msgstr ""
255
251
256#: qml/Shell.qml:267
252#: qml/Shell.qml:267
257−msgid "passcode"
253+msgid "Sorry, incorrect passphrase"
258msgstr ""
254msgstr ""
259
255
260#: qml/Shell.qml:269
256#: qml/Shell.qml:269
261−#, qt-format
257+msgid "Enter your PIN"
262−msgid "Enter your %1"
263msgstr ""
258msgstr ""
264
259
265−#: qml/Shell.qml:270
260+#: qml/Shell.qml:273
266#, qt-format
261#, qt-format
267−msgid "Incorrect %1"
262+msgid "Enter your %1"
268msgstr ""
263msgstr ""
269
264
270−#: qml/Shell.qml:272
265+#: qml/Shell.qml:274
271−msgid "Please re-enter"
266+#, qt-format
267+msgid "Sorry, incorrect %1"
272msgstr ""
268msgstr ""
273
269
274−#: qml/Shell.qml:306
270+#: qml/Shell.qml:310
275msgid "Sorry, incorrect passphrase."
271msgid "Sorry, incorrect passphrase."
276msgstr ""
272msgstr ""
277
273
278−#: qml/Shell.qml:307
274+#: qml/Shell.qml:311
279msgid "Sorry, incorrect passcode."
275msgid "Sorry, incorrect passcode."
280msgstr ""
276msgstr ""
281
277
282−#: qml/Shell.qml:308
278+#: qml/Shell.qml:312
283msgid "This will be your last attempt."
279msgid "This will be your last attempt."
284msgstr ""
280msgstr ""
285
281
286−#: qml/Shell.qml:310
282+#: qml/Shell.qml:314
287msgid ""
283msgid ""
288"If passphrase is entered incorrectly, your phone will conduct a factory "
284"If passphrase is entered incorrectly, your phone will conduct a factory "
289"reset and all personal data will be deleted."
285"reset and all personal data will be deleted."
290msgstr ""
286msgstr ""
291
287
292−#: qml/Shell.qml:311
288+#: qml/Shell.qml:315
293msgid ""
289msgid ""
294"If passcode is entered incorrectly, your phone will conduct a factory reset "
290"If passcode is entered incorrectly, your phone will conduct a factory reset "
295"and all personal data will be deleted."
291"and all personal data will be deleted."
296msgstr ""
292msgstr ""
293+
294+#~ msgid "CANCEL"
295+#~ msgstr "取消"
296+
297+#~ msgid "DONE"
298+#~ msgstr "完成"
299+
300+#~ msgid "Please enter SIM PIN"
301+#~ msgstr "請輸入 SIM 卡 PIN 碼"
po/zh_TW.po+43−38
@@ -7,15 +7,15 @@ msgid ""
7msgstr ""
7msgstr ""
8"Project-Id-Version: unity\n"
8"Project-Id-Version: unity\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2014-08-13 14:09-0400\n"
10+"POT-Creation-Date: 2014-08-21 11:36+0200\n"
11"PO-Revision-Date: 2014-07-26 16:21+0000\n"
11"PO-Revision-Date: 2014-07-26 16:21+0000\n"
12"Last-Translator: Cheng-Chia Tseng <pswo10680@gmail.com>\n"
12"Last-Translator: Cheng-Chia Tseng <pswo10680@gmail.com>\n"
13"Language-Team: Chinese (Traditional) <zh_TW@li.org>\n"
13"Language-Team: Chinese (Traditional) <zh_TW@li.org>\n"
14"MIME-Version: 1.0\n"
14"MIME-Version: 1.0\n"
15"Content-Type: text/plain; charset=UTF-8\n"
15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n"
16"Content-Transfer-Encoding: 8bit\n"
17−"X-Launchpad-Export-Date: 2014-08-15 06:28+0000\n"
17+"X-Launchpad-Export-Date: 2014-08-23 07:17+0000\n"
18−"X-Generator: Launchpad (build 17156)\n"
18+"X-Generator: Launchpad (build 17163)\n"
19
19
20#: plugins/LightDM/Greeter.cpp:129
20#: plugins/LightDM/Greeter.cpp:129
21msgid "Password: "
21msgid "Password: "
@@ -92,19 +92,19 @@ msgid ""
92"phone<br><br>Tap on the screen to start"
92"phone<br><br>Tap on the screen to start"
93msgstr "您現在已熟練邊緣手勢，可以開始使用手機了<br><br>輕觸螢幕開始使用"
93msgstr "您現在已熟練邊緣手勢，可以開始使用手機了<br><br>輕觸螢幕開始使用"
94
94
95−#: qml/Components/Lockscreen.qml:161
95+#: qml/Components/Lockscreen.qml:167
96−msgid "Too many incorrect attempts"
96+msgid "Please wait"
97msgstr ""
97msgstr ""
98
98
99−#: qml/Components/Lockscreen.qml:163
99+#: qml/Components/Lockscreen.qml:172
100−msgid "Please wait"
100+msgid "Too many incorrect attempts"
101msgstr ""
101msgstr ""
102
102
103−#: qml/Components/Lockscreen.qml:245
103+#: qml/Components/Lockscreen.qml:206
104msgid "Emergency Call"
104msgid "Emergency Call"
105msgstr "緊急通話"
105msgstr "緊急通話"
106
106
107−#: qml/Components/Lockscreen.qml:268
107+#: qml/Components/Lockscreen.qml:226
108msgid "OK"
108msgid "OK"
109msgstr "確定"
109msgstr "確定"
110
110
@@ -117,23 +117,15 @@ msgstr "%1 您好"
117msgid "Hello"
117msgid "Hello"
118msgstr "您好"
118msgstr "您好"
119
119
120−#: qml/Components/PinLockscreen.qml:197
120+#: qml/Dash/GenericScopeView.qml:361
121−msgid "CANCEL"
122−msgstr "取消"
123−
124−#: qml/Components/PinLockscreen.qml:215
125−msgid "DONE"
126−msgstr "完成"
127−
128−#: qml/Dash/GenericScopeView.qml:360
129msgid "See less"
121msgid "See less"
130msgstr "縮減查看"
122msgstr "縮減查看"
131
123
132−#: qml/Dash/GenericScopeView.qml:360
124+#: qml/Dash/GenericScopeView.qml:361
133msgid "See all"
125msgid "See all"
134msgstr "查看全部"
126msgstr "查看全部"
135
127
136−#: qml/Dash/GenericScopeView.qml:423 qml/Panel/SearchIndicator.qml:27
128+#: qml/Dash/GenericScopeView.qml:424 qml/Panel/SearchIndicator.qml:27
137msgid "Search"
129msgid "Search"
138msgstr "搜尋"
130msgstr "搜尋"
139
131
@@ -201,13 +193,17 @@ msgstr "請說..."
201msgid "Speaking..."
193msgid "Speaking..."
202msgstr "說話中..."
194msgstr "說話中..."
203
195
204−#: qml/Notifications/NotificationMenuItemFactory.qml:100
196+#: qml/Notifications/NotificationMenuItemFactory.qml:105
205msgid "Show password"
197msgid "Show password"
206msgstr "顯示密碼"
198msgstr "顯示密碼"
207
199
208−#: qml/Notifications/NotificationMenuItemFactory.qml:115
200+#: qml/Notifications/NotificationMenuItemFactory.qml:120
209−msgid "Please enter SIM PIN"
201+msgid "Enter SIM PIN"
210−msgstr "請輸入 SIM 卡 PIN 碼"
202+msgstr ""
203+
204+#: qml/Notifications/NotificationMenuItemFactory.qml:121 qml/Shell.qml:270
205+msgid "Sorry, incorrect PIN"
206+msgstr ""
211
207
212#: qml/Panel/ActiveCallHint.qml:77
208#: qml/Panel/ActiveCallHint.qml:77
213msgid "Tap to return to call..."
209msgid "Tap to return to call..."
@@ -249,48 +245,57 @@ msgstr ""
249msgid "Roaming"
245msgid "Roaming"
250msgstr ""
246msgstr ""
251
247
252−#: qml/Shell.qml:267
248+#: qml/Shell.qml:266
253−msgid "passphrase"
249+msgid "Enter your passphrase"
254msgstr ""
250msgstr ""
255
251
256#: qml/Shell.qml:267
252#: qml/Shell.qml:267
257−msgid "passcode"
253+msgid "Sorry, incorrect passphrase"
258msgstr ""
254msgstr ""
259
255
260#: qml/Shell.qml:269
256#: qml/Shell.qml:269
261−#, qt-format
257+msgid "Enter your PIN"
262−msgid "Enter your %1"
263msgstr ""
258msgstr ""
264
259
265−#: qml/Shell.qml:270
260+#: qml/Shell.qml:273
266#, qt-format
261#, qt-format
267−msgid "Incorrect %1"
262+msgid "Enter your %1"
268msgstr ""
263msgstr ""
269
264
270−#: qml/Shell.qml:272
265+#: qml/Shell.qml:274
271−msgid "Please re-enter"
266+#, qt-format
267+msgid "Sorry, incorrect %1"
272msgstr ""
268msgstr ""
273
269
274−#: qml/Shell.qml:306
270+#: qml/Shell.qml:310
275msgid "Sorry, incorrect passphrase."
271msgid "Sorry, incorrect passphrase."
276msgstr ""
272msgstr ""
277
273
278−#: qml/Shell.qml:307
274+#: qml/Shell.qml:311
279msgid "Sorry, incorrect passcode."
275msgid "Sorry, incorrect passcode."
280msgstr ""
276msgstr ""
281
277
282−#: qml/Shell.qml:308
278+#: qml/Shell.qml:312
283msgid "This will be your last attempt."
279msgid "This will be your last attempt."
284msgstr ""
280msgstr ""
285
281
286−#: qml/Shell.qml:310
282+#: qml/Shell.qml:314
287msgid ""
283msgid ""
288"If passphrase is entered incorrectly, your phone will conduct a factory "
284"If passphrase is entered incorrectly, your phone will conduct a factory "
289"reset and all personal data will be deleted."
285"reset and all personal data will be deleted."
290msgstr ""
286msgstr ""
291
287
292−#: qml/Shell.qml:311
288+#: qml/Shell.qml:315
293msgid ""
289msgid ""
294"If passcode is entered incorrectly, your phone will conduct a factory reset "
290"If passcode is entered incorrectly, your phone will conduct a factory reset "
295"and all personal data will be deleted."
291"and all personal data will be deleted."
296msgstr ""
292msgstr ""
293+
294+#~ msgid "CANCEL"
295+#~ msgstr "取消"
296+
297+#~ msgid "DONE"
298+#~ msgstr "完成"
299+
300+#~ msgid "Please enter SIM PIN"
301+#~ msgstr "請輸入 SIM 卡 PIN 碼"
qml/Components/Lockscreen.qml+33−75
@@ -24,15 +24,14 @@ Showable {
24 // Determine if a numeric or alphanumeric pad is used.
24 // Determine if a numeric or alphanumeric pad is used.
25 property bool alphaNumeric: false
25 property bool alphaNumeric: false
26
26
27− // Placeholder text
27+ // Informational text. (e.g. some text to tell which domain this is pin is entered for)
28− property string placeholderText: ""
28+ property string infoText: ""
29− // Placeholder text while shaking (e.g. Incorrect passprase)
29+
30− property string wrongPlaceholderText: ""
31 // Retries text (e.g. 3 retries left)
30 // Retries text (e.g. 3 retries left)
32 property string retryText: ""
31 property string retryText: ""
33
32
34− // Informational text. (e.g. some text to tell which domain this is pin is entered for.
33+ // The text to be displayed in case the login failed
35− property string infoText: ""
34+ property string errorText: ""
36
35
37 // In case the Lockscreen can show a greeter message, this is the username
36 // In case the Lockscreen can show a greeter message, this is the username
38 property string username: ""
37 property string username: ""
@@ -110,41 +109,6 @@ Showable {
110 anchors.fill: root
109 anchors.fill: root
111 }
110 }
112
111
113− Column {
114− spacing: units.gu(2)
115− anchors {
116− left: parent.left
117− right: parent.right
118− bottom: pinPadLoader.top
119− bottomMargin: units.gu(2)
120− }
121− Label {
122− objectName: "retryCountLabel"
123− anchors {
124− left: parent.left
125− right: parent.right
126− }
127− text: root.retryText
128− horizontalAlignment: Text.AlignHCenter
129− color: "#f3f3e7"
130− opacity: 0.6
131− visible: root.retryText.length > 0
132− }
133− Label {
134− id: infoTextLabel
135− objectName: "infoTextLabel"
136− anchors {
137− left: parent.left
138− right: parent.right
139− }
140− text: root.infoText
141− horizontalAlignment: Text.AlignHCenter
142− color: "#f3f3e7"
143− opacity: 0.6
144− visible: root.infoText.length > 0
145− }
146− }
147−
148 Loader {
112 Loader {
149 id: pinPadLoader
113 id: pinPadLoader
150 objectName: "pinPadLoader"
114 objectName: "pinPadLoader"
@@ -152,21 +116,22 @@ Showable {
152 left: parent.left
116 left: parent.left
153 right: parent.right
117 right: parent.right
154 verticalCenter: parent.verticalCenter
118 verticalCenter: parent.verticalCenter
155− verticalCenterOffset: root.alphaNumeric ? -units.gu(10) : -units.gu(4)
119+ verticalCenterOffset: root.alphaNumeric ? -units.gu(10) : 0
156 }
120 }
157 property bool resetting: false
121 property bool resetting: false
158 property bool waiting: false
122 property bool waiting: false
159 property bool showWrongText: false
123 property bool showWrongText: false
160
124
161− readonly property string forcedDelayText: i18n.tr("Too many incorrect attempts") +
162− "\n" +
163− i18n.tr("Please wait")
164−
165 source: (!resetting && root.required) ? (root.alphaNumeric ? "PassphraseLockscreen.qml" : "PinLockscreen.qml") : ""
125 source: (!resetting && root.required) ? (root.alphaNumeric ? "PassphraseLockscreen.qml" : "PinLockscreen.qml") : ""
166 onSourceChanged: {
126 onSourceChanged: {
167 waiting = false
127 waiting = false
168 showWrongText = false
128 showWrongText = false
169 }
129 }
130+ onLoaded: {
131+ if (forcedDelayTimer.running) {
132+ pinPadLoader.item.clear(true)
133+ }
134+ }
170
135
171 Connections {
136 Connections {
172 target: pinPadLoader.item
137 target: pinPadLoader.item
@@ -193,10 +158,19 @@ Showable {
193 }
158 }
194 Binding {
159 Binding {
195 target: pinPadLoader.item
160 target: pinPadLoader.item
196− property: "placeholderText"
161+ property: "infoText"
197− value: forcedDelayTimer.running ? pinPadLoader.forcedDelayText :
162+ value: root.infoText
198− (pinPadLoader.showWrongText ? root.wrongPlaceholderText :
163+ }
199− root.placeholderText)
164+ Binding {
165+ target: pinPadLoader.item
166+ property: "retryText"
167+ value: forcedDelayTimer.running ? i18n.tr("Please wait") : root.retryText
168+ }
169+ Binding {
170+ target: pinPadLoader.item
171+ property: "errorText"
172+ value: forcedDelayTimer.running ? i18n.tr("Too many incorrect attempts") :
173+ (pinPadLoader.showWrongText ? root.errorText : "")
200 }
174 }
201 Binding {
175 Binding {
202 target: pinPadLoader.item
176 target: pinPadLoader.item
@@ -210,8 +184,9 @@ Showable {
210 }
184 }
211 }
185 }
212
186
213− Column {
187+ Label {
214− id: emergencyCallColumn
188+ id: emergencyCallLabel
189+ objectName: "emergencyCallLabel"
215
190
216 // FIXME: We *should* show emergency dialer if there is a SIM present,
191 // FIXME: We *should* show emergency dialer if there is a SIM present,
217 // regardless of whether the side stage is enabled. But right now,
192 // regardless of whether the side stage is enabled. But right now,
@@ -223,37 +198,20 @@ Showable {
223 visible: !shell.sideStageEnabled
198 visible: !shell.sideStageEnabled
224
199
225 anchors {
200 anchors {
226− left: parent.left
227 bottom: parent.bottom
201 bottom: parent.bottom
228 bottomMargin: units.gu(4)
202 bottomMargin: units.gu(4)
229− right: parent.right
203+ horizontalCenter: parent.horizontalCenter
230− }
231− height: childrenRect.height
232− spacing: units.gu(1)
233−
234− Icon {
235− objectName: "emergencyCallIcon"
236− height: units.gu(3)
237− width: height
238− anchors.horizontalCenter: parent.horizontalCenter
239− name: "phone-app-call-symbolic"
240− color: "#f3f3e7"
241− opacity: 0.6
242 }
204 }
243
205
244− Label {
206+ text: i18n.tr("Emergency Call")
245− text: i18n.tr("Emergency Call")
207+ color: "#f3f3e7"
246− color: "#f3f3e7"
208+ opacity: 0.6
247− opacity: 0.6
248− fontSize: "medium"
249− anchors.horizontalCenter: parent.horizontalCenter
250− }
251 }
209 }
252
210
253 MouseArea {
211 MouseArea {
254− anchors.fill: emergencyCallColumn
212+ anchors.fill: emergencyCallLabel
255 onClicked: root.emergencyCall()
213 onClicked: root.emergencyCall()
256− enabled: emergencyCallColumn.visible
214+ enabled: emergencyCallLabel.visible
257 }
215 }
258
216
259 Component {
217 Component {
qml/Components/PassphraseLockscreen.qml+3−3
@@ -22,7 +22,7 @@ Item {
22 id: root
22 id: root
23 height: highlightItem.height
23 height: highlightItem.height
24
24
25− property string placeholderText
25+ property string infoText
26 property string username: ""
26 property string username: ""
27 property bool entryEnabled: true
27 property bool entryEnabled: true
28
28
@@ -75,8 +75,8 @@ Item {
75 echoMode: TextInput.Password
75 echoMode: TextInput.Password
76 opacity: 0.9
76 opacity: 0.9
77 hasClearButton: false
77 hasClearButton: false
78− enabled: entryEnabled
78+ enabled: root.entryEnabled
79− placeholderText: root.placeholderText
79+ placeholderText: root.infoText
80
80
81 onAccepted: {
81 onAccepted: {
82 if (pinentryField.text) {
82 if (pinentryField.text) {
qml/Components/PinLockscreen.qml+151−163
@@ -22,9 +22,11 @@ import "../Components"
22Column {
22Column {
23 id: root
23 id: root
24 anchors.centerIn: parent
24 anchors.centerIn: parent
25− spacing: units.gu(3.5)
25+ spacing: units.gu(2)
26
26
27− property alias placeholderText: pinentryField.placeholderText
27+ property string infoText
28+ property string retryText
29+ property string errorText
28 property int padWidth: units.gu(34)
30 property int padWidth: units.gu(34)
29 property int padHeight: units.gu(28)
31 property int padHeight: units.gu(28)
30 property int minPinLength: -1
32 property int minPinLength: -1
@@ -35,199 +37,185 @@ Column {
35
37
36 property bool entryEnabled: true
38 property bool entryEnabled: true
37
39
38− function clear(playAnimation) {
40+ function clear(showAnimation) {
39 pinentryField.text = "";
41 pinentryField.text = "";
40− if (playAnimation) {
42+ if (showAnimation) {
43+ pinentryField.incorrectOverride = true;
41 wrongPasswordAnimation.start();
44 wrongPasswordAnimation.start();
42 }
45 }
43 }
46 }
44
47
45− QtObject {
48+ Column {
46− id: priv
49+ id: shakeContainer
47− property bool autoConfirm: root.minPinLength == root.maxPinLength && root.minPinLength != -1
48− }
49−
50− UbuntuShape {
51− id: pinentryField
52− objectName: "pinentryField"
53 anchors.horizontalCenter: parent.horizontalCenter
50 anchors.horizontalCenter: parent.horizontalCenter
54− color: "#55000000"
51+ width: parent.width
55− width:root.padWidth
52+ spacing: units.gu(2)
56− height: units.gu(5)
57− radius: "medium"
58− property string text: ""
59− property string placeholderText: ""
60−
61− function appendChar(character) {
62− if (root.maxPinLength == -1 || pinentryField.text.length < root.maxPinLength) {
63− pinentryField.text = pinentryField.text + character;
64− }
65− }
66−
67− onTextChanged: {
68− pinentryFieldLabel.text = "";
69− for (var i = 0; i < text.length; ++i) {
70− pinentryFieldLabel.text += "•";
71− }
72− if (priv.autoConfirm && text.length === root.maxPinLength) {
73− root.entered(text);
74− }
75− }
76
53
77 Label {
54 Label {
78− id: pinentryFieldLabel
55+ id: infoField
79− anchors.centerIn: parent
56+ objectName: "infoTextLabel"
80− width: parent.width - (backspaceIcon.width + backspaceIcon.anchors.rightMargin) * 2
57+ fontSize: "large"
81− elide: Text.ElideMiddle
82− horizontalAlignment: Text.AlignHCenter
83− font.pixelSize: units.dp(44)
84 color: "#f3f3e7"
58 color: "#f3f3e7"
85− opacity: 0.6
59+ anchors.horizontalCenter: parent.horizontalCenter
86− }
60+ text: root.infoText
87− Label {
88− id: pinentryFieldPlaceHolder
89− objectName: "pinentryFieldPlaceHolder"
90− anchors.centerIn: parent
91− horizontalAlignment: Text.AlignHCenter
92− color: "#f3f3e7"
93− opacity: 0.6
94− text: parent.placeholderText
95− visible: pinentryFieldLabel.text.length == 0
96 }
61 }
97
62
98− Icon {
63+ Item {
99− id: backspaceIcon
64+ id: pinContainer
100− objectName: "backspaceIcon"
65+ anchors { left: parent.left; right: parent.right; margins: units.gu(2) }
101− anchors {
66+ height: units.gu(4)
102− top: parent.top
67+
103− topMargin: units.gu(1)
68+ Row {
104− right: parent.right
69+ id: pinentryField
105− rightMargin: units.gu(2)
70+ objectName: "pinentryField"
106− bottom: parent.bottom
71+ anchors.horizontalCenter: parent.horizontalCenter
107− bottomMargin: units.gu(1)
72+ anchors.verticalCenter: parent.verticalCenter
108− }
73+ spacing: Math.max(0, Math.min(units.gu(3), (parent.width / root.maxPinLength) - units.gu(3)))
109− visible: entryEnabled && !priv.autoConfirm
74+
110− width: height
75+ property string text
111− name: "erase"
76+ property bool incorrectOverride: false
112− color: "#f3f3e7"
77+
113− opacity: 0.6
78+ Repeater {
114− MouseArea {
79+ model: pinentryField.text.length
115− anchors.fill: parent
80+ delegate: Rectangle {
116− onClicked: pinentryField.text = pinentryField.text.substring(0, pinentryField.text.length-1);
81+ color: "#f3f3e7"
117− }
82+ width: Math.min(units.gu(2), (pinContainer.width - pinContainer.height*2 ) / (root.maxPinLength >= 0 ? root.maxPinLength : 16))
118− }
83+ height: width
119− }
84+ radius: width / 2
85+ }
86+ }
120
87
121− UbuntuShape {
88+ function appendNumber(number) {
122− anchors {
89+ if (incorrectOverride) {
123− left: parent.left
90+ incorrectOverride = false;
124− right: parent.right
91+ }
125− margins: (parent.width - root.padWidth) / 2
126− }
127− height: root.padHeight
128− color: "#55000000"
129− radius: "medium"
130−
131− ThinDivider {
132− anchors {
133− left: parent.left
134− right: parent.right
135− top: parent.top
136− topMargin: root.padHeight / 4
137− }
138− }
139− ThinDivider {
140− anchors {
141− left: parent.left
142− right: parent.right
143− verticalCenter: parent.verticalCenter
144− }
145− }
146− ThinDivider {
147− anchors {
148− left: parent.left
149− right: parent.right
150− bottom: parent.bottom
151− bottomMargin: root.padHeight / 4
152− }
153− }
154
92
155− ThinDivider {
93+ pinentryField.text = pinentryField.text + number
156− anchors.centerIn: parent
94+
157− anchors.horizontalCenterOffset: -root.padWidth / 6
95+ if (root.minPinLength > 0 && root.maxPinLength > 0
158− width: root.padHeight
96+ && root.minPinLength == root.maxPinLength && pinentryField.text.length == root.minPinLength) {
159− rotation: -90
97+ root.entered(pinentryField.text)
160− }
98+ }
161− ThinDivider {
99+ }
162− anchors.centerIn: parent
163− anchors.horizontalCenterOffset: root.padWidth / 6
164− width: root.padHeight
165− rotation: -90
166− }
167
100
168− Grid {
101+ function backspace() {
169− anchors {
102+ pinentryField.text = pinentryField.text.substring(0, pinentryField.text.length-1)
170− left: parent.left
103+ }
171− right: parent.right
104+ }
172− margins: (parent.width - root.padWidth) / 2
105+ Label {
106+ id: wrongNoticeLabel
107+ objectName: "wrongNoticeLabel"
108+ fontSize: "x-large"
109+ color: "#f3f3e7"
110+ anchors.horizontalCenter: parent.horizontalCenter
111+ text: root.errorText
112+ visible: pinentryField.incorrectOverride
173 }
113 }
174
114
175− columns: 3
115+ AbstractButton {
116+ objectName: "backspaceIcon"
117+ anchors { right: parent.right; top: parent.top; bottom: parent.bottom }
118+ width: height
176
119
177− Repeater {
120+ Icon {
178− model: 9
121+ anchors.fill: parent
122+ name: "erase"
123+ color: "#f3f3e7"
124+ }
179
125
180− PinPadButton {
126+ opacity: (pinentryField.text.length && !pinentryField.incorrectOverride) > 0 ? 1 : 0
181− objectName: "pinPadButton" + (index + 1)
182− width: root.padWidth / 3
183− height: root.padHeight / 4
184− text: index + 1
185− enabled: entryEnabled
186
127
187− onClicked: {
128+ Behavior on opacity {
188− pinentryField.appendChar(text);
129+ UbuntuNumberAnimation {}
189− }
190 }
130 }
191− }
192
131
193− PinPadButton {
132+ onClicked: pinentryField.backspace()
194− objectName: "pinPadButtonBack"
195− width: root.padWidth / 3
196− height: root.padHeight / 4
197− subText: i18n.tr("CANCEL")
198− onClicked: root.cancel();
199 }
133 }
134+ }
200
135
201− PinPadButton {
136+ Label {
202− objectName: "pinPadButton0"
137+ objectName: "retryLabel"
203− width: root.padWidth / 3
138+ fontSize: "x-small"
204− height: root.padHeight / 4
139+ color: "#f3f3e7"
205− text: "0"
140+ anchors.horizontalCenter: parent.horizontalCenter
206− onClicked: pinentryField.appendChar(text);
141+ text: root.retryText || " "
207− enabled: entryEnabled
142+ }
208− }
143+ }
144+
145+ ThinDivider {
146+ anchors { left: parent.left; right: parent.right; margins: units.gu(2) }
147+ }
148+
149+ Grid {
150+ id: numbersGrid
151+ anchors { horizontalCenter: parent.horizontalCenter }
152+ columns: 3
153+
154+ property int buttonHeight: units.gu(8)
155+ property int buttonWidth: units.gu(12)
156+
157+ Repeater {
158+ model: 9
209
159
210 PinPadButton {
160 PinPadButton {
211− objectName: "pinPadButtonErase"
161+ objectName: "pinPadButton" + text
212− width: root.padWidth / 3
162+ text: index + 1
213− height: root.padHeight / 4
163+ height: numbersGrid.buttonHeight
214− iconName: priv.autoConfirm ? "erase" : ""
164+ width: numbersGrid.buttonWidth
215− subText: priv.autoConfirm ? "" : i18n.tr("DONE")
165+ enabled: root.entryEnabled && (root.maxPinLength == -1 ||
166+ pinentryField.text.length < root.maxPinLength ||
167+ pinentryField.incorrectOverride)
168+
216 onClicked: {
169 onClicked: {
217− if (priv.autoConfirm) {
170+ pinentryField.appendNumber(index + 1)
218− pinentryField.text = pinentryField.text.substring(0, pinentryField.text.length-1);
219− } else {
220− root.entered(pinentryField.text);
221− }
222 }
171 }
223− enabled: priv.autoConfirm ? entryEnabled : pinentryField.text.length >= root.minPinLength
224 }
172 }
225 }
173 }
226− }
174+ Item {
175+ height: numbersGrid.buttonHeight
176+ width: numbersGrid.buttonWidth
177+ }
178+ PinPadButton {
179+ text: "0"
180+ height: numbersGrid.buttonHeight
181+ width: numbersGrid.buttonWidth
182+ enabled: root.entryEnabled && (root.maxPinLength == -1 ||
183+ pinentryField.text.length < root.maxPinLength ||
184+ pinentryField.incorrectOverride)
185+
186+ onClicked: {
187+ pinentryField.appendNumber(0)
188+ }
189+ }
190+ Item {
191+ height: numbersGrid.buttonHeight
192+ width: numbersGrid.buttonWidth
193+ }
194+ PinPadButton {
195+ iconName: "close"
196+ height: numbersGrid.buttonHeight
197+ width: numbersGrid.buttonWidth
227
198
199+ onClicked: root.cancel()
200+ }
201+ Item {
202+ height: numbersGrid.buttonHeight
203+ width: numbersGrid.buttonWidth
204+ }
205+ PinPadButton {
206+ iconName: "tick"
207+ objectName: "confirmButton"
208+ height: numbersGrid.buttonHeight
209+ width: numbersGrid.buttonWidth
210+ enabled: root.enabled && pinentryField.text.length >= root.minPinLength
211+ visible: root.minPinLength == -1 || root.minPinLength !== root.maxPinLength
212+
213+ onClicked: root.entered(pinentryField.text)
214+ }
215+ }
228 WrongPasswordAnimation {
216 WrongPasswordAnimation {
229 id: wrongPasswordAnimation
217 id: wrongPasswordAnimation
230 objectName: "wrongPasswordAnimation"
218 objectName: "wrongPasswordAnimation"
231− target: pinentryField
219+ target: shakeContainer
232 }
220 }
233}
221}
qml/Components/PinPadButton.qml+31−45
@@ -15,62 +15,48 @@
15 */
15 */
16
16
17import QtQuick 2.0
17import QtQuick 2.0
18−import Ubuntu.Components 0.1
18+import Ubuntu.Components 1.1
19
19
20−Item {
20+AbstractButton {
21 id: root
21 id: root
22 opacity: enabled ? 1 : 0.6
22 opacity: enabled ? 1 : 0.6
23
23
24 property alias text: label.text
24 property alias text: label.text
25− property alias subText: subTextLabel.text
26 property string iconName
25 property string iconName
27
26
28− signal clicked()
27+ UbuntuShape {
28+ anchors.fill: parent
29+ opacity: root.pressed ? 1 : 0
30+ Behavior on opacity {
31+ UbuntuNumberAnimation {}
32+ }
33+ }
29
34
30− Column {
35+ Label {
36+ id: label
31 anchors.centerIn: parent
37 anchors.centerIn: parent
32− width: parent.width
38+ horizontalAlignment: Text.AlignHCenter
33− height: childrenRect.height
39+ color: "#f3f3e7"
34−
40+ fontSize: "x-large"
35− Item {
41+ font.weight: Font.DemiBold
36− anchors {
42+ visible: text.length > 0
37− left: parent.left
43+ scale: root.pressed ? 0.9 : 1
38− right: parent.right
44+ Behavior on scale {
39− }
45+ UbuntuNumberAnimation {}
40− height: label.visible || icon.visible ? Math.max(label.height, icon.height) : 0
41−
42− Label {
43− id: label
44− anchors.centerIn: parent
45− width: parent.width
46− horizontalAlignment: Text.AlignHCenter
47− color: "#f3f3e7"
48− fontSize: "large"
49− font.weight: Font.DemiBold
50− visible: text.length > 0
51− }
52−
53− Icon {
54− id: icon
55− height: units.gu(3)
56− width: height
57− anchors.centerIn: parent
58− name: root.iconName
59− color: "#f3f3e7"
60− visible: name.length > 0
61− }
62− }
63− Label {
64− id: subTextLabel
65− fontSize: "small"
66− color: "#f3f3e7"
67− anchors.horizontalCenter: parent.horizontalCenter
68− visible: text.length > 0
69 }
46 }
70 }
47 }
71
48
72− MouseArea {
49+ Icon {
73− anchors.fill: parent
50+ id: icon
74− onClicked: root.clicked()
51+ height: units.gu(3)
52+ width: height
53+ anchors.centerIn: parent
54+ name: root.iconName
55+ color: "#f3f3e7"
56+ visible: name.length > 0
57+ scale: root.pressed ? 0.9 : 1
58+ Behavior on scale {
59+ UbuntuNumberAnimation { duration: UbuntuAnimation.SlowDuration }
60+ }
75 }
61 }
76}
62}
qml/Dash/Previews/PreviewExpandable.qml+3−3
@@ -80,9 +80,9 @@ PreviewWidget {
80 delegate: PreviewWidgetFactory {
80 delegate: PreviewWidgetFactory {
81 height: visible ? implicitHeight : 0
81 height: visible ? implicitHeight : 0
82 width: parent.width
82 width: parent.width
83− widgetId: modelData.widgetId
83+ widgetId: model.widgetId
84− widgetType: modelData.type
84+ widgetType: model.type
85− widgetData: modelData.properties
85+ widgetData: model.properties
86 isCurrentPreview: root.isCurrentPreview
86 isCurrentPreview: root.isCurrentPreview
87 scopeStyle: root.scopeStyle
87 scopeStyle: root.scopeStyle
88 anchors {
88 anchors {
qml/Dash/Previews/PreviewPayments.qml+22−3
@@ -37,9 +37,15 @@ PreviewWidget {
37
37
38 color: Theme.palette.selected.foreground
38 color: Theme.palette.selected.foreground
39 text: paymentClient.formattedPrice
39 text: paymentClient.formattedPrice
40− onClicked: paymentClient.start()
40+ onClicked: {
41+ paymentClient.start();
42+ paymentButton.opacity = 0;
43+ }
41 anchors.right: parent.right
44 anchors.right: parent.right
42 width: (root.width - units.gu(1)) / 2
45 width: (root.width - units.gu(1)) / 2
46+ opacity: 1
47+ visible: paymentButton.opacity == 0 ? false : true
48+ Behavior on opacity { PropertyAnimation { duration: UbuntuAnimation.FastDuration } }
43
49
44 Payments {
50 Payments {
45 id: paymentClient
51 id: paymentClient
@@ -49,8 +55,21 @@ PreviewWidget {
49 price: source["price"]
55 price: source["price"]
50 currency: source["currency"]
56 currency: source["currency"]
51 storeItemId: source["store_item_id"]
57 storeItemId: source["store_item_id"]
52− onPurchaseCompleted: root.triggered(widgetId, "purchaseCompleted", source)
58+ onPurchaseCompleted: {
53− onPurchaseError: root.triggered(widgetId, "purchaseError", source)
59+ root.triggered(widgetId, "purchaseCompleted", source);
60+ }
61+ onPurchaseError: {
62+ root.triggered(widgetId, "purchaseError", source);
63+ }
54 }
64 }
55 }
65 }
66+
67+ ProgressBar {
68+ id: loadingBar
69+ objectName: "loadingBar"
70+ indeterminate: true
71+ anchors.fill: paymentButton
72+ opacity: 1 - paymentButton.opacity
73+ visible: !paymentButton.visible
74+ }
56}
75}
qml/Dash/graphics/phone/screenshots/vkb_portrait.png

Binary file not shown.

qml/Greeter/Clock.qml+2−1
@@ -16,6 +16,7 @@
16
16
17import QtQuick 2.0
17import QtQuick 2.0
18import Ubuntu.Components 0.1
18import Ubuntu.Components 0.1
19+import "../Panel/Indicators"
19import Unity.Indicators 0.1 as Indicators
20import Unity.Indicators 0.1 as Indicators
20
21
21Item {
22Item {
@@ -33,7 +34,7 @@ Item {
33 }
34 }
34 }
35 }
35
36
36− Indicators.CachedUnityMenuModel {
37+ CachedUnityMenuModel {
37 id: timeModel
38 id: timeModel
38 objectName: "timeModel"
39 objectName: "timeModel"
39
40
qml/Greeter/GreeterContent.qml−1
@@ -87,7 +87,6 @@ Item {
87
87
88 onLoaded: {
88 onLoaded: {
89 item.currentIndex = greeterContentLoader.currentIndex;
89 item.currentIndex = greeterContentLoader.currentIndex;
90− item.resetAuthentication();
91 }
90 }
92
91
93 Binding {
92 Binding {
qml/Notifications/Notification.qml+4−3
@@ -52,7 +52,7 @@ Item {
52 implicitHeight: type !== Notification.PlaceHolder ? (fullscreen ? maxHeight : contentColumn.height + contentColumn.spacing * 2) : 0
52 implicitHeight: type !== Notification.PlaceHolder ? (fullscreen ? maxHeight : contentColumn.height + contentColumn.spacing * 2) : 0
53
53
54 color: Qt.rgba(0.132, 0.117, 0.109, 0.97)
54 color: Qt.rgba(0.132, 0.117, 0.109, 0.97)
55− opacity: 0
55+ opacity: 1 // FIXME: 1 because of LP: #1354406 workaround, has to be 0 really
56
56
57 state: {
57 state: {
58 var result = "";
58 var result = "";
@@ -82,7 +82,8 @@ Item {
82 source: hints["suppress-sound"] != "true" && hints["sound-file"] != undefined ? hints["sound-file"] : ""
82 source: hints["suppress-sound"] != "true" && hints["sound-file"] != undefined ? hints["sound-file"] : ""
83 }
83 }
84
84
85− onOpacityChanged: {
85+ // FIXME: using onCompleted because of LP: #1354406 workaround, has to be onOpacityChanged really
86+ Component.onCompleted: {
86 if (opacity == 1.0 && hints["suppress-sound"] != "true" && sound.source) {
87 if (opacity == 1.0 && hints["suppress-sound"] != "true" && sound.source) {
87 sound.play();
88 sound.play();
88 }
89 }
@@ -380,7 +381,7 @@ Item {
380 id: comboRepeater
381 id: comboRepeater
381
382
382 onVisibleChanged: {
383 onVisibleChanged: {
383− comboButton.text = comboRepeater.itemAt(2).actionLabel
384+ comboButton.text = comboRepeater.count >= 3 ? comboRepeater.itemAt(2).actionLabel : ""
384 }
385 }
385
386
386 model: notification.actions
387 model: notification.actions
qml/Notifications/NotificationMenuItemFactory.qml+9−1
@@ -117,7 +117,10 @@ Loader {
117 right: parent.right
117 right: parent.right
118 }
118 }
119 height: menuFactory.maxHeight
119 height: menuFactory.maxHeight
120− placeholderText: i18n.tr("Please enter SIM PIN")
120+ infoText: i18n.tr("Enter SIM PIN")
121+ errorText: i18n.tr("Sorry, incorrect PIN")
122+ minPinLength: 4
123+ maxPinLength: 8
121 background: shell.background
124 background: shell.background
122
125
123 onEntered: {
126 onEntered: {
@@ -127,6 +130,11 @@ Loader {
127 onCancel: {
130 onCancel: {
128 menuModel.activate(menuIndex, false);
131 menuModel.activate(menuIndex, false);
129 }
132 }
133+
134+ onEmergencyCall: {
135+ shell.activateApplication("dialer-app")
136+ menuModel.activate(menuIndex, false)
137+ }
130 }
138 }
131 }
139 }
132}
140}
qml/Notifications/Notifications.qml+5−3
@@ -63,7 +63,8 @@ ListView {
63
63
64 // make sure there's no opacity-difference between the several
64 // make sure there's no opacity-difference between the several
65 // elements in a notification
65 // elements in a notification
66− layer.enabled: add.running || remove.running || populate.running
66+ // FIXME: disabled all transitions because of LP: #1354406 workaround
67+ //layer.enabled: add.running || remove.running || populate.running
67
68
68 Component.onCompleted: {
69 Component.onCompleted: {
69 if (index == 1) {
70 if (index == 1) {
@@ -79,7 +80,8 @@ ListView {
79 }
80 }
80 }
81 }
81
82
82− populate: Transition {
83+ // FIXME: disabled all transitions because of LP: #1354406 workaround
84+ /*populate: Transition {
83 UbuntuNumberAnimation {
85 UbuntuNumberAnimation {
84 property: "opacity"
86 property: "opacity"
85 to: 1
87 to: 1
@@ -107,5 +109,5 @@ ListView {
107 properties: "x,y"
109 properties: "x,y"
108 duration: UbuntuAnimation.SnapDuration
110 duration: UbuntuAnimation.SnapDuration
109 }
111 }
110− }
112+ }*/
111}
113}
tests/mocks/Unity/Indicators/CachedUnityMenuModel.qml → qml/Panel/Indicators/CachedUnityMenuModel.qmlrenamed+14−5
@@ -18,13 +18,22 @@
18 */
18 */
19
19
20import QtQuick 2.0
20import QtQuick 2.0
21+import QMenuModel 0.1
22+import Unity.Indicators 0.1 as Indicators
21
23
24+// Make sure we don't duplicate models.
22Item {
25Item {
23− property string busName: ""
26+ id: cachedModel
24− property string actionsObjectPath: ""
27+ property string busName
25− property string menuObjectPath: ""
28+ property string actionsObjectPath
29+ property string menuObjectPath
30+ readonly property bool ready: busName!=="" && actionsObjectPath!=="" && menuObjectPath!==""
26
31
27− readonly property bool ready: false
32+ property var model: {
33+ if (!ready) return null;
28
34
29− property QtObject model: null
35+ return Indicators.UnityMenuModelCache.model(cachedModel.busName,
36+ cachedModel.menuObjectPath,
37+ { "indicator": cachedModel.actionsObjectPath });
38+ }
30}
39}
qml/Panel/Indicators/DefaultIndicatorWidget.qml+2−1
@@ -63,6 +63,7 @@ IndicatorBase {
63 }
63 }
64
64
65 Row {
65 Row {
66+ id: iconRow
66 anchors {
67 anchors {
67 top: parent.top
68 top: parent.top
68 bottom: parent.bottom
69 bottom: parent.bottom
@@ -73,7 +74,7 @@ IndicatorBase {
73
74
74 Item {
75 Item {
75 width: itemImage.width + units.gu(1)
76 width: itemImage.width + units.gu(1)
76− anchors { top: parent.top; bottom: parent.bottom }
77+ height: iconRow.height
77
78
78 StatusIcon {
79 StatusIcon {
79 id: itemImage
80 id: itemImage
qml/Panel/Indicators/IndicatorBase.qml+4−2
@@ -34,6 +34,7 @@ Item {
34 property string deviceMenuObjectPath: menuObjectPath
34 property string deviceMenuObjectPath: menuObjectPath
35
35
36 property alias menuModel: cachedModel.model
36 property alias menuModel: cachedModel.model
37+ property alias rootActionState: rootAction
37
38
38 CachedUnityMenuModel {
39 CachedUnityMenuModel {
39 id: cachedModel
40 id: cachedModel
@@ -42,8 +43,9 @@ Item {
42 menuObjectPath: indicatorItem.deviceMenuObjectPath
43 menuObjectPath: indicatorItem.deviceMenuObjectPath
43 }
44 }
44
45
45− property RootActionState rootActionState: RootActionState {
46+ RootActionState {
46− menu: menuModel
47+ id: rootAction
48+ menu: menuModel ? menuModel : null
47 onUpdated: indicatorItem.rootActionStateChanged()
49 onUpdated: indicatorItem.rootActionStateChanged()
48 }
50 }
49}
51}
qml/Shell.qml+17−7
@@ -22,6 +22,7 @@ import Ubuntu.Components 0.1
22import Ubuntu.Components.Popups 1.0
22import Ubuntu.Components.Popups 1.0
23import Ubuntu.Gestures 0.1
23import Ubuntu.Gestures 0.1
24import Ubuntu.SystemImage 0.1
24import Ubuntu.SystemImage 0.1
25+import Unity.Connectivity 0.1
25import Unity.Launcher 0.1
26import Unity.Launcher 0.1
26import Utils 0.1
27import Utils 0.1
27import LightDM 0.1 as LightDM
28import LightDM 0.1 as LightDM
@@ -273,15 +274,19 @@ Item {
273
274
274 onShowPrompt: {
275 onShowPrompt: {
275 if (greeter.narrowMode) {
276 if (greeter.narrowMode) {
276− var promptText = text.toLowerCase()
277 if (isDefaultPrompt) {
277 if (isDefaultPrompt) {
278− promptText = lockscreen.alphaNumeric ?
278+ if (lockscreen.alphaNumeric) {
279− i18n.tr("passphrase") : i18n.tr("passcode")
279+ lockscreen.infoText = i18n.tr("Enter your passphrase")
280+ lockscreen.errorText = i18n.tr("Sorry, incorrect passphrase")
281+ } else {
282+ lockscreen.infoText = i18n.tr("Enter your PIN")
283+ lockscreen.errorText = i18n.tr("Sorry, incorrect PIN")
284+ }
285+ } else {
286+ lockscreen.infoText = i18n.tr("Enter your %1").arg(text.toLowerCase())
287+ lockscreen.errorText = i18n.tr("Sorry, incorrect %1").arg(text.toLowerCase())
280 }
288 }
281− lockscreen.placeholderText = i18n.tr("Enter your %1").arg(promptText)
289+
282− lockscreen.wrongPlaceholderText = i18n.tr("Incorrect %1").arg(promptText) +
283− "\n" +
284− i18n.tr("Please re-enter")
285 lockscreen.show();
290 lockscreen.show();
286 }
291 }
287 }
292 }
@@ -416,6 +421,11 @@ Item {
416 }
421 }
417 }
422 }
418
423
424+ /* TODO re-enable when the corresponding changes in the service land (LP: #1361074)
425+ Component.onCompleted: {
426+ Connectivity.unlockAllModems()
427+ } */
428+
419 onUnlocked: greeter.hide()
429 onUnlocked: greeter.hide()
420 onSelected: {
430 onSelected: {
421 // Update launcher items for new user
431 // Update launcher items for new user
qml/Stages/AppSurfaceContainer.qmldeleted−96
@@ -1,96 +0,0 @@
1−/*
2− * Copyright 2014 Canonical Ltd.
3− *
4− * This program is free software; you can redistribute it and/or modify
5− * it under the terms of the GNU 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−import QtQuick 2.0
18−import "Animations"
19−
20−SurfaceContainer {
21− id: container
22− property var promptSurfaces
23−
24− property bool appHasCreatedASurface: false
25−
26− onSurfaceChanged: {
27− if (surface) {
28− if (!appHasCreatedASurface) {
29− surface.visible = false; // hide until splash screen removed
30− appHasCreatedASurface = true;
31− }
32− }
33− }
34−
35− function revealSurface() {
36− surface.visible = true;
37− splashLoader.source = "";
38− }
39−
40− Timer { //FIXME - need to delay removing splash screen to allow surface resize to complete
41− id: surfaceRevealDelay
42− interval: 100
43− onTriggered: surfaceContainer.revealSurface()
44− }
45−
46− Loader {
47− z: 3
48− id: splashLoader
49− anchors.fill: parent
50− }
51−
52− Repeater {
53− model: container.promptSurfaces
54−
55− delegate: SurfaceContainer {
56− anchors {
57− fill: container
58− topMargin: container.surface.anchors.topMargin
59− rightMargin: container.surface.anchors.rightMargin
60− bottomMargin: container.surface.anchors.bottomMargin
61− leftMargin: container.surface.anchors.leftMargin
62− }
63−
64− z: 4 + index
65− surface: modelData
66−
67− Component.onCompleted: {
68− animateIn();
69− }
70− }
71− }
72−
73− StateGroup {
74− id: appSurfaceState
75− states: [
76− State {
77− name: "noSurfaceYet"
78− when: !surfaceContainer.appHasCreatedASurface
79− StateChangeScript {
80− script: { splashLoader.setSource("Splash.qml", { "name": model.name, "image": model.icon }); }
81− }
82− },
83− State {
84− name: "hasSurface"
85− when: surfaceContainer.appHasCreatedASurface && (surfaceContainer.surface !== null)
86− StateChangeScript { script: { surfaceRevealDelay.start(); } }
87− },
88− State {
89− name: "surfaceLostButAppStillAlive"
90− when: surfaceContainer.appHasCreatedASurface && (surfaceContainer.surface === null)
91− // TODO - use app snapshot
92− }
93− ]
94− state: "noSurfaceYet"
95− }
96−}
qml/Stages/ApplicationWindow.qmlnew file+258
@@ -0,0 +1,258 @@
1+/*
2+ * Copyright 2014 Canonical Ltd.
3+ *
4+ * This program is free software; you can redistribute it and/or modify
5+ * it under the terms of the GNU 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+import QtQuick 2.0
18+import Ubuntu.Components 1.1
19+import Unity.Application 0.1
20+
21+Item {
22+ id: root
23+
24+ // to be read from outside
25+ readonly property bool fullscreen: application ? application.fullscreen : false
26+
27+ // to be set from outside
28+ property bool interactive: true
29+ property QtObject application
30+
31+ QtObject {
32+ id: d
33+
34+ // helpers so that we don't have to check for the existence of an application everywhere
35+ // (in order to avoid breaking qml binding due to a javascript exception)
36+ readonly property string name: root.application ? root.application.name : ""
37+ readonly property url icon: root.application ? root.application.icon : ""
38+ readonly property Item surface: root.application ? root.application.surface : null
39+ readonly property int applicationState: root.application ? root.application.state : -1
40+ readonly property var promptSurfaces: root.application ? root.application.promptSurfaces : null
41+
42+ // Whether the Application had a surface before but lost it.
43+ property bool hadSurface: false
44+
45+ property bool needToTakeScreenshot:
46+ d.surface && d.surfaceInitialized && screenshotImage.status === Image.Null
47+ && d.applicationState === ApplicationInfo.Stopped
48+ onNeedToTakeScreenshotChanged: {
49+ if (needToTakeScreenshot) {
50+ screenshotImage.take();
51+ }
52+ }
53+
54+ //FIXME - this is a hack to avoid the first few rendered frames as they
55+ // might show the UI accommodating due to surface resizes on startup.
56+ // Remove this when possible
57+ property bool surfaceInitialized: false
58+ onSurfaceChanged: {
59+ if (surface) {
60+ surfaceInitTimer.start();
61+ } else {
62+ hadSurface = true;
63+ surfaceInitialized = false;
64+ }
65+ }
66+ }
67+
68+ Timer {
69+ id: surfaceInitTimer
70+ interval: 100
71+ onTriggered: { if (d.surface) {d.surfaceInitialized = true;} }
72+ }
73+
74+ Binding {
75+ target: d.surface
76+ when: d.surface
77+ property: "enabled"
78+ value: root.interactive
79+ }
80+ Binding {
81+ target: d.surface
82+ when: d.surface
83+ property: "focus"
84+ value: root.interactive
85+ }
86+ Connections {
87+ target: d.surface
88+ // FIXME: I would rather not need to do this, but currently it doesn't get
89+ // active focus without it and I don't know why.
90+ onFocusChanged: forceSurfaceActiveFocusIfReady();
91+ onParentChanged: forceSurfaceActiveFocusIfReady();
92+ onEnabledChanged: forceSurfaceActiveFocusIfReady();
93+ function forceSurfaceActiveFocusIfReady() {
94+ if (d.surface.focus && d.surface.parent === surfaceContainer && d.surface.enabled) {
95+ d.surface.forceActiveFocus();
96+ }
97+ }
98+ }
99+
100+ SurfaceContainer {
101+ id: surfaceContainer
102+ objectName: "surfaceContainer"
103+ anchors.fill: parent
104+ surface: d.surface
105+ }
106+
107+ Image {
108+ id: screenshotImage
109+ objectName: "screenshotImage"
110+ source: ""
111+ anchors.fill: parent
112+
113+ function take() {
114+ // Format: "image://application/$APP_ID/$CURRENT_TIME_MS"
115+ // eg: "image://application/calculator-app/123456"
116+ var timeMs = new Date().getTime();
117+ source = "image://application/" + root.application.appId + "/" + timeMs;
118+ }
119+
120+ // Save memory by using a half-resolution (thus quarter size) screenshot
121+ sourceSize.width: root.width / 2
122+ sourceSize.height: root.height / 2
123+ }
124+
125+ Loader {
126+ id: splashLoader
127+ visible: active
128+ active: false
129+ anchors.fill: surfaceContainer
130+ sourceComponent: Component {
131+ Splash { name: d.name; image: d.icon }
132+ }
133+ }
134+
135+ Repeater {
136+ model: d.promptSurfaces
137+
138+ delegate: SurfaceContainer {
139+ anchors {
140+ fill: surfaceContainer
141+ }
142+
143+ surface: modelData
144+
145+ Component.onCompleted: {
146+ animateIn();
147+ }
148+ }
149+ }
150+
151+ StateGroup {
152+ objectName: "applicationWindowStateGroup"
153+ states: [
154+ State {
155+ name: "void"
156+ when:
157+ d.hadSurface && (!d.surface || !d.surfaceInitialized)
158+ &&
159+ screenshotImage.status !== Image.Ready
160+ },
161+ State {
162+ name: "splashScreen"
163+ when:
164+ !d.hadSurface && (!d.surface || !d.surfaceInitialized)
165+ &&
166+ screenshotImage.status !== Image.Ready
167+ },
168+ State {
169+ name: "surface"
170+ when:
171+ (d.surface && d.surfaceInitialized)
172+ &&
173+ (d.applicationState !== ApplicationInfo.Stopped
174+ || screenshotImage.status !== Image.Ready)
175+ },
176+ State {
177+ name: "screenshot"
178+ when:
179+ screenshotImage.status === Image.Ready
180+ &&
181+ (d.applicationState === ApplicationInfo.Stopped
182+ || !d.surface || !d.surfaceInitialized)
183+ }
184+ ]
185+
186+ transitions: [
187+ Transition {
188+ from: ""; to: "splashScreen"
189+ PropertyAction { target: splashLoader; property: "active"; value: true }
190+ },
191+ Transition {
192+ from: "splashScreen"; to: "surface"
193+ SequentialAnimation {
194+ PropertyAction { target: surfaceContainer
195+ property: "visible"; value: true }
196+ UbuntuNumberAnimation { target: splashLoader; property: "opacity";
197+ from: 1.0; to: 0.0
198+ duration: UbuntuAnimation.BriskDuration }
199+ PropertyAction { target: splashLoader; property: "active"; value: false }
200+ }
201+ },
202+ Transition {
203+ from: "surface"; to: "splashScreen"
204+ SequentialAnimation {
205+ PropertyAction { target: splashLoader; property: "active"; value: true }
206+ PropertyAction { target: surfaceContainer
207+ property: "visible"; value: true }
208+ UbuntuNumberAnimation { target: splashLoader; property: "opacity";
209+ from: 0.0; to: 1.0
210+ duration: UbuntuAnimation.BriskDuration }
211+ }
212+ },
213+ Transition {
214+ from: "surface"; to: "screenshot"
215+ SequentialAnimation {
216+ PropertyAction { target: screenshotImage
217+ property: "visible"; value: true }
218+ UbuntuNumberAnimation { target: screenshotImage; property: "opacity";
219+ from: 0.0; to: 1.0
220+ duration: UbuntuAnimation.BriskDuration }
221+ PropertyAction { target: surfaceContainer
222+ property: "visible"; value: false }
223+ ScriptAction { script: { if (d.surface) { d.surface.release(); } } }
224+ }
225+ },
226+ Transition {
227+ from: "screenshot"; to: "surface"
228+ SequentialAnimation {
229+ PropertyAction { target: surfaceContainer
230+ property: "visible"; value: true }
231+ UbuntuNumberAnimation { target: screenshotImage; property: "opacity";
232+ from: 1.0; to: 0.0
233+ duration: UbuntuAnimation.BriskDuration }
234+ PropertyAction { target: screenshotImage; property: "visible"; value: false }
235+ PropertyAction { target: screenshotImage; property: "source"; value: "" }
236+ }
237+ },
238+ Transition {
239+ from: "surface"; to: "void"
240+ SequentialAnimation {
241+ PropertyAction { target: surfaceContainer; property: "visible"; value: false }
242+ ScriptAction { script: { if (d.surface) { d.surface.release(); } } }
243+ }
244+ },
245+ Transition {
246+ from: "void"; to: "surface"
247+ SequentialAnimation {
248+ PropertyAction { target: surfaceContainer; property: "opacity"; value: 0.0 }
249+ PropertyAction { target: surfaceContainer; property: "visible"; value: true }
250+ UbuntuNumberAnimation { target: surfaceContainer; property: "opacity";
251+ from: 0.0; to: 1.0
252+ duration: UbuntuAnimation.BriskDuration }
253+ }
254+ }
255+ ]
256+ }
257+
258+}
qml/Stages/PhoneStage.qml+16−4
@@ -110,7 +110,8 @@ Rectangle {
110 id: spreadView
110 id: spreadView
111 objectName: "spreadView"
111 objectName: "spreadView"
112 anchors.fill: parent
112 anchors.fill: parent
113− interactive: (spreadDragArea.status == DirectionalDragArea.Recognized || phase > 1) && draggedIndex == -1
113+ interactive: (spreadDragArea.status == DirectionalDragArea.Recognized || phase > 1)
114+ && draggedDelegateCount === 0
114 contentWidth: spreadRow.width - shift
115 contentWidth: spreadRow.width - shift
115 contentX: -shift
116 contentX: -shift
116
117
@@ -148,7 +149,7 @@ Rectangle {
148 property int phase: 0
149 property int phase: 0
149
150
150 property int selectedIndex: -1
151 property int selectedIndex: -1
151− property int draggedIndex: -1
152+ property int draggedDelegateCount: 0
152 property int closingIndex: -1
153 property int closingIndex: -1
153
154
154 property bool focusChanging: false
155 property bool focusChanging: false
@@ -269,7 +270,7 @@ Rectangle {
269 swipeToCloseEnabled: spreadView.interactive
270 swipeToCloseEnabled: spreadView.interactive
270 maximizedAppTopMargin: root.maximizedAppTopMargin
271 maximizedAppTopMargin: root.maximizedAppTopMargin
271 dropShadow: spreadView.active ||
272 dropShadow: spreadView.active ||
272− priv.focusedAppDelegate.x !== 0
273+ (priv.focusedAppDelegate && priv.focusedAppDelegate.x !== 0)
273
274
274 readonly property bool isDash: model.appId == "unity8-dash"
275 readonly property bool isDash: model.appId == "unity8-dash"
275
276
@@ -290,6 +291,10 @@ Rectangle {
290 // Otherwise line up for the spread
291 // Otherwise line up for the spread
291 return spreadView.width + (index - 1) * spreadView.tileDistance;
292 return spreadView.width + (index - 1) * spreadView.tileDistance;
292 }
293 }
294+
295+ application: ApplicationManager.get(index)
296+ closeable: !isDash
297+
293 property real behavioredIndex: index
298 property real behavioredIndex: index
294 Behavior on behavioredIndex {
299 Behavior on behavioredIndex {
295 enabled: spreadView.closingIndex >= 0
300 enabled: spreadView.closingIndex >= 0
@@ -372,8 +377,15 @@ Rectangle {
372 }
377 }
373 }
378 }
374
379
380+ onDraggedChanged: {
381+ if (dragged) {
382+ spreadView.draggedDelegateCount++;
383+ } else {
384+ spreadView.draggedDelegateCount--;
385+ }
386+ }
387+
375 onClosed: {
388 onClosed: {
376− spreadView.draggedIndex = -1;
377 spreadView.closingIndex = index;
389 spreadView.closingIndex = index;
378 ApplicationManager.stopApplication(ApplicationManager.get(index).appId);
390 ApplicationManager.stopApplication(ApplicationManager.get(index).appId);
379 }
391 }
qml/Stages/SpreadDelegate.qml+32−57
@@ -14,75 +14,43 @@
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 *
15 *
16 * Authors: Michael Zanetti <michael.zanetti@canonical.com>
16 * Authors: Michael Zanetti <michael.zanetti@canonical.com>
17−*/
17+ * Daniel d'Andrada <daniel.dandrada@canonical.com>
18+ */
18
19
19import QtQuick 2.0
20import QtQuick 2.0
20−import Unity.Application 0.1
21import Ubuntu.Components 1.1
21import Ubuntu.Components 1.1
22import "../Components"
22import "../Components"
23
23
24Item {
24Item {
25 id: root
25 id: root
26
26
27+ // to be read from outside
28+ readonly property bool dragged: dragArea.moving
29+ signal clicked()
30+ signal closed()
31+
27 // to be set from outside
32 // to be set from outside
28 property bool interactive: true
33 property bool interactive: true
29 property bool dropShadow: true
34 property bool dropShadow: true
30 property real maximizedAppTopMargin
35 property real maximizedAppTopMargin
31 property alias swipeToCloseEnabled: dragArea.enabled
36 property alias swipeToCloseEnabled: dragArea.enabled
37+ property bool closeable
38+ property alias application: appWindow.application
32
39
33− readonly property bool isFullscreen: surface !== null && surfaceContainer.surface.anchors.topMargin == 0
40+ Item {
34−
41+ objectName: "appWindowWithShadow"
35− signal clicked()
36− signal closed()
37−
38− AppSurfaceContainer {
39− id: surfaceContainer
40− objectName: "surfaceContainer"
41− anchors.fill: parent
42− surface: model.surface
43− promptSurfaces: model.application.promptSurfaces
44−
45− Binding {
46− target: surfaceContainer.surface
47− property: "anchors.topMargin"
48− value: {
49− return surfaceContainer.surface.state === MirSurfaceItem.Fullscreen ? 0 : maximizedAppTopMargin;
50− }
51− }
52−
53− Binding {
54− target: surface
55− property: "enabled"
56− value: root.interactive
57− }
58− Binding {
59− target: surface
60− property: "focus"
61− value: root.interactive
62− }
63
42
64− Connections {
43+ y: dragArea.distance
65− target: surface
44+ width: parent.width
66− // FIXME: I would rather not need to do this, but currently it doesn't get
45+ height: parent.height
67− // active focus without it and I don't know why.
68− onFocusChanged: forceSurfaceActiveFocusIfReady();
69− onParentChanged: forceSurfaceActiveFocusIfReady();
70− onEnabledChanged: forceSurfaceActiveFocusIfReady();
71− function forceSurfaceActiveFocusIfReady() {
72− if (surface.focus && surface.parent === surfaceContainer && surface.enabled) {
73− surface.forceActiveFocus();
74− }
75− }
76− }
77
46
78 BorderImage {
47 BorderImage {
79− id: dropShadowImage
80 anchors {
48 anchors {
81− fill: parent
49+ fill: appWindow
82 leftMargin: -units.gu(2)
50 leftMargin: -units.gu(2)
83 rightMargin: -units.gu(2)
51 rightMargin: -units.gu(2)
84 bottomMargin: -units.gu(2)
52 bottomMargin: -units.gu(2)
85− topMargin: -units.gu(2) + (root.isFullscreen ? 0 : maximizedAppTopMargin)
53+ topMargin: -units.gu(2)
86 }
54 }
87 source: "graphics/dropshadow.png"
55 source: "graphics/dropshadow.png"
88 border { left: 50; right: 50; top: 50; bottom: 50 }
56 border { left: 50; right: 50; top: 50; bottom: 50 }
@@ -90,21 +58,26 @@ Item {
90 Behavior on opacity { UbuntuNumberAnimation {} }
58 Behavior on opacity { UbuntuNumberAnimation {} }
91 }
59 }
92
60
93− transform: Translate {
61+ ApplicationWindow {
94− y: dragArea.distance
62+ id: appWindow
63+ anchors {
64+ fill: parent
65+ topMargin: appWindow.fullscreen ? 0 : maximizedAppTopMargin
66+ }
67+
68+ interactive: root.interactive
95 }
69 }
96 }
70 }
97
71
98 DraggingArea {
72 DraggingArea {
99 id: dragArea
73 id: dragArea
74+ objectName: "dragArea"
100 anchors.fill: parent
75 anchors.fill: parent
101
76
102 property bool moving: false
77 property bool moving: false
103 property real distance: 0
78 property real distance: 0
104
79
105− onMovingChanged: {
80+ readonly property real minSpeedToClose: units.gu(40)
106− spreadView.draggedIndex = moving ? index : -1
107− }
108
81
109 onDragValueChanged: {
82 onDragValueChanged: {
110 if (!dragging) {
83 if (!dragging) {
@@ -123,15 +96,15 @@ Item {
123 }
96 }
124
97
125 onDragEnd: {
98 onDragEnd: {
126− if (model.appId == "unity8-dash") {
99+ if (!root.closeable) {
127 animation.animate("center")
100 animation.animate("center")
128 return;
101 return;
129 }
102 }
130
103
131 // velocity and distance values specified by design prototype
104 // velocity and distance values specified by design prototype
132− if ((dragVelocity < -units.gu(40) && distance < -units.gu(8)) || distance < -root.height / 2) {
105+ if ((dragVelocity < -minSpeedToClose && distance < -units.gu(8)) || distance < -root.height / 2) {
133 animation.animate("up")
106 animation.animate("up")
134− } else if ((dragVelocity > units.gu(40) && distance > units.gu(8)) || distance > root.height / 2) {
107+ } else if ((dragVelocity > minSpeedToClose && distance > units.gu(8)) || distance > root.height / 2) {
135 animation.animate("down")
108 animation.animate("down")
136 } else {
109 } else {
137 animation.animate("center")
110 animation.animate("center")
@@ -140,6 +113,7 @@ Item {
140
113
141 UbuntuNumberAnimation {
114 UbuntuNumberAnimation {
142 id: animation
115 id: animation
116+ objectName: "closeAnimation"
143 target: dragArea
117 target: dragArea
144 property: "distance"
118 property: "distance"
145 property bool requestClose: false
119 property bool requestClose: false
@@ -164,9 +138,10 @@ Item {
164 onRunningChanged: {
138 onRunningChanged: {
165 if (!running) {
139 if (!running) {
166 dragArea.moving = false;
140 dragArea.moving = false;
167− dragArea.distance = 0;
168 if (requestClose) {
141 if (requestClose) {
169 root.closed();
142 root.closed();
143+ } else {
144+ dragArea.distance = 0;
170 }
145 }
171 }
146 }
172 }
147 }
qml/Stages/SurfaceContainer.qml+5−11
@@ -26,9 +26,12 @@ Item {
26 if (surface) {
26 if (surface) {
27 surface.parent = container;
27 surface.parent = container;
28 surface.z = 1;
28 surface.z = 1;
29− state = "initial"
30 }
29 }
31 }
30 }
31+ Binding {
32+ target: surface
33+ property: "anchors.fill"; value: container
34+ }
32
35
33 Connections {
36 Connections {
34 target: surface
37 target: surface
@@ -45,7 +48,7 @@ Item {
45 }
48 }
46
49
47 Repeater {
50 Repeater {
48− model: surface.childSurfaces
51+ model: surface ? surface.childSurfaces : null
49
52
50 delegate: Loader {
53 delegate: Loader {
51 z: 2
54 z: 2
@@ -81,8 +84,6 @@ Item {
81 var popped = tmp.pop();
84 var popped = tmp.pop();
82 popped.end();
85 popped.end();
83 d.animations = tmp;
86 d.animations = tmp;
84− } else {
85− container.state = "initial";
86 }
87 }
87 }
88 }
88
89
@@ -96,11 +97,4 @@ Item {
96 id: swipeFromBottom
97 id: swipeFromBottom
97 SwipeFromBottomAnimation {}
98 SwipeFromBottomAnimation {}
98 }
99 }
99−
100− states: [
101− State {
102− name: "initial"
103− PropertyChanges { target: surface; anchors.fill: container }
104− }
105− ]
106}
100}
qml/Stages/TabletStage.qml+13−3
@@ -145,7 +145,8 @@ Rectangle {
145 Flickable {
145 Flickable {
146 id: spreadView
146 id: spreadView
147 anchors.fill: parent
147 anchors.fill: parent
148− interactive: (spreadDragArea.status == DirectionalDragArea.Recognized || phase > 1) && draggedIndex == -1
148+ interactive: (spreadDragArea.status == DirectionalDragArea.Recognized || phase > 1)
149+ && draggedDelegateCount === 0
149 contentWidth: spreadRow.width - shift
150 contentWidth: spreadRow.width - shift
150 contentX: -shift
151 contentX: -shift
151
152
@@ -189,7 +190,7 @@ Rectangle {
189 readonly property real snapPosition: 0.75
190 readonly property real snapPosition: 0.75
190
191
191 property int selectedIndex: -1
192 property int selectedIndex: -1
192− property int draggedIndex: -1
193+ property int draggedDelegateCount: 0
193 property int closingIndex: -1
194 property int closingIndex: -1
194
195
195 property bool sideStageDragging: sideStageDragHandle.dragging
196 property bool sideStageDragging: sideStageDragHandle.dragging
@@ -475,6 +476,8 @@ Rectangle {
475 swipeToCloseEnabled: spreadView.interactive
476 swipeToCloseEnabled: spreadView.interactive
476 maximizedAppTopMargin: root.maximizedAppTopMargin
477 maximizedAppTopMargin: root.maximizedAppTopMargin
477 dragOffset: !isDash && model.appId == priv.mainStageAppId && root.inverseProgress > 0 ? root.inverseProgress : 0
478 dragOffset: !isDash && model.appId == priv.mainStageAppId && root.inverseProgress > 0 ? root.inverseProgress : 0
479+ application: ApplicationManager.get(index)
480+ closeable: !isDash
478
481
479 readonly property bool isDash: model.appId == "unity8-dash"
482 readonly property bool isDash: model.appId == "unity8-dash"
480
483
@@ -533,8 +536,15 @@ Rectangle {
533 }
536 }
534 }
537 }
535
538
539+ onDraggedChanged: {
540+ if (dragged) {
541+ spreadView.draggedDelegateCount++;
542+ } else {
543+ spreadView.draggedDelegateCount--;
544+ }
545+ }
546+
536 onClosed: {
547 onClosed: {
537− spreadView.draggedIndex = -1;
538 spreadView.closingIndex = index;
548 spreadView.closingIndex = index;
539 ApplicationManager.stopApplication(ApplicationManager.get(index).appId);
549 ApplicationManager.stopApplication(ApplicationManager.get(index).appId);
540 }
550 }
qml/Stages/TransformedSpreadDelegate.qml+1−1
@@ -309,7 +309,7 @@ SpreadDelegate {
309 Scale {
309 Scale {
310 origin { x: 0; y: (spreadView.height * priv.scale) + maximizedAppTopMargin * 3 }
310 origin { x: 0; y: (spreadView.height * priv.scale) + maximizedAppTopMargin * 3 }
311 xScale: 1
311 xScale: 1
312− yScale: isFullscreen ? 1 - priv.topMarginProgress * maximizedAppTopMargin / spreadView.height : 1
312+ yScale: fullscreen ? 1 - priv.topMarginProgress * maximizedAppTopMargin / spreadView.height : 1
313 },
313 },
314 Translate {
314 Translate {
315 x: priv.xTranslate
315 x: priv.xTranslate
tests/autopilot/unity8/shell/tests/test_lock_screen.py+2−2
@@ -54,7 +54,7 @@ class TestLockscreen(UnityTestCase):
54 self.main_window.enter_pin_code("1234")
54 self.main_window.enter_pin_code("1234")
55 self.assertThat(lockscreen.shown, Eventually(Equals(False)))
55 self.assertThat(lockscreen.shown, Eventually(Equals(False)))
56 else:
56 else:
57− self._enter_prompt_passphrase("1234")
57+ self._enter_prompt_passphrase("1234\n")
58 self.assertThat(greeter.shown, Eventually(Equals(False)))
58 self.assertThat(greeter.shown, Eventually(Equals(False)))
59
59
60 @with_lightdm_mock("single-passphrase")
60 @with_lightdm_mock("single-passphrase")
@@ -86,7 +86,7 @@ class TestLockscreen(UnityTestCase):
86 self.assertThat(pinentryField.text, Eventually(Equals("")))
86 self.assertThat(pinentryField.text, Eventually(Equals("")))
87 self.assertThat(lockscreen.shown, Eventually(Equals(True)))
87 self.assertThat(lockscreen.shown, Eventually(Equals(True)))
88 else:
88 else:
89− self._enter_prompt_passphrase("4231")
89+ self._enter_prompt_passphrase("4231\n")
90 prompt = self.main_window.get_greeter().get_prompt()
90 prompt = self.main_window.get_greeter().get_prompt()
91 self.assertThat(prompt.text, Eventually(Equals("")))
91 self.assertThat(prompt.text, Eventually(Equals("")))
92 self.assertThat(greeter.shown, Eventually(Equals(True)))
92 self.assertThat(greeter.shown, Eventually(Equals(True)))
tests/mocks/LightDM/demo/GreeterPrivate.cpp+60−21
@@ -33,6 +33,12 @@ class GreeterImpl : public QObject
33{
33{
34 Q_OBJECT
34 Q_OBJECT
35
35
36+ struct AppData
37+ {
38+ GreeterImpl *impl;
39+ pam_handle *handle;
40+ };
41+
36 typedef QFutureInterface<QString> ResponseFuture;
42 typedef QFutureInterface<QString> ResponseFuture;
37
43
38public:
44public:
@@ -46,32 +52,36 @@ public:
46
52
47 connect(&futureWatcher, SIGNAL(finished()),
53 connect(&futureWatcher, SIGNAL(finished()),
48 this, SLOT(finishPam()));
54 this, SLOT(finishPam()));
49− connect(this, SIGNAL(showMessage(QString, QLightDM::Greeter::MessageType)),
55+ connect(this, SIGNAL(showMessage(pam_handle *, QString, QLightDM::Greeter::MessageType)),
50− greeter, SIGNAL(showMessage(QString, QLightDM::Greeter::MessageType)));
56+ this, SLOT(handleMessage(pam_handle *, QString, QLightDM::Greeter::MessageType)));
51 // This next connect is how we pass ResponseFutures between threads
57 // This next connect is how we pass ResponseFutures between threads
52− connect(this, SIGNAL(showPrompt(QString, QLightDM::Greeter::PromptType, QLightDM::GreeterImpl::ResponseFuture)),
58+ connect(this, SIGNAL(showPrompt(pam_handle *, QString, QLightDM::Greeter::PromptType, QLightDM::GreeterImpl::ResponseFuture)),
53− this, SLOT(handlePrompt(QString, QLightDM::Greeter::PromptType, QLightDM::GreeterImpl::ResponseFuture)));
59+ this, SLOT(handlePrompt(pam_handle *, QString, QLightDM::Greeter::PromptType, QLightDM::GreeterImpl::ResponseFuture)));
60+ }
61+
62+ ~GreeterImpl()
63+ {
64+ cancelPam();
54 }
65 }
55
66
56 void start(QString username)
67 void start(QString username)
57 {
68 {
58− // Clear out any existing PAM interactions first (we can't simply
69+ // Clear out any existing PAM interactions first
59− // cancel our QFuture because QtConcurrent::run doesn't support cancel)
70+ cancelPam();
60− if (pamHandle != NULL) {
71+
61− pam_handle *handle = pamHandle;
72+ AppData *appData = new AppData();
62− pamHandle = NULL; // to disable normal finishPam() handling
73+ appData->impl = this;
63− while (respond(QString())); // clear our local queue of QFutures
64− pam_end(handle, PAM_CONV_ERR);
65− }
66
74
67 // Now actually start a new conversation with PAM
75 // Now actually start a new conversation with PAM
68 pam_conv conversation;
76 pam_conv conversation;
69 conversation.conv = converseWithPam;
77 conversation.conv = converseWithPam;
70− conversation.appdata_ptr = static_cast<void*>(this);
78+ conversation.appdata_ptr = static_cast<void*>(appData);
71
79
72 if (pam_start("lightdm", username.toUtf8(), &conversation, &pamHandle) == PAM_SUCCESS) {
80 if (pam_start("lightdm", username.toUtf8(), &conversation, &pamHandle) == PAM_SUCCESS) {
81+ appData->handle = pamHandle;
73 futureWatcher.setFuture(QtConcurrent::run(authenticateWithPam, pamHandle));
82 futureWatcher.setFuture(QtConcurrent::run(authenticateWithPam, pamHandle));
74 } else {
83 } else {
84+ delete appData;
75 greeterPrivate->authenticated = false;
85 greeterPrivate->authenticated = false;
76 Q_EMIT greeter->showMessage("Internal error: could not start PAM authentication", QLightDM::Greeter::MessageTypeError);
86 Q_EMIT greeter->showMessage("Internal error: could not start PAM authentication", QLightDM::Greeter::MessageTypeError);
77 Q_EMIT greeter->authenticationComplete();
87 Q_EMIT greeter->authenticationComplete();
@@ -103,7 +113,9 @@ public:
103 if (!tmp_response)
113 if (!tmp_response)
104 return PAM_CONV_ERR;
114 return PAM_CONV_ERR;
105
115
106− GreeterImpl* impl = static_cast<GreeterImpl*>(appdata_ptr);
116+ AppData *appData = static_cast<AppData*>(appdata_ptr);
117+ GreeterImpl *impl = appData->impl;
118+ pam_handle *handle = appData->handle;
107
119
108 int count;
120 int count;
109 QVector<ResponseFuture> responses;
121 QVector<ResponseFuture> responses;
@@ -117,7 +129,7 @@ public:
117 QString message(msg[count]->msg);
129 QString message(msg[count]->msg);
118 responses.append(ResponseFuture());
130 responses.append(ResponseFuture());
119 responses.last().reportStarted();
131 responses.last().reportStarted();
120− Q_EMIT impl->showPrompt(message, Greeter::PromptTypeQuestion, responses.last());
132+ Q_EMIT impl->showPrompt(handle, message, Greeter::PromptTypeQuestion, responses.last());
121 break;
133 break;
122 }
134 }
123 case PAM_PROMPT_ECHO_OFF:
135 case PAM_PROMPT_ECHO_OFF:
@@ -125,19 +137,19 @@ public:
125 QString message(msg[count]->msg);
137 QString message(msg[count]->msg);
126 responses.append(ResponseFuture());
138 responses.append(ResponseFuture());
127 responses.last().reportStarted();
139 responses.last().reportStarted();
128− Q_EMIT impl->showPrompt(message, Greeter::PromptTypeSecret, responses.last());
140+ Q_EMIT impl->showPrompt(handle, message, Greeter::PromptTypeSecret, responses.last());
129 break;
141 break;
130 }
142 }
131 case PAM_TEXT_INFO:
143 case PAM_TEXT_INFO:
132 {
144 {
133 QString message(msg[count]->msg);
145 QString message(msg[count]->msg);
134− Q_EMIT impl->showMessage(message, Greeter::MessageTypeInfo);
146+ Q_EMIT impl->showMessage(handle, message, Greeter::MessageTypeInfo);
135 break;
147 break;
136 }
148 }
137 default:
149 default:
138 {
150 {
139 QString message(msg[count]->msg);
151 QString message(msg[count]->msg);
140− Q_EMIT impl->showMessage(message, Greeter::MessageTypeError);
152+ Q_EMIT impl->showMessage(handle, message, Greeter::MessageTypeError);
141 break;
153 break;
142 }
154 }
143 }
155 }
@@ -159,6 +171,8 @@ public:
159 }
171 }
160 }
172 }
161
173
174+ delete appData;
175+
162 if (raise_error)
176 if (raise_error)
163 {
177 {
164 for (int i = 0; i < count; ++i)
178 for (int i = 0; i < count; ++i)
@@ -186,8 +200,8 @@ public Q_SLOTS:
186 }
200 }
187
201
188Q_SIGNALS:
202Q_SIGNALS:
189− void showMessage(QString text, QLightDM::Greeter::MessageType type);
203+ void showMessage(pam_handle *handle, QString text, QLightDM::Greeter::MessageType type);
190− void showPrompt(QString text, QLightDM::Greeter::PromptType type, QLightDM::GreeterImpl::ResponseFuture response);
204+ void showPrompt(pam_handle *handle, QString text, QLightDM::Greeter::PromptType type, QLightDM::GreeterImpl::ResponseFuture response);
191
205
192private Q_SLOTS:
206private Q_SLOTS:
193 void finishPam()
207 void finishPam()
@@ -205,13 +219,38 @@ private Q_SLOTS:
205 Q_EMIT greeter->authenticationComplete();
219 Q_EMIT greeter->authenticationComplete();
206 }
220 }
207
221
208− void handlePrompt(QString text, QLightDM::Greeter::PromptType type, QLightDM::GreeterImpl::ResponseFuture future)
222+ void handleMessage(pam_handle *handle, QString text, QLightDM::Greeter::MessageType type)
223+ {
224+ if (handle != pamHandle)
225+ return;
226+
227+ Q_EMIT greeter->showMessage(text, type);
228+ }
229+
230+ void handlePrompt(pam_handle *handle, QString text, QLightDM::Greeter::PromptType type, QLightDM::GreeterImpl::ResponseFuture future)
209 {
231 {
232+ if (handle != pamHandle) {
233+ future.reportResult(QString());
234+ future.reportFinished();
235+ return;
236+ }
237+
210 futures.enqueue(future);
238 futures.enqueue(future);
211 Q_EMIT greeter->showPrompt(text, type);
239 Q_EMIT greeter->showPrompt(text, type);
212 }
240 }
213
241
214private:
242private:
243+ void cancelPam()
244+ {
245+ // Unfortunately we can't simply cancel our QFuture because QtConcurrent::run doesn't support cancel
246+ if (pamHandle != NULL) {
247+ pam_handle *handle = pamHandle;
248+ pamHandle = NULL; // to disable normal finishPam() handling
249+ while (respond(QString())); // clear our local queue of QFutures
250+ pam_end(handle, PAM_CONV_ERR);
251+ }
252+ }
253+
215 Greeter *greeter;
254 Greeter *greeter;
216 GreeterPrivate *greeterPrivate;
255 GreeterPrivate *greeterPrivate;
217 pam_handle* pamHandle;
256 pam_handle* pamHandle;
tests/mocks/QMenuModel/unitymenumodel.cpp+4−5
@@ -17,7 +17,6 @@
17 */
17 */
18
18
19#include "unitymenumodel.h"
19#include "unitymenumodel.h"
20−#include <QDebug>
21
20
22enum MenuRoles {
21enum MenuRoles {
23 LabelRole = Qt::DisplayRole + 1,
22 LabelRole = Qt::DisplayRole + 1,
@@ -38,6 +37,10 @@ UnityMenuModel::UnityMenuModel(QObject *parent)
38{
37{
39}
38}
40
39
40+UnityMenuModel::~UnityMenuModel()
41+{
42+}
43+
41QVariant UnityMenuModel::modelData() const
44QVariant UnityMenuModel::modelData() const
42{
45{
43 return m_modelData;
46 return m_modelData;
@@ -83,10 +86,6 @@ void UnityMenuModel::removeRow(int row)
83 endRemoveRows();
86 endRemoveRows();
84}
87}
85
88
86−UnityMenuModel::~UnityMenuModel()
87−{
88−}
89−
90QByteArray UnityMenuModel::busName() const
89QByteArray UnityMenuModel::busName() const
91{
90{
92 return m_busName;
91 return m_busName;
tests/mocks/Unity/Application/Application.qmltypes−19
@@ -7,25 +7,6 @@ import QtQuick.tooling 1.1
7// 'qmlplugindump -notrelocatable Unity.Application 0.1 tests/mocks'
7// 'qmlplugindump -notrelocatable Unity.Application 0.1 tests/mocks'
8
8
9Module {
9Module {
10− Component {
11− name: "ApplicationImage"
12− defaultProperty: "data"
13− prototype: "QQuickItem"
14− exports: ["Unity.Application/ApplicationImage 0.1"]
15− exportMetaObjectRevisions: [0]
16− Enum {
17− name: "FillMode"
18− values: {
19− "Stretch": 0,
20− "PreserveAspectCrop": 1
21− }
22− }
23− Property { name: "source"; type: "ApplicationInfo"; isPointer: true }
24− Property { name: "fillMode"; type: "FillMode" }
25− Property { name: "ready"; type: "bool" }
26− Method { name: "scheduleUpdate" }
27− Method { name: "updateFromCache" }
28− }
29 Component {
10 Component {
30 name: "ApplicationInfo"
11 name: "ApplicationInfo"
31 prototype: "unity::shell::application::ApplicationInfoInterface"
12 prototype: "unity::shell::application::ApplicationInfoInterface"
tests/mocks/Unity/Application/ApplicationImage.cppdeleted−123
@@ -1,123 +0,0 @@
1−/*
2− * Copyright (C) 2013 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 "ApplicationImage.h"
18−#include "ApplicationInfo.h"
19−
20−#include <QQmlEngine>
21−#include <QQmlComponent>
22−#include <QQmlContext>
23−
24−ApplicationImage::ApplicationImage(QQuickItem* parent)
25− : QQuickItem(parent),
26− m_source(NULL),
27− m_fillMode(Stretch),
28− m_ready(false),
29− m_imageComponent(0),
30− m_imageItem(0)
31−{
32−}
33−
34−void ApplicationImage::setSource(ApplicationInfo* source)
35−{
36− if (m_source != source) {
37− if (m_source)
38− disconnect(m_source, &ApplicationInfo::imageQmlChanged,
39− this, &ApplicationImage::updateImage);
40−
41− m_source = source;
42−
43− if (m_source) {
44− connect(m_source, &ApplicationInfo::imageQmlChanged,
45− this, &ApplicationImage::updateImage);
46− }
47− updateImage();
48−
49− Q_EMIT sourceChanged();
50− }
51−}
52−
53−void ApplicationImage::setFillMode(FillMode newFillMode)
54−{
55− if (m_fillMode != newFillMode) {
56− m_fillMode = newFillMode;
57− Q_EMIT fillModeChanged();
58− }
59−}
60−
61−void ApplicationImage::setReady(bool value)
62−{
63− if (value != m_ready) {
64− m_ready = value;
65− Q_EMIT readyChanged();
66− }
67−}
68−
69−void ApplicationImage::destroyImage()
70−{
71− delete m_imageItem;
72− m_imageItem = 0;
73− delete m_imageComponent;
74− m_imageComponent = 0;
75− m_qmlUsed.clear();
76− setReady(false);
77−}
78−
79−void ApplicationImage::updateImage()
80−{
81− if (!m_source || m_source->imageQml().isEmpty()) {
82− destroyImage();
83− } else if (m_source->imageQml() != m_qmlUsed) {
84− destroyImage();
85− createImageItem();
86− }
87−}
88−
89−void ApplicationImage::createImageItem()
90−{
91−
92− if (!m_imageComponent)
93− createImageComponent();
94−
95− // only create the windowItem one the component is ready
96− if (!m_imageComponent->isReady()) {
97− connect(m_imageComponent, &QQmlComponent::statusChanged,
98− this, &ApplicationImage::onImageComponentStatusChanged);
99− } else {
100− doCreateImageItem();
101− }
102−
103−}
104−
105−void ApplicationImage::createImageComponent()
106−{
107− QQmlEngine *engine = QQmlEngine::contextForObject(this)->engine();
108− m_imageComponent = new QQmlComponent(engine, this);
109− m_imageComponent->setData(m_source->imageQml().toLatin1(), QUrl());
110−}
111−
112−void ApplicationImage::doCreateImageItem()
113−{
114− m_imageItem = qobject_cast<QQuickItem *>(m_imageComponent->create());
115− m_imageItem->setParentItem(this);
116− setReady(true);
117−}
118−
119−void ApplicationImage::onImageComponentStatusChanged(QQmlComponent::Status status)
120−{
121− if (status == QQmlComponent::Ready && !m_imageItem)
122− doCreateImageItem();
123−}
tests/mocks/Unity/Application/ApplicationImage.hdeleted−79
@@ -1,79 +0,0 @@
1−/*
2− * Copyright (C) 2013 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 APPLICATION_IMAGE_H
18−#define APPLICATION_IMAGE_H
19−
20−#include <QQuickItem>
21−
22−class ApplicationInfo;
23−
24−/* Fake implementation of ApplicationImage
25−
26− That fake implementation is not made in QML just because we can only declare
27− enumerations in C++. We can't even make readonly properties to mimic an enum
28− because properties must begin with a lower case letter.
29−*/
30−class ApplicationImage : public QQuickItem {
31− Q_OBJECT
32− Q_ENUMS(FillMode)
33− Q_PROPERTY(ApplicationInfo* source READ source WRITE setSource NOTIFY sourceChanged)
34− Q_PROPERTY(FillMode fillMode READ fillMode WRITE setFillMode NOTIFY fillModeChanged)
35− Q_PROPERTY(bool ready READ ready WRITE setReady NOTIFY readyChanged)
36−
37−public:
38− explicit ApplicationImage(QQuickItem* parent = 0);
39− virtual ~ApplicationImage() {}
40−
41− enum FillMode { Stretch, PreserveAspectCrop };
42−
43− ApplicationInfo* source() const { return m_source; }
44− void setSource(ApplicationInfo* source);
45−
46− FillMode fillMode() const { return m_fillMode; }
47− void setFillMode(FillMode);
48−
49− void setReady(bool value);
50− bool ready() const { return m_ready; }
51−
52− Q_INVOKABLE void scheduleUpdate() {}
53− Q_INVOKABLE void updateFromCache() {}
54−
55−Q_SIGNALS:
56− void sourceChanged();
57− void fillModeChanged();
58− void readyChanged();
59−
60−private Q_SLOTS:
61− void updateImage();
62− void onImageComponentStatusChanged(QQmlComponent::Status status);
63−
64−private:
65− void createImageItem();
66− void createImageComponent();
67− void doCreateImageItem();
68− void destroyImage();
69−
70− ApplicationInfo* m_source;
71− FillMode m_fillMode;
72− bool m_ready;
73− QQmlComponent *m_imageComponent;
74− QQuickItem* m_imageItem;
75− // the QML script used to create the current m_imageItem
76− QString m_qmlUsed;
77−};
78−
79−#endif // APPLICATION_IMAGE_H
tests/mocks/Unity/Application/ApplicationInfo.cpp+83−14
@@ -18,6 +18,8 @@
18#include "MirSurfaceItem.h"
18#include "MirSurfaceItem.h"
19#include "SurfaceManager.h"
19#include "SurfaceManager.h"
20
20
21+#include <paths.h>
22+
21#include <QGuiApplication>
23#include <QGuiApplication>
22#include <QQuickItem>
24#include <QQuickItem>
23#include <QQuickView>
25#include <QQuickView>
@@ -31,10 +33,10 @@ ApplicationInfo::ApplicationInfo(const QString &appId, QObject *parent)
31 , m_state(Starting)
33 , m_state(Starting)
32 , m_focused(false)
34 , m_focused(false)
33 , m_fullscreen(false)
35 , m_fullscreen(false)
34− , m_parentItem(0)
35 , m_surface(0)
36 , m_surface(0)
37+ , m_manualSurfaceCreation(false)
38+ , m_parentItem(0)
36{
39{
37− connect(this, &ApplicationInfo::stateChanged, this, &ApplicationInfo::onStateChanged);
38}
40}
39
41
40ApplicationInfo::ApplicationInfo(QObject *parent)
42ApplicationInfo::ApplicationInfo(QObject *parent)
@@ -43,10 +45,10 @@ ApplicationInfo::ApplicationInfo(QObject *parent)
43 , m_state(Starting)
45 , m_state(Starting)
44 , m_focused(false)
46 , m_focused(false)
45 , m_fullscreen(false)
47 , m_fullscreen(false)
46− , m_parentItem(0)
47 , m_surface(0)
48 , m_surface(0)
49+ , m_manualSurfaceCreation(false)
50+ , m_parentItem(0)
48{
51{
49− connect(this, &ApplicationInfo::stateChanged, this, &ApplicationInfo::onStateChanged);
50}
52}
51
53
52ApplicationInfo::~ApplicationInfo()
54ApplicationInfo::~ApplicationInfo()
@@ -58,23 +60,16 @@ ApplicationInfo::~ApplicationInfo()
58 }
60 }
59}
61}
60
62
61−void ApplicationInfo::onStateChanged(State state)
62−{
63− if (state == ApplicationInfo::Running) {
64− QTimer::singleShot(1000, this, SLOT(createSurface()));
65− } else if (state == ApplicationInfo::Stopped) {
66− setSurface(nullptr);
67− }
68−}
69−
70void ApplicationInfo::createSurface()
63void ApplicationInfo::createSurface()
71{
64{
72 if (m_surface || state() == ApplicationInfo::Stopped) return;
65 if (m_surface || state() == ApplicationInfo::Stopped) return;
73
66
67+ QUrl screenshotUrl = QString("file://%1").arg(m_screenshotFileName);
68+
74 setSurface(new MirSurfaceItem(name(),
69 setSurface(new MirSurfaceItem(name(),
75 MirSurfaceItem::Normal,
70 MirSurfaceItem::Normal,
76 fullscreen() ? MirSurfaceItem::Fullscreen : MirSurfaceItem::Maximized,
71 fullscreen() ? MirSurfaceItem::Fullscreen : MirSurfaceItem::Maximized,
77− screenshot()));
72+ screenshotUrl));
78}
73}
79
74
80void ApplicationInfo::setSurface(MirSurfaceItem* surface)
75void ApplicationInfo::setSurface(MirSurfaceItem* surface)
@@ -152,3 +147,77 @@ MirSurfaceItem* ApplicationInfo::promptSurfaceAt(QQmlListProperty<MirSurfaceItem
152 return nullptr;
147 return nullptr;
153 return p->m_promptSurfaces[index];
148 return p->m_promptSurfaces[index];
154}
149}
150+
151+void ApplicationInfo::setIconId(const QString &iconId)
152+{
153+ setIcon(QString("file://%1/graphics/applicationIcons/%2@18.png")
154+ .arg(qmlDirectory())
155+ .arg(iconId));
156+}
157+
158+void ApplicationInfo::setScreenshotId(const QString &screenshotId)
159+{
160+ m_screenshotFileName = QString("%1/Dash/graphics/phone/screenshots/%2@12.png")
161+ .arg(qmlDirectory())
162+ .arg(screenshotId);
163+}
164+
165+void ApplicationInfo::setName(const QString &value)
166+{
167+ if (value != m_name) {
168+ m_name = value;
169+ Q_EMIT nameChanged(value);
170+ }
171+}
172+
173+void ApplicationInfo::setIcon(const QUrl &value)
174+{
175+ if (value != m_icon) {
176+ m_icon = value;
177+ Q_EMIT iconChanged(value);
178+ }
179+}
180+
181+void ApplicationInfo::setStage(Stage value)
182+{
183+ if (value != m_stage) {
184+ m_stage = value;
185+ Q_EMIT stageChanged(value);
186+ }
187+}
188+
189+void ApplicationInfo::setState(State value)
190+{
191+ if (value != m_state) {
192+ m_state = value;
193+ Q_EMIT stateChanged(value);
194+
195+ if (!m_manualSurfaceCreation && m_state == ApplicationInfo::Running) {
196+ QTimer::singleShot(1000, this, SLOT(createSurface()));
197+ }
198+ }
199+}
200+
201+void ApplicationInfo::setFocused(bool value)
202+{
203+ if (value != m_focused) {
204+ m_focused = value;
205+ Q_EMIT focusedChanged(value);
206+ }
207+}
208+
209+void ApplicationInfo::setFullscreen(bool value)
210+{
211+ if (value != m_fullscreen) {
212+ m_fullscreen = value;
213+ Q_EMIT fullscreenChanged(value);
214+ }
215+}
216+
217+void ApplicationInfo::setManualSurfaceCreation(bool value)
218+{
219+ if (value != m_manualSurfaceCreation) {
220+ m_manualSurfaceCreation = value;
221+ Q_EMIT manualSurfaceCreationChanged(value);
222+ }
223+}
tests/mocks/Unity/Application/ApplicationInfo.h+50−44
@@ -26,63 +26,52 @@ class MirSurfaceItem;
26// unity-api
26// unity-api
27#include <unity/shell/application/ApplicationInfoInterface.h>
27#include <unity/shell/application/ApplicationInfoInterface.h>
28
28
29−// A pretty dumb file. Just a container for properties.
30−// Implemented in C++ instead of QML just because of the enumerations
31−// See QTBUG-14861
32−
33using namespace unity::shell::application;
29using namespace unity::shell::application;
34
30
35class ApplicationInfo : public ApplicationInfoInterface {
31class ApplicationInfo : public ApplicationInfoInterface {
36 Q_OBJECT
32 Q_OBJECT
37
33
38 Q_PROPERTY(bool fullscreen READ fullscreen WRITE setFullscreen NOTIFY fullscreenChanged)
34 Q_PROPERTY(bool fullscreen READ fullscreen WRITE setFullscreen NOTIFY fullscreenChanged)
39− Q_PROPERTY(Stage stage READ stage WRITE setStage NOTIFY stageChanged)
40 Q_PROPERTY(MirSurfaceItem* surface READ surface NOTIFY surfaceChanged)
35 Q_PROPERTY(MirSurfaceItem* surface READ surface NOTIFY surfaceChanged)
41 Q_PROPERTY(QQmlListProperty<MirSurfaceItem> promptSurfaces READ promptSurfaces NOTIFY promptSurfacesChanged DESIGNABLE false)
36 Q_PROPERTY(QQmlListProperty<MirSurfaceItem> promptSurfaces READ promptSurfaces NOTIFY promptSurfacesChanged DESIGNABLE false)
42
37
43 // Only exists in this fake implementation
38 // Only exists in this fake implementation
44
39
45− // QML component used to represent its image/screenhot
40+ // whether the test code will explicitly control the creation of the application surface
46− Q_PROPERTY(QString imageQml READ imageQml WRITE setImageQml NOTIFY imageQmlChanged)
41+ Q_PROPERTY(bool manualSurfaceCreation READ manualSurfaceCreation WRITE setManualSurfaceCreation NOTIFY manualSurfaceCreationChanged)
47−
48− // QML component used to represent the application window
49− Q_PROPERTY(QString windowQml READ windowQml WRITE setWindowQml NOTIFY windowQmlChanged)
50
42
51public:
43public:
52 ApplicationInfo(QObject *parent = NULL);
44 ApplicationInfo(QObject *parent = NULL);
53 ApplicationInfo(const QString &appId, QObject *parent = NULL);
45 ApplicationInfo(const QString &appId, QObject *parent = NULL);
54 ~ApplicationInfo();
46 ~ApplicationInfo();
55
47
56− #define IMPLEMENT_PROPERTY(name, Name, type) \
48+ void setIconId(const QString &iconId);
57− public: \
49+ void setScreenshotId(const QString &screenshotId);
58− type name() const { return m_##name; } \
50+
59− void set##Name(const type& value) \
51+ void setAppId(const QString &value) { m_appId = value; }
60− { \
52+ QString appId() const override { return m_appId; }
61− if (m_##name != value) { \
53+
62− m_##name = value; \
54+ void setName(const QString &value);
63− Q_EMIT name##Changed(value); \
55+ QString name() const override { return m_name; }
64− } \
56+
65− } \
57+ QString comment() const override { return QString(); }
66− Q_SIGNALS: \
58+
67− void name##Changed(const type&); \
59+ QUrl icon() const override { return m_icon; }
68− private: \
60+
69− type m_##name;
61+ void setStage(Stage value);
70−
62+ Stage stage() const override { return m_stage; }
71− IMPLEMENT_PROPERTY(appId, AppId, QString)
63+
72− IMPLEMENT_PROPERTY(name, Name, QString)
64+ Q_INVOKABLE void setState(State value);
73− IMPLEMENT_PROPERTY(comment, Comment, QString)
65+ State state() const override { return m_state; }
74− IMPLEMENT_PROPERTY(icon, Icon, QUrl)
66+
75− IMPLEMENT_PROPERTY(stage, Stage, Stage)
67+ void setFocused(bool value);
76− IMPLEMENT_PROPERTY(state, State, State)
68+ bool focused() const override { return m_focused; }
77− IMPLEMENT_PROPERTY(focused, Focused, bool)
69+
78− IMPLEMENT_PROPERTY(fullscreen, Fullscreen, bool)
70+ QString screenshot() const { return m_screenshotFileName; }
79− IMPLEMENT_PROPERTY(imageQml, ImageQml, QString)
71+
80− IMPLEMENT_PROPERTY(windowQml, WindowQml, QString)
72+ void setFullscreen(bool value);
81− IMPLEMENT_PROPERTY(screenshot, Screenshot, QUrl)
73+ bool fullscreen() const { return m_fullscreen; }
82−
83− #undef IMPLEMENT_PROPERTY
84
74
85−public:
86 void setSurface(MirSurfaceItem* surface);
75 void setSurface(MirSurfaceItem* surface);
87 MirSurfaceItem* surface() const { return m_surface; }
76 MirSurfaceItem* surface() const { return m_surface; }
88
77
@@ -92,21 +81,38 @@ public:
92 QList<MirSurfaceItem*> promptSurfaceList() const;
81 QList<MirSurfaceItem*> promptSurfaceList() const;
93 QQmlListProperty<MirSurfaceItem> promptSurfaces();
82 QQmlListProperty<MirSurfaceItem> promptSurfaces();
94
83
84+ bool manualSurfaceCreation() const { return m_manualSurfaceCreation; }
85+ void setManualSurfaceCreation(bool value);
86+
95Q_SIGNALS:
87Q_SIGNALS:
96 void surfaceChanged(MirSurfaceItem*);
88 void surfaceChanged(MirSurfaceItem*);
97 void promptSurfacesChanged();
89 void promptSurfacesChanged();
90+ void fullscreenChanged(bool value);
91+ void manualSurfaceCreationChanged(bool value);
98
92
99−private Q_SLOTS:
93+public Q_SLOTS:
100− void onStateChanged(State state);
94+ Q_INVOKABLE void createSurface();
101−
102− void createSurface();
103
95
104private:
96private:
105 static int promptSurfaceCount(QQmlListProperty<MirSurfaceItem> *prop);
97 static int promptSurfaceCount(QQmlListProperty<MirSurfaceItem> *prop);
106 static MirSurfaceItem* promptSurfaceAt(QQmlListProperty<MirSurfaceItem> *prop, int index);
98 static MirSurfaceItem* promptSurfaceAt(QQmlListProperty<MirSurfaceItem> *prop, int index);
99+ void setIcon(const QUrl &value);
100+ void setScreenshot(const QUrl &value);
101+
102+ QString m_screenshotFileName;
103+
104+ QString m_appId;
105+ QString m_name;
106+ QUrl m_icon;
107+ Stage m_stage;
108+ State m_state;
109+ bool m_focused;
110+ bool m_fullscreen;
111+ MirSurfaceItem* m_surface;
112+
113+ bool m_manualSurfaceCreation;
107
114
108 QQuickItem *m_parentItem;
115 QQuickItem *m_parentItem;
109− MirSurfaceItem* m_surface;
110 QList<MirSurfaceItem*> m_promptSurfaces;
116 QList<MirSurfaceItem*> m_promptSurfaces;
111};
117};
112
118
tests/mocks/Unity/Application/ApplicationManager.cpp+87−102
@@ -55,14 +55,32 @@ ApplicationManager::ApplicationManager(QObject *parent)
55
55
56 buildListOfAvailableApplications();
56 buildListOfAvailableApplications();
57
57
58− startApplication("unity8-dash");
58+ // polling to find out when the toplevel window has been created as there's
59− focusApplication("unity8-dash");
59+ // no signal telling us that
60+ connect(&m_windowCreatedTimer, &QTimer::timeout,
61+ this, &ApplicationManager::onWindowCreatedTimerTimeout);
62+ m_windowCreatedTimer.setSingleShot(false);
63+ m_windowCreatedTimer.start(200);
60}
64}
61
65
62ApplicationManager::~ApplicationManager()
66ApplicationManager::~ApplicationManager()
63{
67{
64}
68}
65
69
70+void ApplicationManager::onWindowCreatedTimerTimeout()
71+{
72+ if (QGuiApplication::topLevelWindows().count() > 0) {
73+ m_windowCreatedTimer.stop();
74+ onWindowCreated();
75+ }
76+}
77+
78+void ApplicationManager::onWindowCreated()
79+{
80+ startApplication("unity8-dash");
81+ focusApplication("unity8-dash");
82+}
83+
66int ApplicationManager::rowCount(const QModelIndex& parent) const {
84int ApplicationManager::rowCount(const QModelIndex& parent) const {
67 return !parent.isValid() ? m_runningApplications.size() : 0;
85 return !parent.isValid() ? m_runningApplications.size() : 0;
68}
86}
@@ -87,8 +105,6 @@ QVariant ApplicationManager::data(const QModelIndex& index, int role) const {
87 return app->state();
105 return app->state();
88 case RoleFocused:
106 case RoleFocused:
89 return app->focused();
107 return app->focused();
90− case RoleScreenshot:
91− return app->screenshot();
92 case RoleSurface:
108 case RoleSurface:
93 return QVariant::fromValue(app->surface());
109 return QVariant::fromValue(app->surface());
94 case RoleFullscreen:
110 case RoleFullscreen:
@@ -143,6 +159,16 @@ void ApplicationManager::add(ApplicationInfo *application) {
143 if (!appIndex.isValid()) return;
159 if (!appIndex.isValid()) return;
144 Q_EMIT dataChanged(appIndex, appIndex, QVector<int>() << ApplicationManager::RoleSurface);
160 Q_EMIT dataChanged(appIndex, appIndex, QVector<int>() << ApplicationManager::RoleSurface);
145 });
161 });
162+ connect(application, &ApplicationInfo::focusedChanged, this, [application, this]() {
163+ QModelIndex appIndex = findIndex(application);
164+ if (!appIndex.isValid()) return;
165+ Q_EMIT dataChanged(appIndex, appIndex, QVector<int>() << ApplicationManager::RoleFocused);
166+ });
167+ connect(application, &ApplicationInfo::stateChanged, this, [application, this]() {
168+ QModelIndex appIndex = findIndex(application);
169+ if (!appIndex.isValid()) return;
170+ Q_EMIT dataChanged(appIndex, appIndex, QVector<int>() << ApplicationManager::RoleState);
171+ });
146}
172}
147
173
148void ApplicationManager::remove(ApplicationInfo *application) {
174void ApplicationManager::remove(ApplicationInfo *application) {
@@ -155,7 +181,7 @@ void ApplicationManager::remove(ApplicationInfo *application) {
155 Q_EMIT countChanged();
181 Q_EMIT countChanged();
156 if (isEmpty()) Q_EMIT emptyChanged(isEmpty());
182 if (isEmpty()) Q_EMIT emptyChanged(isEmpty());
157 }
183 }
158− disconnect(application, &ApplicationInfo::surfaceChanged, this, 0);
184+ disconnect(application, 0, this, 0);
159}
185}
160
186
161void ApplicationManager::move(int from, int to) {
187void ApplicationManager::move(int from, int to) {
@@ -198,6 +224,21 @@ ApplicationInfo* ApplicationManager::startApplication(const QString &appId,
198 const QStringList &arguments)
224 const QStringList &arguments)
199{
225{
200 Q_UNUSED(arguments)
226 Q_UNUSED(arguments)
227+ ApplicationInfo *application = add(appId);
228+ if (!application)
229+ return 0;
230+
231+ if (flags.testFlag(ApplicationManager::ForceMainStage)
232+ && application->stage() == ApplicationInfo::SideStage) {
233+ application->setStage(ApplicationInfo::MainStage);
234+ }
235+ application->setState(ApplicationInfo::Running);
236+
237+ return application;
238+}
239+
240+ApplicationInfo* ApplicationManager::add(QString appId)
241+{
201 ApplicationInfo *application = 0;
242 ApplicationInfo *application = 0;
202
243
203 for (ApplicationInfo *availableApp : m_availableApplications) {
244 for (ApplicationInfo *availableApp : m_availableApplications) {
@@ -207,15 +248,8 @@ ApplicationInfo* ApplicationManager::startApplication(const QString &appId,
207 }
248 }
208 }
249 }
209
250
210− if (!application)
251+ if (application)
211− return 0;
252+ add(application);
212−
213− if (flags.testFlag(ApplicationManager::ForceMainStage)
214− && application->stage() == ApplicationInfo::SideStage) {
215− application->setStage(ApplicationInfo::MainStage);
216− }
217− add(application);
218− application->setState(ApplicationInfo::Running);
219
253
220 return application;
254 return application;
221}
255}
@@ -238,27 +272,6 @@ bool ApplicationManager::stopApplication(const QString &appId)
238 return true;
272 return true;
239}
273}
240
274
241−bool ApplicationManager::updateScreenshot(const QString &appId)
242−{
243− int idx = -1;
244− ApplicationInfo *application = nullptr;
245− for (int i = 0; i < m_availableApplications.count(); ++i) {
246− application = m_availableApplications.at(i);
247− if (application->appId() == appId) {
248− idx = i;
249− break;
250− }
251− }
252−
253− if (idx == -1) {
254− return false;
255− }
256−
257− QModelIndex appIndex = index(idx);
258− Q_EMIT dataChanged(appIndex, appIndex, QVector<int>() << RoleScreenshot);
259− return true;
260−}
261−
262QString ApplicationManager::focusedApplicationId() const {
275QString ApplicationManager::focusedApplicationId() const {
263 for (ApplicationInfo *app : m_runningApplications) {
276 for (ApplicationInfo *app : m_runningApplications) {
264 if (app->focused()) {
277 if (app->focused()) {
@@ -293,32 +306,18 @@ bool ApplicationManager::focusApplication(const QString &appId)
293 if (application == nullptr)
306 if (application == nullptr)
294 return false;
307 return false;
295
308
296− if (application->stage() == ApplicationInfo::MainStage) {
309+ // unfocus currently focused app
297− // unfocus currently focused mainstage app
310+ for (ApplicationInfo *app : m_runningApplications) {
298− for (ApplicationInfo *app : m_runningApplications) {
311+ if (app->focused()) {
299− if (app->focused() && app->stage() == ApplicationInfo::MainStage) {
312+ app->setFocused(false);
300− app->setFocused(false);
313+ app->setState(ApplicationInfo::Suspended);
301− app->setState(ApplicationInfo::Suspended);
302− }
303− }
304−
305− // focus this app
306− application->setFocused(true);
307− application->setState(ApplicationInfo::Running);
308− } else if (application->stage() == ApplicationInfo::SideStage) {
309− // unfocus currently focused sidestage app
310− for (ApplicationInfo *app : m_runningApplications) {
311− if (app->focused() && app->stage() == ApplicationInfo::SideStage) {
312− app->setFocused(false);
313− app->setState(ApplicationInfo::Suspended);
314− }
315 }
314 }
316−
317− // focus this app
318− application->setFocused(true);
319− application->setState(ApplicationInfo::Running);
320 }
315 }
321
316
317+ // focus this app
318+ application->setFocused(true);
319+ application->setState(ApplicationInfo::Running);
320+
322 // move app to top of stack
321 // move app to top of stack
323 move(m_runningApplications.indexOf(application), 0);
322 move(m_runningApplications.indexOf(application), 0);
324 Q_EMIT focusedApplicationIdChanged();
323 Q_EMIT focusedApplicationIdChanged();
@@ -341,12 +340,6 @@ void ApplicationManager::unfocusCurrentApplication()
341 Q_EMIT focusedApplicationIdChanged();
340 Q_EMIT focusedApplicationIdChanged();
342}
341}
343
342
344−void ApplicationManager::generateQmlStrings(ApplicationInfo *application)
345−{
346− application->setScreenshot(QString("file://%1/Dash/graphics/phone/screenshots/%2@12.png").arg(qmlDirectory())
347− .arg(application->icon().toString()));
348−}
349−
350void ApplicationManager::buildListOfAvailableApplications()
343void ApplicationManager::buildListOfAvailableApplications()
351{
344{
352 ApplicationInfo *application;
345 ApplicationInfo *application;
@@ -354,128 +347,120 @@ void ApplicationManager::buildListOfAvailableApplications()
354 application = new ApplicationInfo(this);
347 application = new ApplicationInfo(this);
355 application->setAppId("unity8-dash");
348 application->setAppId("unity8-dash");
356 application->setName("Unity 8 Mock Dash");
349 application->setName("Unity 8 Mock Dash");
357− application->setIcon(QUrl("unity8-dash"));
350+ application->setScreenshotId("unity8-dash");
358 application->setStage(ApplicationInfo::MainStage);
351 application->setStage(ApplicationInfo::MainStage);
359− generateQmlStrings(application);
360 m_availableApplications.append(application);
352 m_availableApplications.append(application);
361
353
362 application = new ApplicationInfo(this);
354 application = new ApplicationInfo(this);
363 application->setAppId("dialer-app");
355 application->setAppId("dialer-app");
364 application->setName("Dialer");
356 application->setName("Dialer");
365− application->setIcon(QUrl("dialer"));
357+ application->setScreenshotId("dialer");
358+ application->setIconId("dialer-app");
366 application->setStage(ApplicationInfo::SideStage);
359 application->setStage(ApplicationInfo::SideStage);
367− generateQmlStrings(application);
368 m_availableApplications.append(application);
360 m_availableApplications.append(application);
369
361
370 application = new ApplicationInfo(this);
362 application = new ApplicationInfo(this);
371 application->setAppId("camera-app");
363 application->setAppId("camera-app");
372 application->setName("Camera");
364 application->setName("Camera");
373− application->setIcon(QUrl("camera"));
365+ application->setScreenshotId("camera");
366+ application->setIconId("camera");
374 application->setFullscreen(true);
367 application->setFullscreen(true);
375− generateQmlStrings(application);
376 m_availableApplications.append(application);
368 m_availableApplications.append(application);
377
369
378 application = new ApplicationInfo(this);
370 application = new ApplicationInfo(this);
379 application->setAppId("gallery-app");
371 application->setAppId("gallery-app");
380 application->setName("Gallery");
372 application->setName("Gallery");
381− application->setIcon(QUrl("gallery"));
373+ application->setScreenshotId("gallery");
382− generateQmlStrings(application);
374+ application->setIconId("gallery");
375+ application->setFullscreen(true);
383 m_availableApplications.append(application);
376 m_availableApplications.append(application);
384
377
385 application = new ApplicationInfo(this);
378 application = new ApplicationInfo(this);
386 application->setAppId("facebook-webapp");
379 application->setAppId("facebook-webapp");
387 application->setName("Facebook");
380 application->setName("Facebook");
388− application->setIcon(QUrl("facebook"));
381+ application->setScreenshotId("facebook");
382+ application->setIconId("facebook");
389 application->setStage(ApplicationInfo::SideStage);
383 application->setStage(ApplicationInfo::SideStage);
390− generateQmlStrings(application);
391 m_availableApplications.append(application);
384 m_availableApplications.append(application);
392
385
393 application = new ApplicationInfo(this);
386 application = new ApplicationInfo(this);
394 application->setAppId("webbrowser-app");
387 application->setAppId("webbrowser-app");
395 application->setFullscreen(true);
388 application->setFullscreen(true);
396 application->setName("Browser");
389 application->setName("Browser");
397− application->setIcon(QUrl("browser"));
390+ application->setScreenshotId("browser");
398− generateQmlStrings(application);
391+ application->setIconId("browser");
399 m_availableApplications.append(application);
392 m_availableApplications.append(application);
400
393
401 application = new ApplicationInfo(this);
394 application = new ApplicationInfo(this);
402 application->setAppId("twitter-webapp");
395 application->setAppId("twitter-webapp");
403 application->setName("Twitter");
396 application->setName("Twitter");
404− application->setIcon(QUrl("twitter"));
397+ application->setScreenshotId("twitter");
398+ application->setIconId("twitter");
405 application->setStage(ApplicationInfo::SideStage);
399 application->setStage(ApplicationInfo::SideStage);
406− generateQmlStrings(application);
400+ m_availableApplications.append(application);
401+
402+ application = new ApplicationInfo(this);
403+ application->setAppId("map");
404+ application->setName("Map");
405+ application->setIconId("map");
406+ application->setScreenshotId("map");
407 m_availableApplications.append(application);
407 m_availableApplications.append(application);
408
408
409 application = new ApplicationInfo(this);
409 application = new ApplicationInfo(this);
410 application->setAppId("gmail-webapp");
410 application->setAppId("gmail-webapp");
411 application->setName("GMail");
411 application->setName("GMail");
412− application->setIcon(QUrl("gmail"));
412+ application->setIconId("gmail");
413 m_availableApplications.append(application);
413 m_availableApplications.append(application);
414
414
415 application = new ApplicationInfo(this);
415 application = new ApplicationInfo(this);
416 application->setAppId("ubuntu-weather-app");
416 application->setAppId("ubuntu-weather-app");
417 application->setName("Weather");
417 application->setName("Weather");
418− application->setIcon(QUrl("weather"));
418+ application->setIconId("weather");
419 application->setStage(ApplicationInfo::SideStage);
419 application->setStage(ApplicationInfo::SideStage);
420− generateQmlStrings(application);
421 m_availableApplications.append(application);
420 m_availableApplications.append(application);
422
421
423 application = new ApplicationInfo(this);
422 application = new ApplicationInfo(this);
424 application->setAppId("notes-app");
423 application->setAppId("notes-app");
425 application->setName("Notepad");
424 application->setName("Notepad");
426− application->setIcon(QUrl("notepad"));
425+ application->setIconId("notepad");
427 application->setStage(ApplicationInfo::SideStage);
426 application->setStage(ApplicationInfo::SideStage);
428 m_availableApplications.append(application);
427 m_availableApplications.append(application);
429
428
430 application = new ApplicationInfo(this);
429 application = new ApplicationInfo(this);
431 application->setAppId("calendar-app");
430 application->setAppId("calendar-app");
432 application->setName("Calendar");
431 application->setName("Calendar");
433− application->setIcon(QUrl("calendar"));
432+ application->setIconId("calendar");
434 application->setStage(ApplicationInfo::SideStage);
433 application->setStage(ApplicationInfo::SideStage);
435 m_availableApplications.append(application);
434 m_availableApplications.append(application);
436
435
437− application = new ApplicationInfo(this);
438− application->setAppId("mediaplayer-app");
439− application->setName("Media Player");
440− application->setIcon(QUrl("mediaplayer-app"));
441− application->setFullscreen(true);
442− m_availableApplications.append(application);
443−
444 application = new ApplicationInfo(this);
436 application = new ApplicationInfo(this);
445 application->setAppId("evernote");
437 application->setAppId("evernote");
446 application->setName("Evernote");
438 application->setName("Evernote");
447− application->setIcon(QUrl("evernote"));
439+ application->setIconId("evernote");
448− m_availableApplications.append(application);
449−
450− application = new ApplicationInfo(this);
451− application->setAppId("map");
452− application->setName("Map");
453− application->setIcon(QUrl("map"));
454− generateQmlStrings(application);
455 m_availableApplications.append(application);
440 m_availableApplications.append(application);
456
441
457 application = new ApplicationInfo(this);
442 application = new ApplicationInfo(this);
458 application->setAppId("pinterest");
443 application->setAppId("pinterest");
459 application->setName("Pinterest");
444 application->setName("Pinterest");
460− application->setIcon(QUrl("pinterest"));
445+ application->setIconId("pinterest");
461 m_availableApplications.append(application);
446 m_availableApplications.append(application);
462
447
463 application = new ApplicationInfo(this);
448 application = new ApplicationInfo(this);
464 application->setAppId("soundcloud");
449 application->setAppId("soundcloud");
465 application->setName("SoundCloud");
450 application->setName("SoundCloud");
466− application->setIcon(QUrl("soundcloud"));
451+ application->setIconId("soundcloud");
467 m_availableApplications.append(application);
452 m_availableApplications.append(application);
468
453
469 application = new ApplicationInfo(this);
454 application = new ApplicationInfo(this);
470 application->setAppId("wikipedia");
455 application->setAppId("wikipedia");
471 application->setName("Wikipedia");
456 application->setName("Wikipedia");
472− application->setIcon(QUrl("wikipedia"));
457+ application->setIconId("wikipedia");
473 m_availableApplications.append(application);
458 m_availableApplications.append(application);
474
459
475 application = new ApplicationInfo(this);
460 application = new ApplicationInfo(this);
476 application->setAppId("youtube");
461 application->setAppId("youtube");
477 application->setName("YouTube");
462 application->setName("YouTube");
478− application->setIcon(QUrl("youtube"));
463+ application->setIconId("youtube");
479 m_availableApplications.append(application);
464 m_availableApplications.append(application);
480}
465}
481
466
tests/mocks/Unity/Application/ApplicationManager.h+8−4
@@ -20,6 +20,7 @@
20#include <QObject>
20#include <QObject>
21#include <QList>
21#include <QList>
22#include <QStringList>
22#include <QStringList>
23+#include <QTimer>
23#include "ApplicationInfo.h"
24#include "ApplicationInfo.h"
24
25
25// unity-api
26// unity-api
@@ -51,7 +52,7 @@ class ApplicationManager : public ApplicationManagerInterface {
51 static ApplicationManager *singleton();
52 static ApplicationManager *singleton();
52
53
53 enum MoreRoles {
54 enum MoreRoles {
54− RoleSurface = RoleScreenshot+1,
55+ RoleSurface = RoleFocused+1,
55 RoleFullscreen,
56 RoleFullscreen,
56 RoleApplication,
57 RoleApplication,
57 };
58 };
@@ -97,7 +98,6 @@ class ApplicationManager : public ApplicationManagerInterface {
97 Q_INVOKABLE ApplicationInfo *startApplication(const QString &appId, const QStringList &arguments = QStringList()) override;
98 Q_INVOKABLE ApplicationInfo *startApplication(const QString &appId, const QStringList &arguments = QStringList()) override;
98 Q_INVOKABLE ApplicationInfo *startApplication(const QString &appId, ExecFlags flags, const QStringList &arguments = QStringList());
99 Q_INVOKABLE ApplicationInfo *startApplication(const QString &appId, ExecFlags flags, const QStringList &arguments = QStringList());
99 Q_INVOKABLE bool stopApplication(const QString &appId) override;
100 Q_INVOKABLE bool stopApplication(const QString &appId) override;
100− Q_INVOKABLE bool updateScreenshot(const QString &appId) override;
101
101
102 QString focusedApplicationId() const override;
102 QString focusedApplicationId() const override;
103 bool suspended() const;
103 bool suspended() const;
@@ -105,6 +105,7 @@ class ApplicationManager : public ApplicationManagerInterface {
105
105
106 // Only for testing
106 // Only for testing
107 Q_INVOKABLE QStringList availableApplications();
107 Q_INVOKABLE QStringList availableApplications();
108+ Q_INVOKABLE ApplicationInfo* add(QString appId);
108
109
109 QModelIndex findIndex(ApplicationInfo* application);
110 QModelIndex findIndex(ApplicationInfo* application);
110
111
@@ -115,15 +116,18 @@ class ApplicationManager : public ApplicationManagerInterface {
115 void focusRequested(const QString &appId);
116 void focusRequested(const QString &appId);
116 void emptyChanged(bool empty);
117 void emptyChanged(bool empty);
117
118
119+ private Q_SLOTS:
120+ void onWindowCreatedTimerTimeout();
121+
118 private:
122 private:
119 void add(ApplicationInfo *application);
123 void add(ApplicationInfo *application);
120 void remove(ApplicationInfo* application);
124 void remove(ApplicationInfo* application);
121− void showApplicationWindow(ApplicationInfo *application);
122 void buildListOfAvailableApplications();
125 void buildListOfAvailableApplications();
123− void generateQmlStrings(ApplicationInfo *application);
126+ void onWindowCreated();
124 bool m_suspended;
127 bool m_suspended;
125 QList<ApplicationInfo*> m_runningApplications;
128 QList<ApplicationInfo*> m_runningApplications;
126 QList<ApplicationInfo*> m_availableApplications;
129 QList<ApplicationInfo*> m_availableApplications;
130+ QTimer m_windowCreatedTimer;
127
131
128 static ApplicationManager *the_application_manager;
132 static ApplicationManager *the_application_manager;
129};
133};
tests/mocks/Unity/Application/ApplicationScreenshotProvider.cpp+2−4
@@ -44,11 +44,9 @@ QImage ApplicationScreenshotProvider::requestImage(const QString &imageId, QSize
44 return QImage();
44 return QImage();
45 }
45 }
46
46
47− QString filePath = QString("%1/Dash/graphics/phone/screenshots/%2@12.png").arg(qmlDirectory()).arg(app->icon().toString());
48−
49 QImage image;
47 QImage image;
50− if (!image.load(filePath)) {
48+ if (!image.load(app->screenshot())) {
51− qWarning() << "failed loading app image" << filePath;
49+ qWarning() << "failed loading app image" << app->screenshot();
52 }
50 }
53
51
54
52
tests/mocks/Unity/Application/CMakeLists.txt+1−3
@@ -1,15 +1,13 @@
1−pkg_check_modules(APPLICATION_API REQUIRED unity-shell-application)
1+pkg_check_modules(APPLICATION_API REQUIRED unity-shell-application=3)
2
2
3set(FakeUnityApplicationQml_SOURCES
3set(FakeUnityApplicationQml_SOURCES
4 plugin.cpp
4 plugin.cpp
5 ApplicationDBusAdaptor.cpp
5 ApplicationDBusAdaptor.cpp
6 ApplicationInfo.cpp
6 ApplicationInfo.cpp
7− ApplicationImage.cpp
8 ApplicationManager.cpp
7 ApplicationManager.cpp
9 ApplicationScreenshotProvider.cpp
8 ApplicationScreenshotProvider.cpp
10 MirSurfaceItem.cpp
9 MirSurfaceItem.cpp
11 SurfaceManager.cpp
10 SurfaceManager.cpp
12− VirtualKeyboard.cpp
13 ${APPLICATION_API_INCLUDEDIR}/unity/shell/application/ApplicationInfoInterface.h
11 ${APPLICATION_API_INCLUDEDIR}/unity/shell/application/ApplicationInfoInterface.h
14 ${APPLICATION_API_INCLUDEDIR}/unity/shell/application/ApplicationManagerInterface.h
12 ${APPLICATION_API_INCLUDEDIR}/unity/shell/application/ApplicationManagerInterface.h
15)
13)
tests/mocks/Unity/Application/MirSurfaceItem.cpp+87−16
@@ -17,33 +17,67 @@
17#include "MirSurfaceItem.h"
17#include "MirSurfaceItem.h"
18#include "ApplicationInfo.h"
18#include "ApplicationInfo.h"
19
19
20−#include <QPainter>
20+#include <paths.h>
21+
22+#include <QGuiApplication>
23+#include <QQuickView>
24+#include <QQmlProperty>
21#include <QQmlEngine>
25#include <QQmlEngine>
26+#include <QString>
27+
28+#include <QDebug>
22
29
23MirSurfaceItem::MirSurfaceItem(const QString& name,
30MirSurfaceItem::MirSurfaceItem(const QString& name,
24 MirSurfaceItem::Type type,
31 MirSurfaceItem::Type type,
25 MirSurfaceItem::State state,
32 MirSurfaceItem::State state,
26 const QUrl& screenshot,
33 const QUrl& screenshot,
34+ const QString &qmlFilePath,
27 QQuickItem *parent)
35 QQuickItem *parent)
28− : QQuickPaintedItem(parent)
36+ : QQuickItem(parent)
29 , m_application(nullptr)
37 , m_application(nullptr)
30 , m_name(name)
38 , m_name(name)
31 , m_type(type)
39 , m_type(type)
32 , m_state(state)
40 , m_state(state)
33− , m_img(screenshot.isLocalFile() ? screenshot.toLocalFile() : screenshot.toString())
34 , m_parentSurface(nullptr)
41 , m_parentSurface(nullptr)
35− , m_haveInputMethod(false)
42+ , m_qmlItem(nullptr)
43+ , m_screenshotUrl(screenshot)
36{
44{
37 qDebug() << "MirSurfaceItem::MirSurfaceItem() " << this->name();
45 qDebug() << "MirSurfaceItem::MirSurfaceItem() " << this->name();
38
46
39 QQmlEngine::setObjectOwnership(this, QQmlEngine::CppOwnership);
47 QQmlEngine::setObjectOwnership(this, QQmlEngine::CppOwnership);
40
48
41− // The virtual keyboard (input method) has a big transparent area so that
42− // content behind it show through
43− setFillColor(Qt::transparent);
44−
45 connect(this, &QQuickItem::focusChanged,
49 connect(this, &QQuickItem::focusChanged,
46 this, &MirSurfaceItem::onFocusChanged);
50 this, &MirSurfaceItem::onFocusChanged);
51+
52+ // The assumptions I make here really should hold.
53+ QQuickView *quickView =
54+ qobject_cast<QQuickView*>(QGuiApplication::topLevelWindows()[0]);
55+
56+ QString qmlComponentFilePath;
57+ if (!qmlFilePath.isEmpty()) {
58+ qmlComponentFilePath.append(qmlFilePath);
59+ } else {
60+ qmlComponentFilePath = QString("%1/Unity/Application/MirSurfaceItem.qml")
61+ .arg(mockPluginsDir());
62+ }
63+
64+ m_qmlContentComponent = new QQmlComponent(quickView->engine(), qmlComponentFilePath);
65+
66+ switch (m_qmlContentComponent->status()) {
67+ case QQmlComponent::Ready:
68+ createQmlContentItem();
69+ break;
70+ case QQmlComponent::Loading:
71+ connect(m_qmlContentComponent, &QQmlComponent::statusChanged,
72+ this, &MirSurfaceItem::onComponentStatusChanged);
73+ break;
74+ case QQmlComponent::Error:
75+ printComponentErrors();
76+ qFatal("MirSurfaceItem: failed to create content component.");
77+ break;
78+ default:
79+ qFatal("MirSurfaceItem: Unhandled component status");
80+ }
47}
81}
48
82
49MirSurfaceItem::~MirSurfaceItem()
83MirSurfaceItem::~MirSurfaceItem()
@@ -61,10 +95,11 @@ MirSurfaceItem::~MirSurfaceItem()
61 m_application->removeSurface(this);
95 m_application->removeSurface(this);
62}
96}
63
97
64−void MirSurfaceItem::paint(QPainter * painter)
98+void MirSurfaceItem::printComponentErrors()
65{
99{
66− if (!m_img.isNull()) {
100+ QList<QQmlError> errors = m_qmlContentComponent->errors();
67− painter->drawImage(contentsBoundingRect(), m_img, QRect(QPoint(0,0), m_img.size()));
101+ for (int i = 0; i < errors.count(); ++i) {
102+ qDebug() << errors[i];
68 }
103 }
69}
104}
70
105
@@ -155,19 +190,24 @@ MirSurfaceItem* MirSurfaceItem::childSurfaceAt(QQmlListProperty<MirSurfaceItem>
155}
190}
156
191
157
192
158−void MirSurfaceItem::touchEvent(QTouchEvent * event)
193+void MirSurfaceItem::onQmlWantInputMethodChanged()
159{
194{
160− if (event->type() == QEvent::TouchBegin && hasFocus()) {
195+ QQmlProperty prop(m_qmlItem, "wantInputMethod");
196+ bool wantInputMethod = prop.read().toBool();
197+
198+ if (hasFocus() && wantInputMethod) {
161 Q_EMIT inputMethodRequested();
199 Q_EMIT inputMethodRequested();
162− m_haveInputMethod = true;
163 }
200 }
164}
201}
165
202
166void MirSurfaceItem::onFocusChanged()
203void MirSurfaceItem::onFocusChanged()
167{
204{
168− if (!hasFocus() && m_haveInputMethod) {
205+ QQmlProperty prop(m_qmlItem, "wantInputMethod");
206+ bool wantInputMethod = prop.read().toBool();
207+
208+ if (!hasFocus() && wantInputMethod) {
169 Q_EMIT inputMethodDismissed();
209 Q_EMIT inputMethodDismissed();
170− m_haveInputMethod = false;
210+ prop.write(QVariant::fromValue(false));
171 }
211 }
172}
212}
173
213
@@ -178,3 +218,34 @@ void MirSurfaceItem::setState(MirSurfaceItem::State newState)
178 Q_EMIT stateChanged(newState);
218 Q_EMIT stateChanged(newState);
179 }
219 }
180}
220}
221+
222+void MirSurfaceItem::onComponentStatusChanged(QQmlComponent::Status status)
223+{
224+ if (status == QQmlComponent::Ready) {
225+ createQmlContentItem();
226+ }
227+}
228+
229+void MirSurfaceItem::createQmlContentItem()
230+{
231+ qDebug() << "MirSurfaceItem::createQmlContentItem()";
232+
233+ m_qmlItem = qobject_cast<QQuickItem*>(m_qmlContentComponent->create());
234+ m_qmlItem->setParentItem(this);
235+
236+ setImplicitWidth(m_qmlItem->implicitWidth());
237+ setImplicitHeight(m_qmlItem->implicitHeight());
238+
239+ {
240+ QQmlProperty screenshotSource(m_qmlItem, "screenshotSource");
241+ screenshotSource.write(QVariant::fromValue(m_screenshotUrl));
242+ }
243+
244+ {
245+ QQmlProperty prop(m_qmlItem, "wantInputMethod");
246+ if (prop.type() == QQmlProperty::Property) {
247+ bool ok = prop.connectNotifySignal(this, SLOT(onQmlWantInputMethodChanged()));
248+ if (!ok) qCritical("MirSurfaceItem: failed to connect to wantInputMethod notify signal");
249+ }
250+ }
251+}
tests/mocks/Unity/Application/MirSurfaceItem.h+14−11
@@ -17,12 +17,13 @@
17#ifndef MIRSURFACEITEM_H
17#ifndef MIRSURFACEITEM_H
18#define MIRSURFACEITEM_H
18#define MIRSURFACEITEM_H
19
19
20−#include <QQuickPaintedItem>
20+#include <QQuickItem>
21−#include <QImage>
21+#include <QQmlComponent>
22+#include <QUrl>
22
23
23class ApplicationInfo;
24class ApplicationInfo;
24
25
25−class MirSurfaceItem : public QQuickPaintedItem
26+class MirSurfaceItem : public QQuickItem
26{
27{
27 Q_OBJECT
28 Q_OBJECT
28 Q_ENUMS(Type)
29 Q_ENUMS(Type)
@@ -59,6 +60,7 @@ public:
59 Type type,
60 Type type,
60 State state,
61 State state,
61 const QUrl& screenshot,
62 const QUrl& screenshot,
63+ const QString &qmlFilePath = QString(),
62 QQuickItem *parent = 0);
64 QQuickItem *parent = 0);
63 ~MirSurfaceItem();
65 ~MirSurfaceItem();
64
66
@@ -76,9 +78,6 @@ public:
76 Q_INVOKABLE void setState(State newState);
78 Q_INVOKABLE void setState(State newState);
77 Q_INVOKABLE void release();
79 Q_INVOKABLE void release();
78
80
79− void paint(QPainter * painter) override;
80− void touchEvent(QTouchEvent * event) override;
81−
82Q_SIGNALS:
81Q_SIGNALS:
83 void typeChanged(Type);
82 void typeChanged(Type);
84 void stateChanged(State);
83 void stateChanged(State);
@@ -93,9 +92,8 @@ Q_SIGNALS:
93
92
94private Q_SLOTS:
93private Q_SLOTS:
95 void onFocusChanged();
94 void onFocusChanged();
96−
95+ void onComponentStatusChanged(QQmlComponent::Status status);
97−protected:
96+ void onQmlWantInputMethodChanged();
98− const QImage &screenshotImage() { return m_img; }
99
97
100private:
98private:
101 void addChildSurface(MirSurfaceItem* surface);
99 void addChildSurface(MirSurfaceItem* surface);
@@ -105,15 +103,20 @@ private:
105 static int childSurfaceCount(QQmlListProperty<MirSurfaceItem> *prop);
103 static int childSurfaceCount(QQmlListProperty<MirSurfaceItem> *prop);
106 static MirSurfaceItem* childSurfaceAt(QQmlListProperty<MirSurfaceItem> *prop, int index);
104 static MirSurfaceItem* childSurfaceAt(QQmlListProperty<MirSurfaceItem> *prop, int index);
107
105
106+ void createQmlContentItem();
107+ void printComponentErrors();
108+
108 ApplicationInfo* m_application;
109 ApplicationInfo* m_application;
109 const QString m_name;
110 const QString m_name;
110 const Type m_type;
111 const Type m_type;
111 State m_state;
112 State m_state;
112− const QImage m_img;
113
113
114 MirSurfaceItem* m_parentSurface;
114 MirSurfaceItem* m_parentSurface;
115 QList<MirSurfaceItem*> m_children;
115 QList<MirSurfaceItem*> m_children;
116− bool m_haveInputMethod;
116+
117+ QQmlComponent *m_qmlContentComponent;
118+ QQuickItem *m_qmlItem;
119+ QUrl m_screenshotUrl;
117};
120};
118
121
119Q_DECLARE_METATYPE(MirSurfaceItem*)
122Q_DECLARE_METATYPE(MirSurfaceItem*)
tests/mocks/Unity/Application/MirSurfaceItem.qmlnew file+57
@@ -0,0 +1,57 @@
1+/*
2+ * Copyright 2014 Canonical Ltd.
3+ *
4+ * This program is free software; you can redistribute it and/or modify
5+ * it under the terms of the GNU 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+import QtQuick 2.0
18+
19+Rectangle {
20+ objectName: "fakeSurfaceQML"
21+ id: root
22+ color: "pink"
23+
24+ anchors.fill: parent
25+
26+ implicitWidth: units.gu(40)
27+ implicitHeight: units.gu(70)
28+
29+ property alias screenshotSource: screenshotImage.source
30+
31+ property bool wantInputMethod: false
32+
33+ property int touchPressCount: 0
34+ property int touchReleaseCount: 0
35+
36+ Image {
37+ id: screenshotImage
38+ anchors.fill: parent
39+ fillMode: Image.Stretch
40+ }
41+
42+ Text {
43+ anchors.fill: parent
44+ text: "SURFACE"
45+ color: "yellow"
46+ font.bold: true
47+ fontSizeMode: Text.Fit
48+ minimumPixelSize: 10; font.pixelSize: 200
49+ verticalAlignment: Text.AlignVCenter
50+ }
51+
52+ MultiPointTouchArea {
53+ anchors.fill: parent
54+ onPressed: { root.wantInputMethod = true; root.touchPressCount++; }
55+ onReleased: { root.touchReleaseCount++; }
56+ }
57+}
tests/mocks/Unity/Application/SurfaceManager.cpp+14−3
@@ -16,9 +16,8 @@
16
16
17#include "SurfaceManager.h"
17#include "SurfaceManager.h"
18
18
19+#include <paths.h>
19#include "MirSurfaceItem.h"
20#include "MirSurfaceItem.h"
20−#include "VirtualKeyboard.h"
21−
22
21
23SurfaceManager *SurfaceManager::the_surface_manager = nullptr;
22SurfaceManager *SurfaceManager::the_surface_manager = nullptr;
24
23
@@ -66,7 +65,19 @@ void SurfaceManager::hideInputMethod()
66MirSurfaceItem *SurfaceManager::inputMethodSurface()
65MirSurfaceItem *SurfaceManager::inputMethodSurface()
67{
66{
68 if (!m_virtualKeyboard) {
67 if (!m_virtualKeyboard) {
69− m_virtualKeyboard = new VirtualKeyboard(MirSurfaceItem::Minimized);
68+
69+ QString screenshotPath = QString("file://%1/Dash/graphics/phone/screenshots/vkb_portrait.png")
70+ .arg(qmlDirectory());
71+
72+ QString qmlFilePath = QString("%1/Unity/Application/VirtualKeyboard.qml")
73+ .arg(mockPluginsDir());
74+
75+ m_virtualKeyboard = new MirSurfaceItem(
76+ "input-method",
77+ MirSurfaceItem::InputMethod,
78+ MirSurfaceItem::Minimized,
79+ screenshotPath,
80+ qmlFilePath);
70 Q_EMIT surfaceCreated(m_virtualKeyboard);
81 Q_EMIT surfaceCreated(m_virtualKeyboard);
71 }
82 }
72 return m_virtualKeyboard;
83 return m_virtualKeyboard;
tests/mocks/Unity/Application/SurfaceManager.h+1−2
@@ -20,7 +20,6 @@
20#include <QObject>
20#include <QObject>
21
21
22class MirSurfaceItem;
22class MirSurfaceItem;
23−class VirtualKeyboard;
24
23
25class SurfaceManager : public QObject
24class SurfaceManager : public QObject
26{
25{
@@ -48,7 +47,7 @@ private Q_SLOTS:
48
47
49private:
48private:
50 static SurfaceManager *the_surface_manager;
49 static SurfaceManager *the_surface_manager;
51− VirtualKeyboard *m_virtualKeyboard;
50+ MirSurfaceItem *m_virtualKeyboard;
52};
51};
53
52
54#endif // SURFACEMANAGER_H
53#endif // SURFACEMANAGER_H
tests/mocks/Unity/Application/VirtualKeyboard.cppdeleted−55
@@ -1,55 +0,0 @@
1−/*
2− * Copyright (C) 2014 Canonical, Ltd.
3− *
4− * This program is free software; you can redistribute it and/or modify
5− * it under the terms of the GNU General Public License as published by
6− * the Free Software Foundation; version 3.
7− *
8− * This program is distributed in the hope that it will be useful,
9− * but WITHOUT ANY WARRANTY; without even the implied warranty of
10− * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11− * GNU General Public License for more details.
12− *
13− * You should have received a copy of the GNU General Public License
14− * along with this program. If not, see <http://www.gnu.org/licenses/>.
15− */
16−
17−#include "VirtualKeyboard.h"
18−
19−#include <paths.h>
20−
21−VirtualKeyboard::VirtualKeyboard(State state, QQuickItem *parent)
22− : MirSurfaceItem("input-method",
23− MirSurfaceItem::InputMethod,
24− state,
25− QString("file://%1/Dash/graphics/phone/screenshots/vkb_portrait.png").arg(qmlDirectory()),
26− parent)
27−{
28−}
29−
30−void VirtualKeyboard::touchEvent(QTouchEvent *event)
31−{
32− if (event->type() == QEvent::TouchBegin && !hasTouchInsideKeyboard(event)) {
33− event->ignore();
34− }
35−}
36−
37−bool VirtualKeyboard::hasTouchInsideKeyboard(QTouchEvent *event)
38−{
39− const QList<QTouchEvent::TouchPoint> &touchPoints = event->touchPoints();
40− for (int i = 0; i < touchPoints.count(); ++i) {
41− QPoint pos = touchPoints.at(i).pos().toPoint();
42−
43− // Map to image coords
44− int imageX = (int)( ( ((qreal)pos.x()) / width() ) * ((qreal)screenshotImage().size().width()) );
45− int imageY = (int)( ( ((qreal)pos.y()) / height() ) * ((qreal)screenshotImage().size().height()) );
46−
47− QRgb pixelHit = screenshotImage().pixel(imageX, imageY);
48−
49− // The keyboard depicted in the image is in its opaque part.
50− if (qAlpha(pixelHit) != 0) {
51− return true;
52− }
53− }
54− return false;
55−}
tests/mocks/Unity/Application/VirtualKeyboard.qmlnew file+40
@@ -0,0 +1,40 @@
1+/*
2+ * Copyright 2014 Canonical Ltd.
3+ *
4+ * This program is free software; you can redistribute it and/or modify
5+ * it under the terms of the GNU 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+import QtQuick 2.0
18+
19+Item {
20+ implicitWidth: units.gu(40)
21+ implicitHeight: units.gu(70)
22+
23+ anchors.fill: parent
24+
25+ property alias screenshotSource: screenshotImage.source
26+
27+ property bool landscape: width > height
28+
29+ Image {
30+ id: screenshotImage
31+ height: landscape ? parent.height * 0.4 : width * 0.6
32+ anchors.bottom: parent.bottom
33+ anchors.left: parent.left
34+ anchors.right: parent.right
35+
36+ MultiPointTouchArea {
37+ anchors.fill: parent
38+ }
39+ }
40+}
tests/mocks/Unity/Application/plugin.cpp−3
@@ -16,7 +16,6 @@
16
16
17#include "plugin.h"
17#include "plugin.h"
18#include "ApplicationInfo.h"
18#include "ApplicationInfo.h"
19−#include "ApplicationImage.h"
20#include "ApplicationManager.h"
19#include "ApplicationManager.h"
21#include "ApplicationScreenshotProvider.h"
20#include "ApplicationScreenshotProvider.h"
22#include "MirSurfaceItem.h"
21#include "MirSurfaceItem.h"
@@ -49,8 +48,6 @@ void FakeUnityApplicationQmlPlugin::registerTypes(const char *uri)
49 qmlRegisterType<ApplicationInfo>(uri, 0, 1, "ApplicationInfo");
48 qmlRegisterType<ApplicationInfo>(uri, 0, 1, "ApplicationInfo");
50
49
51 qmlRegisterUncreatableType<MirSurfaceItem>(uri, 0, 1, "MirSurfaceItem", "MirSurfaceItem can't be instantiated from QML");
50 qmlRegisterUncreatableType<MirSurfaceItem>(uri, 0, 1, "MirSurfaceItem", "MirSurfaceItem can't be instantiated from QML");
52−
53− qmlRegisterType<ApplicationImage>(uri, 0, 1, "ApplicationImage");
54}
51}
55
52
56void FakeUnityApplicationQmlPlugin::initializeEngine(QQmlEngine *engine, const char *uri)
53void FakeUnityApplicationQmlPlugin::initializeEngine(QQmlEngine *engine, const char *uri)
tests/mocks/Unity/Application/qmldir−3
@@ -1,6 +1,3 @@
1module Unity.Application
1module Unity.Application
2plugin FakeUnityApplicationQml
2plugin FakeUnityApplicationQml
3typeinfo Application.qmltypes
3typeinfo Application.qmltypes
4−
5−InputFilterArea 0.1 InputFilterArea.qml
6−OSKController 0.1 OSKController.qml
tests/mocks/Unity/CMakeLists.txt+1
@@ -1,4 +1,5 @@
1add_subdirectory(Application)
1add_subdirectory(Application)
2+add_subdirectory(Connectivity)
2add_subdirectory(Indicators)
3add_subdirectory(Indicators)
3add_subdirectory(Launcher)
4add_subdirectory(Launcher)
4add_subdirectory(Notifications)
5add_subdirectory(Notifications)
tests/mocks/Unity/Connectivity/CMakeLists.txtnew file+10
@@ -0,0 +1,10 @@
1+set(MOCK_CONNECTIVITY_SOURCES
2+ plugin.cpp
3+ MockConnectivity.cpp
4+)
5+
6+add_library(MockConnectivity MODULE ${MOCK_CONNECTIVITY_SOURCES})
7+
8+qt5_use_modules(MockConnectivity Qml Quick Core)
9+
10+add_unity8_mock(Unity.Connectivity 0.1 Unity/Connectivity TARGETS MockConnectivity)
tests/mocks/Unity/Connectivity/Connectivity.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.Connectivity 0.1 tests/mocks'
8+
9+Module {
10+ Component {
11+ name: "MockConnectivity"
12+ prototype: "QObject"
13+ exports: ["Unity.Connectivity/Connectivity 0.1"]
14+ isCreatable: false
15+ isSingleton: true
16+ exportMetaObjectRevisions: [0]
17+ Signal { name: "unlockingAllModems" }
18+ Method { name: "unlockAllModems" }
19+ }
20+}
tests/mocks/Unity/Application/InputFilterArea.qml → tests/mocks/Unity/Connectivity/MockConnectivity.cpprenamed+10−4
@@ -1,5 +1,5 @@
1/*
1/*
2− * Copyright (C) 2013 Canonical, Ltd.
2+ * Copyright (C) 2014 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
@@ -14,8 +14,14 @@
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 */
15 */
16
16
17−import QtQuick 2.0;
17+#include "MockConnectivity.h"
18
18
19−Item {
19+MockConnectivity::MockConnectivity(QObject *parent)
20− property bool blockInput: false
20+ : QObject(parent)
21+{
22+}
23+
24+void MockConnectivity::unlockAllModems()
25+{
26+ Q_EMIT unlockingAllModems();
21}
27}
tests/mocks/Unity/Connectivity/MockConnectivity.hnew file+36
@@ -0,0 +1,36 @@
1+/*
2+ * Copyright (C) 2014 Canonical, Ltd.
3+ *
4+ * This program is free software; you can redistribute it and/or modify
5+ * it under the terms of the GNU General Public License as published by
6+ * the Free Software Foundation; version 3.
7+ *
8+ * This program is distributed in the hope that it will be useful,
9+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
10+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11+ * GNU General Public License for more details.
12+ *
13+ * You should have received a copy of the GNU General Public License
14+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
15+ */
16+
17+#ifndef MOCK_CONNECTIVITY_H
18+#define MOCK_CONNECTIVITY_H
19+
20+#include <QObject>
21+
22+class MockConnectivity : public QObject
23+{
24+ Q_OBJECT
25+ Q_DISABLE_COPY(MockConnectivity)
26+
27+public:
28+ explicit MockConnectivity(QObject *parent = 0);
29+
30+ Q_INVOKABLE void unlockAllModems();
31+
32+Q_SIGNALS:
33+ void unlockingAllModems(); // only for mock
34+};
35+
36+#endif // MOCK_CONNECTIVITY_H
tests/mocks/Unity/Connectivity/plugin.cppnew file+34
@@ -0,0 +1,34 @@
1+/*
2+ * Copyright (C) 2014 Canonical, Ltd.
3+ *
4+ * This program is free software; you can redistribute it and/or modify
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 "plugin.h"
18+#include "MockConnectivity.h"
19+
20+#include <QtQml>
21+
22+static QObject *service_provider(QQmlEngine *engine, QJSEngine *scriptEngine)
23+{
24+ Q_UNUSED(engine)
25+ Q_UNUSED(scriptEngine)
26+ return new MockConnectivity();
27+}
28+
29+void BackendPlugin::registerTypes(const char *uri)
30+{
31+ Q_ASSERT(uri == QLatin1String("Unity.Connectivity"));
32+
33+ qmlRegisterSingletonType<MockConnectivity>(uri, 0, 1, "Connectivity", service_provider);
34+}
tests/mocks/Unity/Connectivity/plugin.hnew file+31
@@ -0,0 +1,31 @@
1+/*
2+ * Copyright (C) 2014 Canonical, Ltd.
3+ *
4+ * This program is free software; you can redistribute it and/or modify
5+ * it under the terms of the GNU General Public License as published by
6+ * the Free Software Foundation; version 3.
7+ *
8+ * This program is distributed in the hope that it will be useful,
9+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
10+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11+ * GNU General Public License for more details.
12+ *
13+ * You should have received a copy of the GNU General Public License
14+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
15+ */
16+
17+#ifndef MOCK_CONNECTIVITY_PLUGIN_H
18+#define MOCK_CONNECTIVITY_PLUGIN_H
19+
20+#include <QQmlExtensionPlugin>
21+
22+class BackendPlugin : public QQmlExtensionPlugin
23+{
24+ Q_OBJECT
25+ Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface")
26+
27+public:
28+ void registerTypes(const char *uri);
29+};
30+
31+#endif // MOCK_CONNECTIVITY_PLUGIN_H
tests/mocks/Unity/Connectivity/qmldirnew file+3
@@ -0,0 +1,3 @@
1+module Unity.Connectivity
2+plugin MockConnectivity
3+typeinfo Connectivity.qmltypes
tests/mocks/Unity/Indicators/CMakeLists.txt+6−1
@@ -14,6 +14,7 @@ set(IndicatorsFakeQml_SOURCES
14 fakeplugin.cpp
14 fakeplugin.cpp
15 ${CMAKE_SOURCE_DIR}/plugins/Unity/Indicators/indicators.h
15 ${CMAKE_SOURCE_DIR}/plugins/Unity/Indicators/indicators.h
16 ${CMAKE_SOURCE_DIR}/plugins/Unity/Indicators/menucontentactivator.cpp
16 ${CMAKE_SOURCE_DIR}/plugins/Unity/Indicators/menucontentactivator.cpp
17+ ${CMAKE_SOURCE_DIR}/plugins/Unity/Indicators/unitymenumodelcache.cpp
17 ${CMAKE_SOURCE_DIR}/plugins/Unity/Indicators/unitymenumodelstack.cpp
18 ${CMAKE_SOURCE_DIR}/plugins/Unity/Indicators/unitymenumodelstack.cpp
18 ${CMAKE_SOURCE_DIR}/plugins/Unity/Indicators/visibleindicatorsmodel.cpp
19 ${CMAKE_SOURCE_DIR}/plugins/Unity/Indicators/visibleindicatorsmodel.cpp
19 fakeindicatorsmodel.cpp
20 fakeindicatorsmodel.cpp
@@ -33,7 +34,11 @@ add_library(IndicatorsFakeQml SHARED
33)
34)
34add_definitions(-DUNITYINDICATORS_LIBRARY)
35add_definitions(-DUNITYINDICATORS_LIBRARY)
35
36
36−target_link_libraries(IndicatorsFakeQml)
37+add_dependencies(IndicatorsFakeQml QMenuModelQml)
38+target_link_libraries(IndicatorsFakeQml
39+ -L${CMAKE_BINARY_DIR}/tests/mocks/QMenuModel
40+ -lqmenumodel
41+)
37
42
38qt5_use_modules(IndicatorsFakeQml Core Qml Quick)
43qt5_use_modules(IndicatorsFakeQml Core Qml Quick)
39
44
tests/mocks/Unity/Indicators/fakeplugin.cpp+9
@@ -26,9 +26,16 @@
26#include "fakeindicatorsmodel.h"
26#include "fakeindicatorsmodel.h"
27#include "indicators.h"
27#include "indicators.h"
28#include "menucontentactivator.h"
28#include "menucontentactivator.h"
29+#include "unitymenumodelcache.h"
29#include "unitymenumodelstack.h"
30#include "unitymenumodelstack.h"
30#include "visibleindicatorsmodel.h"
31#include "visibleindicatorsmodel.h"
31
32
33+static QObject* menuModelCacheSingleton(QQmlEngine* engine, QJSEngine* scriptEngine) {
34+ Q_UNUSED(engine);
35+ Q_UNUSED(scriptEngine);
36+ return new UnityMenuModelCache;
37+}
38+
32void IndicatorsFakePlugin::registerTypes(const char * uri)
39void IndicatorsFakePlugin::registerTypes(const char * uri)
33{
40{
34 Q_INIT_RESOURCE(indicators_fake);
41 Q_INIT_RESOURCE(indicators_fake);
@@ -41,6 +48,8 @@ void IndicatorsFakePlugin::registerTypes(const char * uri)
41 qmlRegisterType<UnityMenuModelStack>(uri, 0, 1, "UnityMenuModelStack");
48 qmlRegisterType<UnityMenuModelStack>(uri, 0, 1, "UnityMenuModelStack");
42 qmlRegisterType<VisibleIndicatorsModel>(uri, 0, 1, "VisibleIndicatorsModel");
49 qmlRegisterType<VisibleIndicatorsModel>(uri, 0, 1, "VisibleIndicatorsModel");
43
50
51+ qmlRegisterSingletonType<UnityMenuModelCache>(uri, 0, 1, "UnityMenuModelCache", menuModelCacheSingleton);
52+
44 // external uncreatables
53 // external uncreatables
45 qmlRegisterUncreatableType<MenuContentState>(uri, 0, 1, "MenuContentState", "Can't create MenuContentState class");
54 qmlRegisterUncreatableType<MenuContentState>(uri, 0, 1, "MenuContentState", "Can't create MenuContentState class");
46 qmlRegisterUncreatableType<ActionState>(uri, 0, 1, "ActionState", "Can't create ActionState class");
55 qmlRegisterUncreatableType<ActionState>(uri, 0, 1, "ActionState", "Can't create ActionState class");
tests/mocks/Unity/Indicators/qmldir−1
@@ -2,7 +2,6 @@ module Unity.Indicators
2plugin IndicatorsFakeQml
2plugin IndicatorsFakeQml
3typeinfo Indicators.qmltypes
3typeinfo Indicators.qmltypes
4
4
5−CachedUnityMenuModel 0.1 CachedUnityMenuModel.qml
6IndicatorsModel 0.1 IndicatorsModel.qml
5IndicatorsModel 0.1 IndicatorsModel.qml
7FakeMenuPage 0.1 FakeMenuPage.qml
6FakeMenuPage 0.1 FakeMenuPage.qml
8RootActionState 0.1 RootActionState.qml
7RootActionState 0.1 RootActionState.qml
tests/plugins/Unity/Launcher/CMakeLists.txt+1−1
@@ -1,6 +1,6 @@
1pkg_check_modules(GSETTINGS_QT REQUIRED gsettings-qt)
1pkg_check_modules(GSETTINGS_QT REQUIRED gsettings-qt)
2pkg_check_modules(LAUNCHER_API REQUIRED unity-shell-launcher=3)
2pkg_check_modules(LAUNCHER_API REQUIRED unity-shell-launcher=3)
3−pkg_check_modules(APPLICATION_API REQUIRED unity-shell-application=1)
3+pkg_check_modules(APPLICATION_API REQUIRED unity-shell-application=3)
4
4
5include_directories(
5include_directories(
6 ${CMAKE_CURRENT_BINARY_DIR}
6 ${CMAKE_CURRENT_BINARY_DIR}
tests/plugins/Unity/Launcher/launchermodeltest.cpp−1
@@ -93,7 +93,6 @@ public:
93 m_list.takeAt(index)->deleteLater();
93 m_list.takeAt(index)->deleteLater();
94 endRemoveRows();
94 endRemoveRows();
95 }
95 }
96− bool updateScreenshot(const QString &appId) { Q_UNUSED(appId); return true; }
97 bool requestFocusApplication(const QString &appId) { Q_UNUSED(appId); return true; }
96 bool requestFocusApplication(const QString &appId) { Q_UNUSED(appId); return true; }
98 bool suspended() const { return false; }
97 bool suspended() const { return false; }
99 void setSuspended(bool) {}
98 void setSuspended(bool) {}
tests/qmltests/CMakeLists.txt+4
@@ -72,7 +72,11 @@ add_qml_test(Panel Panel)
72add_qml_test(Panel SearchIndicator)
72add_qml_test(Panel SearchIndicator)
73add_qml_test(Panel/Indicators DefaultIndicatorWidget ENVIRONMENT "LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/tests/mocks/QMenuModel")
73add_qml_test(Panel/Indicators DefaultIndicatorWidget ENVIRONMENT "LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/tests/mocks/QMenuModel")
74add_qml_test(Panel/Indicators DefaultIndicatorPage ENVIRONMENT "LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/tests/mocks/QMenuModel")
74add_qml_test(Panel/Indicators DefaultIndicatorPage ENVIRONMENT "LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/tests/mocks/QMenuModel")
75+add_qml_test(Panel/Indicators CachedUnityMenuModel ENVIRONMENT "LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/tests/mocks/QMenuModel")
75# These MenuItemFactory tests need the test/mocks/ to come before plugins/
76# These MenuItemFactory tests need the test/mocks/ to come before plugins/
76add_qml_test(Panel/Indicators MenuItemFactory IMPORT_PATHS ${CMAKE_BINARY_DIR}/tests/mocks ${qmltest_DEFAULT_IMPORT_PATHS})
77add_qml_test(Panel/Indicators MenuItemFactory IMPORT_PATHS ${CMAKE_BINARY_DIR}/tests/mocks ${qmltest_DEFAULT_IMPORT_PATHS})
77add_qml_test(Panel/Indicators MessageMenuItemFactory IMPORT_PATHS ${CMAKE_BINARY_DIR}/tests/mocks ${qmltest_DEFAULT_IMPORT_PATHS})
78add_qml_test(Panel/Indicators MessageMenuItemFactory IMPORT_PATHS ${CMAKE_BINARY_DIR}/tests/mocks ${qmltest_DEFAULT_IMPORT_PATHS})
79+add_qml_test(Stages ApplicationWindow ENVIRONMENT "LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/tests/mocks/libusermetrics:${CMAKE_BINARY_DIR}/tests/mocks/LightDM/single")
78add_qml_test(Stages PhoneStage ENVIRONMENT "LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/tests/mocks/libusermetrics:${CMAKE_BINARY_DIR}/tests/mocks/LightDM/single")
80add_qml_test(Stages PhoneStage ENVIRONMENT "LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/tests/mocks/libusermetrics:${CMAKE_BINARY_DIR}/tests/mocks/LightDM/single")
81+add_qml_test(Stages SpreadDelegate ENVIRONMENT "LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/tests/mocks/libusermetrics:${CMAKE_BINARY_DIR}/tests/mocks/LightDM/single")
82+add_qml_test(Stages SurfaceContainer ENVIRONMENT "LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/tests/mocks/libusermetrics:${CMAKE_BINARY_DIR}/tests/mocks/LightDM/single")
tests/qmltests/Dash/Previews/tst_PreviewExpandable.qml+12−6
@@ -30,15 +30,21 @@ Rectangle {
30 property string longText2: "This is a very very very long text. 1 This is a very very very long text. 2 This is a very very very long text. 3 This is a very very very long text. 4 This is a very very very long text. 5 This is a very very very long text. 6 This is a very very very long text. 7 This is a very very very long text. 8 This is a very very very long text. 9 This is a very very very long text. 10 This is a very very very long text. 11 This is a very very very long text."
30 property string longText2: "This is a very very very long text. 1 This is a very very very long text. 2 This is a very very very long text. 3 This is a very very very long text. 4 This is a very very very long text. 5 This is a very very very long text. 6 This is a very very very long text. 7 This is a very very very long text. 8 This is a very very very long text. 9 This is a very very very long text. 10 This is a very very very long text. 11 This is a very very very long text."
31 property string shortText: "This is a short text :)"
31 property string shortText: "This is a short text :)"
32
32
33+ ListModel {
34+ id: widgetsModel
35+ }
36+
33 property var widgetData: {
37 property var widgetData: {
34 "title": "Title here",
38 "title": "Title here",
35 "collapsed-widgets": 2,
39 "collapsed-widgets": 2,
36− "widgets": [
40+ "widgets": widgetsModel
37− { "type": "text", "widgetId" : "text1", "properties" : { "text": longText } },
41+ }
38− { "type": "text", "widgetId" : "text2", "properties" : { "text": longText2 } },
42+
39− { "type": "text", "widgetId" : "text3", "properties" : { "text": shortText } },
43+ Component.onCompleted: {
40− { "type": "text", "widgetId" : "text4", "properties" : { "text": longText } }
44+ widgetsModel.append({"type": "text", "widgetId": "text1", "properties": { "text": longText }});
41− ]
45+ widgetsModel.append({"type": "text", "widgetId": "text2", "properties": { "text": longText2 }});
46+ widgetsModel.append({"type": "text", "widgetId": "text3", "properties": { "text": shortText }});
47+ widgetsModel.append({"type": "text", "widgetId": "text4", "properties": { "text": longText }});
42 }
48 }
43
49
44 PreviewExpandable {
50 PreviewExpandable {
tests/qmltests/Dash/Previews/tst_PreviewPayments.qml+24
@@ -52,6 +52,8 @@ Rectangle {
52 function cleanup()
52 function cleanup()
53 {
53 {
54 spy.clear();
54 spy.clear();
55+ var button = findChild(root, "paymentButton");
56+ button.opacity = 1;
55 }
57 }
56
58
57 function test_purchase_text_display() {
59 function test_purchase_text_display() {
@@ -79,6 +81,28 @@ Rectangle {
79 compare(args[2], jsonPurchase["source"]);
81 compare(args[2], jsonPurchase["source"]);
80 }
82 }
81
83
84+ function test_progress_show() {
85+ // Make sure the progress bar is shown.
86+ previewPayments.widgetData = jsonPurchase;
87+
88+ var button = findChild(root, "paymentButton");
89+ var progress = findChild(root, "loadingBar");
90+
91+ tryCompare(progress, "visible", false);
92+ tryCompare(progress, "opacity", 0);
93+ tryCompare(button, "visible", true);
94+ tryCompare(button, "opacity", 1);
95+
96+ mouseClick(button, button.width / 2, button.height / 2);
97+
98+ spy.wait();
99+
100+ tryCompare(progress, "visible", true);
101+ tryCompare(progress, "opacity", 1);
102+ tryCompare(button, "visible", false);
103+ tryCompare(button, "opacity", 0);
104+ }
105+
82 function test_purchase_error() {
106 function test_purchase_error() {
83 // The mock Payments triggers an error when com.example.invalid is
107 // The mock Payments triggers an error when com.example.invalid is
84 // passed to it as store_item_id. Exercise it here
108 // passed to it as store_item_id. Exercise it here
tests/qmltests/Dash/tst_Dash.qml+12−6
@@ -96,8 +96,10 @@ Item {
96 tryCompare(scopes, "loaded", true);
96 tryCompare(scopes, "loaded", true);
97 var dashContentList = findChild(dash, "dashContentList");
97 var dashContentList = findChild(dash, "dashContentList");
98 tryCompare(dashContentList, "count", 6);
98 tryCompare(dashContentList, "count", 6);
99− var mockScope1Loader = findChild(dash, "MockScope1 loader");
99+ tryCompareFunction(function() {
100− tryCompareFunction(function() { return mockScope1Loader.item != null; }, true);
100+ var mockScope1Loader = findChild(dash, "MockScope1 loader");
101+ return mockScope1Loader && mockScope1Loader.item != null; },
102+ true);
101
103
102 // Show the overview
104 // Show the overview
103 touchFlick(dash, dash.width / 2, dash.height - 1, dash.width / 2, dash.height - units.gu(18));
105 touchFlick(dash, dash.width / 2, dash.height - 1, dash.width / 2, dash.height - units.gu(18));
@@ -159,8 +161,10 @@ Item {
159 tryCompare(scopes, "loaded", true);
161 tryCompare(scopes, "loaded", true);
160 var dashContentList = findChild(dash, "dashContentList");
162 var dashContentList = findChild(dash, "dashContentList");
161 tryCompare(dashContentList, "count", 6);
163 tryCompare(dashContentList, "count", 6);
162− var mockScope1Loader = findChild(dash, "MockScope1 loader");
164+ tryCompareFunction(function() {
163− tryCompareFunction(function() { return mockScope1Loader.item != null; }, true);
165+ var mockScope1Loader = findChild(dash, "MockScope1 loader");
166+ return mockScope1Loader && mockScope1Loader.item != null; },
167+ true);
164
168
165 // Show the overview
169 // Show the overview
166 touchFlick(dash, dash.width / 2, dash.height - 1, dash.width / 2, dash.height - units.gu(18));
170 touchFlick(dash, dash.width / 2, dash.height - 1, dash.width / 2, dash.height - units.gu(18));
@@ -224,8 +228,10 @@ Item {
224 tryCompare(scopes, "loaded", true);
228 tryCompare(scopes, "loaded", true);
225 var dashContentList = findChild(dash, "dashContentList");
229 var dashContentList = findChild(dash, "dashContentList");
226 tryCompare(dashContentList, "count", 6);
230 tryCompare(dashContentList, "count", 6);
227− var mockScope1Loader = findChild(dash, "MockScope1 loader");
231+ tryCompareFunction(function() {
228− tryCompareFunction(function() { return mockScope1Loader.item != null; }, true);
232+ var mockScope1Loader = findChild(dash, "MockScope1 loader");
233+ return mockScope1Loader && mockScope1Loader.item != null; },
234+ true);
229
235
230 // Swipe right to Apps scope
236 // Swipe right to Apps scope
231 touchFlick(dash, dash.width - 1, units.gu(1), dash.width - units.gu(10), units.gu(1));
237 touchFlick(dash, dash.width - 1, units.gu(1), dash.width - units.gu(10), units.gu(1));
tests/qmltests/Greeter/tst_Lockscreen.qml+65−46
@@ -26,22 +26,21 @@ import Unity.Test 0.1 as UT
26Rectangle {
26Rectangle {
27 id: root
27 id: root
28 width: units.gu(80)
28 width: units.gu(80)
29− height: units.gu(80)
29+ height: units.gu(70)
30 color: "orange"
30 color: "orange"
31
31
32 Lockscreen {
32 Lockscreen {
33 id: lockscreen
33 id: lockscreen
34 anchors.fill: parent
34 anchors.fill: parent
35− anchors.rightMargin: units.gu(30)
35+ anchors.rightMargin: units.gu(40)
36− placeholderText: "Please enter your PIN"
36+ infoText: infoTextTextField.text
37− wrongPlaceholderText: "Incorrect PIN"
38 retryText: retryCountTextField.text
37 retryText: retryCountTextField.text
38+ errorText: errorTextTextField.text
39 alphaNumeric: pinPadCheckBox.checked
39 alphaNumeric: pinPadCheckBox.checked
40 minPinLength: minPinLengthTextField.text
40 minPinLength: minPinLengthTextField.text
41 maxPinLength: maxPinLengthTextField.text
41 maxPinLength: maxPinLengthTextField.text
42 username: "Lola"
42 username: "Lola"
43 background: "../../../qml/graphics/phone_background.jpg"
43 background: "../../../qml/graphics/phone_background.jpg"
44− infoText: infoTextTextField.text
45 }
44 }
46
45
47 Connections {
46 Connections {
@@ -68,7 +67,7 @@ Rectangle {
68 } else {
67 } else {
69 pinPadCheckBox.checked = true
68 pinPadCheckBox.checked = true
70 }
69 }
71− lockscreen.placeholderText = text;
70+ lockscreen.infoText = text;
72 }
71 }
73 }
72 }
74
73
@@ -157,7 +156,14 @@ Rectangle {
157 id: infoTextTextField
156 id: infoTextTextField
158 width: parent.width
157 width: parent.width
159 placeholderText: "Infotext"
158 placeholderText: "Infotext"
160− text: "+49 179 3253553"
159+ text: "Enter SIM1 PIN"
160+ }
161+
162+ TextField {
163+ id: errorTextTextField
164+ width: parent.width
165+ placeholderText: "Error text"
166+ text: "Sorry, incorrect PIN"
161 }
167 }
162
168
163 TextField {
169 TextField {
@@ -223,7 +229,7 @@ Rectangle {
223 emergencyCheckBox.checked = false
229 emergencyCheckBox.checked = false
224 pinPadCheckBox.checked = data.alphanumeric
230 pinPadCheckBox.checked = data.alphanumeric
225 waitForLockscreenReady();
231 waitForLockscreenReady();
226− var emergencyButton = findChild(lockscreen, "emergencyCallIcon")
232+ var emergencyButton = findChild(lockscreen, "emergencyCallLabel")
227 mouseClick(emergencyButton, units.gu(1), units.gu(1))
233 mouseClick(emergencyButton, units.gu(1), units.gu(1))
228 tryCompare(emergencyCheckBox, "checked", true)
234 tryCompare(emergencyCheckBox, "checked", true)
229
235
@@ -231,18 +237,20 @@ Rectangle {
231
237
232 function test_labels_data() {
238 function test_labels_data() {
233 return [
239 return [
234− {tag: "numeric", alphanumeric: false, placeholderText: "Please enter your PIN", username: "foobar" },
240+ {tag: "numeric", alphanumeric: false, infoText: "Please enter your PIN", username: "foobar" },
235− {tag: "alphanumeric", alphanumeric: true, placeholderText: "Please enter your password", username: "Lola" }
241+ {tag: "alphanumeric", alphanumeric: true, infoText: "Please enter your password", username: "Lola" }
236 ]
242 ]
237 }
243 }
238
244
239 function test_labels(data) {
245 function test_labels(data) {
240 pinPadCheckBox.checked = data.alphanumeric
246 pinPadCheckBox.checked = data.alphanumeric
241− lockscreen.placeholderText = data.placeholderText
247+ lockscreen.infoText = data.infoText
242 waitForLockscreenReady();
248 waitForLockscreenReady();
243− compare(findChild(lockscreen, "pinentryField").placeholderText, data.placeholderText, "Placeholdertext is not what it should be")
244 if (data.alphanumeric) {
249 if (data.alphanumeric) {
250+ compare(findChild(lockscreen, "pinentryField").placeholderText, data.infoText, "Placeholdertext is not what it should be")
245 compare(findChild(lockscreen, "greeterLabel").text, "Hello " + data.username, "Greeter is not set correctly")
251 compare(findChild(lockscreen, "greeterLabel").text, "Hello " + data.username, "Greeter is not set correctly")
252+ } else {
253+ compare(findChild(lockscreen, "infoTextLabel").text, data.infoText, "Placeholdertext is not what it should be")
246 }
254 }
247 }
255 }
248
256
@@ -276,10 +284,8 @@ Rectangle {
276 var button = findChild(lockscreen, "pinPadButton" + character)
284 var button = findChild(lockscreen, "pinPadButton" + character)
277 mouseClick(button, units.gu(1), units.gu(1))
285 mouseClick(button, units.gu(1), units.gu(1))
278 }
286 }
279− if (data.minPinLength !== data.maxPinLength || data.minPinLength == -1) {
287+ var confirmButton = findChild(lockscreen, "confirmButton");
280− var pinPadButtonErase = findChild(lockscreen, "pinPadButtonErase");
288+ mouseClick(confirmButton, units.gu(1), units.gu(1));
281− mouseClick(pinPadButtonErase, units.gu(1), units.gu(1));
282− }
283 }
289 }
284 tryCompare(enteredLabel, "text", data.password)
290 tryCompare(enteredLabel, "text", data.password)
285 }
291 }
@@ -317,11 +323,9 @@ Rectangle {
317 wait(0) // Trigger event loop to make sure the animation would start running
323 wait(0) // Trigger event loop to make sure the animation would start running
318 compare(animation.running, data.animation)
324 compare(animation.running, data.animation)
319 if (data.animation) {
325 if (data.animation) {
320− if (data.alphanumeric) {
326+ if (!data.alphanumeric) {
321− tryCompare(inputField, "placeholderText", lockscreen.wrongPlaceholderText)
327+ var label = findChild(lockscreen, "wrongNoticeLabel");
322− } else {
328+ tryCompare(label, "visible", true)
323− var label = findChild(lockscreen, "pinentryFieldPlaceHolder");
324− tryCompare(label, "text", lockscreen.wrongPlaceholderText)
325 }
329 }
326 }
330 }
327
331
@@ -343,24 +347,21 @@ Rectangle {
343 maxPinLengthTextField.text = data.maxPinLength
347 maxPinLengthTextField.text = data.maxPinLength
344 waitForLockscreenReady();
348 waitForLockscreenReady();
345
349
346− var pinPadButtonErase = findChild(lockscreen, "pinPadButtonErase");
347 var backspaceIcon = findChild(lockscreen, "backspaceIcon");
350 var backspaceIcon = findChild(lockscreen, "backspaceIcon");
348 var pinEntryField = findChild(lockscreen, "pinentryField");
351 var pinEntryField = findChild(lockscreen, "pinentryField");
349
352
350− var autoConfirmEnabled = data.minPinLength === data.maxPinLength && data.minPinLength !== -1;
353+ compare(backspaceIcon.opacity, 0);
351− compare(pinPadButtonErase.iconName, autoConfirmEnabled ? "erase" : "");
352− compare(backspaceIcon.visible, !autoConfirmEnabled);
353
354
354 var pinPadButton5 = findChild(lockscreen, "pinPadButton5");
355 var pinPadButton5 = findChild(lockscreen, "pinPadButton5");
355 mouseClick(pinPadButton5, units.gu(1), units.gu(1));
356 mouseClick(pinPadButton5, units.gu(1), units.gu(1));
356 compare(pinEntryField.text, "5");
357 compare(pinEntryField.text, "5");
357
358
358− if (data.minPinLength !== data.maxPinLength) {
359+ tryCompare(backspaceIcon, "opacity", 1);
359− mouseClick(backspaceIcon, units.gu(1), units.gu(1));
360+
360− } else {
361+ mouseClick(backspaceIcon, units.gu(1), units.gu(1));
361− mouseClick(pinPadButtonErase, units.gu(1), units.gu(1));
362− }
363 compare(pinEntryField.text, "");
362 compare(pinEntryField.text, "");
363+
364+ tryCompare(backspaceIcon, "opacity", 0);
364 }
365 }
365
366
366 function test_minMaxLength_data() {
367 function test_minMaxLength_data() {
@@ -373,37 +374,55 @@ Rectangle {
373
374
374 function test_minMaxLength(data) {
375 function test_minMaxLength(data) {
375 pinPadCheckBox.checked = false
376 pinPadCheckBox.checked = false
376− minPinLengthTextField.text = data.minPinLength
377+ minPinLengthTextField.text = data.minPinLength;
377− maxPinLengthTextField.text = data.maxPinLength
378+ maxPinLengthTextField.text = data.maxPinLength;
378 waitForLockscreenReady();
379 waitForLockscreenReady();
379
380
380 var pinPadButton5 = findChild(lockscreen, "pinPadButton5");
381 var pinPadButton5 = findChild(lockscreen, "pinPadButton5");
381− var pinPadButtonErase = findChild(lockscreen, "pinPadButtonErase");
382+ var backspaceButton = findChild(lockscreen, "backspaceIcon");
382− var inputField = findChild(lockscreen, "pinentryField")
383+ var confirmButton = findChild(lockscreen, "confirmButton");
384+ var inputField = findChild(lockscreen, "pinentryField");
385+
386+ tryCompare(backspaceButton, "opacity", 0);
387+
388+ tryCompare(confirmButton, "visible", (data.minPinLength != data.maxPinLength) || (data.minPinLength == -1));
383
389
384 for (var i = 0; i < 10; i++) {
390 for (var i = 0; i < 10; i++) {
385 mouseClick(pinPadButton5, units.gu(1), units.gu(1));
391 mouseClick(pinPadButton5, units.gu(1), units.gu(1));
392+ tryCompare(backspaceButton, "opacity", 1)
386
393
387− if (data.minPinLength == data.maxPinLength && data.minPinLength != -1) {
394+ if (data.maxPinLength == data.minPinLength && data.minPinLength > 0) {
388− // auto confirm mode...
395+ // Autoconfirm mode. This will automatically confirm (and with it reset)
389− compare(inputField.text.length, (i+1) % data.minPinLength);
396+ // the textfield every data.minPinLength presses
397+ if (i+1 < data.minPinLength) {
398+ compare(inputField.text.length, i + 1);
399+ } else {
400+ compare(inputField.text.length, (i+1) % data.minPinLength)
401+ }
390 } else {
402 } else {
391− // manual confirm mode
392− tryCompare(pinPadButtonErase, "enabled", (i+1) >= data.minPinLength)
393 if (data.maxPinLength == -1) {
403 if (data.maxPinLength == -1) {
404+ // Undefined maxLength... make sure all presses are recorded
394 compare(inputField.text.length, i+1);
405 compare(inputField.text.length, i+1);
395 } else {
406 } else {
407+ // We have a max length. Make sure we're only accepting maxLength presses
396 compare(inputField.text.length, Math.min(data.maxPinLength, i+1));
408 compare(inputField.text.length, Math.min(data.maxPinLength, i+1));
397 }
409 }
398
410
411+ if (data.minPinLength == -1) {
412+ // Undefined minLength. Make sure confirm button is always enabled
413+ compare(confirmButton.enabled, true);
414+ } else {
415+ // We have a min length. Make sure the confirm button is only enabled when met.
416+ compare(confirmButton.enabled, (i+1) >= data.minPinLength);
417+ }
399 }
418 }
400 }
419 }
401 }
420 }
402
421
403 function test_retryDisplay_data() {
422 function test_retryDisplay_data() {
404 return [
423 return [
405− {tag: "empty", retryText: "", shown: false},
424+ {tag: "empty", retryText: " "},
406− {tag: "3 retries left", retryText: "3 retries left", shown: true},
425+ {tag: "3 retries left", retryText: "3 retries left"},
407 ]
426 ]
408 }
427 }
409
428
@@ -412,8 +431,8 @@ Rectangle {
412 waitForLockscreenReady();
431 waitForLockscreenReady();
413
432
414 retryCountTextField.text = data.retryText;
433 retryCountTextField.text = data.retryText;
415− var label = findChild(lockscreen, "retryCountLabel")
434+ var label = findChild(lockscreen, "retryLabel")
416− compare(label.visible, data.shown);
435+ compare(label.text, data.retryText);
417 }
436 }
418
437
419 function test_infoPopup() {
438 function test_infoPopup() {
@@ -438,8 +457,8 @@ Rectangle {
438
457
439 function test_infoTextDisplay_data() {
458 function test_infoTextDisplay_data() {
440 return [
459 return [
441− {tag: "empty string", text: "", shown: false},
460+ {tag: "empty string", text: ""},
442− {tag: "hello world", text: "hello world", shown: true},
461+ {tag: "hello world", text: "hello world"},
443 ]
462 ]
444 }
463 }
445
464
@@ -449,7 +468,7 @@ Rectangle {
449
468
450 infoTextTextField.text = data.text;
469 infoTextTextField.text = data.text;
451 var label = findChild(lockscreen, "infoTextLabel")
470 var label = findChild(lockscreen, "infoTextLabel")
452− compare(label.visible, data.shown);
471+ compare(label.text, data.text);
453 }
472 }
454 }
473 }
455
474
tests/qmltests/Panel/Indicators/tst_CachedUnityMenuModel.qmlnew file+137
@@ -0,0 +1,137 @@
1+/*
2+ * Copyright 2014 Canonical Ltd.
3+ *
4+ * This program is free software; you can redistribute it and/or modify
5+ * it under the terms of the GNU General Public License as published by
6+ * the Free Software Foundation; version 3.
7+ *
8+ * This program is distributed in the hope that it will be useful,
9+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
10+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11+ * GNU General Public License for more details.
12+ *
13+ * You should have received a copy of the GNU General Public License
14+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
15+ */
16+
17+import QtQuick 2.0
18+import QtTest 1.0
19+import Unity.Test 0.1 as UT
20+import QMenuModel 0.1
21+import Unity.Indicators 0.1 as Indicators
22+import "../../../../qml/Panel/Indicators"
23+
24+Item {
25+ id: root
26+ width: units.gu(40)
27+ height: units.gu(70)
28+
29+ Component {
30+ id: model
31+ CachedUnityMenuModel {}
32+ }
33+
34+ UT.UnityTestCase {
35+ name: "CachedUnityMenuModel"
36+ when: windowShown
37+
38+ function cleanup() {
39+ doGC();
40+ }
41+
42+ function doGC() {
43+ // need to put some wait cycles here to get gc going properly.
44+ wait(10);
45+ gc();
46+ wait(10);
47+ }
48+
49+ function test_createDifferent() {
50+ var cachedObject = model.createObject(null,
51+ {
52+ "busName": "com.canonical.test1",
53+ "menuObjectPath": "/com/canonical/test1",
54+ "actionsObjectPath": "/com/canonical/test1"
55+ });
56+
57+ var cachedObject2 = model.createObject(null,
58+ {
59+ "busName": "com.canonical.test2",
60+ "menuObjectPath": "/com/canonical/test2",
61+ "actionsObjectPath": "/com/canonical/test2"
62+ });
63+
64+ verify(cachedObject.model !== cachedObject2.model);
65+ }
66+
67+ function test_createSame() {
68+ var cachedObject = model.createObject(null,
69+ {
70+ "busName": "com.canonical.test3",
71+ "menuObjectPath": "/com/canonical/test3",
72+ "actionsObjectPath": "/com/canonical/test3"
73+ });
74+
75+ var cachedObject2 = model.createObject(null,
76+ {
77+ "busName": "com.canonical.test3",
78+ "menuObjectPath": "/com/canonical/test3",
79+ "actionsObjectPath": "/com/canonical/test3"
80+ });
81+
82+ verify(cachedObject.model === cachedObject2.model);
83+ }
84+
85+ // Tests that changing cached model data does not change the model path of others
86+ function test_lp1328646() {
87+ var cachedObject = model.createObject(null,
88+ {
89+ "busName": "com.canonical.test4",
90+ "menuObjectPath": "/com/canonical/test4",
91+ "actionsObjectPath": "/com/canonical/test4"
92+ });
93+
94+ var cachedObject2 = model.createObject(null,
95+ {
96+ "busName": "com.canonical.test4",
97+ "menuObjectPath": "/com/canonical/test4",
98+ "actionsObjectPath": "/com/canonical/test4"
99+ });
100+
101+ cachedObject.menuObjectPath = "/com/canonical/test5";
102+ compare(cachedObject.model.menuObjectPath, "/com/canonical/test5");
103+ compare(cachedObject2.model.menuObjectPath, "/com/canonical/test4");
104+
105+ verify(cachedObject.model !== cachedObject2.model);
106+ }
107+
108+ function createAndDestroy(test) {
109+ var cachedObject = model.createObject(null,
110+ {
111+ "busName": "com.canonical."+test,
112+ "menuObjectPath": "/com/canonical/"+test,
113+ "actionsObjectPath": "/com/canonical/"+test
114+ });
115+ var cachedObject2 = model.createObject(null,
116+ {
117+ "busName": "com.canonical."+test,
118+ "menuObjectPath": "/com/canonical/"+test,
119+ "actionsObjectPath": "/com/canonical/"+test
120+ });
121+ cachedObject.destroy();
122+ return cachedObject2;
123+ }
124+
125+ function test_destroyAllDeletesModel() {
126+ createAndDestroy("test6");
127+ doGC();
128+ compare(Indicators.UnityMenuModelCache.contains("/com/canonical/test6"), false);
129+ }
130+
131+ function test_destroyPartialKeepsModel() {
132+ var model = createAndDestroy("test7");
133+ doGC();
134+ compare(Indicators.UnityMenuModelCache.contains("/com/canonical/test7"), true);
135+ }
136+ }
137+}
tests/qmltests/Stages/tst_ApplicationWindow.qmlnew file+346
@@ -0,0 +1,346 @@
1+/*
2+ * Copyright 2014 Canonical Ltd.
3+ *
4+ * This program is free software; you can redistribute it and/or modify
5+ * it under the terms of the GNU General Public License as published by
6+ * the Free Software Foundation; version 3.
7+ *
8+ * This program is distributed in the hope that it will be useful,
9+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
10+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11+ * GNU General Public License for more details.
12+ *
13+ * You should have received a copy of the GNU General Public License
14+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
15+ */
16+
17+import QtQuick 2.0
18+import QtTest 1.0
19+import Unity.Test 0.1 as UT
20+import ".."
21+import "../../../qml/Stages"
22+import Ubuntu.Components 0.1
23+import Ubuntu.Components.ListItems 1.0 as ListItem
24+import Unity.Application 0.1
25+
26+Rectangle {
27+ color: "red"
28+ id: root
29+ width: units.gu(70)
30+ height: units.gu(70)
31+
32+ Component.onCompleted: {
33+ root.fakeApplication = ApplicationManager.add("gallery-app");
34+ root.fakeApplication.manualSurfaceCreation = true;
35+ root.fakeApplication.setState(ApplicationInfo.Starting);
36+ }
37+ property QtObject fakeApplication: null
38+
39+ Connections {
40+ target: fakeApplication
41+ onSurfaceChanged: {
42+ surfaceCheckbox.checked = fakeApplication.surface !== null;
43+ }
44+ }
45+
46+ Component {
47+ id: applicationWindowComponent
48+ ApplicationWindow {
49+ anchors.fill: parent
50+ application: fakeApplication
51+ }
52+ }
53+ Loader {
54+ id: applicationWindowLoader
55+ anchors {
56+ top: parent.top
57+ bottom: parent.bottom
58+ left: parent.left
59+ }
60+ width: units.gu(40)
61+ sourceComponent: applicationWindowComponent
62+ }
63+
64+ Rectangle {
65+ color: "white"
66+ anchors {
67+ top: parent.top
68+ bottom: parent.bottom
69+ left: applicationWindowLoader.right
70+ right: parent.right
71+ }
72+
73+ Column {
74+ anchors { left: parent.left; right: parent.right; top: parent.top; margins: units.gu(1) }
75+ spacing: units.gu(1)
76+ Row {
77+ anchors { left: parent.left; right: parent.right }
78+ CheckBox {
79+ id: surfaceCheckbox; checked: false
80+ onCheckedChanged: {
81+ if (applicationWindowLoader.status !== Loader.Ready)
82+ return;
83+
84+ if (checked && !fakeApplication.surface) {
85+ fakeApplication.createSurface();
86+ } else if (!checked && fakeApplication.surface) {
87+ fakeApplication.surface.release();
88+ }
89+ }
90+ }
91+ Label { text: "Surface" }
92+ }
93+ ListItem.ItemSelector {
94+ id: appStateSelector
95+ anchors { left: parent.left; right: parent.right }
96+ text: "Application state"
97+ model: ["Starting",
98+ "Running",
99+ "Suspended",
100+ "Stopped"]
101+ property int selectedApplicationState: {
102+ if (model[selectedIndex] === "Starting") {
103+ return ApplicationInfo.Starting;
104+ } else if (model[selectedIndex] === "Running") {
105+ return ApplicationInfo.Running;
106+ } else if (model[selectedIndex] === "Suspended") {
107+ return ApplicationInfo.Suspended;
108+ } else {
109+ return ApplicationInfo.Stopped;
110+ }
111+ }
112+ onSelectedApplicationStateChanged: {
113+ // state is a read-only property, thus we have to call the setter function
114+ fakeApplication.setState(selectedApplicationState);
115+ }
116+ }
117+ }
118+ }
119+
120+ UT.UnityTestCase {
121+ id: testCase
122+ name: "ApplicationWindow"
123+ when: windowShown
124+
125+ // just to make them shorter
126+ property int appStarting: ApplicationInfo.Starting
127+ property int appRunning: ApplicationInfo.Running
128+ property int appSuspended: ApplicationInfo.Suspended
129+ property int appStopped: ApplicationInfo.Stopped
130+
131+ function setApplicationState(appState) {
132+ switch (appState) {
133+ case appStarting:
134+ appStateSelector.selectedIndex = 0;
135+ break;
136+ case appRunning:
137+ appStateSelector.selectedIndex = 1;
138+ break;
139+ case appSuspended:
140+ appStateSelector.selectedIndex = 2;
141+ break;
142+ case appStopped:
143+ appStateSelector.selectedIndex = 3;
144+ break;
145+ }
146+ }
147+
148+ // holds some of the internal ApplicationWindow objects we probe during the tests
149+ property var stateGroup: null
150+
151+ function findInterestingApplicationWindowChildren() {
152+ stateGroup = findInvisibleChild(applicationWindowLoader.item, "applicationWindowStateGroup");
153+ verify(stateGroup);
154+ }
155+
156+ function forgetApplicationWindowChildren() {
157+ stateGroup = null;
158+ }
159+
160+ // wait until any transition animation has finished
161+ function waitUntilTransitionsEnd() {
162+ var transitions = stateGroup.transitions;
163+ for (var i = 0; i < transitions.length; ++i) {
164+ var transition = transitions[i];
165+ tryCompare(transition, "running", false, 2000);
166+ }
167+ }
168+
169+ function init() {
170+ findInterestingApplicationWindowChildren();
171+ }
172+
173+ function cleanup() {
174+ forgetApplicationWindowChildren();
175+
176+ // reload our test subject to get it in a fresh state once again
177+ applicationWindowLoader.active = false;
178+
179+ appStateSelector.selectedIndex = 0;
180+ surfaceCheckbox.checked = false;
181+
182+ if (fakeApplication.surface)
183+ fakeApplication.surface.release();
184+
185+ applicationWindowLoader.active = true;
186+ }
187+
188+ function test_showSplashUntilAppFullyInit_data() {
189+ return [
190+ {tag: "state=Running then create surface", swapInitOrder: false},
191+
192+ {tag: "create surface then state=Running", swapInitOrder: true},
193+ ]
194+ }
195+
196+ function test_showSplashUntilAppFullyInit() {
197+ verify(stateGroup.state === "splashScreen");
198+
199+ if (data.swapInitOrder) {
200+ surfaceCheckbox.checked = true;
201+ } else {
202+ setApplicationState(appRunning);
203+ }
204+
205+ verify(stateGroup.state === "splashScreen");
206+
207+ if (data.swapInitOrder) {
208+ setApplicationState(appRunning);
209+ } else {
210+ surfaceCheckbox.checked = true;
211+ }
212+
213+ tryCompare(stateGroup, "state", "surface");
214+ }
215+
216+ function test_suspendedAppShowsSurface() {
217+ surfaceCheckbox.checked = true;
218+ setApplicationState(appRunning);
219+
220+ tryCompare(stateGroup, "state", "surface");
221+
222+ waitUntilTransitionsEnd();
223+
224+ setApplicationState(appSuspended);
225+
226+ verify(stateGroup.state === "surface");
227+ waitUntilTransitionsEnd();
228+ }
229+
230+ function test_killedAppShowsScreenshot() {
231+ surfaceCheckbox.checked = true;
232+ setApplicationState(appRunning);
233+ tryCompare(stateGroup, "state", "surface");
234+
235+ setApplicationState(appSuspended);
236+
237+ verify(stateGroup.state === "surface");
238+ verify(fakeApplication.surface !== null);
239+
240+ // kill it!
241+ setApplicationState(appStopped);
242+
243+ tryCompare(stateGroup, "state", "screenshot");
244+ tryCompare(fakeApplication, "surface", null);
245+ }
246+
247+ function test_restartApp() {
248+ var screenshotImage = findChild(applicationWindowLoader.item, "screenshotImage");
249+
250+ surfaceCheckbox.checked = true;
251+ setApplicationState(appRunning);
252+ tryCompare(stateGroup, "state", "surface");
253+ waitUntilTransitionsEnd();
254+
255+ setApplicationState(appSuspended);
256+
257+ // kill it
258+ setApplicationState(appStopped);
259+
260+ tryCompare(stateGroup, "state", "screenshot");
261+ waitUntilTransitionsEnd();
262+ tryCompare(fakeApplication, "surface", null);
263+
264+ // and restart it
265+ setApplicationState(appStarting);
266+
267+ waitUntilTransitionsEnd();
268+ verify(stateGroup.state === "screenshot");
269+ verify(fakeApplication.surface === null);
270+
271+ setApplicationState(appRunning);
272+
273+ waitUntilTransitionsEnd();
274+ verify(stateGroup.state === "screenshot");
275+
276+ surfaceCheckbox.checked = true;
277+
278+ tryCompare(stateGroup, "state", "surface");
279+ tryCompare(screenshotImage, "status", Image.Null);
280+ }
281+
282+ function test_appCrashed() {
283+ surfaceCheckbox.checked = true;
284+ setApplicationState(appRunning);
285+ tryCompare(stateGroup, "state", "surface");
286+ waitUntilTransitionsEnd();
287+
288+ // oh, it crashed...
289+ setApplicationState(appStopped);
290+
291+ tryCompare(stateGroup, "state", "screenshot");
292+ tryCompare(fakeApplication, "surface", null);
293+ }
294+
295+ function test_keepSurfaceWhileInvisible() {
296+ surfaceCheckbox.checked = true;
297+ setApplicationState(appRunning);
298+ tryCompare(stateGroup, "state", "surface");
299+ waitUntilTransitionsEnd();
300+ verify(fakeApplication.surface !== null);
301+
302+ applicationWindowLoader.item.visible = false;
303+
304+ waitUntilTransitionsEnd();
305+ verify(stateGroup.state === "surface");
306+ verify(fakeApplication.surface !== null);
307+
308+ applicationWindowLoader.item.visible = true;
309+
310+ waitUntilTransitionsEnd();
311+ verify(stateGroup.state === "surface");
312+ verify(fakeApplication.surface !== null);
313+ }
314+
315+ function test_touchesReachSurfaceWhenItsShown() {
316+ setApplicationState(appRunning);
317+ surfaceCheckbox.checked = true;
318+
319+ tryCompare(stateGroup, "state", "surface");
320+
321+ waitUntilTransitionsEnd();
322+
323+ // Because doing stuff in C++ is a PITA we keep the counter in the interal qml impl.
324+ var fakeSurface = findChild(fakeApplication.surface, "fakeSurfaceQML");
325+ fakeSurface.touchPressCount = 0;
326+ fakeSurface.touchReleaseCount = 0;
327+
328+ tap(applicationWindowLoader.item,
329+ applicationWindowLoader.item.width / 2, applicationWindowLoader.item.height / 2);
330+
331+ verify(fakeSurface.touchPressCount === 1);
332+ verify(fakeSurface.touchReleaseCount === 1);
333+ }
334+
335+ function test_showNothingOnSuddenSurfaceLoss() {
336+ surfaceCheckbox.checked = true;
337+ setApplicationState(appRunning);
338+ tryCompare(stateGroup, "state", "surface");
339+ waitUntilTransitionsEnd();
340+
341+ surfaceCheckbox.checked = false;
342+
343+ verify(stateGroup.state === "void");
344+ }
345+ }
346+}
tests/qmltests/Stages/tst_PhoneStage.qml+34−8
@@ -26,14 +26,11 @@ Item {
26 width: units.gu(70)
26 width: units.gu(70)
27 height: units.gu(70)
27 height: units.gu(70)
28
28
29− Rectangle {
30−
31− }
32−
33 PhoneStage {
29 PhoneStage {
34 id: phoneStage
30 id: phoneStage
35 anchors { fill: parent; rightMargin: units.gu(30) }
31 anchors { fill: parent; rightMargin: units.gu(30) }
36 dragAreaWidth: units.gu(2)
32 dragAreaWidth: units.gu(2)
33+ maximizedAppTopMargin: units.gu(3) + units.dp(2)
37 }
34 }
38
35
39 Binding {
36 Binding {
@@ -46,6 +43,7 @@ Item {
46 anchors { fill: parent; leftMargin: phoneStage.width }
43 anchors { fill: parent; leftMargin: phoneStage.width }
47
44
48 Column {
45 Column {
46+ id: buttons
49 anchors { left: parent.left; right: parent.right; top: parent.top; margins: units.gu(1) }
47 anchors { left: parent.left; right: parent.right; top: parent.top; margins: units.gu(1) }
50 spacing: units.gu(1)
48 spacing: units.gu(1)
51 Button {
49 Button {
@@ -57,9 +55,33 @@ Item {
57 }
55 }
58 Button {
56 Button {
59 anchors { left: parent.left; right: parent.right }
57 anchors { left: parent.left; right: parent.right }
60− text: "Remove App"
58+ text: "Remove Selected"
61 onClicked: {
59 onClicked: {
62− ApplicationManager.stopApplication(ApplicationManager.get(0).appId)
60+ ApplicationManager.stopApplication(ApplicationManager.get(appList.selectedAppIndex).appId);
61+ }
62+ }
63+ Button {
64+ anchors { left: parent.left; right: parent.right }
65+ text: "Stop Selected"
66+ onClicked: {
67+ ApplicationManager.get(appList.selectedAppIndex).setState(ApplicationInfo.Stopped);
68+ }
69+ }
70+ }
71+ ListView {
72+ id: appList
73+ property int selectedAppIndex
74+ anchors { left: parent.left; right: parent.right; top: buttons.bottom; bottom: parent.bottom }
75+ boundsBehavior: Flickable.StopAtBounds
76+ model: ApplicationManager
77+ delegate: Rectangle {
78+ anchors { left: parent.left; right: parent.right }
79+ height: units.gu(2)
80+ color: appList.selectedAppIndex === model.index ? "red" : "white"
81+ Text { anchors.fill: parent; text: model.appId }
82+ MouseArea {
83+ anchors.fill: parent
84+ onPressed: { appList.selectedAppIndex = model.index; }
63 }
85 }
64 }
86 }
65 }
87 }
@@ -84,7 +106,9 @@ Item {
84 function goToSpread() {
106 function goToSpread() {
85 var spreadView = findChild(phoneStage, "spreadView");
107 var spreadView = findChild(phoneStage, "spreadView");
86
108
87− var startX = phoneStage.width;
109+ // Keep it inside the PhoneStage otherwise the controls on the right side will
110+ // capture the press thus the "- 2" on startX.
111+ var startX = phoneStage.width - 2;
88 var startY = phoneStage.height / 2;
112 var startY = phoneStage.height / 2;
89 var endY = startY;
113 var endY = startY;
90 var endX = units.gu(2);
114 var endX = units.gu(2);
@@ -132,7 +156,9 @@ Item {
132
156
133 var spreadView = findChild(phoneStage, "spreadView");
157 var spreadView = findChild(phoneStage, "spreadView");
134
158
135− var startX = phoneStage.width;
159+ // Keep it inside the PhoneStage otherwise the controls on the right side will
160+ // capture the press thus the "- 2" on startX.
161+ var startX = phoneStage.width - 2;
136 var startY = phoneStage.height / 2;
162 var startY = phoneStage.height / 2;
137 var endY = startY;
163 var endY = startY;
138 var endX = spreadView.width - (spreadView.width * spreadView[data.positionMarker]) - data.offset;
164 var endX = spreadView.width - (spreadView.width * spreadView[data.positionMarker]) - data.offset;
tests/qmltests/Stages/tst_SpreadDelegate.qmlnew file+167
@@ -0,0 +1,167 @@
1+/*
2+ * Copyright 2014 Canonical Ltd.
3+ *
4+ * This program is free software; you can redistribute it and/or modify
5+ * it under the terms of the GNU General Public License as published by
6+ * the Free Software Foundation; version 3.
7+ *
8+ * This program is distributed in the hope that it will be useful,
9+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
10+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11+ * GNU General Public License for more details.
12+ *
13+ * You should have received a copy of the GNU General Public License
14+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
15+ */
16+
17+import QtQuick 2.0
18+import QtTest 1.0
19+import Unity.Test 0.1 as UT
20+import ".."
21+import "../../../qml/Stages"
22+import Ubuntu.Components 0.1
23+import Ubuntu.Components.ListItems 1.0 as ListItem
24+import Unity.Application 0.1
25+
26+Rectangle {
27+ color: "red"
28+ id: root
29+ width: units.gu(70)
30+ height: units.gu(70)
31+
32+ Component.onCompleted: {
33+ root.fakeApplication = ApplicationManager.startApplication("gallery-app");
34+ }
35+ property QtObject fakeApplication: null
36+
37+ Component {
38+ id: spreadDelegateComponent
39+ SpreadDelegate {
40+ anchors.fill: parent
41+ swipeToCloseEnabled: swipeToCloseCheckbox.checked
42+ closeable: closeableCheckbox.checked
43+ application: fakeApplication
44+ }
45+ }
46+ Loader {
47+ id: spreadDelegateLoader
48+ anchors {
49+ top: parent.top
50+ bottom: parent.bottom
51+ left: parent.left
52+ }
53+ width: units.gu(40)
54+ sourceComponent: spreadDelegateComponent
55+ }
56+
57+ Rectangle {
58+ color: "white"
59+ anchors {
60+ top: parent.top
61+ bottom: parent.bottom
62+ left: spreadDelegateLoader.right
63+ right: parent.right
64+ }
65+
66+ Column {
67+ anchors { left: parent.left; right: parent.right; top: parent.top; margins: units.gu(1) }
68+ spacing: units.gu(1)
69+ Row {
70+ anchors { left: parent.left; right: parent.right }
71+ CheckBox { id: swipeToCloseCheckbox; checked: false; }
72+ Label { text: "swipeToCloseEnabled" }
73+ }
74+ Row {
75+ anchors { left: parent.left; right: parent.right }
76+ CheckBox { id: closeableCheckbox; checked: false }
77+ Label { text: "closeable" }
78+ }
79+ }
80+ }
81+
82+ UT.UnityTestCase {
83+ id: testCase
84+ name: "SpreadDelegate"
85+ when: windowShown
86+
87+ SignalSpy {
88+ id: spyClosedSignal
89+ target: spreadDelegateLoader.item
90+ signalName: "closed"
91+ }
92+
93+ property var dragArea
94+
95+ function init() {
96+ dragArea = findInvisibleChild(spreadDelegateLoader.item, "dragArea");
97+ dragArea.__dateTime = fakeDateTime;
98+ }
99+
100+ function cleanup() {
101+ // reload our test subject to get it in a fresh state once again
102+ spreadDelegateLoader.active = false;
103+ spreadDelegateLoader.active = true;
104+
105+ spyClosedSignal.clear();
106+ }
107+
108+ function test_swipeToClose_data() {
109+ return [
110+ {tag: "swipeToClose=true closeable=true -> appWindow moves away",
111+ swipeToClose: true, closeable: true },
112+
113+ {tag: "swipeToClose=true closeable=alse -> appWindow bounces back",
114+ swipeToClose: true, closeable: false },
115+
116+ {tag: "swipeToClose=false -> appWindow stays put",
117+ swipeToClose: false, closeable: true },
118+ ]
119+ }
120+
121+ function test_swipeToClose(data) {
122+ var appWindowWithShadow = findChild(spreadDelegateLoader.item, "appWindowWithShadow");
123+
124+ verify(appWindowWithShadow.y === 0);
125+
126+ swipeToCloseCheckbox.checked = data.swipeToClose;
127+ closeableCheckbox.checked = data.closeable;
128+
129+ var dragDistance = spreadDelegateLoader.item.height / 2;
130+ var touchX = spreadDelegateLoader.item.width / 2;
131+ var fromY = spreadDelegateLoader.item.height / 2;
132+ var toY = fromY - dragDistance;
133+ touchFlick(spreadDelegateLoader.item,
134+ touchX /* fromX */, fromY, touchX /* toX */, toY,
135+ true /* beginTouch */, false /* endTouch */, dragArea.minSpeedToClose * 1.1 /* speed */);
136+
137+
138+ if (data.swipeToClose) {
139+ verify(appWindowWithShadow.y < 0);
140+ verify(Math.abs(Math.abs(appWindowWithShadow.y) - dragDistance) < units.gu(1));
141+
142+ touchRelease(spreadDelegateLoader.item, touchX, toY - units.gu(1));
143+
144+ waitForCloseAnimationToFinish();
145+
146+ if (data.closeable) {
147+ verify(spyClosedSignal.count === 1);
148+ } else {
149+ verify(spyClosedSignal.count === 0);
150+ tryCompare(appWindowWithShadow, "y", 0);
151+ }
152+
153+ } else {
154+ verify(appWindowWithShadow.y === 0);
155+
156+ touchRelease(spreadDelegateLoader.item, touchX, toY);
157+ }
158+ }
159+
160+ function waitForCloseAnimationToFinish() {
161+ var closeAnimation = findInvisibleChild(spreadDelegateLoader.item, "closeAnimation");
162+ wait(closeAnimation.duration * 1.5);
163+ tryCompare(closeAnimation, "running", false);
164+ }
165+
166+ }
167+}
tests/qmltests/Stages/tst_SurfaceContainer.qmlnew file+154
@@ -0,0 +1,154 @@
1+/*
2+ * Copyright 2014 Canonical Ltd.
3+ *
4+ * This program is free software; you can redistribute it and/or modify
5+ * it under the terms of the GNU General Public License as published by
6+ * the Free Software Foundation; version 3.
7+ *
8+ * This program is distributed in the hope that it will be useful,
9+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
10+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11+ * GNU General Public License for more details.
12+ *
13+ * You should have received a copy of the GNU General Public License
14+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
15+ */
16+
17+import QtQuick 2.0
18+import QtTest 1.0
19+import Unity.Test 0.1 as UT
20+import ".."
21+import "../../../qml/Stages"
22+import Ubuntu.Components 0.1
23+import Unity.Application 0.1
24+
25+Rectangle {
26+ color: "black"
27+ id: root
28+ width: units.gu(70)
29+ height: units.gu(70)
30+
31+ Component {
32+ id: fakeSurfaceComponent
33+ Rectangle {
34+ color: "green"
35+
36+ Rectangle {
37+ color: "blue"
38+ anchors.fill: parent
39+ anchors.margins: units.gu(2)
40+ Text {
41+ anchors.fill: parent
42+ text: "Surface"
43+ color: "green"
44+ font.bold: true
45+ fontSizeMode: Text.Fit
46+ minimumPixelSize: 10; font.pixelSize: 200
47+ verticalAlignment: Text.AlignVCenter
48+ }
49+ }
50+
51+ width: units.gu(1)
52+ height: units.gu(1)
53+
54+ property int type: MirSurfaceItem.Normal
55+ property int state: MirSurfaceItem.Restored
56+ property string name: "Fake Surface"
57+ property Item parentSurface: null
58+ property list<Item> childSurfaces
59+ function release() {}
60+ signal removed();
61+ }
62+ }
63+
64+ Item {
65+ id: tempSurfaceHolder
66+ }
67+
68+ Component {
69+ id: surfaceContainerComponent
70+ SurfaceContainer {
71+ anchors.fill: parent
72+ }
73+ }
74+ Loader {
75+ id: surfaceContainerLoader
76+ anchors {
77+ top: parent.top
78+ topMargin: fullscreenCheckbox.checked ? 0 : units.gu(3) + units.dp(2)
79+ bottom: parent.bottom
80+ left: parent.left
81+ }
82+ width: units.gu(40)
83+ sourceComponent: surfaceContainerComponent
84+ }
85+
86+ Rectangle {
87+ color: "white"
88+ anchors {
89+ top: parent.top
90+ bottom: parent.bottom
91+ left: surfaceContainerLoader.right
92+ right: parent.right
93+ }
94+
95+ Column {
96+ anchors { left: parent.left; right: parent.right; top: parent.top; margins: units.gu(1) }
97+ spacing: units.gu(1)
98+ Row {
99+ anchors { left: parent.left; right: parent.right }
100+ CheckBox {
101+ id: surfaceCheckbox; checked: false;
102+ onCheckedChanged: {
103+ if (surfaceContainerLoader.status !== Loader.Ready)
104+ return;
105+
106+ if (checked) {
107+ var fakeSurface = fakeSurfaceComponent.createObject(tempSurfaceHolder);
108+ surfaceContainerLoader.item.surface = fakeSurface;
109+ } else {
110+ var fakeSurface = surfaceContainerLoader.item.surface;
111+ surfaceContainerLoader.item.surface = null;
112+ fakeSurface.parent = null;
113+ fakeSurface.destroy();
114+ }
115+ }
116+ }
117+ Label { text: "surface" }
118+ }
119+ Row {
120+ anchors { left: parent.left; right: parent.right }
121+ CheckBox {id: fullscreenCheckbox; checked: true; }
122+ Label { text: "fullscreen" }
123+ }
124+ }
125+ }
126+
127+ UT.UnityTestCase {
128+ id: testCase
129+ name: "SurfaceContainer"
130+ when: windowShown
131+
132+ function cleanup() {
133+ // reload our test subject to get it in a fresh state once again
134+ surfaceContainerLoader.active = false;
135+ surfaceCheckbox.checked = false;
136+ surfaceContainerLoader.active = true;
137+ }
138+
139+ /*
140+ Add a first surface. Then remove it. Then add a second surface.
141+ That second surface should be properly sized.
142+
143+ Regression test for https://bugs.launchpad.net/ubuntu/+source/qtmir/+bug/1359819
144+ */
145+ function test_resetSurfaceGetsProperlySized() {
146+ surfaceCheckbox.checked = true;
147+ surfaceCheckbox.checked = false;
148+ surfaceCheckbox.checked = true;
149+ var fakeSurface = surfaceContainerLoader.item.surface;
150+ compare(fakeSurface.width, surfaceContainerLoader.item.width);
151+ compare(fakeSurface.height, surfaceContainerLoader.item.height);
152+ }
153+ }
154+}
tests/qmltests/tst_Shell.qml+36−2
@@ -22,12 +22,14 @@ import QtTest 1.0
22import GSettings 1.0
22import GSettings 1.0
23import LightDM 0.1 as LightDM
23import LightDM 0.1 as LightDM
24import Unity.Application 0.1
24import Unity.Application 0.1
25+import Unity.Connectivity 0.1
25import Unity.Test 0.1 as UT
26import Unity.Test 0.1 as UT
26import Powerd 0.1
27import Powerd 0.1
27
28
28import "../../qml"
29import "../../qml"
29
30
30Item {
31Item {
32+ id: root
31 width: shell.width
33 width: shell.width
32 height: shell.height
34 height: shell.height
33
35
@@ -51,6 +53,11 @@ Item {
51 id: shell
53 id: shell
52 }
54 }
53
55
56+ Component {
57+ id: shellComponent
58+ Shell {}
59+ }
60+
54 SignalSpy {
61 SignalSpy {
55 id: sessionSpy
62 id: sessionSpy
56 signalName: "sessionStarted"
63 signalName: "sessionStarted"
@@ -61,6 +68,12 @@ Item {
61 signalName: "setCurrentScopeCalled"
68 signalName: "setCurrentScopeCalled"
62 }
69 }
63
70
71+ SignalSpy {
72+ id: unlockAllModemsSpy
73+ target: Connectivity
74+ signalName: "unlockingAllModems"
75+ }
76+
64 UT.UnityTestCase {
77 UT.UnityTestCase {
65 name: "Shell"
78 name: "Shell"
66 when: windowShown
79 when: windowShown
@@ -403,11 +416,11 @@ Item {
403 compare(panel.fullscreenMode, false);
416 compare(panel.fullscreenMode, false);
404 ApplicationManager.startApplication("camera-app");
417 ApplicationManager.startApplication("camera-app");
405 tryCompare(panel, "fullscreenMode", true);
418 tryCompare(panel, "fullscreenMode", true);
406− ApplicationManager.startApplication("gallery-app");
419+ ApplicationManager.startApplication("dialer-app");
407 tryCompare(panel, "fullscreenMode", false);
420 tryCompare(panel, "fullscreenMode", false);
408 ApplicationManager.requestFocusApplication("camera-app");
421 ApplicationManager.requestFocusApplication("camera-app");
409 tryCompare(panel, "fullscreenMode", true);
422 tryCompare(panel, "fullscreenMode", true);
410− ApplicationManager.requestFocusApplication("gallery-app");
423+ ApplicationManager.requestFocusApplication("dialer-app");
411 tryCompare(panel, "fullscreenMode", false);
424 tryCompare(panel, "fullscreenMode", false);
412 }
425 }
413
426
@@ -431,5 +444,26 @@ Item {
431
444
432 touchRelease(shell);
445 touchRelease(shell);
433 }
446 }
447+
448+ function test_unlockedProperties() {
449+ // Confirm that various properties have the correct values when unlocked
450+ tryCompare(shell, "locked", false)
451+
452+ var launcher = findChild(shell, "launcher")
453+ tryCompare(launcher, "available", true)
454+
455+ var indicators = findChild(shell, "indicators")
456+ tryCompare(indicators, "available", true)
457+ }
458+
459+ function test_unlockAllModemsOnBoot() {
460+ unlockAllModemsSpy.clear()
461+ // actually create an object so we notice the onCompleted signal
462+ var greeter = shellComponent.createObject(root)
463+ // TODO reenable when service ready (LP: #1361074)
464+ expectFail("", "Unlock on boot temporarily disabled");
465+ tryCompare(unlockAllModemsSpy, "count", 1)
466+ greeter.destroy()
467+ }
434 }
468 }
435}
469}
tests/qmltests/tst_ShellWithPin.qml+26−11
@@ -15,6 +15,7 @@
15 */
15 */
16
16
17import QtQuick 2.0
17import QtQuick 2.0
18+import Ubuntu.Components 1.0
18import QtTest 1.0
19import QtTest 1.0
19import AccountsService 0.1
20import AccountsService 0.1
20import GSettings 1.0
21import GSettings 1.0
@@ -28,7 +29,7 @@ import "../../qml"
28
29
29Item {
30Item {
30 id: root
31 id: root
31− width: shell.width
32+ width: shell.width + units.gu(20)
32 height: shell.height
33 height: shell.height
33
34
34 QtObject {
35 QtObject {
@@ -49,6 +50,20 @@ Item {
49
50
50 Shell {
51 Shell {
51 id: shell
52 id: shell
53+ maxFailedLogins: maxRetriesTextField.text
54+ }
55+ Column {
56+ anchors { top: parent.top; right: parent.right; bottom: parent.bottom; margins:units.gu(1) }
57+ width: units.gu(18)
58+
59+ Label {
60+ text: "Max retries:"
61+ color: "black"
62+ }
63+ TextField {
64+ id: maxRetriesTextField
65+ text: "-1"
66+ }
52 }
67 }
53
68
54 SignalSpy {
69 SignalSpy {
@@ -74,7 +89,7 @@ Item {
74 function init() {
89 function init() {
75 swipeAwayGreeter()
90 swipeAwayGreeter()
76 shell.failedLoginsDelayAttempts = -1
91 shell.failedLoginsDelayAttempts = -1
77− shell.maxFailedLogins = -1
92+ maxRetriesTextField.text = "-1"
78 AccountsService.enableLauncherWhileLocked = true
93 AccountsService.enableLauncherWhileLocked = true
79 AccountsService.enableIndicatorsWhileLocked = true
94 AccountsService.enableIndicatorsWhileLocked = true
80 }
95 }
@@ -145,7 +160,7 @@ Item {
145 function test_emergencyCall() {
160 function test_emergencyCall() {
146 var greeter = findChild(shell, "greeter")
161 var greeter = findChild(shell, "greeter")
147 var lockscreen = findChild(shell, "lockscreen")
162 var lockscreen = findChild(shell, "lockscreen")
148− var emergencyButton = findChild(lockscreen, "emergencyCallIcon")
163+ var emergencyButton = findChild(lockscreen, "emergencyCallLabel")
149 var panel = findChild(shell, "panel")
164 var panel = findChild(shell, "panel")
150 var indicators = findChild(shell, "indicators")
165 var indicators = findChild(shell, "indicators")
151 var launcher = findChild(shell, "launcher")
166 var launcher = findChild(shell, "launcher")
@@ -175,7 +190,7 @@ Item {
175
190
176 function test_emergencyCallCrash() {
191 function test_emergencyCallCrash() {
177 var lockscreen = findChild(shell, "lockscreen")
192 var lockscreen = findChild(shell, "lockscreen")
178− var emergencyButton = findChild(lockscreen, "emergencyCallIcon")
193+ var emergencyButton = findChild(lockscreen, "emergencyCallLabel")
179 mouseClick(emergencyButton, units.gu(1), units.gu(1))
194 mouseClick(emergencyButton, units.gu(1), units.gu(1))
180
195
181 tryCompare(lockscreen, "shown", false)
196 tryCompare(lockscreen, "shown", false)
@@ -185,7 +200,7 @@ Item {
185
200
186 function test_emergencyCallAppLaunch() {
201 function test_emergencyCallAppLaunch() {
187 var lockscreen = findChild(shell, "lockscreen")
202 var lockscreen = findChild(shell, "lockscreen")
188− var emergencyButton = findChild(lockscreen, "emergencyCallIcon")
203+ var emergencyButton = findChild(lockscreen, "emergencyCallLabel")
189 mouseClick(emergencyButton, units.gu(1), units.gu(1))
204 mouseClick(emergencyButton, units.gu(1), units.gu(1))
190
205
191 tryCompare(lockscreen, "shown", false)
206 tryCompare(lockscreen, "shown", false)
@@ -206,21 +221,21 @@ Item {
206 function test_wrongEntries() {
221 function test_wrongEntries() {
207 shell.failedLoginsDelayAttempts = 3
222 shell.failedLoginsDelayAttempts = 3
208
223
209− var placeHolder = findChild(shell, "pinentryFieldPlaceHolder")
224+ var placeHolder = findChild(shell, "wrongNoticeLabel")
210− tryCompare(placeHolder, "text", "Enter your passcode")
225+ tryCompare(placeHolder, "text", "")
211
226
212 enterPin("1111")
227 enterPin("1111")
213− tryCompare(placeHolder, "text", "Incorrect passcode\nPlease re-enter")
228+ tryCompare(placeHolder, "text", "Sorry, incorrect PIN")
214
229
215 enterPin("1111")
230 enterPin("1111")
216− tryCompare(placeHolder, "text", "Incorrect passcode\nPlease re-enter")
231+ tryCompare(placeHolder, "text", "Sorry, incorrect PIN")
217
232
218 enterPin("1111")
233 enterPin("1111")
219− tryCompare(placeHolder, "text", "Too many incorrect attempts\nPlease wait")
234+ tryCompare(placeHolder, "text", "Too many incorrect attempts")
220 }
235 }
221
236
222 function test_factoryReset() {
237 function test_factoryReset() {
223− shell.maxFailedLogins = 3
238+ maxRetriesTextField.text = "3"
224 resetSpy.clear()
239 resetSpy.clear()
225
240
226 enterPin("1111")
241 enterPin("1111")
tests/utils/modules/Unity/Test/UnityTestCase.qml+5−2
@@ -312,12 +312,15 @@ TestCase {
312 }
312 }
313
313
314 function tap(item, x, y) {
314 function tap(item, x, y) {
315+ var root = fetchRootItem(item)
316+ var rootPoint = item.mapToItem(root, x, y)
317+
315 var event = touchEvent()
318 var event = touchEvent()
316− event.press(0 /* touchId */, x, y)
319+ event.press(0 /* touchId */, rootPoint.x, rootPoint.y)
317 event.commit()
320 event.commit()
318
321
319 event = touchEvent()
322 event = touchEvent()
320− event.release(0 /* touchId */, x, y)
323+ event.release(0 /* touchId */, rootPoint.x, rootPoint.y)
321 event.commit()
324 event.commit()
322 }
325 }
323
326