Ubuntu Music App

Merge lp:~ahayzen/music-app/type-walkthrough into lp:music-app/remix

  1. type-walkthrough
  2. Merge into remix
Proposed by Andrew Hayzen
Status: Merged
Approved by: Victor Thompson
Approved revision: 799
Merged at revision: 797
Proposed branch: lp:~ahayzen/music-app/type-walkthrough
Merge into: lp:music-app/remix
Diff against target: 286 lines (+60/-55)
4 files modified
common/CMakeLists.txt (+1/-0)
common/Walkthrough/CMakeLists.txt (+4/-0)
common/Walkthrough/Slide2.qml (+1/-1)
po/com.ubuntu.music.pot (+54/-54)
To merge this branch: bzr merge lp:~ahayzen/music-app/type-walkthrough
Reviewer Review Type Date Requested Status
Victor Thompson Approve
Ubuntu Phone Apps Jenkins Bot continuous-integration Approve
Review via email: mp+247057@code.launchpad.net

Commit message

* Fix for typo change 'and' to '&' to prevent double 'and' in one sentence
* Add cmake so that Walkthrough appears in qtc

Description of the change

* Fix for typo change 'and' to '&' to prevent double 'and' in one sentence
* Add cmake so that Walkthrough appears in qtc

To post a comment you must log in.
Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :

PASSED: Continuous integration, rev:798
http://91.189.93.70:8080/job/music-app-ci/1243/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-vivid/755
        deb: http://91.189.93.70:8080/job/generic-mediumtests-vivid/755/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/music-app-vivid-amd64-ci/95

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/music-app-ci/1243/rebuild

review: Approve (continuous-integration)
Revision history for this message
Victor Thompson (vthompson) wrote :

1 inline comment:

Maybe we should get design to rephrase this. Something like "Connect your device to any computer and simply drag files to the Music folder". Should probably use the word device instead of phone as well. Also should tell them where to drag files.

review: Needs Information
lp:~ahayzen/music-app/type-walkthrough updated
799. By Andrew Hayzen

* Further tweaks :)

Revision history for this message
Victor Thompson (vthompson) wrote :

LGTM!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'common/CMakeLists.txt'
--- common/CMakeLists.txt 2014-07-31 23:24:17 +0000
+++ common/CMakeLists.txt 2015-01-20 23:06:24 +0000
@@ -1,4 +1,5 @@
1add_subdirectory(ListItemActions)1add_subdirectory(ListItemActions)
2add_subdirectory(Walkthrough)
23
3# make the qml files visible on qtcreator4# make the qml files visible on qtcreator
4file(GLOB COMMON_QML_FILES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.qml)5file(GLOB COMMON_QML_FILES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.qml)
56
=== added file 'common/Walkthrough/CMakeLists.txt'
--- common/Walkthrough/CMakeLists.txt 1970-01-01 00:00:00 +0000
+++ common/Walkthrough/CMakeLists.txt 2015-01-20 23:06:24 +0000
@@ -0,0 +1,4 @@
1# make the qml files visible on qtcreator
2file(GLOB WALKTHROUGH_QML_FILES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.qml)
3
4add_custom_target(com_ubuntu_music_WALKTHROUGH_QMLFiles ALL SOURCES ${WALKTHROUGH_QML_FILES})
05
=== modified file 'common/Walkthrough/Slide2.qml'
--- common/Walkthrough/Slide2.qml 2015-01-20 05:05:57 +0000
+++ common/Walkthrough/Slide2.qml 2015-01-20 23:06:24 +0000
@@ -59,7 +59,7 @@
59 }59 }
60 fontSize: "large"60 fontSize: "large"
61 horizontalAlignment: Text.AlignHLeft61 horizontalAlignment: Text.AlignHLeft
62 text: i18n.tr("Plug your phone into your Ubuntu computer and drag and drop files staight across.")62 text: i18n.tr("Connect your device to any computer and simply drag files to the Music folder.")
63 width: parent.width63 width: parent.width
64 wrapMode: Text.WordWrap64 wrapMode: Text.WordWrap
65 }65 }
6666
=== modified file 'po/com.ubuntu.music.pot'
--- po/com.ubuntu.music.pot 2015-01-18 23:33:26 +0000
+++ po/com.ubuntu.music.pot 2015-01-20 23:06:24 +0000
@@ -8,7 +8,7 @@
8msgstr ""8msgstr ""
9"Project-Id-Version: music-app\n"9"Project-Id-Version: music-app\n"
10"Report-Msgid-Bugs-To: \n"10"Report-Msgid-Bugs-To: \n"
11"POT-Creation-Date: 2015-01-18 17:32-0600\n"11"POT-Creation-Date: 2015-01-20 23:05+0000\n"
12"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"12"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
13"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"13"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
14"Language-Team: LANGUAGE <LL@li.org>\n"14"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -57,13 +57,13 @@
57msgstr ""57msgstr ""
5858
59#: ../MusicNowPlaying.qml:35 ../music-app.qml:667 ../music-app.qml:69959#: ../MusicNowPlaying.qml:35 ../music-app.qml:667 ../music-app.qml:699
60#: ../music-app.qml:1062 ../music-app.qml:1220 ../music-app.qml:123260#: ../music-app.qml:1062 ../music-app.qml:1221 ../music-app.qml:1233
61#: ../music-app.qml:1260 ../music-app.qml:126161#: ../music-app.qml:1261 ../music-app.qml:1262
62msgid "Queue"62msgid "Queue"
63msgstr ""63msgstr ""
6464
65#: ../MusicNowPlaying.qml:35 ../music-app.qml:667 ../music-app.qml:106165#: ../MusicNowPlaying.qml:35 ../music-app.qml:667 ../music-app.qml:1061
66#: ../music-app.qml:1219 ../music-app.qml:1260 ../music-app.qml:126166#: ../music-app.qml:1220 ../music-app.qml:1261 ../music-app.qml:1262
67msgid "Now playing"67msgid "Now playing"
68msgstr ""68msgstr ""
6969
@@ -131,7 +131,7 @@
131msgid "Add to queue"131msgid "Add to queue"
132msgstr ""132msgstr ""
133133
134#: ../MusicaddtoPlaylist.qml:42 ../music-app.qml:1316134#: ../MusicaddtoPlaylist.qml:42 ../music-app.qml:1317
135msgid "Select playlist"135msgid "Select playlist"
136msgstr ""136msgstr ""
137137
@@ -196,7 +196,7 @@
196msgstr ""196msgstr ""
197197
198#: ../common/SongsPage.qml:567 ../common/SongsPage.qml:605198#: ../common/SongsPage.qml:567 ../common/SongsPage.qml:605
199#: ../music-app.qml:486 ../music-app.qml:1052199#: ../music-app.qml:485 ../music-app.qml:1052
200msgid "Cancel"200msgid "Cancel"
201msgstr ""201msgstr ""
202202
@@ -209,131 +209,131 @@
209msgid "This cannot be undone"209msgid "This cannot be undone"
210msgstr ""210msgstr ""
211211
212#: ../common/Walkthrough/Slide1.qml:61212#: ../common/Walkthrough/Slide1.qml:56
213msgid "Welcome to Music"213msgid "Welcome to Music"
214msgstr ""214msgstr ""
215215
216#: ../common/Walkthrough/Slide1.qml:73216#: ../common/Walkthrough/Slide1.qml:68
217msgid ""217msgid ""
218"Enjoy your favorite music with Ubuntu's Music App. Take a short tour on how "218"Enjoy your favorite music with Ubuntu's Music App. Take a short tour on how "
219"to get started or press skip to start listening now."219"to get started or press skip to start listening now."
220msgstr ""220msgstr ""
221221
222#: ../common/Walkthrough/Slide2.qml:56222#: ../common/Walkthrough/Slide2.qml:51
223msgid "Import your music"223msgid "Import your music"
224msgstr ""224msgstr ""
225225
226#: ../common/Walkthrough/Slide2.qml:67226#: ../common/Walkthrough/Slide2.qml:62
227msgid ""227msgid ""
228"Plug your phone into your Ubuntu computer and drag and drop files staight "228"Connect your device to any computer and simply drag files to the Music "
229"across."229"folder."
230msgstr ""230msgstr ""
231231
232#: ../common/Walkthrough/Slide3.qml:57232#: ../common/Walkthrough/Slide3.qml:51
233msgid "Download new music"233msgid "Download new music"
234msgstr ""234msgstr ""
235235
236#: ../common/Walkthrough/Slide3.qml:68236#: ../common/Walkthrough/Slide3.qml:62
237msgid "Directly import music bought while browsing online."237msgid "Directly import music bought while browsing online."
238msgstr ""238msgstr ""
239239
240#: ../common/Walkthrough/Slide3.qml:82240#: ../common/Walkthrough/Slide3.qml:76
241msgid "Start"241msgid "Start"
242msgstr ""242msgstr ""
243243
244#: ../common/Walkthrough/Walkthrough.qml:81244#: ../common/Walkthrough/Walkthrough.qml:82
245msgid "Skip"245msgid "Skip"
246msgstr ""246msgstr ""
247247
248#: ../music-app.qml:146
249msgid "Next"
250msgstr ""
251
248#: ../music-app.qml:147252#: ../music-app.qml:147
249msgid "Next"
250msgstr ""
251
252#: ../music-app.qml:148
253msgid "Next Track"253msgid "Next Track"
254msgstr ""254msgstr ""
255255
256#: ../music-app.qml:154256#: ../music-app.qml:153
257msgid "Pause"257msgid "Pause"
258msgstr ""258msgstr ""
259259
260#: ../music-app.qml:154260#: ../music-app.qml:153
261msgid "Play"261msgid "Play"
262msgstr ""262msgstr ""
263263
264#: ../music-app.qml:156264#: ../music-app.qml:155
265msgid "Pause Playback"265msgid "Pause Playback"
266msgstr ""266msgstr ""
267267
268#: ../music-app.qml:156268#: ../music-app.qml:155
269msgid "Continue or start playback"269msgid "Continue or start playback"
270msgstr ""270msgstr ""
271271
272#: ../music-app.qml:160
273msgid "Back"
274msgstr ""
275
272#: ../music-app.qml:161276#: ../music-app.qml:161
273msgid "Back"
274msgstr ""
275
276#: ../music-app.qml:162
277msgid "Go back to last page"277msgid "Go back to last page"
278msgstr ""278msgstr ""
279279
280#: ../music-app.qml:169
281msgid "Previous"
282msgstr ""
283
280#: ../music-app.qml:170284#: ../music-app.qml:170
281msgid "Previous"
282msgstr ""
283
284#: ../music-app.qml:171
285msgid "Previous Track"285msgid "Previous Track"
286msgstr ""286msgstr ""
287287
288#: ../music-app.qml:175
289msgid "Stop"
290msgstr ""
291
288#: ../music-app.qml:176292#: ../music-app.qml:176
289msgid "Stop"
290msgstr ""
291
292#: ../music-app.qml:177
293msgid "Stop Playback"293msgid "Stop Playback"
294msgstr ""294msgstr ""
295295
296#. 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/
297#: ../music-app.qml:329297#: ../music-app.qml:328
298msgid "Filepath must start with"298msgid "Filepath must start with"
299msgstr ""299msgstr ""
300300
301#. TRANSLATORS: This string represents that a blank filepath destination has been used301#. TRANSLATORS: This string represents that a blank filepath destination has been used
302#: ../music-app.qml:355302#: ../music-app.qml:354
303msgid "Filepath must be a file"303msgid "Filepath must be a file"
304msgstr ""304msgstr ""
305305
306#. TRANSLATORS: This string represents that there was failure moving the file to the target destination306#. TRANSLATORS: This string represents that there was failure moving the file to the target destination
307#: ../music-app.qml:361307#: ../music-app.qml:360
308msgid "Failed to move file"308msgid "Failed to move file"
309msgstr ""309msgstr ""
310310
311#: ../music-app.qml:440311#: ../music-app.qml:439
312msgid "Waiting for file(s)..."312msgid "Waiting for file(s)..."
313msgstr ""313msgstr ""
314314
315#: ../music-app.qml:459315#: ../music-app.qml:458
316msgid "OK"316msgid "OK"
317msgstr ""317msgstr ""
318318
319#: ../music-app.qml:472319#: ../music-app.qml:471
320msgid "Imported file not found"320msgid "Imported file not found"
321msgstr ""321msgstr ""
322322
323#: ../music-app.qml:476323#: ../music-app.qml:475
324msgid "Wait"324msgid "Wait"
325msgstr ""325msgstr ""
326326
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)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)
328#: ../music-app.qml:496
329msgid "songs played today"
330msgstr ""
331
328#: ../music-app.qml:497332#: ../music-app.qml:497
329msgid "songs played today"
330msgstr ""
331
332#: ../music-app.qml:498
333msgid "No songs played today"333msgid "No songs played today"
334msgstr ""334msgstr ""
335335
336#: ../music-app.qml:589 ../music-app.qml:1256336#: ../music-app.qml:589 ../music-app.qml:1257
337#: com.ubuntu.music_music.desktop.in.in.h:1337#: com.ubuntu.music_music.desktop.in.in.h:1
338msgid "Music"338msgid "Music"
339msgstr ""339msgstr ""
@@ -350,27 +350,27 @@
350msgid "Create"350msgid "Create"
351msgstr ""351msgstr ""
352352
353#: ../music-app.qml:1290353#: ../music-app.qml:1291
354msgid "No music found"354msgid "No music found"
355msgstr ""355msgstr ""
356356
357#: ../music-app.qml:1301357#: ../music-app.qml:1302
358msgid "Please import music"358msgid "Please import music"
359msgstr ""359msgstr ""
360360
361#: ../music-app.qml:1330361#: ../music-app.qml:1331
362msgid "No playlists found"362msgid "No playlists found"
363msgstr ""363msgstr ""
364364
365#: ../music-app.qml:1341365#: ../music-app.qml:1342
366msgid "Click the + to create a playlist"366msgid "Click the + to create a playlist"
367msgstr ""367msgstr ""
368368
369#: ../music-app.qml:1370369#: ../music-app.qml:1371
370msgid "No recent albums or playlists found"370msgid "No recent albums or playlists found"
371msgstr ""371msgstr ""
372372
373#: ../music-app.qml:1381373#: ../music-app.qml:1382
374msgid "Play some music to see your favorites"374msgid "Play some music to see your favorites"
375msgstr ""375msgstr ""
376376

Subscribers

People subscribed via source and target branches