1
=== added directory 'common/Walkthrough'
2
=== added file 'common/Walkthrough/FirstRunWalkthrough.qml'
3
--- common/Walkthrough/FirstRunWalkthrough.qml	1970-01-01 00:00:00 +0000
4
+++ common/Walkthrough/FirstRunWalkthrough.qml	2015-01-20 05:33:53 +0000
5
@@ -0,0 +1,43 @@
6
1
/*
7
2
 * Copyright (C) 2014
8
3
 *      Nekhelesh Ramananthan <nik90@ubuntu.com>
9
4
 *      Victor Thompson <victor.thompson@gmail.com>
10
5
 *
11
6
 * This program is free software; you can redistribute it and/or modify
12
7
 * it under the terms of the GNU General Public License as published by
13
8
 * the Free Software Foundation; version 3.
14
9
 *
15
10
 * This program is distributed in the hope that it will be useful,
16
11
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
17
12
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
18
13
 * GNU General Public License for more details.
19
14
 *
20
15
 * You should have received a copy of the GNU General Public License
21
16
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
22
17
 *
23
18
 * Upstream location:
24
19
 * https://github.com/krnekhelesh/flashback
25
20
 */
26
21
27
22
import QtQuick 2.3
28
23
import Ubuntu.Components 1.1
29
24
30
25
// Initial Walkthrough tutorial
31
26
Walkthrough {
32
27
    id: walkthrough
33
28
    objectName: "walkthroughPage"
34
29
35
30
    appName: "Music"
36
31
37
32
    onFinished: {
38
33
        walkthrough.visible = false
39
34
        pageStack.pop()
40
35
        firstRun = false
41
36
    }
42
37
43
38
    model: [
44
39
        Slide1{},
45
40
        Slide2{},
46
41
        Slide3{}
47
42
    ]
48
43
}
49
0
44
50
=== added file 'common/Walkthrough/Slide1.qml'
51
--- common/Walkthrough/Slide1.qml	1970-01-01 00:00:00 +0000
52
+++ common/Walkthrough/Slide1.qml	2015-01-20 05:33:53 +0000
53
@@ -0,0 +1,73 @@
54
1
/*
55
2
 * Copyright (C) 2014-2015
56
3
 *      Nekhelesh Ramananthan <nik90@ubuntu.com>
57
4
 *      Victor Thompson <victor.thompson@gmail.com>
58
5
 *
59
6
 * This program is free software; you can redistribute it and/or modify
60
7
 * it under the terms of the GNU General Public License as published by
61
8
 * the Free Software Foundation; version 3.
62
9
 *
63
10
 * This program is distributed in the hope that it will be useful,
64
11
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
65
12
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
66
13
 * GNU General Public License for more details.
67
14
 *
68
15
 * You should have received a copy of the GNU General Public License
69
16
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
70
17
 *
71
18
 * Upstream location:
72
19
 * https://github.com/krnekhelesh/flashback
73
20
 */
74
21
75
22
import QtQuick 2.3
76
23
import Ubuntu.Components 1.1
77
24
78
25
// Slide 1
79
26
Component {
80
27
    id: slide1
81
28
82
29
    Item {
83
30
        id: slide1Container
84
31
85
32
        UbuntuShape {
86
33
            anchors {
87
34
                top: parent.top
88
35
                topMargin: units.gu(6)
89
36
                horizontalCenter: parent.horizontalCenter
90
37
            }
91
38
            height: (parent.height - bodyText.contentHeight - introductionText.height - 4*units.gu(4))/2
92
39
            image: Image {
93
40
                id: centerImage
94
41
                source: Qt.resolvedUrl("../../images/music-app@30.png")
95
42
            }
96
43
            radius: "medium"
97
44
            width: height
98
45
        }
99
46
100
47
        Label {
101
48
            id: introductionText
102
49
            anchors {
103
50
                bottom: bodyText.top
104
51
                bottomMargin: units.gu(4)
105
52
            }
106
53
            fontSize: "x-large"
107
54
            height: contentHeight
108
55
            horizontalAlignment: Text.AlignHLeft
109
56
            text: i18n.tr("Welcome to Music")
110
57
        }
111
58
112
59
        Label {
113
60
            id: bodyText
114
61
            anchors {
115
62
                bottom: parent.bottom
116
63
                bottomMargin: units.gu(10)
117
64
            }
118
65
            fontSize: "large"
119
66
            height: contentHeight
120
67
            horizontalAlignment: Text.AlignHLeft
121
68
            text: i18n.tr("Enjoy your favorite music with Ubuntu's Music App. Take a short tour on how to get started or press skip to start listening now.")
122
69
            width: parent.width
123
70
            wrapMode: Text.WordWrap
124
71
        }
125
72
    }
126
73
}
127
0
74
128
=== added file 'common/Walkthrough/Slide2.qml'
129
--- common/Walkthrough/Slide2.qml	1970-01-01 00:00:00 +0000
130
+++ common/Walkthrough/Slide2.qml	2015-01-20 05:33:53 +0000
131
@@ -0,0 +1,67 @@
132
1
/*
133
2
 * Copyright (C) 2014-2015
134
3
 *      Nekhelesh Ramananthan <nik90@ubuntu.com>
135
4
 *      Victor Thompson <victor.thompson@gmail.com>
136
5
 *
137
6
 * This program is free software; you can redistribute it and/or modify
138
7
 * it under the terms of the GNU General Public License as published by
139
8
 * the Free Software Foundation; version 3.
140
9
 *
141
10
 * This program is distributed in the hope that it will be useful,
142
11
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
143
12
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
144
13
 * GNU General Public License for more details.
145
14
 *
146
15
 * You should have received a copy of the GNU General Public License
147
16
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
148
17
 *
149
18
 * Upstream location:
150
19
 * https://github.com/krnekhelesh/flashback
151
20
 */
152
21
153
22
import QtQuick 2.3
154
23
import Ubuntu.Components 1.1
155
24
156
25
// Walkthrough - Slide 2
157
26
Component {
158
27
    id: slide2
159
28
    Item {
160
29
        id: slide2Container
161
30
162
31
        Image {
163
32
            id: centerImage
164
33
            anchors {
165
34
                top: parent.top
166
35
                topMargin: units.gu(6)
167
36
                horizontalCenter: parent.horizontalCenter
168
37
            }
169
38
            height: (parent.height - bodyText.contentHeight - introductionText.height - 4*units.gu(4))/2
170
39
            fillMode: Image.PreserveAspectFit
171
40
            source: Qt.resolvedUrl("../../images/sd_phone_icon.png")
172
41
        }
173
42
174
43
        Label {
175
44
            id: introductionText
176
45
            anchors {
177
46
                bottom: bodyText.top
178
47
                bottomMargin: units.gu(4)
179
48
            }
180
49
            fontSize: "x-large"
181
50
            horizontalAlignment: Text.AlignHLeft
182
51
            text: i18n.tr("Import your music")
183
52
        }
184
53
185
54
        Label {
186
55
            id: bodyText
187
56
            anchors {
188
57
                bottom: parent.bottom
189
58
                bottomMargin: units.gu(10)
190
59
            }
191
60
            fontSize: "large"
192
61
            horizontalAlignment: Text.AlignHLeft
193
62
            text: i18n.tr("Plug your phone into your Ubuntu computer and drag and drop files staight across.")
194
63
            width: parent.width
195
64
            wrapMode: Text.WordWrap
196
65
        }
197
66
    }
198
67
}
199
0
68
200
=== added file 'common/Walkthrough/Slide3.qml'
201
--- common/Walkthrough/Slide3.qml	1970-01-01 00:00:00 +0000
202
+++ common/Walkthrough/Slide3.qml	2015-01-20 05:33:53 +0000
203
@@ -0,0 +1,82 @@
204
1
/*
205
2
 * Copyright (C) 2014-2015
206
3
 *      Nekhelesh Ramananthan <nik90@ubuntu.com>
207
4
 *      Victor Thompson <victor.thompson@gmail.com>
208
5
 *
209
6
 * This program is free software; you can redistribute it and/or modify
210
7
 * it under the terms of the GNU General Public License as published by
211
8
 * the Free Software Foundation; version 3.
212
9
 *
213
10
 * This program is distributed in the hope that it will be useful,
214
11
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
215
12
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
216
13
 * GNU General Public License for more details.
217
14
 *
218
15
 * You should have received a copy of the GNU General Public License
219
16
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
220
17
 *
221
18
 * Upstream location:
222
19
 * https://github.com/krnekhelesh/flashback
223
20
 */
224
21
225
22
import QtQuick 2.3
226
23
import Ubuntu.Components 1.1
227
24
228
25
// Walkthrough - Slide 7
229
26
Component {
230
27
    id: slide7
231
28
    Item {
232
29
        id: slide7Container
233
30
234
31
        Image {
235
32
            id: smileImage
236
33
            anchors {
237
34
                top: parent.top
238
35
                topMargin: units.gu(4)
239
36
                horizontalCenter: parent.horizontalCenter
240
37
            }
241
38
            height: (parent.height - introductionText.height - finalMessage.contentHeight - 4.5*units.gu(4))/2
242
39
            fillMode: Image.PreserveAspectFit
243
40
            source: Qt.resolvedUrl("../../images/music_download_icon.png")
244
41
        }
245
42
246
43
        Label {
247
44
            id: introductionText
248
45
            anchors {
249
46
                bottom: finalMessage.top
250
47
                bottomMargin: units.gu(4)
251
48
            }
252
49
            fontSize: "x-large"
253
50
            horizontalAlignment: Text.AlignHLeft
254
51
            text: i18n.tr("Download new music")
255
52
        }
256
53
257
54
        Label {
258
55
            id: finalMessage
259
56
            anchors {
260
57
                bottom: continueButton.top
261
58
                bottomMargin: units.gu(4)
262
59
            }
263
60
            fontSize: "large"
264
61
            horizontalAlignment: Text.AlignHLeft
265
62
            text: i18n.tr("Directly import music bought while browsing online.")
266
63
            width: parent.width
267
64
            wrapMode: Text.WordWrap
268
65
        }
269
66
270
67
        Button {
271
68
            id: continueButton
272
69
            anchors {
273
70
                bottom: parent.bottom
274
71
                bottomMargin: units.gu(4)
275
72
                horizontalCenter: parent.horizontalCenter
276
73
            }
277
74
            color: UbuntuColors.green
278
75
            height: units.gu(5)
279
76
            text: i18n.tr("Start")
280
77
            width: units.gu(18)
281
78
282
79
            onClicked: finished()
283
80
        }
284
81
    }
285
82
}
286
0
83
287
=== added file 'common/Walkthrough/Walkthrough.qml'
288
--- common/Walkthrough/Walkthrough.qml	1970-01-01 00:00:00 +0000
289
+++ common/Walkthrough/Walkthrough.qml	2015-01-20 05:33:53 +0000
290
@@ -0,0 +1,136 @@
291
1
/*
292
2
 * Copyright (C) 2014-2015
293
3
 *      Nekhelesh Ramananthan <nik90@ubuntu.com>
294
4
 *      Victor Thompson <victor.thompson@gmail.com>
295
5
 *
296
6
 * This program is free software; you can redistribute it and/or modify
297
7
 * it under the terms of the GNU General Public License as published by
298
8
 * the Free Software Foundation; version 3.
299
9
 *
300
10
 * This program is distributed in the hope that it will be useful,
301
11
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
302
12
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
303
13
 * GNU General Public License for more details.
304
14
 *
305
15
 * You should have received a copy of the GNU General Public License
306
16
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
307
17
 *
308
18
 * Upstream location:
309
19
 * https://github.com/krnekhelesh/flashback
310
20
 */
311
21
312
22
import QtQuick 2.3
313
23
import Ubuntu.Components 1.1
314
24
import Ubuntu.Components.ListItems 1.0 as ListItem
315
25
316
26
Page {
317
27
    id: walkthrough
318
28
319
29
    // Property to set the app name used in the walkthrough
320
30
    property string appName
321
31
322
32
    // Property to check if this is the first run or not
323
33
    property bool isFirstRun: true
324
34
325
35
    // Property to store the slides shown in the walkthrough (Each slide is a component defined in a separate file for simplicity)
326
36
    property list<Component> model
327
37
328
38
    // Property to signal walkthrough completion
329
39
    signal finished
330
40
331
41
    // ListView to show the slides
332
42
    ListView {
333
43
        id: listView
334
44
        anchors {
335
45
            left: parent.left
336
46
            right: parent.right
337
47
            top: parent.top
338
48
            bottom: slideIndicator.top
339
49
        }
340
50
341
51
        model: walkthrough.model
342
52
        snapMode: ListView.SnapOneItem
343
53
        orientation: Qt.Horizontal
344
54
        highlightMoveDuration: UbuntuAnimation.FastDuration
345
55
        highlightRangeMode: ListView.StrictlyEnforceRange
346
56
        highlightFollowsCurrentItem: true
347
57
348
58
        delegate: Item {
349
59
            width: listView.width
350
60
            height: listView.height
351
61
            clip: true
352
62
353
63
            Loader {
354
64
                anchors {
355
65
                    fill: parent
356
66
                    margins: units.gu(2)
357
67
                }
358
68
359
69
                sourceComponent: modelData
360
70
            }
361
71
        }
362
72
    }
363
73
364
74
    // Label to skip the walkthrough.
365
75
    Label {
366
76
        id: skipLabel
367
77
368
78
        color: "grey"
369
79
        fontSize: "medium"
370
80
        objectName: "skipLabel"
371
81
        width: contentWidth
372
82
        text: i18n.tr("Skip")
373
83
374
84
        anchors {
375
85
            bottom: parent.bottom
376
86
            left: parent.left
377
87
            margins: units.gu(2)
378
88
        }
379
89
380
90
        MouseArea {
381
91
            anchors.fill: parent
382
92
            onClicked: walkthrough.finished()
383
93
        }
384
94
    }
385
95
386
96
    // Indicator element to represent the current slide of the walkthrough
387
97
    Row {
388
98
        id: slideIndicator
389
99
        height: units.gu(6)
390
100
        spacing: units.gu(2)
391
101
        anchors {
392
102
            bottom: parent.bottom
393
103
            horizontalCenter: parent.horizontalCenter
394
104
        }
395
105
396
106
        Repeater {
397
107
            model: walkthrough.model.length
398
108
            delegate: Image {
399
109
                anchors.verticalCenter: parent.verticalCenter
400
110
                antialiasing: true
401
111
                height: width
402
112
                source: listView.currentIndex == index ?  "../../images/Ellipse@27.png" : "../../images/Ellipse_15_opacity@27.png"
403
113
                width: units.gu(2)
404
114
            }
405
115
        }
406
116
    }
407
117
408
118
    Icon {
409
119
        id: nextIcon
410
120
        anchors {
411
121
            bottom: parent.bottom
412
122
            right: parent.right
413
123
            margins: units.gu(2)
414
124
        }
415
125
        color: "white"
416
126
        height: units.gu(2)
417
127
        name: "chevron"
418
128
        visible: listView.currentIndex !== 2
419
129
        width: height
420
130
421
131
        MouseArea {
422
132
            anchors.fill: parent
423
133
            onClicked: listView.currentIndex++
424
134
        }
425
135
    }
426
136
}
427
0
137
428
=== added file 'images/Ellipse@27.png'
429
1
Binary files images/Ellipse@27.png	1970-01-01 00:00:00 +0000 and images/Ellipse@27.png	2015-01-20 05:33:53 +0000 differ
138
Binary files images/Ellipse@27.png	1970-01-01 00:00:00 +0000 and images/Ellipse@27.png	2015-01-20 05:33:53 +0000 differ
430
=== added file 'images/Ellipse_15_opacity@27.png'
431
2
Binary files images/Ellipse_15_opacity@27.png	1970-01-01 00:00:00 +0000 and images/Ellipse_15_opacity@27.png	2015-01-20 05:33:53 +0000 differ
139
Binary files images/Ellipse_15_opacity@27.png	1970-01-01 00:00:00 +0000 and images/Ellipse_15_opacity@27.png	2015-01-20 05:33:53 +0000 differ
432
=== added file 'images/music_download_icon@27.png'
433
3
Binary files images/music_download_icon@27.png	1970-01-01 00:00:00 +0000 and images/music_download_icon@27.png	2015-01-20 05:33:53 +0000 differ
140
Binary files images/music_download_icon@27.png	1970-01-01 00:00:00 +0000 and images/music_download_icon@27.png	2015-01-20 05:33:53 +0000 differ
434
=== added file 'images/sd_phone_icon@27.png'
435
4
Binary files images/sd_phone_icon@27.png	1970-01-01 00:00:00 +0000 and images/sd_phone_icon@27.png	2015-01-20 05:33:53 +0000 differ
141
Binary files images/sd_phone_icon@27.png	1970-01-01 00:00:00 +0000 and images/sd_phone_icon@27.png	2015-01-20 05:33:53 +0000 differ
436
=== modified file 'music-app.qml'
437
--- music-app.qml	2015-01-18 18:57:12 +0000
438
+++ music-app.qml	2015-01-20 05:33:53 +0000
439
@@ -46,6 +46,7 @@
440
46
        id: startupSettings
46
        id: startupSettings
441
47
        category: "StartupSettings"
47
        category: "StartupSettings"
442
48
48
443
49
        property bool firstRun: true
444
49
        property int queueIndex: 0
50
        property int queueIndex: 0
445
50
        property int tabIndex: -1
51
        property int tabIndex: -1
446
51
    }
52
    }
447
@@ -540,7 +541,6 @@
448
540
    // Run on startup
541
    // Run on startup
449
541
    Component.onCompleted: {
542
    Component.onCompleted: {
450
542
        customdebug("Version "+appVersion) // print the curren version
543
        customdebug("Version "+appVersion) // print the curren version
451
543
        customdebug("Arguments on startup: Debug: "+args.values.debug)
452
544
544
453
545
        Library.createRecent()  // initialize recent
545
        Library.createRecent()  // initialize recent
454
546
546
455
@@ -569,6 +569,13 @@
456
569
        // Run post load
569
        // Run post load
457
570
        tabs.ensurePopulated(tabs.selectedTab);
570
        tabs.ensurePopulated(tabs.selectedTab);
458
571
571
459
572
        // Display walkthrough on first run, even if the user has music
460
573
        if (firstRun) {
461
574
            var comp = Qt.createComponent("common/Walkthrough/FirstRunWalkthrough.qml")
462
575
            var walkthrough = comp.createObject(mainPageStack, {});
463
576
            mainPageStack.push(walkthrough)
464
577
        }
465
578
466
572
        if (args.values.url) {
579
        if (args.values.url) {
467
573
            uriHandler.process(args.values.url, true);
580
            uriHandler.process(args.values.url, true);
468
574
        }
581
        }
469
@@ -583,6 +590,7 @@
470
583
    property string appVersion: '2.0'
590
    property string appVersion: '2.0'
471
584
    property bool toolbarShown: musicToolbar.visible
591
    property bool toolbarShown: musicToolbar.visible
472
585
    property bool selectedAlbum: false
592
    property bool selectedAlbum: false
473
593
    property alias firstRun: startupSettings.firstRun
474
586
    property alias queueIndex: startupSettings.queueIndex
594
    property alias queueIndex: startupSettings.queueIndex
475
587
595
476
588
    signal listItemSwiping(int i)
596
    signal listItemSwiping(int i)
477
@@ -1051,7 +1059,8 @@
478
1051
    MusicToolbar {
1059
    MusicToolbar {
479
1052
        id: musicToolbar
1060
        id: musicToolbar
480
1053
        visible: mainPageStack.currentPage.title !== i18n.tr("Now playing") &&
1061
        visible: mainPageStack.currentPage.title !== i18n.tr("Now playing") &&
482
1054
                 mainPageStack.currentPage.title !== i18n.tr("Queue")
1062
                 mainPageStack.currentPage.title !== i18n.tr("Queue") &&
483
1063
                 !firstRun
484
1055
        objectName: "musicToolbarObject"
1064
        objectName: "musicToolbarObject"
485
1056
        z: 200  // put on top of everything else
1065
        z: 200  // put on top of everything else
486
1057
    }
1066
    }
487
@@ -1246,7 +1255,7 @@
488
1246
    Page {
1255
    Page {
489
1247
        id: emptyPage
1256
        id: emptyPage
490
1248
        title: i18n.tr("Music")
1257
        title: i18n.tr("Music")
492
1249
        visible: noMusic || noPlaylists || noRecent
1258
        visible: (noMusic || noPlaylists || noRecent) && !firstRun
493
1250
1259
494
1251
        property bool noMusic: allSongsModel.rowCount === 0 && allSongsModelModel.status === SongsModel.Ready && loadedUI
1260
        property bool noMusic: allSongsModel.rowCount === 0 && allSongsModelModel.status === SongsModel.Ready && loadedUI
495
1252
        property bool noPlaylists: playlistModel.model.count === 0 && playlistModel.workerComplete && mainPageStack.currentPage.title !== i18n.tr("Now playing") && mainPageStack.currentPage.title !== i18n.tr("Queue")
1261
        property bool noPlaylists: playlistModel.model.count === 0 && playlistModel.workerComplete && mainPageStack.currentPage.title !== i18n.tr("Now playing") && mainPageStack.currentPage.title !== i18n.tr("Queue")
496
1253
1262
497
=== modified file 'po/com.ubuntu.music.pot'
498
--- po/com.ubuntu.music.pot	2015-01-16 22:54:07 +0000
499
+++ po/com.ubuntu.music.pot	2015-01-20 05:33:53 +0000
500
@@ -8,7 +8,7 @@
501
8
msgstr ""
8
msgstr ""
502
9
"Project-Id-Version: music-app\n"
9
"Project-Id-Version: music-app\n"
503
10
"Report-Msgid-Bugs-To: \n"
10
"Report-Msgid-Bugs-To: \n"
505
11
"POT-Creation-Date: 2015-01-16 16:52-0600\n"
11
"POT-Creation-Date: 2015-01-18 17:32-0600\n"
506
12
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
12
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
507
13
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
13
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
508
14
"Language-Team: LANGUAGE <LL@li.org>\n"
14
"Language-Team: LANGUAGE <LL@li.org>\n"
509
@@ -22,18 +22,18 @@
510
22
msgid "Albums"
22
msgid "Albums"
511
23
msgstr ""
23
msgstr ""
512
24
24
515
25
#: ../MusicAlbums.qml:68 ../MusicStart.qml:78 ../common/AlbumsPage.qml:142
25
#: ../MusicAlbums.qml:68 ../MusicStart.qml:78 ../common/AlbumsPage.qml:148
516
26
#: ../common/AlbumsPage.qml:156 ../common/SongsPage.qml:352
26
#: ../common/AlbumsPage.qml:162 ../common/SongsPage.qml:373
517
27
msgid "Unknown Album"
27
msgid "Unknown Album"
518
28
msgstr ""
28
msgstr ""
519
29
29
520
30
#: ../MusicAlbums.qml:69 ../MusicArtists.qml:76 ../MusicStart.qml:79
30
#: ../MusicAlbums.qml:69 ../MusicArtists.qml:76 ../MusicStart.qml:79
523
31
#: ../common/AlbumsPage.qml:103 ../common/AlbumsPage.qml:155
31
#: ../common/AlbumsPage.qml:104 ../common/AlbumsPage.qml:161
524
32
#: ../common/SongsPage.qml:373
32
#: ../common/SongsPage.qml:394
525
33
msgid "Unknown Artist"
33
msgid "Unknown Artist"
526
34
msgstr ""
34
msgstr ""
527
35
35
529
36
#: ../MusicAlbums.qml:80 ../MusicStart.qml:95 ../common/AlbumsPage.qml:154
36
#: ../MusicAlbums.qml:80 ../MusicStart.qml:95 ../common/AlbumsPage.qml:160
530
37
msgid "Album"
37
msgid "Album"
531
38
msgstr ""
38
msgstr ""
532
39
39
533
@@ -49,26 +49,26 @@
534
49
msgid "Genres"
49
msgid "Genres"
535
50
msgstr ""
50
msgstr ""
536
51
51
541
52
#: ../MusicGenres.qml:107 ../MusicGenres.qml:109 ../common/SongsPage.qml:291
52
#: ../MusicGenres.qml:107 ../MusicGenres.qml:109 ../common/SongsPage.qml:312
542
53
#: ../common/SongsPage.qml:325 ../common/SongsPage.qml:339
53
#: ../common/SongsPage.qml:346 ../common/SongsPage.qml:360
543
54
#: ../common/SongsPage.qml:375 ../common/SongsPage.qml:394
54
#: ../common/SongsPage.qml:396 ../common/SongsPage.qml:415
544
55
#: ../common/SongsPage.qml:426
55
#: ../common/SongsPage.qml:447
545
56
msgid "Genre"
56
msgid "Genre"
546
57
msgstr ""
57
msgstr ""
547
58
58
551
59
#: ../MusicNowPlaying.qml:35 ../music-app.qml:656 ../music-app.qml:688
59
#: ../MusicNowPlaying.qml:35 ../music-app.qml:667 ../music-app.qml:699
552
60
#: ../music-app.qml:1047 ../music-app.qml:1059 ../music-app.qml:1087
60
#: ../music-app.qml:1062 ../music-app.qml:1220 ../music-app.qml:1232
553
61
#: ../music-app.qml:1088
61
#: ../music-app.qml:1260 ../music-app.qml:1261
554
62
msgid "Queue"
62
msgid "Queue"
555
63
msgstr ""
63
msgstr ""
556
64
64
559
65
#: ../MusicNowPlaying.qml:35 ../music-app.qml:656 ../music-app.qml:889
65
#: ../MusicNowPlaying.qml:35 ../music-app.qml:667 ../music-app.qml:1061
560
66
#: ../music-app.qml:1046 ../music-app.qml:1087 ../music-app.qml:1088
66
#: ../music-app.qml:1219 ../music-app.qml:1260 ../music-app.qml:1261
561
67
msgid "Now playing"
67
msgid "Now playing"
562
68
msgstr ""
68
msgstr ""
563
69
69
564
70
#: ../MusicNowPlaying.qml:90 ../MusicNowPlaying.qml:150 ../MusicTracks.qml:74
70
#: ../MusicNowPlaying.qml:90 ../MusicNowPlaying.qml:150 ../MusicTracks.qml:74
566
71
#: ../common/ListItemActions/AddToPlaylist.qml:26 ../common/SongsPage.qml:153
71
#: ../common/ListItemActions/AddToPlaylist.qml:26 ../common/SongsPage.qml:169
567
72
msgid "Add to playlist"
72
msgid "Add to playlist"
568
73
msgstr ""
73
msgstr ""
569
74
74
570
@@ -77,28 +77,28 @@
571
77
msgstr ""
77
msgstr ""
572
78
78
573
79
#: ../MusicNowPlaying.qml:128 ../MusicTracks.qml:51
79
#: ../MusicNowPlaying.qml:128 ../MusicTracks.qml:51
575
80
#: ../common/SongsPage.qml:131
80
#: ../common/SongsPage.qml:147
576
81
msgid "Cancel selection"
81
msgid "Cancel selection"
577
82
msgstr ""
82
msgstr ""
578
83
83
579
84
#: ../MusicNowPlaying.qml:137 ../MusicTracks.qml:62
84
#: ../MusicNowPlaying.qml:137 ../MusicTracks.qml:62
581
85
#: ../common/SongsPage.qml:141
85
#: ../common/SongsPage.qml:157
582
86
msgid "Select All"
86
msgid "Select All"
583
87
msgstr ""
87
msgstr ""
584
88
88
586
89
#: ../MusicNowPlaying.qml:173 ../common/SongsPage.qml:188
89
#: ../MusicNowPlaying.qml:173 ../common/SongsPage.qml:204
587
90
msgid "Delete"
90
msgid "Delete"
588
91
msgstr ""
91
msgstr ""
589
92
92
590
93
#. TRANSLATORS: this is the name of the playlists page shown in the tab header.
93
#. TRANSLATORS: this is the name of the playlists page shown in the tab header.
591
94
#. Remember to keep the translation short to fit the screen width
94
#. Remember to keep the translation short to fit the screen width
592
95
#: ../MusicPlaylists.qml:35 ../MusicaddtoPlaylist.qml:114
95
#: ../MusicPlaylists.qml:35 ../MusicaddtoPlaylist.qml:114
594
96
#: ../common/SongsPage.qml:69
96
#: ../common/SongsPage.qml:85
595
97
msgid "Playlists"
97
msgid "Playlists"
596
98
msgstr ""
98
msgstr ""
597
99
99
598
100
#: ../MusicPlaylists.qml:96 ../MusicaddtoPlaylist.qml:104
100
#: ../MusicPlaylists.qml:96 ../MusicaddtoPlaylist.qml:104
600
101
#: ../common/SongsPage.qml:395 ../common/SongsPage.qml:396
101
#: ../common/SongsPage.qml:416 ../common/SongsPage.qml:417
601
102
#, qt-format
102
#, qt-format
602
103
msgid "%1 song"
103
msgid "%1 song"
603
104
msgid_plural "%1 songs"
104
msgid_plural "%1 songs"
604
@@ -106,20 +106,20 @@
605
106
msgstr[1] ""
106
msgstr[1] ""
606
107
107
607
108
#: ../MusicPlaylists.qml:109 ../MusicPlaylists.qml:110 ../MusicStart.qml:79
108
#: ../MusicPlaylists.qml:109 ../MusicPlaylists.qml:110 ../MusicStart.qml:79
613
109
#: ../MusicStart.qml:95 ../common/SongsPage.qml:89 ../common/SongsPage.qml:189
109
#: ../MusicStart.qml:95 ../common/SongsPage.qml:64 ../common/SongsPage.qml:105
614
110
#: ../common/SongsPage.qml:293 ../common/SongsPage.qml:327
110
#: ../common/SongsPage.qml:205 ../common/SongsPage.qml:314
615
111
#: ../common/SongsPage.qml:338 ../common/SongsPage.qml:374
111
#: ../common/SongsPage.qml:348 ../common/SongsPage.qml:359
616
112
#: ../common/SongsPage.qml:410 ../common/SongsPage.qml:413
112
#: ../common/SongsPage.qml:395 ../common/SongsPage.qml:431
617
113
#: ../common/SongsPage.qml:428
113
#: ../common/SongsPage.qml:434 ../common/SongsPage.qml:449
618
114
msgid "Playlist"
114
msgid "Playlist"
619
115
msgstr ""
115
msgstr ""
620
116
116
621
117
#: ../MusicStart.qml:34 ../MusicaddtoPlaylist.qml:122
117
#: ../MusicStart.qml:34 ../MusicaddtoPlaylist.qml:122
623
118
#: ../common/SongsPage.qml:79
118
#: ../common/SongsPage.qml:95
624
119
msgid "Recent"
119
msgid "Recent"
625
120
msgstr ""
120
msgstr ""
626
121
121
628
122
#: ../MusicToolbar.qml:128
122
#: ../MusicToolbar.qml:155
629
123
msgid "Tap to shuffle music"
123
msgid "Tap to shuffle music"
630
124
msgstr ""
124
msgstr ""
631
125
125
632
@@ -127,27 +127,27 @@
633
127
msgid "Songs"
127
msgid "Songs"
634
128
msgstr ""
128
msgstr ""
635
129
129
637
130
#: ../MusicTracks.qml:97 ../common/SongsPage.qml:176
130
#: ../MusicTracks.qml:97 ../common/SongsPage.qml:192
638
131
msgid "Add to queue"
131
msgid "Add to queue"
639
132
msgstr ""
132
msgstr ""
640
133
133
642
134
#: ../MusicaddtoPlaylist.qml:42 ../music-app.qml:1143
134
#: ../MusicaddtoPlaylist.qml:42 ../music-app.qml:1316
643
135
msgid "Select playlist"
135
msgid "Select playlist"
644
136
msgstr ""
136
msgstr ""
645
137
137
647
138
#: ../common/AlbumsPage.qml:62 ../common/SongsPage.qml:286
138
#: ../common/AlbumsPage.qml:63 ../common/SongsPage.qml:307
648
139
msgid "Shuffle"
139
msgid "Shuffle"
649
140
msgstr ""
140
msgstr ""
650
141
141
652
142
#: ../common/AlbumsPage.qml:76 ../common/SongsPage.qml:312
142
#: ../common/AlbumsPage.qml:77 ../common/SongsPage.qml:333
653
143
msgid "Queue all"
143
msgid "Queue all"
654
144
msgstr ""
144
msgstr ""
655
145
145
657
146
#: ../common/AlbumsPage.qml:84 ../common/SongsPage.qml:320
146
#: ../common/AlbumsPage.qml:85 ../common/SongsPage.qml:341
658
147
msgid "Play all"
147
msgid "Play all"
659
148
msgstr ""
148
msgstr ""
660
149
149
662
150
#: ../common/AlbumsPage.qml:122
150
#: ../common/AlbumsPage.qml:123
663
151
#, qt-format
151
#, qt-format
664
152
msgid "%1 album"
152
msgid "%1 album"
665
153
msgid_plural "%1 albums"
153
msgid_plural "%1 albums"
666
@@ -158,7 +158,7 @@
667
158
msgid "Add to Queue"
158
msgid "Add to Queue"
668
159
msgstr ""
159
msgstr ""
669
160
160
671
161
#: ../common/ListItemActions/Remove.qml:27 ../common/SongsPage.qml:564
161
#: ../common/ListItemActions/Remove.qml:27 ../common/SongsPage.qml:586
672
162
msgid "Remove"
162
msgid "Remove"
673
163
msgstr ""
163
msgstr ""
674
164
164
675
@@ -175,166 +175,202 @@
676
175
msgstr ""
175
msgstr ""
677
176
176
678
177
#. TRANSLATORS: this is a title of a dialog with a prompt to rename a playlist
177
#. TRANSLATORS: this is a title of a dialog with a prompt to rename a playlist
680
178
#: ../common/SongsPage.qml:498
178
#: ../common/SongsPage.qml:521
681
179
msgid "Rename playlist"
179
msgid "Rename playlist"
682
180
msgstr ""
180
msgstr ""
683
181
181
685
182
#: ../common/SongsPage.qml:505 ../music-app.qml:843
182
#: ../common/SongsPage.qml:528 ../music-app.qml:1015
686
183
msgid "Enter playlist name"
183
msgid "Enter playlist name"
687
184
msgstr ""
184
msgstr ""
688
185
185
690
186
#: ../common/SongsPage.qml:515
186
#: ../common/SongsPage.qml:537
691
187
msgid "Change"
187
msgid "Change"
692
188
msgstr ""
188
msgstr ""
693
189
189
695
190
#: ../common/SongsPage.qml:536 ../music-app.qml:869
190
#: ../common/SongsPage.qml:558 ../music-app.qml:1041
696
191
msgid "Playlist already exists"
191
msgid "Playlist already exists"
697
192
msgstr ""
192
msgstr ""
698
193
193
700
194
#: ../common/SongsPage.qml:540 ../music-app.qml:874
194
#: ../common/SongsPage.qml:562 ../music-app.qml:1046
701
195
msgid "Please type in a name."
195
msgid "Please type in a name."
702
196
msgstr ""
196
msgstr ""
703
197
197
706
198
#: ../common/SongsPage.qml:545 ../common/SongsPage.qml:583
198
#: ../common/SongsPage.qml:567 ../common/SongsPage.qml:605
707
199
#: ../music-app.qml:481 ../music-app.qml:880
199
#: ../music-app.qml:486 ../music-app.qml:1052
708
200
msgid "Cancel"
200
msgid "Cancel"
709
201
msgstr ""
201
msgstr ""
710
202
202
711
203
#. TRANSLATORS: this is a title of a dialog with a prompt to delete a playlist
203
#. TRANSLATORS: this is a title of a dialog with a prompt to delete a playlist
713
204
#: ../common/SongsPage.qml:558
204
#: ../common/SongsPage.qml:580
714
205
msgid "Permanently delete playlist?"
205
msgid "Permanently delete playlist?"
715
206
msgstr ""
206
msgstr ""
716
207
207
718
208
#: ../common/SongsPage.qml:559
208
#: ../common/SongsPage.qml:581
719
209
msgid "This cannot be undone"
209
msgid "This cannot be undone"
720
210
msgstr ""
210
msgstr ""
721
211
211
723
212
#: ../music-app.qml:145
212
#: ../common/Walkthrough/Slide1.qml:61
724
213
msgid "Welcome to Music"
725
214
msgstr ""
726
215
727
216
#: ../common/Walkthrough/Slide1.qml:73
728
217
msgid ""
729
218
"Enjoy your favorite music with Ubuntu's Music App. Take a short tour on how "
730
219
"to get started or press skip to start listening now."
731
220
msgstr ""
732
221
733
222
#: ../common/Walkthrough/Slide2.qml:56
734
223
msgid "Import your music"
735
224
msgstr ""
736
225
737
226
#: ../common/Walkthrough/Slide2.qml:67
738
227
msgid ""
739
228
"Plug your phone into your Ubuntu computer and drag and drop files staight "
740
229
"across."
741
230
msgstr ""
742
231
743
232
#: ../common/Walkthrough/Slide3.qml:57
744
233
msgid "Download new music"
745
234
msgstr ""
746
235
747
236
#: ../common/Walkthrough/Slide3.qml:68
748
237
msgid "Directly import music bought while browsing online."
749
238
msgstr ""
750
239
751
240
#: ../common/Walkthrough/Slide3.qml:82
752
241
msgid "Start"
753
242
msgstr ""
754
243
755
244
#: ../common/Walkthrough/Walkthrough.qml:81
756
245
msgid "Skip"
757
246
msgstr ""
758
247
759
248
#: ../music-app.qml:147
760
213
msgid "Next"
249
msgid "Next"
761
214
msgstr ""
250
msgstr ""
762
215
251
764
216
#: ../music-app.qml:146
252
#: ../music-app.qml:148
765
217
msgid "Next Track"
253
msgid "Next Track"
766
218
msgstr ""
254
msgstr ""
767
219
255
769
220
#: ../music-app.qml:152
256
#: ../music-app.qml:154
770
221
msgid "Pause"
257
msgid "Pause"
771
222
msgstr ""
258
msgstr ""
772
223
259
774
224
#: ../music-app.qml:152
260
#: ../music-app.qml:154
775
225
msgid "Play"
261
msgid "Play"
776
226
msgstr ""
262
msgstr ""
777
227
263
779
228
#: ../music-app.qml:154
264
#: ../music-app.qml:156
780
229
msgid "Pause Playback"
265
msgid "Pause Playback"
781
230
msgstr ""
266
msgstr ""
782
231
267
784
232
#: ../music-app.qml:154
268
#: ../music-app.qml:156
785
233
msgid "Continue or start playback"
269
msgid "Continue or start playback"
786
234
msgstr ""
270
msgstr ""
787
235
271
789
236
#: ../music-app.qml:159
272
#: ../music-app.qml:161
790
237
msgid "Back"
273
msgid "Back"
791
238
msgstr ""
274
msgstr ""
792
239
275
794
240
#: ../music-app.qml:160
276
#: ../music-app.qml:162
795
241
msgid "Go back to last page"
277
msgid "Go back to last page"
796
242
msgstr ""
278
msgstr ""
797
243
279
799
244
#: ../music-app.qml:168
280
#: ../music-app.qml:170
800
245
msgid "Previous"
281
msgid "Previous"
801
246
msgstr ""
282
msgstr ""
802
247
283
804
248
#: ../music-app.qml:169
284
#: ../music-app.qml:171
805
249
msgid "Previous Track"
285
msgid "Previous Track"
806
250
msgstr ""
286
msgstr ""
807
251
287
809
252
#: ../music-app.qml:174
288
#: ../music-app.qml:176
810
253
msgid "Stop"
289
msgid "Stop"
811
254
msgstr ""
290
msgstr ""
812
255
291
814
256
#: ../music-app.qml:175
292
#: ../music-app.qml:177
815
257
msgid "Stop Playback"
293
msgid "Stop Playback"
816
258
msgstr ""
294
msgstr ""
817
259
295
818
260
#. TRANSLATORS: This string represents that the target destination filepath does not start with ~/Music/Imported/
296
#. TRANSLATORS: This string represents that the target destination filepath does not start with ~/Music/Imported/
820
261
#: ../music-app.qml:324
297
#: ../music-app.qml:329
821
262
msgid "Filepath must start with"
298
msgid "Filepath must start with"
822
263
msgstr ""
299
msgstr ""
823
264
300
824
265
#. TRANSLATORS: This string represents that a blank filepath destination has been used
301
#. TRANSLATORS: This string represents that a blank filepath destination has been used
826
266
#: ../music-app.qml:350
302
#: ../music-app.qml:355
827
267
msgid "Filepath must be a file"
303
msgid "Filepath must be a file"
828
268
msgstr ""
304
msgstr ""
829
269
305
830
270
#. TRANSLATORS: This string represents that there was failure moving the file to the target destination
306
#. TRANSLATORS: This string represents that there was failure moving the file to the target destination
832
271
#: ../music-app.qml:356
307
#: ../music-app.qml:361
833
272
msgid "Failed to move file"
308
msgid "Failed to move file"
834
273
msgstr ""
309
msgstr ""
835
274
310
837
275
#: ../music-app.qml:435
311
#: ../music-app.qml:440
838
276
msgid "Waiting for file(s)..."
312
msgid "Waiting for file(s)..."
839
277
msgstr ""
313
msgstr ""
840
278
314
842
279
#: ../music-app.qml:454
315
#: ../music-app.qml:459
843
280
msgid "OK"
316
msgid "OK"
844
281
msgstr ""
317
msgstr ""
845
282
318
847
283
#: ../music-app.qml:467
319
#: ../music-app.qml:472
848
284
msgid "Imported file not found"
320
msgid "Imported file not found"
849
285
msgstr ""
321
msgstr ""
850
286
322
852
287
#: ../music-app.qml:471
323
#: ../music-app.qml:476
853
288
msgid "Wait"
324
msgid "Wait"
854
289
msgstr ""
325
msgstr ""
855
290
326
856
291
#. TRANSLATORS: this refers to a number of songs greater than one. The actual number will be prepended to the string automatically (plural forms are not yet fully supported in usermetrics, the library that displays that string)
327
#. TRANSLATORS: this refers to a number of songs greater than one. The actual number will be prepended to the string automatically (plural forms are not yet fully supported in usermetrics, the library that displays that string)
858
292
#: ../music-app.qml:492
328
#: ../music-app.qml:497
859
293
msgid "songs played today"
329
msgid "songs played today"
860
294
msgstr ""
330
msgstr ""
861
295
331
863
296
#: ../music-app.qml:493
332
#: ../music-app.qml:498
864
297
msgid "No songs played today"
333
msgid "No songs played today"
865
298
msgstr ""
334
msgstr ""
866
299
335
868
300
#: ../music-app.qml:579 ../music-app.qml:1083
336
#: ../music-app.qml:589 ../music-app.qml:1256
869
301
#: com.ubuntu.music_music.desktop.in.in.h:1
337
#: com.ubuntu.music_music.desktop.in.in.h:1
870
302
msgid "Music"
338
msgid "Music"
871
303
msgstr ""
339
msgstr ""
872
304
340
874
305
#: ../music-app.qml:597
341
#: ../music-app.qml:608
875
306
msgid "Debug: "
342
msgid "Debug: "
876
307
msgstr ""
343
msgstr ""
877
308
344
879
309
#: ../music-app.qml:839
345
#: ../music-app.qml:1011
880
310
msgid "New playlist"
346
msgid "New playlist"
881
311
msgstr ""
347
msgstr ""
882
312
348
884
313
#: ../music-app.qml:853
349
#: ../music-app.qml:1025
885
314
msgid "Create"
350
msgid "Create"
886
315
msgstr ""
351
msgstr ""
887
316
352
889
317
#: ../music-app.qml:1117
353
#: ../music-app.qml:1290
890
318
msgid "No music found"
354
msgid "No music found"
891
319
msgstr ""
355
msgstr ""
892
320
356
894
321
#: ../music-app.qml:1128
357
#: ../music-app.qml:1301
895
322
msgid "Please import music"
358
msgid "Please import music"
896
323
msgstr ""
359
msgstr ""
897
324
360
899
325
#: ../music-app.qml:1157
361
#: ../music-app.qml:1330
900
326
msgid "No playlists found"
362
msgid "No playlists found"
901
327
msgstr ""
363
msgstr ""
902
328
364
904
329
#: ../music-app.qml:1168
365
#: ../music-app.qml:1341
905
330
msgid "Click the + to create a playlist"
366
msgid "Click the + to create a playlist"
906
331
msgstr ""
367
msgstr ""
907
332
368
909
333
#: ../music-app.qml:1197
369
#: ../music-app.qml:1370
910
334
msgid "No recent albums or playlists found"
370
msgid "No recent albums or playlists found"
911
335
msgstr ""
371
msgstr ""
912
336
372
914
337
#: ../music-app.qml:1208
373
#: ../music-app.qml:1381
915
338
msgid "Play some music to see your favorites"
374
msgid "Play some music to see your favorites"
916
339
msgstr ""
375
msgstr ""
917
340
376
918
341
377
919
=== modified file 'tests/autopilot/music_app/__init__.py'
920
--- tests/autopilot/music_app/__init__.py	2015-01-10 15:53:24 +0000
921
+++ tests/autopilot/music_app/__init__.py	2015-01-20 05:33:53 +0000
922
@@ -107,6 +107,10 @@
923
107
        return self.main_view.wait_select_single(
107
        return self.main_view.wait_select_single(
924
108
            MusicPage, objectName='tracksPage')
108
            MusicPage, objectName='tracksPage')
925
109
109
926
110
    def get_walkthrough_page(self):
927
111
        return self.main_view.wait_select_single(Walkthrough,
928
112
                                                 objectName="walkthroughPage")
929
113
930
110
    @property
114
    @property
931
111
    def loaded(self):
115
    def loaded(self):
932
112
        return (not self.main_view.select_single("ActivityIndicator",
116
        return (not self.main_view.select_single("ActivityIndicator",
933
@@ -137,6 +141,18 @@
934
137
        self.main_view = self.get_root_instance().select_single(MainView)
141
        self.main_view = self.get_root_instance().select_single(MainView)
935
138
142
936
139
143
937
144
class Walkthrough(Page):
938
145
    """ Autopilot helper for the walkthrough page """
939
146
    def __init__(self, *args):
940
147
        super(Walkthrough, self).__init__(*args)
941
148
942
149
        self.visible.wait_for(True)
943
150
944
151
    @click_object
945
152
    def skip(self):
946
153
        return self.wait_select_single("Label", objectName="skipLabel")
947
154
948
155
949
140
class MusicAlbums():
156
class MusicAlbums():
950
141
    """ Autopilot helper for the albums page """
157
    """ Autopilot helper for the albums page """
951
142
    def __init__(self, *args):
158
    def __init__(self, *args):
952
143
159
953
=== modified file 'tests/autopilot/music_app/tests/test_music.py'
954
--- tests/autopilot/music_app/tests/test_music.py	2014-11-07 23:08:29 +0000
955
+++ tests/autopilot/music_app/tests/test_music.py	2015-01-20 05:33:53 +0000
956
@@ -1,5 +1,5 @@
957
1
# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
1
# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
959
2
# Copyright 2013, 2014 Canonical
2
# Copyright 2013, 2014, 2015 Canonical
960
3
#
3
#
961
4
# This program is free software: you can redistribute it and/or modify it
4
# This program is free software: you can redistribute it and/or modify it
962
5
# under the terms of the GNU General Public License version 3, as published
5
# under the terms of the GNU General Public License version 3, as published
963
@@ -47,6 +47,9 @@
964
47
            }
47
            }
965
48
        ]
48
        ]
966
49
49
967
50
        # Skip the walkthrough for every test
968
51
        self.app.get_walkthrough_page().skip()
969
52
970
50
    @property
53
    @property
971
51
    def player(self):
54
    def player(self):
972
52
        return self.app.player
55
        return self.app.player
Reviewer	Review Type	Date Requested	Status
Andrew Hayzen		2014-10-22	Approve on 2015-01-20
Ubuntu Phone Apps Jenkins Bot	continuous-integration		Approve on 2015-01-20
Review via email: mp+239293@code.launchpad.net