8924fe7 · unity8 · git.iko.soy

git.iko.soy/unity8

on xenial help sign in

merged

8924fe7Andrea Cimitan12 years ago

build.sh+4−1

compare with xenial

unifiedsplit

@@ -61,7 +61,10 @@ install_dependencies() {

61}

63mk_build_deps() {

64+ if [ ! -f control -o $CODE_DIR/debian/control -nt control ]; then

65+ sed 's/\:native//g' $CODE_DIR/debian/control > control

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

66+ mk-build-deps --install --root-cmd sudo control

67+ fi

65}

68}

67if [ -f "/usr/bin/ccache" ] ; then

70if [ -f "/usr/bin/ccache" ] ; then

debian/changelog+54

@@ -1,3 +1,57 @@

1+unity8 (8.02+15.04.20150121.2-0ubuntu1) vivid; urgency=low

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+

1unity8 (8.02+15.04.20150109.2-0ubuntu1) vivid; urgency=low

55unity8 (8.02+15.04.20150109.2-0ubuntu1) vivid; urgency=low

3 [ Michał Sawicz ]

57 [ Michał Sawicz ]

plugins/Dash/CardCreator.js+1−1

@@ -320,7 +320,7 @@ function cardString(template, components) {

320 var hasSummary = components["summary"] || false;

321 var artAndSummary = hasArt && hasSummary;

322 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);

324 var hasTitle = components["title"] || false;

325 var hasMascot = components["mascot"] || false;

326 var hasEmblem = components["emblem"] && !(hasMascot && template["card-size"] === "small") || false;

plugins/Unity/DashCommunicator/dashconnection.cpp+30

@@ -19,12 +19,42 @@

19#include <QDBusInterface>

20#include <QDBusPendingCall>

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+

22DashConnection::DashConnection(const QString &service, const QString &path, const QString &interface, QObject *parent):

45DashConnection::DashConnection(const QString &service, const QString &path, const QString &interface, QObject *parent):

23 AbstractDBusServiceMonitor(service, path, interface, SessionBus, parent)

46 AbstractDBusServiceMonitor(service, path, interface, SessionBus, parent)

24{

47{

26}

49}

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+

28void DashConnection::setCurrentScope(int index, bool animate, bool isSwipe)

58void DashConnection::setCurrentScope(int index, bool animate, bool isSwipe)

29{

59{

30 if (dbusInterface()) {

60 if (dbusInterface()) {

plugins/Unity/DashCommunicator/dashconnection.h+4−1

@@ -20,7 +20,6 @@

20// local

21#include "abstractdbusservicemonitor.h"

23−

24class DashConnection: public AbstractDBusServiceMonitor

23class DashConnection: public AbstractDBusServiceMonitor

25{

24{

26 Q_OBJECT

25 Q_OBJECT

@@ -29,6 +28,10 @@ public:

30public Q_SLOTS:

29public Q_SLOTS:

31 void setCurrentScope(int index, bool animate, bool isSwipe);

30 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;

32};

35};

34#endif

37#endif

po/ca.po+51−51

@@ -15,19 +15,19 @@ msgstr ""

15"Content-Type: text/plain; charset=UTF-8\n"

16"Content-Transfer-Encoding: 8bit\n"

17"Plural-Forms: nplurals=2; plural=n != 1;\n"

18−"X-Launchpad-Export-Date: 2015-01-14 06:48+0000\n"

18+"X-Launchpad-Export-Date: 2015-01-15 06:06+0000\n"

19−"X-Generator: Launchpad (build 17298)\n"

19+"X-Generator: Launchpad (build 17303)\n"

21#: plugins/LightDM/Greeter.cpp:130

22msgid "Password: "

23msgstr "Contrasenya: "

25#: plugins/Unity/Launcher/launcheritem.cpp:45

26−#: plugins/Unity/Launcher/launcheritem.cpp:100

26+#: plugins/Unity/Launcher/launcheritem.cpp:91

27msgid "Pin shortcut"

28msgstr "Enganxa la drecera"

30−#: plugins/Unity/Launcher/launcheritem.cpp:100

30+#: plugins/Unity/Launcher/launcheritem.cpp:91

31msgid "Unpin shortcut"

32msgstr "Desenganxa la drecera"

@@ -54,45 +54,45 @@ msgid_plural "Please wait %1 minutes and then try again…"

54msgstr[0] "Espereu %1 minut i torneu-ho a intentar..."

55msgstr[1] "Espereu %1 minuts i torneu-ho a intentar..."

57−#: qml/Components/Dialogs.qml:70

57+#: qml/Components/Dialogs.qml:74

58msgid "Log out"

59msgstr "Surt"

61−#: qml/Components/Dialogs.qml:71

61+#: qml/Components/Dialogs.qml:75

62msgid "Are you sure you want to log out?"

63msgstr "Segur que voleu sortir?"

65−#: qml/Components/Dialogs.qml:73 qml/Components/Dialogs.qml:97

65+#: qml/Components/Dialogs.qml:77 qml/Components/Dialogs.qml:101

66−#: qml/Components/Dialogs.qml:122

66+#: qml/Components/Dialogs.qml:126

67msgid "No"

68msgstr "No"

70−#: qml/Components/Dialogs.qml:80 qml/Components/Dialogs.qml:104

70+#: qml/Components/Dialogs.qml:84 qml/Components/Dialogs.qml:108

71−#: qml/Components/Dialogs.qml:129

71+#: qml/Components/Dialogs.qml:133

72msgid "Yes"

73msgstr "Sí"

75−#: qml/Components/Dialogs.qml:94

75+#: qml/Components/Dialogs.qml:98

76msgid "Shut down"

77msgstr "Apaga"

79−#: qml/Components/Dialogs.qml:95

79+#: qml/Components/Dialogs.qml:99

80msgid "Are you sure you want to shut down?"

81msgstr "Segur que voleu apagar?"

83−#: qml/Components/Dialogs.qml:119

83+#: qml/Components/Dialogs.qml:123

84msgid "Reboot"

85msgstr "Reinicia"

87−#: qml/Components/Dialogs.qml:120

87+#: qml/Components/Dialogs.qml:124

88msgid "Are you sure you want to reboot?"

89msgstr "Segur que voleu reiniciar?"

91−#: qml/Components/Dialogs.qml:144

91+#: qml/Components/Dialogs.qml:148

92msgid "Power"

93msgstr "Energia"

95−#: qml/Components/Dialogs.qml:145

95+#: qml/Components/Dialogs.qml:149

96msgid ""

97"Are you sure you would like\n"

98"to power off?"

@@ -100,15 +100,15 @@ msgstr ""

100"Segur que voleu\n"

101"apagar?"

102

103−#: qml/Components/Dialogs.qml:147

103+#: qml/Components/Dialogs.qml:151

104msgid "Power off"

105msgstr "Apaga"

106

107−#: qml/Components/Dialogs.qml:157

107+#: qml/Components/Dialogs.qml:161

108msgid "Restart"

109msgstr "Reinicia"

110

111−#: qml/Components/Dialogs.qml:167

111+#: qml/Components/Dialogs.qml:171

112msgid "Cancel"

113msgstr "Cancel·la"

114

@@ -116,49 +116,49 @@ msgstr "Cancel·la"

116msgid "Skip intro"

117msgstr "Omet la introducció"

118

119−#: qml/Components/EdgeDemo.qml:125

119+#: qml/Components/EdgeDemo.qml:112

120msgid "Right edge"

121msgstr "Vora dreta"

122

123−#: qml/Components/EdgeDemo.qml:126

123+#: qml/Components/EdgeDemo.qml:113

124msgid "Try swiping from the right edge to unlock the phone"

125msgstr ""

126"Proveu de lliscar el dit des de la vora dreta per desblocar el telèfon"

127

128−#: qml/Components/EdgeDemo.qml:157

128+#: qml/Components/EdgeDemo.qml:144

129msgid "Top edge"

130msgstr "Vora superior"

131

132−#: qml/Components/EdgeDemo.qml:158

132+#: qml/Components/EdgeDemo.qml:145

133msgid "Try swiping from the top edge to access the indicators"

134msgstr ""

135"Proveu de lliscar el dit des de la vora superior per accedir als indicadors"

136

137−#: qml/Components/EdgeDemo.qml:183

137+#: qml/Components/EdgeDemo.qml:170

138msgid "Close"

139msgstr "Tanca"

140

141−#: qml/Components/EdgeDemo.qml:184

141+#: qml/Components/EdgeDemo.qml:171

142msgid "Swipe up again to close the settings screen"

143msgstr ""

144"Llisqueu el dit cap amunt una altra vegada per tancar la pantalla de "

145"configuració"

146

147−#: qml/Components/EdgeDemo.qml:214

147+#: qml/Components/EdgeDemo.qml:201

148msgid "Left edge"

149msgstr "Vora esquerra"

150

151−#: qml/Components/EdgeDemo.qml:215

151+#: qml/Components/EdgeDemo.qml:202

152msgid "Swipe from the left to reveal the launcher for quick access to apps"

153msgstr ""

154"Llisqueu el dit des de la vora esquerra per mostrar el llançador i accedir "

155"ràpidament a les aplicacions"

156

157−#: qml/Components/EdgeDemo.qml:242

157+#: qml/Components/EdgeDemo.qml:229

158msgid "Well done"

159msgstr "Enhorabona!"

160

161−#: qml/Components/EdgeDemo.qml:243

161+#: qml/Components/EdgeDemo.qml:230

162msgid ""

163"You have now mastered the edge gestures and can start using the "

164"phone Tap on the screen to start"

@@ -166,44 +166,44 @@ msgstr ""

166"Ja heu après com utilitzar els gestos de les vores per fer servir el "

167"telèfon Feu un toc a la pantalla per començar"

168

169−#: qml/Components/Lockscreen.qml:238

169+#: qml/Components/Lockscreen.qml:223

170msgid "Return to Call"

171msgstr "Torna a la trucada"

172

173−#: qml/Components/Lockscreen.qml:238

173+#: qml/Components/Lockscreen.qml:223

174msgid "Emergency Call"

175msgstr "Trucada d'emergència"

176

177−#: qml/Components/Lockscreen.qml:270

177+#: qml/Components/Lockscreen.qml:255

178msgid "OK"

179msgstr "D'acord"

180

181−#: qml/Dash/GenericScopeView.qml:431 qml/Dash/GenericScopeView.qml:588

181+#: qml/Dash/GenericScopeView.qml:434 qml/Dash/GenericScopeView.qml:591

182msgid "See less"

183msgstr "Mostra'n menys"

184

185−#: qml/Dash/GenericScopeView.qml:431

185+#: qml/Dash/GenericScopeView.qml:434

186msgid "See all"

187msgstr "Mostra-ho tot"

188

189−#: qml/Dash/GenericScopeView.qml:493 qml/Dash/PageHeader.qml:267

189+#: qml/Dash/GenericScopeView.qml:496 qml/Dash/PageHeader.qml:268

190#: qml/Panel/SearchIndicator.qml:27

191msgid "Search"

192msgstr "Cerca"

193

194−#: qml/Dash/PageHeader.qml:260

194+#: qml/Dash/PageHeader.qml:261

195msgid "Store"

196msgstr "Botiga"

197

198−#: qml/Dash/PageHeader.qml:277

198+#: qml/Dash/PageHeader.qml:278

199msgid "Settings"

200msgstr "Paràmetres"

201

202−#: qml/Dash/PageHeader.qml:284

202+#: qml/Dash/PageHeader.qml:285

203msgid "Remove from Favorites"

204msgstr "Suprimeix dels preferits"

205

206−#: qml/Dash/PageHeader.qml:284

206+#: qml/Dash/PageHeader.qml:285

207msgid "Add to Favorites"

208msgstr "Afegeix als preferits"

209

@@ -299,49 +299,49 @@ msgstr "Desbloca la SIM"

299msgid "Roaming"

300msgstr "Itinerància"

301

302−#: qml/Shell.qml:367

302+#: qml/Shell.qml:402

303#, qt-format

304msgid "Enter %1"

305msgstr "Introduïu: %1"

306

307−#: qml/Shell.qml:368 qml/Wizard/Pages/passwd-set.qml:60

307+#: qml/Shell.qml:394

308msgid "Enter passphrase"

309msgstr "Introduïu la contrasenya"

310

311−#: qml/Shell.qml:369

311+#: qml/Shell.qml:398

312msgid "Enter passcode"

313msgstr "Introduïu el codi d'accés"

314

315−#: qml/Shell.qml:370

315+#: qml/Shell.qml:403

316#, qt-format

317msgid "Sorry, incorrect %1"

318msgstr "Incorrecte (%1)"

319

320−#: qml/Shell.qml:371

320+#: qml/Shell.qml:395

321msgid "Sorry, incorrect passphrase"

322msgstr "La contrasenya no és correcta"

323

324−#: qml/Shell.qml:372

324+#: qml/Shell.qml:396

325msgid "Please re-enter"

326msgstr "Torneu-ho a introduir"

327

328−#: qml/Shell.qml:373

328+#: qml/Shell.qml:399

329msgid "Sorry, incorrect passcode"

330msgstr "El codi d'accés no és correcte"

331

332−#: qml/Shell.qml:467 qml/Wizard/Pages/passwd-confirm.qml:53

332+#: qml/Shell.qml:444

333msgid "Sorry, incorrect passphrase."

334msgstr "La contrasenya és incorrecta"

335

336−#: qml/Shell.qml:468 qml/Wizard/Pages/passwd-confirm.qml:54

336+#: qml/Shell.qml:445

337msgid "Sorry, incorrect passcode."

338msgstr "El codi d'accés no és correcte"

339

340−#: qml/Shell.qml:469

340+#: qml/Shell.qml:446

341msgid "This will be your last attempt."

342msgstr "Aquest serà el darrer intent."

343

344−#: qml/Shell.qml:471

344+#: qml/Shell.qml:448

345msgid ""

346"If passphrase is entered incorrectly, your phone will conduct a factory "

347"reset and all personal data will be deleted."

@@ -350,7 +350,7 @@ msgstr ""

350"reinicialitzarà a l'estat de fàbrica i se suprimiran totes les dades "

351"personals."

352

353−#: qml/Shell.qml:472

353+#: qml/Shell.qml:449

354msgid ""

355"If passcode is entered incorrectly, your phone will conduct a factory reset "

356"and all personal data will be deleted."

po/en_AU.po+100−94

@@ -8,26 +8,26 @@ msgstr ""

8"Project-Id-Version: unity\n"

9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10"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"

12"Last-Translator: Jared Norris <jarednorris@ubuntu.com>\n"

13"Language-Team: English (Australia) <en_AU@li.org>\n"

14"MIME-Version: 1.0\n"

15"Content-Type: text/plain; charset=UTF-8\n"

16"Content-Transfer-Encoding: 8bit\n"

17"Plural-Forms: nplurals=2; plural=n != 1;\n"

18−"X-Launchpad-Export-Date: 2014-12-13 07:11+0000\n"

18+"X-Launchpad-Export-Date: 2015-01-26 06:54+0000\n"

19−"X-Generator: Launchpad (build 17286)\n"

19+"X-Generator: Launchpad (build 17306)\n"

21#: plugins/LightDM/Greeter.cpp:130

22msgid "Password: "

23msgstr "Password: "

25#: plugins/Unity/Launcher/launcheritem.cpp:45

26−#: plugins/Unity/Launcher/launcheritem.cpp:100

26+#: plugins/Unity/Launcher/launcheritem.cpp:91

27msgid "Pin shortcut"

28msgstr "Pin shortcut"

30−#: plugins/Unity/Launcher/launcheritem.cpp:100

30+#: plugins/Unity/Launcher/launcheritem.cpp:91

31msgid "Unpin shortcut"

32msgstr "Unpin shortcut"

@@ -50,45 +50,45 @@ msgid_plural "Please wait %1 minutes and then try again…"

50msgstr[0] "Please wait %1 minute and then try again…"

51msgstr[1] "Please wait %1 minutes and then try again…"

53−#: qml/Components/Dialogs.qml:70

53+#: qml/Components/Dialogs.qml:74

54msgid "Log out"

55msgstr "Log out"

57−#: qml/Components/Dialogs.qml:71

57+#: qml/Components/Dialogs.qml:75

58msgid "Are you sure you want to log out?"

59msgstr "Are you sure you want to log out?"

61−#: qml/Components/Dialogs.qml:73 qml/Components/Dialogs.qml:97

61+#: qml/Components/Dialogs.qml:77 qml/Components/Dialogs.qml:101

62−#: qml/Components/Dialogs.qml:122

62+#: qml/Components/Dialogs.qml:126

63msgid "No"

64msgstr "No"

66−#: qml/Components/Dialogs.qml:80 qml/Components/Dialogs.qml:104

66+#: qml/Components/Dialogs.qml:84 qml/Components/Dialogs.qml:108

67−#: qml/Components/Dialogs.qml:129

67+#: qml/Components/Dialogs.qml:133

68msgid "Yes"

69msgstr "Yes"

71−#: qml/Components/Dialogs.qml:94

71+#: qml/Components/Dialogs.qml:98

72msgid "Shut down"

73msgstr "Shut down"

75−#: qml/Components/Dialogs.qml:95

75+#: qml/Components/Dialogs.qml:99

76msgid "Are you sure you want to shut down?"

77msgstr "Are you sure you want to shut down?"

79−#: qml/Components/Dialogs.qml:119

79+#: qml/Components/Dialogs.qml:123

80msgid "Reboot"

81msgstr "Reboot"

83−#: qml/Components/Dialogs.qml:120

83+#: qml/Components/Dialogs.qml:124

84msgid "Are you sure you want to reboot?"

85msgstr "Are you sure you want to reboot?"

87−#: qml/Components/Dialogs.qml:144

87+#: qml/Components/Dialogs.qml:148

88msgid "Power"

89msgstr "Power"

91−#: qml/Components/Dialogs.qml:145

91+#: qml/Components/Dialogs.qml:149

92msgid ""

93"Are you sure you would like\n"

94"to power off?"

@@ -96,15 +96,15 @@ msgstr ""

96"Are you sure you would like\n"

97"to power off?"

99−#: qml/Components/Dialogs.qml:147

99+#: qml/Components/Dialogs.qml:151

100msgid "Power off"

101msgstr "Power off"

102

103−#: qml/Components/Dialogs.qml:157

103+#: qml/Components/Dialogs.qml:161

104msgid "Restart"

105msgstr "Restart"

106

107−#: qml/Components/Dialogs.qml:167

107+#: qml/Components/Dialogs.qml:171

108msgid "Cancel"

109msgstr "Cancel"

110

@@ -112,43 +112,43 @@ msgstr "Cancel"

112msgid "Skip intro"

113msgstr "Skip intro"

114

115−#: qml/Components/EdgeDemo.qml:125

115+#: qml/Components/EdgeDemo.qml:112

116msgid "Right edge"

117msgstr "Right edge"

118

119−#: qml/Components/EdgeDemo.qml:126

119+#: qml/Components/EdgeDemo.qml:113

120msgid "Try swiping from the right edge to unlock the phone"

121msgstr "Try swiping from the right edge to unlock the phone"

122

123−#: qml/Components/EdgeDemo.qml:157

123+#: qml/Components/EdgeDemo.qml:144

124msgid "Top edge"

125msgstr "Top edge"

126

127−#: qml/Components/EdgeDemo.qml:158

127+#: qml/Components/EdgeDemo.qml:145

128msgid "Try swiping from the top edge to access the indicators"

129msgstr "Try swiping from the top edge to access the indicators"

130

131−#: qml/Components/EdgeDemo.qml:183

131+#: qml/Components/EdgeDemo.qml:170

132msgid "Close"

133msgstr "Close"

134

135−#: qml/Components/EdgeDemo.qml:184

135+#: qml/Components/EdgeDemo.qml:171

136msgid "Swipe up again to close the settings screen"

137msgstr "Swipe up again to close the settings screen"

138

139−#: qml/Components/EdgeDemo.qml:214

139+#: qml/Components/EdgeDemo.qml:201

140msgid "Left edge"

141msgstr "Left edge"

142

143−#: qml/Components/EdgeDemo.qml:215

143+#: qml/Components/EdgeDemo.qml:202

144msgid "Swipe from the left to reveal the launcher for quick access to apps"

145msgstr "Swipe from the left to reveal the launcher for quick access to apps"

146

147−#: qml/Components/EdgeDemo.qml:242

147+#: qml/Components/EdgeDemo.qml:229

148msgid "Well done"

149msgstr "Well done"

150

151−#: qml/Components/EdgeDemo.qml:243

151+#: qml/Components/EdgeDemo.qml:230

152msgid ""

153"You have now mastered the edge gestures and can start using the "

154"phone Tap on the screen to start"

@@ -156,44 +156,44 @@ msgstr ""

156"You have now mastered the edge gestures and can start using the "

157"phone Tap on the screen to start"

158

159−#: qml/Components/Lockscreen.qml:238

159+#: qml/Components/Lockscreen.qml:223

160msgid "Return to Call"

161−msgstr ""

161+msgstr "Return to Call"

162

163−#: qml/Components/Lockscreen.qml:238

163+#: qml/Components/Lockscreen.qml:223

164msgid "Emergency Call"

165msgstr "Emergency Call"

166

167−#: qml/Components/Lockscreen.qml:270

167+#: qml/Components/Lockscreen.qml:255

168msgid "OK"

169msgstr "OK"

170

171−#: qml/Dash/GenericScopeView.qml:431 qml/Dash/GenericScopeView.qml:588

171+#: qml/Dash/GenericScopeView.qml:434 qml/Dash/GenericScopeView.qml:591

172msgid "See less"

173msgstr "See less"

174

175−#: qml/Dash/GenericScopeView.qml:431

175+#: qml/Dash/GenericScopeView.qml:434

176msgid "See all"

177msgstr "See all"

178

179−#: qml/Dash/GenericScopeView.qml:493 qml/Dash/PageHeader.qml:267

179+#: qml/Dash/GenericScopeView.qml:496 qml/Dash/PageHeader.qml:268

180#: qml/Panel/SearchIndicator.qml:27

181msgid "Search"

182msgstr "Search"

183

184−#: qml/Dash/PageHeader.qml:260

184+#: qml/Dash/PageHeader.qml:261

185msgid "Store"

186msgstr "Store"

187

188−#: qml/Dash/PageHeader.qml:277

188+#: qml/Dash/PageHeader.qml:278

189msgid "Settings"

190msgstr "Settings"

191

192−#: qml/Dash/PageHeader.qml:284

192+#: qml/Dash/PageHeader.qml:285

193msgid "Remove from Favorites"

194msgstr "Remove from Favourites"

195

196−#: qml/Dash/PageHeader.qml:284

196+#: qml/Dash/PageHeader.qml:285

197msgid "Add to Favorites"

198msgstr "Add to Favourites"

199

@@ -227,15 +227,15 @@ msgstr "Release to refresh…"

227

228#: qml/Dash/ScopesList.qml:63

229msgid "Manage"

230−msgstr ""

230+msgstr "Manage"

231

232#: qml/Dash/ScopesList.qml:107

233msgid "Home"

234−msgstr ""

234+msgstr "Home"

235

236#: qml/Dash/ScopesList.qml:108

237msgid "Also installed"

238−msgstr ""

238+msgstr "Also installed"

239

240#: qml/Greeter/Greeter.qml:174

241msgid "Unlock"

@@ -289,49 +289,49 @@ msgstr "Unlock SIM"

289msgid "Roaming"

290msgstr "Roaming"

291

292−#: qml/Shell.qml:367

292+#: qml/Shell.qml:402

293#, qt-format

294msgid "Enter %1"

295msgstr "Enter %1"

296

297−#: qml/Shell.qml:368 qml/Wizard/Pages/passwd-set.qml:60

297+#: qml/Shell.qml:394

298msgid "Enter passphrase"

299msgstr "Enter passphrase"

300

301−#: qml/Shell.qml:369

301+#: qml/Shell.qml:398

302msgid "Enter passcode"

303msgstr "Enter passcode"

304

305−#: qml/Shell.qml:370

305+#: qml/Shell.qml:403

306#, qt-format

307msgid "Sorry, incorrect %1"

308msgstr "Sorry, incorrect %1"

309

310−#: qml/Shell.qml:371

310+#: qml/Shell.qml:395

311msgid "Sorry, incorrect passphrase"

312msgstr "Sorry, incorrect passphrase"

313

314−#: qml/Shell.qml:372

314+#: qml/Shell.qml:396

315msgid "Please re-enter"

316msgstr "Please re-enter"

317

318−#: qml/Shell.qml:373

318+#: qml/Shell.qml:399

319msgid "Sorry, incorrect passcode"

320msgstr "Sorry, incorrect passcode"

321

322−#: qml/Shell.qml:467 qml/Wizard/Pages/passwd-confirm.qml:53

322+#: qml/Shell.qml:444

323msgid "Sorry, incorrect passphrase."

324msgstr "Sorry, incorrect passphrase."

325

326−#: qml/Shell.qml:468 qml/Wizard/Pages/passwd-confirm.qml:54

326+#: qml/Shell.qml:445

327msgid "Sorry, incorrect passcode."

328msgstr "Sorry, incorrect passcode."

329

330−#: qml/Shell.qml:469

330+#: qml/Shell.qml:446

331msgid "This will be your last attempt."

332msgstr "This will be your last attempt."

333

334−#: qml/Shell.qml:471

334+#: qml/Shell.qml:448

335msgid ""

336"If passphrase is entered incorrectly, your phone will conduct a factory "

337"reset and all personal data will be deleted."

@@ -339,7 +339,7 @@ msgstr ""

339"If passphrase is entered incorrectly, your phone will conduct a factory "

340"reset and all personal data will be deleted."

341

342−#: qml/Shell.qml:472

342+#: qml/Shell.qml:449

343msgid ""

344"If passcode is entered incorrectly, your phone will conduct a factory reset "

345"and all personal data will be deleted."

@@ -349,98 +349,98 @@ msgstr ""

349

350#: qml/Wizard/Page.qml:89

351msgid "Back"

352−msgstr ""

352+msgstr "Back"

353

354#: qml/Wizard/Pages/10-welcome.qml:27

355msgid "Hi!"

356−msgstr ""

356+msgstr "Hi!"

357

358#: qml/Wizard/Pages/10-welcome.qml:44

359msgid "Welcome to your Ubuntu phone."

360−msgstr ""

360+msgstr "Welcome to your Ubuntu phone."

361

362#: qml/Wizard/Pages/10-welcome.qml:52

363msgid "Let’s get started."

364−msgstr ""

364+msgstr "Let’s get started."

365

366#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:128

367#: qml/Wizard/Pages/40-wifi.qml:197 qml/Wizard/Pages/50-location.qml:131

368#: qml/Wizard/Pages/60-reporting.qml:50 qml/Wizard/Pages/passwd-confirm.qml:82

369#: qml/Wizard/Pages/passwd-set.qml:90

370msgid "Continue"

371−msgstr ""

371+msgstr "Continue"

372

373#: qml/Wizard/Pages/20-sim.qml:25

374msgid "Add a SIM card and restart your device"

375−msgstr ""

375+msgstr "Add a SIM card and restart your device"

376

377#: qml/Wizard/Pages/20-sim.qml:55

378msgid "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."

380

381#: qml/Wizard/Pages/20-sim.qml:69 qml/Wizard/Pages/40-wifi.qml:197

382msgid "Skip"

383−msgstr ""

383+msgstr "Skip"

384

385#: qml/Wizard/Pages/30-passwd-type.qml:39

386msgid "Lock security"

387−msgstr ""

387+msgstr "Lock security"

388

389#: qml/Wizard/Pages/30-passwd-type.qml:74

390msgid "Please select how you’d like to unlock your phone."

391−msgstr ""

391+msgstr "Please select how you’d like to unlock your phone."

392

393#: qml/Wizard/Pages/30-passwd-type.qml:97

394msgid "Swipe"

395−msgstr ""

395+msgstr "Swipe"

396

397#: qml/Wizard/Pages/30-passwd-type.qml:98

398msgid "No security"

399−msgstr ""

399+msgstr "No security"

400

401#: qml/Wizard/Pages/30-passwd-type.qml:100

402msgid "Passcode"

403−msgstr ""

403+msgstr "Passcode"

404

405#: qml/Wizard/Pages/30-passwd-type.qml:101

406msgid "4 digits only"

407−msgstr ""

407+msgstr "4 digits only"

408

409#: qml/Wizard/Pages/30-passwd-type.qml:103

410msgid "Passphrase"

411−msgstr ""

411+msgstr "Passphrase"

412

413#: qml/Wizard/Pages/30-passwd-type.qml:104

414msgid "Numbers and letters"

415−msgstr ""

415+msgstr "Numbers and letters"

416

417#: qml/Wizard/Pages/40-wifi.qml:28

418msgid "Connect to Wi‑Fi"

419−msgstr ""

419+msgstr "Connect to Wi‑Fi"

420

421#: qml/Wizard/Pages/40-wifi.qml:147

422msgid "Available networks…"

423−msgstr ""

423+msgstr "Available networks…"

424

425#: qml/Wizard/Pages/40-wifi.qml:148

426msgid "No available networks."

427−msgstr ""

427+msgstr "No available networks."

428

429#: qml/Wizard/Pages/50-location.qml:27

430msgid "Location"

431−msgstr ""

431+msgstr "Location"

432

433#: qml/Wizard/Pages/50-location.qml:62

434msgid "Let the phone detect your location:"

435−msgstr ""

435+msgstr "Let the phone detect your location:"

436

437#: qml/Wizard/Pages/50-location.qml:69

438msgid "Using GPS only (less accurate)"

439−msgstr ""

439+msgstr "Using GPS only (less accurate)"

440

441#: qml/Wizard/Pages/50-location.qml:86

442msgid "Using GPS, anonymized Wi-Fi and cellular network info (recommended)"

443−msgstr ""

443+msgstr "Using GPS, anonymised Wi-Fi and cellular network info (recommended)"

444

445#. TRANSLATORS: HERE is a trademark for Nokia's location service, you probably shouldn't translate it

446#: qml/Wizard/Pages/50-location.qml:103

@@ -448,81 +448,87 @@ msgid ""

448"By selecting this option you agree to the Nokia HERE <a href='#'>terms and "

449"conditions</a>."

450msgstr ""

451+"By selecting this option you agree to the Nokia HERE <a href='#'>terms and "

452+"conditions</a>."

451

453

452#: qml/Wizard/Pages/50-location.qml:112

454#: qml/Wizard/Pages/50-location.qml:112

453msgid "Not at all"

455msgid "Not at all"

454−msgstr ""

456+msgstr "Not at all"

455

457

456#: qml/Wizard/Pages/50-location.qml:124

458#: qml/Wizard/Pages/50-location.qml:124

457msgid "You can change your mind later in System Settings."

459msgid "You can change your mind later in System Settings."

458−msgstr ""

460+msgstr "You can change your mind later in System Settings."

459

461

460#: qml/Wizard/Pages/60-reporting.qml:24

462#: qml/Wizard/Pages/60-reporting.qml:24

461msgid "Improving your experience"

463msgid "Improving your experience"

462−msgstr ""

464+msgstr "Improving your experience"

463

465

464#: qml/Wizard/Pages/60-reporting.qml:36

466#: qml/Wizard/Pages/60-reporting.qml:36

465msgid ""

467msgid ""

466"Your phone is set up to automatically report errors to Canonical and its "

468"Your phone is set up to automatically report errors to Canonical and its "

467"partners, the makers of the operating system."

469"partners, the makers of the operating system."

468msgstr ""

470msgstr ""

471+"Your phone is set up to automatically report errors to Canonical and its "

472+"partners, the makers of the operating system."

469

473

470#: qml/Wizard/Pages/60-reporting.qml:43

474#: qml/Wizard/Pages/60-reporting.qml:43

471msgid ""

475msgid ""

472"This can be disabled in System Settings under Security & "

476"This can be disabled in System Settings under Security & "

473"Privacy"

477"Privacy"

474msgstr ""

478msgstr ""

479+"This can be disabled in System Settings under Security & "

480+"Privacy"

475

481

476#: qml/Wizard/Pages/80-finished.qml:24

482#: qml/Wizard/Pages/80-finished.qml:24

477msgid "All done"

483msgid "All done"

478−msgstr ""

484+msgstr "All done"

479

485

480#: qml/Wizard/Pages/80-finished.qml:39

486#: qml/Wizard/Pages/80-finished.qml:39

481msgid "Nice work!"

487msgid "Nice work!"

482−msgstr ""

488+msgstr "Nice work!"

483

489

484#: qml/Wizard/Pages/80-finished.qml:46

490#: qml/Wizard/Pages/80-finished.qml:46

485msgid "Your phone is now ready to use."

491msgid "Your phone is now ready to use."

486−msgstr ""

492+msgstr "Your phone is now ready to use."

487

493

488#: qml/Wizard/Pages/80-finished.qml:53

494#: qml/Wizard/Pages/80-finished.qml:53

489msgid "Finish"

495msgid "Finish"

490−msgstr ""

496+msgstr "Finish"

491

497

492#: qml/Wizard/Pages/here-terms.qml:27

498#: qml/Wizard/Pages/here-terms.qml:27

493msgid "Terms & Conditions"

499msgid "Terms & Conditions"

494−msgstr ""

500+msgstr "Terms & Conditions"

495

501

496#: qml/Wizard/Pages/passwd-confirm.qml:49

502#: qml/Wizard/Pages/passwd-confirm.qml:49

497msgid "Confirm passphrase"

503msgid "Confirm passphrase"

498−msgstr ""

504+msgstr "Confirm passphrase"

499

505

500#: qml/Wizard/Pages/passwd-confirm.qml:50

506#: qml/Wizard/Pages/passwd-confirm.qml:50

501msgid "Confirm passcode"

507msgid "Confirm passcode"

502−msgstr ""

508+msgstr "Confirm passcode"

503

509

504#: qml/Wizard/Pages/passwd-confirm.qml:53

510#: qml/Wizard/Pages/passwd-confirm.qml:53

505#: qml/Wizard/Pages/passwd-confirm.qml:54

511#: qml/Wizard/Pages/passwd-confirm.qml:54

506msgid "Please try again."

512msgid "Please try again."

507−msgstr ""

513+msgstr "Please try again."

508

514

509#: qml/Wizard/Pages/passwd-set.qml:61

515#: qml/Wizard/Pages/passwd-set.qml:61

510msgid "Choose your passcode"

516msgid "Choose your passcode"

511−msgstr ""

517+msgstr "Choose your passcode"

512

518

513#: qml/Wizard/Pages/passwd-set.qml:68

519#: qml/Wizard/Pages/passwd-set.qml:68

514msgid "Passphrase must be 4 characters long"

520msgid "Passphrase must be 4 characters long"

515−msgstr ""

521+msgstr "Passphrase must be 4 characters long"

516

522

517#: qml/Wizard/StackButton.qml:39

523#: qml/Wizard/StackButton.qml:39

518#, qt-format

524#, qt-format

519msgid "〈 %1"

525msgid "〈 %1"

520−msgstr ""

526+msgstr "〈 %1"

521

527

522#: qml/Wizard/StackButton.qml:42

528#: qml/Wizard/StackButton.qml:42

523#, qt-format

529#, qt-format

524msgid "%1 〉"

530msgid "%1 〉"

525−msgstr ""

531+msgstr "%1 〉"

526

532

527#~ msgid "Confirm"

533#~ msgid "Confirm"

528#~ msgstr "Confirm"

534#~ msgstr "Confirm"

po/en_GB.po+47−41

@@ -8,15 +8,15 @@ msgstr ""

8"Project-Id-Version: unity\n"

9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10"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"

12"Last-Translator: Andi Chandler <Unknown>\n"

13"Language-Team: English (United Kingdom) <en_GB@li.org>\n"

14"MIME-Version: 1.0\n"

15"Content-Type: text/plain; charset=UTF-8\n"

16"Content-Transfer-Encoding: 8bit\n"

17"Plural-Forms: nplurals=2; plural=n != 1;\n"

18−"X-Launchpad-Export-Date: 2014-12-13 07:11+0000\n"

18+"X-Launchpad-Export-Date: 2015-01-23 06:48+0000\n"

19−"X-Generator: Launchpad (build 17286)\n"

19+"X-Generator: Launchpad (build 17306)\n"

21#: plugins/LightDM/Greeter.cpp:130

22msgid "Password: "

@@ -349,98 +349,98 @@ msgstr ""

349

350#: qml/Wizard/Page.qml:89

351msgid "Back"

352−msgstr ""

352+msgstr "Back"

353

354#: qml/Wizard/Pages/10-welcome.qml:27

355msgid "Hi!"

356−msgstr ""

356+msgstr "Hi!"

357

358#: qml/Wizard/Pages/10-welcome.qml:44

359msgid "Welcome to your Ubuntu phone."

360−msgstr ""

360+msgstr "Welcome to your Ubuntu phone."

361

362#: qml/Wizard/Pages/10-welcome.qml:52

363msgid "Let’s get started."

364−msgstr ""

364+msgstr "Let’s get started."

365

366#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:128

367#: qml/Wizard/Pages/40-wifi.qml:197 qml/Wizard/Pages/50-location.qml:131

368#: qml/Wizard/Pages/60-reporting.qml:50 qml/Wizard/Pages/passwd-confirm.qml:82

369#: qml/Wizard/Pages/passwd-set.qml:90

370msgid "Continue"

371−msgstr ""

371+msgstr "Continue"

372

373#: qml/Wizard/Pages/20-sim.qml:25

374msgid "Add a SIM card and restart your device"

375−msgstr ""

375+msgstr "Add a SIM card and restart your device"

376

377#: qml/Wizard/Pages/20-sim.qml:55

378msgid "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."

380

381#: qml/Wizard/Pages/20-sim.qml:69 qml/Wizard/Pages/40-wifi.qml:197

382msgid "Skip"

383−msgstr ""

383+msgstr "Skip"

384

385#: qml/Wizard/Pages/30-passwd-type.qml:39

386msgid "Lock security"

387−msgstr ""

387+msgstr "Lock security"

388

389#: qml/Wizard/Pages/30-passwd-type.qml:74

390msgid "Please select how you’d like to unlock your phone."

391−msgstr ""

391+msgstr "Please select how you’d like to unlock your phone."

392

393#: qml/Wizard/Pages/30-passwd-type.qml:97

394msgid "Swipe"

395−msgstr ""

395+msgstr "Swipe"

396

397#: qml/Wizard/Pages/30-passwd-type.qml:98

398msgid "No security"

399−msgstr ""

399+msgstr "No security"

400

401#: qml/Wizard/Pages/30-passwd-type.qml:100

402msgid "Passcode"

403−msgstr ""

403+msgstr "Passcode"

404

405#: qml/Wizard/Pages/30-passwd-type.qml:101

406msgid "4 digits only"

407−msgstr ""

407+msgstr "4 digits only"

408

409#: qml/Wizard/Pages/30-passwd-type.qml:103

410msgid "Passphrase"

411−msgstr ""

411+msgstr "Passphrase"

412

413#: qml/Wizard/Pages/30-passwd-type.qml:104

414msgid "Numbers and letters"

415−msgstr ""

415+msgstr "Numbers and letters"

416

417#: qml/Wizard/Pages/40-wifi.qml:28

418msgid "Connect to Wi‑Fi"

419−msgstr ""

419+msgstr "Connect to Wi‑Fi"

420

421#: qml/Wizard/Pages/40-wifi.qml:147

422msgid "Available networks…"

423−msgstr ""

423+msgstr "Available networks…"

424

425#: qml/Wizard/Pages/40-wifi.qml:148

426msgid "No available networks."

427−msgstr ""

427+msgstr "No available networks."

428

429#: qml/Wizard/Pages/50-location.qml:27

430msgid "Location"

431−msgstr ""

431+msgstr "Location"

432

433#: qml/Wizard/Pages/50-location.qml:62

434msgid "Let the phone detect your location:"

435−msgstr ""

435+msgstr "Let the phone detect your location:"

436

437#: qml/Wizard/Pages/50-location.qml:69

438msgid "Using GPS only (less accurate)"

439−msgstr ""

439+msgstr "Using GPS only (less accurate)"

440

441#: qml/Wizard/Pages/50-location.qml:86

442msgid "Using GPS, anonymized Wi-Fi and cellular network info (recommended)"

443−msgstr ""

443+msgstr "Using GPS, anonymised Wi-Fi and cellular network info (recommended)"

444

445#. TRANSLATORS: HERE is a trademark for Nokia's location service, you probably shouldn't translate it

446#: qml/Wizard/Pages/50-location.qml:103

@@ -448,81 +448,87 @@ msgid ""

448"By selecting this option you agree to the Nokia HERE <a href='#'>terms and "

449"conditions</a>."

450msgstr ""

451+"By selecting this option you agree to the Nokia HERE <a href='#'>terms and "

452+"conditions</a>."

451

453

452#: qml/Wizard/Pages/50-location.qml:112

454#: qml/Wizard/Pages/50-location.qml:112

453msgid "Not at all"

455msgid "Not at all"

454−msgstr ""

456+msgstr "Not at all"

455

457

456#: qml/Wizard/Pages/50-location.qml:124

458#: qml/Wizard/Pages/50-location.qml:124

457msgid "You can change your mind later in System Settings."

459msgid "You can change your mind later in System Settings."

458−msgstr ""

460+msgstr "You can change your mind later in System Settings."

459

461

460#: qml/Wizard/Pages/60-reporting.qml:24

462#: qml/Wizard/Pages/60-reporting.qml:24

461msgid "Improving your experience"

463msgid "Improving your experience"

462−msgstr ""

464+msgstr "Improving your experience"

463

465

464#: qml/Wizard/Pages/60-reporting.qml:36

466#: qml/Wizard/Pages/60-reporting.qml:36

465msgid ""

467msgid ""

466"Your phone is set up to automatically report errors to Canonical and its "

468"Your phone is set up to automatically report errors to Canonical and its "

467"partners, the makers of the operating system."

469"partners, the makers of the operating system."

468msgstr ""

470msgstr ""

471+"Your phone is set up to automatically report errors to Canonical and its "

472+"partners, the makers of the operating system."

469

473

470#: qml/Wizard/Pages/60-reporting.qml:43

474#: qml/Wizard/Pages/60-reporting.qml:43

471msgid ""

475msgid ""

472"This can be disabled in System Settings under Security & "

476"This can be disabled in System Settings under Security & "

473"Privacy"

477"Privacy"

474msgstr ""

478msgstr ""

479+"This can be disabled in System Settings under Security & "

480+"Privacy"

475

481

476#: qml/Wizard/Pages/80-finished.qml:24

482#: qml/Wizard/Pages/80-finished.qml:24

477msgid "All done"

483msgid "All done"

478−msgstr ""

484+msgstr "All done"

479

485

480#: qml/Wizard/Pages/80-finished.qml:39

486#: qml/Wizard/Pages/80-finished.qml:39

481msgid "Nice work!"

487msgid "Nice work!"

482−msgstr ""

488+msgstr "Nice work!"

483

489

484#: qml/Wizard/Pages/80-finished.qml:46

490#: qml/Wizard/Pages/80-finished.qml:46

485msgid "Your phone is now ready to use."

491msgid "Your phone is now ready to use."

486−msgstr ""

492+msgstr "Your phone is now ready to use."

487

493

488#: qml/Wizard/Pages/80-finished.qml:53

494#: qml/Wizard/Pages/80-finished.qml:53

489msgid "Finish"

495msgid "Finish"

490−msgstr ""

496+msgstr "Finish"

491

497

492#: qml/Wizard/Pages/here-terms.qml:27

498#: qml/Wizard/Pages/here-terms.qml:27

493msgid "Terms & Conditions"

499msgid "Terms & Conditions"

494−msgstr ""

500+msgstr "Terms & Conditions"

495

501

496#: qml/Wizard/Pages/passwd-confirm.qml:49

502#: qml/Wizard/Pages/passwd-confirm.qml:49

497msgid "Confirm passphrase"

503msgid "Confirm passphrase"

498−msgstr ""

504+msgstr "Confirm passphrase"

499

505

500#: qml/Wizard/Pages/passwd-confirm.qml:50

506#: qml/Wizard/Pages/passwd-confirm.qml:50

501msgid "Confirm passcode"

507msgid "Confirm passcode"

502−msgstr ""

508+msgstr "Confirm passcode"

503

509

504#: qml/Wizard/Pages/passwd-confirm.qml:53

510#: qml/Wizard/Pages/passwd-confirm.qml:53

505#: qml/Wizard/Pages/passwd-confirm.qml:54

511#: qml/Wizard/Pages/passwd-confirm.qml:54

506msgid "Please try again."

512msgid "Please try again."

507−msgstr ""

513+msgstr "Please try again."

508

514

509#: qml/Wizard/Pages/passwd-set.qml:61

515#: qml/Wizard/Pages/passwd-set.qml:61

510msgid "Choose your passcode"

516msgid "Choose your passcode"

511−msgstr ""

517+msgstr "Choose your passcode"

512

518

513#: qml/Wizard/Pages/passwd-set.qml:68

519#: qml/Wizard/Pages/passwd-set.qml:68

514msgid "Passphrase must be 4 characters long"

520msgid "Passphrase must be 4 characters long"

515−msgstr ""

521+msgstr "Passphrase must be 4 characters long"

516

522

517#: qml/Wizard/StackButton.qml:39

523#: qml/Wizard/StackButton.qml:39

518#, qt-format

524#, qt-format

519msgid "〈 %1"

525msgid "〈 %1"

520−msgstr ""

526+msgstr "〈 %1"

521

527

522#: qml/Wizard/StackButton.qml:42

528#: qml/Wizard/StackButton.qml:42

523#, qt-format

529#, qt-format

524msgid "%1 〉"

530msgid "%1 〉"

525−msgstr ""

531+msgstr "%1 〉"

526

532

527#~ msgid "Confirm"

533#~ msgid "Confirm"

528#~ msgstr "Confirm"

534#~ msgstr "Confirm"

po/es.po+51−45

@@ -8,15 +8,15 @@ msgstr ""

8"Project-Id-Version: unity\n"

9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10"POT-Creation-Date: 2014-12-10 10:55+0100\n"

11−"PO-Revision-Date: 2014-11-08 08:01+0000\n"

11+"PO-Revision-Date: 2015-01-16 03:09+0000\n"

12−"Last-Translator: Paco Molinero <paco@byasl.com>\n"

12+"Last-Translator: Adolfo Jayme <fitoschido@gmail.com>\n"

13"Language-Team: Spanish <es@li.org>\n"

14"MIME-Version: 1.0\n"

15"Content-Type: text/plain; charset=UTF-8\n"

16"Content-Transfer-Encoding: 8bit\n"

17"Plural-Forms: nplurals=2; plural=n != 1;\n"

18−"X-Launchpad-Export-Date: 2014-12-13 07:11+0000\n"

18+"X-Launchpad-Export-Date: 2015-01-17 07:08+0000\n"

19−"X-Generator: Launchpad (build 17286)\n"

19+"X-Generator: Launchpad (build 17304)\n"

21#: plugins/LightDM/Greeter.cpp:130

22msgid "Password: "

@@ -234,15 +234,15 @@ msgstr "Suelte para actualizar…"

234

235#: qml/Dash/ScopesList.qml:63

236msgid "Manage"

237−msgstr ""

237+msgstr "Administrar"

238

239#: qml/Dash/ScopesList.qml:107

240msgid "Home"

241−msgstr ""

241+msgstr "Inicio"

242

243#: qml/Dash/ScopesList.qml:108

244msgid "Also installed"

245−msgstr ""

245+msgstr "También instalados"

246

247#: qml/Greeter/Greeter.qml:174

248msgid "Unlock"

@@ -356,98 +356,98 @@ msgstr ""

356

357#: qml/Wizard/Page.qml:89

358msgid "Back"

359−msgstr ""

359+msgstr "Atrás"

360

361#: qml/Wizard/Pages/10-welcome.qml:27

362msgid "Hi!"

363−msgstr ""

363+msgstr "¡Hola!"

364

365#: qml/Wizard/Pages/10-welcome.qml:44

366msgid "Welcome to your Ubuntu phone."

367−msgstr ""

367+msgstr "Bienvenido a su teléfono Ubuntu."

368

369#: qml/Wizard/Pages/10-welcome.qml:52

370msgid "Let’s get started."

371−msgstr ""

371+msgstr "Comencemos."

372

373#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:128

374#: qml/Wizard/Pages/40-wifi.qml:197 qml/Wizard/Pages/50-location.qml:131

375#: qml/Wizard/Pages/60-reporting.qml:50 qml/Wizard/Pages/passwd-confirm.qml:82

376#: qml/Wizard/Pages/passwd-set.qml:90

377msgid "Continue"

378−msgstr ""

378+msgstr "Continuar"

379

380#: qml/Wizard/Pages/20-sim.qml:25

381msgid "Add a SIM card and restart your device"

382−msgstr ""

382+msgstr "Inserte una tarjeta SIM y reinicie el dispositivo"

383

384#: qml/Wizard/Pages/20-sim.qml:55

385msgid "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."

387

388#: qml/Wizard/Pages/20-sim.qml:69 qml/Wizard/Pages/40-wifi.qml:197

389msgid "Skip"

390−msgstr ""

390+msgstr "Omitir"

391

392#: qml/Wizard/Pages/30-passwd-type.qml:39

393msgid "Lock security"

394−msgstr ""

394+msgstr "Seguridad de bloqueo"

395

396#: qml/Wizard/Pages/30-passwd-type.qml:74

397msgid "Please select how you’d like to unlock your phone."

398−msgstr ""

398+msgstr "Seleccione el método de desbloqueo del teléfono."

399

400#: qml/Wizard/Pages/30-passwd-type.qml:97

401msgid "Swipe"

402−msgstr ""

402+msgstr "Deslizar"

403

404#: qml/Wizard/Pages/30-passwd-type.qml:98

405msgid "No security"

406−msgstr ""

406+msgstr "Sin seguridad"

407

408#: qml/Wizard/Pages/30-passwd-type.qml:100

409msgid "Passcode"

410−msgstr ""

410+msgstr "Código"

411

412#: qml/Wizard/Pages/30-passwd-type.qml:101

413msgid "4 digits only"

414−msgstr ""

414+msgstr "Solo 4 dígitos"

415

416#: qml/Wizard/Pages/30-passwd-type.qml:103

417msgid "Passphrase"

418−msgstr ""

418+msgstr "Contraseña"

419

420#: qml/Wizard/Pages/30-passwd-type.qml:104

421msgid "Numbers and letters"

422−msgstr ""

422+msgstr "Números y letras"

423

424#: qml/Wizard/Pages/40-wifi.qml:28

425msgid "Connect to Wi‑Fi"

426−msgstr ""

426+msgstr "Conectar con wifi"

427

428#: qml/Wizard/Pages/40-wifi.qml:147

429msgid "Available networks…"

430−msgstr ""

430+msgstr "Redes disponibles…"

431

432#: qml/Wizard/Pages/40-wifi.qml:148

433msgid "No available networks."

434−msgstr ""

434+msgstr "No hay redes disponibles."

435

436#: qml/Wizard/Pages/50-location.qml:27

437msgid "Location"

438−msgstr ""

438+msgstr "Ubicación"

439

440#: qml/Wizard/Pages/50-location.qml:62

441msgid "Let the phone detect your location:"

442−msgstr ""

442+msgstr "Permitir que el teléfono detecte su ubicación:"

443

444#: qml/Wizard/Pages/50-location.qml:69

445msgid "Using GPS only (less accurate)"

446−msgstr ""

446+msgstr "Usando solo GPS (poco preciso)"

447

448#: qml/Wizard/Pages/50-location.qml:86

449msgid "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)"

451

452#. TRANSLATORS: HERE is a trademark for Nokia's location service, you probably shouldn't translate it

453#: qml/Wizard/Pages/50-location.qml:103

@@ -455,81 +455,87 @@ msgid ""

455"By selecting this option you agree to the Nokia HERE <a href='#'>terms and "

456"conditions</a>."

457msgstr ""

458+"Al seleccionar esta opción acepta los <a href='#'>términos y condiciones</a> "

459+"de Nokia HERE."

458

460

459#: qml/Wizard/Pages/50-location.qml:112

461#: qml/Wizard/Pages/50-location.qml:112

460msgid "Not at all"

462msgid "Not at all"

461−msgstr ""

463+msgstr "De ningún modo"

462

464

463#: qml/Wizard/Pages/50-location.qml:124

465#: qml/Wizard/Pages/50-location.qml:124

464msgid "You can change your mind later in System Settings."

466msgid "You can change your mind later in System Settings."

465−msgstr ""

467+msgstr "Si cambia de opinión, vaya a Configuración del sistema."

466

468

467#: qml/Wizard/Pages/60-reporting.qml:24

469#: qml/Wizard/Pages/60-reporting.qml:24

468msgid "Improving your experience"

470msgid "Improving your experience"

469−msgstr ""

471+msgstr "Mejorar la experiencia"

470

472

471#: qml/Wizard/Pages/60-reporting.qml:36

473#: qml/Wizard/Pages/60-reporting.qml:36

472msgid ""

474msgid ""

473"Your phone is set up to automatically report errors to Canonical and its "

475"Your phone is set up to automatically report errors to Canonical and its "

474"partners, the makers of the operating system."

476"partners, the makers of the operating system."

475msgstr ""

477msgstr ""

478+"El teléfono está configurado para enviar automáticamente informes de error a "

479+"Canonical y sus socios, los creadores del sistema operativo."

476

480

477#: qml/Wizard/Pages/60-reporting.qml:43

481#: qml/Wizard/Pages/60-reporting.qml:43

478msgid ""

482msgid ""

479"This can be disabled in System Settings under Security & "

483"This can be disabled in System Settings under Security & "

480"Privacy"

484"Privacy"

481msgstr ""

485msgstr ""

486+"Esto se puede desactivar en Configuración del sistema > "

487+"Seguridad y privacidad."

482

488

483#: qml/Wizard/Pages/80-finished.qml:24

489#: qml/Wizard/Pages/80-finished.qml:24

484msgid "All done"

490msgid "All done"

485−msgstr ""

491+msgstr "Hecho"

486

492

487#: qml/Wizard/Pages/80-finished.qml:39

493#: qml/Wizard/Pages/80-finished.qml:39

488msgid "Nice work!"

494msgid "Nice work!"

489−msgstr ""

495+msgstr "¡Buen trabajo!"

490

496

491#: qml/Wizard/Pages/80-finished.qml:46

497#: qml/Wizard/Pages/80-finished.qml:46

492msgid "Your phone is now ready to use."

498msgid "Your phone is now ready to use."

493−msgstr ""

499+msgstr "El teléfono ya está listo para usarse."

494

500

495#: qml/Wizard/Pages/80-finished.qml:53

501#: qml/Wizard/Pages/80-finished.qml:53

496msgid "Finish"

502msgid "Finish"

497−msgstr ""

503+msgstr "Finalizar"

498

504

499#: qml/Wizard/Pages/here-terms.qml:27

505#: qml/Wizard/Pages/here-terms.qml:27

500msgid "Terms & Conditions"

506msgid "Terms & Conditions"

501−msgstr ""

507+msgstr "Términos y condiciones"

502

508

503#: qml/Wizard/Pages/passwd-confirm.qml:49

509#: qml/Wizard/Pages/passwd-confirm.qml:49

504msgid "Confirm passphrase"

510msgid "Confirm passphrase"

505−msgstr ""

511+msgstr "Confirme la contraseña"

506

512

507#: qml/Wizard/Pages/passwd-confirm.qml:50

513#: qml/Wizard/Pages/passwd-confirm.qml:50

508msgid "Confirm passcode"

514msgid "Confirm passcode"

509−msgstr ""

515+msgstr "Confirme el código"

510

516

511#: qml/Wizard/Pages/passwd-confirm.qml:53

517#: qml/Wizard/Pages/passwd-confirm.qml:53

512#: qml/Wizard/Pages/passwd-confirm.qml:54

518#: qml/Wizard/Pages/passwd-confirm.qml:54

513msgid "Please try again."

519msgid "Please try again."

514−msgstr ""

520+msgstr "Inténtelo de nuevo."

515

521

516#: qml/Wizard/Pages/passwd-set.qml:61

522#: qml/Wizard/Pages/passwd-set.qml:61

517msgid "Choose your passcode"

523msgid "Choose your passcode"

518−msgstr ""

524+msgstr "Elija su código"

519

525

520#: qml/Wizard/Pages/passwd-set.qml:68

526#: qml/Wizard/Pages/passwd-set.qml:68

521msgid "Passphrase must be 4 characters long"

527msgid "Passphrase must be 4 characters long"

522−msgstr ""

528+msgstr "El código debe tener 4 caracteres"

523

529

524#: qml/Wizard/StackButton.qml:39

530#: qml/Wizard/StackButton.qml:39

525#, qt-format

531#, qt-format

526msgid "〈 %1"

532msgid "〈 %1"

527−msgstr ""

533+msgstr "〈 %1"

528

534

529#: qml/Wizard/StackButton.qml:42

535#: qml/Wizard/StackButton.qml:42

530#, qt-format

536#, qt-format

531msgid "%1 〉"

537msgid "%1 〉"

532−msgstr ""

538+msgstr "%1 〉"

533

539

534#~ msgid "Confirm"

540#~ msgid "Confirm"

535#~ msgstr "Confirmar"

541#~ msgstr "Confirmar"

po/eu.po+51−43

@@ -8,15 +8,15 @@ msgstr ""

8"Project-Id-Version: unity8\n"

9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10"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"

12"Last-Translator: Ibai Oihanguren Sala <Unknown>\n"

13"Language-Team: Basque <eu@li.org>\n"

14"MIME-Version: 1.0\n"

15"Content-Type: text/plain; charset=UTF-8\n"

16"Content-Transfer-Encoding: 8bit\n"

17"Plural-Forms: nplurals=2; plural=n != 1;\n"

18−"X-Launchpad-Export-Date: 2014-12-13 07:10+0000\n"

18+"X-Launchpad-Export-Date: 2015-01-23 06:48+0000\n"

19−"X-Generator: Launchpad (build 17286)\n"

19+"X-Generator: Launchpad (build 17306)\n"

21#: plugins/LightDM/Greeter.cpp:130

22msgid "Password: "

@@ -231,15 +231,15 @@ msgstr "Askatu freskatzeko…"

231

232#: qml/Dash/ScopesList.qml:63

233msgid "Manage"

234−msgstr ""

234+msgstr "Kudeatu"

235

236#: qml/Dash/ScopesList.qml:107

237msgid "Home"

238−msgstr ""

238+msgstr "Hasiera"

239

240#: qml/Dash/ScopesList.qml:108

241msgid "Also installed"

242−msgstr ""

242+msgstr "Hau ere instalatuta"

243

244#: qml/Greeter/Greeter.qml:174

245msgid "Unlock"

@@ -353,98 +353,100 @@ msgstr ""

353

354#: qml/Wizard/Page.qml:89

355msgid "Back"

356−msgstr ""

356+msgstr "Atzera"

357

358#: qml/Wizard/Pages/10-welcome.qml:27

359msgid "Hi!"

360−msgstr ""

360+msgstr "Epa!"

361

362#: qml/Wizard/Pages/10-welcome.qml:44

363msgid "Welcome to your Ubuntu phone."

364−msgstr ""

364+msgstr "Ongi etorri zure Ubuntu telefonora."

365

366#: qml/Wizard/Pages/10-welcome.qml:52

367msgid "Let’s get started."

368−msgstr ""

368+msgstr "Has gaitezen."

369

370#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:128

371#: qml/Wizard/Pages/40-wifi.qml:197 qml/Wizard/Pages/50-location.qml:131

372#: qml/Wizard/Pages/60-reporting.qml:50 qml/Wizard/Pages/passwd-confirm.qml:82

373#: qml/Wizard/Pages/passwd-set.qml:90

374msgid "Continue"

375−msgstr ""

375+msgstr "Jarraitu"

376

377#: qml/Wizard/Pages/20-sim.qml:25

378msgid "Add a SIM card and restart your device"

379−msgstr ""

379+msgstr "Gehitu SIM txartel bat eta berrabiarazi zure gailua"

380

381#: qml/Wizard/Pages/20-sim.qml:55

382msgid "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."

384

385#: qml/Wizard/Pages/20-sim.qml:69 qml/Wizard/Pages/40-wifi.qml:197

386msgid "Skip"

387−msgstr ""

387+msgstr "Saltatu"

388

389#: qml/Wizard/Pages/30-passwd-type.qml:39

390msgid "Lock security"

391−msgstr ""

391+msgstr "Blokeo-segurtasuna"

392

393#: qml/Wizard/Pages/30-passwd-type.qml:74

394msgid "Please select how you’d like to unlock your phone."

395−msgstr ""

395+msgstr "Aukeratu telefonoa nola desblokeatu nahi duzun."

396

397#: qml/Wizard/Pages/30-passwd-type.qml:97

398msgid "Swipe"

399−msgstr ""

399+msgstr "Pasatu hatza"

400

401#: qml/Wizard/Pages/30-passwd-type.qml:98

402msgid "No security"

403−msgstr ""

403+msgstr "Segurtasunik gabe"

404

405#: qml/Wizard/Pages/30-passwd-type.qml:100

406msgid "Passcode"

407−msgstr ""

407+msgstr "Pasakodea"

408

409#: qml/Wizard/Pages/30-passwd-type.qml:101

410msgid "4 digits only"

411−msgstr ""

411+msgstr "4 digitu soilik"

412

413#: qml/Wizard/Pages/30-passwd-type.qml:103

414msgid "Passphrase"

415−msgstr ""

415+msgstr "Pasaesaldia"

416

417#: qml/Wizard/Pages/30-passwd-type.qml:104

418msgid "Numbers and letters"

419−msgstr ""

419+msgstr "Zenbakiak eta hizkiak"

420

421#: qml/Wizard/Pages/40-wifi.qml:28

422msgid "Connect to Wi‑Fi"

423−msgstr ""

423+msgstr "Konektatu wifira"

424

425#: qml/Wizard/Pages/40-wifi.qml:147

426msgid "Available networks…"

427−msgstr ""

427+msgstr "Sare erabilgarriak…"

428

429#: qml/Wizard/Pages/40-wifi.qml:148

430msgid "No available networks."

431−msgstr ""

431+msgstr "Ez dago sare erabilgarririk."

432

433#: qml/Wizard/Pages/50-location.qml:27

434msgid "Location"

435−msgstr ""

435+msgstr "Kokalekua"

436

437#: qml/Wizard/Pages/50-location.qml:62

438msgid "Let the phone detect your location:"

439−msgstr ""

439+msgstr "Utzi telefonoari zure kokalekua detektatzen:"

440

441#: qml/Wizard/Pages/50-location.qml:69

442msgid "Using GPS only (less accurate)"

443−msgstr ""

443+msgstr "GPSa soilik erabiltzen (zehaztasun gutxiago)"

444

445#: qml/Wizard/Pages/50-location.qml:86

446msgid "Using GPS, anonymized Wi-Fi and cellular network info (recommended)"

447msgstr ""

448+"GPSa, wifi anonimotua eta sare mugikorraren informazioa erabiltzen "

449+"(gomendatua)"

448

450

449#. TRANSLATORS: HERE is a trademark for Nokia's location service, you probably shouldn't translate it

451#. TRANSLATORS: HERE is a trademark for Nokia's location service, you probably shouldn't translate it

450#: qml/Wizard/Pages/50-location.qml:103

452#: qml/Wizard/Pages/50-location.qml:103

@@ -452,81 +454,87 @@ msgid ""

452"By selecting this option you agree to the Nokia HERE <a href='#'>terms and "

454"By selecting this option you agree to the Nokia HERE <a href='#'>terms and "

453"conditions</a>."

455"conditions</a>."

454msgstr ""

456msgstr ""

457+"Aukera hau hautatuz, Nokia HERE(r)en <a href='#'>baldintzak</a> onartzeko "

458+"dituzu."

455

459

456#: qml/Wizard/Pages/50-location.qml:112

460#: qml/Wizard/Pages/50-location.qml:112

457msgid "Not at all"

461msgid "Not at all"

458−msgstr ""

462+msgstr "Bat ere ez"

459

463

460#: qml/Wizard/Pages/50-location.qml:124

464#: qml/Wizard/Pages/50-location.qml:124

461msgid "You can change your mind later in System Settings."

465msgid "You can change your mind later in System Settings."

462−msgstr ""

466+msgstr "Geroago ere alda dezakezu Sistemaren ezarpenetan."

463

467

464#: qml/Wizard/Pages/60-reporting.qml:24

468#: qml/Wizard/Pages/60-reporting.qml:24

465msgid "Improving your experience"

469msgid "Improving your experience"

466−msgstr ""

470+msgstr "Zure esperientzia hobetuz"

467

471

468#: qml/Wizard/Pages/60-reporting.qml:36

472#: qml/Wizard/Pages/60-reporting.qml:36

469msgid ""

473msgid ""

470"Your phone is set up to automatically report errors to Canonical and its "

474"Your phone is set up to automatically report errors to Canonical and its "

471"partners, the makers of the operating system."

475"partners, the makers of the operating system."

472msgstr ""

476msgstr ""

477+"Telefonoa erroreen berria automatikoki Canonical-i eta honen bazkideei "

478+"emateko konfiguratuta dago, sistema eragilearen egileei."

473

479

474#: qml/Wizard/Pages/60-reporting.qml:43

480#: qml/Wizard/Pages/60-reporting.qml:43

475msgid ""

481msgid ""

476"This can be disabled in System Settings under Security & "

482"This can be disabled in System Settings under Security & "

477"Privacy"

483"Privacy"

478msgstr ""

484msgstr ""

485+"Hau Sistemaren ezarpenetatik desgaitu daiteke, Segurtasuna eta "

486+"pribatutasuna atalean"

479

487

480#: qml/Wizard/Pages/80-finished.qml:24

488#: qml/Wizard/Pages/80-finished.qml:24

481msgid "All done"

489msgid "All done"

482−msgstr ""

490+msgstr "Eginda"

483

491

484#: qml/Wizard/Pages/80-finished.qml:39

492#: qml/Wizard/Pages/80-finished.qml:39

485msgid "Nice work!"

493msgid "Nice work!"

486−msgstr ""

494+msgstr "Bikain!"

487

495

488#: qml/Wizard/Pages/80-finished.qml:46

496#: qml/Wizard/Pages/80-finished.qml:46

489msgid "Your phone is now ready to use."

497msgid "Your phone is now ready to use."

490−msgstr ""

498+msgstr "Zure telefonoa erabiltzeko prest dago."

491

499

492#: qml/Wizard/Pages/80-finished.qml:53

500#: qml/Wizard/Pages/80-finished.qml:53

493msgid "Finish"

501msgid "Finish"

494−msgstr ""

502+msgstr "Amaitu"

495

503

496#: qml/Wizard/Pages/here-terms.qml:27

504#: qml/Wizard/Pages/here-terms.qml:27

497msgid "Terms & Conditions"

505msgid "Terms & Conditions"

498−msgstr ""

506+msgstr "Baldintzak"

499

507

500#: qml/Wizard/Pages/passwd-confirm.qml:49

508#: qml/Wizard/Pages/passwd-confirm.qml:49

501msgid "Confirm passphrase"

509msgid "Confirm passphrase"

502−msgstr ""

510+msgstr "Berretsi pasaesaldia"

503

511

504#: qml/Wizard/Pages/passwd-confirm.qml:50

512#: qml/Wizard/Pages/passwd-confirm.qml:50

505msgid "Confirm passcode"

513msgid "Confirm passcode"

506−msgstr ""

514+msgstr "Berretsi pasakodea"

507

515

508#: qml/Wizard/Pages/passwd-confirm.qml:53

516#: qml/Wizard/Pages/passwd-confirm.qml:53

509#: qml/Wizard/Pages/passwd-confirm.qml:54

517#: qml/Wizard/Pages/passwd-confirm.qml:54

510msgid "Please try again."

518msgid "Please try again."

511−msgstr ""

519+msgstr "Saiatu berriro."

512

520

513#: qml/Wizard/Pages/passwd-set.qml:61

521#: qml/Wizard/Pages/passwd-set.qml:61

514msgid "Choose your passcode"

522msgid "Choose your passcode"

515−msgstr ""

523+msgstr "Aukeratu zure pasakodea"

516

524

517#: qml/Wizard/Pages/passwd-set.qml:68

525#: qml/Wizard/Pages/passwd-set.qml:68

518msgid "Passphrase must be 4 characters long"

526msgid "Passphrase must be 4 characters long"

519−msgstr ""

527+msgstr "Pasaesaldiak 4 karaktereko luzera izan behar du"

520

528

521#: qml/Wizard/StackButton.qml:39

529#: qml/Wizard/StackButton.qml:39

522#, qt-format

530#, qt-format

523msgid "〈 %1"

531msgid "〈 %1"

524−msgstr ""

532+msgstr "〈 %1"

525

533

526#: qml/Wizard/StackButton.qml:42

534#: qml/Wizard/StackButton.qml:42

527#, qt-format

535#, qt-format

528msgid "%1 〉"

536msgid "%1 〉"

529−msgstr ""

537+msgstr "%1 〉"

530

538

531#~ msgid "Type or say a command"

539#~ msgid "Type or say a command"

532#~ msgstr "Idatzi edo esan agindu bat"

540#~ msgstr "Idatzi edo esan agindu bat"

po/hu.po+55−55

@@ -8,26 +8,26 @@ msgstr ""

8"Project-Id-Version: unity\n"

9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10"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"

12"Last-Translator: Richard Somlói <ricsipontaz@gmail.com>\n"

13"Language-Team: Hungarian <hu@li.org>\n"

14"MIME-Version: 1.0\n"

15"Content-Type: text/plain; charset=UTF-8\n"

16"Content-Transfer-Encoding: 8bit\n"

17"Plural-Forms: nplurals=2; plural=n != 1;\n"

18−"X-Launchpad-Export-Date: 2014-12-22 07:05+0000\n"

18+"X-Launchpad-Export-Date: 2015-01-18 05:03+0000\n"

19−"X-Generator: Launchpad (build 17286)\n"

19+"X-Generator: Launchpad (build 17304)\n"

21#: plugins/LightDM/Greeter.cpp:130

22msgid "Password: "

23msgstr "Jelszó: "

25#: plugins/Unity/Launcher/launcheritem.cpp:45

26−#: plugins/Unity/Launcher/launcheritem.cpp:91

26+#: plugins/Unity/Launcher/launcheritem.cpp:100

27msgid "Pin shortcut"

28msgstr "Indító rögzítése"

30−#: plugins/Unity/Launcher/launcheritem.cpp:91

30+#: plugins/Unity/Launcher/launcheritem.cpp:100

31msgid "Unpin shortcut"

32msgstr "Indító feloldása"

@@ -50,45 +50,45 @@ msgid_plural "Please wait %1 minutes and then try again…"

50msgstr[0] "Várjon %1 percet és próbálja újra…"

51msgstr[1] "Várjon %1 percet és próbálja újra…"

53−#: qml/Components/Dialogs.qml:74

53+#: qml/Components/Dialogs.qml:70

54msgid "Log out"

55msgstr "Kijelentkezés"

57−#: qml/Components/Dialogs.qml:75

57+#: qml/Components/Dialogs.qml:71

58msgid "Are you sure you want to log out?"

59msgstr "Biztos benne, hogy kijelentkezik?"

61−#: qml/Components/Dialogs.qml:77 qml/Components/Dialogs.qml:101

61+#: qml/Components/Dialogs.qml:73 qml/Components/Dialogs.qml:97

62−#: qml/Components/Dialogs.qml:126

62+#: qml/Components/Dialogs.qml:122

63msgid "No"

64msgstr "Nem"

66−#: qml/Components/Dialogs.qml:84 qml/Components/Dialogs.qml:108

66+#: qml/Components/Dialogs.qml:80 qml/Components/Dialogs.qml:104

67−#: qml/Components/Dialogs.qml:133

67+#: qml/Components/Dialogs.qml:129

68msgid "Yes"

69msgstr "Igen"

71−#: qml/Components/Dialogs.qml:98

71+#: qml/Components/Dialogs.qml:94

72msgid "Shut down"

73msgstr "Leállítás"

75−#: qml/Components/Dialogs.qml:99

75+#: qml/Components/Dialogs.qml:95

76msgid "Are you sure you want to shut down?"

77msgstr "Biztosan le szeretné állítani?"

79−#: qml/Components/Dialogs.qml:123

79+#: qml/Components/Dialogs.qml:119

80msgid "Reboot"

81msgstr "Újraindítás"

83−#: qml/Components/Dialogs.qml:124

83+#: qml/Components/Dialogs.qml:120

84msgid "Are you sure you want to reboot?"

85msgstr "Biztosan újra szeretné indítani?"

87−#: qml/Components/Dialogs.qml:148

87+#: qml/Components/Dialogs.qml:144

88msgid "Power"

89msgstr "Kikapcsolás"

91−#: qml/Components/Dialogs.qml:149

91+#: qml/Components/Dialogs.qml:145

92msgid ""

93"Are you sure you would like\n"

94"to power off?"

@@ -96,15 +96,15 @@ msgstr ""

96"Biztos benne, hogy ki\n"

97"szeretné kapcsolni?"

99−#: qml/Components/Dialogs.qml:151

99+#: qml/Components/Dialogs.qml:147

100msgid "Power off"

101msgstr "Kikapcsolás"

102

103−#: qml/Components/Dialogs.qml:161

103+#: qml/Components/Dialogs.qml:157

104msgid "Restart"

105msgstr "Újraindítás"

106

107−#: qml/Components/Dialogs.qml:171

107+#: qml/Components/Dialogs.qml:167

108msgid "Cancel"

109msgstr "Mégse"

110

@@ -112,45 +112,45 @@ msgstr "Mégse"

112msgid "Skip intro"

113msgstr "A bemutató kihagyása"

114

115−#: qml/Components/EdgeDemo.qml:112

115+#: qml/Components/EdgeDemo.qml:125

116msgid "Right edge"

117msgstr "Jobb szél"

118

119−#: qml/Components/EdgeDemo.qml:113

119+#: qml/Components/EdgeDemo.qml:126

120msgid "Try swiping from the right edge to unlock the phone"

121msgstr "A telefon feloldásához csúsztassa ujját a jobb szélről"

122

123−#: qml/Components/EdgeDemo.qml:144

123+#: qml/Components/EdgeDemo.qml:157

124msgid "Top edge"

125msgstr "Felső szél"

126

127−#: qml/Components/EdgeDemo.qml:145

127+#: qml/Components/EdgeDemo.qml:158

128msgid "Try swiping from the top edge to access the indicators"

129msgstr "Az állapotmenük eléréséhez csúsztassa ujját a felső szélről"

130

131−#: qml/Components/EdgeDemo.qml:170

131+#: qml/Components/EdgeDemo.qml:183

132msgid "Close"

133msgstr "Bezárás"

134

135−#: qml/Components/EdgeDemo.qml:171

135+#: qml/Components/EdgeDemo.qml:184

136msgid "Swipe up again to close the settings screen"

137msgstr "A beállítások bezárásához csúsztassa ujját újra felfelé"

138

139−#: qml/Components/EdgeDemo.qml:201

139+#: qml/Components/EdgeDemo.qml:214

140msgid "Left edge"

141msgstr "Bal szél"

142

143−#: qml/Components/EdgeDemo.qml:202

143+#: qml/Components/EdgeDemo.qml:215

144msgid "Swipe from the left to reveal the launcher for quick access to apps"

145msgstr ""

146"Csúsztassa ujját a bal szélről az indítón található alkalmazások gyors "

147"eléréséhez"

148

149−#: qml/Components/EdgeDemo.qml:229

149+#: qml/Components/EdgeDemo.qml:242

150msgid "Well done"

151msgstr "Rendben"

152

153−#: qml/Components/EdgeDemo.qml:230

153+#: qml/Components/EdgeDemo.qml:243

154msgid ""

155"You have now mastered the edge gestures and can start using the "

156"phone Tap on the screen to start"

@@ -158,44 +158,44 @@ msgstr ""

158"Elsajátította a gesztusokat, és megkezdheti a telefon "

159"használatát. Koppintson a képernyőre a kezdéshez."

160

161−#: qml/Components/Lockscreen.qml:223

161+#: qml/Components/Lockscreen.qml:238

162msgid "Return to Call"

163msgstr "Vissza a híváshoz"

164

165−#: qml/Components/Lockscreen.qml:223

165+#: qml/Components/Lockscreen.qml:238

166msgid "Emergency Call"

167msgstr "Vészhívás"

168

169−#: qml/Components/Lockscreen.qml:255

169+#: qml/Components/Lockscreen.qml:270

170msgid "OK"

171msgstr "Ok"

172

173−#: qml/Dash/GenericScopeView.qml:434 qml/Dash/GenericScopeView.qml:591

173+#: qml/Dash/GenericScopeView.qml:431 qml/Dash/GenericScopeView.qml:588

174msgid "See less"

175msgstr "Kevesebb"

176

177−#: qml/Dash/GenericScopeView.qml:434

177+#: qml/Dash/GenericScopeView.qml:431

178msgid "See all"

179msgstr "Összes megtekintése"

180

181−#: qml/Dash/GenericScopeView.qml:496 qml/Dash/PageHeader.qml:268

181+#: qml/Dash/GenericScopeView.qml:493 qml/Dash/PageHeader.qml:267

182#: qml/Panel/SearchIndicator.qml:27

183msgid "Search"

184msgstr "Keresés"

185

186−#: qml/Dash/PageHeader.qml:261

186+#: qml/Dash/PageHeader.qml:260

187msgid "Store"

188msgstr "Áruház"

189

190−#: qml/Dash/PageHeader.qml:278

190+#: qml/Dash/PageHeader.qml:277

191msgid "Settings"

192msgstr "Beállítások"

193

194−#: qml/Dash/PageHeader.qml:285

194+#: qml/Dash/PageHeader.qml:284

195msgid "Remove from Favorites"

196msgstr "Eltávolítás a kedvencek közül"

197

198−#: qml/Dash/PageHeader.qml:285

198+#: qml/Dash/PageHeader.qml:284

199msgid "Add to Favorites"

200msgstr "Hozzáadás a kedvencekhez"

201

@@ -229,7 +229,7 @@ msgstr "Engedje el a frissítéshez…"

229

230#: qml/Dash/ScopesList.qml:63

231msgid "Manage"

232−msgstr "Kezelés"

232+msgstr "Szerkesztés"

233

234#: qml/Dash/ScopesList.qml:107

235msgid "Home"

@@ -237,7 +237,7 @@ msgstr "Kezdőlapon"

237

238#: qml/Dash/ScopesList.qml:108

239msgid "Also installed"

240−msgstr "Szintén telepítve"

240+msgstr "Telepítve"

241

242#: qml/Greeter/Greeter.qml:174

243msgid "Unlock"

@@ -291,49 +291,49 @@ msgstr "SIM feloldása"

291msgid "Roaming"

292msgstr "Barangolás"

293

294−#: qml/Shell.qml:402

294+#: qml/Shell.qml:367

295#, qt-format

296msgid "Enter %1"

297msgstr "Adja meg: %1"

298

299−#: qml/Shell.qml:394

299+#: qml/Shell.qml:368 qml/Wizard/Pages/passwd-set.qml:60

300msgid "Enter passphrase"

301msgstr "Jelmondat megadása"

302

303−#: qml/Shell.qml:398

303+#: qml/Shell.qml:369

304msgid "Enter passcode"

305msgstr "Jelkód megadása"

306

307−#: qml/Shell.qml:403

307+#: qml/Shell.qml:370

308#, qt-format

309msgid "Sorry, incorrect %1"

310msgstr "Sajnálom, helytelen %1"

311

312−#: qml/Shell.qml:395

312+#: qml/Shell.qml:371

313msgid "Sorry, incorrect passphrase"

314msgstr "Sajnálom, helytelen jelmondat"

315

316−#: qml/Shell.qml:396

316+#: qml/Shell.qml:372

317msgid "Please re-enter"

318msgstr "Próbálja újra"

319

320−#: qml/Shell.qml:399

320+#: qml/Shell.qml:373

321msgid "Sorry, incorrect passcode"

322msgstr "Sajnálom, helytelen jelkód"

323

324−#: qml/Shell.qml:444

324+#: qml/Shell.qml:467 qml/Wizard/Pages/passwd-confirm.qml:53

325msgid "Sorry, incorrect passphrase."

326msgstr "Sajnálom, helytelen jelmondat."

327

328−#: qml/Shell.qml:445

328+#: qml/Shell.qml:468 qml/Wizard/Pages/passwd-confirm.qml:54

329msgid "Sorry, incorrect passcode."

330msgstr "Sajnálom, helytelen jelkód."

331

332−#: qml/Shell.qml:446

332+#: qml/Shell.qml:469

333msgid "This will be your last attempt."

334msgstr "Ez az utolsó próbálkozási lehetősége."

335

336−#: qml/Shell.qml:448

336+#: qml/Shell.qml:471

337msgid ""

338"If passphrase is entered incorrectly, your phone will conduct a factory "

339"reset and all personal data will be deleted."

@@ -341,7 +341,7 @@ msgstr ""

341"Ha helytelen jelmondatot ad meg, a telefonja visszaállítja a gyári "

342"beállításokat és törli minden személyes adatát."

343

344−#: qml/Shell.qml:449

344+#: qml/Shell.qml:472

345msgid ""

346"If passcode is entered incorrectly, your phone will conduct a factory reset "

347"and all personal data will be deleted."

@@ -457,7 +457,7 @@ msgstr ""

457

458#: qml/Wizard/Pages/50-location.qml:112

459msgid "Not at all"

460−msgstr ""

460+msgstr "Ne tegye"

461

462#: qml/Wizard/Pages/50-location.qml:124

463msgid "You can change your mind later in System Settings."

po/nb.po+51−45

@@ -8,15 +8,15 @@ msgstr ""

8"Project-Id-Version: unity\n"

9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10"POT-Creation-Date: 2014-12-10 10:55+0100\n"

11−"PO-Revision-Date: 2014-11-12 19:57+0000\n"

11+"PO-Revision-Date: 2015-01-15 06:54+0000\n"

12−"Last-Translator: Ari Börde Kröyer <Unknown>\n"

12+"Last-Translator: Åka Sikrom <Unknown>\n"

13"Language-Team: Norwegian Bokmal <nb@li.org>\n"

14"MIME-Version: 1.0\n"

15"Content-Type: text/plain; charset=UTF-8\n"

16"Content-Transfer-Encoding: 8bit\n"

17"Plural-Forms: nplurals=2; plural=n != 1;\n"

18−"X-Launchpad-Export-Date: 2014-12-13 07:11+0000\n"

18+"X-Launchpad-Export-Date: 2015-01-16 06:21+0000\n"

19−"X-Generator: Launchpad (build 17286)\n"

19+"X-Generator: Launchpad (build 17303)\n"

21#: plugins/LightDM/Greeter.cpp:130

22msgid "Password: "

@@ -229,15 +229,15 @@ msgstr "Slipp for å oppdatere …"

229

230#: qml/Dash/ScopesList.qml:63

231msgid "Manage"

232−msgstr ""

232+msgstr "Behandle"

233

234#: qml/Dash/ScopesList.qml:107

235msgid "Home"

236−msgstr ""

236+msgstr "Hjem"

237

238#: qml/Dash/ScopesList.qml:108

239msgid "Also installed"

240−msgstr ""

240+msgstr "Også installert"

241

242#: qml/Greeter/Greeter.qml:174

243msgid "Unlock"

@@ -351,98 +351,98 @@ msgstr ""

351

352#: qml/Wizard/Page.qml:89

353msgid "Back"

354−msgstr ""

354+msgstr "Tilbake"

355

356#: qml/Wizard/Pages/10-welcome.qml:27

357msgid "Hi!"

358−msgstr ""

358+msgstr "Hei!"

359

360#: qml/Wizard/Pages/10-welcome.qml:44

361msgid "Welcome to your Ubuntu phone."

362−msgstr ""

362+msgstr "Velkommen til Ubuntu-telefonen."

363

364#: qml/Wizard/Pages/10-welcome.qml:52

365msgid "Let’s get started."

366−msgstr ""

366+msgstr "La oss komme i gang."

367

368#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:128

369#: qml/Wizard/Pages/40-wifi.qml:197 qml/Wizard/Pages/50-location.qml:131

370#: qml/Wizard/Pages/60-reporting.qml:50 qml/Wizard/Pages/passwd-confirm.qml:82

371#: qml/Wizard/Pages/passwd-set.qml:90

372msgid "Continue"

373−msgstr ""

373+msgstr "Fortsett"

374

375#: qml/Wizard/Pages/20-sim.qml:25

376msgid "Add a SIM card and restart your device"

377−msgstr ""

377+msgstr "Legg til et SIM-kort og start enheten på nytt"

378

379#: qml/Wizard/Pages/20-sim.qml:55

380msgid "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."

382

383#: qml/Wizard/Pages/20-sim.qml:69 qml/Wizard/Pages/40-wifi.qml:197

384msgid "Skip"

385−msgstr ""

385+msgstr "Hopp over"

386

387#: qml/Wizard/Pages/30-passwd-type.qml:39

388msgid "Lock security"

389−msgstr ""

389+msgstr "Låsesikkerhet"

390

391#: qml/Wizard/Pages/30-passwd-type.qml:74

392msgid "Please select how you’d like to unlock your phone."

393−msgstr ""

393+msgstr "Velg hvordan du vil låse opp telefonen."

394

395#: qml/Wizard/Pages/30-passwd-type.qml:97

396msgid "Swipe"

397−msgstr ""

397+msgstr "Sveip"

398

399#: qml/Wizard/Pages/30-passwd-type.qml:98

400msgid "No security"

401−msgstr ""

401+msgstr "Ingen sperre"

402

403#: qml/Wizard/Pages/30-passwd-type.qml:100

404msgid "Passcode"

405−msgstr ""

405+msgstr "Kode"

406

407#: qml/Wizard/Pages/30-passwd-type.qml:101

408msgid "4 digits only"

409−msgstr ""

409+msgstr "4 sifre"

410

411#: qml/Wizard/Pages/30-passwd-type.qml:103

412msgid "Passphrase"

413−msgstr ""

413+msgstr "Passordfrase"

414

415#: qml/Wizard/Pages/30-passwd-type.qml:104

416msgid "Numbers and letters"

417−msgstr ""

417+msgstr "Tall og bokstaver"

418

419#: qml/Wizard/Pages/40-wifi.qml:28

420msgid "Connect to Wi‑Fi"

421−msgstr ""

421+msgstr "Koble til trådløst nettverk"

422

423#: qml/Wizard/Pages/40-wifi.qml:147

424msgid "Available networks…"

425−msgstr ""

425+msgstr "Tilgjengelige nettverk …"

426

427#: qml/Wizard/Pages/40-wifi.qml:148

428msgid "No available networks."

429−msgstr ""

429+msgstr "Ingen tilgjengelige nettverk."

430

431#: qml/Wizard/Pages/50-location.qml:27

432msgid "Location"

433−msgstr ""

433+msgstr "Plassering"

434

435#: qml/Wizard/Pages/50-location.qml:62

436msgid "Let the phone detect your location:"

437−msgstr ""

437+msgstr "La telefonen se hvor du befinner deg:"

438

439#: qml/Wizard/Pages/50-location.qml:69

440msgid "Using GPS only (less accurate)"

441−msgstr ""

441+msgstr "Kun med GPS (unøyaktig)"

442

443#: qml/Wizard/Pages/50-location.qml:86

444msgid "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)"

446

447#. TRANSLATORS: HERE is a trademark for Nokia's location service, you probably shouldn't translate it

448#: qml/Wizard/Pages/50-location.qml:103

@@ -450,81 +450,87 @@ msgid ""

450"By selecting this option you agree to the Nokia HERE <a href='#'>terms and "

451"conditions</a>."

452msgstr ""

453+"Du må samtykke til <a href='#'>brukervilkårene</a> for Nokia HERE for å "

454+"velge dette."

453

455

454#: qml/Wizard/Pages/50-location.qml:112

456#: qml/Wizard/Pages/50-location.qml:112

455msgid "Not at all"

457msgid "Not at all"

456−msgstr ""

458+msgstr "Overhodet ikke"

457

459

458#: qml/Wizard/Pages/50-location.qml:124

460#: qml/Wizard/Pages/50-location.qml:124

459msgid "You can change your mind later in System Settings."

461msgid "You can change your mind later in System Settings."

460−msgstr ""

462+msgstr "Du kan ombestemme deg senere via Systeminnstillinger."

461

463

462#: qml/Wizard/Pages/60-reporting.qml:24

464#: qml/Wizard/Pages/60-reporting.qml:24

463msgid "Improving your experience"

465msgid "Improving your experience"

464−msgstr ""

466+msgstr "Forbedrer opplevelse"

465

467

466#: qml/Wizard/Pages/60-reporting.qml:36

468#: qml/Wizard/Pages/60-reporting.qml:36

467msgid ""

469msgid ""

468"Your phone is set up to automatically report errors to Canonical and its "

470"Your phone is set up to automatically report errors to Canonical and its "

469"partners, the makers of the operating system."

471"partners, the makers of the operating system."

470msgstr ""

472msgstr ""

473+"Telefonen sender feilrapporter til Canonical (produsenten av Ubuntu) "

474+"automatisk."

471

475

472#: qml/Wizard/Pages/60-reporting.qml:43

476#: qml/Wizard/Pages/60-reporting.qml:43

473msgid ""

477msgid ""

474"This can be disabled in System Settings under Security & "

478"This can be disabled in System Settings under Security & "

475"Privacy"

479"Privacy"

476msgstr ""

480msgstr ""

481+"Du kan slå av dette i Systeminnstillinger under Sikkerhet og "

482+"personvern"

477

483

478#: qml/Wizard/Pages/80-finished.qml:24

484#: qml/Wizard/Pages/80-finished.qml:24

479msgid "All done"

485msgid "All done"

480−msgstr ""

486+msgstr "Alt i orden"

481

487

482#: qml/Wizard/Pages/80-finished.qml:39

488#: qml/Wizard/Pages/80-finished.qml:39

483msgid "Nice work!"

489msgid "Nice work!"

484−msgstr ""

490+msgstr "Godt jobba!"

485

491

486#: qml/Wizard/Pages/80-finished.qml:46

492#: qml/Wizard/Pages/80-finished.qml:46

487msgid "Your phone is now ready to use."

493msgid "Your phone is now ready to use."

488−msgstr ""

494+msgstr "Telefonen er klar til bruk."

489

495

490#: qml/Wizard/Pages/80-finished.qml:53

496#: qml/Wizard/Pages/80-finished.qml:53

491msgid "Finish"

497msgid "Finish"

492−msgstr ""

498+msgstr "Fullfør"

493

499

494#: qml/Wizard/Pages/here-terms.qml:27

500#: qml/Wizard/Pages/here-terms.qml:27

495msgid "Terms & Conditions"

501msgid "Terms & Conditions"

496−msgstr ""

502+msgstr "Brukervilkår"

497

503

498#: qml/Wizard/Pages/passwd-confirm.qml:49

504#: qml/Wizard/Pages/passwd-confirm.qml:49

499msgid "Confirm passphrase"

505msgid "Confirm passphrase"

500−msgstr ""

506+msgstr "Bekreft passordfrase"

501

507

502#: qml/Wizard/Pages/passwd-confirm.qml:50

508#: qml/Wizard/Pages/passwd-confirm.qml:50

503msgid "Confirm passcode"

509msgid "Confirm passcode"

504−msgstr ""

510+msgstr "Bekreft kode"

505

511

506#: qml/Wizard/Pages/passwd-confirm.qml:53

512#: qml/Wizard/Pages/passwd-confirm.qml:53

507#: qml/Wizard/Pages/passwd-confirm.qml:54

513#: qml/Wizard/Pages/passwd-confirm.qml:54

508msgid "Please try again."

514msgid "Please try again."

509−msgstr ""

515+msgstr "Prøv igjen."

510

516

511#: qml/Wizard/Pages/passwd-set.qml:61

517#: qml/Wizard/Pages/passwd-set.qml:61

512msgid "Choose your passcode"

518msgid "Choose your passcode"

513−msgstr ""

519+msgstr "Velg kode"

514

520

515#: qml/Wizard/Pages/passwd-set.qml:68

521#: qml/Wizard/Pages/passwd-set.qml:68

516msgid "Passphrase must be 4 characters long"

522msgid "Passphrase must be 4 characters long"

517−msgstr ""

523+msgstr "Passordfrasen må bestå av minst 4 tegn"

518

524

519#: qml/Wizard/StackButton.qml:39

525#: qml/Wizard/StackButton.qml:39

520#, qt-format

526#, qt-format

521msgid "〈 %1"

527msgid "〈 %1"

522−msgstr ""

528+msgstr "〈 %1"

523

529

524#: qml/Wizard/StackButton.qml:42

530#: qml/Wizard/StackButton.qml:42

525#, qt-format

531#, qt-format

526msgid "%1 〉"

532msgid "%1 〉"

527−msgstr ""

533+msgstr "%1 〉"

528

534

529#~ msgid "Confirm"

535#~ msgid "Confirm"

530#~ msgstr "Bekreft"

536#~ msgstr "Bekreft"

po/nl.po+4−4

@@ -8,15 +8,15 @@ msgstr ""

8"Project-Id-Version: unity\n"

9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10"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"

12"Last-Translator: rob <linuxned@gmail.com>\n"

13"Language-Team: Dutch <nl@li.org>\n"

14"MIME-Version: 1.0\n"

15"Content-Type: text/plain; charset=UTF-8\n"

16"Content-Transfer-Encoding: 8bit\n"

17"Plural-Forms: nplurals=2; plural=n != 1;\n"

18−"X-Launchpad-Export-Date: 2015-01-14 06:48+0000\n"

18+"X-Launchpad-Export-Date: 2015-01-18 05:03+0000\n"

19−"X-Generator: Launchpad (build 17298)\n"

19+"X-Generator: Launchpad (build 17304)\n"

21#: plugins/LightDM/Greeter.cpp:130

22msgid "Password: "

@@ -235,7 +235,7 @@ msgstr "Beheren"

235

236#: qml/Dash/ScopesList.qml:107

237msgid "Home"

238−msgstr ""

238+msgstr "Thuis"

239

240#: qml/Dash/ScopesList.qml:108

241msgid "Also installed"

po/pt.po+30−29

@@ -8,15 +8,15 @@ msgstr ""

8"Project-Id-Version: unity8\n"

9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10"POT-Creation-Date: 2014-12-10 10:55+0100\n"

11−"PO-Revision-Date: 2014-11-06 10:25+0000\n"

11+"PO-Revision-Date: 2015-01-20 21:11+0000\n"

12−"Last-Translator: Ivo Xavier <ivofernandes12@gmail.com>\n"

12+"Last-Translator: Filipe André Pinho <Unknown>\n"

13"Language-Team: Portuguese <pt@li.org>\n"

14"MIME-Version: 1.0\n"

15"Content-Type: text/plain; charset=UTF-8\n"

16"Content-Transfer-Encoding: 8bit\n"

17"Plural-Forms: nplurals=2; plural=n != 1;\n"

18−"X-Launchpad-Export-Date: 2014-12-13 07:11+0000\n"

18+"X-Launchpad-Export-Date: 2015-01-21 06:43+0000\n"

19−"X-Generator: Launchpad (build 17286)\n"

19+"X-Generator: Launchpad (build 17306)\n"

21#: plugins/LightDM/Greeter.cpp:130

22msgid "Password: "

@@ -229,15 +229,15 @@ msgstr "Solte para atualizar..."

229

230#: qml/Dash/ScopesList.qml:63

231msgid "Manage"

232−msgstr ""

232+msgstr "Gerir"

233

234#: qml/Dash/ScopesList.qml:107

235msgid "Home"

236−msgstr ""

236+msgstr "Página inicial"

237

238#: qml/Dash/ScopesList.qml:108

239msgid "Also installed"

240−msgstr ""

240+msgstr "Também instalado"

241

242#: qml/Greeter/Greeter.qml:174

243msgid "Unlock"

@@ -351,38 +351,39 @@ msgstr ""

351

352#: qml/Wizard/Page.qml:89

353msgid "Back"

354−msgstr ""

354+msgstr "Anterior"

355

356#: qml/Wizard/Pages/10-welcome.qml:27

357msgid "Hi!"

358−msgstr ""

358+msgstr "Olá!"

359

360#: qml/Wizard/Pages/10-welcome.qml:44

361msgid "Welcome to your Ubuntu phone."

362−msgstr ""

362+msgstr "Bem-vindo ao seu telemóvel Ubuntu."

363

364#: qml/Wizard/Pages/10-welcome.qml:52

365msgid "Let’s get started."

366−msgstr ""

366+msgstr "Vamos começar!"

367

368#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:128

369#: qml/Wizard/Pages/40-wifi.qml:197 qml/Wizard/Pages/50-location.qml:131

370#: qml/Wizard/Pages/60-reporting.qml:50 qml/Wizard/Pages/passwd-confirm.qml:82

371#: qml/Wizard/Pages/passwd-set.qml:90

372msgid "Continue"

373−msgstr ""

373+msgstr "Avançar"

374

375#: qml/Wizard/Pages/20-sim.qml:25

376msgid "Add a SIM card and restart your device"

377−msgstr ""

377+msgstr "Adicione o cartão SIM e reinicie o seu dispositivo"

378

379#: qml/Wizard/Pages/20-sim.qml:55

380msgid "Without it, you won’t be able to make calls or use text messaging."

381msgstr ""

382+"Sem o cartão SIM, não poderá fazer chamadas ou enviar mensagens de texto."

382

383

383#: qml/Wizard/Pages/20-sim.qml:69 qml/Wizard/Pages/40-wifi.qml:197

384#: qml/Wizard/Pages/20-sim.qml:69 qml/Wizard/Pages/40-wifi.qml:197

384msgid "Skip"

385msgid "Skip"

385−msgstr ""

386+msgstr "Ignorar"

386

387

387#: qml/Wizard/Pages/30-passwd-type.qml:39

388#: qml/Wizard/Pages/30-passwd-type.qml:39

388msgid "Lock security"

389msgid "Lock security"

@@ -390,7 +391,7 @@ msgstr ""

390

391

391#: qml/Wizard/Pages/30-passwd-type.qml:74

392#: qml/Wizard/Pages/30-passwd-type.qml:74

392msgid "Please select how you’d like to unlock your phone."

393msgid "Please select how you’d like to unlock your phone."

393−msgstr ""

394+msgstr "Por favor, escolha como pretende desbloquear o seu telemóvel."

394

395

395#: qml/Wizard/Pages/30-passwd-type.qml:97

396#: qml/Wizard/Pages/30-passwd-type.qml:97

396msgid "Swipe"

397msgid "Swipe"

@@ -398,7 +399,7 @@ msgstr ""

398

399

399#: qml/Wizard/Pages/30-passwd-type.qml:98

400#: qml/Wizard/Pages/30-passwd-type.qml:98

400msgid "No security"

401msgid "No security"

401−msgstr ""

402+msgstr "Sem segurança"

402

403

403#: qml/Wizard/Pages/30-passwd-type.qml:100

404#: qml/Wizard/Pages/30-passwd-type.qml:100

404msgid "Passcode"

405msgid "Passcode"

@@ -406,7 +407,7 @@ msgstr ""

406

407

407#: qml/Wizard/Pages/30-passwd-type.qml:101

408#: qml/Wizard/Pages/30-passwd-type.qml:101

408msgid "4 digits only"

409msgid "4 digits only"

409−msgstr ""

410+msgstr "4 dígitos"

410

411

411#: qml/Wizard/Pages/30-passwd-type.qml:103

412#: qml/Wizard/Pages/30-passwd-type.qml:103

412msgid "Passphrase"

413msgid "Passphrase"

@@ -414,31 +415,31 @@ msgstr ""

414

415

415#: qml/Wizard/Pages/30-passwd-type.qml:104

416#: qml/Wizard/Pages/30-passwd-type.qml:104

416msgid "Numbers and letters"

417msgid "Numbers and letters"

417−msgstr ""

418+msgstr "Números e letras"

418

419

419#: qml/Wizard/Pages/40-wifi.qml:28

420#: qml/Wizard/Pages/40-wifi.qml:28

420msgid "Connect to Wi‑Fi"

421msgid "Connect to Wi‑Fi"

421−msgstr ""

422+msgstr "Ligar ao Wi-Fi"

422

423

423#: qml/Wizard/Pages/40-wifi.qml:147

424#: qml/Wizard/Pages/40-wifi.qml:147

424msgid "Available networks…"

425msgid "Available networks…"

425−msgstr ""

426+msgstr "Redes disponíveis..."

426

427

427#: qml/Wizard/Pages/40-wifi.qml:148

428#: qml/Wizard/Pages/40-wifi.qml:148

428msgid "No available networks."

429msgid "No available networks."

429−msgstr ""

430+msgstr "Sem redes disponíveis."

430

431

431#: qml/Wizard/Pages/50-location.qml:27

432#: qml/Wizard/Pages/50-location.qml:27

432msgid "Location"

433msgid "Location"

433−msgstr ""

434+msgstr "Localização"

434

435

435#: qml/Wizard/Pages/50-location.qml:62

436#: qml/Wizard/Pages/50-location.qml:62

436msgid "Let the phone detect your location:"

437msgid "Let the phone detect your location:"

437−msgstr ""

438+msgstr "Deixe o telefone detectar a sua localização:"

438

439

439#: qml/Wizard/Pages/50-location.qml:69

440#: qml/Wizard/Pages/50-location.qml:69

440msgid "Using GPS only (less accurate)"

441msgid "Using GPS only (less accurate)"

441−msgstr ""

442+msgstr "Usar apenas GPS (menos preciso)"

442

443

443#: qml/Wizard/Pages/50-location.qml:86

444#: qml/Wizard/Pages/50-location.qml:86

444msgid "Using GPS, anonymized Wi-Fi and cellular network info (recommended)"

445msgid "Using GPS, anonymized Wi-Fi and cellular network info (recommended)"

@@ -461,7 +462,7 @@ msgstr ""

461

462

462#: qml/Wizard/Pages/60-reporting.qml:24

463#: qml/Wizard/Pages/60-reporting.qml:24

463msgid "Improving your experience"

464msgid "Improving your experience"

464−msgstr ""

465+msgstr "Melhore a sua experiência"

465

466

466#: qml/Wizard/Pages/60-reporting.qml:36

467#: qml/Wizard/Pages/60-reporting.qml:36

467msgid ""

468msgid ""

@@ -481,7 +482,7 @@ msgstr ""

481

482

482#: qml/Wizard/Pages/80-finished.qml:39

483#: qml/Wizard/Pages/80-finished.qml:39

483msgid "Nice work!"

484msgid "Nice work!"

484−msgstr ""

485+msgstr "Bom trabalho!"

485

486

486#: qml/Wizard/Pages/80-finished.qml:46

487#: qml/Wizard/Pages/80-finished.qml:46

487msgid "Your phone is now ready to use."

488msgid "Your phone is now ready to use."

@@ -489,7 +490,7 @@ msgstr ""

489

490

490#: qml/Wizard/Pages/80-finished.qml:53

491#: qml/Wizard/Pages/80-finished.qml:53

491msgid "Finish"

492msgid "Finish"

492−msgstr ""

493+msgstr "Concluir"

493

494

494#: qml/Wizard/Pages/here-terms.qml:27

495#: qml/Wizard/Pages/here-terms.qml:27

495msgid "Terms & Conditions"

496msgid "Terms & Conditions"

@@ -506,7 +507,7 @@ msgstr ""

506#: qml/Wizard/Pages/passwd-confirm.qml:53

507#: qml/Wizard/Pages/passwd-confirm.qml:53

507#: qml/Wizard/Pages/passwd-confirm.qml:54

508#: qml/Wizard/Pages/passwd-confirm.qml:54

508msgid "Please try again."

509msgid "Please try again."

509−msgstr ""

510+msgstr "Por favor, tente novamente."

510

511

511#: qml/Wizard/Pages/passwd-set.qml:61

512#: qml/Wizard/Pages/passwd-set.qml:61

512msgid "Choose your passcode"

513msgid "Choose your passcode"

@@ -519,7 +520,7 @@ msgstr ""

519#: qml/Wizard/StackButton.qml:39

520#: qml/Wizard/StackButton.qml:39

520#, qt-format

521#, qt-format

521msgid "〈 %1"

522msgid "〈 %1"

522−msgstr ""

523+msgstr "〈 %1"

523

524

524#: qml/Wizard/StackButton.qml:42

525#: qml/Wizard/StackButton.qml:42

525#, qt-format

526#, qt-format

po/sl.po+51−43

@@ -8,7 +8,7 @@ msgstr ""

8"Project-Id-Version: unity\n"

9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10"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"

12"Last-Translator: Damir Jerovšek <Unknown>\n"

13"Language-Team: Slovenian <sl@li.org>\n"

14"MIME-Version: 1.0\n"

@@ -16,8 +16,8 @@ msgstr ""

16"Content-Transfer-Encoding: 8bit\n"

17"Plural-Forms: nplurals=4; plural=(n%100==1 ? 1 : n%100==2 ? 2 : n%100==3 || "

18"n%100==4 ? 3 : 0);\n"

19−"X-Launchpad-Export-Date: 2014-12-13 07:11+0000\n"

19+"X-Launchpad-Export-Date: 2015-01-19 06:29+0000\n"

20−"X-Generator: Launchpad (build 17286)\n"

20+"X-Generator: Launchpad (build 17304)\n"

22#: plugins/LightDM/Greeter.cpp:130

23msgid "Password: "

@@ -232,15 +232,15 @@ msgstr "Spustite za osvežitev ..."

232

233#: qml/Dash/ScopesList.qml:63

234msgid "Manage"

235−msgstr ""

235+msgstr "Upravljaj"

236

237#: qml/Dash/ScopesList.qml:107

238msgid "Home"

239−msgstr ""

239+msgstr "Domov"

240

241#: qml/Dash/ScopesList.qml:108

242msgid "Also installed"

243−msgstr ""

243+msgstr "Tudi nameščeno"

244

245#: qml/Greeter/Greeter.qml:174

246msgid "Unlock"

@@ -354,98 +354,100 @@ msgstr ""

354

355#: qml/Wizard/Page.qml:89

356msgid "Back"

357−msgstr ""

357+msgstr "Nazaj"

358

359#: qml/Wizard/Pages/10-welcome.qml:27

360msgid "Hi!"

361−msgstr ""

361+msgstr "Živjo!"

362

363#: qml/Wizard/Pages/10-welcome.qml:44

364msgid "Welcome to your Ubuntu phone."

365−msgstr ""

365+msgstr "Dobrodošli v svoj telefon Ubuntu."

366

367#: qml/Wizard/Pages/10-welcome.qml:52

368msgid "Let’s get started."

369−msgstr ""

369+msgstr "Pa začnimo."

370

371#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:128

372#: qml/Wizard/Pages/40-wifi.qml:197 qml/Wizard/Pages/50-location.qml:131

373#: qml/Wizard/Pages/60-reporting.qml:50 qml/Wizard/Pages/passwd-confirm.qml:82

374#: qml/Wizard/Pages/passwd-set.qml:90

375msgid "Continue"

376−msgstr ""

376+msgstr "Nadaljuj"

377

378#: qml/Wizard/Pages/20-sim.qml:25

379msgid "Add a SIM card and restart your device"

380−msgstr ""

380+msgstr "Dodajte kartico SIM in ponovno zaženite napravo"

381

382#: qml/Wizard/Pages/20-sim.qml:55

383msgid "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."

385

386#: qml/Wizard/Pages/20-sim.qml:69 qml/Wizard/Pages/40-wifi.qml:197

387msgid "Skip"

388−msgstr ""

388+msgstr "Preskoči"

389

390#: qml/Wizard/Pages/30-passwd-type.qml:39

391msgid "Lock security"

392−msgstr ""

392+msgstr "Varnost zaklepa"

393

394#: qml/Wizard/Pages/30-passwd-type.qml:74

395msgid "Please select how you’d like to unlock your phone."

396−msgstr ""

396+msgstr "Izberite, kako želite odkleniti svoj telefon."

397

398#: qml/Wizard/Pages/30-passwd-type.qml:97

399msgid "Swipe"

400−msgstr ""

400+msgstr "Poteg"

401

402#: qml/Wizard/Pages/30-passwd-type.qml:98

403msgid "No security"

404−msgstr ""

404+msgstr "Brez varnosti"

405

406#: qml/Wizard/Pages/30-passwd-type.qml:100

407msgid "Passcode"

408−msgstr ""

408+msgstr "Geslo"

409

410#: qml/Wizard/Pages/30-passwd-type.qml:101

411msgid "4 digits only"

412−msgstr ""

412+msgstr "Samo 4 številke"

413

414#: qml/Wizard/Pages/30-passwd-type.qml:103

415msgid "Passphrase"

416−msgstr ""

416+msgstr "Šifrirno reklo"

417

418#: qml/Wizard/Pages/30-passwd-type.qml:104

419msgid "Numbers and letters"

420−msgstr ""

420+msgstr "Številke in črke"

421

422#: qml/Wizard/Pages/40-wifi.qml:28

423msgid "Connect to Wi‑Fi"

424−msgstr ""

424+msgstr "Poveži se z Wi-Fi-jem"

425

426#: qml/Wizard/Pages/40-wifi.qml:147

427msgid "Available networks…"

428−msgstr ""

428+msgstr "Razpoložljiva omrežja ..."

429

430#: qml/Wizard/Pages/40-wifi.qml:148

431msgid "No available networks."

432−msgstr ""

432+msgstr "Ni razpoložljivih omrežij."

433

434#: qml/Wizard/Pages/50-location.qml:27

435msgid "Location"

436−msgstr ""

436+msgstr "Položaj"

437

438#: qml/Wizard/Pages/50-location.qml:62

439msgid "Let the phone detect your location:"

440−msgstr ""

440+msgstr "Naj telefon zazna vaš položaj:"

441

442#: qml/Wizard/Pages/50-location.qml:69

443msgid "Using GPS only (less accurate)"

444−msgstr ""

444+msgstr "Uporaba samo GPS-a (manj natančno)"

445

446#: qml/Wizard/Pages/50-location.qml:86

447msgid "Using GPS, anonymized Wi-Fi and cellular network info (recommended)"

448msgstr ""

449+"Uporaba GPS-a z brezimnim Wi-Fi-jem ter podatki mobilnega omrežja "

450+"(priporočljivo)"

449

451

450#. TRANSLATORS: HERE is a trademark for Nokia's location service, you probably shouldn't translate it

452#. TRANSLATORS: HERE is a trademark for Nokia's location service, you probably shouldn't translate it

451#: qml/Wizard/Pages/50-location.qml:103

453#: qml/Wizard/Pages/50-location.qml:103

@@ -453,81 +455,87 @@ msgid ""

453"By selecting this option you agree to the Nokia HERE <a href='#'>terms and "

455"By selecting this option you agree to the Nokia HERE <a href='#'>terms and "

454"conditions</a>."

456"conditions</a>."

455msgstr ""

457msgstr ""

458+"Z izbiro te možnosti se strinjate s <a href='#'>pogoji ter pravili</a> Nokia "

459+"HERE."

456

460

457#: qml/Wizard/Pages/50-location.qml:112

461#: qml/Wizard/Pages/50-location.qml:112

458msgid "Not at all"

462msgid "Not at all"

459−msgstr ""

463+msgstr "Sploh ne"

460

464

461#: qml/Wizard/Pages/50-location.qml:124

465#: qml/Wizard/Pages/50-location.qml:124

462msgid "You can change your mind later in System Settings."

466msgid "You can change your mind later in System Settings."

463−msgstr ""

467+msgstr "Premislite si lahko kasneje v Sistemskih nastavitvah."

464

468

465#: qml/Wizard/Pages/60-reporting.qml:24

469#: qml/Wizard/Pages/60-reporting.qml:24

466msgid "Improving your experience"

470msgid "Improving your experience"

467−msgstr ""

471+msgstr "Izboljševanje vaše izkušnje"

468

472

469#: qml/Wizard/Pages/60-reporting.qml:36

473#: qml/Wizard/Pages/60-reporting.qml:36

470msgid ""

474msgid ""

471"Your phone is set up to automatically report errors to Canonical and its "

475"Your phone is set up to automatically report errors to Canonical and its "

472"partners, the makers of the operating system."

476"partners, the makers of the operating system."

473msgstr ""

477msgstr ""

478+"Vaš telefon je nastavljen, da samodejno poroča napake Canonicalu in njegovim "

479+"partnerjem, ustvarjalcem operacijskega sistema."

474

480

475#: qml/Wizard/Pages/60-reporting.qml:43

481#: qml/Wizard/Pages/60-reporting.qml:43

476msgid ""

482msgid ""

477"This can be disabled in System Settings under Security & "

483"This can be disabled in System Settings under Security & "

478"Privacy"

484"Privacy"

479msgstr ""

485msgstr ""

486+"To je možno onemogočiti v Sistemskih nastavitvah pod Varnost "

487+"& Zasebnost"

480

488

481#: qml/Wizard/Pages/80-finished.qml:24

489#: qml/Wizard/Pages/80-finished.qml:24

482msgid "All done"

490msgid "All done"

483−msgstr ""

491+msgstr "Opravljeno"

484

492

485#: qml/Wizard/Pages/80-finished.qml:39

493#: qml/Wizard/Pages/80-finished.qml:39

486msgid "Nice work!"

494msgid "Nice work!"

487−msgstr ""

495+msgstr "Odlično!"

488

496

489#: qml/Wizard/Pages/80-finished.qml:46

497#: qml/Wizard/Pages/80-finished.qml:46

490msgid "Your phone is now ready to use."

498msgid "Your phone is now ready to use."

491−msgstr ""

499+msgstr "Vaš telefon je sedaj pripravljen za uporabo."

492

500

493#: qml/Wizard/Pages/80-finished.qml:53

501#: qml/Wizard/Pages/80-finished.qml:53

494msgid "Finish"

502msgid "Finish"

495−msgstr ""

503+msgstr "Dokončaj"

496

504

497#: qml/Wizard/Pages/here-terms.qml:27

505#: qml/Wizard/Pages/here-terms.qml:27

498msgid "Terms & Conditions"

506msgid "Terms & Conditions"

499−msgstr ""

507+msgstr "Pogoji uporabe"

500

508

501#: qml/Wizard/Pages/passwd-confirm.qml:49

509#: qml/Wizard/Pages/passwd-confirm.qml:49

502msgid "Confirm passphrase"

510msgid "Confirm passphrase"

503−msgstr ""

511+msgstr "Potrdite šifrirno reklo"

504

512

505#: qml/Wizard/Pages/passwd-confirm.qml:50

513#: qml/Wizard/Pages/passwd-confirm.qml:50

506msgid "Confirm passcode"

514msgid "Confirm passcode"

507−msgstr ""

515+msgstr "Potrdite geslo"

508

516

509#: qml/Wizard/Pages/passwd-confirm.qml:53

517#: qml/Wizard/Pages/passwd-confirm.qml:53

510#: qml/Wizard/Pages/passwd-confirm.qml:54

518#: qml/Wizard/Pages/passwd-confirm.qml:54

511msgid "Please try again."

519msgid "Please try again."

512−msgstr ""

520+msgstr "Poskusite znova."

513

521

514#: qml/Wizard/Pages/passwd-set.qml:61

522#: qml/Wizard/Pages/passwd-set.qml:61

515msgid "Choose your passcode"

523msgid "Choose your passcode"

516−msgstr ""

524+msgstr "Izberite svoje geslo"

517

525

518#: qml/Wizard/Pages/passwd-set.qml:68

526#: qml/Wizard/Pages/passwd-set.qml:68

519msgid "Passphrase must be 4 characters long"

527msgid "Passphrase must be 4 characters long"

520−msgstr ""

528+msgstr "Šifrirno reklo mora biti dolgo vsaj 4 znake"

521

529

522#: qml/Wizard/StackButton.qml:39

530#: qml/Wizard/StackButton.qml:39

523#, qt-format

531#, qt-format

524msgid "〈 %1"

532msgid "〈 %1"

525−msgstr ""

533+msgstr "〈 %1"

526

534

527#: qml/Wizard/StackButton.qml:42

535#: qml/Wizard/StackButton.qml:42

528#, qt-format

536#, qt-format

529msgid "%1 〉"

537msgid "%1 〉"

530−msgstr ""

538+msgstr "%1 〉"

531

539

532#~ msgid "Confirm"

540#~ msgid "Confirm"

533#~ msgstr "Potrdi"

541#~ msgstr "Potrdi"

qml/Dash/Dash.qml+2−2

@@ -304,8 +304,8 @@ Showable {

304 Image {

305 source: "graphics/overview_hint.png"

306 anchors.horizontalCenter: parent.horizontalCenter

307− opacity: (scopeItem.scope ? scopeItem.pageHeaderTotallyVisible : scopes.count == 0 || dashContent.pageHeaderTotallyVisible) &&

307+ opacity: !scopeItem.scope && (scopes.count == 0 || dashContent.pageHeaderTotallyVisible) &&

308− (overviewDragHandle.enabled || bottomEdgeController.progress != 0) ? 1 : 0

308+ (overviewDragHandle.enabled || overviewDragHandle.status.progress != 0) ? 1 : 0

309 Behavior on opacity {

310 enabled: bottomEdgeController.progress == 0

311 UbuntuNumberAnimation {}

qml/Dash/GenericScopeView.qml+30−2

@@ -41,6 +41,7 @@ FocusScope {

41 property bool visibleToParent: false

42 property alias pageHeaderTotallyVisible: categoryView.pageHeaderTotallyVisible

43 property var holdingList: null

44+ property bool wasCurrentOnMoveStart: false

45 property var scopeStyle: ScopeStyle {

46 property var scopeStyle: ScopeStyle {

46 style: scope ? scope.customizations : {}

47 style: scope ? scope.customizations : {}

@@ -116,6 +117,9 @@ FocusScope {

116 }

117 }

117

118

118 onIsCurrentChanged: {

119 onIsCurrentChanged: {

120+ if (!holdingList || !holdingList.moving) {

121+ wasCurrentOnMoveStart = scopeView.isCurrent;

122+ }

119 if (pageHeaderLoader.item && showPageHeader) {

123 if (pageHeaderLoader.item && showPageHeader) {

120 pageHeaderLoader.item.resetSearch();

124 pageHeaderLoader.item.resetSearch();

121 }

125 }

@@ -142,6 +146,15 @@ FocusScope {

142 onHideDash: subPageLoader.closeSubPage()

146 onHideDash: subPageLoader.closeSubPage()

143 }

147 }

144

148

149+ Connections {

150+ target: holdingList

151+ onMovingChanged: {

152+ if (!moving) {

153+ wasCurrentOnMoveStart = scopeView.isCurrent;

154+ }

155+ }

156+ }

157+

145 Rectangle {

158 Rectangle {

146 anchors.fill: parent

159 anchors.fill: parent

147 color: scopeView.scopeStyle ? scopeView.scopeStyle.background : "transparent"

160 color: scopeView.scopeStyle ? scopeView.scopeStyle.background : "transparent"

@@ -367,7 +380,11 @@ FocusScope {

367

380

368 function updateRanges() {

381 function updateRanges() {

369 // Don't want to create stress by requesting more items during scope

382 // 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

371 if (holdingList && holdingList.moving && !scopeView.visibleToParent) {

388 if (holdingList && holdingList.moving && !scopeView.visibleToParent) {

372 return;

389 return;

373 }

390 }

@@ -412,7 +429,18 @@ FocusScope {

412 if (scopeView.isCurrent || scopeView.visibleToParent) {

429 if (scopeView.isCurrent || scopeView.visibleToParent) {

413 item.displayMarginBeginning = displayMarginBeginning;

430 item.displayMarginBeginning = displayMarginBeginning;

414 item.displayMarginEnd = displayMarginEnd;

431 item.displayMarginEnd = displayMarginEnd;

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 {

415− item.cacheBuffer = scopeView.isCurrent ? categoryView.height * 1.5 : 0;

442+ item.cacheBuffer = categoryView.height * 1.5;

443+ }

416 } else {

444 } else {

417 var visibleRange = baseItem.height + displayMarginEnd + displayMarginBeginning;

445 var visibleRange = baseItem.height + displayMarginEnd + displayMarginBeginning;

418 if (visibleRange < 0) {

446 if (visibleRange < 0) {

qml/Dash/Previews/PreviewTable.qml+6

@@ -37,6 +37,7 @@ PreviewWidget {

37 id: column

38 objectName: "column"

39 spacing: units.gu(1)

40+ width: parent.width

41 Label {

42 Label {

42 id: titleLabel

43 id: titleLabel

@@ -51,6 +52,7 @@ PreviewWidget {

51 visible: text !== ""

52 visible: text !== ""

52 opacity: .8

53 opacity: .8

53 text: widgetData["title"] || ""

54 text: widgetData["title"] || ""

55+ elide: Text.ElideRight

54 }

56 }

56 GridLayout {

58 GridLayout {

@@ -72,6 +74,10 @@ PreviewWidget {

72 visible: root.expanded || rowIndex < maximumCollapsedRowCount

74 visible: root.expanded || rowIndex < maximumCollapsedRowCount

73 color: root.scopeStyle ? root.scopeStyle.foreground : Theme.palette.normal.baseText

75 color: root.scopeStyle ? root.scopeStyle.foreground : Theme.palette.normal.baseText

74 font.bold: index == 0

76 font.bold: index == 0

77+ verticalAlignment: Text.AlignTop

78+ wrapMode: Text.WordWrap

79+ Layout.fillHeight: true

80+ Layout.maximumWidth: column.width - x

75 }

81 }

76 }

82 }

77 }

83 }

qml/Shell.qml+15−3

@@ -180,8 +180,20 @@ Item {

180

181 WindowKeysFilter {

182 Keys.onPressed: {

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);

183− if (event.key == Qt.Key_PowerOff || event.key == Qt.Key_PowerDown) {

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) {

184− dialogs.onPowerKeyPressed();

195+ dialogs.onPowerKeyPressed();

196+ }

185 event.accepted = true;

197 event.accepted = true;

186 } else {

198 } else {

187 volumeKeyFilter.onKeyPressed(event.key);

199 volumeKeyFilter.onKeyPressed(event.key);

@@ -652,7 +664,7 @@ Item {

652 target: callManager

664 target: callManager

653

665

654 onHasCallsChanged: {

666 onHasCallsChanged: {

655− if (shell.locked && callManager.hasCalls) {

667+ if (shell.locked && callManager.hasCalls && greeter.lockedApp !== "dialer-app") {

656 // We just received an incoming call while locked. The

668 // We just received an incoming call while locked. The

657 // indicator will have already launched dialer-app for us, but

669 // indicator will have already launched dialer-app for us, but

658 // there is a race between "hasCalls" changing and the dialer

670 // there is a race between "hasCalls" changing and the dialer

qml/Stages/DesktopStage.qml+8−44

@@ -94,6 +94,8 @@ Item {

94 width: units.gu(60)

95 height: units.gu(50)

97+ readonly property int minWidth: units.gu(10)

98+ readonly property int minHeight: units.gu(10)

98 states: [

100 states: [

99 State {

101 State {

@@ -114,51 +116,13 @@ Item {

114 }

116 }

115 ]

117 ]

116

118

117− MouseArea {

119+ WindowMoveResizeArea {

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;

120+ target: appDelegate

143− }

121+ minWidth: appDelegate.minWidth

144− }

122+ minHeight: appDelegate.minHeight

145−

123+ resizeHandleWidth: units.gu(0.5)

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− }

156

124

157− onReleased: {

125+ onPressed: ApplicationManager.requestFocusApplication(model.appId)

158− resizeWidth = false;

159− resizeHeight = false;

160− drag.target = undefined;

161− }

162 }

126 }

163

127

164 DecoratedWindow {

128 DecoratedWindow {

qml/Stages/WindowMoveResizeArea.qmlnew file+98

@@ -0,0 +1,98 @@

1+/*

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

32 , m_service(service)

33 , m_path(path)

34 , m_interface(interface)

35+ , m_bus(bus)

35 , m_watcher(new QDBusServiceWatcher(service,

36 , m_watcher(new QDBusServiceWatcher(service,

36 (bus == SystemBus) ? QDBusConnection::systemBus()

37 (bus == SystemBus) ? QDBusConnection::systemBus()

37 : QDBusConnection::sessionBus()))

38 : QDBusConnection::sessionBus()))

38 , m_dbusInterface(nullptr)

39 , m_dbusInterface(nullptr)

39{

40{

40− connect(m_watcher, &QDBusServiceWatcher::serviceRegistered, this, &AbstractDBusServiceMonitor::createInterface);

41+ connect(m_watcher, &QDBusServiceWatcher::serviceRegistered, this, &AbstractDBusServiceMonitor::onServiceRegistered);

41− connect(m_watcher, &QDBusServiceWatcher::serviceUnregistered, this, &AbstractDBusServiceMonitor::destroyInterface);

42+ connect(m_watcher, &QDBusServiceWatcher::serviceUnregistered, this, &AbstractDBusServiceMonitor::onServiceUnregistered);

43 // Connect to the service if it's up already

44 // Connect to the service if it's up already

44 QDBusConnectionInterface* sessionBus = QDBusConnection::sessionBus().interface();

45 QDBusConnectionInterface* sessionBus = QDBusConnection::sessionBus().interface();

45 QDBusReply<bool> reply = sessionBus->isServiceRegistered(m_service);

46 QDBusReply<bool> reply = sessionBus->isServiceRegistered(m_service);

46 if (reply.isValid() && reply.value()) {

47 if (reply.isValid() && reply.value()) {

47− createInterface(m_service);

48+ onServiceRegistered(m_service);

48 }

49 }

49}

50}

@@ -54,19 +55,31 @@ AbstractDBusServiceMonitor::~AbstractDBusServiceMonitor()

54 delete m_dbusInterface;

55 delete m_dbusInterface;

55}

56}

57−void AbstractDBusServiceMonitor::createInterface(const QString &)

58+void AbstractDBusServiceMonitor::onServiceRegistered(const QString &)

58{

59{

59 if (m_dbusInterface != nullptr) {

60 if (m_dbusInterface != nullptr) {

60 delete m_dbusInterface;

61 delete m_dbusInterface;

61 m_dbusInterface = nullptr;

62 m_dbusInterface = nullptr;

62 }

63 }

64− m_dbusInterface = new QDBusInterface(m_service, m_path, m_interface,

65+ m_dbusInterface = createInterface(m_service, m_path, m_interface,

66+ (m_bus == SystemBus) ? QDBusConnection::systemBus()

65− QDBusConnection::sessionBus());

67+ : QDBusConnection::sessionBus());

66 Q_EMIT serviceAvailableChanged(true);

68 Q_EMIT serviceAvailableChanged(true);

67}

69}

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+

69−void AbstractDBusServiceMonitor::destroyInterface(const QString &)

82+void AbstractDBusServiceMonitor::onServiceUnregistered(const QString &)

70{

83{

71 if (m_dbusInterface != nullptr) {

84 if (m_dbusInterface != nullptr) {

72 delete m_dbusInterface;

85 delete m_dbusInterface;

@@ -76,7 +89,7 @@ void AbstractDBusServiceMonitor::destroyInterface(const QString &)

76 Q_EMIT serviceAvailableChanged(false);

89 Q_EMIT serviceAvailableChanged(false);

77}

90}

79−QDBusInterface* AbstractDBusServiceMonitor::dbusInterface() const

92+QDBusAbstractInterface* AbstractDBusServiceMonitor::dbusInterface() const

80{

93{

81 return m_dbusInterface;

94 return m_dbusInterface;

82}

95}

src/libunity8-private/abstractdbusservicemonitor.h+9−5

@@ -24,7 +24,7 @@

24#include <QString>

25#include <QDBusConnection>

27−class QDBusInterface;

27+class QDBusAbstractInterface;

28class QDBusServiceWatcher;

30class Q_DECL_EXPORT AbstractDBusServiceMonitor : public QObject

@@ -44,7 +44,7 @@ public:

44 QObject *parent = 0);

45 ~AbstractDBusServiceMonitor();

47− QDBusInterface* dbusInterface() const;

47+ QDBusAbstractInterface* dbusInterface() const;

49 bool serviceAvailable() const;

@@ -52,15 +52,19 @@ Q_SIGNALS:

52 void serviceAvailableChanged(bool available);

54private Q_SLOTS:

55− void createInterface(const QString &service);

55+ void onServiceRegistered(const QString &service);

56− void destroyInterface(const QString &service);

56+ void onServiceUnregistered(const QString &service);

58protected:

59+ virtual QDBusAbstractInterface* createInterface(const QString &service, const QString &path,

60+ const QString &interface, const QDBusConnection &connection);

61+

59 const QString m_service;

62 const QString m_service;

60 const QString m_path;

63 const QString m_path;

61 const QString m_interface;

64 const QString m_interface;

65+ const Bus m_bus;

62 QDBusServiceWatcher* m_watcher;

66 QDBusServiceWatcher* m_watcher;

63− QDBusInterface* m_dbusInterface;

67+ QDBusAbstractInterface* m_dbusInterface;

64};

68};

66#endif // ABSTRACTDBUSSERVICEMONITOR_H

70#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

31class EdgesDemoTestCase(tests.UnityTestCase):

33 def setUp(self):

34− super().setUp()

34+ super(EdgesDemoTestCase, self).setUp()

35 self._qml_mock_enabled = False

36 self._data_dirs_mock_enabled = False

37 self._lightdm_mock_type = False

tests/mocks/LightDM/CMakeLists.txt+1−2

@@ -37,8 +37,7 @@ add_library(MockLightDM-qml MODULE

37# LD_LIBRARY_PATH.

38add_dependencies(MockLightDM-qml MockLightDM-full MockUserMetrics)

39target_link_libraries(MockLightDM-qml

40− -L${CMAKE_CURRENT_BINARY_DIR}/full

40+ MockLightDM-full

41− -llightdm-qt5-2

42 -L${CMAKE_BINARY_DIR}/tests/mocks/libusermetrics

41 -L${CMAKE_BINARY_DIR}/tests/mocks/libusermetrics

43 -lusermetricsoutput

42 -lusermetricsoutput

44 unity8-private

43 unity8-private

tests/mocks/LightDM/demo/CMakeLists.txt+1

@@ -28,6 +28,7 @@ target_link_libraries(MockLightDM-demo-shared

28qt5_use_modules(MockLightDM-demo Concurrent Gui)

29qt5_use_modules(MockLightDM-demo-shared Concurrent Gui)

31+set_target_properties(MockLightDM-demo PROPERTIES COMPILE_FLAGS -fPIC)

31set_target_properties(MockLightDM-demo-shared PROPERTIES

32set_target_properties(MockLightDM-demo-shared PROPERTIES

32 OUTPUT_NAME lightdm-qt5-2)

33 OUTPUT_NAME lightdm-qt5-2)

tests/plugins/LightDM/CMakeLists.txt+1−4

@@ -11,10 +11,7 @@ include_directories(

11 ${LIBLIGHTDM_INCLUDE_DIRS}

12 )

14−target_link_libraries(GreeterDBusTestExec

14+target_link_libraries(GreeterDBusTestExec MockLightDM-full)

15− -L${CMAKE_BINARY_DIR}/tests/mocks/LightDM/full

16− -llightdm-qt5-2

17− )

19add_definitions(-DCURRENT_SOURCE_DIR="${CMAKE_CURRENT_SOURCE_DIR}")

16add_definitions(-DCURRENT_SOURCE_DIR="${CMAKE_CURRENT_SOURCE_DIR}")

tests/qmltests/CMakeLists.txt+1

@@ -88,5 +88,6 @@ add_qml_test(Stages PhoneStage ENVIRONMENT "LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/

88add_qml_test(Stages SpreadDelegate ENVIRONMENT "LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/tests/mocks/libusermetrics:${CMAKE_BINARY_DIR}/tests/mocks/LightDM/single")

89add_qml_test(Stages SurfaceContainer ENVIRONMENT "LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/tests/mocks/libusermetrics:${CMAKE_BINARY_DIR}/tests/mocks/LightDM/single")

90add_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)

91add_qml_test(Stages Splash)

92add_qml_test(Stages Splash)

92add_qml_test(Wizard Wizard)

93add_qml_test(Wizard Wizard)

tests/qmltests/Dash/Previews/tst_PreviewTable.qml+6−5

@@ -27,17 +27,18 @@ Rectangle {

27 color: Theme.palette.selected.background

29 property var widgetDataComplete: {

30− "title": "Title here",

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"], [ "Label 3", "Value 3"], [ "Label 4", "Value 4"], [ "Label 5", "Value 5"] ]

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"] ]

32 }

34 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"] ]

36 }

38− PreviewTable {

38+ PreviewWidgetFactory {

39 id: previewTable

40 anchors { left: parent.left; right: parent.right }

41+ widgetType: "table"

41 widgetData: widgetDataComplete

42 widgetData: widgetDataComplete

43 Rectangle {

44 Rectangle {

@@ -59,7 +60,7 @@ Rectangle {

59 compare(findChild(previewTable, "label00").text, "Long Label 1");

60 compare(findChild(previewTable, "label00").text, "Long Label 1");

60 compare(findChild(previewTable, "label01").text, "Value 1");

61 compare(findChild(previewTable, "label01").text, "Value 1");

61 compare(findChild(previewTable, "label10").text, "Label 2");

62 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");

63 compare(findChild(previewTable, "label20").text, "Label 3");

64 compare(findChild(previewTable, "label20").text, "Label 3");

64 compare(findChild(previewTable, "label21").text, "Value 3");

65 compare(findChild(previewTable, "label21").text, "Value 3");

65 compare(findChild(previewTable, "label30").text, "Label 4");

66 compare(findChild(previewTable, "label30").text, "Label 4");

tests/qmltests/Dash/tst_Card.qml+2−2

@@ -61,7 +61,7 @@ Rectangle {

61 },

62 {

63 "name": "Art, header, summary - horizontal",

64− "layout": { "template": { "card-layout": "horizontal" },

64+ "layout": { "template": { "card-layout": "horizontal", "card-background": { "type": "gradient", "elements": ["grey", "white"] } },

65 "components": JSON.parse(Helpers.fullMapping) }

66 },

67 {

@@ -407,7 +407,7 @@ Rectangle {

407 return [

408 { tag: "Art and summary", visible: true, color: "#ffffff", index: 0 },

409 { tag: "No Summary", visible: false, index: 6 },

410− { tag: "Horizontal", visible: false, index: 5 },

410+ { tag: "Horizontal", visible: true, color: "#808080", index: 5 },

411 { tag: "Grey background", visible: true, color: "#808080", index: 10 },

412 { tag: "Overriden Gradient background", visible: true, color: "#808080", gradientColor: "#ffffff",

413 background: {type: "color", elements: ["grey", "white"]}, index: 10 },

tests/qmltests/Dash/tst_DashContent.qml+57

@@ -537,5 +537,62 @@ Item {

537

538 compare(categoryListView.pageHeader.item.searchHint, "Search People");

539 }

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+ }

540 }

597 }

541}

598}

tests/qmltests/Stages/tst_WindowMoveResizeArea.qmlnew file+138

@@ -0,0 +1,138 @@

1+/*

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 {

37 this.getCurrentTimeMs = function() {return this.currentTimeMs}

38 }

40+ // TODO This function can be removed altogether once we use Qt 5.5 which has the same feature

40 function mouseClick(item, x, y, button, modifiers, delay) {

41 function mouseClick(item, x, y, button, modifiers, delay) {

41 if (button === undefined)

42 if (button === undefined)

42 button = Qt.LeftButton;

43 button = Qt.LeftButton;

@@ -52,6 +53,7 @@ TestCase {

52 qtest_fail("window not shown", 2);

53 qtest_fail("window not shown", 2);

53 }

54 }

56+ // TODO This function can be removed altogether once we use Qt 5.5 which has the same feature

55 function mouseDoubleClick(item, x, y, button, modifiers, delay) {

57 function mouseDoubleClick(item, x, y, button, modifiers, delay) {

56 if (button === undefined)

58 if (button === undefined)

57 button = Qt.LeftButton;

59 button = Qt.LeftButton;

@@ -67,6 +69,7 @@ TestCase {

67 qtest_fail("window not shown", 2)

69 qtest_fail("window not shown", 2)

68 }

70 }

72+ // TODO This function can be removed altogether once we use Qt 5.5 which has the same feature

70 function mousePress(item, x, y, button, modifiers, delay) {

73 function mousePress(item, x, y, button, modifiers, delay) {

71 if (button === undefined)

74 if (button === undefined)

72 button = Qt.LeftButton;

75 button = Qt.LeftButton;

@@ -82,6 +85,7 @@ TestCase {

82 qtest_fail("window not shown", 2)

85 qtest_fail("window not shown", 2)

83 }

86 }

88+ // TODO This function can be removed altogether once we use Qt 5.5 which has the same feature

85 function mouseRelease(item, x, y, button, modifiers, delay) {

89 function mouseRelease(item, x, y, button, modifiers, delay) {

86 if (button === undefined)

90 if (button === undefined)

87 button = Qt.LeftButton;

91 button = Qt.LeftButton;

@@ -170,78 +174,22 @@ TestCase {

170 return null;

174 return null;

171 }

175 }

172

176

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+

173 // Type a full string instead of keyClick letter by letter

189 // 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.

177 function typeString(str) {

190 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− }

243 for (var i = 0; i < str.length; i++) {

191 for (var i = 0; i < str.length; i++) {

244− keyClick(keyMap[str[i]])

192+ keyClick(str[i])

245 }

193 }

246 }

194 }

247

195