git.iko.soy/unity8
on xenial help sign in
merged
commit8924fe730d826b5fb140fad90084005709ed66e7 authorAndrea Cimitan <andrea.cimitan@gmail.com> dateTue 27 Jan 2015, 12:01 (12 years ago) parent52195ca0af2085
33 files changed+998−600
compare with xenial
unifiedsplit
build.sh+4−1 debian/changelog+54 plugins/Dash/CardCreator.js+1−1 plugins/Unity/DashCommunicator/dashconnection.cpp+30 plugins/Unity/DashCommunicator/dashconnection.h+4−1 po/ca.po+51−51 po/en_AU.po+100−94 po/en_GB.po+47−41 po/es.po+51−45 po/eu.po+51−43 po/hu.po+55−55 po/nb.po+51−45 po/nl.po+4−4 po/pt.po+30−29 po/sl.po+51−43 qml/Dash/Dash.qml+2−2 qml/Dash/GenericScopeView.qml+30−2 qml/Dash/Previews/PreviewTable.qml+6 qml/Shell.qml+15−3 qml/Stages/DesktopStage.qml+8−44 qml/Stages/WindowMoveResizeArea.qml+98 src/libunity8-private/abstractdbusservicemonitor.cpp+21−8 src/libunity8-private/abstractdbusservicemonitor.h+9−5 tests/autopilot/unity8/shell/tests/test_edges_demo.py+1−1 tests/mocks/LightDM/CMakeLists.txt+1−2 tests/mocks/LightDM/demo/CMakeLists.txt+1 tests/plugins/LightDM/CMakeLists.txt+1−4 tests/qmltests/CMakeLists.txt+1 tests/qmltests/Dash/Previews/tst_PreviewTable.qml+6−5 tests/qmltests/Dash/tst_Card.qml+2−2 tests/qmltests/Dash/tst_DashContent.qml+57 tests/qmltests/Stages/tst_WindowMoveResizeArea.qml+138 tests/utils/modules/Unity/Test/UnityTestCase.qml+17−69
build.sh+4−1
@@ -61,7 +61,10 @@ install_dependencies() {
6161}
6262
6363mk_build_deps() {
64− [ ! -f unity8-build-deps*deb -o $CODE_DIR/debian/control -nt unity8-build-deps*deb ] && mk-build-deps --install --root-cmd sudo $CODE_DIR/debian/control
64+ if [ ! -f control -o $CODE_DIR/debian/control -nt control ]; then
65+ sed 's/\:native//g' $CODE_DIR/debian/control > control
66+ mk-build-deps --install --root-cmd sudo control
67+ fi
6568}
6669
6770if [ -f "/usr/bin/ccache" ] ; then
debian/changelog+54
@@ -1,3 +1,57 @@
1+unity8 (8.02+15.04.20150121.2-0ubuntu1) vivid; urgency=low
2+
3+ [ Michael Terry ]
4+ * Don't show any power dialogs while the screen is off. This is a
5+ band-aid to avoid the symptom, while we still investigate the source
6+ of why the screen doesn't turn on (and why we seem to not handle the
7+ power-button-release event). (LP: #1409003, #1410830)
8+ * Don't refocus the dialer-app when a call is started by the user.
9+ Because of how qtmir works, this would cause the dialer-app to
10+ unfocus momentarily, causing interface oddities for the user. (LP:
11+ #1413065)
12+
13+ [ CI Train Bot ]
14+ * Resync trunk
15+
16+ [ Albert Astals Cid ]
17+ * Build with ninja
18+ * Fixes for Table Preview Widget (LP: #1410420)
19+
20+ [ Michael Zanetti ]
21+ * Add support for earpiece media buttons (LP: #1398427)
22+ * Add a WindowMoveResizeArea and tests for it
23+
24+ -- Ubuntu daily release <ps-jenkins@lists.canonical.com> Wed, 21 Jan 2015 18:33:18 +0000
25+
26+unity8 (8.02+15.04.20150113.1-0ubuntu1) vivid; urgency=low
27+
28+ [ Andrea Cimitan ]
29+ * support background on horizontal cards with summary (LP: #1393008)
30+
31+ [ Gerry Boland ]
32+ * DashCommunicator: replace QDBusInterface with a non-blocking
33+ simplification which does not introspect the service on creation
34+ (LP: #1403508)
35+
36+ [ Leo Arias ]
37+ * Added an autopilot test for the edges demo.
38+
39+ [ Albert Astals ]
40+ * Don't show the manage dash pull up arrow on temp scopes (LP:
41+ #1401869)
42+ * Remove hack, newer Qt already support keyClick(char)
43+ * Tests: Add Qt 5.5 removal TODOs
44+ * Make sure we use fPIC when compiling files for the static library
45+ too
46+ * Make sure changing a scope doesn't trigger creation/destruction of
47+ delegates until it's finished (LP: #1410122)
48+
49+ [ Michael Zanetti ]
50+ * patch debian/control file before using it to make it work with mk-
51+ build-deps
52+
53+ -- Ubuntu daily release <ps-jenkins@lists.canonical.com> Tue, 13 Jan 2015 20:58:08 +0000
54+
155unity8 (8.02+15.04.20150109.2-0ubuntu1) vivid; urgency=low
256
357 [ Michał Sawicz ]
plugins/Dash/CardCreator.js+1−1
@@ -320,7 +320,7 @@ function cardString(template, components) {
320320 var hasSummary = components["summary"] || false;
321321 var artAndSummary = hasArt && hasSummary;
322322 var isHorizontal = template["card-layout"] === "horizontal";
323− var hasBackground = !isHorizontal && (template["card-background"] || components["background"] || artAndSummary);
323+ var hasBackground = (hasSummary || !isHorizontal) && (template["card-background"] || components["background"] || artAndSummary);
324324 var hasTitle = components["title"] || false;
325325 var hasMascot = components["mascot"] || false;
326326 var hasEmblem = components["emblem"] && !(hasMascot && template["card-size"] === "small") || false;
plugins/Unity/DashCommunicator/dashconnection.cpp+30
@@ -19,12 +19,42 @@
1919#include <QDBusInterface>
2020#include <QDBusPendingCall>
2121
22+/* The default implementation of AbstractDBusServiceMonitor creates a QDBusInterface when the service
23+ * appears on the bus.
24+ *
25+ * On construction QDBusInterface synchronously introspects the service, which will block the GUI
26+ * thread of this process if the service is busy. QDBusAbstractInterface does not perform this
27+ * introspection, so let's subclass that and avoid the blocking scenario.
28+ *
29+ * However we lose Qt's wrapping of the DBus service with a MetaObject, with the result that we
30+ * cannot easily connect to DBus signals with the usual connect() calls. So this approach only
31+ * suited to push communication with the DBus service.
32+ */
33+class AsyncDBusInterface : public QDBusAbstractInterface
34+{
35+public:
36+ AsyncDBusInterface(const QString &service, const QString &path,
37+ const QString &interface, const QDBusConnection &connection,
38+ QObject *parent = 0)
39+ : QDBusAbstractInterface(service, path, interface.toLatin1().data(), connection, parent)
40+ {}
41+ ~AsyncDBusInterface() = default;
42+};
43+
44+
2245DashConnection::DashConnection(const QString &service, const QString &path, const QString &interface, QObject *parent):
2346 AbstractDBusServiceMonitor(service, path, interface, SessionBus, parent)
2447{
2548
2649}
2750
51+/* Override the default implementation to create a non-blocking DBus interface (see note above). */
52+QDBusAbstractInterface* DashConnection::createInterface(const QString &service, const QString &path,
53+ const QString &interface, const QDBusConnection &connection)
54+{
55+ return new AsyncDBusInterface(service, path, interface, connection);
56+}
57+
2858void DashConnection::setCurrentScope(int index, bool animate, bool isSwipe)
2959{
3060 if (dbusInterface()) {
plugins/Unity/DashCommunicator/dashconnection.h+4−1
@@ -20,7 +20,6 @@
2020// local
2121#include "abstractdbusservicemonitor.h"
2222
23−
2423class DashConnection: public AbstractDBusServiceMonitor
2524{
2625 Q_OBJECT
@@ -29,6 +28,10 @@ public:
2928
3029public Q_SLOTS:
3130 void setCurrentScope(int index, bool animate, bool isSwipe);
31+
32+private:
33+ QDBusAbstractInterface* createInterface(const QString &service, const QString &path,
34+ const QString &interface, const QDBusConnection &connection) override;
3235};
3336
3437#endif
po/ca.po+51−51
@@ -15,19 +15,19 @@ msgstr ""
1515"Content-Type: text/plain; charset=UTF-8\n"
1616"Content-Transfer-Encoding: 8bit\n"
1717"Plural-Forms: nplurals=2; plural=n != 1;\n"
18−"X-Launchpad-Export-Date: 2015-01-14 06:48+0000\n"
19−"X-Generator: Launchpad (build 17298)\n"
18+"X-Launchpad-Export-Date: 2015-01-15 06:06+0000\n"
19+"X-Generator: Launchpad (build 17303)\n"
2020
2121#: plugins/LightDM/Greeter.cpp:130
2222msgid "Password: "
2323msgstr "Contrasenya: "
2424
2525#: plugins/Unity/Launcher/launcheritem.cpp:45
26−#: plugins/Unity/Launcher/launcheritem.cpp:100
26+#: plugins/Unity/Launcher/launcheritem.cpp:91
2727msgid "Pin shortcut"
2828msgstr "Enganxa la drecera"
2929
30−#: plugins/Unity/Launcher/launcheritem.cpp:100
30+#: plugins/Unity/Launcher/launcheritem.cpp:91
3131msgid "Unpin shortcut"
3232msgstr "Desenganxa la drecera"
3333
@@ -54,45 +54,45 @@ msgid_plural "Please wait %1 minutes and then try again…"
5454msgstr[0] "Espereu %1 minut i torneu-ho a intentar..."
5555msgstr[1] "Espereu %1 minuts i torneu-ho a intentar..."
5656
57−#: qml/Components/Dialogs.qml:70
57+#: qml/Components/Dialogs.qml:74
5858msgid "Log out"
5959msgstr "Surt"
6060
61−#: qml/Components/Dialogs.qml:71
61+#: qml/Components/Dialogs.qml:75
6262msgid "Are you sure you want to log out?"
6363msgstr "Segur que voleu sortir?"
6464
65−#: qml/Components/Dialogs.qml:73 qml/Components/Dialogs.qml:97
66−#: qml/Components/Dialogs.qml:122
65+#: qml/Components/Dialogs.qml:77 qml/Components/Dialogs.qml:101
66+#: qml/Components/Dialogs.qml:126
6767msgid "No"
6868msgstr "No"
6969
70−#: qml/Components/Dialogs.qml:80 qml/Components/Dialogs.qml:104
71−#: qml/Components/Dialogs.qml:129
70+#: qml/Components/Dialogs.qml:84 qml/Components/Dialogs.qml:108
71+#: qml/Components/Dialogs.qml:133
7272msgid "Yes"
7373msgstr "Sí"
7474
75−#: qml/Components/Dialogs.qml:94
75+#: qml/Components/Dialogs.qml:98
7676msgid "Shut down"
7777msgstr "Apaga"
7878
79−#: qml/Components/Dialogs.qml:95
79+#: qml/Components/Dialogs.qml:99
8080msgid "Are you sure you want to shut down?"
8181msgstr "Segur que voleu apagar?"
8282
83−#: qml/Components/Dialogs.qml:119
83+#: qml/Components/Dialogs.qml:123
8484msgid "Reboot"
8585msgstr "Reinicia"
8686
87−#: qml/Components/Dialogs.qml:120
87+#: qml/Components/Dialogs.qml:124
8888msgid "Are you sure you want to reboot?"
8989msgstr "Segur que voleu reiniciar?"
9090
91−#: qml/Components/Dialogs.qml:144
91+#: qml/Components/Dialogs.qml:148
9292msgid "Power"
9393msgstr "Energia"
9494
95−#: qml/Components/Dialogs.qml:145
95+#: qml/Components/Dialogs.qml:149
9696msgid ""
9797"Are you sure you would like\n"
9898"to power off?"
@@ -100,15 +100,15 @@ msgstr ""
100100"Segur que voleu\n"
101101"apagar?"
102102
103−#: qml/Components/Dialogs.qml:147
103+#: qml/Components/Dialogs.qml:151
104104msgid "Power off"
105105msgstr "Apaga"
106106
107−#: qml/Components/Dialogs.qml:157
107+#: qml/Components/Dialogs.qml:161
108108msgid "Restart"
109109msgstr "Reinicia"
110110
111−#: qml/Components/Dialogs.qml:167
111+#: qml/Components/Dialogs.qml:171
112112msgid "Cancel"
113113msgstr "Cancel·la"
114114
@@ -116,49 +116,49 @@ msgstr "Cancel·la"
116116msgid "Skip intro"
117117msgstr "Omet la introducció"
118118
119−#: qml/Components/EdgeDemo.qml:125
119+#: qml/Components/EdgeDemo.qml:112
120120msgid "Right edge"
121121msgstr "Vora dreta"
122122
123−#: qml/Components/EdgeDemo.qml:126
123+#: qml/Components/EdgeDemo.qml:113
124124msgid "Try swiping from the right edge to unlock the phone"
125125msgstr ""
126126"Proveu de lliscar el dit des de la vora dreta per desblocar el telèfon"
127127
128−#: qml/Components/EdgeDemo.qml:157
128+#: qml/Components/EdgeDemo.qml:144
129129msgid "Top edge"
130130msgstr "Vora superior"
131131
132−#: qml/Components/EdgeDemo.qml:158
132+#: qml/Components/EdgeDemo.qml:145
133133msgid "Try swiping from the top edge to access the indicators"
134134msgstr ""
135135"Proveu de lliscar el dit des de la vora superior per accedir als indicadors"
136136
137−#: qml/Components/EdgeDemo.qml:183
137+#: qml/Components/EdgeDemo.qml:170
138138msgid "Close"
139139msgstr "Tanca"
140140
141−#: qml/Components/EdgeDemo.qml:184
141+#: qml/Components/EdgeDemo.qml:171
142142msgid "Swipe up again to close the settings screen"
143143msgstr ""
144144"Llisqueu el dit cap amunt una altra vegada per tancar la pantalla de "
145145"configuració"
146146
147−#: qml/Components/EdgeDemo.qml:214
147+#: qml/Components/EdgeDemo.qml:201
148148msgid "Left edge"
149149msgstr "Vora esquerra"
150150
151−#: qml/Components/EdgeDemo.qml:215
151+#: qml/Components/EdgeDemo.qml:202
152152msgid "Swipe from the left to reveal the launcher for quick access to apps"
153153msgstr ""
154154"Llisqueu el dit des de la vora esquerra per mostrar el llançador i accedir "
155155"ràpidament a les aplicacions"
156156
157−#: qml/Components/EdgeDemo.qml:242
157+#: qml/Components/EdgeDemo.qml:229
158158msgid "Well done"
159159msgstr "Enhorabona!"
160160
161−#: qml/Components/EdgeDemo.qml:243
161+#: qml/Components/EdgeDemo.qml:230
162162msgid ""
163163"You have now mastered the edge gestures and can start using the "
164164"phone<br><br>Tap on the screen to start"
@@ -166,44 +166,44 @@ msgstr ""
166166"Ja heu après com utilitzar els gestos de les vores per fer servir el "
167167"telèfon<br><br>Feu un toc a la pantalla per començar"
168168
169−#: qml/Components/Lockscreen.qml:238
169+#: qml/Components/Lockscreen.qml:223
170170msgid "Return to Call"
171171msgstr "Torna a la trucada"
172172
173−#: qml/Components/Lockscreen.qml:238
173+#: qml/Components/Lockscreen.qml:223
174174msgid "Emergency Call"
175175msgstr "Trucada d'emergència"
176176
177−#: qml/Components/Lockscreen.qml:270
177+#: qml/Components/Lockscreen.qml:255
178178msgid "OK"
179179msgstr "D'acord"
180180
181−#: qml/Dash/GenericScopeView.qml:431 qml/Dash/GenericScopeView.qml:588
181+#: qml/Dash/GenericScopeView.qml:434 qml/Dash/GenericScopeView.qml:591
182182msgid "See less"
183183msgstr "Mostra'n menys"
184184
185−#: qml/Dash/GenericScopeView.qml:431
185+#: qml/Dash/GenericScopeView.qml:434
186186msgid "See all"
187187msgstr "Mostra-ho tot"
188188
189−#: qml/Dash/GenericScopeView.qml:493 qml/Dash/PageHeader.qml:267
189+#: qml/Dash/GenericScopeView.qml:496 qml/Dash/PageHeader.qml:268
190190#: qml/Panel/SearchIndicator.qml:27
191191msgid "Search"
192192msgstr "Cerca"
193193
194−#: qml/Dash/PageHeader.qml:260
194+#: qml/Dash/PageHeader.qml:261
195195msgid "Store"
196196msgstr "Botiga"
197197
198−#: qml/Dash/PageHeader.qml:277
198+#: qml/Dash/PageHeader.qml:278
199199msgid "Settings"
200200msgstr "Paràmetres"
201201
202−#: qml/Dash/PageHeader.qml:284
202+#: qml/Dash/PageHeader.qml:285
203203msgid "Remove from Favorites"
204204msgstr "Suprimeix dels preferits"
205205
206−#: qml/Dash/PageHeader.qml:284
206+#: qml/Dash/PageHeader.qml:285
207207msgid "Add to Favorites"
208208msgstr "Afegeix als preferits"
209209
@@ -299,49 +299,49 @@ msgstr "Desbloca la SIM"
299299msgid "Roaming"
300300msgstr "Itinerància"
301301
302−#: qml/Shell.qml:367
302+#: qml/Shell.qml:402
303303#, qt-format
304304msgid "Enter %1"
305305msgstr "Introduïu: %1"
306306
307−#: qml/Shell.qml:368 qml/Wizard/Pages/passwd-set.qml:60
307+#: qml/Shell.qml:394
308308msgid "Enter passphrase"
309309msgstr "Introduïu la contrasenya"
310310
311−#: qml/Shell.qml:369
311+#: qml/Shell.qml:398
312312msgid "Enter passcode"
313313msgstr "Introduïu el codi d'accés"
314314
315−#: qml/Shell.qml:370
315+#: qml/Shell.qml:403
316316#, qt-format
317317msgid "Sorry, incorrect %1"
318318msgstr "Incorrecte (%1)"
319319
320−#: qml/Shell.qml:371
320+#: qml/Shell.qml:395
321321msgid "Sorry, incorrect passphrase"
322322msgstr "La contrasenya no és correcta"
323323
324−#: qml/Shell.qml:372
324+#: qml/Shell.qml:396
325325msgid "Please re-enter"
326326msgstr "Torneu-ho a introduir"
327327
328−#: qml/Shell.qml:373
328+#: qml/Shell.qml:399
329329msgid "Sorry, incorrect passcode"
330330msgstr "El codi d'accés no és correcte"
331331
332−#: qml/Shell.qml:467 qml/Wizard/Pages/passwd-confirm.qml:53
332+#: qml/Shell.qml:444
333333msgid "Sorry, incorrect passphrase."
334334msgstr "La contrasenya és incorrecta"
335335
336−#: qml/Shell.qml:468 qml/Wizard/Pages/passwd-confirm.qml:54
336+#: qml/Shell.qml:445
337337msgid "Sorry, incorrect passcode."
338338msgstr "El codi d'accés no és correcte"
339339
340−#: qml/Shell.qml:469
340+#: qml/Shell.qml:446
341341msgid "This will be your last attempt."
342342msgstr "Aquest serà el darrer intent."
343343
344−#: qml/Shell.qml:471
344+#: qml/Shell.qml:448
345345msgid ""
346346"If passphrase is entered incorrectly, your phone will conduct a factory "
347347"reset and all personal data will be deleted."
@@ -350,7 +350,7 @@ msgstr ""
350350"reinicialitzarà a l'estat de fàbrica i se suprimiran totes les dades "
351351"personals."
352352
353−#: qml/Shell.qml:472
353+#: qml/Shell.qml:449
354354msgid ""
355355"If passcode is entered incorrectly, your phone will conduct a factory reset "
356356"and all personal data will be deleted."
po/en_AU.po+100−94
@@ -8,26 +8,26 @@ msgstr ""
88"Project-Id-Version: unity\n"
99"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
1010"POT-Creation-Date: 2014-12-10 10:55+0100\n"
11−"PO-Revision-Date: 2014-10-12 09:41+0000\n"
11+"PO-Revision-Date: 2015-01-25 05:57+0000\n"
1212"Last-Translator: Jared Norris <jarednorris@ubuntu.com>\n"
1313"Language-Team: English (Australia) <en_AU@li.org>\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=2; plural=n != 1;\n"
18−"X-Launchpad-Export-Date: 2014-12-13 07:11+0000\n"
19−"X-Generator: Launchpad (build 17286)\n"
18+"X-Launchpad-Export-Date: 2015-01-26 06:54+0000\n"
19+"X-Generator: Launchpad (build 17306)\n"
2020
2121#: plugins/LightDM/Greeter.cpp:130
2222msgid "Password: "
2323msgstr "Password: "
2424
2525#: plugins/Unity/Launcher/launcheritem.cpp:45
26−#: plugins/Unity/Launcher/launcheritem.cpp:100
26+#: plugins/Unity/Launcher/launcheritem.cpp:91
2727msgid "Pin shortcut"
2828msgstr "Pin shortcut"
2929
30−#: plugins/Unity/Launcher/launcheritem.cpp:100
30+#: plugins/Unity/Launcher/launcheritem.cpp:91
3131msgid "Unpin shortcut"
3232msgstr "Unpin shortcut"
3333
@@ -50,45 +50,45 @@ msgid_plural "Please wait %1 minutes and then try again…"
5050msgstr[0] "Please wait %1 minute and then try again…"
5151msgstr[1] "Please wait %1 minutes and then try again…"
5252
53−#: qml/Components/Dialogs.qml:70
53+#: qml/Components/Dialogs.qml:74
5454msgid "Log out"
5555msgstr "Log out"
5656
57−#: qml/Components/Dialogs.qml:71
57+#: qml/Components/Dialogs.qml:75
5858msgid "Are you sure you want to log out?"
5959msgstr "Are you sure you want to log out?"
6060
61−#: qml/Components/Dialogs.qml:73 qml/Components/Dialogs.qml:97
62−#: qml/Components/Dialogs.qml:122
61+#: qml/Components/Dialogs.qml:77 qml/Components/Dialogs.qml:101
62+#: qml/Components/Dialogs.qml:126
6363msgid "No"
6464msgstr "No"
6565
66−#: qml/Components/Dialogs.qml:80 qml/Components/Dialogs.qml:104
67−#: qml/Components/Dialogs.qml:129
66+#: qml/Components/Dialogs.qml:84 qml/Components/Dialogs.qml:108
67+#: qml/Components/Dialogs.qml:133
6868msgid "Yes"
6969msgstr "Yes"
7070
71−#: qml/Components/Dialogs.qml:94
71+#: qml/Components/Dialogs.qml:98
7272msgid "Shut down"
7373msgstr "Shut down"
7474
75−#: qml/Components/Dialogs.qml:95
75+#: qml/Components/Dialogs.qml:99
7676msgid "Are you sure you want to shut down?"
7777msgstr "Are you sure you want to shut down?"
7878
79−#: qml/Components/Dialogs.qml:119
79+#: qml/Components/Dialogs.qml:123
8080msgid "Reboot"
8181msgstr "Reboot"
8282
83−#: qml/Components/Dialogs.qml:120
83+#: qml/Components/Dialogs.qml:124
8484msgid "Are you sure you want to reboot?"
8585msgstr "Are you sure you want to reboot?"
8686
87−#: qml/Components/Dialogs.qml:144
87+#: qml/Components/Dialogs.qml:148
8888msgid "Power"
8989msgstr "Power"
9090
91−#: qml/Components/Dialogs.qml:145
91+#: qml/Components/Dialogs.qml:149
9292msgid ""
9393"Are you sure you would like\n"
9494"to power off?"
@@ -96,15 +96,15 @@ msgstr ""
9696"Are you sure you would like\n"
9797"to power off?"
9898
99−#: qml/Components/Dialogs.qml:147
99+#: qml/Components/Dialogs.qml:151
100100msgid "Power off"
101101msgstr "Power off"
102102
103−#: qml/Components/Dialogs.qml:157
103+#: qml/Components/Dialogs.qml:161
104104msgid "Restart"
105105msgstr "Restart"
106106
107−#: qml/Components/Dialogs.qml:167
107+#: qml/Components/Dialogs.qml:171
108108msgid "Cancel"
109109msgstr "Cancel"
110110
@@ -112,43 +112,43 @@ msgstr "Cancel"
112112msgid "Skip intro"
113113msgstr "Skip intro"
114114
115−#: qml/Components/EdgeDemo.qml:125
115+#: qml/Components/EdgeDemo.qml:112
116116msgid "Right edge"
117117msgstr "Right edge"
118118
119−#: qml/Components/EdgeDemo.qml:126
119+#: qml/Components/EdgeDemo.qml:113
120120msgid "Try swiping from the right edge to unlock the phone"
121121msgstr "Try swiping from the right edge to unlock the phone"
122122
123−#: qml/Components/EdgeDemo.qml:157
123+#: qml/Components/EdgeDemo.qml:144
124124msgid "Top edge"
125125msgstr "Top edge"
126126
127−#: qml/Components/EdgeDemo.qml:158
127+#: qml/Components/EdgeDemo.qml:145
128128msgid "Try swiping from the top edge to access the indicators"
129129msgstr "Try swiping from the top edge to access the indicators"
130130
131−#: qml/Components/EdgeDemo.qml:183
131+#: qml/Components/EdgeDemo.qml:170
132132msgid "Close"
133133msgstr "Close"
134134
135−#: qml/Components/EdgeDemo.qml:184
135+#: qml/Components/EdgeDemo.qml:171
136136msgid "Swipe up again to close the settings screen"
137137msgstr "Swipe up again to close the settings screen"
138138
139−#: qml/Components/EdgeDemo.qml:214
139+#: qml/Components/EdgeDemo.qml:201
140140msgid "Left edge"
141141msgstr "Left edge"
142142
143−#: qml/Components/EdgeDemo.qml:215
143+#: qml/Components/EdgeDemo.qml:202
144144msgid "Swipe from the left to reveal the launcher for quick access to apps"
145145msgstr "Swipe from the left to reveal the launcher for quick access to apps"
146146
147−#: qml/Components/EdgeDemo.qml:242
147+#: qml/Components/EdgeDemo.qml:229
148148msgid "Well done"
149149msgstr "Well done"
150150
151−#: qml/Components/EdgeDemo.qml:243
151+#: qml/Components/EdgeDemo.qml:230
152152msgid ""
153153"You have now mastered the edge gestures and can start using the "
154154"phone<br><br>Tap on the screen to start"
@@ -156,44 +156,44 @@ msgstr ""
156156"You have now mastered the edge gestures and can start using the "
157157"phone<br><br>Tap on the screen to start"
158158
159−#: qml/Components/Lockscreen.qml:238
159+#: qml/Components/Lockscreen.qml:223
160160msgid "Return to Call"
161−msgstr ""
161+msgstr "Return to Call"
162162
163−#: qml/Components/Lockscreen.qml:238
163+#: qml/Components/Lockscreen.qml:223
164164msgid "Emergency Call"
165165msgstr "Emergency Call"
166166
167−#: qml/Components/Lockscreen.qml:270
167+#: qml/Components/Lockscreen.qml:255
168168msgid "OK"
169169msgstr "OK"
170170
171−#: qml/Dash/GenericScopeView.qml:431 qml/Dash/GenericScopeView.qml:588
171+#: qml/Dash/GenericScopeView.qml:434 qml/Dash/GenericScopeView.qml:591
172172msgid "See less"
173173msgstr "See less"
174174
175−#: qml/Dash/GenericScopeView.qml:431
175+#: qml/Dash/GenericScopeView.qml:434
176176msgid "See all"
177177msgstr "See all"
178178
179−#: qml/Dash/GenericScopeView.qml:493 qml/Dash/PageHeader.qml:267
179+#: qml/Dash/GenericScopeView.qml:496 qml/Dash/PageHeader.qml:268
180180#: qml/Panel/SearchIndicator.qml:27
181181msgid "Search"
182182msgstr "Search"
183183
184−#: qml/Dash/PageHeader.qml:260
184+#: qml/Dash/PageHeader.qml:261
185185msgid "Store"
186186msgstr "Store"
187187
188−#: qml/Dash/PageHeader.qml:277
188+#: qml/Dash/PageHeader.qml:278
189189msgid "Settings"
190190msgstr "Settings"
191191
192−#: qml/Dash/PageHeader.qml:284
192+#: qml/Dash/PageHeader.qml:285
193193msgid "Remove from Favorites"
194194msgstr "Remove from Favourites"
195195
196−#: qml/Dash/PageHeader.qml:284
196+#: qml/Dash/PageHeader.qml:285
197197msgid "Add to Favorites"
198198msgstr "Add to Favourites"
199199
@@ -227,15 +227,15 @@ msgstr "Release to refresh…"
227227
228228#: qml/Dash/ScopesList.qml:63
229229msgid "Manage"
230−msgstr ""
230+msgstr "Manage"
231231
232232#: qml/Dash/ScopesList.qml:107
233233msgid "Home"
234−msgstr ""
234+msgstr "Home"
235235
236236#: qml/Dash/ScopesList.qml:108
237237msgid "Also installed"
238−msgstr ""
238+msgstr "Also installed"
239239
240240#: qml/Greeter/Greeter.qml:174
241241msgid "Unlock"
@@ -289,49 +289,49 @@ msgstr "Unlock SIM"
289289msgid "Roaming"
290290msgstr "Roaming"
291291
292−#: qml/Shell.qml:367
292+#: qml/Shell.qml:402
293293#, qt-format
294294msgid "Enter %1"
295295msgstr "Enter %1"
296296
297−#: qml/Shell.qml:368 qml/Wizard/Pages/passwd-set.qml:60
297+#: qml/Shell.qml:394
298298msgid "Enter passphrase"
299299msgstr "Enter passphrase"
300300
301−#: qml/Shell.qml:369
301+#: qml/Shell.qml:398
302302msgid "Enter passcode"
303303msgstr "Enter passcode"
304304
305−#: qml/Shell.qml:370
305+#: qml/Shell.qml:403
306306#, qt-format
307307msgid "Sorry, incorrect %1"
308308msgstr "Sorry, incorrect %1"
309309
310−#: qml/Shell.qml:371
310+#: qml/Shell.qml:395
311311msgid "Sorry, incorrect passphrase"
312312msgstr "Sorry, incorrect passphrase"
313313
314−#: qml/Shell.qml:372
314+#: qml/Shell.qml:396
315315msgid "Please re-enter"
316316msgstr "Please re-enter"
317317
318−#: qml/Shell.qml:373
318+#: qml/Shell.qml:399
319319msgid "Sorry, incorrect passcode"
320320msgstr "Sorry, incorrect passcode"
321321
322−#: qml/Shell.qml:467 qml/Wizard/Pages/passwd-confirm.qml:53
322+#: qml/Shell.qml:444
323323msgid "Sorry, incorrect passphrase."
324324msgstr "Sorry, incorrect passphrase."
325325
326−#: qml/Shell.qml:468 qml/Wizard/Pages/passwd-confirm.qml:54
326+#: qml/Shell.qml:445
327327msgid "Sorry, incorrect passcode."
328328msgstr "Sorry, incorrect passcode."
329329
330−#: qml/Shell.qml:469
330+#: qml/Shell.qml:446
331331msgid "This will be your last attempt."
332332msgstr "This will be your last attempt."
333333
334−#: qml/Shell.qml:471
334+#: qml/Shell.qml:448
335335msgid ""
336336"If passphrase is entered incorrectly, your phone will conduct a factory "
337337"reset and all personal data will be deleted."
@@ -339,7 +339,7 @@ msgstr ""
339339"If passphrase is entered incorrectly, your phone will conduct a factory "
340340"reset and all personal data will be deleted."
341341
342−#: qml/Shell.qml:472
342+#: qml/Shell.qml:449
343343msgid ""
344344"If passcode is entered incorrectly, your phone will conduct a factory reset "
345345"and all personal data will be deleted."
@@ -349,98 +349,98 @@ msgstr ""
349349
350350#: qml/Wizard/Page.qml:89
351351msgid "Back"
352−msgstr ""
352+msgstr "Back"
353353
354354#: qml/Wizard/Pages/10-welcome.qml:27
355355msgid "Hi!"
356−msgstr ""
356+msgstr "Hi!"
357357
358358#: qml/Wizard/Pages/10-welcome.qml:44
359359msgid "Welcome to your Ubuntu phone."
360−msgstr ""
360+msgstr "Welcome to your Ubuntu phone."
361361
362362#: qml/Wizard/Pages/10-welcome.qml:52
363363msgid "Let’s get started."
364−msgstr ""
364+msgstr "Let’s get started."
365365
366366#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:128
367367#: qml/Wizard/Pages/40-wifi.qml:197 qml/Wizard/Pages/50-location.qml:131
368368#: qml/Wizard/Pages/60-reporting.qml:50 qml/Wizard/Pages/passwd-confirm.qml:82
369369#: qml/Wizard/Pages/passwd-set.qml:90
370370msgid "Continue"
371−msgstr ""
371+msgstr "Continue"
372372
373373#: qml/Wizard/Pages/20-sim.qml:25
374374msgid "Add a SIM card and restart your device"
375−msgstr ""
375+msgstr "Add a SIM card and restart your device"
376376
377377#: qml/Wizard/Pages/20-sim.qml:55
378378msgid "Without it, you won’t be able to make calls or use text messaging."
379−msgstr ""
379+msgstr "Without it, you won’t be able to make calls or use text messaging."
380380
381381#: qml/Wizard/Pages/20-sim.qml:69 qml/Wizard/Pages/40-wifi.qml:197
382382msgid "Skip"
383−msgstr ""
383+msgstr "Skip"
384384
385385#: qml/Wizard/Pages/30-passwd-type.qml:39
386386msgid "Lock security"
387−msgstr ""
387+msgstr "Lock security"
388388
389389#: qml/Wizard/Pages/30-passwd-type.qml:74
390390msgid "Please select how you’d like to unlock your phone."
391−msgstr ""
391+msgstr "Please select how you’d like to unlock your phone."
392392
393393#: qml/Wizard/Pages/30-passwd-type.qml:97
394394msgid "Swipe"
395−msgstr ""
395+msgstr "Swipe"
396396
397397#: qml/Wizard/Pages/30-passwd-type.qml:98
398398msgid "No security"
399−msgstr ""
399+msgstr "No security"
400400
401401#: qml/Wizard/Pages/30-passwd-type.qml:100
402402msgid "Passcode"
403−msgstr ""
403+msgstr "Passcode"
404404
405405#: qml/Wizard/Pages/30-passwd-type.qml:101
406406msgid "4 digits only"
407−msgstr ""
407+msgstr "4 digits only"
408408
409409#: qml/Wizard/Pages/30-passwd-type.qml:103
410410msgid "Passphrase"
411−msgstr ""
411+msgstr "Passphrase"
412412
413413#: qml/Wizard/Pages/30-passwd-type.qml:104
414414msgid "Numbers and letters"
415−msgstr ""
415+msgstr "Numbers and letters"
416416
417417#: qml/Wizard/Pages/40-wifi.qml:28
418418msgid "Connect to Wi‑Fi"
419−msgstr ""
419+msgstr "Connect to Wi‑Fi"
420420
421421#: qml/Wizard/Pages/40-wifi.qml:147
422422msgid "Available networks…"
423−msgstr ""
423+msgstr "Available networks…"
424424
425425#: qml/Wizard/Pages/40-wifi.qml:148
426426msgid "No available networks."
427−msgstr ""
427+msgstr "No available networks."
428428
429429#: qml/Wizard/Pages/50-location.qml:27
430430msgid "Location"
431−msgstr ""
431+msgstr "Location"
432432
433433#: qml/Wizard/Pages/50-location.qml:62
434434msgid "Let the phone detect your location:"
435−msgstr ""
435+msgstr "Let the phone detect your location:"
436436
437437#: qml/Wizard/Pages/50-location.qml:69
438438msgid "Using GPS only (less accurate)"
439−msgstr ""
439+msgstr "Using GPS only (less accurate)"
440440
441441#: qml/Wizard/Pages/50-location.qml:86
442442msgid "Using GPS, anonymized Wi-Fi and cellular network info (recommended)"
443−msgstr ""
443+msgstr "Using GPS, anonymised Wi-Fi and cellular network info (recommended)"
444444
445445#. TRANSLATORS: HERE is a trademark for Nokia's location service, you probably shouldn't translate it
446446#: qml/Wizard/Pages/50-location.qml:103
@@ -448,81 +448,87 @@ msgid ""
448448"By selecting this option you agree to the Nokia HERE <a href='#'>terms and "
449449"conditions</a>."
450450msgstr ""
451+"By selecting this option you agree to the Nokia HERE <a href='#'>terms and "
452+"conditions</a>."
451453
452454#: qml/Wizard/Pages/50-location.qml:112
453455msgid "Not at all"
454−msgstr ""
456+msgstr "Not at all"
455457
456458#: qml/Wizard/Pages/50-location.qml:124
457459msgid "You can change your mind later in <b>System Settings</b>."
458−msgstr ""
460+msgstr "You can change your mind later in <b>System Settings</b>."
459461
460462#: qml/Wizard/Pages/60-reporting.qml:24
461463msgid "Improving your experience"
462−msgstr ""
464+msgstr "Improving your experience"
463465
464466#: qml/Wizard/Pages/60-reporting.qml:36
465467msgid ""
466468"Your phone is set up to automatically report errors to Canonical and its "
467469"partners, the makers of the operating system."
468470msgstr ""
471+"Your phone is set up to automatically report errors to Canonical and its "
472+"partners, the makers of the operating system."
469473
470474#: qml/Wizard/Pages/60-reporting.qml:43
471475msgid ""
472476"This can be disabled in <b>System Settings</b> under <b>Security &amp; "
473477"Privacy</b>"
474478msgstr ""
479+"This can be disabled in <b>System Settings</b> under <b>Security &amp; "
480+"Privacy</b>"
475481
476482#: qml/Wizard/Pages/80-finished.qml:24
477483msgid "All done"
478−msgstr ""
484+msgstr "All done"
479485
480486#: qml/Wizard/Pages/80-finished.qml:39
481487msgid "Nice work!"
482−msgstr ""
488+msgstr "Nice work!"
483489
484490#: qml/Wizard/Pages/80-finished.qml:46
485491msgid "Your phone is now ready to use."
486−msgstr ""
492+msgstr "Your phone is now ready to use."
487493
488494#: qml/Wizard/Pages/80-finished.qml:53
489495msgid "Finish"
490−msgstr ""
496+msgstr "Finish"
491497
492498#: qml/Wizard/Pages/here-terms.qml:27
493499msgid "Terms & Conditions"
494−msgstr ""
500+msgstr "Terms & Conditions"
495501
496502#: qml/Wizard/Pages/passwd-confirm.qml:49
497503msgid "Confirm passphrase"
498−msgstr ""
504+msgstr "Confirm passphrase"
499505
500506#: qml/Wizard/Pages/passwd-confirm.qml:50
501507msgid "Confirm passcode"
502−msgstr ""
508+msgstr "Confirm passcode"
503509
504510#: qml/Wizard/Pages/passwd-confirm.qml:53
505511#: qml/Wizard/Pages/passwd-confirm.qml:54
506512msgid "Please try again."
507−msgstr ""
513+msgstr "Please try again."
508514
509515#: qml/Wizard/Pages/passwd-set.qml:61
510516msgid "Choose your passcode"
511−msgstr ""
517+msgstr "Choose your passcode"
512518
513519#: qml/Wizard/Pages/passwd-set.qml:68
514520msgid "Passphrase must be 4 characters long"
515−msgstr ""
521+msgstr "Passphrase must be 4 characters long"
516522
517523#: qml/Wizard/StackButton.qml:39
518524#, qt-format
519525msgid "〈 %1"
520−msgstr ""
526+msgstr "〈 %1"
521527
522528#: qml/Wizard/StackButton.qml:42
523529#, qt-format
524530msgid "%1 〉"
525−msgstr ""
531+msgstr "%1 〉"
526532
527533#~ msgid "Confirm"
528534#~ msgstr "Confirm"
po/en_GB.po+47−41
@@ -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: 2014-12-10 10:55+0100\n"
11−"PO-Revision-Date: 2014-11-05 18:59+0000\n"
11+"PO-Revision-Date: 2015-01-22 12:14+0000\n"
1212"Last-Translator: Andi Chandler <Unknown>\n"
1313"Language-Team: English (United Kingdom) <en_GB@li.org>\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=2; plural=n != 1;\n"
18−"X-Launchpad-Export-Date: 2014-12-13 07:11+0000\n"
19−"X-Generator: Launchpad (build 17286)\n"
18+"X-Launchpad-Export-Date: 2015-01-23 06:48+0000\n"
19+"X-Generator: Launchpad (build 17306)\n"
2020
2121#: plugins/LightDM/Greeter.cpp:130
2222msgid "Password: "
@@ -349,98 +349,98 @@ msgstr ""
349349
350350#: qml/Wizard/Page.qml:89
351351msgid "Back"
352−msgstr ""
352+msgstr "Back"
353353
354354#: qml/Wizard/Pages/10-welcome.qml:27
355355msgid "Hi!"
356−msgstr ""
356+msgstr "Hi!"
357357
358358#: qml/Wizard/Pages/10-welcome.qml:44
359359msgid "Welcome to your Ubuntu phone."
360−msgstr ""
360+msgstr "Welcome to your Ubuntu phone."
361361
362362#: qml/Wizard/Pages/10-welcome.qml:52
363363msgid "Let’s get started."
364−msgstr ""
364+msgstr "Let’s get started."
365365
366366#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:128
367367#: qml/Wizard/Pages/40-wifi.qml:197 qml/Wizard/Pages/50-location.qml:131
368368#: qml/Wizard/Pages/60-reporting.qml:50 qml/Wizard/Pages/passwd-confirm.qml:82
369369#: qml/Wizard/Pages/passwd-set.qml:90
370370msgid "Continue"
371−msgstr ""
371+msgstr "Continue"
372372
373373#: qml/Wizard/Pages/20-sim.qml:25
374374msgid "Add a SIM card and restart your device"
375−msgstr ""
375+msgstr "Add a SIM card and restart your device"
376376
377377#: qml/Wizard/Pages/20-sim.qml:55
378378msgid "Without it, you won’t be able to make calls or use text messaging."
379−msgstr ""
379+msgstr "Without it, you won’t be able to make calls or use text messaging."
380380
381381#: qml/Wizard/Pages/20-sim.qml:69 qml/Wizard/Pages/40-wifi.qml:197
382382msgid "Skip"
383−msgstr ""
383+msgstr "Skip"
384384
385385#: qml/Wizard/Pages/30-passwd-type.qml:39
386386msgid "Lock security"
387−msgstr ""
387+msgstr "Lock security"
388388
389389#: qml/Wizard/Pages/30-passwd-type.qml:74
390390msgid "Please select how you’d like to unlock your phone."
391−msgstr ""
391+msgstr "Please select how you’d like to unlock your phone."
392392
393393#: qml/Wizard/Pages/30-passwd-type.qml:97
394394msgid "Swipe"
395−msgstr ""
395+msgstr "Swipe"
396396
397397#: qml/Wizard/Pages/30-passwd-type.qml:98
398398msgid "No security"
399−msgstr ""
399+msgstr "No security"
400400
401401#: qml/Wizard/Pages/30-passwd-type.qml:100
402402msgid "Passcode"
403−msgstr ""
403+msgstr "Passcode"
404404
405405#: qml/Wizard/Pages/30-passwd-type.qml:101
406406msgid "4 digits only"
407−msgstr ""
407+msgstr "4 digits only"
408408
409409#: qml/Wizard/Pages/30-passwd-type.qml:103
410410msgid "Passphrase"
411−msgstr ""
411+msgstr "Passphrase"
412412
413413#: qml/Wizard/Pages/30-passwd-type.qml:104
414414msgid "Numbers and letters"
415−msgstr ""
415+msgstr "Numbers and letters"
416416
417417#: qml/Wizard/Pages/40-wifi.qml:28
418418msgid "Connect to Wi‑Fi"
419−msgstr ""
419+msgstr "Connect to Wi‑Fi"
420420
421421#: qml/Wizard/Pages/40-wifi.qml:147
422422msgid "Available networks…"
423−msgstr ""
423+msgstr "Available networks…"
424424
425425#: qml/Wizard/Pages/40-wifi.qml:148
426426msgid "No available networks."
427−msgstr ""
427+msgstr "No available networks."
428428
429429#: qml/Wizard/Pages/50-location.qml:27
430430msgid "Location"
431−msgstr ""
431+msgstr "Location"
432432
433433#: qml/Wizard/Pages/50-location.qml:62
434434msgid "Let the phone detect your location:"
435−msgstr ""
435+msgstr "Let the phone detect your location:"
436436
437437#: qml/Wizard/Pages/50-location.qml:69
438438msgid "Using GPS only (less accurate)"
439−msgstr ""
439+msgstr "Using GPS only (less accurate)"
440440
441441#: qml/Wizard/Pages/50-location.qml:86
442442msgid "Using GPS, anonymized Wi-Fi and cellular network info (recommended)"
443−msgstr ""
443+msgstr "Using GPS, anonymised Wi-Fi and cellular network info (recommended)"
444444
445445#. TRANSLATORS: HERE is a trademark for Nokia's location service, you probably shouldn't translate it
446446#: qml/Wizard/Pages/50-location.qml:103
@@ -448,81 +448,87 @@ msgid ""
448448"By selecting this option you agree to the Nokia HERE <a href='#'>terms and "
449449"conditions</a>."
450450msgstr ""
451+"By selecting this option you agree to the Nokia HERE <a href='#'>terms and "
452+"conditions</a>."
451453
452454#: qml/Wizard/Pages/50-location.qml:112
453455msgid "Not at all"
454−msgstr ""
456+msgstr "Not at all"
455457
456458#: qml/Wizard/Pages/50-location.qml:124
457459msgid "You can change your mind later in <b>System Settings</b>."
458−msgstr ""
460+msgstr "You can change your mind later in <b>System Settings</b>."
459461
460462#: qml/Wizard/Pages/60-reporting.qml:24
461463msgid "Improving your experience"
462−msgstr ""
464+msgstr "Improving your experience"
463465
464466#: qml/Wizard/Pages/60-reporting.qml:36
465467msgid ""
466468"Your phone is set up to automatically report errors to Canonical and its "
467469"partners, the makers of the operating system."
468470msgstr ""
471+"Your phone is set up to automatically report errors to Canonical and its "
472+"partners, the makers of the operating system."
469473
470474#: qml/Wizard/Pages/60-reporting.qml:43
471475msgid ""
472476"This can be disabled in <b>System Settings</b> under <b>Security &amp; "
473477"Privacy</b>"
474478msgstr ""
479+"This can be disabled in <b>System Settings</b> under <b>Security &amp; "
480+"Privacy</b>"
475481
476482#: qml/Wizard/Pages/80-finished.qml:24
477483msgid "All done"
478−msgstr ""
484+msgstr "All done"
479485
480486#: qml/Wizard/Pages/80-finished.qml:39
481487msgid "Nice work!"
482−msgstr ""
488+msgstr "Nice work!"
483489
484490#: qml/Wizard/Pages/80-finished.qml:46
485491msgid "Your phone is now ready to use."
486−msgstr ""
492+msgstr "Your phone is now ready to use."
487493
488494#: qml/Wizard/Pages/80-finished.qml:53
489495msgid "Finish"
490−msgstr ""
496+msgstr "Finish"
491497
492498#: qml/Wizard/Pages/here-terms.qml:27
493499msgid "Terms & Conditions"
494−msgstr ""
500+msgstr "Terms & Conditions"
495501
496502#: qml/Wizard/Pages/passwd-confirm.qml:49
497503msgid "Confirm passphrase"
498−msgstr ""
504+msgstr "Confirm passphrase"
499505
500506#: qml/Wizard/Pages/passwd-confirm.qml:50
501507msgid "Confirm passcode"
502−msgstr ""
508+msgstr "Confirm passcode"
503509
504510#: qml/Wizard/Pages/passwd-confirm.qml:53
505511#: qml/Wizard/Pages/passwd-confirm.qml:54
506512msgid "Please try again."
507−msgstr ""
513+msgstr "Please try again."
508514
509515#: qml/Wizard/Pages/passwd-set.qml:61
510516msgid "Choose your passcode"
511−msgstr ""
517+msgstr "Choose your passcode"
512518
513519#: qml/Wizard/Pages/passwd-set.qml:68
514520msgid "Passphrase must be 4 characters long"
515−msgstr ""
521+msgstr "Passphrase must be 4 characters long"
516522
517523#: qml/Wizard/StackButton.qml:39
518524#, qt-format
519525msgid "〈 %1"
520−msgstr ""
526+msgstr "〈 %1"
521527
522528#: qml/Wizard/StackButton.qml:42
523529#, qt-format
524530msgid "%1 〉"
525−msgstr ""
531+msgstr "%1 〉"
526532
527533#~ msgid "Confirm"
528534#~ msgstr "Confirm"
po/es.po+51−45
@@ -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: 2014-12-10 10:55+0100\n"
11−"PO-Revision-Date: 2014-11-08 08:01+0000\n"
12−"Last-Translator: Paco Molinero <paco@byasl.com>\n"
11+"PO-Revision-Date: 2015-01-16 03:09+0000\n"
12+"Last-Translator: Adolfo Jayme <fitoschido@gmail.com>\n"
1313"Language-Team: Spanish <es@li.org>\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=2; plural=n != 1;\n"
18−"X-Launchpad-Export-Date: 2014-12-13 07:11+0000\n"
19−"X-Generator: Launchpad (build 17286)\n"
18+"X-Launchpad-Export-Date: 2015-01-17 07:08+0000\n"
19+"X-Generator: Launchpad (build 17304)\n"
2020
2121#: plugins/LightDM/Greeter.cpp:130
2222msgid "Password: "
@@ -234,15 +234,15 @@ msgstr "Suelte para actualizar…"
234234
235235#: qml/Dash/ScopesList.qml:63
236236msgid "Manage"
237−msgstr ""
237+msgstr "Administrar"
238238
239239#: qml/Dash/ScopesList.qml:107
240240msgid "Home"
241−msgstr ""
241+msgstr "Inicio"
242242
243243#: qml/Dash/ScopesList.qml:108
244244msgid "Also installed"
245−msgstr ""
245+msgstr "También instalados"
246246
247247#: qml/Greeter/Greeter.qml:174
248248msgid "Unlock"
@@ -356,98 +356,98 @@ msgstr ""
356356
357357#: qml/Wizard/Page.qml:89
358358msgid "Back"
359−msgstr ""
359+msgstr "Atrás"
360360
361361#: qml/Wizard/Pages/10-welcome.qml:27
362362msgid "Hi!"
363−msgstr ""
363+msgstr "¡Hola!"
364364
365365#: qml/Wizard/Pages/10-welcome.qml:44
366366msgid "Welcome to your Ubuntu phone."
367−msgstr ""
367+msgstr "Bienvenido a su teléfono Ubuntu."
368368
369369#: qml/Wizard/Pages/10-welcome.qml:52
370370msgid "Let’s get started."
371−msgstr ""
371+msgstr "Comencemos."
372372
373373#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:128
374374#: qml/Wizard/Pages/40-wifi.qml:197 qml/Wizard/Pages/50-location.qml:131
375375#: qml/Wizard/Pages/60-reporting.qml:50 qml/Wizard/Pages/passwd-confirm.qml:82
376376#: qml/Wizard/Pages/passwd-set.qml:90
377377msgid "Continue"
378−msgstr ""
378+msgstr "Continuar"
379379
380380#: qml/Wizard/Pages/20-sim.qml:25
381381msgid "Add a SIM card and restart your device"
382−msgstr ""
382+msgstr "Inserte una tarjeta SIM y reinicie el dispositivo"
383383
384384#: qml/Wizard/Pages/20-sim.qml:55
385385msgid "Without it, you won’t be able to make calls or use text messaging."
386−msgstr ""
386+msgstr "Sin ella, no podrá hacer llamadas ni enviar mensajes."
387387
388388#: qml/Wizard/Pages/20-sim.qml:69 qml/Wizard/Pages/40-wifi.qml:197
389389msgid "Skip"
390−msgstr ""
390+msgstr "Omitir"
391391
392392#: qml/Wizard/Pages/30-passwd-type.qml:39
393393msgid "Lock security"
394−msgstr ""
394+msgstr "Seguridad de bloqueo"
395395
396396#: qml/Wizard/Pages/30-passwd-type.qml:74
397397msgid "Please select how you’d like to unlock your phone."
398−msgstr ""
398+msgstr "Seleccione el método de desbloqueo del teléfono."
399399
400400#: qml/Wizard/Pages/30-passwd-type.qml:97
401401msgid "Swipe"
402−msgstr ""
402+msgstr "Deslizar"
403403
404404#: qml/Wizard/Pages/30-passwd-type.qml:98
405405msgid "No security"
406−msgstr ""
406+msgstr "Sin seguridad"
407407
408408#: qml/Wizard/Pages/30-passwd-type.qml:100
409409msgid "Passcode"
410−msgstr ""
410+msgstr "Código"
411411
412412#: qml/Wizard/Pages/30-passwd-type.qml:101
413413msgid "4 digits only"
414−msgstr ""
414+msgstr "Solo 4 dígitos"
415415
416416#: qml/Wizard/Pages/30-passwd-type.qml:103
417417msgid "Passphrase"
418−msgstr ""
418+msgstr "Contraseña"
419419
420420#: qml/Wizard/Pages/30-passwd-type.qml:104
421421msgid "Numbers and letters"
422−msgstr ""
422+msgstr "Números y letras"
423423
424424#: qml/Wizard/Pages/40-wifi.qml:28
425425msgid "Connect to Wi‑Fi"
426−msgstr ""
426+msgstr "Conectar con wifi"
427427
428428#: qml/Wizard/Pages/40-wifi.qml:147
429429msgid "Available networks…"
430−msgstr ""
430+msgstr "Redes disponibles…"
431431
432432#: qml/Wizard/Pages/40-wifi.qml:148
433433msgid "No available networks."
434−msgstr ""
434+msgstr "No hay redes disponibles."
435435
436436#: qml/Wizard/Pages/50-location.qml:27
437437msgid "Location"
438−msgstr ""
438+msgstr "Ubicación"
439439
440440#: qml/Wizard/Pages/50-location.qml:62
441441msgid "Let the phone detect your location:"
442−msgstr ""
442+msgstr "Permitir que el teléfono detecte su ubicación:"
443443
444444#: qml/Wizard/Pages/50-location.qml:69
445445msgid "Using GPS only (less accurate)"
446−msgstr ""
446+msgstr "Usando solo GPS (poco preciso)"
447447
448448#: qml/Wizard/Pages/50-location.qml:86
449449msgid "Using GPS, anonymized Wi-Fi and cellular network info (recommended)"
450−msgstr ""
450+msgstr "Usando GPS, wifi anonimizado y red de datos móviles (recomendado)"
451451
452452#. TRANSLATORS: HERE is a trademark for Nokia's location service, you probably shouldn't translate it
453453#: qml/Wizard/Pages/50-location.qml:103
@@ -455,81 +455,87 @@ msgid ""
455455"By selecting this option you agree to the Nokia HERE <a href='#'>terms and "
456456"conditions</a>."
457457msgstr ""
458+"Al seleccionar esta opción acepta los <a href='#'>términos y condiciones</a> "
459+"de Nokia HERE."
458460
459461#: qml/Wizard/Pages/50-location.qml:112
460462msgid "Not at all"
461−msgstr ""
463+msgstr "De ningún modo"
462464
463465#: qml/Wizard/Pages/50-location.qml:124
464466msgid "You can change your mind later in <b>System Settings</b>."
465−msgstr ""
467+msgstr "Si cambia de opinión, vaya a <b>Configuración del sistema</b>."
466468
467469#: qml/Wizard/Pages/60-reporting.qml:24
468470msgid "Improving your experience"
469−msgstr ""
471+msgstr "Mejorar la experiencia"
470472
471473#: qml/Wizard/Pages/60-reporting.qml:36
472474msgid ""
473475"Your phone is set up to automatically report errors to Canonical and its "
474476"partners, the makers of the operating system."
475477msgstr ""
478+"El teléfono está configurado para enviar automáticamente informes de error a "
479+"Canonical y sus socios, los creadores del sistema operativo."
476480
477481#: qml/Wizard/Pages/60-reporting.qml:43
478482msgid ""
479483"This can be disabled in <b>System Settings</b> under <b>Security &amp; "
480484"Privacy</b>"
481485msgstr ""
486+"Esto se puede desactivar en <b>Configuración del sistema</b> &gt; "
487+"<b>Seguridad y privacidad</b>."
482488
483489#: qml/Wizard/Pages/80-finished.qml:24
484490msgid "All done"
485−msgstr ""
491+msgstr "Hecho"
486492
487493#: qml/Wizard/Pages/80-finished.qml:39
488494msgid "Nice work!"
489−msgstr ""
495+msgstr "¡Buen trabajo!"
490496
491497#: qml/Wizard/Pages/80-finished.qml:46
492498msgid "Your phone is now ready to use."
493−msgstr ""
499+msgstr "El teléfono ya está listo para usarse."
494500
495501#: qml/Wizard/Pages/80-finished.qml:53
496502msgid "Finish"
497−msgstr ""
503+msgstr "Finalizar"
498504
499505#: qml/Wizard/Pages/here-terms.qml:27
500506msgid "Terms & Conditions"
501−msgstr ""
507+msgstr "Términos y condiciones"
502508
503509#: qml/Wizard/Pages/passwd-confirm.qml:49
504510msgid "Confirm passphrase"
505−msgstr ""
511+msgstr "Confirme la contraseña"
506512
507513#: qml/Wizard/Pages/passwd-confirm.qml:50
508514msgid "Confirm passcode"
509−msgstr ""
515+msgstr "Confirme el código"
510516
511517#: qml/Wizard/Pages/passwd-confirm.qml:53
512518#: qml/Wizard/Pages/passwd-confirm.qml:54
513519msgid "Please try again."
514−msgstr ""
520+msgstr "Inténtelo de nuevo."
515521
516522#: qml/Wizard/Pages/passwd-set.qml:61
517523msgid "Choose your passcode"
518−msgstr ""
524+msgstr "Elija su código"
519525
520526#: qml/Wizard/Pages/passwd-set.qml:68
521527msgid "Passphrase must be 4 characters long"
522−msgstr ""
528+msgstr "El código debe tener 4 caracteres"
523529
524530#: qml/Wizard/StackButton.qml:39
525531#, qt-format
526532msgid "〈 %1"
527−msgstr ""
533+msgstr "〈 %1"
528534
529535#: qml/Wizard/StackButton.qml:42
530536#, qt-format
531537msgid "%1 〉"
532−msgstr ""
538+msgstr "%1 〉"
533539
534540#~ msgid "Confirm"
535541#~ msgstr "Confirmar"
po/eu.po+51−43
@@ -8,15 +8,15 @@ msgstr ""
88"Project-Id-Version: unity8\n"
99"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
1010"POT-Creation-Date: 2014-12-10 10:55+0100\n"
11−"PO-Revision-Date: 2014-11-08 14:44+0000\n"
11+"PO-Revision-Date: 2015-01-22 21:40+0000\n"
1212"Last-Translator: Ibai Oihanguren Sala <Unknown>\n"
1313"Language-Team: Basque <eu@li.org>\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=2; plural=n != 1;\n"
18−"X-Launchpad-Export-Date: 2014-12-13 07:10+0000\n"
19−"X-Generator: Launchpad (build 17286)\n"
18+"X-Launchpad-Export-Date: 2015-01-23 06:48+0000\n"
19+"X-Generator: Launchpad (build 17306)\n"
2020
2121#: plugins/LightDM/Greeter.cpp:130
2222msgid "Password: "
@@ -231,15 +231,15 @@ msgstr "Askatu freskatzeko…"
231231
232232#: qml/Dash/ScopesList.qml:63
233233msgid "Manage"
234−msgstr ""
234+msgstr "Kudeatu"
235235
236236#: qml/Dash/ScopesList.qml:107
237237msgid "Home"
238−msgstr ""
238+msgstr "Hasiera"
239239
240240#: qml/Dash/ScopesList.qml:108
241241msgid "Also installed"
242−msgstr ""
242+msgstr "Hau ere instalatuta"
243243
244244#: qml/Greeter/Greeter.qml:174
245245msgid "Unlock"
@@ -353,98 +353,100 @@ msgstr ""
353353
354354#: qml/Wizard/Page.qml:89
355355msgid "Back"
356−msgstr ""
356+msgstr "Atzera"
357357
358358#: qml/Wizard/Pages/10-welcome.qml:27
359359msgid "Hi!"
360−msgstr ""
360+msgstr "Epa!"
361361
362362#: qml/Wizard/Pages/10-welcome.qml:44
363363msgid "Welcome to your Ubuntu phone."
364−msgstr ""
364+msgstr "Ongi etorri zure Ubuntu telefonora."
365365
366366#: qml/Wizard/Pages/10-welcome.qml:52
367367msgid "Let’s get started."
368−msgstr ""
368+msgstr "Has gaitezen."
369369
370370#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:128
371371#: qml/Wizard/Pages/40-wifi.qml:197 qml/Wizard/Pages/50-location.qml:131
372372#: qml/Wizard/Pages/60-reporting.qml:50 qml/Wizard/Pages/passwd-confirm.qml:82
373373#: qml/Wizard/Pages/passwd-set.qml:90
374374msgid "Continue"
375−msgstr ""
375+msgstr "Jarraitu"
376376
377377#: qml/Wizard/Pages/20-sim.qml:25
378378msgid "Add a SIM card and restart your device"
379−msgstr ""
379+msgstr "Gehitu SIM txartel bat eta berrabiarazi zure gailua"
380380
381381#: qml/Wizard/Pages/20-sim.qml:55
382382msgid "Without it, you won’t be able to make calls or use text messaging."
383−msgstr ""
383+msgstr "Hura gabe, ezingo duzu deirik egin edo testu-mezularitza erabili."
384384
385385#: qml/Wizard/Pages/20-sim.qml:69 qml/Wizard/Pages/40-wifi.qml:197
386386msgid "Skip"
387−msgstr ""
387+msgstr "Saltatu"
388388
389389#: qml/Wizard/Pages/30-passwd-type.qml:39
390390msgid "Lock security"
391−msgstr ""
391+msgstr "Blokeo-segurtasuna"
392392
393393#: qml/Wizard/Pages/30-passwd-type.qml:74
394394msgid "Please select how you’d like to unlock your phone."
395−msgstr ""
395+msgstr "Aukeratu telefonoa nola desblokeatu nahi duzun."
396396
397397#: qml/Wizard/Pages/30-passwd-type.qml:97
398398msgid "Swipe"
399−msgstr ""
399+msgstr "Pasatu hatza"
400400
401401#: qml/Wizard/Pages/30-passwd-type.qml:98
402402msgid "No security"
403−msgstr ""
403+msgstr "Segurtasunik gabe"
404404
405405#: qml/Wizard/Pages/30-passwd-type.qml:100
406406msgid "Passcode"
407−msgstr ""
407+msgstr "Pasakodea"
408408
409409#: qml/Wizard/Pages/30-passwd-type.qml:101
410410msgid "4 digits only"
411−msgstr ""
411+msgstr "4 digitu soilik"
412412
413413#: qml/Wizard/Pages/30-passwd-type.qml:103
414414msgid "Passphrase"
415−msgstr ""
415+msgstr "Pasaesaldia"
416416
417417#: qml/Wizard/Pages/30-passwd-type.qml:104
418418msgid "Numbers and letters"
419−msgstr ""
419+msgstr "Zenbakiak eta hizkiak"
420420
421421#: qml/Wizard/Pages/40-wifi.qml:28
422422msgid "Connect to Wi‑Fi"
423−msgstr ""
423+msgstr "Konektatu wifira"
424424
425425#: qml/Wizard/Pages/40-wifi.qml:147
426426msgid "Available networks…"
427−msgstr ""
427+msgstr "Sare erabilgarriak…"
428428
429429#: qml/Wizard/Pages/40-wifi.qml:148
430430msgid "No available networks."
431−msgstr ""
431+msgstr "Ez dago sare erabilgarririk."
432432
433433#: qml/Wizard/Pages/50-location.qml:27
434434msgid "Location"
435−msgstr ""
435+msgstr "Kokalekua"
436436
437437#: qml/Wizard/Pages/50-location.qml:62
438438msgid "Let the phone detect your location:"
439−msgstr ""
439+msgstr "Utzi telefonoari zure kokalekua detektatzen:"
440440
441441#: qml/Wizard/Pages/50-location.qml:69
442442msgid "Using GPS only (less accurate)"
443−msgstr ""
443+msgstr "GPSa soilik erabiltzen (zehaztasun gutxiago)"
444444
445445#: qml/Wizard/Pages/50-location.qml:86
446446msgid "Using GPS, anonymized Wi-Fi and cellular network info (recommended)"
447447msgstr ""
448+"GPSa, wifi anonimotua eta sare mugikorraren informazioa erabiltzen "
449+"(gomendatua)"
448450
449451#. TRANSLATORS: HERE is a trademark for Nokia's location service, you probably shouldn't translate it
450452#: qml/Wizard/Pages/50-location.qml:103
@@ -452,81 +454,87 @@ msgid ""
452454"By selecting this option you agree to the Nokia HERE <a href='#'>terms and "
453455"conditions</a>."
454456msgstr ""
457+"Aukera hau hautatuz, Nokia HERE(r)en <a href='#'>baldintzak</a> onartzeko "
458+"dituzu."
455459
456460#: qml/Wizard/Pages/50-location.qml:112
457461msgid "Not at all"
458−msgstr ""
462+msgstr "Bat ere ez"
459463
460464#: qml/Wizard/Pages/50-location.qml:124
461465msgid "You can change your mind later in <b>System Settings</b>."
462−msgstr ""
466+msgstr "Geroago ere alda dezakezu <b>Sistemaren ezarpenetan</b>."
463467
464468#: qml/Wizard/Pages/60-reporting.qml:24
465469msgid "Improving your experience"
466−msgstr ""
470+msgstr "Zure esperientzia hobetuz"
467471
468472#: qml/Wizard/Pages/60-reporting.qml:36
469473msgid ""
470474"Your phone is set up to automatically report errors to Canonical and its "
471475"partners, the makers of the operating system."
472476msgstr ""
477+"Telefonoa erroreen berria automatikoki Canonical-i eta honen bazkideei "
478+"emateko konfiguratuta dago, sistema eragilearen egileei."
473479
474480#: qml/Wizard/Pages/60-reporting.qml:43
475481msgid ""
476482"This can be disabled in <b>System Settings</b> under <b>Security &amp; "
477483"Privacy</b>"
478484msgstr ""
485+"Hau <b>Sistemaren ezarpenetatik</b> desgaitu daiteke, <b>Segurtasuna eta "
486+"pribatutasuna</b> atalean"
479487
480488#: qml/Wizard/Pages/80-finished.qml:24
481489msgid "All done"
482−msgstr ""
490+msgstr "Eginda"
483491
484492#: qml/Wizard/Pages/80-finished.qml:39
485493msgid "Nice work!"
486−msgstr ""
494+msgstr "Bikain!"
487495
488496#: qml/Wizard/Pages/80-finished.qml:46
489497msgid "Your phone is now ready to use."
490−msgstr ""
498+msgstr "Zure telefonoa erabiltzeko prest dago."
491499
492500#: qml/Wizard/Pages/80-finished.qml:53
493501msgid "Finish"
494−msgstr ""
502+msgstr "Amaitu"
495503
496504#: qml/Wizard/Pages/here-terms.qml:27
497505msgid "Terms & Conditions"
498−msgstr ""
506+msgstr "Baldintzak"
499507
500508#: qml/Wizard/Pages/passwd-confirm.qml:49
501509msgid "Confirm passphrase"
502−msgstr ""
510+msgstr "Berretsi pasaesaldia"
503511
504512#: qml/Wizard/Pages/passwd-confirm.qml:50
505513msgid "Confirm passcode"
506−msgstr ""
514+msgstr "Berretsi pasakodea"
507515
508516#: qml/Wizard/Pages/passwd-confirm.qml:53
509517#: qml/Wizard/Pages/passwd-confirm.qml:54
510518msgid "Please try again."
511−msgstr ""
519+msgstr "Saiatu berriro."
512520
513521#: qml/Wizard/Pages/passwd-set.qml:61
514522msgid "Choose your passcode"
515−msgstr ""
523+msgstr "Aukeratu zure pasakodea"
516524
517525#: qml/Wizard/Pages/passwd-set.qml:68
518526msgid "Passphrase must be 4 characters long"
519−msgstr ""
527+msgstr "Pasaesaldiak 4 karaktereko luzera izan behar du"
520528
521529#: qml/Wizard/StackButton.qml:39
522530#, qt-format
523531msgid "〈 %1"
524−msgstr ""
532+msgstr "〈 %1"
525533
526534#: qml/Wizard/StackButton.qml:42
527535#, qt-format
528536msgid "%1 〉"
529−msgstr ""
537+msgstr "%1 〉"
530538
531539#~ msgid "Type or say a command"
532540#~ msgstr "Idatzi edo esan agindu bat"
po/hu.po+55−55
@@ -8,26 +8,26 @@ msgstr ""
88"Project-Id-Version: unity\n"
99"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
1010"POT-Creation-Date: 2014-12-10 10:55+0100\n"
11−"PO-Revision-Date: 2014-12-21 15:13+0000\n"
11+"PO-Revision-Date: 2015-01-17 10:51+0000\n"
1212"Last-Translator: Richard Somlói <ricsipontaz@gmail.com>\n"
1313"Language-Team: Hungarian <hu@li.org>\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=2; plural=n != 1;\n"
18−"X-Launchpad-Export-Date: 2014-12-22 07:05+0000\n"
19−"X-Generator: Launchpad (build 17286)\n"
18+"X-Launchpad-Export-Date: 2015-01-18 05:03+0000\n"
19+"X-Generator: Launchpad (build 17304)\n"
2020
2121#: plugins/LightDM/Greeter.cpp:130
2222msgid "Password: "
2323msgstr "Jelszó: "
2424
2525#: plugins/Unity/Launcher/launcheritem.cpp:45
26−#: plugins/Unity/Launcher/launcheritem.cpp:91
26+#: plugins/Unity/Launcher/launcheritem.cpp:100
2727msgid "Pin shortcut"
2828msgstr "Indító rögzítése"
2929
30−#: plugins/Unity/Launcher/launcheritem.cpp:91
30+#: plugins/Unity/Launcher/launcheritem.cpp:100
3131msgid "Unpin shortcut"
3232msgstr "Indító feloldása"
3333
@@ -50,45 +50,45 @@ msgid_plural "Please wait %1 minutes and then try again…"
5050msgstr[0] "Várjon %1 percet és próbálja újra…"
5151msgstr[1] "Várjon %1 percet és próbálja újra…"
5252
53−#: qml/Components/Dialogs.qml:74
53+#: qml/Components/Dialogs.qml:70
5454msgid "Log out"
5555msgstr "Kijelentkezés"
5656
57−#: qml/Components/Dialogs.qml:75
57+#: qml/Components/Dialogs.qml:71
5858msgid "Are you sure you want to log out?"
5959msgstr "Biztos benne, hogy kijelentkezik?"
6060
61−#: qml/Components/Dialogs.qml:77 qml/Components/Dialogs.qml:101
62−#: qml/Components/Dialogs.qml:126
61+#: qml/Components/Dialogs.qml:73 qml/Components/Dialogs.qml:97
62+#: qml/Components/Dialogs.qml:122
6363msgid "No"
6464msgstr "Nem"
6565
66−#: qml/Components/Dialogs.qml:84 qml/Components/Dialogs.qml:108
67−#: qml/Components/Dialogs.qml:133
66+#: qml/Components/Dialogs.qml:80 qml/Components/Dialogs.qml:104
67+#: qml/Components/Dialogs.qml:129
6868msgid "Yes"
6969msgstr "Igen"
7070
71−#: qml/Components/Dialogs.qml:98
71+#: qml/Components/Dialogs.qml:94
7272msgid "Shut down"
7373msgstr "Leállítás"
7474
75−#: qml/Components/Dialogs.qml:99
75+#: qml/Components/Dialogs.qml:95
7676msgid "Are you sure you want to shut down?"
7777msgstr "Biztosan le szeretné állítani?"
7878
79−#: qml/Components/Dialogs.qml:123
79+#: qml/Components/Dialogs.qml:119
8080msgid "Reboot"
8181msgstr "Újraindítás"
8282
83−#: qml/Components/Dialogs.qml:124
83+#: qml/Components/Dialogs.qml:120
8484msgid "Are you sure you want to reboot?"
8585msgstr "Biztosan újra szeretné indítani?"
8686
87−#: qml/Components/Dialogs.qml:148
87+#: qml/Components/Dialogs.qml:144
8888msgid "Power"
8989msgstr "Kikapcsolás"
9090
91−#: qml/Components/Dialogs.qml:149
91+#: qml/Components/Dialogs.qml:145
9292msgid ""
9393"Are you sure you would like\n"
9494"to power off?"
@@ -96,15 +96,15 @@ msgstr ""
9696"Biztos benne, hogy ki\n"
9797"szeretné kapcsolni?"
9898
99−#: qml/Components/Dialogs.qml:151
99+#: qml/Components/Dialogs.qml:147
100100msgid "Power off"
101101msgstr "Kikapcsolás"
102102
103−#: qml/Components/Dialogs.qml:161
103+#: qml/Components/Dialogs.qml:157
104104msgid "Restart"
105105msgstr "Újraindítás"
106106
107−#: qml/Components/Dialogs.qml:171
107+#: qml/Components/Dialogs.qml:167
108108msgid "Cancel"
109109msgstr "Mégse"
110110
@@ -112,45 +112,45 @@ msgstr "Mégse"
112112msgid "Skip intro"
113113msgstr "A bemutató kihagyása"
114114
115−#: qml/Components/EdgeDemo.qml:112
115+#: qml/Components/EdgeDemo.qml:125
116116msgid "Right edge"
117117msgstr "Jobb szél"
118118
119−#: qml/Components/EdgeDemo.qml:113
119+#: qml/Components/EdgeDemo.qml:126
120120msgid "Try swiping from the right edge to unlock the phone"
121121msgstr "A telefon feloldásához csúsztassa ujját a jobb szélről"
122122
123−#: qml/Components/EdgeDemo.qml:144
123+#: qml/Components/EdgeDemo.qml:157
124124msgid "Top edge"
125125msgstr "Felső szél"
126126
127−#: qml/Components/EdgeDemo.qml:145
127+#: qml/Components/EdgeDemo.qml:158
128128msgid "Try swiping from the top edge to access the indicators"
129129msgstr "Az állapotmenük eléréséhez csúsztassa ujját a felső szélről"
130130
131−#: qml/Components/EdgeDemo.qml:170
131+#: qml/Components/EdgeDemo.qml:183
132132msgid "Close"
133133msgstr "Bezárás"
134134
135−#: qml/Components/EdgeDemo.qml:171
135+#: qml/Components/EdgeDemo.qml:184
136136msgid "Swipe up again to close the settings screen"
137137msgstr "A beállítások bezárásához csúsztassa ujját újra felfelé"
138138
139−#: qml/Components/EdgeDemo.qml:201
139+#: qml/Components/EdgeDemo.qml:214
140140msgid "Left edge"
141141msgstr "Bal szél"
142142
143−#: qml/Components/EdgeDemo.qml:202
143+#: qml/Components/EdgeDemo.qml:215
144144msgid "Swipe from the left to reveal the launcher for quick access to apps"
145145msgstr ""
146146"Csúsztassa ujját a bal szélről az indítón található alkalmazások gyors "
147147"eléréséhez"
148148
149−#: qml/Components/EdgeDemo.qml:229
149+#: qml/Components/EdgeDemo.qml:242
150150msgid "Well done"
151151msgstr "Rendben"
152152
153−#: qml/Components/EdgeDemo.qml:230
153+#: qml/Components/EdgeDemo.qml:243
154154msgid ""
155155"You have now mastered the edge gestures and can start using the "
156156"phone<br><br>Tap on the screen to start"
@@ -158,44 +158,44 @@ msgstr ""
158158"Elsajátította a gesztusokat, és megkezdheti a telefon "
159159"használatát.<br><br>Koppintson a képernyőre a kezdéshez."
160160
161−#: qml/Components/Lockscreen.qml:223
161+#: qml/Components/Lockscreen.qml:238
162162msgid "Return to Call"
163163msgstr "Vissza a híváshoz"
164164
165−#: qml/Components/Lockscreen.qml:223
165+#: qml/Components/Lockscreen.qml:238
166166msgid "Emergency Call"
167167msgstr "Vészhívás"
168168
169−#: qml/Components/Lockscreen.qml:255
169+#: qml/Components/Lockscreen.qml:270
170170msgid "OK"
171171msgstr "Ok"
172172
173−#: qml/Dash/GenericScopeView.qml:434 qml/Dash/GenericScopeView.qml:591
173+#: qml/Dash/GenericScopeView.qml:431 qml/Dash/GenericScopeView.qml:588
174174msgid "See less"
175175msgstr "Kevesebb"
176176
177−#: qml/Dash/GenericScopeView.qml:434
177+#: qml/Dash/GenericScopeView.qml:431
178178msgid "See all"
179179msgstr "Összes megtekintése"
180180
181−#: qml/Dash/GenericScopeView.qml:496 qml/Dash/PageHeader.qml:268
181+#: qml/Dash/GenericScopeView.qml:493 qml/Dash/PageHeader.qml:267
182182#: qml/Panel/SearchIndicator.qml:27
183183msgid "Search"
184184msgstr "Keresés"
185185
186−#: qml/Dash/PageHeader.qml:261
186+#: qml/Dash/PageHeader.qml:260
187187msgid "Store"
188188msgstr "Áruház"
189189
190−#: qml/Dash/PageHeader.qml:278
190+#: qml/Dash/PageHeader.qml:277
191191msgid "Settings"
192192msgstr "Beállítások"
193193
194−#: qml/Dash/PageHeader.qml:285
194+#: qml/Dash/PageHeader.qml:284
195195msgid "Remove from Favorites"
196196msgstr "Eltávolítás a kedvencek közül"
197197
198−#: qml/Dash/PageHeader.qml:285
198+#: qml/Dash/PageHeader.qml:284
199199msgid "Add to Favorites"
200200msgstr "Hozzáadás a kedvencekhez"
201201
@@ -229,7 +229,7 @@ msgstr "Engedje el a frissítéshez…"
229229
230230#: qml/Dash/ScopesList.qml:63
231231msgid "Manage"
232−msgstr "Kezelés"
232+msgstr "Szerkesztés"
233233
234234#: qml/Dash/ScopesList.qml:107
235235msgid "Home"
@@ -237,7 +237,7 @@ msgstr "Kezdőlapon"
237237
238238#: qml/Dash/ScopesList.qml:108
239239msgid "Also installed"
240−msgstr "Szintén telepítve"
240+msgstr "Telepítve"
241241
242242#: qml/Greeter/Greeter.qml:174
243243msgid "Unlock"
@@ -291,49 +291,49 @@ msgstr "SIM feloldása"
291291msgid "Roaming"
292292msgstr "Barangolás"
293293
294−#: qml/Shell.qml:402
294+#: qml/Shell.qml:367
295295#, qt-format
296296msgid "Enter %1"
297297msgstr "Adja meg: %1"
298298
299−#: qml/Shell.qml:394
299+#: qml/Shell.qml:368 qml/Wizard/Pages/passwd-set.qml:60
300300msgid "Enter passphrase"
301301msgstr "Jelmondat megadása"
302302
303−#: qml/Shell.qml:398
303+#: qml/Shell.qml:369
304304msgid "Enter passcode"
305305msgstr "Jelkód megadása"
306306
307−#: qml/Shell.qml:403
307+#: qml/Shell.qml:370
308308#, qt-format
309309msgid "Sorry, incorrect %1"
310310msgstr "Sajnálom, helytelen %1"
311311
312−#: qml/Shell.qml:395
312+#: qml/Shell.qml:371
313313msgid "Sorry, incorrect passphrase"
314314msgstr "Sajnálom, helytelen jelmondat"
315315
316−#: qml/Shell.qml:396
316+#: qml/Shell.qml:372
317317msgid "Please re-enter"
318318msgstr "Próbálja újra"
319319
320−#: qml/Shell.qml:399
320+#: qml/Shell.qml:373
321321msgid "Sorry, incorrect passcode"
322322msgstr "Sajnálom, helytelen jelkód"
323323
324−#: qml/Shell.qml:444
324+#: qml/Shell.qml:467 qml/Wizard/Pages/passwd-confirm.qml:53
325325msgid "Sorry, incorrect passphrase."
326326msgstr "Sajnálom, helytelen jelmondat."
327327
328−#: qml/Shell.qml:445
328+#: qml/Shell.qml:468 qml/Wizard/Pages/passwd-confirm.qml:54
329329msgid "Sorry, incorrect passcode."
330330msgstr "Sajnálom, helytelen jelkód."
331331
332−#: qml/Shell.qml:446
332+#: qml/Shell.qml:469
333333msgid "This will be your last attempt."
334334msgstr "Ez az utolsó próbálkozási lehetősége."
335335
336−#: qml/Shell.qml:448
336+#: qml/Shell.qml:471
337337msgid ""
338338"If passphrase is entered incorrectly, your phone will conduct a factory "
339339"reset and all personal data will be deleted."
@@ -341,7 +341,7 @@ msgstr ""
341341"Ha helytelen jelmondatot ad meg, a telefonja visszaállítja a gyári "
342342"beállításokat és törli minden személyes adatát."
343343
344−#: qml/Shell.qml:449
344+#: qml/Shell.qml:472
345345msgid ""
346346"If passcode is entered incorrectly, your phone will conduct a factory reset "
347347"and all personal data will be deleted."
@@ -457,7 +457,7 @@ msgstr ""
457457
458458#: qml/Wizard/Pages/50-location.qml:112
459459msgid "Not at all"
460−msgstr ""
460+msgstr "Ne tegye"
461461
462462#: qml/Wizard/Pages/50-location.qml:124
463463msgid "You can change your mind later in <b>System Settings</b>."
po/nb.po+51−45
@@ -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: 2014-12-10 10:55+0100\n"
11−"PO-Revision-Date: 2014-11-12 19:57+0000\n"
12−"Last-Translator: Ari Börde Kröyer <Unknown>\n"
11+"PO-Revision-Date: 2015-01-15 06:54+0000\n"
12+"Last-Translator: Åka Sikrom <Unknown>\n"
1313"Language-Team: Norwegian Bokmal <nb@li.org>\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=2; plural=n != 1;\n"
18−"X-Launchpad-Export-Date: 2014-12-13 07:11+0000\n"
19−"X-Generator: Launchpad (build 17286)\n"
18+"X-Launchpad-Export-Date: 2015-01-16 06:21+0000\n"
19+"X-Generator: Launchpad (build 17303)\n"
2020
2121#: plugins/LightDM/Greeter.cpp:130
2222msgid "Password: "
@@ -229,15 +229,15 @@ msgstr "Slipp for å oppdatere …"
229229
230230#: qml/Dash/ScopesList.qml:63
231231msgid "Manage"
232−msgstr ""
232+msgstr "Behandle"
233233
234234#: qml/Dash/ScopesList.qml:107
235235msgid "Home"
236−msgstr ""
236+msgstr "Hjem"
237237
238238#: qml/Dash/ScopesList.qml:108
239239msgid "Also installed"
240−msgstr ""
240+msgstr "Også installert"
241241
242242#: qml/Greeter/Greeter.qml:174
243243msgid "Unlock"
@@ -351,98 +351,98 @@ msgstr ""
351351
352352#: qml/Wizard/Page.qml:89
353353msgid "Back"
354−msgstr ""
354+msgstr "Tilbake"
355355
356356#: qml/Wizard/Pages/10-welcome.qml:27
357357msgid "Hi!"
358−msgstr ""
358+msgstr "Hei!"
359359
360360#: qml/Wizard/Pages/10-welcome.qml:44
361361msgid "Welcome to your Ubuntu phone."
362−msgstr ""
362+msgstr "Velkommen til Ubuntu-telefonen."
363363
364364#: qml/Wizard/Pages/10-welcome.qml:52
365365msgid "Let’s get started."
366−msgstr ""
366+msgstr "La oss komme i gang."
367367
368368#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:128
369369#: qml/Wizard/Pages/40-wifi.qml:197 qml/Wizard/Pages/50-location.qml:131
370370#: qml/Wizard/Pages/60-reporting.qml:50 qml/Wizard/Pages/passwd-confirm.qml:82
371371#: qml/Wizard/Pages/passwd-set.qml:90
372372msgid "Continue"
373−msgstr ""
373+msgstr "Fortsett"
374374
375375#: qml/Wizard/Pages/20-sim.qml:25
376376msgid "Add a SIM card and restart your device"
377−msgstr ""
377+msgstr "Legg til et SIM-kort og start enheten på nytt"
378378
379379#: qml/Wizard/Pages/20-sim.qml:55
380380msgid "Without it, you won’t be able to make calls or use text messaging."
381−msgstr ""
381+msgstr "Du kan ikke ringe eller sende meldinger uten et SIM-kort."
382382
383383#: qml/Wizard/Pages/20-sim.qml:69 qml/Wizard/Pages/40-wifi.qml:197
384384msgid "Skip"
385−msgstr ""
385+msgstr "Hopp over"
386386
387387#: qml/Wizard/Pages/30-passwd-type.qml:39
388388msgid "Lock security"
389−msgstr ""
389+msgstr "Låsesikkerhet"
390390
391391#: qml/Wizard/Pages/30-passwd-type.qml:74
392392msgid "Please select how you’d like to unlock your phone."
393−msgstr ""
393+msgstr "Velg hvordan du vil låse opp telefonen."
394394
395395#: qml/Wizard/Pages/30-passwd-type.qml:97
396396msgid "Swipe"
397−msgstr ""
397+msgstr "Sveip"
398398
399399#: qml/Wizard/Pages/30-passwd-type.qml:98
400400msgid "No security"
401−msgstr ""
401+msgstr "Ingen sperre"
402402
403403#: qml/Wizard/Pages/30-passwd-type.qml:100
404404msgid "Passcode"
405−msgstr ""
405+msgstr "Kode"
406406
407407#: qml/Wizard/Pages/30-passwd-type.qml:101
408408msgid "4 digits only"
409−msgstr ""
409+msgstr "4 sifre"
410410
411411#: qml/Wizard/Pages/30-passwd-type.qml:103
412412msgid "Passphrase"
413−msgstr ""
413+msgstr "Passordfrase"
414414
415415#: qml/Wizard/Pages/30-passwd-type.qml:104
416416msgid "Numbers and letters"
417−msgstr ""
417+msgstr "Tall og bokstaver"
418418
419419#: qml/Wizard/Pages/40-wifi.qml:28
420420msgid "Connect to Wi‑Fi"
421−msgstr ""
421+msgstr "Koble til trådløst nettverk"
422422
423423#: qml/Wizard/Pages/40-wifi.qml:147
424424msgid "Available networks…"
425−msgstr ""
425+msgstr "Tilgjengelige nettverk …"
426426
427427#: qml/Wizard/Pages/40-wifi.qml:148
428428msgid "No available networks."
429−msgstr ""
429+msgstr "Ingen tilgjengelige nettverk."
430430
431431#: qml/Wizard/Pages/50-location.qml:27
432432msgid "Location"
433−msgstr ""
433+msgstr "Plassering"
434434
435435#: qml/Wizard/Pages/50-location.qml:62
436436msgid "Let the phone detect your location:"
437−msgstr ""
437+msgstr "La telefonen se hvor du befinner deg:"
438438
439439#: qml/Wizard/Pages/50-location.qml:69
440440msgid "Using GPS only (less accurate)"
441−msgstr ""
441+msgstr "Kun med GPS (unøyaktig)"
442442
443443#: qml/Wizard/Pages/50-location.qml:86
444444msgid "Using GPS, anonymized Wi-Fi and cellular network info (recommended)"
445−msgstr ""
445+msgstr "Med GPS, trådløst nettverk og info fra telefonnett (anbefales)"
446446
447447#. TRANSLATORS: HERE is a trademark for Nokia's location service, you probably shouldn't translate it
448448#: qml/Wizard/Pages/50-location.qml:103
@@ -450,81 +450,87 @@ msgid ""
450450"By selecting this option you agree to the Nokia HERE <a href='#'>terms and "
451451"conditions</a>."
452452msgstr ""
453+"Du må samtykke til <a href='#'>brukervilkårene</a> for Nokia HERE for å "
454+"velge dette."
453455
454456#: qml/Wizard/Pages/50-location.qml:112
455457msgid "Not at all"
456−msgstr ""
458+msgstr "Overhodet ikke"
457459
458460#: qml/Wizard/Pages/50-location.qml:124
459461msgid "You can change your mind later in <b>System Settings</b>."
460−msgstr ""
462+msgstr "Du kan ombestemme deg senere via <b>Systeminnstillinger</b>."
461463
462464#: qml/Wizard/Pages/60-reporting.qml:24
463465msgid "Improving your experience"
464−msgstr ""
466+msgstr "Forbedrer opplevelse"
465467
466468#: qml/Wizard/Pages/60-reporting.qml:36
467469msgid ""
468470"Your phone is set up to automatically report errors to Canonical and its "
469471"partners, the makers of the operating system."
470472msgstr ""
473+"Telefonen sender feilrapporter til Canonical (produsenten av Ubuntu) "
474+"automatisk."
471475
472476#: qml/Wizard/Pages/60-reporting.qml:43
473477msgid ""
474478"This can be disabled in <b>System Settings</b> under <b>Security &amp; "
475479"Privacy</b>"
476480msgstr ""
481+"Du kan slå av dette i <b>Systeminnstillinger</b> under <b>Sikkerhet og "
482+"personvern</b>"
477483
478484#: qml/Wizard/Pages/80-finished.qml:24
479485msgid "All done"
480−msgstr ""
486+msgstr "Alt i orden"
481487
482488#: qml/Wizard/Pages/80-finished.qml:39
483489msgid "Nice work!"
484−msgstr ""
490+msgstr "Godt jobba!"
485491
486492#: qml/Wizard/Pages/80-finished.qml:46
487493msgid "Your phone is now ready to use."
488−msgstr ""
494+msgstr "Telefonen er klar til bruk."
489495
490496#: qml/Wizard/Pages/80-finished.qml:53
491497msgid "Finish"
492−msgstr ""
498+msgstr "Fullfør"
493499
494500#: qml/Wizard/Pages/here-terms.qml:27
495501msgid "Terms & Conditions"
496−msgstr ""
502+msgstr "Brukervilkår"
497503
498504#: qml/Wizard/Pages/passwd-confirm.qml:49
499505msgid "Confirm passphrase"
500−msgstr ""
506+msgstr "Bekreft passordfrase"
501507
502508#: qml/Wizard/Pages/passwd-confirm.qml:50
503509msgid "Confirm passcode"
504−msgstr ""
510+msgstr "Bekreft kode"
505511
506512#: qml/Wizard/Pages/passwd-confirm.qml:53
507513#: qml/Wizard/Pages/passwd-confirm.qml:54
508514msgid "Please try again."
509−msgstr ""
515+msgstr "Prøv igjen."
510516
511517#: qml/Wizard/Pages/passwd-set.qml:61
512518msgid "Choose your passcode"
513−msgstr ""
519+msgstr "Velg kode"
514520
515521#: qml/Wizard/Pages/passwd-set.qml:68
516522msgid "Passphrase must be 4 characters long"
517−msgstr ""
523+msgstr "Passordfrasen må bestå av minst 4 tegn"
518524
519525#: qml/Wizard/StackButton.qml:39
520526#, qt-format
521527msgid "〈 %1"
522−msgstr ""
528+msgstr "〈 %1"
523529
524530#: qml/Wizard/StackButton.qml:42
525531#, qt-format
526532msgid "%1 〉"
527−msgstr ""
533+msgstr "%1 〉"
528534
529535#~ msgid "Confirm"
530536#~ msgstr "Bekreft"
po/nl.po+4−4
@@ -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: 2014-12-10 10:55+0100\n"
11−"PO-Revision-Date: 2015-01-13 20:27+0000\n"
11+"PO-Revision-Date: 2015-01-17 11:13+0000\n"
1212"Last-Translator: rob <linuxned@gmail.com>\n"
1313"Language-Team: Dutch <nl@li.org>\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=2; plural=n != 1;\n"
18−"X-Launchpad-Export-Date: 2015-01-14 06:48+0000\n"
19−"X-Generator: Launchpad (build 17298)\n"
18+"X-Launchpad-Export-Date: 2015-01-18 05:03+0000\n"
19+"X-Generator: Launchpad (build 17304)\n"
2020
2121#: plugins/LightDM/Greeter.cpp:130
2222msgid "Password: "
@@ -235,7 +235,7 @@ msgstr "Beheren"
235235
236236#: qml/Dash/ScopesList.qml:107
237237msgid "Home"
238−msgstr ""
238+msgstr "Thuis"
239239
240240#: qml/Dash/ScopesList.qml:108
241241msgid "Also installed"
po/pt.po+30−29
@@ -8,15 +8,15 @@ msgstr ""
88"Project-Id-Version: unity8\n"
99"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
1010"POT-Creation-Date: 2014-12-10 10:55+0100\n"
11−"PO-Revision-Date: 2014-11-06 10:25+0000\n"
12−"Last-Translator: Ivo Xavier <ivofernandes12@gmail.com>\n"
11+"PO-Revision-Date: 2015-01-20 21:11+0000\n"
12+"Last-Translator: Filipe André Pinho <Unknown>\n"
1313"Language-Team: Portuguese <pt@li.org>\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=2; plural=n != 1;\n"
18−"X-Launchpad-Export-Date: 2014-12-13 07:11+0000\n"
19−"X-Generator: Launchpad (build 17286)\n"
18+"X-Launchpad-Export-Date: 2015-01-21 06:43+0000\n"
19+"X-Generator: Launchpad (build 17306)\n"
2020
2121#: plugins/LightDM/Greeter.cpp:130
2222msgid "Password: "
@@ -229,15 +229,15 @@ msgstr "Solte para atualizar..."
229229
230230#: qml/Dash/ScopesList.qml:63
231231msgid "Manage"
232−msgstr ""
232+msgstr "Gerir"
233233
234234#: qml/Dash/ScopesList.qml:107
235235msgid "Home"
236−msgstr ""
236+msgstr "Página inicial"
237237
238238#: qml/Dash/ScopesList.qml:108
239239msgid "Also installed"
240−msgstr ""
240+msgstr "Também instalado"
241241
242242#: qml/Greeter/Greeter.qml:174
243243msgid "Unlock"
@@ -351,38 +351,39 @@ msgstr ""
351351
352352#: qml/Wizard/Page.qml:89
353353msgid "Back"
354−msgstr ""
354+msgstr "Anterior"
355355
356356#: qml/Wizard/Pages/10-welcome.qml:27
357357msgid "Hi!"
358−msgstr ""
358+msgstr "Olá!"
359359
360360#: qml/Wizard/Pages/10-welcome.qml:44
361361msgid "Welcome to your Ubuntu phone."
362−msgstr ""
362+msgstr "Bem-vindo ao seu telemóvel Ubuntu."
363363
364364#: qml/Wizard/Pages/10-welcome.qml:52
365365msgid "Let’s get started."
366−msgstr ""
366+msgstr "Vamos começar!"
367367
368368#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:128
369369#: qml/Wizard/Pages/40-wifi.qml:197 qml/Wizard/Pages/50-location.qml:131
370370#: qml/Wizard/Pages/60-reporting.qml:50 qml/Wizard/Pages/passwd-confirm.qml:82
371371#: qml/Wizard/Pages/passwd-set.qml:90
372372msgid "Continue"
373−msgstr ""
373+msgstr "Avançar"
374374
375375#: qml/Wizard/Pages/20-sim.qml:25
376376msgid "Add a SIM card and restart your device"
377−msgstr ""
377+msgstr "Adicione o cartão SIM e reinicie o seu dispositivo"
378378
379379#: qml/Wizard/Pages/20-sim.qml:55
380380msgid "Without it, you won’t be able to make calls or use text messaging."
381381msgstr ""
382+"Sem o cartão SIM, não poderá fazer chamadas ou enviar mensagens de texto."
382383
383384#: qml/Wizard/Pages/20-sim.qml:69 qml/Wizard/Pages/40-wifi.qml:197
384385msgid "Skip"
385−msgstr ""
386+msgstr "Ignorar"
386387
387388#: qml/Wizard/Pages/30-passwd-type.qml:39
388389msgid "Lock security"
@@ -390,7 +391,7 @@ msgstr ""
390391
391392#: qml/Wizard/Pages/30-passwd-type.qml:74
392393msgid "Please select how you’d like to unlock your phone."
393−msgstr ""
394+msgstr "Por favor, escolha como pretende desbloquear o seu telemóvel."
394395
395396#: qml/Wizard/Pages/30-passwd-type.qml:97
396397msgid "Swipe"
@@ -398,7 +399,7 @@ msgstr ""
398399
399400#: qml/Wizard/Pages/30-passwd-type.qml:98
400401msgid "No security"
401−msgstr ""
402+msgstr "Sem segurança"
402403
403404#: qml/Wizard/Pages/30-passwd-type.qml:100
404405msgid "Passcode"
@@ -406,7 +407,7 @@ msgstr ""
406407
407408#: qml/Wizard/Pages/30-passwd-type.qml:101
408409msgid "4 digits only"
409−msgstr ""
410+msgstr "4 dígitos"
410411
411412#: qml/Wizard/Pages/30-passwd-type.qml:103
412413msgid "Passphrase"
@@ -414,31 +415,31 @@ msgstr ""
414415
415416#: qml/Wizard/Pages/30-passwd-type.qml:104
416417msgid "Numbers and letters"
417−msgstr ""
418+msgstr "Números e letras"
418419
419420#: qml/Wizard/Pages/40-wifi.qml:28
420421msgid "Connect to Wi‑Fi"
421−msgstr ""
422+msgstr "Ligar ao Wi-Fi"
422423
423424#: qml/Wizard/Pages/40-wifi.qml:147
424425msgid "Available networks…"
425−msgstr ""
426+msgstr "Redes disponíveis..."
426427
427428#: qml/Wizard/Pages/40-wifi.qml:148
428429msgid "No available networks."
429−msgstr ""
430+msgstr "Sem redes disponíveis."
430431
431432#: qml/Wizard/Pages/50-location.qml:27
432433msgid "Location"
433−msgstr ""
434+msgstr "Localização"
434435
435436#: qml/Wizard/Pages/50-location.qml:62
436437msgid "Let the phone detect your location:"
437−msgstr ""
438+msgstr "Deixe o telefone detectar a sua localização:"
438439
439440#: qml/Wizard/Pages/50-location.qml:69
440441msgid "Using GPS only (less accurate)"
441−msgstr ""
442+msgstr "Usar apenas GPS (menos preciso)"
442443
443444#: qml/Wizard/Pages/50-location.qml:86
444445msgid "Using GPS, anonymized Wi-Fi and cellular network info (recommended)"
@@ -461,7 +462,7 @@ msgstr ""
461462
462463#: qml/Wizard/Pages/60-reporting.qml:24
463464msgid "Improving your experience"
464−msgstr ""
465+msgstr "Melhore a sua experiência"
465466
466467#: qml/Wizard/Pages/60-reporting.qml:36
467468msgid ""
@@ -481,7 +482,7 @@ msgstr ""
481482
482483#: qml/Wizard/Pages/80-finished.qml:39
483484msgid "Nice work!"
484−msgstr ""
485+msgstr "Bom trabalho!"
485486
486487#: qml/Wizard/Pages/80-finished.qml:46
487488msgid "Your phone is now ready to use."
@@ -489,7 +490,7 @@ msgstr ""
489490
490491#: qml/Wizard/Pages/80-finished.qml:53
491492msgid "Finish"
492−msgstr ""
493+msgstr "Concluir"
493494
494495#: qml/Wizard/Pages/here-terms.qml:27
495496msgid "Terms & Conditions"
@@ -506,7 +507,7 @@ msgstr ""
506507#: qml/Wizard/Pages/passwd-confirm.qml:53
507508#: qml/Wizard/Pages/passwd-confirm.qml:54
508509msgid "Please try again."
509−msgstr ""
510+msgstr "Por favor, tente novamente."
510511
511512#: qml/Wizard/Pages/passwd-set.qml:61
512513msgid "Choose your passcode"
@@ -519,7 +520,7 @@ msgstr ""
519520#: qml/Wizard/StackButton.qml:39
520521#, qt-format
521522msgid "〈 %1"
522−msgstr ""
523+msgstr "〈 %1"
523524
524525#: qml/Wizard/StackButton.qml:42
525526#, qt-format
po/sl.po+51−43
@@ -8,7 +8,7 @@ msgstr ""
88"Project-Id-Version: unity\n"
99"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
1010"POT-Creation-Date: 2014-12-10 10:55+0100\n"
11−"PO-Revision-Date: 2014-11-05 09:41+0000\n"
11+"PO-Revision-Date: 2015-01-18 10:10+0000\n"
1212"Last-Translator: Damir Jerovšek <Unknown>\n"
1313"Language-Team: Slovenian <sl@li.org>\n"
1414"MIME-Version: 1.0\n"
@@ -16,8 +16,8 @@ msgstr ""
1616"Content-Transfer-Encoding: 8bit\n"
1717"Plural-Forms: nplurals=4; plural=(n%100==1 ? 1 : n%100==2 ? 2 : n%100==3 || "
1818"n%100==4 ? 3 : 0);\n"
19−"X-Launchpad-Export-Date: 2014-12-13 07:11+0000\n"
20−"X-Generator: Launchpad (build 17286)\n"
19+"X-Launchpad-Export-Date: 2015-01-19 06:29+0000\n"
20+"X-Generator: Launchpad (build 17304)\n"
2121
2222#: plugins/LightDM/Greeter.cpp:130
2323msgid "Password: "
@@ -232,15 +232,15 @@ msgstr "Spustite za osvežitev ..."
232232
233233#: qml/Dash/ScopesList.qml:63
234234msgid "Manage"
235−msgstr ""
235+msgstr "Upravljaj"
236236
237237#: qml/Dash/ScopesList.qml:107
238238msgid "Home"
239−msgstr ""
239+msgstr "Domov"
240240
241241#: qml/Dash/ScopesList.qml:108
242242msgid "Also installed"
243−msgstr ""
243+msgstr "Tudi nameščeno"
244244
245245#: qml/Greeter/Greeter.qml:174
246246msgid "Unlock"
@@ -354,98 +354,100 @@ msgstr ""
354354
355355#: qml/Wizard/Page.qml:89
356356msgid "Back"
357−msgstr ""
357+msgstr "Nazaj"
358358
359359#: qml/Wizard/Pages/10-welcome.qml:27
360360msgid "Hi!"
361−msgstr ""
361+msgstr "Živjo!"
362362
363363#: qml/Wizard/Pages/10-welcome.qml:44
364364msgid "Welcome to your Ubuntu phone."
365−msgstr ""
365+msgstr "Dobrodošli v svoj telefon Ubuntu."
366366
367367#: qml/Wizard/Pages/10-welcome.qml:52
368368msgid "Let’s get started."
369−msgstr ""
369+msgstr "Pa začnimo."
370370
371371#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:128
372372#: qml/Wizard/Pages/40-wifi.qml:197 qml/Wizard/Pages/50-location.qml:131
373373#: qml/Wizard/Pages/60-reporting.qml:50 qml/Wizard/Pages/passwd-confirm.qml:82
374374#: qml/Wizard/Pages/passwd-set.qml:90
375375msgid "Continue"
376−msgstr ""
376+msgstr "Nadaljuj"
377377
378378#: qml/Wizard/Pages/20-sim.qml:25
379379msgid "Add a SIM card and restart your device"
380−msgstr ""
380+msgstr "Dodajte kartico SIM in ponovno zaženite napravo"
381381
382382#: qml/Wizard/Pages/20-sim.qml:55
383383msgid "Without it, you won’t be able to make calls or use text messaging."
384−msgstr ""
384+msgstr "Brez nje ne bo mogoče opravljati klicev ali besedilnih sporočil."
385385
386386#: qml/Wizard/Pages/20-sim.qml:69 qml/Wizard/Pages/40-wifi.qml:197
387387msgid "Skip"
388−msgstr ""
388+msgstr "Preskoči"
389389
390390#: qml/Wizard/Pages/30-passwd-type.qml:39
391391msgid "Lock security"
392−msgstr ""
392+msgstr "Varnost zaklepa"
393393
394394#: qml/Wizard/Pages/30-passwd-type.qml:74
395395msgid "Please select how you’d like to unlock your phone."
396−msgstr ""
396+msgstr "Izberite, kako želite odkleniti svoj telefon."
397397
398398#: qml/Wizard/Pages/30-passwd-type.qml:97
399399msgid "Swipe"
400−msgstr ""
400+msgstr "Poteg"
401401
402402#: qml/Wizard/Pages/30-passwd-type.qml:98
403403msgid "No security"
404−msgstr ""
404+msgstr "Brez varnosti"
405405
406406#: qml/Wizard/Pages/30-passwd-type.qml:100
407407msgid "Passcode"
408−msgstr ""
408+msgstr "Geslo"
409409
410410#: qml/Wizard/Pages/30-passwd-type.qml:101
411411msgid "4 digits only"
412−msgstr ""
412+msgstr "Samo 4 številke"
413413
414414#: qml/Wizard/Pages/30-passwd-type.qml:103
415415msgid "Passphrase"
416−msgstr ""
416+msgstr "Šifrirno reklo"
417417
418418#: qml/Wizard/Pages/30-passwd-type.qml:104
419419msgid "Numbers and letters"
420−msgstr ""
420+msgstr "Številke in črke"
421421
422422#: qml/Wizard/Pages/40-wifi.qml:28
423423msgid "Connect to Wi‑Fi"
424−msgstr ""
424+msgstr "Poveži se z Wi-Fi-jem"
425425
426426#: qml/Wizard/Pages/40-wifi.qml:147
427427msgid "Available networks…"
428−msgstr ""
428+msgstr "Razpoložljiva omrežja ..."
429429
430430#: qml/Wizard/Pages/40-wifi.qml:148
431431msgid "No available networks."
432−msgstr ""
432+msgstr "Ni razpoložljivih omrežij."
433433
434434#: qml/Wizard/Pages/50-location.qml:27
435435msgid "Location"
436−msgstr ""
436+msgstr "Položaj"
437437
438438#: qml/Wizard/Pages/50-location.qml:62
439439msgid "Let the phone detect your location:"
440−msgstr ""
440+msgstr "Naj telefon zazna vaš položaj:"
441441
442442#: qml/Wizard/Pages/50-location.qml:69
443443msgid "Using GPS only (less accurate)"
444−msgstr ""
444+msgstr "Uporaba samo GPS-a (manj natančno)"
445445
446446#: qml/Wizard/Pages/50-location.qml:86
447447msgid "Using GPS, anonymized Wi-Fi and cellular network info (recommended)"
448448msgstr ""
449+"Uporaba GPS-a z brezimnim Wi-Fi-jem ter podatki mobilnega omrežja "
450+"(priporočljivo)"
449451
450452#. TRANSLATORS: HERE is a trademark for Nokia's location service, you probably shouldn't translate it
451453#: qml/Wizard/Pages/50-location.qml:103
@@ -453,81 +455,87 @@ msgid ""
453455"By selecting this option you agree to the Nokia HERE <a href='#'>terms and "
454456"conditions</a>."
455457msgstr ""
458+"Z izbiro te možnosti se strinjate s <a href='#'>pogoji ter pravili</a> Nokia "
459+"HERE."
456460
457461#: qml/Wizard/Pages/50-location.qml:112
458462msgid "Not at all"
459−msgstr ""
463+msgstr "Sploh ne"
460464
461465#: qml/Wizard/Pages/50-location.qml:124
462466msgid "You can change your mind later in <b>System Settings</b>."
463−msgstr ""
467+msgstr "Premislite si lahko kasneje v <b>Sistemskih nastavitvah</b>."
464468
465469#: qml/Wizard/Pages/60-reporting.qml:24
466470msgid "Improving your experience"
467−msgstr ""
471+msgstr "Izboljševanje vaše izkušnje"
468472
469473#: qml/Wizard/Pages/60-reporting.qml:36
470474msgid ""
471475"Your phone is set up to automatically report errors to Canonical and its "
472476"partners, the makers of the operating system."
473477msgstr ""
478+"Vaš telefon je nastavljen, da samodejno poroča napake Canonicalu in njegovim "
479+"partnerjem, ustvarjalcem operacijskega sistema."
474480
475481#: qml/Wizard/Pages/60-reporting.qml:43
476482msgid ""
477483"This can be disabled in <b>System Settings</b> under <b>Security &amp; "
478484"Privacy</b>"
479485msgstr ""
486+"To je možno onemogočiti v <b>Sistemskih nastavitvah</b> pod <b>Varnost "
487+"&amp; Zasebnost</b>"
480488
481489#: qml/Wizard/Pages/80-finished.qml:24
482490msgid "All done"
483−msgstr ""
491+msgstr "Opravljeno"
484492
485493#: qml/Wizard/Pages/80-finished.qml:39
486494msgid "Nice work!"
487−msgstr ""
495+msgstr "Odlično!"
488496
489497#: qml/Wizard/Pages/80-finished.qml:46
490498msgid "Your phone is now ready to use."
491−msgstr ""
499+msgstr "Vaš telefon je sedaj pripravljen za uporabo."
492500
493501#: qml/Wizard/Pages/80-finished.qml:53
494502msgid "Finish"
495−msgstr ""
503+msgstr "Dokončaj"
496504
497505#: qml/Wizard/Pages/here-terms.qml:27
498506msgid "Terms & Conditions"
499−msgstr ""
507+msgstr "Pogoji uporabe"
500508
501509#: qml/Wizard/Pages/passwd-confirm.qml:49
502510msgid "Confirm passphrase"
503−msgstr ""
511+msgstr "Potrdite šifrirno reklo"
504512
505513#: qml/Wizard/Pages/passwd-confirm.qml:50
506514msgid "Confirm passcode"
507−msgstr ""
515+msgstr "Potrdite geslo"
508516
509517#: qml/Wizard/Pages/passwd-confirm.qml:53
510518#: qml/Wizard/Pages/passwd-confirm.qml:54
511519msgid "Please try again."
512−msgstr ""
520+msgstr "Poskusite znova."
513521
514522#: qml/Wizard/Pages/passwd-set.qml:61
515523msgid "Choose your passcode"
516−msgstr ""
524+msgstr "Izberite svoje geslo"
517525
518526#: qml/Wizard/Pages/passwd-set.qml:68
519527msgid "Passphrase must be 4 characters long"
520−msgstr ""
528+msgstr "Šifrirno reklo mora biti dolgo vsaj 4 znake"
521529
522530#: qml/Wizard/StackButton.qml:39
523531#, qt-format
524532msgid "〈 %1"
525−msgstr ""
533+msgstr "〈 %1"
526534
527535#: qml/Wizard/StackButton.qml:42
528536#, qt-format
529537msgid "%1 〉"
530−msgstr ""
538+msgstr "%1 〉"
531539
532540#~ msgid "Confirm"
533541#~ msgstr "Potrdi"
qml/Dash/Dash.qml+2−2
@@ -304,8 +304,8 @@ Showable {
304304 Image {
305305 source: "graphics/overview_hint.png"
306306 anchors.horizontalCenter: parent.horizontalCenter
307− opacity: (scopeItem.scope ? scopeItem.pageHeaderTotallyVisible : scopes.count == 0 || dashContent.pageHeaderTotallyVisible) &&
308− (overviewDragHandle.enabled || bottomEdgeController.progress != 0) ? 1 : 0
307+ opacity: !scopeItem.scope && (scopes.count == 0 || dashContent.pageHeaderTotallyVisible) &&
308+ (overviewDragHandle.enabled || overviewDragHandle.status.progress != 0) ? 1 : 0
309309 Behavior on opacity {
310310 enabled: bottomEdgeController.progress == 0
311311 UbuntuNumberAnimation {}
qml/Dash/GenericScopeView.qml+30−2
@@ -41,6 +41,7 @@ FocusScope {
4141 property bool visibleToParent: false
4242 property alias pageHeaderTotallyVisible: categoryView.pageHeaderTotallyVisible
4343 property var holdingList: null
44+ property bool wasCurrentOnMoveStart: false
4445
4546 property var scopeStyle: ScopeStyle {
4647 style: scope ? scope.customizations : {}
@@ -116,6 +117,9 @@ FocusScope {
116117 }
117118
118119 onIsCurrentChanged: {
120+ if (!holdingList || !holdingList.moving) {
121+ wasCurrentOnMoveStart = scopeView.isCurrent;
122+ }
119123 if (pageHeaderLoader.item && showPageHeader) {
120124 pageHeaderLoader.item.resetSearch();
121125 }
@@ -142,6 +146,15 @@ FocusScope {
142146 onHideDash: subPageLoader.closeSubPage()
143147 }
144148
149+ Connections {
150+ target: holdingList
151+ onMovingChanged: {
152+ if (!moving) {
153+ wasCurrentOnMoveStart = scopeView.isCurrent;
154+ }
155+ }
156+ }
157+
145158 Rectangle {
146159 anchors.fill: parent
147160 color: scopeView.scopeStyle ? scopeView.scopeStyle.background : "transparent"
@@ -367,7 +380,11 @@ FocusScope {
367380
368381 function updateRanges() {
369382 // Don't want to create stress by requesting more items during scope
370− // changes so unless you're not part of the visible scopes just return
383+ // changes so unless you're not part of the visible scopes just return.
384+ // For the visible scopes we need to do some work, the previously non visible
385+ // scope needs to adjust its ranges so that we define the new visible range,
386+ // that still means no creation/destruction of delegates, it's just about changing
387+ // the culling of the items so they are actually visible
371388 if (holdingList && holdingList.moving && !scopeView.visibleToParent) {
372389 return;
373390 }
@@ -412,7 +429,18 @@ FocusScope {
412429 if (scopeView.isCurrent || scopeView.visibleToParent) {
413430 item.displayMarginBeginning = displayMarginBeginning;
414431 item.displayMarginEnd = displayMarginEnd;
415− item.cacheBuffer = scopeView.isCurrent ? categoryView.height * 1.5 : 0;
432+ if (holdingList && holdingList.moving) {
433+ // If we are moving we need to reset the cache buffer of the
434+ // view that was not visible (i.e. !wasCurrentOnMoveStart) to 0 since
435+ // otherwise the cache buffer we had set to preload the items of the
436+ // visible range will trigger some item creations and we want move to
437+ // be as smooth as possible meaning no need creations
438+ if (!wasCurrentOnMoveStart) {
439+ item.cacheBuffer = 0;
440+ }
441+ } else {
442+ item.cacheBuffer = categoryView.height * 1.5;
443+ }
416444 } else {
417445 var visibleRange = baseItem.height + displayMarginEnd + displayMarginBeginning;
418446 if (visibleRange < 0) {
qml/Dash/Previews/PreviewTable.qml+6
@@ -37,6 +37,7 @@ PreviewWidget {
3737 id: column
3838 objectName: "column"
3939 spacing: units.gu(1)
40+ width: parent.width
4041
4142 Label {
4243 id: titleLabel
@@ -51,6 +52,7 @@ PreviewWidget {
5152 visible: text !== ""
5253 opacity: .8
5354 text: widgetData["title"] || ""
55+ elide: Text.ElideRight
5456 }
5557
5658 GridLayout {
@@ -72,6 +74,10 @@ PreviewWidget {
7274 visible: root.expanded || rowIndex < maximumCollapsedRowCount
7375 color: root.scopeStyle ? root.scopeStyle.foreground : Theme.palette.normal.baseText
7476 font.bold: index == 0
77+ verticalAlignment: Text.AlignTop
78+ wrapMode: Text.WordWrap
79+ Layout.fillHeight: true
80+ Layout.maximumWidth: column.width - x
7581 }
7682 }
7783 }
qml/Shell.qml+15−3
@@ -180,8 +180,20 @@ Item {
180180
181181 WindowKeysFilter {
182182 Keys.onPressed: {
183− if (event.key == Qt.Key_PowerOff || event.key == Qt.Key_PowerDown) {
184− dialogs.onPowerKeyPressed();
183+ // Nokia earpieces give TogglePlayPause, while the iPhone's earpiece gives Play
184+ if (event.key == Qt.Key_MediaTogglePlayPause || event.key == Qt.Key_MediaPlay) {
185+ event.accepted = callManager.handleMediaKey(false);
186+ } else if (event.key == Qt.Key_PowerOff || event.key == Qt.Key_PowerDown) {
187+ // FIXME: We only consider power key presses if the screen is
188+ // on because of bugs 1410830/1409003. The theory is that when
189+ // those bugs are encountered, there is a >2s delay between the
190+ // power press event and the power release event, which causes
191+ // the shutdown dialog to appear on resume. So to avoid that
192+ // symptom while we investigate the root cause, we simply won't
193+ // initiate any dialogs when the screen is off.
194+ if (Powerd.status === Powerd.On) {
195+ dialogs.onPowerKeyPressed();
196+ }
185197 event.accepted = true;
186198 } else {
187199 volumeKeyFilter.onKeyPressed(event.key);
@@ -652,7 +664,7 @@ Item {
652664 target: callManager
653665
654666 onHasCallsChanged: {
655− if (shell.locked && callManager.hasCalls) {
667+ if (shell.locked && callManager.hasCalls && greeter.lockedApp !== "dialer-app") {
656668 // We just received an incoming call while locked. The
657669 // indicator will have already launched dialer-app for us, but
658670 // there is a race between "hasCalls" changing and the dialer
qml/Stages/DesktopStage.qml+8−44
@@ -94,6 +94,8 @@ Item {
9494 width: units.gu(60)
9595 height: units.gu(50)
9696
97+ readonly property int minWidth: units.gu(10)
98+ readonly property int minHeight: units.gu(10)
9799
98100 states: [
99101 State {
@@ -114,51 +116,13 @@ Item {
114116 }
115117 ]
116118
117− MouseArea {
118− anchors.fill: parent
119− anchors.margins: -units.gu(0.5)
120−
121− property bool resizeWidth: false
122− property bool resizeHeight: false
123−
124− property int startX: 0
125− property int startWidth: 0
126− property int startY: 0
127− property int startHeight: 0
128−
129− onPressed: {
130− ApplicationManager.requestFocusApplication(model.appId)
131− if (mouseX > width - units.gu(1)) {
132− resizeWidth = true;
133− startX = mouseX;
134− startWidth = appDelegate.width;
135− }
136− if (mouseY > height - units.gu(1)) {
137− resizeHeight = true;
138− startY = mouseY;
139− startHeight = appDelegate.height;
140− }
141− if (!resizeHeight && !resizeWidth) {
142− drag.target = appDelegate;
143− }
144− }
145−
146− onMouseXChanged: {
147− if (resizeWidth) {
148− appDelegate.width = startWidth + (mouseX - startX)
149− }
150− }
151− onMouseYChanged: {
152− if (resizeHeight) {
153− appDelegate.height = startHeight + (mouseY - startY)
154− }
155− }
119+ WindowMoveResizeArea {
120+ target: appDelegate
121+ minWidth: appDelegate.minWidth
122+ minHeight: appDelegate.minHeight
123+ resizeHandleWidth: units.gu(0.5)
156124
157− onReleased: {
158− resizeWidth = false;
159− resizeHeight = false;
160− drag.target = undefined;
161− }
125+ onPressed: ApplicationManager.requestFocusApplication(model.appId)
162126 }
163127
164128 DecoratedWindow {
qml/Stages/WindowMoveResizeArea.qmlnew file+98
@@ -0,0 +1,98 @@
1+/*
2+ * Copyright (C) 2014 Canonical, Ltd.
3+ *
4+ * This program is free software; you can redistribute it and/or modify
5+ * it under the terms of the GNU General Public License as published by
6+ * the Free Software Foundation; version 3.
7+ *
8+ * This program is distributed in the hope that it will be useful,
9+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
10+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11+ * GNU General Public License for more details.
12+ *
13+ * You should have received a copy of the GNU General Public License
14+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
15+ *
16+ * Authors: Michael Zanetti <michael.zanetti@canonical.com>
17+ */
18+
19+import QtQuick 2.3
20+import Ubuntu.Components 1.1
21+
22+MouseArea {
23+ id: root
24+ anchors.fill: target
25+ anchors.margins: -resizeHandleWidth
26+
27+ // The target item managed by this. Must be a parent or a sibling
28+ // The area will anchor to it and manage move and resize events
29+ property var target: null
30+ property int resizeHandleWidth: 0
31+ property int minWidth: 0
32+ property int minHeight: 0
33+
34+ QtObject {
35+ id: priv
36+ readonly property int windowWidth: root.width - root.resizeHandleWidth * 2
37+ readonly property int windowHeight: root.height - resizeHandleWidth * 2
38+
39+ property var startPoint
40+ property int startWidth
41+ property int startHeight
42+
43+ property bool resizeTop: false
44+ property bool resizeBottom: false
45+ property bool resizeLeft: false
46+ property bool resizeRight: false
47+
48+ }
49+
50+ onPressed: {
51+ priv.startPoint = mapToItem(null, Qt.point(mouse.x, mouse.y)).x;
52+ priv.startWidth = root.width;
53+ priv.startHeight = root.height;
54+ priv.resizeTop = mouseY < root.resizeHandleWidth;
55+ priv.resizeBottom = mouseY > (root.height - root.resizeHandleWidth);
56+ priv.resizeLeft = mouseX < root.resizeHandleWidth;
57+ priv.resizeRight = mouseX > (root.width - root.resizeHandleWidth);
58+ }
59+
60+ onPositionChanged: {
61+ var currentPoint = mapToItem(null, Qt.point(mouse.x, mouse.y)).x;
62+ var mouseDiff = Qt.point(currentPoint.x - priv.startPoint.x, currentPoint.y - priv.startPoint.y);
63+ var moveDiff = Qt.point(0, 0);
64+ var sizeDiff = Qt.point(0, 0);
65+ if (priv.resizeTop || priv.resizeBottom || priv.resizeLeft || priv.resizeRight) {
66+ if (priv.resizeTop) {
67+ moveDiff.y += mouseDiff.y;
68+ sizeDiff.y += -mouseDiff.y;
69+ } else if (priv.resizeBottom) {
70+ sizeDiff.y += mouse.y - priv.startPoint.y;
71+ priv.startPoint.y = mouse.y
72+ }
73+ if (priv.resizeLeft) {
74+ moveDiff.x += mouseDiff.x;
75+ sizeDiff.x += -mouseDiff.x;
76+ } else if (priv.resizeRight) {
77+ sizeDiff.x += mouse.x - priv.startPoint.x;
78+ priv.startPoint.x = mouse.x
79+ }
80+ if (priv.windowWidth + sizeDiff.x < root.minWidth) {
81+ sizeDiff.x = root.minWidth - priv.windowWidth;
82+ moveDiff.x = moveDiff.x == 0 ? 0 : -sizeDiff.x;
83+ }
84+ if (priv.windowHeight + sizeDiff.y < root.minHeight) {
85+ sizeDiff.y = root.minHeight - priv.windowHeight;
86+ moveDiff.y = moveDiff.y == 0 ? 0 : -sizeDiff.y;
87+ }
88+
89+ target.x += moveDiff.x;
90+ target.y += moveDiff.y;
91+ target.width += sizeDiff.x;
92+ target.height += sizeDiff.y;
93+ } else {
94+ target.x += mouseDiff.x;
95+ target.y += mouseDiff.y;
96+ }
97+ }
98+}
src/libunity8-private/abstractdbusservicemonitor.cpp+21−8
@@ -32,19 +32,20 @@ AbstractDBusServiceMonitor::AbstractDBusServiceMonitor(const QString &service, c
3232 , m_service(service)
3333 , m_path(path)
3434 , m_interface(interface)
35+ , m_bus(bus)
3536 , m_watcher(new QDBusServiceWatcher(service,
3637 (bus == SystemBus) ? QDBusConnection::systemBus()
3738 : QDBusConnection::sessionBus()))
3839 , m_dbusInterface(nullptr)
3940{
40− connect(m_watcher, &QDBusServiceWatcher::serviceRegistered, this, &AbstractDBusServiceMonitor::createInterface);
41− connect(m_watcher, &QDBusServiceWatcher::serviceUnregistered, this, &AbstractDBusServiceMonitor::destroyInterface);
41+ connect(m_watcher, &QDBusServiceWatcher::serviceRegistered, this, &AbstractDBusServiceMonitor::onServiceRegistered);
42+ connect(m_watcher, &QDBusServiceWatcher::serviceUnregistered, this, &AbstractDBusServiceMonitor::onServiceUnregistered);
4243
4344 // Connect to the service if it's up already
4445 QDBusConnectionInterface* sessionBus = QDBusConnection::sessionBus().interface();
4546 QDBusReply<bool> reply = sessionBus->isServiceRegistered(m_service);
4647 if (reply.isValid() && reply.value()) {
47− createInterface(m_service);
48+ onServiceRegistered(m_service);
4849 }
4950}
5051
@@ -54,19 +55,31 @@ AbstractDBusServiceMonitor::~AbstractDBusServiceMonitor()
5455 delete m_dbusInterface;
5556}
5657
57−void AbstractDBusServiceMonitor::createInterface(const QString &)
58+void AbstractDBusServiceMonitor::onServiceRegistered(const QString &)
5859{
5960 if (m_dbusInterface != nullptr) {
6061 delete m_dbusInterface;
6162 m_dbusInterface = nullptr;
6263 }
6364
64− m_dbusInterface = new QDBusInterface(m_service, m_path, m_interface,
65− QDBusConnection::sessionBus());
65+ m_dbusInterface = createInterface(m_service, m_path, m_interface,
66+ (m_bus == SystemBus) ? QDBusConnection::systemBus()
67+ : QDBusConnection::sessionBus());
6668 Q_EMIT serviceAvailableChanged(true);
6769}
6870
69−void AbstractDBusServiceMonitor::destroyInterface(const QString &)
71+/*
72+ * Default implementation creates a QDBusInterface. This performs blocking introspection of the
73+ * service at initialization, which may be undesirable if the service is slow/blocked.
74+ */
75+QDBusAbstractInterface*
76+AbstractDBusServiceMonitor::createInterface(const QString &service, const QString &path,
77+ const QString &interface, const QDBusConnection &connection)
78+{
79+ return new QDBusInterface(service, path, interface, connection);
80+}
81+
82+void AbstractDBusServiceMonitor::onServiceUnregistered(const QString &)
7083{
7184 if (m_dbusInterface != nullptr) {
7285 delete m_dbusInterface;
@@ -76,7 +89,7 @@ void AbstractDBusServiceMonitor::destroyInterface(const QString &)
7689 Q_EMIT serviceAvailableChanged(false);
7790}
7891
79−QDBusInterface* AbstractDBusServiceMonitor::dbusInterface() const
92+QDBusAbstractInterface* AbstractDBusServiceMonitor::dbusInterface() const
8093{
8194 return m_dbusInterface;
8295}
src/libunity8-private/abstractdbusservicemonitor.h+9−5
@@ -24,7 +24,7 @@
2424#include <QString>
2525#include <QDBusConnection>
2626
27−class QDBusInterface;
27+class QDBusAbstractInterface;
2828class QDBusServiceWatcher;
2929
3030class Q_DECL_EXPORT AbstractDBusServiceMonitor : public QObject
@@ -44,7 +44,7 @@ public:
4444 QObject *parent = 0);
4545 ~AbstractDBusServiceMonitor();
4646
47− QDBusInterface* dbusInterface() const;
47+ QDBusAbstractInterface* dbusInterface() const;
4848
4949 bool serviceAvailable() const;
5050
@@ -52,15 +52,19 @@ Q_SIGNALS:
5252 void serviceAvailableChanged(bool available);
5353
5454private Q_SLOTS:
55− void createInterface(const QString &service);
56− void destroyInterface(const QString &service);
55+ void onServiceRegistered(const QString &service);
56+ void onServiceUnregistered(const QString &service);
5757
5858protected:
59+ virtual QDBusAbstractInterface* createInterface(const QString &service, const QString &path,
60+ const QString &interface, const QDBusConnection &connection);
61+
5962 const QString m_service;
6063 const QString m_path;
6164 const QString m_interface;
65+ const Bus m_bus;
6266 QDBusServiceWatcher* m_watcher;
63− QDBusInterface* m_dbusInterface;
67+ QDBusAbstractInterface* m_dbusInterface;
6468};
6569
6670#endif // ABSTRACTDBUSSERVICEMONITOR_H
tests/autopilot/unity8/shell/tests/test_edges_demo.py+1−1
@@ -31,7 +31,7 @@ from unity8.shell.emulators import edges_demo # NOQA
3131class EdgesDemoTestCase(tests.UnityTestCase):
3232
3333 def setUp(self):
34− super().setUp()
34+ super(EdgesDemoTestCase, self).setUp()
3535 self._qml_mock_enabled = False
3636 self._data_dirs_mock_enabled = False
3737 self._lightdm_mock_type = False
tests/mocks/LightDM/CMakeLists.txt+1−2
@@ -37,8 +37,7 @@ add_library(MockLightDM-qml MODULE
3737# LD_LIBRARY_PATH.
3838add_dependencies(MockLightDM-qml MockLightDM-full MockUserMetrics)
3939target_link_libraries(MockLightDM-qml
40− -L${CMAKE_CURRENT_BINARY_DIR}/full
41− -llightdm-qt5-2
40+ MockLightDM-full
4241 -L${CMAKE_BINARY_DIR}/tests/mocks/libusermetrics
4342 -lusermetricsoutput
4443 unity8-private
tests/mocks/LightDM/demo/CMakeLists.txt+1
@@ -28,6 +28,7 @@ target_link_libraries(MockLightDM-demo-shared
2828qt5_use_modules(MockLightDM-demo Concurrent Gui)
2929qt5_use_modules(MockLightDM-demo-shared Concurrent Gui)
3030
31+set_target_properties(MockLightDM-demo PROPERTIES COMPILE_FLAGS -fPIC)
3132set_target_properties(MockLightDM-demo-shared PROPERTIES
3233 OUTPUT_NAME lightdm-qt5-2)
3334
tests/plugins/LightDM/CMakeLists.txt+1−4
@@ -11,10 +11,7 @@ include_directories(
1111 ${LIBLIGHTDM_INCLUDE_DIRS}
1212 )
1313
14−target_link_libraries(GreeterDBusTestExec
15− -L${CMAKE_BINARY_DIR}/tests/mocks/LightDM/full
16− -llightdm-qt5-2
17− )
14+target_link_libraries(GreeterDBusTestExec MockLightDM-full)
1815
1916add_definitions(-DCURRENT_SOURCE_DIR="${CMAKE_CURRENT_SOURCE_DIR}")
2017
tests/qmltests/CMakeLists.txt+1
@@ -88,5 +88,6 @@ add_qml_test(Stages PhoneStage ENVIRONMENT "LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/
8888add_qml_test(Stages SpreadDelegate ENVIRONMENT "LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/tests/mocks/libusermetrics:${CMAKE_BINARY_DIR}/tests/mocks/LightDM/single")
8989add_qml_test(Stages SurfaceContainer ENVIRONMENT "LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/tests/mocks/libusermetrics:${CMAKE_BINARY_DIR}/tests/mocks/LightDM/single")
9090add_qml_test(Stages SessionContainer ENVIRONMENT "LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/tests/mocks/libusermetrics:${CMAKE_BINARY_DIR}/tests/mocks/LightDM/single")
91+add_qml_test(Stages WindowMoveResizeArea)
9192add_qml_test(Stages Splash)
9293add_qml_test(Wizard Wizard)
tests/qmltests/Dash/Previews/tst_PreviewTable.qml+6−5
@@ -27,17 +27,18 @@ Rectangle {
2727 color: Theme.palette.selected.background
2828
2929 property var widgetDataComplete: {
30− "title": "Title here",
31− "values": [ [ "Long Label 1", "Value 1"], [ "Label 2", "Long Value 2"], [ "Label 3", "Value 3"], [ "Label 4", "Value 4"], [ "Label 5", "Value 5"] ]
30+ "title": "Title here longa long long long long long long long long long long",
31+ "values": [ [ "Long Label 1", "Value 1"], [ "Label 2", "Long Value 2 Long Value 2 Long Value 2 Long Value 2 Long Value 2 Long Value 2 Long Value 2 Long Value 2 Long Value 2 Long Value 2"], [ "Label 3", "Value 3"], [ "Label 4", "Value 4"], [ "Label 5", "Value 5"] ]
3232 }
3333
3434 property var widgetDataNoTitle: {
35− "values": [ [ "Long Label 1", "Value 1"], [ "Label 2", "Long Value 2"], [ "Label 3", "Value 3"], [ "Label 4", "Value 4"], [ "Label 5", "Value 5"] ]
35+ "values": [ [ "Long Label 1", "Value 1"], [ "Label 2", "Long Value 2 Long Value 2 Long Value 2 Long Value 2 Long Value 2 Long Value 2 Long Value 2 Long Value 2 Long Value 2 Long Value 2"], [ "Label 3", "Value 3"], [ "Label 4", "Value 4"], [ "Label 5", "Value 5"] ]
3636 }
3737
38− PreviewTable {
38+ PreviewWidgetFactory {
3939 id: previewTable
4040 anchors { left: parent.left; right: parent.right }
41+ widgetType: "table"
4142 widgetData: widgetDataComplete
4243
4344 Rectangle {
@@ -59,7 +60,7 @@ Rectangle {
5960 compare(findChild(previewTable, "label00").text, "Long Label 1");
6061 compare(findChild(previewTable, "label01").text, "Value 1");
6162 compare(findChild(previewTable, "label10").text, "Label 2");
62− compare(findChild(previewTable, "label11").text, "Long Value 2");
63+ compare(findChild(previewTable, "label11").text, "Long Value 2 Long Value 2 Long Value 2 Long Value 2 Long Value 2 Long Value 2 Long Value 2 Long Value 2 Long Value 2 Long Value 2");
6364 compare(findChild(previewTable, "label20").text, "Label 3");
6465 compare(findChild(previewTable, "label21").text, "Value 3");
6566 compare(findChild(previewTable, "label30").text, "Label 4");
tests/qmltests/Dash/tst_Card.qml+2−2
@@ -61,7 +61,7 @@ Rectangle {
6161 },
6262 {
6363 "name": "Art, header, summary - horizontal",
64− "layout": { "template": { "card-layout": "horizontal" },
64+ "layout": { "template": { "card-layout": "horizontal", "card-background": { "type": "gradient", "elements": ["grey", "white"] } },
6565 "components": JSON.parse(Helpers.fullMapping) }
6666 },
6767 {
@@ -407,7 +407,7 @@ Rectangle {
407407 return [
408408 { tag: "Art and summary", visible: true, color: "#ffffff", index: 0 },
409409 { tag: "No Summary", visible: false, index: 6 },
410− { tag: "Horizontal", visible: false, index: 5 },
410+ { tag: "Horizontal", visible: true, color: "#808080", index: 5 },
411411 { tag: "Grey background", visible: true, color: "#808080", index: 10 },
412412 { tag: "Overriden Gradient background", visible: true, color: "#808080", gradientColor: "#ffffff",
413413 background: {type: "color", elements: ["grey", "white"]}, index: 10 },
tests/qmltests/Dash/tst_DashContent.qml+57
@@ -537,5 +537,62 @@ Item {
537537
538538 compare(categoryListView.pageHeader.item.searchHint, "Search People");
539539 }
540+
541+ function compareArrays(a, b) {
542+ if (a.length != b.length) return false;
543+ for (var i in a) {
544+ if (a[i] != b[i]) return false;
545+ }
546+ return true;
547+ }
548+
549+ function getSettledButtons() {
550+ var buttons = findChildsByType(dashContent, "AbstractButton");
551+ wait(2500);
552+ var aux = findChildsByType(dashContent, "AbstractButton");
553+ while (!compareArrays(aux, buttons)) {
554+ buttons = aux;
555+ wait(2500);
556+ aux = findChildsByType(dashContent, "AbstractButton");
557+ }
558+ return buttons;
559+ }
560+
561+ function test_noDelegateCreationDestructionOnMove() {
562+ // Our cards are of type AbstractButton as defined in CardCreator.js
563+ // This gives also other things that are not cards but for our purpose it
564+ // does not matter
565+
566+ // Wait for the buttons to settle
567+ var buttons = getSettledButtons();
568+
569+ // Move the scopes so that the item on the right is the current one
570+ // without releasing the button
571+ mouseFlick(dashContent, dashContent.width - units.gu(1), units.gu(1), units.gu(1), units.gu(1), true, false);
572+
573+ // Make sure we have changed to a new scope
574+ compare(dashContent.currentIndex, 1);
575+
576+ // Wait for the buttons to settle
577+ var buttons2 = getSettledButtons();
578+
579+ // Verify we have exactly the same buttons as before starting to move
580+ verify(compareArrays(buttons2, buttons));
581+
582+ // Release the mouse
583+ mouseRelease(dashContent, units.gu(1), units.gu(1));
584+
585+ // Wait for the scopes list to stop moving
586+ var dashContentList = findChild(dashContent, "dashContentList");
587+ tryCompare(dashContentList, "moving", false);
588+ compare(dashContent.currentIndex, 1);
589+
590+ // Wait for the buttons to settle
591+ var buttons3 = getSettledButtons();
592+
593+ // Verify we have a different set of buttons now
594+ expectFail("", "There has to be new cards after releasing the list is not moving anymore");
595+ verify(compareArrays(buttons3, buttons));
596+ }
540597 }
541598}
tests/qmltests/Stages/tst_WindowMoveResizeArea.qmlnew file+138
@@ -0,0 +1,138 @@
1+/*
2+ * Copyright 2014 Canonical Ltd.
3+ *
4+ * This program is free software; you can redistribute it and/or modify
5+ * it under the terms of the GNU General Public License as published by
6+ * the Free Software Foundation; version 3.
7+ *
8+ * This program is distributed in the hope that it will be useful,
9+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
10+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11+ * GNU General Public License for more details.
12+ *
13+ * You should have received a copy of the GNU General Public License
14+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
15+ */
16+
17+import QtQuick 2.1
18+import QtQuick.Layouts 1.1
19+import QtTest 1.0
20+import Unity.Test 0.1 as UT
21+import ".."
22+import "../../../qml/Stages"
23+import Ubuntu.Components 0.1
24+import Ubuntu.Components.ListItems 1.0 as ListItem
25+import Unity.Application 0.1
26+
27+Item {
28+ id: root
29+ height: units.gu(60)
30+ width: units.gu(60)
31+
32+ Rectangle {
33+ id: fakeWindow
34+ height: units.gu(20)
35+ width: units.gu(20)
36+ color: "khaki"
37+ WindowMoveResizeArea {
38+ id: moveResizeArea
39+ target: fakeWindow
40+ resizeHandleWidth: units.gu(0.5)
41+ minWidth: units.gu(15)
42+ minHeight: units.gu(10)
43+ }
44+ }
45+
46+ UT.UnityTestCase {
47+ when: windowShown
48+
49+ function init() {
50+ fakeWindow.x = units.gu(20)
51+ fakeWindow.y = units.gu(20)
52+ fakeWindow.width = units.gu(20)
53+ fakeWindow.height = units.gu(20)
54+ }
55+
56+ function test_dragWindow_data() {
57+ return [
58+ { tag: "up", dx: 0, dy: units.gu(-10) },
59+ { tag: "down", dx: 0, dy: units.gu(10) },
60+ { tag: "left", dx: units.gu(-10), dy: 0 },
61+ { tag: "right", dx: units.gu(10), dy: 0 },
62+ { tag: "right/down", dx: units.gu(10), dy: units.gu(10) },
63+ { tag: "left/down", dx: units.gu(-10), dy: units.gu(10) }
64+ ]
65+ }
66+
67+ function test_dragWindow(data) {
68+ var initialWindowX = fakeWindow.x;
69+ var initialWindowY = fakeWindow.y;
70+ var initialWindowWidth = fakeWindow.width
71+ var initialWindowHeight = fakeWindow.height
72+
73+ var startDragX = initialWindowX + fakeWindow.width / 2;
74+ var startDragY = initialWindowY + fakeWindow.height / 2;
75+ mouseFlick(root, startDragX, startDragY, startDragX + data.dx, startDragY + data.dy, true, true, units.gu(.5), 10)
76+
77+ tryCompare(fakeWindow, "x", initialWindowX + data.dx)
78+ tryCompare(fakeWindow, "y", initialWindowX + data.dy)
79+
80+ compare(fakeWindow.height, initialWindowHeight);
81+ compare(fakeWindow.width, initialWindowWidth);
82+ }
83+
84+ function test_resizeWindowRightBottom_data() {
85+ return [
86+ { tag: "width", dx: units.gu(10), dy: 0 },
87+ { tag: "height", dx: 0, dy: units.gu(10) },
88+ { tag: "both", dx: units.gu(10), dy: units.gu(10) },
89+ { tag: "smaller than minimum size", dx: -units.gu(15), dy: -units.gu(15) }
90+ ]
91+ }
92+
93+ function test_resizeWindowRightBottom(data) {
94+ var initialWindowX = fakeWindow.x;
95+ var initialWindowY = fakeWindow.y;
96+ var initialWindowWidth = fakeWindow.width
97+ var initialWindowHeight = fakeWindow.height
98+
99+ var startDragX = initialWindowX + initialWindowWidth + 1
100+ var startDragY = initialWindowY + initialWindowHeight + 1
101+ mouseFlick(root, startDragX, startDragY, startDragX + data.dx, startDragY + data.dy, true, true, units.gu(.5), 10);
102+
103+ tryCompare(fakeWindow, "width", Math.max(initialWindowWidth + data.dx, moveResizeArea.minWidth));
104+ tryCompare(fakeWindow, "height", Math.max(initialWindowHeight + data.dy, moveResizeArea.minHeight));
105+
106+ compare(fakeWindow.x, initialWindowX);
107+ compare(fakeWindow.y, initialWindowY);
108+ }
109+
110+ function test_resizeWindowLeftTop_data() {
111+ return [
112+ { tag: "width", dx: -units.gu(10), dy: 0 },
113+ { tag: "height", dx: 0, dy: -units.gu(10) },
114+ { tag: "both", dx: -units.gu(10), dy: -units.gu(10) },
115+ { tag: "smaller than minimum size", dx: units.gu(15), dy: units.gu(15) }
116+ ]
117+ }
118+
119+ function test_resizeWindowLeftTop(data) {
120+ var initialWindowX = fakeWindow.x;
121+ var initialWindowY = fakeWindow.y;
122+ var initialWindowWidth = fakeWindow.width
123+ var initialWindowHeight = fakeWindow.height
124+
125+ var startDragX = initialWindowX - 1
126+ var startDragY = initialWindowY - 1
127+ mouseFlick(root, startDragX, startDragY, startDragX + data.dx, startDragY + data.dy, true, true, units.gu(.5), 10);
128+
129+ tryCompare(fakeWindow, "width", Math.max(initialWindowWidth - data.dx, moveResizeArea.minWidth));
130+ tryCompare(fakeWindow, "height", Math.max(initialWindowHeight - data.dy, moveResizeArea.minHeight));
131+
132+ var maxMoveX = initialWindowWidth - moveResizeArea.minWidth;
133+ var maxMoveY = initialWindowHeight - moveResizeArea.minHeight;
134+ compare(fakeWindow.x, Math.min(initialWindowX + data.dx, initialWindowX + maxMoveX));
135+ compare(fakeWindow.y, Math.min(initialWindowY + data.dy, initialWindowY + maxMoveY));
136+ }
137+ }
138+}
tests/utils/modules/Unity/Test/UnityTestCase.qml+17−69
@@ -37,6 +37,7 @@ TestCase {
3737 this.getCurrentTimeMs = function() {return this.currentTimeMs}
3838 }
3939
40+ // TODO This function can be removed altogether once we use Qt 5.5 which has the same feature
4041 function mouseClick(item, x, y, button, modifiers, delay) {
4142 if (button === undefined)
4243 button = Qt.LeftButton;
@@ -52,6 +53,7 @@ TestCase {
5253 qtest_fail("window not shown", 2);
5354 }
5455
56+ // TODO This function can be removed altogether once we use Qt 5.5 which has the same feature
5557 function mouseDoubleClick(item, x, y, button, modifiers, delay) {
5658 if (button === undefined)
5759 button = Qt.LeftButton;
@@ -67,6 +69,7 @@ TestCase {
6769 qtest_fail("window not shown", 2)
6870 }
6971
72+ // TODO This function can be removed altogether once we use Qt 5.5 which has the same feature
7073 function mousePress(item, x, y, button, modifiers, delay) {
7174 if (button === undefined)
7275 button = Qt.LeftButton;
@@ -82,6 +85,7 @@ TestCase {
8285 qtest_fail("window not shown", 2)
8386 }
8487
88+ // TODO This function can be removed altogether once we use Qt 5.5 which has the same feature
8589 function mouseRelease(item, x, y, button, modifiers, delay) {
8690 if (button === undefined)
8791 button = Qt.LeftButton;
@@ -170,78 +174,22 @@ TestCase {
170174 return null;
171175 }
172176
177+ function findChildsByType(obj, typeName) {
178+ var res = new Array(0);
179+ for (var i in obj.children) {
180+ var c = obj.children[i];
181+ if (UT.Util.isInstanceOf(c, typeName)) {
182+ res.push(c)
183+ }
184+ res = res.concat(findChildsByType(c, typeName));
185+ }
186+ return res;
187+ }
188+
173189 // Type a full string instead of keyClick letter by letter
174− // TODO: this is not ugly, this is uber-ugly and does not support
175− // any special character. Remove the keyMap once keyClick(obj, char)
176− // has landed in upstream Qt.
177190 function typeString(str) {
178− var keyMap = {
179− "a": Qt.Key_A,
180− "b": Qt.Key_B,
181− "c": Qt.Key_C,
182− "d": Qt.Key_D,
183− "e": Qt.Key_E,
184− "f": Qt.Key_F,
185− "g": Qt.Key_G,
186− "h": Qt.Key_H,
187− "i": Qt.Key_I,
188− "j": Qt.Key_J,
189− "k": Qt.Key_K,
190− "l": Qt.Key_L,
191− "m": Qt.Key_M,
192− "n": Qt.Key_N,
193− "o": Qt.Key_O,
194− "p": Qt.Key_P,
195− "q": Qt.Key_Q,
196− "r": Qt.Key_R,
197− "s": Qt.Key_S,
198− "t": Qt.Key_T,
199− "u": Qt.Key_U,
200− "v": Qt.Key_V,
201− "w": Qt.Key_W,
202− "x": Qt.Key_X,
203− "y": Qt.Key_Y,
204− "z": Qt.Key_Z,
205− "A": Qt.Key_A,
206− "B": Qt.Key_B,
207− "C": Qt.Key_C,
208− "D": Qt.Key_D,
209− "E": Qt.Key_E,
210− "F": Qt.Key_F,
211− "G": Qt.Key_G,
212− "H": Qt.Key_H,
213− "I": Qt.Key_I,
214− "J": Qt.Key_J,
215− "K": Qt.Key_K,
216− "L": Qt.Key_L,
217− "M": Qt.Key_M,
218− "N": Qt.Key_N,
219− "O": Qt.Key_O,
220− "P": Qt.Key_P,
221− "Q": Qt.Key_Q,
222− "R": Qt.Key_R,
223− "S": Qt.Key_S,
224− "T": Qt.Key_T,
225− "U": Qt.Key_U,
226− "V": Qt.Key_V,
227− "W": Qt.Key_W,
228− "X": Qt.Key_X,
229− "Y": Qt.Key_Y,
230− "Z": Qt.Key_Z,
231− "0": Qt.Key_0,
232− "1": Qt.Key_1,
233− "2": Qt.Key_2,
234− "3": Qt.Key_3,
235− "4": Qt.Key_4,
236− "5": Qt.Key_5,
237− "6": Qt.Key_6,
238− "7": Qt.Key_7,
239− "8": Qt.Key_8,
240− "9": Qt.Key_9,
241− " ": Qt.Key_Space,
242− }
243191 for (var i = 0; i < str.length; i++) {
244− keyClick(keyMap[str[i]])
192+ keyClick(str[i])
245193 }
246194 }
247195