git.iko.soy/unity8
on xenial help sign in
merge trunk
commit1bc4527749a37bfdbd207e58ea5f74562ac920cf authorLukáš Tinkl <lukas.tinkl@canonical.com> dateThu 24 Sep 2015, 16:09 (11 years ago) parent9699834e753816
64 files changed+1625−339
compare with xenial
unifiedsplit
CMakeLists.txt+2−1 cmake/modules/QmlTest.cmake+1 debian/changelog+23 debian/tests/control+5 debian/tests/qmluitests.sh+19 include/paths.h.in+16−10 plugins/IntegratedLightDM/liblightdm/CMakeLists.txt+1−1 plugins/ScreenGrabber/screengrabber.cpp+4−2 plugins/Wizard/System.cpp+11−3 plugins/Wizard/System.h+3 po/hu.po+1381−181 po/ug.po+57−60 qml/Dash/PreviewListView.qml+12−4 qml/Greeter/Infographics.qml+1−1 src/Dash/main.cpp+1−1 src/Panel/Indicators/client/indicatorsclient.cpp+1−1 src/main.cpp+1−1 tests/CMakeLists.txt+9−3 tests/autopilot/unity8/fixture_setup.py+1−1 tests/autopilot/unity8/shell/tests/__init__.py+1−1 tests/mocks/AccountsService/AccountsService.cpp+1−1 tests/mocks/IntegratedLightDM/liblightdm/CMakeLists.txt+1−1 tests/mocks/Ubuntu/CMakeLists.txt+1 tests/mocks/Ubuntu/Web/CMakeLists.txt+1 tests/mocks/Ubuntu/Web/WebView.qml+25 tests/mocks/Ubuntu/Web/qmldir+4 tests/mocks/Unity/Application/CMakeLists.txt+1 tests/mocks/Unity/Application/MirSurface.cpp+2−2 tests/mocks/Unity/Application/MirSurface.h+3−3 tests/mocks/Unity/Application/MirSurfaceItem.cpp+3−4 tests/mocks/Unity/Application/VirtualKeyboard.cpp+2−4 tests/mocks/Unity/Application/MirSurfaceItem.qml → tests/mocks/Unity/Application/resources/MirSurfaceItem.qml tests/mocks/Unity/Application/VirtualKeyboard.qml → tests/mocks/Unity/Application/resources/VirtualKeyboard.qml tests/mocks/Unity/Application/resources/surfaces.qrc+7 tests/mocks/Unity/Application/resources/vkb_portrait.png tests/mocks/Unity/Launcher/MockLauncherItem.cpp+1−1 tests/mocks/Unity/fake_previewstack.cpp+2−2 tests/mocks/Unity/fake_previewstack.h+1−1 tests/mocks/Unity/fake_resultsmodel.cpp+1−1 tests/mocks/Unity/fake_scope.cpp+3−5 tests/mocks/Unity/fake_scopesoverview.cpp+1−1 tests/mocks/libusermetrics/UserMetrics.cpp+1−5 tests/plugins/Dash/CMakeLists.txt−1 tests/plugins/Dash/cardcreatortest.cpp−1 tests/plugins/Dash/horizontaljournaltest.cpp−1 tests/plugins/Dash/horizontaljournaltry.cpp−1 tests/plugins/Dash/listviewwithpageheadersectionexternalmodeltest.cpp−1 tests/plugins/Dash/listviewwithpageheadersectiontest.cpp−1 tests/plugins/Dash/listviewwithpageheadertest.cpp−1 tests/plugins/Dash/organicgridtest.cpp−1 tests/plugins/Dash/organicgridtry.cpp−1 tests/plugins/Dash/verticaljournaltest.cpp−1 tests/plugins/Dash/verticaljournaltry.cpp−1 tests/plugins/IntegratedLightDM/CMakeLists.txt+1−1 tests/plugins/Ubuntu/Gestures/CMakeLists.txt+3−7 tests/plugins/Ubuntu/Gestures/GestureTest.cpp−2 tests/plugins/Ubuntu/Gestures/tst_TouchGate.cpp−1 tests/qmltests/CMakeLists.txt+2−2 tests/qmltests/Components/CMakeLists.txt+1−4 tests/qmltests/Components/tst_DragHandle.cpp−2 tests/qmltests/Components/tst_EdgeDragEvaluator.cpp−1 tests/qmltests/Dash/tst_Card.qml+2−2 tests/qmltests/Greeter/tst_Infographics.qml+4−3 tools/scopetool.cpp+1−1
CMakeLists.txt+2−1
@@ -13,8 +13,9 @@ endif()
1313
1414set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules)
1515
16−# Instruct CMake to run moc automatically when needed.
16+# Instruct CMake to run moc and rcc automatically when needed.
1717set(CMAKE_AUTOMOC ON)
18+set(CMAKE_AUTORCC ON)
1819
1920# enable QML debugging
2021string(TOLOWER "${CMAKE_BUILD_TYPE}" cmake_build_type_lower) # Build types should always be lowercase but sometimes they are not.
cmake/modules/QmlTest.cmake+1
@@ -127,6 +127,7 @@ function(add_executable_test COMPONENT_NAME TARGET)
127127 file(MAKE_DIRECTORY ${ARTIFACTS_DIR}/${path})
128128 set(file_logger -o ${ARTIFACTS_DIR}/${path}/test${COMPONENT_NAME}.xml,xunitxml)
129129 else()
130+ file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
130131 set(file_logger -o ${CMAKE_CURRENT_BINARY_DIR}/test${COMPONENT_NAME}.xml,xunitxml)
131132 endif()
132133
debian/changelog+23
@@ -4,6 +4,29 @@ unity8 (8.13+15.04.20150914-0ubuntu1) UNRELEASED; urgency=medium
44
55 -- Lukas Tinkl <ltinkl@canonical.com> Mon, 14 Sep 2015 19:19:23 +0200
66
7+unity8 (8.11+15.10.20150922.1-0ubuntu1) wily; urgency=medium
8+
9+ [ Albert Astals Cid ]
10+ * Adapt test to code changes
11+ * Add DEP-8 test for all our UI and unit tests
12+ * Keep the PreviewStack around to avoid mem leaks (LP: #1495467)
13+
14+ [ CI Train Bot ]
15+ * Resync trunk.
16+
17+ [ Michael Terry ]
18+ * When libusermetrics gives us an empty string, still show the
19+ infographic circle rather than hiding it. This is a follow-on to a
20+ branch [1] that changes the "no data available" label to the empty
21+ string.
22+
23+ [ Michał Sawicz ]
24+ * Add DEP-8 test for all our UI and unit tests
25+ * Fix integrated LightDM path
26+ * Resync trunk
27+
28+ -- Michał Sawicz <michal.sawicz@canonical.com> Tue, 22 Sep 2015 12:57:15 +0000
29+
730unity8 (8.11+15.10.20150915-0ubuntu1) wily; urgency=medium
831
932 [ Albert Astals Cid ]
debian/tests/controlnew file+5
@@ -0,0 +1,5 @@
1+Tests: qmluitests.sh
2+Restrictions: allow-stderr
3+Depends: @,
4+ @builddeps@,
5+ xvfb,
debian/tests/qmluitests.shnew file+19
@@ -0,0 +1,19 @@
1+#!/bin/sh
2+
3+SHELL_QML_PATH=$(pkg-config --variable=plugindir unity-shell-api)
4+UNITY_SOURCE_DIR=$(readlink -f $(dirname $(readlink -f $0))/../..)
5+
6+dh_auto_configure -- -DCMAKE_INSTALL_LOCALSTATEDIR="/var" \
7+ -DARTIFACTS_DIR=${ADT_ARTIFACTS} \
8+ -DUNITY_PLUGINPATH=${SHELL_QML_PATH} \
9+ -DUNITY_MOCKPATH=${SHELL_QML_PATH}/mocks
10+dh_auto_build --parallel -- -C tests/mocks
11+dh_auto_build --parallel -- -C tests/plugins
12+dh_auto_build --parallel -- -C tests/qmltests
13+dh_auto_build --parallel -- -C tests/uqmlscene
14+dh_auto_build --parallel -- -C tests/utils
15+
16+export UNITY_SOURCE_DIR
17+
18+# FIXME: --parallel here causes some failures
19+dh_auto_build -- -k xvfballtests
include/paths.h.in+16−10
@@ -33,11 +33,21 @@ inline bool isRunningInstalled() {
3333 return installed;
3434}
3535
36+inline QString buildDirectory() {
37+ if (!qEnvironmentVariableIsEmpty("UNITY_BINARY_DIR")) return qgetenv("UNITY_BINARY_DIR");
38+ return QString("@CMAKE_BINARY_DIR@");
39+}
40+
41+inline QString sourceDirectory() {
42+ if (!qEnvironmentVariableIsEmpty("UNITY_SOURCE_DIR")) return qgetenv("UNITY_SOURCE_DIR");
43+ return QString("@CMAKE_SOURCE_DIR@");
44+}
45+
3646inline QString translationDirectory() {
3747 if (isRunningInstalled()) {
3848 return QString("@CMAKE_INSTALL_PREFIX@/share/locale");
3949 } else {
40− return QString("@CMAKE_BINARY_DIR@/po/locale");
50+ return QString(buildDirectory() + "/po/locale");
4151 }
4252}
4353
@@ -45,14 +55,14 @@ inline QString qmlDirectory() {
4555 if (isRunningInstalled()) {
4656 return QString("@CMAKE_INSTALL_PREFIX@/@SHELL_APP_DIR@/");
4757 } else {
48− return QString("@CMAKE_SOURCE_DIR@/qml/");
58+ return QString(sourceDirectory() + "/qml");
4959 }
5060}
5161
5262inline QStringList overrideImportPaths() {
5363 QStringList paths;
5464 if (!isRunningInstalled()) {
55− paths << QString("@CMAKE_BINARY_DIR@/plugins");
65+ paths << QString(buildDirectory() + "/plugins");
5666 }
5767 return paths;
5868}
@@ -62,7 +72,7 @@ inline QStringList nonMirImportPaths() {
6272 if (isRunningInstalled()) {
6373 paths << QString("@CMAKE_INSTALL_PREFIX@/@SHELL_INSTALL_QML@/nonmirplugins");
6474 } else {
65− paths << QString("@CMAKE_BINARY_DIR@/nonmirplugins");
75+ paths << QString(buildDirectory() + "/nonmirplugins");
6676 }
6777 return paths;
6878}
@@ -77,7 +87,7 @@ inline QStringList fallbackImportPaths() {
7787 } else {
7888 paths << QString("@USS_PRIVATE_PLUGINDIR@");
7989 paths << QString("@SHELL_PLUGINDIR@");
80− paths << QString("@CMAKE_BINARY_DIR@/tests/mocks");
90+ paths << QString(buildDirectory() + "/tests/mocks");
8191 }
8292 return paths;
8393}
@@ -86,7 +96,7 @@ inline QString mockPluginsDir() {
8696 if (isRunningInstalled()) {
8797 return QString("@CMAKE_INSTALL_PREFIX@/@SHELL_INSTALL_QML@/mocks");
8898 } else {
89− return QString("@CMAKE_BINARY_DIR@/tests/mocks");
99+ return QString(buildDirectory() + "/tests/mocks");
90100 }
91101}
92102
@@ -99,10 +109,6 @@ inline QStringList shellDataDirs() {
99109 return dirs;
100110}
101111
102−inline QString sourceDirectory() {
103− return QString("@CMAKE_SOURCE_DIR@/");
104−}
105−
106112inline void prependImportPaths(QQmlEngine *engine, const QStringList &paths)
107113{
108114 QStringList importPathList = engine->importPathList();
plugins/IntegratedLightDM/liblightdm/CMakeLists.txt+1−1
@@ -33,5 +33,5 @@ set_target_properties(MockLightDM-demo-shared PROPERTIES
3333 OUTPUT_NAME lightdm-qt5-2)
3434
3535install(TARGETS MockLightDM-demo-shared
36− DESTINATION ${SHELL_INSTALL_QML}/mocks/LightDM/demo
36+ DESTINATION ${SHELL_INSTALL_QML}/mocks/IntegratedLightDM/demo
3737 )
plugins/ScreenGrabber/screengrabber.cpp+4−2
@@ -19,6 +19,7 @@
1919#include <QDir>
2020#include <QDateTime>
2121#include <QStandardPaths>
22+#include <QTemporaryDir>
2223#include <QtGui/QImage>
2324#include <QtGui/QGuiApplication>
2425#include <QtQuick/QQuickWindow>
@@ -42,8 +43,9 @@ ScreenGrabber::ScreenGrabber(QObject *parent)
4243 QDir screenshotsDir;
4344 if (qEnvironmentVariableIsSet("UNITY_TESTING")) {
4445 qDebug() << "Using test environment";
45− QStandardPaths::setTestModeEnabled(true);
46− screenshotsDir = QStandardPaths::writableLocation(QStandardPaths::DataLocation);
46+ QTemporaryDir tDir;
47+ tDir.setAutoRemove(false);
48+ screenshotsDir = tDir.path();
4749 } else {
4850 qDebug() << "Using real environment";
4951 screenshotsDir = QStandardPaths::writableLocation(QStandardPaths::PicturesLocation);
plugins/Wizard/System.cpp+11−3
@@ -33,8 +33,10 @@ System::System()
3333 // Register the argument needed for UpdateActivationEnvironment below
3434 qDBusRegisterMetaType<QMap<QString,QString>>();
3535
36− m_fsWatcher.addPath(wizardEnabledPath());
37− connect(&m_fsWatcher, &QFileSystemWatcher::fileChanged, this, &System::wizardEnabledChanged);
36+ if(!wizardEnabled()) {
37+ m_fsWatcher.addPath(wizardEnabledPath());
38+ }
39+ connect(&m_fsWatcher, &QFileSystemWatcher::fileChanged, this, &System::watcherFileChanged);
3840}
3941
4042QString System::wizardEnabledPath()
@@ -59,10 +61,16 @@ void System::setWizardEnabled(bool enabled)
5961 QDir(wizardEnabledPath()).mkpath("..");
6062 QFile(wizardEnabledPath()).open(QIODevice::WriteOnly);
6163 m_fsWatcher.addPath(wizardEnabledPath());
62− wizardEnabledChanged();
64+ Q_EMIT wizardEnabledChanged();
6365 }
6466}
6567
68+void System::watcherFileChanged()
69+{
70+ Q_EMIT wizardEnabledChanged();
71+ m_fsWatcher.removePath(wizardEnabledPath());
72+}
73+
6674void System::setSessionVariable(const QString &variable, const QString &value)
6775{
6876 // We need to update both upstart's and DBus's environment
plugins/Wizard/System.h+3
@@ -39,6 +39,9 @@ public Q_SLOTS:
3939Q_SIGNALS:
4040 void wizardEnabledChanged();
4141
42+private Q_SLOTS:
43+ void watcherFileChanged();
44+
4245private:
4346 Q_DISABLE_COPY(System)
4447
po/hu.po+1381−181
@@ -7,8 +7,8 @@ msgid ""
77msgstr ""
88"Project-Id-Version: unity\n"
99"Report-Msgid-Bugs-To: \n"
10−"POT-Creation-Date: 2015-08-25 14:53+0200\n"
11−"PO-Revision-Date: 2015-09-18 08:40+0000\n"
10+"POT-Creation-Date: 2015-09-22 04:33+0200\n"
11+"PO-Revision-Date: 2015-09-21 12:40+0000\n"
1212"Last-Translator: Richard Somlói <ricsipontaz@gmail.com>\n"
1313"Language-Team: Hungarian <hu@li.org>\n"
1414"Language: hu\n"
@@ -16,10 +16,10 @@ msgstr ""
1616"Content-Type: text/plain; charset=UTF-8\n"
1717"Content-Transfer-Encoding: 8bit\n"
1818"Plural-Forms: nplurals=2; plural=n != 1;\n"
19−"X-Launchpad-Export-Date: 2015-09-19 05:37+0000\n"
20−"X-Generator: Launchpad (build 17746)\n"
19+"X-Launchpad-Export-Date: 2015-09-22 06:01+0000\n"
20+"X-Generator: Launchpad (build 17749)\n"
2121
22−#: plugins/LightDM/Greeter.cpp:112
22+#: plugins/IntegratedLightDM/Greeter.cpp:112
2323msgid "Password: "
2424msgstr "Jelszó: "
2525
@@ -74,7 +74,7 @@ msgstr "%a %p. %I.%M"
7474#. en_GB example: "%a %b %d\u2003%l:%M %p" --> "Fri 31 Oct 1:00 PM"
7575#: plugins/Utils/relativetimeformatter.cpp:190
7676msgid "%a %d %b %l:%M %p"
77−msgstr "%d. %b. %a, %p. %I.%M"
77+msgstr "%b. %d., %a %p. %I.%M"
7878
7979#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
8080#. This format string is used for showing, on a 24-hour clock, times that happen yesterday.
@@ -114,11 +114,1003 @@ msgstr "%a %H.%M"
114114#. en_GB example: "%a %b %d\u2003%H:%M" --> "Fri 31 Oct 13:00"
115115#: plugins/Utils/relativetimeformatter.cpp:234
116116msgid "%a %d %b %H:%M"
117−msgstr "%d. %b., %a %H.%M"
117+msgstr "%b. %d., %a %H.%M"
118+
119+#: plugins/Wizard/LocalePlugin.cpp:28
120+msgid "Ivory Coast"
121+msgstr ""
122+
123+#: plugins/Wizard/LocalePlugin.cpp:29
124+msgid "Ghana"
125+msgstr ""
126+
127+#: plugins/Wizard/LocalePlugin.cpp:30
128+msgid "Ethiopia"
129+msgstr ""
130+
131+#: plugins/Wizard/LocalePlugin.cpp:31
132+msgid "Algeria"
133+msgstr ""
134+
135+#: plugins/Wizard/LocalePlugin.cpp:32
136+msgid "Eritrea"
137+msgstr ""
138+
139+#: plugins/Wizard/LocalePlugin.cpp:33
140+msgid "Mali"
141+msgstr ""
142+
143+#: plugins/Wizard/LocalePlugin.cpp:34
144+msgid "Central African Republic"
145+msgstr ""
146+
147+#: plugins/Wizard/LocalePlugin.cpp:35
148+msgid "Gambia"
149+msgstr ""
150+
151+#: plugins/Wizard/LocalePlugin.cpp:36
152+msgid "Guinea Bissau"
153+msgstr ""
154+
155+#: plugins/Wizard/LocalePlugin.cpp:37
156+msgid "Malawi"
157+msgstr ""
158+
159+#: plugins/Wizard/LocalePlugin.cpp:38
160+msgid "Congo Brazzaville"
161+msgstr ""
162+
163+#: plugins/Wizard/LocalePlugin.cpp:39
164+msgid "Burundi"
165+msgstr ""
166+
167+#: plugins/Wizard/LocalePlugin.cpp:40
168+msgid "Egypt"
169+msgstr ""
170+
171+#: plugins/Wizard/LocalePlugin.cpp:41
172+msgid "Morocco"
173+msgstr ""
174+
175+#: plugins/Wizard/LocalePlugin.cpp:42
176+msgid "Spain"
177+msgstr ""
178+
179+#: plugins/Wizard/LocalePlugin.cpp:43
180+msgid "Guinea"
181+msgstr ""
182+
183+#: plugins/Wizard/LocalePlugin.cpp:44
184+msgid "Senegal"
185+msgstr ""
186+
187+#: plugins/Wizard/LocalePlugin.cpp:45
188+msgid "Tanzania"
189+msgstr ""
190+
191+#: plugins/Wizard/LocalePlugin.cpp:46
192+msgid "Djibouti"
193+msgstr ""
194+
195+#: plugins/Wizard/LocalePlugin.cpp:47
196+msgid "Cameroon"
197+msgstr ""
198+
199+#: plugins/Wizard/LocalePlugin.cpp:48
200+msgid "Western Sahara"
201+msgstr ""
202+
203+#: plugins/Wizard/LocalePlugin.cpp:49
204+msgid "Sierra Leone"
205+msgstr ""
206+
207+#: plugins/Wizard/LocalePlugin.cpp:50
208+msgid "Botswana"
209+msgstr ""
210+
211+#: plugins/Wizard/LocalePlugin.cpp:51
212+msgid "Zimbabwe"
213+msgstr ""
214+
215+#: plugins/Wizard/LocalePlugin.cpp:52
216+msgid "South Africa"
217+msgstr ""
218+
219+#: plugins/Wizard/LocalePlugin.cpp:53
220+msgid "South Sudan"
221+msgstr ""
222+
223+#: plugins/Wizard/LocalePlugin.cpp:54
224+msgid "Uganda"
225+msgstr ""
226+
227+#: plugins/Wizard/LocalePlugin.cpp:55
228+msgid "Sudan"
229+msgstr ""
230+
231+#: plugins/Wizard/LocalePlugin.cpp:56
232+msgid "Rwanda"
233+msgstr ""
234+
235+#: plugins/Wizard/LocalePlugin.cpp:57
236+msgid "Congo (Kinshasa)"
237+msgstr ""
238+
239+#: plugins/Wizard/LocalePlugin.cpp:58
240+msgid "Nigeria"
241+msgstr ""
242+
243+#: plugins/Wizard/LocalePlugin.cpp:59
244+msgid "Gabon"
245+msgstr ""
246+
247+#: plugins/Wizard/LocalePlugin.cpp:60
248+msgid "Togo"
249+msgstr ""
250+
251+#: plugins/Wizard/LocalePlugin.cpp:61
252+msgid "Angola"
253+msgstr ""
254+
255+#: plugins/Wizard/LocalePlugin.cpp:62
256+msgid "Zambia"
257+msgstr ""
258+
259+#: plugins/Wizard/LocalePlugin.cpp:63
260+msgid "Equatorial Guinea"
261+msgstr ""
262+
263+#: plugins/Wizard/LocalePlugin.cpp:64
264+msgid "Mozambique"
265+msgstr ""
266+
267+#: plugins/Wizard/LocalePlugin.cpp:65
268+msgid "Lesotho"
269+msgstr ""
270+
271+#: plugins/Wizard/LocalePlugin.cpp:66
272+msgid "Swaziland"
273+msgstr ""
274+
275+#: plugins/Wizard/LocalePlugin.cpp:67
276+msgid "Somalia"
277+msgstr ""
278+
279+#: plugins/Wizard/LocalePlugin.cpp:68
280+msgid "Liberia"
281+msgstr ""
282+
283+#: plugins/Wizard/LocalePlugin.cpp:69
284+msgid "Kenya"
285+msgstr ""
286+
287+#: plugins/Wizard/LocalePlugin.cpp:70
288+msgid "Chad"
289+msgstr ""
290+
291+#: plugins/Wizard/LocalePlugin.cpp:71
292+msgid "Niger"
293+msgstr ""
294+
295+#: plugins/Wizard/LocalePlugin.cpp:72
296+msgid "Mauritania"
297+msgstr ""
298+
299+#: plugins/Wizard/LocalePlugin.cpp:73
300+msgid "Burkina Faso"
301+msgstr ""
302+
303+#: plugins/Wizard/LocalePlugin.cpp:74
304+msgid "Benin"
305+msgstr ""
306+
307+#: plugins/Wizard/LocalePlugin.cpp:75
308+msgid "Sao Tome And Principe"
309+msgstr ""
310+
311+#: plugins/Wizard/LocalePlugin.cpp:76
312+msgid "Libya"
313+msgstr ""
314+
315+#: plugins/Wizard/LocalePlugin.cpp:77
316+msgid "Tunisia"
317+msgstr ""
318+
319+#: plugins/Wizard/LocalePlugin.cpp:78
320+msgid "Namibia"
321+msgstr ""
322+
323+#: plugins/Wizard/LocalePlugin.cpp:79
324+msgid "United States"
325+msgstr ""
326+
327+#: plugins/Wizard/LocalePlugin.cpp:80
328+msgid "Anguilla"
329+msgstr ""
330+
331+#: plugins/Wizard/LocalePlugin.cpp:81
332+msgid "Antigua And Barbuda"
333+msgstr ""
334+
335+#: plugins/Wizard/LocalePlugin.cpp:82
336+msgid "Brazil"
337+msgstr ""
338+
339+#: plugins/Wizard/LocalePlugin.cpp:83
340+msgid "Argentina"
341+msgstr ""
342+
343+#: plugins/Wizard/LocalePlugin.cpp:84
344+msgid "Aruba"
345+msgstr ""
346+
347+#: plugins/Wizard/LocalePlugin.cpp:85
348+msgid "Paraguay"
349+msgstr ""
350+
351+#: plugins/Wizard/LocalePlugin.cpp:86
352+msgid "Canada"
353+msgstr ""
354+
355+#: plugins/Wizard/LocalePlugin.cpp:87
356+msgid "Mexico"
357+msgstr ""
358+
359+#: plugins/Wizard/LocalePlugin.cpp:88
360+msgid "Barbados"
361+msgstr ""
362+
363+#: plugins/Wizard/LocalePlugin.cpp:89
364+msgid "Belize"
365+msgstr ""
366+
367+#: plugins/Wizard/LocalePlugin.cpp:90
368+msgid "Colombia"
369+msgstr ""
370+
371+#: plugins/Wizard/LocalePlugin.cpp:91
372+msgid "Venezuela"
373+msgstr ""
374+
375+#: plugins/Wizard/LocalePlugin.cpp:92
376+msgid "French Guiana"
377+msgstr ""
378+
379+#: plugins/Wizard/LocalePlugin.cpp:93
380+msgid "Cayman Islands"
381+msgstr ""
382+
383+#: plugins/Wizard/LocalePlugin.cpp:94
384+msgid "Costa Rica"
385+msgstr ""
386+
387+#: plugins/Wizard/LocalePlugin.cpp:95
388+msgid "Cura Sao"
389+msgstr ""
390+
391+#: plugins/Wizard/LocalePlugin.cpp:96
392+msgid "Greenland"
393+msgstr ""
394+
395+#: plugins/Wizard/LocalePlugin.cpp:97
396+msgid "Dominica"
397+msgstr ""
398+
399+#: plugins/Wizard/LocalePlugin.cpp:98
400+msgid "El Salvador"
401+msgstr ""
402+
403+#: plugins/Wizard/LocalePlugin.cpp:99
404+msgid "Turks And Caicos Islands"
405+msgstr ""
406+
407+#: plugins/Wizard/LocalePlugin.cpp:100
408+msgid "Grenada"
409+msgstr ""
410+
411+#: plugins/Wizard/LocalePlugin.cpp:101
412+msgid "Guadeloupe"
413+msgstr ""
414+
415+#: plugins/Wizard/LocalePlugin.cpp:102
416+msgid "Guatemala"
417+msgstr ""
418+
419+#: plugins/Wizard/LocalePlugin.cpp:103
420+msgid "Ecuador"
421+msgstr ""
422+
423+#: plugins/Wizard/LocalePlugin.cpp:104
424+msgid "Guyana"
425+msgstr ""
426+
427+#: plugins/Wizard/LocalePlugin.cpp:105
428+msgid "Cuba"
429+msgstr ""
430+
431+#: plugins/Wizard/LocalePlugin.cpp:106
432+msgid "Jamaica"
433+msgstr ""
434+
435+#: plugins/Wizard/LocalePlugin.cpp:107
436+msgid "Bonaire"
437+msgstr ""
438+
439+#: plugins/Wizard/LocalePlugin.cpp:108
440+msgid "Bolivia"
441+msgstr ""
442+
443+#: plugins/Wizard/LocalePlugin.cpp:109
444+msgid "Peru"
445+msgstr ""
446+
447+#: plugins/Wizard/LocalePlugin.cpp:110
448+msgid "Sint Maarten"
449+msgstr ""
450+
451+#: plugins/Wizard/LocalePlugin.cpp:111
452+msgid "Nicaragua"
453+msgstr ""
454+
455+#: plugins/Wizard/LocalePlugin.cpp:112
456+msgid "Saint Martin"
457+msgstr ""
458+
459+#: plugins/Wizard/LocalePlugin.cpp:113
460+msgid "Martinique"
461+msgstr ""
462+
463+#: plugins/Wizard/LocalePlugin.cpp:114
464+msgid "Saint Pierre And Miquelon"
465+msgstr ""
466+
467+#: plugins/Wizard/LocalePlugin.cpp:115
468+msgid "Uruguay"
469+msgstr ""
470+
471+#: plugins/Wizard/LocalePlugin.cpp:116
472+msgid "Montserrat"
473+msgstr ""
474+
475+#: plugins/Wizard/LocalePlugin.cpp:117
476+msgid "Bahamas"
477+msgstr ""
478+
479+#: plugins/Wizard/LocalePlugin.cpp:118
480+msgid "Panama"
481+msgstr ""
482+
483+#: plugins/Wizard/LocalePlugin.cpp:119
484+msgid "Suriname"
485+msgstr ""
486+
487+#: plugins/Wizard/LocalePlugin.cpp:120
488+msgid "Haiti"
489+msgstr ""
490+
491+#: plugins/Wizard/LocalePlugin.cpp:121
492+msgid "Trinidad And Tobago"
493+msgstr ""
494+
495+#: plugins/Wizard/LocalePlugin.cpp:122
496+msgid "Puerto Rico"
497+msgstr ""
498+
499+#: plugins/Wizard/LocalePlugin.cpp:123
500+msgid "Chile"
501+msgstr ""
502+
503+#: plugins/Wizard/LocalePlugin.cpp:124
504+msgid "Dominican Republic"
505+msgstr ""
506+
507+#: plugins/Wizard/LocalePlugin.cpp:125
508+msgid "Saint Barthelemy"
509+msgstr ""
510+
511+#: plugins/Wizard/LocalePlugin.cpp:126
512+msgid "Saint Kitts And Nevis"
513+msgstr ""
514+
515+#: plugins/Wizard/LocalePlugin.cpp:127
516+msgid "Saint Lucia"
517+msgstr ""
518+
519+#: plugins/Wizard/LocalePlugin.cpp:128
520+msgid "United States Virgin Islands"
521+msgstr ""
522+
523+#: plugins/Wizard/LocalePlugin.cpp:129
524+msgid "Saint Vincent And The Grenadines"
525+msgstr ""
526+
527+#: plugins/Wizard/LocalePlugin.cpp:130
528+msgid "Honduras"
529+msgstr ""
530+
531+#: plugins/Wizard/LocalePlugin.cpp:131
532+msgid "British Virgin Islands"
533+msgstr ""
534+
535+#: plugins/Wizard/LocalePlugin.cpp:132
536+msgid "Antarctica"
537+msgstr ""
538+
539+#: plugins/Wizard/LocalePlugin.cpp:133
540+msgid "Australia"
541+msgstr ""
542+
543+#: plugins/Wizard/LocalePlugin.cpp:134
544+msgid "Svalbard And Jan Mayen Islands"
545+msgstr ""
546+
547+#: plugins/Wizard/LocalePlugin.cpp:135
548+msgid "Yemen"
549+msgstr ""
550+
551+#: plugins/Wizard/LocalePlugin.cpp:136
552+msgid "Kazakhstan"
553+msgstr ""
554+
555+#: plugins/Wizard/LocalePlugin.cpp:137
556+msgid "Jordan"
557+msgstr ""
558+
559+#: plugins/Wizard/LocalePlugin.cpp:138
560+msgid "Russia"
561+msgstr ""
562+
563+#: plugins/Wizard/LocalePlugin.cpp:139
564+msgid "Turkmenistan"
565+msgstr ""
566+
567+#: plugins/Wizard/LocalePlugin.cpp:140
568+msgid "Iraq"
569+msgstr ""
570+
571+#: plugins/Wizard/LocalePlugin.cpp:141
572+msgid "Bahrain"
573+msgstr ""
574+
575+#: plugins/Wizard/LocalePlugin.cpp:142
576+msgid "Azerbaijan"
577+msgstr ""
578+
579+#: plugins/Wizard/LocalePlugin.cpp:143
580+msgid "Thailand"
581+msgstr ""
582+
583+#: plugins/Wizard/LocalePlugin.cpp:144
584+msgid "Lebanon"
585+msgstr ""
586+
587+#: plugins/Wizard/LocalePlugin.cpp:145
588+msgid "Kyrgyzstan"
589+msgstr ""
590+
591+#: plugins/Wizard/LocalePlugin.cpp:146
592+msgid "Brunei"
593+msgstr ""
594+
595+#: plugins/Wizard/LocalePlugin.cpp:147
596+msgid "Mongolia"
597+msgstr ""
598+
599+#: plugins/Wizard/LocalePlugin.cpp:148
600+msgid "China"
601+msgstr ""
602+
603+#: plugins/Wizard/LocalePlugin.cpp:149
604+msgid "Sri Lanka"
605+msgstr ""
606+
607+#: plugins/Wizard/LocalePlugin.cpp:150
608+msgid "Syria"
609+msgstr ""
610+
611+#: plugins/Wizard/LocalePlugin.cpp:151
612+msgid "Bangladesh"
613+msgstr ""
614+
615+#: plugins/Wizard/LocalePlugin.cpp:152
616+msgid "East Timor"
617+msgstr ""
618+
619+#: plugins/Wizard/LocalePlugin.cpp:153
620+msgid "United Arab Emirates"
621+msgstr ""
622+
623+#: plugins/Wizard/LocalePlugin.cpp:154
624+msgid "Tajikistan"
625+msgstr ""
626+
627+#: plugins/Wizard/LocalePlugin.cpp:155
628+msgid "Palestinian Territories"
629+msgstr ""
630+
631+#: plugins/Wizard/LocalePlugin.cpp:156
632+msgid "Vietnam"
633+msgstr ""
634+
635+#: plugins/Wizard/LocalePlugin.cpp:157
636+msgid "Hong Kong"
637+msgstr ""
638+
639+#: plugins/Wizard/LocalePlugin.cpp:158
640+msgid "Indonesia"
641+msgstr ""
642+
643+#: plugins/Wizard/LocalePlugin.cpp:159
644+msgid "Israel"
645+msgstr ""
646+
647+#: plugins/Wizard/LocalePlugin.cpp:160
648+msgid "Afghanistan"
649+msgstr ""
650+
651+#: plugins/Wizard/LocalePlugin.cpp:161
652+msgid "Pakistan"
653+msgstr ""
654+
655+#: plugins/Wizard/LocalePlugin.cpp:162
656+msgid "Nepal"
657+msgstr ""
658+
659+#: plugins/Wizard/LocalePlugin.cpp:163
660+msgid "India"
661+msgstr ""
662+
663+#: plugins/Wizard/LocalePlugin.cpp:164
664+msgid "Malaysia"
665+msgstr ""
666+
667+#: plugins/Wizard/LocalePlugin.cpp:165
668+msgid "Kuwait"
669+msgstr ""
670+
671+#: plugins/Wizard/LocalePlugin.cpp:166
672+msgid "Macau"
673+msgstr ""
674+
675+#: plugins/Wizard/LocalePlugin.cpp:167
676+msgid "Philippines"
677+msgstr ""
678+
679+#: plugins/Wizard/LocalePlugin.cpp:168
680+msgid "Oman"
681+msgstr ""
682+
683+#: plugins/Wizard/LocalePlugin.cpp:169
684+msgid "Cyprus"
685+msgstr ""
686+
687+#: plugins/Wizard/LocalePlugin.cpp:170
688+msgid "Cambodia"
689+msgstr ""
690+
691+#: plugins/Wizard/LocalePlugin.cpp:171
692+msgid "North Korea"
693+msgstr ""
694+
695+#: plugins/Wizard/LocalePlugin.cpp:172
696+msgid "Qatar"
697+msgstr ""
698+
699+#: plugins/Wizard/LocalePlugin.cpp:173
700+msgid "Myanmar"
701+msgstr ""
702+
703+#: plugins/Wizard/LocalePlugin.cpp:174
704+msgid "Saudi Arabia"
705+msgstr ""
706+
707+#: plugins/Wizard/LocalePlugin.cpp:175
708+msgid "Uzbekistan"
709+msgstr ""
710+
711+#: plugins/Wizard/LocalePlugin.cpp:176
712+msgid "South Korea"
713+msgstr ""
714+
715+#: plugins/Wizard/LocalePlugin.cpp:177
716+msgid "Singapore"
717+msgstr ""
718+
719+#: plugins/Wizard/LocalePlugin.cpp:178
720+msgid "Taiwan"
721+msgstr ""
722+
723+#: plugins/Wizard/LocalePlugin.cpp:179
724+msgid "Georgia"
725+msgstr ""
726+
727+#: plugins/Wizard/LocalePlugin.cpp:180
728+msgid "Iran"
729+msgstr ""
730+
731+#: plugins/Wizard/LocalePlugin.cpp:181
732+msgid "Bhutan"
733+msgstr ""
734+
735+#: plugins/Wizard/LocalePlugin.cpp:182
736+msgid "Japan"
737+msgstr ""
738+
739+#: plugins/Wizard/LocalePlugin.cpp:183
740+msgid "Laos"
741+msgstr ""
742+
743+#: plugins/Wizard/LocalePlugin.cpp:184
744+msgid "Armenia"
745+msgstr ""
746+
747+#: plugins/Wizard/LocalePlugin.cpp:185
748+msgid "Portugal"
749+msgstr ""
750+
751+#: plugins/Wizard/LocalePlugin.cpp:186
752+msgid "Bermuda"
753+msgstr ""
754+
755+#: plugins/Wizard/LocalePlugin.cpp:187
756+msgid "Cape Verde"
757+msgstr ""
758+
759+#: plugins/Wizard/LocalePlugin.cpp:188
760+msgid "Faroe Islands"
761+msgstr ""
762+
763+#: plugins/Wizard/LocalePlugin.cpp:189
764+msgid "Iceland"
765+msgstr ""
766+
767+#: plugins/Wizard/LocalePlugin.cpp:190
768+msgid "South Georgia And The South Sandwich Islands"
769+msgstr ""
770+
771+#: plugins/Wizard/LocalePlugin.cpp:191
772+msgid "Saint Helena"
773+msgstr ""
774+
775+#: plugins/Wizard/LocalePlugin.cpp:192
776+msgid "Falkland Islands"
777+msgstr ""
778+
779+#: plugins/Wizard/LocalePlugin.cpp:193
780+msgid "Netherlands"
781+msgstr ""
782+
783+#: plugins/Wizard/LocalePlugin.cpp:194
784+msgid "Andorra"
785+msgstr ""
786+
787+#: plugins/Wizard/LocalePlugin.cpp:195
788+msgid "Greece"
789+msgstr ""
790+
791+#: plugins/Wizard/LocalePlugin.cpp:196
792+msgid "Serbia"
793+msgstr ""
794+
795+#: plugins/Wizard/LocalePlugin.cpp:197
796+msgid "Germany"
797+msgstr ""
798+
799+#: plugins/Wizard/LocalePlugin.cpp:198
800+msgid "Slovakia"
801+msgstr ""
802+
803+#: plugins/Wizard/LocalePlugin.cpp:199
804+msgid "Belgium"
805+msgstr ""
806+
807+#: plugins/Wizard/LocalePlugin.cpp:200
808+msgid "Romania"
809+msgstr ""
810+
811+#: plugins/Wizard/LocalePlugin.cpp:201
812+msgid "Hungary"
813+msgstr ""
814+
815+#: plugins/Wizard/LocalePlugin.cpp:202
816+msgid "Moldova"
817+msgstr ""
818+
819+#: plugins/Wizard/LocalePlugin.cpp:203
820+msgid "Denmark"
821+msgstr ""
822+
823+#: plugins/Wizard/LocalePlugin.cpp:204
824+msgid "Ireland"
825+msgstr ""
826+
827+#: plugins/Wizard/LocalePlugin.cpp:205
828+msgid "Gibraltar"
829+msgstr ""
830+
831+#: plugins/Wizard/LocalePlugin.cpp:206
832+msgid "Guernsey"
833+msgstr ""
834+
835+#: plugins/Wizard/LocalePlugin.cpp:207
836+msgid "Finland"
837+msgstr ""
838+
839+#: plugins/Wizard/LocalePlugin.cpp:208
840+msgid "Isle Of Man"
841+msgstr ""
842+
843+#: plugins/Wizard/LocalePlugin.cpp:209
844+msgid "Turkey"
845+msgstr ""
846+
847+#: plugins/Wizard/LocalePlugin.cpp:210
848+msgid "Jersey"
849+msgstr ""
850+
851+#: plugins/Wizard/LocalePlugin.cpp:211
852+msgid "Ukraine"
853+msgstr ""
854+
855+#: plugins/Wizard/LocalePlugin.cpp:212
856+msgid "Slovenia"
857+msgstr ""
858+
859+#: plugins/Wizard/LocalePlugin.cpp:213
860+msgid "United Kingdom"
861+msgstr ""
862+
863+#: plugins/Wizard/LocalePlugin.cpp:214
864+msgid "Luxembourg"
865+msgstr ""
866+
867+#: plugins/Wizard/LocalePlugin.cpp:215
868+msgid "Malta"
869+msgstr ""
870+
871+#: plugins/Wizard/LocalePlugin.cpp:216
872+msgid "Aland Islands"
873+msgstr ""
874+
875+#: plugins/Wizard/LocalePlugin.cpp:217
876+msgid "Belarus"
877+msgstr ""
878+
879+#: plugins/Wizard/LocalePlugin.cpp:218
880+msgid "Monaco"
881+msgstr ""
882+
883+#: plugins/Wizard/LocalePlugin.cpp:219
884+msgid "Norway"
885+msgstr ""
886+
887+#: plugins/Wizard/LocalePlugin.cpp:220
888+msgid "France"
889+msgstr ""
890+
891+#: plugins/Wizard/LocalePlugin.cpp:221
892+msgid "Montenegro"
893+msgstr ""
894+
895+#: plugins/Wizard/LocalePlugin.cpp:222
896+msgid "Czech Republic"
897+msgstr ""
898+
899+#: plugins/Wizard/LocalePlugin.cpp:223
900+msgid "Latvia"
901+msgstr ""
902+
903+#: plugins/Wizard/LocalePlugin.cpp:224
904+msgid "Italy"
905+msgstr ""
906+
907+#: plugins/Wizard/LocalePlugin.cpp:225
908+msgid "San Marino"
909+msgstr ""
910+
911+#: plugins/Wizard/LocalePlugin.cpp:226
912+msgid "Bosnia And Herzegowina"
913+msgstr ""
914+
915+#: plugins/Wizard/LocalePlugin.cpp:227
916+msgid "Macedonia"
917+msgstr ""
918+
919+#: plugins/Wizard/LocalePlugin.cpp:228
920+msgid "Bulgaria"
921+msgstr ""
922+
923+#: plugins/Wizard/LocalePlugin.cpp:229
924+msgid "Sweden"
925+msgstr ""
926+
927+#: plugins/Wizard/LocalePlugin.cpp:230
928+msgid "Estonia"
929+msgstr ""
930+
931+#: plugins/Wizard/LocalePlugin.cpp:231
932+msgid "Albania"
933+msgstr ""
934+
935+#: plugins/Wizard/LocalePlugin.cpp:232
936+msgid "Liechtenstein"
937+msgstr ""
938+
939+#: plugins/Wizard/LocalePlugin.cpp:233
940+msgid "Vatican City State"
941+msgstr ""
942+
943+#: plugins/Wizard/LocalePlugin.cpp:234
944+msgid "Austria"
945+msgstr ""
946+
947+#: plugins/Wizard/LocalePlugin.cpp:235
948+msgid "Lithuania"
949+msgstr ""
950+
951+#: plugins/Wizard/LocalePlugin.cpp:236
952+msgid "Poland"
953+msgstr ""
954+
955+#: plugins/Wizard/LocalePlugin.cpp:237
956+msgid "Croatia"
957+msgstr ""
958+
959+#: plugins/Wizard/LocalePlugin.cpp:238
960+msgid "Switzerland"
961+msgstr ""
962+
963+#: plugins/Wizard/LocalePlugin.cpp:239
964+msgid "Madagascar"
965+msgstr ""
966+
967+#: plugins/Wizard/LocalePlugin.cpp:240
968+msgid "British Indian Ocean Territory"
969+msgstr ""
970+
971+#: plugins/Wizard/LocalePlugin.cpp:241
972+msgid "ChristmasIsland"
973+msgstr ""
974+
975+#: plugins/Wizard/LocalePlugin.cpp:242
976+msgid "CocosIslands"
977+msgstr ""
978+
979+#: plugins/Wizard/LocalePlugin.cpp:243
980+msgid "Comoros"
981+msgstr ""
982+
983+#: plugins/Wizard/LocalePlugin.cpp:244
984+msgid "French Southern Territories"
985+msgstr ""
986+
987+#: plugins/Wizard/LocalePlugin.cpp:245
988+msgid "Seychelles"
989+msgstr ""
990+
991+#: plugins/Wizard/LocalePlugin.cpp:246
992+msgid "Maldives"
993+msgstr ""
994+
995+#: plugins/Wizard/LocalePlugin.cpp:247
996+msgid "Mauritius"
997+msgstr ""
998+
999+#: plugins/Wizard/LocalePlugin.cpp:248
1000+msgid "Mayotte"
1001+msgstr ""
1002+
1003+#: plugins/Wizard/LocalePlugin.cpp:249
1004+msgid "Reunion"
1005+msgstr ""
1006+
1007+#: plugins/Wizard/LocalePlugin.cpp:250
1008+msgid "Samoa"
1009+msgstr ""
1010+
1011+#: plugins/Wizard/LocalePlugin.cpp:251
1012+msgid "New Zealand"
1013+msgstr ""
1014+
1015+#: plugins/Wizard/LocalePlugin.cpp:252
1016+msgid "Micronesia"
1017+msgstr ""
1018+
1019+#: plugins/Wizard/LocalePlugin.cpp:253
1020+msgid "Vanuatu"
1021+msgstr ""
1022+
1023+#: plugins/Wizard/LocalePlugin.cpp:254
1024+msgid "Kiribati"
1025+msgstr ""
1026+
1027+#: plugins/Wizard/LocalePlugin.cpp:255
1028+msgid "Tokelau"
1029+msgstr ""
1030+
1031+#: plugins/Wizard/LocalePlugin.cpp:256
1032+msgid "Fiji"
1033+msgstr ""
1034+
1035+#: plugins/Wizard/LocalePlugin.cpp:257
1036+msgid "Tuvalu"
1037+msgstr ""
1038+
1039+#: plugins/Wizard/LocalePlugin.cpp:258
1040+msgid "French Polynesia"
1041+msgstr ""
1042+
1043+#: plugins/Wizard/LocalePlugin.cpp:259
1044+msgid "Solomon Islands"
1045+msgstr ""
1046+
1047+#: plugins/Wizard/LocalePlugin.cpp:260
1048+msgid "Guam"
1049+msgstr ""
1050+
1051+#: plugins/Wizard/LocalePlugin.cpp:261
1052+msgid "United States Minor Outlying Islands"
1053+msgstr ""
1054+
1055+#: plugins/Wizard/LocalePlugin.cpp:262
1056+msgid "Marshall Islands"
1057+msgstr ""
1058+
1059+#: plugins/Wizard/LocalePlugin.cpp:263
1060+msgid "Nauru"
1061+msgstr ""
1062+
1063+#: plugins/Wizard/LocalePlugin.cpp:264
1064+msgid "Niue"
1065+msgstr ""
1066+
1067+#: plugins/Wizard/LocalePlugin.cpp:265
1068+msgid "Norfolk Island"
1069+msgstr ""
1070+
1071+#: plugins/Wizard/LocalePlugin.cpp:266
1072+msgid "New Caledonia"
1073+msgstr ""
1074+
1075+#: plugins/Wizard/LocalePlugin.cpp:267
1076+msgid "American Samoa"
1077+msgstr ""
1078+
1079+#: plugins/Wizard/LocalePlugin.cpp:268
1080+msgid "Palau"
1081+msgstr ""
1082+
1083+#: plugins/Wizard/LocalePlugin.cpp:269
1084+msgid "Pitcairn"
1085+msgstr ""
1086+
1087+#: plugins/Wizard/LocalePlugin.cpp:270
1088+msgid "Papua New Guinea"
1089+msgstr ""
1090+
1091+#: plugins/Wizard/LocalePlugin.cpp:271
1092+msgid "Cook Islands"
1093+msgstr ""
1094+
1095+#: plugins/Wizard/LocalePlugin.cpp:272
1096+msgid "Northern Mariana Islands"
1097+msgstr ""
1098+
1099+#: plugins/Wizard/LocalePlugin.cpp:273
1100+msgid "Tonga"
1101+msgstr ""
1102+
1103+#: plugins/Wizard/LocalePlugin.cpp:274
1104+msgid "Kosovo"
1105+msgstr ""
1106+
1107+#: plugins/Wizard/LocalePlugin.cpp:275
1108+msgid "Wallis And Futuna Islands"
1109+msgstr ""
1181110
1191111#: qml/Components/DelayedLockscreen.qml:49
1201112msgid "Device Locked"
121−msgstr "Eszköz lezárva"
1113+msgstr "Az eszköz zárolva"
1221114
1231115#: qml/Components/DelayedLockscreen.qml:64
1241116msgid "You have been locked out due to too many failed passphrase attempts."
@@ -135,72 +1127,75 @@ msgid_plural "Please wait %1 minutes and then try again…"
1351127msgstr[0] "Várjon %1 percet és próbálja újra…"
1361128msgstr[1] "Várjon %1 percet és próbálja újra…"
1371129
138−#: qml/Components/Dialogs.qml:112
1130+#: qml/Components/Dialogs.qml:115
1391131msgctxt "Title: Lock/Log out dialog"
1401132msgid "Log out"
1411133msgstr "Kijelentkezés"
1421134
143−#: qml/Components/Dialogs.qml:113
1135+#: qml/Components/Dialogs.qml:116
1441136msgid "Are you sure you want to log out?"
1451137msgstr "Biztos benne, hogy kijelentkezik?"
1461138
147−#: qml/Components/Dialogs.qml:115
1139+#: qml/Components/Dialogs.qml:118
1481140msgctxt "Button: Lock the system"
1491141msgid "Lock"
1501142msgstr "Zárolás"
1511143
152−#: qml/Components/Dialogs.qml:122
1144+#: qml/Components/Dialogs.qml:125
1531145msgctxt "Button: Log out from the system"
1541146msgid "Log Out"
1551147msgstr "Kijelentkezés"
1561148
157−#: qml/Components/Dialogs.qml:129 qml/Components/Dialogs.qml:162
158−#: qml/Components/Dialogs.qml:221
1149+#: qml/Components/Dialogs.qml:132 qml/Components/Dialogs.qml:165
1150+#: qml/Components/Dialogs.qml:224 qml/Wizard/Pages/passcode-confirm.qml:32
1151+#: qml/Wizard/Pages/passcode-set.qml:32 qml/Wizard/Pages/password-set.qml:137
1152+#: qml/Wizard/Pages/uaccount-signin.qml:26
1153+#: qml/Wizard/Pages/60-uaccount-signup.qml:29
1591154msgid "Cancel"
1601155msgstr "Mégse"
1611156
162−#: qml/Components/Dialogs.qml:141
1157+#: qml/Components/Dialogs.qml:144
1631158msgctxt "Title: Reboot/Shut down dialog"
1641159msgid "Shut down"
1651160msgstr "Leállítás"
1661161
167−#: qml/Components/Dialogs.qml:142
1162+#: qml/Components/Dialogs.qml:145
1681163msgid "Are you sure you want to shut down?"
1691164msgstr "Biztosan le szeretné állítani?"
1701165
171−#: qml/Components/Dialogs.qml:144
1166+#: qml/Components/Dialogs.qml:147
1721167msgctxt "Button: Reboot the system"
1731168msgid "Reboot"
1741169msgstr "Újraindítás"
1751170
176−#: qml/Components/Dialogs.qml:153
1171+#: qml/Components/Dialogs.qml:156
1771172msgctxt "Button: Shut down the system"
1781173msgid "Shut down"
1791174msgstr "Leállítás"
1801175
181−#: qml/Components/Dialogs.qml:175
1176+#: qml/Components/Dialogs.qml:178
1821177msgctxt "Title: Reboot dialog"
1831178msgid "Reboot"
1841179msgstr "Újraindítás"
1851180
186−#: qml/Components/Dialogs.qml:176
1181+#: qml/Components/Dialogs.qml:179
1871182msgid "Are you sure you want to reboot?"
1881183msgstr "Biztosan újra szeretné indítani?"
1891184
190−#: qml/Components/Dialogs.qml:178
1185+#: qml/Components/Dialogs.qml:181
1911186msgid "No"
1921187msgstr "Nem"
1931188
194−#: qml/Components/Dialogs.qml:185
1189+#: qml/Components/Dialogs.qml:188
1951190msgid "Yes"
1961191msgstr "Igen"
1971192
198−#: qml/Components/Dialogs.qml:200
1193+#: qml/Components/Dialogs.qml:203
1991194msgctxt "Title: Power off/Restart dialog"
2001195msgid "Power"
2011196msgstr "Menü"
2021197
203−#: qml/Components/Dialogs.qml:201
1198+#: qml/Components/Dialogs.qml:204
2041199msgid ""
2051200"Are you sure you would like\n"
2061201"to power off?"
@@ -208,12 +1203,12 @@ msgstr ""
2081203"Biztos benne, hogy ki\n"
2091204"szeretné kapcsolni?"
2101205
211−#: qml/Components/Dialogs.qml:203
1206+#: qml/Components/Dialogs.qml:206
2121207msgctxt "Button: Power off the system"
2131208msgid "Power off"
2141209msgstr "Kikapcsolás"
2151210
216−#: qml/Components/Dialogs.qml:212
1211+#: qml/Components/Dialogs.qml:215
2171212msgctxt "Button: Restart the system"
2181213msgid "Restart"
2191214msgstr "Újraindítás"
@@ -226,7 +1221,7 @@ msgstr "Vissza a híváshoz"
2261221msgid "Emergency Call"
2271222msgstr "Segélyhívás"
2281223
229−#: qml/Components/Lockscreen.qml:277
1224+#: qml/Components/Lockscreen.qml:277 qml/Wizard/Pages/password-set.qml:159
2301225msgid "OK"
2311226msgstr "OK"
2321227
@@ -274,8 +1269,9 @@ msgstr "Több…"
2741269msgid "Less..."
2751270msgstr "Kevesebb…"
2761271
277−#: qml/Dash/Previews/PreviewCommentInput.qml:61
278−#: qml/Dash/Previews/PreviewRatingInput.qml:169
1272+#: qml/Dash/Previews/PreviewCommentInput.qml:68
1273+#: qml/Dash/Previews/PreviewRatingInput.qml:174
1274+#: qml/Panel/Indicators/MessageMenuItemFactory.qml:205
2791275msgid "Send"
2801276msgstr "Küldés"
2811277
@@ -323,11 +1319,11 @@ msgstr "Újra"
3231319msgid "Tap to unlock"
3241320msgstr "Koppintson a feloldáshoz"
3251321
326−#: qml/Greeter/NarrowView.qml:54 qml/Wizard/Pages/passwd-confirm.qml:53
1322+#: qml/Greeter/NarrowView.qml:54
3271323msgid "Sorry, incorrect passphrase."
3281324msgstr "Elnézést, helytelen jelmondat."
3291325
330−#: qml/Greeter/NarrowView.qml:55 qml/Wizard/Pages/passwd-confirm.qml:54
1326+#: qml/Greeter/NarrowView.qml:55
3311327msgid "Sorry, incorrect passcode."
3321328msgstr "Elnézést, helytelen jelkód."
3331329
@@ -356,7 +1352,7 @@ msgstr ""
3561352msgid "Enter %1"
3571353msgstr "%1 megadása"
3581354
359−#: qml/Greeter/NarrowView.qml:117 qml/Wizard/Pages/passwd-set.qml:60
1355+#: qml/Greeter/NarrowView.qml:117
3601356msgid "Enter passphrase"
3611357msgstr "Jelmondat megadása"
3621358
@@ -394,62 +1390,62 @@ msgstr "Ide koppintva visszatérhet a híváshoz"
3941390msgid "Conference"
3951391msgstr "Konferencia"
3961392
397−#: qml/Panel/Indicators/MenuItemFactory.qml:674
1393+#: qml/Panel/Indicators/MenuItemFactory.qml:639
3981394msgid "Nothing is playing"
3991395msgstr "Nincs lejátszás"
4001396
401−#: qml/Panel/Indicators/MenuItemFactory.qml:803
1397+#: qml/Panel/Indicators/MenuItemFactory.qml:768
4021398#, qt-format
4031399msgid "%1 hour"
4041400msgid_plural "%1 hours"
4051401msgstr[0] "%1 óra"
4061402msgstr[1] "%1 óra"
4071403
408−#: qml/Panel/Indicators/MenuItemFactory.qml:807
1404+#: qml/Panel/Indicators/MenuItemFactory.qml:772
4091405#, qt-format
4101406msgid "%1 minute"
4111407msgid_plural "%1 minutes"
4121408msgstr[0] "%1 perc"
4131409msgstr[1] "%1 perc"
4141410
415−#: qml/Panel/Indicators/MenuItemFactory.qml:812
1411+#: qml/Panel/Indicators/MenuItemFactory.qml:777
4161412#, qt-format
4171413msgid "%1 second"
4181414msgid_plural "%1 seconds"
4191415msgstr[0] "%1 másodperc"
4201416msgstr[1] "%1 másodperc"
4211417
422−#: qml/Panel/Indicators/MenuItemFactory.qml:815
1418+#: qml/Panel/Indicators/MenuItemFactory.qml:780
4231419msgid "0 seconds"
4241420msgstr "0 másodperc"
4251421
4261422#. Translators: String like "1 hour, 2 minutes, 3 seconds remaining"
427−#: qml/Panel/Indicators/MenuItemFactory.qml:817
1423+#: qml/Panel/Indicators/MenuItemFactory.qml:782
4281424#, qt-format
4291425msgid "%1 remaining"
4301426msgstr "%1 van hátra"
4311427
432−#: qml/Panel/Indicators/MenuItemFactory.qml:823
1428+#: qml/Panel/Indicators/MenuItemFactory.qml:788
4331429msgid "In queue…"
4341430msgstr "Sorban…"
4351431
436−#: qml/Panel/Indicators/MenuItemFactory.qml:827
1432+#: qml/Panel/Indicators/MenuItemFactory.qml:792
4371433msgid "Downloading"
4381434msgstr "Letöltés"
4391435
440−#: qml/Panel/Indicators/MenuItemFactory.qml:829
1436+#: qml/Panel/Indicators/MenuItemFactory.qml:794
4411437msgid "Paused, tap to resume"
4421438msgstr "Szüneteltetve, koppintson a folytatáshoz"
4431439
444−#: qml/Panel/Indicators/MenuItemFactory.qml:831
1440+#: qml/Panel/Indicators/MenuItemFactory.qml:796
4451441msgid "Canceled"
4461442msgstr "Megszakítva"
4471443
448−#: qml/Panel/Indicators/MenuItemFactory.qml:833
1444+#: qml/Panel/Indicators/MenuItemFactory.qml:798
4491445msgid "Finished"
4501446msgstr "Befejeződött"
4511447
452−#: qml/Panel/Indicators/MenuItemFactory.qml:835
1448+#: qml/Panel/Indicators/MenuItemFactory.qml:800
4531449msgid "Failed, tap to retry"
4541450msgstr "Sikertelen, koppintson az újrapróbáláshoz"
4551451
@@ -523,137 +1519,191 @@ msgstr "Húzza az ujját hosszan a kijelző jobboldalától indulva."
5231519msgid "View all your running tasks."
5241520msgstr "A futó alkalmazások itt tekinthetőek meg."
5251521
526−#: qml/Wizard/Page.qml:89
1522+#: qml/Wizard/Page.qml:51
5271523msgctxt "Button: Go back one page in the Wizard"
5281524msgid "Back"
5291525msgstr "Vissza"
5301526
531−#: qml/Wizard/Pages/here-terms.qml:27
1527+#: qml/Wizard/Pages/here-terms.qml:25
5321528msgid "Terms & Conditions"
5331529msgstr "Felhasználási feltételek"
5341530
535−#: qml/Wizard/Pages/passwd-confirm.qml:49
536−msgid "Confirm passphrase"
537−msgstr "Jelmondat megerősítése"
1531+#: qml/Wizard/Pages/here-terms.qml:70
1532+msgid "Your device uses positioning technologies provided by HERE."
1533+msgstr ""
1534+
1535+#: qml/Wizard/Pages/here-terms.qml:81
1536+msgid ""
1537+"To provide you with positioning services and to improve their quality, HERE "
1538+"collects "
1539+msgstr ""
1540+
1541+#: qml/Wizard/Pages/here-terms.qml:94
1542+msgid "The information collected is used to analyze the service and to "
1543+msgstr ""
1544+
1545+#: qml/Wizard/Pages/here-terms.qml:107
1546+msgid "By continuing, you agree to the HERE Platform Service Terms:"
1547+msgstr ""
1548+
1549+#: qml/Wizard/Pages/here-terms.qml:124
1550+msgid "and Privacy Policy:"
1551+msgstr ""
5381552
539−#: qml/Wizard/Pages/passwd-confirm.qml:50
1553+#: qml/Wizard/Pages/passcode-confirm.qml:47
5401554msgid "Confirm passcode"
5411555msgstr "Jelkód megerősítése"
5421556
543−#: qml/Wizard/Pages/passwd-confirm.qml:53
544−#: qml/Wizard/Pages/passwd-confirm.qml:54
545−msgid "Please try again."
546−msgstr "Próbálja újra."
1557+#: qml/Wizard/Pages/passcode-confirm.qml:49
1558+msgid "Incorrect passcode."
1559+msgstr ""
1560+
1561+#: qml/Wizard/Pages/passcode-confirm.qml:49
1562+msgid "Please re-enter."
1563+msgstr ""
1564+
1565+#: qml/Wizard/Pages/passcode-set.qml:58
1566+msgid "Choose passcode"
1567+msgstr ""
1568+
1569+#: qml/Wizard/Pages/passcode-set.qml:66
1570+msgid "Passcode must be 4 characters long"
1571+msgstr ""
1572+
1573+#: qml/Wizard/Pages/password-set.qml:32
1574+msgid "Confirm Password"
1575+msgstr ""
5471576
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 "Folytatás"
1577+#: qml/Wizard/Pages/password-set.qml:32
1578+msgid "Choose Password"
1579+msgstr ""
1580+
1581+#: qml/Wizard/Pages/password-set.qml:72
1582+msgid "Enter at least 6 characters"
1583+msgstr ""
1584+
1585+#: qml/Wizard/Pages/password-set.qml:108
1586+msgid "Passwords do not match"
1587+msgstr ""
5541588
555−#: qml/Wizard/Pages/passwd-set.qml:61
556−msgid "Choose your passcode"
557−msgstr "Jelkód kiválasztása"
1589+#: qml/Wizard/Pages/password-set.qml:110
1590+msgid "Passwords match"
1591+msgstr ""
5581592
559−#: qml/Wizard/Pages/passwd-set.qml:68
560−msgid "Passphrase must be 4 characters long"
561−msgstr "A jelmondat legalább 4 karakter hosszú legyen"
1593+#: qml/Wizard/Pages/sim.qml:27
1594+msgid "No SIM card installed"
1595+msgstr ""
5621596
563−#: qml/Wizard/Pages/10-welcome.qml:27
564−msgid "Hi!"
565−msgstr "Üdvözöljük!"
1597+#: qml/Wizard/Pages/sim.qml:58
1598+msgid "SIM card added"
1599+msgstr ""
5661600
567−#: qml/Wizard/Pages/10-welcome.qml:44
568−msgid "Welcome to your Ubuntu phone."
569−msgstr "Köszöntjük az Ubuntu telefonos változatában."
1601+#: qml/Wizard/Pages/sim.qml:59
1602+msgid "You must restart the device to access the mobile network."
1603+msgstr ""
5701604
571−#: qml/Wizard/Pages/10-welcome.qml:52
572−msgid "Let’s get started."
573−msgstr "Kezdjünk is bele."
1605+#: qml/Wizard/Pages/sim.qml:63
1606+msgid "Restart"
1607+msgstr "Újraindítás"
5741608
575−#: qml/Wizard/Pages/20-sim.qml:25
576−msgid "Add a SIM card and restart your device"
577−msgstr "Helyezzen be egy SIM kártyát és indítsa újra az eszközét"
1609+#: qml/Wizard/Pages/sim.qml:82
1610+msgid "You won’t be able to make calls or use text messaging without a SIM."
1611+msgstr ""
5781612
579−#: qml/Wizard/Pages/20-sim.qml:59
580−msgid "Without it, you won’t be able to make calls or use text messaging."
1613+#: qml/Wizard/Pages/sim.qml:93
1614+msgid "To proceed with no SIM tap <em>Skip</em>."
5811615msgstr ""
582−"Anélkül nem indíthat vagy fogadhat hívásokat és nem küldhet vagy fogadhat "
583−"üzeneteket."
5841616
585−#: qml/Wizard/Pages/20-sim.qml:73 qml/Wizard/Pages/40-wifi.qml:215
1617+#: qml/Wizard/Pages/sim.qml:103 qml/Wizard/Pages/uaccount.qml:116
1618+#: qml/Wizard/Pages/30-wifi.qml:204
5861619msgid "Skip"
5871620msgstr "Kihagyás"
5881621
589−#: qml/Wizard/Pages/30-passwd-type.qml:39
590−msgid "Lock security"
591−msgstr "Képernyőzárolás"
1622+#: qml/Wizard/Pages/uaccount.qml:24
1623+msgid "Ubuntu Account"
1624+msgstr ""
5921625
593−#: qml/Wizard/Pages/30-passwd-type.qml:74
594−msgid "Please select how you’d like to unlock your phone."
595−msgstr "Válassza ki, hogy milyen módon kívánja feloldani a telefonját."
1626+#: qml/Wizard/Pages/uaccount.qml:37
1627+msgid "Secure my device using my Ubuntu account"
1628+msgstr ""
5961629
597−#: qml/Wizard/Pages/30-passwd-type.qml:97
598−msgctxt "Label: Type of security method"
599−msgid "Swipe"
600−msgstr "Csúsztatás"
1630+#: qml/Wizard/Pages/uaccount.qml:52 qml/Wizard/Pages/uaccount-signin.qml:24
1631+#: qml/Wizard/Pages/uaccount-signin.qml:87
1632+msgid "Sign In"
1633+msgstr ""
6011634
602−#: qml/Wizard/Pages/30-passwd-type.qml:98
603−msgctxt "Label: Description of security method"
604−msgid "No security"
605−msgstr "Nem biztonságos"
1635+#: qml/Wizard/Pages/uaccount.qml:67 qml/Wizard/Pages/60-uaccount-signup.qml:26
1636+msgid "Create Account"
1637+msgstr ""
6061638
607−#: qml/Wizard/Pages/30-passwd-type.qml:100
608−msgctxt "Label: Type of security method"
609−msgid "Passcode"
610−msgstr "Jelkód"
1639+#: qml/Wizard/Pages/uaccount.qml:84 qml/Wizard/Pages/75-report-check.qml:63
1640+msgid "Improve system performance by sending us crashes and error reports."
1641+msgstr ""
1642+
1643+#: qml/Wizard/Pages/uaccount.qml:98 qml/Wizard/Pages/75-report-check.qml:64
1644+msgid "Privacy policy"
1645+msgstr ""
6111646
612−#: qml/Wizard/Pages/30-passwd-type.qml:101
613−msgctxt "Label: Description of security method"
614−msgid "4 digits only"
615−msgstr "4 számjegy"
1647+#: qml/Wizard/Pages/uaccount-signin.qml:42
1648+#: qml/Wizard/Pages/60-uaccount-signup.qml:55
1649+msgid "Email:"
1650+msgstr ""
6161651
617−#: qml/Wizard/Pages/30-passwd-type.qml:103
618−msgctxt "Label: Type of security method"
619−msgid "Passphrase"
620−msgstr "Jelmondat"
1652+#: qml/Wizard/Pages/uaccount-signin.qml:67
1653+#: qml/Wizard/Pages/60-uaccount-signup.qml:103
1654+msgid "Password:"
1655+msgstr ""
1656+
1657+#: qml/Wizard/Pages/10-language.qml:26
1658+msgid "Language"
1659+msgstr ""
1660+
1661+#: qml/Wizard/Pages/10-language.qml:177 qml/Wizard/Pages/30-wifi.qml:204
1662+#: qml/Wizard/Pages/40-location.qml:248 qml/Wizard/Pages/50-timezone.qml:150
1663+#: qml/Wizard/Pages/70-passwd-type.qml:159
1664+#: qml/Wizard/Pages/75-report-check.qml:83
1665+msgid "Next"
1666+msgstr ""
6211667
622−#: qml/Wizard/Pages/30-passwd-type.qml:104
623−msgctxt "Label: Description of security method"
624−msgid "Numbers and letters"
625−msgstr "Betűk és számok"
1668+#: qml/Wizard/Pages/20-finished.qml:86 qml/Wizard/Pages/80-finished.qml:86
1669+msgid "Welcome to Ubuntu"
1670+msgstr ""
1671+
1672+#: qml/Wizard/Pages/20-finished.qml:96 qml/Wizard/Pages/80-finished.qml:96
1673+msgid "You are ready to use your device now"
1674+msgstr ""
1675+
1676+#: qml/Wizard/Pages/20-finished.qml:113 qml/Wizard/Pages/80-finished.qml:113
1677+msgid "Get Started"
1678+msgstr ""
6261679
627−#: qml/Wizard/Pages/40-wifi.qml:29
1680+#: qml/Wizard/Pages/30-wifi.qml:28
6281681msgid "Connect to Wi‑Fi"
6291682msgstr "Csatlakozás Wi-Fi hálózathoz"
6301683
631−#: qml/Wizard/Pages/40-wifi.qml:168
632−msgid "Available networks…"
633−msgstr "Elérhető hálózatok…"
634−
635−#: qml/Wizard/Pages/40-wifi.qml:169
636−msgid "No available networks."
637−msgstr "Nincsenek elérhető hálózatok."
1684+#: qml/Wizard/Pages/30-wifi.qml:125
1685+msgid "Connected"
1686+msgstr ""
6381687
639−#: qml/Wizard/Pages/50-location.qml:27
640−msgid "Location"
641−msgstr "Tartózkodási hely"
1688+#: qml/Wizard/Pages/30-wifi.qml:162
1689+msgid "Available Wi-Fi networks"
1690+msgstr ""
6421691
643−#: qml/Wizard/Pages/50-location.qml:62
644−msgid "Let the phone detect your location:"
645−msgstr "A telefon megpróbálja megállapítani az Ön tartózkodási helyét:"
1692+#: qml/Wizard/Pages/30-wifi.qml:163
1693+msgid "No available Wi-Fi networks"
1694+msgstr ""
6461695
647−#: qml/Wizard/Pages/50-location.qml:69
648−msgid "Using GPS only (less accurate)"
649−msgstr "Csak GPS használata (kevésbé pontos)"
1696+#: qml/Wizard/Pages/40-location.qml:27
1697+msgid "Location Services"
1698+msgstr ""
6501699
651−#: qml/Wizard/Pages/50-location.qml:86
652−msgid "Using GPS, anonymized Wi-Fi and cellular network info (recommended)"
653−msgstr "GPS és névtelen Wi-Fi és mobilhálózati adatok (ajánlott)"
1700+#: qml/Wizard/Pages/40-location.qml:71
1701+msgid ""
1702+"Use GPS, Wi-Fi hotspots and mobile network anonymously to detect location "
1703+"(recommended)"
1704+msgstr ""
6541705
655−#. Translators: HERE is a trademark for Nokia's location service, you probably shouldn't translate it
656−#: qml/Wizard/Pages/50-location.qml:103
1706+#: qml/Wizard/Pages/40-location.qml:102
6571707msgid ""
6581708"By selecting this option you agree to the Nokia HERE <a href='#'>terms and "
6591709"conditions</a>."
@@ -661,61 +1711,214 @@ msgstr ""
6611711"A lehetőség kiválasztásával elfogadja a Nokia HERE <a href='#'>felhasználási "
6621712"feltételeit</a>."
6631713
664−#: qml/Wizard/Pages/50-location.qml:112
665−msgid "Not at all"
666−msgstr "Ne tegye"
1714+#: qml/Wizard/Pages/40-location.qml:137
1715+msgid "GPS only"
1716+msgstr ""
6671717
668−#: qml/Wizard/Pages/50-location.qml:124
669−msgid "You can change your mind later in <b>System Settings</b>."
670−msgstr "Ezt később a <b>Rendszerbeállítások</b> alatt módosíthatja."
1718+#: qml/Wizard/Pages/40-location.qml:190
1719+msgid "Don't use my location"
1720+msgstr ""
6711721
672−#: qml/Wizard/Pages/60-reporting.qml:24
673−msgid "Improving your experience"
674−msgstr "Javítson az élményen"
1722+#: qml/Wizard/Pages/40-location.qml:237
1723+msgid "You can change it later in <em>System Settings</em>."
1724+msgstr ""
6751725
676−#: qml/Wizard/Pages/60-reporting.qml:36
677−msgid ""
678−"Your phone is set up to automatically report errors to Canonical and its "
679−"partners, the makers of the operating system."
1726+#: qml/Wizard/Pages/50-timezone.qml:27
1727+msgid "Time Zone"
6801728msgstr ""
681−"A telefonja automatikus hibajelentéseket küld az operációs rendszert készítő "
682−"Canonical, és annak partnerei felé."
6831729
684−#: qml/Wizard/Pages/60-reporting.qml:43
685−msgid ""
686−"This can be disabled in <b>System Settings</b> under <b>Security &amp; "
687−"Privacy</b>"
1730+#: qml/Wizard/Pages/50-timezone.qml:120
1731+msgid "Enter your city"
6881732msgstr ""
689−"Ezt kikapcsolhatja a <b>Rendszerbeállítások</b> alatt található <b>Biztonság "
690−"és adatvédelem</b> menüpontnál"
6911733
692−#: qml/Wizard/Pages/80-finished.qml:24
693−msgid "All done"
694−msgstr "Készen van"
1734+#: qml/Wizard/Pages/60-uaccount-signup.qml:26
1735+msgid "Terms And Conditions"
1736+msgstr ""
6951737
696−#: qml/Wizard/Pages/80-finished.qml:39
697−msgid "Nice work!"
698−msgstr "Szép munka!"
1738+#: qml/Wizard/Pages/60-uaccount-signup.qml:29
1739+msgid "Back"
1740+msgstr ""
6991741
700−#: qml/Wizard/Pages/80-finished.qml:46
701−msgid "Your phone is now ready to use."
702−msgstr "A telefonja készen áll a használatra."
1742+#: qml/Wizard/Pages/60-uaccount-signup.qml:81
1743+msgid "Your name:"
1744+msgstr ""
7031745
704−#: qml/Wizard/Pages/80-finished.qml:53
705−msgid "Finish"
706−msgstr "Befejezés"
1746+#: qml/Wizard/Pages/60-uaccount-signup.qml:136
1747+msgid "Repeat password:"
1748+msgstr ""
7071749
708−#. Translators: This is the arrow for "Back" buttons
709−#: qml/Wizard/StackButton.qml:39
710−#, qt-format
711−msgid "〈 %1"
712−msgstr "〈 %1"
1750+#: qml/Wizard/Pages/60-uaccount-signup.qml:204
1751+msgid "Sign Up"
1752+msgstr ""
7131753
714−#. Translators: This is the arrow for "Forward" buttons
715−#: qml/Wizard/StackButton.qml:42
716−#, qt-format
717−msgid "%1 〉"
718−msgstr "%1 〉"
1754+#: qml/Wizard/Pages/70-passwd-type.qml:38
1755+msgid "Lock Screen"
1756+msgstr ""
1757+
1758+#: qml/Wizard/Pages/70-passwd-type.qml:68
1759+msgid "Choose lock screen security"
1760+msgstr ""
1761+
1762+#: qml/Wizard/Pages/70-passwd-type.qml:115
1763+msgctxt "Label: Type of security method"
1764+msgid "Device account password"
1765+msgstr ""
1766+
1767+#: qml/Wizard/Pages/70-passwd-type.qml:117
1768+msgctxt "Label: Type of security method"
1769+msgid "New password"
1770+msgstr ""
1771+
1772+#: qml/Wizard/Pages/70-passwd-type.qml:119
1773+msgctxt "Label: Type of security method"
1774+msgid "Passcode"
1775+msgstr "Jelkód"
1776+
1777+#: qml/Wizard/Pages/70-passwd-type.qml:121
1778+msgctxt "Label: Type of security method"
1779+msgid "Swipe"
1780+msgstr "Csúsztatás"
1781+
1782+#: qml/Wizard/Pages/75-report-check.qml:27
1783+msgid "Privacy Policy"
1784+msgstr ""
1785+
1786+#: qml/Wizard/Pages/75-report-check.qml:27
1787+msgid "Help Us Improve"
1788+msgstr ""
1789+
1790+#: qml/Wizard/PasswordMeter.qml:84
1791+msgid "Password too short"
1792+msgstr ""
1793+
1794+#: qml/Wizard/PasswordMeter.qml:86
1795+msgid "Strong password"
1796+msgstr ""
1797+
1798+#: qml/Wizard/PasswordMeter.qml:88
1799+msgid "Fair password"
1800+msgstr ""
1801+
1802+#: qml/Wizard/PasswordMeter.qml:90
1803+msgid "Weak password"
1804+msgstr ""
1805+
1806+#: qml/Wizard/PasswordMeter.qml:92
1807+msgid "Very weak password"
1808+msgstr ""
1809+
1810+#~ msgid "Confirm passphrase"
1811+#~ msgstr "Jelmondat megerősítése"
1812+
1813+#~ msgid "Please try again."
1814+#~ msgstr "Próbálja újra."
1815+
1816+#~ msgid "Continue"
1817+#~ msgstr "Folytatás"
1818+
1819+#~ msgid "Choose your passcode"
1820+#~ msgstr "Jelkód megadása"
1821+
1822+#~ msgid "Passphrase must be 4 characters long"
1823+#~ msgstr "A jelmondat legalább 4 karakter hosszú legyen"
1824+
1825+#~ msgid "Hi!"
1826+#~ msgstr "Üdvözöljük!"
1827+
1828+#~ msgid "Welcome to your Ubuntu phone."
1829+#~ msgstr "Köszöntjük az Ubuntu telefonos változatában."
1830+
1831+#~ msgid "Let’s get started."
1832+#~ msgstr "Kezdjünk is bele."
1833+
1834+#~ msgid "Add a SIM card and restart your device"
1835+#~ msgstr "Helyezzen be egy SIM kártyát és indítsa újra az eszközt"
1836+
1837+#~ msgid "Without it, you won’t be able to make calls or use text messaging."
1838+#~ msgstr ""
1839+#~ "Anélkül nem indíthat vagy fogadhat hívásokat, és nem küldhet vagy "
1840+#~ "fogadhat üzeneteket."
1841+
1842+#~ msgid "Lock security"
1843+#~ msgstr "Képernyőzárolás"
1844+
1845+#~ msgid "Please select how you’d like to unlock your phone."
1846+#~ msgstr "Válassza ki, hogy milyen módon kívánja feloldani a telefonját."
1847+
1848+#~ msgctxt "Label: Description of security method"
1849+#~ msgid "No security"
1850+#~ msgstr "Nem biztonságos"
1851+
1852+#~ msgctxt "Label: Description of security method"
1853+#~ msgid "4 digits only"
1854+#~ msgstr "4 számjegy"
1855+
1856+#~ msgctxt "Label: Type of security method"
1857+#~ msgid "Passphrase"
1858+#~ msgstr "Jelmondat"
1859+
1860+#~ msgctxt "Label: Description of security method"
1861+#~ msgid "Numbers and letters"
1862+#~ msgstr "Betűk és számok"
1863+
1864+#~ msgid "Available networks…"
1865+#~ msgstr "Elérhető hálózatok…"
1866+
1867+#~ msgid "No available networks."
1868+#~ msgstr "Nincsenek elérhető hálózatok."
1869+
1870+#~ msgid "Location"
1871+#~ msgstr "Tartózkodási hely"
1872+
1873+#~ msgid "Let the phone detect your location:"
1874+#~ msgstr "A telefon megpróbálja megállapítani az Ön tartózkodási helyét:"
1875+
1876+#~ msgid "Using GPS only (less accurate)"
1877+#~ msgstr "Csak GPS használata (kevésbé pontos)"
1878+
1879+#~ msgid "Using GPS, anonymized Wi-Fi and cellular network info (recommended)"
1880+#~ msgstr "GPS és névtelen Wi-Fi és mobilhálózati adatok (ajánlott)"
1881+
1882+#~ msgid "Not at all"
1883+#~ msgstr "Ne tegye"
1884+
1885+#~ msgid "You can change your mind later in <b>System Settings</b>."
1886+#~ msgstr "Ezt később a <b>Rendszerbeállítások</b> alatt módosíthatja."
1887+
1888+#~ msgid "Improving your experience"
1889+#~ msgstr "Javítson az élményen"
1890+
1891+#~ msgid ""
1892+#~ "Your phone is set up to automatically report errors to Canonical and its "
1893+#~ "partners, the makers of the operating system."
1894+#~ msgstr ""
1895+#~ "A telefonja automatikus hibajelentéseket küld az operációs rendszert "
1896+#~ "készítő Canonical, és annak partnerei felé."
1897+
1898+#~ msgid ""
1899+#~ "This can be disabled in <b>System Settings</b> under <b>Security &amp; "
1900+#~ "Privacy</b>"
1901+#~ msgstr ""
1902+#~ "Ezt kikapcsolhatja a <b>Rendszerbeállítások</b> alatt található "
1903+#~ "<b>Biztonság és adatvédelem</b> menüpontnál"
1904+
1905+#~ msgid "All done"
1906+#~ msgstr "Készen van"
1907+
1908+#~ msgid "Nice work!"
1909+#~ msgstr "Szép munka!"
1910+
1911+#~ msgid "Your phone is now ready to use."
1912+#~ msgstr "A telefonja készen áll a használatra."
1913+
1914+#~ msgid "Finish"
1915+#~ msgstr "Befejezés"
1916+
1917+#~ msgid "〈 %1"
1918+#~ msgstr "〈 %1"
1919+
1920+#~ msgid "%1 〉"
1921+#~ msgstr "%1 〉"
7191922
7201923#~ msgid "Confirm"
7211924#~ msgstr "Megerősítés"
@@ -804,9 +2007,6 @@ msgstr "%1 〉"
8042007#~ msgid "Power"
8052008#~ msgstr "Kikapcsolás"
8062009
807−#~ msgid "Restart"
808−#~ msgstr "Újraindítás"
809−
8102010#~ msgid "Manage Scopes"
8112011#~ msgstr "Lencsék kezelése"
8122012
po/ug.po+57−60
@@ -8,15 +8,15 @@ msgstr ""
88"Project-Id-Version: unity\n"
99"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
1010"POT-Creation-Date: 2015-08-25 14:53+0200\n"
11−"PO-Revision-Date: 2014-10-07 09:00+0000\n"
12−"Last-Translator: Gheyret T.Kenji <Unknown>\n"
11+"PO-Revision-Date: 2015-09-24 05:55+0000\n"
12+"Last-Translator: eltikin <eltikinuyghur@hotmail.com>\n"
1313"Language-Team: Uyghur Computer Science Association <UKIJ@yahoogroups.com>\n"
1414"MIME-Version: 1.0\n"
1515"Content-Type: text/plain; charset=UTF-8\n"
1616"Content-Transfer-Encoding: 8bit\n"
1717"Plural-Forms: nplurals=1; plural=0;\n"
18−"X-Launchpad-Export-Date: 2015-09-19 05:37+0000\n"
19−"X-Generator: Launchpad (build 17746)\n"
18+"X-Launchpad-Export-Date: 2015-09-24 05:56+0000\n"
19+"X-Generator: Launchpad (build 17749)\n"
2020
2121#: plugins/LightDM/Greeter.cpp:112
2222msgid "Password: "
@@ -29,7 +29,7 @@ msgstr "تېزلەتمىنى قوي"
2929
3030#: plugins/Unity/Launcher/launcheritem.cpp:52
3131msgid "Quit"
32−msgstr ""
32+msgstr "چېكىن"
3333
3434#: plugins/Unity/Launcher/launcheritem.cpp:106
3535msgid "Unpin shortcut"
@@ -56,7 +56,7 @@ msgstr ""
5656#. en_US example: "Tomorrow\u2003%l:%M %p" --> "Tomorrow 1:00 PM"
5757#: plugins/Utils/relativetimeformatter.cpp:172
5858msgid "Tomorrow %l:%M %p"
59−msgstr ""
59+msgstr "ئەتە %l:%M %p"
6060
6161#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
6262#. This format string is used for showing, on a 12-hour clock, times that happened in the last week.
@@ -125,7 +125,7 @@ msgstr "خاتا ئىم جۈملىسى كۆپ قېتىم كىرگۈزۈلگەن
125125
126126#: qml/Components/DelayedLockscreen.qml:65
127127msgid "You have been locked out due to too many failed passcode attempts."
128−msgstr "خاتا ئىم كودى(passcode) كۆپ قېتىم كىرگۈزۈلگەنلىكى ئۈچۈن قۇلۇپلاندى."
128+msgstr "ھىساباتىڭز قۇلۇپلاندى.ئىم كىرگۈزۈشتە كۆپ قېتىم خاتالاشتىڭز."
129129
130130#: qml/Components/DelayedLockscreen.qml:74
131131#, qt-format
@@ -136,7 +136,7 @@ msgstr[0] "%1 مىنۇت كۈتۈپ ئاندىن قايتا سىناڭ…"
136136#: qml/Components/Dialogs.qml:112
137137msgctxt "Title: Lock/Log out dialog"
138138msgid "Log out"
139−msgstr ""
139+msgstr "تىزىمدىن چىق"
140140
141141#: qml/Components/Dialogs.qml:113
142142msgid "Are you sure you want to log out?"
@@ -145,22 +145,22 @@ msgstr "راستلا چىقىپ كېتەمسىز؟"
145145#: qml/Components/Dialogs.qml:115
146146msgctxt "Button: Lock the system"
147147msgid "Lock"
148−msgstr ""
148+msgstr "قۇلۇپلا"
149149
150150#: qml/Components/Dialogs.qml:122
151151msgctxt "Button: Log out from the system"
152152msgid "Log Out"
153−msgstr ""
153+msgstr "تىزىمدىن چىق"
154154
155155#: qml/Components/Dialogs.qml:129 qml/Components/Dialogs.qml:162
156156#: qml/Components/Dialogs.qml:221
157157msgid "Cancel"
158−msgstr "ئەمەلدىن قالدۇر"
158+msgstr "بولدىلا"
159159
160160#: qml/Components/Dialogs.qml:141
161161msgctxt "Title: Reboot/Shut down dialog"
162162msgid "Shut down"
163−msgstr ""
163+msgstr "تاقا"
164164
165165#: qml/Components/Dialogs.qml:142
166166msgid "Are you sure you want to shut down?"
@@ -169,17 +169,17 @@ msgstr "راستلا تاقامسىز؟"
169169#: qml/Components/Dialogs.qml:144
170170msgctxt "Button: Reboot the system"
171171msgid "Reboot"
172−msgstr ""
172+msgstr "قايتا قوزغات"
173173
174174#: qml/Components/Dialogs.qml:153
175175msgctxt "Button: Shut down the system"
176176msgid "Shut down"
177−msgstr ""
177+msgstr "تاقا"
178178
179179#: qml/Components/Dialogs.qml:175
180180msgctxt "Title: Reboot dialog"
181181msgid "Reboot"
182−msgstr ""
182+msgstr "قايتا قوزغات"
183183
184184#: qml/Components/Dialogs.qml:176
185185msgid "Are you sure you want to reboot?"
@@ -196,7 +196,7 @@ msgstr "ھەئە"
196196#: qml/Components/Dialogs.qml:200
197197msgctxt "Title: Power off/Restart dialog"
198198msgid "Power"
199−msgstr ""
199+msgstr "توك مەنبە"
200200
201201#: qml/Components/Dialogs.qml:201
202202msgid ""
@@ -209,12 +209,12 @@ msgstr ""
209209#: qml/Components/Dialogs.qml:203
210210msgctxt "Button: Power off the system"
211211msgid "Power off"
212−msgstr ""
212+msgstr "توكنى ئۈز"
213213
214214#: qml/Components/Dialogs.qml:212
215215msgctxt "Button: Restart the system"
216216msgid "Restart"
217−msgstr ""
217+msgstr "قايتا قوزغات"
218218
219219#: qml/Components/Lockscreen.qml:245
220220msgid "Return to Call"
@@ -239,22 +239,22 @@ msgstr "ھەممىنى كۆرۈش…"
239239#: qml/Dash/GenericScopeView.qml:631
240240msgctxt "Label: Hint for dash search line edit"
241241msgid "Search"
242−msgstr ""
242+msgstr "ئىزدە"
243243
244244#: qml/Dash/PageHeader.qml:269
245245msgctxt "Button: Open the Ubuntu Store"
246246msgid "Store"
247−msgstr ""
247+msgstr "ساقلا"
248248
249249#: qml/Dash/PageHeader.qml:276
250250msgctxt "Button: Start a search in the current dash scope"
251251msgid "Search"
252−msgstr ""
252+msgstr "ئىزدە"
253253
254254#: qml/Dash/PageHeader.qml:286
255255msgctxt "Button: Show the current dash scope settings"
256256msgid "Settings"
257−msgstr ""
257+msgstr "تەڭشەك"
258258
259259#: qml/Dash/PageHeader.qml:293
260260msgid "Remove from Favorites"
@@ -299,15 +299,15 @@ msgstr ""
299299
300300#: qml/Dash/ScopesList.qml:67
301301msgid "Manage"
302−msgstr ""
302+msgstr "باشقۇرۇش"
303303
304304#: qml/Dash/ScopesList.qml:113
305305msgid "Home"
306−msgstr ""
306+msgstr "ماكان"
307307
308308#: qml/Dash/ScopesList.qml:114
309309msgid "Also installed"
310−msgstr ""
310+msgstr "قايتىدىن ئورنات"
311311
312312#: qml/Greeter/CoverPage.qml:107
313313msgid "Unlock"
@@ -315,11 +315,11 @@ msgstr "قۇلۇپسىزلا"
315315
316316#: qml/Greeter/LoginList.qml:236
317317msgid "Retry"
318−msgstr ""
318+msgstr "قايتا سىنا"
319319
320320#: qml/Greeter/LoginList.qml:237
321321msgid "Tap to unlock"
322−msgstr ""
322+msgstr "قۇلۇپسىزلا"
323323
324324#: qml/Greeter/NarrowView.qml:54 qml/Wizard/Pages/passwd-confirm.qml:53
325325msgid "Sorry, incorrect passphrase."
@@ -374,7 +374,7 @@ msgstr "كەچۈرۈڭ، ئىم توغرا ئەمەس"
374374#: qml/Greeter/NarrowView.qml:121
375375msgctxt "passphrase"
376376msgid "Please re-enter"
377−msgstr ""
377+msgstr "قايتا كىرگۈزۈڭ"
378378
379379#: qml/Greeter/NarrowView.qml:122
380380msgid "Sorry, incorrect passcode"
@@ -400,32 +400,29 @@ msgstr "ھېچ نېمە قويۇلمايۋاتىدۇ"
400400#, qt-format
401401msgid "%1 hour"
402402msgid_plural "%1 hours"
403−msgstr[0] ""
404−msgstr[1] ""
403+msgstr[0] "%1 سائەت"
405404
406405#: qml/Panel/Indicators/MenuItemFactory.qml:807
407406#, qt-format
408407msgid "%1 minute"
409408msgid_plural "%1 minutes"
410−msgstr[0] ""
411−msgstr[1] ""
409+msgstr[0] "%1 مىنۇت"
412410
413411#: qml/Panel/Indicators/MenuItemFactory.qml:812
414412#, qt-format
415413msgid "%1 second"
416414msgid_plural "%1 seconds"
417−msgstr[0] ""
418−msgstr[1] ""
415+msgstr[0] "%1 سېكۇنت"
419416
420417#: qml/Panel/Indicators/MenuItemFactory.qml:815
421418msgid "0 seconds"
422−msgstr ""
419+msgstr "0 سېكۇنت"
423420
424421#. Translators: String like "1 hour, 2 minutes, 3 seconds remaining"
425422#: qml/Panel/Indicators/MenuItemFactory.qml:817
426423#, qt-format
427424msgid "%1 remaining"
428−msgstr ""
425+msgstr "%1 قالدۇقى"
429426
430427#: qml/Panel/Indicators/MenuItemFactory.qml:823
431428msgid "In queue…"
@@ -454,11 +451,11 @@ msgstr "مەغلۇپ بولدى، چېكىپ قايتا سىناڭ"
454451#: qml/Panel/Indicators/MessageMenuItemFactory.qml:149
455452msgctxt "Label: Hint in message indicator line edit"
456453msgid "Reply"
457−msgstr ""
454+msgstr "جاۋاب قايتۇر"
458455
459456#: qml/Panel/Indicators/MessageMenuItemFactory.qml:204
460457msgid "Call back"
461−msgstr ""
458+msgstr "تىلفۇن ئۇرلىۋاتىدۇ"
462459
463460#: qml/Panel/Indicators/ModemInfoItem.qml:105
464461msgid "Unlock SIM"
@@ -474,28 +471,28 @@ msgstr ""
474471
475472#: qml/Tutorial/TutorialBottomFinish.qml:25
476473msgid "Tap here to finish."
477−msgstr ""
474+msgstr "بۇ يەرنى چېكىپ ئاخىرلاشتۇرۇڭ"
478475
479476#: qml/Tutorial/TutorialBottom.qml:28
480477msgid "Open special menus"
481−msgstr ""
478+msgstr "تىزملىكنى ئاچ"
482479
483480#: qml/Tutorial/TutorialBottom.qml:29
484481msgid "Swipe up from the bottom edge."
485−msgstr ""
482+msgstr "ئاستى تەرەپكە سېرىل"
486483
487484#: qml/Tutorial/TutorialContent.qml:80 qml/Tutorial/TutorialLeftFinish.qml:25
488485#: qml/Tutorial/TutorialRight.qml:144
489486msgid "Tap here to continue."
490−msgstr ""
487+msgstr "داۋاملاشتۇر"
491488
492489#: qml/Tutorial/TutorialLeftFinish.qml:24
493490msgid "These are the shortcuts to favorite apps"
494−msgstr ""
491+msgstr "بۇ سىز ئەڭ ياخشى كۆردىغان دېتاللارتېزلەتمە كۆنۇپكىلار"
495492
496493#: qml/Tutorial/TutorialLeft.qml:26
497494msgid "Open the launcher"
498−msgstr ""
495+msgstr "تارقىتىش ئاپراتنى ئاچ"
499496
500497#: qml/Tutorial/TutorialLeft.qml:27
501498msgid "Short swipe from the left edge."
@@ -524,71 +521,71 @@ msgstr ""
524521#: qml/Wizard/Page.qml:89
525522msgctxt "Button: Go back one page in the Wizard"
526523msgid "Back"
527−msgstr ""
524+msgstr "قايتىش"
528525
529526#: qml/Wizard/Pages/here-terms.qml:27
530527msgid "Terms & Conditions"
531−msgstr ""
528+msgstr "قائىدە ۋە شەرتلەر"
532529
533530#: qml/Wizard/Pages/passwd-confirm.qml:49
534531msgid "Confirm passphrase"
535−msgstr ""
532+msgstr "ئىم جۈملىسىنى جەزملەڭ"
536533
537534#: qml/Wizard/Pages/passwd-confirm.qml:50
538535msgid "Confirm passcode"
539−msgstr ""
536+msgstr "ئىمنى جەزملەڭ"
540537
541538#: qml/Wizard/Pages/passwd-confirm.qml:53
542539#: qml/Wizard/Pages/passwd-confirm.qml:54
543540msgid "Please try again."
544−msgstr ""
541+msgstr "قايتا سىناڭ."
545542
546543#: qml/Wizard/Pages/passwd-confirm.qml:82 qml/Wizard/Pages/passwd-set.qml:90
547544#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:128
548545#: qml/Wizard/Pages/40-wifi.qml:215 qml/Wizard/Pages/50-location.qml:131
549546#: qml/Wizard/Pages/60-reporting.qml:50
550547msgid "Continue"
551−msgstr ""
548+msgstr "داۋاملاشتۇر"
552549
553550#: qml/Wizard/Pages/passwd-set.qml:61
554551msgid "Choose your passcode"
555−msgstr ""
552+msgstr "ئىم كودى(passcode) تاللاڭ"
556553
557554#: qml/Wizard/Pages/passwd-set.qml:68
558555msgid "Passphrase must be 4 characters long"
559−msgstr ""
556+msgstr "ئىم كودى چوقۇم 4 ھەرپ بولسۇن"
560557
561558#: qml/Wizard/Pages/10-welcome.qml:27
562559msgid "Hi!"
563−msgstr ""
560+msgstr "سالام!"
564561
565562#: qml/Wizard/Pages/10-welcome.qml:44
566563msgid "Welcome to your Ubuntu phone."
567−msgstr ""
564+msgstr "ئۇبۇنتۇ تېلېفونىغا مەرھابا."
568565
569566#: qml/Wizard/Pages/10-welcome.qml:52
570567msgid "Let’s get started."
571−msgstr ""
568+msgstr "باشلايلى"
572569
573570#: qml/Wizard/Pages/20-sim.qml:25
574571msgid "Add a SIM card and restart your device"
575−msgstr ""
572+msgstr "سىم كارتىسى قوشۇپ، ئۈسكۈنىنى قايتا قوزغىتىڭ"
576573
577574#: qml/Wizard/Pages/20-sim.qml:59
578575msgid "Without it, you won’t be able to make calls or use text messaging."
579−msgstr ""
576+msgstr "ئۇ بولمىسا، تېلېفون قىلىشقا ۋە ئۇچۇر ئەۋەتىشكە بولمايدۇ."
580577
581578#: qml/Wizard/Pages/20-sim.qml:73 qml/Wizard/Pages/40-wifi.qml:215
582579msgid "Skip"
583−msgstr ""
580+msgstr "ئۆتكۈزۈۋەت"
584581
585582#: qml/Wizard/Pages/30-passwd-type.qml:39
586583msgid "Lock security"
587−msgstr ""
584+msgstr "قۇلۇپلاش بىخەتەرلىكى"
588585
589586#: qml/Wizard/Pages/30-passwd-type.qml:74
590587msgid "Please select how you’d like to unlock your phone."
591−msgstr ""
588+msgstr "تېلېفوننى قانداق قۇلۇپسىزلاشنى تاللاڭ."
592589
593590#: qml/Wizard/Pages/30-passwd-type.qml:97
594591msgctxt "Label: Type of security method"
qml/Dash/PreviewListView.qml+12−4
@@ -101,18 +101,26 @@ Item {
101101
102102 isCurrent: ListView.isCurrentItem
103103
104− previewModel: {
104+ readonly property var previewStack: {
105105 if (root.open) {
106106 if (index === root.initialIndex) {
107− return root.initialIndexPreviewStack.getPreviewModel(0);
107+ return root.initialIndexPreviewStack;
108108 } else {
109− var previewStack = root.scope.preview(result, root.categoryId);
110− return previewStack.getPreviewModel(0);
109+ return root.scope.preview(result, root.categoryId);
111110 }
112111 } else {
113112 return null;
114113 }
115114 }
115+
116+ previewModel: {
117+ if (previewStack) {
118+ return previewStack.getPreviewModel(0);
119+ } else {
120+ return null;
121+ }
122+ }
123+
116124 scopeStyle: root.scopeStyle
117125 }
118126 }
qml/Greeter/Infographics.qml+1−1
@@ -73,7 +73,7 @@ Item {
7373 notification.hideAnim.start()
7474 }
7575
76− visible: model.label !== ""
76+ visible: model.username !== ""
7777
7878 Component.onCompleted: startShowAnimation()
7979
src/Dash/main.cpp+1−1
@@ -101,7 +101,7 @@ int main(int argc, const char *argv[])
101101 mouseTouchAdaptor = MouseTouchAdaptor::instance();
102102 }
103103
104− QUrl source(::qmlDirectory()+"Dash/DashApplication.qml");
104+ QUrl source(::qmlDirectory() + "/Dash/DashApplication.qml");
105105 prependImportPaths(view->engine(), ::overrideImportPaths());
106106 appendImportPaths(view->engine(), ::fallbackImportPaths());
107107
src/Panel/Indicators/client/indicatorsclient.cpp+1−1
@@ -36,7 +36,7 @@ IndicatorsClient::IndicatorsClient(int &argc, char **argv)
3636 QStringList args = m_application->arguments();
3737
3838 m_view = new QQuickView;
39− m_view->engine()->setBaseUrl(QUrl::fromLocalFile(::qmlDirectory()+"Panel/Indicators/client/"));
39+ m_view->engine()->setBaseUrl(QUrl::fromLocalFile(::qmlDirectory() + "/Panel/Indicators/client/"));
4040 prependImportPaths(m_view->engine(), ::overrideImportPaths());
4141 appendImportPaths(m_view->engine(), ::fallbackImportPaths());
4242
src/main.cpp+1−1
@@ -105,7 +105,7 @@ int main(int argc, const char *argv[])
105105 mouseTouchAdaptor = MouseTouchAdaptor::instance();
106106 }
107107
108− QUrl source(::qmlDirectory()+"OrientedShell.qml");
108+ QUrl source(::qmlDirectory() + "/OrientedShell.qml");
109109 prependImportPaths(view->engine(), ::overrideImportPaths());
110110 if (!isMirServer) {
111111 prependImportPaths(view->engine(), ::nonMirImportPaths());
tests/CMakeLists.txt+9−3
@@ -22,11 +22,17 @@ add_subdirectory(uqmlscene)
2222add_executable(qmlscene ALIAS uqmlscene)
2323import_executables(dbus-test-runner)
2424
25+set(UNITY_PLUGINPATH "${CMAKE_BINARY_DIR}/plugins" CACHE PATH "Path to pre-built unity8 plugin dir.")
26+set(UNITY_MOCKPATH "${CMAKE_BINARY_DIR}/tests/mocks" CACHE PATH "Path to pre-built unity8 mock dir.")
27+
28+# Pre-built mocks have preference, pre-built plugins replace local build
2529set(UNITY_IMPORT_PATHS
30+ ${UNITY_MOCKPATH}
2631 ${CMAKE_BINARY_DIR}/tests/mocks
2732 ${CMAKE_BINARY_DIR}/tests/utils/modules
28− ${CMAKE_BINARY_DIR}/plugins
33+ ${UNITY_PLUGINPATH}
2934)
35+list(REMOVE_DUPLICATES UNITY_IMPORT_PATHS)
3036set(UNITY_IMPORT_PATHS ${UNITY_IMPORT_PATHS} CACHE INTERNAL "")
3137
3238macro(unity8_parse_arguments)
@@ -40,8 +46,8 @@ macro(unity8_parse_arguments)
4046 set(ld_paths)
4147 if(U8TEST_LIGHTDM)
4248 list(APPEND ld_paths
43− ${CMAKE_BINARY_DIR}/tests/mocks/libusermetrics
44− ${CMAKE_BINARY_DIR}/tests/mocks/LightDM/liblightdm
49+ ${UNITY_MOCKPATH}/libusermetrics
50+ ${UNITY_MOCKPATH}/IntegratedLightDM/liblightdm
4551 )
4652 endif()
4753
tests/autopilot/unity8/fixture_setup.py+1−1
@@ -74,7 +74,7 @@ class LaunchUnityWithFakeSensors(fixtures.Fixture):
7474 def _get_lightdm_mock_path(self):
7575 lib_path = get_mocks_library_path()
7676 lightdm_mock_path = os.path.abspath(
77− os.path.join(lib_path, "LightDM", "liblightdm")
77+ os.path.join(lib_path, "IntegratedLightDM", "liblightdm")
7878 )
7979
8080 if not os.path.exists(lightdm_mock_path):
tests/autopilot/unity8/shell/tests/__init__.py+1−1
@@ -261,7 +261,7 @@ class UnityTestCase(AutopilotTestCase):
261261 def _get_lightdm_mock_path(self):
262262 lib_path = get_mocks_library_path()
263263 lightdm_mock_path = os.path.abspath(
264− os.path.join(lib_path, "LightDM", "liblightdm")
264+ os.path.join(lib_path, "IntegratedLightDM", "liblightdm")
265265 )
266266
267267 if not os.path.exists(lightdm_mock_path):
tests/mocks/AccountsService/AccountsService.cpp+1−1
@@ -22,7 +22,7 @@ AccountsService::AccountsService(QObject* parent)
2222 : QObject(parent),
2323 m_enableLauncherWhileLocked(true),
2424 m_enableIndicatorsWhileLocked(true),
25− m_backgroundFile(qmlDirectory() + "graphics/phone_background.jpg"),
25+ m_backgroundFile(qmlDirectory() + "/graphics/phone_background.jpg"),
2626 m_statsWelcomeScreen(true),
2727 m_failedLogins(0),
2828 m_demoEdges(false),
tests/mocks/IntegratedLightDM/liblightdm/CMakeLists.txt+1−1
@@ -14,5 +14,5 @@ set_target_properties(MockLightDM PROPERTIES
1414 OUTPUT_NAME lightdm-qt5-2)
1515
1616install(TARGETS MockLightDM
17− DESTINATION ${SHELL_INSTALL_QML}/mocks/LightDM/liblightdm
17+ DESTINATION ${SHELL_INSTALL_QML}/mocks/IntegratedLightDM/liblightdm
1818 )
tests/mocks/Ubuntu/CMakeLists.txt+1
@@ -5,3 +5,4 @@ add_subdirectory(SystemImage)
55add_subdirectory(SystemSettings)
66add_subdirectory(Telephony)
77add_subdirectory(Thumbnailer)
8+add_subdirectory(Web)
tests/mocks/Ubuntu/Web/CMakeLists.txtnew file+1
@@ -0,0 +1 @@
1+add_unity8_mock(Ubuntu.Web 0.2 Ubuntu/Web)
tests/mocks/Ubuntu/Web/WebView.qmlnew file+25
@@ -0,0 +1,25 @@
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+
18+import QtQuick 2.0
19+
20+Item {
21+ property url url
22+ property int loadProgress: 0
23+
24+ onUrlChanged: loadProgress = 100
25+}
tests/mocks/Ubuntu/Web/qmldirnew file+4
@@ -0,0 +1,4 @@
1+module Ubuntu.Web
2+typeinfo Web.qmltypes
3+
4+WebView 0.2 WebView.qml
tests/mocks/Unity/Application/CMakeLists.txt+1
@@ -18,6 +18,7 @@ set(FakeUnityApplicationQml_SOURCES
1818 ${APPLICATION_API_INCLUDEDIR}/unity/shell/application/Mir.h
1919 ${APPLICATION_API_INCLUDEDIR}/unity/shell/application/MirSurfaceInterface.h
2020 ${APPLICATION_API_INCLUDEDIR}/unity/shell/application/MirSurfaceItemInterface.h
21+ resources/surfaces.qrc
2122)
2223
2324add_library(FakeUnityApplicationQml MODULE ${FakeUnityApplicationQml_SOURCES})
tests/mocks/Unity/Application/MirSurface.cpp+2−2
@@ -22,7 +22,7 @@ MirSurface::MirSurface(const QString& name,
2222 Mir::Type type,
2323 Mir::State state,
2424 const QUrl& screenshot,
25− const QString &qmlFilePath)
25+ const QUrl &qmlFilePath)
2626 : unity::shell::application::MirSurfaceInterface(nullptr)
2727 , m_name(name)
2828 , m_type(type)
@@ -87,7 +87,7 @@ void MirSurface::setLive(bool live)
8787 }
8888}
8989
90−QString MirSurface::qmlFilePath() const
90+QUrl MirSurface::qmlFilePath() const
9191{
9292 return m_qmlFilePath;
9393}
tests/mocks/Unity/Application/MirSurface.h+3−3
@@ -38,7 +38,7 @@ public:
3838 Mir::Type type,
3939 Mir::State state,
4040 const QUrl& screenshot,
41− const QString &qmlFilePath = QString());
41+ const QUrl &qmlFilePath = QUrl());
4242 virtual ~MirSurface();
4343
4444 ////
@@ -76,7 +76,7 @@ public:
7676 /////
7777 // internal mock stuff
7878
79− QString qmlFilePath() const;
79+ QUrl qmlFilePath() const;
8080
8181 QUrl screenshotUrl() const;
8282 void setScreenshotUrl(QUrl);
@@ -102,7 +102,7 @@ private:
102102 Mir::State m_state;
103103 Mir::OrientationAngle m_orientationAngle;
104104 QUrl m_screenshotUrl;
105− QString m_qmlFilePath;
105+ QUrl m_qmlFilePath;
106106 bool m_live;
107107 int m_viewCount;
108108 bool m_activeFocus;
tests/mocks/Unity/Application/MirSurfaceItem.cpp+3−4
@@ -215,12 +215,11 @@ void MirSurfaceItem::setSurface(MirSurfaceInterface* surface)
215215 QQuickView *quickView =
216216 qobject_cast<QQuickView*>(QGuiApplication::topLevelWindows()[0]);
217217
218− QString qmlComponentFilePath;
218+ QUrl qmlComponentFilePath;
219219 if (!m_qmlSurface->qmlFilePath().isEmpty()) {
220− qmlComponentFilePath.append(m_qmlSurface->qmlFilePath());
220+ qmlComponentFilePath = m_qmlSurface->qmlFilePath();
221221 } else {
222− qmlComponentFilePath = QString("%1/Unity/Application/MirSurfaceItem.qml")
223− .arg(mockPluginsDir());
222+ qmlComponentFilePath = QUrl("qrc:///Unity/Application/MirSurfaceItem.qml");
224223 }
225224
226225 m_qmlContentComponent = new QQmlComponent(quickView->engine(), qmlComponentFilePath);
tests/mocks/Unity/Application/VirtualKeyboard.cpp+2−4
@@ -26,10 +26,8 @@ VirtualKeyboard::VirtualKeyboard()
2626 : MirSurface("input-method",
2727 Mir::InputMethodType,
2828 Mir::MinimizedState,
29− QString("file://%1/Dash/graphics/phone/screenshots/vkb_portrait.png")
30− .arg(qmlDirectory()),
31− QString("%1/Unity/Application/VirtualKeyboard.qml")
32− .arg(mockPluginsDir()))
29+ QUrl("qrc:///Unity/Application/vkb_portrait.png"),
30+ QUrl("qrc:///Unity/Application/VirtualKeyboard.qml"))
3331{
3432}
3533
tests/mocks/Unity/Application/MirSurfaceItem.qml → tests/mocks/Unity/Application/resources/MirSurfaceItem.qmlrenamed

The content is the same.

tests/mocks/Unity/Application/VirtualKeyboard.qml → tests/mocks/Unity/Application/resources/VirtualKeyboard.qmlrenamed

The content is the same.

tests/mocks/Unity/Application/resources/surfaces.qrcnew file+7
@@ -0,0 +1,7 @@
1+<RCC>
2+ <qresource prefix="/Unity/Application">
3+ <file>VirtualKeyboard.qml</file>
4+ <file>MirSurfaceItem.qml</file>
5+ <file>vkb_portrait.png</file>
6+ </qresource>
7+</RCC>
tests/mocks/Unity/Application/resources/vkb_portrait.pngnew file

Binary file not shown.

tests/mocks/Unity/Launcher/MockLauncherItem.cpp+1−1
@@ -29,7 +29,7 @@ MockLauncherItem::MockLauncherItem(const QString &appId, const QString& desktopF
2929 m_appId(appId),
3030 m_desktopFile(desktopFile),
3131 m_name(name),
32− m_icon(qmlDirectory() + "graphics/applicationIcons/" + icon + ".png"),
32+ m_icon(qmlDirectory() + "/graphics/applicationIcons/" + icon + ".png"),
3333 m_pinned(false),
3434 m_running(false),
3535 m_recent(false),
tests/mocks/Unity/fake_previewstack.cpp+2−2
@@ -21,8 +21,8 @@
2121#include "fake_previewmodel.h"
2222#include "fake_scope.h"
2323
24−PreviewStack::PreviewStack(QObject* parent, Scope *scope)
25− : unity::shell::scopes::PreviewStackInterface(parent)
24+PreviewStack::PreviewStack(Scope *scope)
25+ : unity::shell::scopes::PreviewStackInterface(nullptr)
2626{
2727 m_previews << new PreviewModel(this, scope);
2828}
tests/mocks/Unity/fake_previewstack.h+1−1
@@ -32,7 +32,7 @@ class PreviewStack : public unity::shell::scopes::PreviewStackInterface
3232 Q_OBJECT
3333
3434public:
35− explicit PreviewStack(QObject* parent = 0, Scope* scope = 0);
35+ explicit PreviewStack(Scope* scope = 0);
3636 virtual ~PreviewStack();
3737
3838 QVariant data(const QModelIndex& index, int role = Qt::DisplayRole) const override;
tests/mocks/Unity/fake_resultsmodel.cpp+1−1
@@ -78,7 +78,7 @@ ResultsModel::data(const QModelIndex& index, int role) const
7878 case RoleTitle:
7979 return QString("Title.%1.%2").arg(m_categoryId).arg(index.row());
8080 case RoleArt:
81− return qmlDirectory() + "graphics/applicationIcons/dash.png";
81+ return qmlDirectory() + "/graphics/applicationIcons/dash.png";
8282 case RoleSubtitle:
8383 return QString("Subtitle.%1.%2").arg(m_categoryId).arg(index.row());
8484 case RoleMascot:
tests/mocks/Unity/fake_scope.cpp+3−5
@@ -201,9 +201,7 @@ PreviewStack* Scope::preview(QVariant const& result, QString const& /*categoryId
201201 if (m_returnNullPreview) {
202202 return nullptr;
203203 } else {
204− // This probably leaks, do we don't care
205− // it's a test after all
206− return new PreviewStack(this, this);
204+ return new PreviewStack(this);
207205 }
208206}
209207
@@ -253,11 +251,11 @@ QVariantMap Scope::customizations() const
253251 m["foreground-color"] = "blue";
254252 m["page-header"] = h;
255253 } else if (m_id == "MockScope4") {
256− h["navigation-background"] = QUrl(sourceDirectory() + "tests/qmltests/Dash/artwork/background.png");
254+ h["navigation-background"] = QUrl(sourceDirectory() + "/tests/qmltests/Dash/artwork/background.png");
257255 m["page-header"] = h;
258256 } else if (m_id == "MockScope5") {
259257 h["background"] = "gradient:///lightgrey/grey";
260− h["logo"] = QUrl(sourceDirectory() + "tests/qmltests/Dash/tst_PageHeader/logo-ubuntu-orange.svg");
258+ h["logo"] = QUrl(sourceDirectory() + "/tests/qmltests/Dash/tst_PageHeader/logo-ubuntu-orange.svg");
261259 h["divider-color"] = "red";
262260 h["navigation-background"] = "color:///black";
263261 m["page-header"] = h;
tests/mocks/Unity/fake_scopesoverview.cpp+1−1
@@ -308,7 +308,7 @@ QVariant ScopesOverviewResultsModel::data(const QModelIndex& index, int role) co
308308 case RoleSubtitle:
309309 return scope && scope->name() == "Videos this is long ab cd ef gh ij kl" ? "tube, movies, cinema, pictures, art, moving images, magic in a box" : QString();
310310 case RoleArt:
311− return qmlDirectory() + "graphics/applicationIcons/dash.png";
311+ return qmlDirectory() + "/graphics/applicationIcons/dash.png";
312312 case RoleMascot:
313313 case RoleEmblem:
314314 case RoleSummary:
tests/mocks/libusermetrics/UserMetrics.cpp+1−5
@@ -416,11 +416,7 @@ UserMetrics::~UserMetrics()
416416
417417QString UserMetrics::label() const
418418{
419− if (d_ptr->m_label.isEmpty()) {
420− return "No data";
421− } else {
422− return d_ptr->m_label;
423− }
419+ return d_ptr->m_label;
424420}
425421
426422QString UserMetrics::username() const
tests/plugins/Dash/CMakeLists.txt−1
@@ -23,7 +23,6 @@ include_directories(
2323remove_definitions(-DQT_NO_KEYWORDS)
2424
2525add_definitions(-DDASHVIEWSTEST_FOLDER="${CMAKE_CURRENT_SOURCE_DIR}")
26−add_definitions(-DBUILT_PLUGINS_DIR="${CMAKE_BINARY_DIR}/plugins")
2726
2827macro(add_lvwph_test FILENAME TESTNAME)
2928 add_executable(${TESTNAME}TestExec
tests/plugins/Dash/cardcreatortest.cpp−1
@@ -35,7 +35,6 @@ private Q_SLOTS:
3535 void init()
3636 {
3737 view = new QQuickView();
38− view->engine()->addImportPath(BUILT_PLUGINS_DIR);
3938 view->setSource(QUrl::fromLocalFile(DASHVIEWSTEST_FOLDER "/cardcreatortest.qml"));
4039 view->show();
4140 QTest::qWaitForWindowExposed(view);
tests/plugins/Dash/horizontaljournaltest.cpp−1
@@ -123,7 +123,6 @@ private Q_SLOTS:
123123 {
124124 view = new QQuickView();
125125 view->setResizeMode(QQuickView::SizeRootObjectToView);
126− view->engine()->addImportPath(BUILT_PLUGINS_DIR);
127126
128127 model = new WidthModel();
129128 QStringList widthList;
tests/plugins/Dash/horizontaljournaltry.cpp−1
@@ -63,7 +63,6 @@ int main(int argc, char *argv[])
6363
6464 QQuickView *view = new QQuickView();
6565 view->setResizeMode(QQuickView::SizeRootObjectToView);
66− view->engine()->addImportPath(BUILT_PLUGINS_DIR);
6766
6867 QWidthModela model;
6968 QStringList heightList;
tests/plugins/Dash/listviewwithpageheadersectionexternalmodeltest.cpp−1
@@ -168,7 +168,6 @@ private Q_SLOTS:
168168 void init()
169169 {
170170 view = new QQuickView();
171− view->engine()->addImportPath(BUILT_PLUGINS_DIR);
172171 view->setSource(QUrl::fromLocalFile(DASHVIEWSTEST_FOLDER "/listviewwithpageheadertestsectionexternalmodel.qml"));
173172 lvwph = dynamic_cast<ListViewWithPageHeader*>(view->rootObject()->findChild<QQuickFlickable*>());
174173 QVERIFY(lvwph);
tests/plugins/Dash/listviewwithpageheadersectiontest.cpp−1
@@ -133,7 +133,6 @@ private Q_SLOTS:
133133 void init()
134134 {
135135 view = new QQuickView();
136− view->engine()->addImportPath(BUILT_PLUGINS_DIR);
137136 view->setSource(QUrl::fromLocalFile(DASHVIEWSTEST_FOLDER "/listviewwithpageheadertestsection.qml"));
138137 lvwph = dynamic_cast<ListViewWithPageHeader*>(view->rootObject()->findChild<QQuickFlickable*>());
139138 model = view->rootObject()->findChild<QQmlListModel*>();
tests/plugins/Dash/listviewwithpageheadertest.cpp−1
@@ -119,7 +119,6 @@ private Q_SLOTS:
119119 void init()
120120 {
121121 view = new QQuickView();
122− view->engine()->addImportPath(BUILT_PLUGINS_DIR);
123122 view->setSource(QUrl::fromLocalFile(DASHVIEWSTEST_FOLDER "/listviewwithpageheadertest.qml"));
124123 lvwph = dynamic_cast<ListViewWithPageHeader*>(view->rootObject()->findChild<QQuickFlickable*>());
125124 model = view->rootObject()->findChild<QQmlListModel*>();
tests/plugins/Dash/organicgridtest.cpp−1
@@ -126,7 +126,6 @@ private Q_SLOTS:
126126 {
127127 view = new QQuickView();
128128 view->setResizeMode(QQuickView::SizeRootObjectToView);
129− view->engine()->addImportPath(BUILT_PLUGINS_DIR);
130129
131130 model = new DummyModel();
132131 model->setCount(21);
tests/plugins/Dash/organicgridtry.cpp−1
@@ -73,7 +73,6 @@ int main(int argc, char *argv[])
7373
7474 QQuickView *view = new QQuickView();
7575 view->setResizeMode(QQuickView::SizeRootObjectToView);
76− view->engine()->addImportPath(BUILT_PLUGINS_DIR);
7776
7877 DummyModel model;
7978 model.setCount(3);
tests/plugins/Dash/verticaljournaltest.cpp−1
@@ -125,7 +125,6 @@ private Q_SLOTS:
125125 {
126126 view = new QQuickView();
127127 view->setResizeMode(QQuickView::SizeRootObjectToView);
128− view->engine()->addImportPath(BUILT_PLUGINS_DIR);
129128
130129 model = new HeightModel();
131130 QStringList heightList;
tests/plugins/Dash/verticaljournaltry.cpp−1
@@ -63,7 +63,6 @@ int main(int argc, char *argv[])
6363
6464 QQuickView *view = new QQuickView();
6565 view->setResizeMode(QQuickView::SizeRootObjectToView);
66− view->engine()->addImportPath(BUILT_PLUGINS_DIR);
6766
6867 QHeightModel model;
6968 QStringList heightList;
tests/plugins/IntegratedLightDM/CMakeLists.txt+1−1
@@ -25,7 +25,7 @@ add_unity8_uitest(GreeterDBus dbus-test-runner
2525 ARG_PREFIX "--parameter"
2626 ARGS --task $<TARGET_FILE:GreeterDBusTestExec>
2727 DEPENDS MockLightDM
28− IMPORT_PATHS ${CMAKE_BINARY_DIR}/tests/mocks
28+ IMPORT_PATHS ${UNITY_MOCKPATH}
2929 LIGHTDM
3030 )
3131
tests/plugins/Ubuntu/Gestures/CMakeLists.txt+3−7
@@ -14,9 +14,6 @@ include_directories(
1414
1515export_qmlfiles(UbuntuGesturesTest .)
1616
17−add_definitions(-DUBUNTU_GESTURES_PLUGIN_DIR="${CMAKE_BINARY_DIR}/plugins")
18−add_definitions(-DTESTS_UTILS_MODULES_DIR="${CMAKE_BINARY_DIR}/tests/utils/modules")
19−
2017macro(build_gesture_test CLASSNAME)
2118 add_executable(${CLASSNAME}TestExec tst_${CLASSNAME}.cpp GestureTest.cpp TestItem.cpp)
2219 qt5_use_modules(${CLASSNAME}TestExec Test Core Qml Gui Quick)
@@ -26,7 +23,7 @@ endmacro()
2623macro(add_gesture_unit_test CLASSNAME)
2724 build_gesture_test(${CLASSNAME})
2825 add_unity8_unittest(${CLASSNAME} ${CLASSNAME}TestExec
29− ENVIRONMENT LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/plugins/Ubuntu/Gestures
26+ ENVIRONMENT LD_LIBRARY_PATH=${UNITY_PLUGINPATH}/Ubuntu/Gestures
3027 DEPENDS UbuntuGesturesTest-qmlfiles
3128 ${ARGN}
3229 )
@@ -35,12 +32,11 @@ endmacro()
3532macro(add_gesture_ui_test CLASSNAME)
3633 build_gesture_test(${CLASSNAME})
3734 add_unity8_uitest(${CLASSNAME} ${CLASSNAME}TestExec
38− ENVIRONMENT LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/plugins/Ubuntu/Gestures
35+ ENVIRONMENT LD_LIBRARY_PATH=${UNITY_PLUGINPATH}/Ubuntu/Gestures
3936 DEPENDS UbuntuGesturesTest-qmlfiles
4037 ${ARGN}
4138 )
42− add_manual_qml_test(. ${CLASSNAME} IMPORT_PATHS ${CMAKE_BINARY_DIR}/plugins
43− ${CMAKE_BINARY_DIR}/tests/utils/modules)
39+ add_manual_qml_test(. ${CLASSNAME} IMPORT_PATHS ${UNITY_PLUGINPATH})
4440endmacro()
4541
4642add_gesture_ui_test(DirectionalDragArea)
tests/plugins/Ubuntu/Gestures/GestureTest.cpp−2
@@ -44,8 +44,6 @@ void GestureTest::init()
4444{
4545 m_view = new QQuickView;
4646 m_view->setResizeMode(QQuickView::SizeRootObjectToView);
47− m_view->engine()->addImportPath(QStringLiteral(UBUNTU_GESTURES_PLUGIN_DIR));
48− m_view->engine()->addImportPath(QStringLiteral(TESTS_UTILS_MODULES_DIR));
4947 m_view->setSource(QUrl::fromLocalFile(m_qmlFilename));
5048 m_view->show();
5149 QVERIFY(QTest::qWaitForWindowExposed(m_view));
tests/plugins/Ubuntu/Gestures/tst_TouchGate.cpp−1
@@ -119,7 +119,6 @@ QQuickView *tst_TouchGate::createView()
119119 QQuickView *window = new QQuickView(0);
120120 window->setResizeMode(QQuickView::SizeRootObjectToView);
121121 window->resize(720, 720);
122− window->engine()->addImportPath(QLatin1String(UBUNTU_GESTURES_PLUGIN_DIR));
123122
124123 return window;
125124}
tests/qmltests/CMakeLists.txt+2−2
@@ -1,7 +1,7 @@
11
22add_subdirectory(Components)
33
4−add_unity8_qmltest(. OrientedShell)
4+add_unity8_qmltest(. OrientedShell LIGHTDM)
55add_unity8_qmltest(. Shell LIGHTDM)
66add_unity8_qmltest(. ShellWithPin LIGHTDM)
77add_unity8_qmltest(Components Background)
@@ -18,7 +18,7 @@ add_unity8_qmltest(Components Showable)
1818add_unity8_qmltest(Components ZoomableImage)
1919add_unity8_qmltest(Dash Dash)
2020add_unity8_qmltest(Dash DashContent)
21−add_unity8_qmltest(Dash DashShell)
21+add_unity8_qmltest(Dash DashShell LIGHTDM)
2222add_unity8_qmltest(Dash Card)
2323add_unity8_qmltest(Dash CardCarousel)
2424add_unity8_qmlbenchmark(Dash CardBenchmark 1000)
tests/qmltests/Components/CMakeLists.txt+1−4
@@ -1,6 +1,4 @@
1−add_definitions(-DUBUNTU_GESTURES_PLUGIN_DIR="${CMAKE_BINARY_DIR}/plugins")
21add_definitions(-DTEST_DIR="${CMAKE_CURRENT_LIST_DIR}")
3−add_definitions(-DTESTS_UTILS_MODULES_DIR="${CMAKE_BINARY_DIR}/tests/utils/modules")
42
53########## tst_DragHandle
64
@@ -17,8 +15,7 @@ qt5_use_modules(DragHandleTestExec Test Core Qml Gui Quick)
1715target_link_libraries(DragHandleTestExec UbuntuGesturesQml UbuntuGestures)
1816
1917add_unity8_uitest(DragHandle DragHandleTestExec ENVIRONMENT LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/plugins/Ubuntu/Gestures)
20−add_manual_qml_test(. DragHandle IMPORT_PATHS ${CMAKE_BINARY_DIR}/plugins ${CMAKE_BINARY_DIR}/tests/utils/modules)
21−
18+add_manual_qml_test(. DragHandle IMPORT_PATHS ${UNITY_PLUGINPATH})
2219
2320########## tst_EdgeDragEvaluator
2421add_executable(EdgeDragEvaluatorTestExec tst_EdgeDragEvaluator.cpp)
tests/qmltests/Components/tst_DragHandle.cpp−2
@@ -113,9 +113,7 @@ QQuickView *tst_DragHandle::createView()
113113{
114114 QQuickView *window = new QQuickView(0);
115115 window->setResizeMode(QQuickView::SizeRootObjectToView);
116− window->engine()->addImportPath(QLatin1String(UBUNTU_GESTURES_PLUGIN_DIR));
117116 window->engine()->addImportPath(QLatin1String(TEST_DIR));
118− window->engine()->addImportPath(QStringLiteral(TESTS_UTILS_MODULES_DIR));
119117
120118 return window;
121119}
tests/qmltests/Components/tst_EdgeDragEvaluator.cpp−1
@@ -99,7 +99,6 @@ QQuickView *tst_EdgeDragEvaluator::createView()
9999{
100100 QQuickView *window = new QQuickView(0);
101101 window->setResizeMode(QQuickView::SizeRootObjectToView);
102− window->engine()->addImportPath(QLatin1String(UBUNTU_GESTURES_PLUGIN_DIR));
103102 window->engine()->addImportPath(QLatin1String(TEST_DIR));
104103
105104 return window;
tests/qmltests/Dash/tst_Card.qml+2−2
@@ -473,14 +473,14 @@ Rectangle {
473473
474474 card.cardData["mascot"] = "somethingbroken2";
475475 card.cardDataChanged();
476− compare(mascotImage.image.status, Image.Error);
476+ compare(mascotImage.status, Image.Error);
477477
478478 cardTool.components["mascot"] = {"fallback": Qt.resolvedUrl("artwork/emblem.png")};
479479 cardTool.componentsChanged();
480480 card.cardData["mascot"] = "somethingbroken2";
481481 card.cardDataChanged();
482482 waitForRendering(card);
483− tryCompare(mascotImage.image, "status", Image.Ready);
483+ tryCompare(mascotImage, "status", Image.Ready);
484484 }
485485
486486 function test_font_weights_data() {
tests/qmltests/Greeter/tst_Infographics.qml+4−3
@@ -74,15 +74,16 @@ Item {
7474
7575 function test_set_username_data() {
7676 return [
77− { username: "has-password", label: "<b>19</b> minutes talk time" },
78− { username: "two-factor", label: "No data" },
79− { username: "", label: "No data" },
77+ { username: "has-password", label: "<b>19</b> minutes talk time", visible: true },
78+ { username: "two-factor", label: "", visible: true },
79+ { username: "", label: "", visible: false },
8080 ]
8181 }
8282
8383 function test_set_username(data) {
8484 infographicModel.username = data.username
8585 tryCompare(label, "text", data.label)
86+ compare(infographic.visible, data.visible);
8687 }
8788 }
8889
tools/scopetool.cpp+1−1
@@ -89,7 +89,7 @@ int main(int argc, char *argv[])
8989 view->setTitle(QGuiApplication::applicationName());
9090 view->engine()->setBaseUrl(QUrl::fromLocalFile(::qmlDirectory()));
9191
92− QUrl source(::qmlDirectory() + "ScopeTool.qml");
92+ QUrl source(::qmlDirectory() + "/ScopeTool.qml");
9393 prependImportPaths(view->engine(), ::overrideImportPaths());
9494 prependImportPaths(view->engine(), ::nonMirImportPaths());
9595 appendImportPaths(view->engine(), ::fallbackImportPaths());