Merge lp:~vthompson/music-app/fix-1290492-music into lp:music-app/trusty

[Victor Thompson]

* Fix po.pro file for desktop filename change
* Update translation strings

* Fix po.pro file for desktop filename change
* Update translation strings

[lp:~vthompson/music-app/fix-1290492-music]

377. By Victor Thompson on 2014-03-10

Update header info in pot file

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

PASSED: Continuous integration, rev:376
http://91.189.93.70:8080/job/music-app-ci/639/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-trusty/1680
    SUCCESS: http://91.189.93.70:8080/job/music-app-raring-amd64-ci/639
    SUCCESS: http://91.189.93.70:8080/job/music-app-saucy-amd64-ci/641
    SUCCESS: http://91.189.93.70:8080/job/music-app-trusty-amd64-ci/360

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

review: Approve (continuous-integration)

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

PASSED: Continuous integration, rev:377
http://91.189.93.70:8080/job/music-app-ci/640/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-trusty/1682
    SUCCESS: http://91.189.93.70:8080/job/music-app-raring-amd64-ci/640
    SUCCESS: http://91.189.93.70:8080/job/music-app-saucy-amd64-ci/642
    SUCCESS: http://91.189.93.70:8080/job/music-app-trusty-amd64-ci/361

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

review: Approve (continuous-integration)

[David Planella (dpm)]

Looks good to me, thanks for updating translations!

Just two notes:

1) Migration to cmake

As the rest of the build processes have moved to cmake, I'd recommend to move the .pot file creation to cmake too, so that we don't end up using two build systems. This is not necessary for this merge proposal, so I'd suggest doing it in a separate one.

This involves:
- Converting the po/po.pro file to a CMakeLists.txt file
- Updating the README.translations file to reflect the new process

The detailed changes can be seen in the merge proposal for this same purpose on Weather [1]

2) Desktop file name as a variable

453 -DESKTOPFILE = ../$${PROJECTNAME}.desktop
454 +DESKTOPFILE = ../com.ubuntu.music_music.desktop.in

461 -DESKTOPFILETEMP = $${BUILDDIR}/$${PROJECTNAME}.desktop.js
462 +DESKTOPFILETEMP = $${BUILDDIR}/com.ubuntu.music_music.desktop.in

Rather than hardcoding com.ubuntu.music_music twice, I'd suggest to put it in a variable, in the same way it's done with the Weather app [2]. I'm not sure PROJECTNAME can be redefined in qmake in the way it's done in cmake, though, but since we're moving to cmake, I'll just add this as a comment and accept the merge proposal anyway

[1] https://code.launchpad.net/~dpm/ubuntu-weather-app/fix-cmake-i18n/+merge/206374
[2] http://bazaar.launchpad.net/~ubuntu-weather-dev/ubuntu-weather-app/trunk/view/head:/CMakeLists.txt#L11

review: Approve

=== modified file 'po/music-app.pot'
--- po/music-app.pot	2014-01-07 13:36:50 +0000
+++ po/music-app.pot	2014-03-10 23:52:00 +0000
@@ -1,5 +1,5 @@
 # Music App Translations
-# Copyright (C) 2013 Canonical Ltd. 
+# Copyright (C) 2014 Canonical Ltd. 
 # This file is distributed under the same license as the music-app package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 #
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: music-app\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-01-07 07:34-0600\n"
+"POT-Creation-Date: 2014-03-10 18:38-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[e-mail]>\n"
@@ -18,156 +18,147 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
 
-#: ../LoginLastFM.qml:41 ../MusicSettings.qml:145 ../MusicSettings.qml:153
+#: ../LoginLastFM.qml:50 ../MusicSettings.qml:145 ../MusicSettings.qml:153
 msgid "Last.fm"
 msgstr ""
 
-#: ../LoginLastFM.qml:47
+#: ../LoginLastFM.qml:56
 msgid "Login to be able to scrobble."
 msgstr ""
 
-#: ../LoginLastFM.qml:55
+#: ../LoginLastFM.qml:64
 msgid "Username"
 msgstr ""
 
-#: ../LoginLastFM.qml:65
+#: ../LoginLastFM.qml:74
 msgid "Password"
 msgstr ""
 
-#: ../LoginLastFM.qml:87
+#: ../LoginLastFM.qml:96
 msgid "Login"
 msgstr ""
 
-#: ../LoginLastFM.qml:94
+#: ../LoginLastFM.qml:103
 msgid "Trying to login..."
 msgstr ""
 
-#: ../LoginLastFM.qml:108
+#: ../LoginLastFM.qml:117
 msgid "Login Successful"
 msgstr ""
 
-#: ../LoginLastFM.qml:114
+#: ../LoginLastFM.qml:123
 msgid "Login Failed"
 msgstr ""
 
-#: ../LoginLastFM.qml:120
+#: ../LoginLastFM.qml:129
 msgid "You forgot to set your username and/or password"
 msgstr ""
 
-#: ../MusicAlbums.qml:33 ../music-app.qml:1124
+#: ../MusicAlbums.qml:33
 msgid "Albums"
 msgstr ""
 
-#: ../MusicAlbums.qml:231
-#, qt-format
-msgid " | %1 song"
-msgid_plural " | %1 songs"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../MusicAlbums.qml:379 ../MusicArtists.qml:429 ../MusicNowPlaying.qml:696
-#: ../MusicTracks.qml:267 ../music-app.qml:995
-msgid "Add to playlist"
-msgstr ""
-
-#: ../MusicAlbums.qml:398 ../MusicArtists.qml:448 ../MusicNowPlaying.qml:714
-#: ../MusicTracks.qml:286 ../MusicaddtoPlaylist.qml:38 ../music-app.qml:1006
-msgid "Select playlist"
-msgstr ""
-
-#: ../MusicAlbums.qml:427 ../MusicArtists.qml:476 ../MusicTracks.qml:315
-#: ../music-app.qml:981
-msgid "Add to queue"
-msgstr ""
-
-#: ../MusicArtists.qml:39 ../music-app.qml:1107
+#: ../MusicArtists.qml:33
 msgid "Artists"
 msgstr ""
 
-#: ../MusicArtists.qml:148
+#: ../MusicArtists.qml:106
 #, qt-format
 msgid "%1 album"
 msgid_plural "%1 albums"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../MusicArtists.qml:163 ../MusicArtists.qml:239 ../MusicPlaylists.qml:235
-#: ../MusicPlaylists.qml:569 ../MusicStart.qml:302
+#: ../MusicArtists.qml:122 ../MusicPlaylists.qml:175 ../MusicStart.qml:304
+#: ../common/SongsSheet.qml:127
 #, qt-format
 msgid "%1 song"
 msgid_plural "%1 songs"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../MusicArtists.qml:190
-msgid "Tracks"
-msgstr ""
-
 #: ../MusicNowPlaying.qml:34
 msgid "Queue"
 msgstr ""
 
+#: ../MusicNowPlaying.qml:701 ../MusicSearch.qml:346 ../MusicTracks.qml:270
+#: ../music-app.qml:858 ../common/SongsSheet.qml:330
+msgid "Add to playlist"
+msgstr ""
+
+#: ../MusicNowPlaying.qml:719 ../MusicSearch.qml:365 ../MusicTracks.qml:289
+#: ../MusicaddtoPlaylist.qml:38 ../music-app.qml:869
+#: ../common/SongsSheet.qml:349
+msgid "Select playlist"
+msgstr ""
+
 #. TRANSLATORS: this refers to sharing a playlist
-#: ../MusicNowPlaying.qml:742 ../MusicPlaylists.qml:429
-#: ../MusicPlaylists.qml:714 ../MusicTracks.qml:353
+#: ../MusicNowPlaying.qml:747 ../MusicPlaylists.qml:370 ../MusicSearch.qml:432
+#: ../MusicTracks.qml:356
 msgid "Share"
 msgstr ""
 
-#. TRANSLATORS: this is a title of a dialog with a prompt to delete a playlist
-#: ../MusicPlaylists.qml:48
-msgid "Are you sure?"
-msgstr ""
-
-#: ../MusicPlaylists.qml:49
-msgid "This will delete your playlist."
-msgstr ""
-
-#: ../MusicPlaylists.qml:52
-msgid "Remove"
-msgstr ""
-
-#: ../MusicPlaylists.qml:65 ../MusicPlaylists.qml:108 ../music-app.qml:1059
-msgid "Cancel"
+#. TRANSLATORS: this is the name of the playlists page shown in the tab header.
+#. Remember to keep the translation short to fit the screen width
+#: ../MusicPlaylists.qml:37
+msgid "Playlists"
 msgstr ""
 
 #. TRANSLATORS: this is a title of a dialog with a prompt to rename a playlist
-#: ../MusicPlaylists.qml:78
+#: ../MusicPlaylists.qml:58
 msgid "Change name"
 msgstr ""
 
-#: ../MusicPlaylists.qml:79
+#: ../MusicPlaylists.qml:59
 msgid "Enter the new name of the playlist."
 msgstr ""
 
-#: ../MusicPlaylists.qml:90
+#: ../MusicPlaylists.qml:70
 msgid "Change"
 msgstr ""
 
-#: ../MusicPlaylists.qml:103
+#: ../MusicPlaylists.qml:83
 msgid "You didn't type in a name."
 msgstr ""
 
-#. TRANSLATORS: this is the name of the playlists page shown in the tab header.
-#. Remember to keep the translation short to fit the screen width
-#: ../MusicPlaylists.qml:136 ../music-app.qml:1159
-msgid "Playlists"
+#: ../MusicPlaylists.qml:88 ../MusicPlaylists.qml:114 ../music-app.qml:922
+msgid "Cancel"
+msgstr ""
+
+#. TRANSLATORS: this is a title of a dialog with a prompt to delete a playlist
+#: ../MusicPlaylists.qml:101
+msgid "Are you sure?"
+msgstr ""
+
+#: ../MusicPlaylists.qml:102
+msgid "This will delete your playlist."
+msgstr ""
+
+#: ../MusicPlaylists.qml:105
+msgid "Remove"
 msgstr ""
 
 #. TRANSLATORS: this refers to editing a playlist
-#: ../MusicPlaylists.qml:343 ../MusicPlaylists.qml:638
+#: ../MusicPlaylists.qml:284
 msgid "Edit"
 msgstr ""
 
 #. TRANSLATORS: this refers to deleting a playlist
-#: ../MusicPlaylists.qml:385 ../MusicPlaylists.qml:675
+#: ../MusicPlaylists.qml:326
 msgid "Delete"
 msgstr ""
 
-#: ../MusicPlaylists.qml:471
-msgid "Playlist"
-msgstr ""
-
-#: ../MusicSettings.qml:30 ../music-app.qml:104
+#: ../MusicSearch.qml:41 ../MusicToolbar.qml:897 ../music-app.qml:89
+#: ../music-app.qml:137 ../music-app.qml:141
+msgid "Search"
+msgstr ""
+
+#: ../MusicSearch.qml:394 ../MusicTracks.qml:318 ../music-app.qml:844
+#: ../common/SongsSheet.qml:378
+msgid "Add to queue"
+msgstr ""
+
+#: ../MusicSettings.qml:30 ../music-app.qml:183
 msgid "Settings"
 msgstr ""
 
@@ -253,147 +244,154 @@
 msgid "Clean everything!"
 msgstr ""
 
-#: ../MusicStart.qml:32 ../MusicTracks.qml:32 ../music-app.qml:231
-#: ../music-app.qml:1090 ../.build/music-app.desktop.js:1
+#: ../MusicStart.qml:33 ../music-app.qml:336 ../music-app.qml:943
+#: ../.build/com.ubuntu.music_music.desktop.in:1
 msgid "Music"
 msgstr ""
 
-#: ../MusicStart.qml:43
+#: ../MusicStart.qml:63
 msgid "Recent"
 msgstr ""
 
-#: ../MusicStart.qml:60
+#: ../MusicStart.qml:80
 msgid "No recent albums or playlists"
 msgstr ""
 
-#: ../MusicStart.qml:202
+#: ../MusicStart.qml:209
 msgid "Genres"
 msgstr ""
 
-#: ../MusicToolbar.qml:292
+#: ../MusicToolbar.qml:322
 msgid "No songs queued"
 msgstr ""
 
-#: ../MusicToolbar.qml:302
+#: ../MusicToolbar.qml:332
 msgid "Tap on a song to start playing"
 msgstr ""
 
-#: ../MusicaddtoPlaylist.qml:164
+#: ../MusicTracks.qml:32
+msgid "Songs"
+msgstr ""
+
+#: ../MusicaddtoPlaylist.qml:125
 msgid "New playlist"
 msgstr ""
 
-#: ../music-app.qml:66
+#: ../music-app.qml:138
+msgid "Search Track"
+msgstr ""
+
+#: ../music-app.qml:146
 msgid "Next"
 msgstr ""
 
-#: ../music-app.qml:67
+#: ../music-app.qml:147
 msgid "Next Track"
 msgstr ""
 
-#: ../music-app.qml:73
+#: ../music-app.qml:153
 msgid "Pause"
 msgstr ""
 
-#: ../music-app.qml:73
+#: ../music-app.qml:153
 msgid "Play"
 msgstr ""
 
-#: ../music-app.qml:75
+#: ../music-app.qml:155
 msgid "Pause Playback"
 msgstr ""
 
-#: ../music-app.qml:75
+#: ../music-app.qml:155
 msgid "Continue or start playback"
 msgstr ""
 
-#: ../music-app.qml:86
+#: ../music-app.qml:160
+msgid "Back"
+msgstr ""
+
+#: ../music-app.qml:161
+msgid "Go back to last page"
+msgstr ""
+
+#: ../music-app.qml:169
 msgid "Previous"
 msgstr ""
 
-#: ../music-app.qml:87
+#: ../music-app.qml:170
 msgid "Previous Track"
 msgstr ""
 
-#: ../music-app.qml:92
+#: ../music-app.qml:175
 msgid "Stop"
 msgstr ""
 
-#: ../music-app.qml:93
+#: ../music-app.qml:176
 msgid "Stop Playback"
 msgstr ""
 
-#: ../music-app.qml:98
-msgid "Back"
-msgstr ""
-
-#: ../music-app.qml:99
-msgid "Go back to last page"
-msgstr ""
-
-#: ../music-app.qml:105
+#: ../music-app.qml:184
 msgid "Music Settings"
 msgstr ""
 
-#: ../music-app.qml:113
-msgid "Quit"
-msgstr ""
-
-#: ../music-app.qml:114
-msgid "Close application"
-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:171
+#: ../music-app.qml:244
 msgid "songs played today"
 msgstr ""
 
-#: ../music-app.qml:172
+#: ../music-app.qml:245
 msgid "No songs played today"
 msgstr ""
 
-#: ../music-app.qml:278
+#: ../music-app.qml:369
 msgid "Debug: "
 msgstr ""
 
-#: ../music-app.qml:758 ../meta-database.js:371
+#: ../music-app.qml:656 ../meta-database.js:431
 msgid "Unknown Artist"
 msgstr ""
 
-#: ../music-app.qml:759 ../meta-database.js:370 ../meta-database.js:373
+#: ../music-app.qml:657 ../meta-database.js:430 ../meta-database.js:433
 msgid "Unknown Album"
 msgstr ""
 
-#: ../music-app.qml:766
+#: ../music-app.qml:663
+msgid "Unknown Year"
+msgstr ""
+
+#: ../music-app.qml:664
 msgid "Unknown Genre"
 msgstr ""
 
-#: ../music-app.qml:1019
+#: ../music-app.qml:882
 msgid "New Playlist"
 msgstr ""
 
-#: ../music-app.qml:1020
+#: ../music-app.qml:883
 msgid "Name your playlist."
 msgstr ""
 
-#: ../music-app.qml:1024
+#: ../music-app.qml:887
 msgid "Name"
 msgstr ""
 
-#: ../music-app.qml:1032
+#: ../music-app.qml:895
 msgid "Create"
 msgstr ""
 
-#: ../music-app.qml:1048
+#: ../music-app.qml:911
 msgid "Error: "
 msgstr ""
 
-#: ../music-app.qml:1053
+#: ../music-app.qml:916
 msgid "Error: You didn't type a name."
 msgstr ""
 
-#: ../music-app.qml:1141
-msgid "Songs"
-msgstr ""
+#: ../common/AlbumsSheet.qml:128 ../common/SongsSheet.qml:126
+#, qt-format
+msgid " | %1 song"
+msgid_plural " | %1 songs"
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../common/LoadingSpinnerComponent.qml:44
 msgid "Loading..."

=== modified file 'po/po.pro'
--- po/po.pro	2013-09-28 06:04:29 +0000
+++ po/po.pro	2014-03-10 23:52:00 +0000
@@ -10,14 +10,14 @@
 PROJECTNAME = $$system(basename ../*.qmlproject)
 PROJECTNAME = $$replace(PROJECTNAME,.qmlproject,)
 
-DESKTOPFILE = ../$${PROJECTNAME}.desktop
+DESKTOPFILE = ../com.ubuntu.music_music.desktop.in
 
 SOURCECODE = ../*.qml \
              ../*.js \
              ../common/*.qml
 
 BUILDDIR = ../.build
-DESKTOPFILETEMP = $${BUILDDIR}/$${PROJECTNAME}.desktop.js
+DESKTOPFILETEMP = $${BUILDDIR}/com.ubuntu.music_music.desktop.in
 
 message("")
 message(" Project Name: $$PROJECTNAME ")