Ubuntu Music App

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

  1. fix-1290492-music
  2. Merge into trusty
Proposed by Victor Thompson
Status: Merged
Approved by: David Planella
Approved revision: 377
Merged at revision: 376
Proposed branch: lp:~vthompson/music-app/fix-1290492-music
Merge into: lp:music-app/trusty
Diff against target: 465 lines (+124/-126)
2 files modified
po/music-app.pot (+122/-124)
po/po.pro (+2/-2)
To merge this branch: bzr merge lp:~vthompson/music-app/fix-1290492-music
Reviewer Review Type Date Requested Status
David Planella Approve
Ubuntu Phone Apps Jenkins Bot continuous-integration Approve
Review via email: mp+210316@code.launchpad.net

Commit message

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

Description of the change

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

To post a comment you must log in.
lp:~vthompson/music-app/fix-1290492-music updated
377. By Victor Thompson

Update header info in pot file

Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :

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)
Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :

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)
Revision history for this message
David Planella (dpm) wrote :

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

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== 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 @@
1# Music App Translations1# Music App Translations
2# Copyright (C) 2013 Canonical Ltd. 2# Copyright (C) 2014 Canonical Ltd.
3# This file is distributed under the same license as the music-app package.3# This file is distributed under the same license as the music-app package.
4# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.4# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
5#5#
@@ -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: 2014-01-07 07:34-0600\n"11"POT-Creation-Date: 2014-03-10 18:38-0500\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"
@@ -18,156 +18,147 @@
18"Content-Transfer-Encoding: 8bit\n"18"Content-Transfer-Encoding: 8bit\n"
19"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"19"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
2020
21#: ../LoginLastFM.qml:41 ../MusicSettings.qml:145 ../MusicSettings.qml:15321#: ../LoginLastFM.qml:50 ../MusicSettings.qml:145 ../MusicSettings.qml:153
22msgid "Last.fm"22msgid "Last.fm"
23msgstr ""23msgstr ""
2424
25#: ../LoginLastFM.qml:4725#: ../LoginLastFM.qml:56
26msgid "Login to be able to scrobble."26msgid "Login to be able to scrobble."
27msgstr ""27msgstr ""
2828
29#: ../LoginLastFM.qml:5529#: ../LoginLastFM.qml:64
30msgid "Username"30msgid "Username"
31msgstr ""31msgstr ""
3232
33#: ../LoginLastFM.qml:6533#: ../LoginLastFM.qml:74
34msgid "Password"34msgid "Password"
35msgstr ""35msgstr ""
3636
37#: ../LoginLastFM.qml:8737#: ../LoginLastFM.qml:96
38msgid "Login"38msgid "Login"
39msgstr ""39msgstr ""
4040
41#: ../LoginLastFM.qml:9441#: ../LoginLastFM.qml:103
42msgid "Trying to login..."42msgid "Trying to login..."
43msgstr ""43msgstr ""
4444
45#: ../LoginLastFM.qml:10845#: ../LoginLastFM.qml:117
46msgid "Login Successful"46msgid "Login Successful"
47msgstr ""47msgstr ""
4848
49#: ../LoginLastFM.qml:11449#: ../LoginLastFM.qml:123
50msgid "Login Failed"50msgid "Login Failed"
51msgstr ""51msgstr ""
5252
53#: ../LoginLastFM.qml:12053#: ../LoginLastFM.qml:129
54msgid "You forgot to set your username and/or password"54msgid "You forgot to set your username and/or password"
55msgstr ""55msgstr ""
5656
57#: ../MusicAlbums.qml:33 ../music-app.qml:112457#: ../MusicAlbums.qml:33
58msgid "Albums"58msgid "Albums"
59msgstr ""59msgstr ""
6060
61#: ../MusicAlbums.qml:23161#: ../MusicArtists.qml:33
62#, qt-format
63msgid " | %1 song"
64msgid_plural " | %1 songs"
65msgstr[0] ""
66msgstr[1] ""
67
68#: ../MusicAlbums.qml:379 ../MusicArtists.qml:429 ../MusicNowPlaying.qml:696
69#: ../MusicTracks.qml:267 ../music-app.qml:995
70msgid "Add to playlist"
71msgstr ""
72
73#: ../MusicAlbums.qml:398 ../MusicArtists.qml:448 ../MusicNowPlaying.qml:714
74#: ../MusicTracks.qml:286 ../MusicaddtoPlaylist.qml:38 ../music-app.qml:1006
75msgid "Select playlist"
76msgstr ""
77
78#: ../MusicAlbums.qml:427 ../MusicArtists.qml:476 ../MusicTracks.qml:315
79#: ../music-app.qml:981
80msgid "Add to queue"
81msgstr ""
82
83#: ../MusicArtists.qml:39 ../music-app.qml:1107
84msgid "Artists"62msgid "Artists"
85msgstr ""63msgstr ""
8664
87#: ../MusicArtists.qml:14865#: ../MusicArtists.qml:106
88#, qt-format66#, qt-format
89msgid "%1 album"67msgid "%1 album"
90msgid_plural "%1 albums"68msgid_plural "%1 albums"
91msgstr[0] ""69msgstr[0] ""
92msgstr[1] ""70msgstr[1] ""
9371
94#: ../MusicArtists.qml:163 ../MusicArtists.qml:239 ../MusicPlaylists.qml:23572#: ../MusicArtists.qml:122 ../MusicPlaylists.qml:175 ../MusicStart.qml:304
95#: ../MusicPlaylists.qml:569 ../MusicStart.qml:30273#: ../common/SongsSheet.qml:127
96#, qt-format74#, qt-format
97msgid "%1 song"75msgid "%1 song"
98msgid_plural "%1 songs"76msgid_plural "%1 songs"
99msgstr[0] ""77msgstr[0] ""
100msgstr[1] ""78msgstr[1] ""
10179
102#: ../MusicArtists.qml:190
103msgid "Tracks"
104msgstr ""
105
106#: ../MusicNowPlaying.qml:3480#: ../MusicNowPlaying.qml:34
107msgid "Queue"81msgid "Queue"
108msgstr ""82msgstr ""
10983
84#: ../MusicNowPlaying.qml:701 ../MusicSearch.qml:346 ../MusicTracks.qml:270
85#: ../music-app.qml:858 ../common/SongsSheet.qml:330
86msgid "Add to playlist"
87msgstr ""
88
89#: ../MusicNowPlaying.qml:719 ../MusicSearch.qml:365 ../MusicTracks.qml:289
90#: ../MusicaddtoPlaylist.qml:38 ../music-app.qml:869
91#: ../common/SongsSheet.qml:349
92msgid "Select playlist"
93msgstr ""
94
110#. TRANSLATORS: this refers to sharing a playlist95#. TRANSLATORS: this refers to sharing a playlist
111#: ../MusicNowPlaying.qml:742 ../MusicPlaylists.qml:42996#: ../MusicNowPlaying.qml:747 ../MusicPlaylists.qml:370 ../MusicSearch.qml:432
112#: ../MusicPlaylists.qml:714 ../MusicTracks.qml:35397#: ../MusicTracks.qml:356
113msgid "Share"98msgid "Share"
114msgstr ""99msgstr ""
115100
116#. TRANSLATORS: this is a title of a dialog with a prompt to delete a playlist101#. TRANSLATORS: this is the name of the playlists page shown in the tab header.
117#: ../MusicPlaylists.qml:48102#. Remember to keep the translation short to fit the screen width
118msgid "Are you sure?"103#: ../MusicPlaylists.qml:37
119msgstr ""104msgid "Playlists"
120
121#: ../MusicPlaylists.qml:49
122msgid "This will delete your playlist."
123msgstr ""
124
125#: ../MusicPlaylists.qml:52
126msgid "Remove"
127msgstr ""
128
129#: ../MusicPlaylists.qml:65 ../MusicPlaylists.qml:108 ../music-app.qml:1059
130msgid "Cancel"
131msgstr ""105msgstr ""
132106
133#. TRANSLATORS: this is a title of a dialog with a prompt to rename a playlist107#. TRANSLATORS: this is a title of a dialog with a prompt to rename a playlist
134#: ../MusicPlaylists.qml:78108#: ../MusicPlaylists.qml:58
135msgid "Change name"109msgid "Change name"
136msgstr ""110msgstr ""
137111
138#: ../MusicPlaylists.qml:79112#: ../MusicPlaylists.qml:59
139msgid "Enter the new name of the playlist."113msgid "Enter the new name of the playlist."
140msgstr ""114msgstr ""
141115
142#: ../MusicPlaylists.qml:90116#: ../MusicPlaylists.qml:70
143msgid "Change"117msgid "Change"
144msgstr ""118msgstr ""
145119
146#: ../MusicPlaylists.qml:103120#: ../MusicPlaylists.qml:83
147msgid "You didn't type in a name."121msgid "You didn't type in a name."
148msgstr ""122msgstr ""
149123
150#. TRANSLATORS: this is the name of the playlists page shown in the tab header.124#: ../MusicPlaylists.qml:88 ../MusicPlaylists.qml:114 ../music-app.qml:922
151#. Remember to keep the translation short to fit the screen width125msgid "Cancel"
152#: ../MusicPlaylists.qml:136 ../music-app.qml:1159126msgstr ""
153msgid "Playlists"127
128#. TRANSLATORS: this is a title of a dialog with a prompt to delete a playlist
129#: ../MusicPlaylists.qml:101
130msgid "Are you sure?"
131msgstr ""
132
133#: ../MusicPlaylists.qml:102
134msgid "This will delete your playlist."
135msgstr ""
136
137#: ../MusicPlaylists.qml:105
138msgid "Remove"
154msgstr ""139msgstr ""
155140
156#. TRANSLATORS: this refers to editing a playlist141#. TRANSLATORS: this refers to editing a playlist
157#: ../MusicPlaylists.qml:343 ../MusicPlaylists.qml:638142#: ../MusicPlaylists.qml:284
158msgid "Edit"143msgid "Edit"
159msgstr ""144msgstr ""
160145
161#. TRANSLATORS: this refers to deleting a playlist146#. TRANSLATORS: this refers to deleting a playlist
162#: ../MusicPlaylists.qml:385 ../MusicPlaylists.qml:675147#: ../MusicPlaylists.qml:326
163msgid "Delete"148msgid "Delete"
164msgstr ""149msgstr ""
165150
166#: ../MusicPlaylists.qml:471151#: ../MusicSearch.qml:41 ../MusicToolbar.qml:897 ../music-app.qml:89
167msgid "Playlist"152#: ../music-app.qml:137 ../music-app.qml:141
168msgstr ""153msgid "Search"
169154msgstr ""
170#: ../MusicSettings.qml:30 ../music-app.qml:104155
156#: ../MusicSearch.qml:394 ../MusicTracks.qml:318 ../music-app.qml:844
157#: ../common/SongsSheet.qml:378
158msgid "Add to queue"
159msgstr ""
160
161#: ../MusicSettings.qml:30 ../music-app.qml:183
171msgid "Settings"162msgid "Settings"
172msgstr ""163msgstr ""
173164
@@ -253,147 +244,154 @@
253msgid "Clean everything!"244msgid "Clean everything!"
254msgstr ""245msgstr ""
255246
256#: ../MusicStart.qml:32 ../MusicTracks.qml:32 ../music-app.qml:231247#: ../MusicStart.qml:33 ../music-app.qml:336 ../music-app.qml:943
257#: ../music-app.qml:1090 ../.build/music-app.desktop.js:1248#: ../.build/com.ubuntu.music_music.desktop.in:1
258msgid "Music"249msgid "Music"
259msgstr ""250msgstr ""
260251
261#: ../MusicStart.qml:43252#: ../MusicStart.qml:63
262msgid "Recent"253msgid "Recent"
263msgstr ""254msgstr ""
264255
265#: ../MusicStart.qml:60256#: ../MusicStart.qml:80
266msgid "No recent albums or playlists"257msgid "No recent albums or playlists"
267msgstr ""258msgstr ""
268259
269#: ../MusicStart.qml:202260#: ../MusicStart.qml:209
270msgid "Genres"261msgid "Genres"
271msgstr ""262msgstr ""
272263
273#: ../MusicToolbar.qml:292264#: ../MusicToolbar.qml:322
274msgid "No songs queued"265msgid "No songs queued"
275msgstr ""266msgstr ""
276267
277#: ../MusicToolbar.qml:302268#: ../MusicToolbar.qml:332
278msgid "Tap on a song to start playing"269msgid "Tap on a song to start playing"
279msgstr ""270msgstr ""
280271
281#: ../MusicaddtoPlaylist.qml:164272#: ../MusicTracks.qml:32
273msgid "Songs"
274msgstr ""
275
276#: ../MusicaddtoPlaylist.qml:125
282msgid "New playlist"277msgid "New playlist"
283msgstr ""278msgstr ""
284279
285#: ../music-app.qml:66280#: ../music-app.qml:138
281msgid "Search Track"
282msgstr ""
283
284#: ../music-app.qml:146
286msgid "Next"285msgid "Next"
287msgstr ""286msgstr ""
288287
289#: ../music-app.qml:67288#: ../music-app.qml:147
290msgid "Next Track"289msgid "Next Track"
291msgstr ""290msgstr ""
292291
293#: ../music-app.qml:73292#: ../music-app.qml:153
294msgid "Pause"293msgid "Pause"
295msgstr ""294msgstr ""
296295
297#: ../music-app.qml:73296#: ../music-app.qml:153
298msgid "Play"297msgid "Play"
299msgstr ""298msgstr ""
300299
301#: ../music-app.qml:75300#: ../music-app.qml:155
302msgid "Pause Playback"301msgid "Pause Playback"
303msgstr ""302msgstr ""
304303
305#: ../music-app.qml:75304#: ../music-app.qml:155
306msgid "Continue or start playback"305msgid "Continue or start playback"
307msgstr ""306msgstr ""
308307
309#: ../music-app.qml:86308#: ../music-app.qml:160
309msgid "Back"
310msgstr ""
311
312#: ../music-app.qml:161
313msgid "Go back to last page"
314msgstr ""
315
316#: ../music-app.qml:169
310msgid "Previous"317msgid "Previous"
311msgstr ""318msgstr ""
312319
313#: ../music-app.qml:87320#: ../music-app.qml:170
314msgid "Previous Track"321msgid "Previous Track"
315msgstr ""322msgstr ""
316323
317#: ../music-app.qml:92324#: ../music-app.qml:175
318msgid "Stop"325msgid "Stop"
319msgstr ""326msgstr ""
320327
321#: ../music-app.qml:93328#: ../music-app.qml:176
322msgid "Stop Playback"329msgid "Stop Playback"
323msgstr ""330msgstr ""
324331
325#: ../music-app.qml:98332#: ../music-app.qml:184
326msgid "Back"
327msgstr ""
328
329#: ../music-app.qml:99
330msgid "Go back to last page"
331msgstr ""
332
333#: ../music-app.qml:105
334msgid "Music Settings"333msgid "Music Settings"
335msgstr ""334msgstr ""
336335
337#: ../music-app.qml:113
338msgid "Quit"
339msgstr ""
340
341#: ../music-app.qml:114
342msgid "Close application"
343msgstr ""
344
345#. 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)336#. 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)
346#: ../music-app.qml:171337#: ../music-app.qml:244
347msgid "songs played today"338msgid "songs played today"
348msgstr ""339msgstr ""
349340
350#: ../music-app.qml:172341#: ../music-app.qml:245
351msgid "No songs played today"342msgid "No songs played today"
352msgstr ""343msgstr ""
353344
354#: ../music-app.qml:278345#: ../music-app.qml:369
355msgid "Debug: "346msgid "Debug: "
356msgstr ""347msgstr ""
357348
358#: ../music-app.qml:758 ../meta-database.js:371349#: ../music-app.qml:656 ../meta-database.js:431
359msgid "Unknown Artist"350msgid "Unknown Artist"
360msgstr ""351msgstr ""
361352
362#: ../music-app.qml:759 ../meta-database.js:370 ../meta-database.js:373353#: ../music-app.qml:657 ../meta-database.js:430 ../meta-database.js:433
363msgid "Unknown Album"354msgid "Unknown Album"
364msgstr ""355msgstr ""
365356
366#: ../music-app.qml:766357#: ../music-app.qml:663
358msgid "Unknown Year"
359msgstr ""
360
361#: ../music-app.qml:664
367msgid "Unknown Genre"362msgid "Unknown Genre"
368msgstr ""363msgstr ""
369364
370#: ../music-app.qml:1019365#: ../music-app.qml:882
371msgid "New Playlist"366msgid "New Playlist"
372msgstr ""367msgstr ""
373368
374#: ../music-app.qml:1020369#: ../music-app.qml:883
375msgid "Name your playlist."370msgid "Name your playlist."
376msgstr ""371msgstr ""
377372
378#: ../music-app.qml:1024373#: ../music-app.qml:887
379msgid "Name"374msgid "Name"
380msgstr ""375msgstr ""
381376
382#: ../music-app.qml:1032377#: ../music-app.qml:895
383msgid "Create"378msgid "Create"
384msgstr ""379msgstr ""
385380
386#: ../music-app.qml:1048381#: ../music-app.qml:911
387msgid "Error: "382msgid "Error: "
388msgstr ""383msgstr ""
389384
390#: ../music-app.qml:1053385#: ../music-app.qml:916
391msgid "Error: You didn't type a name."386msgid "Error: You didn't type a name."
392msgstr ""387msgstr ""
393388
394#: ../music-app.qml:1141389#: ../common/AlbumsSheet.qml:128 ../common/SongsSheet.qml:126
395msgid "Songs"390#, qt-format
396msgstr ""391msgid " | %1 song"
392msgid_plural " | %1 songs"
393msgstr[0] ""
394msgstr[1] ""
397395
398#: ../common/LoadingSpinnerComponent.qml:44396#: ../common/LoadingSpinnerComponent.qml:44
399msgid "Loading..."397msgid "Loading..."
400398
=== 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 @@
10PROJECTNAME = $$system(basename ../*.qmlproject)10PROJECTNAME = $$system(basename ../*.qmlproject)
11PROJECTNAME = $$replace(PROJECTNAME,.qmlproject,)11PROJECTNAME = $$replace(PROJECTNAME,.qmlproject,)
1212
13DESKTOPFILE = ../$${PROJECTNAME}.desktop13DESKTOPFILE = ../com.ubuntu.music_music.desktop.in
1414
15SOURCECODE = ../*.qml \15SOURCECODE = ../*.qml \
16 ../*.js \16 ../*.js \
17 ../common/*.qml17 ../common/*.qml
1818
19BUILDDIR = ../.build19BUILDDIR = ../.build
20DESKTOPFILETEMP = $${BUILDDIR}/$${PROJECTNAME}.desktop.js20DESKTOPFILETEMP = $${BUILDDIR}/com.ubuntu.music_music.desktop.in
2121
22message("")22message("")
23message(" Project Name: $$PROJECTNAME ")23message(" Project Name: $$PROJECTNAME ")

Subscribers

People subscribed via source and target branches

to status/vote changes: