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

[Andrew Hayzen]

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

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

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

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)

[Victor Thompson (vthompson)]

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]

799. By Andrew Hayzen on 2015-01-20

* Further tweaks :)

[Victor Thompson (vthompson)]

LGTM!

review: Approve

=== 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 @@
 add_subdirectory(ListItemActions)
+add_subdirectory(Walkthrough)
 
 # make the qml files visible on qtcreator
 file(GLOB COMMON_QML_FILES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.qml)

=== 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 @@
+# make the qml files visible on qtcreator
+file(GLOB WALKTHROUGH_QML_FILES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.qml)
+
+add_custom_target(com_ubuntu_music_WALKTHROUGH_QMLFiles ALL SOURCES ${WALKTHROUGH_QML_FILES})

=== 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 @@
             }
             fontSize: "large"
             horizontalAlignment: Text.AlignHLeft
-            text: i18n.tr("Plug your phone into your Ubuntu computer and drag and drop files staight across.")
+            text: i18n.tr("Connect your device to any computer and simply drag files to the Music folder.")
             width: parent.width
             wrapMode: Text.WordWrap
         }

=== 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 @@
 msgstr ""
 "Project-Id-Version: music-app\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-01-18 17:32-0600\n"
+"POT-Creation-Date: 2015-01-20 23:05+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[e-mail]>\n"
@@ -57,13 +57,13 @@
 msgstr ""
 
 #: ../MusicNowPlaying.qml:35 ../music-app.qml:667 ../music-app.qml:699
-#: ../music-app.qml:1062 ../music-app.qml:1220 ../music-app.qml:1232
-#: ../music-app.qml:1260 ../music-app.qml:1261
+#: ../music-app.qml:1062 ../music-app.qml:1221 ../music-app.qml:1233
+#: ../music-app.qml:1261 ../music-app.qml:1262
 msgid "Queue"
 msgstr ""
 
 #: ../MusicNowPlaying.qml:35 ../music-app.qml:667 ../music-app.qml:1061
-#: ../music-app.qml:1219 ../music-app.qml:1260 ../music-app.qml:1261
+#: ../music-app.qml:1220 ../music-app.qml:1261 ../music-app.qml:1262
 msgid "Now playing"
 msgstr ""
 
@@ -131,7 +131,7 @@
 msgid "Add to queue"
 msgstr ""
 
-#: ../MusicaddtoPlaylist.qml:42 ../music-app.qml:1316
+#: ../MusicaddtoPlaylist.qml:42 ../music-app.qml:1317
 msgid "Select playlist"
 msgstr ""
 
@@ -196,7 +196,7 @@
 msgstr ""
 
 #: ../common/SongsPage.qml:567 ../common/SongsPage.qml:605
-#: ../music-app.qml:486 ../music-app.qml:1052
+#: ../music-app.qml:485 ../music-app.qml:1052
 msgid "Cancel"
 msgstr ""
 
@@ -209,131 +209,131 @@
 msgid "This cannot be undone"
 msgstr ""
 
-#: ../common/Walkthrough/Slide1.qml:61
+#: ../common/Walkthrough/Slide1.qml:56
 msgid "Welcome to Music"
 msgstr ""
 
-#: ../common/Walkthrough/Slide1.qml:73
+#: ../common/Walkthrough/Slide1.qml:68
 msgid ""
 "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."
 msgstr ""
 
-#: ../common/Walkthrough/Slide2.qml:56
+#: ../common/Walkthrough/Slide2.qml:51
 msgid "Import your music"
 msgstr ""
 
-#: ../common/Walkthrough/Slide2.qml:67
+#: ../common/Walkthrough/Slide2.qml:62
 msgid ""
-"Plug your phone into your Ubuntu computer and drag and drop files staight "
-"across."
+"Connect your device to any computer and simply drag files to the Music "
+"folder."
 msgstr ""
 
-#: ../common/Walkthrough/Slide3.qml:57
+#: ../common/Walkthrough/Slide3.qml:51
 msgid "Download new music"
 msgstr ""
 
-#: ../common/Walkthrough/Slide3.qml:68
+#: ../common/Walkthrough/Slide3.qml:62
 msgid "Directly import music bought while browsing online."
 msgstr ""
 
-#: ../common/Walkthrough/Slide3.qml:82
+#: ../common/Walkthrough/Slide3.qml:76
 msgid "Start"
 msgstr ""
 
-#: ../common/Walkthrough/Walkthrough.qml:81
+#: ../common/Walkthrough/Walkthrough.qml:82
 msgid "Skip"
 msgstr ""
 
+#: ../music-app.qml:146
+msgid "Next"
+msgstr ""
+
 #: ../music-app.qml:147
-msgid "Next"
-msgstr ""
-
-#: ../music-app.qml:148
 msgid "Next Track"
 msgstr ""
 
-#: ../music-app.qml:154
+#: ../music-app.qml:153
 msgid "Pause"
 msgstr ""
 
-#: ../music-app.qml:154
+#: ../music-app.qml:153
 msgid "Play"
 msgstr ""
 
-#: ../music-app.qml:156
+#: ../music-app.qml:155
 msgid "Pause Playback"
 msgstr ""
 
-#: ../music-app.qml:156
+#: ../music-app.qml:155
 msgid "Continue or start playback"
 msgstr ""
 
+#: ../music-app.qml:160
+msgid "Back"
+msgstr ""
+
 #: ../music-app.qml:161
-msgid "Back"
-msgstr ""
-
-#: ../music-app.qml:162
 msgid "Go back to last page"
 msgstr ""
 
+#: ../music-app.qml:169
+msgid "Previous"
+msgstr ""
+
 #: ../music-app.qml:170
-msgid "Previous"
-msgstr ""
-
-#: ../music-app.qml:171
 msgid "Previous Track"
 msgstr ""
 
+#: ../music-app.qml:175
+msgid "Stop"
+msgstr ""
+
 #: ../music-app.qml:176
-msgid "Stop"
-msgstr ""
-
-#: ../music-app.qml:177
 msgid "Stop Playback"
 msgstr ""
 
 #. TRANSLATORS: This string represents that the target destination filepath does not start with ~/Music/Imported/
-#: ../music-app.qml:329
+#: ../music-app.qml:328
 msgid "Filepath must start with"
 msgstr ""
 
 #. TRANSLATORS: This string represents that a blank filepath destination has been used
-#: ../music-app.qml:355
+#: ../music-app.qml:354
 msgid "Filepath must be a file"
 msgstr ""
 
 #. TRANSLATORS: This string represents that there was failure moving the file to the target destination
-#: ../music-app.qml:361
+#: ../music-app.qml:360
 msgid "Failed to move file"
 msgstr ""
 
-#: ../music-app.qml:440
+#: ../music-app.qml:439
 msgid "Waiting for file(s)..."
 msgstr ""
 
-#: ../music-app.qml:459
+#: ../music-app.qml:458
 msgid "OK"
 msgstr ""
 
-#: ../music-app.qml:472
+#: ../music-app.qml:471
 msgid "Imported file not found"
 msgstr ""
 
-#: ../music-app.qml:476
+#: ../music-app.qml:475
 msgid "Wait"
 msgstr ""
 
 #. 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)
+#: ../music-app.qml:496
+msgid "songs played today"
+msgstr ""
+
 #: ../music-app.qml:497
-msgid "songs played today"
-msgstr ""
-
-#: ../music-app.qml:498
 msgid "No songs played today"
 msgstr ""
 
-#: ../music-app.qml:589 ../music-app.qml:1256
+#: ../music-app.qml:589 ../music-app.qml:1257
 #: com.ubuntu.music_music.desktop.in.in.h:1
 msgid "Music"
 msgstr ""
@@ -350,27 +350,27 @@
 msgid "Create"
 msgstr ""
 
-#: ../music-app.qml:1290
+#: ../music-app.qml:1291
 msgid "No music found"
 msgstr ""
 
-#: ../music-app.qml:1301
+#: ../music-app.qml:1302
 msgid "Please import music"
 msgstr ""
 
-#: ../music-app.qml:1330
+#: ../music-app.qml:1331
 msgid "No playlists found"
 msgstr ""
 
-#: ../music-app.qml:1341
+#: ../music-app.qml:1342
 msgid "Click the + to create a playlist"
 msgstr ""
 
-#: ../music-app.qml:1370
+#: ../music-app.qml:1371
 msgid "No recent albums or playlists found"
 msgstr ""
 
-#: ../music-app.qml:1381
+#: ../music-app.qml:1382
 msgid "Play some music to see your favorites"
 msgstr ""