on xenial help sign in
Merge lp:unity8
7c1197cAlbert Astals Cid
debian/changelog+28−32
@@ -1,46 +1,42 @@
1−unity8 (8.10+15.10.20150717-0ubuntu1) wily; urgency=medium
1+unity8 (8.10+15.10.20150729-0ubuntu1) wily; urgency=medium
2
2
3− [ Albert Astals ]
3+ [ CI Train Bot ]
4− * Ensure tutorial doesn't let user drag the launcher past screen edge.
4+ * Resync trunk.
5− (LP: #1454882)
5+ * allow opening the manage dash area by clicking with a mouse on the
6−
6+ arrow label (LP: #1431564)
7− [ Albert Astals Cid ]
8− * Fix build with ninja
9−
10− [ Andrea Cimitan ]
11− * Add PreviewSocialComment
12
7
13 [ Daniel d'Andrada ]
8 [ Daniel d'Andrada ]
14− * Ensure tutorial doesn't let user drag the launcher past screen edge.
9+ * TouchRegistry: remove null candidates from list of candidates (LP:
15− (LP: #1454882)
10+ #1473492)
16− * Update tst_ShellWithPin
17−
18− [ Josh Arenson ]
19− * Add a basic autopilot test for the SettingsWizard
20
11
21 [ Lukáš Tinkl ]
12 [ Lukáš Tinkl ]
22− * Avoid sync DBUS calls
13+ * Fix power dialogs on desktop
23−
14+ * Provide DBUS compatibility with various session services
24− [ Marcus Tomlinson ]
15+ (suspend/hibernate, lock/unlock, screensaver, etc)
25− * Handle TERM, HUP, and INT signals in unity-scope-tool (LP: #1470464)
16+ * React on PrtScr keyboard shortcut for taking screenshots on desktop
17+ (LP: #1474149)
18+ * launcher parity: close apps from quicklist (LP: #1457201)
26
19
27 [ Michael Zanetti ]
20 [ Michael Zanetti ]
28− * Add PreviewSocialComment
21+ * Implement first edition for a desktop Alt+Tab spread
29−
22+ * drop the gcc-4.9 dependency (LP: #1452348)
30− [ Nick Dedekind ]
31− * Fixed qml warnings in 'make tryShell'
32
23
33− -- CI Train Bot <ci-train-bot@canonical.com> Fri, 17 Jul 2015 15:53:38 +0000
24+ [ Mirco Müller ]
34−
25+ * Added corresponding tests and visual tweaks to a launcher-item's
35−unity8 (8.10+15.10.20150713-0ubuntu1) wily; urgency=medium
26+ progress-overlay.
27+ * Added corresponding tests and visual tweaks to a launcher-item's
28+ progress-overlay.
29+ * Implemented alert/wiggle feature for launcher-icons.
30+ * Implemented alert/wiggle feature for launcher-icons.
36
31
37− [ Albert Astals Cid ]
32+ [ handsome_feng ]
38− * Revert Session Screenshotter (LP: #1473476)
33+ * makes left swip reset the search string. (LP: #1413791)
39
34
40− [ Daniel d'Andrada ]
35+ [ handsome_feng<445865575@qq.com> ]
41− * Dismiss the apps spread if greeter gets shown (LP: #1471609)
36+ * Don't expand indicators when tap to return to call. (LP: #1453217)
37+ * makes left swip reset the search string. (LP: #1413791)
42
38
43− -- CI Train Bot <ci-train-bot@canonical.com> Mon, 13 Jul 2015 14:17:20 +0000
39+ -- CI Train Bot <ci-train-bot@canonical.com> Wed, 29 Jul 2015 12:39:01 +0000
44
40
45unity8 (8.10+15.10.20150708.2-0ubuntu1) wily; urgency=medium
41unity8 (8.10+15.10.20150708.2-0ubuntu1) wily; urgency=medium
46
42
debian/control+6−8
@@ -6,12 +6,10 @@ Build-Depends: cmake,
6 dbus-test-runner,
6 dbus-test-runner,
7 debhelper (>= 9),
7 debhelper (>= 9),
8 doxyqml,
8 doxyqml,
9−# We rely on C++11 features, and to prevent from ABI breaks
10−# in libstdc++ causing us issues, we explicitly select a G++
11−# version. To allow cross-compiling to work, we also must
9+# To allow cross-compiling to work, we also must append :native
12−# append :native to g++-4.9 so we don't try to run armhf g++
10+# to g++ so we don't try to run armhf g++
13# on an x86 CPU for eaxmple, when cross-compiling.
11# on an x86 CPU for eaxmple, when cross-compiling.
14− g++-4.9:native,
12+ g++:native,
15 libandroid-properties-dev,
13 libandroid-properties-dev,
16 graphviz,
14 graphviz,
17 gsettings-ubuntu-schemas (>= 0.0.2+14.10.20140815),
15 gsettings-ubuntu-schemas (>= 0.0.2+14.10.20140815),
@@ -30,7 +28,7 @@ Build-Depends: cmake,
30 libqt5xmlpatterns5-dev,
28 libqt5xmlpatterns5-dev,
31 libsystemsettings-dev,
29 libsystemsettings-dev,
32 libudev-dev,
30 libudev-dev,
33− libunity-api-dev (>= 7.97),
31+ libunity-api-dev (>= 7.98),
34 libusermetricsoutput1-dev,
32 libusermetricsoutput1-dev,
35 libxcb1-dev,
33 libxcb1-dev,
36 pkg-config,
34 pkg-config,
@@ -101,7 +99,7 @@ Depends: gsettings-desktop-schemas,
101 qtdeclarative5-ubuntu-telephony0.1,
99 qtdeclarative5-ubuntu-telephony0.1,
102 qtdeclarative5-ubuntu-web-plugin,
100 qtdeclarative5-ubuntu-web-plugin,
103 ubuntu-system-settings,
101 ubuntu-system-settings,
104− unity-launcher-impl-4,
102+ unity-launcher-impl-7,
105 unity8-common (= ${source:Version}),
103 unity8-common (= ${source:Version}),
106 unity8-private (= ${binary:Version}),
104 unity8-private (= ${binary:Version}),
107 unity8-private | unity-launcher-impl,
105 unity8-private | unity-launcher-impl,
@@ -191,7 +189,7 @@ Depends: accountsservice-ubuntu-schemas (>= 0.0.3),
191 ${misc:Depends},
189 ${misc:Depends},
192 ${shlibs:Depends},
190 ${shlibs:Depends},
193Provides: unity-launcher-impl,
191Provides: unity-launcher-impl,
194− unity-launcher-impl-4,
192+ unity-launcher-impl-7,
195Description: Unity 8 private libs
193Description: Unity 8 private libs
196 The Unity 8 shell is the primary user interface for Ubuntu devices.
194 The Unity 8 shell is the primary user interface for Ubuntu devices.
197 .
195 .
libs/UbuntuGestures/TouchRegistry.cpp+60−14
@@ -271,6 +271,8 @@ void TouchRegistry::addCandidateOwnerForTouch(int id, QQuickItem *candidate)
271 this, &TouchRegistry::rejectCandidateOwnerForTouch);
271 this, &TouchRegistry::rejectCandidateOwnerForTouch);
272
272
273 touchInfo->candidates.append(candidateInfo);
273 touchInfo->candidates.append(candidateInfo);
274+
275+ connect(candidate, &QObject::destroyed, this, [=](){ pruneNullCandidatesForTouch(id); });
274}
276}
275
277
276void TouchRegistry::addTouchWatcher(int touchId, QQuickItem *watcher)
278void TouchRegistry::addTouchWatcher(int touchId, QQuickItem *watcher)
@@ -296,25 +298,53 @@ void TouchRegistry::removeCandidateOwnerForTouch(int id, QQuickItem *candidate)
296 Pool<TouchInfo>::Iterator touchInfo = findTouchInfo(id);
298 Pool<TouchInfo>::Iterator touchInfo = findTouchInfo(id);
297 if (!touchInfo) { qFatal("TouchRegistry: Failed to find TouchInfo"); }
299 if (!touchInfo) { qFatal("TouchRegistry: Failed to find TouchInfo"); }
298
300
299− int indexRemoved = -1;
300
301
301 // TODO: check if the candidate is in fact the owner of the touch
302 // TODO: check if the candidate is in fact the owner of the touch
302
303
304+ bool removed = false;
303− for (int i = 0; i < touchInfo->candidates.count() && indexRemoved == -1; ++i) {
305+ for (int i = 0; i < touchInfo->candidates.count() && !removed; ++i) {
304− CandidateInfo &candidateInfo = touchInfo->candidates[i];
306+ if (touchInfo->candidates[i].item == candidate) {
305− if (candidateInfo.item == candidate) {
307+ removeCandidateOwnerForTouchByIndex(touchInfo, i);
306− Q_ASSERT(i > 0 || candidateInfo.state == CandidateInfo::Undecided);
308+ removed = true;
307− if (i == 0 && candidateInfo.state != CandidateInfo::Undecided) {
308− qCritical("TouchRegistry: touch owner is being removed.");
309− }
310− delete candidateInfo.inactivityTimer;
311− candidateInfo.inactivityTimer = nullptr;
312− touchInfo->candidates.removeAt(i);
313− indexRemoved = i;
314 }
309 }
315 }
310 }
311+}
312+
313+void TouchRegistry::pruneNullCandidatesForTouch(int touchId)
314+{
315+ #if TOUCHREGISTRY_DEBUG
316+ UG_DEBUG << "pruneNullCandidatesForTouch touchId" << touchId;
317+ #endif
318+
319+ Pool<TouchInfo>::Iterator touchInfo = findTouchInfo(touchId);
320+ if (!touchInfo) {
321+ // doesn't matter as touch is already gone.
322+ return;
323+ }
316
324
317− if (indexRemoved == 0) {
325+ int i = 0;
326+ while (i < touchInfo->candidates.count()) {
327+ if (touchInfo->candidates[i].item.isNull()) {
328+ removeCandidateOwnerForTouchByIndex(touchInfo, i);
329+ } else {
330+ ++i;
331+ }
332+ }
333+}
334+
335+void TouchRegistry::removeCandidateOwnerForTouchByIndex(Pool<TouchRegistry::TouchInfo>::Iterator &touchInfo,
336+ int candidateIndex)
337+{
338+ // TODO: check if the candidate is in fact the owner of the touch
339+
340+ Q_ASSERT(candidateIndex < touchInfo->candidates.count());
341+
342+ if (candidateIndex == 0 && touchInfo->candidates[candidateIndex].state != CandidateInfo::Undecided) {
343+ qCritical("TouchRegistry: touch owner is being removed.");
344+ }
345+ removeCandidateHelper(touchInfo, candidateIndex);
346+
347+ if (candidateIndex == 0) {
318 // the top candidate has been removed. if the new top candidate
348 // the top candidate has been removed. if the new top candidate
319 // wants the touch let him know he's now the owner.
349 // wants the touch let him know he's now the owner.
320 if (touchInfo->isOwned()) {
350 if (touchInfo->isOwned()) {
@@ -359,6 +389,7 @@ void TouchRegistry::requestTouchOwnership(int id, QQuickItem *candidate)
359 touchInfo->candidates.append(candidateInfo);
389 touchInfo->candidates.append(candidateInfo);
360 // it's the last one
390 // it's the last one
361 candidateIndex = touchInfo->candidates.count() - 1;
391 candidateIndex = touchInfo->candidates.count() - 1;
392+ connect(candidate, &QObject::destroyed, this, [=](){ pruneNullCandidatesForTouch(id); });
362 }
393 }
363
394
364 // If it's the top candidate it means it's now the owner. Let
395 // If it's the top candidate it means it's now the owner. Let
@@ -430,7 +461,7 @@ void TouchRegistry::rejectCandidateOwnerForTouch(int id, QQuickItem *candidate)
430 QCoreApplication::sendEvent(candidate, &lostOwnershipEvent);
461 QCoreApplication::sendEvent(candidate, &lostOwnershipEvent);
431 }
462 }
432
463
433− touchInfo->candidates.removeAt(rejectedCandidateIndex);
464+ removeCandidateHelper(touchInfo, rejectedCandidateIndex);
434
465
435 if (rejectedCandidateIndex == 0) {
466 if (rejectedCandidateIndex == 0) {
436 // the top candidate has been removed. if the new top candidate
467 // the top candidate has been removed. if the new top candidate
@@ -441,6 +472,21 @@ void TouchRegistry::rejectCandidateOwnerForTouch(int id, QQuickItem *candidate)
441 }
472 }
442}
473}
443
474
475+void TouchRegistry::removeCandidateHelper(Pool<TouchInfo>::Iterator &touchInfo, int candidateIndex)
476+{
477+ {
478+ CandidateInfo &candidateInfo = touchInfo->candidates[candidateIndex];
479+
480+ delete candidateInfo.inactivityTimer;
481+ candidateInfo.inactivityTimer = nullptr;
482+
483+ if (candidateInfo.item) {
484+ disconnect(candidateInfo.item.data(), nullptr, this, nullptr);
485+ }
486+ }
487+ touchInfo->candidates.removeAt(candidateIndex);
488+}
489+
444////////////////////////////////////// TouchRegistry::TouchInfo ////////////////////////////////////
490////////////////////////////////////// TouchRegistry::TouchInfo ////////////////////////////////////
445
491
446TouchRegistry::TouchInfo::TouchInfo(int id)
492TouchRegistry::TouchInfo::TouchInfo(int id)
libs/UbuntuGestures/TouchRegistry.h+4−1
@@ -149,7 +149,6 @@ private:
149 // yet because of undecided candidates higher up.
149 // yet because of undecided candidates higher up.
150 InterimOwner = 2
150 InterimOwner = 2
151 } state;
151 } state;
152− // TODO: Prune candidates that become null and resolve ownership accordingly.
153 QPointer<QQuickItem> item;
152 QPointer<QQuickItem> item;
154 QPointer<UbuntuGestures::CandidateInactivityTimer> inactivityTimer;
153 QPointer<UbuntuGestures::CandidateInactivityTimer> inactivityTimer;
155 };
154 };
@@ -172,6 +171,10 @@ private:
172 QList<QPointer<QQuickItem>> watchers;
171 QList<QPointer<QQuickItem>> watchers;
173 };
172 };
174
173
174+ void pruneNullCandidatesForTouch(int touchId);
175+ void removeCandidateOwnerForTouchByIndex(Pool<TouchInfo>::Iterator &touchInfo, int candidateIndex);
176+ void removeCandidateHelper(Pool<TouchInfo>::Iterator &touchInfo, int candidateIndex);
177+
175 Pool<TouchInfo>::Iterator findTouchInfo(int id);
178 Pool<TouchInfo>::Iterator findTouchInfo(int id);
176
179
177 void deliverTouchUpdatesToUndecidedCandidatesAndWatchers(const QTouchEvent *event);
180 void deliverTouchUpdatesToUndecidedCandidatesAndWatchers(const QTouchEvent *event);
plugins/AccountsService/AccountsService.cpp+1−2
@@ -141,9 +141,9 @@ void AccountsService::updateDemoEdges(bool async)
141 this, [this](QDBusPendingCallWatcher* watcher) {
141 this, [this](QDBusPendingCallWatcher* watcher) {
142
142
143 QDBusPendingReply<QDBusVariant> reply = *watcher;
143 QDBusPendingReply<QDBusVariant> reply = *watcher;
144+ watcher->deleteLater();
144 if (reply.isError()) {
145 if (reply.isError()) {
145 qWarning() << "Failed to get 'demo-edges' property - " << reply.error().message();
146 qWarning() << "Failed to get 'demo-edges' property - " << reply.error().message();
146− watcher->deleteLater();
147 return;
147 return;
148 }
148 }
149
149
@@ -152,7 +152,6 @@ void AccountsService::updateDemoEdges(bool async)
152 m_demoEdges = demoEdges;
152 m_demoEdges = demoEdges;
153 Q_EMIT demoEdgesChanged();
153 Q_EMIT demoEdgesChanged();
154 }
154 }
155− watcher->deleteLater();
156 });
155 });
157 if (!async) {
156 if (!async) {
158 watcher->waitForFinished();
157 watcher->waitForFinished();
plugins/Greeter/Unity/Launcher/CMakeLists.txt+1−1
@@ -1,4 +1,4 @@
1−pkg_check_modules(LAUNCHER_API REQUIRED unity-shell-launcher=6)
1+pkg_check_modules(LAUNCHER_API REQUIRED unity-shell-launcher=7)
2pkg_check_modules(APPLICATION_API REQUIRED unity-shell-application=6)
2pkg_check_modules(APPLICATION_API REQUIRED unity-shell-application=6)
3pkg_check_modules(GSETTINGS_QT REQUIRED gsettings-qt)
3pkg_check_modules(GSETTINGS_QT REQUIRED gsettings-qt)
4
4
plugins/Greeter/Unity/Launcher/launcheritem.cpp+14
@@ -31,6 +31,7 @@ LauncherItem::LauncherItem(const QString &appId, const QString &name, const QStr
31 m_count(0),
31 m_count(0),
32 m_countVisible(false),
32 m_countVisible(false),
33 m_focused(false),
33 m_focused(false),
34+ m_alerting(false),
34 m_quickList(new QuickListModel(this))
35 m_quickList(new QuickListModel(this))
35{
36{
36 QuickListEntry nameAction;
37 QuickListEntry nameAction;
@@ -165,6 +166,19 @@ void LauncherItem::setFocused(bool focused)
165 }
166 }
166}
167}
167
168
169+bool LauncherItem::alerting() const
170+{
171+ return m_alerting;
172+}
173+
174+void LauncherItem::setAlerting(bool alerting)
175+{
176+ if (m_alerting != alerting) {
177+ m_alerting = alerting;
178+ Q_EMIT alertingChanged(alerting);
179+ }
180+}
181+
168unity::shell::launcher::QuickListModelInterface *LauncherItem::quickList() const
182unity::shell::launcher::QuickListModelInterface *LauncherItem::quickList() const
169{
183{
170 return m_quickList;
184 return m_quickList;
plugins/Greeter/Unity/Launcher/launcheritem.h+4
@@ -41,6 +41,7 @@ public:
41 int count() const override;
41 int count() const override;
42 bool countVisible() const override;
42 bool countVisible() const override;
43 bool focused() const override;
43 bool focused() const override;
44+ bool alerting() const override;
44
45
45 unity::shell::launcher::QuickListModelInterface *quickList() const override;
46 unity::shell::launcher::QuickListModelInterface *quickList() const override;
46
47
@@ -54,6 +55,8 @@ private:
54 void setCount(int count);
55 void setCount(int count);
55 void setCountVisible(bool countVisible);
56 void setCountVisible(bool countVisible);
56 void setFocused(bool focused);
57 void setFocused(bool focused);
58+ void setAlerting(bool alerting);
59+
57
60
58private:
61private:
59 QString m_appId;
62 QString m_appId;
@@ -66,6 +69,7 @@ private:
66 int m_count;
69 int m_count;
67 bool m_countVisible;
70 bool m_countVisible;
68 bool m_focused;
71 bool m_focused;
72+ bool m_alerting;
69 QuickListModel *m_quickList;
73 QuickListModel *m_quickList;
70
74
71 friend class LauncherModel;
75 friend class LauncherModel;
plugins/Greeter/Unity/Launcher/launchermodelas.cpp+28−12
@@ -67,11 +67,20 @@ QVariant LauncherModel::data(const QModelIndex &index, int role) const
67 return item->progress();
67 return item->progress();
68 case RoleFocused:
68 case RoleFocused:
69 return item->focused();
69 return item->focused();
70+ case RoleRunning:
71+ return item->running();
70 }
72 }
71
73
72 return QVariant();
74 return QVariant();
73}
75}
74
76
77+void LauncherModel::setAlerting(const QString &appId, bool alerting)
78+{
79+ Q_UNUSED(appId)
80+ Q_UNUSED(alerting)
81+ qWarning() << "This is a read only implementation. Cannot set alert-state of items.";
82+}
83+
75unity::shell::launcher::LauncherItemInterface *LauncherModel::get(int index) const
84unity::shell::launcher::LauncherItemInterface *LauncherModel::get(int index) const
76{
85{
77 if (index < 0 || index >= m_list.count()) {
86 if (index < 0 || index >= m_list.count()) {
@@ -200,16 +209,20 @@ void LauncherModel::refresh()
200 Q_FOREACH (LauncherItem* item, m_list) {
209 Q_FOREACH (LauncherItem* item, m_list) {
201 bool found = false;
210 bool found = false;
202 Q_FOREACH(const QVariant &asItem, items) {
211 Q_FOREACH(const QVariant &asItem, items) {
212+ QVariantMap cachedMap = asItem.toMap();
203− if (asItem.toMap().value("id").toString() == item->appId()) {
213+ if (cachedMap.value("id").toString() == item->appId()) {
204 // Only keep and update it if we either show unpinned or it is pinned
214 // Only keep and update it if we either show unpinned or it is pinned
205− if (!m_onlyPinned || asItem.toMap().value("pinned").toBool()) {
215+ if (!m_onlyPinned || cachedMap.value("pinned").toBool()) {
206 found = true;
216 found = true;
207− item->setName(asItem.toMap().value("name").toString());
217+ item->setName(cachedMap.value("name").toString());
208− item->setIcon(asItem.toMap().value("icon").toString());
218+ item->setIcon(cachedMap.value("icon").toString());
209− item->setCount(asItem.toMap().value("count").toInt());
219+ item->setCount(cachedMap.value("count").toInt());
210− item->setCountVisible(asItem.toMap().value("countVisible").toBool());
220+ item->setCountVisible(cachedMap.value("countVisible").toBool());
221+ item->setProgress(cachedMap.value("progress").toInt());
222+ item->setRunning(cachedMap.value("running").toBool());
223+
211 int idx = m_list.indexOf(item);
224 int idx = m_list.indexOf(item);
212− Q_EMIT dataChanged(index(idx), index(idx), QVector<int>() << RoleName << RoleIcon);
225+ Q_EMIT dataChanged(index(idx), index(idx), {RoleName, RoleIcon, RoleCount, RoleCountVisible, RoleRunning, RoleProgress});
213 }
226 }
214 break;
227 break;
215 }
228 }
@@ -247,14 +260,17 @@ void LauncherModel::refresh()
247 }
260 }
248
261
249 if (itemIndex == -1) {
262 if (itemIndex == -1) {
263+ QVariantMap cachedMap = entry.toMap();
250 // Need to add it. Just add it into the addedIndex to keep same ordering as the list in AS.
264 // Need to add it. Just add it into the addedIndex to keep same ordering as the list in AS.
251− LauncherItem *item = new LauncherItem(entry.toMap().value("id").toString(),
265+ LauncherItem *item = new LauncherItem(cachedMap.value("id").toString(),
252− entry.toMap().value("name").toString(),
266+ cachedMap.value("name").toString(),
253− entry.toMap().value("icon").toString(),
267+ cachedMap.value("icon").toString(),
254 this);
268 this);
255 item->setPinned(true);
269 item->setPinned(true);
256− item->setCount(entry.toMap().value("count").toInt());
270+ item->setCount(cachedMap.value("count").toInt());
257− item->setCountVisible(entry.toMap().value("countVisible").toBool());
271+ item->setCountVisible(cachedMap.value("countVisible").toBool());
272+ item->setProgress(cachedMap.value("progress").toInt());
273+ item->setRunning(cachedMap.value("running").toBool());
258 beginInsertRows(QModelIndex(), newPosition, newPosition);
274 beginInsertRows(QModelIndex(), newPosition, newPosition);
259 m_list.insert(newPosition, item);
275 m_list.insert(newPosition, item);
260 endInsertRows();
276 endInsertRows();
plugins/Greeter/Unity/Launcher/launchermodelas.h+1
@@ -41,6 +41,7 @@ public:
41
41
42 QVariant data(const QModelIndex &index, int role) const override;
42 QVariant data(const QModelIndex &index, int role) const override;
43
43
44+ Q_INVOKABLE void setAlerting(const QString &appId, bool alerting) override;
44 Q_INVOKABLE unity::shell::launcher::LauncherItemInterface* get(int index) const override;
45 Q_INVOKABLE unity::shell::launcher::LauncherItemInterface* get(int index) const override;
45 Q_INVOKABLE void move(int oldIndex, int newIndex) override;
46 Q_INVOKABLE void move(int oldIndex, int newIndex) override;
46 Q_INVOKABLE void pin(const QString &appId, int index = -1) override;
47 Q_INVOKABLE void pin(const QString &appId, int index = -1) override;
plugins/ScreenGrabber/screengrabber.cpp+31−20
@@ -1,5 +1,5 @@
1/*
1/*
2− * Copyright (C) 2014 Canonical, Ltd.
2+ * Copyright (C) 2014-2015 Canonical, Ltd.
3 *
3 *
4 * This program is free software; you can redistribute it and/or modify
4 * This program is free software; you can redistribute it and/or modify
5 * it under the terms of the GNU General Public License as published by
5 * it under the terms of the GNU General Public License as published by
@@ -12,8 +12,6 @@
12 *
12 *
13 * You should have received a copy of the GNU General Public License
13 * You should have received a copy of the GNU General Public License
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15− *
16− * Authors: Alberto Aguirre <alberto.aguirre@canonical.com>
17 */
15 */
18
16
19#include "screengrabber.h"
17#include "screengrabber.h"
@@ -28,27 +26,35 @@
28
26
29#include <QDebug>
27#include <QDebug>
30
28
31−void saveScreenshot(QImage screenshot, QString filename, QString format, int quality)
29+bool saveScreenshot(const QImage &screenshot, const QString &filename, const QString &format, int quality)
32{
30{
33− if (!screenshot.save(filename, format.toLatin1().data(), quality))
31+ if (!screenshot.save(filename, format.toLatin1().data(), quality)) {
34− qWarning() << "ScreenShotter: failed to save snapshot!";
32+ qWarning() << "ScreenGrabber: failed to save snapshot!";
33+ return false;
34+ }
35+
36+ return true;
35}
37}
36
38
37ScreenGrabber::ScreenGrabber(QObject *parent)
39ScreenGrabber::ScreenGrabber(QObject *parent)
38− : QObject(parent),
40+ : QObject(parent)
39− screenshotQuality(0)
40{
41{
42+ QDir screenshotsDir;
43+ if (qEnvironmentVariableIsSet("UNITY_TESTING")) {
44+ qDebug() << "Using test environment";
45+ QStandardPaths::setTestModeEnabled(true);
46+ screenshotsDir = QStandardPaths::writableLocation(QStandardPaths::DataLocation);
47+ } else {
48+ qDebug() << "Using real environment";
41− QDir screenshotsDir(QStandardPaths::displayName(QStandardPaths::PicturesLocation));
49+ screenshotsDir = QStandardPaths::writableLocation(QStandardPaths::PicturesLocation);
50+ }
42− screenshotsDir.mkdir("Screenshots");
51+ screenshotsDir.mkpath("Screenshots");
43 screenshotsDir.cd("Screenshots");
52 screenshotsDir.cd("Screenshots");
44− if (screenshotsDir.exists())
53+ if (screenshotsDir.exists()) {
45− {
46 fileNamePrefix = screenshotsDir.absolutePath();
54 fileNamePrefix = screenshotsDir.absolutePath();
47 fileNamePrefix.append("/screenshot");
55 fileNamePrefix.append("/screenshot");
48− }
49− else
56+ } else {
50− {
51− qWarning() << "ScreenShotter: failed to create directory at: " << screenshotsDir.absolutePath();
57+ qWarning() << "ScreenGrabber: failed to create directory at: " << screenshotsDir.absolutePath();
52 }
58 }
53}
59}
54
60
@@ -74,11 +80,16 @@ void ScreenGrabber::captureAndSave()
74 return;
80 return;
75 }
81 }
76
82
77− QImage screenshot = main_window->grabWindow();
83+ const QImage screenshot = main_window->grabWindow();
84+ const QString filename = makeFileName();
85+ qDebug() << "Saving screenshot to" << filename;
78− QtConcurrent::run(saveScreenshot, screenshot, makeFileName(), getFormat(), screenshotQuality);
86+ auto saveOp = QtConcurrent::run(saveScreenshot, screenshot, filename, getFormat(), screenshotQuality);
87+ if (saveOp.result()) {
88+ Q_EMIT screenshotSaved(filename);
89+ }
79}
90}
80
91
81−QString ScreenGrabber::makeFileName()
92+QString ScreenGrabber::makeFileName() const
82{
93{
83 QString fileName(fileNamePrefix);
94 QString fileName(fileNamePrefix);
84 fileName.append(QDateTime::currentDateTime().toString("yyyyMMdd_hhmmsszzz"));
95 fileName.append(QDateTime::currentDateTime().toString("yyyyMMdd_hhmmsszzz"));
@@ -87,7 +98,7 @@ QString ScreenGrabber::makeFileName()
87 return fileName;
98 return fileName;
88}
99}
89
100
90−QString ScreenGrabber::getFormat()
101+QString ScreenGrabber::getFormat() const
91{
102{
92 //TODO: This should be configurable (perhaps through gsettings?)
103 //TODO: This should be configurable (perhaps through gsettings?)
93 return "png";
104 return "png";
plugins/ScreenGrabber/screengrabber.h+8−6
@@ -1,5 +1,5 @@
1/*
1/*
2− * Copyright (C) 2014 Canonical, Ltd.
2+ * Copyright (C) 2014-2015 Canonical, Ltd.
3 *
3 *
4 * This program is free software; you can redistribute it and/or modify
4 * This program is free software; you can redistribute it and/or modify
5 * it under the terms of the GNU General Public License as published by
5 * it under the terms of the GNU General Public License as published by
@@ -12,8 +12,6 @@
12 *
12 *
13 * You should have received a copy of the GNU General Public License
13 * You should have received a copy of the GNU General Public License
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15− *
16− * Authors: Alberto Aguirre <alberto.aguirre@canonical.com>
17 */
15 */
18
16
19#ifndef SNAPSHOTTER_H
17#ifndef SNAPSHOTTER_H
@@ -28,15 +26,19 @@ class ScreenGrabber: public QObject
28
26
29public:
27public:
30 explicit ScreenGrabber(QObject *parent = 0);
28 explicit ScreenGrabber(QObject *parent = 0);
29+ ~ScreenGrabber() = default;
31
30
32public Q_SLOTS:
31public Q_SLOTS:
33 void captureAndSave();
32 void captureAndSave();
34
33
34+Q_SIGNALS:
35+ void screenshotSaved(const QString &filename);
36+
35private:
37private:
36− QString makeFileName();
38+ QString makeFileName() const;
37− QString getFormat();
39+ QString getFormat() const;
38 QString fileNamePrefix;
40 QString fileNamePrefix;
39− int screenshotQuality;
41+ int screenshotQuality = -1; // default quality for the format
40};
42};
41
43
42#endif
44#endif
plugins/Unity/Launcher/CMakeLists.txt+1−1
@@ -1,4 +1,4 @@
1−pkg_check_modules(LAUNCHER_API REQUIRED unity-shell-launcher=6)
1+pkg_check_modules(LAUNCHER_API REQUIRED unity-shell-launcher=7)
2pkg_check_modules(APPLICATION_API REQUIRED unity-shell-application=6)
2pkg_check_modules(APPLICATION_API REQUIRED unity-shell-application=6)
3pkg_check_modules(GSETTINGS_QT REQUIRED gsettings-qt)
3pkg_check_modules(GSETTINGS_QT REQUIRED gsettings-qt)
4
4
plugins/Unity/Launcher/asadapter.cpp+4−2
@@ -34,12 +34,12 @@ ASAdapter::~ASAdapter()
34 m_accounts->deleteLater();
34 m_accounts->deleteLater();
35}
35}
36
36
37−void ASAdapter::syncItems(QList<LauncherItem *> m_list)
37+void ASAdapter::syncItems(const QList<LauncherItem*> &list)
38{
38{
39 if (m_accounts && !m_user.isEmpty()) {
39 if (m_accounts && !m_user.isEmpty()) {
40 QList<QVariantMap> items;
40 QList<QVariantMap> items;
41
41
42− Q_FOREACH(LauncherItem *item, m_list) {
42+ Q_FOREACH(LauncherItem *item, list) {
43 items << itemToVariant(item);
43 items << itemToVariant(item);
44 }
44 }
45
45
@@ -56,5 +56,7 @@ QVariantMap ASAdapter::itemToVariant(LauncherItem *item) const
56 details.insert("count", item->count());
56 details.insert("count", item->count());
57 details.insert("countVisible", item->countVisible());
57 details.insert("countVisible", item->countVisible());
58 details.insert("pinned", item->pinned());
58 details.insert("pinned", item->pinned());
59+ details.insert("running", item->running());
60+ details.insert("progress", item->progress());
59 return details;
61 return details;
60}
62}
plugins/Unity/Launcher/asadapter.h+1−4
@@ -21,7 +21,6 @@
21
21
22class LauncherItem;
22class LauncherItem;
23class AccountsServiceDBusAdaptor;
23class AccountsServiceDBusAdaptor;
24−class QDBusInterface;
25
24
26class ASAdapter
25class ASAdapter
27{
26{
@@ -29,7 +28,7 @@ public:
29 ASAdapter();
28 ASAdapter();
30 ~ASAdapter();
29 ~ASAdapter();
31
30
32− void syncItems(QList<LauncherItem*> m_list);
31+ void syncItems(const QList<LauncherItem*> &list);
33
32
34private:
33private:
35 QVariantMap itemToVariant(LauncherItem *item) const;
34 QVariantMap itemToVariant(LauncherItem *item) const;
@@ -38,8 +37,6 @@ private:
38 AccountsServiceDBusAdaptor *m_accounts;
37 AccountsServiceDBusAdaptor *m_accounts;
39 QString m_user;
38 QString m_user;
40
39
41− QDBusInterface *m_userInterface;
42−
43 friend class LauncherModelTest;
40 friend class LauncherModelTest;
44};
41};
45
42
plugins/Unity/Launcher/dbusinterface.cpp+42−12
@@ -62,6 +62,8 @@ QString DBusInterface::introspect(const QString &path) const
62 "<interface name=\"com.canonical.Unity.Launcher.Item\">"
62 "<interface name=\"com.canonical.Unity.Launcher.Item\">"
63 "<property name=\"count\" type=\"i\" access=\"readwrite\" />"
63 "<property name=\"count\" type=\"i\" access=\"readwrite\" />"
64 "<property name=\"countVisible\" type=\"b\" access=\"readwrite\" />"
64 "<property name=\"countVisible\" type=\"b\" access=\"readwrite\" />"
65+ "<property name=\"progress\" type=\"i\" access=\"readwrite\" />"
66+ "<method name=\"Alert\" />"
65 "</interface>";
67 "</interface>";
66 return nodeiface;
68 return nodeiface;
67}
69}
@@ -122,6 +124,20 @@ bool DBusInterface::handleMessage(const QDBusMessage& message, const QDBusConnec
122 return false;
124 return false;
123 }
125 }
124
126
127+ /* Break down the path to just the app id */
128+ bool validpath = true;
129+ QString pathtemp = message.path();
130+ if (!pathtemp.startsWith("/com/canonical/Unity/Launcher/")) {
131+ validpath = false;
132+ }
133+ pathtemp.remove("/com/canonical/Unity/Launcher/");
134+ if (pathtemp.indexOf('/') >= 0) {
135+ validpath = false;
136+ }
137+
138+ /* Find ourselves an appid */
139+ QString appid = decodeAppId(pathtemp);
140+
125 // First handle methods of the Launcher interface
141 // First handle methods of the Launcher interface
126 if (message.interface() == "com.canonical.Unity.Launcher") {
142 if (message.interface() == "com.canonical.Unity.Launcher") {
127 if (message.member() == "Refresh") {
143 if (message.member() == "Refresh") {
@@ -129,6 +145,13 @@ bool DBusInterface::handleMessage(const QDBusMessage& message, const QDBusConnec
129 Q_EMIT refreshCalled();
145 Q_EMIT refreshCalled();
130 return connection.send(reply);
146 return connection.send(reply);
131 }
147 }
148+ } else if (message.interface() == "com.canonical.Unity.Launcher.Item") {
149+ // Handle methods of the Launcher-Item interface
150+ if (message.member() == "Alert" && validpath) {
151+ QDBusMessage reply = message.createReply();
152+ Q_EMIT alertCalled(appid);
153+ return connection.send(reply);
154+ }
132 }
155 }
133
156
134 // Now handle dynamic properties (for launcher emblems)
157 // Now handle dynamic properties (for launcher emblems)
@@ -136,54 +159,61 @@ bool DBusInterface::handleMessage(const QDBusMessage& message, const QDBusConnec
136 return false;
159 return false;
137 }
160 }
138
161
139− if (message.member() != "GetAll" && message.arguments()[0].toString() != "com.canonical.Unity.Launcher.Item") {
162+ if (message.member() == "Get" && (message.arguments().count() != 2 || message.arguments()[0].toString() != "com.canonical.Unity.Launcher.Item")) {
140 return false;
163 return false;
141 }
164 }
142
165
143− /* Break down the path to just the app id */
166+ if (message.member() == "Set" && (message.arguments().count() != 3 || message.arguments()[0].toString() != "com.canonical.Unity.Launcher.Item")) {
144− QString pathtemp = message.path();
145− if (!pathtemp.startsWith("/com/canonical/Unity/Launcher/")) {
146 return false;
167 return false;
147 }
168 }
148− pathtemp.remove("/com/canonical/Unity/Launcher/");
169+
149− if (pathtemp.indexOf('/') >= 0) {
170+ if (!validpath) {
150 return false;
171 return false;
151 }
172 }
152
173
153− /* Find ourselves an appid */
154− QString appid = decodeAppId(pathtemp);
155 int index = m_launcherModel->findApplication(appid);
174 int index = m_launcherModel->findApplication(appid);
156 LauncherItem *item = static_cast<LauncherItem*>(m_launcherModel->get(index));
175 LauncherItem *item = static_cast<LauncherItem*>(m_launcherModel->get(index));
157
176
158 QVariantList retval;
177 QVariantList retval;
159 if (message.member() == "Get") {
178 if (message.member() == "Get") {
179+ QString cachedString = message.arguments()[1].toString();
160 if (!item) {
180 if (!item) {
161 return false;
181 return false;
162 }
182 }
163− if (message.arguments()[1].toString() == "count") {
183+ if (cachedString == "count") {
164 retval.append(QVariant::fromValue(QDBusVariant(item->count())));
184 retval.append(QVariant::fromValue(QDBusVariant(item->count())));
165− } else if (message.arguments()[1].toString() == "countVisible") {
185+ } else if (cachedString == "countVisible") {
166 retval.append(QVariant::fromValue(QDBusVariant(item->countVisible())));
186 retval.append(QVariant::fromValue(QDBusVariant(item->countVisible())));
187+ } else if (cachedString == "progress") {
188+ retval.append(QVariant::fromValue(QDBusVariant(item->progress())));
167 }
189 }
168 } else if (message.member() == "Set") {
190 } else if (message.member() == "Set") {
169− if (message.arguments()[1].toString() == "count") {
191+ QString cachedString = message.arguments()[1].toString();
192+ if (cachedString == "count") {
170 int newCount = message.arguments()[2].value<QDBusVariant>().variant().toInt();
193 int newCount = message.arguments()[2].value<QDBusVariant>().variant().toInt();
171 if (!item || newCount != item->count()) {
194 if (!item || newCount != item->count()) {
172 Q_EMIT countChanged(appid, newCount);
195 Q_EMIT countChanged(appid, newCount);
173 notifyPropertyChanged("com.canonical.Unity.Launcher.Item", encodeAppId(appid), "count", QVariant(newCount));
196 notifyPropertyChanged("com.canonical.Unity.Launcher.Item", encodeAppId(appid), "count", QVariant(newCount));
174 }
197 }
175− } else if (message.arguments()[1].toString() == "countVisible") {
198+ } else if (cachedString == "countVisible") {
176 bool newVisible = message.arguments()[2].value<QDBusVariant>().variant().toBool();
199 bool newVisible = message.arguments()[2].value<QDBusVariant>().variant().toBool();
177 if (!item || newVisible != item->countVisible()) {
200 if (!item || newVisible != item->countVisible()) {
178 Q_EMIT countVisibleChanged(appid, newVisible);
201 Q_EMIT countVisibleChanged(appid, newVisible);
179 notifyPropertyChanged("com.canonical.Unity.Launcher.Item", encodeAppId(appid), "countVisible", newVisible);
202 notifyPropertyChanged("com.canonical.Unity.Launcher.Item", encodeAppId(appid), "countVisible", newVisible);
180 }
203 }
204+ } else if (cachedString == "progress") {
205+ int newProgress = message.arguments()[2].value<QDBusVariant>().variant().toInt();
206+ if (!item || newProgress != item->progress()) {
207+ Q_EMIT progressChanged(appid, newProgress);
208+ notifyPropertyChanged("com.canonical.Unity.Launcher.Item", encodeAppId(appid), "progress", QVariant(newProgress));
209+ }
181 }
210 }
182 } else if (message.member() == "GetAll") {
211 } else if (message.member() == "GetAll") {
183 if (item) {
212 if (item) {
184 QVariantMap all;
213 QVariantMap all;
185 all.insert("count", item->count());
214 all.insert("count", item->count());
186 all.insert("countVisible", item->countVisible());
215 all.insert("countVisible", item->countVisible());
216+ all.insert("progress", item->progress());
187 retval.append(all);
217 retval.append(all);
188 }
218 }
189 } else {
219 } else {
plugins/Unity/Launcher/dbusinterface.h+2
@@ -36,7 +36,9 @@ public:
36Q_SIGNALS:
36Q_SIGNALS:
37 void countChanged(const QString &appId, int count);
37 void countChanged(const QString &appId, int count);
38 void countVisibleChanged(const QString &appId, bool countVisible);
38 void countVisibleChanged(const QString &appId, bool countVisible);
39+ void progressChanged(const QString &appId, int progress);
39 void refreshCalled();
40 void refreshCalled();
41+ void alertCalled(const QString &appId);
40
42
41private:
43private:
42 static QString decodeAppId(const QString& path);
44 static QString decodeAppId(const QString& path);
plugins/Unity/Launcher/gsettings.cpp+1−1
@@ -68,7 +68,7 @@ void GSettings::setStoredApplications(const QStringList &storedApplications)
68void GSettings::onSettingsChanged(const QString &key)
68void GSettings::onSettingsChanged(const QString &key)
69{
69{
70 if (key == "items") {
70 if (key == "items") {
71− QStringList cachedItems = m_gSettings->get("items").toStringList();
71+ const QStringList cachedItems = m_gSettings->get("items").toStringList();
72 if (m_cachedItems != cachedItems) {
72 if (m_cachedItems != cachedItems) {
73 m_cachedItems = cachedItems;
73 m_cachedItems = cachedItems;
74 Q_EMIT changed();
74 Q_EMIT changed();
plugins/Unity/Launcher/launcheritem.cpp+33
@@ -34,16 +34,22 @@ LauncherItem::LauncherItem(const QString &appId, const QString &name, const QStr
34 m_count(0),
34 m_count(0),
35 m_countVisible(false),
35 m_countVisible(false),
36 m_focused(false),
36 m_focused(false),
37+ m_alerting(false),
37 m_quickList(new QuickListModel(this))
38 m_quickList(new QuickListModel(this))
38{
39{
39 QuickListEntry nameAction;
40 QuickListEntry nameAction;
40 nameAction.setActionId("launch_item");
41 nameAction.setActionId("launch_item");
41 nameAction.setText(m_name);
42 nameAction.setText(m_name);
42 m_quickList->appendAction(nameAction);
43 m_quickList->appendAction(nameAction);
44+
43 QuickListEntry pinningAction;
45 QuickListEntry pinningAction;
44 pinningAction.setActionId("pin_item");
46 pinningAction.setActionId("pin_item");
45 pinningAction.setText(gettext("Pin shortcut"));
47 pinningAction.setText(gettext("Pin shortcut"));
46 m_quickList->appendAction(pinningAction);
48 m_quickList->appendAction(pinningAction);
49+
50+ m_quitAction.setActionId("stop_item");
51+ m_quitAction.setIcon("application-exit");
52+ m_quitAction.setText(gettext("Quit"));
47}
53}
48
54
49QString LauncherItem::appId() const
55QString LauncherItem::appId() const
@@ -110,6 +116,11 @@ void LauncherItem::setRunning(bool running)
110{
116{
111 if (m_running != running) {
117 if (m_running != running) {
112 m_running = running;
118 m_running = running;
119+ if (m_running) { // add the quit action
120+ m_quickList->appendAction(m_quitAction);
121+ } else { // remove the quit action
122+ m_quickList->removeAction(m_quitAction);
123+ }
113 Q_EMIT runningChanged(running);
124 Q_EMIT runningChanged(running);
114 }
125 }
115}
126}
@@ -150,6 +161,9 @@ void LauncherItem::setCount(int count)
150 if (m_count != count) {
161 if (m_count != count) {
151 m_count = count;
162 m_count = count;
152 Q_EMIT countChanged(count);
163 Q_EMIT countChanged(count);
164+ if (m_countVisible) {
165+ setAlerting(true);
166+ }
153 }
167 }
154}
168}
155
169
@@ -163,6 +177,9 @@ void LauncherItem::setCountVisible(bool countVisible)
163 if (m_countVisible != countVisible) {
177 if (m_countVisible != countVisible) {
164 m_countVisible = countVisible;
178 m_countVisible = countVisible;
165 Q_EMIT countVisibleChanged(countVisible);
179 Q_EMIT countVisibleChanged(countVisible);
180+ if (countVisible) {
181+ setAlerting(true);
182+ }
166 }
183 }
167}
184}
168
185
@@ -175,10 +192,26 @@ void LauncherItem::setFocused(bool focused)
175{
192{
176 if (m_focused != focused) {
193 if (m_focused != focused) {
177 m_focused = focused;
194 m_focused = focused;
195+ if (focused) {
196+ setAlerting(false);
197+ }
178 Q_EMIT focusedChanged(focused);
198 Q_EMIT focusedChanged(focused);
179 }
199 }
180}
200}
181
201
202+bool LauncherItem::alerting() const
203+{
204+ return m_alerting;
205+}
206+
207+void LauncherItem::setAlerting(bool alerting)
208+{
209+ if (m_alerting != alerting) {
210+ m_alerting = alerting;
211+ Q_EMIT alertingChanged(alerting);
212+ }
213+}
214+
182unity::shell::launcher::QuickListModelInterface *LauncherItem::quickList() const
215unity::shell::launcher::QuickListModelInterface *LauncherItem::quickList() const
183{
216{
184 return m_quickList;
217 return m_quickList;
plugins/Unity/Launcher/launcheritem.h+4
@@ -44,6 +44,7 @@ public:
44 int count() const override;
44 int count() const override;
45 bool countVisible() const override;
45 bool countVisible() const override;
46 bool focused() const override;
46 bool focused() const override;
47+ bool alerting() const override;
47
48
48 unity::shell::launcher::QuickListModelInterface *quickList() const override;
49 unity::shell::launcher::QuickListModelInterface *quickList() const override;
49
50
@@ -57,6 +58,7 @@ private:
57 void setCount(int count);
58 void setCount(int count);
58 void setCountVisible(bool countVisible);
59 void setCountVisible(bool countVisible);
59 void setFocused(bool focused);
60 void setFocused(bool focused);
61+ void setAlerting(bool alerting);
60
62
61private:
63private:
62 QString m_appId;
64 QString m_appId;
@@ -69,7 +71,9 @@ private:
69 int m_count;
71 int m_count;
70 bool m_countVisible;
72 bool m_countVisible;
71 bool m_focused;
73 bool m_focused;
74+ bool m_alerting;
72 QuickListModel *m_quickList;
75 QuickListModel *m_quickList;
76+ QuickListEntry m_quitAction;
73
77
74 friend class LauncherModel;
78 friend class LauncherModel;
75};
79};
plugins/Unity/Launcher/launchermodel.cpp+78−26
@@ -36,11 +36,13 @@ LauncherModel::LauncherModel(QObject *parent):
36 m_settings(new GSettings(this)),
36 m_settings(new GSettings(this)),
37 m_dbusIface(new DBusInterface(this)),
37 m_dbusIface(new DBusInterface(this)),
38 m_asAdapter(new ASAdapter()),
38 m_asAdapter(new ASAdapter()),
39− m_appManager(0)
39+ m_appManager(nullptr)
40{
40{
41 connect(m_dbusIface, &DBusInterface::countChanged, this, &LauncherModel::countChanged);
41 connect(m_dbusIface, &DBusInterface::countChanged, this, &LauncherModel::countChanged);
42 connect(m_dbusIface, &DBusInterface::countVisibleChanged, this, &LauncherModel::countVisibleChanged);
42 connect(m_dbusIface, &DBusInterface::countVisibleChanged, this, &LauncherModel::countVisibleChanged);
43+ connect(m_dbusIface, &DBusInterface::progressChanged, this, &LauncherModel::progressChanged);
43 connect(m_dbusIface, &DBusInterface::refreshCalled, this, &LauncherModel::refresh);
44 connect(m_dbusIface, &DBusInterface::refreshCalled, this, &LauncherModel::refresh);
45+ connect(m_dbusIface, &DBusInterface::alertCalled, this, &LauncherModel::alert);
44
46
45 connect(m_settings, &GSettings::changed, this, &LauncherModel::refresh);
47 connect(m_settings, &GSettings::changed, this, &LauncherModel::refresh);
46
48
@@ -82,11 +84,30 @@ QVariant LauncherModel::data(const QModelIndex &index, int role) const
82 return item->progress();
84 return item->progress();
83 case RoleFocused:
85 case RoleFocused:
84 return item->focused();
86 return item->focused();
87+ case RoleAlerting:
88+ return item->alerting();
89+ case RoleRunning:
90+ return item->running();
91+ default:
92+ qWarning() << Q_FUNC_INFO << "missing role, implement me";
93+ return QVariant();
85 }
94 }
86
95
87 return QVariant();
96 return QVariant();
88}
97}
89
98
99+void LauncherModel::setAlerting(const QString &appId, bool alerting) {
100+ int index = findApplication(appId);
101+ if (index >= 0) {
102+ QModelIndex modelIndex = this->index(index);
103+ LauncherItem *item = m_list.at(index);
104+ if (!item->focused()) {
105+ item->setAlerting(alerting);
106+ Q_EMIT dataChanged(modelIndex, modelIndex, QVector<int>() << RoleAlerting);
107+ }
108+ }
109+}
110+
90unity::shell::launcher::LauncherItemInterface *LauncherModel::get(int index) const
111unity::shell::launcher::LauncherItemInterface *LauncherModel::get(int index) const
91{
112{
92 if (index < 0 || index >= m_list.count()) {
113 if (index < 0 || index >= m_list.count()) {
@@ -134,7 +155,7 @@ void LauncherModel::pin(const QString &appId, int index)
134 if (index == -1 || index == currentIndex) {
155 if (index == -1 || index == currentIndex) {
135 m_list.at(currentIndex)->setPinned(true);
156 m_list.at(currentIndex)->setPinned(true);
136 QModelIndex modelIndex = this->index(currentIndex);
157 QModelIndex modelIndex = this->index(currentIndex);
137− Q_EMIT dataChanged(modelIndex, modelIndex, QVector<int>() << RolePinned);
158+ Q_EMIT dataChanged(modelIndex, modelIndex, {RolePinned});
138 } else {
159 } else {
139 move(currentIndex, index);
160 move(currentIndex, index);
140 // move() will store the list to the backend itself, so just exit at this point.
161 // move() will store the list to the backend itself, so just exit at this point.
@@ -147,7 +168,7 @@ void LauncherModel::pin(const QString &appId, int index)
147
168
148 DesktopFileHandler desktopFile(appId);
169 DesktopFileHandler desktopFile(appId);
149 if (!desktopFile.isValid()) {
170 if (!desktopFile.isValid()) {
150− qWarning() << "Can't pin this application, there is no .destkop file available.";
171+ qWarning() << "Can't pin this application, there is no .desktop file available.";
151 return;
172 return;
152 }
173 }
153
174
@@ -172,7 +193,7 @@ void LauncherModel::requestRemove(const QString &appId)
172
193
173void LauncherModel::quickListActionInvoked(const QString &appId, int actionIndex)
194void LauncherModel::quickListActionInvoked(const QString &appId, int actionIndex)
174{
195{
175− int index = findApplication(appId);
196+ const int index = findApplication(appId);
176 if (index < 0) {
197 if (index < 0) {
177 return;
198 return;
178 }
199 }
@@ -180,7 +201,7 @@ void LauncherModel::quickListActionInvoked(const QString &appId, int actionIndex
180 LauncherItem *item = m_list.at(index);
201 LauncherItem *item = m_list.at(index);
181 QuickListModel *model = qobject_cast<QuickListModel*>(item->quickList());
202 QuickListModel *model = qobject_cast<QuickListModel*>(item->quickList());
182 if (model) {
203 if (model) {
183− QString actionId = model->get(actionIndex).actionId();
204+ const QString actionId = model->get(actionIndex).actionId();
184
205
185 // Check if this is one of the launcher actions we handle ourselves
206 // Check if this is one of the launcher actions we handle ourselves
186 if (actionId == "pin_item") {
207 if (actionId == "pin_item") {
@@ -191,7 +212,10 @@ void LauncherModel::quickListActionInvoked(const QString &appId, int actionIndex
191 }
212 }
192 } else if (actionId == "launch_item") {
213 } else if (actionId == "launch_item") {
193 QDesktopServices::openUrl(getUrlForAppId(appId));
214 QDesktopServices::openUrl(getUrlForAppId(appId));
194−
215+ } else if (actionId == "stop_item") { // Quit
216+ if (m_appManager) {
217+ m_appManager->stopApplication(appId);
218+ }
195 // Nope, we don't know this action, let the backend forward it to the application
219 // Nope, we don't know this action, let the backend forward it to the application
196 } else {
220 } else {
197 // TODO: forward quicklist action to app, possibly via m_dbusIface
221 // TODO: forward quicklist action to app, possibly via m_dbusIface
@@ -289,7 +313,7 @@ void LauncherModel::storeAppList()
289
313
290void LauncherModel::unpin(const QString &appId)
314void LauncherModel::unpin(const QString &appId)
291{
315{
292− int index = findApplication(appId);
316+ const int index = findApplication(appId);
293 if (index < 0) {
317 if (index < 0) {
294 return;
318 return;
295 }
319 }
@@ -298,7 +322,7 @@ void LauncherModel::unpin(const QString &appId)
298 if (m_list.at(index)->pinned()) {
322 if (m_list.at(index)->pinned()) {
299 m_list.at(index)->setPinned(false);
323 m_list.at(index)->setPinned(false);
300 QModelIndex modelIndex = this->index(index);
324 QModelIndex modelIndex = this->index(index);
301− Q_EMIT dataChanged(modelIndex, modelIndex, QVector<int>() << RolePinned);
325+ Q_EMIT dataChanged(modelIndex, modelIndex, {RolePinned});
302 }
326 }
303 } else {
327 } else {
304 beginRemoveRows(QModelIndex(), index, index);
328 beginRemoveRows(QModelIndex(), index, index);
@@ -320,32 +344,38 @@ int LauncherModel::findApplication(const QString &appId)
320
344
321void LauncherModel::progressChanged(const QString &appId, int progress)
345void LauncherModel::progressChanged(const QString &appId, int progress)
322{
346{
323− int idx = findApplication(appId);
347+ const int idx = findApplication(appId);
324 if (idx >= 0) {
348 if (idx >= 0) {
325 LauncherItem *item = m_list.at(idx);
349 LauncherItem *item = m_list.at(idx);
326 item->setProgress(progress);
350 item->setProgress(progress);
327− Q_EMIT dataChanged(index(idx), index(idx), QVector<int>() << RoleProgress);
351+ Q_EMIT dataChanged(index(idx), index(idx), {RoleProgress});
328 }
352 }
329}
353}
330
354
331void LauncherModel::countChanged(const QString &appId, int count)
355void LauncherModel::countChanged(const QString &appId, int count)
332{
356{
333− int idx = findApplication(appId);
357+ const int idx = findApplication(appId);
334 if (idx >= 0) {
358 if (idx >= 0) {
335 LauncherItem *item = m_list.at(idx);
359 LauncherItem *item = m_list.at(idx);
336 item->setCount(count);
360 item->setCount(count);
337− Q_EMIT dataChanged(index(idx), index(idx), QVector<int>() << RoleCount);
361+ if (item->countVisible()) {
362+ setAlerting(item->appId(), true);
363+ }
338 m_asAdapter->syncItems(m_list);
364 m_asAdapter->syncItems(m_list);
365+ Q_EMIT dataChanged(index(idx), index(idx), {RoleCount});
339 }
366 }
340}
367}
341
368
342−void LauncherModel::countVisibleChanged(const QString &appId, int countVisible)
369+void LauncherModel::countVisibleChanged(const QString &appId, bool countVisible)
343{
370{
344 int idx = findApplication(appId);
371 int idx = findApplication(appId);
345 if (idx >= 0) {
372 if (idx >= 0) {
346 LauncherItem *item = m_list.at(idx);
373 LauncherItem *item = m_list.at(idx);
347 item->setCountVisible(countVisible);
374 item->setCountVisible(countVisible);
375+ if (countVisible) {
376+ setAlerting(item->appId(), true);
377+ }
348− Q_EMIT dataChanged(index(idx), index(idx), QVector<int>() << RoleCountVisible);
378+ Q_EMIT dataChanged(index(idx), index(idx), {RoleCountVisible});
349
379
350 // If countVisible goes to false, and the item is neither pinned nor recent we can drop it
380 // If countVisible goes to false, and the item is neither pinned nor recent we can drop it
351 if (!countVisible && !item->pinned() && !item->recent()) {
381 if (!countVisible && !item->pinned() && !item->recent()) {
@@ -364,7 +394,6 @@ void LauncherModel::countVisibleChanged(const QString &appId, int countVisible)
364 beginInsertRows(QModelIndex(), m_list.count(), m_list.count());
394 beginInsertRows(QModelIndex(), m_list.count(), m_list.count());
365 m_list.append(item);
395 m_list.append(item);
366 endInsertRows();
396 endInsertRows();
367− Q_EMIT hint();
368 }
397 }
369 }
398 }
370 m_asAdapter->syncItems(m_list);
399 m_asAdapter->syncItems(m_list);
@@ -387,7 +416,8 @@ void LauncherModel::refresh()
387 item->setName(desktopFile.displayName());
416 item->setName(desktopFile.displayName());
388 item->setIcon(desktopFile.icon());
417 item->setIcon(desktopFile.icon());
389 item->setPinned(item->pinned()); // update pinned text if needed
418 item->setPinned(item->pinned()); // update pinned text if needed
419+ item->setRunning(item->running());
390− Q_EMIT dataChanged(index(idx), index(idx), QVector<int>() << RoleName << RoleIcon);
420+ Q_EMIT dataChanged(index(idx), index(idx), {RoleName, RoleIcon, RoleRunning});
391 }
421 }
392 }
422 }
393
423
@@ -405,7 +435,7 @@ void LauncherModel::refresh()
405
435
406 // Now walk through settings and see if we need to add something
436 // Now walk through settings and see if we need to add something
407 for (int settingsIndex = 0; settingsIndex < m_settings->storedApplications().count(); ++settingsIndex) {
437 for (int settingsIndex = 0; settingsIndex < m_settings->storedApplications().count(); ++settingsIndex) {
408− QString entry = m_settings->storedApplications().at(settingsIndex);
438+ const QString entry = m_settings->storedApplications().at(settingsIndex);
409 int itemIndex = -1;
439 int itemIndex = -1;
410 for (int i = 0; i < m_list.count(); ++i) {
440 for (int i = 0; i < m_list.count(); ++i) {
411 if (m_list.at(i)->appId() == entry) {
441 if (m_list.at(i)->appId() == entry) {
@@ -453,6 +483,16 @@ void LauncherModel::refresh()
453 m_asAdapter->syncItems(m_list);
483 m_asAdapter->syncItems(m_list);
454}
484}
455
485
486+void LauncherModel::alert(const QString &appId)
487+{
488+ int idx = findApplication(appId);
489+ if (idx >= 0) {
490+ LauncherItem *item = m_list.at(idx);
491+ setAlerting(item->appId(), true);
492+ Q_EMIT dataChanged(index(idx), index(idx), QVector<int>() << RoleAlerting);
493+ }
494+}
495+
456void LauncherModel::applicationAdded(const QModelIndex &parent, int row)
496void LauncherModel::applicationAdded(const QModelIndex &parent, int row)
457{
497{
458 Q_UNUSED(parent);
498 Q_UNUSED(parent);
@@ -468,25 +508,27 @@ void LauncherModel::applicationAdded(const QModelIndex &parent, int row)
468 return;
508 return;
469 }
509 }
470
510
471− int itemIndex = findApplication(app->appId());
511+ const int itemIndex = findApplication(app->appId());
472 if (itemIndex != -1) {
512 if (itemIndex != -1) {
473 LauncherItem *item = m_list.at(itemIndex);
513 LauncherItem *item = m_list.at(itemIndex);
474 if (!item->recent()) {
514 if (!item->recent()) {
475 item->setRecent(true);
515 item->setRecent(true);
476− m_asAdapter->syncItems(m_list);
477− Q_EMIT dataChanged(index(itemIndex), index(itemIndex), QVector<int>() << RoleRecent);
516+ Q_EMIT dataChanged(index(itemIndex), index(itemIndex), {RoleRecent});
478 }
517 }
518+ item->setRunning(true);
479− // Shall we paint some running/recent app highlight? If yes, do it here.
519+ // TODO Shall we paint some running/recent app highlight? If yes, do it here.
480 } else {
520 } else {
481 LauncherItem *item = new LauncherItem(app->appId(), app->name(), app->icon().toString(), this);
521 LauncherItem *item = new LauncherItem(app->appId(), app->name(), app->icon().toString(), this);
482 item->setRecent(true);
522 item->setRecent(true);
523+ item->setRunning(true);
483 item->setFocused(app->focused());
524 item->setFocused(app->focused());
484
525
485 beginInsertRows(QModelIndex(), m_list.count(), m_list.count());
526 beginInsertRows(QModelIndex(), m_list.count(), m_list.count());
486 m_list.append(item);
527 m_list.append(item);
487 endInsertRows();
528 endInsertRows();
488− m_asAdapter->syncItems(m_list);
489 }
529 }
530+ m_asAdapter->syncItems(m_list);
531+ Q_EMIT dataChanged(index(itemIndex), index(itemIndex), {RoleRunning});
490}
532}
491
533
492void LauncherModel::applicationRemoved(const QModelIndex &parent, int row)
534void LauncherModel::applicationRemoved(const QModelIndex &parent, int row)
@@ -501,25 +543,35 @@ void LauncherModel::applicationRemoved(const QModelIndex &parent, int row)
501 }
543 }
502 }
544 }
503
545
546+ if (appIndex < 0) {
547+ qWarning() << Q_FUNC_INFO << "appIndex not found";
548+ return;
549+ }
550+
504− if (appIndex > -1 && !m_list.at(appIndex)->pinned()) {
551+ LauncherItem * item = m_list.at(appIndex);
552+ item->setRunning(false);
553+
554+ if (!item->pinned()) {
505 beginRemoveRows(QModelIndex(), appIndex, appIndex);
555 beginRemoveRows(QModelIndex(), appIndex, appIndex);
506 m_list.takeAt(appIndex)->deleteLater();
556 m_list.takeAt(appIndex)->deleteLater();
507 endRemoveRows();
557 endRemoveRows();
508 m_asAdapter->syncItems(m_list);
558 m_asAdapter->syncItems(m_list);
559+ Q_EMIT dataChanged(index(appIndex), index(appIndex), {RolePinned});
509 }
560 }
561+ Q_EMIT dataChanged(index(appIndex), index(appIndex), {RoleRunning});
510}
562}
511
563
512void LauncherModel::focusedAppIdChanged()
564void LauncherModel::focusedAppIdChanged()
513{
565{
514− QString appId = m_appManager->focusedApplicationId();
566+ const QString appId = m_appManager->focusedApplicationId();
515 for (int i = 0; i < m_list.count(); ++i) {
567 for (int i = 0; i < m_list.count(); ++i) {
516 LauncherItem *item = m_list.at(i);
568 LauncherItem *item = m_list.at(i);
517 if (!item->focused() && item->appId() == appId) {
569 if (!item->focused() && item->appId() == appId) {
518 item->setFocused(true);
570 item->setFocused(true);
519− Q_EMIT dataChanged(index(i), index(i), QVector<int>() << RoleFocused);
571+ Q_EMIT dataChanged(index(i), index(i), {RoleFocused});
520 } else if (item->focused() && item->appId() != appId) {
572 } else if (item->focused() && item->appId() != appId) {
521 item->setFocused(false);
573 item->setFocused(false);
522− Q_EMIT dataChanged(index(i), index(i), QVector<int>() << RoleFocused);
574+ Q_EMIT dataChanged(index(i), index(i), {RoleFocused});
523 }
575 }
524 }
576 }
525}
577}
plugins/Unity/Launcher/launchermodel.h+3−1
@@ -45,6 +45,7 @@ public:
45
45
46 QVariant data(const QModelIndex &index, int role) const override;
46 QVariant data(const QModelIndex &index, int role) const override;
47
47
48+ Q_INVOKABLE void setAlerting(const QString &appId, bool alerting) override;
48 Q_INVOKABLE unity::shell::launcher::LauncherItemInterface* get(int index) const override;
49 Q_INVOKABLE unity::shell::launcher::LauncherItemInterface* get(int index) const override;
49 Q_INVOKABLE void move(int oldIndex, int newIndex) override;
50 Q_INVOKABLE void move(int oldIndex, int newIndex) override;
50 Q_INVOKABLE void pin(const QString &appId, int index = -1) override;
51 Q_INVOKABLE void pin(const QString &appId, int index = -1) override;
@@ -63,6 +64,7 @@ public:
63public Q_SLOTS:
64public Q_SLOTS:
64 void requestRemove(const QString &appId) override;
65 void requestRemove(const QString &appId) override;
65 Q_INVOKABLE void refresh();
66 Q_INVOKABLE void refresh();
67+ Q_INVOKABLE void alert(const QString &appId);
66
68
67private:
69private:
68 void storeAppList();
70 void storeAppList();
@@ -71,7 +73,7 @@ private:
71
73
72private Q_SLOTS:
74private Q_SLOTS:
73 void countChanged(const QString &appId, int count);
75 void countChanged(const QString &appId, int count);
74− void countVisibleChanged(const QString &appId, int count);
76+ void countVisibleChanged(const QString &appId, bool count);
75 void progressChanged(const QString &appId, int progress);
77 void progressChanged(const QString &appId, int progress);
76
78
77 void applicationAdded(const QModelIndex &parent, int row);
79 void applicationAdded(const QModelIndex &parent, int row);
plugins/Unity/Launcher/quicklistentry.cpp+6−2
@@ -1,4 +1,4 @@
1−/* Copyright (C) 2013 Canonical, Ltd.
1+/* Copyright (C) 2013, 2015 Canonical, Ltd.
2 *
2 *
3 * Authors:
3 * Authors:
4 * Michael Zanetti <michael.zanetti@canonical.com>
4 * Michael Zanetti <michael.zanetti@canonical.com>
@@ -20,7 +20,6 @@
20
20
21QuickListEntry::QuickListEntry()
21QuickListEntry::QuickListEntry()
22{
22{
23−
24}
23}
25
24
26QString QuickListEntry::actionId() const
25QString QuickListEntry::actionId() const
@@ -57,3 +56,8 @@ bool QuickListEntry::clickable() const
57{
56{
58 return !m_actionId.isEmpty();
57 return !m_actionId.isEmpty();
59}
58}
59+
60+bool QuickListEntry::operator==(const QuickListEntry &other)
61+{
62+ return !other.actionId().isEmpty() && other.actionId() == m_actionId;
63+}
plugins/Unity/Launcher/quicklistentry.h+3−1
@@ -1,4 +1,4 @@
1−/* Copyright (C) 2013 Canonical, Ltd.
1+/* Copyright (C) 2013, 2015 Canonical, Ltd.
2 *
2 *
3 * Authors:
3 * Authors:
4 * Michael Zanetti <michael.zanetti@canonical.com>
4 * Michael Zanetti <michael.zanetti@canonical.com>
@@ -37,6 +37,8 @@ public:
37
37
38 bool clickable() const;
38 bool clickable() const;
39
39
40+ bool operator==(const QuickListEntry & other);
41+
40private:
42private:
41 QString m_actionId;
43 QString m_actionId;
42 QString m_text;
44 QString m_text;
plugins/Unity/Launcher/quicklistmodel.cpp+12−1
@@ -1,5 +1,5 @@
1/*
1/*
2− * Copyright 2013 Canonical Ltd.
2+ * Copyright 2013, 2015 Canonical Ltd.
3 *
3 *
4 * This program is free software; you can redistribute it and/or modify
4 * This program is free software; you can redistribute it and/or modify
5 * it under the terms of the GNU Lesser General Public License as published by
5 * it under the terms of the GNU Lesser General Public License as published by
@@ -48,6 +48,17 @@ void QuickListModel::updateAction(const QuickListEntry &entry)
48 }
48 }
49}
49}
50
50
51+void QuickListModel::removeAction(const QuickListEntry &entry)
52+{
53+ const int start = m_list.indexOf(entry);
54+ if (start > -1) {
55+ beginRemoveRows(QModelIndex(), start, start);
56+ m_list.removeOne(entry);
57+ Q_EMIT dataChanged(index(start), index(start));
58+ endRemoveRows();
59+ }
60+}
61+
51QuickListEntry QuickListModel::get(int index) const
62QuickListEntry QuickListModel::get(int index) const
52{
63{
53 return m_list.at(index);
64 return m_list.at(index);
plugins/Unity/Launcher/quicklistmodel.h+3−1
@@ -1,5 +1,5 @@
1/*
1/*
2− * Copyright 2013 Canonical Ltd.
2+ * Copyright 201, 2015 Canonical Ltd.
3 *
3 *
4 * This program is free software; you can redistribute it and/or modify
4 * This program is free software; you can redistribute it and/or modify
5 * it under the terms of the GNU Lesser General Public License as published by
5 * it under the terms of the GNU Lesser General Public License as published by
@@ -46,6 +46,8 @@ public:
46 */
46 */
47 void updateAction(const QuickListEntry &entry);
47 void updateAction(const QuickListEntry &entry);
48
48
49+ void removeAction(const QuickListEntry &entry);
50+
49 QuickListEntry get(int index) const;
51 QuickListEntry get(int index) const;
50
52
51 int rowCount(const QModelIndex &parent = QModelIndex()) const override;
53 int rowCount(const QModelIndex &parent = QModelIndex()) const override;
plugins/Unity/Session/CMakeLists.txt+1
@@ -2,6 +2,7 @@ pkg_search_module(GIO REQUIRED gio-2.0)
2
2
3include_directories(
3include_directories(
4 ${CMAKE_CURRENT_SOURCE_DIR}
4 ${CMAKE_CURRENT_SOURCE_DIR}
5+ ${CMAKE_CURRENT_BINARY_DIR}
5 ${GIO_INCLUDE_DIRS}
6 ${GIO_INCLUDE_DIRS}
6 ${libunity8-private_SOURCE_DIR}
7 ${libunity8-private_SOURCE_DIR}
7)
8)
plugins/Unity/Session/dbusunitysessionservice.cpp+372−24
@@ -1,5 +1,5 @@
1/*
1/*
2− * Copyright (C) 2014 Canonical, Ltd.
2+ * Copyright (C) 2014, 2015 Canonical, Ltd.
3 *
3 *
4 * This program is free software: you can redistribute it and/or modify it under
4 * This program is free software: you can redistribute it and/or modify it under
5 * the terms of the GNU Lesser General Public License version 3, as published by
5 * the terms of the GNU Lesser General Public License version 3, as published by
@@ -17,17 +17,186 @@
17// local
17// local
18#include "dbusunitysessionservice.h"
18#include "dbusunitysessionservice.h"
19
19
20+// system
21+#include <sys/types.h>
22+#include <unistd.h>
23+#include <pwd.h>
24+
20// Qt
25// Qt
26+#include <QDebug>
21#include <QDBusPendingCall>
27#include <QDBusPendingCall>
28+#include <QDBusReply>
29+#include <QElapsedTimer>
30+#include <QDateTime>
31+
32+#define LOGIN1_SERVICE QStringLiteral("org.freedesktop.login1")
33+#define LOGIN1_PATH QStringLiteral("/org/freedesktop/login1")
34+#define LOGIN1_IFACE QStringLiteral("org.freedesktop.login1.Manager")
35+#define LOGIN1_SESSION_IFACE QStringLiteral("org.freedesktop.login1.Session")
36+
37+#define ACTIVE_KEY QStringLiteral("Active")
38+#define IDLE_SINCE_KEY QStringLiteral("IdleSinceHint")
39+
40+class DBusUnitySessionServicePrivate: public QObject
41+{
42+ Q_OBJECT
43+public:
44+ QString logindSessionPath;
45+ bool isSessionActive = true;
46+ QElapsedTimer screensaverActiveTimer;
47+
48+ DBusUnitySessionServicePrivate(): QObject() {
49+ init();
50+ checkActive();
51+ }
52+
53+ void init()
54+ {
55+ // get our logind session path
56+ QDBusMessage msg = QDBusMessage::createMethodCall(LOGIN1_SERVICE,
57+ LOGIN1_PATH,
58+ LOGIN1_IFACE,
59+ "GetSessionByPID");
60+ msg << (quint32) getpid();
61+
62+ QDBusReply<QDBusObjectPath> reply = QDBusConnection::systemBus().asyncCall(msg);
63+ if (reply.isValid()) {
64+ logindSessionPath = reply.value().path();
65+
66+ // start watching the Active property
67+ QDBusConnection::systemBus().connect(LOGIN1_SERVICE, logindSessionPath, "org.freedesktop.DBus.Properties", "PropertiesChanged",
68+ this, SLOT(onPropertiesChanged(QString,QVariantMap,QStringList)));
69+ } else {
70+ qWarning() << "Failed to get logind session path" << reply.error().message();
71+ }
72+ }
73+
74+ bool checkLogin1Call(const QString &method) const
75+ {
76+ QDBusMessage msg = QDBusMessage::createMethodCall(LOGIN1_SERVICE, LOGIN1_PATH, LOGIN1_IFACE, method);
77+ QDBusReply<QString> reply = QDBusConnection::systemBus().asyncCall(msg);
78+ return reply.isValid() && (reply == QStringLiteral("yes") || reply == QStringLiteral("challenge"));
79+ }
80+
81+ void makeLogin1Call(const QString &method, const QVariantList &args)
82+ {
83+ QDBusMessage msg = QDBusMessage::createMethodCall(LOGIN1_SERVICE,
84+ LOGIN1_PATH,
85+ LOGIN1_IFACE,
86+ method);
87+ msg.setArguments(args);
88+ QDBusConnection::systemBus().asyncCall(msg);
89+ }
90+
91+ void checkActive()
92+ {
93+ if (logindSessionPath.isEmpty()) {
94+ qWarning() << "Invalid session path";
95+ return;
96+ }
97+
98+ QDBusMessage msg = QDBusMessage::createMethodCall(LOGIN1_SERVICE,
99+ logindSessionPath,
100+ "org.freedesktop.DBus.Properties",
101+ "Get");
102+ msg << LOGIN1_SESSION_IFACE;
103+ msg << ACTIVE_KEY;
104+
105+ QDBusReply<QVariant> reply = QDBusConnection::systemBus().asyncCall(msg);
106+ if (reply.isValid()) {
107+ isSessionActive = reply.value().toBool();
108+ qDebug() << "Session" << logindSessionPath << "is active:" << isSessionActive;
109+ } else {
110+ qWarning() << "Failed to get Active property" << reply.error().message();
111+ }
112+ }
113+
114+ quint32 screensaverActiveTime() const
115+ {
116+ if (!isSessionActive && screensaverActiveTimer.isValid()) {
117+ return screensaverActiveTimer.elapsed() / 1000;
118+ }
119+
120+ return 0;
121+ }
122+
123+ quint64 idleSinceUSecTimestamp() const
124+ {
125+ QDBusMessage msg = QDBusMessage::createMethodCall(LOGIN1_SERVICE,
126+ logindSessionPath,
127+ "org.freedesktop.DBus.Properties",
128+ "Get");
129+ msg << LOGIN1_SESSION_IFACE;
130+ msg << IDLE_SINCE_KEY;
131+
132+ QDBusReply<QVariant> reply = QDBusConnection::systemBus().asyncCall(msg);
133+ if (reply.isValid()) {
134+ return reply.value().value<quint64>();
135+ } else {
136+ qWarning() << "Failed to get IdleSinceHint property" << reply.error().message();
137+ }
138+
139+ return 0;
140+ }
141+
142+ void setIdleHint(bool idle)
143+ {
144+ QDBusMessage msg = QDBusMessage::createMethodCall(LOGIN1_SERVICE,
145+ logindSessionPath,
146+ LOGIN1_SESSION_IFACE,
147+ "SetIdleHint");
148+ msg << idle;
149+ QDBusConnection::systemBus().asyncCall(msg);
150+ }
151+
152+private Q_SLOTS:
153+ void onPropertiesChanged(const QString &iface, const QVariantMap &changedProps, const QStringList &invalidatedProps)
154+ {
155+ Q_UNUSED(iface)
156+
157+ if (changedProps.contains(ACTIVE_KEY) || invalidatedProps.contains(ACTIVE_KEY)) {
158+ if (changedProps.value(ACTIVE_KEY).isValid()) {
159+ isSessionActive = changedProps.value(ACTIVE_KEY).toBool();
160+ } else {
161+ checkActive();
162+ }
163+
164+ Q_EMIT screensaverActiveChanged(!isSessionActive);
165+
166+ if (isSessionActive) {
167+ screensaverActiveTimer.invalidate();
168+ setIdleHint(false);
169+ } else {
170+ screensaverActiveTimer.start();
171+ setIdleHint(true);
172+ }
173+ }
174+ }
175+
176+Q_SIGNALS:
177+ void screensaverActiveChanged(bool active);
178+};
179+
180+Q_GLOBAL_STATIC(DBusUnitySessionServicePrivate, d)
22
181
23DBusUnitySessionService::DBusUnitySessionService()
182DBusUnitySessionService::DBusUnitySessionService()
24 : UnityDBusObject("/com/canonical/Unity/Session", "com.canonical.Unity")
183 : UnityDBusObject("/com/canonical/Unity/Session", "com.canonical.Unity")
25{
184{
185+ if (!d->logindSessionPath.isEmpty()) {
186+ // connect our Lock() slot to the logind's session Lock() signal
187+ QDBusConnection::systemBus().connect(LOGIN1_SERVICE, d->logindSessionPath, LOGIN1_SESSION_IFACE, "Lock", this, SLOT(Lock()));
188+ // ... and our Unlocked() signal to the logind's session Unlock() signal
189+ // (lightdm handles the unlocking by calling logind's Unlock method which in turn emits this signal we connect to)
190+ QDBusConnection::systemBus().connect(LOGIN1_SERVICE, d->logindSessionPath, LOGIN1_SESSION_IFACE, "Unlock", this, SIGNAL(Unlocked()));
191+ } else {
192+ qWarning() << "Failed to connect to logind's session Lock/Unlock signals";
193+ }
26}
194}
27
195
28void DBusUnitySessionService::Logout()
196void DBusUnitySessionService::Logout()
29{
197{
30 // TODO ask the apps to quit and then emit the signal
198 // TODO ask the apps to quit and then emit the signal
199+ Q_EMIT LogoutReady();
31 Q_EMIT logoutReady();
200 Q_EMIT logoutReady();
32}
201}
33
202
@@ -40,38 +209,139 @@ void DBusUnitySessionService::EndSession()
40 QDBusConnection::sessionBus().asyncCall(msg);
209 QDBusConnection::sessionBus().asyncCall(msg);
41}
210}
42
211
212+bool DBusUnitySessionService::CanHibernate() const
213+{
214+ return d->checkLogin1Call("CanHibernate");
215+}
216+
217+bool DBusUnitySessionService::CanSuspend() const
218+{
219+ return d->checkLogin1Call("CanSuspend");
220+}
221+
222+bool DBusUnitySessionService::CanHybridSleep() const
223+{
224+ return d->checkLogin1Call("CanHybridSleep");
225+}
226+
227+bool DBusUnitySessionService::CanReboot() const
228+{
229+ return d->checkLogin1Call("CanReboot");
230+}
231+
232+bool DBusUnitySessionService::CanShutdown() const
233+{
234+ return d->checkLogin1Call("CanPowerOff");
235+}
236+
237+bool DBusUnitySessionService::CanLock() const
238+{
239+ return true; // FIXME
240+}
241+
242+QString DBusUnitySessionService::UserName() const
243+{
244+ struct passwd *p = getpwuid(geteuid());
245+ if (p) {
246+ return QString::fromUtf8(p->pw_name);
247+ }
248+
249+ return QString();
250+}
251+
252+QString DBusUnitySessionService::RealName() const
253+{
254+ struct passwd *p = getpwuid(geteuid());
255+ if (p) {
256+ const QString gecos = QString::fromLocal8Bit(p->pw_gecos);
257+ if (!gecos.isEmpty()) {
258+ return gecos.split(QLatin1Char(',')).first();
259+ }
260+ }
261+
262+ return QString();
263+}
264+
265+QString DBusUnitySessionService::HostName() const
266+{
267+ char hostName[512];
268+ if (gethostname(hostName, sizeof(hostName)) == -1) {
269+ qWarning() << "Could not determine local hostname";
270+ return QString();
271+ }
272+ hostName[sizeof(hostName) - 1] = '\0';
273+ return QString::fromLocal8Bit(hostName);
274+}
275+
276+void DBusUnitySessionService::PromptLock()
277+{
278+ Q_EMIT LockRequested();
279+ Q_EMIT lockRequested();
280+}
281+
282+void DBusUnitySessionService::Lock()
283+{
284+ // lock the session using the org.freedesktop.DisplayManager system DBUS service
285+ const QString sessionPath = QString::fromLocal8Bit(qgetenv("XDG_SESSION_PATH"));
286+ QDBusMessage msg = QDBusMessage::createMethodCall("org.freedesktop.DisplayManager",
287+ sessionPath,
288+ "org.freedesktop.DisplayManager.Session",
289+ "Lock");
290+ qDebug() << "Locking session" << msg.path();
291+ QDBusReply<void> reply = QDBusConnection::systemBus().asyncCall(msg);
292+ if (!reply.isValid()) {
293+ qWarning() << "Lock call failed" << reply.error().message();
294+ } else {
295+ // emit Locked when the call succeeds
296+ Q_EMIT Locked();
297+ }
298+}
299+
300+bool DBusUnitySessionService::IsLocked() const
301+{
302+ return !d->isSessionActive;
303+}
304+
43void DBusUnitySessionService::RequestLogout()
305void DBusUnitySessionService::RequestLogout()
44{
306{
307+ Q_EMIT LogoutRequested(false);
45 Q_EMIT logoutRequested(false);
308 Q_EMIT logoutRequested(false);
46}
309}
47
310
48void DBusUnitySessionService::Reboot()
311void DBusUnitySessionService::Reboot()
49{
312{
50− QDBusMessage msg = QDBusMessage::createMethodCall("org.freedesktop.login1",
313+ d->makeLogin1Call("Reboot", {false});
51− "/org/freedesktop/login1",
52− "org.freedesktop.login1.Manager",
53− "Reboot");
54− msg << false;
55− QDBusConnection::systemBus().asyncCall(msg);
56}
314}
57
315
58void DBusUnitySessionService::RequestReboot()
316void DBusUnitySessionService::RequestReboot()
59{
317{
318+ Q_EMIT RebootRequested(false);
60 Q_EMIT rebootRequested(false);
319 Q_EMIT rebootRequested(false);
61}
320}
62
321
63void DBusUnitySessionService::Shutdown()
322void DBusUnitySessionService::Shutdown()
64{
323{
65− QDBusMessage msg = QDBusMessage::createMethodCall("org.freedesktop.login1",
66− "/org/freedesktop/login1",
67− "org.freedesktop.login1.Manager",
68− "PowerOff");
324+ d->makeLogin1Call("PowerOff", {false});
69− msg << false;
325+}
70− QDBusConnection::systemBus().asyncCall(msg);
326+
327+void DBusUnitySessionService::Suspend()
328+{
329+ d->makeLogin1Call("Suspend", {false});
330+}
331+
332+void DBusUnitySessionService::Hibernate()
333+{
334+ d->makeLogin1Call("Hibernate", {false});
335+}
336+
337+void DBusUnitySessionService::HybridSleep()
338+{
339+ d->makeLogin1Call("HybridSleep", {false});
71}
340}
72
341
73void DBusUnitySessionService::RequestShutdown()
342void DBusUnitySessionService::RequestShutdown()
74{
343{
344+ Q_EMIT ShutdownRequested(false);
75 Q_EMIT shutdownRequested(false);
345 Q_EMIT shutdownRequested(false);
76}
346}
77
347
@@ -83,12 +353,8 @@ enum class Action : unsigned
83 NONE
353 NONE
84};
354};
85
355
86−DBusGnomeSessionManagerWrapper::DBusGnomeSessionManagerWrapper()
87− : UnityDBusObject("/org/gnome/SessionManager/EndSessionDialog", "com.canonical.Unity")
88−{
89−}
90
356
91−void DBusGnomeSessionManagerWrapper::performAsyncCall(const QString &method)
357+void performAsyncUnityCall(const QString &method)
92{
358{
93 const QDBusMessage msg = QDBusMessage::createMethodCall("com.canonical.Unity",
359 const QDBusMessage msg = QDBusMessage::createMethodCall("com.canonical.Unity",
94 "/com/canonical/Unity/Session",
360 "/com/canonical/Unity/Session",
@@ -97,29 +363,111 @@ void DBusGnomeSessionManagerWrapper::performAsyncCall(const QString &method)
97 QDBusConnection::sessionBus().asyncCall(msg);
363 QDBusConnection::sessionBus().asyncCall(msg);
98}
364}
99
365
366+
367+DBusGnomeSessionManagerWrapper::DBusGnomeSessionManagerWrapper()
368+ : UnityDBusObject("/org/gnome/SessionManager/EndSessionDialog", "com.canonical.Unity")
369+{
370+}
371+
100void DBusGnomeSessionManagerWrapper::Open(const unsigned type, const unsigned arg_1, const unsigned max_wait, const QList<QDBusObjectPath> &inhibitors)
372void DBusGnomeSessionManagerWrapper::Open(const unsigned type, const unsigned arg_1, const unsigned max_wait, const QList<QDBusObjectPath> &inhibitors)
101{
373{
102 Q_UNUSED(arg_1);
374 Q_UNUSED(arg_1);
103 Q_UNUSED(max_wait);
375 Q_UNUSED(max_wait);
104 Q_UNUSED(inhibitors);
376 Q_UNUSED(inhibitors);
105
377
106− const Action action = (Action)type;
378+ switch (static_cast<Action>(type))
107−
108− switch (action)
109 {
379 {
110 case Action::LOGOUT:
380 case Action::LOGOUT:
111− performAsyncCall("RequestLogout");
381+ performAsyncUnityCall("RequestLogout");
112 break;
382 break;
113
383
114 case Action::REBOOT:
384 case Action::REBOOT:
115− performAsyncCall("RequestReboot");
385+ performAsyncUnityCall("RequestReboot");
116 break;
386 break;
117
387
118 case Action::SHUTDOWN:
388 case Action::SHUTDOWN:
119− performAsyncCall("RequestShutdown");
389+ performAsyncUnityCall("RequestShutdown");
120 break;
390 break;
121
391
122 default:
392 default:
123 break;
393 break;
124 }
394 }
125}
395}
396+
397+
398+DBusGnomeScreensaverWrapper::DBusGnomeScreensaverWrapper()
399+ : UnityDBusObject("/org/gnome/ScreenSaver", "org.gnome.ScreenSaver")
400+{
401+ connect(d, &DBusUnitySessionServicePrivate::screensaverActiveChanged, this, &DBusGnomeScreensaverWrapper::ActiveChanged);
402+}
403+
404+bool DBusGnomeScreensaverWrapper::GetActive() const
405+{
406+ return !d->isSessionActive; // return whether the session is not active
407+}
408+
409+void DBusGnomeScreensaverWrapper::SetActive(bool lock)
410+{
411+ if (lock) {
412+ Lock();
413+ }
414+}
415+
416+void DBusGnomeScreensaverWrapper::Lock()
417+{
418+ performAsyncUnityCall("Lock");
419+}
420+
421+quint32 DBusGnomeScreensaverWrapper::GetActiveTime() const
422+{
423+ return d->screensaverActiveTime();
424+}
425+
426+void DBusGnomeScreensaverWrapper::SimulateUserActivity()
427+{
428+ d->setIdleHint(false);
429+}
430+
431+
432+DBusScreensaverWrapper::DBusScreensaverWrapper()
433+ : UnityDBusObject("/org/freedesktop/ScreenSaver", "org.freedesktop.ScreenSaver")
434+{
435+ QDBusConnection::sessionBus().registerObject("/ScreenSaver", this, QDBusConnection::ExportScriptableContents); // compat path, also register here
436+ connect(d, &DBusUnitySessionServicePrivate::screensaverActiveChanged, this, &DBusScreensaverWrapper::ActiveChanged);
437+}
438+
439+bool DBusScreensaverWrapper::GetActive() const
440+{
441+ return !d->isSessionActive; // return whether the session is not active
442+}
443+
444+bool DBusScreensaverWrapper::SetActive(bool lock)
445+{
446+ if (lock) {
447+ Lock();
448+ return true;
449+ }
450+ return false;
451+}
452+
453+void DBusScreensaverWrapper::Lock()
454+{
455+ performAsyncUnityCall("Lock");
456+}
457+
458+quint32 DBusScreensaverWrapper::GetActiveTime() const
459+{
460+ return d->screensaverActiveTime();
461+}
462+
463+quint32 DBusScreensaverWrapper::GetSessionIdleTime() const
464+{
465+ return QDateTime::fromMSecsSinceEpoch(d->idleSinceUSecTimestamp()/1000).secsTo(QDateTime::currentDateTime());
466+}
467+
468+void DBusScreensaverWrapper::SimulateUserActivity()
469+{
470+ d->setIdleHint(false);
471+}
472+
473+#include "dbusunitysessionservice.moc"
plugins/Unity/Session/dbusunitysessionservice.h+200−16
@@ -1,5 +1,5 @@
1−/*
1+/*
2− * Copyright (C) 2014 Canonical, Ltd.
2+ * Copyright (C) 2014, 2015 Canonical, Ltd.
3 *
3 *
4 * This program is free software: you can redistribute it and/or modify it under
4 * This program is free software: you can redistribute it and/or modify it under
5 * the terms of the GNU Lesser General Public License version 3, as published by
5 * the terms of the GNU Lesser General Public License version 3, as published by
@@ -29,7 +29,7 @@ Q_DECLARE_METATYPE(QList<QDBusObjectPath>)
29 * interface.
29 * interface.
30 *
30 *
31 * com.canonical.Unity.Session interface provides public methods
31 * com.canonical.Unity.Session interface provides public methods
32− * and signals to handle Logout/Reboot/Shutdown.
32+ * and signals to handle eg. Logout/Reboot/Shutdown.
33 */
33 */
34class DBusUnitySessionService : public UnityDBusObject
34class DBusUnitySessionService : public UnityDBusObject
35{
35{
@@ -46,46 +46,67 @@ public:
46 Q_INVOKABLE void shutdown() { Shutdown(); }
46 Q_INVOKABLE void shutdown() { Shutdown(); }
47 Q_INVOKABLE void endSession() { EndSession(); }
47 Q_INVOKABLE void endSession() { EndSession(); }
48
48
49+ // TODO: remove duplicate signals and split D-Bus and QML API's
50+ // Apparently QML needs the signals in lowercase, while DBUS spec needs the uppercase version
49Q_SIGNALS:
51Q_SIGNALS:
50 /**
52 /**
51− * logoutRequested signal
53+ * LogoutRequested signal
52 *
54 *
53 * This signal is emitted when some applications request the system to
55 * This signal is emitted when some applications request the system to
54 * logout.
56 * logout.
55 * @param have_inhibitors if there are any special running applications
57 * @param have_inhibitors if there are any special running applications
56 * which inhibit the logout.
58 * which inhibit the logout.
57 */
59 */
60+ Q_SCRIPTABLE void LogoutRequested(bool have_inhibitors);
58− Q_SCRIPTABLE void logoutRequested(bool have_inhibitors);
61+ void logoutRequested(bool have_inhibitors);
59
62
60 /**
63 /**
61− * rebootRequested signal
64+ * RebootRequested signal
62 *
65 *
63 * This signal is emitted when some applications request the system to
66 * This signal is emitted when some applications request the system to
64 * reboot.
67 * reboot.
65 * @param have_inhibitors if there are any special running applications
68 * @param have_inhibitors if there are any special running applications
66 * which inhibit the reboot.
69 * which inhibit the reboot.
67 */
70 */
71+ Q_SCRIPTABLE void RebootRequested(bool have_inhibitors);
68− Q_SCRIPTABLE void rebootRequested(bool have_inhibitors);
72+ void rebootRequested(bool have_inhibitors);
69
73
70 /**
74 /**
71− * shutdownRequested signal
75+ * ShutdownRequested signal
72 *
76 *
73 * This signal is emitted when some applications request the system to
77 * This signal is emitted when some applications request the system to
74 * shutdown.
78 * shutdown.
75 * @param have_inhibitors if there are any special running applications
79 * @param have_inhibitors if there are any special running applications
76 * which inhibit the shutdown.
80 * which inhibit the shutdown.
77 */
81 */
82+ Q_SCRIPTABLE void ShutdownRequested(bool have_inhibitors);
78− Q_SCRIPTABLE void shutdownRequested(bool have_inhibitors);
83+ void shutdownRequested(bool have_inhibitors);
79−
80
84
81 /**
85 /**
82− * logoutReady signal
86+ * LogoutReady signal
83 *
87 *
84 * This signal is emitted when all the apps are closed. And the system
88 * This signal is emitted when all the apps are closed. And the system
85 * is safe to logout.
89 * is safe to logout.
86 */
90 */
91+ Q_SCRIPTABLE void LogoutReady();
87 void logoutReady();
92 void logoutReady();
88
93
94+ /**
95+ * Emitted as a result of calling PromptLock()
96+ */
97+ Q_SCRIPTABLE void LockRequested();
98+ void lockRequested();
99+
100+ /**
101+ * Emitted after the session has been locked.
102+ */
103+ Q_SCRIPTABLE void Locked();
104+
105+ /**
106+ * Emitted after the session has been unlocked.
107+ */
108+ Q_SCRIPTABLE void Unlocked();
109+
89public Q_SLOTS:
110public Q_SLOTS:
90 /**
111 /**
91 * Logout the system.
112 * Logout the system.
@@ -114,10 +135,33 @@ public Q_SLOTS:
114 */
135 */
115 Q_SCRIPTABLE void Shutdown();
136 Q_SCRIPTABLE void Shutdown();
116
137
138+ /**
139+ * Suspend the system
140+ *
141+ * This method puts the system into sleep without user's confirmation.
142+ */
143+ Q_SCRIPTABLE void Suspend();
144+
145+ /**
146+ * Hibernate the system
147+ *
148+ * This method puts the system into hibernation without user's confirmation.
149+ */
150+ Q_SCRIPTABLE void Hibernate();
151+
152+ /**
153+ * Hybrid sleep
154+ *
155+ * This method puts the system into hybrid sleep without user's confirmation.
156+ *
157+ * @since unity8
158+ */
159+ Q_SCRIPTABLE void HybridSleep();
160+
117 /**
161 /**
118 * Issue a logout request.
162 * Issue a logout request.
119 *
163 *
120− * This method emits the logoutRequested signal to the shell with a boolean
164+ * This method emits the LogoutRequested signal to the shell with a boolean
121 * which indicates if there's any inhibitors. The shell should receive
165 * which indicates if there's any inhibitors. The shell should receive
122 * this signal and display a dialog to ask the user to confirm the logout
166 * this signal and display a dialog to ask the user to confirm the logout
123 * action. If confirmed, shell can call Logout() method to logout.
167 * action. If confirmed, shell can call Logout() method to logout.
@@ -127,21 +171,21 @@ public Q_SLOTS:
127 /**
171 /**
128 * Issue a reboot request.
172 * Issue a reboot request.
129 *
173 *
130− * This method emits the rebootRequested signal to the shell with a boolean
174+ * This method emits the RebootRequested signal to the shell with a boolean
131 * which indicates if there's any inhibitors. The shell should receive
175 * which indicates if there's any inhibitors. The shell should receive
132 * this signal and display a dialog to ask the user to confirm the reboot
176 * this signal and display a dialog to ask the user to confirm the reboot
133− * action. If confirmed, shell can call Reboot() method to reboot
177+ * action. If confirmed, shell can call Reboot() method to reboot.
134 */
178 */
135 Q_SCRIPTABLE void RequestReboot();
179 Q_SCRIPTABLE void RequestReboot();
136
180
137 /**
181 /**
138 * Issue a shutdown request.
182 * Issue a shutdown request.
139 *
183 *
140− * This method emits the shutdownRequested signal to the shell with a
184+ * This method emits the ShutdownRequested signal to the shell with a
141 * boolean which indicates if there's any inhibitors.
185 * boolean which indicates if there's any inhibitors.
142 * The shell should receive
186 * The shell should receive
143 * this signal and display a dialog to ask the user to confirm the reboot
187 * this signal and display a dialog to ask the user to confirm the reboot
144− * action. If confirmed, shell can call Shutdown() method to reboot
188+ * action. If confirmed, shell can call Shutdown() method to shutdown.
145 */
189 */
146 Q_SCRIPTABLE void RequestShutdown();
190 Q_SCRIPTABLE void RequestShutdown();
147
191
@@ -152,6 +196,68 @@ public Q_SLOTS:
152 * current DBus session bus.
196 * current DBus session bus.
153 */
197 */
154 Q_SCRIPTABLE void EndSession();
198 Q_SCRIPTABLE void EndSession();
199+
200+ /**
201+ * @return whether the system is capable of hibernating
202+ */
203+ Q_SCRIPTABLE bool CanHibernate() const;
204+
205+ /**
206+ * @return whether the system is capable of suspending
207+ */
208+ Q_SCRIPTABLE bool CanSuspend() const;
209+
210+ /**
211+ * @return whether the system is capable of hybrid sleep
212+ * @since unity8
213+ */
214+ Q_SCRIPTABLE bool CanHybridSleep() const;
215+
216+ /**
217+ * @return whether the system is capable of rebooting
218+ * @since unity8
219+ */
220+ Q_SCRIPTABLE bool CanReboot() const;
221+
222+ /**
223+ * @return whether the system is capable of shutting down
224+ */
225+ Q_SCRIPTABLE bool CanShutdown() const;
226+
227+ /**
228+ * @return whether the system is capable of locking the session
229+ */
230+ Q_SCRIPTABLE bool CanLock() const;
231+
232+ /**
233+ * @return the login name of the current user
234+ */
235+ Q_SCRIPTABLE QString UserName() const;
236+
237+ /**
238+ * @return the real name of the current user
239+ */
240+ Q_SCRIPTABLE QString RealName() const;
241+
242+ /**
243+ * @return the local hostname
244+ */
245+ Q_SCRIPTABLE QString HostName() const;
246+
247+ /**
248+ * Request that the session get locked, emits signal LockRequested()
249+ */
250+ Q_SCRIPTABLE void PromptLock();
251+
252+ /**
253+ * Locks the session immediately
254+ */
255+ Q_SCRIPTABLE void Lock();
256+
257+ /**
258+ * @return whether the session is currently locked
259+ */
260+ Q_SCRIPTABLE bool IsLocked() const;
155};
261};
156
262
157class DBusGnomeSessionManagerWrapper : public UnityDBusObject
263class DBusGnomeSessionManagerWrapper : public UnityDBusObject
@@ -169,4 +275,82 @@ public Q_SLOTS:
169private:
275private:
170 void performAsyncCall(const QString &method);
276 void performAsyncCall(const QString &method);
171};
277};
278+
279+class DBusGnomeScreensaverWrapper: public UnityDBusObject
280+{
281+ Q_OBJECT
282+ Q_CLASSINFO("D-Bus Interface", "org.gnome.ScreenSaver")
283+
284+public:
285+ DBusGnomeScreensaverWrapper();
286+ ~DBusGnomeScreensaverWrapper() = default;
287+
288+public Q_SLOTS:
289+ /**
290+ * @return whether the session is currently locked (screensaver is on)
291+ */
292+ Q_SCRIPTABLE bool GetActive() const;
293+
294+ /**
295+ * Locks the session immediately if @p lock is true
296+ */
297+ Q_SCRIPTABLE void SetActive(bool lock);
298+
299+ /**
300+ * Locks the session immediately
301+ */
302+ Q_SCRIPTABLE void Lock();
303+
304+ /**
305+ * @return the number of seconds elapsed since the screensaver had been active
306+ */
307+ Q_SCRIPTABLE quint32 GetActiveTime() const;
308+
309+ Q_SCRIPTABLE void SimulateUserActivity();
310+
311+Q_SIGNALS:
312+ void ActiveChanged(bool active);
313+};
314+
315+class DBusScreensaverWrapper: public UnityDBusObject
316+{
317+ Q_OBJECT
318+ Q_CLASSINFO("D-Bus Interface", "org.freedesktop.ScreenSaver")
319+
320+public:
321+ DBusScreensaverWrapper();
322+ ~DBusScreensaverWrapper() = default;
323+
324+public Q_SLOTS:
325+ /**
326+ * @return whether the session is currently locked (screensaver is on)
327+ */
328+ Q_SCRIPTABLE bool GetActive() const;
329+
330+ /**
331+ * Locks the session immediately if @p lock is true
332+ */
333+ Q_SCRIPTABLE bool SetActive(bool lock);
334+
335+ /**
336+ * Locks the session immediately
337+ */
338+ Q_SCRIPTABLE void Lock();
339+
340+ /**
341+ * @return the number of seconds elapsed since the screensaver had been active
342+ */
343+ Q_SCRIPTABLE quint32 GetActiveTime() const;
344+
345+ /**
346+ * @return the number of seconds that this session has been idle
347+ */
348+ Q_SCRIPTABLE quint32 GetSessionIdleTime() const;
349+
350+ Q_SCRIPTABLE void SimulateUserActivity();
351+
352+Q_SIGNALS:
353+ void ActiveChanged(bool active);
354+};
355+
172#endif // DBUSUNITYSESSIONSERVICE_H
356#endif // DBUSUNITYSESSIONSERVICE_H
plugins/Unity/Session/plugin.cpp+2
@@ -27,6 +27,8 @@
27static QObject *dbusunitysessionservice_provider(QQmlEngine */*engine*/, QJSEngine */*jsEngine*/)
27static QObject *dbusunitysessionservice_provider(QQmlEngine */*engine*/, QJSEngine */*jsEngine*/)
28{
28{
29 new DBusGnomeSessionManagerWrapper();
29 new DBusGnomeSessionManagerWrapper();
30+ new DBusGnomeScreensaverWrapper();
31+ new DBusScreensaverWrapper();
30 return new DBusUnitySessionService();
32 return new DBusUnitySessionService();
31}
33}
32
34
plugins/Utils/CMakeLists.txt+1
@@ -4,6 +4,7 @@ include_directories(
4 ${CMAKE_CURRENT_SOURCE_DIR}
4 ${CMAKE_CURRENT_SOURCE_DIR}
5 ${CMAKE_CURRENT_BINARY_DIR}
5 ${CMAKE_CURRENT_BINARY_DIR}
6 ${Qt5Gui_PRIVATE_INCLUDE_DIRS}
6 ${Qt5Gui_PRIVATE_INCLUDE_DIRS}
7+ ${Qt5Quick_PRIVATE_INCLUDE_DIRS}
7 ${GIO_INCLUDE_DIRS}
8 ${GIO_INCLUDE_DIRS}
8)
9)
9
10
po/am.po+54−50
@@ -7,7 +7,7 @@ msgid ""
7msgstr ""
7msgstr ""
8"Project-Id-Version: unity8\n"
8"Project-Id-Version: unity8\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2015-06-22 12:00+0200\n"
10+"POT-Creation-Date: 2015-07-17 10:10+0200\n"
11"PO-Revision-Date: 2015-07-04 14:46+0000\n"
11"PO-Revision-Date: 2015-07-04 14:46+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"
@@ -15,8 +15,8 @@ msgstr ""
15"Content-Type: text/plain; charset=UTF-8\n"
15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n"
16"Content-Transfer-Encoding: 8bit\n"
17"Plural-Forms: nplurals=2; plural=n > 1;\n"
17"Plural-Forms: nplurals=2; plural=n > 1;\n"
18−"X-Launchpad-Export-Date: 2015-07-05 05:55+0000\n"
18+"X-Launchpad-Export-Date: 2015-07-25 05:38+0000\n"
19−"X-Generator: Launchpad (build 17597)\n"
19+"X-Generator: Launchpad (build 17628)\n"
20
20
21#: plugins/LightDM/Greeter.cpp:112
21#: plugins/LightDM/Greeter.cpp:112
22msgid "Password: "
22msgid "Password: "
@@ -225,15 +225,15 @@ msgstr "የ ድንገተኛ ጥሪ"
225msgid "OK"
225msgid "OK"
226msgstr "እሺ"
226msgstr "እሺ"
227
227
228−#: qml/Dash/GenericScopeView.qml:532 qml/Dash/GenericScopeView.qml:690
228+#: qml/Dash/GenericScopeView.qml:539 qml/Dash/GenericScopeView.qml:697
229msgid "See less"
229msgid "See less"
230msgstr "አነስተኛ መመልከቻ"
230msgstr "አነስተኛ መመልከቻ"
231
231
232−#: qml/Dash/GenericScopeView.qml:532
232+#: qml/Dash/GenericScopeView.qml:539
233msgid "See all"
233msgid "See all"
234msgstr "ሁሉንም መመልከቻ"
234msgstr "ሁሉንም መመልከቻ"
235
235
236−#: qml/Dash/GenericScopeView.qml:594
236+#: qml/Dash/GenericScopeView.qml:601
237msgctxt "Label: Hint for dash search line edit"
237msgctxt "Label: Hint for dash search line edit"
238msgid "Search"
238msgid "Search"
239msgstr "መፈለጊያ"
239msgstr "መፈለጊያ"
@@ -317,19 +317,19 @@ msgstr "እንደገና ይሞክሩ"
317msgid "Tap to unlock"
317msgid "Tap to unlock"
318msgstr "ለመክፈት መታ ያድርጉ"
318msgstr "ለመክፈት መታ ያድርጉ"
319
319
320−#: qml/Greeter/NarrowView.qml:53 qml/Wizard/Pages/passwd-confirm.qml:53
320+#: qml/Greeter/NarrowView.qml:54 qml/Wizard/Pages/passwd-confirm.qml:53
321msgid "Sorry, incorrect passphrase."
321msgid "Sorry, incorrect passphrase."
322msgstr "አዝናለሁ የተሳሳተ የማለፊያ ሐረግ"
322msgstr "አዝናለሁ የተሳሳተ የማለፊያ ሐረግ"
323
323
324−#: qml/Greeter/NarrowView.qml:54 qml/Wizard/Pages/passwd-confirm.qml:54
324+#: qml/Greeter/NarrowView.qml:55 qml/Wizard/Pages/passwd-confirm.qml:54
325msgid "Sorry, incorrect passcode."
325msgid "Sorry, incorrect passcode."
326msgstr "አዝናለሁ የተሳሳተ የማለፊያ ኮድ"
326msgstr "አዝናለሁ የተሳሳተ የማለፊያ ኮድ"
327
327
328−#: qml/Greeter/NarrowView.qml:55
328+#: qml/Greeter/NarrowView.qml:56
329msgid "This will be your last attempt."
329msgid "This will be your last attempt."
330msgstr "ይህ የመጨረሻ ሙከራዎ ነው"
330msgstr "ይህ የመጨረሻ ሙከራዎ ነው"
331
331
332−#: qml/Greeter/NarrowView.qml:57
332+#: qml/Greeter/NarrowView.qml:58
333msgid ""
333msgid ""
334"If passphrase is entered incorrectly, your phone will conduct a factory "
334"If passphrase is entered incorrectly, your phone will conduct a factory "
335"reset and all personal data will be deleted."
335"reset and all personal data will be deleted."
@@ -337,7 +337,7 @@ msgstr ""
337"የተሳሳተ የማለፊያ ሐረግ ካስገቡ የ እርስዎ ስልክ ወደ ነበረበት ወደ ፋክቶሪው ዘዴ ይመለሳል: እና የ ግል ዳታ በሙሉ "
337"የተሳሳተ የማለፊያ ሐረግ ካስገቡ የ እርስዎ ስልክ ወደ ነበረበት ወደ ፋክቶሪው ዘዴ ይመለሳል: እና የ ግል ዳታ በሙሉ "
338"ይጠፋል"
338"ይጠፋል"
339
339
340−#: qml/Greeter/NarrowView.qml:58
340+#: qml/Greeter/NarrowView.qml:59
341msgid ""
341msgid ""
342"If passcode is entered incorrectly, your phone will conduct a factory reset "
342"If passcode is entered incorrectly, your phone will conduct a factory reset "
343"and all personal data will be deleted."
343"and all personal data will be deleted."
@@ -345,33 +345,34 @@ msgstr ""
345"የተሳሳተ የማለፊያ ኮድ ካስገቡ የ እርስዎ ስልክ ወደ ነበረበት ወደ ፋክቶሪው ዘዴ ይመለሳል: እና የ ግል ዳታ በሙሉ "
345"የተሳሳተ የማለፊያ ኮድ ካስገቡ የ እርስዎ ስልክ ወደ ነበረበት ወደ ፋክቶሪው ዘዴ ይመለሳል: እና የ ግል ዳታ በሙሉ "
346"ይጠፋል"
346"ይጠፋል"
347
347
348−#: qml/Greeter/NarrowView.qml:115
348+#: qml/Greeter/NarrowView.qml:116
349#, qt-format
349#, qt-format
350msgid "Enter %1"
350msgid "Enter %1"
351msgstr "ማስገቢያ %1"
351msgstr "ማስገቢያ %1"
352
352
353−#: qml/Greeter/NarrowView.qml:116 qml/Wizard/Pages/passwd-set.qml:60
353+#: qml/Greeter/NarrowView.qml:117 qml/Wizard/Pages/passwd-set.qml:60
354msgid "Enter passphrase"
354msgid "Enter passphrase"
355msgstr "የ ማለፊያ ሀረግ ያስገቡ"
355msgstr "የ ማለፊያ ሀረግ ያስገቡ"
356
356
357−#: qml/Greeter/NarrowView.qml:117
357+#: qml/Greeter/NarrowView.qml:118
358msgid "Enter passcode"
358msgid "Enter passcode"
359msgstr "የ ማለፊያ ኮድ ያስገቡ"
359msgstr "የ ማለፊያ ኮድ ያስገቡ"
360
360
361−#: qml/Greeter/NarrowView.qml:118
361+#: qml/Greeter/NarrowView.qml:119
362#, qt-format
362#, qt-format
363msgid "Sorry, incorrect %1"
363msgid "Sorry, incorrect %1"
364msgstr "አዝናለሁ: የተሳሳተ%1"
364msgstr "አዝናለሁ: የተሳሳተ%1"
365
365
366−#: qml/Greeter/NarrowView.qml:119
366+#: qml/Greeter/NarrowView.qml:120
367msgid "Sorry, incorrect passphrase"
367msgid "Sorry, incorrect passphrase"
368msgstr "አዝናለሁ የተሳሳተ የማለፊያ ሐረግ"
368msgstr "አዝናለሁ የተሳሳተ የማለፊያ ሐረግ"
369
369
370−#: qml/Greeter/NarrowView.qml:120
370+#: qml/Greeter/NarrowView.qml:121
371+msgctxt "passphrase"
371msgid "Please re-enter"
372msgid "Please re-enter"
372msgstr "እባክዎን እንደገና-ያስገቡ"
373msgstr "እባክዎን እንደገና-ያስገቡ"
373
374
374−#: qml/Greeter/NarrowView.qml:121
375+#: qml/Greeter/NarrowView.qml:122
375msgid "Sorry, incorrect passcode"
376msgid "Sorry, incorrect passcode"
376msgstr "አዝናለሁ የተሳሳተ የማለፊያ ኮድ"
377msgstr "አዝናለሁ የተሳሳተ የማለፊያ ኮድ"
377
378
@@ -521,38 +522,6 @@ msgctxt "Button: Go back one page in the Wizard"
521msgid "Back"
522msgid "Back"
522msgstr "ወደ ኋላ"
523msgstr "ወደ ኋላ"
523
524
524−#: qml/Wizard/Pages/here-terms.qml:27
525−msgid "Terms & Conditions"
526−msgstr "ውሎች & ሁኔታዎች"
527−
528−#: qml/Wizard/Pages/passwd-confirm.qml:49
529−msgid "Confirm passphrase"
530−msgstr "የ ማለፊያ ሐረግ ማረጋገጫ"
531−
532−#: qml/Wizard/Pages/passwd-confirm.qml:50
533−msgid "Confirm passcode"
534−msgstr "የማለፊያ ኮድ ማረጋገጫ"
535−
536−#: qml/Wizard/Pages/passwd-confirm.qml:53
537−#: qml/Wizard/Pages/passwd-confirm.qml:54
538−msgid "Please try again."
539−msgstr "እባክዎን እንደገና ይሞክሩ"
540−
541−#: qml/Wizard/Pages/passwd-confirm.qml:82 qml/Wizard/Pages/passwd-set.qml:90
542−#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:128
543−#: qml/Wizard/Pages/40-wifi.qml:215 qml/Wizard/Pages/50-location.qml:131
544−#: qml/Wizard/Pages/60-reporting.qml:50
545−msgid "Continue"
546−msgstr "ይቀጥሉ"
547−
548−#: qml/Wizard/Pages/passwd-set.qml:61
549−msgid "Choose your passcode"
550−msgstr "የ እርስዎን የማለፊያ ኮድ ይምረጡ"
551−
552−#: qml/Wizard/Pages/passwd-set.qml:68
553−msgid "Passphrase must be 4 characters long"
554−msgstr "የ ማለፊያ ሀረግ ቢያንስ 4 ባህሪዎች መሆን አለበት"
555−
556#: qml/Wizard/Pages/10-welcome.qml:27
525#: qml/Wizard/Pages/10-welcome.qml:27
557msgid "Hi!"
526msgid "Hi!"
558msgstr "ሰላም"
527msgstr "ሰላም"
@@ -565,6 +534,13 @@ msgstr "እንኳን ደህና መጡ ወደ እርስዎ ኡቡንቱ ስልክ
565msgid "Let’s get started."
534msgid "Let’s get started."
566msgstr "ስራ እንጀምር"
535msgstr "ስራ እንጀምር"
567
536
537+#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:128
538+#: qml/Wizard/Pages/40-wifi.qml:215 qml/Wizard/Pages/50-location.qml:131
539+#: qml/Wizard/Pages/60-reporting.qml:50 qml/Wizard/Pages/passwd-confirm.qml:82
540+#: qml/Wizard/Pages/passwd-set.qml:90
541+msgid "Continue"
542+msgstr "ይቀጥሉ"
543+
568#: qml/Wizard/Pages/20-sim.qml:25
544#: qml/Wizard/Pages/20-sim.qml:25
569msgid "Add a SIM card and restart your device"
545msgid "Add a SIM card and restart your device"
570msgstr "የ ሲም ካርድ ይጨምሩ እና አካሉን እንደገና ያስነሱ"
546msgstr "የ ሲም ካርድ ይጨምሩ እና አካሉን እንደገና ያስነሱ"
@@ -693,6 +669,31 @@ msgstr "ስልኩ አሁን ለመጠቀም ዝግጁ ነው"
693msgid "Finish"
669msgid "Finish"
694msgstr "መጨረሻ"
670msgstr "መጨረሻ"
695
671
672+#: qml/Wizard/Pages/here-terms.qml:27
673+msgid "Terms & Conditions"
674+msgstr "ውሎች & ሁኔታዎች"
675+
676+#: qml/Wizard/Pages/passwd-confirm.qml:49
677+msgid "Confirm passphrase"
678+msgstr "የ ማለፊያ ሐረግ ማረጋገጫ"
679+
680+#: qml/Wizard/Pages/passwd-confirm.qml:50
681+msgid "Confirm passcode"
682+msgstr "የማለፊያ ኮድ ማረጋገጫ"
683+
684+#: qml/Wizard/Pages/passwd-confirm.qml:53
685+#: qml/Wizard/Pages/passwd-confirm.qml:54
686+msgid "Please try again."
687+msgstr "እባክዎን እንደገና ይሞክሩ"
688+
689+#: qml/Wizard/Pages/passwd-set.qml:61
690+msgid "Choose your passcode"
691+msgstr "የ እርስዎን የማለፊያ ኮድ ይምረጡ"
692+
693+#: qml/Wizard/Pages/passwd-set.qml:68
694+msgid "Passphrase must be 4 characters long"
695+msgstr "የ ማለፊያ ሀረግ ቢያንስ 4 ባህሪዎች መሆን አለበት"
696+
696#. Translators: This is the arrow for "Back" buttons
697#. Translators: This is the arrow for "Back" buttons
697#: qml/Wizard/StackButton.qml:39
698#: qml/Wizard/StackButton.qml:39
698#, qt-format
699#, qt-format
@@ -794,3 +795,6 @@ msgstr "%1 〉"
794
795
795#~ msgid "Manage Scopes"
796#~ msgid "Manage Scopes"
796#~ msgstr "የ ክልል አስተዳዳሪ"
797#~ msgstr "የ ክልል አስተዳዳሪ"
798+
799+#~ msgid "Please re-enter"
800+#~ msgstr "እባክዎን እንደገና-ያስገቡ"
po/ar.po+69−61
@@ -7,8 +7,8 @@ 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: 2015-06-22 12:00+0200\n"
10+"POT-Creation-Date: 2015-07-17 10:10+0200\n"
11−"PO-Revision-Date: 2015-07-17 12:36+0000\n"
11+"PO-Revision-Date: 2015-07-29 09:41+0000\n"
12"Last-Translator: Ibrahim Saed <ibraheem5000@gmail.com>\n"
12"Last-Translator: Ibrahim Saed <ibraheem5000@gmail.com>\n"
13"Language-Team: Arabic <ar@li.org>\n"
13"Language-Team: Arabic <ar@li.org>\n"
14"MIME-Version: 1.0\n"
14"MIME-Version: 1.0\n"
@@ -16,8 +16,8 @@ msgstr ""
16"Content-Transfer-Encoding: 8bit\n"
16"Content-Transfer-Encoding: 8bit\n"
17"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n % 100 >= "
17"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n % 100 >= "
18"3 && n % 100 <= 10 ? 3 : n % 100 >= 11 && n % 100 <= 99 ? 4 : 5;\n"
18"3 && n % 100 <= 10 ? 3 : n % 100 >= 11 && n % 100 <= 99 ? 4 : 5;\n"
19−"X-Launchpad-Export-Date: 2015-07-21 05:35+0000\n"
19+"X-Launchpad-Export-Date: 2015-07-30 06:14+0000\n"
20−"X-Generator: Launchpad (build 17628)\n"
20+"X-Generator: Launchpad (build 17646)\n"
21
21
22#: plugins/LightDM/Greeter.cpp:112
22#: plugins/LightDM/Greeter.cpp:112
23msgid "Password: "
23msgid "Password: "
@@ -232,15 +232,15 @@ msgstr "مكالمة طوارئ"
232msgid "OK"
232msgid "OK"
233msgstr "موافق"
233msgstr "موافق"
234
234
235−#: qml/Dash/GenericScopeView.qml:532 qml/Dash/GenericScopeView.qml:690
235+#: qml/Dash/GenericScopeView.qml:539 qml/Dash/GenericScopeView.qml:697
236msgid "See less"
236msgid "See less"
237msgstr "شاهد أقل"
237msgstr "شاهد أقل"
238
238
239−#: qml/Dash/GenericScopeView.qml:532
239+#: qml/Dash/GenericScopeView.qml:539
240msgid "See all"
240msgid "See all"
241msgstr "عرض الكل"
241msgstr "عرض الكل"
242
242
243−#: qml/Dash/GenericScopeView.qml:594
243+#: qml/Dash/GenericScopeView.qml:601
244msgctxt "Label: Hint for dash search line edit"
244msgctxt "Label: Hint for dash search line edit"
245msgid "Search"
245msgid "Search"
246msgstr "بحث"
246msgstr "بحث"
@@ -310,7 +310,7 @@ msgstr "الرئيسية"
310
310
311#: qml/Dash/ScopesList.qml:114
311#: qml/Dash/ScopesList.qml:114
312msgid "Also installed"
312msgid "Also installed"
313−msgstr ""
313+msgstr "أيضا تم تثبيت"
314
314
315#: qml/Greeter/CoverPage.qml:107
315#: qml/Greeter/CoverPage.qml:107
316msgid "Unlock"
316msgid "Unlock"
@@ -324,57 +324,58 @@ msgstr "إعادة المحاولة"
324msgid "Tap to unlock"
324msgid "Tap to unlock"
325msgstr "انقر لفك القفل"
325msgstr "انقر لفك القفل"
326
326
327−#: qml/Greeter/NarrowView.qml:53 qml/Wizard/Pages/passwd-confirm.qml:53
327+#: qml/Greeter/NarrowView.qml:54 qml/Wizard/Pages/passwd-confirm.qml:53
328msgid "Sorry, incorrect passphrase."
328msgid "Sorry, incorrect passphrase."
329msgstr "عذرًا، عبارة سرّية خاطئة."
329msgstr "عذرًا، عبارة سرّية خاطئة."
330
330
331−#: qml/Greeter/NarrowView.qml:54 qml/Wizard/Pages/passwd-confirm.qml:54
331+#: qml/Greeter/NarrowView.qml:55 qml/Wizard/Pages/passwd-confirm.qml:54
332msgid "Sorry, incorrect passcode."
332msgid "Sorry, incorrect passcode."
333msgstr "عذرًا، رمز سرّي خاطيء."
333msgstr "عذرًا، رمز سرّي خاطيء."
334
334
335−#: qml/Greeter/NarrowView.qml:55
335+#: qml/Greeter/NarrowView.qml:56
336msgid "This will be your last attempt."
336msgid "This will be your last attempt."
337msgstr "هذه ستكون المحاولة الأخيرة لك."
337msgstr "هذه ستكون المحاولة الأخيرة لك."
338
338
339−#: qml/Greeter/NarrowView.qml:57
339+#: qml/Greeter/NarrowView.qml:58
340msgid ""
340msgid ""
341"If passphrase is entered incorrectly, your phone will conduct a factory "
341"If passphrase is entered incorrectly, your phone will conduct a factory "
342"reset and all personal data will be deleted."
342"reset and all personal data will be deleted."
343msgstr ""
343msgstr ""
344
344
345−#: qml/Greeter/NarrowView.qml:58
345+#: qml/Greeter/NarrowView.qml:59
346msgid ""
346msgid ""
347"If passcode is entered incorrectly, your phone will conduct a factory reset "
347"If passcode is entered incorrectly, your phone will conduct a factory reset "
348"and all personal data will be deleted."
348"and all personal data will be deleted."
349msgstr ""
349msgstr ""
350
350
351−#: qml/Greeter/NarrowView.qml:115
351+#: qml/Greeter/NarrowView.qml:116
352#, qt-format
352#, qt-format
353msgid "Enter %1"
353msgid "Enter %1"
354msgstr "أدخِل %1"
354msgstr "أدخِل %1"
355
355
356−#: qml/Greeter/NarrowView.qml:116 qml/Wizard/Pages/passwd-set.qml:60
356+#: qml/Greeter/NarrowView.qml:117 qml/Wizard/Pages/passwd-set.qml:60
357msgid "Enter passphrase"
357msgid "Enter passphrase"
358msgstr "أدخِل العبارة السرية"
358msgstr "أدخِل العبارة السرية"
359
359
360−#: qml/Greeter/NarrowView.qml:117
360+#: qml/Greeter/NarrowView.qml:118
361msgid "Enter passcode"
361msgid "Enter passcode"
362msgstr "أدخِل الرمز السرّي"
362msgstr "أدخِل الرمز السرّي"
363
363
364−#: qml/Greeter/NarrowView.qml:118
364+#: qml/Greeter/NarrowView.qml:119
365#, qt-format
365#, qt-format
366msgid "Sorry, incorrect %1"
366msgid "Sorry, incorrect %1"
367msgstr "نأسف، %1 غير صحيحية"
367msgstr "نأسف، %1 غير صحيحية"
368
368
369−#: qml/Greeter/NarrowView.qml:119
369+#: qml/Greeter/NarrowView.qml:120
370msgid "Sorry, incorrect passphrase"
370msgid "Sorry, incorrect passphrase"
371msgstr "نأسف، عبارة السّر غير صحيحية"
371msgstr "نأسف، عبارة السّر غير صحيحية"
372
372
373−#: qml/Greeter/NarrowView.qml:120
373+#: qml/Greeter/NarrowView.qml:121
374+msgctxt "passphrase"
374msgid "Please re-enter"
375msgid "Please re-enter"
375msgstr "برجاء إعادة إدخالها"
376msgstr "برجاء إعادة إدخالها"
376
377
377−#: qml/Greeter/NarrowView.qml:121
378+#: qml/Greeter/NarrowView.qml:122
378msgid "Sorry, incorrect passcode"
379msgid "Sorry, incorrect passcode"
379msgstr "نأسف، الرمز السري غير صحيح"
380msgstr "نأسف، الرمز السري غير صحيح"
380
381
@@ -388,11 +389,11 @@ msgstr "انقر للعودة إلى المكالمة..."
388
389
389#: qml/Panel/ActiveCallHint.qml:92
390#: qml/Panel/ActiveCallHint.qml:92
390msgid "Conference"
391msgid "Conference"
391−msgstr ""
392+msgstr "مؤتمر"
392
393
393#: qml/Panel/Indicators/MenuItemFactory.qml:639
394#: qml/Panel/Indicators/MenuItemFactory.qml:639
394msgid "Nothing is playing"
395msgid "Nothing is playing"
395−msgstr ""
396+msgstr "لا شيء مُشغّل"
396
397
397#: qml/Panel/Indicators/MenuItemFactory.qml:768
398#: qml/Panel/Indicators/MenuItemFactory.qml:768
398#, qt-format
399#, qt-format
@@ -459,12 +460,12 @@ msgstr "انتهى"
459
460
460#: qml/Panel/Indicators/MenuItemFactory.qml:800
461#: qml/Panel/Indicators/MenuItemFactory.qml:800
461msgid "Failed, tap to retry"
462msgid "Failed, tap to retry"
462−msgstr ""
463+msgstr "فشل، انقل لإعادة المحاولة"
463
464
464#: qml/Panel/Indicators/MessageMenuItemFactory.qml:149
465#: qml/Panel/Indicators/MessageMenuItemFactory.qml:149
465msgctxt "Label: Hint in message indicator line edit"
466msgctxt "Label: Hint in message indicator line edit"
466msgid "Reply"
467msgid "Reply"
467−msgstr ""
468+msgstr "رد"
468
469
469#: qml/Panel/Indicators/ModemInfoItem.qml:105
470#: qml/Panel/Indicators/ModemInfoItem.qml:105
470msgid "Unlock SIM"
471msgid "Unlock SIM"
@@ -513,7 +514,7 @@ msgstr "اسحب سحبة قصيرة من الحافة اليسرى."
513
514
514#: qml/Tutorial/TutorialPage.qml:178
515#: qml/Tutorial/TutorialPage.qml:178
515msgid "You almost got it!"
516msgid "You almost got it!"
516−msgstr ""
517+msgstr "انت حصلت على ذلك تقريبا!"
517
518
518#: qml/Tutorial/TutorialPage.qml:195
519#: qml/Tutorial/TutorialPage.qml:195
519msgid "Try again."
520msgid "Try again."
@@ -536,38 +537,6 @@ msgctxt "Button: Go back one page in the Wizard"
536msgid "Back"
537msgid "Back"
537msgstr "عودة"
538msgstr "عودة"
538
539
539−#: qml/Wizard/Pages/here-terms.qml:27
540−msgid "Terms & Conditions"
541−msgstr "الشروط والأحكام"
542−
543−#: qml/Wizard/Pages/passwd-confirm.qml:49
544−msgid "Confirm passphrase"
545−msgstr "تأكيد العبارة السرية"
546−
547−#: qml/Wizard/Pages/passwd-confirm.qml:50
548−msgid "Confirm passcode"
549−msgstr "تأكيد الرمز السري"
550−
551−#: qml/Wizard/Pages/passwd-confirm.qml:53
552−#: qml/Wizard/Pages/passwd-confirm.qml:54
553−msgid "Please try again."
554−msgstr "حاول مجددا."
555−
556−#: qml/Wizard/Pages/passwd-confirm.qml:82 qml/Wizard/Pages/passwd-set.qml:90
557−#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:128
558−#: qml/Wizard/Pages/40-wifi.qml:215 qml/Wizard/Pages/50-location.qml:131
559−#: qml/Wizard/Pages/60-reporting.qml:50
560−msgid "Continue"
561−msgstr "متابعة"
562−
563−#: qml/Wizard/Pages/passwd-set.qml:61
564−msgid "Choose your passcode"
565−msgstr "اختر الرمز السري خاصتك"
566−
567−#: qml/Wizard/Pages/passwd-set.qml:68
568−msgid "Passphrase must be 4 characters long"
569−msgstr "يجب أن تحتوي العبارة السرية على 4 أحرف على الأقل"
570−
571#: qml/Wizard/Pages/10-welcome.qml:27
540#: qml/Wizard/Pages/10-welcome.qml:27
572msgid "Hi!"
541msgid "Hi!"
573msgstr "أهلا!"
542msgstr "أهلا!"
@@ -580,6 +549,13 @@ msgstr "مرحبا بك في أوبونتو للهواتف."
580msgid "Let’s get started."
549msgid "Let’s get started."
581msgstr "هيا بنا نبدأ."
550msgstr "هيا بنا نبدأ."
582
551
552+#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:128
553+#: qml/Wizard/Pages/40-wifi.qml:215 qml/Wizard/Pages/50-location.qml:131
554+#: qml/Wizard/Pages/60-reporting.qml:50 qml/Wizard/Pages/passwd-confirm.qml:82
555+#: qml/Wizard/Pages/passwd-set.qml:90
556+msgid "Continue"
557+msgstr "متابعة"
558+
583#: qml/Wizard/Pages/20-sim.qml:25
559#: qml/Wizard/Pages/20-sim.qml:25
584msgid "Add a SIM card and restart your device"
560msgid "Add a SIM card and restart your device"
585msgstr "أدخِل شريحة SIM ثم أعِد تشغيل الجهاز"
561msgstr "أدخِل شريحة SIM ثم أعِد تشغيل الجهاز"
@@ -685,28 +661,57 @@ msgid ""
685"Your phone is set up to automatically report errors to Canonical and its "
661"Your phone is set up to automatically report errors to Canonical and its "
686"partners, the makers of the operating system."
662"partners, the makers of the operating system."
687msgstr ""
663msgstr ""
664+"هاتفك مُعدّ لإرسال تقارير آلية بالأخطاء إلى كانونيكال وشركائها (صانعي نظام "
665+"التشغيل)."
688
666
689#: qml/Wizard/Pages/60-reporting.qml:43
667#: qml/Wizard/Pages/60-reporting.qml:43
690msgid ""
668msgid ""
691"This can be disabled in <b>System Settings</b> under <b>Security &amp; "
669"This can be disabled in <b>System Settings</b> under <b>Security &amp; "
692"Privacy</b>"
670"Privacy</b>"
693msgstr ""
671msgstr ""
672+"يمكن تعطيل ذلك بالذهاب إلى <b>إعدادات النظام</b> من خلال <b>الأمان "
673+"والخصوصية</b>"
694
674
695#: qml/Wizard/Pages/80-finished.qml:24
675#: qml/Wizard/Pages/80-finished.qml:24
696msgid "All done"
676msgid "All done"
697−msgstr ""
677+msgstr "تم ذلك"
698
678
699#: qml/Wizard/Pages/80-finished.qml:39
679#: qml/Wizard/Pages/80-finished.qml:39
700msgid "Nice work!"
680msgid "Nice work!"
701−msgstr ""
681+msgstr "عمل جيد!"
702
682
703#: qml/Wizard/Pages/80-finished.qml:46
683#: qml/Wizard/Pages/80-finished.qml:46
704msgid "Your phone is now ready to use."
684msgid "Your phone is now ready to use."
705−msgstr ""
685+msgstr "هاتفك جاهز الآن للاستخدام."
706
686
707#: qml/Wizard/Pages/80-finished.qml:53
687#: qml/Wizard/Pages/80-finished.qml:53
708msgid "Finish"
688msgid "Finish"
709−msgstr ""
689+msgstr "إنهاء"
690+
691+#: qml/Wizard/Pages/here-terms.qml:27
692+msgid "Terms & Conditions"
693+msgstr "الشروط والأحكام"
694+
695+#: qml/Wizard/Pages/passwd-confirm.qml:49
696+msgid "Confirm passphrase"
697+msgstr "تأكيد العبارة السرية"
698+
699+#: qml/Wizard/Pages/passwd-confirm.qml:50
700+msgid "Confirm passcode"
701+msgstr "تأكيد الرمز السري"
702+
703+#: qml/Wizard/Pages/passwd-confirm.qml:53
704+#: qml/Wizard/Pages/passwd-confirm.qml:54
705+msgid "Please try again."
706+msgstr "حاول مجددا."
707+
708+#: qml/Wizard/Pages/passwd-set.qml:61
709+msgid "Choose your passcode"
710+msgstr "اختر الرمز السري خاصتك"
711+
712+#: qml/Wizard/Pages/passwd-set.qml:68
713+msgid "Passphrase must be 4 characters long"
714+msgstr "يجب أن تحتوي العبارة السرية على 4 أحرف على الأقل"
710
715
711#. Translators: This is the arrow for "Back" buttons
716#. Translators: This is the arrow for "Back" buttons
712#: qml/Wizard/StackButton.qml:39
717#: qml/Wizard/StackButton.qml:39
@@ -775,3 +780,6 @@ msgstr ""
775#~ msgstr ""
780#~ msgstr ""
776#~ "أنت الآن بارع في إيماءات الحواف ويمكنك البدء باستخدام هاتفك<br><br>انقر على "
781#~ "أنت الآن بارع في إيماءات الحواف ويمكنك البدء باستخدام هاتفك<br><br>انقر على "
777#~ "الشاشة للبدء"
782#~ "الشاشة للبدء"
783+
784+#~ msgid "Please re-enter"
785+#~ msgstr "برجاء إعادة إدخالها"
po/ast.po+55−51
@@ -7,7 +7,7 @@ msgid ""
7msgstr ""
7msgstr ""
8"Project-Id-Version: unity8\n"
8"Project-Id-Version: unity8\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2015-06-22 12:00+0200\n"
10+"POT-Creation-Date: 2015-07-17 10:10+0200\n"
11"PO-Revision-Date: 2015-06-11 23:39+0000\n"
11"PO-Revision-Date: 2015-06-11 23:39+0000\n"
12"Last-Translator: enolp <enolp@softastur.org>\n"
12"Last-Translator: enolp <enolp@softastur.org>\n"
13"Language-Team: Asturian <ast@li.org>\n"
13"Language-Team: Asturian <ast@li.org>\n"
@@ -15,8 +15,8 @@ msgstr ""
15"Content-Type: text/plain; charset=UTF-8\n"
15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n"
16"Content-Transfer-Encoding: 8bit\n"
17"Plural-Forms: nplurals=2; plural=n != 1;\n"
17"Plural-Forms: nplurals=2; plural=n != 1;\n"
18−"X-Launchpad-Export-Date: 2015-07-04 05:36+0000\n"
18+"X-Launchpad-Export-Date: 2015-07-25 05:38+0000\n"
19−"X-Generator: Launchpad (build 17597)\n"
19+"X-Generator: Launchpad (build 17628)\n"
20
20
21#: plugins/LightDM/Greeter.cpp:112
21#: plugins/LightDM/Greeter.cpp:112
22msgid "Password: "
22msgid "Password: "
@@ -226,15 +226,15 @@ msgstr "Llamada d'emerxencia"
226msgid "OK"
226msgid "OK"
227msgstr "Aceutar"
227msgstr "Aceutar"
228
228
229−#: qml/Dash/GenericScopeView.qml:532 qml/Dash/GenericScopeView.qml:690
229+#: qml/Dash/GenericScopeView.qml:539 qml/Dash/GenericScopeView.qml:697
230msgid "See less"
230msgid "See less"
231msgstr "Ver menos"
231msgstr "Ver menos"
232
232
233−#: qml/Dash/GenericScopeView.qml:532
233+#: qml/Dash/GenericScopeView.qml:539
234msgid "See all"
234msgid "See all"
235msgstr "Ver too"
235msgstr "Ver too"
236
236
237−#: qml/Dash/GenericScopeView.qml:594
237+#: qml/Dash/GenericScopeView.qml:601
238msgctxt "Label: Hint for dash search line edit"
238msgctxt "Label: Hint for dash search line edit"
239msgid "Search"
239msgid "Search"
240msgstr "Guetar"
240msgstr "Guetar"
@@ -318,19 +318,19 @@ msgstr "Reintentar"
318msgid "Tap to unlock"
318msgid "Tap to unlock"
319msgstr "Calca pa desbloquiar"
319msgstr "Calca pa desbloquiar"
320
320
321−#: qml/Greeter/NarrowView.qml:53 qml/Wizard/Pages/passwd-confirm.qml:53
321+#: qml/Greeter/NarrowView.qml:54 qml/Wizard/Pages/passwd-confirm.qml:53
322msgid "Sorry, incorrect passphrase."
322msgid "Sorry, incorrect passphrase."
323msgstr "Perdón, fras de pasu incorreuta"
323msgstr "Perdón, fras de pasu incorreuta"
324
324
325−#: qml/Greeter/NarrowView.qml:54 qml/Wizard/Pages/passwd-confirm.qml:54
325+#: qml/Greeter/NarrowView.qml:55 qml/Wizard/Pages/passwd-confirm.qml:54
326msgid "Sorry, incorrect passcode."
326msgid "Sorry, incorrect passcode."
327msgstr "Perdón, códigu de pasu incorreutu."
327msgstr "Perdón, códigu de pasu incorreutu."
328
328
329−#: qml/Greeter/NarrowView.qml:55
329+#: qml/Greeter/NarrowView.qml:56
330msgid "This will be your last attempt."
330msgid "This will be your last attempt."
331msgstr "Esti sedra'l to caberu intentu"
331msgstr "Esti sedra'l to caberu intentu"
332
332
333−#: qml/Greeter/NarrowView.qml:57
333+#: qml/Greeter/NarrowView.qml:58
334msgid ""
334msgid ""
335"If passphrase is entered incorrectly, your phone will conduct a factory "
335"If passphrase is entered incorrectly, your phone will conduct a factory "
336"reset and all personal data will be deleted."
336"reset and all personal data will be deleted."
@@ -338,7 +338,7 @@ msgstr ""
338"Si s'inxerta la fras de pasu incorreutamente, el to teléfonu va reafitase y "
338"Si s'inxerta la fras de pasu incorreutamente, el to teléfonu va reafitase y "
339"van desaniciase tolos datos personales."
339"van desaniciase tolos datos personales."
340
340
341−#: qml/Greeter/NarrowView.qml:58
341+#: qml/Greeter/NarrowView.qml:59
342msgid ""
342msgid ""
343"If passcode is entered incorrectly, your phone will conduct a factory reset "
343"If passcode is entered incorrectly, your phone will conduct a factory reset "
344"and all personal data will be deleted."
344"and all personal data will be deleted."
@@ -346,33 +346,34 @@ msgstr ""
346"Si s'inxerta'l códigu de pasu incorreutamente, el to teléfonu va reafitase y "
346"Si s'inxerta'l códigu de pasu incorreutamente, el to teléfonu va reafitase y "
347"van desaniciase tolos datos personales."
347"van desaniciase tolos datos personales."
348
348
349−#: qml/Greeter/NarrowView.qml:115
349+#: qml/Greeter/NarrowView.qml:116
350#, qt-format
350#, qt-format
351msgid "Enter %1"
351msgid "Enter %1"
352msgstr "Introduz %1"
352msgstr "Introduz %1"
353
353
354−#: qml/Greeter/NarrowView.qml:116 qml/Wizard/Pages/passwd-set.qml:60
354+#: qml/Greeter/NarrowView.qml:117 qml/Wizard/Pages/passwd-set.qml:60
355msgid "Enter passphrase"
355msgid "Enter passphrase"
356msgstr "Introduz la fras de pasu"
356msgstr "Introduz la fras de pasu"
357
357
358−#: qml/Greeter/NarrowView.qml:117
358+#: qml/Greeter/NarrowView.qml:118
359msgid "Enter passcode"
359msgid "Enter passcode"
360msgstr "Introduz el códigu de pasu"
360msgstr "Introduz el códigu de pasu"
361
361
362−#: qml/Greeter/NarrowView.qml:118
362+#: qml/Greeter/NarrowView.qml:119
363#, qt-format
363#, qt-format
364msgid "Sorry, incorrect %1"
364msgid "Sorry, incorrect %1"
365msgstr "Sentímoslo, %1 incorreutu"
365msgstr "Sentímoslo, %1 incorreutu"
366
366
367−#: qml/Greeter/NarrowView.qml:119
367+#: qml/Greeter/NarrowView.qml:120
368msgid "Sorry, incorrect passphrase"
368msgid "Sorry, incorrect passphrase"
369msgstr "Sentímoslo, contraseña incorreuta"
369msgstr "Sentímoslo, contraseña incorreuta"
370
370
371−#: qml/Greeter/NarrowView.qml:120
371+#: qml/Greeter/NarrowView.qml:121
372+msgctxt "passphrase"
372msgid "Please re-enter"
373msgid "Please re-enter"
373−msgstr "Por favor, reintroduzla"
374+msgstr ""
374
375
375−#: qml/Greeter/NarrowView.qml:121
376+#: qml/Greeter/NarrowView.qml:122
376msgid "Sorry, incorrect passcode"
377msgid "Sorry, incorrect passcode"
377msgstr "Sentímoslo, códigu de pasu incorreutu"
378msgstr "Sentímoslo, códigu de pasu incorreutu"
378
379
@@ -522,38 +523,6 @@ msgctxt "Button: Go back one page in the Wizard"
522msgid "Back"
523msgid "Back"
523msgstr "Atrás"
524msgstr "Atrás"
524
525
525−#: qml/Wizard/Pages/here-terms.qml:27
526−msgid "Terms & Conditions"
527−msgstr "Términos y condiciones"
528−
529−#: qml/Wizard/Pages/passwd-confirm.qml:49
530−msgid "Confirm passphrase"
531−msgstr "Confirmar frase de pasu"
532−
533−#: qml/Wizard/Pages/passwd-confirm.qml:50
534−msgid "Confirm passcode"
535−msgstr "Confirmar códigu de pasu"
536−
537−#: qml/Wizard/Pages/passwd-confirm.qml:53
538−#: qml/Wizard/Pages/passwd-confirm.qml:54
539−msgid "Please try again."
540−msgstr "Por favor, vuelvi a intentalo."
541−
542−#: qml/Wizard/Pages/passwd-confirm.qml:82 qml/Wizard/Pages/passwd-set.qml:90
543−#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:128
544−#: qml/Wizard/Pages/40-wifi.qml:215 qml/Wizard/Pages/50-location.qml:131
545−#: qml/Wizard/Pages/60-reporting.qml:50
546−msgid "Continue"
547−msgstr "Siguir"
548−
549−#: qml/Wizard/Pages/passwd-set.qml:61
550−msgid "Choose your passcode"
551−msgstr "Escueyi'l to códigu de pasu"
552−
553−#: qml/Wizard/Pages/passwd-set.qml:68
554−msgid "Passphrase must be 4 characters long"
555−msgstr "La fras de pasu tien de ser 4 caráuteres de llargor"
556−
557#: qml/Wizard/Pages/10-welcome.qml:27
526#: qml/Wizard/Pages/10-welcome.qml:27
558msgid "Hi!"
527msgid "Hi!"
559msgstr "¡Hola!"
528msgstr "¡Hola!"
@@ -566,6 +535,13 @@ msgstr "Bienllegáu/ada al to teléfonu d'Ubuntu"
566msgid "Let’s get started."
535msgid "Let’s get started."
567msgstr "Entamemos."
536msgstr "Entamemos."
568
537
538+#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:128
539+#: qml/Wizard/Pages/40-wifi.qml:215 qml/Wizard/Pages/50-location.qml:131
540+#: qml/Wizard/Pages/60-reporting.qml:50 qml/Wizard/Pages/passwd-confirm.qml:82
541+#: qml/Wizard/Pages/passwd-set.qml:90
542+msgid "Continue"
543+msgstr "Siguir"
544+
569#: qml/Wizard/Pages/20-sim.qml:25
545#: qml/Wizard/Pages/20-sim.qml:25
570msgid "Add a SIM card and restart your device"
546msgid "Add a SIM card and restart your device"
571msgstr "Amiesta una tarxeta SIM y reanicia'l to preséu"
547msgstr "Amiesta una tarxeta SIM y reanicia'l to preséu"
@@ -698,6 +674,31 @@ msgstr "El teléfonu yá ta tresnáu pa usase."
698msgid "Finish"
674msgid "Finish"
699msgstr "Finar"
675msgstr "Finar"
700
676
677+#: qml/Wizard/Pages/here-terms.qml:27
678+msgid "Terms & Conditions"
679+msgstr "Términos y condiciones"
680+
681+#: qml/Wizard/Pages/passwd-confirm.qml:49
682+msgid "Confirm passphrase"
683+msgstr "Confirmar frase de pasu"
684+
685+#: qml/Wizard/Pages/passwd-confirm.qml:50
686+msgid "Confirm passcode"
687+msgstr "Confirmar códigu de pasu"
688+
689+#: qml/Wizard/Pages/passwd-confirm.qml:53
690+#: qml/Wizard/Pages/passwd-confirm.qml:54
691+msgid "Please try again."
692+msgstr "Por favor, vuelvi a intentalo."
693+
694+#: qml/Wizard/Pages/passwd-set.qml:61
695+msgid "Choose your passcode"
696+msgstr "Escueyi'l to códigu de pasu"
697+
698+#: qml/Wizard/Pages/passwd-set.qml:68
699+msgid "Passphrase must be 4 characters long"
700+msgstr "La fras de pasu tien de ser 4 caráuteres de llargor"
701+
701#. Translators: This is the arrow for "Back" buttons
702#. Translators: This is the arrow for "Back" buttons
702#: qml/Wizard/StackButton.qml:39
703#: qml/Wizard/StackButton.qml:39
703#, qt-format
704#, qt-format
@@ -802,3 +803,6 @@ msgstr "%1 〉"
802
803
803#~ msgid "Manage Scopes"
804#~ msgid "Manage Scopes"
804#~ msgstr "Xestionar ámbitos"
805#~ msgstr "Xestionar ámbitos"
806+
807+#~ msgid "Please re-enter"
808+#~ msgstr "Por favor, reintroduzla"
po/az.po+51−50
@@ -7,7 +7,7 @@ msgid ""
7msgstr ""
7msgstr ""
8"Project-Id-Version: unity\n"
8"Project-Id-Version: unity\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2015-06-22 12:00+0200\n"
10+"POT-Creation-Date: 2015-07-17 10:10+0200\n"
11"PO-Revision-Date: 2014-09-03 16:39+0000\n"
11"PO-Revision-Date: 2014-09-03 16:39+0000\n"
12"Last-Translator: Nicat Məmmədov <n1c4t97@gmail.com>\n"
12"Last-Translator: Nicat Məmmədov <n1c4t97@gmail.com>\n"
13"Language-Team: Azerbaijani <az@li.org>\n"
13"Language-Team: Azerbaijani <az@li.org>\n"
@@ -15,8 +15,8 @@ msgstr ""
15"Content-Type: text/plain; charset=UTF-8\n"
15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n"
16"Content-Transfer-Encoding: 8bit\n"
17"Plural-Forms: nplurals=2; plural=n != 1;\n"
17"Plural-Forms: nplurals=2; plural=n != 1;\n"
18−"X-Launchpad-Export-Date: 2015-07-04 05:36+0000\n"
18+"X-Launchpad-Export-Date: 2015-07-25 05:38+0000\n"
19−"X-Generator: Launchpad (build 17597)\n"
19+"X-Generator: Launchpad (build 17628)\n"
20
20
21#: plugins/LightDM/Greeter.cpp:112
21#: plugins/LightDM/Greeter.cpp:112
22msgid "Password: "
22msgid "Password: "
@@ -223,15 +223,15 @@ msgstr "Zərurət zəngi"
223msgid "OK"
223msgid "OK"
224msgstr "Oldu"
224msgstr "Oldu"
225
225
226−#: qml/Dash/GenericScopeView.qml:532 qml/Dash/GenericScopeView.qml:690
226+#: qml/Dash/GenericScopeView.qml:539 qml/Dash/GenericScopeView.qml:697
227msgid "See less"
227msgid "See less"
228msgstr "Daha azını gör"
228msgstr "Daha azını gör"
229
229
230−#: qml/Dash/GenericScopeView.qml:532
230+#: qml/Dash/GenericScopeView.qml:539
231msgid "See all"
231msgid "See all"
232msgstr "Hamısını gör"
232msgstr "Hamısını gör"
233
233
234−#: qml/Dash/GenericScopeView.qml:594
234+#: qml/Dash/GenericScopeView.qml:601
235msgctxt "Label: Hint for dash search line edit"
235msgctxt "Label: Hint for dash search line edit"
236msgid "Search"
236msgid "Search"
237msgstr ""
237msgstr ""
@@ -315,19 +315,19 @@ msgstr ""
315msgid "Tap to unlock"
315msgid "Tap to unlock"
316msgstr ""
316msgstr ""
317
317
318−#: qml/Greeter/NarrowView.qml:53 qml/Wizard/Pages/passwd-confirm.qml:53
318+#: qml/Greeter/NarrowView.qml:54 qml/Wizard/Pages/passwd-confirm.qml:53
319msgid "Sorry, incorrect passphrase."
319msgid "Sorry, incorrect passphrase."
320msgstr "Bağışlayın, açar söz yanlışdır."
320msgstr "Bağışlayın, açar söz yanlışdır."
321
321
322−#: qml/Greeter/NarrowView.qml:54 qml/Wizard/Pages/passwd-confirm.qml:54
322+#: qml/Greeter/NarrowView.qml:55 qml/Wizard/Pages/passwd-confirm.qml:54
323msgid "Sorry, incorrect passcode."
323msgid "Sorry, incorrect passcode."
324msgstr "Təəssüf ki, açar kod yanlışdır."
324msgstr "Təəssüf ki, açar kod yanlışdır."
325
325
326−#: qml/Greeter/NarrowView.qml:55
326+#: qml/Greeter/NarrowView.qml:56
327msgid "This will be your last attempt."
327msgid "This will be your last attempt."
328msgstr "Bu sizin son cəhdiniz olacaq."
328msgstr "Bu sizin son cəhdiniz olacaq."
329
329
330−#: qml/Greeter/NarrowView.qml:57
330+#: qml/Greeter/NarrowView.qml:58
331msgid ""
331msgid ""
332"If passphrase is entered incorrectly, your phone will conduct a factory "
332"If passphrase is entered incorrectly, your phone will conduct a factory "
333"reset and all personal data will be deleted."
333"reset and all personal data will be deleted."
@@ -335,7 +335,7 @@ msgstr ""
335"Əgər açar söz yanlış daxil edilibsə, onda telefonunuz fabrika parametrlərinə "
335"Əgər açar söz yanlış daxil edilibsə, onda telefonunuz fabrika parametrlərinə "
336"geri qayıdacaq və bütün şəxsi məlumatlarınız silinəcək."
336"geri qayıdacaq və bütün şəxsi məlumatlarınız silinəcək."
337
337
338−#: qml/Greeter/NarrowView.qml:58
338+#: qml/Greeter/NarrowView.qml:59
339msgid ""
339msgid ""
340"If passcode is entered incorrectly, your phone will conduct a factory reset "
340"If passcode is entered incorrectly, your phone will conduct a factory reset "
341"and all personal data will be deleted."
341"and all personal data will be deleted."
@@ -343,33 +343,34 @@ msgstr ""
343"Əgər açar kod yanlış daxil edilibsə, onda telefonunuz fabrika parametrlərinə "
343"Əgər açar kod yanlış daxil edilibsə, onda telefonunuz fabrika parametrlərinə "
344"geri qayıdacaq və bütün şəxsi məlumatlarınız silinəcək."
344"geri qayıdacaq və bütün şəxsi məlumatlarınız silinəcək."
345
345
346−#: qml/Greeter/NarrowView.qml:115
346+#: qml/Greeter/NarrowView.qml:116
347#, qt-format
347#, qt-format
348msgid "Enter %1"
348msgid "Enter %1"
349msgstr ""
349msgstr ""
350
350
351−#: qml/Greeter/NarrowView.qml:116 qml/Wizard/Pages/passwd-set.qml:60
351+#: qml/Greeter/NarrowView.qml:117 qml/Wizard/Pages/passwd-set.qml:60
352msgid "Enter passphrase"
352msgid "Enter passphrase"
353msgstr ""
353msgstr ""
354
354
355−#: qml/Greeter/NarrowView.qml:117
355+#: qml/Greeter/NarrowView.qml:118
356msgid "Enter passcode"
356msgid "Enter passcode"
357msgstr ""
357msgstr ""
358
358
359−#: qml/Greeter/NarrowView.qml:118
359+#: qml/Greeter/NarrowView.qml:119
360#, qt-format
360#, qt-format
361msgid "Sorry, incorrect %1"
361msgid "Sorry, incorrect %1"
362msgstr "Bağışlayın, %1 yanlışdır"
362msgstr "Bağışlayın, %1 yanlışdır"
363
363
364−#: qml/Greeter/NarrowView.qml:119
364+#: qml/Greeter/NarrowView.qml:120
365msgid "Sorry, incorrect passphrase"
365msgid "Sorry, incorrect passphrase"
366msgstr "Bağışlayın, açar söz yanlışdır"
366msgstr "Bağışlayın, açar söz yanlışdır"
367
367
368−#: qml/Greeter/NarrowView.qml:120
368+#: qml/Greeter/NarrowView.qml:121
369+msgctxt "passphrase"
369msgid "Please re-enter"
370msgid "Please re-enter"
370msgstr ""
371msgstr ""
371
372
372−#: qml/Greeter/NarrowView.qml:121
373+#: qml/Greeter/NarrowView.qml:122
373msgid "Sorry, incorrect passcode"
374msgid "Sorry, incorrect passcode"
374msgstr ""
375msgstr ""
375
376
@@ -519,38 +520,6 @@ msgctxt "Button: Go back one page in the Wizard"
519msgid "Back"
520msgid "Back"
520msgstr ""
521msgstr ""
521
522
522−#: qml/Wizard/Pages/here-terms.qml:27
523−msgid "Terms & Conditions"
524−msgstr ""
525−
526−#: qml/Wizard/Pages/passwd-confirm.qml:49
527−msgid "Confirm passphrase"
528−msgstr ""
529−
530−#: qml/Wizard/Pages/passwd-confirm.qml:50
531−msgid "Confirm passcode"
532−msgstr ""
533−
534−#: qml/Wizard/Pages/passwd-confirm.qml:53
535−#: qml/Wizard/Pages/passwd-confirm.qml:54
536−msgid "Please try again."
537−msgstr ""
538−
539−#: qml/Wizard/Pages/passwd-confirm.qml:82 qml/Wizard/Pages/passwd-set.qml:90
540−#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:128
541−#: qml/Wizard/Pages/40-wifi.qml:215 qml/Wizard/Pages/50-location.qml:131
542−#: qml/Wizard/Pages/60-reporting.qml:50
543−msgid "Continue"
544−msgstr ""
545−
546−#: qml/Wizard/Pages/passwd-set.qml:61
547−msgid "Choose your passcode"
548−msgstr ""
549−
550−#: qml/Wizard/Pages/passwd-set.qml:68
551−msgid "Passphrase must be 4 characters long"
552−msgstr ""
553−
554#: qml/Wizard/Pages/10-welcome.qml:27
523#: qml/Wizard/Pages/10-welcome.qml:27
555msgid "Hi!"
524msgid "Hi!"
556msgstr ""
525msgstr ""
@@ -563,6 +532,13 @@ msgstr ""
563msgid "Let’s get started."
532msgid "Let’s get started."
564msgstr ""
533msgstr ""
565
534
535+#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:128
536+#: qml/Wizard/Pages/40-wifi.qml:215 qml/Wizard/Pages/50-location.qml:131
537+#: qml/Wizard/Pages/60-reporting.qml:50 qml/Wizard/Pages/passwd-confirm.qml:82
538+#: qml/Wizard/Pages/passwd-set.qml:90
539+msgid "Continue"
540+msgstr ""
541+
566#: qml/Wizard/Pages/20-sim.qml:25
542#: qml/Wizard/Pages/20-sim.qml:25
567msgid "Add a SIM card and restart your device"
543msgid "Add a SIM card and restart your device"
568msgstr ""
544msgstr ""
@@ -688,6 +664,31 @@ msgstr ""
688msgid "Finish"
664msgid "Finish"
689msgstr ""
665msgstr ""
690
666
667+#: qml/Wizard/Pages/here-terms.qml:27
668+msgid "Terms & Conditions"
669+msgstr ""
670+
671+#: qml/Wizard/Pages/passwd-confirm.qml:49
672+msgid "Confirm passphrase"
673+msgstr ""
674+
675+#: qml/Wizard/Pages/passwd-confirm.qml:50
676+msgid "Confirm passcode"
677+msgstr ""
678+
679+#: qml/Wizard/Pages/passwd-confirm.qml:53
680+#: qml/Wizard/Pages/passwd-confirm.qml:54
681+msgid "Please try again."
682+msgstr ""
683+
684+#: qml/Wizard/Pages/passwd-set.qml:61
685+msgid "Choose your passcode"
686+msgstr ""
687+
688+#: qml/Wizard/Pages/passwd-set.qml:68
689+msgid "Passphrase must be 4 characters long"
690+msgstr ""
691+
691#. Translators: This is the arrow for "Back" buttons
692#. Translators: This is the arrow for "Back" buttons
692#: qml/Wizard/StackButton.qml:39
693#: qml/Wizard/StackButton.qml:39
693#, qt-format
694#, qt-format
po/be.po+55−51
@@ -7,7 +7,7 @@ msgid ""
7msgstr ""
7msgstr ""
8"Project-Id-Version: unity8\n"
8"Project-Id-Version: unity8\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2015-06-22 12:00+0200\n"
10+"POT-Creation-Date: 2015-07-17 10:10+0200\n"
11"PO-Revision-Date: 2015-04-27 14:34+0000\n"
11"PO-Revision-Date: 2015-04-27 14:34+0000\n"
12"Last-Translator: Arsień Šachalevič <semen.shah@gmail.com>\n"
12"Last-Translator: Arsień Šachalevič <semen.shah@gmail.com>\n"
13"Language-Team: Belarusian <be@li.org>\n"
13"Language-Team: Belarusian <be@li.org>\n"
@@ -16,8 +16,8 @@ msgstr ""
16"Content-Transfer-Encoding: 8bit\n"
16"Content-Transfer-Encoding: 8bit\n"
17"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
17"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
18"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
18"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
19−"X-Launchpad-Export-Date: 2015-07-04 05:36+0000\n"
19+"X-Launchpad-Export-Date: 2015-07-25 05:38+0000\n"
20−"X-Generator: Launchpad (build 17597)\n"
20+"X-Generator: Launchpad (build 17628)\n"
21
21
22#: plugins/LightDM/Greeter.cpp:112
22#: plugins/LightDM/Greeter.cpp:112
23msgid "Password: "
23msgid "Password: "
@@ -230,15 +230,15 @@ msgstr "Терміновы выклік"
230msgid "OK"
230msgid "OK"
231msgstr "Добра"
231msgstr "Добра"
232
232
233−#: qml/Dash/GenericScopeView.qml:532 qml/Dash/GenericScopeView.qml:690
233+#: qml/Dash/GenericScopeView.qml:539 qml/Dash/GenericScopeView.qml:697
234msgid "See less"
234msgid "See less"
235msgstr "Карацей"
235msgstr "Карацей"
236
236
237−#: qml/Dash/GenericScopeView.qml:532
237+#: qml/Dash/GenericScopeView.qml:539
238msgid "See all"
238msgid "See all"
239msgstr "Больш падрабязна"
239msgstr "Больш падрабязна"
240
240
241−#: qml/Dash/GenericScopeView.qml:594
241+#: qml/Dash/GenericScopeView.qml:601
242msgctxt "Label: Hint for dash search line edit"
242msgctxt "Label: Hint for dash search line edit"
243msgid "Search"
243msgid "Search"
244msgstr "Пошук"
244msgstr "Пошук"
@@ -322,19 +322,19 @@ msgstr "Паспрабаваць ізноў"
322msgid "Tap to unlock"
322msgid "Tap to unlock"
323msgstr "Націсніце, каб разблакаваць"
323msgstr "Націсніце, каб разблакаваць"
324
324
325−#: qml/Greeter/NarrowView.qml:53 qml/Wizard/Pages/passwd-confirm.qml:53
325+#: qml/Greeter/NarrowView.qml:54 qml/Wizard/Pages/passwd-confirm.qml:53
326msgid "Sorry, incorrect passphrase."
326msgid "Sorry, incorrect passphrase."
327msgstr "Даруйце, няслушны пароль."
327msgstr "Даруйце, няслушны пароль."
328
328
329−#: qml/Greeter/NarrowView.qml:54 qml/Wizard/Pages/passwd-confirm.qml:54
329+#: qml/Greeter/NarrowView.qml:55 qml/Wizard/Pages/passwd-confirm.qml:54
330msgid "Sorry, incorrect passcode."
330msgid "Sorry, incorrect passcode."
331msgstr "Даруйце, няслушны код."
331msgstr "Даруйце, няслушны код."
332
332
333−#: qml/Greeter/NarrowView.qml:55
333+#: qml/Greeter/NarrowView.qml:56
334msgid "This will be your last attempt."
334msgid "This will be your last attempt."
335msgstr "Апошняя спроба."
335msgstr "Апошняя спроба."
336
336
337−#: qml/Greeter/NarrowView.qml:57
337+#: qml/Greeter/NarrowView.qml:58
338msgid ""
338msgid ""
339"If passphrase is entered incorrectly, your phone will conduct a factory "
339"If passphrase is entered incorrectly, your phone will conduct a factory "
340"reset and all personal data will be deleted."
340"reset and all personal data will be deleted."
@@ -342,7 +342,7 @@ msgstr ""
342"Калі ўведзены пароль няправільны, Ваш тэлефон зробіць агульны скід налад і "
342"Калі ўведзены пароль няправільны, Ваш тэлефон зробіць агульны скід налад і "
343"ўсе асабістыя дадзеныя будуць выдалены."
343"ўсе асабістыя дадзеныя будуць выдалены."
344
344
345−#: qml/Greeter/NarrowView.qml:58
345+#: qml/Greeter/NarrowView.qml:59
346msgid ""
346msgid ""
347"If passcode is entered incorrectly, your phone will conduct a factory reset "
347"If passcode is entered incorrectly, your phone will conduct a factory reset "
348"and all personal data will be deleted."
348"and all personal data will be deleted."
@@ -350,33 +350,34 @@ msgstr ""
350"Калі ўведзены код няправільны, Ваш тэлефон зробіць агульны скід налад і ўсе "
350"Калі ўведзены код няправільны, Ваш тэлефон зробіць агульны скід налад і ўсе "
351"асабістыя дадзеныя будуць выдалены."
351"асабістыя дадзеныя будуць выдалены."
352
352
353−#: qml/Greeter/NarrowView.qml:115
353+#: qml/Greeter/NarrowView.qml:116
354#, qt-format
354#, qt-format
355msgid "Enter %1"
355msgid "Enter %1"
356msgstr "Увядзіце %1"
356msgstr "Увядзіце %1"
357
357
358−#: qml/Greeter/NarrowView.qml:116 qml/Wizard/Pages/passwd-set.qml:60
358+#: qml/Greeter/NarrowView.qml:117 qml/Wizard/Pages/passwd-set.qml:60
359msgid "Enter passphrase"
359msgid "Enter passphrase"
360msgstr "Увядзіце парольную фразу"
360msgstr "Увядзіце парольную фразу"
361
361
362−#: qml/Greeter/NarrowView.qml:117
362+#: qml/Greeter/NarrowView.qml:118
363msgid "Enter passcode"
363msgid "Enter passcode"
364msgstr "Увядзіце код"
364msgstr "Увядзіце код"
365
365
366−#: qml/Greeter/NarrowView.qml:118
366+#: qml/Greeter/NarrowView.qml:119
367#, qt-format
367#, qt-format
368msgid "Sorry, incorrect %1"
368msgid "Sorry, incorrect %1"
369msgstr "Даруйце, некарэктны %1"
369msgstr "Даруйце, некарэктны %1"
370
370
371−#: qml/Greeter/NarrowView.qml:119
371+#: qml/Greeter/NarrowView.qml:120
372msgid "Sorry, incorrect passphrase"
372msgid "Sorry, incorrect passphrase"
373msgstr "Даруйце, няслушны пароль"
373msgstr "Даруйце, няслушны пароль"
374
374
375−#: qml/Greeter/NarrowView.qml:120
375+#: qml/Greeter/NarrowView.qml:121
376+msgctxt "passphrase"
376msgid "Please re-enter"
377msgid "Please re-enter"
377−msgstr "Калі ласка, паўтарыце ўвод"
378+msgstr ""
378
379
379−#: qml/Greeter/NarrowView.qml:121
380+#: qml/Greeter/NarrowView.qml:122
380msgid "Sorry, incorrect passcode"
381msgid "Sorry, incorrect passcode"
381msgstr "Даруйце, няслушны код"
382msgstr "Даруйце, няслушны код"
382
383
@@ -526,38 +527,6 @@ msgctxt "Button: Go back one page in the Wizard"
526msgid "Back"
527msgid "Back"
527msgstr "Вярнуцца"
528msgstr "Вярнуцца"
528
529
529−#: qml/Wizard/Pages/here-terms.qml:27
530−msgid "Terms & Conditions"
531−msgstr "Умовы карыстання"
532−
533−#: qml/Wizard/Pages/passwd-confirm.qml:49
534−msgid "Confirm passphrase"
535−msgstr "Пацвердзіце пароль"
536−
537−#: qml/Wizard/Pages/passwd-confirm.qml:50
538−msgid "Confirm passcode"
539−msgstr "Пацвердзіце код"
540−
541−#: qml/Wizard/Pages/passwd-confirm.qml:53
542−#: qml/Wizard/Pages/passwd-confirm.qml:54
543−msgid "Please try again."
544−msgstr "Калі ласка, паспрабуйце яшчэ раз."
545−
546−#: qml/Wizard/Pages/passwd-confirm.qml:82 qml/Wizard/Pages/passwd-set.qml:90
547−#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:128
548−#: qml/Wizard/Pages/40-wifi.qml:215 qml/Wizard/Pages/50-location.qml:131
549−#: qml/Wizard/Pages/60-reporting.qml:50
550−msgid "Continue"
551−msgstr "Працягнуць"
552−
553−#: qml/Wizard/Pages/passwd-set.qml:61
554−msgid "Choose your passcode"
555−msgstr "Выберыце код"
556−
557−#: qml/Wizard/Pages/passwd-set.qml:68
558−msgid "Passphrase must be 4 characters long"
559−msgstr "Код мусіць складацца з 4 сімвалаў"
560−
561#: qml/Wizard/Pages/10-welcome.qml:27
530#: qml/Wizard/Pages/10-welcome.qml:27
562msgid "Hi!"
531msgid "Hi!"
563msgstr "Вітай!"
532msgstr "Вітай!"
@@ -570,6 +539,13 @@ msgstr "Вітаем Вас у сістэме тэлефона Ubuntu."
570msgid "Let’s get started."
539msgid "Let’s get started."
571msgstr "Пачнем."
540msgstr "Пачнем."
572
541
542+#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:128
543+#: qml/Wizard/Pages/40-wifi.qml:215 qml/Wizard/Pages/50-location.qml:131
544+#: qml/Wizard/Pages/60-reporting.qml:50 qml/Wizard/Pages/passwd-confirm.qml:82
545+#: qml/Wizard/Pages/passwd-set.qml:90
546+msgid "Continue"
547+msgstr "Працягнуць"
548+
573#: qml/Wizard/Pages/20-sim.qml:25
549#: qml/Wizard/Pages/20-sim.qml:25
574msgid "Add a SIM card and restart your device"
550msgid "Add a SIM card and restart your device"
575msgstr "Дадайце SIM-карту і перазагрузіце Вашую прыладу"
551msgstr "Дадайце SIM-карту і перазагрузіце Вашую прыладу"
@@ -702,6 +678,31 @@ msgstr "Цяпер Вашым тэлефонам можна карыстацца
702msgid "Finish"
678msgid "Finish"
703msgstr "Скончыць"
679msgstr "Скончыць"
704
680
681+#: qml/Wizard/Pages/here-terms.qml:27
682+msgid "Terms & Conditions"
683+msgstr "Умовы карыстання"
684+
685+#: qml/Wizard/Pages/passwd-confirm.qml:49
686+msgid "Confirm passphrase"
687+msgstr "Пацвердзіце пароль"
688+
689+#: qml/Wizard/Pages/passwd-confirm.qml:50
690+msgid "Confirm passcode"
691+msgstr "Пацвердзіце код"
692+
693+#: qml/Wizard/Pages/passwd-confirm.qml:53
694+#: qml/Wizard/Pages/passwd-confirm.qml:54
695+msgid "Please try again."
696+msgstr "Калі ласка, паспрабуйце яшчэ раз."
697+
698+#: qml/Wizard/Pages/passwd-set.qml:61
699+msgid "Choose your passcode"
700+msgstr "Выберыце код"
701+
702+#: qml/Wizard/Pages/passwd-set.qml:68
703+msgid "Passphrase must be 4 characters long"
704+msgstr "Код мусіць складацца з 4 сімвалаў"
705+
705#. Translators: This is the arrow for "Back" buttons
706#. Translators: This is the arrow for "Back" buttons
706#: qml/Wizard/StackButton.qml:39
707#: qml/Wizard/StackButton.qml:39
707#, qt-format
708#, qt-format
@@ -795,3 +796,6 @@ msgstr "%1 〉"
795#~ msgstr ""
796#~ msgstr ""
796#~ "Вы толькі што асвоілі асноўная жэсты і можаце пачаць выкарыстоўваць "
797#~ "Вы толькі што асвоілі асноўная жэсты і можаце пачаць выкарыстоўваць "
797#~ "тэлефон<br><br>Дакраніцеся да экрана, каб пачаць"
798#~ "тэлефон<br><br>Дакраніцеся да экрана, каб пачаць"
799+
800+#~ msgid "Please re-enter"
801+#~ msgstr "Калі ласка, паўтарыце ўвод"
po/bg.po+51−50
@@ -7,7 +7,7 @@ msgid ""
7msgstr ""
7msgstr ""
8"Project-Id-Version: unity\n"
8"Project-Id-Version: unity\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2015-06-22 12:00+0200\n"
10+"POT-Creation-Date: 2015-07-17 10:10+0200\n"
11"PO-Revision-Date: 2015-04-12 14:43+0000\n"
11"PO-Revision-Date: 2015-04-12 14:43+0000\n"
12"Last-Translator: George Karavasilev <kokoto-java@ubuntu.com>\n"
12"Last-Translator: George Karavasilev <kokoto-java@ubuntu.com>\n"
13"Language-Team: Bulgarian <bg@li.org>\n"
13"Language-Team: Bulgarian <bg@li.org>\n"
@@ -15,8 +15,8 @@ msgstr ""
15"Content-Type: text/plain; charset=UTF-8\n"
15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n"
16"Content-Transfer-Encoding: 8bit\n"
17"Plural-Forms: nplurals=2; plural=n != 1;\n"
17"Plural-Forms: nplurals=2; plural=n != 1;\n"
18−"X-Launchpad-Export-Date: 2015-07-04 05:37+0000\n"
18+"X-Launchpad-Export-Date: 2015-07-25 05:38+0000\n"
19−"X-Generator: Launchpad (build 17597)\n"
19+"X-Generator: Launchpad (build 17628)\n"
20
20
21#: plugins/LightDM/Greeter.cpp:112
21#: plugins/LightDM/Greeter.cpp:112
22msgid "Password: "
22msgid "Password: "
@@ -225,15 +225,15 @@ msgstr "Спешно повикване"
225msgid "OK"
225msgid "OK"
226msgstr ""
226msgstr ""
227
227
228−#: qml/Dash/GenericScopeView.qml:532 qml/Dash/GenericScopeView.qml:690
228+#: qml/Dash/GenericScopeView.qml:539 qml/Dash/GenericScopeView.qml:697
229msgid "See less"
229msgid "See less"
230msgstr ""
230msgstr ""
231
231
232−#: qml/Dash/GenericScopeView.qml:532
232+#: qml/Dash/GenericScopeView.qml:539
233msgid "See all"
233msgid "See all"
234msgstr ""
234msgstr ""
235
235
236−#: qml/Dash/GenericScopeView.qml:594
236+#: qml/Dash/GenericScopeView.qml:601
237msgctxt "Label: Hint for dash search line edit"
237msgctxt "Label: Hint for dash search line edit"
238msgid "Search"
238msgid "Search"
239msgstr ""
239msgstr ""
@@ -317,57 +317,58 @@ msgstr ""
317msgid "Tap to unlock"
317msgid "Tap to unlock"
318msgstr ""
318msgstr ""
319
319
320−#: qml/Greeter/NarrowView.qml:53 qml/Wizard/Pages/passwd-confirm.qml:53
320+#: qml/Greeter/NarrowView.qml:54 qml/Wizard/Pages/passwd-confirm.qml:53
321msgid "Sorry, incorrect passphrase."
321msgid "Sorry, incorrect passphrase."
322msgstr ""
322msgstr ""
323
323
324−#: qml/Greeter/NarrowView.qml:54 qml/Wizard/Pages/passwd-confirm.qml:54
324+#: qml/Greeter/NarrowView.qml:55 qml/Wizard/Pages/passwd-confirm.qml:54
325msgid "Sorry, incorrect passcode."
325msgid "Sorry, incorrect passcode."
326msgstr ""
326msgstr ""
327
327
328−#: qml/Greeter/NarrowView.qml:55
328+#: qml/Greeter/NarrowView.qml:56
329msgid "This will be your last attempt."
329msgid "This will be your last attempt."
330msgstr ""
330msgstr ""
331
331
332−#: qml/Greeter/NarrowView.qml:57
332+#: qml/Greeter/NarrowView.qml:58
333msgid ""
333msgid ""
334"If passphrase is entered incorrectly, your phone will conduct a factory "
334"If passphrase is entered incorrectly, your phone will conduct a factory "
335"reset and all personal data will be deleted."
335"reset and all personal data will be deleted."
336msgstr ""
336msgstr ""
337
337
338−#: qml/Greeter/NarrowView.qml:58
338+#: qml/Greeter/NarrowView.qml:59
339msgid ""
339msgid ""
340"If passcode is entered incorrectly, your phone will conduct a factory reset "
340"If passcode is entered incorrectly, your phone will conduct a factory reset "
341"and all personal data will be deleted."
341"and all personal data will be deleted."
342msgstr ""
342msgstr ""
343
343
344−#: qml/Greeter/NarrowView.qml:115
344+#: qml/Greeter/NarrowView.qml:116
345#, qt-format
345#, qt-format
346msgid "Enter %1"
346msgid "Enter %1"
347msgstr ""
347msgstr ""
348
348
349−#: qml/Greeter/NarrowView.qml:116 qml/Wizard/Pages/passwd-set.qml:60
349+#: qml/Greeter/NarrowView.qml:117 qml/Wizard/Pages/passwd-set.qml:60
350msgid "Enter passphrase"
350msgid "Enter passphrase"
351msgstr ""
351msgstr ""
352
352
353−#: qml/Greeter/NarrowView.qml:117
353+#: qml/Greeter/NarrowView.qml:118
354msgid "Enter passcode"
354msgid "Enter passcode"
355msgstr ""
355msgstr ""
356
356
357−#: qml/Greeter/NarrowView.qml:118
357+#: qml/Greeter/NarrowView.qml:119
358#, qt-format
358#, qt-format
359msgid "Sorry, incorrect %1"
359msgid "Sorry, incorrect %1"
360msgstr ""
360msgstr ""
361
361
362−#: qml/Greeter/NarrowView.qml:119
362+#: qml/Greeter/NarrowView.qml:120
363msgid "Sorry, incorrect passphrase"
363msgid "Sorry, incorrect passphrase"
364msgstr ""
364msgstr ""
365
365
366−#: qml/Greeter/NarrowView.qml:120
366+#: qml/Greeter/NarrowView.qml:121
367+msgctxt "passphrase"
367msgid "Please re-enter"
368msgid "Please re-enter"
368msgstr ""
369msgstr ""
369
370
370−#: qml/Greeter/NarrowView.qml:121
371+#: qml/Greeter/NarrowView.qml:122
371msgid "Sorry, incorrect passcode"
372msgid "Sorry, incorrect passcode"
372msgstr ""
373msgstr ""
373
374
@@ -517,38 +518,6 @@ msgctxt "Button: Go back one page in the Wizard"
517msgid "Back"
518msgid "Back"
518msgstr ""
519msgstr ""
519
520
520−#: qml/Wizard/Pages/here-terms.qml:27
521−msgid "Terms & Conditions"
522−msgstr ""
523−
524−#: qml/Wizard/Pages/passwd-confirm.qml:49
525−msgid "Confirm passphrase"
526−msgstr ""
527−
528−#: qml/Wizard/Pages/passwd-confirm.qml:50
529−msgid "Confirm passcode"
530−msgstr ""
531−
532−#: qml/Wizard/Pages/passwd-confirm.qml:53
533−#: qml/Wizard/Pages/passwd-confirm.qml:54
534−msgid "Please try again."
535−msgstr ""
536−
537−#: qml/Wizard/Pages/passwd-confirm.qml:82 qml/Wizard/Pages/passwd-set.qml:90
538−#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:128
539−#: qml/Wizard/Pages/40-wifi.qml:215 qml/Wizard/Pages/50-location.qml:131
540−#: qml/Wizard/Pages/60-reporting.qml:50
541−msgid "Continue"
542−msgstr ""
543−
544−#: qml/Wizard/Pages/passwd-set.qml:61
545−msgid "Choose your passcode"
546−msgstr ""
547−
548−#: qml/Wizard/Pages/passwd-set.qml:68
549−msgid "Passphrase must be 4 characters long"
550−msgstr ""
551−
552#: qml/Wizard/Pages/10-welcome.qml:27
521#: qml/Wizard/Pages/10-welcome.qml:27
553msgid "Hi!"
522msgid "Hi!"
554msgstr ""
523msgstr ""
@@ -561,6 +530,13 @@ msgstr ""
561msgid "Let’s get started."
530msgid "Let’s get started."
562msgstr ""
531msgstr ""
563
532
533+#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:128
534+#: qml/Wizard/Pages/40-wifi.qml:215 qml/Wizard/Pages/50-location.qml:131
535+#: qml/Wizard/Pages/60-reporting.qml:50 qml/Wizard/Pages/passwd-confirm.qml:82
536+#: qml/Wizard/Pages/passwd-set.qml:90
537+msgid "Continue"
538+msgstr ""
539+
564#: qml/Wizard/Pages/20-sim.qml:25
540#: qml/Wizard/Pages/20-sim.qml:25
565msgid "Add a SIM card and restart your device"
541msgid "Add a SIM card and restart your device"
566msgstr ""
542msgstr ""
@@ -686,6 +662,31 @@ msgstr ""
686msgid "Finish"
662msgid "Finish"
687msgstr ""
663msgstr ""
688
664
665+#: qml/Wizard/Pages/here-terms.qml:27
666+msgid "Terms & Conditions"
667+msgstr ""
668+
669+#: qml/Wizard/Pages/passwd-confirm.qml:49
670+msgid "Confirm passphrase"
671+msgstr ""
672+
673+#: qml/Wizard/Pages/passwd-confirm.qml:50
674+msgid "Confirm passcode"
675+msgstr ""
676+
677+#: qml/Wizard/Pages/passwd-confirm.qml:53
678+#: qml/Wizard/Pages/passwd-confirm.qml:54
679+msgid "Please try again."
680+msgstr ""
681+
682+#: qml/Wizard/Pages/passwd-set.qml:61
683+msgid "Choose your passcode"
684+msgstr ""
685+
686+#: qml/Wizard/Pages/passwd-set.qml:68
687+msgid "Passphrase must be 4 characters long"
688+msgstr ""
689+
689#. Translators: This is the arrow for "Back" buttons
690#. Translators: This is the arrow for "Back" buttons
690#: qml/Wizard/StackButton.qml:39
691#: qml/Wizard/StackButton.qml:39
691#, qt-format
692#, qt-format
po/br.po+55−51
@@ -7,7 +7,7 @@ msgid ""
7msgstr ""
7msgstr ""
8"Project-Id-Version: unity8\n"
8"Project-Id-Version: unity8\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2015-06-22 12:00+0200\n"
10+"POT-Creation-Date: 2015-07-17 10:10+0200\n"
11"PO-Revision-Date: 2015-07-04 13:51+0000\n"
11"PO-Revision-Date: 2015-07-04 13:51+0000\n"
12"Last-Translator: Rouxel <vincent.rouxel@mailoo.org>\n"
12"Last-Translator: Rouxel <vincent.rouxel@mailoo.org>\n"
13"Language-Team: Breton <br@li.org>\n"
13"Language-Team: Breton <br@li.org>\n"
@@ -15,8 +15,8 @@ msgstr ""
15"Content-Type: text/plain; charset=UTF-8\n"
15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n"
16"Content-Transfer-Encoding: 8bit\n"
17"Plural-Forms: nplurals=2; plural=n > 1;\n"
17"Plural-Forms: nplurals=2; plural=n > 1;\n"
18−"X-Launchpad-Export-Date: 2015-07-05 05:55+0000\n"
18+"X-Launchpad-Export-Date: 2015-07-25 05:38+0000\n"
19−"X-Generator: Launchpad (build 17597)\n"
19+"X-Generator: Launchpad (build 17628)\n"
20
20
21#: plugins/LightDM/Greeter.cpp:112
21#: plugins/LightDM/Greeter.cpp:112
22msgid "Password: "
22msgid "Password: "
@@ -229,15 +229,15 @@ msgstr "Pellgomzadenn vallus"
229msgid "OK"
229msgid "OK"
230msgstr "Mat eo"
230msgstr "Mat eo"
231
231
232−#: qml/Dash/GenericScopeView.qml:532 qml/Dash/GenericScopeView.qml:690
232+#: qml/Dash/GenericScopeView.qml:539 qml/Dash/GenericScopeView.qml:697
233msgid "See less"
233msgid "See less"
234msgstr "Gwelet nebeutoc'h"
234msgstr "Gwelet nebeutoc'h"
235
235
236−#: qml/Dash/GenericScopeView.qml:532
236+#: qml/Dash/GenericScopeView.qml:539
237msgid "See all"
237msgid "See all"
238msgstr "Gwelet pep tra"
238msgstr "Gwelet pep tra"
239
239
240−#: qml/Dash/GenericScopeView.qml:594
240+#: qml/Dash/GenericScopeView.qml:601
241msgctxt "Label: Hint for dash search line edit"
241msgctxt "Label: Hint for dash search line edit"
242msgid "Search"
242msgid "Search"
243msgstr "Klask"
243msgstr "Klask"
@@ -321,19 +321,19 @@ msgstr "Esaeañ en-dro"
321msgid "Tap to unlock"
321msgid "Tap to unlock"
322msgstr "Pouezañ evit dibrennañ"
322msgstr "Pouezañ evit dibrennañ"
323
323
324−#: qml/Greeter/NarrowView.qml:53 qml/Wizard/Pages/passwd-confirm.qml:53
324+#: qml/Greeter/NarrowView.qml:54 qml/Wizard/Pages/passwd-confirm.qml:53
325msgid "Sorry, incorrect passphrase."
325msgid "Sorry, incorrect passphrase."
326msgstr "Siwazh, frazenn-dremen direizh"
326msgstr "Siwazh, frazenn-dremen direizh"
327
327
328−#: qml/Greeter/NarrowView.qml:54 qml/Wizard/Pages/passwd-confirm.qml:54
328+#: qml/Greeter/NarrowView.qml:55 qml/Wizard/Pages/passwd-confirm.qml:54
329msgid "Sorry, incorrect passcode."
329msgid "Sorry, incorrect passcode."
330msgstr "Siwazh, kod-tremen direizh"
330msgstr "Siwazh, kod-tremen direizh"
331
331
332−#: qml/Greeter/NarrowView.qml:55
332+#: qml/Greeter/NarrowView.qml:56
333msgid "This will be your last attempt."
333msgid "This will be your last attempt."
334msgstr "Ho taol-esae diwezhañ e vo."
334msgstr "Ho taol-esae diwezhañ e vo."
335
335
336−#: qml/Greeter/NarrowView.qml:57
336+#: qml/Greeter/NarrowView.qml:58
337msgid ""
337msgid ""
338"If passphrase is entered incorrectly, your phone will conduct a factory "
338"If passphrase is entered incorrectly, your phone will conduct a factory "
339"reset and all personal data will be deleted."
339"reset and all personal data will be deleted."
@@ -341,7 +341,7 @@ msgstr ""
341"Ma vez ebarzhet ur frazenn-dremen direizh, e vo adderaouekaet ho pellgomzer "
341"Ma vez ebarzhet ur frazenn-dremen direizh, e vo adderaouekaet ho pellgomzer "
342"gant arventennoù al labouradeg hag e vo diverket an holl roadennoù personel"
342"gant arventennoù al labouradeg hag e vo diverket an holl roadennoù personel"
343
343
344−#: qml/Greeter/NarrowView.qml:58
344+#: qml/Greeter/NarrowView.qml:59
345msgid ""
345msgid ""
346"If passcode is entered incorrectly, your phone will conduct a factory reset "
346"If passcode is entered incorrectly, your phone will conduct a factory reset "
347"and all personal data will be deleted."
347"and all personal data will be deleted."
@@ -349,33 +349,34 @@ msgstr ""
349"Ma vez ebarzhet ur c'hod-tremen direizh, e vo adderaouekaet ho pellgomzer "
349"Ma vez ebarzhet ur c'hod-tremen direizh, e vo adderaouekaet ho pellgomzer "
350"gant arventennoù al labouradeg hag e vo diverket an holl roadennoù personel."
350"gant arventennoù al labouradeg hag e vo diverket an holl roadennoù personel."
351
351
352−#: qml/Greeter/NarrowView.qml:115
352+#: qml/Greeter/NarrowView.qml:116
353#, qt-format
353#, qt-format
354msgid "Enter %1"
354msgid "Enter %1"
355msgstr "Merkañ %1"
355msgstr "Merkañ %1"
356
356
357−#: qml/Greeter/NarrowView.qml:116 qml/Wizard/Pages/passwd-set.qml:60
357+#: qml/Greeter/NarrowView.qml:117 qml/Wizard/Pages/passwd-set.qml:60
358msgid "Enter passphrase"
358msgid "Enter passphrase"
359msgstr "Merkañ ar frazenn-dremen"
359msgstr "Merkañ ar frazenn-dremen"
360
360
361−#: qml/Greeter/NarrowView.qml:117
361+#: qml/Greeter/NarrowView.qml:118
362msgid "Enter passcode"
362msgid "Enter passcode"
363msgstr "Merkañ ar c'hod-tremen"
363msgstr "Merkañ ar c'hod-tremen"
364
364
365−#: qml/Greeter/NarrowView.qml:118
365+#: qml/Greeter/NarrowView.qml:119
366#, qt-format
366#, qt-format
367msgid "Sorry, incorrect %1"
367msgid "Sorry, incorrect %1"
368msgstr "Siwazh, %1 direizh"
368msgstr "Siwazh, %1 direizh"
369
369
370−#: qml/Greeter/NarrowView.qml:119
370+#: qml/Greeter/NarrowView.qml:120
371msgid "Sorry, incorrect passphrase"
371msgid "Sorry, incorrect passphrase"
372msgstr "Siwazh, frazenn-dremen direizh"
372msgstr "Siwazh, frazenn-dremen direizh"
373
373
374−#: qml/Greeter/NarrowView.qml:120
374+#: qml/Greeter/NarrowView.qml:121
375+msgctxt "passphrase"
375msgid "Please re-enter"
376msgid "Please re-enter"
376−msgstr "Adverkañ, mar plij"
377+msgstr ""
377
378
378−#: qml/Greeter/NarrowView.qml:121
379+#: qml/Greeter/NarrowView.qml:122
379msgid "Sorry, incorrect passcode"
380msgid "Sorry, incorrect passcode"
380msgstr "Digarezit, kod-tremen direizh"
381msgstr "Digarezit, kod-tremen direizh"
381
382
@@ -525,38 +526,6 @@ msgctxt "Button: Go back one page in the Wizard"
525msgid "Back"
526msgid "Back"
526msgstr "Distreiñ"
527msgstr "Distreiñ"
527
528
528−#: qml/Wizard/Pages/here-terms.qml:27
529−msgid "Terms & Conditions"
530−msgstr "Penndivizoù implij"
531−
532−#: qml/Wizard/Pages/passwd-confirm.qml:49
533−msgid "Confirm passphrase"
534−msgstr "Kadarnaat ar frazenn-dremen"
535−
536−#: qml/Wizard/Pages/passwd-confirm.qml:50
537−msgid "Confirm passcode"
538−msgstr "Kadarnaat ar c'hod-tremen"
539−
540−#: qml/Wizard/Pages/passwd-confirm.qml:53
541−#: qml/Wizard/Pages/passwd-confirm.qml:54
542−msgid "Please try again."
543−msgstr "Esaeit en-dro, mar plij."
544−
545−#: qml/Wizard/Pages/passwd-confirm.qml:82 qml/Wizard/Pages/passwd-set.qml:90
546−#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:128
547−#: qml/Wizard/Pages/40-wifi.qml:215 qml/Wizard/Pages/50-location.qml:131
548−#: qml/Wizard/Pages/60-reporting.qml:50
549−msgid "Continue"
550−msgstr "Kenderc'hel"
551−
552−#: qml/Wizard/Pages/passwd-set.qml:61
553−msgid "Choose your passcode"
554−msgstr "Choaz ho kod-tremen"
555−
556−#: qml/Wizard/Pages/passwd-set.qml:68
557−msgid "Passphrase must be 4 characters long"
558−msgstr "4 arouezenn a rank bezañ er frazenn-dremen"
559−
560#: qml/Wizard/Pages/10-welcome.qml:27
529#: qml/Wizard/Pages/10-welcome.qml:27
561msgid "Hi!"
530msgid "Hi!"
562msgstr "Salud deoc'h !"
531msgstr "Salud deoc'h !"
@@ -569,6 +538,13 @@ msgstr "Deuet-mat oc'h en ho pellgomzer Ubuntu."
569msgid "Let’s get started."
538msgid "Let’s get started."
570msgstr "Krogomp ganti."
539msgstr "Krogomp ganti."
571
540
541+#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:128
542+#: qml/Wizard/Pages/40-wifi.qml:215 qml/Wizard/Pages/50-location.qml:131
543+#: qml/Wizard/Pages/60-reporting.qml:50 qml/Wizard/Pages/passwd-confirm.qml:82
544+#: qml/Wizard/Pages/passwd-set.qml:90
545+msgid "Continue"
546+msgstr "Kenderc'hel"
547+
572#: qml/Wizard/Pages/20-sim.qml:25
548#: qml/Wizard/Pages/20-sim.qml:25
573msgid "Add a SIM card and restart your device"
549msgid "Add a SIM card and restart your device"
574msgstr "Lakait ur gartenn SIM hag adloc'hit ho penveg"
550msgstr "Lakait ur gartenn SIM hag adloc'hit ho penveg"
@@ -702,6 +678,31 @@ msgstr "Prest eo ho pellgomzer da vezañ implijet bremañ."
702msgid "Finish"
678msgid "Finish"
703msgstr "Echuiñ"
679msgstr "Echuiñ"
704
680
681+#: qml/Wizard/Pages/here-terms.qml:27
682+msgid "Terms & Conditions"
683+msgstr "Penndivizoù implij"
684+
685+#: qml/Wizard/Pages/passwd-confirm.qml:49
686+msgid "Confirm passphrase"
687+msgstr "Kadarnaat ar frazenn-dremen"
688+
689+#: qml/Wizard/Pages/passwd-confirm.qml:50
690+msgid "Confirm passcode"
691+msgstr "Kadarnaat ar c'hod-tremen"
692+
693+#: qml/Wizard/Pages/passwd-confirm.qml:53
694+#: qml/Wizard/Pages/passwd-confirm.qml:54
695+msgid "Please try again."
696+msgstr "Esaeit en-dro, mar plij."
697+
698+#: qml/Wizard/Pages/passwd-set.qml:61
699+msgid "Choose your passcode"
700+msgstr "Choaz ho kod-tremen"
701+
702+#: qml/Wizard/Pages/passwd-set.qml:68
703+msgid "Passphrase must be 4 characters long"
704+msgstr "4 arouezenn a rank bezañ er frazenn-dremen"
705+
705#. Translators: This is the arrow for "Back" buttons
706#. Translators: This is the arrow for "Back" buttons
706#: qml/Wizard/StackButton.qml:39
707#: qml/Wizard/StackButton.qml:39
707#, qt-format
708#, qt-format
@@ -809,3 +810,6 @@ msgstr "%1 〉"
809
810
810#~ msgid "Manage Scopes"
811#~ msgid "Manage Scopes"
811#~ msgstr "Merañ ar c'hefluskerioù enklask"
812#~ msgstr "Merañ ar c'hefluskerioù enklask"
813+
814+#~ msgid "Please re-enter"
815+#~ msgstr "Adverkañ, mar plij"
po/bs.po+55−51
@@ -7,7 +7,7 @@ msgid ""
7msgstr ""
7msgstr ""
8"Project-Id-Version: unity8\n"
8"Project-Id-Version: unity8\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2015-06-22 12:00+0200\n"
10+"POT-Creation-Date: 2015-07-17 10:10+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"
@@ -16,8 +16,8 @@ msgstr ""
16"Content-Transfer-Encoding: 8bit\n"
16"Content-Transfer-Encoding: 8bit\n"
17"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
17"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
18"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
18"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
19−"X-Launchpad-Export-Date: 2015-07-04 05:36+0000\n"
19+"X-Launchpad-Export-Date: 2015-07-25 05:38+0000\n"
20−"X-Generator: Launchpad (build 17597)\n"
20+"X-Generator: Launchpad (build 17628)\n"
21
21
22#: plugins/LightDM/Greeter.cpp:112
22#: plugins/LightDM/Greeter.cpp:112
23msgid "Password: "
23msgid "Password: "
@@ -227,15 +227,15 @@ msgstr "Hitan Poziv"
227msgid "OK"
227msgid "OK"
228msgstr "U redu"
228msgstr "U redu"
229
229
230−#: qml/Dash/GenericScopeView.qml:532 qml/Dash/GenericScopeView.qml:690
230+#: qml/Dash/GenericScopeView.qml:539 qml/Dash/GenericScopeView.qml:697
231msgid "See less"
231msgid "See less"
232msgstr "Pogledati manje"
232msgstr "Pogledati manje"
233
233
234−#: qml/Dash/GenericScopeView.qml:532
234+#: qml/Dash/GenericScopeView.qml:539
235msgid "See all"
235msgid "See all"
236msgstr "Pogledati sve"
236msgstr "Pogledati sve"
237
237
238−#: qml/Dash/GenericScopeView.qml:594
238+#: qml/Dash/GenericScopeView.qml:601
239msgctxt "Label: Hint for dash search line edit"
239msgctxt "Label: Hint for dash search line edit"
240msgid "Search"
240msgid "Search"
241msgstr "Pretraži"
241msgstr "Pretraži"
@@ -319,19 +319,19 @@ msgstr "Ponovi"
319msgid "Tap to unlock"
319msgid "Tap to unlock"
320msgstr "Kucnite za otključavanje"
320msgstr "Kucnite za otključavanje"
321
321
322−#: qml/Greeter/NarrowView.qml:53 qml/Wizard/Pages/passwd-confirm.qml:53
322+#: qml/Greeter/NarrowView.qml:54 qml/Wizard/Pages/passwd-confirm.qml:53
323msgid "Sorry, incorrect passphrase."
323msgid "Sorry, incorrect passphrase."
324msgstr "Izvinite, pogrešna pristupna fraza."
324msgstr "Izvinite, pogrešna pristupna fraza."
325
325
326−#: qml/Greeter/NarrowView.qml:54 qml/Wizard/Pages/passwd-confirm.qml:54
326+#: qml/Greeter/NarrowView.qml:55 qml/Wizard/Pages/passwd-confirm.qml:54
327msgid "Sorry, incorrect passcode."
327msgid "Sorry, incorrect passcode."
328msgstr "Izvinite, pogrešan pristupni kod."
328msgstr "Izvinite, pogrešan pristupni kod."
329
329
330−#: qml/Greeter/NarrowView.qml:55
330+#: qml/Greeter/NarrowView.qml:56
331msgid "This will be your last attempt."
331msgid "This will be your last attempt."
332msgstr "Ovo će biti vaš posljednji pokušaj."
332msgstr "Ovo će biti vaš posljednji pokušaj."
333
333
334−#: qml/Greeter/NarrowView.qml:57
334+#: qml/Greeter/NarrowView.qml:58
335msgid ""
335msgid ""
336"If passphrase is entered incorrectly, your phone will conduct a factory "
336"If passphrase is entered incorrectly, your phone will conduct a factory "
337"reset and all personal data will be deleted."
337"reset and all personal data will be deleted."
@@ -339,7 +339,7 @@ msgstr ""
339"Ako je pristupna fraza unesena pogrešno, vaš telefon će sprovesti reset na "
339"Ako je pristupna fraza unesena pogrešno, vaš telefon će sprovesti reset na "
340"fabričke postavke i svi osobni podaci će biti izbrisani."
340"fabričke postavke i svi osobni podaci će biti izbrisani."
341
341
342−#: qml/Greeter/NarrowView.qml:58
342+#: qml/Greeter/NarrowView.qml:59
343msgid ""
343msgid ""
344"If passcode is entered incorrectly, your phone will conduct a factory reset "
344"If passcode is entered incorrectly, your phone will conduct a factory reset "
345"and all personal data will be deleted."
345"and all personal data will be deleted."
@@ -347,33 +347,34 @@ msgstr ""
347"Ako je pristupni kod unesen netačno, vaš telefon će sprovesti reset na "
347"Ako je pristupni kod unesen netačno, vaš telefon će sprovesti reset na "
348"fabričke postavke i svi osobni podaci će biti izbrisani."
348"fabričke postavke i svi osobni podaci će biti izbrisani."
349
349
350−#: qml/Greeter/NarrowView.qml:115
350+#: qml/Greeter/NarrowView.qml:116
351#, qt-format
351#, qt-format
352msgid "Enter %1"
352msgid "Enter %1"
353msgstr "Unesite %1"
353msgstr "Unesite %1"
354
354
355−#: qml/Greeter/NarrowView.qml:116 qml/Wizard/Pages/passwd-set.qml:60
355+#: qml/Greeter/NarrowView.qml:117 qml/Wizard/Pages/passwd-set.qml:60
356msgid "Enter passphrase"
356msgid "Enter passphrase"
357msgstr "Unesite propusnu frazu"
357msgstr "Unesite propusnu frazu"
358
358
359−#: qml/Greeter/NarrowView.qml:117
359+#: qml/Greeter/NarrowView.qml:118
360msgid "Enter passcode"
360msgid "Enter passcode"
361msgstr "Unesite pristupni kod"
361msgstr "Unesite pristupni kod"
362
362
363−#: qml/Greeter/NarrowView.qml:118
363+#: qml/Greeter/NarrowView.qml:119
364#, qt-format
364#, qt-format
365msgid "Sorry, incorrect %1"
365msgid "Sorry, incorrect %1"
366msgstr "Izvinite, netačno %1"
366msgstr "Izvinite, netačno %1"
367
367
368−#: qml/Greeter/NarrowView.qml:119
368+#: qml/Greeter/NarrowView.qml:120
369msgid "Sorry, incorrect passphrase"
369msgid "Sorry, incorrect passphrase"
370msgstr "Izvinite, netačna propusna fraza"
370msgstr "Izvinite, netačna propusna fraza"
371
371
372−#: qml/Greeter/NarrowView.qml:120
372+#: qml/Greeter/NarrowView.qml:121
373+msgctxt "passphrase"
373msgid "Please re-enter"
374msgid "Please re-enter"
374−msgstr "Molimo ponovo unesite"
375+msgstr ""
375
376
376−#: qml/Greeter/NarrowView.qml:121
377+#: qml/Greeter/NarrowView.qml:122
377msgid "Sorry, incorrect passcode"
378msgid "Sorry, incorrect passcode"
378msgstr "Izvinite, netačan pristupni kod"
379msgstr "Izvinite, netačan pristupni kod"
379
380
@@ -523,38 +524,6 @@ msgctxt "Button: Go back one page in the Wizard"
523msgid "Back"
524msgid "Back"
524msgstr "Nazad"
525msgstr "Nazad"
525
526
526−#: qml/Wizard/Pages/here-terms.qml:27
527−msgid "Terms & Conditions"
528−msgstr "Uslovi i odredbe"
529−
530−#: qml/Wizard/Pages/passwd-confirm.qml:49
531−msgid "Confirm passphrase"
532−msgstr "Potvrditi pristupnu rečenicu"
533−
534−#: qml/Wizard/Pages/passwd-confirm.qml:50
535−msgid "Confirm passcode"
536−msgstr "Potvrdi pristupni kod"
537−
538−#: qml/Wizard/Pages/passwd-confirm.qml:53
539−#: qml/Wizard/Pages/passwd-confirm.qml:54
540−msgid "Please try again."
541−msgstr "Molimo pokušajte ponovo."
542−
543−#: qml/Wizard/Pages/passwd-confirm.qml:82 qml/Wizard/Pages/passwd-set.qml:90
544−#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:128
545−#: qml/Wizard/Pages/40-wifi.qml:215 qml/Wizard/Pages/50-location.qml:131
546−#: qml/Wizard/Pages/60-reporting.qml:50
547−msgid "Continue"
548−msgstr "Nastavite"
549−
550−#: qml/Wizard/Pages/passwd-set.qml:61
551−msgid "Choose your passcode"
552−msgstr "Izaberite vaš pristupni kod"
553−
554−#: qml/Wizard/Pages/passwd-set.qml:68
555−msgid "Passphrase must be 4 characters long"
556−msgstr "Pristupna fraza mora sadržavati 4 slova"
557−
558#: qml/Wizard/Pages/10-welcome.qml:27
527#: qml/Wizard/Pages/10-welcome.qml:27
559msgid "Hi!"
528msgid "Hi!"
560msgstr "Ćao!"
529msgstr "Ćao!"
@@ -567,6 +536,13 @@ msgstr "Dobrodošli u vaš Ubuntu telefon."
567msgid "Let’s get started."
536msgid "Let’s get started."
568msgstr "Započnimo"
537msgstr "Započnimo"
569
538
539+#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:128
540+#: qml/Wizard/Pages/40-wifi.qml:215 qml/Wizard/Pages/50-location.qml:131
541+#: qml/Wizard/Pages/60-reporting.qml:50 qml/Wizard/Pages/passwd-confirm.qml:82
542+#: qml/Wizard/Pages/passwd-set.qml:90
543+msgid "Continue"
544+msgstr "Nastavite"
545+
570#: qml/Wizard/Pages/20-sim.qml:25
546#: qml/Wizard/Pages/20-sim.qml:25
571msgid "Add a SIM card and restart your device"
547msgid "Add a SIM card and restart your device"
572msgstr "Dodajte SIM karticu i restartujte vaš uređaj"
548msgstr "Dodajte SIM karticu i restartujte vaš uređaj"
@@ -700,6 +676,31 @@ msgstr "Vaš telefon je sada spreman za upotrebu."
700msgid "Finish"
676msgid "Finish"
701msgstr "Završiti"
677msgstr "Završiti"
702
678
679+#: qml/Wizard/Pages/here-terms.qml:27
680+msgid "Terms & Conditions"
681+msgstr "Uslovi i odredbe"
682+
683+#: qml/Wizard/Pages/passwd-confirm.qml:49
684+msgid "Confirm passphrase"
685+msgstr "Potvrditi pristupnu rečenicu"
686+
687+#: qml/Wizard/Pages/passwd-confirm.qml:50
688+msgid "Confirm passcode"
689+msgstr "Potvrdi pristupni kod"
690+
691+#: qml/Wizard/Pages/passwd-confirm.qml:53
692+#: qml/Wizard/Pages/passwd-confirm.qml:54
693+msgid "Please try again."
694+msgstr "Molimo pokušajte ponovo."
695+
696+#: qml/Wizard/Pages/passwd-set.qml:61
697+msgid "Choose your passcode"
698+msgstr "Izaberite vaš pristupni kod"
699+
700+#: qml/Wizard/Pages/passwd-set.qml:68
701+msgid "Passphrase must be 4 characters long"
702+msgstr "Pristupna fraza mora sadržavati 4 slova"
703+
703#. Translators: This is the arrow for "Back" buttons
704#. Translators: This is the arrow for "Back" buttons
704#: qml/Wizard/StackButton.qml:39
705#: qml/Wizard/StackButton.qml:39
705#, qt-format
706#, qt-format
@@ -723,3 +724,6 @@ msgstr "%1 〉"
723
724
724#~ msgid "Right edge"
725#~ msgid "Right edge"
725#~ msgstr "Desna ivica"
726#~ msgstr "Desna ivica"
727+
728+#~ msgid "Please re-enter"
729+#~ msgstr "Molimo ponovo unesite"
po/ca.po+55−51
@@ -7,7 +7,7 @@ msgid ""
7msgstr ""
7msgstr ""
8"Project-Id-Version: unity\n"
8"Project-Id-Version: unity\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2015-06-22 12:00+0200\n"
10+"POT-Creation-Date: 2015-07-17 10:10+0200\n"
11"PO-Revision-Date: 2015-07-04 09:48+0000\n"
11"PO-Revision-Date: 2015-07-04 09:48+0000\n"
12"Last-Translator: David Planella <david.planella@ubuntu.com>\n"
12"Last-Translator: David Planella <david.planella@ubuntu.com>\n"
13"Language-Team: Catalan <ca@li.org>\n"
13"Language-Team: Catalan <ca@li.org>\n"
@@ -15,8 +15,8 @@ msgstr ""
15"Content-Type: text/plain; charset=UTF-8\n"
15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n"
16"Content-Transfer-Encoding: 8bit\n"
17"Plural-Forms: nplurals=2; plural=n != 1;\n"
17"Plural-Forms: nplurals=2; plural=n != 1;\n"
18−"X-Launchpad-Export-Date: 2015-07-05 05:55+0000\n"
18+"X-Launchpad-Export-Date: 2015-07-25 05:38+0000\n"
19−"X-Generator: Launchpad (build 17597)\n"
19+"X-Generator: Launchpad (build 17628)\n"
20
20
21#: plugins/LightDM/Greeter.cpp:112
21#: plugins/LightDM/Greeter.cpp:112
22msgid "Password: "
22msgid "Password: "
@@ -229,15 +229,15 @@ msgstr "Trucada d'emergència"
229msgid "OK"
229msgid "OK"
230msgstr "D'acord"
230msgstr "D'acord"
231
231
232−#: qml/Dash/GenericScopeView.qml:532 qml/Dash/GenericScopeView.qml:690
232+#: qml/Dash/GenericScopeView.qml:539 qml/Dash/GenericScopeView.qml:697
233msgid "See less"
233msgid "See less"
234msgstr "Mostra'n menys"
234msgstr "Mostra'n menys"
235
235
236−#: qml/Dash/GenericScopeView.qml:532
236+#: qml/Dash/GenericScopeView.qml:539
237msgid "See all"
237msgid "See all"
238msgstr "Mostra-ho tot"
238msgstr "Mostra-ho tot"
239
239
240−#: qml/Dash/GenericScopeView.qml:594
240+#: qml/Dash/GenericScopeView.qml:601
241msgctxt "Label: Hint for dash search line edit"
241msgctxt "Label: Hint for dash search line edit"
242msgid "Search"
242msgid "Search"
243msgstr "Cerca"
243msgstr "Cerca"
@@ -321,19 +321,19 @@ msgstr "Torna-ho a provar"
321msgid "Tap to unlock"
321msgid "Tap to unlock"
322msgstr "Feu un toc per desblocar"
322msgstr "Feu un toc per desblocar"
323
323
324−#: qml/Greeter/NarrowView.qml:53 qml/Wizard/Pages/passwd-confirm.qml:53
324+#: qml/Greeter/NarrowView.qml:54 qml/Wizard/Pages/passwd-confirm.qml:53
325msgid "Sorry, incorrect passphrase."
325msgid "Sorry, incorrect passphrase."
326msgstr "La contrasenya és incorrecta"
326msgstr "La contrasenya és incorrecta"
327
327
328−#: qml/Greeter/NarrowView.qml:54 qml/Wizard/Pages/passwd-confirm.qml:54
328+#: qml/Greeter/NarrowView.qml:55 qml/Wizard/Pages/passwd-confirm.qml:54
329msgid "Sorry, incorrect passcode."
329msgid "Sorry, incorrect passcode."
330msgstr "El codi d'accés no és correcte"
330msgstr "El codi d'accés no és correcte"
331
331
332−#: qml/Greeter/NarrowView.qml:55
332+#: qml/Greeter/NarrowView.qml:56
333msgid "This will be your last attempt."
333msgid "This will be your last attempt."
334msgstr "Aquest serà el darrer intent."
334msgstr "Aquest serà el darrer intent."
335
335
336−#: qml/Greeter/NarrowView.qml:57
336+#: qml/Greeter/NarrowView.qml:58
337msgid ""
337msgid ""
338"If passphrase is entered incorrectly, your phone will conduct a factory "
338"If passphrase is entered incorrectly, your phone will conduct a factory "
339"reset and all personal data will be deleted."
339"reset and all personal data will be deleted."
@@ -342,7 +342,7 @@ msgstr ""
342"reinicialitzarà a l'estat de fàbrica i se suprimiran totes les dades "
342"reinicialitzarà a l'estat de fàbrica i se suprimiran totes les dades "
343"personals."
343"personals."
344
344
345−#: qml/Greeter/NarrowView.qml:58
345+#: qml/Greeter/NarrowView.qml:59
346msgid ""
346msgid ""
347"If passcode is entered incorrectly, your phone will conduct a factory reset "
347"If passcode is entered incorrectly, your phone will conduct a factory reset "
348"and all personal data will be deleted."
348"and all personal data will be deleted."
@@ -351,33 +351,34 @@ msgstr ""
351"reinicialitzarà a l'estat de fàbrica i se suprimiran totes les dades "
351"reinicialitzarà a l'estat de fàbrica i se suprimiran totes les dades "
352"personals."
352"personals."
353
353
354−#: qml/Greeter/NarrowView.qml:115
354+#: qml/Greeter/NarrowView.qml:116
355#, qt-format
355#, qt-format
356msgid "Enter %1"
356msgid "Enter %1"
357msgstr "Introduïu: %1"
357msgstr "Introduïu: %1"
358
358
359−#: qml/Greeter/NarrowView.qml:116 qml/Wizard/Pages/passwd-set.qml:60
359+#: qml/Greeter/NarrowView.qml:117 qml/Wizard/Pages/passwd-set.qml:60
360msgid "Enter passphrase"
360msgid "Enter passphrase"
361msgstr "Introduïu la contrasenya"
361msgstr "Introduïu la contrasenya"
362
362
363−#: qml/Greeter/NarrowView.qml:117
363+#: qml/Greeter/NarrowView.qml:118
364msgid "Enter passcode"
364msgid "Enter passcode"
365msgstr "Introduïu el codi d'accés"
365msgstr "Introduïu el codi d'accés"
366
366
367−#: qml/Greeter/NarrowView.qml:118
367+#: qml/Greeter/NarrowView.qml:119
368#, qt-format
368#, qt-format
369msgid "Sorry, incorrect %1"
369msgid "Sorry, incorrect %1"
370msgstr "Incorrecte (%1)"
370msgstr "Incorrecte (%1)"
371
371
372−#: qml/Greeter/NarrowView.qml:119
372+#: qml/Greeter/NarrowView.qml:120
373msgid "Sorry, incorrect passphrase"
373msgid "Sorry, incorrect passphrase"
374msgstr "La contrasenya no és correcta"
374msgstr "La contrasenya no és correcta"
375
375
376−#: qml/Greeter/NarrowView.qml:120
376+#: qml/Greeter/NarrowView.qml:121
377+msgctxt "passphrase"
377msgid "Please re-enter"
378msgid "Please re-enter"
378−msgstr "Torneu-ho a introduir"
379+msgstr ""
379
380
380−#: qml/Greeter/NarrowView.qml:121
381+#: qml/Greeter/NarrowView.qml:122
381msgid "Sorry, incorrect passcode"
382msgid "Sorry, incorrect passcode"
382msgstr "El codi d'accés no és correcte"
383msgstr "El codi d'accés no és correcte"
383
384
@@ -527,38 +528,6 @@ msgctxt "Button: Go back one page in the Wizard"
527msgid "Back"
528msgid "Back"
528msgstr "Enrere"
529msgstr "Enrere"
529
530
530−#: qml/Wizard/Pages/here-terms.qml:27
531−msgid "Terms & Conditions"
532−msgstr "Condicions generals"
533−
534−#: qml/Wizard/Pages/passwd-confirm.qml:49
535−msgid "Confirm passphrase"
536−msgstr "Confirmeu la contrasenya"
537−
538−#: qml/Wizard/Pages/passwd-confirm.qml:50
539−msgid "Confirm passcode"
540−msgstr "Confirmeu el codi d'accés"
541−
542−#: qml/Wizard/Pages/passwd-confirm.qml:53
543−#: qml/Wizard/Pages/passwd-confirm.qml:54
544−msgid "Please try again."
545−msgstr "Torneu-ho a intentar."
546−
547−#: qml/Wizard/Pages/passwd-confirm.qml:82 qml/Wizard/Pages/passwd-set.qml:90
548−#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:128
549−#: qml/Wizard/Pages/40-wifi.qml:215 qml/Wizard/Pages/50-location.qml:131
550−#: qml/Wizard/Pages/60-reporting.qml:50
551−msgid "Continue"
552−msgstr "Continua"
553−
554−#: qml/Wizard/Pages/passwd-set.qml:61
555−msgid "Choose your passcode"
556−msgstr "Trieu el codi d'accés"
557−
558−#: qml/Wizard/Pages/passwd-set.qml:68
559−msgid "Passphrase must be 4 characters long"
560−msgstr "La contrasenya ha de tenir 4 caràcters com a mínim"
561−
562#: qml/Wizard/Pages/10-welcome.qml:27
531#: qml/Wizard/Pages/10-welcome.qml:27
563msgid "Hi!"
532msgid "Hi!"
564msgstr "Hola!"
533msgstr "Hola!"
@@ -571,6 +540,13 @@ msgstr "Us donem la benvinguda al vostre telèfon Ubuntu."
571msgid "Let’s get started."
540msgid "Let’s get started."
572msgstr "Comencem."
541msgstr "Comencem."
573
542
543+#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:128
544+#: qml/Wizard/Pages/40-wifi.qml:215 qml/Wizard/Pages/50-location.qml:131
545+#: qml/Wizard/Pages/60-reporting.qml:50 qml/Wizard/Pages/passwd-confirm.qml:82
546+#: qml/Wizard/Pages/passwd-set.qml:90
547+msgid "Continue"
548+msgstr "Continua"
549+
574#: qml/Wizard/Pages/20-sim.qml:25
550#: qml/Wizard/Pages/20-sim.qml:25
575msgid "Add a SIM card and restart your device"
551msgid "Add a SIM card and restart your device"
576msgstr "Afegiu una targeta SIM i reinicieu el dispositiu"
552msgstr "Afegiu una targeta SIM i reinicieu el dispositiu"
@@ -705,6 +681,31 @@ msgstr "Ja podeu utilitzar el vostre telèfon."
705msgid "Finish"
681msgid "Finish"
706msgstr "Finalitza"
682msgstr "Finalitza"
707
683
684+#: qml/Wizard/Pages/here-terms.qml:27
685+msgid "Terms & Conditions"
686+msgstr "Condicions generals"
687+
688+#: qml/Wizard/Pages/passwd-confirm.qml:49
689+msgid "Confirm passphrase"
690+msgstr "Confirmeu la contrasenya"
691+
692+#: qml/Wizard/Pages/passwd-confirm.qml:50
693+msgid "Confirm passcode"
694+msgstr "Confirmeu el codi d'accés"
695+
696+#: qml/Wizard/Pages/passwd-confirm.qml:53
697+#: qml/Wizard/Pages/passwd-confirm.qml:54
698+msgid "Please try again."
699+msgstr "Torneu-ho a intentar."
700+
701+#: qml/Wizard/Pages/passwd-set.qml:61
702+msgid "Choose your passcode"
703+msgstr "Trieu el codi d'accés"
704+
705+#: qml/Wizard/Pages/passwd-set.qml:68
706+msgid "Passphrase must be 4 characters long"
707+msgstr "La contrasenya ha de tenir 4 caràcters com a mínim"
708+
708#. Translators: This is the arrow for "Back" buttons
709#. Translators: This is the arrow for "Back" buttons
709#: qml/Wizard/StackButton.qml:39
710#: qml/Wizard/StackButton.qml:39
710#, qt-format
711#, qt-format
@@ -811,5 +812,8 @@ msgstr "%1 〉"
811#~ msgid "Restart"
812#~ msgid "Restart"
812#~ msgstr "Reinicia"
813#~ msgstr "Reinicia"
813
814
815+#~ msgid "Please re-enter"
816+#~ msgstr "Torneu-ho a introduir"
817+
814#~ msgid "Manage Scopes"
818#~ msgid "Manage Scopes"
815#~ msgstr "Gestioneu les lents"
819#~ msgstr "Gestioneu les lents"
po/ca@valencia.po+55−51
@@ -7,7 +7,7 @@ msgid ""
7msgstr ""
7msgstr ""
8"Project-Id-Version: unity\n"
8"Project-Id-Version: unity\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2015-06-22 12:00+0200\n"
10+"POT-Creation-Date: 2015-07-17 10:10+0200\n"
11"PO-Revision-Date: 2015-02-22 15:22+0000\n"
11"PO-Revision-Date: 2015-02-22 15:22+0000\n"
12"Last-Translator: David Planella <david.planella@ubuntu.com>\n"
12"Last-Translator: David Planella <david.planella@ubuntu.com>\n"
13"Language-Team: Catalan <ca@li.org>\n"
13"Language-Team: Catalan <ca@li.org>\n"
@@ -15,8 +15,8 @@ msgstr ""
15"Content-Type: text/plain; charset=UTF-8\n"
15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n"
16"Content-Transfer-Encoding: 8bit\n"
17"Plural-Forms: nplurals=2; plural=n != 1;\n"
17"Plural-Forms: nplurals=2; plural=n != 1;\n"
18−"X-Launchpad-Export-Date: 2015-07-04 05:37+0000\n"
18+"X-Launchpad-Export-Date: 2015-07-25 05:39+0000\n"
19−"X-Generator: Launchpad (build 17597)\n"
19+"X-Generator: Launchpad (build 17628)\n"
20
20
21#: plugins/LightDM/Greeter.cpp:112
21#: plugins/LightDM/Greeter.cpp:112
22msgid "Password: "
22msgid "Password: "
@@ -229,15 +229,15 @@ msgstr "Cridada d'emergència"
229msgid "OK"
229msgid "OK"
230msgstr "D'acord"
230msgstr "D'acord"
231
231
232−#: qml/Dash/GenericScopeView.qml:532 qml/Dash/GenericScopeView.qml:690
232+#: qml/Dash/GenericScopeView.qml:539 qml/Dash/GenericScopeView.qml:697
233msgid "See less"
233msgid "See less"
234msgstr "Mostra'n menys"
234msgstr "Mostra'n menys"
235
235
236−#: qml/Dash/GenericScopeView.qml:532
236+#: qml/Dash/GenericScopeView.qml:539
237msgid "See all"
237msgid "See all"
238msgstr "Mostra-ho tot"
238msgstr "Mostra-ho tot"
239
239
240−#: qml/Dash/GenericScopeView.qml:594
240+#: qml/Dash/GenericScopeView.qml:601
241msgctxt "Label: Hint for dash search line edit"
241msgctxt "Label: Hint for dash search line edit"
242msgid "Search"
242msgid "Search"
243msgstr ""
243msgstr ""
@@ -321,19 +321,19 @@ msgstr ""
321msgid "Tap to unlock"
321msgid "Tap to unlock"
322msgstr ""
322msgstr ""
323
323
324−#: qml/Greeter/NarrowView.qml:53 qml/Wizard/Pages/passwd-confirm.qml:53
324+#: qml/Greeter/NarrowView.qml:54 qml/Wizard/Pages/passwd-confirm.qml:53
325msgid "Sorry, incorrect passphrase."
325msgid "Sorry, incorrect passphrase."
326msgstr "La contrasenya és incorrecta"
326msgstr "La contrasenya és incorrecta"
327
327
328−#: qml/Greeter/NarrowView.qml:54 qml/Wizard/Pages/passwd-confirm.qml:54
328+#: qml/Greeter/NarrowView.qml:55 qml/Wizard/Pages/passwd-confirm.qml:54
329msgid "Sorry, incorrect passcode."
329msgid "Sorry, incorrect passcode."
330msgstr "El codi d'accés no és correcte"
330msgstr "El codi d'accés no és correcte"
331
331
332−#: qml/Greeter/NarrowView.qml:55
332+#: qml/Greeter/NarrowView.qml:56
333msgid "This will be your last attempt."
333msgid "This will be your last attempt."
334msgstr "Este serà el darrer intent."
334msgstr "Este serà el darrer intent."
335
335
336−#: qml/Greeter/NarrowView.qml:57
336+#: qml/Greeter/NarrowView.qml:58
337msgid ""
337msgid ""
338"If passphrase is entered incorrectly, your phone will conduct a factory "
338"If passphrase is entered incorrectly, your phone will conduct a factory "
339"reset and all personal data will be deleted."
339"reset and all personal data will be deleted."
@@ -342,7 +342,7 @@ msgstr ""
342"reinicialitzarà a l'estat de fàbrica i se suprimiran totes les dades "
342"reinicialitzarà a l'estat de fàbrica i se suprimiran totes les dades "
343"personals."
343"personals."
344
344
345−#: qml/Greeter/NarrowView.qml:58
345+#: qml/Greeter/NarrowView.qml:59
346msgid ""
346msgid ""
347"If passcode is entered incorrectly, your phone will conduct a factory reset "
347"If passcode is entered incorrectly, your phone will conduct a factory reset "
348"and all personal data will be deleted."
348"and all personal data will be deleted."
@@ -351,33 +351,34 @@ msgstr ""
351"reinicialitzarà a l'estat de fàbrica i se suprimiran totes les dades "
351"reinicialitzarà a l'estat de fàbrica i se suprimiran totes les dades "
352"personals."
352"personals."
353
353
354−#: qml/Greeter/NarrowView.qml:115
354+#: qml/Greeter/NarrowView.qml:116
355#, qt-format
355#, qt-format
356msgid "Enter %1"
356msgid "Enter %1"
357msgstr "Introduïu: %1"
357msgstr "Introduïu: %1"
358
358
359−#: qml/Greeter/NarrowView.qml:116 qml/Wizard/Pages/passwd-set.qml:60
359+#: qml/Greeter/NarrowView.qml:117 qml/Wizard/Pages/passwd-set.qml:60
360msgid "Enter passphrase"
360msgid "Enter passphrase"
361msgstr "Introduïu la contrasenya"
361msgstr "Introduïu la contrasenya"
362
362
363−#: qml/Greeter/NarrowView.qml:117
363+#: qml/Greeter/NarrowView.qml:118
364msgid "Enter passcode"
364msgid "Enter passcode"
365msgstr "Introduïu el codi d'accés"
365msgstr "Introduïu el codi d'accés"
366
366
367−#: qml/Greeter/NarrowView.qml:118
367+#: qml/Greeter/NarrowView.qml:119
368#, qt-format
368#, qt-format
369msgid "Sorry, incorrect %1"
369msgid "Sorry, incorrect %1"
370msgstr "Incorrecte (%1)"
370msgstr "Incorrecte (%1)"
371
371
372−#: qml/Greeter/NarrowView.qml:119
372+#: qml/Greeter/NarrowView.qml:120
373msgid "Sorry, incorrect passphrase"
373msgid "Sorry, incorrect passphrase"
374msgstr "La contrasenya no és correcta"
374msgstr "La contrasenya no és correcta"
375
375
376−#: qml/Greeter/NarrowView.qml:120
376+#: qml/Greeter/NarrowView.qml:121
377+msgctxt "passphrase"
377msgid "Please re-enter"
378msgid "Please re-enter"
378−msgstr "Torneu-ho a introduir"
379+msgstr ""
379
380
380−#: qml/Greeter/NarrowView.qml:121
381+#: qml/Greeter/NarrowView.qml:122
381msgid "Sorry, incorrect passcode"
382msgid "Sorry, incorrect passcode"
382msgstr "El codi d'accés no és correcte"
383msgstr "El codi d'accés no és correcte"
383
384
@@ -527,38 +528,6 @@ msgctxt "Button: Go back one page in the Wizard"
527msgid "Back"
528msgid "Back"
528msgstr ""
529msgstr ""
529
530
530−#: qml/Wizard/Pages/here-terms.qml:27
531−msgid "Terms & Conditions"
532−msgstr "Condicions generals"
533−
534−#: qml/Wizard/Pages/passwd-confirm.qml:49
535−msgid "Confirm passphrase"
536−msgstr "Confirmeu la contrasenya"
537−
538−#: qml/Wizard/Pages/passwd-confirm.qml:50
539−msgid "Confirm passcode"
540−msgstr "Confirmeu el codi d'accés"
541−
542−#: qml/Wizard/Pages/passwd-confirm.qml:53
543−#: qml/Wizard/Pages/passwd-confirm.qml:54
544−msgid "Please try again."
545−msgstr "Torneu-ho a intentar."
546−
547−#: qml/Wizard/Pages/passwd-confirm.qml:82 qml/Wizard/Pages/passwd-set.qml:90
548−#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:128
549−#: qml/Wizard/Pages/40-wifi.qml:215 qml/Wizard/Pages/50-location.qml:131
550−#: qml/Wizard/Pages/60-reporting.qml:50
551−msgid "Continue"
552−msgstr "Continua"
553−
554−#: qml/Wizard/Pages/passwd-set.qml:61
555−msgid "Choose your passcode"
556−msgstr "Trieu el codi d'accés"
557−
558−#: qml/Wizard/Pages/passwd-set.qml:68
559−msgid "Passphrase must be 4 characters long"
560−msgstr "La contrasenya ha de tindre 4 caràcters com a mínim"
561−
562#: qml/Wizard/Pages/10-welcome.qml:27
531#: qml/Wizard/Pages/10-welcome.qml:27
563msgid "Hi!"
532msgid "Hi!"
564msgstr "Hola!"
533msgstr "Hola!"
@@ -571,6 +540,13 @@ msgstr "Vos donem la benvinguda al vostre telèfon Ubuntu."
571msgid "Let’s get started."
540msgid "Let’s get started."
572msgstr "Comencem."
541msgstr "Comencem."
573
542
543+#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:128
544+#: qml/Wizard/Pages/40-wifi.qml:215 qml/Wizard/Pages/50-location.qml:131
545+#: qml/Wizard/Pages/60-reporting.qml:50 qml/Wizard/Pages/passwd-confirm.qml:82
546+#: qml/Wizard/Pages/passwd-set.qml:90
547+msgid "Continue"
548+msgstr "Continua"
549+
574#: qml/Wizard/Pages/20-sim.qml:25
550#: qml/Wizard/Pages/20-sim.qml:25
575msgid "Add a SIM card and restart your device"
551msgid "Add a SIM card and restart your device"
576msgstr "Afegiu una targeta SIM i reinicieu el dispositiu"
552msgstr "Afegiu una targeta SIM i reinicieu el dispositiu"
@@ -705,6 +681,31 @@ msgstr "Ja podeu utilitzar el vostre telèfon."
705msgid "Finish"
681msgid "Finish"
706msgstr "Finalitza"
682msgstr "Finalitza"
707
683
684+#: qml/Wizard/Pages/here-terms.qml:27
685+msgid "Terms & Conditions"
686+msgstr "Condicions generals"
687+
688+#: qml/Wizard/Pages/passwd-confirm.qml:49
689+msgid "Confirm passphrase"
690+msgstr "Confirmeu la contrasenya"
691+
692+#: qml/Wizard/Pages/passwd-confirm.qml:50
693+msgid "Confirm passcode"
694+msgstr "Confirmeu el codi d'accés"
695+
696+#: qml/Wizard/Pages/passwd-confirm.qml:53
697+#: qml/Wizard/Pages/passwd-confirm.qml:54
698+msgid "Please try again."
699+msgstr "Torneu-ho a intentar."
700+
701+#: qml/Wizard/Pages/passwd-set.qml:61
702+msgid "Choose your passcode"
703+msgstr "Trieu el codi d'accés"
704+
705+#: qml/Wizard/Pages/passwd-set.qml:68
706+msgid "Passphrase must be 4 characters long"
707+msgstr "La contrasenya ha de tindre 4 caràcters com a mínim"
708+
708#. Translators: This is the arrow for "Back" buttons
709#. Translators: This is the arrow for "Back" buttons
709#: qml/Wizard/StackButton.qml:39
710#: qml/Wizard/StackButton.qml:39
710#, qt-format
711#, qt-format
@@ -804,6 +805,9 @@ msgstr "%1 〉"
804#~ msgid "Speaking..."
805#~ msgid "Speaking..."
805#~ msgstr "S'està parlant..."
806#~ msgstr "S'està parlant..."
806
807
808+#~ msgid "Please re-enter"
809+#~ msgstr "Torneu-ho a introduir"
810+
807#~ msgid "Type or say a command"
811#~ msgid "Type or say a command"
808#~ msgstr "Escriviu o pronuncieu una ordre"
812#~ msgstr "Escriviu o pronuncieu una ordre"
809
813
po/ce.po+51−50
@@ -7,7 +7,7 @@ msgid ""
7msgstr ""
7msgstr ""
8"Project-Id-Version: unity8\n"
8"Project-Id-Version: unity8\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2015-06-22 12:00+0200\n"
10+"POT-Creation-Date: 2015-07-17 10:10+0200\n"
11"PO-Revision-Date: 2015-02-15 04:01+0000\n"
11"PO-Revision-Date: 2015-02-15 04:01+0000\n"
12"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
12"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
13"Language-Team: Chechen <ce@li.org>\n"
13"Language-Team: Chechen <ce@li.org>\n"
@@ -15,8 +15,8 @@ msgstr ""
15"Content-Type: text/plain; charset=UTF-8\n"
15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n"
16"Content-Transfer-Encoding: 8bit\n"
17"Plural-Forms: nplurals=2; plural=n != 1;\n"
17"Plural-Forms: nplurals=2; plural=n != 1;\n"
18−"X-Launchpad-Export-Date: 2015-07-04 05:37+0000\n"
18+"X-Launchpad-Export-Date: 2015-07-25 05:38+0000\n"
19−"X-Generator: Launchpad (build 17597)\n"
19+"X-Generator: Launchpad (build 17628)\n"
20
20
21#: plugins/LightDM/Greeter.cpp:112
21#: plugins/LightDM/Greeter.cpp:112
22msgid "Password: "
22msgid "Password: "
@@ -223,15 +223,15 @@ msgstr ""
223msgid "OK"
223msgid "OK"
224msgstr ""
224msgstr ""
225
225
226−#: qml/Dash/GenericScopeView.qml:532 qml/Dash/GenericScopeView.qml:690
226+#: qml/Dash/GenericScopeView.qml:539 qml/Dash/GenericScopeView.qml:697
227msgid "See less"
227msgid "See less"
228msgstr ""
228msgstr ""
229
229
230−#: qml/Dash/GenericScopeView.qml:532
230+#: qml/Dash/GenericScopeView.qml:539
231msgid "See all"
231msgid "See all"
232msgstr ""
232msgstr ""
233
233
234−#: qml/Dash/GenericScopeView.qml:594
234+#: qml/Dash/GenericScopeView.qml:601
235msgctxt "Label: Hint for dash search line edit"
235msgctxt "Label: Hint for dash search line edit"
236msgid "Search"
236msgid "Search"
237msgstr ""
237msgstr ""
@@ -315,57 +315,58 @@ msgstr ""
315msgid "Tap to unlock"
315msgid "Tap to unlock"
316msgstr ""
316msgstr ""
317
317
318−#: qml/Greeter/NarrowView.qml:53 qml/Wizard/Pages/passwd-confirm.qml:53
318+#: qml/Greeter/NarrowView.qml:54 qml/Wizard/Pages/passwd-confirm.qml:53
319msgid "Sorry, incorrect passphrase."
319msgid "Sorry, incorrect passphrase."
320msgstr ""
320msgstr ""
321
321
322−#: qml/Greeter/NarrowView.qml:54 qml/Wizard/Pages/passwd-confirm.qml:54
322+#: qml/Greeter/NarrowView.qml:55 qml/Wizard/Pages/passwd-confirm.qml:54
323msgid "Sorry, incorrect passcode."
323msgid "Sorry, incorrect passcode."
324msgstr ""
324msgstr ""
325
325
326−#: qml/Greeter/NarrowView.qml:55
326+#: qml/Greeter/NarrowView.qml:56
327msgid "This will be your last attempt."
327msgid "This will be your last attempt."
328msgstr ""
328msgstr ""
329
329
330−#: qml/Greeter/NarrowView.qml:57
330+#: qml/Greeter/NarrowView.qml:58
331msgid ""
331msgid ""
332"If passphrase is entered incorrectly, your phone will conduct a factory "
332"If passphrase is entered incorrectly, your phone will conduct a factory "
333"reset and all personal data will be deleted."
333"reset and all personal data will be deleted."
334msgstr ""
334msgstr ""
335
335
336−#: qml/Greeter/NarrowView.qml:58
336+#: qml/Greeter/NarrowView.qml:59
337msgid ""
337msgid ""
338"If passcode is entered incorrectly, your phone will conduct a factory reset "
338"If passcode is entered incorrectly, your phone will conduct a factory reset "
339"and all personal data will be deleted."
339"and all personal data will be deleted."
340msgstr ""
340msgstr ""
341
341
342−#: qml/Greeter/NarrowView.qml:115
342+#: qml/Greeter/NarrowView.qml:116
343#, qt-format
343#, qt-format
344msgid "Enter %1"
344msgid "Enter %1"
345msgstr ""
345msgstr ""
346
346
347−#: qml/Greeter/NarrowView.qml:116 qml/Wizard/Pages/passwd-set.qml:60
347+#: qml/Greeter/NarrowView.qml:117 qml/Wizard/Pages/passwd-set.qml:60
348msgid "Enter passphrase"
348msgid "Enter passphrase"
349msgstr ""
349msgstr ""
350
350
351−#: qml/Greeter/NarrowView.qml:117
351+#: qml/Greeter/NarrowView.qml:118
352msgid "Enter passcode"
352msgid "Enter passcode"
353msgstr ""
353msgstr ""
354
354
355−#: qml/Greeter/NarrowView.qml:118
355+#: qml/Greeter/NarrowView.qml:119
356#, qt-format
356#, qt-format
357msgid "Sorry, incorrect %1"
357msgid "Sorry, incorrect %1"
358msgstr ""
358msgstr ""
359
359
360−#: qml/Greeter/NarrowView.qml:119
360+#: qml/Greeter/NarrowView.qml:120
361msgid "Sorry, incorrect passphrase"
361msgid "Sorry, incorrect passphrase"
362msgstr ""
362msgstr ""
363
363
364−#: qml/Greeter/NarrowView.qml:120
364+#: qml/Greeter/NarrowView.qml:121
365+msgctxt "passphrase"
365msgid "Please re-enter"
366msgid "Please re-enter"
366msgstr ""
367msgstr ""
367
368
368−#: qml/Greeter/NarrowView.qml:121
369+#: qml/Greeter/NarrowView.qml:122
369msgid "Sorry, incorrect passcode"
370msgid "Sorry, incorrect passcode"
370msgstr ""
371msgstr ""
371
372
@@ -515,38 +516,6 @@ msgctxt "Button: Go back one page in the Wizard"
515msgid "Back"
516msgid "Back"
516msgstr ""
517msgstr ""
517
518
518−#: qml/Wizard/Pages/here-terms.qml:27
519−msgid "Terms & Conditions"
520−msgstr ""
521−
522−#: qml/Wizard/Pages/passwd-confirm.qml:49
523−msgid "Confirm passphrase"
524−msgstr ""
525−
526−#: qml/Wizard/Pages/passwd-confirm.qml:50
527−msgid "Confirm passcode"
528−msgstr ""
529−
530−#: qml/Wizard/Pages/passwd-confirm.qml:53
531−#: qml/Wizard/Pages/passwd-confirm.qml:54
532−msgid "Please try again."
533−msgstr ""
534−
535−#: qml/Wizard/Pages/passwd-confirm.qml:82 qml/Wizard/Pages/passwd-set.qml:90
536−#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:128
537−#: qml/Wizard/Pages/40-wifi.qml:215 qml/Wizard/Pages/50-location.qml:131
538−#: qml/Wizard/Pages/60-reporting.qml:50
539−msgid "Continue"
540−msgstr ""
541−
542−#: qml/Wizard/Pages/passwd-set.qml:61
543−msgid "Choose your passcode"
544−msgstr ""
545−
546−#: qml/Wizard/Pages/passwd-set.qml:68
547−msgid "Passphrase must be 4 characters long"
548−msgstr ""
549−
550#: qml/Wizard/Pages/10-welcome.qml:27
519#: qml/Wizard/Pages/10-welcome.qml:27
551msgid "Hi!"
520msgid "Hi!"
552msgstr ""
521msgstr ""
@@ -559,6 +528,13 @@ msgstr ""
559msgid "Let’s get started."
528msgid "Let’s get started."
560msgstr ""
529msgstr ""
561
530
531+#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:128
532+#: qml/Wizard/Pages/40-wifi.qml:215 qml/Wizard/Pages/50-location.qml:131
533+#: qml/Wizard/Pages/60-reporting.qml:50 qml/Wizard/Pages/passwd-confirm.qml:82
534+#: qml/Wizard/Pages/passwd-set.qml:90
535+msgid "Continue"
536+msgstr ""
537+
562#: qml/Wizard/Pages/20-sim.qml:25
538#: qml/Wizard/Pages/20-sim.qml:25
563msgid "Add a SIM card and restart your device"
539msgid "Add a SIM card and restart your device"
564msgstr ""
540msgstr ""
@@ -684,6 +660,31 @@ msgstr ""
684msgid "Finish"
660msgid "Finish"
685msgstr ""
661msgstr ""
686
662
663+#: qml/Wizard/Pages/here-terms.qml:27
664+msgid "Terms & Conditions"
665+msgstr ""
666+
667+#: qml/Wizard/Pages/passwd-confirm.qml:49
668+msgid "Confirm passphrase"
669+msgstr ""
670+
671+#: qml/Wizard/Pages/passwd-confirm.qml:50
672+msgid "Confirm passcode"
673+msgstr ""
674+
675+#: qml/Wizard/Pages/passwd-confirm.qml:53
676+#: qml/Wizard/Pages/passwd-confirm.qml:54
677+msgid "Please try again."
678+msgstr ""
679+
680+#: qml/Wizard/Pages/passwd-set.qml:61
681+msgid "Choose your passcode"
682+msgstr ""
683+
684+#: qml/Wizard/Pages/passwd-set.qml:68
685+msgid "Passphrase must be 4 characters long"
686+msgstr ""
687+
687#. Translators: This is the arrow for "Back" buttons
688#. Translators: This is the arrow for "Back" buttons
688#: qml/Wizard/StackButton.qml:39
689#: qml/Wizard/StackButton.qml:39
689#, qt-format
690#, qt-format
po/ckb.po+51−50
@@ -7,7 +7,7 @@ msgid ""
7msgstr ""
7msgstr ""
8"Project-Id-Version: unity8\n"
8"Project-Id-Version: unity8\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2015-06-22 12:00+0200\n"
10+"POT-Creation-Date: 2015-07-17 10:10+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"
@@ -15,8 +15,8 @@ msgstr ""
15"Content-Type: text/plain; charset=UTF-8\n"
15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n"
16"Content-Transfer-Encoding: 8bit\n"
17"Plural-Forms: nplurals=2; plural=n != 1;\n"
17"Plural-Forms: nplurals=2; plural=n != 1;\n"
18−"X-Launchpad-Export-Date: 2015-07-04 05:37+0000\n"
18+"X-Launchpad-Export-Date: 2015-07-25 05:39+0000\n"
19−"X-Generator: Launchpad (build 17597)\n"
19+"X-Generator: Launchpad (build 17628)\n"
20
20
21#: plugins/LightDM/Greeter.cpp:112
21#: plugins/LightDM/Greeter.cpp:112
22msgid "Password: "
22msgid "Password: "
@@ -223,15 +223,15 @@ msgstr "هێڵی فریاگوزاری"
223msgid "OK"
223msgid "OK"
224msgstr ""
224msgstr ""
225
225
226−#: qml/Dash/GenericScopeView.qml:532 qml/Dash/GenericScopeView.qml:690
226+#: qml/Dash/GenericScopeView.qml:539 qml/Dash/GenericScopeView.qml:697
227msgid "See less"
227msgid "See less"
228msgstr ""
228msgstr ""
229
229
230−#: qml/Dash/GenericScopeView.qml:532
230+#: qml/Dash/GenericScopeView.qml:539
231msgid "See all"
231msgid "See all"
232msgstr ""
232msgstr ""
233
233
234−#: qml/Dash/GenericScopeView.qml:594
234+#: qml/Dash/GenericScopeView.qml:601
235msgctxt "Label: Hint for dash search line edit"
235msgctxt "Label: Hint for dash search line edit"
236msgid "Search"
236msgid "Search"
237msgstr ""
237msgstr ""
@@ -315,57 +315,58 @@ msgstr ""
315msgid "Tap to unlock"
315msgid "Tap to unlock"
316msgstr ""
316msgstr ""
317
317
318−#: qml/Greeter/NarrowView.qml:53 qml/Wizard/Pages/passwd-confirm.qml:53
318+#: qml/Greeter/NarrowView.qml:54 qml/Wizard/Pages/passwd-confirm.qml:53
319msgid "Sorry, incorrect passphrase."
319msgid "Sorry, incorrect passphrase."
320msgstr ""
320msgstr ""
321
321
322−#: qml/Greeter/NarrowView.qml:54 qml/Wizard/Pages/passwd-confirm.qml:54
322+#: qml/Greeter/NarrowView.qml:55 qml/Wizard/Pages/passwd-confirm.qml:54
323msgid "Sorry, incorrect passcode."
323msgid "Sorry, incorrect passcode."
324msgstr ""
324msgstr ""
325
325
326−#: qml/Greeter/NarrowView.qml:55
326+#: qml/Greeter/NarrowView.qml:56
327msgid "This will be your last attempt."
327msgid "This will be your last attempt."
328msgstr ""
328msgstr ""
329
329
330−#: qml/Greeter/NarrowView.qml:57
330+#: qml/Greeter/NarrowView.qml:58
331msgid ""
331msgid ""
332"If passphrase is entered incorrectly, your phone will conduct a factory "
332"If passphrase is entered incorrectly, your phone will conduct a factory "
333"reset and all personal data will be deleted."
333"reset and all personal data will be deleted."
334msgstr ""
334msgstr ""
335
335
336−#: qml/Greeter/NarrowView.qml:58
336+#: qml/Greeter/NarrowView.qml:59
337msgid ""
337msgid ""
338"If passcode is entered incorrectly, your phone will conduct a factory reset "
338"If passcode is entered incorrectly, your phone will conduct a factory reset "
339"and all personal data will be deleted."
339"and all personal data will be deleted."
340msgstr ""
340msgstr ""
341
341
342−#: qml/Greeter/NarrowView.qml:115
342+#: qml/Greeter/NarrowView.qml:116
343#, qt-format
343#, qt-format
344msgid "Enter %1"
344msgid "Enter %1"
345msgstr ""
345msgstr ""
346
346
347−#: qml/Greeter/NarrowView.qml:116 qml/Wizard/Pages/passwd-set.qml:60
347+#: qml/Greeter/NarrowView.qml:117 qml/Wizard/Pages/passwd-set.qml:60
348msgid "Enter passphrase"
348msgid "Enter passphrase"
349msgstr ""
349msgstr ""
350
350
351−#: qml/Greeter/NarrowView.qml:117
351+#: qml/Greeter/NarrowView.qml:118
352msgid "Enter passcode"
352msgid "Enter passcode"
353msgstr ""
353msgstr ""
354
354
355−#: qml/Greeter/NarrowView.qml:118
355+#: qml/Greeter/NarrowView.qml:119
356#, qt-format
356#, qt-format
357msgid "Sorry, incorrect %1"
357msgid "Sorry, incorrect %1"
358msgstr ""
358msgstr ""
359
359
360−#: qml/Greeter/NarrowView.qml:119
360+#: qml/Greeter/NarrowView.qml:120
361msgid "Sorry, incorrect passphrase"
361msgid "Sorry, incorrect passphrase"
362msgstr ""
362msgstr ""
363
363
364−#: qml/Greeter/NarrowView.qml:120
364+#: qml/Greeter/NarrowView.qml:121
365+msgctxt "passphrase"
365msgid "Please re-enter"
366msgid "Please re-enter"
366msgstr ""
367msgstr ""
367
368
368−#: qml/Greeter/NarrowView.qml:121
369+#: qml/Greeter/NarrowView.qml:122
369msgid "Sorry, incorrect passcode"
370msgid "Sorry, incorrect passcode"
370msgstr ""
371msgstr ""
371
372
@@ -515,38 +516,6 @@ msgctxt "Button: Go back one page in the Wizard"
515msgid "Back"
516msgid "Back"
516msgstr ""
517msgstr ""
517
518
518−#: qml/Wizard/Pages/here-terms.qml:27
519−msgid "Terms & Conditions"
520−msgstr ""
521−
522−#: qml/Wizard/Pages/passwd-confirm.qml:49
523−msgid "Confirm passphrase"
524−msgstr ""
525−
526−#: qml/Wizard/Pages/passwd-confirm.qml:50
527−msgid "Confirm passcode"
528−msgstr ""
529−
530−#: qml/Wizard/Pages/passwd-confirm.qml:53
531−#: qml/Wizard/Pages/passwd-confirm.qml:54
532−msgid "Please try again."
533−msgstr ""
534−
535−#: qml/Wizard/Pages/passwd-confirm.qml:82 qml/Wizard/Pages/passwd-set.qml:90
536−#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:128
537−#: qml/Wizard/Pages/40-wifi.qml:215 qml/Wizard/Pages/50-location.qml:131
538−#: qml/Wizard/Pages/60-reporting.qml:50
539−msgid "Continue"
540−msgstr ""
541−
542−#: qml/Wizard/Pages/passwd-set.qml:61
543−msgid "Choose your passcode"
544−msgstr ""
545−
546−#: qml/Wizard/Pages/passwd-set.qml:68
547−msgid "Passphrase must be 4 characters long"
548−msgstr ""
549−
550#: qml/Wizard/Pages/10-welcome.qml:27
519#: qml/Wizard/Pages/10-welcome.qml:27
551msgid "Hi!"
520msgid "Hi!"
552msgstr ""
521msgstr ""
@@ -559,6 +528,13 @@ msgstr ""
559msgid "Let’s get started."
528msgid "Let’s get started."
560msgstr ""
529msgstr ""
561
530
531+#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:128
532+#: qml/Wizard/Pages/40-wifi.qml:215 qml/Wizard/Pages/50-location.qml:131
533+#: qml/Wizard/Pages/60-reporting.qml:50 qml/Wizard/Pages/passwd-confirm.qml:82
534+#: qml/Wizard/Pages/passwd-set.qml:90
535+msgid "Continue"
536+msgstr ""
537+
562#: qml/Wizard/Pages/20-sim.qml:25
538#: qml/Wizard/Pages/20-sim.qml:25
563msgid "Add a SIM card and restart your device"
539msgid "Add a SIM card and restart your device"
564msgstr ""
540msgstr ""
@@ -684,6 +660,31 @@ msgstr ""
684msgid "Finish"
660msgid "Finish"
685msgstr ""
661msgstr ""
686
662
663+#: qml/Wizard/Pages/here-terms.qml:27
664+msgid "Terms & Conditions"
665+msgstr ""
666+
667+#: qml/Wizard/Pages/passwd-confirm.qml:49
668+msgid "Confirm passphrase"
669+msgstr ""
670+
671+#: qml/Wizard/Pages/passwd-confirm.qml:50
672+msgid "Confirm passcode"
673+msgstr ""
674+
675+#: qml/Wizard/Pages/passwd-confirm.qml:53
676+#: qml/Wizard/Pages/passwd-confirm.qml:54
677+msgid "Please try again."
678+msgstr ""
679+
680+#: qml/Wizard/Pages/passwd-set.qml:61
681+msgid "Choose your passcode"
682+msgstr ""
683+
684+#: qml/Wizard/Pages/passwd-set.qml:68
685+msgid "Passphrase must be 4 characters long"
686+msgstr ""
687+
687#. Translators: This is the arrow for "Back" buttons
688#. Translators: This is the arrow for "Back" buttons
688#: qml/Wizard/StackButton.qml:39
689#: qml/Wizard/StackButton.qml:39
689#, qt-format
690#, qt-format
po/cs.po+55−51
@@ -7,7 +7,7 @@ msgid ""
7msgstr ""
7msgstr ""
8"Project-Id-Version: unity8\n"
8"Project-Id-Version: unity8\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2015-06-22 12:00+0200\n"
10+"POT-Creation-Date: 2015-07-17 10:10+0200\n"
11"PO-Revision-Date: 2015-07-07 10:44+0000\n"
11"PO-Revision-Date: 2015-07-07 10:44+0000\n"
12"Last-Translator: Vojtěch Daněk <vdanek@outlook.com>\n"
12"Last-Translator: Vojtěch Daněk <vdanek@outlook.com>\n"
13"Language-Team: Czech <cs@li.org>\n"
13"Language-Team: Czech <cs@li.org>\n"
@@ -15,8 +15,8 @@ msgstr ""
15"Content-Type: text/plain; charset=UTF-8\n"
15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n"
16"Content-Transfer-Encoding: 8bit\n"
17"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
17"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
18−"X-Launchpad-Export-Date: 2015-07-08 05:46+0000\n"
18+"X-Launchpad-Export-Date: 2015-07-25 05:38+0000\n"
19−"X-Generator: Launchpad (build 17608)\n"
19+"X-Generator: Launchpad (build 17628)\n"
20"Language: cs\n"
20"Language: cs\n"
21
21
22#: plugins/LightDM/Greeter.cpp:112
22#: plugins/LightDM/Greeter.cpp:112
@@ -229,15 +229,15 @@ msgstr "Tísňové volání"
229msgid "OK"
229msgid "OK"
230msgstr "OK"
230msgstr "OK"
231
231
232−#: qml/Dash/GenericScopeView.qml:532 qml/Dash/GenericScopeView.qml:690
232+#: qml/Dash/GenericScopeView.qml:539 qml/Dash/GenericScopeView.qml:697
233msgid "See less"
233msgid "See less"
234msgstr "Zobrazit méně"
234msgstr "Zobrazit méně"
235
235
236−#: qml/Dash/GenericScopeView.qml:532
236+#: qml/Dash/GenericScopeView.qml:539
237msgid "See all"
237msgid "See all"
238msgstr "Zobrazit vše"
238msgstr "Zobrazit vše"
239
239
240−#: qml/Dash/GenericScopeView.qml:594
240+#: qml/Dash/GenericScopeView.qml:601
241msgctxt "Label: Hint for dash search line edit"
241msgctxt "Label: Hint for dash search line edit"
242msgid "Search"
242msgid "Search"
243msgstr "Hledat"
243msgstr "Hledat"
@@ -321,19 +321,19 @@ msgstr "Znovu"
321msgid "Tap to unlock"
321msgid "Tap to unlock"
322msgstr "Klepnout pro odemčení"
322msgstr "Klepnout pro odemčení"
323
323
324−#: qml/Greeter/NarrowView.qml:53 qml/Wizard/Pages/passwd-confirm.qml:53
324+#: qml/Greeter/NarrowView.qml:54 qml/Wizard/Pages/passwd-confirm.qml:53
325msgid "Sorry, incorrect passphrase."
325msgid "Sorry, incorrect passphrase."
326msgstr "Zadali jste špatné heslo."
326msgstr "Zadali jste špatné heslo."
327
327
328−#: qml/Greeter/NarrowView.qml:54 qml/Wizard/Pages/passwd-confirm.qml:54
328+#: qml/Greeter/NarrowView.qml:55 qml/Wizard/Pages/passwd-confirm.qml:54
329msgid "Sorry, incorrect passcode."
329msgid "Sorry, incorrect passcode."
330msgstr "Zadali jste špatné heslo."
330msgstr "Zadali jste špatné heslo."
331
331
332−#: qml/Greeter/NarrowView.qml:55
332+#: qml/Greeter/NarrowView.qml:56
333msgid "This will be your last attempt."
333msgid "This will be your last attempt."
334msgstr "Toto je váš poslední pokus."
334msgstr "Toto je váš poslední pokus."
335
335
336−#: qml/Greeter/NarrowView.qml:57
336+#: qml/Greeter/NarrowView.qml:58
337msgid ""
337msgid ""
338"If passphrase is entered incorrectly, your phone will conduct a factory "
338"If passphrase is entered incorrectly, your phone will conduct a factory "
339"reset and all personal data will be deleted."
339"reset and all personal data will be deleted."
@@ -341,7 +341,7 @@ msgstr ""
341"Pokud bude heslo zadáno nesprávně, bude telefon obnoven do továrního "
341"Pokud bude heslo zadáno nesprávně, bude telefon obnoven do továrního "
342"nastavení a všechna osobní data budou smazána."
342"nastavení a všechna osobní data budou smazána."
343
343
344−#: qml/Greeter/NarrowView.qml:58
344+#: qml/Greeter/NarrowView.qml:59
345msgid ""
345msgid ""
346"If passcode is entered incorrectly, your phone will conduct a factory reset "
346"If passcode is entered incorrectly, your phone will conduct a factory reset "
347"and all personal data will be deleted."
347"and all personal data will be deleted."
@@ -349,33 +349,34 @@ msgstr ""
349"Pokud bude heslo zadáno nesprávně, bude telefon obnoven do továrního "
349"Pokud bude heslo zadáno nesprávně, bude telefon obnoven do továrního "
350"nastavení a všechna osobní data budou smazána."
350"nastavení a všechna osobní data budou smazána."
351
351
352−#: qml/Greeter/NarrowView.qml:115
352+#: qml/Greeter/NarrowView.qml:116
353#, qt-format
353#, qt-format
354msgid "Enter %1"
354msgid "Enter %1"
355msgstr "Vložte %1"
355msgstr "Vložte %1"
356
356
357−#: qml/Greeter/NarrowView.qml:116 qml/Wizard/Pages/passwd-set.qml:60
357+#: qml/Greeter/NarrowView.qml:117 qml/Wizard/Pages/passwd-set.qml:60
358msgid "Enter passphrase"
358msgid "Enter passphrase"
359msgstr "Vložte heslo"
359msgstr "Vložte heslo"
360
360
361−#: qml/Greeter/NarrowView.qml:117
361+#: qml/Greeter/NarrowView.qml:118
362msgid "Enter passcode"
362msgid "Enter passcode"
363msgstr "Vložte heslo"
363msgstr "Vložte heslo"
364
364
365−#: qml/Greeter/NarrowView.qml:118
365+#: qml/Greeter/NarrowView.qml:119
366#, qt-format
366#, qt-format
367msgid "Sorry, incorrect %1"
367msgid "Sorry, incorrect %1"
368msgstr "Špatné %1"
368msgstr "Špatné %1"
369
369
370−#: qml/Greeter/NarrowView.qml:119
370+#: qml/Greeter/NarrowView.qml:120
371msgid "Sorry, incorrect passphrase"
371msgid "Sorry, incorrect passphrase"
372msgstr "Špatné heslo"
372msgstr "Špatné heslo"
373
373
374−#: qml/Greeter/NarrowView.qml:120
374+#: qml/Greeter/NarrowView.qml:121
375+msgctxt "passphrase"
375msgid "Please re-enter"
376msgid "Please re-enter"
376−msgstr "Vložte znovu"
377+msgstr ""
377
378
378−#: qml/Greeter/NarrowView.qml:121
379+#: qml/Greeter/NarrowView.qml:122
379msgid "Sorry, incorrect passcode"
380msgid "Sorry, incorrect passcode"
380msgstr "Špatné heslo"
381msgstr "Špatné heslo"
381
382
@@ -528,38 +529,6 @@ msgctxt "Button: Go back one page in the Wizard"
528msgid "Back"
529msgid "Back"
529msgstr "Zpět"
530msgstr "Zpět"
530
531
531−#: qml/Wizard/Pages/here-terms.qml:27
532−msgid "Terms & Conditions"
533−msgstr "Pravidla a podmínky"
534−
535−#: qml/Wizard/Pages/passwd-confirm.qml:49
536−msgid "Confirm passphrase"
537−msgstr "Potvrdit heslo"
538−
539−#: qml/Wizard/Pages/passwd-confirm.qml:50
540−msgid "Confirm passcode"
541−msgstr "Potvrdit číselné heslo"
542−
543−#: qml/Wizard/Pages/passwd-confirm.qml:53
544−#: qml/Wizard/Pages/passwd-confirm.qml:54
545−msgid "Please try again."
546−msgstr "Zkuste to, prosím, znovu."
547−
548−#: qml/Wizard/Pages/passwd-confirm.qml:82 qml/Wizard/Pages/passwd-set.qml:90
549−#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:128
550−#: qml/Wizard/Pages/40-wifi.qml:215 qml/Wizard/Pages/50-location.qml:131
551−#: qml/Wizard/Pages/60-reporting.qml:50
552−msgid "Continue"
553−msgstr "Pokračovat"
554−
555−#: qml/Wizard/Pages/passwd-set.qml:61
556−msgid "Choose your passcode"
557−msgstr "Zvolte své heslo"
558−
559−#: qml/Wizard/Pages/passwd-set.qml:68
560−msgid "Passphrase must be 4 characters long"
561−msgstr "Heslo musí být alespoň 4 znaky dlouhé"
562−
563#: qml/Wizard/Pages/10-welcome.qml:27
532#: qml/Wizard/Pages/10-welcome.qml:27
564msgid "Hi!"
533msgid "Hi!"
565msgstr "Ahoj!"
534msgstr "Ahoj!"
@@ -572,6 +541,13 @@ msgstr "Vítejte ve vašem Ubuntu telefonu."
572msgid "Let’s get started."
541msgid "Let’s get started."
573msgstr "Začněme."
542msgstr "Začněme."
574
543
544+#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:128
545+#: qml/Wizard/Pages/40-wifi.qml:215 qml/Wizard/Pages/50-location.qml:131
546+#: qml/Wizard/Pages/60-reporting.qml:50 qml/Wizard/Pages/passwd-confirm.qml:82
547+#: qml/Wizard/Pages/passwd-set.qml:90
548+msgid "Continue"
549+msgstr "Pokračovat"
550+
575#: qml/Wizard/Pages/20-sim.qml:25
551#: qml/Wizard/Pages/20-sim.qml:25
576msgid "Add a SIM card and restart your device"
552msgid "Add a SIM card and restart your device"
577msgstr "Vložte SIM kartu a restartujte své zařízení"
553msgstr "Vložte SIM kartu a restartujte své zařízení"
@@ -704,6 +680,31 @@ msgstr "Váš telefon je nyní připraven k použití."
704msgid "Finish"
680msgid "Finish"
705msgstr "Dokončit"
681msgstr "Dokončit"
706
682
683+#: qml/Wizard/Pages/here-terms.qml:27
684+msgid "Terms & Conditions"
685+msgstr "Pravidla a podmínky"
686+
687+#: qml/Wizard/Pages/passwd-confirm.qml:49
688+msgid "Confirm passphrase"
689+msgstr "Potvrdit heslo"
690+
691+#: qml/Wizard/Pages/passwd-confirm.qml:50
692+msgid "Confirm passcode"
693+msgstr "Potvrdit číselné heslo"
694+
695+#: qml/Wizard/Pages/passwd-confirm.qml:53
696+#: qml/Wizard/Pages/passwd-confirm.qml:54
697+msgid "Please try again."
698+msgstr "Zkuste to, prosím, znovu."
699+
700+#: qml/Wizard/Pages/passwd-set.qml:61
701+msgid "Choose your passcode"
702+msgstr "Zvolte své heslo"
703+
704+#: qml/Wizard/Pages/passwd-set.qml:68
705+msgid "Passphrase must be 4 characters long"
706+msgstr "Heslo musí být alespoň 4 znaky dlouhé"
707+
707#. Translators: This is the arrow for "Back" buttons
708#. Translators: This is the arrow for "Back" buttons
708#: qml/Wizard/StackButton.qml:39
709#: qml/Wizard/StackButton.qml:39
709#, qt-format
710#, qt-format
@@ -763,3 +764,6 @@ msgstr "%1 〉"
763
764
764#~ msgid "Swipe up again to close the settings screen"
765#~ msgid "Swipe up again to close the settings screen"
765#~ msgstr "Přetažením nahoru dojde k uzavření obrazovky nastavení"
766#~ msgstr "Přetažením nahoru dojde k uzavření obrazovky nastavení"
767+
768+#~ msgid "Please re-enter"
769+#~ msgstr "Vložte znovu"
po/cy.ponew file+722
@@ -0,0 +1,722 @@
1+# Welsh translation for unity8
2+# Copyright (c) 2015 Rosetta Contributors and Canonical Ltd 2015
3+# This file is distributed under the same license as the unity8 package.
4+# FIRST AUTHOR <EMAIL@ADDRESS>, 2015.
5+#
6+msgid ""
7+msgstr ""
8+"Project-Id-Version: unity8\n"
9+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10+"POT-Creation-Date: 2015-07-17 10:10+0200\n"
11+"PO-Revision-Date: 2015-07-31 13:21+0000\n"
12+"Last-Translator: Owen Llywelyn <owen.llywelyn@gmail.com>\n"
13+"Language-Team: Welsh <cy@li.org>\n"
14+"MIME-Version: 1.0\n"
15+"Content-Type: text/plain; charset=UTF-8\n"
16+"Content-Transfer-Encoding: 8bit\n"
17+"Plural-Forms: nplurals=4; plural=n==1 ? 0 : n==2 ? 1 : (n != 8 && n != 11) ? "
18+"2 : 3;\n"
19+"X-Launchpad-Export-Date: 2015-08-01 05:45+0000\n"
20+"X-Generator: Launchpad (build 17656)\n"
21+
22+#: plugins/LightDM/Greeter.cpp:112
23+msgid "Password: "
24+msgstr "Cyfrinair: "
25+
26+#: plugins/Unity/Launcher/launcheritem.cpp:45
27+#: plugins/Unity/Launcher/launcheritem.cpp:100
28+msgid "Pin shortcut"
29+msgstr "Pinio llwybr byr"
30+
31+#: plugins/Unity/Launcher/launcheritem.cpp:100
32+msgid "Unpin shortcut"
33+msgstr "Dadbinio llwybr byr"
34+
35+#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
36+#. This format string is used for showing, on a 12-hour clock, times that happen yesterday.
37+#. (\u2003 is a unicode em space which is slightly wider than a normal space.)
38+#. en_US example: "Yesterday\u2003%l:%M %p" --> "Yesterday 1:00 PM"
39+#: plugins/Utils/relativetimeformatter.cpp:157
40+msgid "Yesterday %l:%M %p"
41+msgstr "Ddoe %l:%M %p"
42+
43+#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
44+#. This format string is used for showing, on a 12-hour clock, times that happened today.
45+#. en_US example: "%l:%M %p" --> "1:00 PM"
46+#: plugins/Utils/relativetimeformatter.cpp:164
47+msgid "%l:%M %p"
48+msgstr "%l:%M %p"
49+
50+#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
51+#. This format string is used for showing, on a 12-hour clock, events/appointments that happen tomorrow.
52+#. (\u2003 is a unicode em space which is slightly wider than a normal space.)
53+#. en_US example: "Tomorrow\u2003%l:%M %p" --> "Tomorrow 1:00 PM"
54+#: plugins/Utils/relativetimeformatter.cpp:172
55+msgid "Tomorrow %l:%M %p"
56+msgstr "Yfory %l:%M %p"
57+
58+#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
59+#. This format string is used for showing, on a 12-hour clock, times that happened in the last week.
60+#. (\u2003 is a unicode em space which is slightly wider than a normal space.)
61+#. en_US example: "%a\u2003%l:%M %p" --> "Fri 1:00 PM"
62+#: plugins/Utils/relativetimeformatter.cpp:181
63+msgid "%a %l:%M %p"
64+msgstr "%a %l:%M %p"
65+
66+#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
67+#. This format string is used for showing, on a 12-hour clock, times that happened before a week from now.
68+#. (\u2003 is a unicode em space which is slightly wider than a normal space.)
69+#. en_US example: "%a %d %b\u2003%l:%M %p" --> "Fri Oct 31 1:00 PM"
70+#. en_GB example: "%a %b %d\u2003%l:%M %p" --> "Fri 31 Oct 1:00 PM"
71+#: plugins/Utils/relativetimeformatter.cpp:190
72+msgid "%a %d %b %l:%M %p"
73+msgstr "%a %d %b %l:%M %p"
74+
75+#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
76+#. This format string is used for showing, on a 24-hour clock, times that happen yesterday.
77+#. (\u2003 is a unicode em space which is slightly wider than a normal space.)
78+#. en_US example: "Yesterday\u2003%l:%M %p" --> "Yesterday 13:00"
79+#: plugins/Utils/relativetimeformatter.cpp:201
80+msgid "Yesterday %H:%M"
81+msgstr "Ddoe %H:%M"
82+
83+#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
84+#. This format string is used for showing, on a 24-hour clock, times that happened today.
85+#. en_US example: "%H:%M" --> "13:00"
86+#: plugins/Utils/relativetimeformatter.cpp:208
87+msgid "%H:%M"
88+msgstr "%H:%M"
89+
90+#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
91+#. This format string is used for showing, on a 24-hour clock, events/appointments that happen tomorrow.
92+#. (\u2003 is a unicode em space which is slightly wider than a normal space.)
93+#. en_US example: "Tomorrow\u2003%l:%M %p" --> "Tomorrow 13:00"
94+#: plugins/Utils/relativetimeformatter.cpp:216
95+msgid "Tomorrow %H:%M"
96+msgstr "Yfory %H:%M"
97+
98+#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
99+#. This format string is used for showing, on a 24-hour clock, times that happened in the last week.
100+#. (\u2003 is a unicode em space which is slightly wider than a normal space.)
101+#. en_US example: "%a\u2003%H:%M" --> "Fri 13:00"
102+#: plugins/Utils/relativetimeformatter.cpp:225
103+msgid "%a %H:%M"
104+msgstr "%a %H:%M"
105+
106+#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
107+#. This format string is used for showing, on a 24-hour clock, times that happened before a week from now.
108+#. (\u2003 is a unicode em space which is slightly wider than a normal space.)
109+#. en_US example: "%a %d %b\u2003%H:%M" --> "Fri Oct 31 13:00"
110+#. en_GB example: "%a %b %d\u2003%H:%M" --> "Fri 31 Oct 13:00"
111+#: plugins/Utils/relativetimeformatter.cpp:234
112+msgid "%a %d %b %H:%M"
113+msgstr "%a %d %b %H:%M"
114+
115+#: qml/Components/DelayedLockscreen.qml:49
116+msgid "Device Locked"
117+msgstr "Dyfais ar glo"
118+
119+#: qml/Components/DelayedLockscreen.qml:64
120+msgid "You have been locked out due to too many failed passphrase attempts."
121+msgstr ""
122+"Cawsoch eich cloi allan am gyflwyno cyfrinair anghywir ormod o weithiau."
123+
124+#: qml/Components/DelayedLockscreen.qml:65
125+msgid "You have been locked out due to too many failed passcode attempts."
126+msgstr ""
127+"Cawsoch eich cloi allan am gyflwyno côd mynediad anghywir ormod o weithiau."
128+
129+#: qml/Components/DelayedLockscreen.qml:74
130+#, qt-format
131+msgid "Please wait %1 minute and then try again…"
132+msgid_plural "Please wait %1 minutes and then try again…"
133+msgstr[0] "Arhoswch am %1 munud cyn cynnig eto..."
134+msgstr[1] "Arhoswch am %1 munud cyn cynnig eto..."
135+msgstr[2] "Arhoswch am %1 munud cyn cynnig eto..."
136+msgstr[3] "Arhoswch am %1 munud cyn cynnig eto..."
137+
138+#: qml/Components/Dialogs.qml:69
139+msgctxt "Title: Lock/Log out dialog"
140+msgid "Log out"
141+msgstr "Allgofnodi"
142+
143+#: qml/Components/Dialogs.qml:70
144+msgid "Are you sure you want to log out?"
145+msgstr "Ydych chi'n sicr eich bod am allgofnodi?"
146+
147+#: qml/Components/Dialogs.qml:72
148+msgctxt "Button: Lock the system"
149+msgid "Lock"
150+msgstr "Cloi"
151+
152+#: qml/Components/Dialogs.qml:79
153+msgctxt "Button: Log out from the system"
154+msgid "Log Out"
155+msgstr "Allgofnodi"
156+
157+#: qml/Components/Dialogs.qml:86 qml/Components/Dialogs.qml:117
158+#: qml/Components/Dialogs.qml:173
159+msgid "Cancel"
160+msgstr "Diddymu"
161+
162+#: qml/Components/Dialogs.qml:98
163+msgctxt "Title: Reboot/Shut down dialog"
164+msgid "Shut down"
165+msgstr "Diffodd"
166+
167+#: qml/Components/Dialogs.qml:99
168+msgid "Are you sure you want to shut down?"
169+msgstr "Ydych chi'n sicr eich bod am ddiffodd?"
170+
171+#: qml/Components/Dialogs.qml:101
172+msgctxt "Button: Reboot the system"
173+msgid "Reboot"
174+msgstr "Ailgychwyn"
175+
176+#: qml/Components/Dialogs.qml:109
177+msgctxt "Button: Shut down the system"
178+msgid "Shut down"
179+msgstr "Diffodd"
180+
181+#: qml/Components/Dialogs.qml:129
182+msgctxt "Title: Reboot dialog"
183+msgid "Reboot"
184+msgstr "Ailgychwyn"
185+
186+#: qml/Components/Dialogs.qml:130
187+msgid "Are you sure you want to reboot?"
188+msgstr "Ydych chi'n sicr eich bod am ailgychwyn?"
189+
190+#: qml/Components/Dialogs.qml:132
191+msgid "No"
192+msgstr "Na"
193+
194+#: qml/Components/Dialogs.qml:138
195+msgid "Yes"
196+msgstr "Ydw"
197+
198+#: qml/Components/Dialogs.qml:152
199+msgctxt "Title: Power off/Restart dialog"
200+msgid "Power"
201+msgstr "Pŵer"
202+
203+#: qml/Components/Dialogs.qml:153
204+msgid ""
205+"Are you sure you would like\n"
206+"to power off?"
207+msgstr ""
208+"Ydych chi'n sicr eich bod am\n"
209+"ddiffodd y pŵer?"
210+
211+#: qml/Components/Dialogs.qml:155
212+msgctxt "Button: Power off the system"
213+msgid "Power off"
214+msgstr "Diffodd y pŵer"
215+
216+#: qml/Components/Dialogs.qml:164
217+msgctxt "Button: Restart the system"
218+msgid "Restart"
219+msgstr "Ailgychwyn"
220+
221+#: qml/Components/Lockscreen.qml:245
222+msgid "Return to Call"
223+msgstr "Nôl i'r alwad"
224+
225+#: qml/Components/Lockscreen.qml:245
226+msgid "Emergency Call"
227+msgstr "Galwad Frys"
228+
229+#: qml/Components/Lockscreen.qml:277
230+msgid "OK"
231+msgstr "Iawn"
232+
233+#: qml/Dash/GenericScopeView.qml:539 qml/Dash/GenericScopeView.qml:697
234+msgid "See less"
235+msgstr "Gweld llai"
236+
237+#: qml/Dash/GenericScopeView.qml:539
238+msgid "See all"
239+msgstr "Gweld y cyfan"
240+
241+#: qml/Dash/GenericScopeView.qml:601
242+msgctxt "Label: Hint for dash search line edit"
243+msgid "Search"
244+msgstr "Chwilio"
245+
246+#: qml/Dash/PageHeader.qml:269
247+msgctxt "Button: Open the Ubuntu Store"
248+msgid "Store"
249+msgstr "Marchnad"
250+
251+#: qml/Dash/PageHeader.qml:276
252+msgctxt "Button: Start a search in the current dash scope"
253+msgid "Search"
254+msgstr "Chwilio"
255+
256+#: qml/Dash/PageHeader.qml:286
257+msgctxt "Button: Show the current dash scope settings"
258+msgid "Settings"
259+msgstr "Gosodiadau"
260+
261+#: qml/Dash/PageHeader.qml:293
262+msgid "Remove from Favorites"
263+msgstr "Tynnu o Ffefrynnau"
264+
265+#: qml/Dash/PageHeader.qml:293
266+msgid "Add to Favorites"
267+msgstr "Ychwanegu at Ffefrynnau"
268+
269+#: qml/Dash/Previews/PreviewActionCombo.qml:35
270+msgid "More..."
271+msgstr "Mwy..."
272+
273+#: qml/Dash/Previews/PreviewActionCombo.qml:35
274+msgid "Less..."
275+msgstr "Llai..."
276+
277+#: qml/Dash/Previews/PreviewRatingInput.qml:84
278+msgid "Rate this"
279+msgstr "Graddio hwn"
280+
281+#: qml/Dash/Previews/PreviewRatingInput.qml:129
282+msgid "Add a review"
283+msgstr "Ychwanegu adolygiad"
284+
285+#: qml/Dash/Previews/PreviewRatingInput.qml:169
286+msgid "Send"
287+msgstr "Anfon"
288+
289+#: qml/Dash/PullToRefreshScopeStyle.qml:55
290+msgid "Pull to refresh…"
291+msgstr "Tynnwch i adnewyddu..."
292+
293+#: qml/Dash/PullToRefreshScopeStyle.qml:60
294+msgid "Release to refresh…"
295+msgstr "Rhyddhewch i adnewyddu..."
296+
297+#: qml/Dash/ScopeSettings/ScopeSettingBoolean.qml:43
298+msgid "Enable location data"
299+msgstr "Galluogi data lleoliad"
300+
301+#: qml/Dash/ScopesList.qml:67
302+msgid "Manage"
303+msgstr "Rheoli"
304+
305+#: qml/Dash/ScopesList.qml:113
306+msgid "Home"
307+msgstr "Cartref"
308+
309+#: qml/Dash/ScopesList.qml:114
310+msgid "Also installed"
311+msgstr "Hefyd wedi gosod"
312+
313+#: qml/Greeter/CoverPage.qml:107
314+msgid "Unlock"
315+msgstr "Datgloi"
316+
317+#: qml/Greeter/LoginList.qml:236
318+msgid "Retry"
319+msgstr "Ailgynnig"
320+
321+#: qml/Greeter/LoginList.qml:237
322+msgid "Tap to unlock"
323+msgstr "Tapiwch i ddatgloi"
324+
325+#: qml/Greeter/NarrowView.qml:54 qml/Wizard/Pages/passwd-confirm.qml:53
326+msgid "Sorry, incorrect passphrase."
327+msgstr "Cyfrinair anghywir"
328+
329+#: qml/Greeter/NarrowView.qml:55 qml/Wizard/Pages/passwd-confirm.qml:54
330+msgid "Sorry, incorrect passcode."
331+msgstr "Cod cyfrinachol anghywir"
332+
333+#: qml/Greeter/NarrowView.qml:56
334+msgid "This will be your last attempt."
335+msgstr "Hwn yw eich ymgais olaf"
336+
337+#: qml/Greeter/NarrowView.qml:58
338+msgid ""
339+"If passphrase is entered incorrectly, your phone will conduct a factory "
340+"reset and all personal data will be deleted."
341+msgstr ""
342+"Os fydd y cyfrinair yn anghywir bydd eich ffôn yn cael ei ailosod i gyflwr "
343+"ffatri a bydd data personol yn cael ei ddileu."
344+
345+#: qml/Greeter/NarrowView.qml:59
346+msgid ""
347+"If passcode is entered incorrectly, your phone will conduct a factory reset "
348+"and all personal data will be deleted."
349+msgstr ""
350+"Os fydd y cod cyfrinachol yn anghywir bydd eich ffôn yn cael ei ailosod i "
351+"gyflwr ffatri a bydd data personol yn cael ei ddileu."
352+
353+#: qml/Greeter/NarrowView.qml:116
354+#, qt-format
355+msgid "Enter %1"
356+msgstr "Rhowch %1"
357+
358+#: qml/Greeter/NarrowView.qml:117 qml/Wizard/Pages/passwd-set.qml:60
359+msgid "Enter passphrase"
360+msgstr "Rhowch gyfrinair"
361+
362+#: qml/Greeter/NarrowView.qml:118
363+msgid "Enter passcode"
364+msgstr "Rhowch god cyfrinachol"
365+
366+#: qml/Greeter/NarrowView.qml:119
367+#, qt-format
368+msgid "Sorry, incorrect %1"
369+msgstr "%1 anghywir"
370+
371+#: qml/Greeter/NarrowView.qml:120
372+msgid "Sorry, incorrect passphrase"
373+msgstr "Cyfrinair anghywir"
374+
375+#: qml/Greeter/NarrowView.qml:121
376+msgctxt "passphrase"
377+msgid "Please re-enter"
378+msgstr "Ceisiwch eto"
379+
380+#: qml/Greeter/NarrowView.qml:122
381+msgid "Sorry, incorrect passcode"
382+msgstr "Cod cyfrinachol anghywir"
383+
384+#: qml/Notifications/NotificationMenuItemFactory.qml:128
385+msgid "Show password"
386+msgstr "Dangos cyfrinair"
387+
388+#: qml/Panel/ActiveCallHint.qml:79
389+msgid "Tap to return to call..."
390+msgstr "Tapiwch i ffonio nôl"
391+
392+#: qml/Panel/ActiveCallHint.qml:92
393+msgid "Conference"
394+msgstr "Cydalwad"
395+
396+#: qml/Panel/Indicators/MenuItemFactory.qml:639
397+msgid "Nothing is playing"
398+msgstr "Dim byd yn chwarae"
399+
400+#: qml/Panel/Indicators/MenuItemFactory.qml:768
401+#, qt-format
402+msgid "%1 hour"
403+msgid_plural "%1 hours"
404+msgstr[0] "%1 awr"
405+msgstr[1] "%1 awr"
406+msgstr[2] "%1 awr"
407+msgstr[3] "%1 awr"
408+
409+#: qml/Panel/Indicators/MenuItemFactory.qml:772
410+#, qt-format
411+msgid "%1 minute"
412+msgid_plural "%1 minutes"
413+msgstr[0] "%1 munud"
414+msgstr[1] "%1 munud"
415+msgstr[2] "%1 munud"
416+msgstr[3] "%1 munud"
417+
418+#: qml/Panel/Indicators/MenuItemFactory.qml:777
419+#, qt-format
420+msgid "%1 second"
421+msgid_plural "%1 seconds"
422+msgstr[0] "%1 eiliad"
423+msgstr[1] "%1 eiliad"
424+msgstr[2] "%1 eiliad"
425+msgstr[3] "%1 eiliad"
426+
427+#: qml/Panel/Indicators/MenuItemFactory.qml:780
428+msgid "0 seconds"
429+msgstr "0 eiliad"
430+
431+#. Translators: String like "1 hour, 2 minutes, 3 seconds remaining"
432+#: qml/Panel/Indicators/MenuItemFactory.qml:782
433+#, qt-format
434+msgid "%1 remaining"
435+msgstr "%1 yn weddill"
436+
437+#: qml/Panel/Indicators/MenuItemFactory.qml:788
438+msgid "In queue…"
439+msgstr "Mewn ciw..."
440+
441+#: qml/Panel/Indicators/MenuItemFactory.qml:792
442+msgid "Downloading"
443+msgstr "Yn llwytho i lawr"
444+
445+#: qml/Panel/Indicators/MenuItemFactory.qml:794
446+msgid "Paused, tap to resume"
447+msgstr "Seibiwyd, tapiwch i ailafael ynddi"
448+
449+#: qml/Panel/Indicators/MenuItemFactory.qml:796
450+msgid "Canceled"
451+msgstr "Diddymwyd"
452+
453+#: qml/Panel/Indicators/MenuItemFactory.qml:798
454+msgid "Finished"
455+msgstr "Wedi gorffen"
456+
457+#: qml/Panel/Indicators/MenuItemFactory.qml:800
458+msgid "Failed, tap to retry"
459+msgstr "Methwyd, tapiwch i geisio eto"
460+
461+#: qml/Panel/Indicators/MessageMenuItemFactory.qml:149
462+msgctxt "Label: Hint in message indicator line edit"
463+msgid "Reply"
464+msgstr "Ateb"
465+
466+#: qml/Panel/Indicators/ModemInfoItem.qml:105
467+msgid "Unlock SIM"
468+msgstr "Datgloi SIM"
469+
470+#: qml/Panel/Indicators/RoamingIndication.qml:27
471+msgid "Roaming"
472+msgstr "Crwydrol"
473+
474+#: qml/Tutorial/TutorialBottomFinish.qml:24
475+msgid "This action does different things for different apps"
476+msgstr "Mae'r weithred hon yn gwneud pethau gwahanol mewn apiau gwahanol"
477+
478+#: qml/Tutorial/TutorialBottomFinish.qml:25
479+msgid "Tap here to finish."
480+msgstr "Tapiwch yma i orffen"
481+
482+#: qml/Tutorial/TutorialBottom.qml:28
483+msgid "Open special menus"
484+msgstr "Agor dewislenni arbennig"
485+
486+#: qml/Tutorial/TutorialBottom.qml:29
487+msgid "Swipe up from the bottom edge."
488+msgstr "Trawiwch i fyny o'r ymyl gwaelod."
489+
490+#: qml/Tutorial/TutorialContent.qml:81 qml/Tutorial/TutorialLeftFinish.qml:25
491+#: qml/Tutorial/TutorialRight.qml:144
492+msgid "Tap here to continue."
493+msgstr "Tapiwch yma i barhau."
494+
495+#: qml/Tutorial/TutorialContent.qml:81
496+msgid "Click here to finish."
497+msgstr "Cliciwch yma i orffen."
498+
499+#: qml/Tutorial/TutorialLeftFinish.qml:24
500+msgid "These are the shortcuts to favorite apps"
501+msgstr "Rhain yw'r llwybrau byr i'ch hoff apiau"
502+
503+#: qml/Tutorial/TutorialLeft.qml:26
504+msgid "Open the launcher"
505+msgstr "Agor y lansiwr"
506+
507+#: qml/Tutorial/TutorialLeft.qml:27
508+msgid "Short swipe from the left edge."
509+msgstr "Trawiad byr o'r ymyl chwith."
510+
511+#: qml/Tutorial/TutorialPage.qml:178
512+msgid "You almost got it!"
513+msgstr "Bron â bod!"
514+
515+#: qml/Tutorial/TutorialPage.qml:195
516+msgid "Try again."
517+msgstr "Ceisiwch eto."
518+
519+#: qml/Tutorial/TutorialRight.qml:31
520+msgid "To view open apps"
521+msgstr "I weld apiau sydd ar agor"
522+
523+#: qml/Tutorial/TutorialRight.qml:32
524+msgid "Long swipe from the right edge."
525+msgstr "Trawiad hir o'r ymyl dde."
526+
527+#: qml/Tutorial/TutorialRight.qml:122
528+msgid "View all your running tasks."
529+msgstr "Gweld pob tasg sy'n rhedeg."
530+
531+#: qml/Wizard/Page.qml:89
532+msgctxt "Button: Go back one page in the Wizard"
533+msgid "Back"
534+msgstr "Nôl"
535+
536+#: qml/Wizard/Pages/10-welcome.qml:27
537+msgid "Hi!"
538+msgstr "Shwmae!"
539+
540+#: qml/Wizard/Pages/10-welcome.qml:44
541+msgid "Welcome to your Ubuntu phone."
542+msgstr "Croeso i'ch ffôn Ubuntu."
543+
544+#: qml/Wizard/Pages/10-welcome.qml:52
545+msgid "Let’s get started."
546+msgstr "Beth am gychwyn."
547+
548+#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:128
549+#: qml/Wizard/Pages/40-wifi.qml:215 qml/Wizard/Pages/50-location.qml:131
550+#: qml/Wizard/Pages/60-reporting.qml:50 qml/Wizard/Pages/passwd-confirm.qml:82
551+#: qml/Wizard/Pages/passwd-set.qml:90
552+msgid "Continue"
553+msgstr "Parhau"
554+
555+#: qml/Wizard/Pages/20-sim.qml:25
556+msgid "Add a SIM card and restart your device"
557+msgstr "Ychwanegwch gerdyn SIM ac ailgychwyn y ddyfais"
558+
559+#: qml/Wizard/Pages/20-sim.qml:59
560+msgid "Without it, you won’t be able to make calls or use text messaging."
561+msgstr "Hebddo bydd dim modd gwneud galwadau na defnyddio negeseuon testun."
562+
563+#: qml/Wizard/Pages/20-sim.qml:73 qml/Wizard/Pages/40-wifi.qml:215
564+msgid "Skip"
565+msgstr "Neidio"
566+
567+#: qml/Wizard/Pages/30-passwd-type.qml:39
568+msgid "Lock security"
569+msgstr "Diogelwch cloi"
570+
571+#: qml/Wizard/Pages/30-passwd-type.qml:74
572+msgid "Please select how you’d like to unlock your phone."
573+msgstr "Dewiswch sut yr hoffech ddatgloi'r ffôn."
574+
575+#: qml/Wizard/Pages/30-passwd-type.qml:97
576+msgctxt "Label: Type of security method"
577+msgid "Swipe"
578+msgstr "Trawio"
579+
580+#: qml/Wizard/Pages/30-passwd-type.qml:98
581+msgctxt "Label: Description of security method"
582+msgid "No security"
583+msgstr "Dim diogelwch"
584+
585+#: qml/Wizard/Pages/30-passwd-type.qml:100
586+msgctxt "Label: Type of security method"
587+msgid "Passcode"
588+msgstr "Cod cyfrinachol"
589+
590+#: qml/Wizard/Pages/30-passwd-type.qml:101
591+msgctxt "Label: Description of security method"
592+msgid "4 digits only"
593+msgstr "4 digid yn unig"
594+
595+#: qml/Wizard/Pages/30-passwd-type.qml:103
596+msgctxt "Label: Type of security method"
597+msgid "Passphrase"
598+msgstr "Cyfrinair"
599+
600+#: qml/Wizard/Pages/30-passwd-type.qml:104
601+msgctxt "Label: Description of security method"
602+msgid "Numbers and letters"
603+msgstr "Rhifau a llythrennau"
604+
605+#: qml/Wizard/Pages/40-wifi.qml:29
606+msgid "Connect to Wi‑Fi"
607+msgstr "Cysylltu â diwifr"
608+
609+#: qml/Wizard/Pages/40-wifi.qml:168
610+msgid "Available networks…"
611+msgstr "Rhwydweithiau sydd ar gael..."
612+
613+#: qml/Wizard/Pages/40-wifi.qml:169
614+msgid "No available networks."
615+msgstr "Dim rhwydweithiau ar gael"
616+
617+#: qml/Wizard/Pages/50-location.qml:27
618+msgid "Location"
619+msgstr "Lleoliad"
620+
621+#: qml/Wizard/Pages/50-location.qml:62
622+msgid "Let the phone detect your location:"
623+msgstr "Caniatáu'r ffôn i ganfod eich lleoliad:"
624+
625+#: qml/Wizard/Pages/50-location.qml:69
626+msgid "Using GPS only (less accurate)"
627+msgstr "Defnyddio GPS yn unig (llai cywir)"
628+
629+#: qml/Wizard/Pages/50-location.qml:86
630+msgid "Using GPS, anonymized Wi-Fi and cellular network info (recommended)"
631+msgstr ""
632+"Defnyddio GPS, diwifr dienw a gwybodaeth rhwydwaith cellog (argymellir hwn)"
633+
634+#. Translators: HERE is a trademark for Nokia's location service, you probably shouldn't translate it
635+#: qml/Wizard/Pages/50-location.qml:103
636+msgid ""
637+"By selecting this option you agree to the Nokia HERE <a href='#'>terms and "
638+"conditions</a>."
639+msgstr ""
640+"Drwy ddewis yr opsiwn yma rydych yn cytuno i <a href='#'>dermau ac "
641+"amodau</a> Nokia HERE."
642+
643+#: qml/Wizard/Pages/50-location.qml:112
644+msgid "Not at all"
645+msgstr "Dim o gwbl"
646+
647+#: qml/Wizard/Pages/50-location.qml:124
648+msgid "You can change your mind later in <b>System Settings</b>."
649+msgstr "Gallwch newid hwn eto yn <b>Gosodiadau System</b>."
650+
651+#: qml/Wizard/Pages/60-reporting.qml:24
652+msgid "Improving your experience"
653+msgstr "Gwella eich profiad"
654+
655+#: qml/Wizard/Pages/60-reporting.qml:36
656+msgid ""
657+"Your phone is set up to automatically report errors to Canonical and its "
658+"partners, the makers of the operating system."
659+msgstr ""
660+"Cyfluniwyd eich ffôn i adrodd gwallau i Canonical a'i bartneriaid, "
661+"gwneuthurwyr y system weithredu."
662+
663+#: qml/Wizard/Pages/60-reporting.qml:43
664+msgid ""
665+"This can be disabled in <b>System Settings</b> under <b>Security &amp; "
666+"Privacy</b>"
667+msgstr ""
668+"Gellir analluogi hwn yn <b>Gosodiadau System</b> dan <b>Diogelwch a "
669+"Phreifatwydd</b>"
670+
671+#: qml/Wizard/Pages/80-finished.qml:24
672+msgid "All done"
673+msgstr "Wedi gorffen"
674+
675+#: qml/Wizard/Pages/80-finished.qml:39
676+msgid "Nice work!"
677+msgstr "Da iawn!"
678+
679+#: qml/Wizard/Pages/80-finished.qml:46
680+msgid "Your phone is now ready to use."
681+msgstr "Mae eich ffôn yn barod i'w ddefnyddio"
682+
683+#: qml/Wizard/Pages/80-finished.qml:53
684+msgid "Finish"
685+msgstr "Gorffen"
686+
687+#: qml/Wizard/Pages/here-terms.qml:27
688+msgid "Terms & Conditions"
689+msgstr "Amodau a Thelerau"
690+
691+#: qml/Wizard/Pages/passwd-confirm.qml:49
692+msgid "Confirm passphrase"
693+msgstr "Cadarnhau cyfrinair"
694+
695+#: qml/Wizard/Pages/passwd-confirm.qml:50
696+msgid "Confirm passcode"
697+msgstr "Cadarnhau cod cyfrinachol"
698+
699+#: qml/Wizard/Pages/passwd-confirm.qml:53
700+#: qml/Wizard/Pages/passwd-confirm.qml:54
701+msgid "Please try again."
702+msgstr "Rhowch gynnig arall arni"
703+
704+#: qml/Wizard/Pages/passwd-set.qml:61
705+msgid "Choose your passcode"
706+msgstr "Dewiswch eich cod cyfrinachol"
707+
708+#: qml/Wizard/Pages/passwd-set.qml:68
709+msgid "Passphrase must be 4 characters long"
710+msgstr "Dylai cyfrinair fod yn bedwar nod"
711+
712+#. Translators: This is the arrow for "Back" buttons
713+#: qml/Wizard/StackButton.qml:39
714+#, qt-format
715+msgid "〈 %1"
716+msgstr "〈 %1"
717+
718+#. Translators: This is the arrow for "Forward" buttons
719+#: qml/Wizard/StackButton.qml:42
720+#, qt-format
721+msgid "%1 〉"
722+msgstr "%1 〉"
po/da.po+55−51
@@ -8,7 +8,7 @@ msgid ""
8msgstr ""
8msgstr ""
9"Project-Id-Version: unity8\n"
9"Project-Id-Version: unity8\n"
10"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
11−"POT-Creation-Date: 2015-06-22 12:00+0200\n"
11+"POT-Creation-Date: 2015-07-17 10:10+0200\n"
12"PO-Revision-Date: 2015-07-06 12:05+0000\n"
12"PO-Revision-Date: 2015-07-06 12:05+0000\n"
13"Last-Translator: Folmer Fredslund <Unknown>\n"
13"Last-Translator: Folmer Fredslund <Unknown>\n"
14"Language-Team: Danish <dansk@dansk-gruppen.dk>\n"
14"Language-Team: Danish <dansk@dansk-gruppen.dk>\n"
@@ -16,8 +16,8 @@ msgstr ""
16"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Type: text/plain; charset=UTF-8\n"
17"Content-Transfer-Encoding: 8bit\n"
17"Content-Transfer-Encoding: 8bit\n"
18"Plural-Forms: nplurals=2; plural=n != 1;\n"
18"Plural-Forms: nplurals=2; plural=n != 1;\n"
19−"X-Launchpad-Export-Date: 2015-07-07 05:40+0000\n"
19+"X-Launchpad-Export-Date: 2015-07-25 05:38+0000\n"
20−"X-Generator: Launchpad (build 17597)\n"
20+"X-Generator: Launchpad (build 17628)\n"
21
21
22#: plugins/LightDM/Greeter.cpp:112
22#: plugins/LightDM/Greeter.cpp:112
23msgid "Password: "
23msgid "Password: "
@@ -230,15 +230,15 @@ msgstr "Nødopkald"
230msgid "OK"
230msgid "OK"
231msgstr "Ok"
231msgstr "Ok"
232
232
233−#: qml/Dash/GenericScopeView.qml:532 qml/Dash/GenericScopeView.qml:690
233+#: qml/Dash/GenericScopeView.qml:539 qml/Dash/GenericScopeView.qml:697
234msgid "See less"
234msgid "See less"
235msgstr "Vis mindre"
235msgstr "Vis mindre"
236
236
237−#: qml/Dash/GenericScopeView.qml:532
237+#: qml/Dash/GenericScopeView.qml:539
238msgid "See all"
238msgid "See all"
239msgstr "Se alle"
239msgstr "Se alle"
240
240
241−#: qml/Dash/GenericScopeView.qml:594
241+#: qml/Dash/GenericScopeView.qml:601
242msgctxt "Label: Hint for dash search line edit"
242msgctxt "Label: Hint for dash search line edit"
243msgid "Search"
243msgid "Search"
244msgstr "Søg"
244msgstr "Søg"
@@ -322,19 +322,19 @@ msgstr "Forsøg igen"
322msgid "Tap to unlock"
322msgid "Tap to unlock"
323msgstr "Tap for at låse op"
323msgstr "Tap for at låse op"
324
324
325−#: qml/Greeter/NarrowView.qml:53 qml/Wizard/Pages/passwd-confirm.qml:53
325+#: qml/Greeter/NarrowView.qml:54 qml/Wizard/Pages/passwd-confirm.qml:53
326msgid "Sorry, incorrect passphrase."
326msgid "Sorry, incorrect passphrase."
327msgstr "Beklager, forkert adgangsfrase."
327msgstr "Beklager, forkert adgangsfrase."
328
328
329−#: qml/Greeter/NarrowView.qml:54 qml/Wizard/Pages/passwd-confirm.qml:54
329+#: qml/Greeter/NarrowView.qml:55 qml/Wizard/Pages/passwd-confirm.qml:54
330msgid "Sorry, incorrect passcode."
330msgid "Sorry, incorrect passcode."
331msgstr "Beklager, forkert adgangskode."
331msgstr "Beklager, forkert adgangskode."
332
332
333−#: qml/Greeter/NarrowView.qml:55
333+#: qml/Greeter/NarrowView.qml:56
334msgid "This will be your last attempt."
334msgid "This will be your last attempt."
335msgstr "Dette er dit sidste forsøg."
335msgstr "Dette er dit sidste forsøg."
336
336
337−#: qml/Greeter/NarrowView.qml:57
337+#: qml/Greeter/NarrowView.qml:58
338msgid ""
338msgid ""
339"If passphrase is entered incorrectly, your phone will conduct a factory "
339"If passphrase is entered incorrectly, your phone will conduct a factory "
340"reset and all personal data will be deleted."
340"reset and all personal data will be deleted."
@@ -342,7 +342,7 @@ msgstr ""
342"Hvis adgangsfrasen er forkert, vil telefonen blive gendannet til "
342"Hvis adgangsfrasen er forkert, vil telefonen blive gendannet til "
343"fabriksindstillinger og al personlig data vil blive slettet."
343"fabriksindstillinger og al personlig data vil blive slettet."
344
344
345−#: qml/Greeter/NarrowView.qml:58
345+#: qml/Greeter/NarrowView.qml:59
346msgid ""
346msgid ""
347"If passcode is entered incorrectly, your phone will conduct a factory reset "
347"If passcode is entered incorrectly, your phone will conduct a factory reset "
348"and all personal data will be deleted."
348"and all personal data will be deleted."
@@ -350,33 +350,34 @@ msgstr ""
350"Hvis adgangskoden er forkert, vil telefonen blive gendannet til "
350"Hvis adgangskoden er forkert, vil telefonen blive gendannet til "
351"fabriksindstillinger og al personlig data vil blive slettet."
351"fabriksindstillinger og al personlig data vil blive slettet."
352
352
353−#: qml/Greeter/NarrowView.qml:115
353+#: qml/Greeter/NarrowView.qml:116
354#, qt-format
354#, qt-format
355msgid "Enter %1"
355msgid "Enter %1"
356msgstr "Indtast %1"
356msgstr "Indtast %1"
357
357
358−#: qml/Greeter/NarrowView.qml:116 qml/Wizard/Pages/passwd-set.qml:60
358+#: qml/Greeter/NarrowView.qml:117 qml/Wizard/Pages/passwd-set.qml:60
359msgid "Enter passphrase"
359msgid "Enter passphrase"
360msgstr "Angiv adgangsfrase"
360msgstr "Angiv adgangsfrase"
361
361
362−#: qml/Greeter/NarrowView.qml:117
362+#: qml/Greeter/NarrowView.qml:118
363msgid "Enter passcode"
363msgid "Enter passcode"
364msgstr "Indtast adgangskode"
364msgstr "Indtast adgangskode"
365
365
366−#: qml/Greeter/NarrowView.qml:118
366+#: qml/Greeter/NarrowView.qml:119
367#, qt-format
367#, qt-format
368msgid "Sorry, incorrect %1"
368msgid "Sorry, incorrect %1"
369msgstr "Beklager, forkert %1"
369msgstr "Beklager, forkert %1"
370
370
371−#: qml/Greeter/NarrowView.qml:119
371+#: qml/Greeter/NarrowView.qml:120
372msgid "Sorry, incorrect passphrase"
372msgid "Sorry, incorrect passphrase"
373msgstr "Beklager, forkert adgangsfrase"
373msgstr "Beklager, forkert adgangsfrase"
374
374
375−#: qml/Greeter/NarrowView.qml:120
375+#: qml/Greeter/NarrowView.qml:121
376+msgctxt "passphrase"
376msgid "Please re-enter"
377msgid "Please re-enter"
377−msgstr "Vær venlig at genindtaste"
378+msgstr ""
378
379
379−#: qml/Greeter/NarrowView.qml:121
380+#: qml/Greeter/NarrowView.qml:122
380msgid "Sorry, incorrect passcode"
381msgid "Sorry, incorrect passcode"
381msgstr "Beklager, forkert adgangskode"
382msgstr "Beklager, forkert adgangskode"
382
383
@@ -526,38 +527,6 @@ msgctxt "Button: Go back one page in the Wizard"
526msgid "Back"
527msgid "Back"
527msgstr "Tilbage"
528msgstr "Tilbage"
528
529
529−#: qml/Wizard/Pages/here-terms.qml:27
530−msgid "Terms & Conditions"
531−msgstr "Betingelser og vilkår"
532−
533−#: qml/Wizard/Pages/passwd-confirm.qml:49
534−msgid "Confirm passphrase"
535−msgstr "Bekæft adgangsfrase"
536−
537−#: qml/Wizard/Pages/passwd-confirm.qml:50
538−msgid "Confirm passcode"
539−msgstr "Bekræft adgangskode"
540−
541−#: qml/Wizard/Pages/passwd-confirm.qml:53
542−#: qml/Wizard/Pages/passwd-confirm.qml:54
543−msgid "Please try again."
544−msgstr "Forsøg venligst igen."
545−
546−#: qml/Wizard/Pages/passwd-confirm.qml:82 qml/Wizard/Pages/passwd-set.qml:90
547−#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:128
548−#: qml/Wizard/Pages/40-wifi.qml:215 qml/Wizard/Pages/50-location.qml:131
549−#: qml/Wizard/Pages/60-reporting.qml:50
550−msgid "Continue"
551−msgstr "Fortsæt"
552−
553−#: qml/Wizard/Pages/passwd-set.qml:61
554−msgid "Choose your passcode"
555−msgstr "Vælg din adgangskode"
556−
557−#: qml/Wizard/Pages/passwd-set.qml:68
558−msgid "Passphrase must be 4 characters long"
559−msgstr "Adgangsfrasen skal være mindst 4 tegn"
560−
561#: qml/Wizard/Pages/10-welcome.qml:27
530#: qml/Wizard/Pages/10-welcome.qml:27
562msgid "Hi!"
531msgid "Hi!"
563msgstr "Hej!"
532msgstr "Hej!"
@@ -570,6 +539,13 @@ msgstr "Velkommen til din Ubuntu-telefon."
570msgid "Let’s get started."
539msgid "Let’s get started."
571msgstr "Lad os komme i gang."
540msgstr "Lad os komme i gang."
572
541
542+#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:128
543+#: qml/Wizard/Pages/40-wifi.qml:215 qml/Wizard/Pages/50-location.qml:131
544+#: qml/Wizard/Pages/60-reporting.qml:50 qml/Wizard/Pages/passwd-confirm.qml:82
545+#: qml/Wizard/Pages/passwd-set.qml:90
546+msgid "Continue"
547+msgstr "Fortsæt"
548+
573#: qml/Wizard/Pages/20-sim.qml:25
549#: qml/Wizard/Pages/20-sim.qml:25
574msgid "Add a SIM card and restart your device"
550msgid "Add a SIM card and restart your device"
575msgstr "Indsæt et SIM-kort og genstart din enhed"
551msgstr "Indsæt et SIM-kort og genstart din enhed"
@@ -704,6 +680,31 @@ msgstr "Din telefon er nu klar til brug."
704msgid "Finish"
680msgid "Finish"
705msgstr "Afslut"
681msgstr "Afslut"
706
682
683+#: qml/Wizard/Pages/here-terms.qml:27
684+msgid "Terms & Conditions"
685+msgstr "Betingelser og vilkår"
686+
687+#: qml/Wizard/Pages/passwd-confirm.qml:49
688+msgid "Confirm passphrase"
689+msgstr "Bekæft adgangsfrase"
690+
691+#: qml/Wizard/Pages/passwd-confirm.qml:50
692+msgid "Confirm passcode"
693+msgstr "Bekræft adgangskode"
694+
695+#: qml/Wizard/Pages/passwd-confirm.qml:53
696+#: qml/Wizard/Pages/passwd-confirm.qml:54
697+msgid "Please try again."
698+msgstr "Forsøg venligst igen."
699+
700+#: qml/Wizard/Pages/passwd-set.qml:61
701+msgid "Choose your passcode"
702+msgstr "Vælg din adgangskode"
703+
704+#: qml/Wizard/Pages/passwd-set.qml:68
705+msgid "Passphrase must be 4 characters long"
706+msgstr "Adgangsfrasen skal være mindst 4 tegn"
707+
707#. Translators: This is the arrow for "Back" buttons
708#. Translators: This is the arrow for "Back" buttons
708#: qml/Wizard/StackButton.qml:39
709#: qml/Wizard/StackButton.qml:39
709#, qt-format
710#, qt-format
@@ -770,3 +771,6 @@ msgstr "%1 〉"
770#~ msgstr ""
771#~ msgstr ""
771#~ "Du mestrer nu kantbevægelserne og kan begynde at bruge telefonen<br><br>Tryk "
772#~ "Du mestrer nu kantbevægelserne og kan begynde at bruge telefonen<br><br>Tryk "
772#~ "på skærmen for at starte"
773#~ "på skærmen for at starte"
774+
775+#~ msgid "Please re-enter"
776+#~ msgstr "Vær venlig at genindtaste"
po/de.po+56−52
@@ -7,16 +7,16 @@ msgid ""
7msgstr ""
7msgstr ""
8"Project-Id-Version: unity\n"
8"Project-Id-Version: unity\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2015-06-22 12:00+0200\n"
10+"POT-Creation-Date: 2015-07-17 10:10+0200\n"
11−"PO-Revision-Date: 2015-07-05 13:45+0000\n"
11+"PO-Revision-Date: 2015-07-24 18:03+0000\n"
12−"Last-Translator: Phillip Sz <Unknown>\n"
12+"Last-Translator: Torsten Franz <Unknown>\n"
13"Language-Team: German <de@li.org>\n"
13"Language-Team: German <de@li.org>\n"
14"MIME-Version: 1.0\n"
14"MIME-Version: 1.0\n"
15"Content-Type: text/plain; charset=UTF-8\n"
15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n"
16"Content-Transfer-Encoding: 8bit\n"
17"Plural-Forms: nplurals=2; plural=n != 1;\n"
17"Plural-Forms: nplurals=2; plural=n != 1;\n"
18−"X-Launchpad-Export-Date: 2015-07-06 05:36+0000\n"
18+"X-Launchpad-Export-Date: 2015-07-25 05:38+0000\n"
19−"X-Generator: Launchpad (build 17597)\n"
19+"X-Generator: Launchpad (build 17628)\n"
20
20
21#: plugins/LightDM/Greeter.cpp:112
21#: plugins/LightDM/Greeter.cpp:112
22msgid "Password: "
22msgid "Password: "
@@ -229,15 +229,15 @@ msgstr "Notruf"
229msgid "OK"
229msgid "OK"
230msgstr "OK"
230msgstr "OK"
231
231
232−#: qml/Dash/GenericScopeView.qml:532 qml/Dash/GenericScopeView.qml:690
232+#: qml/Dash/GenericScopeView.qml:539 qml/Dash/GenericScopeView.qml:697
233msgid "See less"
233msgid "See less"
234msgstr "Weniger ansehen"
234msgstr "Weniger ansehen"
235
235
236−#: qml/Dash/GenericScopeView.qml:532
236+#: qml/Dash/GenericScopeView.qml:539
237msgid "See all"
237msgid "See all"
238msgstr "Alle anzeigen"
238msgstr "Alle anzeigen"
239
239
240−#: qml/Dash/GenericScopeView.qml:594
240+#: qml/Dash/GenericScopeView.qml:601
241msgctxt "Label: Hint for dash search line edit"
241msgctxt "Label: Hint for dash search line edit"
242msgid "Search"
242msgid "Search"
243msgstr "Suchen"
243msgstr "Suchen"
@@ -321,19 +321,19 @@ msgstr "Erneut versuchen"
321msgid "Tap to unlock"
321msgid "Tap to unlock"
322msgstr "Zum Entsperren tippen"
322msgstr "Zum Entsperren tippen"
323
323
324−#: qml/Greeter/NarrowView.qml:53 qml/Wizard/Pages/passwd-confirm.qml:53
324+#: qml/Greeter/NarrowView.qml:54 qml/Wizard/Pages/passwd-confirm.qml:53
325msgid "Sorry, incorrect passphrase."
325msgid "Sorry, incorrect passphrase."
326msgstr "Entschuldigung, falsches Passwort."
326msgstr "Entschuldigung, falsches Passwort."
327
327
328−#: qml/Greeter/NarrowView.qml:54 qml/Wizard/Pages/passwd-confirm.qml:54
328+#: qml/Greeter/NarrowView.qml:55 qml/Wizard/Pages/passwd-confirm.qml:54
329msgid "Sorry, incorrect passcode."
329msgid "Sorry, incorrect passcode."
330msgstr "Falsche PIN"
330msgstr "Falsche PIN"
331
331
332−#: qml/Greeter/NarrowView.qml:55
332+#: qml/Greeter/NarrowView.qml:56
333msgid "This will be your last attempt."
333msgid "This will be your last attempt."
334msgstr "Dies ist Ihr letzter Versuch."
334msgstr "Dies ist Ihr letzter Versuch."
335
335
336−#: qml/Greeter/NarrowView.qml:57
336+#: qml/Greeter/NarrowView.qml:58
337msgid ""
337msgid ""
338"If passphrase is entered incorrectly, your phone will conduct a factory "
338"If passphrase is entered incorrectly, your phone will conduct a factory "
339"reset and all personal data will be deleted."
339"reset and all personal data will be deleted."
@@ -341,7 +341,7 @@ msgstr ""
341"Wird das Passwort falsch eingegeben, wird das Telefon auf den Werkszustand "
341"Wird das Passwort falsch eingegeben, wird das Telefon auf den Werkszustand "
342"zurückgesetzt und alle Daten werden gelöscht."
342"zurückgesetzt und alle Daten werden gelöscht."
343
343
344−#: qml/Greeter/NarrowView.qml:58
344+#: qml/Greeter/NarrowView.qml:59
345msgid ""
345msgid ""
346"If passcode is entered incorrectly, your phone will conduct a factory reset "
346"If passcode is entered incorrectly, your phone will conduct a factory reset "
347"and all personal data will be deleted."
347"and all personal data will be deleted."
@@ -349,33 +349,34 @@ msgstr ""
349"Wird die PIN falsch eingegeben, wird das Telefon auf den Werkszustand "
349"Wird die PIN falsch eingegeben, wird das Telefon auf den Werkszustand "
350"zurückgesetzt und alle Daten werden gelöscht."
350"zurückgesetzt und alle Daten werden gelöscht."
351
351
352−#: qml/Greeter/NarrowView.qml:115
352+#: qml/Greeter/NarrowView.qml:116
353#, qt-format
353#, qt-format
354msgid "Enter %1"
354msgid "Enter %1"
355msgstr "%1 eingeben"
355msgstr "%1 eingeben"
356
356
357−#: qml/Greeter/NarrowView.qml:116 qml/Wizard/Pages/passwd-set.qml:60
357+#: qml/Greeter/NarrowView.qml:117 qml/Wizard/Pages/passwd-set.qml:60
358msgid "Enter passphrase"
358msgid "Enter passphrase"
359msgstr "Passphrase eingeben"
359msgstr "Passphrase eingeben"
360
360
361−#: qml/Greeter/NarrowView.qml:117
361+#: qml/Greeter/NarrowView.qml:118
362msgid "Enter passcode"
362msgid "Enter passcode"
363msgstr "PIN eingeben"
363msgstr "PIN eingeben"
364
364
365−#: qml/Greeter/NarrowView.qml:118
365+#: qml/Greeter/NarrowView.qml:119
366#, qt-format
366#, qt-format
367msgid "Sorry, incorrect %1"
367msgid "Sorry, incorrect %1"
368msgstr "%1 falsch"
368msgstr "%1 falsch"
369
369
370−#: qml/Greeter/NarrowView.qml:119
370+#: qml/Greeter/NarrowView.qml:120
371msgid "Sorry, incorrect passphrase"
371msgid "Sorry, incorrect passphrase"
372msgstr "Das Passwort ist nicht korrekt"
372msgstr "Das Passwort ist nicht korrekt"
373
373
374−#: qml/Greeter/NarrowView.qml:120
374+#: qml/Greeter/NarrowView.qml:121
375+msgctxt "passphrase"
375msgid "Please re-enter"
376msgid "Please re-enter"
376msgstr "Bitte erneut eingeben"
377msgstr "Bitte erneut eingeben"
377
378
378−#: qml/Greeter/NarrowView.qml:121
379+#: qml/Greeter/NarrowView.qml:122
379msgid "Sorry, incorrect passcode"
380msgid "Sorry, incorrect passcode"
380msgstr "Falsches Passwort"
381msgstr "Falsches Passwort"
381
382
@@ -526,38 +527,6 @@ msgctxt "Button: Go back one page in the Wizard"
526msgid "Back"
527msgid "Back"
527msgstr "Zurück"
528msgstr "Zurück"
528
529
529−#: qml/Wizard/Pages/here-terms.qml:27
530−msgid "Terms & Conditions"
531−msgstr "Nutzungsbedingungen"
532−
533−#: qml/Wizard/Pages/passwd-confirm.qml:49
534−msgid "Confirm passphrase"
535−msgstr "Passwort bestätigen"
536−
537−#: qml/Wizard/Pages/passwd-confirm.qml:50
538−msgid "Confirm passcode"
539−msgstr "PIN bestätigen"
540−
541−#: qml/Wizard/Pages/passwd-confirm.qml:53
542−#: qml/Wizard/Pages/passwd-confirm.qml:54
543−msgid "Please try again."
544−msgstr "Bitte versuchen Sie es erneut."
545−
546−#: qml/Wizard/Pages/passwd-confirm.qml:82 qml/Wizard/Pages/passwd-set.qml:90
547−#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:128
548−#: qml/Wizard/Pages/40-wifi.qml:215 qml/Wizard/Pages/50-location.qml:131
549−#: qml/Wizard/Pages/60-reporting.qml:50
550−msgid "Continue"
551−msgstr "Weiter"
552−
553−#: qml/Wizard/Pages/passwd-set.qml:61
554−msgid "Choose your passcode"
555−msgstr "Wählen Sie Ihre PIN"
556−
557−#: qml/Wizard/Pages/passwd-set.qml:68
558−msgid "Passphrase must be 4 characters long"
559−msgstr "Passwörter müssen 4 Buchstaben lang sein"
560−
561#: qml/Wizard/Pages/10-welcome.qml:27
530#: qml/Wizard/Pages/10-welcome.qml:27
562msgid "Hi!"
531msgid "Hi!"
563msgstr "Hallo!"
532msgstr "Hallo!"
@@ -570,6 +539,13 @@ msgstr "Willkommen zu Ihrem Ubuntu-Telefon."
570msgid "Let’s get started."
539msgid "Let’s get started."
571msgstr "Fangen wir an!"
540msgstr "Fangen wir an!"
572
541
542+#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:128
543+#: qml/Wizard/Pages/40-wifi.qml:215 qml/Wizard/Pages/50-location.qml:131
544+#: qml/Wizard/Pages/60-reporting.qml:50 qml/Wizard/Pages/passwd-confirm.qml:82
545+#: qml/Wizard/Pages/passwd-set.qml:90
546+msgid "Continue"
547+msgstr "Weiter"
548+
573#: qml/Wizard/Pages/20-sim.qml:25
549#: qml/Wizard/Pages/20-sim.qml:25
574msgid "Add a SIM card and restart your device"
550msgid "Add a SIM card and restart your device"
575msgstr "SIM-Karte einlegen und Gerät neustarten"
551msgstr "SIM-Karte einlegen und Gerät neustarten"
@@ -703,6 +679,31 @@ msgstr "Ihr Telefon ist nun einsatzbereit."
703msgid "Finish"
679msgid "Finish"
704msgstr "Beenden"
680msgstr "Beenden"
705
681
682+#: qml/Wizard/Pages/here-terms.qml:27
683+msgid "Terms & Conditions"
684+msgstr "Nutzungsbedingungen"
685+
686+#: qml/Wizard/Pages/passwd-confirm.qml:49
687+msgid "Confirm passphrase"
688+msgstr "Passwort bestätigen"
689+
690+#: qml/Wizard/Pages/passwd-confirm.qml:50
691+msgid "Confirm passcode"
692+msgstr "PIN bestätigen"
693+
694+#: qml/Wizard/Pages/passwd-confirm.qml:53
695+#: qml/Wizard/Pages/passwd-confirm.qml:54
696+msgid "Please try again."
697+msgstr "Bitte versuchen Sie es erneut."
698+
699+#: qml/Wizard/Pages/passwd-set.qml:61
700+msgid "Choose your passcode"
701+msgstr "Wählen Sie Ihre PIN"
702+
703+#: qml/Wizard/Pages/passwd-set.qml:68
704+msgid "Passphrase must be 4 characters long"
705+msgstr "Passwörter müssen 4 Buchstaben lang sein"
706+
706#. Translators: This is the arrow for "Back" buttons
707#. Translators: This is the arrow for "Back" buttons
707#: qml/Wizard/StackButton.qml:39
708#: qml/Wizard/StackButton.qml:39
708#, qt-format
709#, qt-format
@@ -808,3 +809,6 @@ msgstr "%1 〉"
808
809
809#~ msgid "Manage Scopes"
810#~ msgid "Manage Scopes"
810#~ msgstr "Filter verwalten"
811#~ msgstr "Filter verwalten"
812+
813+#~ msgid "Please re-enter"
814+#~ msgstr "Bitte erneut eingeben"
po/el.po+55−51
@@ -7,7 +7,7 @@ msgid ""
7msgstr ""
7msgstr ""
8"Project-Id-Version: unity\n"
8"Project-Id-Version: unity\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2015-06-22 12:00+0200\n"
10+"POT-Creation-Date: 2015-07-17 10:10+0200\n"
11"PO-Revision-Date: 2015-07-05 21:52+0000\n"
11"PO-Revision-Date: 2015-07-05 21:52+0000\n"
12"Last-Translator: Simos Xenitellis <Unknown>\n"
12"Last-Translator: Simos Xenitellis <Unknown>\n"
13"Language-Team: Greek <el@li.org>\n"
13"Language-Team: Greek <el@li.org>\n"
@@ -15,8 +15,8 @@ msgstr ""
15"Content-Type: text/plain; charset=UTF-8\n"
15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n"
16"Content-Transfer-Encoding: 8bit\n"
17"Plural-Forms: nplurals=2; plural=n != 1;\n"
17"Plural-Forms: nplurals=2; plural=n != 1;\n"
18−"X-Launchpad-Export-Date: 2015-07-06 05:36+0000\n"
18+"X-Launchpad-Export-Date: 2015-07-25 05:39+0000\n"
19−"X-Generator: Launchpad (build 17597)\n"
19+"X-Generator: Launchpad (build 17628)\n"
20
20
21#: plugins/LightDM/Greeter.cpp:112
21#: plugins/LightDM/Greeter.cpp:112
22msgid "Password: "
22msgid "Password: "
@@ -229,15 +229,15 @@ msgstr "Κλήση έκτακτης ανάγκης"
229msgid "OK"
229msgid "OK"
230msgstr "OK"
230msgstr "OK"
231
231
232−#: qml/Dash/GenericScopeView.qml:532 qml/Dash/GenericScopeView.qml:690
232+#: qml/Dash/GenericScopeView.qml:539 qml/Dash/GenericScopeView.qml:697
233msgid "See less"
233msgid "See less"
234msgstr "Λιγότερα"
234msgstr "Λιγότερα"
235
235
236−#: qml/Dash/GenericScopeView.qml:532
236+#: qml/Dash/GenericScopeView.qml:539
237msgid "See all"
237msgid "See all"
238msgstr "Εμφάνιση όλων"
238msgstr "Εμφάνιση όλων"
239
239
240−#: qml/Dash/GenericScopeView.qml:594
240+#: qml/Dash/GenericScopeView.qml:601
241msgctxt "Label: Hint for dash search line edit"
241msgctxt "Label: Hint for dash search line edit"
242msgid "Search"
242msgid "Search"
243msgstr "Αναζήτηση"
243msgstr "Αναζήτηση"
@@ -321,19 +321,19 @@ msgstr "Επανάληψη"
321msgid "Tap to unlock"
321msgid "Tap to unlock"
322msgstr "Ακουμπήστε για να ξεκλειδώσετε"
322msgstr "Ακουμπήστε για να ξεκλειδώσετε"
323
323
324−#: qml/Greeter/NarrowView.qml:53 qml/Wizard/Pages/passwd-confirm.qml:53
324+#: qml/Greeter/NarrowView.qml:54 qml/Wizard/Pages/passwd-confirm.qml:53
325msgid "Sorry, incorrect passphrase."
325msgid "Sorry, incorrect passphrase."
326msgstr "Συγνώμη, μη έγκυρη συνθηματική φράση."
326msgstr "Συγνώμη, μη έγκυρη συνθηματική φράση."
327
327
328−#: qml/Greeter/NarrowView.qml:54 qml/Wizard/Pages/passwd-confirm.qml:54
328+#: qml/Greeter/NarrowView.qml:55 qml/Wizard/Pages/passwd-confirm.qml:54
329msgid "Sorry, incorrect passcode."
329msgid "Sorry, incorrect passcode."
330msgstr "Συγνώμη, μη έγκυρος κωδικός πρόσβασης."
330msgstr "Συγνώμη, μη έγκυρος κωδικός πρόσβασης."
331
331
332−#: qml/Greeter/NarrowView.qml:55
332+#: qml/Greeter/NarrowView.qml:56
333msgid "This will be your last attempt."
333msgid "This will be your last attempt."
334msgstr "Αυτή θα είναι η τελευταία σας προσπάθεια."
334msgstr "Αυτή θα είναι η τελευταία σας προσπάθεια."
335
335
336−#: qml/Greeter/NarrowView.qml:57
336+#: qml/Greeter/NarrowView.qml:58
337msgid ""
337msgid ""
338"If passphrase is entered incorrectly, your phone will conduct a factory "
338"If passphrase is entered incorrectly, your phone will conduct a factory "
339"reset and all personal data will be deleted."
339"reset and all personal data will be deleted."
@@ -342,7 +342,7 @@ msgstr ""
342"κάνει επαναφορά των εργοστασιακών ρυθμίσεων και όλα τα δεδομένα σας θα "
342"κάνει επαναφορά των εργοστασιακών ρυθμίσεων και όλα τα δεδομένα σας θα "
343"διαγραφούν."
343"διαγραφούν."
344
344
345−#: qml/Greeter/NarrowView.qml:58
345+#: qml/Greeter/NarrowView.qml:59
346msgid ""
346msgid ""
347"If passcode is entered incorrectly, your phone will conduct a factory reset "
347"If passcode is entered incorrectly, your phone will conduct a factory reset "
348"and all personal data will be deleted."
348"and all personal data will be deleted."
@@ -351,33 +351,34 @@ msgstr ""
351"κάνει επαναφορά των εργοστασιακών ρυθμίσεων και όλα τα δεδομένα σας θα "
351"κάνει επαναφορά των εργοστασιακών ρυθμίσεων και όλα τα δεδομένα σας θα "
352"διαγραφούν."
352"διαγραφούν."
353
353
354−#: qml/Greeter/NarrowView.qml:115
354+#: qml/Greeter/NarrowView.qml:116
355#, qt-format
355#, qt-format
356msgid "Enter %1"
356msgid "Enter %1"
357msgstr "Εισάγετε %1"
357msgstr "Εισάγετε %1"
358
358
359−#: qml/Greeter/NarrowView.qml:116 qml/Wizard/Pages/passwd-set.qml:60
359+#: qml/Greeter/NarrowView.qml:117 qml/Wizard/Pages/passwd-set.qml:60
360msgid "Enter passphrase"
360msgid "Enter passphrase"
361msgstr "Εισαγωγή συνθηματικού"
361msgstr "Εισαγωγή συνθηματικού"
362
362
363−#: qml/Greeter/NarrowView.qml:117
363+#: qml/Greeter/NarrowView.qml:118
364msgid "Enter passcode"
364msgid "Enter passcode"
365msgstr "Εισαγωγή κωδικού"
365msgstr "Εισαγωγή κωδικού"
366
366
367−#: qml/Greeter/NarrowView.qml:118
367+#: qml/Greeter/NarrowView.qml:119
368#, qt-format
368#, qt-format
369msgid "Sorry, incorrect %1"
369msgid "Sorry, incorrect %1"
370msgstr "Συγνώμη, μη έγκυρο %1"
370msgstr "Συγνώμη, μη έγκυρο %1"
371
371
372−#: qml/Greeter/NarrowView.qml:119
372+#: qml/Greeter/NarrowView.qml:120
373msgid "Sorry, incorrect passphrase"
373msgid "Sorry, incorrect passphrase"
374msgstr "Συγνώμη, μη έγκυρο συνθηματικό"
374msgstr "Συγνώμη, μη έγκυρο συνθηματικό"
375
375
376−#: qml/Greeter/NarrowView.qml:120
376+#: qml/Greeter/NarrowView.qml:121
377+msgctxt "passphrase"
377msgid "Please re-enter"
378msgid "Please re-enter"
378−msgstr "Παρακαλώ πληκτρολογήστε ξανά"
379+msgstr ""
379
380
380−#: qml/Greeter/NarrowView.qml:121
381+#: qml/Greeter/NarrowView.qml:122
381msgid "Sorry, incorrect passcode"
382msgid "Sorry, incorrect passcode"
382msgstr "Συγνώμη, μη έγκυρος κωδικός πρόσβασης"
383msgstr "Συγνώμη, μη έγκυρος κωδικός πρόσβασης"
383
384
@@ -528,38 +529,6 @@ msgctxt "Button: Go back one page in the Wizard"
528msgid "Back"
529msgid "Back"
529msgstr "Πίσω"
530msgstr "Πίσω"
530
531
531−#: qml/Wizard/Pages/here-terms.qml:27
532−msgid "Terms & Conditions"
533−msgstr "Όροι και προϋποθέσεις"
534−
535−#: qml/Wizard/Pages/passwd-confirm.qml:49
536−msgid "Confirm passphrase"
537−msgstr "Επιβεβαίωση φράσης πρόσβασης"
538−
539−#: qml/Wizard/Pages/passwd-confirm.qml:50
540−msgid "Confirm passcode"
541−msgstr "Επιβεβαιώστε τον κωδικό πρόσβασης"
542−
543−#: qml/Wizard/Pages/passwd-confirm.qml:53
544−#: qml/Wizard/Pages/passwd-confirm.qml:54
545−msgid "Please try again."
546−msgstr "Παρακαλώ προσπαθήστε ξανά."
547−
548−#: qml/Wizard/Pages/passwd-confirm.qml:82 qml/Wizard/Pages/passwd-set.qml:90
549−#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:128
550−#: qml/Wizard/Pages/40-wifi.qml:215 qml/Wizard/Pages/50-location.qml:131
551−#: qml/Wizard/Pages/60-reporting.qml:50
552−msgid "Continue"
553−msgstr "Συνέχιση"
554−
555−#: qml/Wizard/Pages/passwd-set.qml:61
556−msgid "Choose your passcode"
557−msgstr "Επιλογή κωδικού πρόσβασης"
558−
559−#: qml/Wizard/Pages/passwd-set.qml:68
560−msgid "Passphrase must be 4 characters long"
561−msgstr "Η φράση πρόσβασης πρέπει να έχει 4 χαρακτήρες"
562−
563#: qml/Wizard/Pages/10-welcome.qml:27
532#: qml/Wizard/Pages/10-welcome.qml:27
564msgid "Hi!"
533msgid "Hi!"
565msgstr "Γεια!"
534msgstr "Γεια!"
@@ -572,6 +541,13 @@ msgstr "Καλώς ήρθατε στο Ubuntu phone σας."
572msgid "Let’s get started."
541msgid "Let’s get started."
573msgstr "Ας ξεκινήσουμε."
542msgstr "Ας ξεκινήσουμε."
574
543
544+#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:128
545+#: qml/Wizard/Pages/40-wifi.qml:215 qml/Wizard/Pages/50-location.qml:131
546+#: qml/Wizard/Pages/60-reporting.qml:50 qml/Wizard/Pages/passwd-confirm.qml:82
547+#: qml/Wizard/Pages/passwd-set.qml:90
548+msgid "Continue"
549+msgstr "Συνέχιση"
550+
575#: qml/Wizard/Pages/20-sim.qml:25
551#: qml/Wizard/Pages/20-sim.qml:25
576msgid "Add a SIM card and restart your device"
552msgid "Add a SIM card and restart your device"
577msgstr "Εισάγετε μια κάρτα SIM και επανεκκινήστε τη συσκευή σας"
553msgstr "Εισάγετε μια κάρτα SIM και επανεκκινήστε τη συσκευή σας"
@@ -709,6 +685,31 @@ msgstr "Το τηλέφωνό σας είναι πλέον έτοιμο για
709msgid "Finish"
685msgid "Finish"
710msgstr "Ολοκλήρωση"
686msgstr "Ολοκλήρωση"
711
687
688+#: qml/Wizard/Pages/here-terms.qml:27
689+msgid "Terms & Conditions"
690+msgstr "Όροι και προϋποθέσεις"
691+
692+#: qml/Wizard/Pages/passwd-confirm.qml:49
693+msgid "Confirm passphrase"
694+msgstr "Επιβεβαίωση φράσης πρόσβασης"
695+
696+#: qml/Wizard/Pages/passwd-confirm.qml:50
697+msgid "Confirm passcode"
698+msgstr "Επιβεβαιώστε τον κωδικό πρόσβασης"
699+
700+#: qml/Wizard/Pages/passwd-confirm.qml:53
701+#: qml/Wizard/Pages/passwd-confirm.qml:54
702+msgid "Please try again."
703+msgstr "Παρακαλώ προσπαθήστε ξανά."
704+
705+#: qml/Wizard/Pages/passwd-set.qml:61
706+msgid "Choose your passcode"
707+msgstr "Επιλογή κωδικού πρόσβασης"
708+
709+#: qml/Wizard/Pages/passwd-set.qml:68
710+msgid "Passphrase must be 4 characters long"
711+msgstr "Η φράση πρόσβασης πρέπει να έχει 4 χαρακτήρες"
712+
712#. Translators: This is the arrow for "Back" buttons
713#. Translators: This is the arrow for "Back" buttons
713#: qml/Wizard/StackButton.qml:39
714#: qml/Wizard/StackButton.qml:39
714#, qt-format
715#, qt-format
@@ -802,6 +803,9 @@ msgstr "%1 〉"
802#~ msgid "Restart"
803#~ msgid "Restart"
803#~ msgstr "Επανεκκίνηση"
804#~ msgstr "Επανεκκίνηση"
804
805
806+#~ msgid "Please re-enter"
807+#~ msgstr "Παρακαλώ πληκτρολογήστε ξανά"
808+
805#~ msgid "Shut down"
809#~ msgid "Shut down"
806#~ msgstr "Τερματισμός λειτουργίας"
810#~ msgstr "Τερματισμός λειτουργίας"
807
811
po/en_AU.po+55−51
@@ -7,7 +7,7 @@ msgid ""
7msgstr ""
7msgstr ""
8"Project-Id-Version: unity\n"
8"Project-Id-Version: unity\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2015-06-22 12:00+0200\n"
10+"POT-Creation-Date: 2015-07-17 10:10+0200\n"
11"PO-Revision-Date: 2015-07-12 07:17+0000\n"
11"PO-Revision-Date: 2015-07-12 07:17+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"
@@ -15,8 +15,8 @@ msgstr ""
15"Content-Type: text/plain; charset=UTF-8\n"
15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n"
16"Content-Transfer-Encoding: 8bit\n"
17"Plural-Forms: nplurals=2; plural=n != 1;\n"
17"Plural-Forms: nplurals=2; plural=n != 1;\n"
18−"X-Launchpad-Export-Date: 2015-07-13 05:36+0000\n"
18+"X-Launchpad-Export-Date: 2015-07-25 05:39+0000\n"
19−"X-Generator: Launchpad (build 17620)\n"
19+"X-Generator: Launchpad (build 17628)\n"
20
20
21#: plugins/LightDM/Greeter.cpp:112
21#: plugins/LightDM/Greeter.cpp:112
22msgid "Password: "
22msgid "Password: "
@@ -225,15 +225,15 @@ msgstr "Emergency Call"
225msgid "OK"
225msgid "OK"
226msgstr "OK"
226msgstr "OK"
227
227
228−#: qml/Dash/GenericScopeView.qml:532 qml/Dash/GenericScopeView.qml:690
228+#: qml/Dash/GenericScopeView.qml:539 qml/Dash/GenericScopeView.qml:697
229msgid "See less"
229msgid "See less"
230msgstr "See less"
230msgstr "See less"
231
231
232−#: qml/Dash/GenericScopeView.qml:532
232+#: qml/Dash/GenericScopeView.qml:539
233msgid "See all"
233msgid "See all"
234msgstr "See all"
234msgstr "See all"
235
235
236−#: qml/Dash/GenericScopeView.qml:594
236+#: qml/Dash/GenericScopeView.qml:601
237msgctxt "Label: Hint for dash search line edit"
237msgctxt "Label: Hint for dash search line edit"
238msgid "Search"
238msgid "Search"
239msgstr "Search"
239msgstr "Search"
@@ -317,19 +317,19 @@ msgstr "Retry"
317msgid "Tap to unlock"
317msgid "Tap to unlock"
318msgstr "Tap to unlock"
318msgstr "Tap to unlock"
319
319
320−#: qml/Greeter/NarrowView.qml:53 qml/Wizard/Pages/passwd-confirm.qml:53
320+#: qml/Greeter/NarrowView.qml:54 qml/Wizard/Pages/passwd-confirm.qml:53
321msgid "Sorry, incorrect passphrase."
321msgid "Sorry, incorrect passphrase."
322msgstr "Sorry, incorrect passphrase."
322msgstr "Sorry, incorrect passphrase."
323
323
324−#: qml/Greeter/NarrowView.qml:54 qml/Wizard/Pages/passwd-confirm.qml:54
324+#: qml/Greeter/NarrowView.qml:55 qml/Wizard/Pages/passwd-confirm.qml:54
325msgid "Sorry, incorrect passcode."
325msgid "Sorry, incorrect passcode."
326msgstr "Sorry, incorrect passcode."
326msgstr "Sorry, incorrect passcode."
327
327
328−#: qml/Greeter/NarrowView.qml:55
328+#: qml/Greeter/NarrowView.qml:56
329msgid "This will be your last attempt."
329msgid "This will be your last attempt."
330msgstr "This will be your last attempt."
330msgstr "This will be your last attempt."
331
331
332−#: qml/Greeter/NarrowView.qml:57
332+#: qml/Greeter/NarrowView.qml:58
333msgid ""
333msgid ""
334"If passphrase is entered incorrectly, your phone will conduct a factory "
334"If passphrase is entered incorrectly, your phone will conduct a factory "
335"reset and all personal data will be deleted."
335"reset and all personal data will be deleted."
@@ -337,7 +337,7 @@ msgstr ""
337"If passphrase is entered incorrectly, your phone will conduct a factory "
337"If passphrase is entered incorrectly, your phone will conduct a factory "
338"reset and all personal data will be deleted."
338"reset and all personal data will be deleted."
339
339
340−#: qml/Greeter/NarrowView.qml:58
340+#: qml/Greeter/NarrowView.qml:59
341msgid ""
341msgid ""
342"If passcode is entered incorrectly, your phone will conduct a factory reset "
342"If passcode is entered incorrectly, your phone will conduct a factory reset "
343"and all personal data will be deleted."
343"and all personal data will be deleted."
@@ -345,33 +345,34 @@ msgstr ""
345"If passcode is entered incorrectly, your phone will conduct a factory reset "
345"If passcode is entered incorrectly, your phone will conduct a factory reset "
346"and all personal data will be deleted."
346"and all personal data will be deleted."
347
347
348−#: qml/Greeter/NarrowView.qml:115
348+#: qml/Greeter/NarrowView.qml:116
349#, qt-format
349#, qt-format
350msgid "Enter %1"
350msgid "Enter %1"
351msgstr "Enter %1"
351msgstr "Enter %1"
352
352
353−#: qml/Greeter/NarrowView.qml:116 qml/Wizard/Pages/passwd-set.qml:60
353+#: qml/Greeter/NarrowView.qml:117 qml/Wizard/Pages/passwd-set.qml:60
354msgid "Enter passphrase"
354msgid "Enter passphrase"
355msgstr "Enter passphrase"
355msgstr "Enter passphrase"
356
356
357−#: qml/Greeter/NarrowView.qml:117
357+#: qml/Greeter/NarrowView.qml:118
358msgid "Enter passcode"
358msgid "Enter passcode"
359msgstr "Enter passcode"
359msgstr "Enter passcode"
360
360
361−#: qml/Greeter/NarrowView.qml:118
361+#: qml/Greeter/NarrowView.qml:119
362#, qt-format
362#, qt-format
363msgid "Sorry, incorrect %1"
363msgid "Sorry, incorrect %1"
364msgstr "Sorry, incorrect %1"
364msgstr "Sorry, incorrect %1"
365
365
366−#: qml/Greeter/NarrowView.qml:119
366+#: qml/Greeter/NarrowView.qml:120
367msgid "Sorry, incorrect passphrase"
367msgid "Sorry, incorrect passphrase"
368msgstr "Sorry, incorrect passphrase"
368msgstr "Sorry, incorrect passphrase"
369
369
370−#: qml/Greeter/NarrowView.qml:120
370+#: qml/Greeter/NarrowView.qml:121
371+msgctxt "passphrase"
371msgid "Please re-enter"
372msgid "Please re-enter"
372−msgstr "Please re-enter"
373+msgstr ""
373
374
374−#: qml/Greeter/NarrowView.qml:121
375+#: qml/Greeter/NarrowView.qml:122
375msgid "Sorry, incorrect passcode"
376msgid "Sorry, incorrect passcode"
376msgstr "Sorry, incorrect passcode"
377msgstr "Sorry, incorrect passcode"
377
378
@@ -521,38 +522,6 @@ msgctxt "Button: Go back one page in the Wizard"
521msgid "Back"
522msgid "Back"
522msgstr "Back"
523msgstr "Back"
523
524
524−#: qml/Wizard/Pages/here-terms.qml:27
525−msgid "Terms & Conditions"
526−msgstr "Terms & Conditions"
527−
528−#: qml/Wizard/Pages/passwd-confirm.qml:49
529−msgid "Confirm passphrase"
530−msgstr "Confirm passphrase"
531−
532−#: qml/Wizard/Pages/passwd-confirm.qml:50
533−msgid "Confirm passcode"
534−msgstr "Confirm passcode"
535−
536−#: qml/Wizard/Pages/passwd-confirm.qml:53
537−#: qml/Wizard/Pages/passwd-confirm.qml:54
538−msgid "Please try again."
539−msgstr "Please try again."
540−
541−#: qml/Wizard/Pages/passwd-confirm.qml:82 qml/Wizard/Pages/passwd-set.qml:90
542−#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:128
543−#: qml/Wizard/Pages/40-wifi.qml:215 qml/Wizard/Pages/50-location.qml:131
544−#: qml/Wizard/Pages/60-reporting.qml:50
545−msgid "Continue"
546−msgstr "Continue"
547−
548−#: qml/Wizard/Pages/passwd-set.qml:61
549−msgid "Choose your passcode"
550−msgstr "Choose your passcode"
551−
552−#: qml/Wizard/Pages/passwd-set.qml:68
553−msgid "Passphrase must be 4 characters long"
554−msgstr "Passphrase must be 4 characters long"
555−
556#: qml/Wizard/Pages/10-welcome.qml:27
525#: qml/Wizard/Pages/10-welcome.qml:27
557msgid "Hi!"
526msgid "Hi!"
558msgstr "Hi!"
527msgstr "Hi!"
@@ -565,6 +534,13 @@ msgstr "Welcome to your Ubuntu phone."
565msgid "Let’s get started."
534msgid "Let’s get started."
566msgstr "Let’s get started."
535msgstr "Let’s get started."
567
536
537+#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:128
538+#: qml/Wizard/Pages/40-wifi.qml:215 qml/Wizard/Pages/50-location.qml:131
539+#: qml/Wizard/Pages/60-reporting.qml:50 qml/Wizard/Pages/passwd-confirm.qml:82
540+#: qml/Wizard/Pages/passwd-set.qml:90
541+msgid "Continue"
542+msgstr "Continue"
543+
568#: qml/Wizard/Pages/20-sim.qml:25
544#: qml/Wizard/Pages/20-sim.qml:25
569msgid "Add a SIM card and restart your device"
545msgid "Add a SIM card and restart your device"
570msgstr "Add a SIM card and restart your device"
546msgstr "Add a SIM card and restart your device"
@@ -696,6 +672,31 @@ msgstr "Your phone is now ready to use."
696msgid "Finish"
672msgid "Finish"
697msgstr "Finish"
673msgstr "Finish"
698
674
675+#: qml/Wizard/Pages/here-terms.qml:27
676+msgid "Terms & Conditions"
677+msgstr "Terms & Conditions"
678+
679+#: qml/Wizard/Pages/passwd-confirm.qml:49
680+msgid "Confirm passphrase"
681+msgstr "Confirm passphrase"
682+
683+#: qml/Wizard/Pages/passwd-confirm.qml:50
684+msgid "Confirm passcode"
685+msgstr "Confirm passcode"
686+
687+#: qml/Wizard/Pages/passwd-confirm.qml:53
688+#: qml/Wizard/Pages/passwd-confirm.qml:54
689+msgid "Please try again."
690+msgstr "Please try again."
691+
692+#: qml/Wizard/Pages/passwd-set.qml:61
693+msgid "Choose your passcode"
694+msgstr "Choose your passcode"
695+
696+#: qml/Wizard/Pages/passwd-set.qml:68
697+msgid "Passphrase must be 4 characters long"
698+msgstr "Passphrase must be 4 characters long"
699+
699#. Translators: This is the arrow for "Back" buttons
700#. Translators: This is the arrow for "Back" buttons
700#: qml/Wizard/StackButton.qml:39
701#: qml/Wizard/StackButton.qml:39
701#, qt-format
702#, qt-format
@@ -798,3 +799,6 @@ msgstr "%1 〉"
798
799
799#~ msgid "Manage Scopes"
800#~ msgid "Manage Scopes"
800#~ msgstr "Manage Scopes"
801#~ msgstr "Manage Scopes"
802+
803+#~ msgid "Please re-enter"
804+#~ msgstr "Please re-enter"
po/en_GB.po+73−69
@@ -7,7 +7,7 @@ msgid ""
7msgstr ""
7msgstr ""
8"Project-Id-Version: unity\n"
8"Project-Id-Version: unity\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2015-06-22 12:00+0200\n"
10+"POT-Creation-Date: 2015-07-17 10:10+0200\n"
11"PO-Revision-Date: 2015-04-23 12:59+0000\n"
11"PO-Revision-Date: 2015-04-23 12:59+0000\n"
12"Last-Translator: Andi Chandler <Unknown>\n"
12"Last-Translator: Andi Chandler <Unknown>\n"
13"Language-Team: English (United Kingdom) <en_GB@li.org>\n"
13"Language-Team: English (United Kingdom) <en_GB@li.org>\n"
@@ -15,8 +15,8 @@ msgstr ""
15"Content-Type: text/plain; charset=UTF-8\n"
15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n"
16"Content-Transfer-Encoding: 8bit\n"
17"Plural-Forms: nplurals=2; plural=n != 1;\n"
17"Plural-Forms: nplurals=2; plural=n != 1;\n"
18−"X-Launchpad-Export-Date: 2015-07-04 05:37+0000\n"
18+"X-Launchpad-Export-Date: 2015-07-25 05:39+0000\n"
19−"X-Generator: Launchpad (build 17597)\n"
19+"X-Generator: Launchpad (build 17628)\n"
20
20
21#: plugins/LightDM/Greeter.cpp:112
21#: plugins/LightDM/Greeter.cpp:112
22msgid "Password: "
22msgid "Password: "
@@ -37,14 +37,14 @@ msgstr "Unpin shortcut"
37#. en_US example: "Yesterday\u2003%l:%M %p" --> "Yesterday 1:00 PM"
37#. en_US example: "Yesterday\u2003%l:%M %p" --> "Yesterday 1:00 PM"
38#: plugins/Utils/relativetimeformatter.cpp:157
38#: plugins/Utils/relativetimeformatter.cpp:157
39msgid "Yesterday %l:%M %p"
39msgid "Yesterday %l:%M %p"
40−msgstr ""
40+msgstr "Yesterday %l:%M %p"
41
41
42#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
42#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
43#. This format string is used for showing, on a 12-hour clock, times that happened today.
43#. This format string is used for showing, on a 12-hour clock, times that happened today.
44#. en_US example: "%l:%M %p" --> "1:00 PM"
44#. en_US example: "%l:%M %p" --> "1:00 PM"
45#: plugins/Utils/relativetimeformatter.cpp:164
45#: plugins/Utils/relativetimeformatter.cpp:164
46msgid "%l:%M %p"
46msgid "%l:%M %p"
47−msgstr ""
47+msgstr "%l:%M %p"
48
48
49#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
49#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
50#. This format string is used for showing, on a 12-hour clock, events/appointments that happen tomorrow.
50#. This format string is used for showing, on a 12-hour clock, events/appointments that happen tomorrow.
@@ -52,7 +52,7 @@ msgstr ""
52#. en_US example: "Tomorrow\u2003%l:%M %p" --> "Tomorrow 1:00 PM"
52#. en_US example: "Tomorrow\u2003%l:%M %p" --> "Tomorrow 1:00 PM"
53#: plugins/Utils/relativetimeformatter.cpp:172
53#: plugins/Utils/relativetimeformatter.cpp:172
54msgid "Tomorrow %l:%M %p"
54msgid "Tomorrow %l:%M %p"
55−msgstr ""
55+msgstr "Tomorrow %l:%M %p"
56
56
57#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
57#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
58#. This format string is used for showing, on a 12-hour clock, times that happened in the last week.
58#. This format string is used for showing, on a 12-hour clock, times that happened in the last week.
@@ -60,7 +60,7 @@ msgstr ""
60#. en_US example: "%a\u2003%l:%M %p" --> "Fri 1:00 PM"
60#. en_US example: "%a\u2003%l:%M %p" --> "Fri 1:00 PM"
61#: plugins/Utils/relativetimeformatter.cpp:181
61#: plugins/Utils/relativetimeformatter.cpp:181
62msgid "%a %l:%M %p"
62msgid "%a %l:%M %p"
63−msgstr ""
63+msgstr "%a %l:%M %p"
64
64
65#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
65#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
66#. This format string is used for showing, on a 12-hour clock, times that happened before a week from now.
66#. This format string is used for showing, on a 12-hour clock, times that happened before a week from now.
@@ -69,7 +69,7 @@ msgstr ""
69#. en_GB example: "%a %b %d\u2003%l:%M %p" --> "Fri 31 Oct 1:00 PM"
69#. en_GB example: "%a %b %d\u2003%l:%M %p" --> "Fri 31 Oct 1:00 PM"
70#: plugins/Utils/relativetimeformatter.cpp:190
70#: plugins/Utils/relativetimeformatter.cpp:190
71msgid "%a %d %b %l:%M %p"
71msgid "%a %d %b %l:%M %p"
72−msgstr ""
72+msgstr "%a %d %b %l:%M %p"
73
73
74#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
74#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
75#. This format string is used for showing, on a 24-hour clock, times that happen yesterday.
75#. This format string is used for showing, on a 24-hour clock, times that happen yesterday.
@@ -77,14 +77,14 @@ msgstr ""
77#. en_US example: "Yesterday\u2003%l:%M %p" --> "Yesterday 13:00"
77#. en_US example: "Yesterday\u2003%l:%M %p" --> "Yesterday 13:00"
78#: plugins/Utils/relativetimeformatter.cpp:201
78#: plugins/Utils/relativetimeformatter.cpp:201
79msgid "Yesterday %H:%M"
79msgid "Yesterday %H:%M"
80−msgstr ""
80+msgstr "Yesterday %H:%M"
81
81
82#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
82#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
83#. This format string is used for showing, on a 24-hour clock, times that happened today.
83#. This format string is used for showing, on a 24-hour clock, times that happened today.
84#. en_US example: "%H:%M" --> "13:00"
84#. en_US example: "%H:%M" --> "13:00"
85#: plugins/Utils/relativetimeformatter.cpp:208
85#: plugins/Utils/relativetimeformatter.cpp:208
86msgid "%H:%M"
86msgid "%H:%M"
87−msgstr ""
87+msgstr "%H:%M"
88
88
89#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
89#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
90#. This format string is used for showing, on a 24-hour clock, events/appointments that happen tomorrow.
90#. This format string is used for showing, on a 24-hour clock, events/appointments that happen tomorrow.
@@ -92,7 +92,7 @@ msgstr ""
92#. en_US example: "Tomorrow\u2003%l:%M %p" --> "Tomorrow 13:00"
92#. en_US example: "Tomorrow\u2003%l:%M %p" --> "Tomorrow 13:00"
93#: plugins/Utils/relativetimeformatter.cpp:216
93#: plugins/Utils/relativetimeformatter.cpp:216
94msgid "Tomorrow %H:%M"
94msgid "Tomorrow %H:%M"
95−msgstr ""
95+msgstr "Tomorrow %H:%M"
96
96
97#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
97#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
98#. This format string is used for showing, on a 24-hour clock, times that happened in the last week.
98#. This format string is used for showing, on a 24-hour clock, times that happened in the last week.
@@ -100,7 +100,7 @@ msgstr ""
100#. en_US example: "%a\u2003%H:%M" --> "Fri 13:00"
100#. en_US example: "%a\u2003%H:%M" --> "Fri 13:00"
101#: plugins/Utils/relativetimeformatter.cpp:225
101#: plugins/Utils/relativetimeformatter.cpp:225
102msgid "%a %H:%M"
102msgid "%a %H:%M"
103−msgstr ""
103+msgstr "%a %H:%M"
104
104
105#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
105#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
106#. This format string is used for showing, on a 24-hour clock, times that happened before a week from now.
106#. This format string is used for showing, on a 24-hour clock, times that happened before a week from now.
@@ -109,7 +109,7 @@ msgstr ""
109#. en_GB example: "%a %b %d\u2003%H:%M" --> "Fri 31 Oct 13:00"
109#. en_GB example: "%a %b %d\u2003%H:%M" --> "Fri 31 Oct 13:00"
110#: plugins/Utils/relativetimeformatter.cpp:234
110#: plugins/Utils/relativetimeformatter.cpp:234
111msgid "%a %d %b %H:%M"
111msgid "%a %d %b %H:%M"
112−msgstr ""
112+msgstr "%a %d %b %H:%M"
113
113
114#: qml/Components/DelayedLockscreen.qml:49
114#: qml/Components/DelayedLockscreen.qml:49
115msgid "Device Locked"
115msgid "Device Locked"
@@ -225,15 +225,15 @@ msgstr "Emergency Call"
225msgid "OK"
225msgid "OK"
226msgstr "OK"
226msgstr "OK"
227
227
228−#: qml/Dash/GenericScopeView.qml:532 qml/Dash/GenericScopeView.qml:690
228+#: qml/Dash/GenericScopeView.qml:539 qml/Dash/GenericScopeView.qml:697
229msgid "See less"
229msgid "See less"
230msgstr "See less"
230msgstr "See less"
231
231
232−#: qml/Dash/GenericScopeView.qml:532
232+#: qml/Dash/GenericScopeView.qml:539
233msgid "See all"
233msgid "See all"
234msgstr "See all"
234msgstr "See all"
235
235
236−#: qml/Dash/GenericScopeView.qml:594
236+#: qml/Dash/GenericScopeView.qml:601
237msgctxt "Label: Hint for dash search line edit"
237msgctxt "Label: Hint for dash search line edit"
238msgid "Search"
238msgid "Search"
239msgstr "Search"
239msgstr "Search"
@@ -317,19 +317,19 @@ msgstr "Retry"
317msgid "Tap to unlock"
317msgid "Tap to unlock"
318msgstr "Tap to unlock"
318msgstr "Tap to unlock"
319
319
320−#: qml/Greeter/NarrowView.qml:53 qml/Wizard/Pages/passwd-confirm.qml:53
320+#: qml/Greeter/NarrowView.qml:54 qml/Wizard/Pages/passwd-confirm.qml:53
321msgid "Sorry, incorrect passphrase."
321msgid "Sorry, incorrect passphrase."
322msgstr "Sorry, incorrect passphrase."
322msgstr "Sorry, incorrect passphrase."
323
323
324−#: qml/Greeter/NarrowView.qml:54 qml/Wizard/Pages/passwd-confirm.qml:54
324+#: qml/Greeter/NarrowView.qml:55 qml/Wizard/Pages/passwd-confirm.qml:54
325msgid "Sorry, incorrect passcode."
325msgid "Sorry, incorrect passcode."
326msgstr "Sorry, incorrect passcode."
326msgstr "Sorry, incorrect passcode."
327
327
328−#: qml/Greeter/NarrowView.qml:55
328+#: qml/Greeter/NarrowView.qml:56
329msgid "This will be your last attempt."
329msgid "This will be your last attempt."
330msgstr "This will be your last attempt."
330msgstr "This will be your last attempt."
331
331
332−#: qml/Greeter/NarrowView.qml:57
332+#: qml/Greeter/NarrowView.qml:58
333msgid ""
333msgid ""
334"If passphrase is entered incorrectly, your phone will conduct a factory "
334"If passphrase is entered incorrectly, your phone will conduct a factory "
335"reset and all personal data will be deleted."
335"reset and all personal data will be deleted."
@@ -337,7 +337,7 @@ msgstr ""
337"If passphrase is entered incorrectly, your phone will conduct a factory "
337"If passphrase is entered incorrectly, your phone will conduct a factory "
338"reset and all personal data will be deleted."
338"reset and all personal data will be deleted."
339
339
340−#: qml/Greeter/NarrowView.qml:58
340+#: qml/Greeter/NarrowView.qml:59
341msgid ""
341msgid ""
342"If passcode is entered incorrectly, your phone will conduct a factory reset "
342"If passcode is entered incorrectly, your phone will conduct a factory reset "
343"and all personal data will be deleted."
343"and all personal data will be deleted."
@@ -345,33 +345,34 @@ msgstr ""
345"If passcode is entered incorrectly, your phone will conduct a factory reset "
345"If passcode is entered incorrectly, your phone will conduct a factory reset "
346"and all personal data will be deleted."
346"and all personal data will be deleted."
347
347
348−#: qml/Greeter/NarrowView.qml:115
348+#: qml/Greeter/NarrowView.qml:116
349#, qt-format
349#, qt-format
350msgid "Enter %1"
350msgid "Enter %1"
351msgstr "Enter %1"
351msgstr "Enter %1"
352
352
353−#: qml/Greeter/NarrowView.qml:116 qml/Wizard/Pages/passwd-set.qml:60
353+#: qml/Greeter/NarrowView.qml:117 qml/Wizard/Pages/passwd-set.qml:60
354msgid "Enter passphrase"
354msgid "Enter passphrase"
355msgstr "Enter passphrase"
355msgstr "Enter passphrase"
356
356
357−#: qml/Greeter/NarrowView.qml:117
357+#: qml/Greeter/NarrowView.qml:118
358msgid "Enter passcode"
358msgid "Enter passcode"
359msgstr "Enter passcode"
359msgstr "Enter passcode"
360
360
361−#: qml/Greeter/NarrowView.qml:118
361+#: qml/Greeter/NarrowView.qml:119
362#, qt-format
362#, qt-format
363msgid "Sorry, incorrect %1"
363msgid "Sorry, incorrect %1"
364msgstr "Sorry, incorrect %1"
364msgstr "Sorry, incorrect %1"
365
365
366−#: qml/Greeter/NarrowView.qml:119
366+#: qml/Greeter/NarrowView.qml:120
367msgid "Sorry, incorrect passphrase"
367msgid "Sorry, incorrect passphrase"
368msgstr "Sorry, incorrect passphrase"
368msgstr "Sorry, incorrect passphrase"
369
369
370−#: qml/Greeter/NarrowView.qml:120
370+#: qml/Greeter/NarrowView.qml:121
371+msgctxt "passphrase"
371msgid "Please re-enter"
372msgid "Please re-enter"
372−msgstr "Please re-enter"
373+msgstr ""
373
374
374−#: qml/Greeter/NarrowView.qml:121
375+#: qml/Greeter/NarrowView.qml:122
375msgid "Sorry, incorrect passcode"
376msgid "Sorry, incorrect passcode"
376msgstr "Sorry, incorrect passcode"
377msgstr "Sorry, incorrect passcode"
377
378
@@ -395,32 +396,32 @@ msgstr "Nothing is playing"
395#, qt-format
396#, qt-format
396msgid "%1 hour"
397msgid "%1 hour"
397msgid_plural "%1 hours"
398msgid_plural "%1 hours"
398−msgstr[0] ""
399+msgstr[0] "%1 hour"
399−msgstr[1] ""
400+msgstr[1] "%1 hours"
400
401
401#: qml/Panel/Indicators/MenuItemFactory.qml:772
402#: qml/Panel/Indicators/MenuItemFactory.qml:772
402#, qt-format
403#, qt-format
403msgid "%1 minute"
404msgid "%1 minute"
404msgid_plural "%1 minutes"
405msgid_plural "%1 minutes"
405−msgstr[0] ""
406+msgstr[0] "%1 minute"
406−msgstr[1] ""
407+msgstr[1] "%1 minutes"
407
408
408#: qml/Panel/Indicators/MenuItemFactory.qml:777
409#: qml/Panel/Indicators/MenuItemFactory.qml:777
409#, qt-format
410#, qt-format
410msgid "%1 second"
411msgid "%1 second"
411msgid_plural "%1 seconds"
412msgid_plural "%1 seconds"
412−msgstr[0] ""
413+msgstr[0] "%1 second"
413−msgstr[1] ""
414+msgstr[1] "%1 seconds"
414
415
415#: qml/Panel/Indicators/MenuItemFactory.qml:780
416#: qml/Panel/Indicators/MenuItemFactory.qml:780
416msgid "0 seconds"
417msgid "0 seconds"
417−msgstr ""
418+msgstr "0 seconds"
418
419
419#. Translators: String like "1 hour, 2 minutes, 3 seconds remaining"
420#. Translators: String like "1 hour, 2 minutes, 3 seconds remaining"
420#: qml/Panel/Indicators/MenuItemFactory.qml:782
421#: qml/Panel/Indicators/MenuItemFactory.qml:782
421#, qt-format
422#, qt-format
422msgid "%1 remaining"
423msgid "%1 remaining"
423−msgstr ""
424+msgstr "%1 remaining"
424
425
425#: qml/Panel/Indicators/MenuItemFactory.qml:788
426#: qml/Panel/Indicators/MenuItemFactory.qml:788
426msgid "In queue…"
427msgid "In queue…"
@@ -521,38 +522,6 @@ msgctxt "Button: Go back one page in the Wizard"
521msgid "Back"
522msgid "Back"
522msgstr "Back"
523msgstr "Back"
523
524
524−#: qml/Wizard/Pages/here-terms.qml:27
525−msgid "Terms & Conditions"
526−msgstr "Terms & Conditions"
527−
528−#: qml/Wizard/Pages/passwd-confirm.qml:49
529−msgid "Confirm passphrase"
530−msgstr "Confirm passphrase"
531−
532−#: qml/Wizard/Pages/passwd-confirm.qml:50
533−msgid "Confirm passcode"
534−msgstr "Confirm passcode"
535−
536−#: qml/Wizard/Pages/passwd-confirm.qml:53
537−#: qml/Wizard/Pages/passwd-confirm.qml:54
538−msgid "Please try again."
539−msgstr "Please try again."
540−
541−#: qml/Wizard/Pages/passwd-confirm.qml:82 qml/Wizard/Pages/passwd-set.qml:90
542−#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:128
543−#: qml/Wizard/Pages/40-wifi.qml:215 qml/Wizard/Pages/50-location.qml:131
544−#: qml/Wizard/Pages/60-reporting.qml:50
545−msgid "Continue"
546−msgstr "Continue"
547−
548−#: qml/Wizard/Pages/passwd-set.qml:61
549−msgid "Choose your passcode"
550−msgstr "Choose your passcode"
551−
552−#: qml/Wizard/Pages/passwd-set.qml:68
553−msgid "Passphrase must be 4 characters long"
554−msgstr "Passphrase must be 4 characters long"
555−
556#: qml/Wizard/Pages/10-welcome.qml:27
525#: qml/Wizard/Pages/10-welcome.qml:27
557msgid "Hi!"
526msgid "Hi!"
558msgstr "Hi!"
527msgstr "Hi!"
@@ -565,6 +534,13 @@ msgstr "Welcome to your Ubuntu phone."
565msgid "Let’s get started."
534msgid "Let’s get started."
566msgstr "Let’s get started."
535msgstr "Let’s get started."
567
536
537+#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:128
538+#: qml/Wizard/Pages/40-wifi.qml:215 qml/Wizard/Pages/50-location.qml:131
539+#: qml/Wizard/Pages/60-reporting.qml:50 qml/Wizard/Pages/passwd-confirm.qml:82
540+#: qml/Wizard/Pages/passwd-set.qml:90
541+msgid "Continue"
542+msgstr "Continue"
543+
568#: qml/Wizard/Pages/20-sim.qml:25
544#: qml/Wizard/Pages/20-sim.qml:25
569msgid "Add a SIM card and restart your device"
545msgid "Add a SIM card and restart your device"
570msgstr "Add a SIM card and restart your device"
546msgstr "Add a SIM card and restart your device"
@@ -696,6 +672,31 @@ msgstr "Your phone is now ready to use."
696msgid "Finish"
672msgid "Finish"
697msgstr "Finish"
673msgstr "Finish"
698
674
675+#: qml/Wizard/Pages/here-terms.qml:27
676+msgid "Terms & Conditions"
677+msgstr "Terms & Conditions"
678+
679+#: qml/Wizard/Pages/passwd-confirm.qml:49
680+msgid "Confirm passphrase"
681+msgstr "Confirm passphrase"
682+
683+#: qml/Wizard/Pages/passwd-confirm.qml:50
684+msgid "Confirm passcode"
685+msgstr "Confirm passcode"
686+
687+#: qml/Wizard/Pages/passwd-confirm.qml:53
688+#: qml/Wizard/Pages/passwd-confirm.qml:54
689+msgid "Please try again."
690+msgstr "Please try again."
691+
692+#: qml/Wizard/Pages/passwd-set.qml:61
693+msgid "Choose your passcode"
694+msgstr "Choose your passcode"
695+
696+#: qml/Wizard/Pages/passwd-set.qml:68
697+msgid "Passphrase must be 4 characters long"
698+msgstr "Passphrase must be 4 characters long"
699+
699#. Translators: This is the arrow for "Back" buttons
700#. Translators: This is the arrow for "Back" buttons
700#: qml/Wizard/StackButton.qml:39
701#: qml/Wizard/StackButton.qml:39
701#, qt-format
702#, qt-format
@@ -798,3 +799,6 @@ msgstr "%1 〉"
798
799
799#~ msgid "Manage Scopes"
800#~ msgid "Manage Scopes"
800#~ msgstr "Manage Scopes"
801#~ msgstr "Manage Scopes"
802+
803+#~ msgid "Please re-enter"
804+#~ msgstr "Please re-enter"
po/eo.po+51−50
@@ -7,7 +7,7 @@ msgid ""
7msgstr ""
7msgstr ""
8"Project-Id-Version: unity\n"
8"Project-Id-Version: unity\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2015-06-22 12:00+0200\n"
10+"POT-Creation-Date: 2015-07-17 10:10+0200\n"
11"PO-Revision-Date: 2015-06-06 23:37+0000\n"
11"PO-Revision-Date: 2015-06-06 23:37+0000\n"
12"Last-Translator: Eliovir <Unknown>\n"
12"Last-Translator: Eliovir <Unknown>\n"
13"Language-Team: Esperanto <eo@li.org>\n"
13"Language-Team: Esperanto <eo@li.org>\n"
@@ -15,8 +15,8 @@ msgstr ""
15"Content-Type: text/plain; charset=UTF-8\n"
15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n"
16"Content-Transfer-Encoding: 8bit\n"
17"Plural-Forms: nplurals=2; plural=n != 1;\n"
17"Plural-Forms: nplurals=2; plural=n != 1;\n"
18−"X-Launchpad-Export-Date: 2015-07-04 05:37+0000\n"
18+"X-Launchpad-Export-Date: 2015-07-25 05:38+0000\n"
19−"X-Generator: Launchpad (build 17597)\n"
19+"X-Generator: Launchpad (build 17628)\n"
20
20
21#: plugins/LightDM/Greeter.cpp:112
21#: plugins/LightDM/Greeter.cpp:112
22msgid "Password: "
22msgid "Password: "
@@ -223,15 +223,15 @@ msgstr ""
223msgid "OK"
223msgid "OK"
224msgstr ""
224msgstr ""
225
225
226−#: qml/Dash/GenericScopeView.qml:532 qml/Dash/GenericScopeView.qml:690
226+#: qml/Dash/GenericScopeView.qml:539 qml/Dash/GenericScopeView.qml:697
227msgid "See less"
227msgid "See less"
228msgstr ""
228msgstr ""
229
229
230−#: qml/Dash/GenericScopeView.qml:532
230+#: qml/Dash/GenericScopeView.qml:539
231msgid "See all"
231msgid "See all"
232msgstr ""
232msgstr ""
233
233
234−#: qml/Dash/GenericScopeView.qml:594
234+#: qml/Dash/GenericScopeView.qml:601
235msgctxt "Label: Hint for dash search line edit"
235msgctxt "Label: Hint for dash search line edit"
236msgid "Search"
236msgid "Search"
237msgstr ""
237msgstr ""
@@ -315,57 +315,58 @@ msgstr ""
315msgid "Tap to unlock"
315msgid "Tap to unlock"
316msgstr ""
316msgstr ""
317
317
318−#: qml/Greeter/NarrowView.qml:53 qml/Wizard/Pages/passwd-confirm.qml:53
318+#: qml/Greeter/NarrowView.qml:54 qml/Wizard/Pages/passwd-confirm.qml:53
319msgid "Sorry, incorrect passphrase."
319msgid "Sorry, incorrect passphrase."
320msgstr ""
320msgstr ""
321
321
322−#: qml/Greeter/NarrowView.qml:54 qml/Wizard/Pages/passwd-confirm.qml:54
322+#: qml/Greeter/NarrowView.qml:55 qml/Wizard/Pages/passwd-confirm.qml:54
323msgid "Sorry, incorrect passcode."
323msgid "Sorry, incorrect passcode."
324msgstr ""
324msgstr ""
325
325
326−#: qml/Greeter/NarrowView.qml:55
326+#: qml/Greeter/NarrowView.qml:56
327msgid "This will be your last attempt."
327msgid "This will be your last attempt."
328msgstr ""
328msgstr ""
329
329
330−#: qml/Greeter/NarrowView.qml:57
330+#: qml/Greeter/NarrowView.qml:58
331msgid ""
331msgid ""
332"If passphrase is entered incorrectly, your phone will conduct a factory "
332"If passphrase is entered incorrectly, your phone will conduct a factory "
333"reset and all personal data will be deleted."
333"reset and all personal data will be deleted."
334msgstr ""
334msgstr ""
335
335
336−#: qml/Greeter/NarrowView.qml:58
336+#: qml/Greeter/NarrowView.qml:59
337msgid ""
337msgid ""
338"If passcode is entered incorrectly, your phone will conduct a factory reset "
338"If passcode is entered incorrectly, your phone will conduct a factory reset "
339"and all personal data will be deleted."
339"and all personal data will be deleted."
340msgstr ""
340msgstr ""
341
341
342−#: qml/Greeter/NarrowView.qml:115
342+#: qml/Greeter/NarrowView.qml:116
343#, qt-format
343#, qt-format
344msgid "Enter %1"
344msgid "Enter %1"
345msgstr ""
345msgstr ""
346
346
347−#: qml/Greeter/NarrowView.qml:116 qml/Wizard/Pages/passwd-set.qml:60
347+#: qml/Greeter/NarrowView.qml:117 qml/Wizard/Pages/passwd-set.qml:60
348msgid "Enter passphrase"
348msgid "Enter passphrase"
349msgstr ""
349msgstr ""
350
350
351−#: qml/Greeter/NarrowView.qml:117
351+#: qml/Greeter/NarrowView.qml:118
352msgid "Enter passcode"
352msgid "Enter passcode"
353msgstr ""
353msgstr ""
354
354
355−#: qml/Greeter/NarrowView.qml:118
355+#: qml/Greeter/NarrowView.qml:119
356#, qt-format
356#, qt-format
357msgid "Sorry, incorrect %1"
357msgid "Sorry, incorrect %1"
358msgstr ""
358msgstr ""
359
359
360−#: qml/Greeter/NarrowView.qml:119
360+#: qml/Greeter/NarrowView.qml:120
361msgid "Sorry, incorrect passphrase"
361msgid "Sorry, incorrect passphrase"
362msgstr ""
362msgstr ""
363
363
364−#: qml/Greeter/NarrowView.qml:120
364+#: qml/Greeter/NarrowView.qml:121
365+msgctxt "passphrase"
365msgid "Please re-enter"
366msgid "Please re-enter"
366msgstr ""
367msgstr ""
367
368
368−#: qml/Greeter/NarrowView.qml:121
369+#: qml/Greeter/NarrowView.qml:122
369msgid "Sorry, incorrect passcode"
370msgid "Sorry, incorrect passcode"
370msgstr ""
371msgstr ""
371
372
@@ -515,38 +516,6 @@ msgctxt "Button: Go back one page in the Wizard"
515msgid "Back"
516msgid "Back"
516msgstr ""
517msgstr ""
517
518
518−#: qml/Wizard/Pages/here-terms.qml:27
519−msgid "Terms & Conditions"
520−msgstr ""
521−
522−#: qml/Wizard/Pages/passwd-confirm.qml:49
523−msgid "Confirm passphrase"
524−msgstr ""
525−
526−#: qml/Wizard/Pages/passwd-confirm.qml:50
527−msgid "Confirm passcode"
528−msgstr ""
529−
530−#: qml/Wizard/Pages/passwd-confirm.qml:53
531−#: qml/Wizard/Pages/passwd-confirm.qml:54
532−msgid "Please try again."
533−msgstr ""
534−
535−#: qml/Wizard/Pages/passwd-confirm.qml:82 qml/Wizard/Pages/passwd-set.qml:90
536−#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:128
537−#: qml/Wizard/Pages/40-wifi.qml:215 qml/Wizard/Pages/50-location.qml:131
538−#: qml/Wizard/Pages/60-reporting.qml:50
539−msgid "Continue"
540−msgstr ""
541−
542−#: qml/Wizard/Pages/passwd-set.qml:61
543−msgid "Choose your passcode"
544−msgstr ""
545−
546−#: qml/Wizard/Pages/passwd-set.qml:68
547−msgid "Passphrase must be 4 characters long"
548−msgstr ""
549−
550#: qml/Wizard/Pages/10-welcome.qml:27
519#: qml/Wizard/Pages/10-welcome.qml:27
551msgid "Hi!"
520msgid "Hi!"
552msgstr ""
521msgstr ""
@@ -559,6 +528,13 @@ msgstr ""
559msgid "Let’s get started."
528msgid "Let’s get started."
560msgstr ""
529msgstr ""
561
530
531+#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:128
532+#: qml/Wizard/Pages/40-wifi.qml:215 qml/Wizard/Pages/50-location.qml:131
533+#: qml/Wizard/Pages/60-reporting.qml:50 qml/Wizard/Pages/passwd-confirm.qml:82
534+#: qml/Wizard/Pages/passwd-set.qml:90
535+msgid "Continue"
536+msgstr ""
537+
562#: qml/Wizard/Pages/20-sim.qml:25
538#: qml/Wizard/Pages/20-sim.qml:25
563msgid "Add a SIM card and restart your device"
539msgid "Add a SIM card and restart your device"
564msgstr ""
540msgstr ""
@@ -684,6 +660,31 @@ msgstr ""
684msgid "Finish"
660msgid "Finish"
685msgstr ""
661msgstr ""
686
662
663+#: qml/Wizard/Pages/here-terms.qml:27
664+msgid "Terms & Conditions"
665+msgstr ""
666+
667+#: qml/Wizard/Pages/passwd-confirm.qml:49
668+msgid "Confirm passphrase"
669+msgstr ""
670+
671+#: qml/Wizard/Pages/passwd-confirm.qml:50
672+msgid "Confirm passcode"
673+msgstr ""
674+
675+#: qml/Wizard/Pages/passwd-confirm.qml:53
676+#: qml/Wizard/Pages/passwd-confirm.qml:54
677+msgid "Please try again."
678+msgstr ""
679+
680+#: qml/Wizard/Pages/passwd-set.qml:61
681+msgid "Choose your passcode"
682+msgstr ""
683+
684+#: qml/Wizard/Pages/passwd-set.qml:68
685+msgid "Passphrase must be 4 characters long"
686+msgstr ""
687+
687#. Translators: This is the arrow for "Back" buttons
688#. Translators: This is the arrow for "Back" buttons
688#: qml/Wizard/StackButton.qml:39
689#: qml/Wizard/StackButton.qml:39
689#, qt-format
690#, qt-format
po/es.po+55−51
@@ -7,7 +7,7 @@ msgid ""
7msgstr ""
7msgstr ""
8"Project-Id-Version: unity\n"
8"Project-Id-Version: unity\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2015-06-22 12:00+0200\n"
10+"POT-Creation-Date: 2015-07-17 10:10+0200\n"
11"PO-Revision-Date: 2015-07-04 06:08+0000\n"
11"PO-Revision-Date: 2015-07-04 06:08+0000\n"
12"Last-Translator: Paco Molinero <paco@byasl.com>\n"
12"Last-Translator: Paco Molinero <paco@byasl.com>\n"
13"Language-Team: Spanish <es@li.org>\n"
13"Language-Team: Spanish <es@li.org>\n"
@@ -15,8 +15,8 @@ msgstr ""
15"Content-Type: text/plain; charset=UTF-8\n"
15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n"
16"Content-Transfer-Encoding: 8bit\n"
17"Plural-Forms: nplurals=2; plural=n != 1;\n"
17"Plural-Forms: nplurals=2; plural=n != 1;\n"
18−"X-Launchpad-Export-Date: 2015-07-05 05:55+0000\n"
18+"X-Launchpad-Export-Date: 2015-07-25 05:39+0000\n"
19−"X-Generator: Launchpad (build 17597)\n"
19+"X-Generator: Launchpad (build 17628)\n"
20
20
21#: plugins/LightDM/Greeter.cpp:112
21#: plugins/LightDM/Greeter.cpp:112
22msgid "Password: "
22msgid "Password: "
@@ -229,15 +229,15 @@ msgstr "Llamada de emergencia"
229msgid "OK"
229msgid "OK"
230msgstr "Aceptar"
230msgstr "Aceptar"
231
231
232−#: qml/Dash/GenericScopeView.qml:532 qml/Dash/GenericScopeView.qml:690
232+#: qml/Dash/GenericScopeView.qml:539 qml/Dash/GenericScopeView.qml:697
233msgid "See less"
233msgid "See less"
234msgstr "Ver menos"
234msgstr "Ver menos"
235
235
236−#: qml/Dash/GenericScopeView.qml:532
236+#: qml/Dash/GenericScopeView.qml:539
237msgid "See all"
237msgid "See all"
238msgstr "Ver todo"
238msgstr "Ver todo"
239
239
240−#: qml/Dash/GenericScopeView.qml:594
240+#: qml/Dash/GenericScopeView.qml:601
241msgctxt "Label: Hint for dash search line edit"
241msgctxt "Label: Hint for dash search line edit"
242msgid "Search"
242msgid "Search"
243msgstr "Búsqueda"
243msgstr "Búsqueda"
@@ -321,19 +321,19 @@ msgstr "Reintentar"
321msgid "Tap to unlock"
321msgid "Tap to unlock"
322msgstr "Toque para desbloquear"
322msgstr "Toque para desbloquear"
323
323
324−#: qml/Greeter/NarrowView.qml:53 qml/Wizard/Pages/passwd-confirm.qml:53
324+#: qml/Greeter/NarrowView.qml:54 qml/Wizard/Pages/passwd-confirm.qml:53
325msgid "Sorry, incorrect passphrase."
325msgid "Sorry, incorrect passphrase."
326msgstr "La contraseña es incorrecta."
326msgstr "La contraseña es incorrecta."
327
327
328−#: qml/Greeter/NarrowView.qml:54 qml/Wizard/Pages/passwd-confirm.qml:54
328+#: qml/Greeter/NarrowView.qml:55 qml/Wizard/Pages/passwd-confirm.qml:54
329msgid "Sorry, incorrect passcode."
329msgid "Sorry, incorrect passcode."
330msgstr "Código de acceso incorrecto."
330msgstr "Código de acceso incorrecto."
331
331
332−#: qml/Greeter/NarrowView.qml:55
332+#: qml/Greeter/NarrowView.qml:56
333msgid "This will be your last attempt."
333msgid "This will be your last attempt."
334msgstr "Este será su último intento."
334msgstr "Este será su último intento."
335
335
336−#: qml/Greeter/NarrowView.qml:57
336+#: qml/Greeter/NarrowView.qml:58
337msgid ""
337msgid ""
338"If passphrase is entered incorrectly, your phone will conduct a factory "
338"If passphrase is entered incorrectly, your phone will conduct a factory "
339"reset and all personal data will be deleted."
339"reset and all personal data will be deleted."
@@ -341,7 +341,7 @@ msgstr ""
341"Si se introduce la frase incorrectamente, el teléfono volverá a la "
341"Si se introduce la frase incorrectamente, el teléfono volverá a la "
342"configuración de fábrica y se perderán todos los datos personales."
342"configuración de fábrica y se perderán todos los datos personales."
343
343
344−#: qml/Greeter/NarrowView.qml:58
344+#: qml/Greeter/NarrowView.qml:59
345msgid ""
345msgid ""
346"If passcode is entered incorrectly, your phone will conduct a factory reset "
346"If passcode is entered incorrectly, your phone will conduct a factory reset "
347"and all personal data will be deleted."
347"and all personal data will be deleted."
@@ -349,33 +349,34 @@ msgstr ""
349"Si se introduce el código incorrectamente, el teléfono volverá a la "
349"Si se introduce el código incorrectamente, el teléfono volverá a la "
350"configuración de fábrica y se perderán todos los datos personales."
350"configuración de fábrica y se perderán todos los datos personales."
351
351
352−#: qml/Greeter/NarrowView.qml:115
352+#: qml/Greeter/NarrowView.qml:116
353#, qt-format
353#, qt-format
354msgid "Enter %1"
354msgid "Enter %1"
355msgstr "Introduzca %1"
355msgstr "Introduzca %1"
356
356
357−#: qml/Greeter/NarrowView.qml:116 qml/Wizard/Pages/passwd-set.qml:60
357+#: qml/Greeter/NarrowView.qml:117 qml/Wizard/Pages/passwd-set.qml:60
358msgid "Enter passphrase"
358msgid "Enter passphrase"
359msgstr "Introduzca la contraseña"
359msgstr "Introduzca la contraseña"
360
360
361−#: qml/Greeter/NarrowView.qml:117
361+#: qml/Greeter/NarrowView.qml:118
362msgid "Enter passcode"
362msgid "Enter passcode"
363msgstr "Introduzca el código"
363msgstr "Introduzca el código"
364
364
365−#: qml/Greeter/NarrowView.qml:118
365+#: qml/Greeter/NarrowView.qml:119
366#, qt-format
366#, qt-format
367msgid "Sorry, incorrect %1"
367msgid "Sorry, incorrect %1"
368msgstr "Incorrecto (%1)"
368msgstr "Incorrecto (%1)"
369
369
370−#: qml/Greeter/NarrowView.qml:119
370+#: qml/Greeter/NarrowView.qml:120
371msgid "Sorry, incorrect passphrase"
371msgid "Sorry, incorrect passphrase"
372msgstr "La contraseña es incorrecta"
372msgstr "La contraseña es incorrecta"
373
373
374−#: qml/Greeter/NarrowView.qml:120
374+#: qml/Greeter/NarrowView.qml:121
375+msgctxt "passphrase"
375msgid "Please re-enter"
376msgid "Please re-enter"
376−msgstr "Reintroduzca"
377+msgstr ""
377
378
378−#: qml/Greeter/NarrowView.qml:121
379+#: qml/Greeter/NarrowView.qml:122
379msgid "Sorry, incorrect passcode"
380msgid "Sorry, incorrect passcode"
380msgstr "El código es incorrecto"
381msgstr "El código es incorrecto"
381
382
@@ -525,38 +526,6 @@ msgctxt "Button: Go back one page in the Wizard"
525msgid "Back"
526msgid "Back"
526msgstr "Atrás"
527msgstr "Atrás"
527
528
528−#: qml/Wizard/Pages/here-terms.qml:27
529−msgid "Terms & Conditions"
530−msgstr "Términos y condiciones"
531−
532−#: qml/Wizard/Pages/passwd-confirm.qml:49
533−msgid "Confirm passphrase"
534−msgstr "Confirme la contraseña"
535−
536−#: qml/Wizard/Pages/passwd-confirm.qml:50
537−msgid "Confirm passcode"
538−msgstr "Confirme el código"
539−
540−#: qml/Wizard/Pages/passwd-confirm.qml:53
541−#: qml/Wizard/Pages/passwd-confirm.qml:54
542−msgid "Please try again."
543−msgstr "Inténtelo de nuevo."
544−
545−#: qml/Wizard/Pages/passwd-confirm.qml:82 qml/Wizard/Pages/passwd-set.qml:90
546−#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:128
547−#: qml/Wizard/Pages/40-wifi.qml:215 qml/Wizard/Pages/50-location.qml:131
548−#: qml/Wizard/Pages/60-reporting.qml:50
549−msgid "Continue"
550−msgstr "Continuar"
551−
552−#: qml/Wizard/Pages/passwd-set.qml:61
553−msgid "Choose your passcode"
554−msgstr "Elija su código"
555−
556−#: qml/Wizard/Pages/passwd-set.qml:68
557−msgid "Passphrase must be 4 characters long"
558−msgstr "El código debe tener 4 caracteres"
559−
560#: qml/Wizard/Pages/10-welcome.qml:27
529#: qml/Wizard/Pages/10-welcome.qml:27
561msgid "Hi!"
530msgid "Hi!"
562msgstr "¡Hola!"
531msgstr "¡Hola!"
@@ -569,6 +538,13 @@ msgstr "Bienvenido a su teléfono Ubuntu."
569msgid "Let’s get started."
538msgid "Let’s get started."
570msgstr "Comencemos."
539msgstr "Comencemos."
571
540
541+#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:128
542+#: qml/Wizard/Pages/40-wifi.qml:215 qml/Wizard/Pages/50-location.qml:131
543+#: qml/Wizard/Pages/60-reporting.qml:50 qml/Wizard/Pages/passwd-confirm.qml:82
544+#: qml/Wizard/Pages/passwd-set.qml:90
545+msgid "Continue"
546+msgstr "Continuar"
547+
572#: qml/Wizard/Pages/20-sim.qml:25
548#: qml/Wizard/Pages/20-sim.qml:25
573msgid "Add a SIM card and restart your device"
549msgid "Add a SIM card and restart your device"
574msgstr "Inserte una tarjeta SIM y reinicie el dispositivo"
550msgstr "Inserte una tarjeta SIM y reinicie el dispositivo"
@@ -700,6 +676,31 @@ msgstr "El teléfono ya está listo para usarse."
700msgid "Finish"
676msgid "Finish"
701msgstr "Finalizar"
677msgstr "Finalizar"
702
678
679+#: qml/Wizard/Pages/here-terms.qml:27
680+msgid "Terms & Conditions"
681+msgstr "Términos y condiciones"
682+
683+#: qml/Wizard/Pages/passwd-confirm.qml:49
684+msgid "Confirm passphrase"
685+msgstr "Confirme la contraseña"
686+
687+#: qml/Wizard/Pages/passwd-confirm.qml:50
688+msgid "Confirm passcode"
689+msgstr "Confirme el código"
690+
691+#: qml/Wizard/Pages/passwd-confirm.qml:53
692+#: qml/Wizard/Pages/passwd-confirm.qml:54
693+msgid "Please try again."
694+msgstr "Inténtelo de nuevo."
695+
696+#: qml/Wizard/Pages/passwd-set.qml:61
697+msgid "Choose your passcode"
698+msgstr "Elija su código"
699+
700+#: qml/Wizard/Pages/passwd-set.qml:68
701+msgid "Passphrase must be 4 characters long"
702+msgstr "El código debe tener 4 caracteres"
703+
703#. Translators: This is the arrow for "Back" buttons
704#. Translators: This is the arrow for "Back" buttons
704#: qml/Wizard/StackButton.qml:39
705#: qml/Wizard/StackButton.qml:39
705#, qt-format
706#, qt-format
@@ -803,5 +804,8 @@ msgstr "%1 〉"
803#~ msgid "Power"
804#~ msgid "Power"
804#~ msgstr "Apagar"
805#~ msgstr "Apagar"
805
806
807+#~ msgid "Please re-enter"
808+#~ msgstr "Reintroduzca"
809+
806#~ msgid "Manage Scopes"
810#~ msgid "Manage Scopes"
807#~ msgstr "Administrar Scopes"
811#~ msgstr "Administrar Scopes"
po/eu.po+54−50
@@ -7,7 +7,7 @@ msgid ""
7msgstr ""
7msgstr ""
8"Project-Id-Version: unity8\n"
8"Project-Id-Version: unity8\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2015-06-22 12:00+0200\n"
10+"POT-Creation-Date: 2015-07-17 10:10+0200\n"
11"PO-Revision-Date: 2015-07-13 23:29+0000\n"
11"PO-Revision-Date: 2015-07-13 23:29+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"
@@ -15,7 +15,7 @@ msgstr ""
15"Content-Type: text/plain; charset=UTF-8\n"
15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n"
16"Content-Transfer-Encoding: 8bit\n"
17"Plural-Forms: nplurals=2; plural=n != 1;\n"
17"Plural-Forms: nplurals=2; plural=n != 1;\n"
18−"X-Launchpad-Export-Date: 2015-07-14 05:39+0000\n"
18+"X-Launchpad-Export-Date: 2015-07-25 05:38+0000\n"
19"X-Generator: Launchpad (build 17628)\n"
19"X-Generator: Launchpad (build 17628)\n"
20
20
21#: plugins/LightDM/Greeter.cpp:112
21#: plugins/LightDM/Greeter.cpp:112
@@ -226,15 +226,15 @@ msgstr "Larrialdi-deia"
226msgid "OK"
226msgid "OK"
227msgstr "Ados"
227msgstr "Ados"
228
228
229−#: qml/Dash/GenericScopeView.qml:532 qml/Dash/GenericScopeView.qml:690
229+#: qml/Dash/GenericScopeView.qml:539 qml/Dash/GenericScopeView.qml:697
230msgid "See less"
230msgid "See less"
231msgstr "Ikusi gutxiago"
231msgstr "Ikusi gutxiago"
232
232
233−#: qml/Dash/GenericScopeView.qml:532
233+#: qml/Dash/GenericScopeView.qml:539
234msgid "See all"
234msgid "See all"
235msgstr "Ikusi guztiak"
235msgstr "Ikusi guztiak"
236
236
237−#: qml/Dash/GenericScopeView.qml:594
237+#: qml/Dash/GenericScopeView.qml:601
238msgctxt "Label: Hint for dash search line edit"
238msgctxt "Label: Hint for dash search line edit"
239msgid "Search"
239msgid "Search"
240msgstr "Bilatu"
240msgstr "Bilatu"
@@ -318,19 +318,19 @@ msgstr "Saiatu berriz"
318msgid "Tap to unlock"
318msgid "Tap to unlock"
319msgstr "Ukitu desblokeatzeko"
319msgstr "Ukitu desblokeatzeko"
320
320
321−#: qml/Greeter/NarrowView.qml:53 qml/Wizard/Pages/passwd-confirm.qml:53
321+#: qml/Greeter/NarrowView.qml:54 qml/Wizard/Pages/passwd-confirm.qml:53
322msgid "Sorry, incorrect passphrase."
322msgid "Sorry, incorrect passphrase."
323msgstr "Sentitzen dugu, pasaesaldia okerra da."
323msgstr "Sentitzen dugu, pasaesaldia okerra da."
324
324
325−#: qml/Greeter/NarrowView.qml:54 qml/Wizard/Pages/passwd-confirm.qml:54
325+#: qml/Greeter/NarrowView.qml:55 qml/Wizard/Pages/passwd-confirm.qml:54
326msgid "Sorry, incorrect passcode."
326msgid "Sorry, incorrect passcode."
327msgstr "Sentitzen dugu, pasakodea okerra da."
327msgstr "Sentitzen dugu, pasakodea okerra da."
328
328
329−#: qml/Greeter/NarrowView.qml:55
329+#: qml/Greeter/NarrowView.qml:56
330msgid "This will be your last attempt."
330msgid "This will be your last attempt."
331msgstr "Hau duzu azken saiakera."
331msgstr "Hau duzu azken saiakera."
332
332
333−#: qml/Greeter/NarrowView.qml:57
333+#: qml/Greeter/NarrowView.qml:58
334msgid ""
334msgid ""
335"If passphrase is entered incorrectly, your phone will conduct a factory "
335"If passphrase is entered incorrectly, your phone will conduct a factory "
336"reset and all personal data will be deleted."
336"reset and all personal data will be deleted."
@@ -338,7 +338,7 @@ msgstr ""
338"Okerreko pasaesaldia sartzen baduzu, telefonoaren jatorrizko ezarpenak "
338"Okerreko pasaesaldia sartzen baduzu, telefonoaren jatorrizko ezarpenak "
339"berrezarri eta datu pertsonal guztiak ezabatuko dira."
339"berrezarri eta datu pertsonal guztiak ezabatuko dira."
340
340
341−#: qml/Greeter/NarrowView.qml:58
341+#: qml/Greeter/NarrowView.qml:59
342msgid ""
342msgid ""
343"If passcode is entered incorrectly, your phone will conduct a factory reset "
343"If passcode is entered incorrectly, your phone will conduct a factory reset "
344"and all personal data will be deleted."
344"and all personal data will be deleted."
@@ -346,33 +346,34 @@ msgstr ""
346"Okerreko pasakodea sartzen baduzu, telefonoaren jatorrizko ezarpenak "
346"Okerreko pasakodea sartzen baduzu, telefonoaren jatorrizko ezarpenak "
347"berrezarri eta datu pertsonal guztiak ezabatuko dira."
347"berrezarri eta datu pertsonal guztiak ezabatuko dira."
348
348
349−#: qml/Greeter/NarrowView.qml:115
349+#: qml/Greeter/NarrowView.qml:116
350#, qt-format
350#, qt-format
351msgid "Enter %1"
351msgid "Enter %1"
352msgstr "Sartu %1"
352msgstr "Sartu %1"
353
353
354−#: qml/Greeter/NarrowView.qml:116 qml/Wizard/Pages/passwd-set.qml:60
354+#: qml/Greeter/NarrowView.qml:117 qml/Wizard/Pages/passwd-set.qml:60
355msgid "Enter passphrase"
355msgid "Enter passphrase"
356msgstr "Sartu pasaesaldia"
356msgstr "Sartu pasaesaldia"
357
357
358−#: qml/Greeter/NarrowView.qml:117
358+#: qml/Greeter/NarrowView.qml:118
359msgid "Enter passcode"
359msgid "Enter passcode"
360msgstr "Sartu pasakodea"
360msgstr "Sartu pasakodea"
361
361
362−#: qml/Greeter/NarrowView.qml:118
362+#: qml/Greeter/NarrowView.qml:119
363#, qt-format
363#, qt-format
364msgid "Sorry, incorrect %1"
364msgid "Sorry, incorrect %1"
365msgstr "Sentitzen dugu, %1 okerra da"
365msgstr "Sentitzen dugu, %1 okerra da"
366
366
367−#: qml/Greeter/NarrowView.qml:119
367+#: qml/Greeter/NarrowView.qml:120
368msgid "Sorry, incorrect passphrase"
368msgid "Sorry, incorrect passphrase"
369msgstr "Sentitzen dugu, pasaesaldia okerrekoa da"
369msgstr "Sentitzen dugu, pasaesaldia okerrekoa da"
370
370
371−#: qml/Greeter/NarrowView.qml:120
371+#: qml/Greeter/NarrowView.qml:121
372+msgctxt "passphrase"
372msgid "Please re-enter"
373msgid "Please re-enter"
373−msgstr "Errepikatu"
374+msgstr ""
374
375
375−#: qml/Greeter/NarrowView.qml:121
376+#: qml/Greeter/NarrowView.qml:122
376msgid "Sorry, incorrect passcode"
377msgid "Sorry, incorrect passcode"
377msgstr "Sentitzen dugu, pasakodea okerra da"
378msgstr "Sentitzen dugu, pasakodea okerra da"
378
379
@@ -522,38 +523,6 @@ msgctxt "Button: Go back one page in the Wizard"
522msgid "Back"
523msgid "Back"
523msgstr "Atzera"
524msgstr "Atzera"
524
525
525−#: qml/Wizard/Pages/here-terms.qml:27
526−msgid "Terms & Conditions"
527−msgstr "Baldintzak"
528−
529−#: qml/Wizard/Pages/passwd-confirm.qml:49
530−msgid "Confirm passphrase"
531−msgstr "Berretsi pasaesaldia"
532−
533−#: qml/Wizard/Pages/passwd-confirm.qml:50
534−msgid "Confirm passcode"
535−msgstr "Berretsi pasakodea"
536−
537−#: qml/Wizard/Pages/passwd-confirm.qml:53
538−#: qml/Wizard/Pages/passwd-confirm.qml:54
539−msgid "Please try again."
540−msgstr "Saiatu berriro."
541−
542−#: qml/Wizard/Pages/passwd-confirm.qml:82 qml/Wizard/Pages/passwd-set.qml:90
543−#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:128
544−#: qml/Wizard/Pages/40-wifi.qml:215 qml/Wizard/Pages/50-location.qml:131
545−#: qml/Wizard/Pages/60-reporting.qml:50
546−msgid "Continue"
547−msgstr "Jarraitu"
548−
549−#: qml/Wizard/Pages/passwd-set.qml:61
550−msgid "Choose your passcode"
551−msgstr "Aukeratu zure pasakodea"
552−
553−#: qml/Wizard/Pages/passwd-set.qml:68
554−msgid "Passphrase must be 4 characters long"
555−msgstr "Pasaesaldiak 4 karaktereko luzera izan behar du"
556−
557#: qml/Wizard/Pages/10-welcome.qml:27
526#: qml/Wizard/Pages/10-welcome.qml:27
558msgid "Hi!"
527msgid "Hi!"
559msgstr "Epa!"
528msgstr "Epa!"
@@ -566,6 +535,13 @@ msgstr "Ongi etorri zure Ubuntu telefonora."
566msgid "Let’s get started."
535msgid "Let’s get started."
567msgstr "Has gaitezen."
536msgstr "Has gaitezen."
568
537
538+#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:128
539+#: qml/Wizard/Pages/40-wifi.qml:215 qml/Wizard/Pages/50-location.qml:131
540+#: qml/Wizard/Pages/60-reporting.qml:50 qml/Wizard/Pages/passwd-confirm.qml:82
541+#: qml/Wizard/Pages/passwd-set.qml:90
542+msgid "Continue"
543+msgstr "Jarraitu"
544+
569#: qml/Wizard/Pages/20-sim.qml:25
545#: qml/Wizard/Pages/20-sim.qml:25
570msgid "Add a SIM card and restart your device"
546msgid "Add a SIM card and restart your device"
571msgstr "Gehitu SIM txartel bat eta berrabiarazi zure gailua"
547msgstr "Gehitu SIM txartel bat eta berrabiarazi zure gailua"
@@ -699,6 +675,31 @@ msgstr "Zure telefonoa erabiltzeko prest dago."
699msgid "Finish"
675msgid "Finish"
700msgstr "Amaitu"
676msgstr "Amaitu"
701
677
678+#: qml/Wizard/Pages/here-terms.qml:27
679+msgid "Terms & Conditions"
680+msgstr "Baldintzak"
681+
682+#: qml/Wizard/Pages/passwd-confirm.qml:49
683+msgid "Confirm passphrase"
684+msgstr "Berretsi pasaesaldia"
685+
686+#: qml/Wizard/Pages/passwd-confirm.qml:50
687+msgid "Confirm passcode"
688+msgstr "Berretsi pasakodea"
689+
690+#: qml/Wizard/Pages/passwd-confirm.qml:53
691+#: qml/Wizard/Pages/passwd-confirm.qml:54
692+msgid "Please try again."
693+msgstr "Saiatu berriro."
694+
695+#: qml/Wizard/Pages/passwd-set.qml:61
696+msgid "Choose your passcode"
697+msgstr "Aukeratu zure pasakodea"
698+
699+#: qml/Wizard/Pages/passwd-set.qml:68
700+msgid "Passphrase must be 4 characters long"
701+msgstr "Pasaesaldiak 4 karaktereko luzera izan behar du"
702+
702#. Translators: This is the arrow for "Back" buttons
703#. Translators: This is the arrow for "Back" buttons
703#: qml/Wizard/StackButton.qml:39
704#: qml/Wizard/StackButton.qml:39
704#, qt-format
705#, qt-format
@@ -804,3 +805,6 @@ msgstr "%1 〉"
804
805
805#~ msgid "Manage Scopes"
806#~ msgid "Manage Scopes"
806#~ msgstr "Kudeatu eremuak"
807#~ msgstr "Kudeatu eremuak"
808+
809+#~ msgid "Please re-enter"
810+#~ msgstr "Errepikatu"
po/fa.po+55−51
@@ -7,7 +7,7 @@ msgid ""
7msgstr ""
7msgstr ""
8"Project-Id-Version: unity8\n"
8"Project-Id-Version: unity8\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2015-06-22 12:00+0200\n"
10+"POT-Creation-Date: 2015-07-17 10:10+0200\n"
11"PO-Revision-Date: 2015-07-11 15:43+0000\n"
11"PO-Revision-Date: 2015-07-11 15:43+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"
@@ -15,8 +15,8 @@ msgstr ""
15"Content-Type: text/plain; charset=UTF-8\n"
15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n"
16"Content-Transfer-Encoding: 8bit\n"
17"Plural-Forms: nplurals=1; plural=0;\n"
17"Plural-Forms: nplurals=1; plural=0;\n"
18−"X-Launchpad-Export-Date: 2015-07-12 04:55+0000\n"
18+"X-Launchpad-Export-Date: 2015-07-25 05:39+0000\n"
19−"X-Generator: Launchpad (build 17620)\n"
19+"X-Generator: Launchpad (build 17628)\n"
20
20
21#: plugins/LightDM/Greeter.cpp:112
21#: plugins/LightDM/Greeter.cpp:112
22msgid "Password: "
22msgid "Password: "
@@ -225,15 +225,15 @@ msgstr "تماس اضطراری"
225msgid "OK"
225msgid "OK"
226msgstr "قبول"
226msgstr "قبول"
227
227
228−#: qml/Dash/GenericScopeView.qml:532 qml/Dash/GenericScopeView.qml:690
228+#: qml/Dash/GenericScopeView.qml:539 qml/Dash/GenericScopeView.qml:697
229msgid "See less"
229msgid "See less"
230msgstr "کم‌تر ببینید"
230msgstr "کم‌تر ببینید"
231
231
232−#: qml/Dash/GenericScopeView.qml:532
232+#: qml/Dash/GenericScopeView.qml:539
233msgid "See all"
233msgid "See all"
234msgstr "دیدن همه"
234msgstr "دیدن همه"
235
235
236−#: qml/Dash/GenericScopeView.qml:594
236+#: qml/Dash/GenericScopeView.qml:601
237msgctxt "Label: Hint for dash search line edit"
237msgctxt "Label: Hint for dash search line edit"
238msgid "Search"
238msgid "Search"
239msgstr "جست‌وجو"
239msgstr "جست‌وجو"
@@ -317,19 +317,19 @@ msgstr "تلاش دوباره"
317msgid "Tap to unlock"
317msgid "Tap to unlock"
318msgstr "برای باز کردن قفل ضربه بزنید"
318msgstr "برای باز کردن قفل ضربه بزنید"
319
319
320−#: qml/Greeter/NarrowView.qml:53 qml/Wizard/Pages/passwd-confirm.qml:53
320+#: qml/Greeter/NarrowView.qml:54 qml/Wizard/Pages/passwd-confirm.qml:53
321msgid "Sorry, incorrect passphrase."
321msgid "Sorry, incorrect passphrase."
322msgstr "متأسّفیم، عبارت‌عبور نادرست است."
322msgstr "متأسّفیم، عبارت‌عبور نادرست است."
323
323
324−#: qml/Greeter/NarrowView.qml:54 qml/Wizard/Pages/passwd-confirm.qml:54
324+#: qml/Greeter/NarrowView.qml:55 qml/Wizard/Pages/passwd-confirm.qml:54
325msgid "Sorry, incorrect passcode."
325msgid "Sorry, incorrect passcode."
326msgstr "متأسّفیم، رمزعبور نادرست است."
326msgstr "متأسّفیم، رمزعبور نادرست است."
327
327
328−#: qml/Greeter/NarrowView.qml:55
328+#: qml/Greeter/NarrowView.qml:56
329msgid "This will be your last attempt."
329msgid "This will be your last attempt."
330msgstr "این آخرین تلاش شما خواهد بود."
330msgstr "این آخرین تلاش شما خواهد بود."
331
331
332−#: qml/Greeter/NarrowView.qml:57
332+#: qml/Greeter/NarrowView.qml:58
333msgid ""
333msgid ""
334"If passphrase is entered incorrectly, your phone will conduct a factory "
334"If passphrase is entered incorrectly, your phone will conduct a factory "
335"reset and all personal data will be deleted."
335"reset and all personal data will be deleted."
@@ -337,7 +337,7 @@ msgstr ""
337"اگر عبارت‌عبور نادرست وارد شود، تلفن شما بازنشانی کارخانه خواهد شد و تمامی "
337"اگر عبارت‌عبور نادرست وارد شود، تلفن شما بازنشانی کارخانه خواهد شد و تمامی "
338"اطّلاعات شخصی حذف خواهند شد."
338"اطّلاعات شخصی حذف خواهند شد."
339
339
340−#: qml/Greeter/NarrowView.qml:58
340+#: qml/Greeter/NarrowView.qml:59
341msgid ""
341msgid ""
342"If passcode is entered incorrectly, your phone will conduct a factory reset "
342"If passcode is entered incorrectly, your phone will conduct a factory reset "
343"and all personal data will be deleted."
343"and all personal data will be deleted."
@@ -345,33 +345,34 @@ msgstr ""
345"اگر رمزعبور نادرست وارد شود، تلفن شما بازنشانی کارخانه خواهد شد و تمامی "
345"اگر رمزعبور نادرست وارد شود، تلفن شما بازنشانی کارخانه خواهد شد و تمامی "
346"اطّلاعات شخصی حذف خواهند شد."
346"اطّلاعات شخصی حذف خواهند شد."
347
347
348−#: qml/Greeter/NarrowView.qml:115
348+#: qml/Greeter/NarrowView.qml:116
349#, qt-format
349#, qt-format
350msgid "Enter %1"
350msgid "Enter %1"
351msgstr "%1 را وارد کنید"
351msgstr "%1 را وارد کنید"
352
352
353−#: qml/Greeter/NarrowView.qml:116 qml/Wizard/Pages/passwd-set.qml:60
353+#: qml/Greeter/NarrowView.qml:117 qml/Wizard/Pages/passwd-set.qml:60
354msgid "Enter passphrase"
354msgid "Enter passphrase"
355msgstr "عبارت‌عبور را وارد کنید"
355msgstr "عبارت‌عبور را وارد کنید"
356
356
357−#: qml/Greeter/NarrowView.qml:117
357+#: qml/Greeter/NarrowView.qml:118
358msgid "Enter passcode"
358msgid "Enter passcode"
359msgstr "رمزعبور را وارد کنید"
359msgstr "رمزعبور را وارد کنید"
360
360
361−#: qml/Greeter/NarrowView.qml:118
361+#: qml/Greeter/NarrowView.qml:119
362#, qt-format
362#, qt-format
363msgid "Sorry, incorrect %1"
363msgid "Sorry, incorrect %1"
364msgstr "متأسّفیم، %1 نادرست بود"
364msgstr "متأسّفیم، %1 نادرست بود"
365
365
366−#: qml/Greeter/NarrowView.qml:119
366+#: qml/Greeter/NarrowView.qml:120
367msgid "Sorry, incorrect passphrase"
367msgid "Sorry, incorrect passphrase"
368msgstr "متأسّفیم، عبارت‌عبور نادرست بود"
368msgstr "متأسّفیم، عبارت‌عبور نادرست بود"
369
369
370−#: qml/Greeter/NarrowView.qml:120
370+#: qml/Greeter/NarrowView.qml:121
371+msgctxt "passphrase"
371msgid "Please re-enter"
372msgid "Please re-enter"
372−msgstr "لطفاً دوباره وارد کنید"
373+msgstr ""
373
374
374−#: qml/Greeter/NarrowView.qml:121
375+#: qml/Greeter/NarrowView.qml:122
375msgid "Sorry, incorrect passcode"
376msgid "Sorry, incorrect passcode"
376msgstr "متأسّفیم، رمزعبور نادرست بود"
377msgstr "متأسّفیم، رمزعبور نادرست بود"
377
378
@@ -518,38 +519,6 @@ msgctxt "Button: Go back one page in the Wizard"
518msgid "Back"
519msgid "Back"
519msgstr "بازگشت"
520msgstr "بازگشت"
520
521
521−#: qml/Wizard/Pages/here-terms.qml:27
522−msgid "Terms & Conditions"
523−msgstr "شرایط و ضوابط"
524−
525−#: qml/Wizard/Pages/passwd-confirm.qml:49
526−msgid "Confirm passphrase"
527−msgstr "تأیید عبارت‌عبور"
528−
529−#: qml/Wizard/Pages/passwd-confirm.qml:50
530−msgid "Confirm passcode"
531−msgstr "تأیید رمزعبور"
532−
533−#: qml/Wizard/Pages/passwd-confirm.qml:53
534−#: qml/Wizard/Pages/passwd-confirm.qml:54
535−msgid "Please try again."
536−msgstr "لطفاً دوباره سعی کنید."
537−
538−#: qml/Wizard/Pages/passwd-confirm.qml:82 qml/Wizard/Pages/passwd-set.qml:90
539−#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:128
540−#: qml/Wizard/Pages/40-wifi.qml:215 qml/Wizard/Pages/50-location.qml:131
541−#: qml/Wizard/Pages/60-reporting.qml:50
542−msgid "Continue"
543−msgstr "ادامه"
544−
545−#: qml/Wizard/Pages/passwd-set.qml:61
546−msgid "Choose your passcode"
547−msgstr "رمزعبور خود را انتخاب کنید"
548−
549−#: qml/Wizard/Pages/passwd-set.qml:68
550−msgid "Passphrase must be 4 characters long"
551−msgstr "عبارت‌عبور باید ۴ نویسه طول داشته باشد"
552−
553#: qml/Wizard/Pages/10-welcome.qml:27
522#: qml/Wizard/Pages/10-welcome.qml:27
554msgid "Hi!"
523msgid "Hi!"
555msgstr "سلام!"
524msgstr "سلام!"
@@ -562,6 +531,13 @@ msgstr "به تلفن اوبونتوی خودتان خوش آمدید."
562msgid "Let’s get started."
531msgid "Let’s get started."
563msgstr "بیایید شروع کینم."
532msgstr "بیایید شروع کینم."
564
533
534+#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:128
535+#: qml/Wizard/Pages/40-wifi.qml:215 qml/Wizard/Pages/50-location.qml:131
536+#: qml/Wizard/Pages/60-reporting.qml:50 qml/Wizard/Pages/passwd-confirm.qml:82
537+#: qml/Wizard/Pages/passwd-set.qml:90
538+msgid "Continue"
539+msgstr "ادامه"
540+
565#: qml/Wizard/Pages/20-sim.qml:25
541#: qml/Wizard/Pages/20-sim.qml:25
566msgid "Add a SIM card and restart your device"
542msgid "Add a SIM card and restart your device"
567msgstr "سیم‌کارتی افزوده و دستگاهتان را شروع مجدّد کنید"
543msgstr "سیم‌کارتی افزوده و دستگاهتان را شروع مجدّد کنید"
@@ -695,6 +671,31 @@ msgstr "هم‌اکنون تلفن شما آماده‌ی استفاده است.
695msgid "Finish"
671msgid "Finish"
696msgstr "پایان"
672msgstr "پایان"
697
673
674+#: qml/Wizard/Pages/here-terms.qml:27
675+msgid "Terms & Conditions"
676+msgstr "شرایط و ضوابط"
677+
678+#: qml/Wizard/Pages/passwd-confirm.qml:49
679+msgid "Confirm passphrase"
680+msgstr "تأیید عبارت‌عبور"
681+
682+#: qml/Wizard/Pages/passwd-confirm.qml:50
683+msgid "Confirm passcode"
684+msgstr "تأیید رمزعبور"
685+
686+#: qml/Wizard/Pages/passwd-confirm.qml:53
687+#: qml/Wizard/Pages/passwd-confirm.qml:54
688+msgid "Please try again."
689+msgstr "لطفاً دوباره سعی کنید."
690+
691+#: qml/Wizard/Pages/passwd-set.qml:61
692+msgid "Choose your passcode"
693+msgstr "رمزعبور خود را انتخاب کنید"
694+
695+#: qml/Wizard/Pages/passwd-set.qml:68
696+msgid "Passphrase must be 4 characters long"
697+msgstr "عبارت‌عبور باید ۴ نویسه طول داشته باشد"
698+
698#. Translators: This is the arrow for "Back" buttons
699#. Translators: This is the arrow for "Back" buttons
699#: qml/Wizard/StackButton.qml:39
700#: qml/Wizard/StackButton.qml:39
700#, qt-format
701#, qt-format
@@ -795,5 +796,8 @@ msgstr "%1 〉"
795#~ msgid "Restart"
796#~ msgid "Restart"
796#~ msgstr "شروع مجدّد"
797#~ msgstr "شروع مجدّد"
797
798
799+#~ msgid "Please re-enter"
800+#~ msgstr "لطفاً دوباره وارد کنید"
801+
798#~ msgid "Manage Scopes"
802#~ msgid "Manage Scopes"
799#~ msgstr "مدیریت حوزه‌ها"
803#~ msgstr "مدیریت حوزه‌ها"
po/fi.po+54−50
@@ -7,7 +7,7 @@ msgid ""
7msgstr ""
7msgstr ""
8"Project-Id-Version: unity\n"
8"Project-Id-Version: unity\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2015-06-22 12:00+0200\n"
10+"POT-Creation-Date: 2015-07-17 10:10+0200\n"
11"PO-Revision-Date: 2015-07-04 18:32+0000\n"
11"PO-Revision-Date: 2015-07-04 18:32+0000\n"
12"Last-Translator: Jiri Grönroos <Unknown>\n"
12"Last-Translator: Jiri Grönroos <Unknown>\n"
13"Language-Team: Finnish <fi@li.org>\n"
13"Language-Team: Finnish <fi@li.org>\n"
@@ -15,8 +15,8 @@ msgstr ""
15"Content-Type: text/plain; charset=UTF-8\n"
15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n"
16"Content-Transfer-Encoding: 8bit\n"
17"Plural-Forms: nplurals=2; plural=n != 1;\n"
17"Plural-Forms: nplurals=2; plural=n != 1;\n"
18−"X-Launchpad-Export-Date: 2015-07-05 05:55+0000\n"
18+"X-Launchpad-Export-Date: 2015-07-25 05:38+0000\n"
19−"X-Generator: Launchpad (build 17597)\n"
19+"X-Generator: Launchpad (build 17628)\n"
20
20
21#: plugins/LightDM/Greeter.cpp:112
21#: plugins/LightDM/Greeter.cpp:112
22msgid "Password: "
22msgid "Password: "
@@ -227,15 +227,15 @@ msgstr "Hätäpuhelu"
227msgid "OK"
227msgid "OK"
228msgstr "OK"
228msgstr "OK"
229
229
230−#: qml/Dash/GenericScopeView.qml:532 qml/Dash/GenericScopeView.qml:690
230+#: qml/Dash/GenericScopeView.qml:539 qml/Dash/GenericScopeView.qml:697
231msgid "See less"
231msgid "See less"
232msgstr "Näytä vähemmän"
232msgstr "Näytä vähemmän"
233
233
234−#: qml/Dash/GenericScopeView.qml:532
234+#: qml/Dash/GenericScopeView.qml:539
235msgid "See all"
235msgid "See all"
236msgstr "Näytä kaikki"
236msgstr "Näytä kaikki"
237
237
238−#: qml/Dash/GenericScopeView.qml:594
238+#: qml/Dash/GenericScopeView.qml:601
239msgctxt "Label: Hint for dash search line edit"
239msgctxt "Label: Hint for dash search line edit"
240msgid "Search"
240msgid "Search"
241msgstr "Etsi"
241msgstr "Etsi"
@@ -319,19 +319,19 @@ msgstr "Yritä uudelleen"
319msgid "Tap to unlock"
319msgid "Tap to unlock"
320msgstr "Napauta avataksesi lukituksen"
320msgstr "Napauta avataksesi lukituksen"
321
321
322−#: qml/Greeter/NarrowView.qml:53 qml/Wizard/Pages/passwd-confirm.qml:53
322+#: qml/Greeter/NarrowView.qml:54 qml/Wizard/Pages/passwd-confirm.qml:53
323msgid "Sorry, incorrect passphrase."
323msgid "Sorry, incorrect passphrase."
324msgstr "Virheellinen tunnuslause."
324msgstr "Virheellinen tunnuslause."
325
325
326−#: qml/Greeter/NarrowView.qml:54 qml/Wizard/Pages/passwd-confirm.qml:54
326+#: qml/Greeter/NarrowView.qml:55 qml/Wizard/Pages/passwd-confirm.qml:54
327msgid "Sorry, incorrect passcode."
327msgid "Sorry, incorrect passcode."
328msgstr "Virheellinen suojakoodi."
328msgstr "Virheellinen suojakoodi."
329
329
330−#: qml/Greeter/NarrowView.qml:55
330+#: qml/Greeter/NarrowView.qml:56
331msgid "This will be your last attempt."
331msgid "This will be your last attempt."
332msgstr "Tämä on viimeinen yritys."
332msgstr "Tämä on viimeinen yritys."
333
333
334−#: qml/Greeter/NarrowView.qml:57
334+#: qml/Greeter/NarrowView.qml:58
335msgid ""
335msgid ""
336"If passphrase is entered incorrectly, your phone will conduct a factory "
336"If passphrase is entered incorrectly, your phone will conduct a factory "
337"reset and all personal data will be deleted."
337"reset and all personal data will be deleted."
@@ -339,7 +339,7 @@ msgstr ""
339"Jos kirjoitat tunnuslauseen virheellisesti, puhelimesi palautetaan "
339"Jos kirjoitat tunnuslauseen virheellisesti, puhelimesi palautetaan "
340"tehdastilaan ja kaikki henkilökohtaiset tietosi poistetaan."
340"tehdastilaan ja kaikki henkilökohtaiset tietosi poistetaan."
341
341
342−#: qml/Greeter/NarrowView.qml:58
342+#: qml/Greeter/NarrowView.qml:59
343msgid ""
343msgid ""
344"If passcode is entered incorrectly, your phone will conduct a factory reset "
344"If passcode is entered incorrectly, your phone will conduct a factory reset "
345"and all personal data will be deleted."
345"and all personal data will be deleted."
@@ -347,33 +347,34 @@ msgstr ""
347"Jos kirjoitat suojakoodin virheellisesti, puhelimesi palautetaan "
347"Jos kirjoitat suojakoodin virheellisesti, puhelimesi palautetaan "
348"tehdastilaan ja kaikki henkilökohtaiset tietosi poistetaan."
348"tehdastilaan ja kaikki henkilökohtaiset tietosi poistetaan."
349
349
350−#: qml/Greeter/NarrowView.qml:115
350+#: qml/Greeter/NarrowView.qml:116
351#, qt-format
351#, qt-format
352msgid "Enter %1"
352msgid "Enter %1"
353msgstr "Anna %1"
353msgstr "Anna %1"
354
354
355−#: qml/Greeter/NarrowView.qml:116 qml/Wizard/Pages/passwd-set.qml:60
355+#: qml/Greeter/NarrowView.qml:117 qml/Wizard/Pages/passwd-set.qml:60
356msgid "Enter passphrase"
356msgid "Enter passphrase"
357msgstr "Anna tunnuslause"
357msgstr "Anna tunnuslause"
358
358
359−#: qml/Greeter/NarrowView.qml:117
359+#: qml/Greeter/NarrowView.qml:118
360msgid "Enter passcode"
360msgid "Enter passcode"
361msgstr "Anna suojakoodi"
361msgstr "Anna suojakoodi"
362
362
363−#: qml/Greeter/NarrowView.qml:118
363+#: qml/Greeter/NarrowView.qml:119
364#, qt-format
364#, qt-format
365msgid "Sorry, incorrect %1"
365msgid "Sorry, incorrect %1"
366msgstr "Väärä %1"
366msgstr "Väärä %1"
367
367
368−#: qml/Greeter/NarrowView.qml:119
368+#: qml/Greeter/NarrowView.qml:120
369msgid "Sorry, incorrect passphrase"
369msgid "Sorry, incorrect passphrase"
370msgstr "Virheellinen tunnuslause"
370msgstr "Virheellinen tunnuslause"
371
371
372−#: qml/Greeter/NarrowView.qml:120
372+#: qml/Greeter/NarrowView.qml:121
373+msgctxt "passphrase"
373msgid "Please re-enter"
374msgid "Please re-enter"
374msgstr "Anna uudelleen"
375msgstr "Anna uudelleen"
375
376
376−#: qml/Greeter/NarrowView.qml:121
377+#: qml/Greeter/NarrowView.qml:122
377msgid "Sorry, incorrect passcode"
378msgid "Sorry, incorrect passcode"
378msgstr "Väärä suojakoodi"
379msgstr "Väärä suojakoodi"
379
380
@@ -523,38 +524,6 @@ msgctxt "Button: Go back one page in the Wizard"
523msgid "Back"
524msgid "Back"
524msgstr "Takaisin"
525msgstr "Takaisin"
525
526
526−#: qml/Wizard/Pages/here-terms.qml:27
527−msgid "Terms & Conditions"
528−msgstr "Käyttöehdot"
529−
530−#: qml/Wizard/Pages/passwd-confirm.qml:49
531−msgid "Confirm passphrase"
532−msgstr "Vahvista salasana"
533−
534−#: qml/Wizard/Pages/passwd-confirm.qml:50
535−msgid "Confirm passcode"
536−msgstr "Vahvista suojakoodi"
537−
538−#: qml/Wizard/Pages/passwd-confirm.qml:53
539−#: qml/Wizard/Pages/passwd-confirm.qml:54
540−msgid "Please try again."
541−msgstr "Yritä uudelleen."
542−
543−#: qml/Wizard/Pages/passwd-confirm.qml:82 qml/Wizard/Pages/passwd-set.qml:90
544−#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:128
545−#: qml/Wizard/Pages/40-wifi.qml:215 qml/Wizard/Pages/50-location.qml:131
546−#: qml/Wizard/Pages/60-reporting.qml:50
547−msgid "Continue"
548−msgstr "Jatka"
549−
550−#: qml/Wizard/Pages/passwd-set.qml:61
551−msgid "Choose your passcode"
552−msgstr "Valitse suojakoodi"
553−
554−#: qml/Wizard/Pages/passwd-set.qml:68
555−msgid "Passphrase must be 4 characters long"
556−msgstr "Salasanan tulee olla neljä merkkiä pitkä"
557−
558#: qml/Wizard/Pages/10-welcome.qml:27
527#: qml/Wizard/Pages/10-welcome.qml:27
559msgid "Hi!"
528msgid "Hi!"
560msgstr "Hei!"
529msgstr "Hei!"
@@ -567,6 +536,13 @@ msgstr "Tervetuloa Ubuntu-puhelimen pariin."
567msgid "Let’s get started."
536msgid "Let’s get started."
568msgstr "Aloitetaanpa."
537msgstr "Aloitetaanpa."
569
538
539+#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:128
540+#: qml/Wizard/Pages/40-wifi.qml:215 qml/Wizard/Pages/50-location.qml:131
541+#: qml/Wizard/Pages/60-reporting.qml:50 qml/Wizard/Pages/passwd-confirm.qml:82
542+#: qml/Wizard/Pages/passwd-set.qml:90
543+msgid "Continue"
544+msgstr "Jatka"
545+
570#: qml/Wizard/Pages/20-sim.qml:25
546#: qml/Wizard/Pages/20-sim.qml:25
571msgid "Add a SIM card and restart your device"
547msgid "Add a SIM card and restart your device"
572msgstr "Lisää SIM-kortti ja käynnistä laite uudelleen"
548msgstr "Lisää SIM-kortti ja käynnistä laite uudelleen"
@@ -699,6 +675,31 @@ msgstr "Puhelimesi on nyt valmis käytettäväksi."
699msgid "Finish"
675msgid "Finish"
700msgstr "Valmis"
676msgstr "Valmis"
701
677
678+#: qml/Wizard/Pages/here-terms.qml:27
679+msgid "Terms & Conditions"
680+msgstr "Käyttöehdot"
681+
682+#: qml/Wizard/Pages/passwd-confirm.qml:49
683+msgid "Confirm passphrase"
684+msgstr "Vahvista salasana"
685+
686+#: qml/Wizard/Pages/passwd-confirm.qml:50
687+msgid "Confirm passcode"
688+msgstr "Vahvista suojakoodi"
689+
690+#: qml/Wizard/Pages/passwd-confirm.qml:53
691+#: qml/Wizard/Pages/passwd-confirm.qml:54
692+msgid "Please try again."
693+msgstr "Yritä uudelleen."
694+
695+#: qml/Wizard/Pages/passwd-set.qml:61
696+msgid "Choose your passcode"
697+msgstr "Valitse suojakoodi"
698+
699+#: qml/Wizard/Pages/passwd-set.qml:68
700+msgid "Passphrase must be 4 characters long"
701+msgstr "Salasanan tulee olla neljä merkkiä pitkä"
702+
702#. Translators: This is the arrow for "Back" buttons
703#. Translators: This is the arrow for "Back" buttons
703#: qml/Wizard/StackButton.qml:39
704#: qml/Wizard/StackButton.qml:39
704#, qt-format
705#, qt-format
@@ -801,3 +802,6 @@ msgstr "%1 〉"
801
802
802#~ msgid "Manage Scopes"
803#~ msgid "Manage Scopes"
803#~ msgstr "Näkymien hallinta"
804#~ msgstr "Näkymien hallinta"
805+
806+#~ msgid "Please re-enter"
807+#~ msgstr "Anna uudelleen"
po/fo.po+51−50
@@ -7,7 +7,7 @@ msgid ""
7msgstr ""
7msgstr ""
8"Project-Id-Version: unity\n"
8"Project-Id-Version: unity\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2015-06-22 12:00+0200\n"
10+"POT-Creation-Date: 2015-07-17 10:10+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"
@@ -15,8 +15,8 @@ msgstr ""
15"Content-Type: text/plain; charset=UTF-8\n"
15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n"
16"Content-Transfer-Encoding: 8bit\n"
17"Plural-Forms: nplurals=2; plural=n != 1;\n"
17"Plural-Forms: nplurals=2; plural=n != 1;\n"
18−"X-Launchpad-Export-Date: 2015-07-04 05:37+0000\n"
18+"X-Launchpad-Export-Date: 2015-07-25 05:38+0000\n"
19−"X-Generator: Launchpad (build 17597)\n"
19+"X-Generator: Launchpad (build 17628)\n"
20
20
21#: plugins/LightDM/Greeter.cpp:112
21#: plugins/LightDM/Greeter.cpp:112
22msgid "Password: "
22msgid "Password: "
@@ -223,15 +223,15 @@ msgstr ""
223msgid "OK"
223msgid "OK"
224msgstr ""
224msgstr ""
225
225
226−#: qml/Dash/GenericScopeView.qml:532 qml/Dash/GenericScopeView.qml:690
226+#: qml/Dash/GenericScopeView.qml:539 qml/Dash/GenericScopeView.qml:697
227msgid "See less"
227msgid "See less"
228msgstr ""
228msgstr ""
229
229
230−#: qml/Dash/GenericScopeView.qml:532
230+#: qml/Dash/GenericScopeView.qml:539
231msgid "See all"
231msgid "See all"
232msgstr ""
232msgstr ""
233
233
234−#: qml/Dash/GenericScopeView.qml:594
234+#: qml/Dash/GenericScopeView.qml:601
235msgctxt "Label: Hint for dash search line edit"
235msgctxt "Label: Hint for dash search line edit"
236msgid "Search"
236msgid "Search"
237msgstr ""
237msgstr ""
@@ -315,57 +315,58 @@ msgstr ""
315msgid "Tap to unlock"
315msgid "Tap to unlock"
316msgstr ""
316msgstr ""
317
317
318−#: qml/Greeter/NarrowView.qml:53 qml/Wizard/Pages/passwd-confirm.qml:53
318+#: qml/Greeter/NarrowView.qml:54 qml/Wizard/Pages/passwd-confirm.qml:53
319msgid "Sorry, incorrect passphrase."
319msgid "Sorry, incorrect passphrase."
320msgstr ""
320msgstr ""
321
321
322−#: qml/Greeter/NarrowView.qml:54 qml/Wizard/Pages/passwd-confirm.qml:54
322+#: qml/Greeter/NarrowView.qml:55 qml/Wizard/Pages/passwd-confirm.qml:54
323msgid "Sorry, incorrect passcode."
323msgid "Sorry, incorrect passcode."
324msgstr ""
324msgstr ""
325
325
326−#: qml/Greeter/NarrowView.qml:55
326+#: qml/Greeter/NarrowView.qml:56
327msgid "This will be your last attempt."
327msgid "This will be your last attempt."
328msgstr ""
328msgstr ""
329
329
330−#: qml/Greeter/NarrowView.qml:57
330+#: qml/Greeter/NarrowView.qml:58
331msgid ""
331msgid ""
332"If passphrase is entered incorrectly, your phone will conduct a factory "
332"If passphrase is entered incorrectly, your phone will conduct a factory "
333"reset and all personal data will be deleted."
333"reset and all personal data will be deleted."
334msgstr ""
334msgstr ""
335
335
336−#: qml/Greeter/NarrowView.qml:58
336+#: qml/Greeter/NarrowView.qml:59
337msgid ""
337msgid ""
338"If passcode is entered incorrectly, your phone will conduct a factory reset "
338"If passcode is entered incorrectly, your phone will conduct a factory reset "
339"and all personal data will be deleted."
339"and all personal data will be deleted."
340msgstr ""
340msgstr ""
341
341
342−#: qml/Greeter/NarrowView.qml:115
342+#: qml/Greeter/NarrowView.qml:116
343#, qt-format
343#, qt-format
344msgid "Enter %1"
344msgid "Enter %1"
345msgstr ""
345msgstr ""
346
346
347−#: qml/Greeter/NarrowView.qml:116 qml/Wizard/Pages/passwd-set.qml:60
347+#: qml/Greeter/NarrowView.qml:117 qml/Wizard/Pages/passwd-set.qml:60
348msgid "Enter passphrase"
348msgid "Enter passphrase"
349msgstr ""
349msgstr ""
350
350
351−#: qml/Greeter/NarrowView.qml:117
351+#: qml/Greeter/NarrowView.qml:118
352msgid "Enter passcode"
352msgid "Enter passcode"
353msgstr ""
353msgstr ""
354
354
355−#: qml/Greeter/NarrowView.qml:118
355+#: qml/Greeter/NarrowView.qml:119
356#, qt-format
356#, qt-format
357msgid "Sorry, incorrect %1"
357msgid "Sorry, incorrect %1"
358msgstr ""
358msgstr ""
359
359
360−#: qml/Greeter/NarrowView.qml:119
360+#: qml/Greeter/NarrowView.qml:120
361msgid "Sorry, incorrect passphrase"
361msgid "Sorry, incorrect passphrase"
362msgstr ""
362msgstr ""
363
363
364−#: qml/Greeter/NarrowView.qml:120
364+#: qml/Greeter/NarrowView.qml:121
365+msgctxt "passphrase"
365msgid "Please re-enter"
366msgid "Please re-enter"
366msgstr ""
367msgstr ""
367
368
368−#: qml/Greeter/NarrowView.qml:121
369+#: qml/Greeter/NarrowView.qml:122
369msgid "Sorry, incorrect passcode"
370msgid "Sorry, incorrect passcode"
370msgstr ""
371msgstr ""
371
372
@@ -515,38 +516,6 @@ msgctxt "Button: Go back one page in the Wizard"
515msgid "Back"
516msgid "Back"
516msgstr ""
517msgstr ""
517
518
518−#: qml/Wizard/Pages/here-terms.qml:27
519−msgid "Terms & Conditions"
520−msgstr ""
521−
522−#: qml/Wizard/Pages/passwd-confirm.qml:49
523−msgid "Confirm passphrase"
524−msgstr ""
525−
526−#: qml/Wizard/Pages/passwd-confirm.qml:50
527−msgid "Confirm passcode"
528−msgstr ""
529−
530−#: qml/Wizard/Pages/passwd-confirm.qml:53
531−#: qml/Wizard/Pages/passwd-confirm.qml:54
532−msgid "Please try again."
533−msgstr ""
534−
535−#: qml/Wizard/Pages/passwd-confirm.qml:82 qml/Wizard/Pages/passwd-set.qml:90
536−#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:128
537−#: qml/Wizard/Pages/40-wifi.qml:215 qml/Wizard/Pages/50-location.qml:131
538−#: qml/Wizard/Pages/60-reporting.qml:50
539−msgid "Continue"
540−msgstr ""
541−
542−#: qml/Wizard/Pages/passwd-set.qml:61
543−msgid "Choose your passcode"
544−msgstr ""
545−
546−#: qml/Wizard/Pages/passwd-set.qml:68
547−msgid "Passphrase must be 4 characters long"
548−msgstr ""
549−
550#: qml/Wizard/Pages/10-welcome.qml:27
519#: qml/Wizard/Pages/10-welcome.qml:27
551msgid "Hi!"
520msgid "Hi!"
552msgstr ""
521msgstr ""
@@ -559,6 +528,13 @@ msgstr ""
559msgid "Let’s get started."
528msgid "Let’s get started."
560msgstr ""
529msgstr ""
561
530
531+#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:128
532+#: qml/Wizard/Pages/40-wifi.qml:215 qml/Wizard/Pages/50-location.qml:131
533+#: qml/Wizard/Pages/60-reporting.qml:50 qml/Wizard/Pages/passwd-confirm.qml:82
534+#: qml/Wizard/Pages/passwd-set.qml:90
535+msgid "Continue"
536+msgstr ""
537+
562#: qml/Wizard/Pages/20-sim.qml:25
538#: qml/Wizard/Pages/20-sim.qml:25
563msgid "Add a SIM card and restart your device"
539msgid "Add a SIM card and restart your device"
564msgstr ""
540msgstr ""
@@ -684,6 +660,31 @@ msgstr ""
684msgid "Finish"
660msgid "Finish"
685msgstr ""
661msgstr ""
686
662
663+#: qml/Wizard/Pages/here-terms.qml:27
664+msgid "Terms & Conditions"
665+msgstr ""
666+
667+#: qml/Wizard/Pages/passwd-confirm.qml:49
668+msgid "Confirm passphrase"
669+msgstr ""
670+
671+#: qml/Wizard/Pages/passwd-confirm.qml:50
672+msgid "Confirm passcode"
673+msgstr ""
674+
675+#: qml/Wizard/Pages/passwd-confirm.qml:53
676+#: qml/Wizard/Pages/passwd-confirm.qml:54
677+msgid "Please try again."
678+msgstr ""
679+
680+#: qml/Wizard/Pages/passwd-set.qml:61
681+msgid "Choose your passcode"
682+msgstr ""
683+
684+#: qml/Wizard/Pages/passwd-set.qml:68
685+msgid "Passphrase must be 4 characters long"
686+msgstr ""
687+
687#. Translators: This is the arrow for "Back" buttons
688#. Translators: This is the arrow for "Back" buttons
688#: qml/Wizard/StackButton.qml:39
689#: qml/Wizard/StackButton.qml:39
689#, qt-format
690#, qt-format
po/fr.po+55−51
@@ -7,16 +7,16 @@ msgid ""
7msgstr ""
7msgstr ""
8"Project-Id-Version: unity\n"
8"Project-Id-Version: unity\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2015-06-22 12:00+0200\n"
10+"POT-Creation-Date: 2015-07-17 10:10+0200\n"
11−"PO-Revision-Date: 2015-07-05 09:43+0000\n"
11+"PO-Revision-Date: 2015-07-27 11:47+0000\n"
12"Last-Translator: Anne <anneonyme017@gmail.com>\n"
12"Last-Translator: Anne <anneonyme017@gmail.com>\n"
13"Language-Team: French <fr@li.org>\n"
13"Language-Team: French <fr@li.org>\n"
14"MIME-Version: 1.0\n"
14"MIME-Version: 1.0\n"
15"Content-Type: text/plain; charset=UTF-8\n"
15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n"
16"Content-Transfer-Encoding: 8bit\n"
17"Plural-Forms: nplurals=2; plural=n > 1;\n"
17"Plural-Forms: nplurals=2; plural=n > 1;\n"
18−"X-Launchpad-Export-Date: 2015-07-06 05:36+0000\n"
18+"X-Launchpad-Export-Date: 2015-07-28 05:40+0000\n"
19−"X-Generator: Launchpad (build 17597)\n"
19+"X-Generator: Launchpad (build 17628)\n"
20
20
21#: plugins/LightDM/Greeter.cpp:112
21#: plugins/LightDM/Greeter.cpp:112
22msgid "Password: "
22msgid "Password: "
@@ -229,15 +229,15 @@ msgstr "Appel d'urgence"
229msgid "OK"
229msgid "OK"
230msgstr "OK"
230msgstr "OK"
231
231
232−#: qml/Dash/GenericScopeView.qml:532 qml/Dash/GenericScopeView.qml:690
232+#: qml/Dash/GenericScopeView.qml:539 qml/Dash/GenericScopeView.qml:697
233msgid "See less"
233msgid "See less"
234msgstr "Voir moins"
234msgstr "Voir moins"
235
235
236−#: qml/Dash/GenericScopeView.qml:532
236+#: qml/Dash/GenericScopeView.qml:539
237msgid "See all"
237msgid "See all"
238msgstr "Tout voir"
238msgstr "Tout voir"
239
239
240−#: qml/Dash/GenericScopeView.qml:594
240+#: qml/Dash/GenericScopeView.qml:601
241msgctxt "Label: Hint for dash search line edit"
241msgctxt "Label: Hint for dash search line edit"
242msgid "Search"
242msgid "Search"
243msgstr "Rechercher"
243msgstr "Rechercher"
@@ -321,19 +321,19 @@ msgstr "Réessayer"
321msgid "Tap to unlock"
321msgid "Tap to unlock"
322msgstr "Appuyer pour déverrouiller"
322msgstr "Appuyer pour déverrouiller"
323
323
324−#: qml/Greeter/NarrowView.qml:53 qml/Wizard/Pages/passwd-confirm.qml:53
324+#: qml/Greeter/NarrowView.qml:54 qml/Wizard/Pages/passwd-confirm.qml:53
325msgid "Sorry, incorrect passphrase."
325msgid "Sorry, incorrect passphrase."
326msgstr "Désolé, phrase secrète incorrecte."
326msgstr "Désolé, phrase secrète incorrecte."
327
327
328−#: qml/Greeter/NarrowView.qml:54 qml/Wizard/Pages/passwd-confirm.qml:54
328+#: qml/Greeter/NarrowView.qml:55 qml/Wizard/Pages/passwd-confirm.qml:54
329msgid "Sorry, incorrect passcode."
329msgid "Sorry, incorrect passcode."
330msgstr "Désolé, code incorrect."
330msgstr "Désolé, code incorrect."
331
331
332−#: qml/Greeter/NarrowView.qml:55
332+#: qml/Greeter/NarrowView.qml:56
333msgid "This will be your last attempt."
333msgid "This will be your last attempt."
334msgstr "Ceci sera votre dernière tentative."
334msgstr "Ceci sera votre dernière tentative."
335
335
336−#: qml/Greeter/NarrowView.qml:57
336+#: qml/Greeter/NarrowView.qml:58
337msgid ""
337msgid ""
338"If passphrase is entered incorrectly, your phone will conduct a factory "
338"If passphrase is entered incorrectly, your phone will conduct a factory "
339"reset and all personal data will be deleted."
339"reset and all personal data will be deleted."
@@ -342,7 +342,7 @@ msgstr ""
342"effectuera une réinitialisation aux paramètres d'usine et toutes les données "
342"effectuera une réinitialisation aux paramètres d'usine et toutes les données "
343"personnelles seront supprimées."
343"personnelles seront supprimées."
344
344
345−#: qml/Greeter/NarrowView.qml:58
345+#: qml/Greeter/NarrowView.qml:59
346msgid ""
346msgid ""
347"If passcode is entered incorrectly, your phone will conduct a factory reset "
347"If passcode is entered incorrectly, your phone will conduct a factory reset "
348"and all personal data will be deleted."
348"and all personal data will be deleted."
@@ -351,33 +351,34 @@ msgstr ""
351"réinitialisation aux paramètres d'usine et toutes les données personnelles "
351"réinitialisation aux paramètres d'usine et toutes les données personnelles "
352"seront supprimées."
352"seront supprimées."
353
353
354−#: qml/Greeter/NarrowView.qml:115
354+#: qml/Greeter/NarrowView.qml:116
355#, qt-format
355#, qt-format
356msgid "Enter %1"
356msgid "Enter %1"
357msgstr "Saisissez %1"
357msgstr "Saisissez %1"
358
358
359−#: qml/Greeter/NarrowView.qml:116 qml/Wizard/Pages/passwd-set.qml:60
359+#: qml/Greeter/NarrowView.qml:117 qml/Wizard/Pages/passwd-set.qml:60
360msgid "Enter passphrase"
360msgid "Enter passphrase"
361msgstr "Saisissez la phrase de passe"
361msgstr "Saisissez la phrase de passe"
362
362
363−#: qml/Greeter/NarrowView.qml:117
363+#: qml/Greeter/NarrowView.qml:118
364msgid "Enter passcode"
364msgid "Enter passcode"
365msgstr "Saisissez le mot de passe"
365msgstr "Saisissez le mot de passe"
366
366
367−#: qml/Greeter/NarrowView.qml:118
367+#: qml/Greeter/NarrowView.qml:119
368#, qt-format
368#, qt-format
369msgid "Sorry, incorrect %1"
369msgid "Sorry, incorrect %1"
370msgstr "Désolé, %1 incorrect"
370msgstr "Désolé, %1 incorrect"
371
371
372−#: qml/Greeter/NarrowView.qml:119
372+#: qml/Greeter/NarrowView.qml:120
373msgid "Sorry, incorrect passphrase"
373msgid "Sorry, incorrect passphrase"
374msgstr "Désolé, phrase secrète incorrecte"
374msgstr "Désolé, phrase secrète incorrecte"
375
375
376−#: qml/Greeter/NarrowView.qml:120
376+#: qml/Greeter/NarrowView.qml:121
377+msgctxt "passphrase"
377msgid "Please re-enter"
378msgid "Please re-enter"
378msgstr "Veuillez ressaisir"
379msgstr "Veuillez ressaisir"
379
380
380−#: qml/Greeter/NarrowView.qml:121
381+#: qml/Greeter/NarrowView.qml:122
381msgid "Sorry, incorrect passcode"
382msgid "Sorry, incorrect passcode"
382msgstr "Désolé, code incorrect"
383msgstr "Désolé, code incorrect"
383
384
@@ -527,38 +528,6 @@ msgctxt "Button: Go back one page in the Wizard"
527msgid "Back"
528msgid "Back"
528msgstr "Précédent"
529msgstr "Précédent"
529
530
530−#: qml/Wizard/Pages/here-terms.qml:27
531−msgid "Terms & Conditions"
532−msgstr "Conditions générales d'utilisation"
533−
534−#: qml/Wizard/Pages/passwd-confirm.qml:49
535−msgid "Confirm passphrase"
536−msgstr "Confirmez votre phrase de passe"
537−
538−#: qml/Wizard/Pages/passwd-confirm.qml:50
539−msgid "Confirm passcode"
540−msgstr "Confirmez votre code"
541−
542−#: qml/Wizard/Pages/passwd-confirm.qml:53
543−#: qml/Wizard/Pages/passwd-confirm.qml:54
544−msgid "Please try again."
545−msgstr "Veuillez réessayer."
546−
547−#: qml/Wizard/Pages/passwd-confirm.qml:82 qml/Wizard/Pages/passwd-set.qml:90
548−#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:128
549−#: qml/Wizard/Pages/40-wifi.qml:215 qml/Wizard/Pages/50-location.qml:131
550−#: qml/Wizard/Pages/60-reporting.qml:50
551−msgid "Continue"
552−msgstr "Continuer"
553−
554−#: qml/Wizard/Pages/passwd-set.qml:61
555−msgid "Choose your passcode"
556−msgstr "Choisissez votre code"
557−
558−#: qml/Wizard/Pages/passwd-set.qml:68
559−msgid "Passphrase must be 4 characters long"
560−msgstr "La phrase de passe doit comporter 4 caractères"
561−
562#: qml/Wizard/Pages/10-welcome.qml:27
531#: qml/Wizard/Pages/10-welcome.qml:27
563msgid "Hi!"
532msgid "Hi!"
564msgstr "Salut !"
533msgstr "Salut !"
@@ -571,6 +540,13 @@ msgstr "Bienvenue sur votre téléphone Ubuntu."
571msgid "Let’s get started."
540msgid "Let’s get started."
572msgstr "Commençons."
541msgstr "Commençons."
573
542
543+#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:128
544+#: qml/Wizard/Pages/40-wifi.qml:215 qml/Wizard/Pages/50-location.qml:131
545+#: qml/Wizard/Pages/60-reporting.qml:50 qml/Wizard/Pages/passwd-confirm.qml:82
546+#: qml/Wizard/Pages/passwd-set.qml:90
547+msgid "Continue"
548+msgstr "Continuer"
549+
574#: qml/Wizard/Pages/20-sim.qml:25
550#: qml/Wizard/Pages/20-sim.qml:25
575msgid "Add a SIM card and restart your device"
551msgid "Add a SIM card and restart your device"
576msgstr "Ajoutez une carte SIM et redémarrez votre appareil"
552msgstr "Ajoutez une carte SIM et redémarrez votre appareil"
@@ -708,6 +684,31 @@ msgstr "Votre téléphone est maintenant prêt à être utilisé."
708msgid "Finish"
684msgid "Finish"
709msgstr "Terminer"
685msgstr "Terminer"
710
686
687+#: qml/Wizard/Pages/here-terms.qml:27
688+msgid "Terms & Conditions"
689+msgstr "Conditions générales d'utilisation"
690+
691+#: qml/Wizard/Pages/passwd-confirm.qml:49
692+msgid "Confirm passphrase"
693+msgstr "Confirmez votre phrase de passe"
694+
695+#: qml/Wizard/Pages/passwd-confirm.qml:50
696+msgid "Confirm passcode"
697+msgstr "Confirmez votre code"
698+
699+#: qml/Wizard/Pages/passwd-confirm.qml:53
700+#: qml/Wizard/Pages/passwd-confirm.qml:54
701+msgid "Please try again."
702+msgstr "Veuillez réessayer."
703+
704+#: qml/Wizard/Pages/passwd-set.qml:61
705+msgid "Choose your passcode"
706+msgstr "Choisissez votre code"
707+
708+#: qml/Wizard/Pages/passwd-set.qml:68
709+msgid "Passphrase must be 4 characters long"
710+msgstr "La phrase de passe doit comporter 4 caractères"
711+
711#. Translators: This is the arrow for "Back" buttons
712#. Translators: This is the arrow for "Back" buttons
712#: qml/Wizard/StackButton.qml:39
713#: qml/Wizard/StackButton.qml:39
713#, qt-format
714#, qt-format
@@ -817,3 +818,6 @@ msgstr "%1 〉"
817
818
818#~ msgid "Manage Scopes"
819#~ msgid "Manage Scopes"
819#~ msgstr "Gérer les moteurs de recherche"
820#~ msgstr "Gérer les moteurs de recherche"
821+
822+#~ msgid "Please re-enter"
823+#~ msgstr "Veuillez ressaisir"
po/ga.po+50−49
@@ -7,7 +7,7 @@ msgid ""
7msgstr ""
7msgstr ""
8"Project-Id-Version: unity8\n"
8"Project-Id-Version: unity8\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2015-06-22 12:00+0200\n"
10+"POT-Creation-Date: 2015-07-17 10:10+0200\n"
11"PO-Revision-Date: 2015-07-20 16:25+0000\n"
11"PO-Revision-Date: 2015-07-20 16:25+0000\n"
12"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
12"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
13"Language-Team: Irish <ga@li.org>\n"
13"Language-Team: Irish <ga@li.org>\n"
@@ -15,7 +15,7 @@ msgstr ""
15"Content-Type: text/plain; charset=UTF-8\n"
15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n"
16"Content-Transfer-Encoding: 8bit\n"
17"Plural-Forms: nplurals=3; plural=n==1 ? 0 : n==2 ? 1 : 2;\n"
17"Plural-Forms: nplurals=3; plural=n==1 ? 0 : n==2 ? 1 : 2;\n"
18−"X-Launchpad-Export-Date: 2015-07-21 05:35+0000\n"
18+"X-Launchpad-Export-Date: 2015-07-25 05:38+0000\n"
19"X-Generator: Launchpad (build 17628)\n"
19"X-Generator: Launchpad (build 17628)\n"
20
20
21#: plugins/LightDM/Greeter.cpp:112
21#: plugins/LightDM/Greeter.cpp:112
@@ -223,15 +223,15 @@ msgstr ""
223msgid "OK"
223msgid "OK"
224msgstr ""
224msgstr ""
225
225
226−#: qml/Dash/GenericScopeView.qml:532 qml/Dash/GenericScopeView.qml:690
226+#: qml/Dash/GenericScopeView.qml:539 qml/Dash/GenericScopeView.qml:697
227msgid "See less"
227msgid "See less"
228msgstr ""
228msgstr ""
229
229
230−#: qml/Dash/GenericScopeView.qml:532
230+#: qml/Dash/GenericScopeView.qml:539
231msgid "See all"
231msgid "See all"
232msgstr ""
232msgstr ""
233
233
234−#: qml/Dash/GenericScopeView.qml:594
234+#: qml/Dash/GenericScopeView.qml:601
235msgctxt "Label: Hint for dash search line edit"
235msgctxt "Label: Hint for dash search line edit"
236msgid "Search"
236msgid "Search"
237msgstr ""
237msgstr ""
@@ -315,57 +315,58 @@ msgstr ""
315msgid "Tap to unlock"
315msgid "Tap to unlock"
316msgstr ""
316msgstr ""
317
317
318−#: qml/Greeter/NarrowView.qml:53 qml/Wizard/Pages/passwd-confirm.qml:53
318+#: qml/Greeter/NarrowView.qml:54 qml/Wizard/Pages/passwd-confirm.qml:53
319msgid "Sorry, incorrect passphrase."
319msgid "Sorry, incorrect passphrase."
320msgstr ""
320msgstr ""
321
321
322−#: qml/Greeter/NarrowView.qml:54 qml/Wizard/Pages/passwd-confirm.qml:54
322+#: qml/Greeter/NarrowView.qml:55 qml/Wizard/Pages/passwd-confirm.qml:54
323msgid "Sorry, incorrect passcode."
323msgid "Sorry, incorrect passcode."
324msgstr ""
324msgstr ""
325
325
326−#: qml/Greeter/NarrowView.qml:55
326+#: qml/Greeter/NarrowView.qml:56
327msgid "This will be your last attempt."
327msgid "This will be your last attempt."
328msgstr ""
328msgstr ""
329
329
330−#: qml/Greeter/NarrowView.qml:57
330+#: qml/Greeter/NarrowView.qml:58
331msgid ""
331msgid ""
332"If passphrase is entered incorrectly, your phone will conduct a factory "
332"If passphrase is entered incorrectly, your phone will conduct a factory "
333"reset and all personal data will be deleted."
333"reset and all personal data will be deleted."
334msgstr ""
334msgstr ""
335
335
336−#: qml/Greeter/NarrowView.qml:58
336+#: qml/Greeter/NarrowView.qml:59
337msgid ""
337msgid ""
338"If passcode is entered incorrectly, your phone will conduct a factory reset "
338"If passcode is entered incorrectly, your phone will conduct a factory reset "
339"and all personal data will be deleted."
339"and all personal data will be deleted."
340msgstr ""
340msgstr ""
341
341
342−#: qml/Greeter/NarrowView.qml:115
342+#: qml/Greeter/NarrowView.qml:116
343#, qt-format
343#, qt-format
344msgid "Enter %1"
344msgid "Enter %1"
345msgstr ""
345msgstr ""
346
346
347−#: qml/Greeter/NarrowView.qml:116 qml/Wizard/Pages/passwd-set.qml:60
347+#: qml/Greeter/NarrowView.qml:117 qml/Wizard/Pages/passwd-set.qml:60
348msgid "Enter passphrase"
348msgid "Enter passphrase"
349msgstr ""
349msgstr ""
350
350
351−#: qml/Greeter/NarrowView.qml:117
351+#: qml/Greeter/NarrowView.qml:118
352msgid "Enter passcode"
352msgid "Enter passcode"
353msgstr ""
353msgstr ""
354
354
355−#: qml/Greeter/NarrowView.qml:118
355+#: qml/Greeter/NarrowView.qml:119
356#, qt-format
356#, qt-format
357msgid "Sorry, incorrect %1"
357msgid "Sorry, incorrect %1"
358msgstr ""
358msgstr ""
359
359
360−#: qml/Greeter/NarrowView.qml:119
360+#: qml/Greeter/NarrowView.qml:120
361msgid "Sorry, incorrect passphrase"
361msgid "Sorry, incorrect passphrase"
362msgstr ""
362msgstr ""
363
363
364−#: qml/Greeter/NarrowView.qml:120
364+#: qml/Greeter/NarrowView.qml:121
365+msgctxt "passphrase"
365msgid "Please re-enter"
366msgid "Please re-enter"
366msgstr ""
367msgstr ""
367
368
368−#: qml/Greeter/NarrowView.qml:121
369+#: qml/Greeter/NarrowView.qml:122
369msgid "Sorry, incorrect passcode"
370msgid "Sorry, incorrect passcode"
370msgstr ""
371msgstr ""
371
372
@@ -515,38 +516,6 @@ msgctxt "Button: Go back one page in the Wizard"
515msgid "Back"
516msgid "Back"
516msgstr ""
517msgstr ""
517
518
518−#: qml/Wizard/Pages/here-terms.qml:27
519−msgid "Terms & Conditions"
520−msgstr ""
521−
522−#: qml/Wizard/Pages/passwd-confirm.qml:49
523−msgid "Confirm passphrase"
524−msgstr ""
525−
526−#: qml/Wizard/Pages/passwd-confirm.qml:50
527−msgid "Confirm passcode"
528−msgstr ""
529−
530−#: qml/Wizard/Pages/passwd-confirm.qml:53
531−#: qml/Wizard/Pages/passwd-confirm.qml:54
532−msgid "Please try again."
533−msgstr ""
534−
535−#: qml/Wizard/Pages/passwd-confirm.qml:82 qml/Wizard/Pages/passwd-set.qml:90
536−#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:128
537−#: qml/Wizard/Pages/40-wifi.qml:215 qml/Wizard/Pages/50-location.qml:131
538−#: qml/Wizard/Pages/60-reporting.qml:50
539−msgid "Continue"
540−msgstr ""
541−
542−#: qml/Wizard/Pages/passwd-set.qml:61
543−msgid "Choose your passcode"
544−msgstr ""
545−
546−#: qml/Wizard/Pages/passwd-set.qml:68
547−msgid "Passphrase must be 4 characters long"
548−msgstr ""
549−
550#: qml/Wizard/Pages/10-welcome.qml:27
519#: qml/Wizard/Pages/10-welcome.qml:27
551msgid "Hi!"
520msgid "Hi!"
552msgstr ""
521msgstr ""
@@ -559,6 +528,13 @@ msgstr ""
559msgid "Let’s get started."
528msgid "Let’s get started."
560msgstr ""
529msgstr ""
561
530
531+#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:128
532+#: qml/Wizard/Pages/40-wifi.qml:215 qml/Wizard/Pages/50-location.qml:131
533+#: qml/Wizard/Pages/60-reporting.qml:50 qml/Wizard/Pages/passwd-confirm.qml:82
534+#: qml/Wizard/Pages/passwd-set.qml:90
535+msgid "Continue"
536+msgstr ""
537+
562#: qml/Wizard/Pages/20-sim.qml:25
538#: qml/Wizard/Pages/20-sim.qml:25
563msgid "Add a SIM card and restart your device"
539msgid "Add a SIM card and restart your device"
564msgstr ""
540msgstr ""
@@ -684,6 +660,31 @@ msgstr ""
684msgid "Finish"
660msgid "Finish"
685msgstr ""
661msgstr ""
686
662
663+#: qml/Wizard/Pages/here-terms.qml:27
664+msgid "Terms & Conditions"
665+msgstr ""
666+
667+#: qml/Wizard/Pages/passwd-confirm.qml:49
668+msgid "Confirm passphrase"
669+msgstr ""
670+
671+#: qml/Wizard/Pages/passwd-confirm.qml:50
672+msgid "Confirm passcode"
673+msgstr ""
674+
675+#: qml/Wizard/Pages/passwd-confirm.qml:53
676+#: qml/Wizard/Pages/passwd-confirm.qml:54
677+msgid "Please try again."
678+msgstr ""
679+
680+#: qml/Wizard/Pages/passwd-set.qml:61
681+msgid "Choose your passcode"
682+msgstr ""
683+
684+#: qml/Wizard/Pages/passwd-set.qml:68
685+msgid "Passphrase must be 4 characters long"
686+msgstr ""
687+
687#. Translators: This is the arrow for "Back" buttons
688#. Translators: This is the arrow for "Back" buttons
688#: qml/Wizard/StackButton.qml:39
689#: qml/Wizard/StackButton.qml:39
689#, qt-format
690#, qt-format
po/gd.po+54−50
@@ -7,7 +7,7 @@ msgid ""
7msgstr ""
7msgstr ""
8"Project-Id-Version: unity8\n"
8"Project-Id-Version: unity8\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2015-06-22 12:00+0200\n"
10+"POT-Creation-Date: 2015-07-17 10:10+0200\n"
11"PO-Revision-Date: 2015-07-16 10:56+0000\n"
11"PO-Revision-Date: 2015-07-16 10:56+0000\n"
12"Last-Translator: GunChleoc <Unknown>\n"
12"Last-Translator: GunChleoc <Unknown>\n"
13"Language-Team: Fòram na Gàidhlig\n"
13"Language-Team: Fòram na Gàidhlig\n"
@@ -16,7 +16,7 @@ msgstr ""
16"Content-Transfer-Encoding: 8bit\n"
16"Content-Transfer-Encoding: 8bit\n"
17"Plural-Forms: nplurals=4; plural=(n==1 || n==11) ? 0 : (n==2 || n==12) ? 1 : "
17"Plural-Forms: nplurals=4; plural=(n==1 || n==11) ? 0 : (n==2 || n==12) ? 1 : "
18"(n > 2 && n < 20) ? 2 : 3;\n"
18"(n > 2 && n < 20) ? 2 : 3;\n"
19−"X-Launchpad-Export-Date: 2015-07-17 05:37+0000\n"
19+"X-Launchpad-Export-Date: 2015-07-25 05:38+0000\n"
20"X-Generator: Launchpad (build 17628)\n"
20"X-Generator: Launchpad (build 17628)\n"
21"Language: gd\n"
21"Language: gd\n"
22
22
@@ -233,15 +233,15 @@ msgstr "Gairm èiginn"
233msgid "OK"
233msgid "OK"
234msgstr "Ceart ma-thà"
234msgstr "Ceart ma-thà"
235
235
236−#: qml/Dash/GenericScopeView.qml:532 qml/Dash/GenericScopeView.qml:690
236+#: qml/Dash/GenericScopeView.qml:539 qml/Dash/GenericScopeView.qml:697
237msgid "See less"
237msgid "See less"
238msgstr "Seall nas lugha"
238msgstr "Seall nas lugha"
239
239
240−#: qml/Dash/GenericScopeView.qml:532
240+#: qml/Dash/GenericScopeView.qml:539
241msgid "See all"
241msgid "See all"
242msgstr "Seall na h-uile"
242msgstr "Seall na h-uile"
243
243
244−#: qml/Dash/GenericScopeView.qml:594
244+#: qml/Dash/GenericScopeView.qml:601
245msgctxt "Label: Hint for dash search line edit"
245msgctxt "Label: Hint for dash search line edit"
246msgid "Search"
246msgid "Search"
247msgstr "Lorg"
247msgstr "Lorg"
@@ -325,19 +325,19 @@ msgstr "Feuch ris a-rithist"
325msgid "Tap to unlock"
325msgid "Tap to unlock"
326msgstr "Gnog gus a' ghlas a thoirt fo bharr"
326msgstr "Gnog gus a' ghlas a thoirt fo bharr"
327
327
328−#: qml/Greeter/NarrowView.qml:53 qml/Wizard/Pages/passwd-confirm.qml:53
328+#: qml/Greeter/NarrowView.qml:54 qml/Wizard/Pages/passwd-confirm.qml:53
329msgid "Sorry, incorrect passphrase."
329msgid "Sorry, incorrect passphrase."
330msgstr "Duilich ach tha an abairt-fhaire cearr."
330msgstr "Duilich ach tha an abairt-fhaire cearr."
331
331
332−#: qml/Greeter/NarrowView.qml:54 qml/Wizard/Pages/passwd-confirm.qml:54
332+#: qml/Greeter/NarrowView.qml:55 qml/Wizard/Pages/passwd-confirm.qml:54
333msgid "Sorry, incorrect passcode."
333msgid "Sorry, incorrect passcode."
334msgstr "Duilich ach tha an còd-faire cearr."
334msgstr "Duilich ach tha an còd-faire cearr."
335
335
336−#: qml/Greeter/NarrowView.qml:55
336+#: qml/Greeter/NarrowView.qml:56
337msgid "This will be your last attempt."
337msgid "This will be your last attempt."
338msgstr "Seo an oidhirp mu dheireadh agad."
338msgstr "Seo an oidhirp mu dheireadh agad."
339
339
340−#: qml/Greeter/NarrowView.qml:57
340+#: qml/Greeter/NarrowView.qml:58
341msgid ""
341msgid ""
342"If passphrase is entered incorrectly, your phone will conduct a factory "
342"If passphrase is entered incorrectly, your phone will conduct a factory "
343"reset and all personal data will be deleted."
343"reset and all personal data will be deleted."
@@ -346,7 +346,7 @@ msgstr ""
346"ath-shuidheachadh air roghainnean an fhactaraidh agus thèid gach dàta "
346"ath-shuidheachadh air roghainnean an fhactaraidh agus thèid gach dàta "
347"pearsanta a sguabadh às."
347"pearsanta a sguabadh às."
348
348
349−#: qml/Greeter/NarrowView.qml:58
349+#: qml/Greeter/NarrowView.qml:59
350msgid ""
350msgid ""
351"If passcode is entered incorrectly, your phone will conduct a factory reset "
351"If passcode is entered incorrectly, your phone will conduct a factory reset "
352"and all personal data will be deleted."
352"and all personal data will be deleted."
@@ -355,33 +355,34 @@ msgstr ""
355"shuidheachadh air roghainnean an fhactaraidh agus thèid gach dàta pearsanta "
355"shuidheachadh air roghainnean an fhactaraidh agus thèid gach dàta pearsanta "
356"a sguabadh às."
356"a sguabadh às."
357
357
358−#: qml/Greeter/NarrowView.qml:115
358+#: qml/Greeter/NarrowView.qml:116
359#, qt-format
359#, qt-format
360msgid "Enter %1"
360msgid "Enter %1"
361msgstr "Cuir a-steach %1"
361msgstr "Cuir a-steach %1"
362
362
363−#: qml/Greeter/NarrowView.qml:116 qml/Wizard/Pages/passwd-set.qml:60
363+#: qml/Greeter/NarrowView.qml:117 qml/Wizard/Pages/passwd-set.qml:60
364msgid "Enter passphrase"
364msgid "Enter passphrase"
365msgstr "Cuir abairt-fhaire a-steach"
365msgstr "Cuir abairt-fhaire a-steach"
366
366
367−#: qml/Greeter/NarrowView.qml:117
367+#: qml/Greeter/NarrowView.qml:118
368msgid "Enter passcode"
368msgid "Enter passcode"
369msgstr "Cuir còd-faire a-steach"
369msgstr "Cuir còd-faire a-steach"
370
370
371−#: qml/Greeter/NarrowView.qml:118
371+#: qml/Greeter/NarrowView.qml:119
372#, qt-format
372#, qt-format
373msgid "Sorry, incorrect %1"
373msgid "Sorry, incorrect %1"
374msgstr "Duilich ach tha a' %1 cearr"
374msgstr "Duilich ach tha a' %1 cearr"
375
375
376−#: qml/Greeter/NarrowView.qml:119
376+#: qml/Greeter/NarrowView.qml:120
377msgid "Sorry, incorrect passphrase"
377msgid "Sorry, incorrect passphrase"
378msgstr "Duilich ach tha an abairt-fhaire cearr"
378msgstr "Duilich ach tha an abairt-fhaire cearr"
379
379
380−#: qml/Greeter/NarrowView.qml:120
380+#: qml/Greeter/NarrowView.qml:121
381+msgctxt "passphrase"
381msgid "Please re-enter"
382msgid "Please re-enter"
382−msgstr "Cuir a-steach e a-rithist"
383+msgstr ""
383
384
384−#: qml/Greeter/NarrowView.qml:121
385+#: qml/Greeter/NarrowView.qml:122
385msgid "Sorry, incorrect passcode"
386msgid "Sorry, incorrect passcode"
386msgstr "Duilich ach tha an còd-faire cearr"
387msgstr "Duilich ach tha an còd-faire cearr"
387
388
@@ -537,38 +538,6 @@ msgctxt "Button: Go back one page in the Wizard"
537msgid "Back"
538msgid "Back"
538msgstr "Air ais"
539msgstr "Air ais"
539
540
540−#: qml/Wizard/Pages/here-terms.qml:27
541−msgid "Terms & Conditions"
542−msgstr "Teirmichean ⁊ cumhaichean"
543−
544−#: qml/Wizard/Pages/passwd-confirm.qml:49
545−msgid "Confirm passphrase"
546−msgstr "Dearbhaich an abairt-fhaire"
547−
548−#: qml/Wizard/Pages/passwd-confirm.qml:50
549−msgid "Confirm passcode"
550−msgstr "Dearbhaich an còd-faire"
551−
552−#: qml/Wizard/Pages/passwd-confirm.qml:53
553−#: qml/Wizard/Pages/passwd-confirm.qml:54
554−msgid "Please try again."
555−msgstr "Feuch ris a-rithist."
556−
557−#: qml/Wizard/Pages/passwd-confirm.qml:82 qml/Wizard/Pages/passwd-set.qml:90
558−#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:128
559−#: qml/Wizard/Pages/40-wifi.qml:215 qml/Wizard/Pages/50-location.qml:131
560−#: qml/Wizard/Pages/60-reporting.qml:50
561−msgid "Continue"
562−msgstr "Lean air adhart"
563−
564−#: qml/Wizard/Pages/passwd-set.qml:61
565−msgid "Choose your passcode"
566−msgstr "Tagh an còd-faire agad"
567−
568−#: qml/Wizard/Pages/passwd-set.qml:68
569−msgid "Passphrase must be 4 characters long"
570−msgstr "Feumaidh an abairt-fhaire a bhith 4 caractaran a dh'fhaid"
571−
572#: qml/Wizard/Pages/10-welcome.qml:27
541#: qml/Wizard/Pages/10-welcome.qml:27
573msgid "Hi!"
542msgid "Hi!"
574msgstr "Shin thu!"
543msgstr "Shin thu!"
@@ -581,6 +550,13 @@ msgstr "Fàilte dhan fhòn Ubuntu agad."
581msgid "Let’s get started."
550msgid "Let’s get started."
582msgstr "Tòisicheamaid."
551msgstr "Tòisicheamaid."
583
552
553+#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:128
554+#: qml/Wizard/Pages/40-wifi.qml:215 qml/Wizard/Pages/50-location.qml:131
555+#: qml/Wizard/Pages/60-reporting.qml:50 qml/Wizard/Pages/passwd-confirm.qml:82
556+#: qml/Wizard/Pages/passwd-set.qml:90
557+msgid "Continue"
558+msgstr "Lean air adhart"
559+
584#: qml/Wizard/Pages/20-sim.qml:25
560#: qml/Wizard/Pages/20-sim.qml:25
585msgid "Add a SIM card and restart your device"
561msgid "Add a SIM card and restart your device"
586msgstr "Cuir cairt SIM ris 's tòisich an uidheam agad às ùr"
562msgstr "Cuir cairt SIM ris 's tòisich an uidheam agad às ùr"
@@ -717,6 +693,31 @@ msgstr "Gabhaidh am fòn agad cleachdadh a-nis."
717msgid "Finish"
693msgid "Finish"
718msgstr "Crìochnaich"
694msgstr "Crìochnaich"
719
695
696+#: qml/Wizard/Pages/here-terms.qml:27
697+msgid "Terms & Conditions"
698+msgstr "Teirmichean ⁊ cumhaichean"
699+
700+#: qml/Wizard/Pages/passwd-confirm.qml:49
701+msgid "Confirm passphrase"
702+msgstr "Dearbhaich an abairt-fhaire"
703+
704+#: qml/Wizard/Pages/passwd-confirm.qml:50
705+msgid "Confirm passcode"
706+msgstr "Dearbhaich an còd-faire"
707+
708+#: qml/Wizard/Pages/passwd-confirm.qml:53
709+#: qml/Wizard/Pages/passwd-confirm.qml:54
710+msgid "Please try again."
711+msgstr "Feuch ris a-rithist."
712+
713+#: qml/Wizard/Pages/passwd-set.qml:61
714+msgid "Choose your passcode"
715+msgstr "Tagh an còd-faire agad"
716+
717+#: qml/Wizard/Pages/passwd-set.qml:68
718+msgid "Passphrase must be 4 characters long"
719+msgstr "Feumaidh an abairt-fhaire a bhith 4 caractaran a dh'fhaid"
720+
720#. Translators: This is the arrow for "Back" buttons
721#. Translators: This is the arrow for "Back" buttons
721#: qml/Wizard/StackButton.qml:39
722#: qml/Wizard/StackButton.qml:39
722#, qt-format
723#, qt-format
@@ -825,3 +826,6 @@ msgstr "%1 〉"
825
826
826#~ msgid "Manage Scopes"
827#~ msgid "Manage Scopes"
827#~ msgstr "Stiùirich na sgòpaichean"
828#~ msgstr "Stiùirich na sgòpaichean"
829+
830+#~ msgid "Please re-enter"
831+#~ msgstr "Cuir a-steach i a-rithist"
po/gl.po+56−52
@@ -7,16 +7,16 @@ msgid ""
7msgstr ""
7msgstr ""
8"Project-Id-Version: unity\n"
8"Project-Id-Version: unity\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2015-06-22 12:00+0200\n"
10+"POT-Creation-Date: 2015-07-17 10:10+0200\n"
11−"PO-Revision-Date: 2015-07-13 13:56+0000\n"
11+"PO-Revision-Date: 2015-08-01 03:25+0000\n"
12"Last-Translator: Marcos Lans <Unknown>\n"
12"Last-Translator: Marcos Lans <Unknown>\n"
13"Language-Team: Galician <gl@li.org>\n"
13"Language-Team: Galician <gl@li.org>\n"
14"MIME-Version: 1.0\n"
14"MIME-Version: 1.0\n"
15"Content-Type: text/plain; charset=UTF-8\n"
15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n"
16"Content-Transfer-Encoding: 8bit\n"
17"Plural-Forms: nplurals=2; plural=n != 1;\n"
17"Plural-Forms: nplurals=2; plural=n != 1;\n"
18−"X-Launchpad-Export-Date: 2015-07-14 05:39+0000\n"
18+"X-Launchpad-Export-Date: 2015-08-02 05:36+0000\n"
19−"X-Generator: Launchpad (build 17628)\n"
19+"X-Generator: Launchpad (build 17656)\n"
20
20
21#: plugins/LightDM/Greeter.cpp:112
21#: plugins/LightDM/Greeter.cpp:112
22msgid "Password: "
22msgid "Password: "
@@ -223,15 +223,15 @@ msgstr "Chamada de emerxencia"
223msgid "OK"
223msgid "OK"
224msgstr "Aceptar"
224msgstr "Aceptar"
225
225
226−#: qml/Dash/GenericScopeView.qml:532 qml/Dash/GenericScopeView.qml:690
226+#: qml/Dash/GenericScopeView.qml:539 qml/Dash/GenericScopeView.qml:697
227msgid "See less"
227msgid "See less"
228msgstr "Ver menos"
228msgstr "Ver menos"
229
229
230−#: qml/Dash/GenericScopeView.qml:532
230+#: qml/Dash/GenericScopeView.qml:539
231msgid "See all"
231msgid "See all"
232msgstr "Ver todo"
232msgstr "Ver todo"
233
233
234−#: qml/Dash/GenericScopeView.qml:594
234+#: qml/Dash/GenericScopeView.qml:601
235msgctxt "Label: Hint for dash search line edit"
235msgctxt "Label: Hint for dash search line edit"
236msgid "Search"
236msgid "Search"
237msgstr "Buscar"
237msgstr "Buscar"
@@ -315,19 +315,19 @@ msgstr "Reintentar"
315msgid "Tap to unlock"
315msgid "Tap to unlock"
316msgstr "Tocar para desbloquear"
316msgstr "Tocar para desbloquear"
317
317
318−#: qml/Greeter/NarrowView.qml:53 qml/Wizard/Pages/passwd-confirm.qml:53
318+#: qml/Greeter/NarrowView.qml:54 qml/Wizard/Pages/passwd-confirm.qml:53
319msgid "Sorry, incorrect passphrase."
319msgid "Sorry, incorrect passphrase."
320msgstr "Sentímolo a frase é incorrecta."
320msgstr "Sentímolo a frase é incorrecta."
321
321
322−#: qml/Greeter/NarrowView.qml:54 qml/Wizard/Pages/passwd-confirm.qml:54
322+#: qml/Greeter/NarrowView.qml:55 qml/Wizard/Pages/passwd-confirm.qml:54
323msgid "Sorry, incorrect passcode."
323msgid "Sorry, incorrect passcode."
324msgstr "Sentímolo, a clave é incorrecta."
324msgstr "Sentímolo, a clave é incorrecta."
325
325
326−#: qml/Greeter/NarrowView.qml:55
326+#: qml/Greeter/NarrowView.qml:56
327msgid "This will be your last attempt."
327msgid "This will be your last attempt."
328msgstr "Este será o seu último intento."
328msgstr "Este será o seu último intento."
329
329
330−#: qml/Greeter/NarrowView.qml:57
330+#: qml/Greeter/NarrowView.qml:58
331msgid ""
331msgid ""
332"If passphrase is entered incorrectly, your phone will conduct a factory "
332"If passphrase is entered incorrectly, your phone will conduct a factory "
333"reset and all personal data will be deleted."
333"reset and all personal data will be deleted."
@@ -335,7 +335,7 @@ msgstr ""
335"Se a frase de paso introducida é incorrecta, o teléfono restabelecerá os "
335"Se a frase de paso introducida é incorrecta, o teléfono restabelecerá os "
336"valores de fábrica e perderá todos os datos persoais."
336"valores de fábrica e perderá todos os datos persoais."
337
337
338−#: qml/Greeter/NarrowView.qml:58
338+#: qml/Greeter/NarrowView.qml:59
339msgid ""
339msgid ""
340"If passcode is entered incorrectly, your phone will conduct a factory reset "
340"If passcode is entered incorrectly, your phone will conduct a factory reset "
341"and all personal data will be deleted."
341"and all personal data will be deleted."
@@ -343,33 +343,34 @@ msgstr ""
343"Se a clave introducida é incorrecta, o teléfono restabelecerá os valores de "
343"Se a clave introducida é incorrecta, o teléfono restabelecerá os valores de "
344"fábrica e perderá todos os datos persoais."
344"fábrica e perderá todos os datos persoais."
345
345
346−#: qml/Greeter/NarrowView.qml:115
346+#: qml/Greeter/NarrowView.qml:116
347#, qt-format
347#, qt-format
348msgid "Enter %1"
348msgid "Enter %1"
349msgstr "Introducir %1"
349msgstr "Introducir %1"
350
350
351−#: qml/Greeter/NarrowView.qml:116 qml/Wizard/Pages/passwd-set.qml:60
351+#: qml/Greeter/NarrowView.qml:117 qml/Wizard/Pages/passwd-set.qml:60
352msgid "Enter passphrase"
352msgid "Enter passphrase"
353msgstr "Introduza a frase secreta"
353msgstr "Introduza a frase secreta"
354
354
355−#: qml/Greeter/NarrowView.qml:117
355+#: qml/Greeter/NarrowView.qml:118
356msgid "Enter passcode"
356msgid "Enter passcode"
357msgstr "Introduza a clave"
357msgstr "Introduza a clave"
358
358
359−#: qml/Greeter/NarrowView.qml:118
359+#: qml/Greeter/NarrowView.qml:119
360#, qt-format
360#, qt-format
361msgid "Sorry, incorrect %1"
361msgid "Sorry, incorrect %1"
362msgstr "Sentímolo, %1 non coincide"
362msgstr "Sentímolo, %1 non coincide"
363
363
364−#: qml/Greeter/NarrowView.qml:119
364+#: qml/Greeter/NarrowView.qml:120
365msgid "Sorry, incorrect passphrase"
365msgid "Sorry, incorrect passphrase"
366msgstr "Sentímolo a frase é incorrecta"
366msgstr "Sentímolo a frase é incorrecta"
367
367
368−#: qml/Greeter/NarrowView.qml:120
368+#: qml/Greeter/NarrowView.qml:121
369+msgctxt "passphrase"
369msgid "Please re-enter"
370msgid "Please re-enter"
370msgstr "Introducir de novo"
371msgstr "Introducir de novo"
371
372
372−#: qml/Greeter/NarrowView.qml:121
373+#: qml/Greeter/NarrowView.qml:122
373msgid "Sorry, incorrect passcode"
374msgid "Sorry, incorrect passcode"
374msgstr "Sentímolo, a clave é incorrecta"
375msgstr "Sentímolo, a clave é incorrecta"
375
376
@@ -379,7 +380,7 @@ msgstr "Mostrar contrasinal"
379
380
380#: qml/Panel/ActiveCallHint.qml:79
381#: qml/Panel/ActiveCallHint.qml:79
381msgid "Tap to return to call..."
382msgid "Tap to return to call..."
382−msgstr "Toque para volver a chamar..."
383+msgstr "Toque para volver á chamada..."
383
384
384#: qml/Panel/ActiveCallHint.qml:92
385#: qml/Panel/ActiveCallHint.qml:92
385msgid "Conference"
386msgid "Conference"
@@ -519,38 +520,6 @@ msgctxt "Button: Go back one page in the Wizard"
519msgid "Back"
520msgid "Back"
520msgstr "Atrás"
521msgstr "Atrás"
521
522
522−#: qml/Wizard/Pages/here-terms.qml:27
523−msgid "Terms & Conditions"
524−msgstr "Termos e condicións"
525−
526−#: qml/Wizard/Pages/passwd-confirm.qml:49
527−msgid "Confirm passphrase"
528−msgstr "Confirmar a frase secreta"
529−
530−#: qml/Wizard/Pages/passwd-confirm.qml:50
531−msgid "Confirm passcode"
532−msgstr "Confirmar a clave"
533−
534−#: qml/Wizard/Pages/passwd-confirm.qml:53
535−#: qml/Wizard/Pages/passwd-confirm.qml:54
536−msgid "Please try again."
537−msgstr "Ténteo de novo."
538−
539−#: qml/Wizard/Pages/passwd-confirm.qml:82 qml/Wizard/Pages/passwd-set.qml:90
540−#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:128
541−#: qml/Wizard/Pages/40-wifi.qml:215 qml/Wizard/Pages/50-location.qml:131
542−#: qml/Wizard/Pages/60-reporting.qml:50
543−msgid "Continue"
544−msgstr "Continuar"
545−
546−#: qml/Wizard/Pages/passwd-set.qml:61
547−msgid "Choose your passcode"
548−msgstr "Escolla unha clave"
549−
550−#: qml/Wizard/Pages/passwd-set.qml:68
551−msgid "Passphrase must be 4 characters long"
552−msgstr "A frase secreta debe ter 4 caracteres"
553−
554#: qml/Wizard/Pages/10-welcome.qml:27
523#: qml/Wizard/Pages/10-welcome.qml:27
555msgid "Hi!"
524msgid "Hi!"
556msgstr "Boas!"
525msgstr "Boas!"
@@ -563,6 +532,13 @@ msgstr "Benvido/a ao seu teléfono Ubuntu."
563msgid "Let’s get started."
532msgid "Let’s get started."
564msgstr "Comezamos."
533msgstr "Comezamos."
565
534
535+#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:128
536+#: qml/Wizard/Pages/40-wifi.qml:215 qml/Wizard/Pages/50-location.qml:131
537+#: qml/Wizard/Pages/60-reporting.qml:50 qml/Wizard/Pages/passwd-confirm.qml:82
538+#: qml/Wizard/Pages/passwd-set.qml:90
539+msgid "Continue"
540+msgstr "Continuar"
541+
566#: qml/Wizard/Pages/20-sim.qml:25
542#: qml/Wizard/Pages/20-sim.qml:25
567msgid "Add a SIM card and restart your device"
543msgid "Add a SIM card and restart your device"
568msgstr "Engada unha tarxeta SIM e reinicie o dispositivo"
544msgstr "Engada unha tarxeta SIM e reinicie o dispositivo"
@@ -695,6 +671,31 @@ msgstr "Xa ten o teléfono listo para usar."
695msgid "Finish"
671msgid "Finish"
696msgstr "Rematar"
672msgstr "Rematar"
697
673
674+#: qml/Wizard/Pages/here-terms.qml:27
675+msgid "Terms & Conditions"
676+msgstr "Termos e condicións"
677+
678+#: qml/Wizard/Pages/passwd-confirm.qml:49
679+msgid "Confirm passphrase"
680+msgstr "Confirmar a frase secreta"
681+
682+#: qml/Wizard/Pages/passwd-confirm.qml:50
683+msgid "Confirm passcode"
684+msgstr "Confirmar a clave"
685+
686+#: qml/Wizard/Pages/passwd-confirm.qml:53
687+#: qml/Wizard/Pages/passwd-confirm.qml:54
688+msgid "Please try again."
689+msgstr "Ténteo de novo."
690+
691+#: qml/Wizard/Pages/passwd-set.qml:61
692+msgid "Choose your passcode"
693+msgstr "Escolla unha clave"
694+
695+#: qml/Wizard/Pages/passwd-set.qml:68
696+msgid "Passphrase must be 4 characters long"
697+msgstr "A frase secreta debe ter 4 caracteres"
698+
698#. Translators: This is the arrow for "Back" buttons
699#. Translators: This is the arrow for "Back" buttons
699#: qml/Wizard/StackButton.qml:39
700#: qml/Wizard/StackButton.qml:39
700#, qt-format
701#, qt-format
@@ -799,3 +800,6 @@ msgstr "%1 〉"
799
800
800#~ msgid "Manage Scopes"
801#~ msgid "Manage Scopes"
801#~ msgstr "Xestionar os Ámbitos"
802#~ msgstr "Xestionar os Ámbitos"
803+
804+#~ msgid "Please re-enter"
805+#~ msgstr "Introducir de novo"
po/gv.po+51−50
@@ -7,7 +7,7 @@ msgid ""
7msgstr ""
7msgstr ""
8"Project-Id-Version: unity8\n"
8"Project-Id-Version: unity8\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2015-06-22 12:00+0200\n"
10+"POT-Creation-Date: 2015-07-17 10:10+0200\n"
11"PO-Revision-Date: 2015-04-02 14:24+0000\n"
11"PO-Revision-Date: 2015-04-02 14:24+0000\n"
12"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
12"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
13"Language-Team: Manx <gv@li.org>\n"
13"Language-Team: Manx <gv@li.org>\n"
@@ -15,8 +15,8 @@ msgstr ""
15"Content-Type: text/plain; charset=UTF-8\n"
15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n"
16"Content-Transfer-Encoding: 8bit\n"
17"Plural-Forms: nplurals=3; plural=n == 1 ? 0 : (n == 2 ? 1 : 2);\n"
17"Plural-Forms: nplurals=3; plural=n == 1 ? 0 : (n == 2 ? 1 : 2);\n"
18−"X-Launchpad-Export-Date: 2015-07-04 05:37+0000\n"
18+"X-Launchpad-Export-Date: 2015-07-25 05:39+0000\n"
19−"X-Generator: Launchpad (build 17597)\n"
19+"X-Generator: Launchpad (build 17628)\n"
20
20
21#: plugins/LightDM/Greeter.cpp:112
21#: plugins/LightDM/Greeter.cpp:112
22msgid "Password: "
22msgid "Password: "
@@ -230,15 +230,15 @@ msgstr "Eam eginit"
230msgid "OK"
230msgid "OK"
231msgstr "Mie dy liooar"
231msgstr "Mie dy liooar"
232
232
233−#: qml/Dash/GenericScopeView.qml:532 qml/Dash/GenericScopeView.qml:690
233+#: qml/Dash/GenericScopeView.qml:539 qml/Dash/GenericScopeView.qml:697
234msgid "See less"
234msgid "See less"
235msgstr "Faik ny sloo"
235msgstr "Faik ny sloo"
236
236
237−#: qml/Dash/GenericScopeView.qml:532
237+#: qml/Dash/GenericScopeView.qml:539
238msgid "See all"
238msgid "See all"
239msgstr "Faik ooilley"
239msgstr "Faik ooilley"
240
240
241−#: qml/Dash/GenericScopeView.qml:594
241+#: qml/Dash/GenericScopeView.qml:601
242msgctxt "Label: Hint for dash search line edit"
242msgctxt "Label: Hint for dash search line edit"
243msgid "Search"
243msgid "Search"
244msgstr ""
244msgstr ""
@@ -322,57 +322,58 @@ msgstr ""
322msgid "Tap to unlock"
322msgid "Tap to unlock"
323msgstr ""
323msgstr ""
324
324
325−#: qml/Greeter/NarrowView.qml:53 qml/Wizard/Pages/passwd-confirm.qml:53
325+#: qml/Greeter/NarrowView.qml:54 qml/Wizard/Pages/passwd-confirm.qml:53
326msgid "Sorry, incorrect passphrase."
326msgid "Sorry, incorrect passphrase."
327msgstr ""
327msgstr ""
328
328
329−#: qml/Greeter/NarrowView.qml:54 qml/Wizard/Pages/passwd-confirm.qml:54
329+#: qml/Greeter/NarrowView.qml:55 qml/Wizard/Pages/passwd-confirm.qml:54
330msgid "Sorry, incorrect passcode."
330msgid "Sorry, incorrect passcode."
331msgstr ""
331msgstr ""
332
332
333−#: qml/Greeter/NarrowView.qml:55
333+#: qml/Greeter/NarrowView.qml:56
334msgid "This will be your last attempt."
334msgid "This will be your last attempt."
335msgstr ""
335msgstr ""
336
336
337−#: qml/Greeter/NarrowView.qml:57
337+#: qml/Greeter/NarrowView.qml:58
338msgid ""
338msgid ""
339"If passphrase is entered incorrectly, your phone will conduct a factory "
339"If passphrase is entered incorrectly, your phone will conduct a factory "
340"reset and all personal data will be deleted."
340"reset and all personal data will be deleted."
341msgstr ""
341msgstr ""
342
342
343−#: qml/Greeter/NarrowView.qml:58
343+#: qml/Greeter/NarrowView.qml:59
344msgid ""
344msgid ""
345"If passcode is entered incorrectly, your phone will conduct a factory reset "
345"If passcode is entered incorrectly, your phone will conduct a factory reset "
346"and all personal data will be deleted."
346"and all personal data will be deleted."
347msgstr ""
347msgstr ""
348
348
349−#: qml/Greeter/NarrowView.qml:115
349+#: qml/Greeter/NarrowView.qml:116
350#, qt-format
350#, qt-format
351msgid "Enter %1"
351msgid "Enter %1"
352msgstr ""
352msgstr ""
353
353
354−#: qml/Greeter/NarrowView.qml:116 qml/Wizard/Pages/passwd-set.qml:60
354+#: qml/Greeter/NarrowView.qml:117 qml/Wizard/Pages/passwd-set.qml:60
355msgid "Enter passphrase"
355msgid "Enter passphrase"
356msgstr ""
356msgstr ""
357
357
358−#: qml/Greeter/NarrowView.qml:117
358+#: qml/Greeter/NarrowView.qml:118
359msgid "Enter passcode"
359msgid "Enter passcode"
360msgstr ""
360msgstr ""
361
361
362−#: qml/Greeter/NarrowView.qml:118
362+#: qml/Greeter/NarrowView.qml:119
363#, qt-format
363#, qt-format
364msgid "Sorry, incorrect %1"
364msgid "Sorry, incorrect %1"
365msgstr ""
365msgstr ""
366
366
367−#: qml/Greeter/NarrowView.qml:119
367+#: qml/Greeter/NarrowView.qml:120
368msgid "Sorry, incorrect passphrase"
368msgid "Sorry, incorrect passphrase"
369msgstr ""
369msgstr ""
370
370
371−#: qml/Greeter/NarrowView.qml:120
371+#: qml/Greeter/NarrowView.qml:121
372+msgctxt "passphrase"
372msgid "Please re-enter"
373msgid "Please re-enter"
373msgstr ""
374msgstr ""
374
375
375−#: qml/Greeter/NarrowView.qml:121
376+#: qml/Greeter/NarrowView.qml:122
376msgid "Sorry, incorrect passcode"
377msgid "Sorry, incorrect passcode"
377msgstr ""
378msgstr ""
378
379
@@ -522,38 +523,6 @@ msgctxt "Button: Go back one page in the Wizard"
522msgid "Back"
523msgid "Back"
523msgstr ""
524msgstr ""
524
525
525−#: qml/Wizard/Pages/here-terms.qml:27
526−msgid "Terms & Conditions"
527−msgstr ""
528−
529−#: qml/Wizard/Pages/passwd-confirm.qml:49
530−msgid "Confirm passphrase"
531−msgstr ""
532−
533−#: qml/Wizard/Pages/passwd-confirm.qml:50
534−msgid "Confirm passcode"
535−msgstr ""
536−
537−#: qml/Wizard/Pages/passwd-confirm.qml:53
538−#: qml/Wizard/Pages/passwd-confirm.qml:54
539−msgid "Please try again."
540−msgstr ""
541−
542−#: qml/Wizard/Pages/passwd-confirm.qml:82 qml/Wizard/Pages/passwd-set.qml:90
543−#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:128
544−#: qml/Wizard/Pages/40-wifi.qml:215 qml/Wizard/Pages/50-location.qml:131
545−#: qml/Wizard/Pages/60-reporting.qml:50
546−msgid "Continue"
547−msgstr ""
548−
549−#: qml/Wizard/Pages/passwd-set.qml:61
550−msgid "Choose your passcode"
551−msgstr ""
552−
553−#: qml/Wizard/Pages/passwd-set.qml:68
554−msgid "Passphrase must be 4 characters long"
555−msgstr ""
556−
557#: qml/Wizard/Pages/10-welcome.qml:27
526#: qml/Wizard/Pages/10-welcome.qml:27
558msgid "Hi!"
527msgid "Hi!"
559msgstr ""
528msgstr ""
@@ -566,6 +535,13 @@ msgstr ""
566msgid "Let’s get started."
535msgid "Let’s get started."
567msgstr ""
536msgstr ""
568
537
538+#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:128
539+#: qml/Wizard/Pages/40-wifi.qml:215 qml/Wizard/Pages/50-location.qml:131
540+#: qml/Wizard/Pages/60-reporting.qml:50 qml/Wizard/Pages/passwd-confirm.qml:82
541+#: qml/Wizard/Pages/passwd-set.qml:90
542+msgid "Continue"
543+msgstr ""
544+
569#: qml/Wizard/Pages/20-sim.qml:25
545#: qml/Wizard/Pages/20-sim.qml:25
570msgid "Add a SIM card and restart your device"
546msgid "Add a SIM card and restart your device"
571msgstr ""
547msgstr ""
@@ -691,6 +667,31 @@ msgstr ""
691msgid "Finish"
667msgid "Finish"
692msgstr ""
668msgstr ""
693
669
670+#: qml/Wizard/Pages/here-terms.qml:27
671+msgid "Terms & Conditions"
672+msgstr ""
673+
674+#: qml/Wizard/Pages/passwd-confirm.qml:49
675+msgid "Confirm passphrase"
676+msgstr ""
677+
678+#: qml/Wizard/Pages/passwd-confirm.qml:50
679+msgid "Confirm passcode"
680+msgstr ""
681+
682+#: qml/Wizard/Pages/passwd-confirm.qml:53
683+#: qml/Wizard/Pages/passwd-confirm.qml:54
684+msgid "Please try again."
685+msgstr ""
686+
687+#: qml/Wizard/Pages/passwd-set.qml:61
688+msgid "Choose your passcode"
689+msgstr ""
690+
691+#: qml/Wizard/Pages/passwd-set.qml:68
692+msgid "Passphrase must be 4 characters long"
693+msgstr ""
694+
694#. Translators: This is the arrow for "Back" buttons
695#. Translators: This is the arrow for "Back" buttons
695#: qml/Wizard/StackButton.qml:39
696#: qml/Wizard/StackButton.qml:39
696#, qt-format
697#, qt-format
po/he.po+51−50
@@ -7,7 +7,7 @@ msgid ""
7msgstr ""
7msgstr ""
8"Project-Id-Version: unity\n"
8"Project-Id-Version: unity\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2015-06-22 12:00+0200\n"
10+"POT-Creation-Date: 2015-07-17 10:10+0200\n"
11"PO-Revision-Date: 2015-07-12 08:47+0000\n"
11"PO-Revision-Date: 2015-07-12 08:47+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"
@@ -15,8 +15,8 @@ msgstr ""
15"Content-Type: text/plain; charset=UTF-8\n"
15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n"
16"Content-Transfer-Encoding: 8bit\n"
17"Plural-Forms: nplurals=2; plural=n != 1;\n"
17"Plural-Forms: nplurals=2; plural=n != 1;\n"
18−"X-Launchpad-Export-Date: 2015-07-13 05:36+0000\n"
18+"X-Launchpad-Export-Date: 2015-07-25 05:39+0000\n"
19−"X-Generator: Launchpad (build 17620)\n"
19+"X-Generator: Launchpad (build 17628)\n"
20
20
21#: plugins/LightDM/Greeter.cpp:112
21#: plugins/LightDM/Greeter.cpp:112
22msgid "Password: "
22msgid "Password: "
@@ -223,15 +223,15 @@ msgstr "שיחת חירום"
223msgid "OK"
223msgid "OK"
224msgstr "אישור"
224msgstr "אישור"
225
225
226−#: qml/Dash/GenericScopeView.qml:532 qml/Dash/GenericScopeView.qml:690
226+#: qml/Dash/GenericScopeView.qml:539 qml/Dash/GenericScopeView.qml:697
227msgid "See less"
227msgid "See less"
228msgstr "לראות פחות"
228msgstr "לראות פחות"
229
229
230−#: qml/Dash/GenericScopeView.qml:532
230+#: qml/Dash/GenericScopeView.qml:539
231msgid "See all"
231msgid "See all"
232msgstr "להציג הכול"
232msgstr "להציג הכול"
233
233
234−#: qml/Dash/GenericScopeView.qml:594
234+#: qml/Dash/GenericScopeView.qml:601
235msgctxt "Label: Hint for dash search line edit"
235msgctxt "Label: Hint for dash search line edit"
236msgid "Search"
236msgid "Search"
237msgstr "חיפוש"
237msgstr "חיפוש"
@@ -315,57 +315,58 @@ msgstr "ניסיון חוזר"
315msgid "Tap to unlock"
315msgid "Tap to unlock"
316msgstr "יש לגעת כדי לשחרר נעילה"
316msgstr "יש לגעת כדי לשחרר נעילה"
317
317
318−#: qml/Greeter/NarrowView.qml:53 qml/Wizard/Pages/passwd-confirm.qml:53
318+#: qml/Greeter/NarrowView.qml:54 qml/Wizard/Pages/passwd-confirm.qml:53
319msgid "Sorry, incorrect passphrase."
319msgid "Sorry, incorrect passphrase."
320msgstr "מילת הצופן שגויה, עמך הסליחה."
320msgstr "מילת הצופן שגויה, עמך הסליחה."
321
321
322−#: qml/Greeter/NarrowView.qml:54 qml/Wizard/Pages/passwd-confirm.qml:54
322+#: qml/Greeter/NarrowView.qml:55 qml/Wizard/Pages/passwd-confirm.qml:54
323msgid "Sorry, incorrect passcode."
323msgid "Sorry, incorrect passcode."
324msgstr "הצופן שגוי, עם הסליחה."
324msgstr "הצופן שגוי, עם הסליחה."
325
325
326−#: qml/Greeter/NarrowView.qml:55
326+#: qml/Greeter/NarrowView.qml:56
327msgid "This will be your last attempt."
327msgid "This will be your last attempt."
328msgstr "זה יהיה הניסיון האחרון שלך."
328msgstr "זה יהיה הניסיון האחרון שלך."
329
329
330−#: qml/Greeter/NarrowView.qml:57
330+#: qml/Greeter/NarrowView.qml:58
331msgid ""
331msgid ""
332"If passphrase is entered incorrectly, your phone will conduct a factory "
332"If passphrase is entered incorrectly, your phone will conduct a factory "
333"reset and all personal data will be deleted."
333"reset and all personal data will be deleted."
334msgstr ""
334msgstr ""
335
335
336−#: qml/Greeter/NarrowView.qml:58
336+#: qml/Greeter/NarrowView.qml:59
337msgid ""
337msgid ""
338"If passcode is entered incorrectly, your phone will conduct a factory reset "
338"If passcode is entered incorrectly, your phone will conduct a factory reset "
339"and all personal data will be deleted."
339"and all personal data will be deleted."
340msgstr ""
340msgstr ""
341
341
342−#: qml/Greeter/NarrowView.qml:115
342+#: qml/Greeter/NarrowView.qml:116
343#, qt-format
343#, qt-format
344msgid "Enter %1"
344msgid "Enter %1"
345msgstr ""
345msgstr ""
346
346
347−#: qml/Greeter/NarrowView.qml:116 qml/Wizard/Pages/passwd-set.qml:60
347+#: qml/Greeter/NarrowView.qml:117 qml/Wizard/Pages/passwd-set.qml:60
348msgid "Enter passphrase"
348msgid "Enter passphrase"
349msgstr "נא להזין מילת צופן"
349msgstr "נא להזין מילת צופן"
350
350
351−#: qml/Greeter/NarrowView.qml:117
351+#: qml/Greeter/NarrowView.qml:118
352msgid "Enter passcode"
352msgid "Enter passcode"
353msgstr ""
353msgstr ""
354
354
355−#: qml/Greeter/NarrowView.qml:118
355+#: qml/Greeter/NarrowView.qml:119
356#, qt-format
356#, qt-format
357msgid "Sorry, incorrect %1"
357msgid "Sorry, incorrect %1"
358msgstr ""
358msgstr ""
359
359
360−#: qml/Greeter/NarrowView.qml:119
360+#: qml/Greeter/NarrowView.qml:120
361msgid "Sorry, incorrect passphrase"
361msgid "Sorry, incorrect passphrase"
362msgstr "מילת הצופן שגויה, עמך הסליחה."
362msgstr "מילת הצופן שגויה, עמך הסליחה."
363
363
364−#: qml/Greeter/NarrowView.qml:120
364+#: qml/Greeter/NarrowView.qml:121
365+msgctxt "passphrase"
365msgid "Please re-enter"
366msgid "Please re-enter"
366msgstr ""
367msgstr ""
367
368
368−#: qml/Greeter/NarrowView.qml:121
369+#: qml/Greeter/NarrowView.qml:122
369msgid "Sorry, incorrect passcode"
370msgid "Sorry, incorrect passcode"
370msgstr ""
371msgstr ""
371
372
@@ -515,38 +516,6 @@ msgctxt "Button: Go back one page in the Wizard"
515msgid "Back"
516msgid "Back"
516msgstr ""
517msgstr ""
517
518
518−#: qml/Wizard/Pages/here-terms.qml:27
519−msgid "Terms & Conditions"
520−msgstr "תנאי שימוש"
521−
522−#: qml/Wizard/Pages/passwd-confirm.qml:49
523−msgid "Confirm passphrase"
524−msgstr "אישור מילת הצופן"
525−
526−#: qml/Wizard/Pages/passwd-confirm.qml:50
527−msgid "Confirm passcode"
528−msgstr "אישור קוד הצופן"
529−
530−#: qml/Wizard/Pages/passwd-confirm.qml:53
531−#: qml/Wizard/Pages/passwd-confirm.qml:54
532−msgid "Please try again."
533−msgstr "נא לנסות שוב."
534−
535−#: qml/Wizard/Pages/passwd-confirm.qml:82 qml/Wizard/Pages/passwd-set.qml:90
536−#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:128
537−#: qml/Wizard/Pages/40-wifi.qml:215 qml/Wizard/Pages/50-location.qml:131
538−#: qml/Wizard/Pages/60-reporting.qml:50
539−msgid "Continue"
540−msgstr "להמשיך"
541−
542−#: qml/Wizard/Pages/passwd-set.qml:61
543−msgid "Choose your passcode"
544−msgstr "בחירת קוד הצופן שלך"
545−
546−#: qml/Wizard/Pages/passwd-set.qml:68
547−msgid "Passphrase must be 4 characters long"
548−msgstr ""
549−
550#: qml/Wizard/Pages/10-welcome.qml:27
519#: qml/Wizard/Pages/10-welcome.qml:27
551msgid "Hi!"
520msgid "Hi!"
552msgstr "שלום!"
521msgstr "שלום!"
@@ -559,6 +528,13 @@ msgstr "ברוך בואך לטלפון האובונטו שלך."
559msgid "Let’s get started."
528msgid "Let’s get started."
560msgstr "קדימה, מתחילים."
529msgstr "קדימה, מתחילים."
561
530
531+#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:128
532+#: qml/Wizard/Pages/40-wifi.qml:215 qml/Wizard/Pages/50-location.qml:131
533+#: qml/Wizard/Pages/60-reporting.qml:50 qml/Wizard/Pages/passwd-confirm.qml:82
534+#: qml/Wizard/Pages/passwd-set.qml:90
535+msgid "Continue"
536+msgstr "להמשיך"
537+
562#: qml/Wizard/Pages/20-sim.qml:25
538#: qml/Wizard/Pages/20-sim.qml:25
563msgid "Add a SIM card and restart your device"
539msgid "Add a SIM card and restart your device"
564msgstr "יש להוסיף כרטיס SIM ולהפעיל את ההתקן מחדש"
540msgstr "יש להוסיף כרטיס SIM ולהפעיל את ההתקן מחדש"
@@ -684,6 +660,31 @@ msgstr "הטלפון שלך מוכן לשימוש."
684msgid "Finish"
660msgid "Finish"
685msgstr "סיום"
661msgstr "סיום"
686
662
663+#: qml/Wizard/Pages/here-terms.qml:27
664+msgid "Terms & Conditions"
665+msgstr "תנאי שימוש"
666+
667+#: qml/Wizard/Pages/passwd-confirm.qml:49
668+msgid "Confirm passphrase"
669+msgstr "אישור מילת הצופן"
670+
671+#: qml/Wizard/Pages/passwd-confirm.qml:50
672+msgid "Confirm passcode"
673+msgstr "אישור קוד הצופן"
674+
675+#: qml/Wizard/Pages/passwd-confirm.qml:53
676+#: qml/Wizard/Pages/passwd-confirm.qml:54
677+msgid "Please try again."
678+msgstr "נא לנסות שוב."
679+
680+#: qml/Wizard/Pages/passwd-set.qml:61
681+msgid "Choose your passcode"
682+msgstr "בחירת קוד הצופן שלך"
683+
684+#: qml/Wizard/Pages/passwd-set.qml:68
685+msgid "Passphrase must be 4 characters long"
686+msgstr ""
687+
687#. Translators: This is the arrow for "Back" buttons
688#. Translators: This is the arrow for "Back" buttons
688#: qml/Wizard/StackButton.qml:39
689#: qml/Wizard/StackButton.qml:39
689#, qt-format
690#, qt-format
po/hi.po+51−50
@@ -7,7 +7,7 @@ msgid ""
7msgstr ""
7msgstr ""
8"Project-Id-Version: unity8\n"
8"Project-Id-Version: unity8\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2015-06-22 12:00+0200\n"
10+"POT-Creation-Date: 2015-07-17 10:10+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 Shanmugam <Unknown>\n"
12"Last-Translator: Siddhanathan Shanmugam <Unknown>\n"
13"Language-Team: Hindi <hi@li.org>\n"
13"Language-Team: Hindi <hi@li.org>\n"
@@ -15,8 +15,8 @@ msgstr ""
15"Content-Type: text/plain; charset=UTF-8\n"
15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n"
16"Content-Transfer-Encoding: 8bit\n"
17"Plural-Forms: nplurals=2; plural=n != 1;\n"
17"Plural-Forms: nplurals=2; plural=n != 1;\n"
18−"X-Launchpad-Export-Date: 2015-07-04 05:37+0000\n"
18+"X-Launchpad-Export-Date: 2015-07-25 05:39+0000\n"
19−"X-Generator: Launchpad (build 17597)\n"
19+"X-Generator: Launchpad (build 17628)\n"
20
20
21#: plugins/LightDM/Greeter.cpp:112
21#: plugins/LightDM/Greeter.cpp:112
22msgid "Password: "
22msgid "Password: "
@@ -223,15 +223,15 @@ msgstr "आपातकालीन कॉल"
223msgid "OK"
223msgid "OK"
224msgstr ""
224msgstr ""
225
225
226−#: qml/Dash/GenericScopeView.qml:532 qml/Dash/GenericScopeView.qml:690
226+#: qml/Dash/GenericScopeView.qml:539 qml/Dash/GenericScopeView.qml:697
227msgid "See less"
227msgid "See less"
228msgstr ""
228msgstr ""
229
229
230−#: qml/Dash/GenericScopeView.qml:532
230+#: qml/Dash/GenericScopeView.qml:539
231msgid "See all"
231msgid "See all"
232msgstr ""
232msgstr ""
233
233
234−#: qml/Dash/GenericScopeView.qml:594
234+#: qml/Dash/GenericScopeView.qml:601
235msgctxt "Label: Hint for dash search line edit"
235msgctxt "Label: Hint for dash search line edit"
236msgid "Search"
236msgid "Search"
237msgstr ""
237msgstr ""
@@ -315,57 +315,58 @@ msgstr ""
315msgid "Tap to unlock"
315msgid "Tap to unlock"
316msgstr ""
316msgstr ""
317
317
318−#: qml/Greeter/NarrowView.qml:53 qml/Wizard/Pages/passwd-confirm.qml:53
318+#: qml/Greeter/NarrowView.qml:54 qml/Wizard/Pages/passwd-confirm.qml:53
319msgid "Sorry, incorrect passphrase."
319msgid "Sorry, incorrect passphrase."
320msgstr ""
320msgstr ""
321
321
322−#: qml/Greeter/NarrowView.qml:54 qml/Wizard/Pages/passwd-confirm.qml:54
322+#: qml/Greeter/NarrowView.qml:55 qml/Wizard/Pages/passwd-confirm.qml:54
323msgid "Sorry, incorrect passcode."
323msgid "Sorry, incorrect passcode."
324msgstr ""
324msgstr ""
325
325
326−#: qml/Greeter/NarrowView.qml:55
326+#: qml/Greeter/NarrowView.qml:56
327msgid "This will be your last attempt."
327msgid "This will be your last attempt."
328msgstr ""
328msgstr ""
329
329
330−#: qml/Greeter/NarrowView.qml:57
330+#: qml/Greeter/NarrowView.qml:58
331msgid ""
331msgid ""
332"If passphrase is entered incorrectly, your phone will conduct a factory "
332"If passphrase is entered incorrectly, your phone will conduct a factory "
333"reset and all personal data will be deleted."
333"reset and all personal data will be deleted."
334msgstr ""
334msgstr ""
335
335
336−#: qml/Greeter/NarrowView.qml:58
336+#: qml/Greeter/NarrowView.qml:59
337msgid ""
337msgid ""
338"If passcode is entered incorrectly, your phone will conduct a factory reset "
338"If passcode is entered incorrectly, your phone will conduct a factory reset "
339"and all personal data will be deleted."
339"and all personal data will be deleted."
340msgstr ""
340msgstr ""
341
341
342−#: qml/Greeter/NarrowView.qml:115
342+#: qml/Greeter/NarrowView.qml:116
343#, qt-format
343#, qt-format
344msgid "Enter %1"
344msgid "Enter %1"
345msgstr ""
345msgstr ""
346
346
347−#: qml/Greeter/NarrowView.qml:116 qml/Wizard/Pages/passwd-set.qml:60
347+#: qml/Greeter/NarrowView.qml:117 qml/Wizard/Pages/passwd-set.qml:60
348msgid "Enter passphrase"
348msgid "Enter passphrase"
349msgstr ""
349msgstr ""
350
350
351−#: qml/Greeter/NarrowView.qml:117
351+#: qml/Greeter/NarrowView.qml:118
352msgid "Enter passcode"
352msgid "Enter passcode"
353msgstr ""
353msgstr ""
354
354
355−#: qml/Greeter/NarrowView.qml:118
355+#: qml/Greeter/NarrowView.qml:119
356#, qt-format
356#, qt-format
357msgid "Sorry, incorrect %1"
357msgid "Sorry, incorrect %1"
358msgstr ""
358msgstr ""
359
359
360−#: qml/Greeter/NarrowView.qml:119
360+#: qml/Greeter/NarrowView.qml:120
361msgid "Sorry, incorrect passphrase"
361msgid "Sorry, incorrect passphrase"
362msgstr ""
362msgstr ""
363
363
364−#: qml/Greeter/NarrowView.qml:120
364+#: qml/Greeter/NarrowView.qml:121
365+msgctxt "passphrase"
365msgid "Please re-enter"
366msgid "Please re-enter"
366msgstr ""
367msgstr ""
367
368
368−#: qml/Greeter/NarrowView.qml:121
369+#: qml/Greeter/NarrowView.qml:122
369msgid "Sorry, incorrect passcode"
370msgid "Sorry, incorrect passcode"
370msgstr ""
371msgstr ""
371
372
@@ -515,38 +516,6 @@ msgctxt "Button: Go back one page in the Wizard"
515msgid "Back"
516msgid "Back"
516msgstr ""
517msgstr ""
517
518
518−#: qml/Wizard/Pages/here-terms.qml:27
519−msgid "Terms & Conditions"
520−msgstr ""
521−
522−#: qml/Wizard/Pages/passwd-confirm.qml:49
523−msgid "Confirm passphrase"
524−msgstr ""
525−
526−#: qml/Wizard/Pages/passwd-confirm.qml:50
527−msgid "Confirm passcode"
528−msgstr ""
529−
530−#: qml/Wizard/Pages/passwd-confirm.qml:53
531−#: qml/Wizard/Pages/passwd-confirm.qml:54
532−msgid "Please try again."
533−msgstr ""
534−
535−#: qml/Wizard/Pages/passwd-confirm.qml:82 qml/Wizard/Pages/passwd-set.qml:90
536−#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:128
537−#: qml/Wizard/Pages/40-wifi.qml:215 qml/Wizard/Pages/50-location.qml:131
538−#: qml/Wizard/Pages/60-reporting.qml:50
539−msgid "Continue"
540−msgstr ""
541−
542−#: qml/Wizard/Pages/passwd-set.qml:61
543−msgid "Choose your passcode"
544−msgstr ""
545−
546−#: qml/Wizard/Pages/passwd-set.qml:68
547−msgid "Passphrase must be 4 characters long"
548−msgstr ""
549−
550#: qml/Wizard/Pages/10-welcome.qml:27
519#: qml/Wizard/Pages/10-welcome.qml:27
551msgid "Hi!"
520msgid "Hi!"
552msgstr ""
521msgstr ""
@@ -559,6 +528,13 @@ msgstr ""
559msgid "Let’s get started."
528msgid "Let’s get started."
560msgstr ""
529msgstr ""
561
530
531+#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:128
532+#: qml/Wizard/Pages/40-wifi.qml:215 qml/Wizard/Pages/50-location.qml:131
533+#: qml/Wizard/Pages/60-reporting.qml:50 qml/Wizard/Pages/passwd-confirm.qml:82
534+#: qml/Wizard/Pages/passwd-set.qml:90
535+msgid "Continue"
536+msgstr ""
537+
562#: qml/Wizard/Pages/20-sim.qml:25
538#: qml/Wizard/Pages/20-sim.qml:25
563msgid "Add a SIM card and restart your device"
539msgid "Add a SIM card and restart your device"
564msgstr ""
540msgstr ""
@@ -684,6 +660,31 @@ msgstr ""
684msgid "Finish"
660msgid "Finish"
685msgstr ""
661msgstr ""
686
662
663+#: qml/Wizard/Pages/here-terms.qml:27
664+msgid "Terms & Conditions"
665+msgstr ""
666+
667+#: qml/Wizard/Pages/passwd-confirm.qml:49
668+msgid "Confirm passphrase"
669+msgstr ""
670+
671+#: qml/Wizard/Pages/passwd-confirm.qml:50
672+msgid "Confirm passcode"
673+msgstr ""
674+
675+#: qml/Wizard/Pages/passwd-confirm.qml:53
676+#: qml/Wizard/Pages/passwd-confirm.qml:54
677+msgid "Please try again."
678+msgstr ""
679+
680+#: qml/Wizard/Pages/passwd-set.qml:61
681+msgid "Choose your passcode"
682+msgstr ""
683+
684+#: qml/Wizard/Pages/passwd-set.qml:68
685+msgid "Passphrase must be 4 characters long"
686+msgstr ""
687+
687#. Translators: This is the arrow for "Back" buttons
688#. Translators: This is the arrow for "Back" buttons
688#: qml/Wizard/StackButton.qml:39
689#: qml/Wizard/StackButton.qml:39
689#, qt-format
690#, qt-format
po/hr.po+51−50
@@ -7,7 +7,7 @@ msgid ""
7msgstr ""
7msgstr ""
8"Project-Id-Version: unity\n"
8"Project-Id-Version: unity\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2015-06-22 12:00+0200\n"
10+"POT-Creation-Date: 2015-07-17 10:10+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"
@@ -16,8 +16,8 @@ msgstr ""
16"Content-Transfer-Encoding: 8bit\n"
16"Content-Transfer-Encoding: 8bit\n"
17"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
17"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
18"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
18"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
19−"X-Launchpad-Export-Date: 2015-07-04 05:37+0000\n"
19+"X-Launchpad-Export-Date: 2015-07-25 05:39+0000\n"
20−"X-Generator: Launchpad (build 17597)\n"
20+"X-Generator: Launchpad (build 17628)\n"
21
21
22#: plugins/LightDM/Greeter.cpp:112
22#: plugins/LightDM/Greeter.cpp:112
23msgid "Password: "
23msgid "Password: "
@@ -224,15 +224,15 @@ msgstr ""
224msgid "OK"
224msgid "OK"
225msgstr ""
225msgstr ""
226
226
227−#: qml/Dash/GenericScopeView.qml:532 qml/Dash/GenericScopeView.qml:690
227+#: qml/Dash/GenericScopeView.qml:539 qml/Dash/GenericScopeView.qml:697
228msgid "See less"
228msgid "See less"
229msgstr ""
229msgstr ""
230
230
231−#: qml/Dash/GenericScopeView.qml:532
231+#: qml/Dash/GenericScopeView.qml:539
232msgid "See all"
232msgid "See all"
233msgstr ""
233msgstr ""
234
234
235−#: qml/Dash/GenericScopeView.qml:594
235+#: qml/Dash/GenericScopeView.qml:601
236msgctxt "Label: Hint for dash search line edit"
236msgctxt "Label: Hint for dash search line edit"
237msgid "Search"
237msgid "Search"
238msgstr ""
238msgstr ""
@@ -316,57 +316,58 @@ msgstr ""
316msgid "Tap to unlock"
316msgid "Tap to unlock"
317msgstr ""
317msgstr ""
318
318
319−#: qml/Greeter/NarrowView.qml:53 qml/Wizard/Pages/passwd-confirm.qml:53
319+#: qml/Greeter/NarrowView.qml:54 qml/Wizard/Pages/passwd-confirm.qml:53
320msgid "Sorry, incorrect passphrase."
320msgid "Sorry, incorrect passphrase."
321msgstr ""
321msgstr ""
322
322
323−#: qml/Greeter/NarrowView.qml:54 qml/Wizard/Pages/passwd-confirm.qml:54
323+#: qml/Greeter/NarrowView.qml:55 qml/Wizard/Pages/passwd-confirm.qml:54
324msgid "Sorry, incorrect passcode."
324msgid "Sorry, incorrect passcode."
325msgstr ""
325msgstr ""
326
326
327−#: qml/Greeter/NarrowView.qml:55
327+#: qml/Greeter/NarrowView.qml:56
328msgid "This will be your last attempt."
328msgid "This will be your last attempt."
329msgstr ""
329msgstr ""
330
330
331−#: qml/Greeter/NarrowView.qml:57
331+#: qml/Greeter/NarrowView.qml:58
332msgid ""
332msgid ""
333"If passphrase is entered incorrectly, your phone will conduct a factory "
333"If passphrase is entered incorrectly, your phone will conduct a factory "
334"reset and all personal data will be deleted."
334"reset and all personal data will be deleted."
335msgstr ""
335msgstr ""
336
336
337−#: qml/Greeter/NarrowView.qml:58
337+#: qml/Greeter/NarrowView.qml:59
338msgid ""
338msgid ""
339"If passcode is entered incorrectly, your phone will conduct a factory reset "
339"If passcode is entered incorrectly, your phone will conduct a factory reset "
340"and all personal data will be deleted."
340"and all personal data will be deleted."
341msgstr ""
341msgstr ""
342
342
343−#: qml/Greeter/NarrowView.qml:115
343+#: qml/Greeter/NarrowView.qml:116
344#, qt-format
344#, qt-format
345msgid "Enter %1"
345msgid "Enter %1"
346msgstr ""
346msgstr ""
347
347
348−#: qml/Greeter/NarrowView.qml:116 qml/Wizard/Pages/passwd-set.qml:60
348+#: qml/Greeter/NarrowView.qml:117 qml/Wizard/Pages/passwd-set.qml:60
349msgid "Enter passphrase"
349msgid "Enter passphrase"
350msgstr ""
350msgstr ""
351
351
352−#: qml/Greeter/NarrowView.qml:117
352+#: qml/Greeter/NarrowView.qml:118
353msgid "Enter passcode"
353msgid "Enter passcode"
354msgstr ""
354msgstr ""
355
355
356−#: qml/Greeter/NarrowView.qml:118
356+#: qml/Greeter/NarrowView.qml:119
357#, qt-format
357#, qt-format
358msgid "Sorry, incorrect %1"
358msgid "Sorry, incorrect %1"
359msgstr ""
359msgstr ""
360
360
361−#: qml/Greeter/NarrowView.qml:119
361+#: qml/Greeter/NarrowView.qml:120
362msgid "Sorry, incorrect passphrase"
362msgid "Sorry, incorrect passphrase"
363msgstr ""
363msgstr ""
364
364
365−#: qml/Greeter/NarrowView.qml:120
365+#: qml/Greeter/NarrowView.qml:121
366+msgctxt "passphrase"
366msgid "Please re-enter"
367msgid "Please re-enter"
367msgstr ""
368msgstr ""
368
369
369−#: qml/Greeter/NarrowView.qml:121
370+#: qml/Greeter/NarrowView.qml:122
370msgid "Sorry, incorrect passcode"
371msgid "Sorry, incorrect passcode"
371msgstr ""
372msgstr ""
372
373
@@ -516,38 +517,6 @@ msgctxt "Button: Go back one page in the Wizard"
516msgid "Back"
517msgid "Back"
517msgstr ""
518msgstr ""
518
519
519−#: qml/Wizard/Pages/here-terms.qml:27
520−msgid "Terms & Conditions"
521−msgstr ""
522−
523−#: qml/Wizard/Pages/passwd-confirm.qml:49
524−msgid "Confirm passphrase"
525−msgstr ""
526−
527−#: qml/Wizard/Pages/passwd-confirm.qml:50
528−msgid "Confirm passcode"
529−msgstr ""
530−
531−#: qml/Wizard/Pages/passwd-confirm.qml:53
532−#: qml/Wizard/Pages/passwd-confirm.qml:54
533−msgid "Please try again."
534−msgstr ""
535−
536−#: qml/Wizard/Pages/passwd-confirm.qml:82 qml/Wizard/Pages/passwd-set.qml:90
537−#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:128
538−#: qml/Wizard/Pages/40-wifi.qml:215 qml/Wizard/Pages/50-location.qml:131
539−#: qml/Wizard/Pages/60-reporting.qml:50
540−msgid "Continue"
541−msgstr ""
542−
543−#: qml/Wizard/Pages/passwd-set.qml:61
544−msgid "Choose your passcode"
545−msgstr ""
546−
547−#: qml/Wizard/Pages/passwd-set.qml:68
548−msgid "Passphrase must be 4 characters long"
549−msgstr ""
550−
551#: qml/Wizard/Pages/10-welcome.qml:27
520#: qml/Wizard/Pages/10-welcome.qml:27
552msgid "Hi!"
521msgid "Hi!"
553msgstr ""
522msgstr ""
@@ -560,6 +529,13 @@ msgstr ""
560msgid "Let’s get started."
529msgid "Let’s get started."
561msgstr ""
530msgstr ""
562
531
532+#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:128
533+#: qml/Wizard/Pages/40-wifi.qml:215 qml/Wizard/Pages/50-location.qml:131
534+#: qml/Wizard/Pages/60-reporting.qml:50 qml/Wizard/Pages/passwd-confirm.qml:82
535+#: qml/Wizard/Pages/passwd-set.qml:90
536+msgid "Continue"
537+msgstr ""
538+
563#: qml/Wizard/Pages/20-sim.qml:25
539#: qml/Wizard/Pages/20-sim.qml:25
564msgid "Add a SIM card and restart your device"
540msgid "Add a SIM card and restart your device"
565msgstr ""
541msgstr ""
@@ -685,6 +661,31 @@ msgstr ""
685msgid "Finish"
661msgid "Finish"
686msgstr ""
662msgstr ""
687
663
664+#: qml/Wizard/Pages/here-terms.qml:27
665+msgid "Terms & Conditions"
666+msgstr ""
667+
668+#: qml/Wizard/Pages/passwd-confirm.qml:49
669+msgid "Confirm passphrase"
670+msgstr ""
671+
672+#: qml/Wizard/Pages/passwd-confirm.qml:50
673+msgid "Confirm passcode"
674+msgstr ""
675+
676+#: qml/Wizard/Pages/passwd-confirm.qml:53
677+#: qml/Wizard/Pages/passwd-confirm.qml:54
678+msgid "Please try again."
679+msgstr ""
680+
681+#: qml/Wizard/Pages/passwd-set.qml:61
682+msgid "Choose your passcode"
683+msgstr ""
684+
685+#: qml/Wizard/Pages/passwd-set.qml:68
686+msgid "Passphrase must be 4 characters long"
687+msgstr ""
688+
688#. Translators: This is the arrow for "Back" buttons
689#. Translators: This is the arrow for "Back" buttons
689#: qml/Wizard/StackButton.qml:39
690#: qml/Wizard/StackButton.qml:39
690#, qt-format
691#, qt-format
po/hu.po+55−51
@@ -7,16 +7,16 @@ msgid ""
7msgstr ""
7msgstr ""
8"Project-Id-Version: unity\n"
8"Project-Id-Version: unity\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2015-06-22 12:00+0200\n"
10+"POT-Creation-Date: 2015-07-17 10:10+0200\n"
11−"PO-Revision-Date: 2015-07-04 11:42+0000\n"
11+"PO-Revision-Date: 2015-08-01 06:47+0000\n"
12"Last-Translator: Richard Somlói <ricsipontaz@gmail.com>\n"
12"Last-Translator: Richard Somlói <ricsipontaz@gmail.com>\n"
13"Language-Team: Hungarian <hu@li.org>\n"
13"Language-Team: Hungarian <hu@li.org>\n"
14"MIME-Version: 1.0\n"
14"MIME-Version: 1.0\n"
15"Content-Type: text/plain; charset=UTF-8\n"
15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n"
16"Content-Transfer-Encoding: 8bit\n"
17"Plural-Forms: nplurals=2; plural=n != 1;\n"
17"Plural-Forms: nplurals=2; plural=n != 1;\n"
18−"X-Launchpad-Export-Date: 2015-07-05 05:55+0000\n"
18+"X-Launchpad-Export-Date: 2015-08-02 05:36+0000\n"
19−"X-Generator: Launchpad (build 17597)\n"
19+"X-Generator: Launchpad (build 17656)\n"
20
20
21#: plugins/LightDM/Greeter.cpp:112
21#: plugins/LightDM/Greeter.cpp:112
22msgid "Password: "
22msgid "Password: "
@@ -225,15 +225,15 @@ msgstr "Vészhívás"
225msgid "OK"
225msgid "OK"
226msgstr "Ok"
226msgstr "Ok"
227
227
228−#: qml/Dash/GenericScopeView.qml:532 qml/Dash/GenericScopeView.qml:690
228+#: qml/Dash/GenericScopeView.qml:539 qml/Dash/GenericScopeView.qml:697
229msgid "See less"
229msgid "See less"
230msgstr "Kevesebb"
230msgstr "Kevesebb"
231
231
232−#: qml/Dash/GenericScopeView.qml:532
232+#: qml/Dash/GenericScopeView.qml:539
233msgid "See all"
233msgid "See all"
234msgstr "Összes megtekintése"
234msgstr "Összes megtekintése"
235
235
236−#: qml/Dash/GenericScopeView.qml:594
236+#: qml/Dash/GenericScopeView.qml:601
237msgctxt "Label: Hint for dash search line edit"
237msgctxt "Label: Hint for dash search line edit"
238msgid "Search"
238msgid "Search"
239msgstr "Keresés"
239msgstr "Keresés"
@@ -317,19 +317,19 @@ msgstr "Újra"
317msgid "Tap to unlock"
317msgid "Tap to unlock"
318msgstr "Koppintson a feloldáshoz"
318msgstr "Koppintson a feloldáshoz"
319
319
320−#: qml/Greeter/NarrowView.qml:53 qml/Wizard/Pages/passwd-confirm.qml:53
320+#: qml/Greeter/NarrowView.qml:54 qml/Wizard/Pages/passwd-confirm.qml:53
321msgid "Sorry, incorrect passphrase."
321msgid "Sorry, incorrect passphrase."
322msgstr "Elnézést, helytelen jelmondat."
322msgstr "Elnézést, helytelen jelmondat."
323
323
324−#: qml/Greeter/NarrowView.qml:54 qml/Wizard/Pages/passwd-confirm.qml:54
324+#: qml/Greeter/NarrowView.qml:55 qml/Wizard/Pages/passwd-confirm.qml:54
325msgid "Sorry, incorrect passcode."
325msgid "Sorry, incorrect passcode."
326msgstr "Elnézést, helytelen jelkód."
326msgstr "Elnézést, helytelen jelkód."
327
327
328−#: qml/Greeter/NarrowView.qml:55
328+#: qml/Greeter/NarrowView.qml:56
329msgid "This will be your last attempt."
329msgid "This will be your last attempt."
330msgstr "Ez az utolsó próbálkozási lehetősége."
330msgstr "Ez az utolsó próbálkozási lehetősége."
331
331
332−#: qml/Greeter/NarrowView.qml:57
332+#: qml/Greeter/NarrowView.qml:58
333msgid ""
333msgid ""
334"If passphrase is entered incorrectly, your phone will conduct a factory "
334"If passphrase is entered incorrectly, your phone will conduct a factory "
335"reset and all personal data will be deleted."
335"reset and all personal data will be deleted."
@@ -337,7 +337,7 @@ msgstr ""
337"Ha helytelen jelmondatot ad meg, a telefonja visszaállítja a gyári "
337"Ha helytelen jelmondatot ad meg, a telefonja visszaállítja a gyári "
338"beállításokat és törli minden személyes adatát."
338"beállításokat és törli minden személyes adatát."
339
339
340−#: qml/Greeter/NarrowView.qml:58
340+#: qml/Greeter/NarrowView.qml:59
341msgid ""
341msgid ""
342"If passcode is entered incorrectly, your phone will conduct a factory reset "
342"If passcode is entered incorrectly, your phone will conduct a factory reset "
343"and all personal data will be deleted."
343"and all personal data will be deleted."
@@ -345,33 +345,34 @@ msgstr ""
345"Ha helytelen jelkódot ad meg, a telefonja visszaállítja a gyári "
345"Ha helytelen jelkódot ad meg, a telefonja visszaállítja a gyári "
346"beállításokat és törli minden személyes adatát."
346"beállításokat és törli minden személyes adatát."
347
347
348−#: qml/Greeter/NarrowView.qml:115
348+#: qml/Greeter/NarrowView.qml:116
349#, qt-format
349#, qt-format
350msgid "Enter %1"
350msgid "Enter %1"
351msgstr "Adja meg: %1"
351msgstr "Adja meg: %1"
352
352
353−#: qml/Greeter/NarrowView.qml:116 qml/Wizard/Pages/passwd-set.qml:60
353+#: qml/Greeter/NarrowView.qml:117 qml/Wizard/Pages/passwd-set.qml:60
354msgid "Enter passphrase"
354msgid "Enter passphrase"
355msgstr "Jelmondat megadása"
355msgstr "Jelmondat megadása"
356
356
357−#: qml/Greeter/NarrowView.qml:117
357+#: qml/Greeter/NarrowView.qml:118
358msgid "Enter passcode"
358msgid "Enter passcode"
359msgstr "Jelkód megadása"
359msgstr "Jelkód megadása"
360
360
361−#: qml/Greeter/NarrowView.qml:118
361+#: qml/Greeter/NarrowView.qml:119
362#, qt-format
362#, qt-format
363msgid "Sorry, incorrect %1"
363msgid "Sorry, incorrect %1"
364msgstr "Elnézést, helytelen %1"
364msgstr "Elnézést, helytelen %1"
365
365
366−#: qml/Greeter/NarrowView.qml:119
366+#: qml/Greeter/NarrowView.qml:120
367msgid "Sorry, incorrect passphrase"
367msgid "Sorry, incorrect passphrase"
368msgstr "Elnézést, helytelen jelmondat"
368msgstr "Elnézést, helytelen jelmondat"
369
369
370−#: qml/Greeter/NarrowView.qml:120
370+#: qml/Greeter/NarrowView.qml:121
371+msgctxt "passphrase"
371msgid "Please re-enter"
372msgid "Please re-enter"
372msgstr "Próbálja újra"
373msgstr "Próbálja újra"
373
374
374−#: qml/Greeter/NarrowView.qml:121
375+#: qml/Greeter/NarrowView.qml:122
375msgid "Sorry, incorrect passcode"
376msgid "Sorry, incorrect passcode"
376msgstr "Elnézést, helytelen jelkód"
377msgstr "Elnézést, helytelen jelkód"
377
378
@@ -521,38 +522,6 @@ msgctxt "Button: Go back one page in the Wizard"
521msgid "Back"
522msgid "Back"
522msgstr "Vissza"
523msgstr "Vissza"
523
524
524−#: qml/Wizard/Pages/here-terms.qml:27
525−msgid "Terms & Conditions"
526−msgstr "Felhasználási feltételek"
527−
528−#: qml/Wizard/Pages/passwd-confirm.qml:49
529−msgid "Confirm passphrase"
530−msgstr "Jelmondat megerősítése"
531−
532−#: qml/Wizard/Pages/passwd-confirm.qml:50
533−msgid "Confirm passcode"
534−msgstr "Jelkód megerősítése"
535−
536−#: qml/Wizard/Pages/passwd-confirm.qml:53
537−#: qml/Wizard/Pages/passwd-confirm.qml:54
538−msgid "Please try again."
539−msgstr "Próbálja újra."
540−
541−#: qml/Wizard/Pages/passwd-confirm.qml:82 qml/Wizard/Pages/passwd-set.qml:90
542−#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:128
543−#: qml/Wizard/Pages/40-wifi.qml:215 qml/Wizard/Pages/50-location.qml:131
544−#: qml/Wizard/Pages/60-reporting.qml:50
545−msgid "Continue"
546−msgstr "Folytatás"
547−
548−#: qml/Wizard/Pages/passwd-set.qml:61
549−msgid "Choose your passcode"
550−msgstr "Jelkód kiválasztása"
551−
552−#: qml/Wizard/Pages/passwd-set.qml:68
553−msgid "Passphrase must be 4 characters long"
554−msgstr "A jelmondat legalább 4 karakter hosszú legyen"
555−
556#: qml/Wizard/Pages/10-welcome.qml:27
525#: qml/Wizard/Pages/10-welcome.qml:27
557msgid "Hi!"
526msgid "Hi!"
558msgstr "Üdv!"
527msgstr "Üdv!"
@@ -565,6 +534,13 @@ msgstr "Üdvözöljük az Ubuntu telefonos változatában."
565msgid "Let’s get started."
534msgid "Let’s get started."
566msgstr "Kezdjünk is bele."
535msgstr "Kezdjünk is bele."
567
536
537+#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:128
538+#: qml/Wizard/Pages/40-wifi.qml:215 qml/Wizard/Pages/50-location.qml:131
539+#: qml/Wizard/Pages/60-reporting.qml:50 qml/Wizard/Pages/passwd-confirm.qml:82
540+#: qml/Wizard/Pages/passwd-set.qml:90
541+msgid "Continue"
542+msgstr "Folytatás"
543+
568#: qml/Wizard/Pages/20-sim.qml:25
544#: qml/Wizard/Pages/20-sim.qml:25
569msgid "Add a SIM card and restart your device"
545msgid "Add a SIM card and restart your device"
570msgstr "Helyezzen be egy SIM kártyát és indítsa újra az eszközét"
546msgstr "Helyezzen be egy SIM kártyát és indítsa újra az eszközét"
@@ -698,6 +674,31 @@ msgstr "A telefonja készen áll a használatra."
698msgid "Finish"
674msgid "Finish"
699msgstr "Befejezés"
675msgstr "Befejezés"
700
676
677+#: qml/Wizard/Pages/here-terms.qml:27
678+msgid "Terms & Conditions"
679+msgstr "Felhasználási feltételek"
680+
681+#: qml/Wizard/Pages/passwd-confirm.qml:49
682+msgid "Confirm passphrase"
683+msgstr "Jelmondat megerősítése"
684+
685+#: qml/Wizard/Pages/passwd-confirm.qml:50
686+msgid "Confirm passcode"
687+msgstr "Jelkód megerősítése"
688+
689+#: qml/Wizard/Pages/passwd-confirm.qml:53
690+#: qml/Wizard/Pages/passwd-confirm.qml:54
691+msgid "Please try again."
692+msgstr "Próbálja újra."
693+
694+#: qml/Wizard/Pages/passwd-set.qml:61
695+msgid "Choose your passcode"
696+msgstr "Jelkód kiválasztása"
697+
698+#: qml/Wizard/Pages/passwd-set.qml:68
699+msgid "Passphrase must be 4 characters long"
700+msgstr "A jelmondat legalább 4 karakter hosszú legyen"
701+
701#. Translators: This is the arrow for "Back" buttons
702#. Translators: This is the arrow for "Back" buttons
702#: qml/Wizard/StackButton.qml:39
703#: qml/Wizard/StackButton.qml:39
703#, qt-format
704#, qt-format
@@ -802,3 +803,6 @@ msgstr "%1 〉"
802
803
803#~ msgid "Manage Scopes"
804#~ msgid "Manage Scopes"
804#~ msgstr "Lencsék kezelése"
805#~ msgstr "Lencsék kezelése"
806+
807+#~ msgid "Please re-enter"
808+#~ msgstr "Próbálja újra"
po/hy.po+55−51
@@ -7,7 +7,7 @@ msgid ""
7msgstr ""
7msgstr ""
8"Project-Id-Version: unity\n"
8"Project-Id-Version: unity\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2015-06-22 12:00+0200\n"
10+"POT-Creation-Date: 2015-07-17 10:10+0200\n"
11"PO-Revision-Date: 2014-10-28 06:34+0000\n"
11"PO-Revision-Date: 2014-10-28 06:34+0000\n"
12"Last-Translator: Vahan Harutyunyan <Unknown>\n"
12"Last-Translator: Vahan Harutyunyan <Unknown>\n"
13"Language-Team: Armenian <hy@li.org>\n"
13"Language-Team: Armenian <hy@li.org>\n"
@@ -15,8 +15,8 @@ msgstr ""
15"Content-Type: text/plain; charset=UTF-8\n"
15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n"
16"Content-Transfer-Encoding: 8bit\n"
17"Plural-Forms: nplurals=1; plural=0;\n"
17"Plural-Forms: nplurals=1; plural=0;\n"
18−"X-Launchpad-Export-Date: 2015-07-04 05:36+0000\n"
18+"X-Launchpad-Export-Date: 2015-07-25 05:38+0000\n"
19−"X-Generator: Launchpad (build 17597)\n"
19+"X-Generator: Launchpad (build 17628)\n"
20
20
21#: plugins/LightDM/Greeter.cpp:112
21#: plugins/LightDM/Greeter.cpp:112
22msgid "Password: "
22msgid "Password: "
@@ -227,15 +227,15 @@ msgstr ""
227msgid "OK"
227msgid "OK"
228msgstr ""
228msgstr ""
229
229
230−#: qml/Dash/GenericScopeView.qml:532 qml/Dash/GenericScopeView.qml:690
230+#: qml/Dash/GenericScopeView.qml:539 qml/Dash/GenericScopeView.qml:697
231msgid "See less"
231msgid "See less"
232msgstr ""
232msgstr ""
233
233
234−#: qml/Dash/GenericScopeView.qml:532
234+#: qml/Dash/GenericScopeView.qml:539
235msgid "See all"
235msgid "See all"
236msgstr "Տեսնել բոլորը"
236msgstr "Տեսնել բոլորը"
237
237
238−#: qml/Dash/GenericScopeView.qml:594
238+#: qml/Dash/GenericScopeView.qml:601
239msgctxt "Label: Hint for dash search line edit"
239msgctxt "Label: Hint for dash search line edit"
240msgid "Search"
240msgid "Search"
241msgstr ""
241msgstr ""
@@ -319,57 +319,58 @@ msgstr ""
319msgid "Tap to unlock"
319msgid "Tap to unlock"
320msgstr ""
320msgstr ""
321
321
322−#: qml/Greeter/NarrowView.qml:53 qml/Wizard/Pages/passwd-confirm.qml:53
322+#: qml/Greeter/NarrowView.qml:54 qml/Wizard/Pages/passwd-confirm.qml:53
323msgid "Sorry, incorrect passphrase."
323msgid "Sorry, incorrect passphrase."
324msgstr "Ներեցեք, սխալ անցաբառ է"
324msgstr "Ներեցեք, սխալ անցաբառ է"
325
325
326−#: qml/Greeter/NarrowView.qml:54 qml/Wizard/Pages/passwd-confirm.qml:54
326+#: qml/Greeter/NarrowView.qml:55 qml/Wizard/Pages/passwd-confirm.qml:54
327msgid "Sorry, incorrect passcode."
327msgid "Sorry, incorrect passcode."
328msgstr "Ներեցեք, սխալ ծածկագիր է:"
328msgstr "Ներեցեք, սխալ ծածկագիր է:"
329
329
330−#: qml/Greeter/NarrowView.qml:55
330+#: qml/Greeter/NarrowView.qml:56
331msgid "This will be your last attempt."
331msgid "This will be your last attempt."
332msgstr "Սա կլինի ձեր վերջին փորձը"
332msgstr "Սա կլինի ձեր վերջին փորձը"
333
333
334−#: qml/Greeter/NarrowView.qml:57
334+#: qml/Greeter/NarrowView.qml:58
335msgid ""
335msgid ""
336"If passphrase is entered incorrectly, your phone will conduct a factory "
336"If passphrase is entered incorrectly, your phone will conduct a factory "
337"reset and all personal data will be deleted."
337"reset and all personal data will be deleted."
338msgstr ""
338msgstr ""
339
339
340−#: qml/Greeter/NarrowView.qml:58
340+#: qml/Greeter/NarrowView.qml:59
341msgid ""
341msgid ""
342"If passcode is entered incorrectly, your phone will conduct a factory reset "
342"If passcode is entered incorrectly, your phone will conduct a factory reset "
343"and all personal data will be deleted."
343"and all personal data will be deleted."
344msgstr ""
344msgstr ""
345
345
346−#: qml/Greeter/NarrowView.qml:115
346+#: qml/Greeter/NarrowView.qml:116
347#, qt-format
347#, qt-format
348msgid "Enter %1"
348msgid "Enter %1"
349msgstr "Մուտքագրեք %1"
349msgstr "Մուտքագրեք %1"
350
350
351−#: qml/Greeter/NarrowView.qml:116 qml/Wizard/Pages/passwd-set.qml:60
351+#: qml/Greeter/NarrowView.qml:117 qml/Wizard/Pages/passwd-set.qml:60
352msgid "Enter passphrase"
352msgid "Enter passphrase"
353msgstr "Մուտքագրե՛ք անցաբառը"
353msgstr "Մուտքագրե՛ք անցաբառը"
354
354
355−#: qml/Greeter/NarrowView.qml:117
355+#: qml/Greeter/NarrowView.qml:118
356msgid "Enter passcode"
356msgid "Enter passcode"
357msgstr "Մոտքագրեք ծածկագիրը"
357msgstr "Մոտքագրեք ծածկագիրը"
358
358
359−#: qml/Greeter/NarrowView.qml:118
359+#: qml/Greeter/NarrowView.qml:119
360#, qt-format
360#, qt-format
361msgid "Sorry, incorrect %1"
361msgid "Sorry, incorrect %1"
362msgstr "Ներեցեք, սխալ %1"
362msgstr "Ներեցեք, սխալ %1"
363
363
364−#: qml/Greeter/NarrowView.qml:119
364+#: qml/Greeter/NarrowView.qml:120
365msgid "Sorry, incorrect passphrase"
365msgid "Sorry, incorrect passphrase"
366msgstr "Ներեցեք, սխալ անցաբառ է"
366msgstr "Ներեցեք, սխալ անցաբառ է"
367
367
368−#: qml/Greeter/NarrowView.qml:120
368+#: qml/Greeter/NarrowView.qml:121
369+msgctxt "passphrase"
369msgid "Please re-enter"
370msgid "Please re-enter"
370−msgstr "Խնդրում ենք նորից մուտքագրել"
371+msgstr ""
371
372
372−#: qml/Greeter/NarrowView.qml:121
373+#: qml/Greeter/NarrowView.qml:122
373msgid "Sorry, incorrect passcode"
374msgid "Sorry, incorrect passcode"
374msgstr "Ներեցեք, սխալ ծածկագիր է"
375msgstr "Ներեցեք, սխալ ծածկագիր է"
375
376
@@ -519,38 +520,6 @@ msgctxt "Button: Go back one page in the Wizard"
519msgid "Back"
520msgid "Back"
520msgstr ""
521msgstr ""
521
522
522−#: qml/Wizard/Pages/here-terms.qml:27
523−msgid "Terms & Conditions"
524−msgstr ""
525−
526−#: qml/Wizard/Pages/passwd-confirm.qml:49
527−msgid "Confirm passphrase"
528−msgstr ""
529−
530−#: qml/Wizard/Pages/passwd-confirm.qml:50
531−msgid "Confirm passcode"
532−msgstr ""
533−
534−#: qml/Wizard/Pages/passwd-confirm.qml:53
535−#: qml/Wizard/Pages/passwd-confirm.qml:54
536−msgid "Please try again."
537−msgstr ""
538−
539−#: qml/Wizard/Pages/passwd-confirm.qml:82 qml/Wizard/Pages/passwd-set.qml:90
540−#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:128
541−#: qml/Wizard/Pages/40-wifi.qml:215 qml/Wizard/Pages/50-location.qml:131
542−#: qml/Wizard/Pages/60-reporting.qml:50
543−msgid "Continue"
544−msgstr ""
545−
546−#: qml/Wizard/Pages/passwd-set.qml:61
547−msgid "Choose your passcode"
548−msgstr ""
549−
550−#: qml/Wizard/Pages/passwd-set.qml:68
551−msgid "Passphrase must be 4 characters long"
552−msgstr ""
553−
554#: qml/Wizard/Pages/10-welcome.qml:27
523#: qml/Wizard/Pages/10-welcome.qml:27
555msgid "Hi!"
524msgid "Hi!"
556msgstr ""
525msgstr ""
@@ -563,6 +532,13 @@ msgstr ""
563msgid "Let’s get started."
532msgid "Let’s get started."
564msgstr ""
533msgstr ""
565
534
535+#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:128
536+#: qml/Wizard/Pages/40-wifi.qml:215 qml/Wizard/Pages/50-location.qml:131
537+#: qml/Wizard/Pages/60-reporting.qml:50 qml/Wizard/Pages/passwd-confirm.qml:82
538+#: qml/Wizard/Pages/passwd-set.qml:90
539+msgid "Continue"
540+msgstr ""
541+
566#: qml/Wizard/Pages/20-sim.qml:25
542#: qml/Wizard/Pages/20-sim.qml:25
567msgid "Add a SIM card and restart your device"
543msgid "Add a SIM card and restart your device"
568msgstr ""
544msgstr ""
@@ -688,6 +664,31 @@ msgstr ""
688msgid "Finish"
664msgid "Finish"
689msgstr ""
665msgstr ""
690
666
667+#: qml/Wizard/Pages/here-terms.qml:27
668+msgid "Terms & Conditions"
669+msgstr ""
670+
671+#: qml/Wizard/Pages/passwd-confirm.qml:49
672+msgid "Confirm passphrase"
673+msgstr ""
674+
675+#: qml/Wizard/Pages/passwd-confirm.qml:50
676+msgid "Confirm passcode"
677+msgstr ""
678+
679+#: qml/Wizard/Pages/passwd-confirm.qml:53
680+#: qml/Wizard/Pages/passwd-confirm.qml:54
681+msgid "Please try again."
682+msgstr ""
683+
684+#: qml/Wizard/Pages/passwd-set.qml:61
685+msgid "Choose your passcode"
686+msgstr ""
687+
688+#: qml/Wizard/Pages/passwd-set.qml:68
689+msgid "Passphrase must be 4 characters long"
690+msgstr ""
691+
691#. Translators: This is the arrow for "Back" buttons
692#. Translators: This is the arrow for "Back" buttons
692#: qml/Wizard/StackButton.qml:39
693#: qml/Wizard/StackButton.qml:39
693#, qt-format
694#, qt-format
@@ -766,5 +767,8 @@ msgstr ""
766#~ msgid "All"
767#~ msgid "All"
767#~ msgstr "Բոլորը"
768#~ msgstr "Բոլորը"
768
769
770+#~ msgid "Please re-enter"
771+#~ msgstr "Խնդրում ենք նորից մուտքագրել"
772+
769#~ msgid "Skip intro"
773#~ msgid "Skip intro"
770#~ msgstr "Բաց թողնել ներածությունը"
774#~ msgstr "Բաց թողնել ներածությունը"
po/ia.po+55−51
@@ -7,7 +7,7 @@ msgid ""
7msgstr ""
7msgstr ""
8"Project-Id-Version: unity8\n"
8"Project-Id-Version: unity8\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2015-06-22 12:00+0200\n"
10+"POT-Creation-Date: 2015-07-17 10:10+0200\n"
11"PO-Revision-Date: 2015-06-08 18:58+0000\n"
11"PO-Revision-Date: 2015-06-08 18:58+0000\n"
12"Last-Translator: karm <melo@carmu.com>\n"
12"Last-Translator: karm <melo@carmu.com>\n"
13"Language-Team: Interlingua <ia@li.org>\n"
13"Language-Team: Interlingua <ia@li.org>\n"
@@ -15,8 +15,8 @@ msgstr ""
15"Content-Type: text/plain; charset=UTF-8\n"
15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n"
16"Content-Transfer-Encoding: 8bit\n"
17"Plural-Forms: nplurals=2; plural=n != 1;\n"
17"Plural-Forms: nplurals=2; plural=n != 1;\n"
18−"X-Launchpad-Export-Date: 2015-07-04 05:37+0000\n"
18+"X-Launchpad-Export-Date: 2015-07-25 05:39+0000\n"
19−"X-Generator: Launchpad (build 17597)\n"
19+"X-Generator: Launchpad (build 17628)\n"
20
20
21#: plugins/LightDM/Greeter.cpp:112
21#: plugins/LightDM/Greeter.cpp:112
22msgid "Password: "
22msgid "Password: "
@@ -227,15 +227,15 @@ msgstr "Appello de emergentia"
227msgid "OK"
227msgid "OK"
228msgstr "OK"
228msgstr "OK"
229
229
230−#: qml/Dash/GenericScopeView.qml:532 qml/Dash/GenericScopeView.qml:690
230+#: qml/Dash/GenericScopeView.qml:539 qml/Dash/GenericScopeView.qml:697
231msgid "See less"
231msgid "See less"
232msgstr "Vider minus"
232msgstr "Vider minus"
233
233
234−#: qml/Dash/GenericScopeView.qml:532
234+#: qml/Dash/GenericScopeView.qml:539
235msgid "See all"
235msgid "See all"
236msgstr "Vider toto"
236msgstr "Vider toto"
237
237
238−#: qml/Dash/GenericScopeView.qml:594
238+#: qml/Dash/GenericScopeView.qml:601
239msgctxt "Label: Hint for dash search line edit"
239msgctxt "Label: Hint for dash search line edit"
240msgid "Search"
240msgid "Search"
241msgstr "Cerca"
241msgstr "Cerca"
@@ -319,19 +319,19 @@ msgstr "Re-provar"
319msgid "Tap to unlock"
319msgid "Tap to unlock"
320msgstr "Pulsa pro liberar"
320msgstr "Pulsa pro liberar"
321
321
322−#: qml/Greeter/NarrowView.qml:53 qml/Wizard/Pages/passwd-confirm.qml:53
322+#: qml/Greeter/NarrowView.qml:54 qml/Wizard/Pages/passwd-confirm.qml:53
323msgid "Sorry, incorrect passphrase."
323msgid "Sorry, incorrect passphrase."
324msgstr "Displacente, incorrecte phrase-contrasigno."
324msgstr "Displacente, incorrecte phrase-contrasigno."
325
325
326−#: qml/Greeter/NarrowView.qml:54 qml/Wizard/Pages/passwd-confirm.qml:54
326+#: qml/Greeter/NarrowView.qml:55 qml/Wizard/Pages/passwd-confirm.qml:54
327msgid "Sorry, incorrect passcode."
327msgid "Sorry, incorrect passcode."
328msgstr "Displacente, incorrecte codice-contrasigno."
328msgstr "Displacente, incorrecte codice-contrasigno."
329
329
330−#: qml/Greeter/NarrowView.qml:55
330+#: qml/Greeter/NarrowView.qml:56
331msgid "This will be your last attempt."
331msgid "This will be your last attempt."
332msgstr "Isto essera tu ultime tentativa."
332msgstr "Isto essera tu ultime tentativa."
333
333
334−#: qml/Greeter/NarrowView.qml:57
334+#: qml/Greeter/NarrowView.qml:58
335msgid ""
335msgid ""
336"If passphrase is entered incorrectly, your phone will conduct a factory "
336"If passphrase is entered incorrectly, your phone will conduct a factory "
337"reset and all personal data will be deleted."
337"reset and all personal data will be deleted."
@@ -339,7 +339,7 @@ msgstr ""
339"Si le phrase-contrasigno es inserite incorrectemente, tu telephono conducera "
339"Si le phrase-contrasigno es inserite incorrectemente, tu telephono conducera "
340"un prefixation al fabrica e omne le datos personal essera delite."
340"un prefixation al fabrica e omne le datos personal essera delite."
341
341
342−#: qml/Greeter/NarrowView.qml:58
342+#: qml/Greeter/NarrowView.qml:59
343msgid ""
343msgid ""
344"If passcode is entered incorrectly, your phone will conduct a factory reset "
344"If passcode is entered incorrectly, your phone will conduct a factory reset "
345"and all personal data will be deleted."
345"and all personal data will be deleted."
@@ -347,33 +347,34 @@ msgstr ""
347"Si le codice-contrasigno es inserite incorrectemente, tu telephono conducera "
347"Si le codice-contrasigno es inserite incorrectemente, tu telephono conducera "
348"un prefixation a fabrica e omne le datos personal essera delite."
348"un prefixation a fabrica e omne le datos personal essera delite."
349
349
350−#: qml/Greeter/NarrowView.qml:115
350+#: qml/Greeter/NarrowView.qml:116
351#, qt-format
351#, qt-format
352msgid "Enter %1"
352msgid "Enter %1"
353msgstr "Inserer %1"
353msgstr "Inserer %1"
354
354
355−#: qml/Greeter/NarrowView.qml:116 qml/Wizard/Pages/passwd-set.qml:60
355+#: qml/Greeter/NarrowView.qml:117 qml/Wizard/Pages/passwd-set.qml:60
356msgid "Enter passphrase"
356msgid "Enter passphrase"
357msgstr "Inserer le phrase-contrasigno"
357msgstr "Inserer le phrase-contrasigno"
358
358
359−#: qml/Greeter/NarrowView.qml:117
359+#: qml/Greeter/NarrowView.qml:118
360msgid "Enter passcode"
360msgid "Enter passcode"
361msgstr "Inserer le codice-contrasigno"
361msgstr "Inserer le codice-contrasigno"
362
362
363−#: qml/Greeter/NarrowView.qml:118
363+#: qml/Greeter/NarrowView.qml:119
364#, qt-format
364#, qt-format
365msgid "Sorry, incorrect %1"
365msgid "Sorry, incorrect %1"
366msgstr "Displacente, incorrecte %1"
366msgstr "Displacente, incorrecte %1"
367
367
368−#: qml/Greeter/NarrowView.qml:119
368+#: qml/Greeter/NarrowView.qml:120
369msgid "Sorry, incorrect passphrase"
369msgid "Sorry, incorrect passphrase"
370msgstr "Displacente, phrase-contrasigno incorrecte"
370msgstr "Displacente, phrase-contrasigno incorrecte"
371
371
372−#: qml/Greeter/NarrowView.qml:120
372+#: qml/Greeter/NarrowView.qml:121
373+msgctxt "passphrase"
373msgid "Please re-enter"
374msgid "Please re-enter"
374−msgstr "Per favor re-inserer"
375+msgstr ""
375
376
376−#: qml/Greeter/NarrowView.qml:121
377+#: qml/Greeter/NarrowView.qml:122
377msgid "Sorry, incorrect passcode"
378msgid "Sorry, incorrect passcode"
378msgstr "Displacente, codice-contrasigno incorrecte"
379msgstr "Displacente, codice-contrasigno incorrecte"
379
380
@@ -523,38 +524,6 @@ msgctxt "Button: Go back one page in the Wizard"
523msgid "Back"
524msgid "Back"
524msgstr "Retro"
525msgstr "Retro"
525
526
526−#: qml/Wizard/Pages/here-terms.qml:27
527−msgid "Terms & Conditions"
528−msgstr "Terminos & Conditiones"
529−
530−#: qml/Wizard/Pages/passwd-confirm.qml:49
531−msgid "Confirm passphrase"
532−msgstr "Confirma le phrase-contrasigno"
533−
534−#: qml/Wizard/Pages/passwd-confirm.qml:50
535−msgid "Confirm passcode"
536−msgstr "Confirma le codice-contrasigno"
537−
538−#: qml/Wizard/Pages/passwd-confirm.qml:53
539−#: qml/Wizard/Pages/passwd-confirm.qml:54
540−msgid "Please try again."
541−msgstr "Reproba per favor."
542−
543−#: qml/Wizard/Pages/passwd-confirm.qml:82 qml/Wizard/Pages/passwd-set.qml:90
544−#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:128
545−#: qml/Wizard/Pages/40-wifi.qml:215 qml/Wizard/Pages/50-location.qml:131
546−#: qml/Wizard/Pages/60-reporting.qml:50
547−msgid "Continue"
548−msgstr "Continua"
549−
550−#: qml/Wizard/Pages/passwd-set.qml:61
551−msgid "Choose your passcode"
552−msgstr "Selige tu codice-contrasigno"
553−
554−#: qml/Wizard/Pages/passwd-set.qml:68
555−msgid "Passphrase must be 4 characters long"
556−msgstr "Le phrase-contrasigno debe esser longe 4 characteres"
557−
558#: qml/Wizard/Pages/10-welcome.qml:27
527#: qml/Wizard/Pages/10-welcome.qml:27
559msgid "Hi!"
528msgid "Hi!"
560msgstr "Salute!"
529msgstr "Salute!"
@@ -567,6 +536,13 @@ msgstr "Benvenite a tu telephono Ubuntu."
567msgid "Let’s get started."
536msgid "Let’s get started."
568msgstr "Que nos initia."
537msgstr "Que nos initia."
569
538
539+#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:128
540+#: qml/Wizard/Pages/40-wifi.qml:215 qml/Wizard/Pages/50-location.qml:131
541+#: qml/Wizard/Pages/60-reporting.qml:50 qml/Wizard/Pages/passwd-confirm.qml:82
542+#: qml/Wizard/Pages/passwd-set.qml:90
543+msgid "Continue"
544+msgstr "Continua"
545+
570#: qml/Wizard/Pages/20-sim.qml:25
546#: qml/Wizard/Pages/20-sim.qml:25
571msgid "Add a SIM card and restart your device"
547msgid "Add a SIM card and restart your device"
572msgstr "Adde un carta SIM e reinitia tu dispositivo"
548msgstr "Adde un carta SIM e reinitia tu dispositivo"
@@ -703,6 +679,31 @@ msgstr "Tu telephono es ora preste al uso."
703msgid "Finish"
679msgid "Finish"
704msgstr "Fin"
680msgstr "Fin"
705
681
682+#: qml/Wizard/Pages/here-terms.qml:27
683+msgid "Terms & Conditions"
684+msgstr "Terminos & Conditiones"
685+
686+#: qml/Wizard/Pages/passwd-confirm.qml:49
687+msgid "Confirm passphrase"
688+msgstr "Confirma le phrase-contrasigno"
689+
690+#: qml/Wizard/Pages/passwd-confirm.qml:50
691+msgid "Confirm passcode"
692+msgstr "Confirma le codice-contrasigno"
693+
694+#: qml/Wizard/Pages/passwd-confirm.qml:53
695+#: qml/Wizard/Pages/passwd-confirm.qml:54
696+msgid "Please try again."
697+msgstr "Reproba per favor."
698+
699+#: qml/Wizard/Pages/passwd-set.qml:61
700+msgid "Choose your passcode"
701+msgstr "Selige tu codice-contrasigno"
702+
703+#: qml/Wizard/Pages/passwd-set.qml:68
704+msgid "Passphrase must be 4 characters long"
705+msgstr "Le phrase-contrasigno debe esser longe 4 characteres"
706+
706#. Translators: This is the arrow for "Back" buttons
707#. Translators: This is the arrow for "Back" buttons
707#: qml/Wizard/StackButton.qml:39
708#: qml/Wizard/StackButton.qml:39
708#, qt-format
709#, qt-format
@@ -789,6 +790,9 @@ msgstr "%1 〉"
789#~ msgid "Speaking..."
790#~ msgid "Speaking..."
790#~ msgstr "Parlante..."
791#~ msgstr "Parlante..."
791
792
793+#~ msgid "Please re-enter"
794+#~ msgstr "Per favor re-inserer"
795+
792#~ msgid ""
796#~ msgid ""
793#~ "You have now mastered the edge gestures and can start using the "
797#~ "You have now mastered the edge gestures and can start using the "
794#~ "phone<br><br>Tap on the screen to start"
798#~ "phone<br><br>Tap on the screen to start"
po/id.po+55−51
@@ -7,7 +7,7 @@ msgid ""
7msgstr ""
7msgstr ""
8"Project-Id-Version: unity\n"
8"Project-Id-Version: unity\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2015-06-22 12:00+0200\n"
10+"POT-Creation-Date: 2015-07-17 10:10+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"
@@ -15,8 +15,8 @@ msgstr ""
15"Content-Type: text/plain; charset=UTF-8\n"
15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n"
16"Content-Transfer-Encoding: 8bit\n"
17"Plural-Forms: nplurals=1; plural=0;\n"
17"Plural-Forms: nplurals=1; plural=0;\n"
18−"X-Launchpad-Export-Date: 2015-07-04 05:37+0000\n"
18+"X-Launchpad-Export-Date: 2015-07-25 05:39+0000\n"
19−"X-Generator: Launchpad (build 17597)\n"
19+"X-Generator: Launchpad (build 17628)\n"
20
20
21#: plugins/LightDM/Greeter.cpp:112
21#: plugins/LightDM/Greeter.cpp:112
22msgid "Password: "
22msgid "Password: "
@@ -226,15 +226,15 @@ msgstr "Panggilan Darurat"
226msgid "OK"
226msgid "OK"
227msgstr "OK"
227msgstr "OK"
228
228
229−#: qml/Dash/GenericScopeView.qml:532 qml/Dash/GenericScopeView.qml:690
229+#: qml/Dash/GenericScopeView.qml:539 qml/Dash/GenericScopeView.qml:697
230msgid "See less"
230msgid "See less"
231msgstr "Lihat lebih sedikit"
231msgstr "Lihat lebih sedikit"
232
232
233−#: qml/Dash/GenericScopeView.qml:532
233+#: qml/Dash/GenericScopeView.qml:539
234msgid "See all"
234msgid "See all"
235msgstr "Lihat semua"
235msgstr "Lihat semua"
236
236
237−#: qml/Dash/GenericScopeView.qml:594
237+#: qml/Dash/GenericScopeView.qml:601
238msgctxt "Label: Hint for dash search line edit"
238msgctxt "Label: Hint for dash search line edit"
239msgid "Search"
239msgid "Search"
240msgstr ""
240msgstr ""
@@ -318,19 +318,19 @@ msgstr ""
318msgid "Tap to unlock"
318msgid "Tap to unlock"
319msgstr ""
319msgstr ""
320
320
321−#: qml/Greeter/NarrowView.qml:53 qml/Wizard/Pages/passwd-confirm.qml:53
321+#: qml/Greeter/NarrowView.qml:54 qml/Wizard/Pages/passwd-confirm.qml:53
322msgid "Sorry, incorrect passphrase."
322msgid "Sorry, incorrect passphrase."
323msgstr "Maaf, frasa sandi salah."
323msgstr "Maaf, frasa sandi salah."
324
324
325−#: qml/Greeter/NarrowView.qml:54 qml/Wizard/Pages/passwd-confirm.qml:54
325+#: qml/Greeter/NarrowView.qml:55 qml/Wizard/Pages/passwd-confirm.qml:54
326msgid "Sorry, incorrect passcode."
326msgid "Sorry, incorrect passcode."
327msgstr "Maaf, kode sandi salah."
327msgstr "Maaf, kode sandi salah."
328
328
329−#: qml/Greeter/NarrowView.qml:55
329+#: qml/Greeter/NarrowView.qml:56
330msgid "This will be your last attempt."
330msgid "This will be your last attempt."
331msgstr "Ini akan menjadi upaya terakhir Anda."
331msgstr "Ini akan menjadi upaya terakhir Anda."
332
332
333−#: qml/Greeter/NarrowView.qml:57
333+#: qml/Greeter/NarrowView.qml:58
334msgid ""
334msgid ""
335"If passphrase is entered incorrectly, your phone will conduct a factory "
335"If passphrase is entered incorrectly, your phone will conduct a factory "
336"reset and all personal data will be deleted."
336"reset and all personal data will be deleted."
@@ -338,7 +338,7 @@ msgstr ""
338"Bila frasa sandi salah dimasukkan, telepon Anda akan melakukan reset pabrik "
338"Bila frasa sandi salah dimasukkan, telepon Anda akan melakukan reset pabrik "
339"dan semua data pribadi akan dihapus."
339"dan semua data pribadi akan dihapus."
340
340
341−#: qml/Greeter/NarrowView.qml:58
341+#: qml/Greeter/NarrowView.qml:59
342msgid ""
342msgid ""
343"If passcode is entered incorrectly, your phone will conduct a factory reset "
343"If passcode is entered incorrectly, your phone will conduct a factory reset "
344"and all personal data will be deleted."
344"and all personal data will be deleted."
@@ -346,33 +346,34 @@ msgstr ""
346"Bila kode sandi salah dimasukkan, telepon Anda akan melakukan reset pabrik "
346"Bila kode sandi salah dimasukkan, telepon Anda akan melakukan reset pabrik "
347"dan semua data pribadi akan dihapus."
347"dan semua data pribadi akan dihapus."
348
348
349−#: qml/Greeter/NarrowView.qml:115
349+#: qml/Greeter/NarrowView.qml:116
350#, qt-format
350#, qt-format
351msgid "Enter %1"
351msgid "Enter %1"
352msgstr "Masukkan %1"
352msgstr "Masukkan %1"
353
353
354−#: qml/Greeter/NarrowView.qml:116 qml/Wizard/Pages/passwd-set.qml:60
354+#: qml/Greeter/NarrowView.qml:117 qml/Wizard/Pages/passwd-set.qml:60
355msgid "Enter passphrase"
355msgid "Enter passphrase"
356msgstr "Masukkan frasa sandi"
356msgstr "Masukkan frasa sandi"
357
357
358−#: qml/Greeter/NarrowView.qml:117
358+#: qml/Greeter/NarrowView.qml:118
359msgid "Enter passcode"
359msgid "Enter passcode"
360msgstr "Masukkan kode sandi"
360msgstr "Masukkan kode sandi"
361
361
362−#: qml/Greeter/NarrowView.qml:118
362+#: qml/Greeter/NarrowView.qml:119
363#, qt-format
363#, qt-format
364msgid "Sorry, incorrect %1"
364msgid "Sorry, incorrect %1"
365msgstr "Maaf, %1 salah"
365msgstr "Maaf, %1 salah"
366
366
367−#: qml/Greeter/NarrowView.qml:119
367+#: qml/Greeter/NarrowView.qml:120
368msgid "Sorry, incorrect passphrase"
368msgid "Sorry, incorrect passphrase"
369msgstr "Maaf, frasa sandi salah"
369msgstr "Maaf, frasa sandi salah"
370
370
371−#: qml/Greeter/NarrowView.qml:120
371+#: qml/Greeter/NarrowView.qml:121
372+msgctxt "passphrase"
372msgid "Please re-enter"
373msgid "Please re-enter"
373−msgstr "Harap masukkan lagi"
374+msgstr ""
374
375
375−#: qml/Greeter/NarrowView.qml:121
376+#: qml/Greeter/NarrowView.qml:122
376msgid "Sorry, incorrect passcode"
377msgid "Sorry, incorrect passcode"
377msgstr "Maaf, kode sandi salah"
378msgstr "Maaf, kode sandi salah"
378
379
@@ -522,38 +523,6 @@ msgctxt "Button: Go back one page in the Wizard"
522msgid "Back"
523msgid "Back"
523msgstr ""
524msgstr ""
524
525
525−#: qml/Wizard/Pages/here-terms.qml:27
526−msgid "Terms & Conditions"
527−msgstr ""
528−
529−#: qml/Wizard/Pages/passwd-confirm.qml:49
530−msgid "Confirm passphrase"
531−msgstr ""
532−
533−#: qml/Wizard/Pages/passwd-confirm.qml:50
534−msgid "Confirm passcode"
535−msgstr ""
536−
537−#: qml/Wizard/Pages/passwd-confirm.qml:53
538−#: qml/Wizard/Pages/passwd-confirm.qml:54
539−msgid "Please try again."
540−msgstr ""
541−
542−#: qml/Wizard/Pages/passwd-confirm.qml:82 qml/Wizard/Pages/passwd-set.qml:90
543−#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:128
544−#: qml/Wizard/Pages/40-wifi.qml:215 qml/Wizard/Pages/50-location.qml:131
545−#: qml/Wizard/Pages/60-reporting.qml:50
546−msgid "Continue"
547−msgstr ""
548−
549−#: qml/Wizard/Pages/passwd-set.qml:61
550−msgid "Choose your passcode"
551−msgstr ""
552−
553−#: qml/Wizard/Pages/passwd-set.qml:68
554−msgid "Passphrase must be 4 characters long"
555−msgstr ""
556−
557#: qml/Wizard/Pages/10-welcome.qml:27
526#: qml/Wizard/Pages/10-welcome.qml:27
558msgid "Hi!"
527msgid "Hi!"
559msgstr ""
528msgstr ""
@@ -566,6 +535,13 @@ msgstr ""
566msgid "Let’s get started."
535msgid "Let’s get started."
567msgstr ""
536msgstr ""
568
537
538+#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:128
539+#: qml/Wizard/Pages/40-wifi.qml:215 qml/Wizard/Pages/50-location.qml:131
540+#: qml/Wizard/Pages/60-reporting.qml:50 qml/Wizard/Pages/passwd-confirm.qml:82
541+#: qml/Wizard/Pages/passwd-set.qml:90
542+msgid "Continue"
543+msgstr ""
544+
569#: qml/Wizard/Pages/20-sim.qml:25
545#: qml/Wizard/Pages/20-sim.qml:25
570msgid "Add a SIM card and restart your device"
546msgid "Add a SIM card and restart your device"
571msgstr ""
547msgstr ""
@@ -691,6 +667,31 @@ msgstr ""
691msgid "Finish"
667msgid "Finish"
692msgstr ""
668msgstr ""
693
669
670+#: qml/Wizard/Pages/here-terms.qml:27
671+msgid "Terms & Conditions"
672+msgstr ""
673+
674+#: qml/Wizard/Pages/passwd-confirm.qml:49
675+msgid "Confirm passphrase"
676+msgstr ""
677+
678+#: qml/Wizard/Pages/passwd-confirm.qml:50
679+msgid "Confirm passcode"
680+msgstr ""
681+
682+#: qml/Wizard/Pages/passwd-confirm.qml:53
683+#: qml/Wizard/Pages/passwd-confirm.qml:54
684+msgid "Please try again."
685+msgstr ""
686+
687+#: qml/Wizard/Pages/passwd-set.qml:61
688+msgid "Choose your passcode"
689+msgstr ""
690+
691+#: qml/Wizard/Pages/passwd-set.qml:68
692+msgid "Passphrase must be 4 characters long"
693+msgstr ""
694+
694#. Translators: This is the arrow for "Back" buttons
695#. Translators: This is the arrow for "Back" buttons
695#: qml/Wizard/StackButton.qml:39
696#: qml/Wizard/StackButton.qml:39
696#, qt-format
697#, qt-format
@@ -784,6 +785,9 @@ msgstr ""
784#~ msgid "Store"
785#~ msgid "Store"
785#~ msgstr "Simpan"
786#~ msgstr "Simpan"
786
787
788+#~ msgid "Please re-enter"
789+#~ msgstr "Harap masukkan lagi"
790+
787#~ msgid "Well done"
791#~ msgid "Well done"
788#~ msgstr "Bagus sekali"
792#~ msgstr "Bagus sekali"
789
793
po/is.po+55−51
@@ -9,7 +9,7 @@ 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: 2015-06-22 12:00+0200\n"
12+"POT-Creation-Date: 2015-07-17 10:10+0200\n"
13"PO-Revision-Date: 2014-11-13 09:32+0000\n"
13"PO-Revision-Date: 2014-11-13 09:32+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"
@@ -17,8 +17,8 @@ msgstr ""
17"Content-Type: text/plain; charset=UTF-8\n"
17"Content-Type: text/plain; charset=UTF-8\n"
18"Content-Transfer-Encoding: 8bit\n"
18"Content-Transfer-Encoding: 8bit\n"
19"Plural-Forms: nplurals=2; plural=n != 1;\n"
19"Plural-Forms: nplurals=2; plural=n != 1;\n"
20−"X-Launchpad-Export-Date: 2015-07-04 05:37+0000\n"
20+"X-Launchpad-Export-Date: 2015-07-25 05:39+0000\n"
21−"X-Generator: Launchpad (build 17597)\n"
21+"X-Generator: Launchpad (build 17628)\n"
22"Language: is\n"
22"Language: is\n"
23
23
24#: plugins/LightDM/Greeter.cpp:112
24#: plugins/LightDM/Greeter.cpp:112
@@ -232,15 +232,15 @@ msgstr "Neyðarsímtal"
232msgid "OK"
232msgid "OK"
233msgstr "Í lagi"
233msgstr "Í lagi"
234
234
235−#: qml/Dash/GenericScopeView.qml:532 qml/Dash/GenericScopeView.qml:690
235+#: qml/Dash/GenericScopeView.qml:539 qml/Dash/GenericScopeView.qml:697
236msgid "See less"
236msgid "See less"
237msgstr "Sjá minna"
237msgstr "Sjá minna"
238
238
239−#: qml/Dash/GenericScopeView.qml:532
239+#: qml/Dash/GenericScopeView.qml:539
240msgid "See all"
240msgid "See all"
241msgstr "Sjá allt"
241msgstr "Sjá allt"
242
242
243−#: qml/Dash/GenericScopeView.qml:594
243+#: qml/Dash/GenericScopeView.qml:601
244msgctxt "Label: Hint for dash search line edit"
244msgctxt "Label: Hint for dash search line edit"
245msgid "Search"
245msgid "Search"
246msgstr ""
246msgstr ""
@@ -324,19 +324,19 @@ msgstr ""
324msgid "Tap to unlock"
324msgid "Tap to unlock"
325msgstr ""
325msgstr ""
326
326
327−#: qml/Greeter/NarrowView.qml:53 qml/Wizard/Pages/passwd-confirm.qml:53
327+#: qml/Greeter/NarrowView.qml:54 qml/Wizard/Pages/passwd-confirm.qml:53
328msgid "Sorry, incorrect passphrase."
328msgid "Sorry, incorrect passphrase."
329msgstr "Því miður, rangt lykilorð."
329msgstr "Því miður, rangt lykilorð."
330
330
331−#: qml/Greeter/NarrowView.qml:54 qml/Wizard/Pages/passwd-confirm.qml:54
331+#: qml/Greeter/NarrowView.qml:55 qml/Wizard/Pages/passwd-confirm.qml:54
332msgid "Sorry, incorrect passcode."
332msgid "Sorry, incorrect passcode."
333msgstr "Því miður, rangur aðgangskóði."
333msgstr "Því miður, rangur aðgangskóði."
334
334
335−#: qml/Greeter/NarrowView.qml:55
335+#: qml/Greeter/NarrowView.qml:56
336msgid "This will be your last attempt."
336msgid "This will be your last attempt."
337msgstr "Þetta mun verða síðasta tilraunin þín."
337msgstr "Þetta mun verða síðasta tilraunin þín."
338
338
339−#: qml/Greeter/NarrowView.qml:57
339+#: qml/Greeter/NarrowView.qml:58
340msgid ""
340msgid ""
341"If passphrase is entered incorrectly, your phone will conduct a factory "
341"If passphrase is entered incorrectly, your phone will conduct a factory "
342"reset and all personal data will be deleted."
342"reset and all personal data will be deleted."
@@ -344,7 +344,7 @@ msgstr ""
344"Ef lykilorð er rangt, mun síminn frumstilla allt á verksmiðjustillingar og "
344"Ef lykilorð er rangt, mun síminn frumstilla allt á verksmiðjustillingar og "
345"öllum einkagögnum verður eytt."
345"öllum einkagögnum verður eytt."
346
346
347−#: qml/Greeter/NarrowView.qml:58
347+#: qml/Greeter/NarrowView.qml:59
348msgid ""
348msgid ""
349"If passcode is entered incorrectly, your phone will conduct a factory reset "
349"If passcode is entered incorrectly, your phone will conduct a factory reset "
350"and all personal data will be deleted."
350"and all personal data will be deleted."
@@ -352,33 +352,34 @@ msgstr ""
352"Ef aðgangskóði er rangur, mun síminn frumstilla allt á verksmiðjustillingar "
352"Ef aðgangskóði er rangur, mun síminn frumstilla allt á verksmiðjustillingar "
353"og öllum einkagögnum verður eytt."
353"og öllum einkagögnum verður eytt."
354
354
355−#: qml/Greeter/NarrowView.qml:115
355+#: qml/Greeter/NarrowView.qml:116
356#, qt-format
356#, qt-format
357msgid "Enter %1"
357msgid "Enter %1"
358msgstr "Settu inn %1"
358msgstr "Settu inn %1"
359
359
360−#: qml/Greeter/NarrowView.qml:116 qml/Wizard/Pages/passwd-set.qml:60
360+#: qml/Greeter/NarrowView.qml:117 qml/Wizard/Pages/passwd-set.qml:60
361msgid "Enter passphrase"
361msgid "Enter passphrase"
362msgstr "Settu inn lykilfrasa"
362msgstr "Settu inn lykilfrasa"
363
363
364−#: qml/Greeter/NarrowView.qml:117
364+#: qml/Greeter/NarrowView.qml:118
365msgid "Enter passcode"
365msgid "Enter passcode"
366msgstr "Settu inn aðgangskóða"
366msgstr "Settu inn aðgangskóða"
367
367
368−#: qml/Greeter/NarrowView.qml:118
368+#: qml/Greeter/NarrowView.qml:119
369#, qt-format
369#, qt-format
370msgid "Sorry, incorrect %1"
370msgid "Sorry, incorrect %1"
371msgstr "Því miður, rangt %1"
371msgstr "Því miður, rangt %1"
372
372
373−#: qml/Greeter/NarrowView.qml:119
373+#: qml/Greeter/NarrowView.qml:120
374msgid "Sorry, incorrect passphrase"
374msgid "Sorry, incorrect passphrase"
375msgstr "Því miður, rangt lykilorð"
375msgstr "Því miður, rangt lykilorð"
376
376
377−#: qml/Greeter/NarrowView.qml:120
377+#: qml/Greeter/NarrowView.qml:121
378+msgctxt "passphrase"
378msgid "Please re-enter"
379msgid "Please re-enter"
379−msgstr "Settu aftur inn"
380+msgstr ""
380
381
381−#: qml/Greeter/NarrowView.qml:121
382+#: qml/Greeter/NarrowView.qml:122
382msgid "Sorry, incorrect passcode"
383msgid "Sorry, incorrect passcode"
383msgstr "Því miður, rangur aðgangskóði"
384msgstr "Því miður, rangur aðgangskóði"
384
385
@@ -528,38 +529,6 @@ msgctxt "Button: Go back one page in the Wizard"
528msgid "Back"
529msgid "Back"
529msgstr ""
530msgstr ""
530
531
531−#: qml/Wizard/Pages/here-terms.qml:27
532−msgid "Terms & Conditions"
533−msgstr ""
534−
535−#: qml/Wizard/Pages/passwd-confirm.qml:49
536−msgid "Confirm passphrase"
537−msgstr ""
538−
539−#: qml/Wizard/Pages/passwd-confirm.qml:50
540−msgid "Confirm passcode"
541−msgstr ""
542−
543−#: qml/Wizard/Pages/passwd-confirm.qml:53
544−#: qml/Wizard/Pages/passwd-confirm.qml:54
545−msgid "Please try again."
546−msgstr ""
547−
548−#: qml/Wizard/Pages/passwd-confirm.qml:82 qml/Wizard/Pages/passwd-set.qml:90
549−#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:128
550−#: qml/Wizard/Pages/40-wifi.qml:215 qml/Wizard/Pages/50-location.qml:131
551−#: qml/Wizard/Pages/60-reporting.qml:50
552−msgid "Continue"
553−msgstr ""
554−
555−#: qml/Wizard/Pages/passwd-set.qml:61
556−msgid "Choose your passcode"
557−msgstr ""
558−
559−#: qml/Wizard/Pages/passwd-set.qml:68
560−msgid "Passphrase must be 4 characters long"
561−msgstr ""
562−
563#: qml/Wizard/Pages/10-welcome.qml:27
532#: qml/Wizard/Pages/10-welcome.qml:27
564msgid "Hi!"
533msgid "Hi!"
565msgstr ""
534msgstr ""
@@ -572,6 +541,13 @@ msgstr ""
572msgid "Let’s get started."
541msgid "Let’s get started."
573msgstr ""
542msgstr ""
574
543
544+#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:128
545+#: qml/Wizard/Pages/40-wifi.qml:215 qml/Wizard/Pages/50-location.qml:131
546+#: qml/Wizard/Pages/60-reporting.qml:50 qml/Wizard/Pages/passwd-confirm.qml:82
547+#: qml/Wizard/Pages/passwd-set.qml:90
548+msgid "Continue"
549+msgstr ""
550+
575#: qml/Wizard/Pages/20-sim.qml:25
551#: qml/Wizard/Pages/20-sim.qml:25
576msgid "Add a SIM card and restart your device"
552msgid "Add a SIM card and restart your device"
577msgstr ""
553msgstr ""
@@ -697,6 +673,31 @@ msgstr ""
697msgid "Finish"
673msgid "Finish"
698msgstr ""
674msgstr ""
699
675
676+#: qml/Wizard/Pages/here-terms.qml:27
677+msgid "Terms & Conditions"
678+msgstr ""
679+
680+#: qml/Wizard/Pages/passwd-confirm.qml:49
681+msgid "Confirm passphrase"
682+msgstr ""
683+
684+#: qml/Wizard/Pages/passwd-confirm.qml:50
685+msgid "Confirm passcode"
686+msgstr ""
687+
688+#: qml/Wizard/Pages/passwd-confirm.qml:53
689+#: qml/Wizard/Pages/passwd-confirm.qml:54
690+msgid "Please try again."
691+msgstr ""
692+
693+#: qml/Wizard/Pages/passwd-set.qml:61
694+msgid "Choose your passcode"
695+msgstr ""
696+
697+#: qml/Wizard/Pages/passwd-set.qml:68
698+msgid "Passphrase must be 4 characters long"
699+msgstr ""
700+
700#. Translators: This is the arrow for "Back" buttons
701#. Translators: This is the arrow for "Back" buttons
701#: qml/Wizard/StackButton.qml:39
702#: qml/Wizard/StackButton.qml:39
702#, qt-format
703#, qt-format
@@ -798,5 +799,8 @@ msgstr ""
798#~ msgid "Done"
799#~ msgid "Done"
799#~ msgstr "Lokið"
800#~ msgstr "Lokið"
800
801
802+#~ msgid "Please re-enter"
803+#~ msgstr "Settu aftur inn"
804+
801#~ msgid "Manage Scopes"
805#~ msgid "Manage Scopes"
802#~ msgstr "Sýsla með leitarsvið"
806#~ msgstr "Sýsla með leitarsvið"
po/it.po+55−51
@@ -7,7 +7,7 @@ msgid ""
7msgstr ""
7msgstr ""
8"Project-Id-Version: unity\n"
8"Project-Id-Version: unity\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2015-06-22 12:00+0200\n"
10+"POT-Creation-Date: 2015-07-17 10:10+0200\n"
11"PO-Revision-Date: 2015-07-04 11:34+0000\n"
11"PO-Revision-Date: 2015-07-04 11:34+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"
@@ -15,8 +15,8 @@ msgstr ""
15"Content-Type: text/plain; charset=UTF-8\n"
15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n"
16"Content-Transfer-Encoding: 8bit\n"
17"Plural-Forms: nplurals=2; plural=n != 1;\n"
17"Plural-Forms: nplurals=2; plural=n != 1;\n"
18−"X-Launchpad-Export-Date: 2015-07-05 05:55+0000\n"
18+"X-Launchpad-Export-Date: 2015-07-25 05:39+0000\n"
19−"X-Generator: Launchpad (build 17597)\n"
19+"X-Generator: Launchpad (build 17628)\n"
20
20
21#: plugins/LightDM/Greeter.cpp:112
21#: plugins/LightDM/Greeter.cpp:112
22msgid "Password: "
22msgid "Password: "
@@ -229,15 +229,15 @@ msgstr "Chiamata di emergenza"
229msgid "OK"
229msgid "OK"
230msgstr "OK"
230msgstr "OK"
231
231
232−#: qml/Dash/GenericScopeView.qml:532 qml/Dash/GenericScopeView.qml:690
232+#: qml/Dash/GenericScopeView.qml:539 qml/Dash/GenericScopeView.qml:697
233msgid "See less"
233msgid "See less"
234msgstr "Mostra meno"
234msgstr "Mostra meno"
235
235
236−#: qml/Dash/GenericScopeView.qml:532
236+#: qml/Dash/GenericScopeView.qml:539
237msgid "See all"
237msgid "See all"
238msgstr "Mostra tutto"
238msgstr "Mostra tutto"
239
239
240−#: qml/Dash/GenericScopeView.qml:594
240+#: qml/Dash/GenericScopeView.qml:601
241msgctxt "Label: Hint for dash search line edit"
241msgctxt "Label: Hint for dash search line edit"
242msgid "Search"
242msgid "Search"
243msgstr "Cerca"
243msgstr "Cerca"
@@ -321,19 +321,19 @@ msgstr "Riprova"
321msgid "Tap to unlock"
321msgid "Tap to unlock"
322msgstr "Tocca per sbloccare"
322msgstr "Tocca per sbloccare"
323
323
324−#: qml/Greeter/NarrowView.qml:53 qml/Wizard/Pages/passwd-confirm.qml:53
324+#: qml/Greeter/NarrowView.qml:54 qml/Wizard/Pages/passwd-confirm.qml:53
325msgid "Sorry, incorrect passphrase."
325msgid "Sorry, incorrect passphrase."
326msgstr "Passphrase non corretta"
326msgstr "Passphrase non corretta"
327
327
328−#: qml/Greeter/NarrowView.qml:54 qml/Wizard/Pages/passwd-confirm.qml:54
328+#: qml/Greeter/NarrowView.qml:55 qml/Wizard/Pages/passwd-confirm.qml:54
329msgid "Sorry, incorrect passcode."
329msgid "Sorry, incorrect passcode."
330msgstr "Passcode non corretto"
330msgstr "Passcode non corretto"
331
331
332−#: qml/Greeter/NarrowView.qml:55
332+#: qml/Greeter/NarrowView.qml:56
333msgid "This will be your last attempt."
333msgid "This will be your last attempt."
334msgstr "Questo sarà l'ultimo tentativo."
334msgstr "Questo sarà l'ultimo tentativo."
335
335
336−#: qml/Greeter/NarrowView.qml:57
336+#: qml/Greeter/NarrowView.qml:58
337msgid ""
337msgid ""
338"If passphrase is entered incorrectly, your phone will conduct a factory "
338"If passphrase is entered incorrectly, your phone will conduct a factory "
339"reset and all personal data will be deleted."
339"reset and all personal data will be deleted."
@@ -341,7 +341,7 @@ msgstr ""
341"Se verrà inserita una passphrase errata, il telefono eseguirà un ripristino "
341"Se verrà inserita una passphrase errata, il telefono eseguirà un ripristino "
342"delle impostazioni di fabbrica e tutti i dati personali verranno eliminati."
342"delle impostazioni di fabbrica e tutti i dati personali verranno eliminati."
343
343
344−#: qml/Greeter/NarrowView.qml:58
344+#: qml/Greeter/NarrowView.qml:59
345msgid ""
345msgid ""
346"If passcode is entered incorrectly, your phone will conduct a factory reset "
346"If passcode is entered incorrectly, your phone will conduct a factory reset "
347"and all personal data will be deleted."
347"and all personal data will be deleted."
@@ -349,33 +349,34 @@ msgstr ""
349"Se verrà inserito una passcode errato, il telefono eseguirà un ripristino "
349"Se verrà inserito una passcode errato, il telefono eseguirà un ripristino "
350"delle impostazioni di fabbrica e tutti i dati personali verranno eliminati."
350"delle impostazioni di fabbrica e tutti i dati personali verranno eliminati."
351
351
352−#: qml/Greeter/NarrowView.qml:115
352+#: qml/Greeter/NarrowView.qml:116
353#, qt-format
353#, qt-format
354msgid "Enter %1"
354msgid "Enter %1"
355msgstr "Inserire %1"
355msgstr "Inserire %1"
356
356
357−#: qml/Greeter/NarrowView.qml:116 qml/Wizard/Pages/passwd-set.qml:60
357+#: qml/Greeter/NarrowView.qml:117 qml/Wizard/Pages/passwd-set.qml:60
358msgid "Enter passphrase"
358msgid "Enter passphrase"
359msgstr "Inserire passphrase"
359msgstr "Inserire passphrase"
360
360
361−#: qml/Greeter/NarrowView.qml:117
361+#: qml/Greeter/NarrowView.qml:118
362msgid "Enter passcode"
362msgid "Enter passcode"
363msgstr "Inserire codice"
363msgstr "Inserire codice"
364
364
365−#: qml/Greeter/NarrowView.qml:118
365+#: qml/Greeter/NarrowView.qml:119
366#, qt-format
366#, qt-format
367msgid "Sorry, incorrect %1"
367msgid "Sorry, incorrect %1"
368msgstr "%1 non corretto"
368msgstr "%1 non corretto"
369
369
370−#: qml/Greeter/NarrowView.qml:119
370+#: qml/Greeter/NarrowView.qml:120
371msgid "Sorry, incorrect passphrase"
371msgid "Sorry, incorrect passphrase"
372msgstr "Passphrase errata"
372msgstr "Passphrase errata"
373
373
374−#: qml/Greeter/NarrowView.qml:120
374+#: qml/Greeter/NarrowView.qml:121
375+msgctxt "passphrase"
375msgid "Please re-enter"
376msgid "Please re-enter"
376−msgstr "Inserire nuovamente"
377+msgstr ""
377
378
378−#: qml/Greeter/NarrowView.qml:121
379+#: qml/Greeter/NarrowView.qml:122
379msgid "Sorry, incorrect passcode"
380msgid "Sorry, incorrect passcode"
380msgstr "Passcode non corretto"
381msgstr "Passcode non corretto"
381
382
@@ -525,38 +526,6 @@ msgctxt "Button: Go back one page in the Wizard"
525msgid "Back"
526msgid "Back"
526msgstr "Indietro"
527msgstr "Indietro"
527
528
528−#: qml/Wizard/Pages/here-terms.qml:27
529−msgid "Terms & Conditions"
530−msgstr "Termini e condizioni"
531−
532−#: qml/Wizard/Pages/passwd-confirm.qml:49
533−msgid "Confirm passphrase"
534−msgstr "Conferma passphrase"
535−
536−#: qml/Wizard/Pages/passwd-confirm.qml:50
537−msgid "Confirm passcode"
538−msgstr "Conferma codice"
539−
540−#: qml/Wizard/Pages/passwd-confirm.qml:53
541−#: qml/Wizard/Pages/passwd-confirm.qml:54
542−msgid "Please try again."
543−msgstr "Riprovare."
544−
545−#: qml/Wizard/Pages/passwd-confirm.qml:82 qml/Wizard/Pages/passwd-set.qml:90
546−#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:128
547−#: qml/Wizard/Pages/40-wifi.qml:215 qml/Wizard/Pages/50-location.qml:131
548−#: qml/Wizard/Pages/60-reporting.qml:50
549−msgid "Continue"
550−msgstr "Continua"
551−
552−#: qml/Wizard/Pages/passwd-set.qml:61
553−msgid "Choose your passcode"
554−msgstr "Scegliere il codice"
555−
556−#: qml/Wizard/Pages/passwd-set.qml:68
557−msgid "Passphrase must be 4 characters long"
558−msgstr "La passphrase deve essere lunga 4 caratteri"
559−
560#: qml/Wizard/Pages/10-welcome.qml:27
529#: qml/Wizard/Pages/10-welcome.qml:27
561msgid "Hi!"
530msgid "Hi!"
562msgstr "Ciao!"
531msgstr "Ciao!"
@@ -569,6 +538,13 @@ msgstr "Benvenuti in Ubuntu Phone."
569msgid "Let’s get started."
538msgid "Let’s get started."
570msgstr "Iniziamo!"
539msgstr "Iniziamo!"
571
540
541+#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:128
542+#: qml/Wizard/Pages/40-wifi.qml:215 qml/Wizard/Pages/50-location.qml:131
543+#: qml/Wizard/Pages/60-reporting.qml:50 qml/Wizard/Pages/passwd-confirm.qml:82
544+#: qml/Wizard/Pages/passwd-set.qml:90
545+msgid "Continue"
546+msgstr "Continua"
547+
572#: qml/Wizard/Pages/20-sim.qml:25
548#: qml/Wizard/Pages/20-sim.qml:25
573msgid "Add a SIM card and restart your device"
549msgid "Add a SIM card and restart your device"
574msgstr "Inserire una SIM e riavviare il dispositivo"
550msgstr "Inserire una SIM e riavviare il dispositivo"
@@ -704,6 +680,31 @@ msgstr "Il telefono è pronto per essere usato."
704msgid "Finish"
680msgid "Finish"
705msgstr "Finito"
681msgstr "Finito"
706
682
683+#: qml/Wizard/Pages/here-terms.qml:27
684+msgid "Terms & Conditions"
685+msgstr "Termini e condizioni"
686+
687+#: qml/Wizard/Pages/passwd-confirm.qml:49
688+msgid "Confirm passphrase"
689+msgstr "Conferma passphrase"
690+
691+#: qml/Wizard/Pages/passwd-confirm.qml:50
692+msgid "Confirm passcode"
693+msgstr "Conferma codice"
694+
695+#: qml/Wizard/Pages/passwd-confirm.qml:53
696+#: qml/Wizard/Pages/passwd-confirm.qml:54
697+msgid "Please try again."
698+msgstr "Riprovare."
699+
700+#: qml/Wizard/Pages/passwd-set.qml:61
701+msgid "Choose your passcode"
702+msgstr "Scegliere il codice"
703+
704+#: qml/Wizard/Pages/passwd-set.qml:68
705+msgid "Passphrase must be 4 characters long"
706+msgstr "La passphrase deve essere lunga 4 caratteri"
707+
707#. Translators: This is the arrow for "Back" buttons
708#. Translators: This is the arrow for "Back" buttons
708#: qml/Wizard/StackButton.qml:39
709#: qml/Wizard/StackButton.qml:39
709#, qt-format
710#, qt-format
@@ -807,6 +808,9 @@ msgstr "%1 〉"
807#~ msgid "Manage Scopes"
808#~ msgid "Manage Scopes"
808#~ msgstr "Gestisci Scope"
809#~ msgstr "Gestisci Scope"
809
810
811+#~ msgid "Please re-enter"
812+#~ msgstr "Inserire nuovamente"
813+
810#~ msgid "Swipe up again to close the settings screen"
814#~ msgid "Swipe up again to close the settings screen"
811#~ msgstr ""
815#~ msgstr ""
812#~ "Far scorrere nuovamente verso l'alto per chiudere la schermata delle "
816#~ "Far scorrere nuovamente verso l'alto per chiudere la schermata delle "
po/ja.po+55−51
@@ -7,7 +7,7 @@ msgid ""
7msgstr ""
7msgstr ""
8"Project-Id-Version: unity\n"
8"Project-Id-Version: unity\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2015-06-22 12:00+0200\n"
10+"POT-Creation-Date: 2015-07-17 10:10+0200\n"
11"PO-Revision-Date: 2014-11-20 05:08+0000\n"
11"PO-Revision-Date: 2014-11-20 05:08+0000\n"
12"Last-Translator: Kentaro Kazuhama <Unknown>\n"
12"Last-Translator: Kentaro Kazuhama <Unknown>\n"
13"Language-Team: Japanese <ja@li.org>\n"
13"Language-Team: Japanese <ja@li.org>\n"
@@ -15,8 +15,8 @@ msgstr ""
15"Content-Type: text/plain; charset=UTF-8\n"
15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n"
16"Content-Transfer-Encoding: 8bit\n"
17"Plural-Forms: nplurals=1; plural=0;\n"
17"Plural-Forms: nplurals=1; plural=0;\n"
18−"X-Launchpad-Export-Date: 2015-07-04 05:37+0000\n"
18+"X-Launchpad-Export-Date: 2015-07-25 05:39+0000\n"
19−"X-Generator: Launchpad (build 17597)\n"
19+"X-Generator: Launchpad (build 17628)\n"
20
20
21#: plugins/LightDM/Greeter.cpp:112
21#: plugins/LightDM/Greeter.cpp:112
22msgid "Password: "
22msgid "Password: "
@@ -222,15 +222,15 @@ msgstr "緊急通報"
222msgid "OK"
222msgid "OK"
223msgstr "OK"
223msgstr "OK"
224
224
225−#: qml/Dash/GenericScopeView.qml:532 qml/Dash/GenericScopeView.qml:690
225+#: qml/Dash/GenericScopeView.qml:539 qml/Dash/GenericScopeView.qml:697
226msgid "See less"
226msgid "See less"
227msgstr "隠す"
227msgstr "隠す"
228
228
229−#: qml/Dash/GenericScopeView.qml:532
229+#: qml/Dash/GenericScopeView.qml:539
230msgid "See all"
230msgid "See all"
231msgstr "すべて表示する"
231msgstr "すべて表示する"
232
232
233−#: qml/Dash/GenericScopeView.qml:594
233+#: qml/Dash/GenericScopeView.qml:601
234msgctxt "Label: Hint for dash search line edit"
234msgctxt "Label: Hint for dash search line edit"
235msgid "Search"
235msgid "Search"
236msgstr ""
236msgstr ""
@@ -314,57 +314,58 @@ msgstr ""
314msgid "Tap to unlock"
314msgid "Tap to unlock"
315msgstr ""
315msgstr ""
316
316
317−#: qml/Greeter/NarrowView.qml:53 qml/Wizard/Pages/passwd-confirm.qml:53
317+#: qml/Greeter/NarrowView.qml:54 qml/Wizard/Pages/passwd-confirm.qml:53
318msgid "Sorry, incorrect passphrase."
318msgid "Sorry, incorrect passphrase."
319msgstr "パスフレーズが間違っています。"
319msgstr "パスフレーズが間違っています。"
320
320
321−#: qml/Greeter/NarrowView.qml:54 qml/Wizard/Pages/passwd-confirm.qml:54
321+#: qml/Greeter/NarrowView.qml:55 qml/Wizard/Pages/passwd-confirm.qml:54
322msgid "Sorry, incorrect passcode."
322msgid "Sorry, incorrect passcode."
323msgstr "パスコードが間違っています。"
323msgstr "パスコードが間違っています。"
324
324
325−#: qml/Greeter/NarrowView.qml:55
325+#: qml/Greeter/NarrowView.qml:56
326msgid "This will be your last attempt."
326msgid "This will be your last attempt."
327msgstr "これが最後のチャンスです。"
327msgstr "これが最後のチャンスです。"
328
328
329−#: qml/Greeter/NarrowView.qml:57
329+#: qml/Greeter/NarrowView.qml:58
330msgid ""
330msgid ""
331"If passphrase is entered incorrectly, your phone will conduct a factory "
331"If passphrase is entered incorrectly, your phone will conduct a factory "
332"reset and all personal data will be deleted."
332"reset and all personal data will be deleted."
333msgstr "パスフレーズが間違っている場合、ファクトリーリセットを実施し、すべての個人データは削除されます。"
333msgstr "パスフレーズが間違っている場合、ファクトリーリセットを実施し、すべての個人データは削除されます。"
334
334
335−#: qml/Greeter/NarrowView.qml:58
335+#: qml/Greeter/NarrowView.qml:59
336msgid ""
336msgid ""
337"If passcode is entered incorrectly, your phone will conduct a factory reset "
337"If passcode is entered incorrectly, your phone will conduct a factory reset "
338"and all personal data will be deleted."
338"and all personal data will be deleted."
339msgstr "パスコードが間違っている場合、ファクトリーリセットを実施し、すべての個人データは削除されます。"
339msgstr "パスコードが間違っている場合、ファクトリーリセットを実施し、すべての個人データは削除されます。"
340
340
341−#: qml/Greeter/NarrowView.qml:115
341+#: qml/Greeter/NarrowView.qml:116
342#, qt-format
342#, qt-format
343msgid "Enter %1"
343msgid "Enter %1"
344msgstr "%1 を入力"
344msgstr "%1 を入力"
345
345
346−#: qml/Greeter/NarrowView.qml:116 qml/Wizard/Pages/passwd-set.qml:60
346+#: qml/Greeter/NarrowView.qml:117 qml/Wizard/Pages/passwd-set.qml:60
347msgid "Enter passphrase"
347msgid "Enter passphrase"
348msgstr "パスフレーズを入力"
348msgstr "パスフレーズを入力"
349
349
350−#: qml/Greeter/NarrowView.qml:117
350+#: qml/Greeter/NarrowView.qml:118
351msgid "Enter passcode"
351msgid "Enter passcode"
352msgstr "パスコードを入力"
352msgstr "パスコードを入力"
353
353
354−#: qml/Greeter/NarrowView.qml:118
354+#: qml/Greeter/NarrowView.qml:119
355#, qt-format
355#, qt-format
356msgid "Sorry, incorrect %1"
356msgid "Sorry, incorrect %1"
357msgstr "%1が違います"
357msgstr "%1が違います"
358
358
359−#: qml/Greeter/NarrowView.qml:119
359+#: qml/Greeter/NarrowView.qml:120
360msgid "Sorry, incorrect passphrase"
360msgid "Sorry, incorrect passphrase"
361msgstr "パスフレーズが違います"
361msgstr "パスフレーズが違います"
362
362
363−#: qml/Greeter/NarrowView.qml:120
363+#: qml/Greeter/NarrowView.qml:121
364+msgctxt "passphrase"
364msgid "Please re-enter"
365msgid "Please re-enter"
365−msgstr "再入力してください"
366+msgstr ""
366
367
367−#: qml/Greeter/NarrowView.qml:121
368+#: qml/Greeter/NarrowView.qml:122
368msgid "Sorry, incorrect passcode"
369msgid "Sorry, incorrect passcode"
369msgstr "パスコードが違います"
370msgstr "パスコードが違います"
370
371
@@ -514,38 +515,6 @@ msgctxt "Button: Go back one page in the Wizard"
514msgid "Back"
515msgid "Back"
515msgstr ""
516msgstr ""
516
517
517−#: qml/Wizard/Pages/here-terms.qml:27
518−msgid "Terms & Conditions"
519−msgstr ""
520−
521−#: qml/Wizard/Pages/passwd-confirm.qml:49
522−msgid "Confirm passphrase"
523−msgstr ""
524−
525−#: qml/Wizard/Pages/passwd-confirm.qml:50
526−msgid "Confirm passcode"
527−msgstr ""
528−
529−#: qml/Wizard/Pages/passwd-confirm.qml:53
530−#: qml/Wizard/Pages/passwd-confirm.qml:54
531−msgid "Please try again."
532−msgstr ""
533−
534−#: qml/Wizard/Pages/passwd-confirm.qml:82 qml/Wizard/Pages/passwd-set.qml:90
535−#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:128
536−#: qml/Wizard/Pages/40-wifi.qml:215 qml/Wizard/Pages/50-location.qml:131
537−#: qml/Wizard/Pages/60-reporting.qml:50
538−msgid "Continue"
539−msgstr ""
540−
541−#: qml/Wizard/Pages/passwd-set.qml:61
542−msgid "Choose your passcode"
543−msgstr ""
544−
545−#: qml/Wizard/Pages/passwd-set.qml:68
546−msgid "Passphrase must be 4 characters long"
547−msgstr ""
548−
549#: qml/Wizard/Pages/10-welcome.qml:27
518#: qml/Wizard/Pages/10-welcome.qml:27
550msgid "Hi!"
519msgid "Hi!"
551msgstr ""
520msgstr ""
@@ -558,6 +527,13 @@ msgstr ""
558msgid "Let’s get started."
527msgid "Let’s get started."
559msgstr ""
528msgstr ""
560
529
530+#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:128
531+#: qml/Wizard/Pages/40-wifi.qml:215 qml/Wizard/Pages/50-location.qml:131
532+#: qml/Wizard/Pages/60-reporting.qml:50 qml/Wizard/Pages/passwd-confirm.qml:82
533+#: qml/Wizard/Pages/passwd-set.qml:90
534+msgid "Continue"
535+msgstr ""
536+
561#: qml/Wizard/Pages/20-sim.qml:25
537#: qml/Wizard/Pages/20-sim.qml:25
562msgid "Add a SIM card and restart your device"
538msgid "Add a SIM card and restart your device"
563msgstr ""
539msgstr ""
@@ -683,6 +659,31 @@ msgstr ""
683msgid "Finish"
659msgid "Finish"
684msgstr ""
660msgstr ""
685
661
662+#: qml/Wizard/Pages/here-terms.qml:27
663+msgid "Terms & Conditions"
664+msgstr ""
665+
666+#: qml/Wizard/Pages/passwd-confirm.qml:49
667+msgid "Confirm passphrase"
668+msgstr ""
669+
670+#: qml/Wizard/Pages/passwd-confirm.qml:50
671+msgid "Confirm passcode"
672+msgstr ""
673+
674+#: qml/Wizard/Pages/passwd-confirm.qml:53
675+#: qml/Wizard/Pages/passwd-confirm.qml:54
676+msgid "Please try again."
677+msgstr ""
678+
679+#: qml/Wizard/Pages/passwd-set.qml:61
680+msgid "Choose your passcode"
681+msgstr ""
682+
683+#: qml/Wizard/Pages/passwd-set.qml:68
684+msgid "Passphrase must be 4 characters long"
685+msgstr ""
686+
686#. Translators: This is the arrow for "Back" buttons
687#. Translators: This is the arrow for "Back" buttons
687#: qml/Wizard/StackButton.qml:39
688#: qml/Wizard/StackButton.qml:39
688#, qt-format
689#, qt-format
@@ -784,3 +785,6 @@ msgstr ""
784
785
785#~ msgid "Manage Scopes"
786#~ msgid "Manage Scopes"
786#~ msgstr "Scopeの管理"
787#~ msgstr "Scopeの管理"
788+
789+#~ msgid "Please re-enter"
790+#~ msgstr "再入力してください"
po/km.po+51−50
@@ -7,7 +7,7 @@ msgid ""
7msgstr ""
7msgstr ""
8"Project-Id-Version: unity8\n"
8"Project-Id-Version: unity8\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2015-06-22 12:00+0200\n"
10+"POT-Creation-Date: 2015-07-17 10:10+0200\n"
11"PO-Revision-Date: 2014-08-20 02:48+0000\n"
11"PO-Revision-Date: 2014-08-20 02:48+0000\n"
12"Last-Translator: Sophea Sok <sksophea@gmail.com>\n"
12"Last-Translator: Sophea Sok <sksophea@gmail.com>\n"
13"Language-Team: Khmer <km@li.org>\n"
13"Language-Team: Khmer <km@li.org>\n"
@@ -15,8 +15,8 @@ msgstr ""
15"Content-Type: text/plain; charset=UTF-8\n"
15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n"
16"Content-Transfer-Encoding: 8bit\n"
17"Plural-Forms: nplurals=1; plural=0;\n"
17"Plural-Forms: nplurals=1; plural=0;\n"
18−"X-Launchpad-Export-Date: 2015-07-04 05:37+0000\n"
18+"X-Launchpad-Export-Date: 2015-07-25 05:39+0000\n"
19−"X-Generator: Launchpad (build 17597)\n"
19+"X-Generator: Launchpad (build 17628)\n"
20
20
21#: plugins/LightDM/Greeter.cpp:112
21#: plugins/LightDM/Greeter.cpp:112
22msgid "Password: "
22msgid "Password: "
@@ -225,15 +225,15 @@ msgstr "ការ​ហៅ​ពេល​អាសន្ន"
225msgid "OK"
225msgid "OK"
226msgstr "យល់ព្រម"
226msgstr "យល់ព្រម"
227
227
228−#: qml/Dash/GenericScopeView.qml:532 qml/Dash/GenericScopeView.qml:690
228+#: qml/Dash/GenericScopeView.qml:539 qml/Dash/GenericScopeView.qml:697
229msgid "See less"
229msgid "See less"
230msgstr "មើល​តិច​ជាង"
230msgstr "មើល​តិច​ជាង"
231
231
232−#: qml/Dash/GenericScopeView.qml:532
232+#: qml/Dash/GenericScopeView.qml:539
233msgid "See all"
233msgid "See all"
234msgstr "មើល​ទាំងអស់"
234msgstr "មើល​ទាំងអស់"
235
235
236−#: qml/Dash/GenericScopeView.qml:594
236+#: qml/Dash/GenericScopeView.qml:601
237msgctxt "Label: Hint for dash search line edit"
237msgctxt "Label: Hint for dash search line edit"
238msgid "Search"
238msgid "Search"
239msgstr ""
239msgstr ""
@@ -317,19 +317,19 @@ msgstr ""
317msgid "Tap to unlock"
317msgid "Tap to unlock"
318msgstr ""
318msgstr ""
319
319
320−#: qml/Greeter/NarrowView.qml:53 qml/Wizard/Pages/passwd-confirm.qml:53
320+#: qml/Greeter/NarrowView.qml:54 qml/Wizard/Pages/passwd-confirm.qml:53
321msgid "Sorry, incorrect passphrase."
321msgid "Sorry, incorrect passphrase."
322msgstr "សូមទោស! ឃ្លា​សម្ងាត់​មិន​ត្រឹមត្រូវ។"
322msgstr "សូមទោស! ឃ្លា​សម្ងាត់​មិន​ត្រឹមត្រូវ។"
323
323
324−#: qml/Greeter/NarrowView.qml:54 qml/Wizard/Pages/passwd-confirm.qml:54
324+#: qml/Greeter/NarrowView.qml:55 qml/Wizard/Pages/passwd-confirm.qml:54
325msgid "Sorry, incorrect passcode."
325msgid "Sorry, incorrect passcode."
326msgstr "សូមទោស! កូដ​សម្ងាត់​មិន​ត្រឹមត្រូវ។"
326msgstr "សូមទោស! កូដ​សម្ងាត់​មិន​ត្រឹមត្រូវ។"
327
327
328−#: qml/Greeter/NarrowView.qml:55
328+#: qml/Greeter/NarrowView.qml:56
329msgid "This will be your last attempt."
329msgid "This will be your last attempt."
330msgstr "នេះ​គឺ​ការ​ព្យាយាម​លើក​ចុងក្រោយ។"
330msgstr "នេះ​គឺ​ការ​ព្យាយាម​លើក​ចុងក្រោយ។"
331
331
332−#: qml/Greeter/NarrowView.qml:57
332+#: qml/Greeter/NarrowView.qml:58
333msgid ""
333msgid ""
334"If passphrase is entered incorrectly, your phone will conduct a factory "
334"If passphrase is entered incorrectly, your phone will conduct a factory "
335"reset and all personal data will be deleted."
335"reset and all personal data will be deleted."
@@ -338,7 +338,7 @@ msgstr ""
338"ទូរស័ព្ទ​របស់​អ្នក​នឹង​កំណត់​ទៅ​ទិន្នន័យ​ពី​រោងចក្រ​វិញ "
338"ទូរស័ព្ទ​របស់​អ្នក​នឹង​កំណត់​ទៅ​ទិន្នន័យ​ពី​រោងចក្រ​វិញ "
339"ហើយ​ទិន្នន័យ​ផ្ទាល់ខ្លួន​ទាំងអស់​របស់​អ្នក​នឹង​ត្រូវ​បាន​លុប។"
339"ហើយ​ទិន្នន័យ​ផ្ទាល់ខ្លួន​ទាំងអស់​របស់​អ្នក​នឹង​ត្រូវ​បាន​លុប។"
340
340
341−#: qml/Greeter/NarrowView.qml:58
341+#: qml/Greeter/NarrowView.qml:59
342msgid ""
342msgid ""
343"If passcode is entered incorrectly, your phone will conduct a factory reset "
343"If passcode is entered incorrectly, your phone will conduct a factory reset "
344"and all personal data will be deleted."
344"and all personal data will be deleted."
@@ -347,33 +347,34 @@ msgstr ""
347"ទូរស័ព្ទ​របស់​អ្នក​នឹង​កំណត់​ទៅ​ទិន្នន័យ​ពី​រោងចក្រ​វិញ "
347"ទូរស័ព្ទ​របស់​អ្នក​នឹង​កំណត់​ទៅ​ទិន្នន័យ​ពី​រោងចក្រ​វិញ "
348"ហើយ​ទិន្នន័យ​ផ្ទាល់ខ្លួន​ទាំងអស់​របស់​អ្នក​នឹង​ត្រូវ​បាន​លុប។"
348"ហើយ​ទិន្នន័យ​ផ្ទាល់ខ្លួន​ទាំងអស់​របស់​អ្នក​នឹង​ត្រូវ​បាន​លុប។"
349
349
350−#: qml/Greeter/NarrowView.qml:115
350+#: qml/Greeter/NarrowView.qml:116
351#, qt-format
351#, qt-format
352msgid "Enter %1"
352msgid "Enter %1"
353msgstr ""
353msgstr ""
354
354
355−#: qml/Greeter/NarrowView.qml:116 qml/Wizard/Pages/passwd-set.qml:60
355+#: qml/Greeter/NarrowView.qml:117 qml/Wizard/Pages/passwd-set.qml:60
356msgid "Enter passphrase"
356msgid "Enter passphrase"
357msgstr ""
357msgstr ""
358
358
359−#: qml/Greeter/NarrowView.qml:117
359+#: qml/Greeter/NarrowView.qml:118
360msgid "Enter passcode"
360msgid "Enter passcode"
361msgstr ""
361msgstr ""
362
362
363−#: qml/Greeter/NarrowView.qml:118
363+#: qml/Greeter/NarrowView.qml:119
364#, qt-format
364#, qt-format
365msgid "Sorry, incorrect %1"
365msgid "Sorry, incorrect %1"
366msgstr "សូមទោស! %1 មិន​ត្រឹមត្រូវ"
366msgstr "សូមទោស! %1 មិន​ត្រឹមត្រូវ"
367
367
368−#: qml/Greeter/NarrowView.qml:119
368+#: qml/Greeter/NarrowView.qml:120
369msgid "Sorry, incorrect passphrase"
369msgid "Sorry, incorrect passphrase"
370msgstr "សូមទោស! ឃ្លា​សម្ងាត់​មិន​ត្រឹមត្រូវ"
370msgstr "សូមទោស! ឃ្លា​សម្ងាត់​មិន​ត្រឹមត្រូវ"
371
371
372−#: qml/Greeter/NarrowView.qml:120
372+#: qml/Greeter/NarrowView.qml:121
373+msgctxt "passphrase"
373msgid "Please re-enter"
374msgid "Please re-enter"
374msgstr ""
375msgstr ""
375
376
376−#: qml/Greeter/NarrowView.qml:121
377+#: qml/Greeter/NarrowView.qml:122
377msgid "Sorry, incorrect passcode"
378msgid "Sorry, incorrect passcode"
378msgstr "សូមទោស! កូដ​សម្ងាត់​មិន​ត្រឹមត្រូវ"
379msgstr "សូមទោស! កូដ​សម្ងាត់​មិន​ត្រឹមត្រូវ"
379
380
@@ -523,38 +524,6 @@ msgctxt "Button: Go back one page in the Wizard"
523msgid "Back"
524msgid "Back"
524msgstr ""
525msgstr ""
525
526
526−#: qml/Wizard/Pages/here-terms.qml:27
527−msgid "Terms & Conditions"
528−msgstr ""
529−
530−#: qml/Wizard/Pages/passwd-confirm.qml:49
531−msgid "Confirm passphrase"
532−msgstr ""
533−
534−#: qml/Wizard/Pages/passwd-confirm.qml:50
535−msgid "Confirm passcode"
536−msgstr ""
537−
538−#: qml/Wizard/Pages/passwd-confirm.qml:53
539−#: qml/Wizard/Pages/passwd-confirm.qml:54
540−msgid "Please try again."
541−msgstr ""
542−
543−#: qml/Wizard/Pages/passwd-confirm.qml:82 qml/Wizard/Pages/passwd-set.qml:90
544−#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:128
545−#: qml/Wizard/Pages/40-wifi.qml:215 qml/Wizard/Pages/50-location.qml:131
546−#: qml/Wizard/Pages/60-reporting.qml:50
547−msgid "Continue"
548−msgstr ""
549−
550−#: qml/Wizard/Pages/passwd-set.qml:61
551−msgid "Choose your passcode"
552−msgstr ""
553−
554−#: qml/Wizard/Pages/passwd-set.qml:68
555−msgid "Passphrase must be 4 characters long"
556−msgstr ""
557−
558#: qml/Wizard/Pages/10-welcome.qml:27
527#: qml/Wizard/Pages/10-welcome.qml:27
559msgid "Hi!"
528msgid "Hi!"
560msgstr ""
529msgstr ""
@@ -567,6 +536,13 @@ msgstr ""
567msgid "Let’s get started."
536msgid "Let’s get started."
568msgstr ""
537msgstr ""
569
538
539+#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:128
540+#: qml/Wizard/Pages/40-wifi.qml:215 qml/Wizard/Pages/50-location.qml:131
541+#: qml/Wizard/Pages/60-reporting.qml:50 qml/Wizard/Pages/passwd-confirm.qml:82
542+#: qml/Wizard/Pages/passwd-set.qml:90
543+msgid "Continue"
544+msgstr ""
545+
570#: qml/Wizard/Pages/20-sim.qml:25
546#: qml/Wizard/Pages/20-sim.qml:25
571msgid "Add a SIM card and restart your device"
547msgid "Add a SIM card and restart your device"
572msgstr ""
548msgstr ""
@@ -692,6 +668,31 @@ msgstr ""
692msgid "Finish"
668msgid "Finish"
693msgstr ""
669msgstr ""
694
670
671+#: qml/Wizard/Pages/here-terms.qml:27
672+msgid "Terms & Conditions"
673+msgstr ""
674+
675+#: qml/Wizard/Pages/passwd-confirm.qml:49
676+msgid "Confirm passphrase"
677+msgstr ""
678+
679+#: qml/Wizard/Pages/passwd-confirm.qml:50
680+msgid "Confirm passcode"
681+msgstr ""
682+
683+#: qml/Wizard/Pages/passwd-confirm.qml:53
684+#: qml/Wizard/Pages/passwd-confirm.qml:54
685+msgid "Please try again."
686+msgstr ""
687+
688+#: qml/Wizard/Pages/passwd-set.qml:61
689+msgid "Choose your passcode"
690+msgstr ""
691+
692+#: qml/Wizard/Pages/passwd-set.qml:68
693+msgid "Passphrase must be 4 characters long"
694+msgstr ""
695+
695#. Translators: This is the arrow for "Back" buttons
696#. Translators: This is the arrow for "Back" buttons
696#: qml/Wizard/StackButton.qml:39
697#: qml/Wizard/StackButton.qml:39
697#, qt-format
698#, qt-format
po/kn.po+51−50
@@ -7,7 +7,7 @@ msgid ""
7msgstr ""
7msgstr ""
8"Project-Id-Version: unity\n"
8"Project-Id-Version: unity\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2015-06-22 12:00+0200\n"
10+"POT-Creation-Date: 2015-07-17 10:10+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"
@@ -15,8 +15,8 @@ msgstr ""
15"Content-Type: text/plain; charset=UTF-8\n"
15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n"
16"Content-Transfer-Encoding: 8bit\n"
17"Plural-Forms: nplurals=2; plural=n != 1;\n"
17"Plural-Forms: nplurals=2; plural=n != 1;\n"
18−"X-Launchpad-Export-Date: 2015-07-04 05:37+0000\n"
18+"X-Launchpad-Export-Date: 2015-07-25 05:39+0000\n"
19−"X-Generator: Launchpad (build 17597)\n"
19+"X-Generator: Launchpad (build 17628)\n"
20
20
21#: plugins/LightDM/Greeter.cpp:112
21#: plugins/LightDM/Greeter.cpp:112
22msgid "Password: "
22msgid "Password: "
@@ -223,15 +223,15 @@ msgstr ""
223msgid "OK"
223msgid "OK"
224msgstr ""
224msgstr ""
225
225
226−#: qml/Dash/GenericScopeView.qml:532 qml/Dash/GenericScopeView.qml:690
226+#: qml/Dash/GenericScopeView.qml:539 qml/Dash/GenericScopeView.qml:697
227msgid "See less"
227msgid "See less"
228msgstr ""
228msgstr ""
229
229
230−#: qml/Dash/GenericScopeView.qml:532
230+#: qml/Dash/GenericScopeView.qml:539
231msgid "See all"
231msgid "See all"
232msgstr ""
232msgstr ""
233
233
234−#: qml/Dash/GenericScopeView.qml:594
234+#: qml/Dash/GenericScopeView.qml:601
235msgctxt "Label: Hint for dash search line edit"
235msgctxt "Label: Hint for dash search line edit"
236msgid "Search"
236msgid "Search"
237msgstr ""
237msgstr ""
@@ -315,57 +315,58 @@ msgstr ""
315msgid "Tap to unlock"
315msgid "Tap to unlock"
316msgstr ""
316msgstr ""
317
317
318−#: qml/Greeter/NarrowView.qml:53 qml/Wizard/Pages/passwd-confirm.qml:53
318+#: qml/Greeter/NarrowView.qml:54 qml/Wizard/Pages/passwd-confirm.qml:53
319msgid "Sorry, incorrect passphrase."
319msgid "Sorry, incorrect passphrase."
320msgstr ""
320msgstr ""
321
321
322−#: qml/Greeter/NarrowView.qml:54 qml/Wizard/Pages/passwd-confirm.qml:54
322+#: qml/Greeter/NarrowView.qml:55 qml/Wizard/Pages/passwd-confirm.qml:54
323msgid "Sorry, incorrect passcode."
323msgid "Sorry, incorrect passcode."
324msgstr ""
324msgstr ""
325
325
326−#: qml/Greeter/NarrowView.qml:55
326+#: qml/Greeter/NarrowView.qml:56
327msgid "This will be your last attempt."
327msgid "This will be your last attempt."
328msgstr ""
328msgstr ""
329
329
330−#: qml/Greeter/NarrowView.qml:57
330+#: qml/Greeter/NarrowView.qml:58
331msgid ""
331msgid ""
332"If passphrase is entered incorrectly, your phone will conduct a factory "
332"If passphrase is entered incorrectly, your phone will conduct a factory "
333"reset and all personal data will be deleted."
333"reset and all personal data will be deleted."
334msgstr ""
334msgstr ""
335
335
336−#: qml/Greeter/NarrowView.qml:58
336+#: qml/Greeter/NarrowView.qml:59
337msgid ""
337msgid ""
338"If passcode is entered incorrectly, your phone will conduct a factory reset "
338"If passcode is entered incorrectly, your phone will conduct a factory reset "
339"and all personal data will be deleted."
339"and all personal data will be deleted."
340msgstr ""
340msgstr ""
341
341
342−#: qml/Greeter/NarrowView.qml:115
342+#: qml/Greeter/NarrowView.qml:116
343#, qt-format
343#, qt-format
344msgid "Enter %1"
344msgid "Enter %1"
345msgstr ""
345msgstr ""
346
346
347−#: qml/Greeter/NarrowView.qml:116 qml/Wizard/Pages/passwd-set.qml:60
347+#: qml/Greeter/NarrowView.qml:117 qml/Wizard/Pages/passwd-set.qml:60
348msgid "Enter passphrase"
348msgid "Enter passphrase"
349msgstr ""
349msgstr ""
350
350
351−#: qml/Greeter/NarrowView.qml:117
351+#: qml/Greeter/NarrowView.qml:118
352msgid "Enter passcode"
352msgid "Enter passcode"
353msgstr ""
353msgstr ""
354
354
355−#: qml/Greeter/NarrowView.qml:118
355+#: qml/Greeter/NarrowView.qml:119
356#, qt-format
356#, qt-format
357msgid "Sorry, incorrect %1"
357msgid "Sorry, incorrect %1"
358msgstr ""
358msgstr ""
359
359
360−#: qml/Greeter/NarrowView.qml:119
360+#: qml/Greeter/NarrowView.qml:120
361msgid "Sorry, incorrect passphrase"
361msgid "Sorry, incorrect passphrase"
362msgstr ""
362msgstr ""
363
363
364−#: qml/Greeter/NarrowView.qml:120
364+#: qml/Greeter/NarrowView.qml:121
365+msgctxt "passphrase"
365msgid "Please re-enter"
366msgid "Please re-enter"
366msgstr ""
367msgstr ""
367
368
368−#: qml/Greeter/NarrowView.qml:121
369+#: qml/Greeter/NarrowView.qml:122
369msgid "Sorry, incorrect passcode"
370msgid "Sorry, incorrect passcode"
370msgstr ""
371msgstr ""
371
372
@@ -515,38 +516,6 @@ msgctxt "Button: Go back one page in the Wizard"
515msgid "Back"
516msgid "Back"
516msgstr ""
517msgstr ""
517
518
518−#: qml/Wizard/Pages/here-terms.qml:27
519−msgid "Terms & Conditions"
520−msgstr ""
521−
522−#: qml/Wizard/Pages/passwd-confirm.qml:49
523−msgid "Confirm passphrase"
524−msgstr ""
525−
526−#: qml/Wizard/Pages/passwd-confirm.qml:50
527−msgid "Confirm passcode"
528−msgstr ""
529−
530−#: qml/Wizard/Pages/passwd-confirm.qml:53
531−#: qml/Wizard/Pages/passwd-confirm.qml:54
532−msgid "Please try again."
533−msgstr ""
534−
535−#: qml/Wizard/Pages/passwd-confirm.qml:82 qml/Wizard/Pages/passwd-set.qml:90
536−#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:128
537−#: qml/Wizard/Pages/40-wifi.qml:215 qml/Wizard/Pages/50-location.qml:131
538−#: qml/Wizard/Pages/60-reporting.qml:50
539−msgid "Continue"
540−msgstr ""
541−
542−#: qml/Wizard/Pages/passwd-set.qml:61
543−msgid "Choose your passcode"
544−msgstr ""
545−
546−#: qml/Wizard/Pages/passwd-set.qml:68
547−msgid "Passphrase must be 4 characters long"
548−msgstr ""
549−
550#: qml/Wizard/Pages/10-welcome.qml:27
519#: qml/Wizard/Pages/10-welcome.qml:27
551msgid "Hi!"
520msgid "Hi!"
552msgstr ""
521msgstr ""
@@ -559,6 +528,13 @@ msgstr ""
559msgid "Let’s get started."
528msgid "Let’s get started."
560msgstr ""
529msgstr ""
561
530
531+#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:128
532+#: qml/Wizard/Pages/40-wifi.qml:215 qml/Wizard/Pages/50-location.qml:131
533+#: qml/Wizard/Pages/60-reporting.qml:50 qml/Wizard/Pages/passwd-confirm.qml:82
534+#: qml/Wizard/Pages/passwd-set.qml:90
535+msgid "Continue"
536+msgstr ""
537+
562#: qml/Wizard/Pages/20-sim.qml:25
538#: qml/Wizard/Pages/20-sim.qml:25
563msgid "Add a SIM card and restart your device"
539msgid "Add a SIM card and restart your device"
564msgstr ""
540msgstr ""
@@ -684,6 +660,31 @@ msgstr ""
684msgid "Finish"
660msgid "Finish"
685msgstr ""
661msgstr ""
686
662
663+#: qml/Wizard/Pages/here-terms.qml:27
664+msgid "Terms & Conditions"
665+msgstr ""
666+
667+#: qml/Wizard/Pages/passwd-confirm.qml:49
668+msgid "Confirm passphrase"
669+msgstr ""
670+
671+#: qml/Wizard/Pages/passwd-confirm.qml:50
672+msgid "Confirm passcode"
673+msgstr ""
674+
675+#: qml/Wizard/Pages/passwd-confirm.qml:53
676+#: qml/Wizard/Pages/passwd-confirm.qml:54
677+msgid "Please try again."
678+msgstr ""
679+
680+#: qml/Wizard/Pages/passwd-set.qml:61
681+msgid "Choose your passcode"
682+msgstr ""
683+
684+#: qml/Wizard/Pages/passwd-set.qml:68
685+msgid "Passphrase must be 4 characters long"
686+msgstr ""
687+
687#. Translators: This is the arrow for "Back" buttons
688#. Translators: This is the arrow for "Back" buttons
688#: qml/Wizard/StackButton.qml:39
689#: qml/Wizard/StackButton.qml:39
689#, qt-format
690#, qt-format
po/ko.po+55−51
@@ -7,7 +7,7 @@ msgid ""
7msgstr ""
7msgstr ""
8"Project-Id-Version: unity\n"
8"Project-Id-Version: unity\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2015-06-22 12:00+0200\n"
10+"POT-Creation-Date: 2015-07-17 10:10+0200\n"
11"PO-Revision-Date: 2014-08-19 13:02+0000\n"
11"PO-Revision-Date: 2014-08-19 13:02+0000\n"
12"Last-Translator: MinSik CHO <Unknown>\n"
12"Last-Translator: MinSik CHO <Unknown>\n"
13"Language-Team: Korean <ko@li.org>\n"
13"Language-Team: Korean <ko@li.org>\n"
@@ -15,8 +15,8 @@ msgstr ""
15"Content-Type: text/plain; charset=UTF-8\n"
15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n"
16"Content-Transfer-Encoding: 8bit\n"
17"Plural-Forms: nplurals=1; plural=0;\n"
17"Plural-Forms: nplurals=1; plural=0;\n"
18−"X-Launchpad-Export-Date: 2015-07-04 05:37+0000\n"
18+"X-Launchpad-Export-Date: 2015-07-25 05:39+0000\n"
19−"X-Generator: Launchpad (build 17597)\n"
19+"X-Generator: Launchpad (build 17628)\n"
20
20
21#: plugins/LightDM/Greeter.cpp:112
21#: plugins/LightDM/Greeter.cpp:112
22msgid "Password: "
22msgid "Password: "
@@ -222,15 +222,15 @@ msgstr "긴급 통화"
222msgid "OK"
222msgid "OK"
223msgstr "확인"
223msgstr "확인"
224
224
225−#: qml/Dash/GenericScopeView.qml:532 qml/Dash/GenericScopeView.qml:690
225+#: qml/Dash/GenericScopeView.qml:539 qml/Dash/GenericScopeView.qml:697
226msgid "See less"
226msgid "See less"
227msgstr "간단히 표시"
227msgstr "간단히 표시"
228
228
229−#: qml/Dash/GenericScopeView.qml:532
229+#: qml/Dash/GenericScopeView.qml:539
230msgid "See all"
230msgid "See all"
231msgstr "모두 보기"
231msgstr "모두 보기"
232
232
233−#: qml/Dash/GenericScopeView.qml:594
233+#: qml/Dash/GenericScopeView.qml:601
234msgctxt "Label: Hint for dash search line edit"
234msgctxt "Label: Hint for dash search line edit"
235msgid "Search"
235msgid "Search"
236msgstr "검색"
236msgstr "검색"
@@ -314,57 +314,58 @@ msgstr "다시 시도"
314msgid "Tap to unlock"
314msgid "Tap to unlock"
315msgstr "두드려서 잠금 해제"
315msgstr "두드려서 잠금 해제"
316
316
317−#: qml/Greeter/NarrowView.qml:53 qml/Wizard/Pages/passwd-confirm.qml:53
317+#: qml/Greeter/NarrowView.qml:54 qml/Wizard/Pages/passwd-confirm.qml:53
318msgid "Sorry, incorrect passphrase."
318msgid "Sorry, incorrect passphrase."
319msgstr "올바르지 않은 암호문입니다."
319msgstr "올바르지 않은 암호문입니다."
320
320
321−#: qml/Greeter/NarrowView.qml:54 qml/Wizard/Pages/passwd-confirm.qml:54
321+#: qml/Greeter/NarrowView.qml:55 qml/Wizard/Pages/passwd-confirm.qml:54
322msgid "Sorry, incorrect passcode."
322msgid "Sorry, incorrect passcode."
323msgstr "최송합니다. 패스코드가 올바르지 않습니다."
323msgstr "최송합니다. 패스코드가 올바르지 않습니다."
324
324
325−#: qml/Greeter/NarrowView.qml:55
325+#: qml/Greeter/NarrowView.qml:56
326msgid "This will be your last attempt."
326msgid "This will be your last attempt."
327msgstr "마지막 시도입니다."
327msgstr "마지막 시도입니다."
328
328
329−#: qml/Greeter/NarrowView.qml:57
329+#: qml/Greeter/NarrowView.qml:58
330msgid ""
330msgid ""
331"If passphrase is entered incorrectly, your phone will conduct a factory "
331"If passphrase is entered incorrectly, your phone will conduct a factory "
332"reset and all personal data will be deleted."
332"reset and all personal data will be deleted."
333msgstr "이번에도 올바르지 않은 암호문을 입력하면 휴대 전화를 공장 초기화하여 모든 개인 정보를 삭제합니다."
333msgstr "이번에도 올바르지 않은 암호문을 입력하면 휴대 전화를 공장 초기화하여 모든 개인 정보를 삭제합니다."
334
334
335−#: qml/Greeter/NarrowView.qml:58
335+#: qml/Greeter/NarrowView.qml:59
336msgid ""
336msgid ""
337"If passcode is entered incorrectly, your phone will conduct a factory reset "
337"If passcode is entered incorrectly, your phone will conduct a factory reset "
338"and all personal data will be deleted."
338"and all personal data will be deleted."
339msgstr "이번에도 올바르지 않은 패스코드를 입력하면 휴대 전화를 공장 초기화하여 모든 개인 정보를 삭제합니다."
339msgstr "이번에도 올바르지 않은 패스코드를 입력하면 휴대 전화를 공장 초기화하여 모든 개인 정보를 삭제합니다."
340
340
341−#: qml/Greeter/NarrowView.qml:115
341+#: qml/Greeter/NarrowView.qml:116
342#, qt-format
342#, qt-format
343msgid "Enter %1"
343msgid "Enter %1"
344msgstr "%1 입력"
344msgstr "%1 입력"
345
345
346−#: qml/Greeter/NarrowView.qml:116 qml/Wizard/Pages/passwd-set.qml:60
346+#: qml/Greeter/NarrowView.qml:117 qml/Wizard/Pages/passwd-set.qml:60
347msgid "Enter passphrase"
347msgid "Enter passphrase"
348msgstr "암호문을 입력해주십시오."
348msgstr "암호문을 입력해주십시오."
349
349
350−#: qml/Greeter/NarrowView.qml:117
350+#: qml/Greeter/NarrowView.qml:118
351msgid "Enter passcode"
351msgid "Enter passcode"
352msgstr "패스코드를 입력해주십시오."
352msgstr "패스코드를 입력해주십시오."
353
353
354−#: qml/Greeter/NarrowView.qml:118
354+#: qml/Greeter/NarrowView.qml:119
355#, qt-format
355#, qt-format
356msgid "Sorry, incorrect %1"
356msgid "Sorry, incorrect %1"
357msgstr "죄송합니다. %1이(가) 올바르지 않습니다."
357msgstr "죄송합니다. %1이(가) 올바르지 않습니다."
358
358
359−#: qml/Greeter/NarrowView.qml:119
359+#: qml/Greeter/NarrowView.qml:120
360msgid "Sorry, incorrect passphrase"
360msgid "Sorry, incorrect passphrase"
361msgstr "죄송합니다. 암호문일 올바르지 않습니다."
361msgstr "죄송합니다. 암호문일 올바르지 않습니다."
362
362
363−#: qml/Greeter/NarrowView.qml:120
363+#: qml/Greeter/NarrowView.qml:121
364+msgctxt "passphrase"
364msgid "Please re-enter"
365msgid "Please re-enter"
365−msgstr "다시 입력해주십시오."
366+msgstr ""
366
367
367−#: qml/Greeter/NarrowView.qml:121
368+#: qml/Greeter/NarrowView.qml:122
368msgid "Sorry, incorrect passcode"
369msgid "Sorry, incorrect passcode"
369msgstr "죄송합니다. 패스코드가 올바르지 않습니다."
370msgstr "죄송합니다. 패스코드가 올바르지 않습니다."
370
371
@@ -514,38 +515,6 @@ msgctxt "Button: Go back one page in the Wizard"
514msgid "Back"
515msgid "Back"
515msgstr "뒤로"
516msgstr "뒤로"
516
517
517−#: qml/Wizard/Pages/here-terms.qml:27
518−msgid "Terms & Conditions"
519−msgstr "사용 약관"
520−
521−#: qml/Wizard/Pages/passwd-confirm.qml:49
522−msgid "Confirm passphrase"
523−msgstr "암호문 확인"
524−
525−#: qml/Wizard/Pages/passwd-confirm.qml:50
526−msgid "Confirm passcode"
527−msgstr "패스코드 확인"
528−
529−#: qml/Wizard/Pages/passwd-confirm.qml:53
530−#: qml/Wizard/Pages/passwd-confirm.qml:54
531−msgid "Please try again."
532−msgstr "다시 시도해주십시오."
533−
534−#: qml/Wizard/Pages/passwd-confirm.qml:82 qml/Wizard/Pages/passwd-set.qml:90
535−#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:128
536−#: qml/Wizard/Pages/40-wifi.qml:215 qml/Wizard/Pages/50-location.qml:131
537−#: qml/Wizard/Pages/60-reporting.qml:50
538−msgid "Continue"
539−msgstr "계속"
540−
541−#: qml/Wizard/Pages/passwd-set.qml:61
542−msgid "Choose your passcode"
543−msgstr "패스코드 선택"
544−
545−#: qml/Wizard/Pages/passwd-set.qml:68
546−msgid "Passphrase must be 4 characters long"
547−msgstr "암호문의 최소 길이는 네 문자입니다."
548−
549#: qml/Wizard/Pages/10-welcome.qml:27
518#: qml/Wizard/Pages/10-welcome.qml:27
550msgid "Hi!"
519msgid "Hi!"
551msgstr "안녕!"
520msgstr "안녕!"
@@ -558,6 +527,13 @@ msgstr "우분투 폰을 사용해주셔서 감사합니다."
558msgid "Let’s get started."
527msgid "Let’s get started."
559msgstr "자 시작합니다."
528msgstr "자 시작합니다."
560
529
530+#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:128
531+#: qml/Wizard/Pages/40-wifi.qml:215 qml/Wizard/Pages/50-location.qml:131
532+#: qml/Wizard/Pages/60-reporting.qml:50 qml/Wizard/Pages/passwd-confirm.qml:82
533+#: qml/Wizard/Pages/passwd-set.qml:90
534+msgid "Continue"
535+msgstr "계속"
536+
561#: qml/Wizard/Pages/20-sim.qml:25
537#: qml/Wizard/Pages/20-sim.qml:25
562msgid "Add a SIM card and restart your device"
538msgid "Add a SIM card and restart your device"
563msgstr "심 카드를 추가한 후 장치 다시 시작"
539msgstr "심 카드를 추가한 후 장치 다시 시작"
@@ -683,6 +659,31 @@ msgstr "이제 전화를 사용할 수 있습니다."
683msgid "Finish"
659msgid "Finish"
684msgstr "완료"
660msgstr "완료"
685
661
662+#: qml/Wizard/Pages/here-terms.qml:27
663+msgid "Terms & Conditions"
664+msgstr "사용 약관"
665+
666+#: qml/Wizard/Pages/passwd-confirm.qml:49
667+msgid "Confirm passphrase"
668+msgstr "암호문 확인"
669+
670+#: qml/Wizard/Pages/passwd-confirm.qml:50
671+msgid "Confirm passcode"
672+msgstr "패스코드 확인"
673+
674+#: qml/Wizard/Pages/passwd-confirm.qml:53
675+#: qml/Wizard/Pages/passwd-confirm.qml:54
676+msgid "Please try again."
677+msgstr "다시 시도해주십시오."
678+
679+#: qml/Wizard/Pages/passwd-set.qml:61
680+msgid "Choose your passcode"
681+msgstr "패스코드 선택"
682+
683+#: qml/Wizard/Pages/passwd-set.qml:68
684+msgid "Passphrase must be 4 characters long"
685+msgstr "암호문의 최소 길이는 네 문자입니다."
686+
686#. Translators: This is the arrow for "Back" buttons
687#. Translators: This is the arrow for "Back" buttons
687#: qml/Wizard/StackButton.qml:39
688#: qml/Wizard/StackButton.qml:39
688#, qt-format
689#, qt-format
@@ -784,3 +785,6 @@ msgstr "%1 〉"
784
785
785#~ msgid "Manage Scopes"
786#~ msgid "Manage Scopes"
786#~ msgstr "스코프 관리"
787#~ msgstr "스코프 관리"
788+
789+#~ msgid "Please re-enter"
790+#~ msgstr "다시 입력해주십시오."
po/ku.po+51−50
@@ -7,7 +7,7 @@ msgid ""
7msgstr ""
7msgstr ""
8"Project-Id-Version: unity8\n"
8"Project-Id-Version: unity8\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2015-06-22 12:00+0200\n"
10+"POT-Creation-Date: 2015-07-17 10:10+0200\n"
11"PO-Revision-Date: 2014-09-10 13:14+0000\n"
11"PO-Revision-Date: 2014-09-10 13:14+0000\n"
12"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
12"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
13"Language-Team: Kurdish <ku@li.org>\n"
13"Language-Team: Kurdish <ku@li.org>\n"
@@ -15,8 +15,8 @@ msgstr ""
15"Content-Type: text/plain; charset=UTF-8\n"
15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n"
16"Content-Transfer-Encoding: 8bit\n"
17"Plural-Forms: nplurals=2; plural=n != 1;\n"
17"Plural-Forms: nplurals=2; plural=n != 1;\n"
18−"X-Launchpad-Export-Date: 2015-07-04 05:37+0000\n"
18+"X-Launchpad-Export-Date: 2015-07-25 05:39+0000\n"
19−"X-Generator: Launchpad (build 17597)\n"
19+"X-Generator: Launchpad (build 17628)\n"
20
20
21#: plugins/LightDM/Greeter.cpp:112
21#: plugins/LightDM/Greeter.cpp:112
22msgid "Password: "
22msgid "Password: "
@@ -225,15 +225,15 @@ msgstr "Lêgerîna Lezgîn"
225msgid "OK"
225msgid "OK"
226msgstr "BAŞ E"
226msgstr "BAŞ E"
227
227
228−#: qml/Dash/GenericScopeView.qml:532 qml/Dash/GenericScopeView.qml:690
228+#: qml/Dash/GenericScopeView.qml:539 qml/Dash/GenericScopeView.qml:697
229msgid "See less"
229msgid "See less"
230msgstr "Hindiktir bibîne"
230msgstr "Hindiktir bibîne"
231
231
232−#: qml/Dash/GenericScopeView.qml:532
232+#: qml/Dash/GenericScopeView.qml:539
233msgid "See all"
233msgid "See all"
234msgstr "Tevî bibîne"
234msgstr "Tevî bibîne"
235
235
236−#: qml/Dash/GenericScopeView.qml:594
236+#: qml/Dash/GenericScopeView.qml:601
237msgctxt "Label: Hint for dash search line edit"
237msgctxt "Label: Hint for dash search line edit"
238msgid "Search"
238msgid "Search"
239msgstr ""
239msgstr ""
@@ -317,19 +317,19 @@ msgstr ""
317msgid "Tap to unlock"
317msgid "Tap to unlock"
318msgstr ""
318msgstr ""
319
319
320−#: qml/Greeter/NarrowView.qml:53 qml/Wizard/Pages/passwd-confirm.qml:53
320+#: qml/Greeter/NarrowView.qml:54 qml/Wizard/Pages/passwd-confirm.qml:53
321msgid "Sorry, incorrect passphrase."
321msgid "Sorry, incorrect passphrase."
322msgstr "Bibore, parola çewt e."
322msgstr "Bibore, parola çewt e."
323
323
324−#: qml/Greeter/NarrowView.qml:54 qml/Wizard/Pages/passwd-confirm.qml:54
324+#: qml/Greeter/NarrowView.qml:55 qml/Wizard/Pages/passwd-confirm.qml:54
325msgid "Sorry, incorrect passcode."
325msgid "Sorry, incorrect passcode."
326msgstr "Bibore, parola çewt e."
326msgstr "Bibore, parola çewt e."
327
327
328−#: qml/Greeter/NarrowView.qml:55
328+#: qml/Greeter/NarrowView.qml:56
329msgid "This will be your last attempt."
329msgid "This will be your last attempt."
330msgstr "Ev ê ceribandina dawiyê be."
330msgstr "Ev ê ceribandina dawiyê be."
331
331
332−#: qml/Greeter/NarrowView.qml:57
332+#: qml/Greeter/NarrowView.qml:58
333msgid ""
333msgid ""
334"If passphrase is entered incorrectly, your phone will conduct a factory "
334"If passphrase is entered incorrectly, your phone will conduct a factory "
335"reset and all personal data will be deleted."
335"reset and all personal data will be deleted."
@@ -337,7 +337,7 @@ msgstr ""
337"Eger parola çewt bê nivîsandin, telefona te dê vegere eyarên fabrîkayê û "
337"Eger parola çewt bê nivîsandin, telefona te dê vegere eyarên fabrîkayê û "
338"hemû daneyên te yên taybet dê bên jêbirin."
338"hemû daneyên te yên taybet dê bên jêbirin."
339
339
340−#: qml/Greeter/NarrowView.qml:58
340+#: qml/Greeter/NarrowView.qml:59
341msgid ""
341msgid ""
342"If passcode is entered incorrectly, your phone will conduct a factory reset "
342"If passcode is entered incorrectly, your phone will conduct a factory reset "
343"and all personal data will be deleted."
343"and all personal data will be deleted."
@@ -345,33 +345,34 @@ msgstr ""
345"Eger parola çewt bê nivîsandin, telefona te dê vegere eyarên fabrîkayê û "
345"Eger parola çewt bê nivîsandin, telefona te dê vegere eyarên fabrîkayê û "
346"hemû daneyên te yên taybet dê bên jêbirin."
346"hemû daneyên te yên taybet dê bên jêbirin."
347
347
348−#: qml/Greeter/NarrowView.qml:115
348+#: qml/Greeter/NarrowView.qml:116
349#, qt-format
349#, qt-format
350msgid "Enter %1"
350msgid "Enter %1"
351msgstr ""
351msgstr ""
352
352
353−#: qml/Greeter/NarrowView.qml:116 qml/Wizard/Pages/passwd-set.qml:60
353+#: qml/Greeter/NarrowView.qml:117 qml/Wizard/Pages/passwd-set.qml:60
354msgid "Enter passphrase"
354msgid "Enter passphrase"
355msgstr ""
355msgstr ""
356
356
357−#: qml/Greeter/NarrowView.qml:117
357+#: qml/Greeter/NarrowView.qml:118
358msgid "Enter passcode"
358msgid "Enter passcode"
359msgstr ""
359msgstr ""
360
360
361−#: qml/Greeter/NarrowView.qml:118
361+#: qml/Greeter/NarrowView.qml:119
362#, qt-format
362#, qt-format
363msgid "Sorry, incorrect %1"
363msgid "Sorry, incorrect %1"
364msgstr "Bibore, %1 çewt e"
364msgstr "Bibore, %1 çewt e"
365
365
366−#: qml/Greeter/NarrowView.qml:119
366+#: qml/Greeter/NarrowView.qml:120
367msgid "Sorry, incorrect passphrase"
367msgid "Sorry, incorrect passphrase"
368msgstr "Bibore, parola çewt e"
368msgstr "Bibore, parola çewt e"
369
369
370−#: qml/Greeter/NarrowView.qml:120
370+#: qml/Greeter/NarrowView.qml:121
371+msgctxt "passphrase"
371msgid "Please re-enter"
372msgid "Please re-enter"
372msgstr ""
373msgstr ""
373
374
374−#: qml/Greeter/NarrowView.qml:121
375+#: qml/Greeter/NarrowView.qml:122
375msgid "Sorry, incorrect passcode"
376msgid "Sorry, incorrect passcode"
376msgstr "Bibore, parola çewrt e"
377msgstr "Bibore, parola çewrt e"
377
378
@@ -521,38 +522,6 @@ msgctxt "Button: Go back one page in the Wizard"
521msgid "Back"
522msgid "Back"
522msgstr ""
523msgstr ""
523
524
524−#: qml/Wizard/Pages/here-terms.qml:27
525−msgid "Terms & Conditions"
526−msgstr ""
527−
528−#: qml/Wizard/Pages/passwd-confirm.qml:49
529−msgid "Confirm passphrase"
530−msgstr ""
531−
532−#: qml/Wizard/Pages/passwd-confirm.qml:50
533−msgid "Confirm passcode"
534−msgstr ""
535−
536−#: qml/Wizard/Pages/passwd-confirm.qml:53
537−#: qml/Wizard/Pages/passwd-confirm.qml:54
538−msgid "Please try again."
539−msgstr ""
540−
541−#: qml/Wizard/Pages/passwd-confirm.qml:82 qml/Wizard/Pages/passwd-set.qml:90
542−#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:128
543−#: qml/Wizard/Pages/40-wifi.qml:215 qml/Wizard/Pages/50-location.qml:131
544−#: qml/Wizard/Pages/60-reporting.qml:50
545−msgid "Continue"
546−msgstr ""
547−
548−#: qml/Wizard/Pages/passwd-set.qml:61
549−msgid "Choose your passcode"
550−msgstr ""
551−
552−#: qml/Wizard/Pages/passwd-set.qml:68
553−msgid "Passphrase must be 4 characters long"
554−msgstr ""
555−
556#: qml/Wizard/Pages/10-welcome.qml:27
525#: qml/Wizard/Pages/10-welcome.qml:27
557msgid "Hi!"
526msgid "Hi!"
558msgstr ""
527msgstr ""
@@ -565,6 +534,13 @@ msgstr ""
565msgid "Let’s get started."
534msgid "Let’s get started."
566msgstr ""
535msgstr ""
567
536
537+#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:128
538+#: qml/Wizard/Pages/40-wifi.qml:215 qml/Wizard/Pages/50-location.qml:131
539+#: qml/Wizard/Pages/60-reporting.qml:50 qml/Wizard/Pages/passwd-confirm.qml:82
540+#: qml/Wizard/Pages/passwd-set.qml:90
541+msgid "Continue"
542+msgstr ""
543+
568#: qml/Wizard/Pages/20-sim.qml:25
544#: qml/Wizard/Pages/20-sim.qml:25
569msgid "Add a SIM card and restart your device"
545msgid "Add a SIM card and restart your device"
570msgstr ""
546msgstr ""
@@ -690,6 +666,31 @@ msgstr ""
690msgid "Finish"
666msgid "Finish"
691msgstr ""
667msgstr ""
692
668
669+#: qml/Wizard/Pages/here-terms.qml:27
670+msgid "Terms & Conditions"
671+msgstr ""
672+
673+#: qml/Wizard/Pages/passwd-confirm.qml:49
674+msgid "Confirm passphrase"
675+msgstr ""
676+
677+#: qml/Wizard/Pages/passwd-confirm.qml:50
678+msgid "Confirm passcode"
679+msgstr ""
680+
681+#: qml/Wizard/Pages/passwd-confirm.qml:53
682+#: qml/Wizard/Pages/passwd-confirm.qml:54
683+msgid "Please try again."
684+msgstr ""
685+
686+#: qml/Wizard/Pages/passwd-set.qml:61
687+msgid "Choose your passcode"
688+msgstr ""
689+
690+#: qml/Wizard/Pages/passwd-set.qml:68
691+msgid "Passphrase must be 4 characters long"
692+msgstr ""
693+
693#. Translators: This is the arrow for "Back" buttons
694#. Translators: This is the arrow for "Back" buttons
694#: qml/Wizard/StackButton.qml:39
695#: qml/Wizard/StackButton.qml:39
695#, qt-format
696#, qt-format
po/ky.po+51−50
@@ -7,7 +7,7 @@ msgid ""
7msgstr ""
7msgstr ""
8"Project-Id-Version: unity\n"
8"Project-Id-Version: unity\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2015-06-22 12:00+0200\n"
10+"POT-Creation-Date: 2015-07-17 10:10+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"
@@ -15,8 +15,8 @@ msgstr ""
15"Content-Type: text/plain; charset=UTF-8\n"
15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n"
16"Content-Transfer-Encoding: 8bit\n"
17"Plural-Forms: nplurals=1; plural=0;\n"
17"Plural-Forms: nplurals=1; plural=0;\n"
18−"X-Launchpad-Export-Date: 2015-07-04 05:37+0000\n"
18+"X-Launchpad-Export-Date: 2015-07-25 05:39+0000\n"
19−"X-Generator: Launchpad (build 17597)\n"
19+"X-Generator: Launchpad (build 17628)\n"
20
20
21#: plugins/LightDM/Greeter.cpp:112
21#: plugins/LightDM/Greeter.cpp:112
22msgid "Password: "
22msgid "Password: "
@@ -223,15 +223,15 @@ msgstr ""
223msgid "OK"
223msgid "OK"
224msgstr ""
224msgstr ""
225
225
226−#: qml/Dash/GenericScopeView.qml:532 qml/Dash/GenericScopeView.qml:690
226+#: qml/Dash/GenericScopeView.qml:539 qml/Dash/GenericScopeView.qml:697
227msgid "See less"
227msgid "See less"
228msgstr ""
228msgstr ""
229
229
230−#: qml/Dash/GenericScopeView.qml:532
230+#: qml/Dash/GenericScopeView.qml:539
231msgid "See all"
231msgid "See all"
232msgstr ""
232msgstr ""
233
233
234−#: qml/Dash/GenericScopeView.qml:594
234+#: qml/Dash/GenericScopeView.qml:601
235msgctxt "Label: Hint for dash search line edit"
235msgctxt "Label: Hint for dash search line edit"
236msgid "Search"
236msgid "Search"
237msgstr ""
237msgstr ""
@@ -315,57 +315,58 @@ msgstr ""
315msgid "Tap to unlock"
315msgid "Tap to unlock"
316msgstr ""
316msgstr ""
317
317
318−#: qml/Greeter/NarrowView.qml:53 qml/Wizard/Pages/passwd-confirm.qml:53
318+#: qml/Greeter/NarrowView.qml:54 qml/Wizard/Pages/passwd-confirm.qml:53
319msgid "Sorry, incorrect passphrase."
319msgid "Sorry, incorrect passphrase."
320msgstr ""
320msgstr ""
321
321
322−#: qml/Greeter/NarrowView.qml:54 qml/Wizard/Pages/passwd-confirm.qml:54
322+#: qml/Greeter/NarrowView.qml:55 qml/Wizard/Pages/passwd-confirm.qml:54
323msgid "Sorry, incorrect passcode."
323msgid "Sorry, incorrect passcode."
324msgstr ""
324msgstr ""
325
325
326−#: qml/Greeter/NarrowView.qml:55
326+#: qml/Greeter/NarrowView.qml:56
327msgid "This will be your last attempt."
327msgid "This will be your last attempt."
328msgstr ""
328msgstr ""
329
329
330−#: qml/Greeter/NarrowView.qml:57
330+#: qml/Greeter/NarrowView.qml:58
331msgid ""
331msgid ""
332"If passphrase is entered incorrectly, your phone will conduct a factory "
332"If passphrase is entered incorrectly, your phone will conduct a factory "
333"reset and all personal data will be deleted."
333"reset and all personal data will be deleted."
334msgstr ""
334msgstr ""
335
335
336−#: qml/Greeter/NarrowView.qml:58
336+#: qml/Greeter/NarrowView.qml:59
337msgid ""
337msgid ""
338"If passcode is entered incorrectly, your phone will conduct a factory reset "
338"If passcode is entered incorrectly, your phone will conduct a factory reset "
339"and all personal data will be deleted."
339"and all personal data will be deleted."
340msgstr ""
340msgstr ""
341
341
342−#: qml/Greeter/NarrowView.qml:115
342+#: qml/Greeter/NarrowView.qml:116
343#, qt-format
343#, qt-format
344msgid "Enter %1"
344msgid "Enter %1"
345msgstr ""
345msgstr ""
346
346
347−#: qml/Greeter/NarrowView.qml:116 qml/Wizard/Pages/passwd-set.qml:60
347+#: qml/Greeter/NarrowView.qml:117 qml/Wizard/Pages/passwd-set.qml:60
348msgid "Enter passphrase"
348msgid "Enter passphrase"
349msgstr ""
349msgstr ""
350
350
351−#: qml/Greeter/NarrowView.qml:117
351+#: qml/Greeter/NarrowView.qml:118
352msgid "Enter passcode"
352msgid "Enter passcode"
353msgstr ""
353msgstr ""
354
354
355−#: qml/Greeter/NarrowView.qml:118
355+#: qml/Greeter/NarrowView.qml:119
356#, qt-format
356#, qt-format
357msgid "Sorry, incorrect %1"
357msgid "Sorry, incorrect %1"
358msgstr ""
358msgstr ""
359
359
360−#: qml/Greeter/NarrowView.qml:119
360+#: qml/Greeter/NarrowView.qml:120
361msgid "Sorry, incorrect passphrase"
361msgid "Sorry, incorrect passphrase"
362msgstr ""
362msgstr ""
363
363
364−#: qml/Greeter/NarrowView.qml:120
364+#: qml/Greeter/NarrowView.qml:121
365+msgctxt "passphrase"
365msgid "Please re-enter"
366msgid "Please re-enter"
366msgstr ""
367msgstr ""
367
368
368−#: qml/Greeter/NarrowView.qml:121
369+#: qml/Greeter/NarrowView.qml:122
369msgid "Sorry, incorrect passcode"
370msgid "Sorry, incorrect passcode"
370msgstr ""
371msgstr ""
371
372
@@ -515,38 +516,6 @@ msgctxt "Button: Go back one page in the Wizard"
515msgid "Back"
516msgid "Back"
516msgstr ""
517msgstr ""
517
518
518−#: qml/Wizard/Pages/here-terms.qml:27
519−msgid "Terms & Conditions"
520−msgstr ""
521−
522−#: qml/Wizard/Pages/passwd-confirm.qml:49
523−msgid "Confirm passphrase"
524−msgstr ""
525−
526−#: qml/Wizard/Pages/passwd-confirm.qml:50
527−msgid "Confirm passcode"
528−msgstr ""
529−
530−#: qml/Wizard/Pages/passwd-confirm.qml:53
531−#: qml/Wizard/Pages/passwd-confirm.qml:54
532−msgid "Please try again."
533−msgstr ""
534−
535−#: qml/Wizard/Pages/passwd-confirm.qml:82 qml/Wizard/Pages/passwd-set.qml:90
536−#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:128
537−#: qml/Wizard/Pages/40-wifi.qml:215 qml/Wizard/Pages/50-location.qml:131
538−#: qml/Wizard/Pages/60-reporting.qml:50
539−msgid "Continue"
540−msgstr ""
541−
542−#: qml/Wizard/Pages/passwd-set.qml:61
543−msgid "Choose your passcode"
544−msgstr ""
545−
546−#: qml/Wizard/Pages/passwd-set.qml:68
547−msgid "Passphrase must be 4 characters long"
548−msgstr ""
549−
550#: qml/Wizard/Pages/10-welcome.qml:27
519#: qml/Wizard/Pages/10-welcome.qml:27
551msgid "Hi!"
520msgid "Hi!"
552msgstr ""
521msgstr ""
@@ -559,6 +528,13 @@ msgstr ""
559msgid "Let’s get started."
528msgid "Let’s get started."
560msgstr ""
529msgstr ""
561
530
531+#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:128
532+#: qml/Wizard/Pages/40-wifi.qml:215 qml/Wizard/Pages/50-location.qml:131
533+#: qml/Wizard/Pages/60-reporting.qml:50 qml/Wizard/Pages/passwd-confirm.qml:82
534+#: qml/Wizard/Pages/passwd-set.qml:90
535+msgid "Continue"
536+msgstr ""
537+
562#: qml/Wizard/Pages/20-sim.qml:25
538#: qml/Wizard/Pages/20-sim.qml:25
563msgid "Add a SIM card and restart your device"
539msgid "Add a SIM card and restart your device"
564msgstr ""
540msgstr ""
@@ -684,6 +660,31 @@ msgstr ""
684msgid "Finish"
660msgid "Finish"
685msgstr ""
661msgstr ""
686
662
663+#: qml/Wizard/Pages/here-terms.qml:27
664+msgid "Terms & Conditions"
665+msgstr ""
666+
667+#: qml/Wizard/Pages/passwd-confirm.qml:49
668+msgid "Confirm passphrase"
669+msgstr ""
670+
671+#: qml/Wizard/Pages/passwd-confirm.qml:50
672+msgid "Confirm passcode"
673+msgstr ""
674+
675+#: qml/Wizard/Pages/passwd-confirm.qml:53
676+#: qml/Wizard/Pages/passwd-confirm.qml:54
677+msgid "Please try again."
678+msgstr ""
679+
680+#: qml/Wizard/Pages/passwd-set.qml:61
681+msgid "Choose your passcode"
682+msgstr ""
683+
684+#: qml/Wizard/Pages/passwd-set.qml:68
685+msgid "Passphrase must be 4 characters long"
686+msgstr ""
687+
687#. Translators: This is the arrow for "Back" buttons
688#. Translators: This is the arrow for "Back" buttons
688#: qml/Wizard/StackButton.qml:39
689#: qml/Wizard/StackButton.qml:39
689#, qt-format
690#, qt-format
po/lo.po+51−50
@@ -7,7 +7,7 @@ msgid ""
7msgstr ""
7msgstr ""
8"Project-Id-Version: unity8\n"
8"Project-Id-Version: unity8\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2015-06-22 12:00+0200\n"
10+"POT-Creation-Date: 2015-07-17 10:10+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"
@@ -15,8 +15,8 @@ msgstr ""
15"Content-Type: text/plain; charset=UTF-8\n"
15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n"
16"Content-Transfer-Encoding: 8bit\n"
17"Plural-Forms: nplurals=1; plural=0;\n"
17"Plural-Forms: nplurals=1; plural=0;\n"
18−"X-Launchpad-Export-Date: 2015-07-04 05:37+0000\n"
18+"X-Launchpad-Export-Date: 2015-07-25 05:39+0000\n"
19−"X-Generator: Launchpad (build 17597)\n"
19+"X-Generator: Launchpad (build 17628)\n"
20
20
21#: plugins/LightDM/Greeter.cpp:112
21#: plugins/LightDM/Greeter.cpp:112
22msgid "Password: "
22msgid "Password: "
@@ -223,15 +223,15 @@ msgstr ""
223msgid "OK"
223msgid "OK"
224msgstr ""
224msgstr ""
225
225
226−#: qml/Dash/GenericScopeView.qml:532 qml/Dash/GenericScopeView.qml:690
226+#: qml/Dash/GenericScopeView.qml:539 qml/Dash/GenericScopeView.qml:697
227msgid "See less"
227msgid "See less"
228msgstr ""
228msgstr ""
229
229
230−#: qml/Dash/GenericScopeView.qml:532
230+#: qml/Dash/GenericScopeView.qml:539
231msgid "See all"
231msgid "See all"
232msgstr ""
232msgstr ""
233
233
234−#: qml/Dash/GenericScopeView.qml:594
234+#: qml/Dash/GenericScopeView.qml:601
235msgctxt "Label: Hint for dash search line edit"
235msgctxt "Label: Hint for dash search line edit"
236msgid "Search"
236msgid "Search"
237msgstr ""
237msgstr ""
@@ -315,57 +315,58 @@ msgstr ""
315msgid "Tap to unlock"
315msgid "Tap to unlock"
316msgstr ""
316msgstr ""
317
317
318−#: qml/Greeter/NarrowView.qml:53 qml/Wizard/Pages/passwd-confirm.qml:53
318+#: qml/Greeter/NarrowView.qml:54 qml/Wizard/Pages/passwd-confirm.qml:53
319msgid "Sorry, incorrect passphrase."
319msgid "Sorry, incorrect passphrase."
320msgstr ""
320msgstr ""
321
321
322−#: qml/Greeter/NarrowView.qml:54 qml/Wizard/Pages/passwd-confirm.qml:54
322+#: qml/Greeter/NarrowView.qml:55 qml/Wizard/Pages/passwd-confirm.qml:54
323msgid "Sorry, incorrect passcode."
323msgid "Sorry, incorrect passcode."
324msgstr ""
324msgstr ""
325
325
326−#: qml/Greeter/NarrowView.qml:55
326+#: qml/Greeter/NarrowView.qml:56
327msgid "This will be your last attempt."
327msgid "This will be your last attempt."
328msgstr ""
328msgstr ""
329
329
330−#: qml/Greeter/NarrowView.qml:57
330+#: qml/Greeter/NarrowView.qml:58
331msgid ""
331msgid ""
332"If passphrase is entered incorrectly, your phone will conduct a factory "
332"If passphrase is entered incorrectly, your phone will conduct a factory "
333"reset and all personal data will be deleted."
333"reset and all personal data will be deleted."
334msgstr ""
334msgstr ""
335
335
336−#: qml/Greeter/NarrowView.qml:58
336+#: qml/Greeter/NarrowView.qml:59
337msgid ""
337msgid ""
338"If passcode is entered incorrectly, your phone will conduct a factory reset "
338"If passcode is entered incorrectly, your phone will conduct a factory reset "
339"and all personal data will be deleted."
339"and all personal data will be deleted."
340msgstr ""
340msgstr ""
341
341
342−#: qml/Greeter/NarrowView.qml:115
342+#: qml/Greeter/NarrowView.qml:116
343#, qt-format
343#, qt-format
344msgid "Enter %1"
344msgid "Enter %1"
345msgstr ""
345msgstr ""
346
346
347−#: qml/Greeter/NarrowView.qml:116 qml/Wizard/Pages/passwd-set.qml:60
347+#: qml/Greeter/NarrowView.qml:117 qml/Wizard/Pages/passwd-set.qml:60
348msgid "Enter passphrase"
348msgid "Enter passphrase"
349msgstr ""
349msgstr ""
350
350
351−#: qml/Greeter/NarrowView.qml:117
351+#: qml/Greeter/NarrowView.qml:118
352msgid "Enter passcode"
352msgid "Enter passcode"
353msgstr ""
353msgstr ""
354
354
355−#: qml/Greeter/NarrowView.qml:118
355+#: qml/Greeter/NarrowView.qml:119
356#, qt-format
356#, qt-format
357msgid "Sorry, incorrect %1"
357msgid "Sorry, incorrect %1"
358msgstr ""
358msgstr ""
359
359
360−#: qml/Greeter/NarrowView.qml:119
360+#: qml/Greeter/NarrowView.qml:120
361msgid "Sorry, incorrect passphrase"
361msgid "Sorry, incorrect passphrase"
362msgstr ""
362msgstr ""
363
363
364−#: qml/Greeter/NarrowView.qml:120
364+#: qml/Greeter/NarrowView.qml:121
365+msgctxt "passphrase"
365msgid "Please re-enter"
366msgid "Please re-enter"
366msgstr ""
367msgstr ""
367
368
368−#: qml/Greeter/NarrowView.qml:121
369+#: qml/Greeter/NarrowView.qml:122
369msgid "Sorry, incorrect passcode"
370msgid "Sorry, incorrect passcode"
370msgstr ""
371msgstr ""
371
372
@@ -515,38 +516,6 @@ msgctxt "Button: Go back one page in the Wizard"
515msgid "Back"
516msgid "Back"
516msgstr ""
517msgstr ""
517
518
518−#: qml/Wizard/Pages/here-terms.qml:27
519−msgid "Terms & Conditions"
520−msgstr ""
521−
522−#: qml/Wizard/Pages/passwd-confirm.qml:49
523−msgid "Confirm passphrase"
524−msgstr ""
525−
526−#: qml/Wizard/Pages/passwd-confirm.qml:50
527−msgid "Confirm passcode"
528−msgstr ""
529−
530−#: qml/Wizard/Pages/passwd-confirm.qml:53
531−#: qml/Wizard/Pages/passwd-confirm.qml:54
532−msgid "Please try again."
533−msgstr ""
534−
535−#: qml/Wizard/Pages/passwd-confirm.qml:82 qml/Wizard/Pages/passwd-set.qml:90
536−#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:128
537−#: qml/Wizard/Pages/40-wifi.qml:215 qml/Wizard/Pages/50-location.qml:131
538−#: qml/Wizard/Pages/60-reporting.qml:50
539−msgid "Continue"
540−msgstr ""
541−
542−#: qml/Wizard/Pages/passwd-set.qml:61
543−msgid "Choose your passcode"
544−msgstr ""
545−
546−#: qml/Wizard/Pages/passwd-set.qml:68
547−msgid "Passphrase must be 4 characters long"
548−msgstr ""
549−
550#: qml/Wizard/Pages/10-welcome.qml:27
519#: qml/Wizard/Pages/10-welcome.qml:27
551msgid "Hi!"
520msgid "Hi!"
552msgstr ""
521msgstr ""
@@ -559,6 +528,13 @@ msgstr ""
559msgid "Let’s get started."
528msgid "Let’s get started."
560msgstr ""
529msgstr ""
561
530
531+#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:128
532+#: qml/Wizard/Pages/40-wifi.qml:215 qml/Wizard/Pages/50-location.qml:131
533+#: qml/Wizard/Pages/60-reporting.qml:50 qml/Wizard/Pages/passwd-confirm.qml:82
534+#: qml/Wizard/Pages/passwd-set.qml:90
535+msgid "Continue"
536+msgstr ""
537+
562#: qml/Wizard/Pages/20-sim.qml:25
538#: qml/Wizard/Pages/20-sim.qml:25
563msgid "Add a SIM card and restart your device"
539msgid "Add a SIM card and restart your device"
564msgstr ""
540msgstr ""
@@ -684,6 +660,31 @@ msgstr ""
684msgid "Finish"
660msgid "Finish"
685msgstr ""
661msgstr ""
686
662
663+#: qml/Wizard/Pages/here-terms.qml:27
664+msgid "Terms & Conditions"
665+msgstr ""
666+
667+#: qml/Wizard/Pages/passwd-confirm.qml:49
668+msgid "Confirm passphrase"
669+msgstr ""
670+
671+#: qml/Wizard/Pages/passwd-confirm.qml:50
672+msgid "Confirm passcode"
673+msgstr ""
674+
675+#: qml/Wizard/Pages/passwd-confirm.qml:53
676+#: qml/Wizard/Pages/passwd-confirm.qml:54
677+msgid "Please try again."
678+msgstr ""
679+
680+#: qml/Wizard/Pages/passwd-set.qml:61
681+msgid "Choose your passcode"
682+msgstr ""
683+
684+#: qml/Wizard/Pages/passwd-set.qml:68
685+msgid "Passphrase must be 4 characters long"
686+msgstr ""
687+
687#. Translators: This is the arrow for "Back" buttons
688#. Translators: This is the arrow for "Back" buttons
688#: qml/Wizard/StackButton.qml:39
689#: qml/Wizard/StackButton.qml:39
689#, qt-format
690#, qt-format
po/lt.po+51−50
@@ -7,7 +7,7 @@ msgid ""
7msgstr ""
7msgstr ""
8"Project-Id-Version: unity8\n"
8"Project-Id-Version: unity8\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2015-06-22 12:00+0200\n"
10+"POT-Creation-Date: 2015-07-17 10:10+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"
@@ -16,8 +16,8 @@ msgstr ""
16"Content-Transfer-Encoding: 8bit\n"
16"Content-Transfer-Encoding: 8bit\n"
17"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
17"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
18"(n%100<10 || n%100>=20) ? 1 : 2;\n"
18"(n%100<10 || n%100>=20) ? 1 : 2;\n"
19−"X-Launchpad-Export-Date: 2015-07-04 05:37+0000\n"
19+"X-Launchpad-Export-Date: 2015-07-25 05:39+0000\n"
20−"X-Generator: Launchpad (build 17597)\n"
20+"X-Generator: Launchpad (build 17628)\n"
21
21
22#: plugins/LightDM/Greeter.cpp:112
22#: plugins/LightDM/Greeter.cpp:112
23msgid "Password: "
23msgid "Password: "
@@ -224,15 +224,15 @@ msgstr "Pagalbos skambutis"
224msgid "OK"
224msgid "OK"
225msgstr ""
225msgstr ""
226
226
227−#: qml/Dash/GenericScopeView.qml:532 qml/Dash/GenericScopeView.qml:690
227+#: qml/Dash/GenericScopeView.qml:539 qml/Dash/GenericScopeView.qml:697
228msgid "See less"
228msgid "See less"
229msgstr ""
229msgstr ""
230
230
231−#: qml/Dash/GenericScopeView.qml:532
231+#: qml/Dash/GenericScopeView.qml:539
232msgid "See all"
232msgid "See all"
233msgstr ""
233msgstr ""
234
234
235−#: qml/Dash/GenericScopeView.qml:594
235+#: qml/Dash/GenericScopeView.qml:601
236msgctxt "Label: Hint for dash search line edit"
236msgctxt "Label: Hint for dash search line edit"
237msgid "Search"
237msgid "Search"
238msgstr ""
238msgstr ""
@@ -316,57 +316,58 @@ msgstr ""
316msgid "Tap to unlock"
316msgid "Tap to unlock"
317msgstr ""
317msgstr ""
318
318
319−#: qml/Greeter/NarrowView.qml:53 qml/Wizard/Pages/passwd-confirm.qml:53
319+#: qml/Greeter/NarrowView.qml:54 qml/Wizard/Pages/passwd-confirm.qml:53
320msgid "Sorry, incorrect passphrase."
320msgid "Sorry, incorrect passphrase."
321msgstr ""
321msgstr ""
322
322
323−#: qml/Greeter/NarrowView.qml:54 qml/Wizard/Pages/passwd-confirm.qml:54
323+#: qml/Greeter/NarrowView.qml:55 qml/Wizard/Pages/passwd-confirm.qml:54
324msgid "Sorry, incorrect passcode."
324msgid "Sorry, incorrect passcode."
325msgstr ""
325msgstr ""
326
326
327−#: qml/Greeter/NarrowView.qml:55
327+#: qml/Greeter/NarrowView.qml:56
328msgid "This will be your last attempt."
328msgid "This will be your last attempt."
329msgstr ""
329msgstr ""
330
330
331−#: qml/Greeter/NarrowView.qml:57
331+#: qml/Greeter/NarrowView.qml:58
332msgid ""
332msgid ""
333"If passphrase is entered incorrectly, your phone will conduct a factory "
333"If passphrase is entered incorrectly, your phone will conduct a factory "
334"reset and all personal data will be deleted."
334"reset and all personal data will be deleted."
335msgstr ""
335msgstr ""
336
336
337−#: qml/Greeter/NarrowView.qml:58
337+#: qml/Greeter/NarrowView.qml:59
338msgid ""
338msgid ""
339"If passcode is entered incorrectly, your phone will conduct a factory reset "
339"If passcode is entered incorrectly, your phone will conduct a factory reset "
340"and all personal data will be deleted."
340"and all personal data will be deleted."
341msgstr ""
341msgstr ""
342
342
343−#: qml/Greeter/NarrowView.qml:115
343+#: qml/Greeter/NarrowView.qml:116
344#, qt-format
344#, qt-format
345msgid "Enter %1"
345msgid "Enter %1"
346msgstr ""
346msgstr ""
347
347
348−#: qml/Greeter/NarrowView.qml:116 qml/Wizard/Pages/passwd-set.qml:60
348+#: qml/Greeter/NarrowView.qml:117 qml/Wizard/Pages/passwd-set.qml:60
349msgid "Enter passphrase"
349msgid "Enter passphrase"
350msgstr ""
350msgstr ""
351
351
352−#: qml/Greeter/NarrowView.qml:117
352+#: qml/Greeter/NarrowView.qml:118
353msgid "Enter passcode"
353msgid "Enter passcode"
354msgstr ""
354msgstr ""
355
355
356−#: qml/Greeter/NarrowView.qml:118
356+#: qml/Greeter/NarrowView.qml:119
357#, qt-format
357#, qt-format
358msgid "Sorry, incorrect %1"
358msgid "Sorry, incorrect %1"
359msgstr ""
359msgstr ""
360
360
361−#: qml/Greeter/NarrowView.qml:119
361+#: qml/Greeter/NarrowView.qml:120
362msgid "Sorry, incorrect passphrase"
362msgid "Sorry, incorrect passphrase"
363msgstr ""
363msgstr ""
364
364
365−#: qml/Greeter/NarrowView.qml:120
365+#: qml/Greeter/NarrowView.qml:121
366+msgctxt "passphrase"
366msgid "Please re-enter"
367msgid "Please re-enter"
367msgstr ""
368msgstr ""
368
369
369−#: qml/Greeter/NarrowView.qml:121
370+#: qml/Greeter/NarrowView.qml:122
370msgid "Sorry, incorrect passcode"
371msgid "Sorry, incorrect passcode"
371msgstr ""
372msgstr ""
372
373
@@ -516,38 +517,6 @@ msgctxt "Button: Go back one page in the Wizard"
516msgid "Back"
517msgid "Back"
517msgstr ""
518msgstr ""
518
519
519−#: qml/Wizard/Pages/here-terms.qml:27
520−msgid "Terms & Conditions"
521−msgstr ""
522−
523−#: qml/Wizard/Pages/passwd-confirm.qml:49
524−msgid "Confirm passphrase"
525−msgstr ""
526−
527−#: qml/Wizard/Pages/passwd-confirm.qml:50
528−msgid "Confirm passcode"
529−msgstr ""
530−
531−#: qml/Wizard/Pages/passwd-confirm.qml:53
532−#: qml/Wizard/Pages/passwd-confirm.qml:54
533−msgid "Please try again."
534−msgstr ""
535−
536−#: qml/Wizard/Pages/passwd-confirm.qml:82 qml/Wizard/Pages/passwd-set.qml:90
537−#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:128
538−#: qml/Wizard/Pages/40-wifi.qml:215 qml/Wizard/Pages/50-location.qml:131
539−#: qml/Wizard/Pages/60-reporting.qml:50
540−msgid "Continue"
541−msgstr ""
542−
543−#: qml/Wizard/Pages/passwd-set.qml:61
544−msgid "Choose your passcode"
545−msgstr ""
546−
547−#: qml/Wizard/Pages/passwd-set.qml:68
548−msgid "Passphrase must be 4 characters long"
549−msgstr ""
550−
551#: qml/Wizard/Pages/10-welcome.qml:27
520#: qml/Wizard/Pages/10-welcome.qml:27
552msgid "Hi!"
521msgid "Hi!"
553msgstr ""
522msgstr ""
@@ -560,6 +529,13 @@ msgstr ""
560msgid "Let’s get started."
529msgid "Let’s get started."
561msgstr ""
530msgstr ""
562
531
532+#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:128
533+#: qml/Wizard/Pages/40-wifi.qml:215 qml/Wizard/Pages/50-location.qml:131
534+#: qml/Wizard/Pages/60-reporting.qml:50 qml/Wizard/Pages/passwd-confirm.qml:82
535+#: qml/Wizard/Pages/passwd-set.qml:90
536+msgid "Continue"
537+msgstr ""
538+
563#: qml/Wizard/Pages/20-sim.qml:25
539#: qml/Wizard/Pages/20-sim.qml:25
564msgid "Add a SIM card and restart your device"
540msgid "Add a SIM card and restart your device"
565msgstr ""
541msgstr ""
@@ -685,6 +661,31 @@ msgstr ""
685msgid "Finish"
661msgid "Finish"
686msgstr ""
662msgstr ""
687
663
664+#: qml/Wizard/Pages/here-terms.qml:27
665+msgid "Terms & Conditions"
666+msgstr ""
667+
668+#: qml/Wizard/Pages/passwd-confirm.qml:49
669+msgid "Confirm passphrase"
670+msgstr ""
671+
672+#: qml/Wizard/Pages/passwd-confirm.qml:50
673+msgid "Confirm passcode"
674+msgstr ""
675+
676+#: qml/Wizard/Pages/passwd-confirm.qml:53
677+#: qml/Wizard/Pages/passwd-confirm.qml:54
678+msgid "Please try again."
679+msgstr ""
680+
681+#: qml/Wizard/Pages/passwd-set.qml:61
682+msgid "Choose your passcode"
683+msgstr ""
684+
685+#: qml/Wizard/Pages/passwd-set.qml:68
686+msgid "Passphrase must be 4 characters long"
687+msgstr ""
688+
688#. Translators: This is the arrow for "Back" buttons
689#. Translators: This is the arrow for "Back" buttons
689#: qml/Wizard/StackButton.qml:39
690#: qml/Wizard/StackButton.qml:39
690#, qt-format
691#, qt-format
po/lv.po+55−51
@@ -7,7 +7,7 @@ msgid ""
7msgstr ""
7msgstr ""
8"Project-Id-Version: unity\n"
8"Project-Id-Version: unity\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2015-06-22 12:00+0200\n"
10+"POT-Creation-Date: 2015-07-17 10:10+0200\n"
11"PO-Revision-Date: 2015-02-28 16:18+0000\n"
11"PO-Revision-Date: 2015-02-28 16:18+0000\n"
12"Last-Translator: Rūdolfs Mazurs <Unknown>\n"
12"Last-Translator: Rūdolfs Mazurs <Unknown>\n"
13"Language-Team: Latvian <lv@li.org>\n"
13"Language-Team: Latvian <lv@li.org>\n"
@@ -15,8 +15,8 @@ msgstr ""
15"Content-Type: text/plain; charset=UTF-8\n"
15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n"
16"Content-Transfer-Encoding: 8bit\n"
17"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2;\n"
17"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2;\n"
18−"X-Launchpad-Export-Date: 2015-07-04 05:37+0000\n"
18+"X-Launchpad-Export-Date: 2015-07-25 05:39+0000\n"
19−"X-Generator: Launchpad (build 17597)\n"
19+"X-Generator: Launchpad (build 17628)\n"
20
20
21#: plugins/LightDM/Greeter.cpp:112
21#: plugins/LightDM/Greeter.cpp:112
22msgid "Password: "
22msgid "Password: "
@@ -226,15 +226,15 @@ msgstr "Ārkārtas situācijas zvans"
226msgid "OK"
226msgid "OK"
227msgstr "Labi"
227msgstr "Labi"
228
228
229−#: qml/Dash/GenericScopeView.qml:532 qml/Dash/GenericScopeView.qml:690
229+#: qml/Dash/GenericScopeView.qml:539 qml/Dash/GenericScopeView.qml:697
230msgid "See less"
230msgid "See less"
231msgstr "Skatīt mazāk"
231msgstr "Skatīt mazāk"
232
232
233−#: qml/Dash/GenericScopeView.qml:532
233+#: qml/Dash/GenericScopeView.qml:539
234msgid "See all"
234msgid "See all"
235msgstr "Skatīt visus"
235msgstr "Skatīt visus"
236
236
237−#: qml/Dash/GenericScopeView.qml:594
237+#: qml/Dash/GenericScopeView.qml:601
238msgctxt "Label: Hint for dash search line edit"
238msgctxt "Label: Hint for dash search line edit"
239msgid "Search"
239msgid "Search"
240msgstr ""
240msgstr ""
@@ -318,19 +318,19 @@ msgstr ""
318msgid "Tap to unlock"
318msgid "Tap to unlock"
319msgstr ""
319msgstr ""
320
320
321−#: qml/Greeter/NarrowView.qml:53 qml/Wizard/Pages/passwd-confirm.qml:53
321+#: qml/Greeter/NarrowView.qml:54 qml/Wizard/Pages/passwd-confirm.qml:53
322msgid "Sorry, incorrect passphrase."
322msgid "Sorry, incorrect passphrase."
323msgstr "Piedodiet, nepareiza parole."
323msgstr "Piedodiet, nepareiza parole."
324
324
325−#: qml/Greeter/NarrowView.qml:54 qml/Wizard/Pages/passwd-confirm.qml:54
325+#: qml/Greeter/NarrowView.qml:55 qml/Wizard/Pages/passwd-confirm.qml:54
326msgid "Sorry, incorrect passcode."
326msgid "Sorry, incorrect passcode."
327msgstr "Piedodiet, nepareizs piekļuves kods."
327msgstr "Piedodiet, nepareizs piekļuves kods."
328
328
329−#: qml/Greeter/NarrowView.qml:55
329+#: qml/Greeter/NarrowView.qml:56
330msgid "This will be your last attempt."
330msgid "This will be your last attempt."
331msgstr "Šīs būs jūs pēdējais mēģinājums."
331msgstr "Šīs būs jūs pēdējais mēģinājums."
332
332
333−#: qml/Greeter/NarrowView.qml:57
333+#: qml/Greeter/NarrowView.qml:58
334msgid ""
334msgid ""
335"If passphrase is entered incorrectly, your phone will conduct a factory "
335"If passphrase is entered incorrectly, your phone will conduct a factory "
336"reset and all personal data will be deleted."
336"reset and all personal data will be deleted."
@@ -338,7 +338,7 @@ msgstr ""
338"Ja parole netiks pareizi ievadīta, jūsu tālrunis tiks atstatīts uz rūpnīcas "
338"Ja parole netiks pareizi ievadīta, jūsu tālrunis tiks atstatīts uz rūpnīcas "
339"iestatījumiem un visa personīgā informācija tiks izdzēsta."
339"iestatījumiem un visa personīgā informācija tiks izdzēsta."
340
340
341−#: qml/Greeter/NarrowView.qml:58
341+#: qml/Greeter/NarrowView.qml:59
342msgid ""
342msgid ""
343"If passcode is entered incorrectly, your phone will conduct a factory reset "
343"If passcode is entered incorrectly, your phone will conduct a factory reset "
344"and all personal data will be deleted."
344"and all personal data will be deleted."
@@ -346,33 +346,34 @@ msgstr ""
346"Ja piekļuves kods netiks pareizi ievadīts, jūsu tālrunis tiks atstatīts uz "
346"Ja piekļuves kods netiks pareizi ievadīts, jūsu tālrunis tiks atstatīts uz "
347"rūpnīcas iestatījumiem un visa personīgā informācija tiks izdzēsta."
347"rūpnīcas iestatījumiem un visa personīgā informācija tiks izdzēsta."
348
348
349−#: qml/Greeter/NarrowView.qml:115
349+#: qml/Greeter/NarrowView.qml:116
350#, qt-format
350#, qt-format
351msgid "Enter %1"
351msgid "Enter %1"
352msgstr "Ievadiet %1"
352msgstr "Ievadiet %1"
353
353
354−#: qml/Greeter/NarrowView.qml:116 qml/Wizard/Pages/passwd-set.qml:60
354+#: qml/Greeter/NarrowView.qml:117 qml/Wizard/Pages/passwd-set.qml:60
355msgid "Enter passphrase"
355msgid "Enter passphrase"
356msgstr "Ievadiet paroli"
356msgstr "Ievadiet paroli"
357
357
358−#: qml/Greeter/NarrowView.qml:117
358+#: qml/Greeter/NarrowView.qml:118
359msgid "Enter passcode"
359msgid "Enter passcode"
360msgstr "Ievadiet piekļuves kodu"
360msgstr "Ievadiet piekļuves kodu"
361
361
362−#: qml/Greeter/NarrowView.qml:118
362+#: qml/Greeter/NarrowView.qml:119
363#, qt-format
363#, qt-format
364msgid "Sorry, incorrect %1"
364msgid "Sorry, incorrect %1"
365msgstr "Piedodiet, nepareizs %1"
365msgstr "Piedodiet, nepareizs %1"
366
366
367−#: qml/Greeter/NarrowView.qml:119
367+#: qml/Greeter/NarrowView.qml:120
368msgid "Sorry, incorrect passphrase"
368msgid "Sorry, incorrect passphrase"
369msgstr "Piedodiet, nepareiza parole"
369msgstr "Piedodiet, nepareiza parole"
370
370
371−#: qml/Greeter/NarrowView.qml:120
371+#: qml/Greeter/NarrowView.qml:121
372+msgctxt "passphrase"
372msgid "Please re-enter"
373msgid "Please re-enter"
373−msgstr "Lūdzu, ievadiet vēlreiz"
374+msgstr ""
374
375
375−#: qml/Greeter/NarrowView.qml:121
376+#: qml/Greeter/NarrowView.qml:122
376msgid "Sorry, incorrect passcode"
377msgid "Sorry, incorrect passcode"
377msgstr "Piedodiet, nepareizs piekļuves kods"
378msgstr "Piedodiet, nepareizs piekļuves kods"
378
379
@@ -522,38 +523,6 @@ msgctxt "Button: Go back one page in the Wizard"
522msgid "Back"
523msgid "Back"
523msgstr ""
524msgstr ""
524
525
525−#: qml/Wizard/Pages/here-terms.qml:27
526−msgid "Terms & Conditions"
527−msgstr "Nosacījumi"
528−
529−#: qml/Wizard/Pages/passwd-confirm.qml:49
530−msgid "Confirm passphrase"
531−msgstr "Apstipriniet paroli"
532−
533−#: qml/Wizard/Pages/passwd-confirm.qml:50
534−msgid "Confirm passcode"
535−msgstr "Apstipriniet piekļuves kodu"
536−
537−#: qml/Wizard/Pages/passwd-confirm.qml:53
538−#: qml/Wizard/Pages/passwd-confirm.qml:54
539−msgid "Please try again."
540−msgstr "Lūdzu, mēģiniet vēlreiz."
541−
542−#: qml/Wizard/Pages/passwd-confirm.qml:82 qml/Wizard/Pages/passwd-set.qml:90
543−#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:128
544−#: qml/Wizard/Pages/40-wifi.qml:215 qml/Wizard/Pages/50-location.qml:131
545−#: qml/Wizard/Pages/60-reporting.qml:50
546−msgid "Continue"
547−msgstr "Turpināt"
548−
549−#: qml/Wizard/Pages/passwd-set.qml:61
550−msgid "Choose your passcode"
551−msgstr "Izvēlieties savu paroli"
552−
553−#: qml/Wizard/Pages/passwd-set.qml:68
554−msgid "Passphrase must be 4 characters long"
555−msgstr "Piekļuves kodam ir jābūt 4 rakstzīmju garumā"
556−
557#: qml/Wizard/Pages/10-welcome.qml:27
526#: qml/Wizard/Pages/10-welcome.qml:27
558msgid "Hi!"
527msgid "Hi!"
559msgstr "Sveiki!"
528msgstr "Sveiki!"
@@ -566,6 +535,13 @@ msgstr "Laipni lūdza Ubuntu viedtālrunī."
566msgid "Let’s get started."
535msgid "Let’s get started."
567msgstr "Sāksim."
536msgstr "Sāksim."
568
537
538+#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:128
539+#: qml/Wizard/Pages/40-wifi.qml:215 qml/Wizard/Pages/50-location.qml:131
540+#: qml/Wizard/Pages/60-reporting.qml:50 qml/Wizard/Pages/passwd-confirm.qml:82
541+#: qml/Wizard/Pages/passwd-set.qml:90
542+msgid "Continue"
543+msgstr "Turpināt"
544+
569#: qml/Wizard/Pages/20-sim.qml:25
545#: qml/Wizard/Pages/20-sim.qml:25
570msgid "Add a SIM card and restart your device"
546msgid "Add a SIM card and restart your device"
571msgstr "Pievienojiet SIM karti un pārstartējiet ierīci"
547msgstr "Pievienojiet SIM karti un pārstartējiet ierīci"
@@ -697,6 +673,31 @@ msgstr "Jūsu tālrunis tagad ir gatavs lietošanai."
697msgid "Finish"
673msgid "Finish"
698msgstr "Pabeigt"
674msgstr "Pabeigt"
699
675
676+#: qml/Wizard/Pages/here-terms.qml:27
677+msgid "Terms & Conditions"
678+msgstr "Nosacījumi"
679+
680+#: qml/Wizard/Pages/passwd-confirm.qml:49
681+msgid "Confirm passphrase"
682+msgstr "Apstipriniet paroli"
683+
684+#: qml/Wizard/Pages/passwd-confirm.qml:50
685+msgid "Confirm passcode"
686+msgstr "Apstipriniet piekļuves kodu"
687+
688+#: qml/Wizard/Pages/passwd-confirm.qml:53
689+#: qml/Wizard/Pages/passwd-confirm.qml:54
690+msgid "Please try again."
691+msgstr "Lūdzu, mēģiniet vēlreiz."
692+
693+#: qml/Wizard/Pages/passwd-set.qml:61
694+msgid "Choose your passcode"
695+msgstr "Izvēlieties savu paroli"
696+
697+#: qml/Wizard/Pages/passwd-set.qml:68
698+msgid "Passphrase must be 4 characters long"
699+msgstr "Piekļuves kodam ir jābūt 4 rakstzīmju garumā"
700+
700#. Translators: This is the arrow for "Back" buttons
701#. Translators: This is the arrow for "Back" buttons
701#: qml/Wizard/StackButton.qml:39
702#: qml/Wizard/StackButton.qml:39
702#, qt-format
703#, qt-format
@@ -783,3 +784,6 @@ msgstr "%1 〉"
783
784
784#~ msgid "Restart"
785#~ msgid "Restart"
785#~ msgstr "Pārstartēt"
786#~ msgstr "Pārstartēt"
787+
788+#~ msgid "Please re-enter"
789+#~ msgstr "Lūdzu, ievadiet vēlreiz"
po/ml.po+51−50
@@ -7,7 +7,7 @@ msgid ""
7msgstr ""
7msgstr ""
8"Project-Id-Version: unity8\n"
8"Project-Id-Version: unity8\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2015-06-22 12:00+0200\n"
10+"POT-Creation-Date: 2015-07-17 10:10+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"
@@ -15,8 +15,8 @@ msgstr ""
15"Content-Type: text/plain; charset=UTF-8\n"
15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n"
16"Content-Transfer-Encoding: 8bit\n"
17"Plural-Forms: nplurals=2; plural=n != 1;\n"
17"Plural-Forms: nplurals=2; plural=n != 1;\n"
18−"X-Launchpad-Export-Date: 2015-07-04 05:37+0000\n"
18+"X-Launchpad-Export-Date: 2015-07-25 05:39+0000\n"
19−"X-Generator: Launchpad (build 17597)\n"
19+"X-Generator: Launchpad (build 17628)\n"
20
20
21#: plugins/LightDM/Greeter.cpp:112
21#: plugins/LightDM/Greeter.cpp:112
22msgid "Password: "
22msgid "Password: "
@@ -223,15 +223,15 @@ msgstr "അടിയന്തിര വിളി"
223msgid "OK"
223msgid "OK"
224msgstr ""
224msgstr ""
225
225
226−#: qml/Dash/GenericScopeView.qml:532 qml/Dash/GenericScopeView.qml:690
226+#: qml/Dash/GenericScopeView.qml:539 qml/Dash/GenericScopeView.qml:697
227msgid "See less"
227msgid "See less"
228msgstr ""
228msgstr ""
229
229
230−#: qml/Dash/GenericScopeView.qml:532
230+#: qml/Dash/GenericScopeView.qml:539
231msgid "See all"
231msgid "See all"
232msgstr ""
232msgstr ""
233
233
234−#: qml/Dash/GenericScopeView.qml:594
234+#: qml/Dash/GenericScopeView.qml:601
235msgctxt "Label: Hint for dash search line edit"
235msgctxt "Label: Hint for dash search line edit"
236msgid "Search"
236msgid "Search"
237msgstr ""
237msgstr ""
@@ -315,57 +315,58 @@ msgstr ""
315msgid "Tap to unlock"
315msgid "Tap to unlock"
316msgstr ""
316msgstr ""
317
317
318−#: qml/Greeter/NarrowView.qml:53 qml/Wizard/Pages/passwd-confirm.qml:53
318+#: qml/Greeter/NarrowView.qml:54 qml/Wizard/Pages/passwd-confirm.qml:53
319msgid "Sorry, incorrect passphrase."
319msgid "Sorry, incorrect passphrase."
320msgstr ""
320msgstr ""
321
321
322−#: qml/Greeter/NarrowView.qml:54 qml/Wizard/Pages/passwd-confirm.qml:54
322+#: qml/Greeter/NarrowView.qml:55 qml/Wizard/Pages/passwd-confirm.qml:54
323msgid "Sorry, incorrect passcode."
323msgid "Sorry, incorrect passcode."
324msgstr ""
324msgstr ""
325
325
326−#: qml/Greeter/NarrowView.qml:55
326+#: qml/Greeter/NarrowView.qml:56
327msgid "This will be your last attempt."
327msgid "This will be your last attempt."
328msgstr ""
328msgstr ""
329
329
330−#: qml/Greeter/NarrowView.qml:57
330+#: qml/Greeter/NarrowView.qml:58
331msgid ""
331msgid ""
332"If passphrase is entered incorrectly, your phone will conduct a factory "
332"If passphrase is entered incorrectly, your phone will conduct a factory "
333"reset and all personal data will be deleted."
333"reset and all personal data will be deleted."
334msgstr ""
334msgstr ""
335
335
336−#: qml/Greeter/NarrowView.qml:58
336+#: qml/Greeter/NarrowView.qml:59
337msgid ""
337msgid ""
338"If passcode is entered incorrectly, your phone will conduct a factory reset "
338"If passcode is entered incorrectly, your phone will conduct a factory reset "
339"and all personal data will be deleted."
339"and all personal data will be deleted."
340msgstr ""
340msgstr ""
341
341
342−#: qml/Greeter/NarrowView.qml:115
342+#: qml/Greeter/NarrowView.qml:116
343#, qt-format
343#, qt-format
344msgid "Enter %1"
344msgid "Enter %1"
345msgstr ""
345msgstr ""
346
346
347−#: qml/Greeter/NarrowView.qml:116 qml/Wizard/Pages/passwd-set.qml:60
347+#: qml/Greeter/NarrowView.qml:117 qml/Wizard/Pages/passwd-set.qml:60
348msgid "Enter passphrase"
348msgid "Enter passphrase"
349msgstr ""
349msgstr ""
350
350
351−#: qml/Greeter/NarrowView.qml:117
351+#: qml/Greeter/NarrowView.qml:118
352msgid "Enter passcode"
352msgid "Enter passcode"
353msgstr ""
353msgstr ""
354
354
355−#: qml/Greeter/NarrowView.qml:118
355+#: qml/Greeter/NarrowView.qml:119
356#, qt-format
356#, qt-format
357msgid "Sorry, incorrect %1"
357msgid "Sorry, incorrect %1"
358msgstr ""
358msgstr ""
359
359
360−#: qml/Greeter/NarrowView.qml:119
360+#: qml/Greeter/NarrowView.qml:120
361msgid "Sorry, incorrect passphrase"
361msgid "Sorry, incorrect passphrase"
362msgstr ""
362msgstr ""
363
363
364−#: qml/Greeter/NarrowView.qml:120
364+#: qml/Greeter/NarrowView.qml:121
365+msgctxt "passphrase"
365msgid "Please re-enter"
366msgid "Please re-enter"
366msgstr ""
367msgstr ""
367
368
368−#: qml/Greeter/NarrowView.qml:121
369+#: qml/Greeter/NarrowView.qml:122
369msgid "Sorry, incorrect passcode"
370msgid "Sorry, incorrect passcode"
370msgstr ""
371msgstr ""
371
372
@@ -515,38 +516,6 @@ msgctxt "Button: Go back one page in the Wizard"
515msgid "Back"
516msgid "Back"
516msgstr ""
517msgstr ""
517
518
518−#: qml/Wizard/Pages/here-terms.qml:27
519−msgid "Terms & Conditions"
520−msgstr ""
521−
522−#: qml/Wizard/Pages/passwd-confirm.qml:49
523−msgid "Confirm passphrase"
524−msgstr ""
525−
526−#: qml/Wizard/Pages/passwd-confirm.qml:50
527−msgid "Confirm passcode"
528−msgstr ""
529−
530−#: qml/Wizard/Pages/passwd-confirm.qml:53
531−#: qml/Wizard/Pages/passwd-confirm.qml:54
532−msgid "Please try again."
533−msgstr ""
534−
535−#: qml/Wizard/Pages/passwd-confirm.qml:82 qml/Wizard/Pages/passwd-set.qml:90
536−#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:128
537−#: qml/Wizard/Pages/40-wifi.qml:215 qml/Wizard/Pages/50-location.qml:131
538−#: qml/Wizard/Pages/60-reporting.qml:50
539−msgid "Continue"
540−msgstr ""
541−
542−#: qml/Wizard/Pages/passwd-set.qml:61
543−msgid "Choose your passcode"
544−msgstr ""
545−
546−#: qml/Wizard/Pages/passwd-set.qml:68
547−msgid "Passphrase must be 4 characters long"
548−msgstr ""
549−
550#: qml/Wizard/Pages/10-welcome.qml:27
519#: qml/Wizard/Pages/10-welcome.qml:27
551msgid "Hi!"
520msgid "Hi!"
552msgstr ""
521msgstr ""
@@ -559,6 +528,13 @@ msgstr ""
559msgid "Let’s get started."
528msgid "Let’s get started."
560msgstr ""
529msgstr ""
561
530
531+#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:128
532+#: qml/Wizard/Pages/40-wifi.qml:215 qml/Wizard/Pages/50-location.qml:131
533+#: qml/Wizard/Pages/60-reporting.qml:50 qml/Wizard/Pages/passwd-confirm.qml:82
534+#: qml/Wizard/Pages/passwd-set.qml:90
535+msgid "Continue"
536+msgstr ""
537+
562#: qml/Wizard/Pages/20-sim.qml:25
538#: qml/Wizard/Pages/20-sim.qml:25
563msgid "Add a SIM card and restart your device"
539msgid "Add a SIM card and restart your device"
564msgstr ""
540msgstr ""
@@ -684,6 +660,31 @@ msgstr ""
684msgid "Finish"
660msgid "Finish"
685msgstr ""
661msgstr ""
686
662
663+#: qml/Wizard/Pages/here-terms.qml:27
664+msgid "Terms & Conditions"
665+msgstr ""
666+
667+#: qml/Wizard/Pages/passwd-confirm.qml:49
668+msgid "Confirm passphrase"
669+msgstr ""
670+
671+#: qml/Wizard/Pages/passwd-confirm.qml:50
672+msgid "Confirm passcode"
673+msgstr ""
674+
675+#: qml/Wizard/Pages/passwd-confirm.qml:53
676+#: qml/Wizard/Pages/passwd-confirm.qml:54
677+msgid "Please try again."
678+msgstr ""
679+
680+#: qml/Wizard/Pages/passwd-set.qml:61
681+msgid "Choose your passcode"
682+msgstr ""
683+
684+#: qml/Wizard/Pages/passwd-set.qml:68
685+msgid "Passphrase must be 4 characters long"
686+msgstr ""
687+
687#. Translators: This is the arrow for "Back" buttons
688#. Translators: This is the arrow for "Back" buttons
688#: qml/Wizard/StackButton.qml:39
689#: qml/Wizard/StackButton.qml:39
689#, qt-format
690#, qt-format
po/mr.po+51−50
@@ -7,7 +7,7 @@ msgid ""
7msgstr ""
7msgstr ""
8"Project-Id-Version: unity8\n"
8"Project-Id-Version: unity8\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2015-06-22 12:00+0200\n"
10+"POT-Creation-Date: 2015-07-17 10:10+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"
@@ -15,8 +15,8 @@ msgstr ""
15"Content-Type: text/plain; charset=UTF-8\n"
15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n"
16"Content-Transfer-Encoding: 8bit\n"
17"Plural-Forms: nplurals=2; plural=n != 1;\n"
17"Plural-Forms: nplurals=2; plural=n != 1;\n"
18−"X-Launchpad-Export-Date: 2015-07-04 05:37+0000\n"
18+"X-Launchpad-Export-Date: 2015-07-25 05:39+0000\n"
19−"X-Generator: Launchpad (build 17597)\n"
19+"X-Generator: Launchpad (build 17628)\n"
20
20
21#: plugins/LightDM/Greeter.cpp:112
21#: plugins/LightDM/Greeter.cpp:112
22msgid "Password: "
22msgid "Password: "
@@ -223,15 +223,15 @@ msgstr ""
223msgid "OK"
223msgid "OK"
224msgstr ""
224msgstr ""
225
225
226−#: qml/Dash/GenericScopeView.qml:532 qml/Dash/GenericScopeView.qml:690
226+#: qml/Dash/GenericScopeView.qml:539 qml/Dash/GenericScopeView.qml:697
227msgid "See less"
227msgid "See less"
228msgstr ""
228msgstr ""
229
229
230−#: qml/Dash/GenericScopeView.qml:532
230+#: qml/Dash/GenericScopeView.qml:539
231msgid "See all"
231msgid "See all"
232msgstr ""
232msgstr ""
233
233
234−#: qml/Dash/GenericScopeView.qml:594
234+#: qml/Dash/GenericScopeView.qml:601
235msgctxt "Label: Hint for dash search line edit"
235msgctxt "Label: Hint for dash search line edit"
236msgid "Search"
236msgid "Search"
237msgstr ""
237msgstr ""
@@ -315,57 +315,58 @@ msgstr ""
315msgid "Tap to unlock"
315msgid "Tap to unlock"
316msgstr ""
316msgstr ""
317
317
318−#: qml/Greeter/NarrowView.qml:53 qml/Wizard/Pages/passwd-confirm.qml:53
318+#: qml/Greeter/NarrowView.qml:54 qml/Wizard/Pages/passwd-confirm.qml:53
319msgid "Sorry, incorrect passphrase."
319msgid "Sorry, incorrect passphrase."
320msgstr ""
320msgstr ""
321
321
322−#: qml/Greeter/NarrowView.qml:54 qml/Wizard/Pages/passwd-confirm.qml:54
322+#: qml/Greeter/NarrowView.qml:55 qml/Wizard/Pages/passwd-confirm.qml:54
323msgid "Sorry, incorrect passcode."
323msgid "Sorry, incorrect passcode."
324msgstr ""
324msgstr ""
325
325
326−#: qml/Greeter/NarrowView.qml:55
326+#: qml/Greeter/NarrowView.qml:56
327msgid "This will be your last attempt."
327msgid "This will be your last attempt."
328msgstr ""
328msgstr ""
329
329
330−#: qml/Greeter/NarrowView.qml:57
330+#: qml/Greeter/NarrowView.qml:58
331msgid ""
331msgid ""
332"If passphrase is entered incorrectly, your phone will conduct a factory "
332"If passphrase is entered incorrectly, your phone will conduct a factory "
333"reset and all personal data will be deleted."
333"reset and all personal data will be deleted."
334msgstr ""
334msgstr ""
335
335
336−#: qml/Greeter/NarrowView.qml:58
336+#: qml/Greeter/NarrowView.qml:59
337msgid ""
337msgid ""
338"If passcode is entered incorrectly, your phone will conduct a factory reset "
338"If passcode is entered incorrectly, your phone will conduct a factory reset "
339"and all personal data will be deleted."
339"and all personal data will be deleted."
340msgstr ""
340msgstr ""
341
341
342−#: qml/Greeter/NarrowView.qml:115
342+#: qml/Greeter/NarrowView.qml:116
343#, qt-format
343#, qt-format
344msgid "Enter %1"
344msgid "Enter %1"
345msgstr ""
345msgstr ""
346
346
347−#: qml/Greeter/NarrowView.qml:116 qml/Wizard/Pages/passwd-set.qml:60
347+#: qml/Greeter/NarrowView.qml:117 qml/Wizard/Pages/passwd-set.qml:60
348msgid "Enter passphrase"
348msgid "Enter passphrase"
349msgstr ""
349msgstr ""
350
350
351−#: qml/Greeter/NarrowView.qml:117
351+#: qml/Greeter/NarrowView.qml:118
352msgid "Enter passcode"
352msgid "Enter passcode"
353msgstr ""
353msgstr ""
354
354
355−#: qml/Greeter/NarrowView.qml:118
355+#: qml/Greeter/NarrowView.qml:119
356#, qt-format
356#, qt-format
357msgid "Sorry, incorrect %1"
357msgid "Sorry, incorrect %1"
358msgstr ""
358msgstr ""
359
359
360−#: qml/Greeter/NarrowView.qml:119
360+#: qml/Greeter/NarrowView.qml:120
361msgid "Sorry, incorrect passphrase"
361msgid "Sorry, incorrect passphrase"
362msgstr ""
362msgstr ""
363
363
364−#: qml/Greeter/NarrowView.qml:120
364+#: qml/Greeter/NarrowView.qml:121
365+msgctxt "passphrase"
365msgid "Please re-enter"
366msgid "Please re-enter"
366msgstr ""
367msgstr ""
367
368
368−#: qml/Greeter/NarrowView.qml:121
369+#: qml/Greeter/NarrowView.qml:122
369msgid "Sorry, incorrect passcode"
370msgid "Sorry, incorrect passcode"
370msgstr ""
371msgstr ""
371
372
@@ -515,38 +516,6 @@ msgctxt "Button: Go back one page in the Wizard"
515msgid "Back"
516msgid "Back"
516msgstr ""
517msgstr ""
517
518
518−#: qml/Wizard/Pages/here-terms.qml:27
519−msgid "Terms & Conditions"
520−msgstr ""
521−
522−#: qml/Wizard/Pages/passwd-confirm.qml:49
523−msgid "Confirm passphrase"
524−msgstr ""
525−
526−#: qml/Wizard/Pages/passwd-confirm.qml:50
527−msgid "Confirm passcode"
528−msgstr ""
529−
530−#: qml/Wizard/Pages/passwd-confirm.qml:53
531−#: qml/Wizard/Pages/passwd-confirm.qml:54
532−msgid "Please try again."
533−msgstr ""
534−
535−#: qml/Wizard/Pages/passwd-confirm.qml:82 qml/Wizard/Pages/passwd-set.qml:90
536−#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:128
537−#: qml/Wizard/Pages/40-wifi.qml:215 qml/Wizard/Pages/50-location.qml:131
538−#: qml/Wizard/Pages/60-reporting.qml:50
539−msgid "Continue"
540−msgstr ""
541−
542−#: qml/Wizard/Pages/passwd-set.qml:61
543−msgid "Choose your passcode"
544−msgstr ""
545−
546−#: qml/Wizard/Pages/passwd-set.qml:68
547−msgid "Passphrase must be 4 characters long"
548−msgstr ""
549−
550#: qml/Wizard/Pages/10-welcome.qml:27
519#: qml/Wizard/Pages/10-welcome.qml:27
551msgid "Hi!"
520msgid "Hi!"
552msgstr ""
521msgstr ""
@@ -559,6 +528,13 @@ msgstr ""
559msgid "Let’s get started."
528msgid "Let’s get started."
560msgstr ""
529msgstr ""
561
530
531+#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:128
532+#: qml/Wizard/Pages/40-wifi.qml:215 qml/Wizard/Pages/50-location.qml:131
533+#: qml/Wizard/Pages/60-reporting.qml:50 qml/Wizard/Pages/passwd-confirm.qml:82
534+#: qml/Wizard/Pages/passwd-set.qml:90
535+msgid "Continue"
536+msgstr ""
537+
562#: qml/Wizard/Pages/20-sim.qml:25
538#: qml/Wizard/Pages/20-sim.qml:25
563msgid "Add a SIM card and restart your device"
539msgid "Add a SIM card and restart your device"
564msgstr ""
540msgstr ""
@@ -684,6 +660,31 @@ msgstr ""
684msgid "Finish"
660msgid "Finish"
685msgstr ""
661msgstr ""
686
662
663+#: qml/Wizard/Pages/here-terms.qml:27
664+msgid "Terms & Conditions"
665+msgstr ""
666+
667+#: qml/Wizard/Pages/passwd-confirm.qml:49
668+msgid "Confirm passphrase"
669+msgstr ""
670+
671+#: qml/Wizard/Pages/passwd-confirm.qml:50
672+msgid "Confirm passcode"
673+msgstr ""
674+
675+#: qml/Wizard/Pages/passwd-confirm.qml:53
676+#: qml/Wizard/Pages/passwd-confirm.qml:54
677+msgid "Please try again."
678+msgstr ""
679+
680+#: qml/Wizard/Pages/passwd-set.qml:61
681+msgid "Choose your passcode"
682+msgstr ""
683+
684+#: qml/Wizard/Pages/passwd-set.qml:68
685+msgid "Passphrase must be 4 characters long"
686+msgstr ""
687+
687#. Translators: This is the arrow for "Back" buttons
688#. Translators: This is the arrow for "Back" buttons
688#: qml/Wizard/StackButton.qml:39
689#: qml/Wizard/StackButton.qml:39
689#, qt-format
690#, qt-format
po/ms.po+55−51
@@ -7,7 +7,7 @@ msgid ""
7msgstr ""
7msgstr ""
8"Project-Id-Version: unity8\n"
8"Project-Id-Version: unity8\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2015-06-22 12:00+0200\n"
10+"POT-Creation-Date: 2015-07-17 10:10+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"
@@ -15,8 +15,8 @@ msgstr ""
15"Content-Type: text/plain; charset=UTF-8\n"
15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n"
16"Content-Transfer-Encoding: 8bit\n"
17"Plural-Forms: nplurals=2; plural=n != 1;\n"
17"Plural-Forms: nplurals=2; plural=n != 1;\n"
18−"X-Launchpad-Export-Date: 2015-07-04 05:37+0000\n"
18+"X-Launchpad-Export-Date: 2015-07-25 05:39+0000\n"
19−"X-Generator: Launchpad (build 17597)\n"
19+"X-Generator: Launchpad (build 17628)\n"
20
20
21#: plugins/LightDM/Greeter.cpp:112
21#: plugins/LightDM/Greeter.cpp:112
22msgid "Password: "
22msgid "Password: "
@@ -225,15 +225,15 @@ msgstr "panggilan Kecemasan"
225msgid "OK"
225msgid "OK"
226msgstr "OK"
226msgstr "OK"
227
227
228−#: qml/Dash/GenericScopeView.qml:532 qml/Dash/GenericScopeView.qml:690
228+#: qml/Dash/GenericScopeView.qml:539 qml/Dash/GenericScopeView.qml:697
229msgid "See less"
229msgid "See less"
230msgstr "Lihat kurang"
230msgstr "Lihat kurang"
231
231
232−#: qml/Dash/GenericScopeView.qml:532
232+#: qml/Dash/GenericScopeView.qml:539
233msgid "See all"
233msgid "See all"
234msgstr "Lihat semua"
234msgstr "Lihat semua"
235
235
236−#: qml/Dash/GenericScopeView.qml:594
236+#: qml/Dash/GenericScopeView.qml:601
237msgctxt "Label: Hint for dash search line edit"
237msgctxt "Label: Hint for dash search line edit"
238msgid "Search"
238msgid "Search"
239msgstr ""
239msgstr ""
@@ -317,19 +317,19 @@ msgstr ""
317msgid "Tap to unlock"
317msgid "Tap to unlock"
318msgstr ""
318msgstr ""
319
319
320−#: qml/Greeter/NarrowView.qml:53 qml/Wizard/Pages/passwd-confirm.qml:53
320+#: qml/Greeter/NarrowView.qml:54 qml/Wizard/Pages/passwd-confirm.qml:53
321msgid "Sorry, incorrect passphrase."
321msgid "Sorry, incorrect passphrase."
322msgstr "Maaf, frasa laluan salah."
322msgstr "Maaf, frasa laluan salah."
323
323
324−#: qml/Greeter/NarrowView.qml:54 qml/Wizard/Pages/passwd-confirm.qml:54
324+#: qml/Greeter/NarrowView.qml:55 qml/Wizard/Pages/passwd-confirm.qml:54
325msgid "Sorry, incorrect passcode."
325msgid "Sorry, incorrect passcode."
326msgstr "Maaf, kod laluan salah."
326msgstr "Maaf, kod laluan salah."
327
327
328−#: qml/Greeter/NarrowView.qml:55
328+#: qml/Greeter/NarrowView.qml:56
329msgid "This will be your last attempt."
329msgid "This will be your last attempt."
330msgstr "Ini merupakan percubaan terakhir anda."
330msgstr "Ini merupakan percubaan terakhir anda."
331
331
332−#: qml/Greeter/NarrowView.qml:57
332+#: qml/Greeter/NarrowView.qml:58
333msgid ""
333msgid ""
334"If passphrase is entered incorrectly, your phone will conduct a factory "
334"If passphrase is entered incorrectly, your phone will conduct a factory "
335"reset and all personal data will be deleted."
335"reset and all personal data will be deleted."
@@ -337,7 +337,7 @@ msgstr ""
337"Jika frasa laluan masih salah, telefon anda akan membuat tetapan semula "
337"Jika frasa laluan masih salah, telefon anda akan membuat tetapan semula "
338"kilang dan semua data peribadi anda akan dipadam."
338"kilang dan semua data peribadi anda akan dipadam."
339
339
340−#: qml/Greeter/NarrowView.qml:58
340+#: qml/Greeter/NarrowView.qml:59
341msgid ""
341msgid ""
342"If passcode is entered incorrectly, your phone will conduct a factory reset "
342"If passcode is entered incorrectly, your phone will conduct a factory reset "
343"and all personal data will be deleted."
343"and all personal data will be deleted."
@@ -345,33 +345,34 @@ msgstr ""
345"Jika kod laluan masih salah, telefon anda akan membuat tetapan semula kilang "
345"Jika kod laluan masih salah, telefon anda akan membuat tetapan semula kilang "
346"dan semua data peribadi anda akan dipadam."
346"dan semua data peribadi anda akan dipadam."
347
347
348−#: qml/Greeter/NarrowView.qml:115
348+#: qml/Greeter/NarrowView.qml:116
349#, qt-format
349#, qt-format
350msgid "Enter %1"
350msgid "Enter %1"
351msgstr "Masuk %1"
351msgstr "Masuk %1"
352
352
353−#: qml/Greeter/NarrowView.qml:116 qml/Wizard/Pages/passwd-set.qml:60
353+#: qml/Greeter/NarrowView.qml:117 qml/Wizard/Pages/passwd-set.qml:60
354msgid "Enter passphrase"
354msgid "Enter passphrase"
355msgstr "Masukkan frasa laluan"
355msgstr "Masukkan frasa laluan"
356
356
357−#: qml/Greeter/NarrowView.qml:117
357+#: qml/Greeter/NarrowView.qml:118
358msgid "Enter passcode"
358msgid "Enter passcode"
359msgstr "Masukkan kod laluan"
359msgstr "Masukkan kod laluan"
360
360
361−#: qml/Greeter/NarrowView.qml:118
361+#: qml/Greeter/NarrowView.qml:119
362#, qt-format
362#, qt-format
363msgid "Sorry, incorrect %1"
363msgid "Sorry, incorrect %1"
364msgstr "Maaf, %1 salah"
364msgstr "Maaf, %1 salah"
365
365
366−#: qml/Greeter/NarrowView.qml:119
366+#: qml/Greeter/NarrowView.qml:120
367msgid "Sorry, incorrect passphrase"
367msgid "Sorry, incorrect passphrase"
368msgstr "Maaf, frasa laluan salah"
368msgstr "Maaf, frasa laluan salah"
369
369
370−#: qml/Greeter/NarrowView.qml:120
370+#: qml/Greeter/NarrowView.qml:121
371+msgctxt "passphrase"
371msgid "Please re-enter"
372msgid "Please re-enter"
372−msgstr "Sila masuk-semula"
373+msgstr ""
373
374
374−#: qml/Greeter/NarrowView.qml:121
375+#: qml/Greeter/NarrowView.qml:122
375msgid "Sorry, incorrect passcode"
376msgid "Sorry, incorrect passcode"
376msgstr "Maaf, kod laluan salah"
377msgstr "Maaf, kod laluan salah"
377
378
@@ -521,38 +522,6 @@ msgctxt "Button: Go back one page in the Wizard"
521msgid "Back"
522msgid "Back"
522msgstr ""
523msgstr ""
523
524
524−#: qml/Wizard/Pages/here-terms.qml:27
525−msgid "Terms & Conditions"
526−msgstr ""
527−
528−#: qml/Wizard/Pages/passwd-confirm.qml:49
529−msgid "Confirm passphrase"
530−msgstr ""
531−
532−#: qml/Wizard/Pages/passwd-confirm.qml:50
533−msgid "Confirm passcode"
534−msgstr ""
535−
536−#: qml/Wizard/Pages/passwd-confirm.qml:53
537−#: qml/Wizard/Pages/passwd-confirm.qml:54
538−msgid "Please try again."
539−msgstr ""
540−
541−#: qml/Wizard/Pages/passwd-confirm.qml:82 qml/Wizard/Pages/passwd-set.qml:90
542−#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:128
543−#: qml/Wizard/Pages/40-wifi.qml:215 qml/Wizard/Pages/50-location.qml:131
544−#: qml/Wizard/Pages/60-reporting.qml:50
545−msgid "Continue"
546−msgstr ""
547−
548−#: qml/Wizard/Pages/passwd-set.qml:61
549−msgid "Choose your passcode"
550−msgstr ""
551−
552−#: qml/Wizard/Pages/passwd-set.qml:68
553−msgid "Passphrase must be 4 characters long"
554−msgstr ""
555−
556#: qml/Wizard/Pages/10-welcome.qml:27
525#: qml/Wizard/Pages/10-welcome.qml:27
557msgid "Hi!"
526msgid "Hi!"
558msgstr ""
527msgstr ""
@@ -565,6 +534,13 @@ msgstr ""
565msgid "Let’s get started."
534msgid "Let’s get started."
566msgstr ""
535msgstr ""
567
536
537+#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:128
538+#: qml/Wizard/Pages/40-wifi.qml:215 qml/Wizard/Pages/50-location.qml:131
539+#: qml/Wizard/Pages/60-reporting.qml:50 qml/Wizard/Pages/passwd-confirm.qml:82
540+#: qml/Wizard/Pages/passwd-set.qml:90
541+msgid "Continue"
542+msgstr ""
543+
568#: qml/Wizard/Pages/20-sim.qml:25
544#: qml/Wizard/Pages/20-sim.qml:25
569msgid "Add a SIM card and restart your device"
545msgid "Add a SIM card and restart your device"
570msgstr ""
546msgstr ""
@@ -690,6 +666,31 @@ msgstr ""
690msgid "Finish"
666msgid "Finish"
691msgstr ""
667msgstr ""
692
668
669+#: qml/Wizard/Pages/here-terms.qml:27
670+msgid "Terms & Conditions"
671+msgstr ""
672+
673+#: qml/Wizard/Pages/passwd-confirm.qml:49
674+msgid "Confirm passphrase"
675+msgstr ""
676+
677+#: qml/Wizard/Pages/passwd-confirm.qml:50
678+msgid "Confirm passcode"
679+msgstr ""
680+
681+#: qml/Wizard/Pages/passwd-confirm.qml:53
682+#: qml/Wizard/Pages/passwd-confirm.qml:54
683+msgid "Please try again."
684+msgstr ""
685+
686+#: qml/Wizard/Pages/passwd-set.qml:61
687+msgid "Choose your passcode"
688+msgstr ""
689+
690+#: qml/Wizard/Pages/passwd-set.qml:68
691+msgid "Passphrase must be 4 characters long"
692+msgstr ""
693+
693#. Translators: This is the arrow for "Back" buttons
694#. Translators: This is the arrow for "Back" buttons
694#: qml/Wizard/StackButton.qml:39
695#: qml/Wizard/StackButton.qml:39
695#, qt-format
696#, qt-format
@@ -783,6 +784,9 @@ msgstr ""
783#~ msgid "Done"
784#~ msgid "Done"
784#~ msgstr "Selesai"
785#~ msgstr "Selesai"
785
786
787+#~ msgid "Please re-enter"
788+#~ msgstr "Sila masuk-semula"
789+
786#~ msgid "Manage Scopes"
790#~ msgid "Manage Scopes"
787#~ msgstr "Urus Skop"
791#~ msgstr "Urus Skop"
788
792
po/my.po+51−50
@@ -7,7 +7,7 @@ msgid ""
7msgstr ""
7msgstr ""
8"Project-Id-Version: unity\n"
8"Project-Id-Version: unity\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2015-06-22 12:00+0200\n"
10+"POT-Creation-Date: 2015-07-17 10:10+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"
@@ -15,8 +15,8 @@ msgstr ""
15"Content-Type: text/plain; charset=UTF-8\n"
15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n"
16"Content-Transfer-Encoding: 8bit\n"
17"Plural-Forms: nplurals=1; plural=0;\n"
17"Plural-Forms: nplurals=1; plural=0;\n"
18−"X-Launchpad-Export-Date: 2015-07-04 05:37+0000\n"
18+"X-Launchpad-Export-Date: 2015-07-25 05:38+0000\n"
19−"X-Generator: Launchpad (build 17597)\n"
19+"X-Generator: Launchpad (build 17628)\n"
20
20
21#: plugins/LightDM/Greeter.cpp:112
21#: plugins/LightDM/Greeter.cpp:112
22msgid "Password: "
22msgid "Password: "
@@ -223,15 +223,15 @@ msgstr "အရေးပေါ်ခေါ်မည်"
223msgid "OK"
223msgid "OK"
224msgstr "ကောင်းပြီ"
224msgstr "ကောင်းပြီ"
225
225
226−#: qml/Dash/GenericScopeView.qml:532 qml/Dash/GenericScopeView.qml:690
226+#: qml/Dash/GenericScopeView.qml:539 qml/Dash/GenericScopeView.qml:697
227msgid "See less"
227msgid "See less"
228msgstr ""
228msgstr ""
229
229
230−#: qml/Dash/GenericScopeView.qml:532
230+#: qml/Dash/GenericScopeView.qml:539
231msgid "See all"
231msgid "See all"
232msgstr ""
232msgstr ""
233
233
234−#: qml/Dash/GenericScopeView.qml:594
234+#: qml/Dash/GenericScopeView.qml:601
235msgctxt "Label: Hint for dash search line edit"
235msgctxt "Label: Hint for dash search line edit"
236msgid "Search"
236msgid "Search"
237msgstr "ရှာဖွေရန်"
237msgstr "ရှာဖွေရန်"
@@ -315,57 +315,58 @@ msgstr "ထပ်ကြိုးစားပါ"
315msgid "Tap to unlock"
315msgid "Tap to unlock"
316msgstr ""
316msgstr ""
317
317
318−#: qml/Greeter/NarrowView.qml:53 qml/Wizard/Pages/passwd-confirm.qml:53
318+#: qml/Greeter/NarrowView.qml:54 qml/Wizard/Pages/passwd-confirm.qml:53
319msgid "Sorry, incorrect passphrase."
319msgid "Sorry, incorrect passphrase."
320msgstr ""
320msgstr ""
321
321
322−#: qml/Greeter/NarrowView.qml:54 qml/Wizard/Pages/passwd-confirm.qml:54
322+#: qml/Greeter/NarrowView.qml:55 qml/Wizard/Pages/passwd-confirm.qml:54
323msgid "Sorry, incorrect passcode."
323msgid "Sorry, incorrect passcode."
324msgstr ""
324msgstr ""
325
325
326−#: qml/Greeter/NarrowView.qml:55
326+#: qml/Greeter/NarrowView.qml:56
327msgid "This will be your last attempt."
327msgid "This will be your last attempt."
328msgstr ""
328msgstr ""
329
329
330−#: qml/Greeter/NarrowView.qml:57
330+#: qml/Greeter/NarrowView.qml:58
331msgid ""
331msgid ""
332"If passphrase is entered incorrectly, your phone will conduct a factory "
332"If passphrase is entered incorrectly, your phone will conduct a factory "
333"reset and all personal data will be deleted."
333"reset and all personal data will be deleted."
334msgstr ""
334msgstr ""
335
335
336−#: qml/Greeter/NarrowView.qml:58
336+#: qml/Greeter/NarrowView.qml:59
337msgid ""
337msgid ""
338"If passcode is entered incorrectly, your phone will conduct a factory reset "
338"If passcode is entered incorrectly, your phone will conduct a factory reset "
339"and all personal data will be deleted."
339"and all personal data will be deleted."
340msgstr ""
340msgstr ""
341
341
342−#: qml/Greeter/NarrowView.qml:115
342+#: qml/Greeter/NarrowView.qml:116
343#, qt-format
343#, qt-format
344msgid "Enter %1"
344msgid "Enter %1"
345msgstr ""
345msgstr ""
346
346
347−#: qml/Greeter/NarrowView.qml:116 qml/Wizard/Pages/passwd-set.qml:60
347+#: qml/Greeter/NarrowView.qml:117 qml/Wizard/Pages/passwd-set.qml:60
348msgid "Enter passphrase"
348msgid "Enter passphrase"
349msgstr ""
349msgstr ""
350
350
351−#: qml/Greeter/NarrowView.qml:117
351+#: qml/Greeter/NarrowView.qml:118
352msgid "Enter passcode"
352msgid "Enter passcode"
353msgstr ""
353msgstr ""
354
354
355−#: qml/Greeter/NarrowView.qml:118
355+#: qml/Greeter/NarrowView.qml:119
356#, qt-format
356#, qt-format
357msgid "Sorry, incorrect %1"
357msgid "Sorry, incorrect %1"
358msgstr ""
358msgstr ""
359
359
360−#: qml/Greeter/NarrowView.qml:119
360+#: qml/Greeter/NarrowView.qml:120
361msgid "Sorry, incorrect passphrase"
361msgid "Sorry, incorrect passphrase"
362msgstr ""
362msgstr ""
363
363
364−#: qml/Greeter/NarrowView.qml:120
364+#: qml/Greeter/NarrowView.qml:121
365+msgctxt "passphrase"
365msgid "Please re-enter"
366msgid "Please re-enter"
366msgstr ""
367msgstr ""
367
368
368−#: qml/Greeter/NarrowView.qml:121
369+#: qml/Greeter/NarrowView.qml:122
369msgid "Sorry, incorrect passcode"
370msgid "Sorry, incorrect passcode"
370msgstr ""
371msgstr ""
371
372
@@ -515,38 +516,6 @@ msgctxt "Button: Go back one page in the Wizard"
515msgid "Back"
516msgid "Back"
516msgstr "နောက်သို့"
517msgstr "နောက်သို့"
517
518
518−#: qml/Wizard/Pages/here-terms.qml:27
519−msgid "Terms & Conditions"
520−msgstr ""
521−
522−#: qml/Wizard/Pages/passwd-confirm.qml:49
523−msgid "Confirm passphrase"
524−msgstr ""
525−
526−#: qml/Wizard/Pages/passwd-confirm.qml:50
527−msgid "Confirm passcode"
528−msgstr ""
529−
530−#: qml/Wizard/Pages/passwd-confirm.qml:53
531−#: qml/Wizard/Pages/passwd-confirm.qml:54
532−msgid "Please try again."
533−msgstr ""
534−
535−#: qml/Wizard/Pages/passwd-confirm.qml:82 qml/Wizard/Pages/passwd-set.qml:90
536−#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:128
537−#: qml/Wizard/Pages/40-wifi.qml:215 qml/Wizard/Pages/50-location.qml:131
538−#: qml/Wizard/Pages/60-reporting.qml:50
539−msgid "Continue"
540−msgstr "ဆက်လုပ်ရန်"
541−
542−#: qml/Wizard/Pages/passwd-set.qml:61
543−msgid "Choose your passcode"
544−msgstr ""
545−
546−#: qml/Wizard/Pages/passwd-set.qml:68
547−msgid "Passphrase must be 4 characters long"
548−msgstr ""
549−
550#: qml/Wizard/Pages/10-welcome.qml:27
519#: qml/Wizard/Pages/10-welcome.qml:27
551msgid "Hi!"
520msgid "Hi!"
552msgstr ""
521msgstr ""
@@ -559,6 +528,13 @@ msgstr ""
559msgid "Let’s get started."
528msgid "Let’s get started."
560msgstr ""
529msgstr ""
561
530
531+#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:128
532+#: qml/Wizard/Pages/40-wifi.qml:215 qml/Wizard/Pages/50-location.qml:131
533+#: qml/Wizard/Pages/60-reporting.qml:50 qml/Wizard/Pages/passwd-confirm.qml:82
534+#: qml/Wizard/Pages/passwd-set.qml:90
535+msgid "Continue"
536+msgstr "ဆက်လုပ်ရန်"
537+
562#: qml/Wizard/Pages/20-sim.qml:25
538#: qml/Wizard/Pages/20-sim.qml:25
563msgid "Add a SIM card and restart your device"
539msgid "Add a SIM card and restart your device"
564msgstr ""
540msgstr ""
@@ -684,6 +660,31 @@ msgstr ""
684msgid "Finish"
660msgid "Finish"
685msgstr ""
661msgstr ""
686
662
663+#: qml/Wizard/Pages/here-terms.qml:27
664+msgid "Terms & Conditions"
665+msgstr ""
666+
667+#: qml/Wizard/Pages/passwd-confirm.qml:49
668+msgid "Confirm passphrase"
669+msgstr ""
670+
671+#: qml/Wizard/Pages/passwd-confirm.qml:50
672+msgid "Confirm passcode"
673+msgstr ""
674+
675+#: qml/Wizard/Pages/passwd-confirm.qml:53
676+#: qml/Wizard/Pages/passwd-confirm.qml:54
677+msgid "Please try again."
678+msgstr ""
679+
680+#: qml/Wizard/Pages/passwd-set.qml:61
681+msgid "Choose your passcode"
682+msgstr ""
683+
684+#: qml/Wizard/Pages/passwd-set.qml:68
685+msgid "Passphrase must be 4 characters long"
686+msgstr ""
687+
687#. Translators: This is the arrow for "Back" buttons
688#. Translators: This is the arrow for "Back" buttons
688#: qml/Wizard/StackButton.qml:39
689#: qml/Wizard/StackButton.qml:39
689#, qt-format
690#, qt-format
po/nb.po+55−51
@@ -7,7 +7,7 @@ msgid ""
7msgstr ""
7msgstr ""
8"Project-Id-Version: unity\n"
8"Project-Id-Version: unity\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2015-06-22 12:00+0200\n"
10+"POT-Creation-Date: 2015-07-17 10:10+0200\n"
11"PO-Revision-Date: 2015-07-05 19:44+0000\n"
11"PO-Revision-Date: 2015-07-05 19:44+0000\n"
12"Last-Translator: Mathias Bynke <Unknown>\n"
12"Last-Translator: Mathias Bynke <Unknown>\n"
13"Language-Team: Norwegian Bokmal <nb@li.org>\n"
13"Language-Team: Norwegian Bokmal <nb@li.org>\n"
@@ -15,8 +15,8 @@ msgstr ""
15"Content-Type: text/plain; charset=UTF-8\n"
15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n"
16"Content-Transfer-Encoding: 8bit\n"
17"Plural-Forms: nplurals=2; plural=n != 1;\n"
17"Plural-Forms: nplurals=2; plural=n != 1;\n"
18−"X-Launchpad-Export-Date: 2015-07-06 05:36+0000\n"
18+"X-Launchpad-Export-Date: 2015-07-25 05:39+0000\n"
19−"X-Generator: Launchpad (build 17597)\n"
19+"X-Generator: Launchpad (build 17628)\n"
20
20
21#: plugins/LightDM/Greeter.cpp:112
21#: plugins/LightDM/Greeter.cpp:112
22msgid "Password: "
22msgid "Password: "
@@ -227,15 +227,15 @@ msgstr "Nødanrop"
227msgid "OK"
227msgid "OK"
228msgstr "OK"
228msgstr "OK"
229
229
230−#: qml/Dash/GenericScopeView.qml:532 qml/Dash/GenericScopeView.qml:690
230+#: qml/Dash/GenericScopeView.qml:539 qml/Dash/GenericScopeView.qml:697
231msgid "See less"
231msgid "See less"
232msgstr "Vis mindre"
232msgstr "Vis mindre"
233
233
234−#: qml/Dash/GenericScopeView.qml:532
234+#: qml/Dash/GenericScopeView.qml:539
235msgid "See all"
235msgid "See all"
236msgstr "Vis alt"
236msgstr "Vis alt"
237
237
238−#: qml/Dash/GenericScopeView.qml:594
238+#: qml/Dash/GenericScopeView.qml:601
239msgctxt "Label: Hint for dash search line edit"
239msgctxt "Label: Hint for dash search line edit"
240msgid "Search"
240msgid "Search"
241msgstr "Søk"
241msgstr "Søk"
@@ -319,19 +319,19 @@ msgstr "Prøv igjen"
319msgid "Tap to unlock"
319msgid "Tap to unlock"
320msgstr "Trykk for å låse opp"
320msgstr "Trykk for å låse opp"
321
321
322−#: qml/Greeter/NarrowView.qml:53 qml/Wizard/Pages/passwd-confirm.qml:53
322+#: qml/Greeter/NarrowView.qml:54 qml/Wizard/Pages/passwd-confirm.qml:53
323msgid "Sorry, incorrect passphrase."
323msgid "Sorry, incorrect passphrase."
324msgstr "Feil passordfrase."
324msgstr "Feil passordfrase."
325
325
326−#: qml/Greeter/NarrowView.qml:54 qml/Wizard/Pages/passwd-confirm.qml:54
326+#: qml/Greeter/NarrowView.qml:55 qml/Wizard/Pages/passwd-confirm.qml:54
327msgid "Sorry, incorrect passcode."
327msgid "Sorry, incorrect passcode."
328msgstr "Feil kode."
328msgstr "Feil kode."
329
329
330−#: qml/Greeter/NarrowView.qml:55
330+#: qml/Greeter/NarrowView.qml:56
331msgid "This will be your last attempt."
331msgid "This will be your last attempt."
332msgstr "Dette er ditt siste forsøk."
332msgstr "Dette er ditt siste forsøk."
333
333
334−#: qml/Greeter/NarrowView.qml:57
334+#: qml/Greeter/NarrowView.qml:58
335msgid ""
335msgid ""
336"If passphrase is entered incorrectly, your phone will conduct a factory "
336"If passphrase is entered incorrectly, your phone will conduct a factory "
337"reset and all personal data will be deleted."
337"reset and all personal data will be deleted."
@@ -339,7 +339,7 @@ msgstr ""
339"Hvis du skriver feil passordfrase en gang til, tilbakestilles telefonen til "
339"Hvis du skriver feil passordfrase en gang til, tilbakestilles telefonen til "
340"fabrikkinnstillinger, og alle personlige data slettes."
340"fabrikkinnstillinger, og alle personlige data slettes."
341
341
342−#: qml/Greeter/NarrowView.qml:58
342+#: qml/Greeter/NarrowView.qml:59
343msgid ""
343msgid ""
344"If passcode is entered incorrectly, your phone will conduct a factory reset "
344"If passcode is entered incorrectly, your phone will conduct a factory reset "
345"and all personal data will be deleted."
345"and all personal data will be deleted."
@@ -347,33 +347,34 @@ msgstr ""
347"Hvis du skriver feil kode en gang til, tilbakestilles telefonen til "
347"Hvis du skriver feil kode en gang til, tilbakestilles telefonen til "
348"fabrikkinnstillinger, og alle personlige data slettes."
348"fabrikkinnstillinger, og alle personlige data slettes."
349
349
350−#: qml/Greeter/NarrowView.qml:115
350+#: qml/Greeter/NarrowView.qml:116
351#, qt-format
351#, qt-format
352msgid "Enter %1"
352msgid "Enter %1"
353msgstr "Skriv inn %1"
353msgstr "Skriv inn %1"
354
354
355−#: qml/Greeter/NarrowView.qml:116 qml/Wizard/Pages/passwd-set.qml:60
355+#: qml/Greeter/NarrowView.qml:117 qml/Wizard/Pages/passwd-set.qml:60
356msgid "Enter passphrase"
356msgid "Enter passphrase"
357msgstr "Skriv inn passordfrase"
357msgstr "Skriv inn passordfrase"
358
358
359−#: qml/Greeter/NarrowView.qml:117
359+#: qml/Greeter/NarrowView.qml:118
360msgid "Enter passcode"
360msgid "Enter passcode"
361msgstr "Tast kode"
361msgstr "Tast kode"
362
362
363−#: qml/Greeter/NarrowView.qml:118
363+#: qml/Greeter/NarrowView.qml:119
364#, qt-format
364#, qt-format
365msgid "Sorry, incorrect %1"
365msgid "Sorry, incorrect %1"
366msgstr "Feil %1"
366msgstr "Feil %1"
367
367
368−#: qml/Greeter/NarrowView.qml:119
368+#: qml/Greeter/NarrowView.qml:120
369msgid "Sorry, incorrect passphrase"
369msgid "Sorry, incorrect passphrase"
370msgstr "Feil passordfrase"
370msgstr "Feil passordfrase"
371
371
372−#: qml/Greeter/NarrowView.qml:120
372+#: qml/Greeter/NarrowView.qml:121
373+msgctxt "passphrase"
373msgid "Please re-enter"
374msgid "Please re-enter"
374−msgstr "Skriv inn på nytt"
375+msgstr ""
375
376
376−#: qml/Greeter/NarrowView.qml:121
377+#: qml/Greeter/NarrowView.qml:122
377msgid "Sorry, incorrect passcode"
378msgid "Sorry, incorrect passcode"
378msgstr "Feil kode"
379msgstr "Feil kode"
379
380
@@ -523,38 +524,6 @@ msgctxt "Button: Go back one page in the Wizard"
523msgid "Back"
524msgid "Back"
524msgstr "Tilbake"
525msgstr "Tilbake"
525
526
526−#: qml/Wizard/Pages/here-terms.qml:27
527−msgid "Terms & Conditions"
528−msgstr "Brukervilkår"
529−
530−#: qml/Wizard/Pages/passwd-confirm.qml:49
531−msgid "Confirm passphrase"
532−msgstr "Bekreft passordfrase"
533−
534−#: qml/Wizard/Pages/passwd-confirm.qml:50
535−msgid "Confirm passcode"
536−msgstr "Bekreft kode"
537−
538−#: qml/Wizard/Pages/passwd-confirm.qml:53
539−#: qml/Wizard/Pages/passwd-confirm.qml:54
540−msgid "Please try again."
541−msgstr "Prøv igjen."
542−
543−#: qml/Wizard/Pages/passwd-confirm.qml:82 qml/Wizard/Pages/passwd-set.qml:90
544−#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:128
545−#: qml/Wizard/Pages/40-wifi.qml:215 qml/Wizard/Pages/50-location.qml:131
546−#: qml/Wizard/Pages/60-reporting.qml:50
547−msgid "Continue"
548−msgstr "Fortsett"
549−
550−#: qml/Wizard/Pages/passwd-set.qml:61
551−msgid "Choose your passcode"
552−msgstr "Velg kode"
553−
554−#: qml/Wizard/Pages/passwd-set.qml:68
555−msgid "Passphrase must be 4 characters long"
556−msgstr "Passordfrasen må bestå av minst 4 tegn"
557−
558#: qml/Wizard/Pages/10-welcome.qml:27
527#: qml/Wizard/Pages/10-welcome.qml:27
559msgid "Hi!"
528msgid "Hi!"
560msgstr "Hei!"
529msgstr "Hei!"
@@ -567,6 +536,13 @@ msgstr "Velkommen til Ubuntu-telefonen."
567msgid "Let’s get started."
536msgid "Let’s get started."
568msgstr "La oss komme i gang."
537msgstr "La oss komme i gang."
569
538
539+#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:128
540+#: qml/Wizard/Pages/40-wifi.qml:215 qml/Wizard/Pages/50-location.qml:131
541+#: qml/Wizard/Pages/60-reporting.qml:50 qml/Wizard/Pages/passwd-confirm.qml:82
542+#: qml/Wizard/Pages/passwd-set.qml:90
543+msgid "Continue"
544+msgstr "Fortsett"
545+
570#: qml/Wizard/Pages/20-sim.qml:25
546#: qml/Wizard/Pages/20-sim.qml:25
571msgid "Add a SIM card and restart your device"
547msgid "Add a SIM card and restart your device"
572msgstr "Legg til et SIM-kort og start enheten på nytt"
548msgstr "Legg til et SIM-kort og start enheten på nytt"
@@ -698,6 +674,31 @@ msgstr "Telefonen er klar til bruk."
698msgid "Finish"
674msgid "Finish"
699msgstr "Fullfør"
675msgstr "Fullfør"
700
676
677+#: qml/Wizard/Pages/here-terms.qml:27
678+msgid "Terms & Conditions"
679+msgstr "Brukervilkår"
680+
681+#: qml/Wizard/Pages/passwd-confirm.qml:49
682+msgid "Confirm passphrase"
683+msgstr "Bekreft passordfrase"
684+
685+#: qml/Wizard/Pages/passwd-confirm.qml:50
686+msgid "Confirm passcode"
687+msgstr "Bekreft kode"
688+
689+#: qml/Wizard/Pages/passwd-confirm.qml:53
690+#: qml/Wizard/Pages/passwd-confirm.qml:54
691+msgid "Please try again."
692+msgstr "Prøv igjen."
693+
694+#: qml/Wizard/Pages/passwd-set.qml:61
695+msgid "Choose your passcode"
696+msgstr "Velg kode"
697+
698+#: qml/Wizard/Pages/passwd-set.qml:68
699+msgid "Passphrase must be 4 characters long"
700+msgstr "Passordfrasen må bestå av minst 4 tegn"
701+
701#. Translators: This is the arrow for "Back" buttons
702#. Translators: This is the arrow for "Back" buttons
702#: qml/Wizard/StackButton.qml:39
703#: qml/Wizard/StackButton.qml:39
703#, qt-format
704#, qt-format
@@ -800,3 +801,6 @@ msgstr "%1 〉"
800
801
801#~ msgid "Manage Scopes"
802#~ msgid "Manage Scopes"
802#~ msgstr "Håndter virkefelt"
803#~ msgstr "Håndter virkefelt"
804+
805+#~ msgid "Please re-enter"
806+#~ msgstr "Skriv inn på nytt"
po/nl.po+55−51
@@ -7,7 +7,7 @@ msgid ""
7msgstr ""
7msgstr ""
8"Project-Id-Version: unity\n"
8"Project-Id-Version: unity\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2015-06-22 12:00+0200\n"
10+"POT-Creation-Date: 2015-07-17 10:10+0200\n"
11"PO-Revision-Date: 2015-07-07 07:14+0000\n"
11"PO-Revision-Date: 2015-07-07 07:14+0000\n"
12"Last-Translator: Hannie Dumoleyn <Unknown>\n"
12"Last-Translator: Hannie Dumoleyn <Unknown>\n"
13"Language-Team: Dutch <nl@li.org>\n"
13"Language-Team: Dutch <nl@li.org>\n"
@@ -15,8 +15,8 @@ msgstr ""
15"Content-Type: text/plain; charset=UTF-8\n"
15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n"
16"Content-Transfer-Encoding: 8bit\n"
17"Plural-Forms: nplurals=2; plural=n != 1;\n"
17"Plural-Forms: nplurals=2; plural=n != 1;\n"
18−"X-Launchpad-Export-Date: 2015-07-08 05:46+0000\n"
18+"X-Launchpad-Export-Date: 2015-07-25 05:38+0000\n"
19−"X-Generator: Launchpad (build 17608)\n"
19+"X-Generator: Launchpad (build 17628)\n"
20
20
21#: plugins/LightDM/Greeter.cpp:112
21#: plugins/LightDM/Greeter.cpp:112
22msgid "Password: "
22msgid "Password: "
@@ -229,15 +229,15 @@ msgstr "Noodoproep"
229msgid "OK"
229msgid "OK"
230msgstr "Ok"
230msgstr "Ok"
231
231
232−#: qml/Dash/GenericScopeView.qml:532 qml/Dash/GenericScopeView.qml:690
232+#: qml/Dash/GenericScopeView.qml:539 qml/Dash/GenericScopeView.qml:697
233msgid "See less"
233msgid "See less"
234msgstr "Minder zien"
234msgstr "Minder zien"
235
235
236−#: qml/Dash/GenericScopeView.qml:532
236+#: qml/Dash/GenericScopeView.qml:539
237msgid "See all"
237msgid "See all"
238msgstr "Alles zien"
238msgstr "Alles zien"
239
239
240−#: qml/Dash/GenericScopeView.qml:594
240+#: qml/Dash/GenericScopeView.qml:601
241msgctxt "Label: Hint for dash search line edit"
241msgctxt "Label: Hint for dash search line edit"
242msgid "Search"
242msgid "Search"
243msgstr "Zoeken"
243msgstr "Zoeken"
@@ -321,19 +321,19 @@ msgstr "Opnieuw proberen"
321msgid "Tap to unlock"
321msgid "Tap to unlock"
322msgstr "Tik om te ontgrendelen"
322msgstr "Tik om te ontgrendelen"
323
323
324−#: qml/Greeter/NarrowView.qml:53 qml/Wizard/Pages/passwd-confirm.qml:53
324+#: qml/Greeter/NarrowView.qml:54 qml/Wizard/Pages/passwd-confirm.qml:53
325msgid "Sorry, incorrect passphrase."
325msgid "Sorry, incorrect passphrase."
326msgstr "Sorry, onjuiste wachtwoordzin."
326msgstr "Sorry, onjuiste wachtwoordzin."
327
327
328−#: qml/Greeter/NarrowView.qml:54 qml/Wizard/Pages/passwd-confirm.qml:54
328+#: qml/Greeter/NarrowView.qml:55 qml/Wizard/Pages/passwd-confirm.qml:54
329msgid "Sorry, incorrect passcode."
329msgid "Sorry, incorrect passcode."
330msgstr "Sorry, onjuiste toegangscode."
330msgstr "Sorry, onjuiste toegangscode."
331
331
332−#: qml/Greeter/NarrowView.qml:55
332+#: qml/Greeter/NarrowView.qml:56
333msgid "This will be your last attempt."
333msgid "This will be your last attempt."
334msgstr "Dit zal uw laatste poging worden."
334msgstr "Dit zal uw laatste poging worden."
335
335
336−#: qml/Greeter/NarrowView.qml:57
336+#: qml/Greeter/NarrowView.qml:58
337msgid ""
337msgid ""
338"If passphrase is entered incorrectly, your phone will conduct a factory "
338"If passphrase is entered incorrectly, your phone will conduct a factory "
339"reset and all personal data will be deleted."
339"reset and all personal data will be deleted."
@@ -341,7 +341,7 @@ msgstr ""
341"Wanneer de wachtwoordzin nu opnieuw onjuist wordt ingevoerd, zal uw telefoon "
341"Wanneer de wachtwoordzin nu opnieuw onjuist wordt ingevoerd, zal uw telefoon "
342"teruggaan naar de fabrieksinstellingen en zal al uw eigen data verloren gaan."
342"teruggaan naar de fabrieksinstellingen en zal al uw eigen data verloren gaan."
343
343
344−#: qml/Greeter/NarrowView.qml:58
344+#: qml/Greeter/NarrowView.qml:59
345msgid ""
345msgid ""
346"If passcode is entered incorrectly, your phone will conduct a factory reset "
346"If passcode is entered incorrectly, your phone will conduct a factory reset "
347"and all personal data will be deleted."
347"and all personal data will be deleted."
@@ -349,33 +349,34 @@ msgstr ""
349"Wanneer de toegangscode nu opnieuw onjuist wordt ingevoerd, zal uw telefoon "
349"Wanneer de toegangscode nu opnieuw onjuist wordt ingevoerd, zal uw telefoon "
350"teruggaan naar de fabrieksinstellingen en zal al uw eigen data verloren gaan."
350"teruggaan naar de fabrieksinstellingen en zal al uw eigen data verloren gaan."
351
351
352−#: qml/Greeter/NarrowView.qml:115
352+#: qml/Greeter/NarrowView.qml:116
353#, qt-format
353#, qt-format
354msgid "Enter %1"
354msgid "Enter %1"
355msgstr "Voer %1 in"
355msgstr "Voer %1 in"
356
356
357−#: qml/Greeter/NarrowView.qml:116 qml/Wizard/Pages/passwd-set.qml:60
357+#: qml/Greeter/NarrowView.qml:117 qml/Wizard/Pages/passwd-set.qml:60
358msgid "Enter passphrase"
358msgid "Enter passphrase"
359msgstr "Voer wachtwoordzin in"
359msgstr "Voer wachtwoordzin in"
360
360
361−#: qml/Greeter/NarrowView.qml:117
361+#: qml/Greeter/NarrowView.qml:118
362msgid "Enter passcode"
362msgid "Enter passcode"
363msgstr "Voer toegangscode in"
363msgstr "Voer toegangscode in"
364
364
365−#: qml/Greeter/NarrowView.qml:118
365+#: qml/Greeter/NarrowView.qml:119
366#, qt-format
366#, qt-format
367msgid "Sorry, incorrect %1"
367msgid "Sorry, incorrect %1"
368msgstr "Sorry, onjuiste %1"
368msgstr "Sorry, onjuiste %1"
369
369
370−#: qml/Greeter/NarrowView.qml:119
370+#: qml/Greeter/NarrowView.qml:120
371msgid "Sorry, incorrect passphrase"
371msgid "Sorry, incorrect passphrase"
372msgstr "Sorry, onjuiste wachtwoordzin"
372msgstr "Sorry, onjuiste wachtwoordzin"
373
373
374−#: qml/Greeter/NarrowView.qml:120
374+#: qml/Greeter/NarrowView.qml:121
375+msgctxt "passphrase"
375msgid "Please re-enter"
376msgid "Please re-enter"
376−msgstr "Herhaal deze a.u.b."
377+msgstr ""
377
378
378−#: qml/Greeter/NarrowView.qml:121
379+#: qml/Greeter/NarrowView.qml:122
379msgid "Sorry, incorrect passcode"
380msgid "Sorry, incorrect passcode"
380msgstr "Sorry, onjuiste toegangscode"
381msgstr "Sorry, onjuiste toegangscode"
381
382
@@ -527,38 +528,6 @@ msgctxt "Button: Go back one page in the Wizard"
527msgid "Back"
528msgid "Back"
528msgstr "Terug"
529msgstr "Terug"
529
530
530−#: qml/Wizard/Pages/here-terms.qml:27
531−msgid "Terms & Conditions"
532−msgstr "Algemene voorwaarden"
533−
534−#: qml/Wizard/Pages/passwd-confirm.qml:49
535−msgid "Confirm passphrase"
536−msgstr "Wachtwoordzin bevestigen"
537−
538−#: qml/Wizard/Pages/passwd-confirm.qml:50
539−msgid "Confirm passcode"
540−msgstr "Toegangscode bevestigen"
541−
542−#: qml/Wizard/Pages/passwd-confirm.qml:53
543−#: qml/Wizard/Pages/passwd-confirm.qml:54
544−msgid "Please try again."
545−msgstr "Probeer het a.u.b. opnieuw."
546−
547−#: qml/Wizard/Pages/passwd-confirm.qml:82 qml/Wizard/Pages/passwd-set.qml:90
548−#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:128
549−#: qml/Wizard/Pages/40-wifi.qml:215 qml/Wizard/Pages/50-location.qml:131
550−#: qml/Wizard/Pages/60-reporting.qml:50
551−msgid "Continue"
552−msgstr "Doorgaan"
553−
554−#: qml/Wizard/Pages/passwd-set.qml:61
555−msgid "Choose your passcode"
556−msgstr "Kies uw toegangscode"
557−
558−#: qml/Wizard/Pages/passwd-set.qml:68
559−msgid "Passphrase must be 4 characters long"
560−msgstr "De wachtwoordzin moet 4 tekens lang zijn"
561−
562#: qml/Wizard/Pages/10-welcome.qml:27
531#: qml/Wizard/Pages/10-welcome.qml:27
563msgid "Hi!"
532msgid "Hi!"
564msgstr "Hallo!"
533msgstr "Hallo!"
@@ -571,6 +540,13 @@ msgstr "Welkom bij uw Ubuntutelefoon."
571msgid "Let’s get started."
540msgid "Let’s get started."
572msgstr "Laten we beginnen."
541msgstr "Laten we beginnen."
573
542
543+#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:128
544+#: qml/Wizard/Pages/40-wifi.qml:215 qml/Wizard/Pages/50-location.qml:131
545+#: qml/Wizard/Pages/60-reporting.qml:50 qml/Wizard/Pages/passwd-confirm.qml:82
546+#: qml/Wizard/Pages/passwd-set.qml:90
547+msgid "Continue"
548+msgstr "Doorgaan"
549+
574#: qml/Wizard/Pages/20-sim.qml:25
550#: qml/Wizard/Pages/20-sim.qml:25
575msgid "Add a SIM card and restart your device"
551msgid "Add a SIM card and restart your device"
576msgstr "Plaats een simkaart en herstart uw apparaat"
552msgstr "Plaats een simkaart en herstart uw apparaat"
@@ -703,6 +679,31 @@ msgstr "Uw telefoon is nu klaar voor gebruik."
703msgid "Finish"
679msgid "Finish"
704msgstr "Voltooien"
680msgstr "Voltooien"
705
681
682+#: qml/Wizard/Pages/here-terms.qml:27
683+msgid "Terms & Conditions"
684+msgstr "Algemene voorwaarden"
685+
686+#: qml/Wizard/Pages/passwd-confirm.qml:49
687+msgid "Confirm passphrase"
688+msgstr "Wachtwoordzin bevestigen"
689+
690+#: qml/Wizard/Pages/passwd-confirm.qml:50
691+msgid "Confirm passcode"
692+msgstr "Toegangscode bevestigen"
693+
694+#: qml/Wizard/Pages/passwd-confirm.qml:53
695+#: qml/Wizard/Pages/passwd-confirm.qml:54
696+msgid "Please try again."
697+msgstr "Probeer het a.u.b. opnieuw."
698+
699+#: qml/Wizard/Pages/passwd-set.qml:61
700+msgid "Choose your passcode"
701+msgstr "Kies uw toegangscode"
702+
703+#: qml/Wizard/Pages/passwd-set.qml:68
704+msgid "Passphrase must be 4 characters long"
705+msgstr "De wachtwoordzin moet 4 tekens lang zijn"
706+
706#. Translators: This is the arrow for "Back" buttons
707#. Translators: This is the arrow for "Back" buttons
707#: qml/Wizard/StackButton.qml:39
708#: qml/Wizard/StackButton.qml:39
708#, qt-format
709#, qt-format
@@ -805,3 +806,6 @@ msgstr "%1 〉"
805
806
806#~ msgid "Manage Scopes"
807#~ msgid "Manage Scopes"
807#~ msgstr "Scopes-beheer"
808#~ msgstr "Scopes-beheer"
809+
810+#~ msgid "Please re-enter"
811+#~ msgstr "Herhaal deze a.u.b."
po/nn.po+51−50
@@ -7,7 +7,7 @@ msgid ""
7msgstr ""
7msgstr ""
8"Project-Id-Version: unity8\n"
8"Project-Id-Version: unity8\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2015-06-22 12:00+0200\n"
10+"POT-Creation-Date: 2015-07-17 10:10+0200\n"
11"PO-Revision-Date: 2015-05-12 11:32+0000\n"
11"PO-Revision-Date: 2015-05-12 11:32+0000\n"
12"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
12"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
13"Language-Team: Norwegian Nynorsk <nn@li.org>\n"
13"Language-Team: Norwegian Nynorsk <nn@li.org>\n"
@@ -15,8 +15,8 @@ msgstr ""
15"Content-Type: text/plain; charset=UTF-8\n"
15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n"
16"Content-Transfer-Encoding: 8bit\n"
17"Plural-Forms: nplurals=2; plural=n != 1;\n"
17"Plural-Forms: nplurals=2; plural=n != 1;\n"
18−"X-Launchpad-Export-Date: 2015-07-04 05:37+0000\n"
18+"X-Launchpad-Export-Date: 2015-07-25 05:39+0000\n"
19−"X-Generator: Launchpad (build 17597)\n"
19+"X-Generator: Launchpad (build 17628)\n"
20
20
21#: plugins/LightDM/Greeter.cpp:112
21#: plugins/LightDM/Greeter.cpp:112
22msgid "Password: "
22msgid "Password: "
@@ -223,15 +223,15 @@ msgstr ""
223msgid "OK"
223msgid "OK"
224msgstr ""
224msgstr ""
225
225
226−#: qml/Dash/GenericScopeView.qml:532 qml/Dash/GenericScopeView.qml:690
226+#: qml/Dash/GenericScopeView.qml:539 qml/Dash/GenericScopeView.qml:697
227msgid "See less"
227msgid "See less"
228msgstr ""
228msgstr ""
229
229
230−#: qml/Dash/GenericScopeView.qml:532
230+#: qml/Dash/GenericScopeView.qml:539
231msgid "See all"
231msgid "See all"
232msgstr ""
232msgstr ""
233
233
234−#: qml/Dash/GenericScopeView.qml:594
234+#: qml/Dash/GenericScopeView.qml:601
235msgctxt "Label: Hint for dash search line edit"
235msgctxt "Label: Hint for dash search line edit"
236msgid "Search"
236msgid "Search"
237msgstr ""
237msgstr ""
@@ -315,57 +315,58 @@ msgstr ""
315msgid "Tap to unlock"
315msgid "Tap to unlock"
316msgstr ""
316msgstr ""
317
317
318−#: qml/Greeter/NarrowView.qml:53 qml/Wizard/Pages/passwd-confirm.qml:53
318+#: qml/Greeter/NarrowView.qml:54 qml/Wizard/Pages/passwd-confirm.qml:53
319msgid "Sorry, incorrect passphrase."
319msgid "Sorry, incorrect passphrase."
320msgstr ""
320msgstr ""
321
321
322−#: qml/Greeter/NarrowView.qml:54 qml/Wizard/Pages/passwd-confirm.qml:54
322+#: qml/Greeter/NarrowView.qml:55 qml/Wizard/Pages/passwd-confirm.qml:54
323msgid "Sorry, incorrect passcode."
323msgid "Sorry, incorrect passcode."
324msgstr ""
324msgstr ""
325
325
326−#: qml/Greeter/NarrowView.qml:55
326+#: qml/Greeter/NarrowView.qml:56
327msgid "This will be your last attempt."
327msgid "This will be your last attempt."
328msgstr ""
328msgstr ""
329
329
330−#: qml/Greeter/NarrowView.qml:57
330+#: qml/Greeter/NarrowView.qml:58
331msgid ""
331msgid ""
332"If passphrase is entered incorrectly, your phone will conduct a factory "
332"If passphrase is entered incorrectly, your phone will conduct a factory "
333"reset and all personal data will be deleted."
333"reset and all personal data will be deleted."
334msgstr ""
334msgstr ""
335
335
336−#: qml/Greeter/NarrowView.qml:58
336+#: qml/Greeter/NarrowView.qml:59
337msgid ""
337msgid ""
338"If passcode is entered incorrectly, your phone will conduct a factory reset "
338"If passcode is entered incorrectly, your phone will conduct a factory reset "
339"and all personal data will be deleted."
339"and all personal data will be deleted."
340msgstr ""
340msgstr ""
341
341
342−#: qml/Greeter/NarrowView.qml:115
342+#: qml/Greeter/NarrowView.qml:116
343#, qt-format
343#, qt-format
344msgid "Enter %1"
344msgid "Enter %1"
345msgstr ""
345msgstr ""
346
346
347−#: qml/Greeter/NarrowView.qml:116 qml/Wizard/Pages/passwd-set.qml:60
347+#: qml/Greeter/NarrowView.qml:117 qml/Wizard/Pages/passwd-set.qml:60
348msgid "Enter passphrase"
348msgid "Enter passphrase"
349msgstr ""
349msgstr ""
350
350
351−#: qml/Greeter/NarrowView.qml:117
351+#: qml/Greeter/NarrowView.qml:118
352msgid "Enter passcode"
352msgid "Enter passcode"
353msgstr ""
353msgstr ""
354
354
355−#: qml/Greeter/NarrowView.qml:118
355+#: qml/Greeter/NarrowView.qml:119
356#, qt-format
356#, qt-format
357msgid "Sorry, incorrect %1"
357msgid "Sorry, incorrect %1"
358msgstr ""
358msgstr ""
359
359
360−#: qml/Greeter/NarrowView.qml:119
360+#: qml/Greeter/NarrowView.qml:120
361msgid "Sorry, incorrect passphrase"
361msgid "Sorry, incorrect passphrase"
362msgstr ""
362msgstr ""
363
363
364−#: qml/Greeter/NarrowView.qml:120
364+#: qml/Greeter/NarrowView.qml:121
365+msgctxt "passphrase"
365msgid "Please re-enter"
366msgid "Please re-enter"
366msgstr ""
367msgstr ""
367
368
368−#: qml/Greeter/NarrowView.qml:121
369+#: qml/Greeter/NarrowView.qml:122
369msgid "Sorry, incorrect passcode"
370msgid "Sorry, incorrect passcode"
370msgstr ""
371msgstr ""
371
372
@@ -515,38 +516,6 @@ msgctxt "Button: Go back one page in the Wizard"
515msgid "Back"
516msgid "Back"
516msgstr ""
517msgstr ""
517
518
518−#: qml/Wizard/Pages/here-terms.qml:27
519−msgid "Terms & Conditions"
520−msgstr ""
521−
522−#: qml/Wizard/Pages/passwd-confirm.qml:49
523−msgid "Confirm passphrase"
524−msgstr ""
525−
526−#: qml/Wizard/Pages/passwd-confirm.qml:50
527−msgid "Confirm passcode"
528−msgstr ""
529−
530−#: qml/Wizard/Pages/passwd-confirm.qml:53
531−#: qml/Wizard/Pages/passwd-confirm.qml:54
532−msgid "Please try again."
533−msgstr ""
534−
535−#: qml/Wizard/Pages/passwd-confirm.qml:82 qml/Wizard/Pages/passwd-set.qml:90
536−#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:128
537−#: qml/Wizard/Pages/40-wifi.qml:215 qml/Wizard/Pages/50-location.qml:131
538−#: qml/Wizard/Pages/60-reporting.qml:50
539−msgid "Continue"
540−msgstr ""
541−
542−#: qml/Wizard/Pages/passwd-set.qml:61
543−msgid "Choose your passcode"
544−msgstr ""
545−
546−#: qml/Wizard/Pages/passwd-set.qml:68
547−msgid "Passphrase must be 4 characters long"
548−msgstr ""
549−
550#: qml/Wizard/Pages/10-welcome.qml:27
519#: qml/Wizard/Pages/10-welcome.qml:27
551msgid "Hi!"
520msgid "Hi!"
552msgstr ""
521msgstr ""
@@ -559,6 +528,13 @@ msgstr ""
559msgid "Let’s get started."
528msgid "Let’s get started."
560msgstr ""
529msgstr ""
561
530
531+#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:128
532+#: qml/Wizard/Pages/40-wifi.qml:215 qml/Wizard/Pages/50-location.qml:131
533+#: qml/Wizard/Pages/60-reporting.qml:50 qml/Wizard/Pages/passwd-confirm.qml:82
534+#: qml/Wizard/Pages/passwd-set.qml:90
535+msgid "Continue"
536+msgstr ""
537+
562#: qml/Wizard/Pages/20-sim.qml:25
538#: qml/Wizard/Pages/20-sim.qml:25
563msgid "Add a SIM card and restart your device"
539msgid "Add a SIM card and restart your device"
564msgstr ""
540msgstr ""
@@ -684,6 +660,31 @@ msgstr ""
684msgid "Finish"
660msgid "Finish"
685msgstr ""
661msgstr ""
686
662
663+#: qml/Wizard/Pages/here-terms.qml:27
664+msgid "Terms & Conditions"
665+msgstr ""
666+
667+#: qml/Wizard/Pages/passwd-confirm.qml:49
668+msgid "Confirm passphrase"
669+msgstr ""
670+
671+#: qml/Wizard/Pages/passwd-confirm.qml:50
672+msgid "Confirm passcode"
673+msgstr ""
674+
675+#: qml/Wizard/Pages/passwd-confirm.qml:53
676+#: qml/Wizard/Pages/passwd-confirm.qml:54
677+msgid "Please try again."
678+msgstr ""
679+
680+#: qml/Wizard/Pages/passwd-set.qml:61
681+msgid "Choose your passcode"
682+msgstr ""
683+
684+#: qml/Wizard/Pages/passwd-set.qml:68
685+msgid "Passphrase must be 4 characters long"
686+msgstr ""
687+
687#. Translators: This is the arrow for "Back" buttons
688#. Translators: This is the arrow for "Back" buttons
688#: qml/Wizard/StackButton.qml:39
689#: qml/Wizard/StackButton.qml:39
689#, qt-format
690#, qt-format
po/oc.po+51−50
@@ -7,7 +7,7 @@ msgid ""
7msgstr ""
7msgstr ""
8"Project-Id-Version: unity8\n"
8"Project-Id-Version: unity8\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2015-06-22 12:00+0200\n"
10+"POT-Creation-Date: 2015-07-17 10:10+0200\n"
11"PO-Revision-Date: 2015-02-05 20:35+0000\n"
11"PO-Revision-Date: 2015-02-05 20:35+0000\n"
12"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
12"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
13"Language-Team: Occitan (post 1500) <oc@li.org>\n"
13"Language-Team: Occitan (post 1500) <oc@li.org>\n"
@@ -15,8 +15,8 @@ msgstr ""
15"Content-Type: text/plain; charset=UTF-8\n"
15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n"
16"Content-Transfer-Encoding: 8bit\n"
17"Plural-Forms: nplurals=2; plural=n > 1;\n"
17"Plural-Forms: nplurals=2; plural=n > 1;\n"
18−"X-Launchpad-Export-Date: 2015-07-04 05:37+0000\n"
18+"X-Launchpad-Export-Date: 2015-07-25 05:39+0000\n"
19−"X-Generator: Launchpad (build 17597)\n"
19+"X-Generator: Launchpad (build 17628)\n"
20
20
21#: plugins/LightDM/Greeter.cpp:112
21#: plugins/LightDM/Greeter.cpp:112
22msgid "Password: "
22msgid "Password: "
@@ -223,15 +223,15 @@ msgstr ""
223msgid "OK"
223msgid "OK"
224msgstr ""
224msgstr ""
225
225
226−#: qml/Dash/GenericScopeView.qml:532 qml/Dash/GenericScopeView.qml:690
226+#: qml/Dash/GenericScopeView.qml:539 qml/Dash/GenericScopeView.qml:697
227msgid "See less"
227msgid "See less"
228msgstr ""
228msgstr ""
229
229
230−#: qml/Dash/GenericScopeView.qml:532
230+#: qml/Dash/GenericScopeView.qml:539
231msgid "See all"
231msgid "See all"
232msgstr ""
232msgstr ""
233
233
234−#: qml/Dash/GenericScopeView.qml:594
234+#: qml/Dash/GenericScopeView.qml:601
235msgctxt "Label: Hint for dash search line edit"
235msgctxt "Label: Hint for dash search line edit"
236msgid "Search"
236msgid "Search"
237msgstr ""
237msgstr ""
@@ -315,57 +315,58 @@ msgstr ""
315msgid "Tap to unlock"
315msgid "Tap to unlock"
316msgstr ""
316msgstr ""
317
317
318−#: qml/Greeter/NarrowView.qml:53 qml/Wizard/Pages/passwd-confirm.qml:53
318+#: qml/Greeter/NarrowView.qml:54 qml/Wizard/Pages/passwd-confirm.qml:53
319msgid "Sorry, incorrect passphrase."
319msgid "Sorry, incorrect passphrase."
320msgstr ""
320msgstr ""
321
321
322−#: qml/Greeter/NarrowView.qml:54 qml/Wizard/Pages/passwd-confirm.qml:54
322+#: qml/Greeter/NarrowView.qml:55 qml/Wizard/Pages/passwd-confirm.qml:54
323msgid "Sorry, incorrect passcode."
323msgid "Sorry, incorrect passcode."
324msgstr ""
324msgstr ""
325
325
326−#: qml/Greeter/NarrowView.qml:55
326+#: qml/Greeter/NarrowView.qml:56
327msgid "This will be your last attempt."
327msgid "This will be your last attempt."
328msgstr ""
328msgstr ""
329
329
330−#: qml/Greeter/NarrowView.qml:57
330+#: qml/Greeter/NarrowView.qml:58
331msgid ""
331msgid ""
332"If passphrase is entered incorrectly, your phone will conduct a factory "
332"If passphrase is entered incorrectly, your phone will conduct a factory "
333"reset and all personal data will be deleted."
333"reset and all personal data will be deleted."
334msgstr ""
334msgstr ""
335
335
336−#: qml/Greeter/NarrowView.qml:58
336+#: qml/Greeter/NarrowView.qml:59
337msgid ""
337msgid ""
338"If passcode is entered incorrectly, your phone will conduct a factory reset "
338"If passcode is entered incorrectly, your phone will conduct a factory reset "
339"and all personal data will be deleted."
339"and all personal data will be deleted."
340msgstr ""
340msgstr ""
341
341
342−#: qml/Greeter/NarrowView.qml:115
342+#: qml/Greeter/NarrowView.qml:116
343#, qt-format
343#, qt-format
344msgid "Enter %1"
344msgid "Enter %1"
345msgstr ""
345msgstr ""
346
346
347−#: qml/Greeter/NarrowView.qml:116 qml/Wizard/Pages/passwd-set.qml:60
347+#: qml/Greeter/NarrowView.qml:117 qml/Wizard/Pages/passwd-set.qml:60
348msgid "Enter passphrase"
348msgid "Enter passphrase"
349msgstr ""
349msgstr ""
350
350
351−#: qml/Greeter/NarrowView.qml:117
351+#: qml/Greeter/NarrowView.qml:118
352msgid "Enter passcode"
352msgid "Enter passcode"
353msgstr ""
353msgstr ""
354
354
355−#: qml/Greeter/NarrowView.qml:118
355+#: qml/Greeter/NarrowView.qml:119
356#, qt-format
356#, qt-format
357msgid "Sorry, incorrect %1"
357msgid "Sorry, incorrect %1"
358msgstr ""
358msgstr ""
359
359
360−#: qml/Greeter/NarrowView.qml:119
360+#: qml/Greeter/NarrowView.qml:120
361msgid "Sorry, incorrect passphrase"
361msgid "Sorry, incorrect passphrase"
362msgstr ""
362msgstr ""
363
363
364−#: qml/Greeter/NarrowView.qml:120
364+#: qml/Greeter/NarrowView.qml:121
365+msgctxt "passphrase"
365msgid "Please re-enter"
366msgid "Please re-enter"
366msgstr ""
367msgstr ""
367
368
368−#: qml/Greeter/NarrowView.qml:121
369+#: qml/Greeter/NarrowView.qml:122
369msgid "Sorry, incorrect passcode"
370msgid "Sorry, incorrect passcode"
370msgstr ""
371msgstr ""
371
372
@@ -515,38 +516,6 @@ msgctxt "Button: Go back one page in the Wizard"
515msgid "Back"
516msgid "Back"
516msgstr ""
517msgstr ""
517
518
518−#: qml/Wizard/Pages/here-terms.qml:27
519−msgid "Terms & Conditions"
520−msgstr ""
521−
522−#: qml/Wizard/Pages/passwd-confirm.qml:49
523−msgid "Confirm passphrase"
524−msgstr ""
525−
526−#: qml/Wizard/Pages/passwd-confirm.qml:50
527−msgid "Confirm passcode"
528−msgstr ""
529−
530−#: qml/Wizard/Pages/passwd-confirm.qml:53
531−#: qml/Wizard/Pages/passwd-confirm.qml:54
532−msgid "Please try again."
533−msgstr ""
534−
535−#: qml/Wizard/Pages/passwd-confirm.qml:82 qml/Wizard/Pages/passwd-set.qml:90
536−#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:128
537−#: qml/Wizard/Pages/40-wifi.qml:215 qml/Wizard/Pages/50-location.qml:131
538−#: qml/Wizard/Pages/60-reporting.qml:50
539−msgid "Continue"
540−msgstr ""
541−
542−#: qml/Wizard/Pages/passwd-set.qml:61
543−msgid "Choose your passcode"
544−msgstr ""
545−
546−#: qml/Wizard/Pages/passwd-set.qml:68
547−msgid "Passphrase must be 4 characters long"
548−msgstr ""
549−
550#: qml/Wizard/Pages/10-welcome.qml:27
519#: qml/Wizard/Pages/10-welcome.qml:27
551msgid "Hi!"
520msgid "Hi!"
552msgstr ""
521msgstr ""
@@ -559,6 +528,13 @@ msgstr ""
559msgid "Let’s get started."
528msgid "Let’s get started."
560msgstr ""
529msgstr ""
561
530
531+#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:128
532+#: qml/Wizard/Pages/40-wifi.qml:215 qml/Wizard/Pages/50-location.qml:131
533+#: qml/Wizard/Pages/60-reporting.qml:50 qml/Wizard/Pages/passwd-confirm.qml:82
534+#: qml/Wizard/Pages/passwd-set.qml:90
535+msgid "Continue"
536+msgstr ""
537+
562#: qml/Wizard/Pages/20-sim.qml:25
538#: qml/Wizard/Pages/20-sim.qml:25
563msgid "Add a SIM card and restart your device"
539msgid "Add a SIM card and restart your device"
564msgstr ""
540msgstr ""
@@ -684,6 +660,31 @@ msgstr ""
684msgid "Finish"
660msgid "Finish"
685msgstr ""
661msgstr ""
686
662
663+#: qml/Wizard/Pages/here-terms.qml:27
664+msgid "Terms & Conditions"
665+msgstr ""
666+
667+#: qml/Wizard/Pages/passwd-confirm.qml:49
668+msgid "Confirm passphrase"
669+msgstr ""
670+
671+#: qml/Wizard/Pages/passwd-confirm.qml:50
672+msgid "Confirm passcode"
673+msgstr ""
674+
675+#: qml/Wizard/Pages/passwd-confirm.qml:53
676+#: qml/Wizard/Pages/passwd-confirm.qml:54
677+msgid "Please try again."
678+msgstr ""
679+
680+#: qml/Wizard/Pages/passwd-set.qml:61
681+msgid "Choose your passcode"
682+msgstr ""
683+
684+#: qml/Wizard/Pages/passwd-set.qml:68
685+msgid "Passphrase must be 4 characters long"
686+msgstr ""
687+
687#. Translators: This is the arrow for "Back" buttons
688#. Translators: This is the arrow for "Back" buttons
688#: qml/Wizard/StackButton.qml:39
689#: qml/Wizard/StackButton.qml:39
689#, qt-format
690#, qt-format
po/or.po+51−50
@@ -7,7 +7,7 @@ msgid ""
7msgstr ""
7msgstr ""
8"Project-Id-Version: unity8\n"
8"Project-Id-Version: unity8\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2015-06-22 12:00+0200\n"
10+"POT-Creation-Date: 2015-07-17 10:10+0200\n"
11"PO-Revision-Date: 2015-03-21 05:28+0000\n"
11"PO-Revision-Date: 2015-03-21 05:28+0000\n"
12"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
12"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
13"Language-Team: Oriya <or@li.org>\n"
13"Language-Team: Oriya <or@li.org>\n"
@@ -15,8 +15,8 @@ msgstr ""
15"Content-Type: text/plain; charset=UTF-8\n"
15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n"
16"Content-Transfer-Encoding: 8bit\n"
17"Plural-Forms: nplurals=2; plural=n!=1;\n"
17"Plural-Forms: nplurals=2; plural=n!=1;\n"
18−"X-Launchpad-Export-Date: 2015-07-04 05:37+0000\n"
18+"X-Launchpad-Export-Date: 2015-07-25 05:39+0000\n"
19−"X-Generator: Launchpad (build 17597)\n"
19+"X-Generator: Launchpad (build 17628)\n"
20
20
21#: plugins/LightDM/Greeter.cpp:112
21#: plugins/LightDM/Greeter.cpp:112
22msgid "Password: "
22msgid "Password: "
@@ -223,15 +223,15 @@ msgstr ""
223msgid "OK"
223msgid "OK"
224msgstr ""
224msgstr ""
225
225
226−#: qml/Dash/GenericScopeView.qml:532 qml/Dash/GenericScopeView.qml:690
226+#: qml/Dash/GenericScopeView.qml:539 qml/Dash/GenericScopeView.qml:697
227msgid "See less"
227msgid "See less"
228msgstr ""
228msgstr ""
229
229
230−#: qml/Dash/GenericScopeView.qml:532
230+#: qml/Dash/GenericScopeView.qml:539
231msgid "See all"
231msgid "See all"
232msgstr ""
232msgstr ""
233
233
234−#: qml/Dash/GenericScopeView.qml:594
234+#: qml/Dash/GenericScopeView.qml:601
235msgctxt "Label: Hint for dash search line edit"
235msgctxt "Label: Hint for dash search line edit"
236msgid "Search"
236msgid "Search"
237msgstr ""
237msgstr ""
@@ -315,57 +315,58 @@ msgstr ""
315msgid "Tap to unlock"
315msgid "Tap to unlock"
316msgstr ""
316msgstr ""
317
317
318−#: qml/Greeter/NarrowView.qml:53 qml/Wizard/Pages/passwd-confirm.qml:53
318+#: qml/Greeter/NarrowView.qml:54 qml/Wizard/Pages/passwd-confirm.qml:53
319msgid "Sorry, incorrect passphrase."
319msgid "Sorry, incorrect passphrase."
320msgstr ""
320msgstr ""
321
321
322−#: qml/Greeter/NarrowView.qml:54 qml/Wizard/Pages/passwd-confirm.qml:54
322+#: qml/Greeter/NarrowView.qml:55 qml/Wizard/Pages/passwd-confirm.qml:54
323msgid "Sorry, incorrect passcode."
323msgid "Sorry, incorrect passcode."
324msgstr ""
324msgstr ""
325
325
326−#: qml/Greeter/NarrowView.qml:55
326+#: qml/Greeter/NarrowView.qml:56
327msgid "This will be your last attempt."
327msgid "This will be your last attempt."
328msgstr ""
328msgstr ""
329
329
330−#: qml/Greeter/NarrowView.qml:57
330+#: qml/Greeter/NarrowView.qml:58
331msgid ""
331msgid ""
332"If passphrase is entered incorrectly, your phone will conduct a factory "
332"If passphrase is entered incorrectly, your phone will conduct a factory "
333"reset and all personal data will be deleted."
333"reset and all personal data will be deleted."
334msgstr ""
334msgstr ""
335
335
336−#: qml/Greeter/NarrowView.qml:58
336+#: qml/Greeter/NarrowView.qml:59
337msgid ""
337msgid ""
338"If passcode is entered incorrectly, your phone will conduct a factory reset "
338"If passcode is entered incorrectly, your phone will conduct a factory reset "
339"and all personal data will be deleted."
339"and all personal data will be deleted."
340msgstr ""
340msgstr ""
341
341
342−#: qml/Greeter/NarrowView.qml:115
342+#: qml/Greeter/NarrowView.qml:116
343#, qt-format
343#, qt-format
344msgid "Enter %1"
344msgid "Enter %1"
345msgstr ""
345msgstr ""
346
346
347−#: qml/Greeter/NarrowView.qml:116 qml/Wizard/Pages/passwd-set.qml:60
347+#: qml/Greeter/NarrowView.qml:117 qml/Wizard/Pages/passwd-set.qml:60
348msgid "Enter passphrase"
348msgid "Enter passphrase"
349msgstr ""
349msgstr ""
350
350
351−#: qml/Greeter/NarrowView.qml:117
351+#: qml/Greeter/NarrowView.qml:118
352msgid "Enter passcode"
352msgid "Enter passcode"
353msgstr ""
353msgstr ""
354
354
355−#: qml/Greeter/NarrowView.qml:118
355+#: qml/Greeter/NarrowView.qml:119
356#, qt-format
356#, qt-format
357msgid "Sorry, incorrect %1"
357msgid "Sorry, incorrect %1"
358msgstr ""
358msgstr ""
359
359
360−#: qml/Greeter/NarrowView.qml:119
360+#: qml/Greeter/NarrowView.qml:120
361msgid "Sorry, incorrect passphrase"
361msgid "Sorry, incorrect passphrase"
362msgstr ""
362msgstr ""
363
363
364−#: qml/Greeter/NarrowView.qml:120
364+#: qml/Greeter/NarrowView.qml:121
365+msgctxt "passphrase"
365msgid "Please re-enter"
366msgid "Please re-enter"
366msgstr ""
367msgstr ""
367
368
368−#: qml/Greeter/NarrowView.qml:121
369+#: qml/Greeter/NarrowView.qml:122
369msgid "Sorry, incorrect passcode"
370msgid "Sorry, incorrect passcode"
370msgstr ""
371msgstr ""
371
372
@@ -515,38 +516,6 @@ msgctxt "Button: Go back one page in the Wizard"
515msgid "Back"
516msgid "Back"
516msgstr ""
517msgstr ""
517
518
518−#: qml/Wizard/Pages/here-terms.qml:27
519−msgid "Terms & Conditions"
520−msgstr ""
521−
522−#: qml/Wizard/Pages/passwd-confirm.qml:49
523−msgid "Confirm passphrase"
524−msgstr ""
525−
526−#: qml/Wizard/Pages/passwd-confirm.qml:50
527−msgid "Confirm passcode"
528−msgstr ""
529−
530−#: qml/Wizard/Pages/passwd-confirm.qml:53
531−#: qml/Wizard/Pages/passwd-confirm.qml:54
532−msgid "Please try again."
533−msgstr ""
534−
535−#: qml/Wizard/Pages/passwd-confirm.qml:82 qml/Wizard/Pages/passwd-set.qml:90
536−#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:128
537−#: qml/Wizard/Pages/40-wifi.qml:215 qml/Wizard/Pages/50-location.qml:131
538−#: qml/Wizard/Pages/60-reporting.qml:50
539−msgid "Continue"
540−msgstr ""
541−
542−#: qml/Wizard/Pages/passwd-set.qml:61
543−msgid "Choose your passcode"
544−msgstr ""
545−
546−#: qml/Wizard/Pages/passwd-set.qml:68
547−msgid "Passphrase must be 4 characters long"
548−msgstr ""
549−
550#: qml/Wizard/Pages/10-welcome.qml:27
519#: qml/Wizard/Pages/10-welcome.qml:27
551msgid "Hi!"
520msgid "Hi!"
552msgstr ""
521msgstr ""
@@ -559,6 +528,13 @@ msgstr ""
559msgid "Let’s get started."
528msgid "Let’s get started."
560msgstr ""
529msgstr ""
561
530
531+#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:128
532+#: qml/Wizard/Pages/40-wifi.qml:215 qml/Wizard/Pages/50-location.qml:131
533+#: qml/Wizard/Pages/60-reporting.qml:50 qml/Wizard/Pages/passwd-confirm.qml:82
534+#: qml/Wizard/Pages/passwd-set.qml:90
535+msgid "Continue"
536+msgstr ""
537+
562#: qml/Wizard/Pages/20-sim.qml:25
538#: qml/Wizard/Pages/20-sim.qml:25
563msgid "Add a SIM card and restart your device"
539msgid "Add a SIM card and restart your device"
564msgstr ""
540msgstr ""
@@ -684,6 +660,31 @@ msgstr ""
684msgid "Finish"
660msgid "Finish"
685msgstr ""
661msgstr ""
686
662
663+#: qml/Wizard/Pages/here-terms.qml:27
664+msgid "Terms & Conditions"
665+msgstr ""
666+
667+#: qml/Wizard/Pages/passwd-confirm.qml:49
668+msgid "Confirm passphrase"
669+msgstr ""
670+
671+#: qml/Wizard/Pages/passwd-confirm.qml:50
672+msgid "Confirm passcode"
673+msgstr ""
674+
675+#: qml/Wizard/Pages/passwd-confirm.qml:53
676+#: qml/Wizard/Pages/passwd-confirm.qml:54
677+msgid "Please try again."
678+msgstr ""
679+
680+#: qml/Wizard/Pages/passwd-set.qml:61
681+msgid "Choose your passcode"
682+msgstr ""
683+
684+#: qml/Wizard/Pages/passwd-set.qml:68
685+msgid "Passphrase must be 4 characters long"
686+msgstr ""
687+
687#. Translators: This is the arrow for "Back" buttons
688#. Translators: This is the arrow for "Back" buttons
688#: qml/Wizard/StackButton.qml:39
689#: qml/Wizard/StackButton.qml:39
689#, qt-format
690#, qt-format
po/pa.po+55−51
@@ -7,7 +7,7 @@ msgid ""
7msgstr ""
7msgstr ""
8"Project-Id-Version: unity8\n"
8"Project-Id-Version: unity8\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2015-06-22 12:00+0200\n"
10+"POT-Creation-Date: 2015-07-17 10:10+0200\n"
11"PO-Revision-Date: 2015-04-24 04:29+0000\n"
11"PO-Revision-Date: 2015-04-24 04:29+0000\n"
12"Last-Translator: Gursharnjit_Singh <ubuntuser13@gmail.com>\n"
12"Last-Translator: Gursharnjit_Singh <ubuntuser13@gmail.com>\n"
13"Language-Team: Punjabi <pa@li.org>\n"
13"Language-Team: Punjabi <pa@li.org>\n"
@@ -15,8 +15,8 @@ msgstr ""
15"Content-Type: text/plain; charset=UTF-8\n"
15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n"
16"Content-Transfer-Encoding: 8bit\n"
17"Plural-Forms: nplurals=2; plural=n != 1;\n"
17"Plural-Forms: nplurals=2; plural=n != 1;\n"
18−"X-Launchpad-Export-Date: 2015-07-04 05:37+0000\n"
18+"X-Launchpad-Export-Date: 2015-07-25 05:39+0000\n"
19−"X-Generator: Launchpad (build 17597)\n"
19+"X-Generator: Launchpad (build 17628)\n"
20
20
21#: plugins/LightDM/Greeter.cpp:112
21#: plugins/LightDM/Greeter.cpp:112
22msgid "Password: "
22msgid "Password: "
@@ -225,15 +225,15 @@ msgstr "ਅਪਾਤਕਾਲੀਨ ਕਾਲ"
225msgid "OK"
225msgid "OK"
226msgstr "ਠੀਕ"
226msgstr "ਠੀਕ"
227
227
228−#: qml/Dash/GenericScopeView.qml:532 qml/Dash/GenericScopeView.qml:690
228+#: qml/Dash/GenericScopeView.qml:539 qml/Dash/GenericScopeView.qml:697
229msgid "See less"
229msgid "See less"
230msgstr "ਘੱਟ ਵੇਖੋ"
230msgstr "ਘੱਟ ਵੇਖੋ"
231
231
232−#: qml/Dash/GenericScopeView.qml:532
232+#: qml/Dash/GenericScopeView.qml:539
233msgid "See all"
233msgid "See all"
234msgstr "ਸਾਰਾ ਵੇਖੋ"
234msgstr "ਸਾਰਾ ਵੇਖੋ"
235
235
236−#: qml/Dash/GenericScopeView.qml:594
236+#: qml/Dash/GenericScopeView.qml:601
237msgctxt "Label: Hint for dash search line edit"
237msgctxt "Label: Hint for dash search line edit"
238msgid "Search"
238msgid "Search"
239msgstr "ਖੋਜ"
239msgstr "ਖੋਜ"
@@ -317,19 +317,19 @@ msgstr "ਮੁੜ-ਕੋਸ਼ਿਸ਼"
317msgid "Tap to unlock"
317msgid "Tap to unlock"
318msgstr "ਅਣਲਾਕ ਲਈ ਛੂਹੋ"
318msgstr "ਅਣਲਾਕ ਲਈ ਛੂਹੋ"
319
319
320−#: qml/Greeter/NarrowView.qml:53 qml/Wizard/Pages/passwd-confirm.qml:53
320+#: qml/Greeter/NarrowView.qml:54 qml/Wizard/Pages/passwd-confirm.qml:53
321msgid "Sorry, incorrect passphrase."
321msgid "Sorry, incorrect passphrase."
322msgstr "ਮੁਆਫ਼ੀ, ਗਲਤ ਵਾਕ।"
322msgstr "ਮੁਆਫ਼ੀ, ਗਲਤ ਵਾਕ।"
323
323
324−#: qml/Greeter/NarrowView.qml:54 qml/Wizard/Pages/passwd-confirm.qml:54
324+#: qml/Greeter/NarrowView.qml:55 qml/Wizard/Pages/passwd-confirm.qml:54
325msgid "Sorry, incorrect passcode."
325msgid "Sorry, incorrect passcode."
326msgstr "ਮੁਆਫ਼ੀ, ਗਲਤ ਪਾਸਕੋਡ।"
326msgstr "ਮੁਆਫ਼ੀ, ਗਲਤ ਪਾਸਕੋਡ।"
327
327
328−#: qml/Greeter/NarrowView.qml:55
328+#: qml/Greeter/NarrowView.qml:56
329msgid "This will be your last attempt."
329msgid "This will be your last attempt."
330msgstr "ਇਹ ਤੁਹਾਡੀ ਆਖਰੀ ਕੋਸ਼ਿਸ਼ ਹੋਵੇਗੀ।"
330msgstr "ਇਹ ਤੁਹਾਡੀ ਆਖਰੀ ਕੋਸ਼ਿਸ਼ ਹੋਵੇਗੀ।"
331
331
332−#: qml/Greeter/NarrowView.qml:57
332+#: qml/Greeter/NarrowView.qml:58
333msgid ""
333msgid ""
334"If passphrase is entered incorrectly, your phone will conduct a factory "
334"If passphrase is entered incorrectly, your phone will conduct a factory "
335"reset and all personal data will be deleted."
335"reset and all personal data will be deleted."
@@ -337,7 +337,7 @@ msgstr ""
337"ਜੇਕਰ ਗਲਤ ਵਾਕ ਦਰਜ ਹੋਇਆ, ਤੁਹਾਡਾ ਫ਼ੋਨ ਇੱਕ ਫ਼ੋਨ ਇੱਕ ਫ਼ੈਕਟਰੀ ਰੀਸੈੱਟ ਚਾਲੂ ਕਰੇਗਾ ਅਤੇ "
337"ਜੇਕਰ ਗਲਤ ਵਾਕ ਦਰਜ ਹੋਇਆ, ਤੁਹਾਡਾ ਫ਼ੋਨ ਇੱਕ ਫ਼ੋਨ ਇੱਕ ਫ਼ੈਕਟਰੀ ਰੀਸੈੱਟ ਚਾਲੂ ਕਰੇਗਾ ਅਤੇ "
338"ਸਾਰਾ ਨਿੱਜੀ ਡਾਟਾ ਹਟਾ ਦਿੱਤਾ ਜਾਵੇਗਾ।"
338"ਸਾਰਾ ਨਿੱਜੀ ਡਾਟਾ ਹਟਾ ਦਿੱਤਾ ਜਾਵੇਗਾ।"
339
339
340−#: qml/Greeter/NarrowView.qml:58
340+#: qml/Greeter/NarrowView.qml:59
341msgid ""
341msgid ""
342"If passcode is entered incorrectly, your phone will conduct a factory reset "
342"If passcode is entered incorrectly, your phone will conduct a factory reset "
343"and all personal data will be deleted."
343"and all personal data will be deleted."
@@ -345,33 +345,34 @@ msgstr ""
345"ਜੇਕਰ ਗਲਤ ਪਾਸਕੋਡ ਦਰਜ ਹੋਇਆ, ਤੁਹਾਡਾ ਫ਼ੋਨ ਇੱਕ ਫ਼ੋਨ ਇੱਕ ਫ਼ੈਕਟਰੀ ਰੀਸੈੱਟ ਚਾਲੂ ਕਰੇਗਾ "
345"ਜੇਕਰ ਗਲਤ ਪਾਸਕੋਡ ਦਰਜ ਹੋਇਆ, ਤੁਹਾਡਾ ਫ਼ੋਨ ਇੱਕ ਫ਼ੋਨ ਇੱਕ ਫ਼ੈਕਟਰੀ ਰੀਸੈੱਟ ਚਾਲੂ ਕਰੇਗਾ "
346"ਅਤੇ ਸਾਰਾ ਨਿੱਜੀ ਡਾਟਾ ਹਟਾ ਦਿੱਤਾ ਜਾਵੇਗਾ।"
346"ਅਤੇ ਸਾਰਾ ਨਿੱਜੀ ਡਾਟਾ ਹਟਾ ਦਿੱਤਾ ਜਾਵੇਗਾ।"
347
347
348−#: qml/Greeter/NarrowView.qml:115
348+#: qml/Greeter/NarrowView.qml:116
349#, qt-format
349#, qt-format
350msgid "Enter %1"
350msgid "Enter %1"
351msgstr "ਦਰਜ %1"
351msgstr "ਦਰਜ %1"
352
352
353−#: qml/Greeter/NarrowView.qml:116 qml/Wizard/Pages/passwd-set.qml:60
353+#: qml/Greeter/NarrowView.qml:117 qml/Wizard/Pages/passwd-set.qml:60
354msgid "Enter passphrase"
354msgid "Enter passphrase"
355msgstr "ਵਾਕ ਦਿਓ"
355msgstr "ਵਾਕ ਦਿਓ"
356
356
357−#: qml/Greeter/NarrowView.qml:117
357+#: qml/Greeter/NarrowView.qml:118
358msgid "Enter passcode"
358msgid "Enter passcode"
359msgstr "ਪਾਸਕੋਡ ਦਿਓ"
359msgstr "ਪਾਸਕੋਡ ਦਿਓ"
360
360
361−#: qml/Greeter/NarrowView.qml:118
361+#: qml/Greeter/NarrowView.qml:119
362#, qt-format
362#, qt-format
363msgid "Sorry, incorrect %1"
363msgid "Sorry, incorrect %1"
364msgstr "ਮੁਆਫ਼ੀ, ਗਲਤ %1"
364msgstr "ਮੁਆਫ਼ੀ, ਗਲਤ %1"
365
365
366−#: qml/Greeter/NarrowView.qml:119
366+#: qml/Greeter/NarrowView.qml:120
367msgid "Sorry, incorrect passphrase"
367msgid "Sorry, incorrect passphrase"
368msgstr "ਮੁਆਫ਼ੀ, ਗਲਤ ਵਾਕ"
368msgstr "ਮੁਆਫ਼ੀ, ਗਲਤ ਵਾਕ"
369
369
370−#: qml/Greeter/NarrowView.qml:120
370+#: qml/Greeter/NarrowView.qml:121
371+msgctxt "passphrase"
371msgid "Please re-enter"
372msgid "Please re-enter"
372−msgstr "ਕਿਰਪਾ ਕਰਕੇ ਮੁੜ-ਦਰਜ ਕਰੋ"
373+msgstr ""
373
374
374−#: qml/Greeter/NarrowView.qml:121
375+#: qml/Greeter/NarrowView.qml:122
375msgid "Sorry, incorrect passcode"
376msgid "Sorry, incorrect passcode"
376msgstr "ਮੁਆਫ਼ੀ, ਗਲਤ ਪਾਸਕੋਡ"
377msgstr "ਮੁਆਫ਼ੀ, ਗਲਤ ਪਾਸਕੋਡ"
377
378
@@ -521,38 +522,6 @@ msgctxt "Button: Go back one page in the Wizard"
521msgid "Back"
522msgid "Back"
522msgstr "ਪਿੱਛੇ"
523msgstr "ਪਿੱਛੇ"
523
524
524−#: qml/Wizard/Pages/here-terms.qml:27
525−msgid "Terms & Conditions"
526−msgstr "ਨਿਯਮ ਅਤੇ ਸ਼ਰਤਾਂ"
527−
528−#: qml/Wizard/Pages/passwd-confirm.qml:49
529−msgid "Confirm passphrase"
530−msgstr "ਵਾਕ ਦੀ ਪੁਸ਼ਟੀ ਕਰੋ"
531−
532−#: qml/Wizard/Pages/passwd-confirm.qml:50
533−msgid "Confirm passcode"
534−msgstr "ਪਾਸਕੋਡ ਦੀ ਪੁਸ਼ਟੀ ਕਰੋ"
535−
536−#: qml/Wizard/Pages/passwd-confirm.qml:53
537−#: qml/Wizard/Pages/passwd-confirm.qml:54
538−msgid "Please try again."
539−msgstr "ਕਿਰਪਾ ਕਰਕੇ ਮੁੜ ਕੋਸ਼ਿਸ ਕਰੋ।"
540−
541−#: qml/Wizard/Pages/passwd-confirm.qml:82 qml/Wizard/Pages/passwd-set.qml:90
542−#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:128
543−#: qml/Wizard/Pages/40-wifi.qml:215 qml/Wizard/Pages/50-location.qml:131
544−#: qml/Wizard/Pages/60-reporting.qml:50
545−msgid "Continue"
546−msgstr "ਜਾਰੀ"
547−
548−#: qml/Wizard/Pages/passwd-set.qml:61
549−msgid "Choose your passcode"
550−msgstr "ਆਪਣਾ ਪਾਸਕੋਡ ਚੁਣੋ"
551−
552−#: qml/Wizard/Pages/passwd-set.qml:68
553−msgid "Passphrase must be 4 characters long"
554−msgstr "ਵਾਕ 4 ਅੱਖਰ ਜਿੰਨ੍ਹਾ ਵੱਡਾ ਹੋਣਾ ਚਾਹੀਦਾ"
555−
556#: qml/Wizard/Pages/10-welcome.qml:27
525#: qml/Wizard/Pages/10-welcome.qml:27
557msgid "Hi!"
526msgid "Hi!"
558msgstr "ਹੈਲੋ!"
527msgstr "ਹੈਲੋ!"
@@ -565,6 +534,13 @@ msgstr "ਉਬੰਤੂ ਫ਼ੋਨ ਵਿੱਚ ਤੁਹਾਨੂੰ ਜੀ ਆ
565msgid "Let’s get started."
534msgid "Let’s get started."
566msgstr "ਚਲੋ ਸ਼ੁਰੂ ਕਰੀਏ।"
535msgstr "ਚਲੋ ਸ਼ੁਰੂ ਕਰੀਏ।"
567
536
537+#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:128
538+#: qml/Wizard/Pages/40-wifi.qml:215 qml/Wizard/Pages/50-location.qml:131
539+#: qml/Wizard/Pages/60-reporting.qml:50 qml/Wizard/Pages/passwd-confirm.qml:82
540+#: qml/Wizard/Pages/passwd-set.qml:90
541+msgid "Continue"
542+msgstr "ਜਾਰੀ"
543+
568#: qml/Wizard/Pages/20-sim.qml:25
544#: qml/Wizard/Pages/20-sim.qml:25
569msgid "Add a SIM card and restart your device"
545msgid "Add a SIM card and restart your device"
570msgstr "ਸਿਮ ਕਾਰਡ ਦਾਖਲ ਕਰੋ ਅਤੇ ਜੰਤਰ ਨੂੰ ਮੁੜ-ਚਾਲੂ ਕਰੋ"
546msgstr "ਸਿਮ ਕਾਰਡ ਦਾਖਲ ਕਰੋ ਅਤੇ ਜੰਤਰ ਨੂੰ ਮੁੜ-ਚਾਲੂ ਕਰੋ"
@@ -697,6 +673,31 @@ msgstr "ਤੁਹਾਡਾ ਫ਼ੋਨ ਹੁਣ ਵਰਤੋਂ ਲਈ ਤਿਆ
697msgid "Finish"
673msgid "Finish"
698msgstr "ਮੁਕੰਮਲ"
674msgstr "ਮੁਕੰਮਲ"
699
675
676+#: qml/Wizard/Pages/here-terms.qml:27
677+msgid "Terms & Conditions"
678+msgstr "ਨਿਯਮ ਅਤੇ ਸ਼ਰਤਾਂ"
679+
680+#: qml/Wizard/Pages/passwd-confirm.qml:49
681+msgid "Confirm passphrase"
682+msgstr "ਵਾਕ ਦੀ ਪੁਸ਼ਟੀ ਕਰੋ"
683+
684+#: qml/Wizard/Pages/passwd-confirm.qml:50
685+msgid "Confirm passcode"
686+msgstr "ਪਾਸਕੋਡ ਦੀ ਪੁਸ਼ਟੀ ਕਰੋ"
687+
688+#: qml/Wizard/Pages/passwd-confirm.qml:53
689+#: qml/Wizard/Pages/passwd-confirm.qml:54
690+msgid "Please try again."
691+msgstr "ਕਿਰਪਾ ਕਰਕੇ ਮੁੜ ਕੋਸ਼ਿਸ ਕਰੋ।"
692+
693+#: qml/Wizard/Pages/passwd-set.qml:61
694+msgid "Choose your passcode"
695+msgstr "ਆਪਣਾ ਪਾਸਕੋਡ ਚੁਣੋ"
696+
697+#: qml/Wizard/Pages/passwd-set.qml:68
698+msgid "Passphrase must be 4 characters long"
699+msgstr "ਵਾਕ 4 ਅੱਖਰ ਜਿੰਨ੍ਹਾ ਵੱਡਾ ਹੋਣਾ ਚਾਹੀਦਾ"
700+
700#. Translators: This is the arrow for "Back" buttons
701#. Translators: This is the arrow for "Back" buttons
701#: qml/Wizard/StackButton.qml:39
702#: qml/Wizard/StackButton.qml:39
702#, qt-format
703#, qt-format
@@ -744,3 +745,6 @@ msgstr "%1 〉"
744
745
745#~ msgid "Search"
746#~ msgid "Search"
746#~ msgstr "ਖੋਜ"
747#~ msgstr "ਖੋਜ"
748+
749+#~ msgid "Please re-enter"
750+#~ msgstr "ਕਿਰਪਾ ਕਰਕੇ ਮੁੜ-ਦਰਜ ਕਰੋ"
po/pl.po+55−51
@@ -7,7 +7,7 @@ msgid ""
7msgstr ""
7msgstr ""
8"Project-Id-Version: unity\n"
8"Project-Id-Version: unity\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2015-06-22 12:00+0200\n"
10+"POT-Creation-Date: 2015-07-17 10:10+0200\n"
11"PO-Revision-Date: 2015-07-12 09:46+0000\n"
11"PO-Revision-Date: 2015-07-12 09:46+0000\n"
12"Last-Translator: Seweryn Opyd <Unknown>\n"
12"Last-Translator: Seweryn Opyd <Unknown>\n"
13"Language-Team: Polish <pl@li.org>\n"
13"Language-Team: Polish <pl@li.org>\n"
@@ -16,8 +16,8 @@ msgstr ""
16"Content-Transfer-Encoding: 8bit\n"
16"Content-Transfer-Encoding: 8bit\n"
17"Plural-Forms: nplurals=3; plural=n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
17"Plural-Forms: nplurals=3; plural=n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
18"|| n%100>=20) ? 1 : 2;\n"
18"|| n%100>=20) ? 1 : 2;\n"
19−"X-Launchpad-Export-Date: 2015-07-13 05:36+0000\n"
19+"X-Launchpad-Export-Date: 2015-07-25 05:39+0000\n"
20−"X-Generator: Launchpad (build 17620)\n"
20+"X-Generator: Launchpad (build 17628)\n"
21
21
22#: plugins/LightDM/Greeter.cpp:112
22#: plugins/LightDM/Greeter.cpp:112
23msgid "Password: "
23msgid "Password: "
@@ -226,15 +226,15 @@ msgstr "Telefon ratunkowy"
226msgid "OK"
226msgid "OK"
227msgstr "OK"
227msgstr "OK"
228
228
229−#: qml/Dash/GenericScopeView.qml:532 qml/Dash/GenericScopeView.qml:690
229+#: qml/Dash/GenericScopeView.qml:539 qml/Dash/GenericScopeView.qml:697
230msgid "See less"
230msgid "See less"
231msgstr "Zobacz mniej"
231msgstr "Zobacz mniej"
232
232
233−#: qml/Dash/GenericScopeView.qml:532
233+#: qml/Dash/GenericScopeView.qml:539
234msgid "See all"
234msgid "See all"
235msgstr "Zobacz wszystko"
235msgstr "Zobacz wszystko"
236
236
237−#: qml/Dash/GenericScopeView.qml:594
237+#: qml/Dash/GenericScopeView.qml:601
238msgctxt "Label: Hint for dash search line edit"
238msgctxt "Label: Hint for dash search line edit"
239msgid "Search"
239msgid "Search"
240msgstr "Szukaj"
240msgstr "Szukaj"
@@ -318,19 +318,19 @@ msgstr "Ponów"
318msgid "Tap to unlock"
318msgid "Tap to unlock"
319msgstr "Dotknij, by odblokować"
319msgstr "Dotknij, by odblokować"
320
320
321−#: qml/Greeter/NarrowView.qml:53 qml/Wizard/Pages/passwd-confirm.qml:53
321+#: qml/Greeter/NarrowView.qml:54 qml/Wizard/Pages/passwd-confirm.qml:53
322msgid "Sorry, incorrect passphrase."
322msgid "Sorry, incorrect passphrase."
323msgstr "Niestety, błędne hasło"
323msgstr "Niestety, błędne hasło"
324
324
325−#: qml/Greeter/NarrowView.qml:54 qml/Wizard/Pages/passwd-confirm.qml:54
325+#: qml/Greeter/NarrowView.qml:55 qml/Wizard/Pages/passwd-confirm.qml:54
326msgid "Sorry, incorrect passcode."
326msgid "Sorry, incorrect passcode."
327msgstr "Niestety, błędny kod"
327msgstr "Niestety, błędny kod"
328
328
329−#: qml/Greeter/NarrowView.qml:55
329+#: qml/Greeter/NarrowView.qml:56
330msgid "This will be your last attempt."
330msgid "This will be your last attempt."
331msgstr "To już jest ostatnia próba."
331msgstr "To już jest ostatnia próba."
332
332
333−#: qml/Greeter/NarrowView.qml:57
333+#: qml/Greeter/NarrowView.qml:58
334msgid ""
334msgid ""
335"If passphrase is entered incorrectly, your phone will conduct a factory "
335"If passphrase is entered incorrectly, your phone will conduct a factory "
336"reset and all personal data will be deleted."
336"reset and all personal data will be deleted."
@@ -338,7 +338,7 @@ msgstr ""
338"Jeśli zostanie wprowadzone błędne hasło, telefon przywróci ustawienia "
338"Jeśli zostanie wprowadzone błędne hasło, telefon przywróci ustawienia "
339"fabryczne i wszystkie dane osobiste zostaną usunięte."
339"fabryczne i wszystkie dane osobiste zostaną usunięte."
340
340
341−#: qml/Greeter/NarrowView.qml:58
341+#: qml/Greeter/NarrowView.qml:59
342msgid ""
342msgid ""
343"If passcode is entered incorrectly, your phone will conduct a factory reset "
343"If passcode is entered incorrectly, your phone will conduct a factory reset "
344"and all personal data will be deleted."
344"and all personal data will be deleted."
@@ -346,33 +346,34 @@ msgstr ""
346"Jeśli zostanie wprowadzony błędny kod, telefon przywróci ustawienia "
346"Jeśli zostanie wprowadzony błędny kod, telefon przywróci ustawienia "
347"fabryczne i wszystkie dane osobiste zostaną usunięte."
347"fabryczne i wszystkie dane osobiste zostaną usunięte."
348
348
349−#: qml/Greeter/NarrowView.qml:115
349+#: qml/Greeter/NarrowView.qml:116
350#, qt-format
350#, qt-format
351msgid "Enter %1"
351msgid "Enter %1"
352msgstr "Wprowadź %1"
352msgstr "Wprowadź %1"
353
353
354−#: qml/Greeter/NarrowView.qml:116 qml/Wizard/Pages/passwd-set.qml:60
354+#: qml/Greeter/NarrowView.qml:117 qml/Wizard/Pages/passwd-set.qml:60
355msgid "Enter passphrase"
355msgid "Enter passphrase"
356msgstr "Wprowadź hasło"
356msgstr "Wprowadź hasło"
357
357
358−#: qml/Greeter/NarrowView.qml:117
358+#: qml/Greeter/NarrowView.qml:118
359msgid "Enter passcode"
359msgid "Enter passcode"
360msgstr "Podaj kod"
360msgstr "Podaj kod"
361
361
362−#: qml/Greeter/NarrowView.qml:118
362+#: qml/Greeter/NarrowView.qml:119
363#, qt-format
363#, qt-format
364msgid "Sorry, incorrect %1"
364msgid "Sorry, incorrect %1"
365msgstr "Niestety niepoprawne %1"
365msgstr "Niestety niepoprawne %1"
366
366
367−#: qml/Greeter/NarrowView.qml:119
367+#: qml/Greeter/NarrowView.qml:120
368msgid "Sorry, incorrect passphrase"
368msgid "Sorry, incorrect passphrase"
369msgstr "Niestety, błędne hasło"
369msgstr "Niestety, błędne hasło"
370
370
371−#: qml/Greeter/NarrowView.qml:120
371+#: qml/Greeter/NarrowView.qml:121
372+msgctxt "passphrase"
372msgid "Please re-enter"
373msgid "Please re-enter"
373−msgstr "Proszę wprowadź ponownie"
374+msgstr ""
374
375
375−#: qml/Greeter/NarrowView.qml:121
376+#: qml/Greeter/NarrowView.qml:122
376msgid "Sorry, incorrect passcode"
377msgid "Sorry, incorrect passcode"
377msgstr "Niestety ten kod nie jest poprawny"
378msgstr "Niestety ten kod nie jest poprawny"
378
379
@@ -525,38 +526,6 @@ msgctxt "Button: Go back one page in the Wizard"
525msgid "Back"
526msgid "Back"
526msgstr "Powrót"
527msgstr "Powrót"
527
528
528−#: qml/Wizard/Pages/here-terms.qml:27
529−msgid "Terms & Conditions"
530−msgstr "Zasady i warunki"
531−
532−#: qml/Wizard/Pages/passwd-confirm.qml:49
533−msgid "Confirm passphrase"
534−msgstr "Potwierdź hasło"
535−
536−#: qml/Wizard/Pages/passwd-confirm.qml:50
537−msgid "Confirm passcode"
538−msgstr "Potwierdź kod"
539−
540−#: qml/Wizard/Pages/passwd-confirm.qml:53
541−#: qml/Wizard/Pages/passwd-confirm.qml:54
542−msgid "Please try again."
543−msgstr "Proszę spróbować ponownie."
544−
545−#: qml/Wizard/Pages/passwd-confirm.qml:82 qml/Wizard/Pages/passwd-set.qml:90
546−#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:128
547−#: qml/Wizard/Pages/40-wifi.qml:215 qml/Wizard/Pages/50-location.qml:131
548−#: qml/Wizard/Pages/60-reporting.qml:50
549−msgid "Continue"
550−msgstr "Kontynuuj"
551−
552−#: qml/Wizard/Pages/passwd-set.qml:61
553−msgid "Choose your passcode"
554−msgstr "Wybierz kod"
555−
556−#: qml/Wizard/Pages/passwd-set.qml:68
557−msgid "Passphrase must be 4 characters long"
558−msgstr "Hasło musi składać się z 4 znaków"
559−
560#: qml/Wizard/Pages/10-welcome.qml:27
529#: qml/Wizard/Pages/10-welcome.qml:27
561msgid "Hi!"
530msgid "Hi!"
562msgstr "Witaj!"
531msgstr "Witaj!"
@@ -569,6 +538,13 @@ msgstr "Witamy w telefonie z systemem Ubuntu."
569msgid "Let’s get started."
538msgid "Let’s get started."
570msgstr "Zaczynajmy."
539msgstr "Zaczynajmy."
571
540
541+#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:128
542+#: qml/Wizard/Pages/40-wifi.qml:215 qml/Wizard/Pages/50-location.qml:131
543+#: qml/Wizard/Pages/60-reporting.qml:50 qml/Wizard/Pages/passwd-confirm.qml:82
544+#: qml/Wizard/Pages/passwd-set.qml:90
545+msgid "Continue"
546+msgstr "Kontynuuj"
547+
572#: qml/Wizard/Pages/20-sim.qml:25
548#: qml/Wizard/Pages/20-sim.qml:25
573msgid "Add a SIM card and restart your device"
549msgid "Add a SIM card and restart your device"
574msgstr "Włóż kartę SIM i uruchom urządzenie ponownie"
550msgstr "Włóż kartę SIM i uruchom urządzenie ponownie"
@@ -701,6 +677,31 @@ msgstr "Twoje urządzenie jest gotowe do pracy"
701msgid "Finish"
677msgid "Finish"
702msgstr "Zakończ"
678msgstr "Zakończ"
703
679
680+#: qml/Wizard/Pages/here-terms.qml:27
681+msgid "Terms & Conditions"
682+msgstr "Zasady i warunki"
683+
684+#: qml/Wizard/Pages/passwd-confirm.qml:49
685+msgid "Confirm passphrase"
686+msgstr "Potwierdź hasło"
687+
688+#: qml/Wizard/Pages/passwd-confirm.qml:50
689+msgid "Confirm passcode"
690+msgstr "Potwierdź kod"
691+
692+#: qml/Wizard/Pages/passwd-confirm.qml:53
693+#: qml/Wizard/Pages/passwd-confirm.qml:54
694+msgid "Please try again."
695+msgstr "Proszę spróbować ponownie."
696+
697+#: qml/Wizard/Pages/passwd-set.qml:61
698+msgid "Choose your passcode"
699+msgstr "Wybierz kod"
700+
701+#: qml/Wizard/Pages/passwd-set.qml:68
702+msgid "Passphrase must be 4 characters long"
703+msgstr "Hasło musi składać się z 4 znaków"
704+
704#. Translators: This is the arrow for "Back" buttons
705#. Translators: This is the arrow for "Back" buttons
705#: qml/Wizard/StackButton.qml:39
706#: qml/Wizard/StackButton.qml:39
706#, qt-format
707#, qt-format
@@ -793,3 +794,6 @@ msgstr "%1 〉"
793
794
794#~ msgid "Settings"
795#~ msgid "Settings"
795#~ msgstr "Ustawienia"
796#~ msgstr "Ustawienia"
797+
798+#~ msgid "Please re-enter"
799+#~ msgstr "Proszę wprowadź ponownie"
po/pt.po+73−69
@@ -7,16 +7,16 @@ msgid ""
7msgstr ""
7msgstr ""
8"Project-Id-Version: unity8\n"
8"Project-Id-Version: unity8\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2015-06-22 12:00+0200\n"
10+"POT-Creation-Date: 2015-07-17 10:10+0200\n"
11−"PO-Revision-Date: 2015-07-16 12:23+0000\n"
11+"PO-Revision-Date: 2015-07-29 10:01+0000\n"
12−"Last-Translator: João Fernandes <Unknown>\n"
12+"Last-Translator: Ivo Xavier <ivofernandes12@gmail.com>\n"
13"Language-Team: Portuguese <pt@li.org>\n"
13"Language-Team: Portuguese <pt@li.org>\n"
14"MIME-Version: 1.0\n"
14"MIME-Version: 1.0\n"
15"Content-Type: text/plain; charset=UTF-8\n"
15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n"
16"Content-Transfer-Encoding: 8bit\n"
17"Plural-Forms: nplurals=2; plural=n != 1;\n"
17"Plural-Forms: nplurals=2; plural=n != 1;\n"
18−"X-Launchpad-Export-Date: 2015-07-17 05:37+0000\n"
18+"X-Launchpad-Export-Date: 2015-07-30 06:14+0000\n"
19−"X-Generator: Launchpad (build 17628)\n"
19+"X-Generator: Launchpad (build 17646)\n"
20
20
21#: plugins/LightDM/Greeter.cpp:112
21#: plugins/LightDM/Greeter.cpp:112
22msgid "Password: "
22msgid "Password: "
@@ -44,7 +44,7 @@ msgstr "Ontem %l:%M %p"
44#. en_US example: "%l:%M %p" --> "1:00 PM"
44#. en_US example: "%l:%M %p" --> "1:00 PM"
45#: plugins/Utils/relativetimeformatter.cpp:164
45#: plugins/Utils/relativetimeformatter.cpp:164
46msgid "%l:%M %p"
46msgid "%l:%M %p"
47−msgstr ""
47+msgstr "%l:%M %p"
48
48
49#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
49#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
50#. This format string is used for showing, on a 12-hour clock, events/appointments that happen tomorrow.
50#. This format string is used for showing, on a 12-hour clock, events/appointments that happen tomorrow.
@@ -60,7 +60,7 @@ msgstr "Amanhã %l:%M %p"
60#. en_US example: "%a\u2003%l:%M %p" --> "Fri 1:00 PM"
60#. en_US example: "%a\u2003%l:%M %p" --> "Fri 1:00 PM"
61#: plugins/Utils/relativetimeformatter.cpp:181
61#: plugins/Utils/relativetimeformatter.cpp:181
62msgid "%a %l:%M %p"
62msgid "%a %l:%M %p"
63−msgstr ""
63+msgstr "%a %l:%M %p"
64
64
65#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
65#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
66#. This format string is used for showing, on a 12-hour clock, times that happened before a week from now.
66#. This format string is used for showing, on a 12-hour clock, times that happened before a week from now.
@@ -69,7 +69,7 @@ msgstr ""
69#. en_GB example: "%a %b %d\u2003%l:%M %p" --> "Fri 31 Oct 1:00 PM"
69#. en_GB example: "%a %b %d\u2003%l:%M %p" --> "Fri 31 Oct 1:00 PM"
70#: plugins/Utils/relativetimeformatter.cpp:190
70#: plugins/Utils/relativetimeformatter.cpp:190
71msgid "%a %d %b %l:%M %p"
71msgid "%a %d %b %l:%M %p"
72−msgstr ""
72+msgstr "%a %b %d %l:%M %p"
73
73
74#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
74#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
75#. This format string is used for showing, on a 24-hour clock, times that happen yesterday.
75#. This format string is used for showing, on a 24-hour clock, times that happen yesterday.
@@ -84,7 +84,7 @@ msgstr "Ontem %H:%M"
84#. en_US example: "%H:%M" --> "13:00"
84#. en_US example: "%H:%M" --> "13:00"
85#: plugins/Utils/relativetimeformatter.cpp:208
85#: plugins/Utils/relativetimeformatter.cpp:208
86msgid "%H:%M"
86msgid "%H:%M"
87−msgstr ""
87+msgstr "%H:%M"
88
88
89#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
89#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
90#. This format string is used for showing, on a 24-hour clock, events/appointments that happen tomorrow.
90#. This format string is used for showing, on a 24-hour clock, events/appointments that happen tomorrow.
@@ -100,7 +100,7 @@ msgstr "Amanhã %H:%M"
100#. en_US example: "%a\u2003%H:%M" --> "Fri 13:00"
100#. en_US example: "%a\u2003%H:%M" --> "Fri 13:00"
101#: plugins/Utils/relativetimeformatter.cpp:225
101#: plugins/Utils/relativetimeformatter.cpp:225
102msgid "%a %H:%M"
102msgid "%a %H:%M"
103−msgstr ""
103+msgstr "%a %H:%M"
104
104
105#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
105#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
106#. This format string is used for showing, on a 24-hour clock, times that happened before a week from now.
106#. This format string is used for showing, on a 24-hour clock, times that happened before a week from now.
@@ -109,7 +109,7 @@ msgstr ""
109#. en_GB example: "%a %b %d\u2003%H:%M" --> "Fri 31 Oct 13:00"
109#. en_GB example: "%a %b %d\u2003%H:%M" --> "Fri 31 Oct 13:00"
110#: plugins/Utils/relativetimeformatter.cpp:234
110#: plugins/Utils/relativetimeformatter.cpp:234
111msgid "%a %d %b %H:%M"
111msgid "%a %d %b %H:%M"
112−msgstr ""
112+msgstr "%a %b %d %H:%M"
113
113
114#: qml/Components/DelayedLockscreen.qml:49
114#: qml/Components/DelayedLockscreen.qml:49
115msgid "Device Locked"
115msgid "Device Locked"
@@ -229,15 +229,15 @@ msgstr "Chamada de emergência"
229msgid "OK"
229msgid "OK"
230msgstr "OK"
230msgstr "OK"
231
231
232−#: qml/Dash/GenericScopeView.qml:532 qml/Dash/GenericScopeView.qml:690
232+#: qml/Dash/GenericScopeView.qml:539 qml/Dash/GenericScopeView.qml:697
233msgid "See less"
233msgid "See less"
234msgstr "Ver menos"
234msgstr "Ver menos"
235
235
236−#: qml/Dash/GenericScopeView.qml:532
236+#: qml/Dash/GenericScopeView.qml:539
237msgid "See all"
237msgid "See all"
238msgstr "Ver todos"
238msgstr "Ver todos"
239
239
240−#: qml/Dash/GenericScopeView.qml:594
240+#: qml/Dash/GenericScopeView.qml:601
241msgctxt "Label: Hint for dash search line edit"
241msgctxt "Label: Hint for dash search line edit"
242msgid "Search"
242msgid "Search"
243msgstr "Procurar"
243msgstr "Procurar"
@@ -321,19 +321,19 @@ msgstr "Tentar novamente"
321msgid "Tap to unlock"
321msgid "Tap to unlock"
322msgstr "Toque para desbloquear"
322msgstr "Toque para desbloquear"
323
323
324−#: qml/Greeter/NarrowView.qml:53 qml/Wizard/Pages/passwd-confirm.qml:53
324+#: qml/Greeter/NarrowView.qml:54 qml/Wizard/Pages/passwd-confirm.qml:53
325msgid "Sorry, incorrect passphrase."
325msgid "Sorry, incorrect passphrase."
326msgstr "Desculpe, frase de acesso incorreta."
326msgstr "Desculpe, frase de acesso incorreta."
327
327
328−#: qml/Greeter/NarrowView.qml:54 qml/Wizard/Pages/passwd-confirm.qml:54
328+#: qml/Greeter/NarrowView.qml:55 qml/Wizard/Pages/passwd-confirm.qml:54
329msgid "Sorry, incorrect passcode."
329msgid "Sorry, incorrect passcode."
330msgstr "Código incorreto."
330msgstr "Código incorreto."
331
331
332−#: qml/Greeter/NarrowView.qml:55
332+#: qml/Greeter/NarrowView.qml:56
333msgid "This will be your last attempt."
333msgid "This will be your last attempt."
334msgstr "Esta será a sua última tentativa."
334msgstr "Esta será a sua última tentativa."
335
335
336−#: qml/Greeter/NarrowView.qml:57
336+#: qml/Greeter/NarrowView.qml:58
337msgid ""
337msgid ""
338"If passphrase is entered incorrectly, your phone will conduct a factory "
338"If passphrase is entered incorrectly, your phone will conduct a factory "
339"reset and all personal data will be deleted."
339"reset and all personal data will be deleted."
@@ -341,7 +341,7 @@ msgstr ""
341"Se a frase de acesso for introduzida incorretamente, o seu telemóvel vai "
341"Se a frase de acesso for introduzida incorretamente, o seu telemóvel vai "
342"proceder ao restauro de fábrica e apagará toda a sua informação pessoal."
342"proceder ao restauro de fábrica e apagará toda a sua informação pessoal."
343
343
344−#: qml/Greeter/NarrowView.qml:58
344+#: qml/Greeter/NarrowView.qml:59
345msgid ""
345msgid ""
346"If passcode is entered incorrectly, your phone will conduct a factory reset "
346"If passcode is entered incorrectly, your phone will conduct a factory reset "
347"and all personal data will be deleted."
347"and all personal data will be deleted."
@@ -349,33 +349,34 @@ msgstr ""
349"Se o código não for introduzido corretamente, todos os dados pessoais do seu "
349"Se o código não for introduzido corretamente, todos os dados pessoais do seu "
350"telemóvel serão apagados."
350"telemóvel serão apagados."
351
351
352−#: qml/Greeter/NarrowView.qml:115
352+#: qml/Greeter/NarrowView.qml:116
353#, qt-format
353#, qt-format
354msgid "Enter %1"
354msgid "Enter %1"
355msgstr "Introduziu %1"
355msgstr "Introduziu %1"
356
356
357−#: qml/Greeter/NarrowView.qml:116 qml/Wizard/Pages/passwd-set.qml:60
357+#: qml/Greeter/NarrowView.qml:117 qml/Wizard/Pages/passwd-set.qml:60
358msgid "Enter passphrase"
358msgid "Enter passphrase"
359msgstr "Indique a palavra-passe"
359msgstr "Indique a palavra-passe"
360
360
361−#: qml/Greeter/NarrowView.qml:117
361+#: qml/Greeter/NarrowView.qml:118
362msgid "Enter passcode"
362msgid "Enter passcode"
363msgstr "Introduza o código"
363msgstr "Introduza o código"
364
364
365−#: qml/Greeter/NarrowView.qml:118
365+#: qml/Greeter/NarrowView.qml:119
366#, qt-format
366#, qt-format
367msgid "Sorry, incorrect %1"
367msgid "Sorry, incorrect %1"
368msgstr "Desculpe, incorreto %1"
368msgstr "Desculpe, incorreto %1"
369
369
370−#: qml/Greeter/NarrowView.qml:119
370+#: qml/Greeter/NarrowView.qml:120
371msgid "Sorry, incorrect passphrase"
371msgid "Sorry, incorrect passphrase"
372msgstr "Palavra-passe incorreta"
372msgstr "Palavra-passe incorreta"
373
373
374−#: qml/Greeter/NarrowView.qml:120
374+#: qml/Greeter/NarrowView.qml:121
375+msgctxt "passphrase"
375msgid "Please re-enter"
376msgid "Please re-enter"
376msgstr "Por favor, volte a introduzir"
377msgstr "Por favor, volte a introduzir"
377
378
378−#: qml/Greeter/NarrowView.qml:121
379+#: qml/Greeter/NarrowView.qml:122
379msgid "Sorry, incorrect passcode"
380msgid "Sorry, incorrect passcode"
380msgstr "Código incorreto"
381msgstr "Código incorreto"
381
382
@@ -406,25 +407,25 @@ msgstr[1] "%1 horas"
406#, qt-format
407#, qt-format
407msgid "%1 minute"
408msgid "%1 minute"
408msgid_plural "%1 minutes"
409msgid_plural "%1 minutes"
409−msgstr[0] ""
410+msgstr[0] "%1 minuto"
410−msgstr[1] ""
411+msgstr[1] "%1 minutos"
411
412
412#: qml/Panel/Indicators/MenuItemFactory.qml:777
413#: qml/Panel/Indicators/MenuItemFactory.qml:777
413#, qt-format
414#, qt-format
414msgid "%1 second"
415msgid "%1 second"
415msgid_plural "%1 seconds"
416msgid_plural "%1 seconds"
416−msgstr[0] ""
417+msgstr[0] "%1 segundo"
417−msgstr[1] ""
418+msgstr[1] "%1 segundos"
418
419
419#: qml/Panel/Indicators/MenuItemFactory.qml:780
420#: qml/Panel/Indicators/MenuItemFactory.qml:780
420msgid "0 seconds"
421msgid "0 seconds"
421−msgstr ""
422+msgstr "0 segundos"
422
423
423#. Translators: String like "1 hour, 2 minutes, 3 seconds remaining"
424#. Translators: String like "1 hour, 2 minutes, 3 seconds remaining"
424#: qml/Panel/Indicators/MenuItemFactory.qml:782
425#: qml/Panel/Indicators/MenuItemFactory.qml:782
425#, qt-format
426#, qt-format
426msgid "%1 remaining"
427msgid "%1 remaining"
427−msgstr ""
428+msgstr "Falta %1"
428
429
429#: qml/Panel/Indicators/MenuItemFactory.qml:788
430#: qml/Panel/Indicators/MenuItemFactory.qml:788
430msgid "In queue…"
431msgid "In queue…"
@@ -525,38 +526,6 @@ msgctxt "Button: Go back one page in the Wizard"
525msgid "Back"
526msgid "Back"
526msgstr "Retroceder"
527msgstr "Retroceder"
527
528
528−#: qml/Wizard/Pages/here-terms.qml:27
529−msgid "Terms & Conditions"
530−msgstr "Termos e Condições"
531−
532−#: qml/Wizard/Pages/passwd-confirm.qml:49
533−msgid "Confirm passphrase"
534−msgstr "Confirmar a palavra-passe"
535−
536−#: qml/Wizard/Pages/passwd-confirm.qml:50
537−msgid "Confirm passcode"
538−msgstr "Confirmar código"
539−
540−#: qml/Wizard/Pages/passwd-confirm.qml:53
541−#: qml/Wizard/Pages/passwd-confirm.qml:54
542−msgid "Please try again."
543−msgstr "Por favor, tente novamente."
544−
545−#: qml/Wizard/Pages/passwd-confirm.qml:82 qml/Wizard/Pages/passwd-set.qml:90
546−#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:128
547−#: qml/Wizard/Pages/40-wifi.qml:215 qml/Wizard/Pages/50-location.qml:131
548−#: qml/Wizard/Pages/60-reporting.qml:50
549−msgid "Continue"
550−msgstr "Avançar"
551−
552−#: qml/Wizard/Pages/passwd-set.qml:61
553−msgid "Choose your passcode"
554−msgstr "Escolha o seu código"
555−
556−#: qml/Wizard/Pages/passwd-set.qml:68
557−msgid "Passphrase must be 4 characters long"
558−msgstr "A palavra-passe tem de conter no mínimo 4 caracteres"
559−
560#: qml/Wizard/Pages/10-welcome.qml:27
529#: qml/Wizard/Pages/10-welcome.qml:27
561msgid "Hi!"
530msgid "Hi!"
562msgstr "Olá!"
531msgstr "Olá!"
@@ -569,6 +538,13 @@ msgstr "Bem-vindo ao seu telemóvel Ubuntu."
569msgid "Let’s get started."
538msgid "Let’s get started."
570msgstr "Vamos começar!"
539msgstr "Vamos começar!"
571
540
541+#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:128
542+#: qml/Wizard/Pages/40-wifi.qml:215 qml/Wizard/Pages/50-location.qml:131
543+#: qml/Wizard/Pages/60-reporting.qml:50 qml/Wizard/Pages/passwd-confirm.qml:82
544+#: qml/Wizard/Pages/passwd-set.qml:90
545+msgid "Continue"
546+msgstr "Avançar"
547+
572#: qml/Wizard/Pages/20-sim.qml:25
548#: qml/Wizard/Pages/20-sim.qml:25
573msgid "Add a SIM card and restart your device"
549msgid "Add a SIM card and restart your device"
574msgstr "Adicione o cartão SIM e reinicie o seu dispositivo"
550msgstr "Adicione o cartão SIM e reinicie o seu dispositivo"
@@ -638,11 +614,11 @@ msgstr "Localização"
638
614
639#: qml/Wizard/Pages/50-location.qml:62
615#: qml/Wizard/Pages/50-location.qml:62
640msgid "Let the phone detect your location:"
616msgid "Let the phone detect your location:"
641−msgstr "Deixe o telemóvel detetar a sua localização:"
617+msgstr "Permitir que o telemóvel o localize:"
642
618
643#: qml/Wizard/Pages/50-location.qml:69
619#: qml/Wizard/Pages/50-location.qml:69
644msgid "Using GPS only (less accurate)"
620msgid "Using GPS only (less accurate)"
645−msgstr "Usar apenas GPS (menos preciso)"
621+msgstr "Utilizando apenas o GPS (menos preciso)"
646
622
647#: qml/Wizard/Pages/50-location.qml:86
623#: qml/Wizard/Pages/50-location.qml:86
648msgid "Using GPS, anonymized Wi-Fi and cellular network info (recommended)"
624msgid "Using GPS, anonymized Wi-Fi and cellular network info (recommended)"
@@ -654,8 +630,8 @@ msgid ""
654"By selecting this option you agree to the Nokia HERE <a href='#'>terms and "
630"By selecting this option you agree to the Nokia HERE <a href='#'>terms and "
655"conditions</a>."
631"conditions</a>."
656msgstr ""
632msgstr ""
657−"Ao selecionar esta opção concorda com os <a href='#'>termos e "
633+"Ao selecionar esta opção concorda com os <a href='#'>termos e condições</a> "
658−"conditições</a> do Nokia HERE."
634+"do Nokia HERE."
659
635
660#: qml/Wizard/Pages/50-location.qml:112
636#: qml/Wizard/Pages/50-location.qml:112
661msgid "Not at all"
637msgid "Not at all"
@@ -683,7 +659,7 @@ msgid ""
683"Privacy</b>"
659"Privacy</b>"
684msgstr ""
660msgstr ""
685"Isto pode ser desligado nas <b>Definições do Sistema</b> debaixo da "
661"Isto pode ser desligado nas <b>Definições do Sistema</b> debaixo da "
686−"<b>Segurança &amp; Privacidade</b>"
662+"<b>Segurança eamp; Privacidade</b>"
687
663
688#: qml/Wizard/Pages/80-finished.qml:24
664#: qml/Wizard/Pages/80-finished.qml:24
689msgid "All done"
665msgid "All done"
@@ -701,6 +677,31 @@ msgstr "O seu telemóvel está pronto."
701msgid "Finish"
677msgid "Finish"
702msgstr "Concluir"
678msgstr "Concluir"
703
679
680+#: qml/Wizard/Pages/here-terms.qml:27
681+msgid "Terms & Conditions"
682+msgstr "Termos e Condições"
683+
684+#: qml/Wizard/Pages/passwd-confirm.qml:49
685+msgid "Confirm passphrase"
686+msgstr "Confirmar a palavra-passe"
687+
688+#: qml/Wizard/Pages/passwd-confirm.qml:50
689+msgid "Confirm passcode"
690+msgstr "Confirmar código"
691+
692+#: qml/Wizard/Pages/passwd-confirm.qml:53
693+#: qml/Wizard/Pages/passwd-confirm.qml:54
694+msgid "Please try again."
695+msgstr "Por favor, tente novamente."
696+
697+#: qml/Wizard/Pages/passwd-set.qml:61
698+msgid "Choose your passcode"
699+msgstr "Escolha o seu código"
700+
701+#: qml/Wizard/Pages/passwd-set.qml:68
702+msgid "Passphrase must be 4 characters long"
703+msgstr "A palavra-passe tem de conter no mínimo 4 caracteres"
704+
704#. Translators: This is the arrow for "Back" buttons
705#. Translators: This is the arrow for "Back" buttons
705#: qml/Wizard/StackButton.qml:39
706#: qml/Wizard/StackButton.qml:39
706#, qt-format
707#, qt-format
@@ -785,6 +786,9 @@ msgstr "%1 〉"
785#~ msgid "Manage Scopes"
786#~ msgid "Manage Scopes"
786#~ msgstr "Gerir Scopes"
787#~ msgstr "Gerir Scopes"
787
788
789+#~ msgid "Please re-enter"
790+#~ msgstr "Por favor, volte a introduzir"
791+
788#~ msgid "Try swiping from the top edge to access the indicators"
792#~ msgid "Try swiping from the top edge to access the indicators"
789#~ msgstr "Tente deslizar da margem superior para aceder aos indicadores"
793#~ msgstr "Tente deslizar da margem superior para aceder aos indicadores"
790
794
po/pt_BR.po+55−51
@@ -7,7 +7,7 @@ msgid ""
7msgstr ""
7msgstr ""
8"Project-Id-Version: unity\n"
8"Project-Id-Version: unity\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2015-06-22 12:00+0200\n"
10+"POT-Creation-Date: 2015-07-17 10:10+0200\n"
11"PO-Revision-Date: 2015-05-04 21:50+0000\n"
11"PO-Revision-Date: 2015-05-04 21:50+0000\n"
12"Last-Translator: Tiago Hillebrandt <tiagohillebrandt@gmail.com>\n"
12"Last-Translator: Tiago Hillebrandt <tiagohillebrandt@gmail.com>\n"
13"Language-Team: Brazilian Portuguese <pt_BR@li.org>\n"
13"Language-Team: Brazilian Portuguese <pt_BR@li.org>\n"
@@ -15,8 +15,8 @@ msgstr ""
15"Content-Type: text/plain; charset=UTF-8\n"
15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n"
16"Content-Transfer-Encoding: 8bit\n"
17"Plural-Forms: nplurals=2; plural=n > 1;\n"
17"Plural-Forms: nplurals=2; plural=n > 1;\n"
18−"X-Launchpad-Export-Date: 2015-07-04 05:37+0000\n"
18+"X-Launchpad-Export-Date: 2015-07-25 05:39+0000\n"
19−"X-Generator: Launchpad (build 17597)\n"
19+"X-Generator: Launchpad (build 17628)\n"
20
20
21#: plugins/LightDM/Greeter.cpp:112
21#: plugins/LightDM/Greeter.cpp:112
22msgid "Password: "
22msgid "Password: "
@@ -227,15 +227,15 @@ msgstr "Chamada de emergência"
227msgid "OK"
227msgid "OK"
228msgstr "OK"
228msgstr "OK"
229
229
230−#: qml/Dash/GenericScopeView.qml:532 qml/Dash/GenericScopeView.qml:690
230+#: qml/Dash/GenericScopeView.qml:539 qml/Dash/GenericScopeView.qml:697
231msgid "See less"
231msgid "See less"
232msgstr "Ver menos"
232msgstr "Ver menos"
233
233
234−#: qml/Dash/GenericScopeView.qml:532
234+#: qml/Dash/GenericScopeView.qml:539
235msgid "See all"
235msgid "See all"
236msgstr "Ver todos"
236msgstr "Ver todos"
237
237
238−#: qml/Dash/GenericScopeView.qml:594
238+#: qml/Dash/GenericScopeView.qml:601
239msgctxt "Label: Hint for dash search line edit"
239msgctxt "Label: Hint for dash search line edit"
240msgid "Search"
240msgid "Search"
241msgstr "Pesquisar"
241msgstr "Pesquisar"
@@ -319,19 +319,19 @@ msgstr "Repetir"
319msgid "Tap to unlock"
319msgid "Tap to unlock"
320msgstr "Toque para desbloquear"
320msgstr "Toque para desbloquear"
321
321
322−#: qml/Greeter/NarrowView.qml:53 qml/Wizard/Pages/passwd-confirm.qml:53
322+#: qml/Greeter/NarrowView.qml:54 qml/Wizard/Pages/passwd-confirm.qml:53
323msgid "Sorry, incorrect passphrase."
323msgid "Sorry, incorrect passphrase."
324msgstr "Desculpe, senha incorreta."
324msgstr "Desculpe, senha incorreta."
325
325
326−#: qml/Greeter/NarrowView.qml:54 qml/Wizard/Pages/passwd-confirm.qml:54
326+#: qml/Greeter/NarrowView.qml:55 qml/Wizard/Pages/passwd-confirm.qml:54
327msgid "Sorry, incorrect passcode."
327msgid "Sorry, incorrect passcode."
328msgstr "Desculpe, código de acesso incorreto."
328msgstr "Desculpe, código de acesso incorreto."
329
329
330−#: qml/Greeter/NarrowView.qml:55
330+#: qml/Greeter/NarrowView.qml:56
331msgid "This will be your last attempt."
331msgid "This will be your last attempt."
332msgstr "Esta será a sua última tentativa."
332msgstr "Esta será a sua última tentativa."
333
333
334−#: qml/Greeter/NarrowView.qml:57
334+#: qml/Greeter/NarrowView.qml:58
335msgid ""
335msgid ""
336"If passphrase is entered incorrectly, your phone will conduct a factory "
336"If passphrase is entered incorrectly, your phone will conduct a factory "
337"reset and all personal data will be deleted."
337"reset and all personal data will be deleted."
@@ -339,7 +339,7 @@ msgstr ""
339"Se a senha for digitada incorretamente, o telefone será restaurado aos "
339"Se a senha for digitada incorretamente, o telefone será restaurado aos "
340"padrões de fábrica e todos os dados pessoais serão apagados."
340"padrões de fábrica e todos os dados pessoais serão apagados."
341
341
342−#: qml/Greeter/NarrowView.qml:58
342+#: qml/Greeter/NarrowView.qml:59
343msgid ""
343msgid ""
344"If passcode is entered incorrectly, your phone will conduct a factory reset "
344"If passcode is entered incorrectly, your phone will conduct a factory reset "
345"and all personal data will be deleted."
345"and all personal data will be deleted."
@@ -347,33 +347,34 @@ msgstr ""
347"Se o código de acesso for digitado incorretamente, o telefone será "
347"Se o código de acesso for digitado incorretamente, o telefone será "
348"restaurado aos padrões de fábrica e todos os dados pessoais serão apagados."
348"restaurado aos padrões de fábrica e todos os dados pessoais serão apagados."
349
349
350−#: qml/Greeter/NarrowView.qml:115
350+#: qml/Greeter/NarrowView.qml:116
351#, qt-format
351#, qt-format
352msgid "Enter %1"
352msgid "Enter %1"
353msgstr "Digite %1"
353msgstr "Digite %1"
354
354
355−#: qml/Greeter/NarrowView.qml:116 qml/Wizard/Pages/passwd-set.qml:60
355+#: qml/Greeter/NarrowView.qml:117 qml/Wizard/Pages/passwd-set.qml:60
356msgid "Enter passphrase"
356msgid "Enter passphrase"
357msgstr "Digite a frase secreta"
357msgstr "Digite a frase secreta"
358
358
359−#: qml/Greeter/NarrowView.qml:117
359+#: qml/Greeter/NarrowView.qml:118
360msgid "Enter passcode"
360msgid "Enter passcode"
361msgstr "Informe sua senha"
361msgstr "Informe sua senha"
362
362
363−#: qml/Greeter/NarrowView.qml:118
363+#: qml/Greeter/NarrowView.qml:119
364#, qt-format
364#, qt-format
365msgid "Sorry, incorrect %1"
365msgid "Sorry, incorrect %1"
366msgstr "Desculpe, %1 incorreto"
366msgstr "Desculpe, %1 incorreto"
367
367
368−#: qml/Greeter/NarrowView.qml:119
368+#: qml/Greeter/NarrowView.qml:120
369msgid "Sorry, incorrect passphrase"
369msgid "Sorry, incorrect passphrase"
370msgstr "Desculpe, senha incorreta"
370msgstr "Desculpe, senha incorreta"
371
371
372−#: qml/Greeter/NarrowView.qml:120
372+#: qml/Greeter/NarrowView.qml:121
373+msgctxt "passphrase"
373msgid "Please re-enter"
374msgid "Please re-enter"
374−msgstr "Por favor, digite novamente"
375+msgstr ""
375
376
376−#: qml/Greeter/NarrowView.qml:121
377+#: qml/Greeter/NarrowView.qml:122
377msgid "Sorry, incorrect passcode"
378msgid "Sorry, incorrect passcode"
378msgstr "Desculpe, senha incorreta"
379msgstr "Desculpe, senha incorreta"
379
380
@@ -523,38 +524,6 @@ msgctxt "Button: Go back one page in the Wizard"
523msgid "Back"
524msgid "Back"
524msgstr "Voltar"
525msgstr "Voltar"
525
526
526−#: qml/Wizard/Pages/here-terms.qml:27
527−msgid "Terms & Conditions"
528−msgstr "Termos e condições"
529−
530−#: qml/Wizard/Pages/passwd-confirm.qml:49
531−msgid "Confirm passphrase"
532−msgstr "Confirmar frase secreta"
533−
534−#: qml/Wizard/Pages/passwd-confirm.qml:50
535−msgid "Confirm passcode"
536−msgstr "Confirmar código secreto"
537−
538−#: qml/Wizard/Pages/passwd-confirm.qml:53
539−#: qml/Wizard/Pages/passwd-confirm.qml:54
540−msgid "Please try again."
541−msgstr "Por favor, tente novamente."
542−
543−#: qml/Wizard/Pages/passwd-confirm.qml:82 qml/Wizard/Pages/passwd-set.qml:90
544−#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:128
545−#: qml/Wizard/Pages/40-wifi.qml:215 qml/Wizard/Pages/50-location.qml:131
546−#: qml/Wizard/Pages/60-reporting.qml:50
547−msgid "Continue"
548−msgstr "Continuar"
549−
550−#: qml/Wizard/Pages/passwd-set.qml:61
551−msgid "Choose your passcode"
552−msgstr "Escolha seu código secreto"
553−
554−#: qml/Wizard/Pages/passwd-set.qml:68
555−msgid "Passphrase must be 4 characters long"
556−msgstr "A frase secreta deve possuir 4 caracteres"
557−
558#: qml/Wizard/Pages/10-welcome.qml:27
527#: qml/Wizard/Pages/10-welcome.qml:27
559msgid "Hi!"
528msgid "Hi!"
560msgstr "Olá!"
529msgstr "Olá!"
@@ -567,6 +536,13 @@ msgstr "Bem-vindo ao seu Ubuntu phone."
567msgid "Let’s get started."
536msgid "Let’s get started."
568msgstr "Vamos começar."
537msgstr "Vamos começar."
569
538
539+#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:128
540+#: qml/Wizard/Pages/40-wifi.qml:215 qml/Wizard/Pages/50-location.qml:131
541+#: qml/Wizard/Pages/60-reporting.qml:50 qml/Wizard/Pages/passwd-confirm.qml:82
542+#: qml/Wizard/Pages/passwd-set.qml:90
543+msgid "Continue"
544+msgstr "Continuar"
545+
570#: qml/Wizard/Pages/20-sim.qml:25
546#: qml/Wizard/Pages/20-sim.qml:25
571msgid "Add a SIM card and restart your device"
547msgid "Add a SIM card and restart your device"
572msgstr "Adicione um cartão SIM e reinicie o seu dispositivo"
548msgstr "Adicione um cartão SIM e reinicie o seu dispositivo"
@@ -701,6 +677,31 @@ msgstr "O seu telefone está pronto para uso."
701msgid "Finish"
677msgid "Finish"
702msgstr "Terminar"
678msgstr "Terminar"
703
679
680+#: qml/Wizard/Pages/here-terms.qml:27
681+msgid "Terms & Conditions"
682+msgstr "Termos e condições"
683+
684+#: qml/Wizard/Pages/passwd-confirm.qml:49
685+msgid "Confirm passphrase"
686+msgstr "Confirmar frase secreta"
687+
688+#: qml/Wizard/Pages/passwd-confirm.qml:50
689+msgid "Confirm passcode"
690+msgstr "Confirmar código secreto"
691+
692+#: qml/Wizard/Pages/passwd-confirm.qml:53
693+#: qml/Wizard/Pages/passwd-confirm.qml:54
694+msgid "Please try again."
695+msgstr "Por favor, tente novamente."
696+
697+#: qml/Wizard/Pages/passwd-set.qml:61
698+msgid "Choose your passcode"
699+msgstr "Escolha seu código secreto"
700+
701+#: qml/Wizard/Pages/passwd-set.qml:68
702+msgid "Passphrase must be 4 characters long"
703+msgstr "A frase secreta deve possuir 4 caracteres"
704+
704#. Translators: This is the arrow for "Back" buttons
705#. Translators: This is the arrow for "Back" buttons
705#: qml/Wizard/StackButton.qml:39
706#: qml/Wizard/StackButton.qml:39
706#, qt-format
707#, qt-format
@@ -805,3 +806,6 @@ msgstr "%1 〉"
805
806
806#~ msgid "Manage Scopes"
807#~ msgid "Manage Scopes"
807#~ msgstr "Gerenciar Plugins"
808#~ msgstr "Gerenciar Plugins"
809+
810+#~ msgid "Please re-enter"
811+#~ msgstr "Por favor, digite novamente"
po/ro.po+55−51
@@ -7,7 +7,7 @@ msgid ""
7msgstr ""
7msgstr ""
8"Project-Id-Version: unity\n"
8"Project-Id-Version: unity\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2015-06-22 12:00+0200\n"
10+"POT-Creation-Date: 2015-07-17 10:10+0200\n"
11"PO-Revision-Date: 2015-07-06 17:47+0000\n"
11"PO-Revision-Date: 2015-07-06 17:47+0000\n"
12"Last-Translator: Meriuță Cornel <meriutacornel@neacornel.eu>\n"
12"Last-Translator: Meriuță Cornel <meriutacornel@neacornel.eu>\n"
13"Language-Team: Romanian <ro@li.org>\n"
13"Language-Team: Romanian <ro@li.org>\n"
@@ -16,8 +16,8 @@ msgstr ""
16"Content-Transfer-Encoding: 8bit\n"
16"Content-Transfer-Encoding: 8bit\n"
17"Plural-Forms: nplurals=3; plural=(n == 1 ? 0: (((n % 100 > 19) || ((n % 100 "
17"Plural-Forms: nplurals=3; plural=(n == 1 ? 0: (((n % 100 > 19) || ((n % 100 "
18"== 0) && (n != 0))) ? 2: 1));\n"
18"== 0) && (n != 0))) ? 2: 1));\n"
19−"X-Launchpad-Export-Date: 2015-07-07 05:40+0000\n"
19+"X-Launchpad-Export-Date: 2015-07-25 05:39+0000\n"
20−"X-Generator: Launchpad (build 17597)\n"
20+"X-Generator: Launchpad (build 17628)\n"
21
21
22#: plugins/LightDM/Greeter.cpp:112
22#: plugins/LightDM/Greeter.cpp:112
23msgid "Password: "
23msgid "Password: "
@@ -230,15 +230,15 @@ msgstr "Apel de urgență"
230msgid "OK"
230msgid "OK"
231msgstr "În regulă"
231msgstr "În regulă"
232
232
233−#: qml/Dash/GenericScopeView.qml:532 qml/Dash/GenericScopeView.qml:690
233+#: qml/Dash/GenericScopeView.qml:539 qml/Dash/GenericScopeView.qml:697
234msgid "See less"
234msgid "See less"
235msgstr "Afișează mai puține"
235msgstr "Afișează mai puține"
236
236
237−#: qml/Dash/GenericScopeView.qml:532
237+#: qml/Dash/GenericScopeView.qml:539
238msgid "See all"
238msgid "See all"
239msgstr "Afișează tot"
239msgstr "Afișează tot"
240
240
241−#: qml/Dash/GenericScopeView.qml:594
241+#: qml/Dash/GenericScopeView.qml:601
242msgctxt "Label: Hint for dash search line edit"
242msgctxt "Label: Hint for dash search line edit"
243msgid "Search"
243msgid "Search"
244msgstr "Căutare"
244msgstr "Căutare"
@@ -322,19 +322,19 @@ msgstr "Reîncercați"
322msgid "Tap to unlock"
322msgid "Tap to unlock"
323msgstr "Apasă pentru deblocare"
323msgstr "Apasă pentru deblocare"
324
324
325−#: qml/Greeter/NarrowView.qml:53 qml/Wizard/Pages/passwd-confirm.qml:53
325+#: qml/Greeter/NarrowView.qml:54 qml/Wizard/Pages/passwd-confirm.qml:53
326msgid "Sorry, incorrect passphrase."
326msgid "Sorry, incorrect passphrase."
327msgstr "Frază parolă greșită"
327msgstr "Frază parolă greșită"
328
328
329−#: qml/Greeter/NarrowView.qml:54 qml/Wizard/Pages/passwd-confirm.qml:54
329+#: qml/Greeter/NarrowView.qml:55 qml/Wizard/Pages/passwd-confirm.qml:54
330msgid "Sorry, incorrect passcode."
330msgid "Sorry, incorrect passcode."
331msgstr "Parolă greșită"
331msgstr "Parolă greșită"
332
332
333−#: qml/Greeter/NarrowView.qml:55
333+#: qml/Greeter/NarrowView.qml:56
334msgid "This will be your last attempt."
334msgid "This will be your last attempt."
335msgstr "Aceasta va fi ultima încercare"
335msgstr "Aceasta va fi ultima încercare"
336
336
337−#: qml/Greeter/NarrowView.qml:57
337+#: qml/Greeter/NarrowView.qml:58
338msgid ""
338msgid ""
339"If passphrase is entered incorrectly, your phone will conduct a factory "
339"If passphrase is entered incorrectly, your phone will conduct a factory "
340"reset and all personal data will be deleted."
340"reset and all personal data will be deleted."
@@ -343,7 +343,7 @@ msgstr ""
343"configurările inițiale, ale fabricantului, iar toate datele personale vor fi "
343"configurările inițiale, ale fabricantului, iar toate datele personale vor fi "
344"șterse."
344"șterse."
345
345
346−#: qml/Greeter/NarrowView.qml:58
346+#: qml/Greeter/NarrowView.qml:59
347msgid ""
347msgid ""
348"If passcode is entered incorrectly, your phone will conduct a factory reset "
348"If passcode is entered incorrectly, your phone will conduct a factory reset "
349"and all personal data will be deleted."
349"and all personal data will be deleted."
@@ -352,33 +352,34 @@ msgstr ""
352"configurările inițiale, ale fabricantului, iar toate datele personale vor fi "
352"configurările inițiale, ale fabricantului, iar toate datele personale vor fi "
353"șterse."
353"șterse."
354
354
355−#: qml/Greeter/NarrowView.qml:115
355+#: qml/Greeter/NarrowView.qml:116
356#, qt-format
356#, qt-format
357msgid "Enter %1"
357msgid "Enter %1"
358msgstr "Introducere %1"
358msgstr "Introducere %1"
359
359
360−#: qml/Greeter/NarrowView.qml:116 qml/Wizard/Pages/passwd-set.qml:60
360+#: qml/Greeter/NarrowView.qml:117 qml/Wizard/Pages/passwd-set.qml:60
361msgid "Enter passphrase"
361msgid "Enter passphrase"
362msgstr "Introduceți fraza parolă"
362msgstr "Introduceți fraza parolă"
363
363
364−#: qml/Greeter/NarrowView.qml:117
364+#: qml/Greeter/NarrowView.qml:118
365msgid "Enter passcode"
365msgid "Enter passcode"
366msgstr "Introduceți parola"
366msgstr "Introduceți parola"
367
367
368−#: qml/Greeter/NarrowView.qml:118
368+#: qml/Greeter/NarrowView.qml:119
369#, qt-format
369#, qt-format
370msgid "Sorry, incorrect %1"
370msgid "Sorry, incorrect %1"
371msgstr "%1 incorectă"
371msgstr "%1 incorectă"
372
372
373−#: qml/Greeter/NarrowView.qml:119
373+#: qml/Greeter/NarrowView.qml:120
374msgid "Sorry, incorrect passphrase"
374msgid "Sorry, incorrect passphrase"
375msgstr "Frază secretă incorectă"
375msgstr "Frază secretă incorectă"
376
376
377−#: qml/Greeter/NarrowView.qml:120
377+#: qml/Greeter/NarrowView.qml:121
378+msgctxt "passphrase"
378msgid "Please re-enter"
379msgid "Please re-enter"
379−msgstr "Introduceți din nou"
380+msgstr ""
380
381
381−#: qml/Greeter/NarrowView.qml:121
382+#: qml/Greeter/NarrowView.qml:122
382msgid "Sorry, incorrect passcode"
383msgid "Sorry, incorrect passcode"
383msgstr "Parolă incorectă"
384msgstr "Parolă incorectă"
384
385
@@ -531,38 +532,6 @@ msgctxt "Button: Go back one page in the Wizard"
531msgid "Back"
532msgid "Back"
532msgstr "Înapoi"
533msgstr "Înapoi"
533
534
534−#: qml/Wizard/Pages/here-terms.qml:27
535−msgid "Terms & Conditions"
536−msgstr "Termeni și condiții"
537−
538−#: qml/Wizard/Pages/passwd-confirm.qml:49
539−msgid "Confirm passphrase"
540−msgstr "Confirmați frază parolă"
541−
542−#: qml/Wizard/Pages/passwd-confirm.qml:50
543−msgid "Confirm passcode"
544−msgstr "Confirmați codul de acces"
545−
546−#: qml/Wizard/Pages/passwd-confirm.qml:53
547−#: qml/Wizard/Pages/passwd-confirm.qml:54
548−msgid "Please try again."
549−msgstr "Vă rugăm să încercați din nou."
550−
551−#: qml/Wizard/Pages/passwd-confirm.qml:82 qml/Wizard/Pages/passwd-set.qml:90
552−#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:128
553−#: qml/Wizard/Pages/40-wifi.qml:215 qml/Wizard/Pages/50-location.qml:131
554−#: qml/Wizard/Pages/60-reporting.qml:50
555−msgid "Continue"
556−msgstr "Continuare"
557−
558−#: qml/Wizard/Pages/passwd-set.qml:61
559−msgid "Choose your passcode"
560−msgstr "Alegeți codul dumneavoastră de acces"
561−
562−#: qml/Wizard/Pages/passwd-set.qml:68
563−msgid "Passphrase must be 4 characters long"
564−msgstr "Codul de acces trebuie să conțină 4 caractere"
565−
566#: qml/Wizard/Pages/10-welcome.qml:27
535#: qml/Wizard/Pages/10-welcome.qml:27
567msgid "Hi!"
536msgid "Hi!"
568msgstr "Salut!"
537msgstr "Salut!"
@@ -575,6 +544,13 @@ msgstr "Bun venit! Acesta este telefonul dumneavoastră Ubuntu."
575msgid "Let’s get started."
544msgid "Let’s get started."
576msgstr "Să începem."
545msgstr "Să începem."
577
546
547+#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:128
548+#: qml/Wizard/Pages/40-wifi.qml:215 qml/Wizard/Pages/50-location.qml:131
549+#: qml/Wizard/Pages/60-reporting.qml:50 qml/Wizard/Pages/passwd-confirm.qml:82
550+#: qml/Wizard/Pages/passwd-set.qml:90
551+msgid "Continue"
552+msgstr "Continuare"
553+
578#: qml/Wizard/Pages/20-sim.qml:25
554#: qml/Wizard/Pages/20-sim.qml:25
579msgid "Add a SIM card and restart your device"
555msgid "Add a SIM card and restart your device"
580msgstr "Adăugați un card SIM și reporniți dispozitivul dumneavoastră"
556msgstr "Adăugați un card SIM și reporniți dispozitivul dumneavoastră"
@@ -711,6 +687,31 @@ msgstr "Telefonul dumneavoastră este gata de utilizare."
711msgid "Finish"
687msgid "Finish"
712msgstr "Sfârșit"
688msgstr "Sfârșit"
713
689
690+#: qml/Wizard/Pages/here-terms.qml:27
691+msgid "Terms & Conditions"
692+msgstr "Termeni și condiții"
693+
694+#: qml/Wizard/Pages/passwd-confirm.qml:49
695+msgid "Confirm passphrase"
696+msgstr "Confirmați frază parolă"
697+
698+#: qml/Wizard/Pages/passwd-confirm.qml:50
699+msgid "Confirm passcode"
700+msgstr "Confirmați codul de acces"
701+
702+#: qml/Wizard/Pages/passwd-confirm.qml:53
703+#: qml/Wizard/Pages/passwd-confirm.qml:54
704+msgid "Please try again."
705+msgstr "Vă rugăm să încercați din nou."
706+
707+#: qml/Wizard/Pages/passwd-set.qml:61
708+msgid "Choose your passcode"
709+msgstr "Alegeți codul dumneavoastră de acces"
710+
711+#: qml/Wizard/Pages/passwd-set.qml:68
712+msgid "Passphrase must be 4 characters long"
713+msgstr "Codul de acces trebuie să conțină 4 caractere"
714+
714#. Translators: This is the arrow for "Back" buttons
715#. Translators: This is the arrow for "Back" buttons
715#: qml/Wizard/StackButton.qml:39
716#: qml/Wizard/StackButton.qml:39
716#, qt-format
717#, qt-format
@@ -816,3 +817,6 @@ msgstr "%1 〉"
816
817
817#~ msgid "Manage Scopes"
818#~ msgid "Manage Scopes"
818#~ msgstr "Administrare domenii"
819#~ msgstr "Administrare domenii"
820+
821+#~ msgid "Please re-enter"
822+#~ msgstr "Introduceți din nou"
po/ru.po+55−51
@@ -7,7 +7,7 @@ msgid ""
7msgstr ""
7msgstr ""
8"Project-Id-Version: unity\n"
8"Project-Id-Version: unity\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2015-06-22 12:00+0200\n"
10+"POT-Creation-Date: 2015-07-17 10:10+0200\n"
11"PO-Revision-Date: 2015-07-06 05:33+0000\n"
11"PO-Revision-Date: 2015-07-06 05:33+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"
@@ -16,8 +16,8 @@ msgstr ""
16"Content-Transfer-Encoding: 8bit\n"
16"Content-Transfer-Encoding: 8bit\n"
17"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
17"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
18"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
18"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
19−"X-Launchpad-Export-Date: 2015-07-07 05:40+0000\n"
19+"X-Launchpad-Export-Date: 2015-07-25 05:39+0000\n"
20−"X-Generator: Launchpad (build 17597)\n"
20+"X-Generator: Launchpad (build 17628)\n"
21
21
22#: plugins/LightDM/Greeter.cpp:112
22#: plugins/LightDM/Greeter.cpp:112
23msgid "Password: "
23msgid "Password: "
@@ -229,15 +229,15 @@ msgstr "Экстренный вызов"
229msgid "OK"
229msgid "OK"
230msgstr "ОК"
230msgstr "ОК"
231
231
232−#: qml/Dash/GenericScopeView.qml:532 qml/Dash/GenericScopeView.qml:690
232+#: qml/Dash/GenericScopeView.qml:539 qml/Dash/GenericScopeView.qml:697
233msgid "See less"
233msgid "See less"
234msgstr "Вкратце"
234msgstr "Вкратце"
235
235
236−#: qml/Dash/GenericScopeView.qml:532
236+#: qml/Dash/GenericScopeView.qml:539
237msgid "See all"
237msgid "See all"
238msgstr "Показать всё"
238msgstr "Показать всё"
239
239
240−#: qml/Dash/GenericScopeView.qml:594
240+#: qml/Dash/GenericScopeView.qml:601
241msgctxt "Label: Hint for dash search line edit"
241msgctxt "Label: Hint for dash search line edit"
242msgid "Search"
242msgid "Search"
243msgstr "Поиск"
243msgstr "Поиск"
@@ -321,19 +321,19 @@ msgstr "Повторить"
321msgid "Tap to unlock"
321msgid "Tap to unlock"
322msgstr "Нажмите для разблокировки"
322msgstr "Нажмите для разблокировки"
323
323
324−#: qml/Greeter/NarrowView.qml:53 qml/Wizard/Pages/passwd-confirm.qml:53
324+#: qml/Greeter/NarrowView.qml:54 qml/Wizard/Pages/passwd-confirm.qml:53
325msgid "Sorry, incorrect passphrase."
325msgid "Sorry, incorrect passphrase."
326msgstr "Неверная ключевая фраза."
326msgstr "Неверная ключевая фраза."
327
327
328−#: qml/Greeter/NarrowView.qml:54 qml/Wizard/Pages/passwd-confirm.qml:54
328+#: qml/Greeter/NarrowView.qml:55 qml/Wizard/Pages/passwd-confirm.qml:54
329msgid "Sorry, incorrect passcode."
329msgid "Sorry, incorrect passcode."
330msgstr "Неверный секретный код."
330msgstr "Неверный секретный код."
331
331
332−#: qml/Greeter/NarrowView.qml:55
332+#: qml/Greeter/NarrowView.qml:56
333msgid "This will be your last attempt."
333msgid "This will be your last attempt."
334msgstr "Осталась последняя попытка."
334msgstr "Осталась последняя попытка."
335
335
336−#: qml/Greeter/NarrowView.qml:57
336+#: qml/Greeter/NarrowView.qml:58
337msgid ""
337msgid ""
338"If passphrase is entered incorrectly, your phone will conduct a factory "
338"If passphrase is entered incorrectly, your phone will conduct a factory "
339"reset and all personal data will be deleted."
339"reset and all personal data will be deleted."
@@ -341,7 +341,7 @@ msgstr ""
341"Если ключевая фраза будет введена неверно, то телефон вернётся к заводским "
341"Если ключевая фраза будет введена неверно, то телефон вернётся к заводским "
342"настройкам, а все личные данные будут удалены."
342"настройкам, а все личные данные будут удалены."
343
343
344−#: qml/Greeter/NarrowView.qml:58
344+#: qml/Greeter/NarrowView.qml:59
345msgid ""
345msgid ""
346"If passcode is entered incorrectly, your phone will conduct a factory reset "
346"If passcode is entered incorrectly, your phone will conduct a factory reset "
347"and all personal data will be deleted."
347"and all personal data will be deleted."
@@ -349,33 +349,34 @@ msgstr ""
349"Если секретный код будет введен неверно, то телефон вернётся к заводским "
349"Если секретный код будет введен неверно, то телефон вернётся к заводским "
350"настройкам, а все личные данные будут удалены."
350"настройкам, а все личные данные будут удалены."
351
351
352−#: qml/Greeter/NarrowView.qml:115
352+#: qml/Greeter/NarrowView.qml:116
353#, qt-format
353#, qt-format
354msgid "Enter %1"
354msgid "Enter %1"
355msgstr "Введите %1"
355msgstr "Введите %1"
356
356
357−#: qml/Greeter/NarrowView.qml:116 qml/Wizard/Pages/passwd-set.qml:60
357+#: qml/Greeter/NarrowView.qml:117 qml/Wizard/Pages/passwd-set.qml:60
358msgid "Enter passphrase"
358msgid "Enter passphrase"
359msgstr "Введите кодовую фразу"
359msgstr "Введите кодовую фразу"
360
360
361−#: qml/Greeter/NarrowView.qml:117
361+#: qml/Greeter/NarrowView.qml:118
362msgid "Enter passcode"
362msgid "Enter passcode"
363msgstr "Введите секретный код"
363msgstr "Введите секретный код"
364
364
365−#: qml/Greeter/NarrowView.qml:118
365+#: qml/Greeter/NarrowView.qml:119
366#, qt-format
366#, qt-format
367msgid "Sorry, incorrect %1"
367msgid "Sorry, incorrect %1"
368msgstr "Некорректный ввод %1"
368msgstr "Некорректный ввод %1"
369
369
370−#: qml/Greeter/NarrowView.qml:119
370+#: qml/Greeter/NarrowView.qml:120
371msgid "Sorry, incorrect passphrase"
371msgid "Sorry, incorrect passphrase"
372msgstr "Введена неверная кодовая фраза"
372msgstr "Введена неверная кодовая фраза"
373
373
374−#: qml/Greeter/NarrowView.qml:120
374+#: qml/Greeter/NarrowView.qml:121
375+msgctxt "passphrase"
375msgid "Please re-enter"
376msgid "Please re-enter"
376−msgstr "Повторите ввод"
377+msgstr ""
377
378
378−#: qml/Greeter/NarrowView.qml:121
379+#: qml/Greeter/NarrowView.qml:122
379msgid "Sorry, incorrect passcode"
380msgid "Sorry, incorrect passcode"
380msgstr "Секретный код введён неверно"
381msgstr "Секретный код введён неверно"
381
382
@@ -528,38 +529,6 @@ msgctxt "Button: Go back one page in the Wizard"
528msgid "Back"
529msgid "Back"
529msgstr "Назад"
530msgstr "Назад"
530
531
531−#: qml/Wizard/Pages/here-terms.qml:27
532−msgid "Terms & Conditions"
533−msgstr "Условия использования"
534−
535−#: qml/Wizard/Pages/passwd-confirm.qml:49
536−msgid "Confirm passphrase"
537−msgstr "Подтвердите кодовую фразу"
538−
539−#: qml/Wizard/Pages/passwd-confirm.qml:50
540−msgid "Confirm passcode"
541−msgstr "Подтвердите код"
542−
543−#: qml/Wizard/Pages/passwd-confirm.qml:53
544−#: qml/Wizard/Pages/passwd-confirm.qml:54
545−msgid "Please try again."
546−msgstr "Попробуйте снова."
547−
548−#: qml/Wizard/Pages/passwd-confirm.qml:82 qml/Wizard/Pages/passwd-set.qml:90
549−#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:128
550−#: qml/Wizard/Pages/40-wifi.qml:215 qml/Wizard/Pages/50-location.qml:131
551−#: qml/Wizard/Pages/60-reporting.qml:50
552−msgid "Continue"
553−msgstr "Продолжить"
554−
555−#: qml/Wizard/Pages/passwd-set.qml:61
556−msgid "Choose your passcode"
557−msgstr "Выберите секретный код"
558−
559−#: qml/Wizard/Pages/passwd-set.qml:68
560−msgid "Passphrase must be 4 characters long"
561−msgstr "Кодовая фраза должна состоять из 4 символов"
562−
563#: qml/Wizard/Pages/10-welcome.qml:27
532#: qml/Wizard/Pages/10-welcome.qml:27
564msgid "Hi!"
533msgid "Hi!"
565msgstr "Привет!"
534msgstr "Привет!"
@@ -572,6 +541,13 @@ msgstr "Рады представить вам Ubuntu для телефона."
572msgid "Let’s get started."
541msgid "Let’s get started."
573msgstr "Приступим."
542msgstr "Приступим."
574
543
544+#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:128
545+#: qml/Wizard/Pages/40-wifi.qml:215 qml/Wizard/Pages/50-location.qml:131
546+#: qml/Wizard/Pages/60-reporting.qml:50 qml/Wizard/Pages/passwd-confirm.qml:82
547+#: qml/Wizard/Pages/passwd-set.qml:90
548+msgid "Continue"
549+msgstr "Продолжить"
550+
575#: qml/Wizard/Pages/20-sim.qml:25
551#: qml/Wizard/Pages/20-sim.qml:25
576msgid "Add a SIM card and restart your device"
552msgid "Add a SIM card and restart your device"
577msgstr "Вставьте SIM-карту и перезагрузите устройство"
553msgstr "Вставьте SIM-карту и перезагрузите устройство"
@@ -706,6 +682,31 @@ msgstr "Теперь телефон готов к использованию."
706msgid "Finish"
682msgid "Finish"
707msgstr "Завершить"
683msgstr "Завершить"
708
684
685+#: qml/Wizard/Pages/here-terms.qml:27
686+msgid "Terms & Conditions"
687+msgstr "Условия использования"
688+
689+#: qml/Wizard/Pages/passwd-confirm.qml:49
690+msgid "Confirm passphrase"
691+msgstr "Подтвердите кодовую фразу"
692+
693+#: qml/Wizard/Pages/passwd-confirm.qml:50
694+msgid "Confirm passcode"
695+msgstr "Подтвердите код"
696+
697+#: qml/Wizard/Pages/passwd-confirm.qml:53
698+#: qml/Wizard/Pages/passwd-confirm.qml:54
699+msgid "Please try again."
700+msgstr "Попробуйте снова."
701+
702+#: qml/Wizard/Pages/passwd-set.qml:61
703+msgid "Choose your passcode"
704+msgstr "Выберите секретный код"
705+
706+#: qml/Wizard/Pages/passwd-set.qml:68
707+msgid "Passphrase must be 4 characters long"
708+msgstr "Кодовая фраза должна состоять из 4 символов"
709+
709#. Translators: This is the arrow for "Back" buttons
710#. Translators: This is the arrow for "Back" buttons
710#: qml/Wizard/StackButton.qml:39
711#: qml/Wizard/StackButton.qml:39
711#, qt-format
712#, qt-format
@@ -811,5 +812,8 @@ msgstr "%1 〉"
811#~ msgid "Restart"
812#~ msgid "Restart"
812#~ msgstr "Перезагрузить"
813#~ msgstr "Перезагрузить"
813
814
815+#~ msgid "Please re-enter"
816+#~ msgstr "Повторите ввод"
817+
814#~ msgid "Manage Scopes"
818#~ msgid "Manage Scopes"
815#~ msgstr "Настройки поиска"
819#~ msgstr "Настройки поиска"
po/shn.po+51−50
@@ -7,7 +7,7 @@ msgid ""
7msgstr ""
7msgstr ""
8"Project-Id-Version: unity8\n"
8"Project-Id-Version: unity8\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2015-06-22 12:00+0200\n"
10+"POT-Creation-Date: 2015-07-17 10:10+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"
@@ -15,8 +15,8 @@ msgstr ""
15"Content-Type: text/plain; charset=UTF-8\n"
15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n"
16"Content-Transfer-Encoding: 8bit\n"
17"Plural-Forms: nplurals=2; plural=(n == 1) ? 0 : 1;\n"
17"Plural-Forms: nplurals=2; plural=(n == 1) ? 0 : 1;\n"
18−"X-Launchpad-Export-Date: 2015-07-04 05:37+0000\n"
18+"X-Launchpad-Export-Date: 2015-07-25 05:39+0000\n"
19−"X-Generator: Launchpad (build 17597)\n"
19+"X-Generator: Launchpad (build 17628)\n"
20
20
21#: plugins/LightDM/Greeter.cpp:112
21#: plugins/LightDM/Greeter.cpp:112
22msgid "Password: "
22msgid "Password: "
@@ -223,15 +223,15 @@ msgstr ""
223msgid "OK"
223msgid "OK"
224msgstr ""
224msgstr ""
225
225
226−#: qml/Dash/GenericScopeView.qml:532 qml/Dash/GenericScopeView.qml:690
226+#: qml/Dash/GenericScopeView.qml:539 qml/Dash/GenericScopeView.qml:697
227msgid "See less"
227msgid "See less"
228msgstr ""
228msgstr ""
229
229
230−#: qml/Dash/GenericScopeView.qml:532
230+#: qml/Dash/GenericScopeView.qml:539
231msgid "See all"
231msgid "See all"
232msgstr ""
232msgstr ""
233
233
234−#: qml/Dash/GenericScopeView.qml:594
234+#: qml/Dash/GenericScopeView.qml:601
235msgctxt "Label: Hint for dash search line edit"
235msgctxt "Label: Hint for dash search line edit"
236msgid "Search"
236msgid "Search"
237msgstr ""
237msgstr ""
@@ -315,57 +315,58 @@ msgstr ""
315msgid "Tap to unlock"
315msgid "Tap to unlock"
316msgstr ""
316msgstr ""
317
317
318−#: qml/Greeter/NarrowView.qml:53 qml/Wizard/Pages/passwd-confirm.qml:53
318+#: qml/Greeter/NarrowView.qml:54 qml/Wizard/Pages/passwd-confirm.qml:53
319msgid "Sorry, incorrect passphrase."
319msgid "Sorry, incorrect passphrase."
320msgstr ""
320msgstr ""
321
321
322−#: qml/Greeter/NarrowView.qml:54 qml/Wizard/Pages/passwd-confirm.qml:54
322+#: qml/Greeter/NarrowView.qml:55 qml/Wizard/Pages/passwd-confirm.qml:54
323msgid "Sorry, incorrect passcode."
323msgid "Sorry, incorrect passcode."
324msgstr ""
324msgstr ""
325
325
326−#: qml/Greeter/NarrowView.qml:55
326+#: qml/Greeter/NarrowView.qml:56
327msgid "This will be your last attempt."
327msgid "This will be your last attempt."
328msgstr ""
328msgstr ""
329
329
330−#: qml/Greeter/NarrowView.qml:57
330+#: qml/Greeter/NarrowView.qml:58
331msgid ""
331msgid ""
332"If passphrase is entered incorrectly, your phone will conduct a factory "
332"If passphrase is entered incorrectly, your phone will conduct a factory "
333"reset and all personal data will be deleted."
333"reset and all personal data will be deleted."
334msgstr ""
334msgstr ""
335
335
336−#: qml/Greeter/NarrowView.qml:58
336+#: qml/Greeter/NarrowView.qml:59
337msgid ""
337msgid ""
338"If passcode is entered incorrectly, your phone will conduct a factory reset "
338"If passcode is entered incorrectly, your phone will conduct a factory reset "
339"and all personal data will be deleted."
339"and all personal data will be deleted."
340msgstr ""
340msgstr ""
341
341
342−#: qml/Greeter/NarrowView.qml:115
342+#: qml/Greeter/NarrowView.qml:116
343#, qt-format
343#, qt-format
344msgid "Enter %1"
344msgid "Enter %1"
345msgstr ""
345msgstr ""
346
346
347−#: qml/Greeter/NarrowView.qml:116 qml/Wizard/Pages/passwd-set.qml:60
347+#: qml/Greeter/NarrowView.qml:117 qml/Wizard/Pages/passwd-set.qml:60
348msgid "Enter passphrase"
348msgid "Enter passphrase"
349msgstr ""
349msgstr ""
350
350
351−#: qml/Greeter/NarrowView.qml:117
351+#: qml/Greeter/NarrowView.qml:118
352msgid "Enter passcode"
352msgid "Enter passcode"
353msgstr ""
353msgstr ""
354
354
355−#: qml/Greeter/NarrowView.qml:118
355+#: qml/Greeter/NarrowView.qml:119
356#, qt-format
356#, qt-format
357msgid "Sorry, incorrect %1"
357msgid "Sorry, incorrect %1"
358msgstr ""
358msgstr ""
359
359
360−#: qml/Greeter/NarrowView.qml:119
360+#: qml/Greeter/NarrowView.qml:120
361msgid "Sorry, incorrect passphrase"
361msgid "Sorry, incorrect passphrase"
362msgstr ""
362msgstr ""
363
363
364−#: qml/Greeter/NarrowView.qml:120
364+#: qml/Greeter/NarrowView.qml:121
365+msgctxt "passphrase"
365msgid "Please re-enter"
366msgid "Please re-enter"
366msgstr ""
367msgstr ""
367
368
368−#: qml/Greeter/NarrowView.qml:121
369+#: qml/Greeter/NarrowView.qml:122
369msgid "Sorry, incorrect passcode"
370msgid "Sorry, incorrect passcode"
370msgstr ""
371msgstr ""
371
372
@@ -515,38 +516,6 @@ msgctxt "Button: Go back one page in the Wizard"
515msgid "Back"
516msgid "Back"
516msgstr ""
517msgstr ""
517
518
518−#: qml/Wizard/Pages/here-terms.qml:27
519−msgid "Terms & Conditions"
520−msgstr ""
521−
522−#: qml/Wizard/Pages/passwd-confirm.qml:49
523−msgid "Confirm passphrase"
524−msgstr ""
525−
526−#: qml/Wizard/Pages/passwd-confirm.qml:50
527−msgid "Confirm passcode"
528−msgstr ""
529−
530−#: qml/Wizard/Pages/passwd-confirm.qml:53
531−#: qml/Wizard/Pages/passwd-confirm.qml:54
532−msgid "Please try again."
533−msgstr ""
534−
535−#: qml/Wizard/Pages/passwd-confirm.qml:82 qml/Wizard/Pages/passwd-set.qml:90
536−#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:128
537−#: qml/Wizard/Pages/40-wifi.qml:215 qml/Wizard/Pages/50-location.qml:131
538−#: qml/Wizard/Pages/60-reporting.qml:50
539−msgid "Continue"
540−msgstr ""
541−
542−#: qml/Wizard/Pages/passwd-set.qml:61
543−msgid "Choose your passcode"
544−msgstr ""
545−
546−#: qml/Wizard/Pages/passwd-set.qml:68
547−msgid "Passphrase must be 4 characters long"
548−msgstr ""
549−
550#: qml/Wizard/Pages/10-welcome.qml:27
519#: qml/Wizard/Pages/10-welcome.qml:27
551msgid "Hi!"
520msgid "Hi!"
552msgstr ""
521msgstr ""
@@ -559,6 +528,13 @@ msgstr ""
559msgid "Let’s get started."
528msgid "Let’s get started."
560msgstr ""
529msgstr ""
561
530
531+#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:128
532+#: qml/Wizard/Pages/40-wifi.qml:215 qml/Wizard/Pages/50-location.qml:131
533+#: qml/Wizard/Pages/60-reporting.qml:50 qml/Wizard/Pages/passwd-confirm.qml:82
534+#: qml/Wizard/Pages/passwd-set.qml:90
535+msgid "Continue"
536+msgstr ""
537+
562#: qml/Wizard/Pages/20-sim.qml:25
538#: qml/Wizard/Pages/20-sim.qml:25
563msgid "Add a SIM card and restart your device"
539msgid "Add a SIM card and restart your device"
564msgstr ""
540msgstr ""
@@ -684,6 +660,31 @@ msgstr ""
684msgid "Finish"
660msgid "Finish"
685msgstr ""
661msgstr ""
686
662
663+#: qml/Wizard/Pages/here-terms.qml:27
664+msgid "Terms & Conditions"
665+msgstr ""
666+
667+#: qml/Wizard/Pages/passwd-confirm.qml:49
668+msgid "Confirm passphrase"
669+msgstr ""
670+
671+#: qml/Wizard/Pages/passwd-confirm.qml:50
672+msgid "Confirm passcode"
673+msgstr ""
674+
675+#: qml/Wizard/Pages/passwd-confirm.qml:53
676+#: qml/Wizard/Pages/passwd-confirm.qml:54
677+msgid "Please try again."
678+msgstr ""
679+
680+#: qml/Wizard/Pages/passwd-set.qml:61
681+msgid "Choose your passcode"
682+msgstr ""
683+
684+#: qml/Wizard/Pages/passwd-set.qml:68
685+msgid "Passphrase must be 4 characters long"
686+msgstr ""
687+
687#. Translators: This is the arrow for "Back" buttons
688#. Translators: This is the arrow for "Back" buttons
688#: qml/Wizard/StackButton.qml:39
689#: qml/Wizard/StackButton.qml:39
689#, qt-format
690#, qt-format
po/si.po+51−50
@@ -7,7 +7,7 @@ msgid ""
7msgstr ""
7msgstr ""
8"Project-Id-Version: unity\n"
8"Project-Id-Version: unity\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2015-06-22 12:00+0200\n"
10+"POT-Creation-Date: 2015-07-17 10:10+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"
@@ -15,8 +15,8 @@ msgstr ""
15"Content-Type: text/plain; charset=UTF-8\n"
15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n"
16"Content-Transfer-Encoding: 8bit\n"
17"Plural-Forms: nplurals=2; plural=n != 1;\n"
17"Plural-Forms: nplurals=2; plural=n != 1;\n"
18−"X-Launchpad-Export-Date: 2015-07-04 05:37+0000\n"
18+"X-Launchpad-Export-Date: 2015-07-25 05:39+0000\n"
19−"X-Generator: Launchpad (build 17597)\n"
19+"X-Generator: Launchpad (build 17628)\n"
20
20
21#: plugins/LightDM/Greeter.cpp:112
21#: plugins/LightDM/Greeter.cpp:112
22msgid "Password: "
22msgid "Password: "
@@ -223,15 +223,15 @@ msgstr ""
223msgid "OK"
223msgid "OK"
224msgstr ""
224msgstr ""
225
225
226−#: qml/Dash/GenericScopeView.qml:532 qml/Dash/GenericScopeView.qml:690
226+#: qml/Dash/GenericScopeView.qml:539 qml/Dash/GenericScopeView.qml:697
227msgid "See less"
227msgid "See less"
228msgstr ""
228msgstr ""
229
229
230−#: qml/Dash/GenericScopeView.qml:532
230+#: qml/Dash/GenericScopeView.qml:539
231msgid "See all"
231msgid "See all"
232msgstr ""
232msgstr ""
233
233
234−#: qml/Dash/GenericScopeView.qml:594
234+#: qml/Dash/GenericScopeView.qml:601
235msgctxt "Label: Hint for dash search line edit"
235msgctxt "Label: Hint for dash search line edit"
236msgid "Search"
236msgid "Search"
237msgstr ""
237msgstr ""
@@ -315,57 +315,58 @@ msgstr ""
315msgid "Tap to unlock"
315msgid "Tap to unlock"
316msgstr ""
316msgstr ""
317
317
318−#: qml/Greeter/NarrowView.qml:53 qml/Wizard/Pages/passwd-confirm.qml:53
318+#: qml/Greeter/NarrowView.qml:54 qml/Wizard/Pages/passwd-confirm.qml:53
319msgid "Sorry, incorrect passphrase."
319msgid "Sorry, incorrect passphrase."
320msgstr ""
320msgstr ""
321
321
322−#: qml/Greeter/NarrowView.qml:54 qml/Wizard/Pages/passwd-confirm.qml:54
322+#: qml/Greeter/NarrowView.qml:55 qml/Wizard/Pages/passwd-confirm.qml:54
323msgid "Sorry, incorrect passcode."
323msgid "Sorry, incorrect passcode."
324msgstr ""
324msgstr ""
325
325
326−#: qml/Greeter/NarrowView.qml:55
326+#: qml/Greeter/NarrowView.qml:56
327msgid "This will be your last attempt."
327msgid "This will be your last attempt."
328msgstr ""
328msgstr ""
329
329
330−#: qml/Greeter/NarrowView.qml:57
330+#: qml/Greeter/NarrowView.qml:58
331msgid ""
331msgid ""
332"If passphrase is entered incorrectly, your phone will conduct a factory "
332"If passphrase is entered incorrectly, your phone will conduct a factory "
333"reset and all personal data will be deleted."
333"reset and all personal data will be deleted."
334msgstr ""
334msgstr ""
335
335
336−#: qml/Greeter/NarrowView.qml:58
336+#: qml/Greeter/NarrowView.qml:59
337msgid ""
337msgid ""
338"If passcode is entered incorrectly, your phone will conduct a factory reset "
338"If passcode is entered incorrectly, your phone will conduct a factory reset "
339"and all personal data will be deleted."
339"and all personal data will be deleted."
340msgstr ""
340msgstr ""
341
341
342−#: qml/Greeter/NarrowView.qml:115
342+#: qml/Greeter/NarrowView.qml:116
343#, qt-format
343#, qt-format
344msgid "Enter %1"
344msgid "Enter %1"
345msgstr ""
345msgstr ""
346
346
347−#: qml/Greeter/NarrowView.qml:116 qml/Wizard/Pages/passwd-set.qml:60
347+#: qml/Greeter/NarrowView.qml:117 qml/Wizard/Pages/passwd-set.qml:60
348msgid "Enter passphrase"
348msgid "Enter passphrase"
349msgstr ""
349msgstr ""
350
350
351−#: qml/Greeter/NarrowView.qml:117
351+#: qml/Greeter/NarrowView.qml:118
352msgid "Enter passcode"
352msgid "Enter passcode"
353msgstr ""
353msgstr ""
354
354
355−#: qml/Greeter/NarrowView.qml:118
355+#: qml/Greeter/NarrowView.qml:119
356#, qt-format
356#, qt-format
357msgid "Sorry, incorrect %1"
357msgid "Sorry, incorrect %1"
358msgstr ""
358msgstr ""
359
359
360−#: qml/Greeter/NarrowView.qml:119
360+#: qml/Greeter/NarrowView.qml:120
361msgid "Sorry, incorrect passphrase"
361msgid "Sorry, incorrect passphrase"
362msgstr ""
362msgstr ""
363
363
364−#: qml/Greeter/NarrowView.qml:120
364+#: qml/Greeter/NarrowView.qml:121
365+msgctxt "passphrase"
365msgid "Please re-enter"
366msgid "Please re-enter"
366msgstr ""
367msgstr ""
367
368
368−#: qml/Greeter/NarrowView.qml:121
369+#: qml/Greeter/NarrowView.qml:122
369msgid "Sorry, incorrect passcode"
370msgid "Sorry, incorrect passcode"
370msgstr ""
371msgstr ""
371
372
@@ -515,38 +516,6 @@ msgctxt "Button: Go back one page in the Wizard"
515msgid "Back"
516msgid "Back"
516msgstr ""
517msgstr ""
517
518
518−#: qml/Wizard/Pages/here-terms.qml:27
519−msgid "Terms & Conditions"
520−msgstr ""
521−
522−#: qml/Wizard/Pages/passwd-confirm.qml:49
523−msgid "Confirm passphrase"
524−msgstr ""
525−
526−#: qml/Wizard/Pages/passwd-confirm.qml:50
527−msgid "Confirm passcode"
528−msgstr ""
529−
530−#: qml/Wizard/Pages/passwd-confirm.qml:53
531−#: qml/Wizard/Pages/passwd-confirm.qml:54
532−msgid "Please try again."
533−msgstr ""
534−
535−#: qml/Wizard/Pages/passwd-confirm.qml:82 qml/Wizard/Pages/passwd-set.qml:90
536−#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:128
537−#: qml/Wizard/Pages/40-wifi.qml:215 qml/Wizard/Pages/50-location.qml:131
538−#: qml/Wizard/Pages/60-reporting.qml:50
539−msgid "Continue"
540−msgstr ""
541−
542−#: qml/Wizard/Pages/passwd-set.qml:61
543−msgid "Choose your passcode"
544−msgstr ""
545−
546−#: qml/Wizard/Pages/passwd-set.qml:68
547−msgid "Passphrase must be 4 characters long"
548−msgstr ""
549−
550#: qml/Wizard/Pages/10-welcome.qml:27
519#: qml/Wizard/Pages/10-welcome.qml:27
551msgid "Hi!"
520msgid "Hi!"
552msgstr ""
521msgstr ""
@@ -559,6 +528,13 @@ msgstr ""
559msgid "Let’s get started."
528msgid "Let’s get started."
560msgstr ""
529msgstr ""
561
530
531+#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:128
532+#: qml/Wizard/Pages/40-wifi.qml:215 qml/Wizard/Pages/50-location.qml:131
533+#: qml/Wizard/Pages/60-reporting.qml:50 qml/Wizard/Pages/passwd-confirm.qml:82
534+#: qml/Wizard/Pages/passwd-set.qml:90
535+msgid "Continue"
536+msgstr ""
537+
562#: qml/Wizard/Pages/20-sim.qml:25
538#: qml/Wizard/Pages/20-sim.qml:25
563msgid "Add a SIM card and restart your device"
539msgid "Add a SIM card and restart your device"
564msgstr ""
540msgstr ""
@@ -684,6 +660,31 @@ msgstr ""
684msgid "Finish"
660msgid "Finish"
685msgstr ""
661msgstr ""
686
662
663+#: qml/Wizard/Pages/here-terms.qml:27
664+msgid "Terms & Conditions"
665+msgstr ""
666+
667+#: qml/Wizard/Pages/passwd-confirm.qml:49
668+msgid "Confirm passphrase"
669+msgstr ""
670+
671+#: qml/Wizard/Pages/passwd-confirm.qml:50
672+msgid "Confirm passcode"
673+msgstr ""
674+
675+#: qml/Wizard/Pages/passwd-confirm.qml:53
676+#: qml/Wizard/Pages/passwd-confirm.qml:54
677+msgid "Please try again."
678+msgstr ""
679+
680+#: qml/Wizard/Pages/passwd-set.qml:61
681+msgid "Choose your passcode"
682+msgstr ""
683+
684+#: qml/Wizard/Pages/passwd-set.qml:68
685+msgid "Passphrase must be 4 characters long"
686+msgstr ""
687+
687#. Translators: This is the arrow for "Back" buttons
688#. Translators: This is the arrow for "Back" buttons
688#: qml/Wizard/StackButton.qml:39
689#: qml/Wizard/StackButton.qml:39
689#, qt-format
690#, qt-format
po/sk.po+51−50
@@ -7,7 +7,7 @@ msgid ""
7msgstr ""
7msgstr ""
8"Project-Id-Version: unity8\n"
8"Project-Id-Version: unity8\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2015-06-22 12:00+0200\n"
10+"POT-Creation-Date: 2015-07-17 10:10+0200\n"
11"PO-Revision-Date: 2015-04-10 09:15+0000\n"
11"PO-Revision-Date: 2015-04-10 09:15+0000\n"
12"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
12"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
13"Language-Team: Slovak <sk@li.org>\n"
13"Language-Team: Slovak <sk@li.org>\n"
@@ -15,8 +15,8 @@ msgstr ""
15"Content-Type: text/plain; charset=UTF-8\n"
15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n"
16"Content-Transfer-Encoding: 8bit\n"
17"Plural-Forms: nplurals=3; plural=(n==1) ? 1 : (n>=2 && n<=4) ? 2 : 0;\n"
17"Plural-Forms: nplurals=3; plural=(n==1) ? 1 : (n>=2 && n<=4) ? 2 : 0;\n"
18−"X-Launchpad-Export-Date: 2015-07-04 05:37+0000\n"
18+"X-Launchpad-Export-Date: 2015-07-25 05:39+0000\n"
19−"X-Generator: Launchpad (build 17597)\n"
19+"X-Generator: Launchpad (build 17628)\n"
20
20
21#: plugins/LightDM/Greeter.cpp:112
21#: plugins/LightDM/Greeter.cpp:112
22msgid "Password: "
22msgid "Password: "
@@ -223,15 +223,15 @@ msgstr ""
223msgid "OK"
223msgid "OK"
224msgstr ""
224msgstr ""
225
225
226−#: qml/Dash/GenericScopeView.qml:532 qml/Dash/GenericScopeView.qml:690
226+#: qml/Dash/GenericScopeView.qml:539 qml/Dash/GenericScopeView.qml:697
227msgid "See less"
227msgid "See less"
228msgstr ""
228msgstr ""
229
229
230−#: qml/Dash/GenericScopeView.qml:532
230+#: qml/Dash/GenericScopeView.qml:539
231msgid "See all"
231msgid "See all"
232msgstr ""
232msgstr ""
233
233
234−#: qml/Dash/GenericScopeView.qml:594
234+#: qml/Dash/GenericScopeView.qml:601
235msgctxt "Label: Hint for dash search line edit"
235msgctxt "Label: Hint for dash search line edit"
236msgid "Search"
236msgid "Search"
237msgstr ""
237msgstr ""
@@ -315,57 +315,58 @@ msgstr ""
315msgid "Tap to unlock"
315msgid "Tap to unlock"
316msgstr ""
316msgstr ""
317
317
318−#: qml/Greeter/NarrowView.qml:53 qml/Wizard/Pages/passwd-confirm.qml:53
318+#: qml/Greeter/NarrowView.qml:54 qml/Wizard/Pages/passwd-confirm.qml:53
319msgid "Sorry, incorrect passphrase."
319msgid "Sorry, incorrect passphrase."
320msgstr ""
320msgstr ""
321
321
322−#: qml/Greeter/NarrowView.qml:54 qml/Wizard/Pages/passwd-confirm.qml:54
322+#: qml/Greeter/NarrowView.qml:55 qml/Wizard/Pages/passwd-confirm.qml:54
323msgid "Sorry, incorrect passcode."
323msgid "Sorry, incorrect passcode."
324msgstr ""
324msgstr ""
325
325
326−#: qml/Greeter/NarrowView.qml:55
326+#: qml/Greeter/NarrowView.qml:56
327msgid "This will be your last attempt."
327msgid "This will be your last attempt."
328msgstr ""
328msgstr ""
329
329
330−#: qml/Greeter/NarrowView.qml:57
330+#: qml/Greeter/NarrowView.qml:58
331msgid ""
331msgid ""
332"If passphrase is entered incorrectly, your phone will conduct a factory "
332"If passphrase is entered incorrectly, your phone will conduct a factory "
333"reset and all personal data will be deleted."
333"reset and all personal data will be deleted."
334msgstr ""
334msgstr ""
335
335
336−#: qml/Greeter/NarrowView.qml:58
336+#: qml/Greeter/NarrowView.qml:59
337msgid ""
337msgid ""
338"If passcode is entered incorrectly, your phone will conduct a factory reset "
338"If passcode is entered incorrectly, your phone will conduct a factory reset "
339"and all personal data will be deleted."
339"and all personal data will be deleted."
340msgstr ""
340msgstr ""
341
341
342−#: qml/Greeter/NarrowView.qml:115
342+#: qml/Greeter/NarrowView.qml:116
343#, qt-format
343#, qt-format
344msgid "Enter %1"
344msgid "Enter %1"
345msgstr ""
345msgstr ""
346
346
347−#: qml/Greeter/NarrowView.qml:116 qml/Wizard/Pages/passwd-set.qml:60
347+#: qml/Greeter/NarrowView.qml:117 qml/Wizard/Pages/passwd-set.qml:60
348msgid "Enter passphrase"
348msgid "Enter passphrase"
349msgstr ""
349msgstr ""
350
350
351−#: qml/Greeter/NarrowView.qml:117
351+#: qml/Greeter/NarrowView.qml:118
352msgid "Enter passcode"
352msgid "Enter passcode"
353msgstr ""
353msgstr ""
354
354
355−#: qml/Greeter/NarrowView.qml:118
355+#: qml/Greeter/NarrowView.qml:119
356#, qt-format
356#, qt-format
357msgid "Sorry, incorrect %1"
357msgid "Sorry, incorrect %1"
358msgstr ""
358msgstr ""
359
359
360−#: qml/Greeter/NarrowView.qml:119
360+#: qml/Greeter/NarrowView.qml:120
361msgid "Sorry, incorrect passphrase"
361msgid "Sorry, incorrect passphrase"
362msgstr ""
362msgstr ""
363
363
364−#: qml/Greeter/NarrowView.qml:120
364+#: qml/Greeter/NarrowView.qml:121
365+msgctxt "passphrase"
365msgid "Please re-enter"
366msgid "Please re-enter"
366msgstr ""
367msgstr ""
367
368
368−#: qml/Greeter/NarrowView.qml:121
369+#: qml/Greeter/NarrowView.qml:122
369msgid "Sorry, incorrect passcode"
370msgid "Sorry, incorrect passcode"
370msgstr ""
371msgstr ""
371
372
@@ -515,38 +516,6 @@ msgctxt "Button: Go back one page in the Wizard"
515msgid "Back"
516msgid "Back"
516msgstr ""
517msgstr ""
517
518
518−#: qml/Wizard/Pages/here-terms.qml:27
519−msgid "Terms & Conditions"
520−msgstr ""
521−
522−#: qml/Wizard/Pages/passwd-confirm.qml:49
523−msgid "Confirm passphrase"
524−msgstr ""
525−
526−#: qml/Wizard/Pages/passwd-confirm.qml:50
527−msgid "Confirm passcode"
528−msgstr ""
529−
530−#: qml/Wizard/Pages/passwd-confirm.qml:53
531−#: qml/Wizard/Pages/passwd-confirm.qml:54
532−msgid "Please try again."
533−msgstr ""
534−
535−#: qml/Wizard/Pages/passwd-confirm.qml:82 qml/Wizard/Pages/passwd-set.qml:90
536−#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:128
537−#: qml/Wizard/Pages/40-wifi.qml:215 qml/Wizard/Pages/50-location.qml:131
538−#: qml/Wizard/Pages/60-reporting.qml:50
539−msgid "Continue"
540−msgstr ""
541−
542−#: qml/Wizard/Pages/passwd-set.qml:61
543−msgid "Choose your passcode"
544−msgstr ""
545−
546−#: qml/Wizard/Pages/passwd-set.qml:68
547−msgid "Passphrase must be 4 characters long"
548−msgstr ""
549−
550#: qml/Wizard/Pages/10-welcome.qml:27
519#: qml/Wizard/Pages/10-welcome.qml:27
551msgid "Hi!"
520msgid "Hi!"
552msgstr ""
521msgstr ""
@@ -559,6 +528,13 @@ msgstr ""
559msgid "Let’s get started."
528msgid "Let’s get started."
560msgstr ""
529msgstr ""
561
530
531+#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:128
532+#: qml/Wizard/Pages/40-wifi.qml:215 qml/Wizard/Pages/50-location.qml:131
533+#: qml/Wizard/Pages/60-reporting.qml:50 qml/Wizard/Pages/passwd-confirm.qml:82
534+#: qml/Wizard/Pages/passwd-set.qml:90
535+msgid "Continue"
536+msgstr ""
537+
562#: qml/Wizard/Pages/20-sim.qml:25
538#: qml/Wizard/Pages/20-sim.qml:25
563msgid "Add a SIM card and restart your device"
539msgid "Add a SIM card and restart your device"
564msgstr ""
540msgstr ""
@@ -684,6 +660,31 @@ msgstr ""
684msgid "Finish"
660msgid "Finish"
685msgstr ""
661msgstr ""
686
662
663+#: qml/Wizard/Pages/here-terms.qml:27
664+msgid "Terms & Conditions"
665+msgstr ""
666+
667+#: qml/Wizard/Pages/passwd-confirm.qml:49
668+msgid "Confirm passphrase"
669+msgstr ""
670+
671+#: qml/Wizard/Pages/passwd-confirm.qml:50
672+msgid "Confirm passcode"
673+msgstr ""
674+
675+#: qml/Wizard/Pages/passwd-confirm.qml:53
676+#: qml/Wizard/Pages/passwd-confirm.qml:54
677+msgid "Please try again."
678+msgstr ""
679+
680+#: qml/Wizard/Pages/passwd-set.qml:61
681+msgid "Choose your passcode"
682+msgstr ""
683+
684+#: qml/Wizard/Pages/passwd-set.qml:68
685+msgid "Passphrase must be 4 characters long"
686+msgstr ""
687+
687#. Translators: This is the arrow for "Back" buttons
688#. Translators: This is the arrow for "Back" buttons
688#: qml/Wizard/StackButton.qml:39
689#: qml/Wizard/StackButton.qml:39
689#, qt-format
690#, qt-format
po/sl.po+55−51
@@ -7,7 +7,7 @@ msgid ""
7msgstr ""
7msgstr ""
8"Project-Id-Version: unity\n"
8"Project-Id-Version: unity\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2015-06-22 12:00+0200\n"
10+"POT-Creation-Date: 2015-07-17 10:10+0200\n"
11"PO-Revision-Date: 2015-07-06 21:10+0000\n"
11"PO-Revision-Date: 2015-07-06 21:10+0000\n"
12"Last-Translator: Sasa Batistic <Unknown>\n"
12"Last-Translator: Sasa Batistic <Unknown>\n"
13"Language-Team: Slovenian <sl@li.org>\n"
13"Language-Team: Slovenian <sl@li.org>\n"
@@ -16,8 +16,8 @@ msgstr ""
16"Content-Transfer-Encoding: 8bit\n"
16"Content-Transfer-Encoding: 8bit\n"
17"Plural-Forms: nplurals=4; plural=(n%100==1 ? 1 : n%100==2 ? 2 : n%100==3 || "
17"Plural-Forms: nplurals=4; plural=(n%100==1 ? 1 : n%100==2 ? 2 : n%100==3 || "
18"n%100==4 ? 3 : 0);\n"
18"n%100==4 ? 3 : 0);\n"
19−"X-Launchpad-Export-Date: 2015-07-07 05:40+0000\n"
19+"X-Launchpad-Export-Date: 2015-07-25 05:39+0000\n"
20−"X-Generator: Launchpad (build 17597)\n"
20+"X-Generator: Launchpad (build 17628)\n"
21
21
22#: plugins/LightDM/Greeter.cpp:112
22#: plugins/LightDM/Greeter.cpp:112
23msgid "Password: "
23msgid "Password: "
@@ -228,15 +228,15 @@ msgstr "Klic v sili"
228msgid "OK"
228msgid "OK"
229msgstr "V REDU"
229msgstr "V REDU"
230
230
231−#: qml/Dash/GenericScopeView.qml:532 qml/Dash/GenericScopeView.qml:690
231+#: qml/Dash/GenericScopeView.qml:539 qml/Dash/GenericScopeView.qml:697
232msgid "See less"
232msgid "See less"
233msgstr "Pokaži manj"
233msgstr "Pokaži manj"
234
234
235−#: qml/Dash/GenericScopeView.qml:532
235+#: qml/Dash/GenericScopeView.qml:539
236msgid "See all"
236msgid "See all"
237msgstr "Pokaži vse"
237msgstr "Pokaži vse"
238
238
239−#: qml/Dash/GenericScopeView.qml:594
239+#: qml/Dash/GenericScopeView.qml:601
240msgctxt "Label: Hint for dash search line edit"
240msgctxt "Label: Hint for dash search line edit"
241msgid "Search"
241msgid "Search"
242msgstr "Iskanje"
242msgstr "Iskanje"
@@ -320,19 +320,19 @@ msgstr "Poskusi znova"
320msgid "Tap to unlock"
320msgid "Tap to unlock"
321msgstr "Tapnite za odklep"
321msgstr "Tapnite za odklep"
322
322
323−#: qml/Greeter/NarrowView.qml:53 qml/Wizard/Pages/passwd-confirm.qml:53
323+#: qml/Greeter/NarrowView.qml:54 qml/Wizard/Pages/passwd-confirm.qml:53
324msgid "Sorry, incorrect passphrase."
324msgid "Sorry, incorrect passphrase."
325msgstr "Nepravilno geslo."
325msgstr "Nepravilno geslo."
326
326
327−#: qml/Greeter/NarrowView.qml:54 qml/Wizard/Pages/passwd-confirm.qml:54
327+#: qml/Greeter/NarrowView.qml:55 qml/Wizard/Pages/passwd-confirm.qml:54
328msgid "Sorry, incorrect passcode."
328msgid "Sorry, incorrect passcode."
329msgstr "Nepravilno geslo."
329msgstr "Nepravilno geslo."
330
330
331−#: qml/Greeter/NarrowView.qml:55
331+#: qml/Greeter/NarrowView.qml:56
332msgid "This will be your last attempt."
332msgid "This will be your last attempt."
333msgstr "To je vaš zadnji poskus"
333msgstr "To je vaš zadnji poskus"
334
334
335−#: qml/Greeter/NarrowView.qml:57
335+#: qml/Greeter/NarrowView.qml:58
336msgid ""
336msgid ""
337"If passphrase is entered incorrectly, your phone will conduct a factory "
337"If passphrase is entered incorrectly, your phone will conduct a factory "
338"reset and all personal data will be deleted."
338"reset and all personal data will be deleted."
@@ -340,7 +340,7 @@ msgstr ""
340"Če je vneseno nepravilno šifrirno reklo, bo telefon ponastavljen na "
340"Če je vneseno nepravilno šifrirno reklo, bo telefon ponastavljen na "
341"tovarniške nastavitve ter vsi osebni podatki bodo izbrisani."
341"tovarniške nastavitve ter vsi osebni podatki bodo izbrisani."
342
342
343−#: qml/Greeter/NarrowView.qml:58
343+#: qml/Greeter/NarrowView.qml:59
344msgid ""
344msgid ""
345"If passcode is entered incorrectly, your phone will conduct a factory reset "
345"If passcode is entered incorrectly, your phone will conduct a factory reset "
346"and all personal data will be deleted."
346"and all personal data will be deleted."
@@ -348,33 +348,34 @@ msgstr ""
348"Če je vneseno nepravilno geslo, bo telefon ponastavljen na tovarniške "
348"Če je vneseno nepravilno geslo, bo telefon ponastavljen na tovarniške "
349"nastavitve ter vsi osebni podatki bodo izbrisani."
349"nastavitve ter vsi osebni podatki bodo izbrisani."
350
350
351−#: qml/Greeter/NarrowView.qml:115
351+#: qml/Greeter/NarrowView.qml:116
352#, qt-format
352#, qt-format
353msgid "Enter %1"
353msgid "Enter %1"
354msgstr "Vnesite %1"
354msgstr "Vnesite %1"
355
355
356−#: qml/Greeter/NarrowView.qml:116 qml/Wizard/Pages/passwd-set.qml:60
356+#: qml/Greeter/NarrowView.qml:117 qml/Wizard/Pages/passwd-set.qml:60
357msgid "Enter passphrase"
357msgid "Enter passphrase"
358msgstr "Vnesite šifrirno reklo"
358msgstr "Vnesite šifrirno reklo"
359
359
360−#: qml/Greeter/NarrowView.qml:117
360+#: qml/Greeter/NarrowView.qml:118
361msgid "Enter passcode"
361msgid "Enter passcode"
362msgstr "Vnesite geslo"
362msgstr "Vnesite geslo"
363
363
364−#: qml/Greeter/NarrowView.qml:118
364+#: qml/Greeter/NarrowView.qml:119
365#, qt-format
365#, qt-format
366msgid "Sorry, incorrect %1"
366msgid "Sorry, incorrect %1"
367msgstr "Oprostite, napačen %1"
367msgstr "Oprostite, napačen %1"
368
368
369−#: qml/Greeter/NarrowView.qml:119
369+#: qml/Greeter/NarrowView.qml:120
370msgid "Sorry, incorrect passphrase"
370msgid "Sorry, incorrect passphrase"
371msgstr "Oprostite, napačno šifrirno reklo"
371msgstr "Oprostite, napačno šifrirno reklo"
372
372
373−#: qml/Greeter/NarrowView.qml:120
373+#: qml/Greeter/NarrowView.qml:121
374+msgctxt "passphrase"
374msgid "Please re-enter"
375msgid "Please re-enter"
375−msgstr "Ponovno vnesite"
376+msgstr ""
376
377
377−#: qml/Greeter/NarrowView.qml:121
378+#: qml/Greeter/NarrowView.qml:122
378msgid "Sorry, incorrect passcode"
379msgid "Sorry, incorrect passcode"
379msgstr "Nepravilno geslo"
380msgstr "Nepravilno geslo"
380
381
@@ -530,38 +531,6 @@ msgctxt "Button: Go back one page in the Wizard"
530msgid "Back"
531msgid "Back"
531msgstr "Nazaj"
532msgstr "Nazaj"
532
533
533−#: qml/Wizard/Pages/here-terms.qml:27
534−msgid "Terms & Conditions"
535−msgstr "Pogoji uporabe"
536−
537−#: qml/Wizard/Pages/passwd-confirm.qml:49
538−msgid "Confirm passphrase"
539−msgstr "Potrdite geslo"
540−
541−#: qml/Wizard/Pages/passwd-confirm.qml:50
542−msgid "Confirm passcode"
543−msgstr "Potrdite geslo"
544−
545−#: qml/Wizard/Pages/passwd-confirm.qml:53
546−#: qml/Wizard/Pages/passwd-confirm.qml:54
547−msgid "Please try again."
548−msgstr "Poskusite znova."
549−
550−#: qml/Wizard/Pages/passwd-confirm.qml:82 qml/Wizard/Pages/passwd-set.qml:90
551−#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:128
552−#: qml/Wizard/Pages/40-wifi.qml:215 qml/Wizard/Pages/50-location.qml:131
553−#: qml/Wizard/Pages/60-reporting.qml:50
554−msgid "Continue"
555−msgstr "Nadaljuj"
556−
557−#: qml/Wizard/Pages/passwd-set.qml:61
558−msgid "Choose your passcode"
559−msgstr "Izberite svoje geslo"
560−
561−#: qml/Wizard/Pages/passwd-set.qml:68
562−msgid "Passphrase must be 4 characters long"
563−msgstr "Geslo mora biti dolgo vsaj 4 znake"
564−
565#: qml/Wizard/Pages/10-welcome.qml:27
534#: qml/Wizard/Pages/10-welcome.qml:27
566msgid "Hi!"
535msgid "Hi!"
567msgstr "Živjo!"
536msgstr "Živjo!"
@@ -574,6 +543,13 @@ msgstr "Dobrodošli v svoj telefon Ubuntu."
574msgid "Let’s get started."
543msgid "Let’s get started."
575msgstr "Pa začnimo."
544msgstr "Pa začnimo."
576
545
546+#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:128
547+#: qml/Wizard/Pages/40-wifi.qml:215 qml/Wizard/Pages/50-location.qml:131
548+#: qml/Wizard/Pages/60-reporting.qml:50 qml/Wizard/Pages/passwd-confirm.qml:82
549+#: qml/Wizard/Pages/passwd-set.qml:90
550+msgid "Continue"
551+msgstr "Nadaljuj"
552+
577#: qml/Wizard/Pages/20-sim.qml:25
553#: qml/Wizard/Pages/20-sim.qml:25
578msgid "Add a SIM card and restart your device"
554msgid "Add a SIM card and restart your device"
579msgstr "Dodajte kartico SIM in ponovno zaženite napravo"
555msgstr "Dodajte kartico SIM in ponovno zaženite napravo"
@@ -707,6 +683,31 @@ msgstr "Vaš telefon je sedaj pripravljen za uporabo."
707msgid "Finish"
683msgid "Finish"
708msgstr "Dokončaj"
684msgstr "Dokončaj"
709
685
686+#: qml/Wizard/Pages/here-terms.qml:27
687+msgid "Terms & Conditions"
688+msgstr "Pogoji uporabe"
689+
690+#: qml/Wizard/Pages/passwd-confirm.qml:49
691+msgid "Confirm passphrase"
692+msgstr "Potrdite geslo"
693+
694+#: qml/Wizard/Pages/passwd-confirm.qml:50
695+msgid "Confirm passcode"
696+msgstr "Potrdite geslo"
697+
698+#: qml/Wizard/Pages/passwd-confirm.qml:53
699+#: qml/Wizard/Pages/passwd-confirm.qml:54
700+msgid "Please try again."
701+msgstr "Poskusite znova."
702+
703+#: qml/Wizard/Pages/passwd-set.qml:61
704+msgid "Choose your passcode"
705+msgstr "Izberite svoje geslo"
706+
707+#: qml/Wizard/Pages/passwd-set.qml:68
708+msgid "Passphrase must be 4 characters long"
709+msgstr "Geslo mora biti dolgo vsaj 4 znake"
710+
710#. Translators: This is the arrow for "Back" buttons
711#. Translators: This is the arrow for "Back" buttons
711#: qml/Wizard/StackButton.qml:39
712#: qml/Wizard/StackButton.qml:39
712#, qt-format
713#, qt-format
@@ -808,3 +809,6 @@ msgstr "%1 〉"
808
809
809#~ msgid "Restart"
810#~ msgid "Restart"
810#~ msgstr "Ponovni zagon"
811#~ msgstr "Ponovni zagon"
812+
813+#~ msgid "Please re-enter"
814+#~ msgstr "Ponovno vnesite"
po/sq.po+51−50
@@ -7,7 +7,7 @@ msgid ""
7msgstr ""
7msgstr ""
8"Project-Id-Version: unity8\n"
8"Project-Id-Version: unity8\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2015-06-22 12:00+0200\n"
10+"POT-Creation-Date: 2015-07-17 10:10+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"
@@ -15,8 +15,8 @@ msgstr ""
15"Content-Type: text/plain; charset=UTF-8\n"
15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n"
16"Content-Transfer-Encoding: 8bit\n"
17"Plural-Forms: nplurals=2; plural=n != 1;\n"
17"Plural-Forms: nplurals=2; plural=n != 1;\n"
18−"X-Launchpad-Export-Date: 2015-07-04 05:36+0000\n"
18+"X-Launchpad-Export-Date: 2015-07-25 05:38+0000\n"
19−"X-Generator: Launchpad (build 17597)\n"
19+"X-Generator: Launchpad (build 17628)\n"
20
20
21#: plugins/LightDM/Greeter.cpp:112
21#: plugins/LightDM/Greeter.cpp:112
22msgid "Password: "
22msgid "Password: "
@@ -223,15 +223,15 @@ msgstr ""
223msgid "OK"
223msgid "OK"
224msgstr "OK"
224msgstr "OK"
225
225
226−#: qml/Dash/GenericScopeView.qml:532 qml/Dash/GenericScopeView.qml:690
226+#: qml/Dash/GenericScopeView.qml:539 qml/Dash/GenericScopeView.qml:697
227msgid "See less"
227msgid "See less"
228msgstr ""
228msgstr ""
229
229
230−#: qml/Dash/GenericScopeView.qml:532
230+#: qml/Dash/GenericScopeView.qml:539
231msgid "See all"
231msgid "See all"
232msgstr ""
232msgstr ""
233
233
234−#: qml/Dash/GenericScopeView.qml:594
234+#: qml/Dash/GenericScopeView.qml:601
235msgctxt "Label: Hint for dash search line edit"
235msgctxt "Label: Hint for dash search line edit"
236msgid "Search"
236msgid "Search"
237msgstr "Kërko"
237msgstr "Kërko"
@@ -315,57 +315,58 @@ msgstr "Riprovo"
315msgid "Tap to unlock"
315msgid "Tap to unlock"
316msgstr ""
316msgstr ""
317
317
318−#: qml/Greeter/NarrowView.qml:53 qml/Wizard/Pages/passwd-confirm.qml:53
318+#: qml/Greeter/NarrowView.qml:54 qml/Wizard/Pages/passwd-confirm.qml:53
319msgid "Sorry, incorrect passphrase."
319msgid "Sorry, incorrect passphrase."
320msgstr ""
320msgstr ""
321
321
322−#: qml/Greeter/NarrowView.qml:54 qml/Wizard/Pages/passwd-confirm.qml:54
322+#: qml/Greeter/NarrowView.qml:55 qml/Wizard/Pages/passwd-confirm.qml:54
323msgid "Sorry, incorrect passcode."
323msgid "Sorry, incorrect passcode."
324msgstr ""
324msgstr ""
325
325
326−#: qml/Greeter/NarrowView.qml:55
326+#: qml/Greeter/NarrowView.qml:56
327msgid "This will be your last attempt."
327msgid "This will be your last attempt."
328msgstr "Kjo do to jetë përpjekja jote e fundit."
328msgstr "Kjo do to jetë përpjekja jote e fundit."
329
329
330−#: qml/Greeter/NarrowView.qml:57
330+#: qml/Greeter/NarrowView.qml:58
331msgid ""
331msgid ""
332"If passphrase is entered incorrectly, your phone will conduct a factory "
332"If passphrase is entered incorrectly, your phone will conduct a factory "
333"reset and all personal data will be deleted."
333"reset and all personal data will be deleted."
334msgstr ""
334msgstr ""
335
335
336−#: qml/Greeter/NarrowView.qml:58
336+#: qml/Greeter/NarrowView.qml:59
337msgid ""
337msgid ""
338"If passcode is entered incorrectly, your phone will conduct a factory reset "
338"If passcode is entered incorrectly, your phone will conduct a factory reset "
339"and all personal data will be deleted."
339"and all personal data will be deleted."
340msgstr ""
340msgstr ""
341
341
342−#: qml/Greeter/NarrowView.qml:115
342+#: qml/Greeter/NarrowView.qml:116
343#, qt-format
343#, qt-format
344msgid "Enter %1"
344msgid "Enter %1"
345msgstr ""
345msgstr ""
346
346
347−#: qml/Greeter/NarrowView.qml:116 qml/Wizard/Pages/passwd-set.qml:60
347+#: qml/Greeter/NarrowView.qml:117 qml/Wizard/Pages/passwd-set.qml:60
348msgid "Enter passphrase"
348msgid "Enter passphrase"
349msgstr ""
349msgstr ""
350
350
351−#: qml/Greeter/NarrowView.qml:117
351+#: qml/Greeter/NarrowView.qml:118
352msgid "Enter passcode"
352msgid "Enter passcode"
353msgstr ""
353msgstr ""
354
354
355−#: qml/Greeter/NarrowView.qml:118
355+#: qml/Greeter/NarrowView.qml:119
356#, qt-format
356#, qt-format
357msgid "Sorry, incorrect %1"
357msgid "Sorry, incorrect %1"
358msgstr ""
358msgstr ""
359
359
360−#: qml/Greeter/NarrowView.qml:119
360+#: qml/Greeter/NarrowView.qml:120
361msgid "Sorry, incorrect passphrase"
361msgid "Sorry, incorrect passphrase"
362msgstr ""
362msgstr ""
363
363
364−#: qml/Greeter/NarrowView.qml:120
364+#: qml/Greeter/NarrowView.qml:121
365+msgctxt "passphrase"
365msgid "Please re-enter"
366msgid "Please re-enter"
366msgstr ""
367msgstr ""
367
368
368−#: qml/Greeter/NarrowView.qml:121
369+#: qml/Greeter/NarrowView.qml:122
369msgid "Sorry, incorrect passcode"
370msgid "Sorry, incorrect passcode"
370msgstr ""
371msgstr ""
371
372
@@ -515,38 +516,6 @@ msgctxt "Button: Go back one page in the Wizard"
515msgid "Back"
516msgid "Back"
516msgstr "Mbrapsht"
517msgstr "Mbrapsht"
517
518
518−#: qml/Wizard/Pages/here-terms.qml:27
519−msgid "Terms & Conditions"
520−msgstr "Termat dhe Kushtet"
521−
522−#: qml/Wizard/Pages/passwd-confirm.qml:49
523−msgid "Confirm passphrase"
524−msgstr "Konfirmo fjalëkalimin"
525−
526−#: qml/Wizard/Pages/passwd-confirm.qml:50
527−msgid "Confirm passcode"
528−msgstr ""
529−
530−#: qml/Wizard/Pages/passwd-confirm.qml:53
531−#: qml/Wizard/Pages/passwd-confirm.qml:54
532−msgid "Please try again."
533−msgstr ""
534−
535−#: qml/Wizard/Pages/passwd-confirm.qml:82 qml/Wizard/Pages/passwd-set.qml:90
536−#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:128
537−#: qml/Wizard/Pages/40-wifi.qml:215 qml/Wizard/Pages/50-location.qml:131
538−#: qml/Wizard/Pages/60-reporting.qml:50
539−msgid "Continue"
540−msgstr "Vazhdo"
541−
542−#: qml/Wizard/Pages/passwd-set.qml:61
543−msgid "Choose your passcode"
544−msgstr ""
545−
546−#: qml/Wizard/Pages/passwd-set.qml:68
547−msgid "Passphrase must be 4 characters long"
548−msgstr ""
549−
550#: qml/Wizard/Pages/10-welcome.qml:27
519#: qml/Wizard/Pages/10-welcome.qml:27
551msgid "Hi!"
520msgid "Hi!"
552msgstr "Përshëndetje!"
521msgstr "Përshëndetje!"
@@ -559,6 +528,13 @@ msgstr "Mirëseerdhët në telefonin tuaj Ubuntu."
559msgid "Let’s get started."
528msgid "Let’s get started."
560msgstr "Le t'ia nisim."
529msgstr "Le t'ia nisim."
561
530
531+#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:128
532+#: qml/Wizard/Pages/40-wifi.qml:215 qml/Wizard/Pages/50-location.qml:131
533+#: qml/Wizard/Pages/60-reporting.qml:50 qml/Wizard/Pages/passwd-confirm.qml:82
534+#: qml/Wizard/Pages/passwd-set.qml:90
535+msgid "Continue"
536+msgstr "Vazhdo"
537+
562#: qml/Wizard/Pages/20-sim.qml:25
538#: qml/Wizard/Pages/20-sim.qml:25
563msgid "Add a SIM card and restart your device"
539msgid "Add a SIM card and restart your device"
564msgstr ""
540msgstr ""
@@ -684,6 +660,31 @@ msgstr "Telefoni juaj tani është gati për përdorim."
684msgid "Finish"
660msgid "Finish"
685msgstr "Përfundo"
661msgstr "Përfundo"
686
662
663+#: qml/Wizard/Pages/here-terms.qml:27
664+msgid "Terms & Conditions"
665+msgstr "Termat dhe Kushtet"
666+
667+#: qml/Wizard/Pages/passwd-confirm.qml:49
668+msgid "Confirm passphrase"
669+msgstr "Konfirmo fjalëkalimin"
670+
671+#: qml/Wizard/Pages/passwd-confirm.qml:50
672+msgid "Confirm passcode"
673+msgstr ""
674+
675+#: qml/Wizard/Pages/passwd-confirm.qml:53
676+#: qml/Wizard/Pages/passwd-confirm.qml:54
677+msgid "Please try again."
678+msgstr ""
679+
680+#: qml/Wizard/Pages/passwd-set.qml:61
681+msgid "Choose your passcode"
682+msgstr ""
683+
684+#: qml/Wizard/Pages/passwd-set.qml:68
685+msgid "Passphrase must be 4 characters long"
686+msgstr ""
687+
687#. Translators: This is the arrow for "Back" buttons
688#. Translators: This is the arrow for "Back" buttons
688#: qml/Wizard/StackButton.qml:39
689#: qml/Wizard/StackButton.qml:39
689#, qt-format
690#, qt-format
po/sr.po+55−51
@@ -8,7 +8,7 @@ msgid ""
8msgstr ""
8msgstr ""
9"Project-Id-Version: unity\n"
9"Project-Id-Version: unity\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: 2015-06-22 12:00+0200\n"
11+"POT-Creation-Date: 2015-07-17 10:10+0200\n"
12"PO-Revision-Date: 2015-04-13 15:19+0000\n"
12"PO-Revision-Date: 2015-04-13 15:19+0000\n"
13"Last-Translator: Данило Шеган <Unknown>\n"
13"Last-Translator: Данило Шеган <Unknown>\n"
14"Language-Team: српски <xfce4@xfce4.org>\n"
14"Language-Team: српски <xfce4@xfce4.org>\n"
@@ -17,8 +17,8 @@ msgstr ""
17"Content-Transfer-Encoding: 8bit\n"
17"Content-Transfer-Encoding: 8bit\n"
18"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
18"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
19"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
19"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
20−"X-Launchpad-Export-Date: 2015-07-04 05:37+0000\n"
20+"X-Launchpad-Export-Date: 2015-07-25 05:39+0000\n"
21−"X-Generator: Launchpad (build 17597)\n"
21+"X-Generator: Launchpad (build 17628)\n"
22"Language: sr\n"
22"Language: sr\n"
23
23
24#: plugins/LightDM/Greeter.cpp:112
24#: plugins/LightDM/Greeter.cpp:112
@@ -229,15 +229,15 @@ msgstr "Хитан позив"
229msgid "OK"
229msgid "OK"
230msgstr "У реду"
230msgstr "У реду"
231
231
232−#: qml/Dash/GenericScopeView.qml:532 qml/Dash/GenericScopeView.qml:690
232+#: qml/Dash/GenericScopeView.qml:539 qml/Dash/GenericScopeView.qml:697
233msgid "See less"
233msgid "See less"
234msgstr "Сажетије"
234msgstr "Сажетије"
235
235
236−#: qml/Dash/GenericScopeView.qml:532
236+#: qml/Dash/GenericScopeView.qml:539
237msgid "See all"
237msgid "See all"
238msgstr "Опширније"
238msgstr "Опширније"
239
239
240−#: qml/Dash/GenericScopeView.qml:594
240+#: qml/Dash/GenericScopeView.qml:601
241msgctxt "Label: Hint for dash search line edit"
241msgctxt "Label: Hint for dash search line edit"
242msgid "Search"
242msgid "Search"
243msgstr "Претрага"
243msgstr "Претрага"
@@ -321,19 +321,19 @@ msgstr "Покушај поново"
321msgid "Tap to unlock"
321msgid "Tap to unlock"
322msgstr "Додирните да откључате"
322msgstr "Додирните да откључате"
323
323
324−#: qml/Greeter/NarrowView.qml:53 qml/Wizard/Pages/passwd-confirm.qml:53
324+#: qml/Greeter/NarrowView.qml:54 qml/Wizard/Pages/passwd-confirm.qml:53
325msgid "Sorry, incorrect passphrase."
325msgid "Sorry, incorrect passphrase."
326msgstr "Жао ми је, погрешна лозинка."
326msgstr "Жао ми је, погрешна лозинка."
327
327
328−#: qml/Greeter/NarrowView.qml:54 qml/Wizard/Pages/passwd-confirm.qml:54
328+#: qml/Greeter/NarrowView.qml:55 qml/Wizard/Pages/passwd-confirm.qml:54
329msgid "Sorry, incorrect passcode."
329msgid "Sorry, incorrect passcode."
330msgstr "Жао ми је, погрешан код."
330msgstr "Жао ми је, погрешан код."
331
331
332−#: qml/Greeter/NarrowView.qml:55
332+#: qml/Greeter/NarrowView.qml:56
333msgid "This will be your last attempt."
333msgid "This will be your last attempt."
334msgstr "Ово је ваш последњи покушај."
334msgstr "Ово је ваш последњи покушај."
335
335
336−#: qml/Greeter/NarrowView.qml:57
336+#: qml/Greeter/NarrowView.qml:58
337msgid ""
337msgid ""
338"If passphrase is entered incorrectly, your phone will conduct a factory "
338"If passphrase is entered incorrectly, your phone will conduct a factory "
339"reset and all personal data will be deleted."
339"reset and all personal data will be deleted."
@@ -341,7 +341,7 @@ msgstr ""
341"Ако се унесе погрешна лозинка, ваш телефон ће се ресетовати и сви лични "
341"Ако се унесе погрешна лозинка, ваш телефон ће се ресетовати и сви лични "
342"подаци ће бити обрисани."
342"подаци ће бити обрисани."
343
343
344−#: qml/Greeter/NarrowView.qml:58
344+#: qml/Greeter/NarrowView.qml:59
345msgid ""
345msgid ""
346"If passcode is entered incorrectly, your phone will conduct a factory reset "
346"If passcode is entered incorrectly, your phone will conduct a factory reset "
347"and all personal data will be deleted."
347"and all personal data will be deleted."
@@ -349,33 +349,34 @@ msgstr ""
349"Ако се унесе погрешан код, ваш телефон ће се ресетовати и сви лични подаци "
349"Ако се унесе погрешан код, ваш телефон ће се ресетовати и сви лични подаци "
350"ће бити обрисани."
350"ће бити обрисани."
351
351
352−#: qml/Greeter/NarrowView.qml:115
352+#: qml/Greeter/NarrowView.qml:116
353#, qt-format
353#, qt-format
354msgid "Enter %1"
354msgid "Enter %1"
355msgstr "Унеси %1"
355msgstr "Унеси %1"
356
356
357−#: qml/Greeter/NarrowView.qml:116 qml/Wizard/Pages/passwd-set.qml:60
357+#: qml/Greeter/NarrowView.qml:117 qml/Wizard/Pages/passwd-set.qml:60
358msgid "Enter passphrase"
358msgid "Enter passphrase"
359msgstr "Унесите лозинку"
359msgstr "Унесите лозинку"
360
360
361−#: qml/Greeter/NarrowView.qml:117
361+#: qml/Greeter/NarrowView.qml:118
362msgid "Enter passcode"
362msgid "Enter passcode"
363msgstr "Унесите шифру"
363msgstr "Унесите шифру"
364
364
365−#: qml/Greeter/NarrowView.qml:118
365+#: qml/Greeter/NarrowView.qml:119
366#, qt-format
366#, qt-format
367msgid "Sorry, incorrect %1"
367msgid "Sorry, incorrect %1"
368msgstr "Жао ми је, погрешан %1"
368msgstr "Жао ми је, погрешан %1"
369
369
370−#: qml/Greeter/NarrowView.qml:119
370+#: qml/Greeter/NarrowView.qml:120
371msgid "Sorry, incorrect passphrase"
371msgid "Sorry, incorrect passphrase"
372msgstr "Жао ми је, погрешна лозинка"
372msgstr "Жао ми је, погрешна лозинка"
373
373
374−#: qml/Greeter/NarrowView.qml:120
374+#: qml/Greeter/NarrowView.qml:121
375+msgctxt "passphrase"
375msgid "Please re-enter"
376msgid "Please re-enter"
376−msgstr "Молим, унесите поново"
377+msgstr ""
377
378
378−#: qml/Greeter/NarrowView.qml:121
379+#: qml/Greeter/NarrowView.qml:122
379msgid "Sorry, incorrect passcode"
380msgid "Sorry, incorrect passcode"
380msgstr "Жао ми је, погрешан код"
381msgstr "Жао ми је, погрешан код"
381
382
@@ -525,38 +526,6 @@ msgctxt "Button: Go back one page in the Wizard"
525msgid "Back"
526msgid "Back"
526msgstr "Назад"
527msgstr "Назад"
527
528
528−#: qml/Wizard/Pages/here-terms.qml:27
529−msgid "Terms & Conditions"
530−msgstr "Услови употребе"
531−
532−#: qml/Wizard/Pages/passwd-confirm.qml:49
533−msgid "Confirm passphrase"
534−msgstr "Потврдите лозинку"
535−
536−#: qml/Wizard/Pages/passwd-confirm.qml:50
537−msgid "Confirm passcode"
538−msgstr "Потврдите шифру"
539−
540−#: qml/Wizard/Pages/passwd-confirm.qml:53
541−#: qml/Wizard/Pages/passwd-confirm.qml:54
542−msgid "Please try again."
543−msgstr "Молим, покушајте поново"
544−
545−#: qml/Wizard/Pages/passwd-confirm.qml:82 qml/Wizard/Pages/passwd-set.qml:90
546−#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:128
547−#: qml/Wizard/Pages/40-wifi.qml:215 qml/Wizard/Pages/50-location.qml:131
548−#: qml/Wizard/Pages/60-reporting.qml:50
549−msgid "Continue"
550−msgstr "Настави"
551−
552−#: qml/Wizard/Pages/passwd-set.qml:61
553−msgid "Choose your passcode"
554−msgstr "Изаберите своју шифру"
555−
556−#: qml/Wizard/Pages/passwd-set.qml:68
557−msgid "Passphrase must be 4 characters long"
558−msgstr "Лозинка мора имати бар 4 знака"
559−
560#: qml/Wizard/Pages/10-welcome.qml:27
529#: qml/Wizard/Pages/10-welcome.qml:27
561msgid "Hi!"
530msgid "Hi!"
562msgstr "Здраво!"
531msgstr "Здраво!"
@@ -569,6 +538,13 @@ msgstr "Добродошли у свој Убунту телефон."
569msgid "Let’s get started."
538msgid "Let’s get started."
570msgstr "Почнимо."
539msgstr "Почнимо."
571
540
541+#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:128
542+#: qml/Wizard/Pages/40-wifi.qml:215 qml/Wizard/Pages/50-location.qml:131
543+#: qml/Wizard/Pages/60-reporting.qml:50 qml/Wizard/Pages/passwd-confirm.qml:82
544+#: qml/Wizard/Pages/passwd-set.qml:90
545+msgid "Continue"
546+msgstr "Настави"
547+
572#: qml/Wizard/Pages/20-sim.qml:25
548#: qml/Wizard/Pages/20-sim.qml:25
573msgid "Add a SIM card and restart your device"
549msgid "Add a SIM card and restart your device"
574msgstr "Додајте СИМ картицу и поново покрените уређај"
550msgstr "Додајте СИМ картицу и поново покрените уређај"
@@ -701,6 +677,31 @@ msgstr "Телефон је спреман за употребу."
701msgid "Finish"
677msgid "Finish"
702msgstr "Крај"
678msgstr "Крај"
703
679
680+#: qml/Wizard/Pages/here-terms.qml:27
681+msgid "Terms & Conditions"
682+msgstr "Услови употребе"
683+
684+#: qml/Wizard/Pages/passwd-confirm.qml:49
685+msgid "Confirm passphrase"
686+msgstr "Потврдите лозинку"
687+
688+#: qml/Wizard/Pages/passwd-confirm.qml:50
689+msgid "Confirm passcode"
690+msgstr "Потврдите шифру"
691+
692+#: qml/Wizard/Pages/passwd-confirm.qml:53
693+#: qml/Wizard/Pages/passwd-confirm.qml:54
694+msgid "Please try again."
695+msgstr "Молим, покушајте поново"
696+
697+#: qml/Wizard/Pages/passwd-set.qml:61
698+msgid "Choose your passcode"
699+msgstr "Изаберите своју шифру"
700+
701+#: qml/Wizard/Pages/passwd-set.qml:68
702+msgid "Passphrase must be 4 characters long"
703+msgstr "Лозинка мора имати бар 4 знака"
704+
704#. Translators: This is the arrow for "Back" buttons
705#. Translators: This is the arrow for "Back" buttons
705#: qml/Wizard/StackButton.qml:39
706#: qml/Wizard/StackButton.qml:39
706#, qt-format
707#, qt-format
@@ -800,3 +801,6 @@ msgstr "%1 〉"
800
801
801#~ msgid "Restart"
802#~ msgid "Restart"
802#~ msgstr "Поново покрени"
803#~ msgstr "Поново покрени"
804+
805+#~ msgid "Please re-enter"
806+#~ msgstr "Молим, унесите поново"
po/sv.po+55−51
@@ -7,7 +7,7 @@ msgid ""
7msgstr ""
7msgstr ""
8"Project-Id-Version: unity\n"
8"Project-Id-Version: unity\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2015-06-22 12:00+0200\n"
10+"POT-Creation-Date: 2015-07-17 10:10+0200\n"
11"PO-Revision-Date: 2015-07-12 22:17+0000\n"
11"PO-Revision-Date: 2015-07-12 22:17+0000\n"
12"Last-Translator: Josef Andersson <Unknown>\n"
12"Last-Translator: Josef Andersson <Unknown>\n"
13"Language-Team: Swedish\n"
13"Language-Team: Swedish\n"
@@ -15,8 +15,8 @@ msgstr ""
15"Content-Type: text/plain; charset=UTF-8\n"
15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n"
16"Content-Transfer-Encoding: 8bit\n"
17"Plural-Forms: nplurals=2; plural=n != 1;\n"
17"Plural-Forms: nplurals=2; plural=n != 1;\n"
18−"X-Launchpad-Export-Date: 2015-07-13 05:36+0000\n"
18+"X-Launchpad-Export-Date: 2015-07-25 05:39+0000\n"
19−"X-Generator: Launchpad (build 17620)\n"
19+"X-Generator: Launchpad (build 17628)\n"
20"Language: sv\n"
20"Language: sv\n"
21
21
22#: plugins/LightDM/Greeter.cpp:112
22#: plugins/LightDM/Greeter.cpp:112
@@ -226,15 +226,15 @@ msgstr "Nödsamtal"
226msgid "OK"
226msgid "OK"
227msgstr "OK"
227msgstr "OK"
228
228
229−#: qml/Dash/GenericScopeView.qml:532 qml/Dash/GenericScopeView.qml:690
229+#: qml/Dash/GenericScopeView.qml:539 qml/Dash/GenericScopeView.qml:697
230msgid "See less"
230msgid "See less"
231msgstr "Visa mindre"
231msgstr "Visa mindre"
232
232
233−#: qml/Dash/GenericScopeView.qml:532
233+#: qml/Dash/GenericScopeView.qml:539
234msgid "See all"
234msgid "See all"
235msgstr "Visa alla"
235msgstr "Visa alla"
236
236
237−#: qml/Dash/GenericScopeView.qml:594
237+#: qml/Dash/GenericScopeView.qml:601
238msgctxt "Label: Hint for dash search line edit"
238msgctxt "Label: Hint for dash search line edit"
239msgid "Search"
239msgid "Search"
240msgstr "Sök"
240msgstr "Sök"
@@ -318,19 +318,19 @@ msgstr "Försök igen"
318msgid "Tap to unlock"
318msgid "Tap to unlock"
319msgstr "Tryck för att låsa upp"
319msgstr "Tryck för att låsa upp"
320
320
321−#: qml/Greeter/NarrowView.qml:53 qml/Wizard/Pages/passwd-confirm.qml:53
321+#: qml/Greeter/NarrowView.qml:54 qml/Wizard/Pages/passwd-confirm.qml:53
322msgid "Sorry, incorrect passphrase."
322msgid "Sorry, incorrect passphrase."
323msgstr "Felaktig lösenfras."
323msgstr "Felaktig lösenfras."
324
324
325−#: qml/Greeter/NarrowView.qml:54 qml/Wizard/Pages/passwd-confirm.qml:54
325+#: qml/Greeter/NarrowView.qml:55 qml/Wizard/Pages/passwd-confirm.qml:54
326msgid "Sorry, incorrect passcode."
326msgid "Sorry, incorrect passcode."
327msgstr "Felaktig lösenkod."
327msgstr "Felaktig lösenkod."
328
328
329−#: qml/Greeter/NarrowView.qml:55
329+#: qml/Greeter/NarrowView.qml:56
330msgid "This will be your last attempt."
330msgid "This will be your last attempt."
331msgstr "Detta är ditt sista försök."
331msgstr "Detta är ditt sista försök."
332
332
333−#: qml/Greeter/NarrowView.qml:57
333+#: qml/Greeter/NarrowView.qml:58
334msgid ""
334msgid ""
335"If passphrase is entered incorrectly, your phone will conduct a factory "
335"If passphrase is entered incorrectly, your phone will conduct a factory "
336"reset and all personal data will be deleted."
336"reset and all personal data will be deleted."
@@ -338,7 +338,7 @@ msgstr ""
338"Om lösenfrasen anges inkorrekt kommer telefonen att fabrikåterställas och "
338"Om lösenfrasen anges inkorrekt kommer telefonen att fabrikåterställas och "
339"all personlig data kommer att tas bort."
339"all personlig data kommer att tas bort."
340
340
341−#: qml/Greeter/NarrowView.qml:58
341+#: qml/Greeter/NarrowView.qml:59
342msgid ""
342msgid ""
343"If passcode is entered incorrectly, your phone will conduct a factory reset "
343"If passcode is entered incorrectly, your phone will conduct a factory reset "
344"and all personal data will be deleted."
344"and all personal data will be deleted."
@@ -346,33 +346,34 @@ msgstr ""
346"Om lösenkoden anges felaktigt kommer telefonen att fabrikåterställas och all "
346"Om lösenkoden anges felaktigt kommer telefonen att fabrikåterställas och all "
347"personlig data kommer att tas bort."
347"personlig data kommer att tas bort."
348
348
349−#: qml/Greeter/NarrowView.qml:115
349+#: qml/Greeter/NarrowView.qml:116
350#, qt-format
350#, qt-format
351msgid "Enter %1"
351msgid "Enter %1"
352msgstr "Ange %1"
352msgstr "Ange %1"
353
353
354−#: qml/Greeter/NarrowView.qml:116 qml/Wizard/Pages/passwd-set.qml:60
354+#: qml/Greeter/NarrowView.qml:117 qml/Wizard/Pages/passwd-set.qml:60
355msgid "Enter passphrase"
355msgid "Enter passphrase"
356msgstr "Ange lösenfras"
356msgstr "Ange lösenfras"
357
357
358−#: qml/Greeter/NarrowView.qml:117
358+#: qml/Greeter/NarrowView.qml:118
359msgid "Enter passcode"
359msgid "Enter passcode"
360msgstr "Ange lösenkod"
360msgstr "Ange lösenkod"
361
361
362−#: qml/Greeter/NarrowView.qml:118
362+#: qml/Greeter/NarrowView.qml:119
363#, qt-format
363#, qt-format
364msgid "Sorry, incorrect %1"
364msgid "Sorry, incorrect %1"
365msgstr "Felaktig %1"
365msgstr "Felaktig %1"
366
366
367−#: qml/Greeter/NarrowView.qml:119
367+#: qml/Greeter/NarrowView.qml:120
368msgid "Sorry, incorrect passphrase"
368msgid "Sorry, incorrect passphrase"
369msgstr "Felaktig lösenfras"
369msgstr "Felaktig lösenfras"
370
370
371−#: qml/Greeter/NarrowView.qml:120
371+#: qml/Greeter/NarrowView.qml:121
372+msgctxt "passphrase"
372msgid "Please re-enter"
373msgid "Please re-enter"
373−msgstr "Ange igen"
374+msgstr ""
374
375
375−#: qml/Greeter/NarrowView.qml:121
376+#: qml/Greeter/NarrowView.qml:122
376msgid "Sorry, incorrect passcode"
377msgid "Sorry, incorrect passcode"
377msgstr "Felaktig lösenkod"
378msgstr "Felaktig lösenkod"
378
379
@@ -522,38 +523,6 @@ msgctxt "Button: Go back one page in the Wizard"
522msgid "Back"
523msgid "Back"
523msgstr "Bakåt"
524msgstr "Bakåt"
524
525
525−#: qml/Wizard/Pages/here-terms.qml:27
526−msgid "Terms & Conditions"
527−msgstr "Användarvillkor"
528−
529−#: qml/Wizard/Pages/passwd-confirm.qml:49
530−msgid "Confirm passphrase"
531−msgstr "Bekräfta lösenfras"
532−
533−#: qml/Wizard/Pages/passwd-confirm.qml:50
534−msgid "Confirm passcode"
535−msgstr "Bekräfta lösenkod"
536−
537−#: qml/Wizard/Pages/passwd-confirm.qml:53
538−#: qml/Wizard/Pages/passwd-confirm.qml:54
539−msgid "Please try again."
540−msgstr "Försök igen."
541−
542−#: qml/Wizard/Pages/passwd-confirm.qml:82 qml/Wizard/Pages/passwd-set.qml:90
543−#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:128
544−#: qml/Wizard/Pages/40-wifi.qml:215 qml/Wizard/Pages/50-location.qml:131
545−#: qml/Wizard/Pages/60-reporting.qml:50
546−msgid "Continue"
547−msgstr "Fortsätt"
548−
549−#: qml/Wizard/Pages/passwd-set.qml:61
550−msgid "Choose your passcode"
551−msgstr "Välj din lösenkod"
552−
553−#: qml/Wizard/Pages/passwd-set.qml:68
554−msgid "Passphrase must be 4 characters long"
555−msgstr "Lösenfras måste vara fyra tecken lång"
556−
557#: qml/Wizard/Pages/10-welcome.qml:27
526#: qml/Wizard/Pages/10-welcome.qml:27
558msgid "Hi!"
527msgid "Hi!"
559msgstr "Hej!"
528msgstr "Hej!"
@@ -566,6 +535,13 @@ msgstr "Välkommen till din Ubuntutelefon."
566msgid "Let’s get started."
535msgid "Let’s get started."
567msgstr "Låt oss komma igång."
536msgstr "Låt oss komma igång."
568
537
538+#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:128
539+#: qml/Wizard/Pages/40-wifi.qml:215 qml/Wizard/Pages/50-location.qml:131
540+#: qml/Wizard/Pages/60-reporting.qml:50 qml/Wizard/Pages/passwd-confirm.qml:82
541+#: qml/Wizard/Pages/passwd-set.qml:90
542+msgid "Continue"
543+msgstr "Fortsätt"
544+
569#: qml/Wizard/Pages/20-sim.qml:25
545#: qml/Wizard/Pages/20-sim.qml:25
570msgid "Add a SIM card and restart your device"
546msgid "Add a SIM card and restart your device"
571msgstr "Lägg till ett SIM-kort och starta om din enhet"
547msgstr "Lägg till ett SIM-kort och starta om din enhet"
@@ -699,6 +675,31 @@ msgstr "Din telefon är nu redo att användas."
699msgid "Finish"
675msgid "Finish"
700msgstr "Färdigställ"
676msgstr "Färdigställ"
701
677
678+#: qml/Wizard/Pages/here-terms.qml:27
679+msgid "Terms & Conditions"
680+msgstr "Användarvillkor"
681+
682+#: qml/Wizard/Pages/passwd-confirm.qml:49
683+msgid "Confirm passphrase"
684+msgstr "Bekräfta lösenfras"
685+
686+#: qml/Wizard/Pages/passwd-confirm.qml:50
687+msgid "Confirm passcode"
688+msgstr "Bekräfta lösenkod"
689+
690+#: qml/Wizard/Pages/passwd-confirm.qml:53
691+#: qml/Wizard/Pages/passwd-confirm.qml:54
692+msgid "Please try again."
693+msgstr "Försök igen."
694+
695+#: qml/Wizard/Pages/passwd-set.qml:61
696+msgid "Choose your passcode"
697+msgstr "Välj din lösenkod"
698+
699+#: qml/Wizard/Pages/passwd-set.qml:68
700+msgid "Passphrase must be 4 characters long"
701+msgstr "Lösenfras måste vara fyra tecken lång"
702+
702#. Translators: This is the arrow for "Back" buttons
703#. Translators: This is the arrow for "Back" buttons
703#: qml/Wizard/StackButton.qml:39
704#: qml/Wizard/StackButton.qml:39
704#, qt-format
705#, qt-format
@@ -801,3 +802,6 @@ msgstr "%1 〉"
801
802
802#~ msgid "Manage Scopes"
803#~ msgid "Manage Scopes"
803#~ msgstr "Hantera vyer"
804#~ msgstr "Hantera vyer"
805+
806+#~ msgid "Please re-enter"
807+#~ msgstr "Ange igen"
po/sw.po+54−50
@@ -7,7 +7,7 @@ msgid ""
7msgstr ""
7msgstr ""
8"Project-Id-Version: unity8\n"
8"Project-Id-Version: unity8\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2015-06-22 12:00+0200\n"
10+"POT-Creation-Date: 2015-07-17 10:10+0200\n"
11"PO-Revision-Date: 2015-07-17 20:02+0000\n"
11"PO-Revision-Date: 2015-07-17 20:02+0000\n"
12"Last-Translator: Valentine <mwangi_valentino@yahoo.com>\n"
12"Last-Translator: Valentine <mwangi_valentino@yahoo.com>\n"
13"Language-Team: Swahili <sw@li.org>\n"
13"Language-Team: Swahili <sw@li.org>\n"
@@ -15,7 +15,7 @@ msgstr ""
15"Content-Type: text/plain; charset=UTF-8\n"
15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n"
16"Content-Transfer-Encoding: 8bit\n"
17"Plural-Forms: nplurals=2; plural=n != 1;\n"
17"Plural-Forms: nplurals=2; plural=n != 1;\n"
18−"X-Launchpad-Export-Date: 2015-07-21 05:35+0000\n"
18+"X-Launchpad-Export-Date: 2015-07-25 05:39+0000\n"
19"X-Generator: Launchpad (build 17628)\n"
19"X-Generator: Launchpad (build 17628)\n"
20
20
21#: plugins/LightDM/Greeter.cpp:112
21#: plugins/LightDM/Greeter.cpp:112
@@ -225,15 +225,15 @@ msgstr "Simu ya dharura"
225msgid "OK"
225msgid "OK"
226msgstr "Sawa"
226msgstr "Sawa"
227
227
228−#: qml/Dash/GenericScopeView.qml:532 qml/Dash/GenericScopeView.qml:690
228+#: qml/Dash/GenericScopeView.qml:539 qml/Dash/GenericScopeView.qml:697
229msgid "See less"
229msgid "See less"
230msgstr "Onyesha kidogo"
230msgstr "Onyesha kidogo"
231
231
232−#: qml/Dash/GenericScopeView.qml:532
232+#: qml/Dash/GenericScopeView.qml:539
233msgid "See all"
233msgid "See all"
234msgstr "Onyesha zote"
234msgstr "Onyesha zote"
235
235
236−#: qml/Dash/GenericScopeView.qml:594
236+#: qml/Dash/GenericScopeView.qml:601
237msgctxt "Label: Hint for dash search line edit"
237msgctxt "Label: Hint for dash search line edit"
238msgid "Search"
238msgid "Search"
239msgstr "Tafuta"
239msgstr "Tafuta"
@@ -317,19 +317,19 @@ msgstr "Jaribu tena"
317msgid "Tap to unlock"
317msgid "Tap to unlock"
318msgstr "Gusa ufungue"
318msgstr "Gusa ufungue"
319
319
320−#: qml/Greeter/NarrowView.qml:53 qml/Wizard/Pages/passwd-confirm.qml:53
320+#: qml/Greeter/NarrowView.qml:54 qml/Wizard/Pages/passwd-confirm.qml:53
321msgid "Sorry, incorrect passphrase."
321msgid "Sorry, incorrect passphrase."
322msgstr "Samahani, neno siri si hilo"
322msgstr "Samahani, neno siri si hilo"
323
323
324−#: qml/Greeter/NarrowView.qml:54 qml/Wizard/Pages/passwd-confirm.qml:54
324+#: qml/Greeter/NarrowView.qml:55 qml/Wizard/Pages/passwd-confirm.qml:54
325msgid "Sorry, incorrect passcode."
325msgid "Sorry, incorrect passcode."
326msgstr "Samahani, neno siri si hilo"
326msgstr "Samahani, neno siri si hilo"
327
327
328−#: qml/Greeter/NarrowView.qml:55
328+#: qml/Greeter/NarrowView.qml:56
329msgid "This will be your last attempt."
329msgid "This will be your last attempt."
330msgstr "Hii ndiyo nafasi ya mwisho"
330msgstr "Hii ndiyo nafasi ya mwisho"
331
331
332−#: qml/Greeter/NarrowView.qml:57
332+#: qml/Greeter/NarrowView.qml:58
333msgid ""
333msgid ""
334"If passphrase is entered incorrectly, your phone will conduct a factory "
334"If passphrase is entered incorrectly, your phone will conduct a factory "
335"reset and all personal data will be deleted."
335"reset and all personal data will be deleted."
@@ -337,7 +337,7 @@ msgstr ""
337"Kama utabonyeza neno la siri lisilofaa, simu yako itajiweka upya na data "
337"Kama utabonyeza neno la siri lisilofaa, simu yako itajiweka upya na data "
338"yako yote itafutwa."
338"yako yote itafutwa."
339
339
340−#: qml/Greeter/NarrowView.qml:58
340+#: qml/Greeter/NarrowView.qml:59
341msgid ""
341msgid ""
342"If passcode is entered incorrectly, your phone will conduct a factory reset "
342"If passcode is entered incorrectly, your phone will conduct a factory reset "
343"and all personal data will be deleted."
343"and all personal data will be deleted."
@@ -345,33 +345,34 @@ msgstr ""
345"Kama utabonyeza neno la siri lisilofaa, simu yako itajiweka upya na data "
345"Kama utabonyeza neno la siri lisilofaa, simu yako itajiweka upya na data "
346"yako yote itafutwa."
346"yako yote itafutwa."
347
347
348−#: qml/Greeter/NarrowView.qml:115
348+#: qml/Greeter/NarrowView.qml:116
349#, qt-format
349#, qt-format
350msgid "Enter %1"
350msgid "Enter %1"
351msgstr "Bonyeza %1"
351msgstr "Bonyeza %1"
352
352
353−#: qml/Greeter/NarrowView.qml:116 qml/Wizard/Pages/passwd-set.qml:60
353+#: qml/Greeter/NarrowView.qml:117 qml/Wizard/Pages/passwd-set.qml:60
354msgid "Enter passphrase"
354msgid "Enter passphrase"
355msgstr "Bonyeza neno siri"
355msgstr "Bonyeza neno siri"
356
356
357−#: qml/Greeter/NarrowView.qml:117
357+#: qml/Greeter/NarrowView.qml:118
358msgid "Enter passcode"
358msgid "Enter passcode"
359msgstr "Bonyeza neno la siri"
359msgstr "Bonyeza neno la siri"
360
360
361−#: qml/Greeter/NarrowView.qml:118
361+#: qml/Greeter/NarrowView.qml:119
362#, qt-format
362#, qt-format
363msgid "Sorry, incorrect %1"
363msgid "Sorry, incorrect %1"
364msgstr "Samahani, %1 halidhihirishi"
364msgstr "Samahani, %1 halidhihirishi"
365
365
366−#: qml/Greeter/NarrowView.qml:119
366+#: qml/Greeter/NarrowView.qml:120
367msgid "Sorry, incorrect passphrase"
367msgid "Sorry, incorrect passphrase"
368msgstr "Samahani, neno la siri si hilo"
368msgstr "Samahani, neno la siri si hilo"
369
369
370−#: qml/Greeter/NarrowView.qml:120
370+#: qml/Greeter/NarrowView.qml:121
371+msgctxt "passphrase"
371msgid "Please re-enter"
372msgid "Please re-enter"
372−msgstr "Tafadhali bonyeza tena"
373+msgstr ""
373
374
374−#: qml/Greeter/NarrowView.qml:121
375+#: qml/Greeter/NarrowView.qml:122
375msgid "Sorry, incorrect passcode"
376msgid "Sorry, incorrect passcode"
376msgstr "Samahani, neno la siri si hilo"
377msgstr "Samahani, neno la siri si hilo"
377
378
@@ -521,38 +522,6 @@ msgctxt "Button: Go back one page in the Wizard"
521msgid "Back"
522msgid "Back"
522msgstr "Nyuma"
523msgstr "Nyuma"
523
524
524−#: qml/Wizard/Pages/here-terms.qml:27
525−msgid "Terms & Conditions"
526−msgstr "Suala na Masharti"
527−
528−#: qml/Wizard/Pages/passwd-confirm.qml:49
529−msgid "Confirm passphrase"
530−msgstr "Thibitisha neno la siri"
531−
532−#: qml/Wizard/Pages/passwd-confirm.qml:50
533−msgid "Confirm passcode"
534−msgstr "Thibitisha neno la siri"
535−
536−#: qml/Wizard/Pages/passwd-confirm.qml:53
537−#: qml/Wizard/Pages/passwd-confirm.qml:54
538−msgid "Please try again."
539−msgstr "Jaribu tena."
540−
541−#: qml/Wizard/Pages/passwd-confirm.qml:82 qml/Wizard/Pages/passwd-set.qml:90
542−#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:128
543−#: qml/Wizard/Pages/40-wifi.qml:215 qml/Wizard/Pages/50-location.qml:131
544−#: qml/Wizard/Pages/60-reporting.qml:50
545−msgid "Continue"
546−msgstr "Endelea"
547−
548−#: qml/Wizard/Pages/passwd-set.qml:61
549−msgid "Choose your passcode"
550−msgstr "Chagua neno lako la siri"
551−
552−#: qml/Wizard/Pages/passwd-set.qml:68
553−msgid "Passphrase must be 4 characters long"
554−msgstr "Neno la siri ni lazima liwe na urefu wa herufi 4"
555−
556#: qml/Wizard/Pages/10-welcome.qml:27
525#: qml/Wizard/Pages/10-welcome.qml:27
557msgid "Hi!"
526msgid "Hi!"
558msgstr "Jambo!"
527msgstr "Jambo!"
@@ -565,6 +534,13 @@ msgstr "Karibu kwenye simu yako ya Ubuntu."
565msgid "Let’s get started."
534msgid "Let’s get started."
566msgstr "Tuanze pamoja."
535msgstr "Tuanze pamoja."
567
536
537+#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:128
538+#: qml/Wizard/Pages/40-wifi.qml:215 qml/Wizard/Pages/50-location.qml:131
539+#: qml/Wizard/Pages/60-reporting.qml:50 qml/Wizard/Pages/passwd-confirm.qml:82
540+#: qml/Wizard/Pages/passwd-set.qml:90
541+msgid "Continue"
542+msgstr "Endelea"
543+
568#: qml/Wizard/Pages/20-sim.qml:25
544#: qml/Wizard/Pages/20-sim.qml:25
569msgid "Add a SIM card and restart your device"
545msgid "Add a SIM card and restart your device"
570msgstr "Ongeza kadi ya SIM halafu uanzishe upya kifaa chako"
546msgstr "Ongeza kadi ya SIM halafu uanzishe upya kifaa chako"
@@ -690,6 +666,31 @@ msgstr ""
690msgid "Finish"
666msgid "Finish"
691msgstr ""
667msgstr ""
692
668
669+#: qml/Wizard/Pages/here-terms.qml:27
670+msgid "Terms & Conditions"
671+msgstr "Suala na Masharti"
672+
673+#: qml/Wizard/Pages/passwd-confirm.qml:49
674+msgid "Confirm passphrase"
675+msgstr "Thibitisha neno la siri"
676+
677+#: qml/Wizard/Pages/passwd-confirm.qml:50
678+msgid "Confirm passcode"
679+msgstr "Thibitisha neno la siri"
680+
681+#: qml/Wizard/Pages/passwd-confirm.qml:53
682+#: qml/Wizard/Pages/passwd-confirm.qml:54
683+msgid "Please try again."
684+msgstr "Jaribu tena."
685+
686+#: qml/Wizard/Pages/passwd-set.qml:61
687+msgid "Choose your passcode"
688+msgstr "Chagua neno lako la siri"
689+
690+#: qml/Wizard/Pages/passwd-set.qml:68
691+msgid "Passphrase must be 4 characters long"
692+msgstr "Neno la siri ni lazima liwe na urefu wa herufi 4"
693+
693#. Translators: This is the arrow for "Back" buttons
694#. Translators: This is the arrow for "Back" buttons
694#: qml/Wizard/StackButton.qml:39
695#: qml/Wizard/StackButton.qml:39
695#, qt-format
696#, qt-format
@@ -710,3 +711,6 @@ msgstr ""
710
711
711#~ msgid "Search"
712#~ msgid "Search"
712#~ msgstr "Tafuta"
713#~ msgstr "Tafuta"
714+
715+#~ msgid "Please re-enter"
716+#~ msgstr "Tafadhali bonyeza tena"
po/ta.po+51−50
@@ -7,7 +7,7 @@ msgid ""
7msgstr ""
7msgstr ""
8"Project-Id-Version: unity8\n"
8"Project-Id-Version: unity8\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2015-06-22 12:00+0200\n"
10+"POT-Creation-Date: 2015-07-17 10:10+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"
@@ -15,8 +15,8 @@ msgstr ""
15"Content-Type: text/plain; charset=UTF-8\n"
15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n"
16"Content-Transfer-Encoding: 8bit\n"
17"Plural-Forms: nplurals=2; plural=n != 1;\n"
17"Plural-Forms: nplurals=2; plural=n != 1;\n"
18−"X-Launchpad-Export-Date: 2015-07-04 05:37+0000\n"
18+"X-Launchpad-Export-Date: 2015-07-25 05:39+0000\n"
19−"X-Generator: Launchpad (build 17597)\n"
19+"X-Generator: Launchpad (build 17628)\n"
20"Language: ta\n"
20"Language: ta\n"
21
21
22#: plugins/LightDM/Greeter.cpp:112
22#: plugins/LightDM/Greeter.cpp:112
@@ -224,15 +224,15 @@ msgstr "அவசர அழைப்பு"
224msgid "OK"
224msgid "OK"
225msgstr ""
225msgstr ""
226
226
227−#: qml/Dash/GenericScopeView.qml:532 qml/Dash/GenericScopeView.qml:690
227+#: qml/Dash/GenericScopeView.qml:539 qml/Dash/GenericScopeView.qml:697
228msgid "See less"
228msgid "See less"
229msgstr ""
229msgstr ""
230
230
231−#: qml/Dash/GenericScopeView.qml:532
231+#: qml/Dash/GenericScopeView.qml:539
232msgid "See all"
232msgid "See all"
233msgstr ""
233msgstr ""
234
234
235−#: qml/Dash/GenericScopeView.qml:594
235+#: qml/Dash/GenericScopeView.qml:601
236msgctxt "Label: Hint for dash search line edit"
236msgctxt "Label: Hint for dash search line edit"
237msgid "Search"
237msgid "Search"
238msgstr ""
238msgstr ""
@@ -316,57 +316,58 @@ msgstr ""
316msgid "Tap to unlock"
316msgid "Tap to unlock"
317msgstr ""
317msgstr ""
318
318
319−#: qml/Greeter/NarrowView.qml:53 qml/Wizard/Pages/passwd-confirm.qml:53
319+#: qml/Greeter/NarrowView.qml:54 qml/Wizard/Pages/passwd-confirm.qml:53
320msgid "Sorry, incorrect passphrase."
320msgid "Sorry, incorrect passphrase."
321msgstr ""
321msgstr ""
322
322
323−#: qml/Greeter/NarrowView.qml:54 qml/Wizard/Pages/passwd-confirm.qml:54
323+#: qml/Greeter/NarrowView.qml:55 qml/Wizard/Pages/passwd-confirm.qml:54
324msgid "Sorry, incorrect passcode."
324msgid "Sorry, incorrect passcode."
325msgstr ""
325msgstr ""
326
326
327−#: qml/Greeter/NarrowView.qml:55
327+#: qml/Greeter/NarrowView.qml:56
328msgid "This will be your last attempt."
328msgid "This will be your last attempt."
329msgstr ""
329msgstr ""
330
330
331−#: qml/Greeter/NarrowView.qml:57
331+#: qml/Greeter/NarrowView.qml:58
332msgid ""
332msgid ""
333"If passphrase is entered incorrectly, your phone will conduct a factory "
333"If passphrase is entered incorrectly, your phone will conduct a factory "
334"reset and all personal data will be deleted."
334"reset and all personal data will be deleted."
335msgstr ""
335msgstr ""
336
336
337−#: qml/Greeter/NarrowView.qml:58
337+#: qml/Greeter/NarrowView.qml:59
338msgid ""
338msgid ""
339"If passcode is entered incorrectly, your phone will conduct a factory reset "
339"If passcode is entered incorrectly, your phone will conduct a factory reset "
340"and all personal data will be deleted."
340"and all personal data will be deleted."
341msgstr ""
341msgstr ""
342
342
343−#: qml/Greeter/NarrowView.qml:115
343+#: qml/Greeter/NarrowView.qml:116
344#, qt-format
344#, qt-format
345msgid "Enter %1"
345msgid "Enter %1"
346msgstr ""
346msgstr ""
347
347
348−#: qml/Greeter/NarrowView.qml:116 qml/Wizard/Pages/passwd-set.qml:60
348+#: qml/Greeter/NarrowView.qml:117 qml/Wizard/Pages/passwd-set.qml:60
349msgid "Enter passphrase"
349msgid "Enter passphrase"
350msgstr ""
350msgstr ""
351
351
352−#: qml/Greeter/NarrowView.qml:117
352+#: qml/Greeter/NarrowView.qml:118
353msgid "Enter passcode"
353msgid "Enter passcode"
354msgstr ""
354msgstr ""
355
355
356−#: qml/Greeter/NarrowView.qml:118
356+#: qml/Greeter/NarrowView.qml:119
357#, qt-format
357#, qt-format
358msgid "Sorry, incorrect %1"
358msgid "Sorry, incorrect %1"
359msgstr ""
359msgstr ""
360
360
361−#: qml/Greeter/NarrowView.qml:119
361+#: qml/Greeter/NarrowView.qml:120
362msgid "Sorry, incorrect passphrase"
362msgid "Sorry, incorrect passphrase"
363msgstr ""
363msgstr ""
364
364
365−#: qml/Greeter/NarrowView.qml:120
365+#: qml/Greeter/NarrowView.qml:121
366+msgctxt "passphrase"
366msgid "Please re-enter"
367msgid "Please re-enter"
367msgstr ""
368msgstr ""
368
369
369−#: qml/Greeter/NarrowView.qml:121
370+#: qml/Greeter/NarrowView.qml:122
370msgid "Sorry, incorrect passcode"
371msgid "Sorry, incorrect passcode"
371msgstr ""
372msgstr ""
372
373
@@ -516,38 +517,6 @@ msgctxt "Button: Go back one page in the Wizard"
516msgid "Back"
517msgid "Back"
517msgstr ""
518msgstr ""
518
519
519−#: qml/Wizard/Pages/here-terms.qml:27
520−msgid "Terms & Conditions"
521−msgstr ""
522−
523−#: qml/Wizard/Pages/passwd-confirm.qml:49
524−msgid "Confirm passphrase"
525−msgstr ""
526−
527−#: qml/Wizard/Pages/passwd-confirm.qml:50
528−msgid "Confirm passcode"
529−msgstr ""
530−
531−#: qml/Wizard/Pages/passwd-confirm.qml:53
532−#: qml/Wizard/Pages/passwd-confirm.qml:54
533−msgid "Please try again."
534−msgstr ""
535−
536−#: qml/Wizard/Pages/passwd-confirm.qml:82 qml/Wizard/Pages/passwd-set.qml:90
537−#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:128
538−#: qml/Wizard/Pages/40-wifi.qml:215 qml/Wizard/Pages/50-location.qml:131
539−#: qml/Wizard/Pages/60-reporting.qml:50
540−msgid "Continue"
541−msgstr ""
542−
543−#: qml/Wizard/Pages/passwd-set.qml:61
544−msgid "Choose your passcode"
545−msgstr ""
546−
547−#: qml/Wizard/Pages/passwd-set.qml:68
548−msgid "Passphrase must be 4 characters long"
549−msgstr ""
550−
551#: qml/Wizard/Pages/10-welcome.qml:27
520#: qml/Wizard/Pages/10-welcome.qml:27
552msgid "Hi!"
521msgid "Hi!"
553msgstr ""
522msgstr ""
@@ -560,6 +529,13 @@ msgstr ""
560msgid "Let’s get started."
529msgid "Let’s get started."
561msgstr ""
530msgstr ""
562
531
532+#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:128
533+#: qml/Wizard/Pages/40-wifi.qml:215 qml/Wizard/Pages/50-location.qml:131
534+#: qml/Wizard/Pages/60-reporting.qml:50 qml/Wizard/Pages/passwd-confirm.qml:82
535+#: qml/Wizard/Pages/passwd-set.qml:90
536+msgid "Continue"
537+msgstr ""
538+
563#: qml/Wizard/Pages/20-sim.qml:25
539#: qml/Wizard/Pages/20-sim.qml:25
564msgid "Add a SIM card and restart your device"
540msgid "Add a SIM card and restart your device"
565msgstr ""
541msgstr ""
@@ -685,6 +661,31 @@ msgstr ""
685msgid "Finish"
661msgid "Finish"
686msgstr ""
662msgstr ""
687
663
664+#: qml/Wizard/Pages/here-terms.qml:27
665+msgid "Terms & Conditions"
666+msgstr ""
667+
668+#: qml/Wizard/Pages/passwd-confirm.qml:49
669+msgid "Confirm passphrase"
670+msgstr ""
671+
672+#: qml/Wizard/Pages/passwd-confirm.qml:50
673+msgid "Confirm passcode"
674+msgstr ""
675+
676+#: qml/Wizard/Pages/passwd-confirm.qml:53
677+#: qml/Wizard/Pages/passwd-confirm.qml:54
678+msgid "Please try again."
679+msgstr ""
680+
681+#: qml/Wizard/Pages/passwd-set.qml:61
682+msgid "Choose your passcode"
683+msgstr ""
684+
685+#: qml/Wizard/Pages/passwd-set.qml:68
686+msgid "Passphrase must be 4 characters long"
687+msgstr ""
688+
688#. Translators: This is the arrow for "Back" buttons
689#. Translators: This is the arrow for "Back" buttons
689#: qml/Wizard/StackButton.qml:39
690#: qml/Wizard/StackButton.qml:39
690#, qt-format
691#, qt-format
po/te.po+51−50
@@ -7,7 +7,7 @@ msgid ""
7msgstr ""
7msgstr ""
8"Project-Id-Version: unity\n"
8"Project-Id-Version: unity\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2015-06-22 12:00+0200\n"
10+"POT-Creation-Date: 2015-07-17 10:10+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"
@@ -15,8 +15,8 @@ msgstr ""
15"Content-Type: text/plain; charset=UTF-8\n"
15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n"
16"Content-Transfer-Encoding: 8bit\n"
17"Plural-Forms: nplurals=2; plural=n != 1;\n"
17"Plural-Forms: nplurals=2; plural=n != 1;\n"
18−"X-Launchpad-Export-Date: 2015-07-04 05:37+0000\n"
18+"X-Launchpad-Export-Date: 2015-07-25 05:39+0000\n"
19−"X-Generator: Launchpad (build 17597)\n"
19+"X-Generator: Launchpad (build 17628)\n"
20
20
21#: plugins/LightDM/Greeter.cpp:112
21#: plugins/LightDM/Greeter.cpp:112
22msgid "Password: "
22msgid "Password: "
@@ -223,15 +223,15 @@ msgstr "అత్యవసర పిలుపు"
223msgid "OK"
223msgid "OK"
224msgstr "సరే"
224msgstr "సరే"
225
225
226−#: qml/Dash/GenericScopeView.qml:532 qml/Dash/GenericScopeView.qml:690
226+#: qml/Dash/GenericScopeView.qml:539 qml/Dash/GenericScopeView.qml:697
227msgid "See less"
227msgid "See less"
228msgstr ""
228msgstr ""
229
229
230−#: qml/Dash/GenericScopeView.qml:532
230+#: qml/Dash/GenericScopeView.qml:539
231msgid "See all"
231msgid "See all"
232msgstr ""
232msgstr ""
233
233
234−#: qml/Dash/GenericScopeView.qml:594
234+#: qml/Dash/GenericScopeView.qml:601
235msgctxt "Label: Hint for dash search line edit"
235msgctxt "Label: Hint for dash search line edit"
236msgid "Search"
236msgid "Search"
237msgstr ""
237msgstr ""
@@ -315,57 +315,58 @@ msgstr ""
315msgid "Tap to unlock"
315msgid "Tap to unlock"
316msgstr ""
316msgstr ""
317
317
318−#: qml/Greeter/NarrowView.qml:53 qml/Wizard/Pages/passwd-confirm.qml:53
318+#: qml/Greeter/NarrowView.qml:54 qml/Wizard/Pages/passwd-confirm.qml:53
319msgid "Sorry, incorrect passphrase."
319msgid "Sorry, incorrect passphrase."
320msgstr ""
320msgstr ""
321
321
322−#: qml/Greeter/NarrowView.qml:54 qml/Wizard/Pages/passwd-confirm.qml:54
322+#: qml/Greeter/NarrowView.qml:55 qml/Wizard/Pages/passwd-confirm.qml:54
323msgid "Sorry, incorrect passcode."
323msgid "Sorry, incorrect passcode."
324msgstr ""
324msgstr ""
325
325
326−#: qml/Greeter/NarrowView.qml:55
326+#: qml/Greeter/NarrowView.qml:56
327msgid "This will be your last attempt."
327msgid "This will be your last attempt."
328msgstr ""
328msgstr ""
329
329
330−#: qml/Greeter/NarrowView.qml:57
330+#: qml/Greeter/NarrowView.qml:58
331msgid ""
331msgid ""
332"If passphrase is entered incorrectly, your phone will conduct a factory "
332"If passphrase is entered incorrectly, your phone will conduct a factory "
333"reset and all personal data will be deleted."
333"reset and all personal data will be deleted."
334msgstr ""
334msgstr ""
335
335
336−#: qml/Greeter/NarrowView.qml:58
336+#: qml/Greeter/NarrowView.qml:59
337msgid ""
337msgid ""
338"If passcode is entered incorrectly, your phone will conduct a factory reset "
338"If passcode is entered incorrectly, your phone will conduct a factory reset "
339"and all personal data will be deleted."
339"and all personal data will be deleted."
340msgstr ""
340msgstr ""
341
341
342−#: qml/Greeter/NarrowView.qml:115
342+#: qml/Greeter/NarrowView.qml:116
343#, qt-format
343#, qt-format
344msgid "Enter %1"
344msgid "Enter %1"
345msgstr ""
345msgstr ""
346
346
347−#: qml/Greeter/NarrowView.qml:116 qml/Wizard/Pages/passwd-set.qml:60
347+#: qml/Greeter/NarrowView.qml:117 qml/Wizard/Pages/passwd-set.qml:60
348msgid "Enter passphrase"
348msgid "Enter passphrase"
349msgstr ""
349msgstr ""
350
350
351−#: qml/Greeter/NarrowView.qml:117
351+#: qml/Greeter/NarrowView.qml:118
352msgid "Enter passcode"
352msgid "Enter passcode"
353msgstr ""
353msgstr ""
354
354
355−#: qml/Greeter/NarrowView.qml:118
355+#: qml/Greeter/NarrowView.qml:119
356#, qt-format
356#, qt-format
357msgid "Sorry, incorrect %1"
357msgid "Sorry, incorrect %1"
358msgstr ""
358msgstr ""
359
359
360−#: qml/Greeter/NarrowView.qml:119
360+#: qml/Greeter/NarrowView.qml:120
361msgid "Sorry, incorrect passphrase"
361msgid "Sorry, incorrect passphrase"
362msgstr ""
362msgstr ""
363
363
364−#: qml/Greeter/NarrowView.qml:120
364+#: qml/Greeter/NarrowView.qml:121
365+msgctxt "passphrase"
365msgid "Please re-enter"
366msgid "Please re-enter"
366msgstr ""
367msgstr ""
367
368
368−#: qml/Greeter/NarrowView.qml:121
369+#: qml/Greeter/NarrowView.qml:122
369msgid "Sorry, incorrect passcode"
370msgid "Sorry, incorrect passcode"
370msgstr ""
371msgstr ""
371
372
@@ -515,38 +516,6 @@ msgctxt "Button: Go back one page in the Wizard"
515msgid "Back"
516msgid "Back"
516msgstr ""
517msgstr ""
517
518
518−#: qml/Wizard/Pages/here-terms.qml:27
519−msgid "Terms & Conditions"
520−msgstr ""
521−
522−#: qml/Wizard/Pages/passwd-confirm.qml:49
523−msgid "Confirm passphrase"
524−msgstr ""
525−
526−#: qml/Wizard/Pages/passwd-confirm.qml:50
527−msgid "Confirm passcode"
528−msgstr ""
529−
530−#: qml/Wizard/Pages/passwd-confirm.qml:53
531−#: qml/Wizard/Pages/passwd-confirm.qml:54
532−msgid "Please try again."
533−msgstr ""
534−
535−#: qml/Wizard/Pages/passwd-confirm.qml:82 qml/Wizard/Pages/passwd-set.qml:90
536−#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:128
537−#: qml/Wizard/Pages/40-wifi.qml:215 qml/Wizard/Pages/50-location.qml:131
538−#: qml/Wizard/Pages/60-reporting.qml:50
539−msgid "Continue"
540−msgstr ""
541−
542−#: qml/Wizard/Pages/passwd-set.qml:61
543−msgid "Choose your passcode"
544−msgstr ""
545−
546−#: qml/Wizard/Pages/passwd-set.qml:68
547−msgid "Passphrase must be 4 characters long"
548−msgstr ""
549−
550#: qml/Wizard/Pages/10-welcome.qml:27
519#: qml/Wizard/Pages/10-welcome.qml:27
551msgid "Hi!"
520msgid "Hi!"
552msgstr ""
521msgstr ""
@@ -559,6 +528,13 @@ msgstr ""
559msgid "Let’s get started."
528msgid "Let’s get started."
560msgstr ""
529msgstr ""
561
530
531+#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:128
532+#: qml/Wizard/Pages/40-wifi.qml:215 qml/Wizard/Pages/50-location.qml:131
533+#: qml/Wizard/Pages/60-reporting.qml:50 qml/Wizard/Pages/passwd-confirm.qml:82
534+#: qml/Wizard/Pages/passwd-set.qml:90
535+msgid "Continue"
536+msgstr ""
537+
562#: qml/Wizard/Pages/20-sim.qml:25
538#: qml/Wizard/Pages/20-sim.qml:25
563msgid "Add a SIM card and restart your device"
539msgid "Add a SIM card and restart your device"
564msgstr ""
540msgstr ""
@@ -684,6 +660,31 @@ msgstr ""
684msgid "Finish"
660msgid "Finish"
685msgstr ""
661msgstr ""
686
662
663+#: qml/Wizard/Pages/here-terms.qml:27
664+msgid "Terms & Conditions"
665+msgstr ""
666+
667+#: qml/Wizard/Pages/passwd-confirm.qml:49
668+msgid "Confirm passphrase"
669+msgstr ""
670+
671+#: qml/Wizard/Pages/passwd-confirm.qml:50
672+msgid "Confirm passcode"
673+msgstr ""
674+
675+#: qml/Wizard/Pages/passwd-confirm.qml:53
676+#: qml/Wizard/Pages/passwd-confirm.qml:54
677+msgid "Please try again."
678+msgstr ""
679+
680+#: qml/Wizard/Pages/passwd-set.qml:61
681+msgid "Choose your passcode"
682+msgstr ""
683+
684+#: qml/Wizard/Pages/passwd-set.qml:68
685+msgid "Passphrase must be 4 characters long"
686+msgstr ""
687+
687#. Translators: This is the arrow for "Back" buttons
688#. Translators: This is the arrow for "Back" buttons
688#: qml/Wizard/StackButton.qml:39
689#: qml/Wizard/StackButton.qml:39
689#, qt-format
690#, qt-format
po/th.po+51−50
@@ -7,7 +7,7 @@ msgid ""
7msgstr ""
7msgstr ""
8"Project-Id-Version: unity8\n"
8"Project-Id-Version: unity8\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2015-06-22 12:00+0200\n"
10+"POT-Creation-Date: 2015-07-17 10:10+0200\n"
11"PO-Revision-Date: 2014-10-02 04:55+0000\n"
11"PO-Revision-Date: 2014-10-02 04:55+0000\n"
12"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
12"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
13"Language-Team: Thai <th@li.org>\n"
13"Language-Team: Thai <th@li.org>\n"
@@ -15,8 +15,8 @@ msgstr ""
15"Content-Type: text/plain; charset=UTF-8\n"
15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n"
16"Content-Transfer-Encoding: 8bit\n"
17"Plural-Forms: nplurals=1; plural=0;\n"
17"Plural-Forms: nplurals=1; plural=0;\n"
18−"X-Launchpad-Export-Date: 2015-07-04 05:37+0000\n"
18+"X-Launchpad-Export-Date: 2015-07-25 05:39+0000\n"
19−"X-Generator: Launchpad (build 17597)\n"
19+"X-Generator: Launchpad (build 17628)\n"
20
20
21#: plugins/LightDM/Greeter.cpp:112
21#: plugins/LightDM/Greeter.cpp:112
22msgid "Password: "
22msgid "Password: "
@@ -223,15 +223,15 @@ msgstr ""
223msgid "OK"
223msgid "OK"
224msgstr ""
224msgstr ""
225
225
226−#: qml/Dash/GenericScopeView.qml:532 qml/Dash/GenericScopeView.qml:690
226+#: qml/Dash/GenericScopeView.qml:539 qml/Dash/GenericScopeView.qml:697
227msgid "See less"
227msgid "See less"
228msgstr ""
228msgstr ""
229
229
230−#: qml/Dash/GenericScopeView.qml:532
230+#: qml/Dash/GenericScopeView.qml:539
231msgid "See all"
231msgid "See all"
232msgstr ""
232msgstr ""
233
233
234−#: qml/Dash/GenericScopeView.qml:594
234+#: qml/Dash/GenericScopeView.qml:601
235msgctxt "Label: Hint for dash search line edit"
235msgctxt "Label: Hint for dash search line edit"
236msgid "Search"
236msgid "Search"
237msgstr ""
237msgstr ""
@@ -315,57 +315,58 @@ msgstr ""
315msgid "Tap to unlock"
315msgid "Tap to unlock"
316msgstr ""
316msgstr ""
317
317
318−#: qml/Greeter/NarrowView.qml:53 qml/Wizard/Pages/passwd-confirm.qml:53
318+#: qml/Greeter/NarrowView.qml:54 qml/Wizard/Pages/passwd-confirm.qml:53
319msgid "Sorry, incorrect passphrase."
319msgid "Sorry, incorrect passphrase."
320msgstr ""
320msgstr ""
321
321
322−#: qml/Greeter/NarrowView.qml:54 qml/Wizard/Pages/passwd-confirm.qml:54
322+#: qml/Greeter/NarrowView.qml:55 qml/Wizard/Pages/passwd-confirm.qml:54
323msgid "Sorry, incorrect passcode."
323msgid "Sorry, incorrect passcode."
324msgstr ""
324msgstr ""
325
325
326−#: qml/Greeter/NarrowView.qml:55
326+#: qml/Greeter/NarrowView.qml:56
327msgid "This will be your last attempt."
327msgid "This will be your last attempt."
328msgstr ""
328msgstr ""
329
329
330−#: qml/Greeter/NarrowView.qml:57
330+#: qml/Greeter/NarrowView.qml:58
331msgid ""
331msgid ""
332"If passphrase is entered incorrectly, your phone will conduct a factory "
332"If passphrase is entered incorrectly, your phone will conduct a factory "
333"reset and all personal data will be deleted."
333"reset and all personal data will be deleted."
334msgstr ""
334msgstr ""
335
335
336−#: qml/Greeter/NarrowView.qml:58
336+#: qml/Greeter/NarrowView.qml:59
337msgid ""
337msgid ""
338"If passcode is entered incorrectly, your phone will conduct a factory reset "
338"If passcode is entered incorrectly, your phone will conduct a factory reset "
339"and all personal data will be deleted."
339"and all personal data will be deleted."
340msgstr ""
340msgstr ""
341
341
342−#: qml/Greeter/NarrowView.qml:115
342+#: qml/Greeter/NarrowView.qml:116
343#, qt-format
343#, qt-format
344msgid "Enter %1"
344msgid "Enter %1"
345msgstr ""
345msgstr ""
346
346
347−#: qml/Greeter/NarrowView.qml:116 qml/Wizard/Pages/passwd-set.qml:60
347+#: qml/Greeter/NarrowView.qml:117 qml/Wizard/Pages/passwd-set.qml:60
348msgid "Enter passphrase"
348msgid "Enter passphrase"
349msgstr ""
349msgstr ""
350
350
351−#: qml/Greeter/NarrowView.qml:117
351+#: qml/Greeter/NarrowView.qml:118
352msgid "Enter passcode"
352msgid "Enter passcode"
353msgstr ""
353msgstr ""
354
354
355−#: qml/Greeter/NarrowView.qml:118
355+#: qml/Greeter/NarrowView.qml:119
356#, qt-format
356#, qt-format
357msgid "Sorry, incorrect %1"
357msgid "Sorry, incorrect %1"
358msgstr ""
358msgstr ""
359
359
360−#: qml/Greeter/NarrowView.qml:119
360+#: qml/Greeter/NarrowView.qml:120
361msgid "Sorry, incorrect passphrase"
361msgid "Sorry, incorrect passphrase"
362msgstr ""
362msgstr ""
363
363
364−#: qml/Greeter/NarrowView.qml:120
364+#: qml/Greeter/NarrowView.qml:121
365+msgctxt "passphrase"
365msgid "Please re-enter"
366msgid "Please re-enter"
366msgstr ""
367msgstr ""
367
368
368−#: qml/Greeter/NarrowView.qml:121
369+#: qml/Greeter/NarrowView.qml:122
369msgid "Sorry, incorrect passcode"
370msgid "Sorry, incorrect passcode"
370msgstr ""
371msgstr ""
371
372
@@ -515,38 +516,6 @@ msgctxt "Button: Go back one page in the Wizard"
515msgid "Back"
516msgid "Back"
516msgstr ""
517msgstr ""
517
518
518−#: qml/Wizard/Pages/here-terms.qml:27
519−msgid "Terms & Conditions"
520−msgstr ""
521−
522−#: qml/Wizard/Pages/passwd-confirm.qml:49
523−msgid "Confirm passphrase"
524−msgstr ""
525−
526−#: qml/Wizard/Pages/passwd-confirm.qml:50
527−msgid "Confirm passcode"
528−msgstr ""
529−
530−#: qml/Wizard/Pages/passwd-confirm.qml:53
531−#: qml/Wizard/Pages/passwd-confirm.qml:54
532−msgid "Please try again."
533−msgstr ""
534−
535−#: qml/Wizard/Pages/passwd-confirm.qml:82 qml/Wizard/Pages/passwd-set.qml:90
536−#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:128
537−#: qml/Wizard/Pages/40-wifi.qml:215 qml/Wizard/Pages/50-location.qml:131
538−#: qml/Wizard/Pages/60-reporting.qml:50
539−msgid "Continue"
540−msgstr ""
541−
542−#: qml/Wizard/Pages/passwd-set.qml:61
543−msgid "Choose your passcode"
544−msgstr ""
545−
546−#: qml/Wizard/Pages/passwd-set.qml:68
547−msgid "Passphrase must be 4 characters long"
548−msgstr ""
549−
550#: qml/Wizard/Pages/10-welcome.qml:27
519#: qml/Wizard/Pages/10-welcome.qml:27
551msgid "Hi!"
520msgid "Hi!"
552msgstr ""
521msgstr ""
@@ -559,6 +528,13 @@ msgstr ""
559msgid "Let’s get started."
528msgid "Let’s get started."
560msgstr ""
529msgstr ""
561
530
531+#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:128
532+#: qml/Wizard/Pages/40-wifi.qml:215 qml/Wizard/Pages/50-location.qml:131
533+#: qml/Wizard/Pages/60-reporting.qml:50 qml/Wizard/Pages/passwd-confirm.qml:82
534+#: qml/Wizard/Pages/passwd-set.qml:90
535+msgid "Continue"
536+msgstr ""
537+
562#: qml/Wizard/Pages/20-sim.qml:25
538#: qml/Wizard/Pages/20-sim.qml:25
563msgid "Add a SIM card and restart your device"
539msgid "Add a SIM card and restart your device"
564msgstr ""
540msgstr ""
@@ -684,6 +660,31 @@ msgstr ""
684msgid "Finish"
660msgid "Finish"
685msgstr ""
661msgstr ""
686
662
663+#: qml/Wizard/Pages/here-terms.qml:27
664+msgid "Terms & Conditions"
665+msgstr ""
666+
667+#: qml/Wizard/Pages/passwd-confirm.qml:49
668+msgid "Confirm passphrase"
669+msgstr ""
670+
671+#: qml/Wizard/Pages/passwd-confirm.qml:50
672+msgid "Confirm passcode"
673+msgstr ""
674+
675+#: qml/Wizard/Pages/passwd-confirm.qml:53
676+#: qml/Wizard/Pages/passwd-confirm.qml:54
677+msgid "Please try again."
678+msgstr ""
679+
680+#: qml/Wizard/Pages/passwd-set.qml:61
681+msgid "Choose your passcode"
682+msgstr ""
683+
684+#: qml/Wizard/Pages/passwd-set.qml:68
685+msgid "Passphrase must be 4 characters long"
686+msgstr ""
687+
687#. Translators: This is the arrow for "Back" buttons
688#. Translators: This is the arrow for "Back" buttons
688#: qml/Wizard/StackButton.qml:39
689#: qml/Wizard/StackButton.qml:39
689#, qt-format
690#, qt-format
po/tr.po+55−51
@@ -7,7 +7,7 @@ msgid ""
7msgstr ""
7msgstr ""
8"Project-Id-Version: unity\n"
8"Project-Id-Version: unity\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2015-06-22 12:00+0200\n"
10+"POT-Creation-Date: 2015-07-17 10:10+0200\n"
11"PO-Revision-Date: 2015-03-22 15:56+0000\n"
11"PO-Revision-Date: 2015-03-22 15:56+0000\n"
12"Last-Translator: Arda Ünlü <aarda.uunlu@gmail.com>\n"
12"Last-Translator: Arda Ünlü <aarda.uunlu@gmail.com>\n"
13"Language-Team: Turkish <tr@li.org>\n"
13"Language-Team: Turkish <tr@li.org>\n"
@@ -15,8 +15,8 @@ msgstr ""
15"Content-Type: text/plain; charset=UTF-8\n"
15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n"
16"Content-Transfer-Encoding: 8bit\n"
17"Plural-Forms: nplurals=2; plural=n != 1;\n"
17"Plural-Forms: nplurals=2; plural=n != 1;\n"
18−"X-Launchpad-Export-Date: 2015-07-04 05:37+0000\n"
18+"X-Launchpad-Export-Date: 2015-07-25 05:39+0000\n"
19−"X-Generator: Launchpad (build 17597)\n"
19+"X-Generator: Launchpad (build 17628)\n"
20
20
21#: plugins/LightDM/Greeter.cpp:112
21#: plugins/LightDM/Greeter.cpp:112
22msgid "Password: "
22msgid "Password: "
@@ -223,15 +223,15 @@ msgstr "Acil Arama"
223msgid "OK"
223msgid "OK"
224msgstr "Tamam"
224msgstr "Tamam"
225
225
226−#: qml/Dash/GenericScopeView.qml:532 qml/Dash/GenericScopeView.qml:690
226+#: qml/Dash/GenericScopeView.qml:539 qml/Dash/GenericScopeView.qml:697
227msgid "See less"
227msgid "See less"
228msgstr "Daha azını gör"
228msgstr "Daha azını gör"
229
229
230−#: qml/Dash/GenericScopeView.qml:532
230+#: qml/Dash/GenericScopeView.qml:539
231msgid "See all"
231msgid "See all"
232msgstr "Tümünü gör"
232msgstr "Tümünü gör"
233
233
234−#: qml/Dash/GenericScopeView.qml:594
234+#: qml/Dash/GenericScopeView.qml:601
235msgctxt "Label: Hint for dash search line edit"
235msgctxt "Label: Hint for dash search line edit"
236msgid "Search"
236msgid "Search"
237msgstr "Ara"
237msgstr "Ara"
@@ -315,19 +315,19 @@ msgstr ""
315msgid "Tap to unlock"
315msgid "Tap to unlock"
316msgstr "Kilidi açmak için dokun"
316msgstr "Kilidi açmak için dokun"
317
317
318−#: qml/Greeter/NarrowView.qml:53 qml/Wizard/Pages/passwd-confirm.qml:53
318+#: qml/Greeter/NarrowView.qml:54 qml/Wizard/Pages/passwd-confirm.qml:53
319msgid "Sorry, incorrect passphrase."
319msgid "Sorry, incorrect passphrase."
320msgstr "Üzgünüm, hatalı parola."
320msgstr "Üzgünüm, hatalı parola."
321
321
322−#: qml/Greeter/NarrowView.qml:54 qml/Wizard/Pages/passwd-confirm.qml:54
322+#: qml/Greeter/NarrowView.qml:55 qml/Wizard/Pages/passwd-confirm.qml:54
323msgid "Sorry, incorrect passcode."
323msgid "Sorry, incorrect passcode."
324msgstr "Üzgünüm, hatalı parola."
324msgstr "Üzgünüm, hatalı parola."
325
325
326−#: qml/Greeter/NarrowView.qml:55
326+#: qml/Greeter/NarrowView.qml:56
327msgid "This will be your last attempt."
327msgid "This will be your last attempt."
328msgstr "Bu son denemeniz olacak."
328msgstr "Bu son denemeniz olacak."
329
329
330−#: qml/Greeter/NarrowView.qml:57
330+#: qml/Greeter/NarrowView.qml:58
331msgid ""
331msgid ""
332"If passphrase is entered incorrectly, your phone will conduct a factory "
332"If passphrase is entered incorrectly, your phone will conduct a factory "
333"reset and all personal data will be deleted."
333"reset and all personal data will be deleted."
@@ -335,7 +335,7 @@ msgstr ""
335"Eğer hatalı parola girilirse, telefonunuz fabrika ayarlarına dönecek ve tüm "
335"Eğer hatalı parola girilirse, telefonunuz fabrika ayarlarına dönecek ve tüm "
336"kişisel verileriniz silinecek."
336"kişisel verileriniz silinecek."
337
337
338−#: qml/Greeter/NarrowView.qml:58
338+#: qml/Greeter/NarrowView.qml:59
339msgid ""
339msgid ""
340"If passcode is entered incorrectly, your phone will conduct a factory reset "
340"If passcode is entered incorrectly, your phone will conduct a factory reset "
341"and all personal data will be deleted."
341"and all personal data will be deleted."
@@ -343,33 +343,34 @@ msgstr ""
343"Eğer hatalı parola girilirse, telefonunuz fabrika ayarlarına dönecek ve tüm "
343"Eğer hatalı parola girilirse, telefonunuz fabrika ayarlarına dönecek ve tüm "
344"kişisel verileriniz silinecek."
344"kişisel verileriniz silinecek."
345
345
346−#: qml/Greeter/NarrowView.qml:115
346+#: qml/Greeter/NarrowView.qml:116
347#, qt-format
347#, qt-format
348msgid "Enter %1"
348msgid "Enter %1"
349msgstr "%1 Girin"
349msgstr "%1 Girin"
350
350
351−#: qml/Greeter/NarrowView.qml:116 qml/Wizard/Pages/passwd-set.qml:60
351+#: qml/Greeter/NarrowView.qml:117 qml/Wizard/Pages/passwd-set.qml:60
352msgid "Enter passphrase"
352msgid "Enter passphrase"
353msgstr "Parolayı girin"
353msgstr "Parolayı girin"
354
354
355−#: qml/Greeter/NarrowView.qml:117
355+#: qml/Greeter/NarrowView.qml:118
356msgid "Enter passcode"
356msgid "Enter passcode"
357msgstr "Parolayı girin"
357msgstr "Parolayı girin"
358
358
359−#: qml/Greeter/NarrowView.qml:118
359+#: qml/Greeter/NarrowView.qml:119
360#, qt-format
360#, qt-format
361msgid "Sorry, incorrect %1"
361msgid "Sorry, incorrect %1"
362msgstr "Üzgünüm, hatalı %1"
362msgstr "Üzgünüm, hatalı %1"
363
363
364−#: qml/Greeter/NarrowView.qml:119
364+#: qml/Greeter/NarrowView.qml:120
365msgid "Sorry, incorrect passphrase"
365msgid "Sorry, incorrect passphrase"
366msgstr "Üzgünüm, hatalı parola"
366msgstr "Üzgünüm, hatalı parola"
367
367
368−#: qml/Greeter/NarrowView.qml:120
368+#: qml/Greeter/NarrowView.qml:121
369+msgctxt "passphrase"
369msgid "Please re-enter"
370msgid "Please re-enter"
370−msgstr "Lütfen yeniden girin"
371+msgstr ""
371
372
372−#: qml/Greeter/NarrowView.qml:121
373+#: qml/Greeter/NarrowView.qml:122
373msgid "Sorry, incorrect passcode"
374msgid "Sorry, incorrect passcode"
374msgstr "Üzgünüm, hatalı parola"
375msgstr "Üzgünüm, hatalı parola"
375
376
@@ -519,38 +520,6 @@ msgctxt "Button: Go back one page in the Wizard"
519msgid "Back"
520msgid "Back"
520msgstr ""
521msgstr ""
521
522
522−#: qml/Wizard/Pages/here-terms.qml:27
523−msgid "Terms & Conditions"
524−msgstr "Şartlar ve Koşullar"
525−
526−#: qml/Wizard/Pages/passwd-confirm.qml:49
527−msgid "Confirm passphrase"
528−msgstr "Parolayı yinele"
529−
530−#: qml/Wizard/Pages/passwd-confirm.qml:50
531−msgid "Confirm passcode"
532−msgstr "Parolayı yinele"
533−
534−#: qml/Wizard/Pages/passwd-confirm.qml:53
535−#: qml/Wizard/Pages/passwd-confirm.qml:54
536−msgid "Please try again."
537−msgstr "Lütfen yeniden deneyin."
538−
539−#: qml/Wizard/Pages/passwd-confirm.qml:82 qml/Wizard/Pages/passwd-set.qml:90
540−#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:128
541−#: qml/Wizard/Pages/40-wifi.qml:215 qml/Wizard/Pages/50-location.qml:131
542−#: qml/Wizard/Pages/60-reporting.qml:50
543−msgid "Continue"
544−msgstr "Devam Et"
545−
546−#: qml/Wizard/Pages/passwd-set.qml:61
547−msgid "Choose your passcode"
548−msgstr "Parolanızı seçin"
549−
550−#: qml/Wizard/Pages/passwd-set.qml:68
551−msgid "Passphrase must be 4 characters long"
552−msgstr "Parola 4 karakter olmalı"
553−
554#: qml/Wizard/Pages/10-welcome.qml:27
523#: qml/Wizard/Pages/10-welcome.qml:27
555msgid "Hi!"
524msgid "Hi!"
556msgstr "Merhaba!"
525msgstr "Merhaba!"
@@ -563,6 +532,13 @@ msgstr "Ubuntu telefonunuza hoş geldiniz."
563msgid "Let’s get started."
532msgid "Let’s get started."
564msgstr "Hadi başlayalım."
533msgstr "Hadi başlayalım."
565
534
535+#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:128
536+#: qml/Wizard/Pages/40-wifi.qml:215 qml/Wizard/Pages/50-location.qml:131
537+#: qml/Wizard/Pages/60-reporting.qml:50 qml/Wizard/Pages/passwd-confirm.qml:82
538+#: qml/Wizard/Pages/passwd-set.qml:90
539+msgid "Continue"
540+msgstr "Devam Et"
541+
566#: qml/Wizard/Pages/20-sim.qml:25
542#: qml/Wizard/Pages/20-sim.qml:25
567msgid "Add a SIM card and restart your device"
543msgid "Add a SIM card and restart your device"
568msgstr "Bir SIM kartı ekleyin ve cihazınızı yeniden başlatın"
544msgstr "Bir SIM kartı ekleyin ve cihazınızı yeniden başlatın"
@@ -698,6 +674,31 @@ msgstr "Telefonunuz artık kullanıma hazır."
698msgid "Finish"
674msgid "Finish"
699msgstr "Son"
675msgstr "Son"
700
676
677+#: qml/Wizard/Pages/here-terms.qml:27
678+msgid "Terms & Conditions"
679+msgstr "Şartlar ve Koşullar"
680+
681+#: qml/Wizard/Pages/passwd-confirm.qml:49
682+msgid "Confirm passphrase"
683+msgstr "Parolayı yinele"
684+
685+#: qml/Wizard/Pages/passwd-confirm.qml:50
686+msgid "Confirm passcode"
687+msgstr "Parolayı yinele"
688+
689+#: qml/Wizard/Pages/passwd-confirm.qml:53
690+#: qml/Wizard/Pages/passwd-confirm.qml:54
691+msgid "Please try again."
692+msgstr "Lütfen yeniden deneyin."
693+
694+#: qml/Wizard/Pages/passwd-set.qml:61
695+msgid "Choose your passcode"
696+msgstr "Parolanızı seçin"
697+
698+#: qml/Wizard/Pages/passwd-set.qml:68
699+msgid "Passphrase must be 4 characters long"
700+msgstr "Parola 4 karakter olmalı"
701+
701#. Translators: This is the arrow for "Back" buttons
702#. Translators: This is the arrow for "Back" buttons
702#: qml/Wizard/StackButton.qml:39
703#: qml/Wizard/StackButton.qml:39
703#, qt-format
704#, qt-format
@@ -792,3 +793,6 @@ msgstr "%1 〉"
792
793
793#~ msgid "Restart"
794#~ msgid "Restart"
794#~ msgstr "Yeniden başlat"
795#~ msgstr "Yeniden başlat"
796+
797+#~ msgid "Please re-enter"
798+#~ msgstr "Lütfen yeniden girin"
po/ug.po+55−51
@@ -7,7 +7,7 @@ msgid ""
7msgstr ""
7msgstr ""
8"Project-Id-Version: unity\n"
8"Project-Id-Version: unity\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2015-06-22 12:00+0200\n"
10+"POT-Creation-Date: 2015-07-17 10:10+0200\n"
11"PO-Revision-Date: 2014-10-07 09:00+0000\n"
11"PO-Revision-Date: 2014-10-07 09:00+0000\n"
12"Last-Translator: Gheyret T.Kenji <Unknown>\n"
12"Last-Translator: Gheyret T.Kenji <Unknown>\n"
13"Language-Team: Uyghur Computer Science Association <UKIJ@yahoogroups.com>\n"
13"Language-Team: Uyghur Computer Science Association <UKIJ@yahoogroups.com>\n"
@@ -15,8 +15,8 @@ msgstr ""
15"Content-Type: text/plain; charset=UTF-8\n"
15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n"
16"Content-Transfer-Encoding: 8bit\n"
17"Plural-Forms: nplurals=1; plural=0;\n"
17"Plural-Forms: nplurals=1; plural=0;\n"
18−"X-Launchpad-Export-Date: 2015-07-04 05:37+0000\n"
18+"X-Launchpad-Export-Date: 2015-07-25 05:39+0000\n"
19−"X-Generator: Launchpad (build 17597)\n"
19+"X-Generator: Launchpad (build 17628)\n"
20
20
21#: plugins/LightDM/Greeter.cpp:112
21#: plugins/LightDM/Greeter.cpp:112
22msgid "Password: "
22msgid "Password: "
@@ -224,15 +224,15 @@ msgstr "جىددىي تېلېفون"
224msgid "OK"
224msgid "OK"
225msgstr "تامام"
225msgstr "تامام"
226
226
227−#: qml/Dash/GenericScopeView.qml:532 qml/Dash/GenericScopeView.qml:690
227+#: qml/Dash/GenericScopeView.qml:539 qml/Dash/GenericScopeView.qml:697
228msgid "See less"
228msgid "See less"
229msgstr "ئازراق كۆرۈش"
229msgstr "ئازراق كۆرۈش"
230
230
231−#: qml/Dash/GenericScopeView.qml:532
231+#: qml/Dash/GenericScopeView.qml:539
232msgid "See all"
232msgid "See all"
233msgstr "ھەممىنى كۆرۈش…"
233msgstr "ھەممىنى كۆرۈش…"
234
234
235−#: qml/Dash/GenericScopeView.qml:594
235+#: qml/Dash/GenericScopeView.qml:601
236msgctxt "Label: Hint for dash search line edit"
236msgctxt "Label: Hint for dash search line edit"
237msgid "Search"
237msgid "Search"
238msgstr ""
238msgstr ""
@@ -316,19 +316,19 @@ msgstr ""
316msgid "Tap to unlock"
316msgid "Tap to unlock"
317msgstr ""
317msgstr ""
318
318
319−#: qml/Greeter/NarrowView.qml:53 qml/Wizard/Pages/passwd-confirm.qml:53
319+#: qml/Greeter/NarrowView.qml:54 qml/Wizard/Pages/passwd-confirm.qml:53
320msgid "Sorry, incorrect passphrase."
320msgid "Sorry, incorrect passphrase."
321msgstr "كەچۈرۈڭ، ئىم توغرا ئەمەس"
321msgstr "كەچۈرۈڭ، ئىم توغرا ئەمەس"
322
322
323−#: qml/Greeter/NarrowView.qml:54 qml/Wizard/Pages/passwd-confirm.qml:54
323+#: qml/Greeter/NarrowView.qml:55 qml/Wizard/Pages/passwd-confirm.qml:54
324msgid "Sorry, incorrect passcode."
324msgid "Sorry, incorrect passcode."
325msgstr "كەچۈرۈڭ، ئىم كودى ئەمەس"
325msgstr "كەچۈرۈڭ، ئىم كودى ئەمەس"
326
326
327−#: qml/Greeter/NarrowView.qml:55
327+#: qml/Greeter/NarrowView.qml:56
328msgid "This will be your last attempt."
328msgid "This will be your last attempt."
329msgstr "بۇ سىزنىڭ ئەڭ ئاخىرقى پۇرسىتىڭىز"
329msgstr "بۇ سىزنىڭ ئەڭ ئاخىرقى پۇرسىتىڭىز"
330
330
331−#: qml/Greeter/NarrowView.qml:57
331+#: qml/Greeter/NarrowView.qml:58
332msgid ""
332msgid ""
333"If passphrase is entered incorrectly, your phone will conduct a factory "
333"If passphrase is entered incorrectly, your phone will conduct a factory "
334"reset and all personal data will be deleted."
334"reset and all personal data will be deleted."
@@ -336,7 +336,7 @@ msgstr ""
336"ئەگەر ئىم توغرا بولمىسا، تېلېفونىڭىز ئەسلىگە قايتۇرۇلۇپ، زاۋۇتتىن چىققان "
336"ئەگەر ئىم توغرا بولمىسا، تېلېفونىڭىز ئەسلىگە قايتۇرۇلۇپ، زاۋۇتتىن چىققان "
337"ھالەتكە كېلىپ قالىدۇ. بارلىق مەزمۇنلار يوقىلىدۇ."
337"ھالەتكە كېلىپ قالىدۇ. بارلىق مەزمۇنلار يوقىلىدۇ."
338
338
339−#: qml/Greeter/NarrowView.qml:58
339+#: qml/Greeter/NarrowView.qml:59
340msgid ""
340msgid ""
341"If passcode is entered incorrectly, your phone will conduct a factory reset "
341"If passcode is entered incorrectly, your phone will conduct a factory reset "
342"and all personal data will be deleted."
342"and all personal data will be deleted."
@@ -344,33 +344,34 @@ msgstr ""
344"ئەگەر ئىم كودى توغرا بولمىسا، تېلېفونىڭىز ئەسلىگە قايتۇرۇلۇپ، زاۋۇتتىن "
344"ئەگەر ئىم كودى توغرا بولمىسا، تېلېفونىڭىز ئەسلىگە قايتۇرۇلۇپ، زاۋۇتتىن "
345"چىققان ھالەتكە كېلىپ قالىدۇ. بارلىق مەزمۇنلار يوقىلىدۇ."
345"چىققان ھالەتكە كېلىپ قالىدۇ. بارلىق مەزمۇنلار يوقىلىدۇ."
346
346
347−#: qml/Greeter/NarrowView.qml:115
347+#: qml/Greeter/NarrowView.qml:116
348#, qt-format
348#, qt-format
349msgid "Enter %1"
349msgid "Enter %1"
350msgstr "%1 نى كىرگۈزۈڭ"
350msgstr "%1 نى كىرگۈزۈڭ"
351
351
352−#: qml/Greeter/NarrowView.qml:116 qml/Wizard/Pages/passwd-set.qml:60
352+#: qml/Greeter/NarrowView.qml:117 qml/Wizard/Pages/passwd-set.qml:60
353msgid "Enter passphrase"
353msgid "Enter passphrase"
354msgstr "ئىم كىرگۈزۈڭ"
354msgstr "ئىم كىرگۈزۈڭ"
355
355
356−#: qml/Greeter/NarrowView.qml:117
356+#: qml/Greeter/NarrowView.qml:118
357msgid "Enter passcode"
357msgid "Enter passcode"
358msgstr "ئىم كودى(passcode)نى كىرگۈزۈڭ"
358msgstr "ئىم كودى(passcode)نى كىرگۈزۈڭ"
359
359
360−#: qml/Greeter/NarrowView.qml:118
360+#: qml/Greeter/NarrowView.qml:119
361#, qt-format
361#, qt-format
362msgid "Sorry, incorrect %1"
362msgid "Sorry, incorrect %1"
363msgstr "كەچۈرۈڭ، %1 توغرا ئەمەس"
363msgstr "كەچۈرۈڭ، %1 توغرا ئەمەس"
364
364
365−#: qml/Greeter/NarrowView.qml:119
365+#: qml/Greeter/NarrowView.qml:120
366msgid "Sorry, incorrect passphrase"
366msgid "Sorry, incorrect passphrase"
367msgstr "كەچۈرۈڭ، ئىم توغرا ئەمەس"
367msgstr "كەچۈرۈڭ، ئىم توغرا ئەمەس"
368
368
369−#: qml/Greeter/NarrowView.qml:120
369+#: qml/Greeter/NarrowView.qml:121
370+msgctxt "passphrase"
370msgid "Please re-enter"
371msgid "Please re-enter"
371−msgstr "قايتا كىرگۈزۈڭ"
372+msgstr ""
372
373
373−#: qml/Greeter/NarrowView.qml:121
374+#: qml/Greeter/NarrowView.qml:122
374msgid "Sorry, incorrect passcode"
375msgid "Sorry, incorrect passcode"
375msgstr "كەچۈرۈڭ، ئىم توغرا ئەمەس"
376msgstr "كەچۈرۈڭ، ئىم توغرا ئەمەس"
376
377
@@ -520,38 +521,6 @@ msgctxt "Button: Go back one page in the Wizard"
520msgid "Back"
521msgid "Back"
521msgstr ""
522msgstr ""
522
523
523−#: qml/Wizard/Pages/here-terms.qml:27
524−msgid "Terms & Conditions"
525−msgstr ""
526−
527−#: qml/Wizard/Pages/passwd-confirm.qml:49
528−msgid "Confirm passphrase"
529−msgstr ""
530−
531−#: qml/Wizard/Pages/passwd-confirm.qml:50
532−msgid "Confirm passcode"
533−msgstr ""
534−
535−#: qml/Wizard/Pages/passwd-confirm.qml:53
536−#: qml/Wizard/Pages/passwd-confirm.qml:54
537−msgid "Please try again."
538−msgstr ""
539−
540−#: qml/Wizard/Pages/passwd-confirm.qml:82 qml/Wizard/Pages/passwd-set.qml:90
541−#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:128
542−#: qml/Wizard/Pages/40-wifi.qml:215 qml/Wizard/Pages/50-location.qml:131
543−#: qml/Wizard/Pages/60-reporting.qml:50
544−msgid "Continue"
545−msgstr ""
546−
547−#: qml/Wizard/Pages/passwd-set.qml:61
548−msgid "Choose your passcode"
549−msgstr ""
550−
551−#: qml/Wizard/Pages/passwd-set.qml:68
552−msgid "Passphrase must be 4 characters long"
553−msgstr ""
554−
555#: qml/Wizard/Pages/10-welcome.qml:27
524#: qml/Wizard/Pages/10-welcome.qml:27
556msgid "Hi!"
525msgid "Hi!"
557msgstr ""
526msgstr ""
@@ -564,6 +533,13 @@ msgstr ""
564msgid "Let’s get started."
533msgid "Let’s get started."
565msgstr ""
534msgstr ""
566
535
536+#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:128
537+#: qml/Wizard/Pages/40-wifi.qml:215 qml/Wizard/Pages/50-location.qml:131
538+#: qml/Wizard/Pages/60-reporting.qml:50 qml/Wizard/Pages/passwd-confirm.qml:82
539+#: qml/Wizard/Pages/passwd-set.qml:90
540+msgid "Continue"
541+msgstr ""
542+
567#: qml/Wizard/Pages/20-sim.qml:25
543#: qml/Wizard/Pages/20-sim.qml:25
568msgid "Add a SIM card and restart your device"
544msgid "Add a SIM card and restart your device"
569msgstr ""
545msgstr ""
@@ -689,6 +665,31 @@ msgstr ""
689msgid "Finish"
665msgid "Finish"
690msgstr ""
666msgstr ""
691
667
668+#: qml/Wizard/Pages/here-terms.qml:27
669+msgid "Terms & Conditions"
670+msgstr ""
671+
672+#: qml/Wizard/Pages/passwd-confirm.qml:49
673+msgid "Confirm passphrase"
674+msgstr ""
675+
676+#: qml/Wizard/Pages/passwd-confirm.qml:50
677+msgid "Confirm passcode"
678+msgstr ""
679+
680+#: qml/Wizard/Pages/passwd-confirm.qml:53
681+#: qml/Wizard/Pages/passwd-confirm.qml:54
682+msgid "Please try again."
683+msgstr ""
684+
685+#: qml/Wizard/Pages/passwd-set.qml:61
686+msgid "Choose your passcode"
687+msgstr ""
688+
689+#: qml/Wizard/Pages/passwd-set.qml:68
690+msgid "Passphrase must be 4 characters long"
691+msgstr ""
692+
692#. Translators: This is the arrow for "Back" buttons
693#. Translators: This is the arrow for "Back" buttons
693#: qml/Wizard/StackButton.qml:39
694#: qml/Wizard/StackButton.qml:39
694#, qt-format
695#, qt-format
@@ -791,3 +792,6 @@ msgstr ""
791
792
792#~ msgid "Manage Scopes"
793#~ msgid "Manage Scopes"
793#~ msgstr "دائىرە باشقۇرۇش"
794#~ msgstr "دائىرە باشقۇرۇش"
795+
796+#~ msgid "Please re-enter"
797+#~ msgstr "قايتا كىرگۈزۈڭ"
po/uk.po+55−51
@@ -7,7 +7,7 @@ msgid ""
7msgstr ""
7msgstr ""
8"Project-Id-Version: unity\n"
8"Project-Id-Version: unity\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2015-06-22 12:00+0200\n"
10+"POT-Creation-Date: 2015-07-17 10:10+0200\n"
11"PO-Revision-Date: 2015-07-04 05:53+0000\n"
11"PO-Revision-Date: 2015-07-04 05:53+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"
@@ -16,8 +16,8 @@ msgstr ""
16"Content-Transfer-Encoding: 8bit\n"
16"Content-Transfer-Encoding: 8bit\n"
17"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
17"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
18"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
18"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
19−"X-Launchpad-Export-Date: 2015-07-05 05:55+0000\n"
19+"X-Launchpad-Export-Date: 2015-07-25 05:39+0000\n"
20−"X-Generator: Launchpad (build 17597)\n"
20+"X-Generator: Launchpad (build 17628)\n"
21
21
22#: plugins/LightDM/Greeter.cpp:112
22#: plugins/LightDM/Greeter.cpp:112
23msgid "Password: "
23msgid "Password: "
@@ -231,15 +231,15 @@ msgstr "Терміновий виклик"
231msgid "OK"
231msgid "OK"
232msgstr "Гаразд"
232msgstr "Гаразд"
233
233
234−#: qml/Dash/GenericScopeView.qml:532 qml/Dash/GenericScopeView.qml:690
234+#: qml/Dash/GenericScopeView.qml:539 qml/Dash/GenericScopeView.qml:697
235msgid "See less"
235msgid "See less"
236msgstr "Стисліше"
236msgstr "Стисліше"
237
237
238−#: qml/Dash/GenericScopeView.qml:532
238+#: qml/Dash/GenericScopeView.qml:539
239msgid "See all"
239msgid "See all"
240msgstr "Детальніше"
240msgstr "Детальніше"
241
241
242−#: qml/Dash/GenericScopeView.qml:594
242+#: qml/Dash/GenericScopeView.qml:601
243msgctxt "Label: Hint for dash search line edit"
243msgctxt "Label: Hint for dash search line edit"
244msgid "Search"
244msgid "Search"
245msgstr "Пошук"
245msgstr "Пошук"
@@ -323,19 +323,19 @@ msgstr "Повторити"
323msgid "Tap to unlock"
323msgid "Tap to unlock"
324msgstr "Торкніться, щоб розблокувати"
324msgstr "Торкніться, щоб розблокувати"
325
325
326−#: qml/Greeter/NarrowView.qml:53 qml/Wizard/Pages/passwd-confirm.qml:53
326+#: qml/Greeter/NarrowView.qml:54 qml/Wizard/Pages/passwd-confirm.qml:53
327msgid "Sorry, incorrect passphrase."
327msgid "Sorry, incorrect passphrase."
328msgstr "Вибачте, помилковий пароль."
328msgstr "Вибачте, помилковий пароль."
329
329
330−#: qml/Greeter/NarrowView.qml:54 qml/Wizard/Pages/passwd-confirm.qml:54
330+#: qml/Greeter/NarrowView.qml:55 qml/Wizard/Pages/passwd-confirm.qml:54
331msgid "Sorry, incorrect passcode."
331msgid "Sorry, incorrect passcode."
332msgstr "Вибачте, помилковий код-пароль."
332msgstr "Вибачте, помилковий код-пароль."
333
333
334−#: qml/Greeter/NarrowView.qml:55
334+#: qml/Greeter/NarrowView.qml:56
335msgid "This will be your last attempt."
335msgid "This will be your last attempt."
336msgstr "Ця спроба буде останньою."
336msgstr "Ця спроба буде останньою."
337
337
338−#: qml/Greeter/NarrowView.qml:57
338+#: qml/Greeter/NarrowView.qml:58
339msgid ""
339msgid ""
340"If passphrase is entered incorrectly, your phone will conduct a factory "
340"If passphrase is entered incorrectly, your phone will conduct a factory "
341"reset and all personal data will be deleted."
341"reset and all personal data will be deleted."
@@ -343,7 +343,7 @@ msgstr ""
343"Якщо пароль буде вказано неправильно, телефон повернеться до початкового "
343"Якщо пароль буде вказано неправильно, телефон повернеться до початкового "
344"стану, усі особисті дані буде вилучено."
344"стану, усі особисті дані буде вилучено."
345
345
346−#: qml/Greeter/NarrowView.qml:58
346+#: qml/Greeter/NarrowView.qml:59
347msgid ""
347msgid ""
348"If passcode is entered incorrectly, your phone will conduct a factory reset "
348"If passcode is entered incorrectly, your phone will conduct a factory reset "
349"and all personal data will be deleted."
349"and all personal data will be deleted."
@@ -351,33 +351,34 @@ msgstr ""
351"Якщо код-пароль буде вказано неправильно, телефон повернеться до початкового "
351"Якщо код-пароль буде вказано неправильно, телефон повернеться до початкового "
352"стану, усі особисті дані буде вилучено."
352"стану, усі особисті дані буде вилучено."
353
353
354−#: qml/Greeter/NarrowView.qml:115
354+#: qml/Greeter/NarrowView.qml:116
355#, qt-format
355#, qt-format
356msgid "Enter %1"
356msgid "Enter %1"
357msgstr "Введіть %1"
357msgstr "Введіть %1"
358
358
359−#: qml/Greeter/NarrowView.qml:116 qml/Wizard/Pages/passwd-set.qml:60
359+#: qml/Greeter/NarrowView.qml:117 qml/Wizard/Pages/passwd-set.qml:60
360msgid "Enter passphrase"
360msgid "Enter passphrase"
361msgstr "Введіть пароль"
361msgstr "Введіть пароль"
362
362
363−#: qml/Greeter/NarrowView.qml:117
363+#: qml/Greeter/NarrowView.qml:118
364msgid "Enter passcode"
364msgid "Enter passcode"
365msgstr "Введіть код"
365msgstr "Введіть код"
366
366
367−#: qml/Greeter/NarrowView.qml:118
367+#: qml/Greeter/NarrowView.qml:119
368#, qt-format
368#, qt-format
369msgid "Sorry, incorrect %1"
369msgid "Sorry, incorrect %1"
370msgstr "Вибачте, помилковий %1"
370msgstr "Вибачте, помилковий %1"
371
371
372−#: qml/Greeter/NarrowView.qml:119
372+#: qml/Greeter/NarrowView.qml:120
373msgid "Sorry, incorrect passphrase"
373msgid "Sorry, incorrect passphrase"
374msgstr "Вибачте, помилковий пароль"
374msgstr "Вибачте, помилковий пароль"
375
375
376−#: qml/Greeter/NarrowView.qml:120
376+#: qml/Greeter/NarrowView.qml:121
377+msgctxt "passphrase"
377msgid "Please re-enter"
378msgid "Please re-enter"
378−msgstr "Ввведіть ще раз"
379+msgstr ""
379
380
380−#: qml/Greeter/NarrowView.qml:121
381+#: qml/Greeter/NarrowView.qml:122
381msgid "Sorry, incorrect passcode"
382msgid "Sorry, incorrect passcode"
382msgstr "Вибачте, помилковий код-пароль"
383msgstr "Вибачте, помилковий код-пароль"
383
384
@@ -530,38 +531,6 @@ msgctxt "Button: Go back one page in the Wizard"
530msgid "Back"
531msgid "Back"
531msgstr "Назад"
532msgstr "Назад"
532
533
533−#: qml/Wizard/Pages/here-terms.qml:27
534−msgid "Terms & Conditions"
535−msgstr "Умови користування"
536−
537−#: qml/Wizard/Pages/passwd-confirm.qml:49
538−msgid "Confirm passphrase"
539−msgstr "Підтвердіть пароль"
540−
541−#: qml/Wizard/Pages/passwd-confirm.qml:50
542−msgid "Confirm passcode"
543−msgstr "Підтвердіть код-пароль"
544−
545−#: qml/Wizard/Pages/passwd-confirm.qml:53
546−#: qml/Wizard/Pages/passwd-confirm.qml:54
547−msgid "Please try again."
548−msgstr "Будь ласка, спробуйте ще раз!"
549−
550−#: qml/Wizard/Pages/passwd-confirm.qml:82 qml/Wizard/Pages/passwd-set.qml:90
551−#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:128
552−#: qml/Wizard/Pages/40-wifi.qml:215 qml/Wizard/Pages/50-location.qml:131
553−#: qml/Wizard/Pages/60-reporting.qml:50
554−msgid "Continue"
555−msgstr "Продовжити"
556−
557−#: qml/Wizard/Pages/passwd-set.qml:61
558−msgid "Choose your passcode"
559−msgstr "Виберіть ваш код-пароль"
560−
561−#: qml/Wizard/Pages/passwd-set.qml:68
562−msgid "Passphrase must be 4 characters long"
563−msgstr "Пароль має складатися принаймні з 4 символів"
564−
565#: qml/Wizard/Pages/10-welcome.qml:27
534#: qml/Wizard/Pages/10-welcome.qml:27
566msgid "Hi!"
535msgid "Hi!"
567msgstr "Привіт!"
536msgstr "Привіт!"
@@ -574,6 +543,13 @@ msgstr "Вітаємо вас у системі телефону Ubuntu."
574msgid "Let’s get started."
543msgid "Let’s get started."
575msgstr "Почнімо."
544msgstr "Почнімо."
576
545
546+#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:128
547+#: qml/Wizard/Pages/40-wifi.qml:215 qml/Wizard/Pages/50-location.qml:131
548+#: qml/Wizard/Pages/60-reporting.qml:50 qml/Wizard/Pages/passwd-confirm.qml:82
549+#: qml/Wizard/Pages/passwd-set.qml:90
550+msgid "Continue"
551+msgstr "Продовжити"
552+
577#: qml/Wizard/Pages/20-sim.qml:25
553#: qml/Wizard/Pages/20-sim.qml:25
578msgid "Add a SIM card and restart your device"
554msgid "Add a SIM card and restart your device"
579msgstr "Додайте SIM-картку і перезапустіть ваш пристрій"
555msgstr "Додайте SIM-картку і перезапустіть ваш пристрій"
@@ -708,6 +684,31 @@ msgstr "Тепер вашим телефоном можна користуват
708msgid "Finish"
684msgid "Finish"
709msgstr "Завершити"
685msgstr "Завершити"
710
686
687+#: qml/Wizard/Pages/here-terms.qml:27
688+msgid "Terms & Conditions"
689+msgstr "Умови користування"
690+
691+#: qml/Wizard/Pages/passwd-confirm.qml:49
692+msgid "Confirm passphrase"
693+msgstr "Підтвердіть пароль"
694+
695+#: qml/Wizard/Pages/passwd-confirm.qml:50
696+msgid "Confirm passcode"
697+msgstr "Підтвердіть код-пароль"
698+
699+#: qml/Wizard/Pages/passwd-confirm.qml:53
700+#: qml/Wizard/Pages/passwd-confirm.qml:54
701+msgid "Please try again."
702+msgstr "Будь ласка, спробуйте ще раз!"
703+
704+#: qml/Wizard/Pages/passwd-set.qml:61
705+msgid "Choose your passcode"
706+msgstr "Виберіть ваш код-пароль"
707+
708+#: qml/Wizard/Pages/passwd-set.qml:68
709+msgid "Passphrase must be 4 characters long"
710+msgstr "Пароль має складатися принаймні з 4 символів"
711+
711#. Translators: This is the arrow for "Back" buttons
712#. Translators: This is the arrow for "Back" buttons
712#: qml/Wizard/StackButton.qml:39
713#: qml/Wizard/StackButton.qml:39
713#, qt-format
714#, qt-format
@@ -813,3 +814,6 @@ msgstr "%1 〉"
813
814
814#~ msgid "Manage Scopes"
815#~ msgid "Manage Scopes"
815#~ msgstr "Керування областями"
816#~ msgstr "Керування областями"
817+
818+#~ msgid "Please re-enter"
819+#~ msgstr "Ввведіть ще раз"
po/unity8.pot+49−48
@@ -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: 2015-06-22 12:00+0200\n"
11+"POT-Creation-Date: 2015-07-17 10:10+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"
@@ -223,15 +223,15 @@ msgstr ""
223msgid "OK"
223msgid "OK"
224msgstr ""
224msgstr ""
225
225
226−#: qml/Dash/GenericScopeView.qml:532 qml/Dash/GenericScopeView.qml:690
226+#: qml/Dash/GenericScopeView.qml:539 qml/Dash/GenericScopeView.qml:697
227msgid "See less"
227msgid "See less"
228msgstr ""
228msgstr ""
229
229
230−#: qml/Dash/GenericScopeView.qml:532
230+#: qml/Dash/GenericScopeView.qml:539
231msgid "See all"
231msgid "See all"
232msgstr ""
232msgstr ""
233
233
234−#: qml/Dash/GenericScopeView.qml:594
234+#: qml/Dash/GenericScopeView.qml:601
235msgctxt "Label: Hint for dash search line edit"
235msgctxt "Label: Hint for dash search line edit"
236msgid "Search"
236msgid "Search"
237msgstr ""
237msgstr ""
@@ -315,57 +315,58 @@ msgstr ""
315msgid "Tap to unlock"
315msgid "Tap to unlock"
316msgstr ""
316msgstr ""
317
317
318−#: qml/Greeter/NarrowView.qml:53 qml/Wizard/Pages/passwd-confirm.qml:53
318+#: qml/Greeter/NarrowView.qml:54 qml/Wizard/Pages/passwd-confirm.qml:53
319msgid "Sorry, incorrect passphrase."
319msgid "Sorry, incorrect passphrase."
320msgstr ""
320msgstr ""
321
321
322−#: qml/Greeter/NarrowView.qml:54 qml/Wizard/Pages/passwd-confirm.qml:54
322+#: qml/Greeter/NarrowView.qml:55 qml/Wizard/Pages/passwd-confirm.qml:54
323msgid "Sorry, incorrect passcode."
323msgid "Sorry, incorrect passcode."
324msgstr ""
324msgstr ""
325
325
326−#: qml/Greeter/NarrowView.qml:55
326+#: qml/Greeter/NarrowView.qml:56
327msgid "This will be your last attempt."
327msgid "This will be your last attempt."
328msgstr ""
328msgstr ""
329
329
330−#: qml/Greeter/NarrowView.qml:57
330+#: qml/Greeter/NarrowView.qml:58
331msgid ""
331msgid ""
332"If passphrase is entered incorrectly, your phone will conduct a factory "
332"If passphrase is entered incorrectly, your phone will conduct a factory "
333"reset and all personal data will be deleted."
333"reset and all personal data will be deleted."
334msgstr ""
334msgstr ""
335
335
336−#: qml/Greeter/NarrowView.qml:58
336+#: qml/Greeter/NarrowView.qml:59
337msgid ""
337msgid ""
338"If passcode is entered incorrectly, your phone will conduct a factory reset "
338"If passcode is entered incorrectly, your phone will conduct a factory reset "
339"and all personal data will be deleted."
339"and all personal data will be deleted."
340msgstr ""
340msgstr ""
341
341
342−#: qml/Greeter/NarrowView.qml:115
342+#: qml/Greeter/NarrowView.qml:116
343#, qt-format
343#, qt-format
344msgid "Enter %1"
344msgid "Enter %1"
345msgstr ""
345msgstr ""
346
346
347−#: qml/Greeter/NarrowView.qml:116 qml/Wizard/Pages/passwd-set.qml:60
347+#: qml/Greeter/NarrowView.qml:117 qml/Wizard/Pages/passwd-set.qml:60
348msgid "Enter passphrase"
348msgid "Enter passphrase"
349msgstr ""
349msgstr ""
350
350
351−#: qml/Greeter/NarrowView.qml:117
351+#: qml/Greeter/NarrowView.qml:118
352msgid "Enter passcode"
352msgid "Enter passcode"
353msgstr ""
353msgstr ""
354
354
355−#: qml/Greeter/NarrowView.qml:118
355+#: qml/Greeter/NarrowView.qml:119
356#, qt-format
356#, qt-format
357msgid "Sorry, incorrect %1"
357msgid "Sorry, incorrect %1"
358msgstr ""
358msgstr ""
359
359
360−#: qml/Greeter/NarrowView.qml:119
360+#: qml/Greeter/NarrowView.qml:120
361msgid "Sorry, incorrect passphrase"
361msgid "Sorry, incorrect passphrase"
362msgstr ""
362msgstr ""
363
363
364−#: qml/Greeter/NarrowView.qml:120
364+#: qml/Greeter/NarrowView.qml:121
365+msgctxt "passphrase"
365msgid "Please re-enter"
366msgid "Please re-enter"
366msgstr ""
367msgstr ""
367
368
368−#: qml/Greeter/NarrowView.qml:121
369+#: qml/Greeter/NarrowView.qml:122
369msgid "Sorry, incorrect passcode"
370msgid "Sorry, incorrect passcode"
370msgstr ""
371msgstr ""
371
372
@@ -515,38 +516,6 @@ msgctxt "Button: Go back one page in the Wizard"
515msgid "Back"
516msgid "Back"
516msgstr ""
517msgstr ""
517
518
518−#: qml/Wizard/Pages/here-terms.qml:27
519−msgid "Terms & Conditions"
520−msgstr ""
521−
522−#: qml/Wizard/Pages/passwd-confirm.qml:49
523−msgid "Confirm passphrase"
524−msgstr ""
525−
526−#: qml/Wizard/Pages/passwd-confirm.qml:50
527−msgid "Confirm passcode"
528−msgstr ""
529−
530−#: qml/Wizard/Pages/passwd-confirm.qml:53
531−#: qml/Wizard/Pages/passwd-confirm.qml:54
532−msgid "Please try again."
533−msgstr ""
534−
535−#: qml/Wizard/Pages/passwd-confirm.qml:82 qml/Wizard/Pages/passwd-set.qml:90
536−#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:128
537−#: qml/Wizard/Pages/40-wifi.qml:215 qml/Wizard/Pages/50-location.qml:131
538−#: qml/Wizard/Pages/60-reporting.qml:50
539−msgid "Continue"
540−msgstr ""
541−
542−#: qml/Wizard/Pages/passwd-set.qml:61
543−msgid "Choose your passcode"
544−msgstr ""
545−
546−#: qml/Wizard/Pages/passwd-set.qml:68
547−msgid "Passphrase must be 4 characters long"
548−msgstr ""
549−
550#: qml/Wizard/Pages/10-welcome.qml:27
519#: qml/Wizard/Pages/10-welcome.qml:27
551msgid "Hi!"
520msgid "Hi!"
552msgstr ""
521msgstr ""
@@ -559,6 +528,13 @@ msgstr ""
559msgid "Let’s get started."
528msgid "Let’s get started."
560msgstr ""
529msgstr ""
561
530
531+#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:128
532+#: qml/Wizard/Pages/40-wifi.qml:215 qml/Wizard/Pages/50-location.qml:131
533+#: qml/Wizard/Pages/60-reporting.qml:50 qml/Wizard/Pages/passwd-confirm.qml:82
534+#: qml/Wizard/Pages/passwd-set.qml:90
535+msgid "Continue"
536+msgstr ""
537+
562#: qml/Wizard/Pages/20-sim.qml:25
538#: qml/Wizard/Pages/20-sim.qml:25
563msgid "Add a SIM card and restart your device"
539msgid "Add a SIM card and restart your device"
564msgstr ""
540msgstr ""
@@ -684,6 +660,31 @@ msgstr ""
684msgid "Finish"
660msgid "Finish"
685msgstr ""
661msgstr ""
686
662
663+#: qml/Wizard/Pages/here-terms.qml:27
664+msgid "Terms & Conditions"
665+msgstr ""
666+
667+#: qml/Wizard/Pages/passwd-confirm.qml:49
668+msgid "Confirm passphrase"
669+msgstr ""
670+
671+#: qml/Wizard/Pages/passwd-confirm.qml:50
672+msgid "Confirm passcode"
673+msgstr ""
674+
675+#: qml/Wizard/Pages/passwd-confirm.qml:53
676+#: qml/Wizard/Pages/passwd-confirm.qml:54
677+msgid "Please try again."
678+msgstr ""
679+
680+#: qml/Wizard/Pages/passwd-set.qml:61
681+msgid "Choose your passcode"
682+msgstr ""
683+
684+#: qml/Wizard/Pages/passwd-set.qml:68
685+msgid "Passphrase must be 4 characters long"
686+msgstr ""
687+
687#. Translators: This is the arrow for "Back" buttons
688#. Translators: This is the arrow for "Back" buttons
688#: qml/Wizard/StackButton.qml:39
689#: qml/Wizard/StackButton.qml:39
689#, qt-format
690#, qt-format
po/ur.po+51−50
@@ -7,7 +7,7 @@ msgid ""
7msgstr ""
7msgstr ""
8"Project-Id-Version: unity8\n"
8"Project-Id-Version: unity8\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2015-06-22 12:00+0200\n"
10+"POT-Creation-Date: 2015-07-17 10:10+0200\n"
11"PO-Revision-Date: 2015-05-05 03:12+0000\n"
11"PO-Revision-Date: 2015-05-05 03:12+0000\n"
12"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
12"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
13"Language-Team: Urdu <ur@li.org>\n"
13"Language-Team: Urdu <ur@li.org>\n"
@@ -15,8 +15,8 @@ msgstr ""
15"Content-Type: text/plain; charset=UTF-8\n"
15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n"
16"Content-Transfer-Encoding: 8bit\n"
17"Plural-Forms: nplurals=2; plural=n != 1;\n"
17"Plural-Forms: nplurals=2; plural=n != 1;\n"
18−"X-Launchpad-Export-Date: 2015-07-04 05:37+0000\n"
18+"X-Launchpad-Export-Date: 2015-07-25 05:39+0000\n"
19−"X-Generator: Launchpad (build 17597)\n"
19+"X-Generator: Launchpad (build 17628)\n"
20
20
21#: plugins/LightDM/Greeter.cpp:112
21#: plugins/LightDM/Greeter.cpp:112
22msgid "Password: "
22msgid "Password: "
@@ -223,15 +223,15 @@ msgstr ""
223msgid "OK"
223msgid "OK"
224msgstr ""
224msgstr ""
225
225
226−#: qml/Dash/GenericScopeView.qml:532 qml/Dash/GenericScopeView.qml:690
226+#: qml/Dash/GenericScopeView.qml:539 qml/Dash/GenericScopeView.qml:697
227msgid "See less"
227msgid "See less"
228msgstr ""
228msgstr ""
229
229
230−#: qml/Dash/GenericScopeView.qml:532
230+#: qml/Dash/GenericScopeView.qml:539
231msgid "See all"
231msgid "See all"
232msgstr ""
232msgstr ""
233
233
234−#: qml/Dash/GenericScopeView.qml:594
234+#: qml/Dash/GenericScopeView.qml:601
235msgctxt "Label: Hint for dash search line edit"
235msgctxt "Label: Hint for dash search line edit"
236msgid "Search"
236msgid "Search"
237msgstr ""
237msgstr ""
@@ -315,57 +315,58 @@ msgstr ""
315msgid "Tap to unlock"
315msgid "Tap to unlock"
316msgstr ""
316msgstr ""
317
317
318−#: qml/Greeter/NarrowView.qml:53 qml/Wizard/Pages/passwd-confirm.qml:53
318+#: qml/Greeter/NarrowView.qml:54 qml/Wizard/Pages/passwd-confirm.qml:53
319msgid "Sorry, incorrect passphrase."
319msgid "Sorry, incorrect passphrase."
320msgstr ""
320msgstr ""
321
321
322−#: qml/Greeter/NarrowView.qml:54 qml/Wizard/Pages/passwd-confirm.qml:54
322+#: qml/Greeter/NarrowView.qml:55 qml/Wizard/Pages/passwd-confirm.qml:54
323msgid "Sorry, incorrect passcode."
323msgid "Sorry, incorrect passcode."
324msgstr ""
324msgstr ""
325
325
326−#: qml/Greeter/NarrowView.qml:55
326+#: qml/Greeter/NarrowView.qml:56
327msgid "This will be your last attempt."
327msgid "This will be your last attempt."
328msgstr ""
328msgstr ""
329
329
330−#: qml/Greeter/NarrowView.qml:57
330+#: qml/Greeter/NarrowView.qml:58
331msgid ""
331msgid ""
332"If passphrase is entered incorrectly, your phone will conduct a factory "
332"If passphrase is entered incorrectly, your phone will conduct a factory "
333"reset and all personal data will be deleted."
333"reset and all personal data will be deleted."
334msgstr ""
334msgstr ""
335
335
336−#: qml/Greeter/NarrowView.qml:58
336+#: qml/Greeter/NarrowView.qml:59
337msgid ""
337msgid ""
338"If passcode is entered incorrectly, your phone will conduct a factory reset "
338"If passcode is entered incorrectly, your phone will conduct a factory reset "
339"and all personal data will be deleted."
339"and all personal data will be deleted."
340msgstr ""
340msgstr ""
341
341
342−#: qml/Greeter/NarrowView.qml:115
342+#: qml/Greeter/NarrowView.qml:116
343#, qt-format
343#, qt-format
344msgid "Enter %1"
344msgid "Enter %1"
345msgstr ""
345msgstr ""
346
346
347−#: qml/Greeter/NarrowView.qml:116 qml/Wizard/Pages/passwd-set.qml:60
347+#: qml/Greeter/NarrowView.qml:117 qml/Wizard/Pages/passwd-set.qml:60
348msgid "Enter passphrase"
348msgid "Enter passphrase"
349msgstr ""
349msgstr ""
350
350
351−#: qml/Greeter/NarrowView.qml:117
351+#: qml/Greeter/NarrowView.qml:118
352msgid "Enter passcode"
352msgid "Enter passcode"
353msgstr ""
353msgstr ""
354
354
355−#: qml/Greeter/NarrowView.qml:118
355+#: qml/Greeter/NarrowView.qml:119
356#, qt-format
356#, qt-format
357msgid "Sorry, incorrect %1"
357msgid "Sorry, incorrect %1"
358msgstr ""
358msgstr ""
359
359
360−#: qml/Greeter/NarrowView.qml:119
360+#: qml/Greeter/NarrowView.qml:120
361msgid "Sorry, incorrect passphrase"
361msgid "Sorry, incorrect passphrase"
362msgstr ""
362msgstr ""
363
363
364−#: qml/Greeter/NarrowView.qml:120
364+#: qml/Greeter/NarrowView.qml:121
365+msgctxt "passphrase"
365msgid "Please re-enter"
366msgid "Please re-enter"
366msgstr ""
367msgstr ""
367
368
368−#: qml/Greeter/NarrowView.qml:121
369+#: qml/Greeter/NarrowView.qml:122
369msgid "Sorry, incorrect passcode"
370msgid "Sorry, incorrect passcode"
370msgstr ""
371msgstr ""
371
372
@@ -515,38 +516,6 @@ msgctxt "Button: Go back one page in the Wizard"
515msgid "Back"
516msgid "Back"
516msgstr ""
517msgstr ""
517
518
518−#: qml/Wizard/Pages/here-terms.qml:27
519−msgid "Terms & Conditions"
520−msgstr ""
521−
522−#: qml/Wizard/Pages/passwd-confirm.qml:49
523−msgid "Confirm passphrase"
524−msgstr ""
525−
526−#: qml/Wizard/Pages/passwd-confirm.qml:50
527−msgid "Confirm passcode"
528−msgstr ""
529−
530−#: qml/Wizard/Pages/passwd-confirm.qml:53
531−#: qml/Wizard/Pages/passwd-confirm.qml:54
532−msgid "Please try again."
533−msgstr ""
534−
535−#: qml/Wizard/Pages/passwd-confirm.qml:82 qml/Wizard/Pages/passwd-set.qml:90
536−#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:128
537−#: qml/Wizard/Pages/40-wifi.qml:215 qml/Wizard/Pages/50-location.qml:131
538−#: qml/Wizard/Pages/60-reporting.qml:50
539−msgid "Continue"
540−msgstr ""
541−
542−#: qml/Wizard/Pages/passwd-set.qml:61
543−msgid "Choose your passcode"
544−msgstr ""
545−
546−#: qml/Wizard/Pages/passwd-set.qml:68
547−msgid "Passphrase must be 4 characters long"
548−msgstr ""
549−
550#: qml/Wizard/Pages/10-welcome.qml:27
519#: qml/Wizard/Pages/10-welcome.qml:27
551msgid "Hi!"
520msgid "Hi!"
552msgstr ""
521msgstr ""
@@ -559,6 +528,13 @@ msgstr ""
559msgid "Let’s get started."
528msgid "Let’s get started."
560msgstr ""
529msgstr ""
561
530
531+#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:128
532+#: qml/Wizard/Pages/40-wifi.qml:215 qml/Wizard/Pages/50-location.qml:131
533+#: qml/Wizard/Pages/60-reporting.qml:50 qml/Wizard/Pages/passwd-confirm.qml:82
534+#: qml/Wizard/Pages/passwd-set.qml:90
535+msgid "Continue"
536+msgstr ""
537+
562#: qml/Wizard/Pages/20-sim.qml:25
538#: qml/Wizard/Pages/20-sim.qml:25
563msgid "Add a SIM card and restart your device"
539msgid "Add a SIM card and restart your device"
564msgstr ""
540msgstr ""
@@ -684,6 +660,31 @@ msgstr ""
684msgid "Finish"
660msgid "Finish"
685msgstr ""
661msgstr ""
686
662
663+#: qml/Wizard/Pages/here-terms.qml:27
664+msgid "Terms & Conditions"
665+msgstr ""
666+
667+#: qml/Wizard/Pages/passwd-confirm.qml:49
668+msgid "Confirm passphrase"
669+msgstr ""
670+
671+#: qml/Wizard/Pages/passwd-confirm.qml:50
672+msgid "Confirm passcode"
673+msgstr ""
674+
675+#: qml/Wizard/Pages/passwd-confirm.qml:53
676+#: qml/Wizard/Pages/passwd-confirm.qml:54
677+msgid "Please try again."
678+msgstr ""
679+
680+#: qml/Wizard/Pages/passwd-set.qml:61
681+msgid "Choose your passcode"
682+msgstr ""
683+
684+#: qml/Wizard/Pages/passwd-set.qml:68
685+msgid "Passphrase must be 4 characters long"
686+msgstr ""
687+
687#. Translators: This is the arrow for "Back" buttons
688#. Translators: This is the arrow for "Back" buttons
688#: qml/Wizard/StackButton.qml:39
689#: qml/Wizard/StackButton.qml:39
689#, qt-format
690#, qt-format
po/uz.po+51−50
@@ -7,7 +7,7 @@ msgid ""
7msgstr ""
7msgstr ""
8"Project-Id-Version: unity8\n"
8"Project-Id-Version: unity8\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2015-06-22 12:00+0200\n"
10+"POT-Creation-Date: 2015-07-17 10:10+0200\n"
11"PO-Revision-Date: 2015-07-04 16:03+0000\n"
11"PO-Revision-Date: 2015-07-04 16:03+0000\n"
12"Last-Translator: Learner <muzaffar.habibullayev@yandex.ru>\n"
12"Last-Translator: Learner <muzaffar.habibullayev@yandex.ru>\n"
13"Language-Team: Uzbek <uz@li.org>\n"
13"Language-Team: Uzbek <uz@li.org>\n"
@@ -15,8 +15,8 @@ msgstr ""
15"Content-Type: text/plain; charset=UTF-8\n"
15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n"
16"Content-Transfer-Encoding: 8bit\n"
17"Plural-Forms: nplurals=1; plural=0;\n"
17"Plural-Forms: nplurals=1; plural=0;\n"
18−"X-Launchpad-Export-Date: 2015-07-05 05:55+0000\n"
18+"X-Launchpad-Export-Date: 2015-07-25 05:39+0000\n"
19−"X-Generator: Launchpad (build 17597)\n"
19+"X-Generator: Launchpad (build 17628)\n"
20
20
21#: plugins/LightDM/Greeter.cpp:112
21#: plugins/LightDM/Greeter.cpp:112
22msgid "Password: "
22msgid "Password: "
@@ -223,15 +223,15 @@ msgstr ""
223msgid "OK"
223msgid "OK"
224msgstr ""
224msgstr ""
225
225
226−#: qml/Dash/GenericScopeView.qml:532 qml/Dash/GenericScopeView.qml:690
226+#: qml/Dash/GenericScopeView.qml:539 qml/Dash/GenericScopeView.qml:697
227msgid "See less"
227msgid "See less"
228msgstr ""
228msgstr ""
229
229
230−#: qml/Dash/GenericScopeView.qml:532
230+#: qml/Dash/GenericScopeView.qml:539
231msgid "See all"
231msgid "See all"
232msgstr ""
232msgstr ""
233
233
234−#: qml/Dash/GenericScopeView.qml:594
234+#: qml/Dash/GenericScopeView.qml:601
235msgctxt "Label: Hint for dash search line edit"
235msgctxt "Label: Hint for dash search line edit"
236msgid "Search"
236msgid "Search"
237msgstr ""
237msgstr ""
@@ -315,57 +315,58 @@ msgstr ""
315msgid "Tap to unlock"
315msgid "Tap to unlock"
316msgstr ""
316msgstr ""
317
317
318−#: qml/Greeter/NarrowView.qml:53 qml/Wizard/Pages/passwd-confirm.qml:53
318+#: qml/Greeter/NarrowView.qml:54 qml/Wizard/Pages/passwd-confirm.qml:53
319msgid "Sorry, incorrect passphrase."
319msgid "Sorry, incorrect passphrase."
320msgstr ""
320msgstr ""
321
321
322−#: qml/Greeter/NarrowView.qml:54 qml/Wizard/Pages/passwd-confirm.qml:54
322+#: qml/Greeter/NarrowView.qml:55 qml/Wizard/Pages/passwd-confirm.qml:54
323msgid "Sorry, incorrect passcode."
323msgid "Sorry, incorrect passcode."
324msgstr ""
324msgstr ""
325
325
326−#: qml/Greeter/NarrowView.qml:55
326+#: qml/Greeter/NarrowView.qml:56
327msgid "This will be your last attempt."
327msgid "This will be your last attempt."
328msgstr ""
328msgstr ""
329
329
330−#: qml/Greeter/NarrowView.qml:57
330+#: qml/Greeter/NarrowView.qml:58
331msgid ""
331msgid ""
332"If passphrase is entered incorrectly, your phone will conduct a factory "
332"If passphrase is entered incorrectly, your phone will conduct a factory "
333"reset and all personal data will be deleted."
333"reset and all personal data will be deleted."
334msgstr ""
334msgstr ""
335
335
336−#: qml/Greeter/NarrowView.qml:58
336+#: qml/Greeter/NarrowView.qml:59
337msgid ""
337msgid ""
338"If passcode is entered incorrectly, your phone will conduct a factory reset "
338"If passcode is entered incorrectly, your phone will conduct a factory reset "
339"and all personal data will be deleted."
339"and all personal data will be deleted."
340msgstr ""
340msgstr ""
341
341
342−#: qml/Greeter/NarrowView.qml:115
342+#: qml/Greeter/NarrowView.qml:116
343#, qt-format
343#, qt-format
344msgid "Enter %1"
344msgid "Enter %1"
345msgstr ""
345msgstr ""
346
346
347−#: qml/Greeter/NarrowView.qml:116 qml/Wizard/Pages/passwd-set.qml:60
347+#: qml/Greeter/NarrowView.qml:117 qml/Wizard/Pages/passwd-set.qml:60
348msgid "Enter passphrase"
348msgid "Enter passphrase"
349msgstr ""
349msgstr ""
350
350
351−#: qml/Greeter/NarrowView.qml:117
351+#: qml/Greeter/NarrowView.qml:118
352msgid "Enter passcode"
352msgid "Enter passcode"
353msgstr ""
353msgstr ""
354
354
355−#: qml/Greeter/NarrowView.qml:118
355+#: qml/Greeter/NarrowView.qml:119
356#, qt-format
356#, qt-format
357msgid "Sorry, incorrect %1"
357msgid "Sorry, incorrect %1"
358msgstr ""
358msgstr ""
359
359
360−#: qml/Greeter/NarrowView.qml:119
360+#: qml/Greeter/NarrowView.qml:120
361msgid "Sorry, incorrect passphrase"
361msgid "Sorry, incorrect passphrase"
362msgstr ""
362msgstr ""
363
363
364−#: qml/Greeter/NarrowView.qml:120
364+#: qml/Greeter/NarrowView.qml:121
365+msgctxt "passphrase"
365msgid "Please re-enter"
366msgid "Please re-enter"
366msgstr ""
367msgstr ""
367
368
368−#: qml/Greeter/NarrowView.qml:121
369+#: qml/Greeter/NarrowView.qml:122
369msgid "Sorry, incorrect passcode"
370msgid "Sorry, incorrect passcode"
370msgstr ""
371msgstr ""
371
372
@@ -515,38 +516,6 @@ msgctxt "Button: Go back one page in the Wizard"
515msgid "Back"
516msgid "Back"
516msgstr ""
517msgstr ""
517
518
518−#: qml/Wizard/Pages/here-terms.qml:27
519−msgid "Terms & Conditions"
520−msgstr ""
521−
522−#: qml/Wizard/Pages/passwd-confirm.qml:49
523−msgid "Confirm passphrase"
524−msgstr ""
525−
526−#: qml/Wizard/Pages/passwd-confirm.qml:50
527−msgid "Confirm passcode"
528−msgstr ""
529−
530−#: qml/Wizard/Pages/passwd-confirm.qml:53
531−#: qml/Wizard/Pages/passwd-confirm.qml:54
532−msgid "Please try again."
533−msgstr ""
534−
535−#: qml/Wizard/Pages/passwd-confirm.qml:82 qml/Wizard/Pages/passwd-set.qml:90
536−#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:128
537−#: qml/Wizard/Pages/40-wifi.qml:215 qml/Wizard/Pages/50-location.qml:131
538−#: qml/Wizard/Pages/60-reporting.qml:50
539−msgid "Continue"
540−msgstr ""
541−
542−#: qml/Wizard/Pages/passwd-set.qml:61
543−msgid "Choose your passcode"
544−msgstr ""
545−
546−#: qml/Wizard/Pages/passwd-set.qml:68
547−msgid "Passphrase must be 4 characters long"
548−msgstr ""
549−
550#: qml/Wizard/Pages/10-welcome.qml:27
519#: qml/Wizard/Pages/10-welcome.qml:27
551msgid "Hi!"
520msgid "Hi!"
552msgstr ""
521msgstr ""
@@ -559,6 +528,13 @@ msgstr ""
559msgid "Let’s get started."
528msgid "Let’s get started."
560msgstr ""
529msgstr ""
561
530
531+#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:128
532+#: qml/Wizard/Pages/40-wifi.qml:215 qml/Wizard/Pages/50-location.qml:131
533+#: qml/Wizard/Pages/60-reporting.qml:50 qml/Wizard/Pages/passwd-confirm.qml:82
534+#: qml/Wizard/Pages/passwd-set.qml:90
535+msgid "Continue"
536+msgstr ""
537+
562#: qml/Wizard/Pages/20-sim.qml:25
538#: qml/Wizard/Pages/20-sim.qml:25
563msgid "Add a SIM card and restart your device"
539msgid "Add a SIM card and restart your device"
564msgstr ""
540msgstr ""
@@ -684,6 +660,31 @@ msgstr ""
684msgid "Finish"
660msgid "Finish"
685msgstr ""
661msgstr ""
686
662
663+#: qml/Wizard/Pages/here-terms.qml:27
664+msgid "Terms & Conditions"
665+msgstr ""
666+
667+#: qml/Wizard/Pages/passwd-confirm.qml:49
668+msgid "Confirm passphrase"
669+msgstr ""
670+
671+#: qml/Wizard/Pages/passwd-confirm.qml:50
672+msgid "Confirm passcode"
673+msgstr ""
674+
675+#: qml/Wizard/Pages/passwd-confirm.qml:53
676+#: qml/Wizard/Pages/passwd-confirm.qml:54
677+msgid "Please try again."
678+msgstr ""
679+
680+#: qml/Wizard/Pages/passwd-set.qml:61
681+msgid "Choose your passcode"
682+msgstr ""
683+
684+#: qml/Wizard/Pages/passwd-set.qml:68
685+msgid "Passphrase must be 4 characters long"
686+msgstr ""
687+
687#. Translators: This is the arrow for "Back" buttons
688#. Translators: This is the arrow for "Back" buttons
688#: qml/Wizard/StackButton.qml:39
689#: qml/Wizard/StackButton.qml:39
689#, qt-format
690#, qt-format
po/vi.po+51−50
@@ -7,7 +7,7 @@ msgid ""
7msgstr ""
7msgstr ""
8"Project-Id-Version: unity8\n"
8"Project-Id-Version: unity8\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2015-06-22 12:00+0200\n"
10+"POT-Creation-Date: 2015-07-17 10:10+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"
@@ -15,8 +15,8 @@ msgstr ""
15"Content-Type: text/plain; charset=UTF-8\n"
15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n"
16"Content-Transfer-Encoding: 8bit\n"
17"Plural-Forms: nplurals=1; plural=0;\n"
17"Plural-Forms: nplurals=1; plural=0;\n"
18−"X-Launchpad-Export-Date: 2015-07-04 05:37+0000\n"
18+"X-Launchpad-Export-Date: 2015-07-25 05:39+0000\n"
19−"X-Generator: Launchpad (build 17597)\n"
19+"X-Generator: Launchpad (build 17628)\n"
20
20
21#: plugins/LightDM/Greeter.cpp:112
21#: plugins/LightDM/Greeter.cpp:112
22msgid "Password: "
22msgid "Password: "
@@ -223,15 +223,15 @@ msgstr ""
223msgid "OK"
223msgid "OK"
224msgstr ""
224msgstr ""
225
225
226−#: qml/Dash/GenericScopeView.qml:532 qml/Dash/GenericScopeView.qml:690
226+#: qml/Dash/GenericScopeView.qml:539 qml/Dash/GenericScopeView.qml:697
227msgid "See less"
227msgid "See less"
228msgstr ""
228msgstr ""
229
229
230−#: qml/Dash/GenericScopeView.qml:532
230+#: qml/Dash/GenericScopeView.qml:539
231msgid "See all"
231msgid "See all"
232msgstr ""
232msgstr ""
233
233
234−#: qml/Dash/GenericScopeView.qml:594
234+#: qml/Dash/GenericScopeView.qml:601
235msgctxt "Label: Hint for dash search line edit"
235msgctxt "Label: Hint for dash search line edit"
236msgid "Search"
236msgid "Search"
237msgstr ""
237msgstr ""
@@ -315,57 +315,58 @@ msgstr ""
315msgid "Tap to unlock"
315msgid "Tap to unlock"
316msgstr ""
316msgstr ""
317
317
318−#: qml/Greeter/NarrowView.qml:53 qml/Wizard/Pages/passwd-confirm.qml:53
318+#: qml/Greeter/NarrowView.qml:54 qml/Wizard/Pages/passwd-confirm.qml:53
319msgid "Sorry, incorrect passphrase."
319msgid "Sorry, incorrect passphrase."
320msgstr ""
320msgstr ""
321
321
322−#: qml/Greeter/NarrowView.qml:54 qml/Wizard/Pages/passwd-confirm.qml:54
322+#: qml/Greeter/NarrowView.qml:55 qml/Wizard/Pages/passwd-confirm.qml:54
323msgid "Sorry, incorrect passcode."
323msgid "Sorry, incorrect passcode."
324msgstr ""
324msgstr ""
325
325
326−#: qml/Greeter/NarrowView.qml:55
326+#: qml/Greeter/NarrowView.qml:56
327msgid "This will be your last attempt."
327msgid "This will be your last attempt."
328msgstr ""
328msgstr ""
329
329
330−#: qml/Greeter/NarrowView.qml:57
330+#: qml/Greeter/NarrowView.qml:58
331msgid ""
331msgid ""
332"If passphrase is entered incorrectly, your phone will conduct a factory "
332"If passphrase is entered incorrectly, your phone will conduct a factory "
333"reset and all personal data will be deleted."
333"reset and all personal data will be deleted."
334msgstr ""
334msgstr ""
335
335
336−#: qml/Greeter/NarrowView.qml:58
336+#: qml/Greeter/NarrowView.qml:59
337msgid ""
337msgid ""
338"If passcode is entered incorrectly, your phone will conduct a factory reset "
338"If passcode is entered incorrectly, your phone will conduct a factory reset "
339"and all personal data will be deleted."
339"and all personal data will be deleted."
340msgstr ""
340msgstr ""
341
341
342−#: qml/Greeter/NarrowView.qml:115
342+#: qml/Greeter/NarrowView.qml:116
343#, qt-format
343#, qt-format
344msgid "Enter %1"
344msgid "Enter %1"
345msgstr ""
345msgstr ""
346
346
347−#: qml/Greeter/NarrowView.qml:116 qml/Wizard/Pages/passwd-set.qml:60
347+#: qml/Greeter/NarrowView.qml:117 qml/Wizard/Pages/passwd-set.qml:60
348msgid "Enter passphrase"
348msgid "Enter passphrase"
349msgstr ""
349msgstr ""
350
350
351−#: qml/Greeter/NarrowView.qml:117
351+#: qml/Greeter/NarrowView.qml:118
352msgid "Enter passcode"
352msgid "Enter passcode"
353msgstr ""
353msgstr ""
354
354
355−#: qml/Greeter/NarrowView.qml:118
355+#: qml/Greeter/NarrowView.qml:119
356#, qt-format
356#, qt-format
357msgid "Sorry, incorrect %1"
357msgid "Sorry, incorrect %1"
358msgstr ""
358msgstr ""
359
359
360−#: qml/Greeter/NarrowView.qml:119
360+#: qml/Greeter/NarrowView.qml:120
361msgid "Sorry, incorrect passphrase"
361msgid "Sorry, incorrect passphrase"
362msgstr ""
362msgstr ""
363
363
364−#: qml/Greeter/NarrowView.qml:120
364+#: qml/Greeter/NarrowView.qml:121
365+msgctxt "passphrase"
365msgid "Please re-enter"
366msgid "Please re-enter"
366msgstr ""
367msgstr ""
367
368
368−#: qml/Greeter/NarrowView.qml:121
369+#: qml/Greeter/NarrowView.qml:122
369msgid "Sorry, incorrect passcode"
370msgid "Sorry, incorrect passcode"
370msgstr ""
371msgstr ""
371
372
@@ -515,38 +516,6 @@ msgctxt "Button: Go back one page in the Wizard"
515msgid "Back"
516msgid "Back"
516msgstr ""
517msgstr ""
517
518
518−#: qml/Wizard/Pages/here-terms.qml:27
519−msgid "Terms & Conditions"
520−msgstr ""
521−
522−#: qml/Wizard/Pages/passwd-confirm.qml:49
523−msgid "Confirm passphrase"
524−msgstr ""
525−
526−#: qml/Wizard/Pages/passwd-confirm.qml:50
527−msgid "Confirm passcode"
528−msgstr ""
529−
530−#: qml/Wizard/Pages/passwd-confirm.qml:53
531−#: qml/Wizard/Pages/passwd-confirm.qml:54
532−msgid "Please try again."
533−msgstr ""
534−
535−#: qml/Wizard/Pages/passwd-confirm.qml:82 qml/Wizard/Pages/passwd-set.qml:90
536−#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:128
537−#: qml/Wizard/Pages/40-wifi.qml:215 qml/Wizard/Pages/50-location.qml:131
538−#: qml/Wizard/Pages/60-reporting.qml:50
539−msgid "Continue"
540−msgstr ""
541−
542−#: qml/Wizard/Pages/passwd-set.qml:61
543−msgid "Choose your passcode"
544−msgstr ""
545−
546−#: qml/Wizard/Pages/passwd-set.qml:68
547−msgid "Passphrase must be 4 characters long"
548−msgstr ""
549−
550#: qml/Wizard/Pages/10-welcome.qml:27
519#: qml/Wizard/Pages/10-welcome.qml:27
551msgid "Hi!"
520msgid "Hi!"
552msgstr ""
521msgstr ""
@@ -559,6 +528,13 @@ msgstr ""
559msgid "Let’s get started."
528msgid "Let’s get started."
560msgstr ""
529msgstr ""
561
530
531+#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:128
532+#: qml/Wizard/Pages/40-wifi.qml:215 qml/Wizard/Pages/50-location.qml:131
533+#: qml/Wizard/Pages/60-reporting.qml:50 qml/Wizard/Pages/passwd-confirm.qml:82
534+#: qml/Wizard/Pages/passwd-set.qml:90
535+msgid "Continue"
536+msgstr ""
537+
562#: qml/Wizard/Pages/20-sim.qml:25
538#: qml/Wizard/Pages/20-sim.qml:25
563msgid "Add a SIM card and restart your device"
539msgid "Add a SIM card and restart your device"
564msgstr ""
540msgstr ""
@@ -684,6 +660,31 @@ msgstr ""
684msgid "Finish"
660msgid "Finish"
685msgstr ""
661msgstr ""
686
662
663+#: qml/Wizard/Pages/here-terms.qml:27
664+msgid "Terms & Conditions"
665+msgstr ""
666+
667+#: qml/Wizard/Pages/passwd-confirm.qml:49
668+msgid "Confirm passphrase"
669+msgstr ""
670+
671+#: qml/Wizard/Pages/passwd-confirm.qml:50
672+msgid "Confirm passcode"
673+msgstr ""
674+
675+#: qml/Wizard/Pages/passwd-confirm.qml:53
676+#: qml/Wizard/Pages/passwd-confirm.qml:54
677+msgid "Please try again."
678+msgstr ""
679+
680+#: qml/Wizard/Pages/passwd-set.qml:61
681+msgid "Choose your passcode"
682+msgstr ""
683+
684+#: qml/Wizard/Pages/passwd-set.qml:68
685+msgid "Passphrase must be 4 characters long"
686+msgstr ""
687+
687#. Translators: This is the arrow for "Back" buttons
688#. Translators: This is the arrow for "Back" buttons
688#: qml/Wizard/StackButton.qml:39
689#: qml/Wizard/StackButton.qml:39
689#, qt-format
690#, qt-format
po/xh.po+51−50
@@ -7,7 +7,7 @@ msgid ""
7msgstr ""
7msgstr ""
8"Project-Id-Version: unity8\n"
8"Project-Id-Version: unity8\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2015-06-22 12:00+0200\n"
10+"POT-Creation-Date: 2015-07-17 10:10+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"
@@ -15,8 +15,8 @@ msgstr ""
15"Content-Type: text/plain; charset=UTF-8\n"
15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n"
16"Content-Transfer-Encoding: 8bit\n"
17"Plural-Forms: nplurals=2; plural=n != 1;\n"
17"Plural-Forms: nplurals=2; plural=n != 1;\n"
18−"X-Launchpad-Export-Date: 2015-07-04 05:37+0000\n"
18+"X-Launchpad-Export-Date: 2015-07-25 05:39+0000\n"
19−"X-Generator: Launchpad (build 17597)\n"
19+"X-Generator: Launchpad (build 17628)\n"
20
20
21#: plugins/LightDM/Greeter.cpp:112
21#: plugins/LightDM/Greeter.cpp:112
22msgid "Password: "
22msgid "Password: "
@@ -223,15 +223,15 @@ msgstr ""
223msgid "OK"
223msgid "OK"
224msgstr ""
224msgstr ""
225
225
226−#: qml/Dash/GenericScopeView.qml:532 qml/Dash/GenericScopeView.qml:690
226+#: qml/Dash/GenericScopeView.qml:539 qml/Dash/GenericScopeView.qml:697
227msgid "See less"
227msgid "See less"
228msgstr ""
228msgstr ""
229
229
230−#: qml/Dash/GenericScopeView.qml:532
230+#: qml/Dash/GenericScopeView.qml:539
231msgid "See all"
231msgid "See all"
232msgstr ""
232msgstr ""
233
233
234−#: qml/Dash/GenericScopeView.qml:594
234+#: qml/Dash/GenericScopeView.qml:601
235msgctxt "Label: Hint for dash search line edit"
235msgctxt "Label: Hint for dash search line edit"
236msgid "Search"
236msgid "Search"
237msgstr ""
237msgstr ""
@@ -315,57 +315,58 @@ msgstr ""
315msgid "Tap to unlock"
315msgid "Tap to unlock"
316msgstr ""
316msgstr ""
317
317
318−#: qml/Greeter/NarrowView.qml:53 qml/Wizard/Pages/passwd-confirm.qml:53
318+#: qml/Greeter/NarrowView.qml:54 qml/Wizard/Pages/passwd-confirm.qml:53
319msgid "Sorry, incorrect passphrase."
319msgid "Sorry, incorrect passphrase."
320msgstr ""
320msgstr ""
321
321
322−#: qml/Greeter/NarrowView.qml:54 qml/Wizard/Pages/passwd-confirm.qml:54
322+#: qml/Greeter/NarrowView.qml:55 qml/Wizard/Pages/passwd-confirm.qml:54
323msgid "Sorry, incorrect passcode."
323msgid "Sorry, incorrect passcode."
324msgstr ""
324msgstr ""
325
325
326−#: qml/Greeter/NarrowView.qml:55
326+#: qml/Greeter/NarrowView.qml:56
327msgid "This will be your last attempt."
327msgid "This will be your last attempt."
328msgstr ""
328msgstr ""
329
329
330−#: qml/Greeter/NarrowView.qml:57
330+#: qml/Greeter/NarrowView.qml:58
331msgid ""
331msgid ""
332"If passphrase is entered incorrectly, your phone will conduct a factory "
332"If passphrase is entered incorrectly, your phone will conduct a factory "
333"reset and all personal data will be deleted."
333"reset and all personal data will be deleted."
334msgstr ""
334msgstr ""
335
335
336−#: qml/Greeter/NarrowView.qml:58
336+#: qml/Greeter/NarrowView.qml:59
337msgid ""
337msgid ""
338"If passcode is entered incorrectly, your phone will conduct a factory reset "
338"If passcode is entered incorrectly, your phone will conduct a factory reset "
339"and all personal data will be deleted."
339"and all personal data will be deleted."
340msgstr ""
340msgstr ""
341
341
342−#: qml/Greeter/NarrowView.qml:115
342+#: qml/Greeter/NarrowView.qml:116
343#, qt-format
343#, qt-format
344msgid "Enter %1"
344msgid "Enter %1"
345msgstr ""
345msgstr ""
346
346
347−#: qml/Greeter/NarrowView.qml:116 qml/Wizard/Pages/passwd-set.qml:60
347+#: qml/Greeter/NarrowView.qml:117 qml/Wizard/Pages/passwd-set.qml:60
348msgid "Enter passphrase"
348msgid "Enter passphrase"
349msgstr ""
349msgstr ""
350
350
351−#: qml/Greeter/NarrowView.qml:117
351+#: qml/Greeter/NarrowView.qml:118
352msgid "Enter passcode"
352msgid "Enter passcode"
353msgstr ""
353msgstr ""
354
354
355−#: qml/Greeter/NarrowView.qml:118
355+#: qml/Greeter/NarrowView.qml:119
356#, qt-format
356#, qt-format
357msgid "Sorry, incorrect %1"
357msgid "Sorry, incorrect %1"
358msgstr ""
358msgstr ""
359
359
360−#: qml/Greeter/NarrowView.qml:119
360+#: qml/Greeter/NarrowView.qml:120
361msgid "Sorry, incorrect passphrase"
361msgid "Sorry, incorrect passphrase"
362msgstr ""
362msgstr ""
363
363
364−#: qml/Greeter/NarrowView.qml:120
364+#: qml/Greeter/NarrowView.qml:121
365+msgctxt "passphrase"
365msgid "Please re-enter"
366msgid "Please re-enter"
366msgstr ""
367msgstr ""
367
368
368−#: qml/Greeter/NarrowView.qml:121
369+#: qml/Greeter/NarrowView.qml:122
369msgid "Sorry, incorrect passcode"
370msgid "Sorry, incorrect passcode"
370msgstr ""
371msgstr ""
371
372
@@ -515,38 +516,6 @@ msgctxt "Button: Go back one page in the Wizard"
515msgid "Back"
516msgid "Back"
516msgstr ""
517msgstr ""
517
518
518−#: qml/Wizard/Pages/here-terms.qml:27
519−msgid "Terms & Conditions"
520−msgstr ""
521−
522−#: qml/Wizard/Pages/passwd-confirm.qml:49
523−msgid "Confirm passphrase"
524−msgstr ""
525−
526−#: qml/Wizard/Pages/passwd-confirm.qml:50
527−msgid "Confirm passcode"
528−msgstr ""
529−
530−#: qml/Wizard/Pages/passwd-confirm.qml:53
531−#: qml/Wizard/Pages/passwd-confirm.qml:54
532−msgid "Please try again."
533−msgstr ""
534−
535−#: qml/Wizard/Pages/passwd-confirm.qml:82 qml/Wizard/Pages/passwd-set.qml:90
536−#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:128
537−#: qml/Wizard/Pages/40-wifi.qml:215 qml/Wizard/Pages/50-location.qml:131
538−#: qml/Wizard/Pages/60-reporting.qml:50
539−msgid "Continue"
540−msgstr ""
541−
542−#: qml/Wizard/Pages/passwd-set.qml:61
543−msgid "Choose your passcode"
544−msgstr ""
545−
546−#: qml/Wizard/Pages/passwd-set.qml:68
547−msgid "Passphrase must be 4 characters long"
548−msgstr ""
549−
550#: qml/Wizard/Pages/10-welcome.qml:27
519#: qml/Wizard/Pages/10-welcome.qml:27
551msgid "Hi!"
520msgid "Hi!"
552msgstr ""
521msgstr ""
@@ -559,6 +528,13 @@ msgstr ""
559msgid "Let’s get started."
528msgid "Let’s get started."
560msgstr ""
529msgstr ""
561
530
531+#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:128
532+#: qml/Wizard/Pages/40-wifi.qml:215 qml/Wizard/Pages/50-location.qml:131
533+#: qml/Wizard/Pages/60-reporting.qml:50 qml/Wizard/Pages/passwd-confirm.qml:82
534+#: qml/Wizard/Pages/passwd-set.qml:90
535+msgid "Continue"
536+msgstr ""
537+
562#: qml/Wizard/Pages/20-sim.qml:25
538#: qml/Wizard/Pages/20-sim.qml:25
563msgid "Add a SIM card and restart your device"
539msgid "Add a SIM card and restart your device"
564msgstr ""
540msgstr ""
@@ -684,6 +660,31 @@ msgstr ""
684msgid "Finish"
660msgid "Finish"
685msgstr ""
661msgstr ""
686
662
663+#: qml/Wizard/Pages/here-terms.qml:27
664+msgid "Terms & Conditions"
665+msgstr ""
666+
667+#: qml/Wizard/Pages/passwd-confirm.qml:49
668+msgid "Confirm passphrase"
669+msgstr ""
670+
671+#: qml/Wizard/Pages/passwd-confirm.qml:50
672+msgid "Confirm passcode"
673+msgstr ""
674+
675+#: qml/Wizard/Pages/passwd-confirm.qml:53
676+#: qml/Wizard/Pages/passwd-confirm.qml:54
677+msgid "Please try again."
678+msgstr ""
679+
680+#: qml/Wizard/Pages/passwd-set.qml:61
681+msgid "Choose your passcode"
682+msgstr ""
683+
684+#: qml/Wizard/Pages/passwd-set.qml:68
685+msgid "Passphrase must be 4 characters long"
686+msgstr ""
687+
687#. Translators: This is the arrow for "Back" buttons
688#. Translators: This is the arrow for "Back" buttons
688#: qml/Wizard/StackButton.qml:39
689#: qml/Wizard/StackButton.qml:39
689#, qt-format
690#, qt-format
po/zh_CN.po+75−74
@@ -7,16 +7,16 @@ msgid ""
7msgstr ""
7msgstr ""
8"Project-Id-Version: unity\n"
8"Project-Id-Version: unity\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2015-06-22 12:00+0200\n"
10+"POT-Creation-Date: 2015-07-17 10:10+0200\n"
11−"PO-Revision-Date: 2015-06-29 07:55+0000\n"
11+"PO-Revision-Date: 2015-07-27 10:26+0000\n"
12−"Last-Translator: Mydin <imydin@163.com>\n"
12+"Last-Translator: Ian Li <Unknown>\n"
13"Language-Team: Chinese (Simplified) <zh_CN@li.org>\n"
13"Language-Team: Chinese (Simplified) <zh_CN@li.org>\n"
14"MIME-Version: 1.0\n"
14"MIME-Version: 1.0\n"
15"Content-Type: text/plain; charset=UTF-8\n"
15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n"
16"Content-Transfer-Encoding: 8bit\n"
17"Plural-Forms: nplurals=1; plural=0;\n"
17"Plural-Forms: nplurals=1; plural=0;\n"
18−"X-Launchpad-Export-Date: 2015-07-04 05:37+0000\n"
18+"X-Launchpad-Export-Date: 2015-07-28 05:40+0000\n"
19−"X-Generator: Launchpad (build 17597)\n"
19+"X-Generator: Launchpad (build 17628)\n"
20
20
21#: plugins/LightDM/Greeter.cpp:112
21#: plugins/LightDM/Greeter.cpp:112
22msgid "Password: "
22msgid "Password: "
@@ -37,14 +37,14 @@ msgstr "取消固定快捷方式"
37#. en_US example: "Yesterday\u2003%l:%M %p" --> "Yesterday 1:00 PM"
37#. en_US example: "Yesterday\u2003%l:%M %p" --> "Yesterday 1:00 PM"
38#: plugins/Utils/relativetimeformatter.cpp:157
38#: plugins/Utils/relativetimeformatter.cpp:157
39msgid "Yesterday %l:%M %p"
39msgid "Yesterday %l:%M %p"
40−msgstr ""
40+msgstr "昨天 %p %l:%M"
41
41
42#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
42#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
43#. This format string is used for showing, on a 12-hour clock, times that happened today.
43#. This format string is used for showing, on a 12-hour clock, times that happened today.
44#. en_US example: "%l:%M %p" --> "1:00 PM"
44#. en_US example: "%l:%M %p" --> "1:00 PM"
45#: plugins/Utils/relativetimeformatter.cpp:164
45#: plugins/Utils/relativetimeformatter.cpp:164
46msgid "%l:%M %p"
46msgid "%l:%M %p"
47−msgstr ""
47+msgstr "%l:%M %p"
48
48
49#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
49#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
50#. This format string is used for showing, on a 12-hour clock, events/appointments that happen tomorrow.
50#. This format string is used for showing, on a 12-hour clock, events/appointments that happen tomorrow.
@@ -52,7 +52,7 @@ msgstr ""
52#. en_US example: "Tomorrow\u2003%l:%M %p" --> "Tomorrow 1:00 PM"
52#. en_US example: "Tomorrow\u2003%l:%M %p" --> "Tomorrow 1:00 PM"
53#: plugins/Utils/relativetimeformatter.cpp:172
53#: plugins/Utils/relativetimeformatter.cpp:172
54msgid "Tomorrow %l:%M %p"
54msgid "Tomorrow %l:%M %p"
55−msgstr ""
55+msgstr "明天 %l:%M %p"
56
56
57#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
57#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
58#. This format string is used for showing, on a 12-hour clock, times that happened in the last week.
58#. This format string is used for showing, on a 12-hour clock, times that happened in the last week.
@@ -60,7 +60,7 @@ msgstr ""
60#. en_US example: "%a\u2003%l:%M %p" --> "Fri 1:00 PM"
60#. en_US example: "%a\u2003%l:%M %p" --> "Fri 1:00 PM"
61#: plugins/Utils/relativetimeformatter.cpp:181
61#: plugins/Utils/relativetimeformatter.cpp:181
62msgid "%a %l:%M %p"
62msgid "%a %l:%M %p"
63−msgstr ""
63+msgstr "%a %l:%M %p"
64
64
65#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
65#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
66#. This format string is used for showing, on a 12-hour clock, times that happened before a week from now.
66#. This format string is used for showing, on a 12-hour clock, times that happened before a week from now.
@@ -69,7 +69,7 @@ msgstr ""
69#. en_GB example: "%a %b %d\u2003%l:%M %p" --> "Fri 31 Oct 1:00 PM"
69#. en_GB example: "%a %b %d\u2003%l:%M %p" --> "Fri 31 Oct 1:00 PM"
70#: plugins/Utils/relativetimeformatter.cpp:190
70#: plugins/Utils/relativetimeformatter.cpp:190
71msgid "%a %d %b %l:%M %p"
71msgid "%a %d %b %l:%M %p"
72−msgstr ""
72+msgstr "%d %b %a %l:%M %p"
73
73
74#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
74#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
75#. This format string is used for showing, on a 24-hour clock, times that happen yesterday.
75#. This format string is used for showing, on a 24-hour clock, times that happen yesterday.
@@ -77,14 +77,14 @@ msgstr ""
77#. en_US example: "Yesterday\u2003%l:%M %p" --> "Yesterday 13:00"
77#. en_US example: "Yesterday\u2003%l:%M %p" --> "Yesterday 13:00"
78#: plugins/Utils/relativetimeformatter.cpp:201
78#: plugins/Utils/relativetimeformatter.cpp:201
79msgid "Yesterday %H:%M"
79msgid "Yesterday %H:%M"
80−msgstr ""
80+msgstr "昨天 %H:%M"
81
81
82#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
82#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
83#. This format string is used for showing, on a 24-hour clock, times that happened today.
83#. This format string is used for showing, on a 24-hour clock, times that happened today.
84#. en_US example: "%H:%M" --> "13:00"
84#. en_US example: "%H:%M" --> "13:00"
85#: plugins/Utils/relativetimeformatter.cpp:208
85#: plugins/Utils/relativetimeformatter.cpp:208
86msgid "%H:%M"
86msgid "%H:%M"
87−msgstr ""
87+msgstr "%H:%M"
88
88
89#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
89#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
90#. This format string is used for showing, on a 24-hour clock, events/appointments that happen tomorrow.
90#. This format string is used for showing, on a 24-hour clock, events/appointments that happen tomorrow.
@@ -92,7 +92,7 @@ msgstr ""
92#. en_US example: "Tomorrow\u2003%l:%M %p" --> "Tomorrow 13:00"
92#. en_US example: "Tomorrow\u2003%l:%M %p" --> "Tomorrow 13:00"
93#: plugins/Utils/relativetimeformatter.cpp:216
93#: plugins/Utils/relativetimeformatter.cpp:216
94msgid "Tomorrow %H:%M"
94msgid "Tomorrow %H:%M"
95−msgstr ""
95+msgstr "明天 %H:%M"
96
96
97#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
97#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
98#. This format string is used for showing, on a 24-hour clock, times that happened in the last week.
98#. This format string is used for showing, on a 24-hour clock, times that happened in the last week.
@@ -100,7 +100,7 @@ msgstr ""
100#. en_US example: "%a\u2003%H:%M" --> "Fri 13:00"
100#. en_US example: "%a\u2003%H:%M" --> "Fri 13:00"
101#: plugins/Utils/relativetimeformatter.cpp:225
101#: plugins/Utils/relativetimeformatter.cpp:225
102msgid "%a %H:%M"
102msgid "%a %H:%M"
103−msgstr ""
103+msgstr "%a %H:%M"
104
104
105#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
105#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
106#. This format string is used for showing, on a 24-hour clock, times that happened before a week from now.
106#. This format string is used for showing, on a 24-hour clock, times that happened before a week from now.
@@ -109,7 +109,7 @@ msgstr ""
109#. en_GB example: "%a %b %d\u2003%H:%M" --> "Fri 31 Oct 13:00"
109#. en_GB example: "%a %b %d\u2003%H:%M" --> "Fri 31 Oct 13:00"
110#: plugins/Utils/relativetimeformatter.cpp:234
110#: plugins/Utils/relativetimeformatter.cpp:234
111msgid "%a %d %b %H:%M"
111msgid "%a %d %b %H:%M"
112−msgstr ""
112+msgstr "%d %b %a %H:%M"
113
113
114#: qml/Components/DelayedLockscreen.qml:49
114#: qml/Components/DelayedLockscreen.qml:49
115msgid "Device Locked"
115msgid "Device Locked"
@@ -218,21 +218,21 @@ msgstr "回到呼叫"
218
218
219#: qml/Components/Lockscreen.qml:245
219#: qml/Components/Lockscreen.qml:245
220msgid "Emergency Call"
220msgid "Emergency Call"
221−msgstr "紧急电话"
221+msgstr "紧急呼叫"
222
222
223#: qml/Components/Lockscreen.qml:277
223#: qml/Components/Lockscreen.qml:277
224msgid "OK"
224msgid "OK"
225msgstr "确定"
225msgstr "确定"
226
226
227−#: qml/Dash/GenericScopeView.qml:532 qml/Dash/GenericScopeView.qml:690
227+#: qml/Dash/GenericScopeView.qml:539 qml/Dash/GenericScopeView.qml:697
228msgid "See less"
228msgid "See less"
229msgstr "显示更少"
229msgstr "显示更少"
230
230
231−#: qml/Dash/GenericScopeView.qml:532
231+#: qml/Dash/GenericScopeView.qml:539
232msgid "See all"
232msgid "See all"
233msgstr "查看全部"
233msgstr "查看全部"
234
234
235−#: qml/Dash/GenericScopeView.qml:594
235+#: qml/Dash/GenericScopeView.qml:601
236msgctxt "Label: Hint for dash search line edit"
236msgctxt "Label: Hint for dash search line edit"
237msgid "Search"
237msgid "Search"
238msgstr "搜索"
238msgstr "搜索"
@@ -316,57 +316,58 @@ msgstr "重试"
316msgid "Tap to unlock"
316msgid "Tap to unlock"
317msgstr "点击解锁"
317msgstr "点击解锁"
318
318
319−#: qml/Greeter/NarrowView.qml:53 qml/Wizard/Pages/passwd-confirm.qml:53
319+#: qml/Greeter/NarrowView.qml:54 qml/Wizard/Pages/passwd-confirm.qml:53
320msgid "Sorry, incorrect passphrase."
320msgid "Sorry, incorrect passphrase."
321msgstr "对不起,口令密语错误"
321msgstr "对不起,口令密语错误"
322
322
323−#: qml/Greeter/NarrowView.qml:54 qml/Wizard/Pages/passwd-confirm.qml:54
323+#: qml/Greeter/NarrowView.qml:55 qml/Wizard/Pages/passwd-confirm.qml:54
324msgid "Sorry, incorrect passcode."
324msgid "Sorry, incorrect passcode."
325msgstr "对不起,密码错误。"
325msgstr "对不起,密码错误。"
326
326
327−#: qml/Greeter/NarrowView.qml:55
327+#: qml/Greeter/NarrowView.qml:56
328msgid "This will be your last attempt."
328msgid "This will be your last attempt."
329msgstr "这是您最后的尝试机会。"
329msgstr "这是您最后的尝试机会。"
330
330
331−#: qml/Greeter/NarrowView.qml:57
331+#: qml/Greeter/NarrowView.qml:58
332msgid ""
332msgid ""
333"If passphrase is entered incorrectly, your phone will conduct a factory "
333"If passphrase is entered incorrectly, your phone will conduct a factory "
334"reset and all personal data will be deleted."
334"reset and all personal data will be deleted."
335msgstr "如果输入的密语不正确,您的手机将恢复到出厂设置并且所有的个人数据将被删除。"
335msgstr "如果输入的密语不正确,您的手机将恢复到出厂设置并且所有的个人数据将被删除。"
336
336
337−#: qml/Greeter/NarrowView.qml:58
337+#: qml/Greeter/NarrowView.qml:59
338msgid ""
338msgid ""
339"If passcode is entered incorrectly, your phone will conduct a factory reset "
339"If passcode is entered incorrectly, your phone will conduct a factory reset "
340"and all personal data will be deleted."
340"and all personal data will be deleted."
341msgstr "如果输入的密码不正确,您的手机将恢复到出厂设置并且所有的个人数据将被删除。"
341msgstr "如果输入的密码不正确,您的手机将恢复到出厂设置并且所有的个人数据将被删除。"
342
342
343−#: qml/Greeter/NarrowView.qml:115
343+#: qml/Greeter/NarrowView.qml:116
344#, qt-format
344#, qt-format
345msgid "Enter %1"
345msgid "Enter %1"
346msgstr "输入 %1"
346msgstr "输入 %1"
347
347
348−#: qml/Greeter/NarrowView.qml:116 qml/Wizard/Pages/passwd-set.qml:60
348+#: qml/Greeter/NarrowView.qml:117 qml/Wizard/Pages/passwd-set.qml:60
349msgid "Enter passphrase"
349msgid "Enter passphrase"
350msgstr "输入口令密语"
350msgstr "输入口令密语"
351
351
352−#: qml/Greeter/NarrowView.qml:117
352+#: qml/Greeter/NarrowView.qml:118
353msgid "Enter passcode"
353msgid "Enter passcode"
354msgstr "输入密码"
354msgstr "输入密码"
355
355
356−#: qml/Greeter/NarrowView.qml:118
356+#: qml/Greeter/NarrowView.qml:119
357#, qt-format
357#, qt-format
358msgid "Sorry, incorrect %1"
358msgid "Sorry, incorrect %1"
359msgstr "对不起,%1 不正确"
359msgstr "对不起,%1 不正确"
360
360
361−#: qml/Greeter/NarrowView.qml:119
361+#: qml/Greeter/NarrowView.qml:120
362msgid "Sorry, incorrect passphrase"
362msgid "Sorry, incorrect passphrase"
363msgstr "对不起,密语不正确"
363msgstr "对不起,密语不正确"
364
364
365−#: qml/Greeter/NarrowView.qml:120
365+#: qml/Greeter/NarrowView.qml:121
366+msgctxt "passphrase"
366msgid "Please re-enter"
367msgid "Please re-enter"
367msgstr "请重新输入"
368msgstr "请重新输入"
368
369
369−#: qml/Greeter/NarrowView.qml:121
370+#: qml/Greeter/NarrowView.qml:122
370msgid "Sorry, incorrect passcode"
371msgid "Sorry, incorrect passcode"
371msgstr "对不起,密码错误"
372msgstr "对不起,密码错误"
372
373
@@ -390,32 +391,29 @@ msgstr "无正在播放的项目"
390#, qt-format
391#, qt-format
391msgid "%1 hour"
392msgid "%1 hour"
392msgid_plural "%1 hours"
393msgid_plural "%1 hours"
393−msgstr[0] ""
394+msgstr[0] "%1 小时"
394−msgstr[1] ""
395
395
396#: qml/Panel/Indicators/MenuItemFactory.qml:772
396#: qml/Panel/Indicators/MenuItemFactory.qml:772
397#, qt-format
397#, qt-format
398msgid "%1 minute"
398msgid "%1 minute"
399msgid_plural "%1 minutes"
399msgid_plural "%1 minutes"
400−msgstr[0] ""
400+msgstr[0] "%1 分钟"
401−msgstr[1] ""
402
401
403#: qml/Panel/Indicators/MenuItemFactory.qml:777
402#: qml/Panel/Indicators/MenuItemFactory.qml:777
404#, qt-format
403#, qt-format
405msgid "%1 second"
404msgid "%1 second"
406msgid_plural "%1 seconds"
405msgid_plural "%1 seconds"
407−msgstr[0] ""
406+msgstr[0] "%1 秒"
408−msgstr[1] ""
409
407
410#: qml/Panel/Indicators/MenuItemFactory.qml:780
408#: qml/Panel/Indicators/MenuItemFactory.qml:780
411msgid "0 seconds"
409msgid "0 seconds"
412−msgstr ""
410+msgstr "0 秒"
413
411
414#. Translators: String like "1 hour, 2 minutes, 3 seconds remaining"
412#. Translators: String like "1 hour, 2 minutes, 3 seconds remaining"
415#: qml/Panel/Indicators/MenuItemFactory.qml:782
413#: qml/Panel/Indicators/MenuItemFactory.qml:782
416#, qt-format
414#, qt-format
417msgid "%1 remaining"
415msgid "%1 remaining"
418−msgstr ""
416+msgstr "剩余 %1"
419
417
420#: qml/Panel/Indicators/MenuItemFactory.qml:788
418#: qml/Panel/Indicators/MenuItemFactory.qml:788
421msgid "In queue…"
419msgid "In queue…"
@@ -516,41 +514,9 @@ msgctxt "Button: Go back one page in the Wizard"
516msgid "Back"
514msgid "Back"
517msgstr "上一步"
515msgstr "上一步"
518
516
519−#: qml/Wizard/Pages/here-terms.qml:27
520−msgid "Terms & Conditions"
521−msgstr "条款与条件"
522−
523−#: qml/Wizard/Pages/passwd-confirm.qml:49
524−msgid "Confirm passphrase"
525−msgstr "确认口令密语"
526−
527−#: qml/Wizard/Pages/passwd-confirm.qml:50
528−msgid "Confirm passcode"
529−msgstr "确认新密码"
530−
531−#: qml/Wizard/Pages/passwd-confirm.qml:53
532−#: qml/Wizard/Pages/passwd-confirm.qml:54
533−msgid "Please try again."
534−msgstr "请再试一次。"
535−
536−#: qml/Wizard/Pages/passwd-confirm.qml:82 qml/Wizard/Pages/passwd-set.qml:90
537−#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:128
538−#: qml/Wizard/Pages/40-wifi.qml:215 qml/Wizard/Pages/50-location.qml:131
539−#: qml/Wizard/Pages/60-reporting.qml:50
540−msgid "Continue"
541−msgstr "下一步"
542−
543−#: qml/Wizard/Pages/passwd-set.qml:61
544−msgid "Choose your passcode"
545−msgstr "选择您的密码"
546−
547−#: qml/Wizard/Pages/passwd-set.qml:68
548−msgid "Passphrase must be 4 characters long"
549−msgstr "口令密语必须为4个字符长度"
550−
551#: qml/Wizard/Pages/10-welcome.qml:27
517#: qml/Wizard/Pages/10-welcome.qml:27
552msgid "Hi!"
518msgid "Hi!"
553−msgstr "Hi!"
519+msgstr "您好!"
554
520
555#: qml/Wizard/Pages/10-welcome.qml:44
521#: qml/Wizard/Pages/10-welcome.qml:44
556msgid "Welcome to your Ubuntu phone."
522msgid "Welcome to your Ubuntu phone."
@@ -560,13 +526,20 @@ msgstr "欢迎使用您的 Ubuntu 手机。"
560msgid "Let’s get started."
526msgid "Let’s get started."
561msgstr "让我们开始吧。"
527msgstr "让我们开始吧。"
562
528
529+#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:128
530+#: qml/Wizard/Pages/40-wifi.qml:215 qml/Wizard/Pages/50-location.qml:131
531+#: qml/Wizard/Pages/60-reporting.qml:50 qml/Wizard/Pages/passwd-confirm.qml:82
532+#: qml/Wizard/Pages/passwd-set.qml:90
533+msgid "Continue"
534+msgstr "下一步"
535+
563#: qml/Wizard/Pages/20-sim.qml:25
536#: qml/Wizard/Pages/20-sim.qml:25
564msgid "Add a SIM card and restart your device"
537msgid "Add a SIM card and restart your device"
565msgstr "插入 SIM 卡并重启你的设备"
538msgstr "插入 SIM 卡并重启你的设备"
566
539
567#: qml/Wizard/Pages/20-sim.qml:59
540#: qml/Wizard/Pages/20-sim.qml:59
568msgid "Without it, you won’t be able to make calls or use text messaging."
541msgid "Without it, you won’t be able to make calls or use text messaging."
569−msgstr "离开它,您将不能使用电话或短信功能。"
542+msgstr "没有它,您将不能使用电话或短信功能。"
570
543
571#: qml/Wizard/Pages/20-sim.qml:73 qml/Wizard/Pages/40-wifi.qml:215
544#: qml/Wizard/Pages/20-sim.qml:73 qml/Wizard/Pages/40-wifi.qml:215
572msgid "Skip"
545msgid "Skip"
@@ -647,7 +620,7 @@ msgstr "选择这个选项表示你同意 Nokia HERE <a href='#'>条款声明</a
647
620
648#: qml/Wizard/Pages/50-location.qml:112
621#: qml/Wizard/Pages/50-location.qml:112
649msgid "Not at all"
622msgid "Not at all"
650−msgstr "一点也不"
623+msgstr "不使用"
651
624
652#: qml/Wizard/Pages/50-location.qml:124
625#: qml/Wizard/Pages/50-location.qml:124
653msgid "You can change your mind later in <b>System Settings</b>."
626msgid "You can change your mind later in <b>System Settings</b>."
@@ -685,6 +658,31 @@ msgstr "您的手机现在可以使用了。"
685msgid "Finish"
658msgid "Finish"
686msgstr "结束"
659msgstr "结束"
687
660
661+#: qml/Wizard/Pages/here-terms.qml:27
662+msgid "Terms & Conditions"
663+msgstr "条款与条件"
664+
665+#: qml/Wizard/Pages/passwd-confirm.qml:49
666+msgid "Confirm passphrase"
667+msgstr "确认口令密语"
668+
669+#: qml/Wizard/Pages/passwd-confirm.qml:50
670+msgid "Confirm passcode"
671+msgstr "确认新密码"
672+
673+#: qml/Wizard/Pages/passwd-confirm.qml:53
674+#: qml/Wizard/Pages/passwd-confirm.qml:54
675+msgid "Please try again."
676+msgstr "请再试一次。"
677+
678+#: qml/Wizard/Pages/passwd-set.qml:61
679+msgid "Choose your passcode"
680+msgstr "选择您的密码"
681+
682+#: qml/Wizard/Pages/passwd-set.qml:68
683+msgid "Passphrase must be 4 characters long"
684+msgstr "口令密语必须为4个字符长度"
685+
688#. Translators: This is the arrow for "Back" buttons
686#. Translators: This is the arrow for "Back" buttons
689#: qml/Wizard/StackButton.qml:39
687#: qml/Wizard/StackButton.qml:39
690#, qt-format
688#, qt-format
@@ -764,3 +762,6 @@ msgstr "%1 〉"
764
762
765#~ msgid "Done"
763#~ msgid "Done"
766#~ msgstr "完成"
764#~ msgstr "完成"
765+
766+#~ msgid "Please re-enter"
767+#~ msgstr "请重新输入"
po/zh_HK.po+51−50
@@ -7,7 +7,7 @@ msgid ""
7msgstr ""
7msgstr ""
8"Project-Id-Version: unity8\n"
8"Project-Id-Version: unity8\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2015-06-22 12:00+0200\n"
10+"POT-Creation-Date: 2015-07-17 10:10+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"
@@ -15,8 +15,8 @@ msgstr ""
15"Content-Type: text/plain; charset=UTF-8\n"
15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n"
16"Content-Transfer-Encoding: 8bit\n"
17"Plural-Forms: nplurals=1; plural=0;\n"
17"Plural-Forms: nplurals=1; plural=0;\n"
18−"X-Launchpad-Export-Date: 2015-07-04 05:37+0000\n"
18+"X-Launchpad-Export-Date: 2015-07-25 05:39+0000\n"
19−"X-Generator: Launchpad (build 17597)\n"
19+"X-Generator: Launchpad (build 17628)\n"
20
20
21#: plugins/LightDM/Greeter.cpp:112
21#: plugins/LightDM/Greeter.cpp:112
22msgid "Password: "
22msgid "Password: "
@@ -223,15 +223,15 @@ msgstr "緊急電話"
223msgid "OK"
223msgid "OK"
224msgstr "確定"
224msgstr "確定"
225
225
226−#: qml/Dash/GenericScopeView.qml:532 qml/Dash/GenericScopeView.qml:690
226+#: qml/Dash/GenericScopeView.qml:539 qml/Dash/GenericScopeView.qml:697
227msgid "See less"
227msgid "See less"
228msgstr "縮減查看"
228msgstr "縮減查看"
229
229
230−#: qml/Dash/GenericScopeView.qml:532
230+#: qml/Dash/GenericScopeView.qml:539
231msgid "See all"
231msgid "See all"
232msgstr "查看全部"
232msgstr "查看全部"
233
233
234−#: qml/Dash/GenericScopeView.qml:594
234+#: qml/Dash/GenericScopeView.qml:601
235msgctxt "Label: Hint for dash search line edit"
235msgctxt "Label: Hint for dash search line edit"
236msgid "Search"
236msgid "Search"
237msgstr ""
237msgstr ""
@@ -315,57 +315,58 @@ msgstr ""
315msgid "Tap to unlock"
315msgid "Tap to unlock"
316msgstr ""
316msgstr ""
317
317
318−#: qml/Greeter/NarrowView.qml:53 qml/Wizard/Pages/passwd-confirm.qml:53
318+#: qml/Greeter/NarrowView.qml:54 qml/Wizard/Pages/passwd-confirm.qml:53
319msgid "Sorry, incorrect passphrase."
319msgid "Sorry, incorrect passphrase."
320msgstr ""
320msgstr ""
321
321
322−#: qml/Greeter/NarrowView.qml:54 qml/Wizard/Pages/passwd-confirm.qml:54
322+#: qml/Greeter/NarrowView.qml:55 qml/Wizard/Pages/passwd-confirm.qml:54
323msgid "Sorry, incorrect passcode."
323msgid "Sorry, incorrect passcode."
324msgstr ""
324msgstr ""
325
325
326−#: qml/Greeter/NarrowView.qml:55
326+#: qml/Greeter/NarrowView.qml:56
327msgid "This will be your last attempt."
327msgid "This will be your last attempt."
328msgstr ""
328msgstr ""
329
329
330−#: qml/Greeter/NarrowView.qml:57
330+#: qml/Greeter/NarrowView.qml:58
331msgid ""
331msgid ""
332"If passphrase is entered incorrectly, your phone will conduct a factory "
332"If passphrase is entered incorrectly, your phone will conduct a factory "
333"reset and all personal data will be deleted."
333"reset and all personal data will be deleted."
334msgstr ""
334msgstr ""
335
335
336−#: qml/Greeter/NarrowView.qml:58
336+#: qml/Greeter/NarrowView.qml:59
337msgid ""
337msgid ""
338"If passcode is entered incorrectly, your phone will conduct a factory reset "
338"If passcode is entered incorrectly, your phone will conduct a factory reset "
339"and all personal data will be deleted."
339"and all personal data will be deleted."
340msgstr ""
340msgstr ""
341
341
342−#: qml/Greeter/NarrowView.qml:115
342+#: qml/Greeter/NarrowView.qml:116
343#, qt-format
343#, qt-format
344msgid "Enter %1"
344msgid "Enter %1"
345msgstr ""
345msgstr ""
346
346
347−#: qml/Greeter/NarrowView.qml:116 qml/Wizard/Pages/passwd-set.qml:60
347+#: qml/Greeter/NarrowView.qml:117 qml/Wizard/Pages/passwd-set.qml:60
348msgid "Enter passphrase"
348msgid "Enter passphrase"
349msgstr ""
349msgstr ""
350
350
351−#: qml/Greeter/NarrowView.qml:117
351+#: qml/Greeter/NarrowView.qml:118
352msgid "Enter passcode"
352msgid "Enter passcode"
353msgstr ""
353msgstr ""
354
354
355−#: qml/Greeter/NarrowView.qml:118
355+#: qml/Greeter/NarrowView.qml:119
356#, qt-format
356#, qt-format
357msgid "Sorry, incorrect %1"
357msgid "Sorry, incorrect %1"
358msgstr ""
358msgstr ""
359
359
360−#: qml/Greeter/NarrowView.qml:119
360+#: qml/Greeter/NarrowView.qml:120
361msgid "Sorry, incorrect passphrase"
361msgid "Sorry, incorrect passphrase"
362msgstr ""
362msgstr ""
363
363
364−#: qml/Greeter/NarrowView.qml:120
364+#: qml/Greeter/NarrowView.qml:121
365+msgctxt "passphrase"
365msgid "Please re-enter"
366msgid "Please re-enter"
366msgstr ""
367msgstr ""
367
368
368−#: qml/Greeter/NarrowView.qml:121
369+#: qml/Greeter/NarrowView.qml:122
369msgid "Sorry, incorrect passcode"
370msgid "Sorry, incorrect passcode"
370msgstr ""
371msgstr ""
371
372
@@ -515,38 +516,6 @@ msgctxt "Button: Go back one page in the Wizard"
515msgid "Back"
516msgid "Back"
516msgstr ""
517msgstr ""
517
518
518−#: qml/Wizard/Pages/here-terms.qml:27
519−msgid "Terms & Conditions"
520−msgstr ""
521−
522−#: qml/Wizard/Pages/passwd-confirm.qml:49
523−msgid "Confirm passphrase"
524−msgstr ""
525−
526−#: qml/Wizard/Pages/passwd-confirm.qml:50
527−msgid "Confirm passcode"
528−msgstr ""
529−
530−#: qml/Wizard/Pages/passwd-confirm.qml:53
531−#: qml/Wizard/Pages/passwd-confirm.qml:54
532−msgid "Please try again."
533−msgstr ""
534−
535−#: qml/Wizard/Pages/passwd-confirm.qml:82 qml/Wizard/Pages/passwd-set.qml:90
536−#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:128
537−#: qml/Wizard/Pages/40-wifi.qml:215 qml/Wizard/Pages/50-location.qml:131
538−#: qml/Wizard/Pages/60-reporting.qml:50
539−msgid "Continue"
540−msgstr ""
541−
542−#: qml/Wizard/Pages/passwd-set.qml:61
543−msgid "Choose your passcode"
544−msgstr ""
545−
546−#: qml/Wizard/Pages/passwd-set.qml:68
547−msgid "Passphrase must be 4 characters long"
548−msgstr ""
549−
550#: qml/Wizard/Pages/10-welcome.qml:27
519#: qml/Wizard/Pages/10-welcome.qml:27
551msgid "Hi!"
520msgid "Hi!"
552msgstr ""
521msgstr ""
@@ -559,6 +528,13 @@ msgstr ""
559msgid "Let’s get started."
528msgid "Let’s get started."
560msgstr ""
529msgstr ""
561
530
531+#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:128
532+#: qml/Wizard/Pages/40-wifi.qml:215 qml/Wizard/Pages/50-location.qml:131
533+#: qml/Wizard/Pages/60-reporting.qml:50 qml/Wizard/Pages/passwd-confirm.qml:82
534+#: qml/Wizard/Pages/passwd-set.qml:90
535+msgid "Continue"
536+msgstr ""
537+
562#: qml/Wizard/Pages/20-sim.qml:25
538#: qml/Wizard/Pages/20-sim.qml:25
563msgid "Add a SIM card and restart your device"
539msgid "Add a SIM card and restart your device"
564msgstr ""
540msgstr ""
@@ -684,6 +660,31 @@ msgstr ""
684msgid "Finish"
660msgid "Finish"
685msgstr ""
661msgstr ""
686
662
663+#: qml/Wizard/Pages/here-terms.qml:27
664+msgid "Terms & Conditions"
665+msgstr ""
666+
667+#: qml/Wizard/Pages/passwd-confirm.qml:49
668+msgid "Confirm passphrase"
669+msgstr ""
670+
671+#: qml/Wizard/Pages/passwd-confirm.qml:50
672+msgid "Confirm passcode"
673+msgstr ""
674+
675+#: qml/Wizard/Pages/passwd-confirm.qml:53
676+#: qml/Wizard/Pages/passwd-confirm.qml:54
677+msgid "Please try again."
678+msgstr ""
679+
680+#: qml/Wizard/Pages/passwd-set.qml:61
681+msgid "Choose your passcode"
682+msgstr ""
683+
684+#: qml/Wizard/Pages/passwd-set.qml:68
685+msgid "Passphrase must be 4 characters long"
686+msgstr ""
687+
687#. Translators: This is the arrow for "Back" buttons
688#. Translators: This is the arrow for "Back" buttons
688#: qml/Wizard/StackButton.qml:39
689#: qml/Wizard/StackButton.qml:39
689#, qt-format
690#, qt-format
po/zh_TW.po+90−89
@@ -7,16 +7,16 @@ msgid ""
7msgstr ""
7msgstr ""
8"Project-Id-Version: unity\n"
8"Project-Id-Version: unity\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2015-06-22 12:00+0200\n"
10+"POT-Creation-Date: 2015-07-17 10:10+0200\n"
11−"PO-Revision-Date: 2015-03-15 06:06+0000\n"
11+"PO-Revision-Date: 2015-07-31 09:29+0000\n"
12−"Last-Translator: Cheng-Chia Tseng <pswo10680@gmail.com>\n"
12+"Last-Translator: Po-Hsu Lin <po-hsu.lin@canonical.com>\n"
13"Language-Team: Chinese (Traditional) <zh_TW@li.org>\n"
13"Language-Team: Chinese (Traditional) <zh_TW@li.org>\n"
14"MIME-Version: 1.0\n"
14"MIME-Version: 1.0\n"
15"Content-Type: text/plain; charset=UTF-8\n"
15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n"
16"Content-Transfer-Encoding: 8bit\n"
17"Plural-Forms: nplurals=1; plural=0;\n"
17"Plural-Forms: nplurals=1; plural=0;\n"
18−"X-Launchpad-Export-Date: 2015-07-04 05:37+0000\n"
18+"X-Launchpad-Export-Date: 2015-08-01 05:45+0000\n"
19−"X-Generator: Launchpad (build 17597)\n"
19+"X-Generator: Launchpad (build 17656)\n"
20"Language: zh_TW\n"
20"Language: zh_TW\n"
21
21
22#: plugins/LightDM/Greeter.cpp:112
22#: plugins/LightDM/Greeter.cpp:112
@@ -38,14 +38,14 @@ msgstr "取消捷徑釘選"
38#. en_US example: "Yesterday\u2003%l:%M %p" --> "Yesterday 1:00 PM"
38#. en_US example: "Yesterday\u2003%l:%M %p" --> "Yesterday 1:00 PM"
39#: plugins/Utils/relativetimeformatter.cpp:157
39#: plugins/Utils/relativetimeformatter.cpp:157
40msgid "Yesterday %l:%M %p"
40msgid "Yesterday %l:%M %p"
41−msgstr ""
41+msgstr "昨日 %l:%M %p"
42
42
43#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
43#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
44#. This format string is used for showing, on a 12-hour clock, times that happened today.
44#. This format string is used for showing, on a 12-hour clock, times that happened today.
45#. en_US example: "%l:%M %p" --> "1:00 PM"
45#. en_US example: "%l:%M %p" --> "1:00 PM"
46#: plugins/Utils/relativetimeformatter.cpp:164
46#: plugins/Utils/relativetimeformatter.cpp:164
47msgid "%l:%M %p"
47msgid "%l:%M %p"
48−msgstr ""
48+msgstr "%l:%M %p"
49
49
50#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
50#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
51#. This format string is used for showing, on a 12-hour clock, events/appointments that happen tomorrow.
51#. This format string is used for showing, on a 12-hour clock, events/appointments that happen tomorrow.
@@ -53,7 +53,7 @@ msgstr ""
53#. en_US example: "Tomorrow\u2003%l:%M %p" --> "Tomorrow 1:00 PM"
53#. en_US example: "Tomorrow\u2003%l:%M %p" --> "Tomorrow 1:00 PM"
54#: plugins/Utils/relativetimeformatter.cpp:172
54#: plugins/Utils/relativetimeformatter.cpp:172
55msgid "Tomorrow %l:%M %p"
55msgid "Tomorrow %l:%M %p"
56−msgstr ""
56+msgstr "明日 %l:%M %p"
57
57
58#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
58#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
59#. This format string is used for showing, on a 12-hour clock, times that happened in the last week.
59#. This format string is used for showing, on a 12-hour clock, times that happened in the last week.
@@ -61,7 +61,7 @@ msgstr ""
61#. en_US example: "%a\u2003%l:%M %p" --> "Fri 1:00 PM"
61#. en_US example: "%a\u2003%l:%M %p" --> "Fri 1:00 PM"
62#: plugins/Utils/relativetimeformatter.cpp:181
62#: plugins/Utils/relativetimeformatter.cpp:181
63msgid "%a %l:%M %p"
63msgid "%a %l:%M %p"
64−msgstr ""
64+msgstr "%a %l:%M %p"
65
65
66#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
66#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
67#. This format string is used for showing, on a 12-hour clock, times that happened before a week from now.
67#. This format string is used for showing, on a 12-hour clock, times that happened before a week from now.
@@ -78,14 +78,14 @@ msgstr ""
78#. en_US example: "Yesterday\u2003%l:%M %p" --> "Yesterday 13:00"
78#. en_US example: "Yesterday\u2003%l:%M %p" --> "Yesterday 13:00"
79#: plugins/Utils/relativetimeformatter.cpp:201
79#: plugins/Utils/relativetimeformatter.cpp:201
80msgid "Yesterday %H:%M"
80msgid "Yesterday %H:%M"
81−msgstr ""
81+msgstr "昨日 %H:%M"
82
82
83#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
83#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
84#. This format string is used for showing, on a 24-hour clock, times that happened today.
84#. This format string is used for showing, on a 24-hour clock, times that happened today.
85#. en_US example: "%H:%M" --> "13:00"
85#. en_US example: "%H:%M" --> "13:00"
86#: plugins/Utils/relativetimeformatter.cpp:208
86#: plugins/Utils/relativetimeformatter.cpp:208
87msgid "%H:%M"
87msgid "%H:%M"
88−msgstr ""
88+msgstr "%H:%M"
89
89
90#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
90#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
91#. This format string is used for showing, on a 24-hour clock, events/appointments that happen tomorrow.
91#. This format string is used for showing, on a 24-hour clock, events/appointments that happen tomorrow.
@@ -93,7 +93,7 @@ msgstr ""
93#. en_US example: "Tomorrow\u2003%l:%M %p" --> "Tomorrow 13:00"
93#. en_US example: "Tomorrow\u2003%l:%M %p" --> "Tomorrow 13:00"
94#: plugins/Utils/relativetimeformatter.cpp:216
94#: plugins/Utils/relativetimeformatter.cpp:216
95msgid "Tomorrow %H:%M"
95msgid "Tomorrow %H:%M"
96−msgstr ""
96+msgstr "明日 %H:%M"
97
97
98#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
98#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
99#. This format string is used for showing, on a 24-hour clock, times that happened in the last week.
99#. This format string is used for showing, on a 24-hour clock, times that happened in the last week.
@@ -133,7 +133,7 @@ msgstr[0] "請等候 %1 分鐘再試…"
133#: qml/Components/Dialogs.qml:69
133#: qml/Components/Dialogs.qml:69
134msgctxt "Title: Lock/Log out dialog"
134msgctxt "Title: Lock/Log out dialog"
135msgid "Log out"
135msgid "Log out"
136−msgstr ""
136+msgstr "登出"
137
137
138#: qml/Components/Dialogs.qml:70
138#: qml/Components/Dialogs.qml:70
139msgid "Are you sure you want to log out?"
139msgid "Are you sure you want to log out?"
@@ -142,12 +142,12 @@ msgstr "確定要登出?"
142#: qml/Components/Dialogs.qml:72
142#: qml/Components/Dialogs.qml:72
143msgctxt "Button: Lock the system"
143msgctxt "Button: Lock the system"
144msgid "Lock"
144msgid "Lock"
145−msgstr ""
145+msgstr "上鎖"
146
146
147#: qml/Components/Dialogs.qml:79
147#: qml/Components/Dialogs.qml:79
148msgctxt "Button: Log out from the system"
148msgctxt "Button: Log out from the system"
149msgid "Log Out"
149msgid "Log Out"
150−msgstr ""
150+msgstr "登出"
151
151
152#: qml/Components/Dialogs.qml:86 qml/Components/Dialogs.qml:117
152#: qml/Components/Dialogs.qml:86 qml/Components/Dialogs.qml:117
153#: qml/Components/Dialogs.qml:173
153#: qml/Components/Dialogs.qml:173
@@ -157,7 +157,7 @@ msgstr "取消"
157#: qml/Components/Dialogs.qml:98
157#: qml/Components/Dialogs.qml:98
158msgctxt "Title: Reboot/Shut down dialog"
158msgctxt "Title: Reboot/Shut down dialog"
159msgid "Shut down"
159msgid "Shut down"
160−msgstr ""
160+msgstr "關機"
161
161
162#: qml/Components/Dialogs.qml:99
162#: qml/Components/Dialogs.qml:99
163msgid "Are you sure you want to shut down?"
163msgid "Are you sure you want to shut down?"
@@ -166,17 +166,17 @@ msgstr "確定要關機?"
166#: qml/Components/Dialogs.qml:101
166#: qml/Components/Dialogs.qml:101
167msgctxt "Button: Reboot the system"
167msgctxt "Button: Reboot the system"
168msgid "Reboot"
168msgid "Reboot"
169−msgstr ""
169+msgstr "重新開機"
170
170
171#: qml/Components/Dialogs.qml:109
171#: qml/Components/Dialogs.qml:109
172msgctxt "Button: Shut down the system"
172msgctxt "Button: Shut down the system"
173msgid "Shut down"
173msgid "Shut down"
174−msgstr ""
174+msgstr "關機"
175
175
176#: qml/Components/Dialogs.qml:129
176#: qml/Components/Dialogs.qml:129
177msgctxt "Title: Reboot dialog"
177msgctxt "Title: Reboot dialog"
178msgid "Reboot"
178msgid "Reboot"
179−msgstr ""
179+msgstr "重新開機"
180
180
181#: qml/Components/Dialogs.qml:130
181#: qml/Components/Dialogs.qml:130
182msgid "Are you sure you want to reboot?"
182msgid "Are you sure you want to reboot?"
@@ -193,7 +193,7 @@ msgstr "是"
193#: qml/Components/Dialogs.qml:152
193#: qml/Components/Dialogs.qml:152
194msgctxt "Title: Power off/Restart dialog"
194msgctxt "Title: Power off/Restart dialog"
195msgid "Power"
195msgid "Power"
196−msgstr ""
196+msgstr "電源"
197
197
198#: qml/Components/Dialogs.qml:153
198#: qml/Components/Dialogs.qml:153
199msgid ""
199msgid ""
@@ -204,12 +204,12 @@ msgstr "確定要關閉電源?"
204#: qml/Components/Dialogs.qml:155
204#: qml/Components/Dialogs.qml:155
205msgctxt "Button: Power off the system"
205msgctxt "Button: Power off the system"
206msgid "Power off"
206msgid "Power off"
207−msgstr ""
207+msgstr "關閉電源"
208
208
209#: qml/Components/Dialogs.qml:164
209#: qml/Components/Dialogs.qml:164
210msgctxt "Button: Restart the system"
210msgctxt "Button: Restart the system"
211msgid "Restart"
211msgid "Restart"
212−msgstr ""
212+msgstr "重新啟動"
213
213
214#: qml/Components/Lockscreen.qml:245
214#: qml/Components/Lockscreen.qml:245
215msgid "Return to Call"
215msgid "Return to Call"
@@ -223,33 +223,33 @@ msgstr "緊急通話"
223msgid "OK"
223msgid "OK"
224msgstr "確定"
224msgstr "確定"
225
225
226−#: qml/Dash/GenericScopeView.qml:532 qml/Dash/GenericScopeView.qml:690
226+#: qml/Dash/GenericScopeView.qml:539 qml/Dash/GenericScopeView.qml:697
227msgid "See less"
227msgid "See less"
228msgstr "縮減查看"
228msgstr "縮減查看"
229
229
230−#: qml/Dash/GenericScopeView.qml:532
230+#: qml/Dash/GenericScopeView.qml:539
231msgid "See all"
231msgid "See all"
232msgstr "查看全部"
232msgstr "查看全部"
233
233
234−#: qml/Dash/GenericScopeView.qml:594
234+#: qml/Dash/GenericScopeView.qml:601
235msgctxt "Label: Hint for dash search line edit"
235msgctxt "Label: Hint for dash search line edit"
236msgid "Search"
236msgid "Search"
237−msgstr ""
237+msgstr "搜尋"
238
238
239#: qml/Dash/PageHeader.qml:269
239#: qml/Dash/PageHeader.qml:269
240msgctxt "Button: Open the Ubuntu Store"
240msgctxt "Button: Open the Ubuntu Store"
241msgid "Store"
241msgid "Store"
242−msgstr ""
242+msgstr "商城"
243
243
244#: qml/Dash/PageHeader.qml:276
244#: qml/Dash/PageHeader.qml:276
245msgctxt "Button: Start a search in the current dash scope"
245msgctxt "Button: Start a search in the current dash scope"
246msgid "Search"
246msgid "Search"
247−msgstr ""
247+msgstr "搜尋"
248
248
249#: qml/Dash/PageHeader.qml:286
249#: qml/Dash/PageHeader.qml:286
250msgctxt "Button: Show the current dash scope settings"
250msgctxt "Button: Show the current dash scope settings"
251msgid "Settings"
251msgid "Settings"
252−msgstr ""
252+msgstr "設定"
253
253
254#: qml/Dash/PageHeader.qml:293
254#: qml/Dash/PageHeader.qml:293
255msgid "Remove from Favorites"
255msgid "Remove from Favorites"
@@ -315,57 +315,58 @@ msgstr "重試"
315msgid "Tap to unlock"
315msgid "Tap to unlock"
316msgstr "點按以解鎖"
316msgstr "點按以解鎖"
317
317
318−#: qml/Greeter/NarrowView.qml:53 qml/Wizard/Pages/passwd-confirm.qml:53
318+#: qml/Greeter/NarrowView.qml:54 qml/Wizard/Pages/passwd-confirm.qml:53
319msgid "Sorry, incorrect passphrase."
319msgid "Sorry, incorrect passphrase."
320msgstr "抱歉,密語不對"
320msgstr "抱歉,密語不對"
321
321
322−#: qml/Greeter/NarrowView.qml:54 qml/Wizard/Pages/passwd-confirm.qml:54
322+#: qml/Greeter/NarrowView.qml:55 qml/Wizard/Pages/passwd-confirm.qml:54
323msgid "Sorry, incorrect passcode."
323msgid "Sorry, incorrect passcode."
324msgstr "抱歉,通關碼不對。"
324msgstr "抱歉,通關碼不對。"
325
325
326−#: qml/Greeter/NarrowView.qml:55
326+#: qml/Greeter/NarrowView.qml:56
327msgid "This will be your last attempt."
327msgid "This will be your last attempt."
328msgstr "這將會是您最後一次嘗試的機會。"
328msgstr "這將會是您最後一次嘗試的機會。"
329
329
330−#: qml/Greeter/NarrowView.qml:57
330+#: qml/Greeter/NarrowView.qml:58
331msgid ""
331msgid ""
332"If passphrase is entered incorrectly, your phone will conduct a factory "
332"If passphrase is entered incorrectly, your phone will conduct a factory "
333"reset and all personal data will be deleted."
333"reset and all personal data will be deleted."
334msgstr "如輸入的密語不對,本電話會進行重設,所有個人資料都會刪除。"
334msgstr "如輸入的密語不對,本電話會進行重設,所有個人資料都會刪除。"
335
335
336−#: qml/Greeter/NarrowView.qml:58
336+#: qml/Greeter/NarrowView.qml:59
337msgid ""
337msgid ""
338"If passcode is entered incorrectly, your phone will conduct a factory reset "
338"If passcode is entered incorrectly, your phone will conduct a factory reset "
339"and all personal data will be deleted."
339"and all personal data will be deleted."
340msgstr "如輸入的通關碼不對,本電話會進行重設,所有個人資料都會刪除。"
340msgstr "如輸入的通關碼不對,本電話會進行重設,所有個人資料都會刪除。"
341
341
342−#: qml/Greeter/NarrowView.qml:115
342+#: qml/Greeter/NarrowView.qml:116
343#, qt-format
343#, qt-format
344msgid "Enter %1"
344msgid "Enter %1"
345msgstr "輸入 %1"
345msgstr "輸入 %1"
346
346
347−#: qml/Greeter/NarrowView.qml:116 qml/Wizard/Pages/passwd-set.qml:60
347+#: qml/Greeter/NarrowView.qml:117 qml/Wizard/Pages/passwd-set.qml:60
348msgid "Enter passphrase"
348msgid "Enter passphrase"
349msgstr "輸入密語"
349msgstr "輸入密語"
350
350
351−#: qml/Greeter/NarrowView.qml:117
351+#: qml/Greeter/NarrowView.qml:118
352msgid "Enter passcode"
352msgid "Enter passcode"
353msgstr "輸入通關碼"
353msgstr "輸入通關碼"
354
354
355−#: qml/Greeter/NarrowView.qml:118
355+#: qml/Greeter/NarrowView.qml:119
356#, qt-format
356#, qt-format
357msgid "Sorry, incorrect %1"
357msgid "Sorry, incorrect %1"
358msgstr "抱歉,%1不對"
358msgstr "抱歉,%1不對"
359
359
360−#: qml/Greeter/NarrowView.qml:119
360+#: qml/Greeter/NarrowView.qml:120
361msgid "Sorry, incorrect passphrase"
361msgid "Sorry, incorrect passphrase"
362msgstr "抱歉,密語不對"
362msgstr "抱歉,密語不對"
363
363
364−#: qml/Greeter/NarrowView.qml:120
364+#: qml/Greeter/NarrowView.qml:121
365+msgctxt "passphrase"
365msgid "Please re-enter"
366msgid "Please re-enter"
366msgstr "請再輸入"
367msgstr "請再輸入"
367
368
368−#: qml/Greeter/NarrowView.qml:121
369+#: qml/Greeter/NarrowView.qml:122
369msgid "Sorry, incorrect passcode"
370msgid "Sorry, incorrect passcode"
370msgstr "抱歉,通關碼不對"
371msgstr "抱歉,通關碼不對"
371
372
@@ -389,32 +390,29 @@ msgstr "無影音播放中"
389#, qt-format
390#, qt-format
390msgid "%1 hour"
391msgid "%1 hour"
391msgid_plural "%1 hours"
392msgid_plural "%1 hours"
392−msgstr[0] ""
393+msgstr[0] "%1 小時"
393−msgstr[1] ""
394
394
395#: qml/Panel/Indicators/MenuItemFactory.qml:772
395#: qml/Panel/Indicators/MenuItemFactory.qml:772
396#, qt-format
396#, qt-format
397msgid "%1 minute"
397msgid "%1 minute"
398msgid_plural "%1 minutes"
398msgid_plural "%1 minutes"
399−msgstr[0] ""
399+msgstr[0] "%1 分鐘"
400−msgstr[1] ""
401
400
402#: qml/Panel/Indicators/MenuItemFactory.qml:777
401#: qml/Panel/Indicators/MenuItemFactory.qml:777
403#, qt-format
402#, qt-format
404msgid "%1 second"
403msgid "%1 second"
405msgid_plural "%1 seconds"
404msgid_plural "%1 seconds"
406−msgstr[0] ""
405+msgstr[0] "%1 秒鐘"
407−msgstr[1] ""
408
406
409#: qml/Panel/Indicators/MenuItemFactory.qml:780
407#: qml/Panel/Indicators/MenuItemFactory.qml:780
410msgid "0 seconds"
408msgid "0 seconds"
411−msgstr ""
409+msgstr "0 秒鐘"
412
410
413#. Translators: String like "1 hour, 2 minutes, 3 seconds remaining"
411#. Translators: String like "1 hour, 2 minutes, 3 seconds remaining"
414#: qml/Panel/Indicators/MenuItemFactory.qml:782
412#: qml/Panel/Indicators/MenuItemFactory.qml:782
415#, qt-format
413#, qt-format
416msgid "%1 remaining"
414msgid "%1 remaining"
417−msgstr ""
415+msgstr "還剩下 %1"
418
416
419#: qml/Panel/Indicators/MenuItemFactory.qml:788
417#: qml/Panel/Indicators/MenuItemFactory.qml:788
420msgid "In queue…"
418msgid "In queue…"
@@ -443,7 +441,7 @@ msgstr "失敗,點按可重試"
443#: qml/Panel/Indicators/MessageMenuItemFactory.qml:149
441#: qml/Panel/Indicators/MessageMenuItemFactory.qml:149
444msgctxt "Label: Hint in message indicator line edit"
442msgctxt "Label: Hint in message indicator line edit"
445msgid "Reply"
443msgid "Reply"
446−msgstr ""
444+msgstr "回覆"
447
445
448#: qml/Panel/Indicators/ModemInfoItem.qml:105
446#: qml/Panel/Indicators/ModemInfoItem.qml:105
449msgid "Unlock SIM"
447msgid "Unlock SIM"
@@ -513,39 +511,7 @@ msgstr "檢視您所有執行中的作業項目。"
513#: qml/Wizard/Page.qml:89
511#: qml/Wizard/Page.qml:89
514msgctxt "Button: Go back one page in the Wizard"
512msgctxt "Button: Go back one page in the Wizard"
515msgid "Back"
513msgid "Back"
516−msgstr ""
514+msgstr "返回"
517−
518−#: qml/Wizard/Pages/here-terms.qml:27
519−msgid "Terms & Conditions"
520−msgstr "使用條款與細則"
521−
522−#: qml/Wizard/Pages/passwd-confirm.qml:49
523−msgid "Confirm passphrase"
524−msgstr "確認密語"
525−
526−#: qml/Wizard/Pages/passwd-confirm.qml:50
527−msgid "Confirm passcode"
528−msgstr "確認通關碼"
529−
530−#: qml/Wizard/Pages/passwd-confirm.qml:53
531−#: qml/Wizard/Pages/passwd-confirm.qml:54
532−msgid "Please try again."
533−msgstr "請重試一次。"
534−
535−#: qml/Wizard/Pages/passwd-confirm.qml:82 qml/Wizard/Pages/passwd-set.qml:90
536−#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:128
537−#: qml/Wizard/Pages/40-wifi.qml:215 qml/Wizard/Pages/50-location.qml:131
538−#: qml/Wizard/Pages/60-reporting.qml:50
539−msgid "Continue"
540−msgstr "繼續"
541−
542−#: qml/Wizard/Pages/passwd-set.qml:61
543−msgid "Choose your passcode"
544−msgstr "決定您的通關碼"
545−
546−#: qml/Wizard/Pages/passwd-set.qml:68
547−msgid "Passphrase must be 4 characters long"
548−msgstr "密語必須 4 個字元長"
549
515
550#: qml/Wizard/Pages/10-welcome.qml:27
516#: qml/Wizard/Pages/10-welcome.qml:27
551msgid "Hi!"
517msgid "Hi!"
@@ -559,6 +525,13 @@ msgstr "歡迎使用您的 Ubuntu 手機。"
559msgid "Let’s get started."
525msgid "Let’s get started."
560msgstr "讓我們開始吧。"
526msgstr "讓我們開始吧。"
561
527
528+#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:128
529+#: qml/Wizard/Pages/40-wifi.qml:215 qml/Wizard/Pages/50-location.qml:131
530+#: qml/Wizard/Pages/60-reporting.qml:50 qml/Wizard/Pages/passwd-confirm.qml:82
531+#: qml/Wizard/Pages/passwd-set.qml:90
532+msgid "Continue"
533+msgstr "繼續"
534+
562#: qml/Wizard/Pages/20-sim.qml:25
535#: qml/Wizard/Pages/20-sim.qml:25
563msgid "Add a SIM card and restart your device"
536msgid "Add a SIM card and restart your device"
564msgstr "插入 SIM 卡並重新啟動您的裝置"
537msgstr "插入 SIM 卡並重新啟動您的裝置"
@@ -582,32 +555,32 @@ msgstr "請選取您想要的手機解鎖方式。"
582#: qml/Wizard/Pages/30-passwd-type.qml:97
555#: qml/Wizard/Pages/30-passwd-type.qml:97
583msgctxt "Label: Type of security method"
556msgctxt "Label: Type of security method"
584msgid "Swipe"
557msgid "Swipe"
585−msgstr ""
558+msgstr "滑開"
586
559
587#: qml/Wizard/Pages/30-passwd-type.qml:98
560#: qml/Wizard/Pages/30-passwd-type.qml:98
588msgctxt "Label: Description of security method"
561msgctxt "Label: Description of security method"
589msgid "No security"
562msgid "No security"
590−msgstr ""
563+msgstr "不安全"
591
564
592#: qml/Wizard/Pages/30-passwd-type.qml:100
565#: qml/Wizard/Pages/30-passwd-type.qml:100
593msgctxt "Label: Type of security method"
566msgctxt "Label: Type of security method"
594msgid "Passcode"
567msgid "Passcode"
595−msgstr ""
568+msgstr "通關碼"
596
569
597#: qml/Wizard/Pages/30-passwd-type.qml:101
570#: qml/Wizard/Pages/30-passwd-type.qml:101
598msgctxt "Label: Description of security method"
571msgctxt "Label: Description of security method"
599msgid "4 digits only"
572msgid "4 digits only"
600−msgstr ""
573+msgstr "僅 4 位數字"
601
574
602#: qml/Wizard/Pages/30-passwd-type.qml:103
575#: qml/Wizard/Pages/30-passwd-type.qml:103
603msgctxt "Label: Type of security method"
576msgctxt "Label: Type of security method"
604msgid "Passphrase"
577msgid "Passphrase"
605−msgstr ""
578+msgstr "密語"
606
579
607#: qml/Wizard/Pages/30-passwd-type.qml:104
580#: qml/Wizard/Pages/30-passwd-type.qml:104
608msgctxt "Label: Description of security method"
581msgctxt "Label: Description of security method"
609msgid "Numbers and letters"
582msgid "Numbers and letters"
610−msgstr ""
583+msgstr "數字及字母"
611
584
612#: qml/Wizard/Pages/40-wifi.qml:29
585#: qml/Wizard/Pages/40-wifi.qml:29
613msgid "Connect to Wi‑Fi"
586msgid "Connect to Wi‑Fi"
@@ -684,6 +657,31 @@ msgstr "您的手機現在已準備好使用。"
684msgid "Finish"
657msgid "Finish"
685msgstr "完成"
658msgstr "完成"
686
659
660+#: qml/Wizard/Pages/here-terms.qml:27
661+msgid "Terms & Conditions"
662+msgstr "使用條款與細則"
663+
664+#: qml/Wizard/Pages/passwd-confirm.qml:49
665+msgid "Confirm passphrase"
666+msgstr "確認密語"
667+
668+#: qml/Wizard/Pages/passwd-confirm.qml:50
669+msgid "Confirm passcode"
670+msgstr "確認通關碼"
671+
672+#: qml/Wizard/Pages/passwd-confirm.qml:53
673+#: qml/Wizard/Pages/passwd-confirm.qml:54
674+msgid "Please try again."
675+msgstr "請重試一次。"
676+
677+#: qml/Wizard/Pages/passwd-set.qml:61
678+msgid "Choose your passcode"
679+msgstr "決定您的通關碼"
680+
681+#: qml/Wizard/Pages/passwd-set.qml:68
682+msgid "Passphrase must be 4 characters long"
683+msgstr "密語必須 4 個字元長"
684+
687#. Translators: This is the arrow for "Back" buttons
685#. Translators: This is the arrow for "Back" buttons
688#: qml/Wizard/StackButton.qml:39
686#: qml/Wizard/StackButton.qml:39
689#, qt-format
687#, qt-format
@@ -782,5 +780,8 @@ msgstr "%1 〉"
782#~ msgid "Restart"
780#~ msgid "Restart"
783#~ msgstr "重新啟動"
781#~ msgstr "重新啟動"
784
782
783+#~ msgid "Please re-enter"
784+#~ msgstr "請再輸入"
785+
785#~ msgid "Manage Scopes"
786#~ msgid "Manage Scopes"
786#~ msgstr "管理 Scopes"
787#~ msgstr "管理 Scopes"
qml/Components/PhysicalKeysMapper.qml+24
@@ -41,14 +41,23 @@ Item {
41 signal volumeUpTriggered;
41 signal volumeUpTriggered;
42 signal screenshotTriggered;
42 signal screenshotTriggered;
43
43
44+ readonly property bool altTabPressed: d.altTabPressed
45+
44 property int powerKeyLongPressTime: 2000
46 property int powerKeyLongPressTime: 2000
45
47
48+ // For testing. If running windowed (e.g. tryShell), Alt+Tab is taken by the
49+ // running desktop, set this to true to use Ctrl+Tab instead.
50+ property bool controlInsteadOfAlt: false
51+
46 QtObject {
52 QtObject {
47 id: d
53 id: d
48
54
49 property bool volumeDownKeyPressed: false
55 property bool volumeDownKeyPressed: false
50 property bool volumeUpKeyPressed: false
56 property bool volumeUpKeyPressed: false
51 property bool ignoreVolumeEvents: false
57 property bool ignoreVolumeEvents: false
58+
59+ property bool altPressed: false
60+ property bool altTabPressed: false
52 }
61 }
53
62
54 Timer {
63 Timer {
@@ -93,6 +102,15 @@ Item {
93 }
102 }
94 d.volumeUpKeyPressed = true;
103 d.volumeUpKeyPressed = true;
95 }
104 }
105+ } else if (event.key == Qt.Key_Alt || (root.controlInsteadOfAlt && event.key == Qt.Key_Control)) {
106+ d.altPressed = true;
107+ } else if (event.key == Qt.Key_Tab) {
108+ if (d.altPressed && !d.altTabPressed) {
109+ d.altTabPressed = true;
110+ event.accepted = true;
111+ }
112+ } else if (event.key == Qt.Key_Print) {
113+ root.screenshotTriggered();
96 }
114 }
97 }
115 }
98
116
@@ -108,6 +126,12 @@ Item {
108 if (!d.ignoreVolumeEvents) root.volumeUpTriggered();
126 if (!d.ignoreVolumeEvents) root.volumeUpTriggered();
109 d.volumeUpKeyPressed = false;
127 d.volumeUpKeyPressed = false;
110 if (!d.volumeDownKeyPressed) d.ignoreVolumeEvents = false;
128 if (!d.volumeDownKeyPressed) d.ignoreVolumeEvents = false;
129+ } else if (event.key == Qt.Key_Alt || (root.controlInsteadOfAlt && event.key == Qt.Key_Control)) {
130+ d.altPressed = false;
131+ if (d.altTabPressed) {
132+ d.altTabPressed = false;
133+ event.accepted = true;
134+ }
111 }
135 }
112 }
136 }
113}
137}
qml/Components/ScreenGrabber.qml+1−5
@@ -1,5 +1,5 @@
1/*
1/*
2− * Copyright (C) 2014 Canonical, Ltd.
2+ * Copyright (C) 2014-2015 Canonical, Ltd.
3 *
3 *
4 * This program is free software; you can redistribute it and/or modify
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
@@ -20,7 +20,6 @@ import ScreenGrabber 0.1
20
20
21Rectangle {
21Rectangle {
22 id: root
22 id: root
23− enabled: true
24 visible: false
23 visible: false
25 color: "white"
24 color: "white"
26 anchors.fill: parent
25 anchors.fill: parent
@@ -38,9 +37,6 @@ Rectangle {
38 }
37 }
39
38
40 function capture() {
39 function capture() {
41− if (!enabled)
42− return;
43−
44 visible = true;
40 visible = true;
45 shutterSound.stop();
41 shutterSound.stop();
46 shutterSound.play();
42 shutterSound.play();
qml/Dash/Dash.qml+13−1
@@ -41,7 +41,7 @@ Showable {
41 onSetCurrentScopeRequested: {
41 onSetCurrentScopeRequested: {
42 if (!isSwipe || !window.active || bottomEdgeController.progress != 0 || scopeItem.scope || dashContent.subPageShown) {
42 if (!isSwipe || !window.active || bottomEdgeController.progress != 0 || scopeItem.scope || dashContent.subPageShown) {
43 if (bottomEdgeController.progress != 0 && window.active) animate = false;
43 if (bottomEdgeController.progress != 0 && window.active) animate = false;
44− dashContent.setCurrentScopeAtIndex(index, animate, isSwipe)
44+ dashContent.setCurrentScopeAtIndex(index, animate, true)
45 backToDashContent()
45 backToDashContent()
46 }
46 }
47 }
47 }
@@ -332,6 +332,18 @@ Showable {
332 // Eat direct presses on the overview hint so that they do not end up in the card below
332 // Eat direct presses on the overview hint so that they do not end up in the card below
333 anchors.fill: parent
333 anchors.fill: parent
334 enabled: parent.opacity != 0
334 enabled: parent.opacity != 0
335+
336+ // TODO: This is a temporary workaround to allow people opening the
337+ // dash overview when there's no touch input around. Will be replaced with
338+ // a SDK component once that's available
339+ onClicked: bottomEdgeController.progress = 1;
340+
341+ // We need to eat touch events here in order to not allow opening the bottom edge with a touch press
342+ MultiPointTouchArea {
343+ anchors.fill: parent
344+ mouseEnabled: false
345+ enabled: parent.enabled
346+ }
335 }
347 }
336 }
348 }
337
349
qml/Dash/DashContent.qml+1
@@ -84,6 +84,7 @@ Item {
84
84
85 if (reset) {
85 if (reset) {
86 dashContentList.currentItem.item.positionAtBeginning()
86 dashContentList.currentItem.item.positionAtBeginning()
87+ dashContentList.currentItem.item.resetSearch()
87 }
88 }
88 }
89 }
89
90
qml/Dash/DashNavigationList.qml+6−49
@@ -16,6 +16,7 @@
16
16
17import QtQuick 2.4
17import QtQuick 2.4
18import Ubuntu.Components 1.3
18import Ubuntu.Components 1.3
19+import Ubuntu.Components.ListItems 1.3 as ListItem
19import "../Components"
20import "../Components"
20
21
21Item {
22Item {
@@ -58,13 +59,9 @@ Item {
58 id: column
59 id: column
59 width: parent.width
60 width: parent.width
60
61
61− // TODO: check if SDK ListItems could be used here
62+ ListItem.Standard {
62− // and if not make them be useful since this is a quite common pattern
63−
64− AbstractButton {
65 id: backButton
63 id: backButton
66 objectName: "backButton"
64 objectName: "backButton"
67− width: parent.width
68 visible: navigation && !navigation.isRoot || false
65 visible: navigation && !navigation.isRoot || false
69 height: itemHeight
66 height: itemHeight
70
67
@@ -97,25 +94,11 @@ Item {
97 maximumLineCount: 2
94 maximumLineCount: 2
98 elide: Text.ElideMiddle
95 elide: Text.ElideMiddle
99 }
96 }
100−
101− Rectangle {
102− anchors {
103− bottom: parent.bottom
104− left: parent.left
105− right: parent.right
106− leftMargin: units.gu(2)
107− rightMargin: units.gu(2)
108− }
109− color: root.foregroundColor
110− opacity: 0.2
111− height: units.dp(1)
112− }
113 }
97 }
114
98
115− AbstractButton {
99+ ListItem.Standard {
116 id: allButton
100 id: allButton
117 objectName: "allButton"
101 objectName: "allButton"
118− width: parent.width
119 visible: navigation && (!navigation.isRoot || (!navigation.hidden && root.currentNavigation && !root.currentNavigation.isRoot && root.currentNavigation.parentNavigationId == navigation.navigationId)) || false
102 visible: navigation && (!navigation.isRoot || (!navigation.hidden && root.currentNavigation && !root.currentNavigation.isRoot && root.currentNavigation.parentNavigationId == navigation.navigationId)) || false
120 height: itemHeight
103 height: itemHeight
121
104
@@ -135,29 +118,17 @@ Item {
135 elide: Text.ElideMiddle
118 elide: Text.ElideMiddle
136 }
119 }
137
120
138− Rectangle {
139− anchors {
140− bottom: parent.bottom
141− left: parent.left
142− right: parent.right
143− leftMargin: units.gu(2)
144− rightMargin: units.gu(2)
145− }
146− color: root.foregroundColor
147− opacity: 0.2
148− height: units.dp(1)
149− }
150−
151 onClicked: root.allNavigationClicked();
121 onClicked: root.allNavigationClicked();
152 }
122 }
153
123
154 Repeater {
124 Repeater {
155 model: navigation && navigation.loaded ? navigation : null
125 model: navigation && navigation.loaded ? navigation : null
156 clip: true
126 clip: true
157− delegate: AbstractButton {
127+ delegate: ListItem.Standard {
158 objectName: root.objectName + "child" + index
128 objectName: root.objectName + "child" + index
159 height: root.itemHeight
129 height: root.itemHeight
160− width: root.width
130+ showDivider: index != navigation.count - 1
131+ selected: isActive
161
132
162 onClicked: root.enterNavigation(navigationId, hasChildren)
133 onClicked: root.enterNavigation(navigationId, hasChildren)
163
134
@@ -189,20 +160,6 @@ Item {
189 color: root.foregroundColor
160 color: root.foregroundColor
190 visible: hasChildren || isActive
161 visible: hasChildren || isActive
191 }
162 }
192−
193− Rectangle {
194− anchors {
195− bottom: parent.bottom
196− left: parent.left
197− right: parent.right
198− leftMargin: units.gu(2)
199− rightMargin: units.gu(2)
200− }
201− color: root.foregroundColor
202− opacity: 0.1
203− height: units.dp(1)
204− visible: index != navigation.count - 1
205− }
206 }
163 }
207 }
164 }
208 }
165 }
qml/Dash/GenericScopeView.qml+5
@@ -67,6 +67,11 @@ FocusScope {
67 subPageLoader.closeSubPage()
67 subPageLoader.closeSubPage()
68 }
68 }
69
69
70+ function resetSearch() {
71+ if(pageHeaderLoader.item && showPageHeader)
72+ pageHeaderLoader.item.resetSearch()
73+ }
74+
70 function itemClicked(index, result, item, itemModel, resultsModel, limitedCategoryItemCount, categoryId) {
75 function itemClicked(index, result, item, itemModel, resultsModel, limitedCategoryItemCount, categoryId) {
71 if (itemModel.uri.indexOf("scope://") === 0 || scope.id === "clickscope" || (scope.id === "videoaggregator" && categoryId === "myvideos-getstarted")) {
76 if (itemModel.uri.indexOf("scope://") === 0 || scope.id === "clickscope" || (scope.id === "videoaggregator" && categoryId === "myvideos-getstarted")) {
72 // TODO Technically it is possible that calling activate() will make the scope emit
77 // TODO Technically it is possible that calling activate() will make the scope emit
qml/Dash/PageHeader.qml+1−4
@@ -136,7 +136,7 @@ Item {
136 objectName: "headerContainer"
136 objectName: "headerContainer"
137 clip: contentY < height
137 clip: contentY < height
138 anchors { left: parent.left; top: parent.top; right: parent.right }
138 anchors { left: parent.left; top: parent.top; right: parent.right }
139− height: units.gu(7)
139+ height: header.contentHeight
140 contentHeight: headersColumn.height
140 contentHeight: headersColumn.height
141 interactive: false
141 interactive: false
142 contentY: showSearch ? 0 : height
142 contentY: showSearch ? 0 : height
@@ -171,8 +171,6 @@ Item {
171 PageHeadStyle {
171 PageHeadStyle {
172 id: searchHeader
172 id: searchHeader
173 anchors { left: parent.left; right: parent.right }
173 anchors { left: parent.left; right: parent.right }
174− height: headerContainer.height
175− contentHeight: height
176 opacity: headerContainer.clip || headerContainer.showSearch ? 1 : 0 // setting visible false cause column to relayout
174 opacity: headerContainer.clip || headerContainer.showSearch ? 1 : 0 // setting visible false cause column to relayout
177 __separator_visible: false
175 __separator_visible: false
178 // Required to keep PageHeadStyle noise down as it expects the Page's properties around.
176 // Required to keep PageHeadStyle noise down as it expects the Page's properties around.
@@ -247,7 +245,6 @@ Item {
247 objectName: "innerPageHeader"
245 objectName: "innerPageHeader"
248 anchors { left: parent.left; right: parent.right }
246 anchors { left: parent.left; right: parent.right }
249 height: headerContainer.height
247 height: headerContainer.height
250− contentHeight: height
251 opacity: headerContainer.clip || !headerContainer.showSearch ? 1 : 0 // setting visible false cause column to relayout
248 opacity: headerContainer.clip || !headerContainer.showSearch ? 1 : 0 // setting visible false cause column to relayout
252 __separator_visible: false
249 __separator_visible: false
253 property var styledItem: header
250 property var styledItem: header
qml/Dash/Previews/PreviewIconActions.qmlnew file+72
@@ -0,0 +1,72 @@
1+/*
2+ * Copyright (C) 2015 Canonical, Ltd.
3+ *
4+ * This program is free software; you can redistribute it and/or modify
5+ * it under the terms of the GNU 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.4
18+import Ubuntu.Components 1.3
19+
20+/*! This preview widget icons+label for number of items in widgetData["actions"].
21+ * For each of the items we recognize the fields "label", "icon", "temporaryIcon" and "id".
22+ * temporaryIcon is the icon that will be shown just after the user presses icon until the
23+ * scope refreshes the preview
24+ */
25+
26+PreviewWidget {
27+ id: root
28+
29+ implicitHeight: row.height
30+
31+ Row {
32+ id: row
33+ readonly property var actions: root.widgetData ? root.widgetData["actions"] : null
34+ width: parent.width
35+
36+ spacing: units.gu(2)
37+
38+ Repeater {
39+ model: row.actions
40+
41+ AbstractButton {
42+ objectName: "button" + modelData.id
43+ height: label.height
44+ width: childrenRect.width
45+
46+ Image {
47+ id: icon
48+ height: parent.height
49+ width: height
50+ source: modelData.icon
51+ sourceSize { width: icon.width; height: icon.height }
52+ }
53+
54+ Label {
55+ id: label
56+ anchors.left: icon.right
57+ anchors.leftMargin: visible ? units.gu(0.5) : 0
58+ text: modelData.label
59+ visible: text !== ""
60+ }
61+
62+ onClicked: {
63+ if (modelData.temporaryIcon) {
64+ icon.source = modelData.temporaryIcon;
65+ }
66+ root.triggered(root.widgetId, modelData.id, modelData);
67+ }
68+ }
69+ }
70+ }
71+
72+}
qml/Dash/Previews/PreviewWidgetFactory.qml+2−1
@@ -35,7 +35,7 @@ Loader {
35 property var scopeStyle: null
35 property var scopeStyle: null
36
36
37 //! Should the widget show in expanded mode (For those that support it)
37 //! Should the widget show in expanded mode (For those that support it)
38− property bool expanded: true
38+ property bool expanded: widgetType !== "expandable"
39
39
40 //! Set to true if the parent preview is displayed.
40 //! Set to true if the parent preview is displayed.
41 property bool isCurrentPreview: false
41 property bool isCurrentPreview: false
@@ -55,6 +55,7 @@ Loader {
55 case "expandable": return "PreviewExpandable.qml";
55 case "expandable": return "PreviewExpandable.qml";
56 case "gallery": return "PreviewImageGallery.qml";
56 case "gallery": return "PreviewImageGallery.qml";
57 case "header": return "PreviewHeader.qml";
57 case "header": return "PreviewHeader.qml";
58+ case "icon-actions": return "PreviewIconActions.qml";
58 case "image": return "PreviewZoomableImage.qml";
59 case "image": return "PreviewZoomableImage.qml";
59 case "progress": return "PreviewProgress.qml";
60 case "progress": return "PreviewProgress.qml";
60 case "payments": return "PreviewPayments.qml";
61 case "payments": return "PreviewPayments.qml";
qml/Greeter/NarrowView.qml+1−1
@@ -118,7 +118,7 @@ FocusScope {
118 i18n.tr("Enter passcode")
118 i18n.tr("Enter passcode")
119 errorText: promptText !== "" ? i18n.tr("Sorry, incorrect %1").arg(promptText) :
119 errorText: promptText !== "" ? i18n.tr("Sorry, incorrect %1").arg(promptText) :
120 alphaNumeric ? i18n.tr("Sorry, incorrect passphrase") + "\n" +
120 alphaNumeric ? i18n.tr("Sorry, incorrect passphrase") + "\n" +
121− i18n.tr("Please re-enter") :
121+ i18n.ctr("passphrase", "Please re-enter") :
122 i18n.tr("Sorry, incorrect passcode")
122 i18n.tr("Sorry, incorrect passcode")
123
123
124 onEntered: root.responded(passphrase)
124 onEntered: root.responded(passphrase)
qml/Launcher/LauncherDelegate.qml+100−14

This diff is too big to show here.

qml/Launcher/LauncherPanel.qml+93−13

This diff is too big to show here.

qml/Launcher/graphics/progressbar-fill@30.pngdeleted

Binary file not shown.

qml/Launcher/graphics/progressbar-fill@30.scideleted−5

This diff is too big to show here.

qml/Launcher/graphics/progressbar-trough@30.pngdeleted

Binary file not shown.

qml/Launcher/graphics/progressbar-trough@30.scideleted−5

This diff is too big to show here.

qml/Panel/IndicatorsMenu.qml+4−2

This diff is too big to show here.

qml/Panel/Panel.qml+1

This diff is too big to show here.

qml/Shell.qml+6−1

This diff is too big to show here.

qml/Stages/ApplicationWindow.qml+3

This diff is too big to show here.

qml/Stages/DecoratedWindow.qml+72−8

This diff is too big to show here.

qml/Stages/DesktopStage.qml+498−57

This diff is too big to show here.

qml/Stages/SpreadMaths.qmlnew file+164

This diff is too big to show here.

qml/Stages/graphics/window-close.svgnew file+64

This diff is too big to show here.

qml/graphics/phone_background.jpg

Binary file not shown.

tests/autopilot/unity8/indicators/__init__.py+1

This diff is too big to show here.

tests/autopilot/unity8/settings_wizard/__init__.py+48−5

This diff is too big to show here.

tests/autopilot/unity8/settings_wizard/tests/test_settings_wizard.py+19−4

This diff is too big to show here.

tests/libs/UbuntuGestures/tst_TouchRegistry.cpp+47

This diff is too big to show here.

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

This diff is too big to show here.

tests/mocks/Unity/Launcher/MockLauncherItem.cpp+22

This diff is too big to show here.

tests/mocks/Unity/Launcher/MockLauncherItem.h+4

This diff is too big to show here.

tests/mocks/Unity/Launcher/MockLauncherModel.cpp+54−1

This diff is too big to show here.

tests/mocks/Unity/Launcher/MockLauncherModel.h+4

This diff is too big to show here.

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

This diff is too big to show here.

tests/mocks/Utils/plugin.cpp+9−1

This diff is too big to show here.

tests/plugins/CMakeLists.txt+1

This diff is too big to show here.

tests/plugins/Greeter/Unity/Launcher/CMakeLists.txt+1−1

This diff is too big to show here.

tests/plugins/Greeter/Unity/Launcher/launchermodelastest.cpp+3

This diff is too big to show here.

tests/plugins/ScreenGrabber/CMakeLists.txtnew file+14

This diff is too big to show here.

tests/plugins/ScreenGrabber/ScreenGrabberTest.cppnew file+65

This diff is too big to show here.

tests/plugins/ScreenGrabber/grabber.qmlnew file+31

This diff is too big to show here.

tests/plugins/Unity/Launcher/CMakeLists.txt+1−1

This diff is too big to show here.

tests/plugins/Unity/Launcher/launchermodeltest.cpp+64−7

This diff is too big to show here.

tests/plugins/Unity/Session/sessionbackendtest.cpp+54−8

This diff is too big to show here.

tests/qmltests/CMakeLists.txt+1

This diff is too big to show here.

tests/qmltests/Components/tst_PhysicalKeysMapper.qml+5

This diff is too big to show here.

tests/qmltests/Dash/Previews/tst_PreviewExpandable.qml+3−1

This diff is too big to show here.

tests/qmltests/Dash/Previews/tst_PreviewIconActions.qmlnew file+126

This diff is too big to show here.

tests/qmltests/Dash/Previews/tst_PreviewWidgetFactory.qml+15−14

This diff is too big to show here.

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

This diff is too big to show here.

tests/qmltests/Dash/tst_PageHeader.qml+12−6

This diff is too big to show here.

tests/qmltests/Launcher/tst_Launcher.qml+210−7

This diff is too big to show here.

tests/qmltests/Panel/tst_IndicatorsMenu.qml+6

This diff is too big to show here.

tests/qmltests/Panel/tst_Panel.qml+18

This diff is too big to show here.

tests/qmltests/tst_Shell.qml+353−12

This diff is too big to show here.

tests/scripts/READMEnew file+9

This diff is too big to show here.

tests/scripts/alert-launcher-icon.shnew file+3

This diff is too big to show here.

tests/scripts/get-progress.shnew file+3

This diff is too big to show here.

tests/scripts/list-launcher-icons.shnew file+3

This diff is too big to show here.

tests/scripts/set-count-visible.shnew file+3

This diff is too big to show here.

tests/scripts/set-count.shnew file+3

This diff is too big to show here.

tests/scripts/set-progress.shnew file+3

This diff is too big to show here.

tests/uqmlscene/CMakeLists.txt+1

This diff is too big to show here.

tests/uqmlscene/main.cpp+17−1

This diff is too big to show here.

tools/scopetool.cpp+1

This diff is too big to show here.