Merge lp:~ahayzen/music-app/fix-1318008 into lp:music-app/trusty

Proposed by Andrew Hayzen
Status: Merged
Approved by: David Planella
Approved revision: 486
Merged at revision: 484
Proposed branch: lp:~ahayzen/music-app/fix-1318008
Merge into: lp:music-app/trusty
Diff against target: 636 lines (+138/-121)
8 files modified
.bzrignore (+2/-0)
CMakeLists.txt (+13/-10)
click/manifest.json.in (+1/-1)
com.ubuntu.music_music.desktop.in (+0/-11)
com.ubuntu.music_music.desktop.in.in (+11/-0)
debian/control (+1/-0)
po/CMakeLists.txt (+5/-2)
po/com.ubuntu.music.pot (+105/-97)
To merge this branch: bzr merge lp:~ahayzen/music-app/fix-1318008
Reviewer Review Type Date Requested Status
David Planella Approve
Ubuntu Phone Apps Jenkins Bot continuous-integration Approve
Review via email: mp+222315@code.launchpad.net

Commit message

* Merge translations back into .desktop file using intltool.

Description of the change

* Merge translations back into .desktop file using intltool.

To post a comment you must log in.
Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
David Planella (dpm) wrote :

Nice work! Pending finishing the review, here's one small think I've noticed (see inline comments)

review: Needs Fixing
lp:~ahayzen/music-app/fix-1318008 updated
484. By Andrew Hayzen

* Merge of trunk

Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :
review: Approve (continuous-integration)
lp:~ahayzen/music-app/fix-1318008 updated
485. By Andrew Hayzen

* Fixes to commands

Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :
review: Approve (continuous-integration)
lp:~ahayzen/music-app/fix-1318008 updated
486. By Andrew Hayzen

* Fix for syntax error
* Removal of duplicate parameter

Revision history for this message
David Planella (dpm) wrote :

Looks good to me now and works as expected, nice work!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file '.bzrignore'
2--- .bzrignore 2014-04-27 18:25:48 +0000
3+++ .bzrignore 2014-06-06 14:52:43 +0000
4@@ -13,5 +13,7 @@
5 *.gmo
6 *.mo
7 *.desktop
8+*.desktop.in
9+*.desktop.in.in.h
10 .excludes
11 music-app.json
12
13=== modified file 'CMakeLists.txt'
14--- CMakeLists.txt 2014-04-27 18:25:48 +0000
15+++ CMakeLists.txt 2014-06-06 14:52:43 +0000
16@@ -1,5 +1,7 @@
17 project(com.ubuntu.music)
18 cmake_minimum_required(VERSION 2.8.9)
19+find_program(INTLTOOL_MERGE intltool-merge)
20+find_program(INTLTOOL_EXTRACT intltool-extract)
21
22 # Standard install paths
23 include(GNUInstallDirs)
24@@ -41,10 +43,12 @@
25 endif(CLICK_MODE)
26
27 file(GLOB_RECURSE I18N_SRC_FILES
28- RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
29- *.qml *.js ${DESKTOP_FILE}.in)
30+ RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}/po
31+ *.qml *.js)
32+list(APPEND I18N_SRC_FILES ${DESKTOP_FILE}.in.in.h)
33 list(SORT I18N_SRC_FILES)
34-list(REMOVE_ITEM I18N_SRC_FILES .build/${DESKTOP_FILE}.in)
35+
36+message("Found ${I18N_SRC_FILES}")
37
38 file(GLOB SRC_FILES
39 RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
40@@ -52,13 +56,12 @@
41 install(DIRECTORY common images DESTINATION ${DATA_DIR})
42 install(FILES ${SRC_FILES} ${ICON_FILE} DESTINATION ${DATA_DIR})
43
44-configure_file(${DESKTOP_FILE}.in ${DESKTOP_FILE}.in @ONLY)
45-file(REMOVE ${CMAKE_CURRENT_BINARY_DIR}/${DESKTOP_FILE})
46-file(STRINGS ${CMAKE_CURRENT_BINARY_DIR}/${DESKTOP_FILE}.in DESKTOP_FILE_CONTENTS)
47-foreach(LINE ${DESKTOP_FILE_CONTENTS})
48- string(REGEX REPLACE "tr\\\(\"(.*)\"\\\)" "\\1" LINE "${LINE}")
49- file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/${DESKTOP_FILE} "${LINE}\n")
50-endforeach(LINE)
51+configure_file(${DESKTOP_FILE}.in.in ${DESKTOP_FILE}.in)
52+
53+add_custom_target(${DESKTOP_FILE} ALL
54+ COMMENT "Merging translations into ${DESKTOP_FILE}"
55+ COMMAND LC_ALL=C ${INTLTOOL_MERGE} -d -u ${CMAKE_SOURCE_DIR}/po ${DESKTOP_FILE}.in ${DESKTOP_FILE}
56+)
57
58 install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${DESKTOP_FILE}
59 DESTINATION ${DESKTOP_DIR})
60
61=== modified file 'click/manifest.json.in'
62--- click/manifest.json.in 2014-04-11 21:37:48 +0000
63+++ click/manifest.json.in 2014-06-06 14:52:43 +0000
64@@ -1,5 +1,5 @@
65 {
66- "description": "Music application for ubuntu",
67+ "description": "A music application for Ubuntu",
68 "framework": "ubuntu-sdk-14.04-dev1",
69 "architecture": "armhf",
70 "hooks": {
71
72=== removed file 'com.ubuntu.music_music.desktop.in'
73--- com.ubuntu.music_music.desktop.in 2014-06-06 10:37:44 +0000
74+++ com.ubuntu.music_music.desktop.in 1970-01-01 00:00:00 +0000
75@@ -1,11 +0,0 @@
76-[Desktop Entry]
77-Version=1.0
78-Type=Application
79-Terminal=false
80-Exec=@EXEC@
81-Icon=@ICON@
82-Name=tr("Music")
83-Comment=Ubuntu Touch Music Player
84-StartupNotify=true
85-X-Ubuntu-Touch=true
86-X-Ubuntu-Single-Instance=true
87
88=== added file 'com.ubuntu.music_music.desktop.in.in'
89--- com.ubuntu.music_music.desktop.in.in 1970-01-01 00:00:00 +0000
90+++ com.ubuntu.music_music.desktop.in.in 2014-06-06 14:52:43 +0000
91@@ -0,0 +1,11 @@
92+[Desktop Entry]
93+_Name=Music
94+_Comment=A music application for Ubuntu
95+_Keywords=music;songs;play;tracks;player;tunes;
96+Type=Application
97+Terminal=false
98+Exec=@EXEC@
99+Icon=@ICON@
100+StartupNotify=true
101+X-Ubuntu-Touch=true
102+X-Ubuntu-Single-Instance=true
103
104=== modified file 'debian/control'
105--- debian/control 2014-04-30 03:04:06 +0000
106+++ debian/control 2014-06-06 14:52:43 +0000
107@@ -4,6 +4,7 @@
108 Maintainer: Ubuntu App Cats <ubuntu-touch-coreapps@lists.launchpad.net>
109 Build-Depends: cmake,
110 debhelper (>= 9),
111+ intltool,
112 python,
113 qt5-default,
114 Standards-Version: 3.9.4
115
116=== modified file 'po/CMakeLists.txt'
117--- po/CMakeLists.txt 2014-04-27 18:25:48 +0000
118+++ po/CMakeLists.txt 2014-06-06 14:52:43 +0000
119@@ -8,11 +8,14 @@
120 # Creates the .pot file containing the translations template
121 add_custom_target(${POT_FILE} ALL
122 COMMENT "Generating translation template"
123+ COMMAND ${INTLTOOL_EXTRACT} --update --type=gettext/ini
124+ --srcdir=${CMAKE_SOURCE_DIR} ${DESKTOP_FILE}.in.in
125 COMMAND ${GETTEXT_XGETTEXT_EXECUTABLE} -o ${POT_FILE}
126- -D ${CMAKE_SOURCE_DIR}
127+ -D ${CMAKE_CURRENT_SOURCE_DIR}
128+ -D ${CMAKE_CURRENT_BINARY_DIR}
129 --from-code=UTF-8
130 --c++ --qt --add-comments=TRANSLATORS
131- --keyword=tr --keyword=tr:1,2
132+ --keyword=tr --keyword=tr:1,2 --keyword=N_
133 --package-name='${APP_HARDCODE}'
134 --copyright-holder='Canonical Ltd.'
135 ${I18N_SRC_FILES})
136
137=== modified file 'po/com.ubuntu.music.pot'
138--- po/com.ubuntu.music.pot 2014-06-03 16:59:27 +0000
139+++ po/com.ubuntu.music.pot 2014-06-06 14:52:43 +0000
140@@ -8,7 +8,7 @@
141 msgstr ""
142 "Project-Id-Version: music-app\n"
143 "Report-Msgid-Bugs-To: \n"
144-"POT-Creation-Date: 2014-06-02 17:52+0200\n"
145+"POT-Creation-Date: 2014-06-06 12:31+0100\n"
146 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
147 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
148 "Language-Team: LANGUAGE <LL@li.org>\n"
149@@ -18,383 +18,391 @@
150 "Content-Transfer-Encoding: 8bit\n"
151 "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
152
153-#: LoginLastFM.qml:50 MusicSettings.qml:145 MusicSettings.qml:153
154+#: ../LoginLastFM.qml:50 ../MusicSettings.qml:145 ../MusicSettings.qml:153
155 msgid "Last.fm"
156 msgstr ""
157
158-#: LoginLastFM.qml:56
159+#: ../LoginLastFM.qml:56
160 msgid "Login to be able to scrobble."
161 msgstr ""
162
163-#: LoginLastFM.qml:64
164+#: ../LoginLastFM.qml:64
165 msgid "Username"
166 msgstr ""
167
168-#: LoginLastFM.qml:74
169+#: ../LoginLastFM.qml:74
170 msgid "Password"
171 msgstr ""
172
173-#: LoginLastFM.qml:96
174+#: ../LoginLastFM.qml:96
175 msgid "Login"
176 msgstr ""
177
178-#: LoginLastFM.qml:103
179+#: ../LoginLastFM.qml:103
180 msgid "Trying to login..."
181 msgstr ""
182
183-#: LoginLastFM.qml:117
184+#: ../LoginLastFM.qml:117
185 msgid "Login Successful"
186 msgstr ""
187
188-#: LoginLastFM.qml:123
189+#: ../LoginLastFM.qml:123
190 msgid "Login Failed"
191 msgstr ""
192
193-#: LoginLastFM.qml:129
194+#: ../LoginLastFM.qml:129
195 msgid "You forgot to set your username and/or password"
196 msgstr ""
197
198-#: MusicAlbums.qml:33 MusicStart.qml:333
199+#: ../MusicAlbums.qml:33 ../MusicStart.qml:333
200 msgid "Albums"
201 msgstr ""
202
203-#: MusicArtists.qml:33
204+#: ../MusicArtists.qml:33
205 msgid "Artists"
206 msgstr ""
207
208-#: MusicArtists.qml:107 common/AlbumsSheet.qml:116
209+#: ../MusicArtists.qml:107 ../common/AlbumsSheet.qml:116
210 #, qt-format
211 msgid "%1 album"
212 msgid_plural "%1 albums"
213 msgstr[0] ""
214 msgstr[1] ""
215
216-#: MusicArtists.qml:124 MusicPlaylists.qml:186 MusicStart.qml:314
217-#: common/SongsSheet.qml:129
218+#: ../MusicArtists.qml:124 ../MusicPlaylists.qml:186 ../MusicStart.qml:314
219+#: ../common/SongsSheet.qml:129
220 #, qt-format
221 msgid "%1 song"
222 msgid_plural "%1 songs"
223 msgstr[0] ""
224 msgstr[1] ""
225
226-#: MusicNowPlaying.qml:33
227+#: ../MusicNowPlaying.qml:33
228 msgid "Now Playing"
229 msgstr ""
230
231 #. TRANSLATORS: this is the name of the playlists page shown in the tab header.
232 #. Remember to keep the translation short to fit the screen width
233-#: MusicPlaylists.qml:38
234+#: ../MusicPlaylists.qml:38
235 msgid "Playlists"
236 msgstr ""
237
238 #. TRANSLATORS: this is a title of a dialog with a prompt to rename a playlist
239-#: MusicPlaylists.qml:59
240+#: ../MusicPlaylists.qml:59
241 msgid "Change name"
242 msgstr ""
243
244-#: MusicPlaylists.qml:60
245+#: ../MusicPlaylists.qml:60
246 msgid "Enter the new name of the playlist."
247 msgstr ""
248
249-#: MusicPlaylists.qml:71
250+#: ../MusicPlaylists.qml:71
251 msgid "Change"
252 msgstr ""
253
254-#: MusicPlaylists.qml:84
255+#: ../MusicPlaylists.qml:84
256 msgid "You didn't type in a name."
257 msgstr ""
258
259-#: MusicPlaylists.qml:89 MusicPlaylists.qml:115 music-app.qml:987
260+#: ../MusicPlaylists.qml:89 ../MusicPlaylists.qml:115 ../music-app.qml:987
261 msgid "Cancel"
262 msgstr ""
263
264 #. TRANSLATORS: this is a title of a dialog with a prompt to delete a playlist
265-#: MusicPlaylists.qml:102
266+#: ../MusicPlaylists.qml:102
267 msgid "Are you sure?"
268 msgstr ""
269
270-#: MusicPlaylists.qml:103
271+#: ../MusicPlaylists.qml:103
272 msgid "This will delete your playlist."
273 msgstr ""
274
275-#: MusicPlaylists.qml:106
276+#: ../MusicPlaylists.qml:106
277 msgid "Remove"
278 msgstr ""
279
280-#: MusicSearch.qml:42 MusicToolbar.qml:508 music-app.qml:93 music-app.qml:141
281-#: music-app.qml:147
282+#: ../MusicSearch.qml:42 ../MusicToolbar.qml:508 ../music-app.qml:93
283+#: ../music-app.qml:141 ../music-app.qml:147
284 msgid "Search"
285 msgstr ""
286
287-#: MusicSettings.qml:30 music-app.qml:191
288+#: ../MusicSettings.qml:30 ../music-app.qml:191
289 msgid "Settings"
290 msgstr ""
291
292-#: MusicSettings.qml:81
293+#: ../MusicSettings.qml:81
294 msgid "Equaliser"
295 msgstr ""
296
297-#: MusicSettings.qml:82
298+#: ../MusicSettings.qml:82
299 msgid "Default"
300 msgstr ""
301
302-#: MusicSettings.qml:83
303+#: ../MusicSettings.qml:83
304 msgid "Acoustic"
305 msgstr ""
306
307-#: MusicSettings.qml:84
308+#: ../MusicSettings.qml:84
309 msgid "Classical"
310 msgstr ""
311
312-#: MusicSettings.qml:85
313+#: ../MusicSettings.qml:85
314 msgid "Electronic"
315 msgstr ""
316
317-#: MusicSettings.qml:86
318+#: ../MusicSettings.qml:86
319 msgid "Flat"
320 msgstr ""
321
322-#: MusicSettings.qml:87
323+#: ../MusicSettings.qml:87
324 msgid "Hip Hop"
325 msgstr ""
326
327-#: MusicSettings.qml:88
328+#: ../MusicSettings.qml:88
329 msgid "Jazz"
330 msgstr ""
331
332-#: MusicSettings.qml:89
333+#: ../MusicSettings.qml:89
334 msgid "Metal"
335 msgstr ""
336
337-#: MusicSettings.qml:90
338+#: ../MusicSettings.qml:90
339 msgid "Pop"
340 msgstr ""
341
342-#: MusicSettings.qml:91
343+#: ../MusicSettings.qml:91
344 msgid "Rock"
345 msgstr ""
346
347-#: MusicSettings.qml:92
348+#: ../MusicSettings.qml:92
349 msgid "Custom"
350 msgstr ""
351
352-#: MusicSettings.qml:112
353+#: ../MusicSettings.qml:112
354 msgid ""
355 "Snap to current song \n"
356 "when opening toolbar"
357 msgstr ""
358
359-#: MusicSettings.qml:132
360+#: ../MusicSettings.qml:132
361 msgid "Accounts"
362 msgstr ""
363
364-#: MusicSettings.qml:146
365+#: ../MusicSettings.qml:146
366 msgid "Login to scrobble and import playlists"
367 msgstr ""
368
369-#: MusicSettings.qml:169
370+#: ../MusicSettings.qml:169
371 msgid "Music Streaming"
372 msgstr ""
373
374-#: MusicSettings.qml:179
375+#: ../MusicSettings.qml:179
376 msgid "Ubuntu One"
377 msgstr ""
378
379-#: MusicSettings.qml:180
380+#: ../MusicSettings.qml:180
381 msgid "Sign in to stream your cloud music"
382 msgstr ""
383
384-#: MusicSettings.qml:196
385+#: ../MusicSettings.qml:196
386 msgid "Stream only on Wi-Fi"
387 msgstr ""
388
389-#: MusicSettings.qml:230
390+#: ../MusicSettings.qml:230
391 msgid "Clean everything!"
392 msgstr ""
393
394-#: MusicStart.qml:33 com.ubuntu.music_music.desktop.in:7 music-app.qml:366
395-#: music-app.qml:1002
396+#: ../MusicStart.qml:33 ../music-app.qml:366 ../music-app.qml:1002
397+#: com.ubuntu.music_music.desktop.in.in.h:1
398 msgid "Music"
399 msgstr ""
400
401-#: MusicStart.qml:80
402+#: ../MusicStart.qml:80
403 msgid "Recent"
404 msgstr ""
405
406-#: MusicStart.qml:108
407+#: ../MusicStart.qml:108
408 msgid "Clear History"
409 msgstr ""
410
411-#: MusicStart.qml:217
412+#: ../MusicStart.qml:217
413 msgid "Genres"
414 msgstr ""
415
416-#: MusicToolbar.qml:739
417+#: ../MusicToolbar.qml:739
418 msgid "No songs queued"
419 msgstr ""
420
421-#: MusicToolbar.qml:749
422+#: ../MusicToolbar.qml:749
423 msgid "Tap play or any item to start"
424 msgstr ""
425
426-#: MusicTracks.qml:33
427+#: ../MusicTracks.qml:33
428 msgid "Songs"
429 msgstr ""
430
431-#: MusicaddtoPlaylist.qml:38 common/ExpanderItems/AddToPlaylist.qml:59
432-#: music-app.qml:934
433+#: ../MusicaddtoPlaylist.qml:38 ../common/ExpanderItems/AddToPlaylist.qml:59
434+#: ../music-app.qml:934
435 msgid "Select playlist"
436 msgstr ""
437
438-#: MusicaddtoPlaylist.qml:130
439+#: ../MusicaddtoPlaylist.qml:130
440 msgid "New playlist"
441 msgstr ""
442
443-#: common/AlbumsSheet.qml:163 common/AlbumsSheet.qml:351
444-#: common/SongsSheet.qml:158
445+#: ../common/AlbumsSheet.qml:163 ../common/AlbumsSheet.qml:351
446+#: ../common/SongsSheet.qml:158
447 msgid "Play all"
448 msgstr ""
449
450-#: common/AlbumsSheet.qml:214 common/AlbumsSheet.qml:399
451-#: common/ExpanderItems/AddToQueue.qml:45 common/SongsSheet.qml:209
452-#: music-app.qml:909
453+#: ../common/AlbumsSheet.qml:214 ../common/AlbumsSheet.qml:399
454+#: ../common/ExpanderItems/AddToQueue.qml:45 ../common/SongsSheet.qml:209
455+#: ../music-app.qml:909
456 msgid "Add to queue"
457 msgstr ""
458
459-#: common/AlbumsSheet.qml:323 common/SongsSheet.qml:128
460+#: ../common/AlbumsSheet.qml:323 ../common/SongsSheet.qml:128
461 #, qt-format
462 msgid " | %1 song"
463 msgid_plural " | %1 songs"
464 msgstr[0] ""
465 msgstr[1] ""
466
467-#: common/ExpanderItems/AddToPlaylist.qml:47 music-app.qml:923
468+#: ../common/ExpanderItems/AddToPlaylist.qml:47 ../music-app.qml:923
469 msgid "Add to playlist"
470 msgstr ""
471
472 #. TRANSLATORS: this refers to deleting a playlist
473-#: common/ExpanderItems/DeletePlaylist.qml:48
474+#: ../common/ExpanderItems/DeletePlaylist.qml:48
475 msgid "Delete"
476 msgstr ""
477
478 #. TRANSLATORS: this refers to editing a playlist
479-#: common/ExpanderItems/EditPlaylist.qml:48
480+#: ../common/ExpanderItems/EditPlaylist.qml:48
481 msgid "Edit"
482 msgstr ""
483
484-#: common/LoadingSpinnerComponent.qml:44
485+#: ../common/LoadingSpinnerComponent.qml:44
486 msgid "Loading..."
487 msgstr ""
488
489-#: common/SwipeDelete.qml:51 common/SwipeDelete.qml:86
490+#: ../common/SwipeDelete.qml:51 ../common/SwipeDelete.qml:86
491 msgid "Clear"
492 msgstr ""
493
494-#: meta-database.js:444 meta-database.js:447 music-app.qml:695
495+#: ../meta-database.js:444 ../meta-database.js:447 ../music-app.qml:695
496 msgid "Unknown Album"
497 msgstr ""
498
499-#: meta-database.js:445 music-app.qml:694
500+#: ../meta-database.js:445 ../music-app.qml:694
501 msgid "Unknown Artist"
502 msgstr ""
503
504-#: music-app.qml:142
505+#: ../music-app.qml:142
506 msgid "Search Track"
507 msgstr ""
508
509-#: music-app.qml:154
510+#: ../music-app.qml:154
511 msgid "Next"
512 msgstr ""
513
514-#: music-app.qml:155
515+#: ../music-app.qml:155
516 msgid "Next Track"
517 msgstr ""
518
519-#: music-app.qml:161
520+#: ../music-app.qml:161
521 msgid "Pause"
522 msgstr ""
523
524-#: music-app.qml:161
525+#: ../music-app.qml:161
526 msgid "Play"
527 msgstr ""
528
529-#: music-app.qml:163
530+#: ../music-app.qml:163
531 msgid "Pause Playback"
532 msgstr ""
533
534-#: music-app.qml:163
535+#: ../music-app.qml:163
536 msgid "Continue or start playback"
537 msgstr ""
538
539-#: music-app.qml:168
540+#: ../music-app.qml:168
541 msgid "Back"
542 msgstr ""
543
544-#: music-app.qml:169
545+#: ../music-app.qml:169
546 msgid "Go back to last page"
547 msgstr ""
548
549-#: music-app.qml:177
550+#: ../music-app.qml:177
551 msgid "Previous"
552 msgstr ""
553
554-#: music-app.qml:178
555+#: ../music-app.qml:178
556 msgid "Previous Track"
557 msgstr ""
558
559-#: music-app.qml:183
560+#: ../music-app.qml:183
561 msgid "Stop"
562 msgstr ""
563
564-#: music-app.qml:184
565+#: ../music-app.qml:184
566 msgid "Stop Playback"
567 msgstr ""
568
569-#: music-app.qml:192
570+#: ../music-app.qml:192
571 msgid "Music Settings"
572 msgstr ""
573
574 #. 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)
575-#: music-app.qml:294
576+#: ../music-app.qml:294
577 msgid "songs played today"
578 msgstr ""
579
580-#: music-app.qml:295
581+#: ../music-app.qml:295
582 msgid "No songs played today"
583 msgstr ""
584
585-#: music-app.qml:392
586+#: ../music-app.qml:392
587 msgid "Debug: "
588 msgstr ""
589
590-#: music-app.qml:701
591+#: ../music-app.qml:701
592 msgid "Unknown Year"
593 msgstr ""
594
595-#: music-app.qml:702
596+#: ../music-app.qml:702
597 msgid "Unknown Genre"
598 msgstr ""
599
600-#: music-app.qml:947
601+#: ../music-app.qml:947
602 msgid "New Playlist"
603 msgstr ""
604
605-#: music-app.qml:948
606+#: ../music-app.qml:948
607 msgid "Name your playlist."
608 msgstr ""
609
610-#: music-app.qml:952
611+#: ../music-app.qml:952
612 msgid "Name"
613 msgstr ""
614
615-#: music-app.qml:960
616+#: ../music-app.qml:960
617 msgid "Create"
618 msgstr ""
619
620-#: music-app.qml:976
621+#: ../music-app.qml:976
622 msgid "Error: "
623 msgstr ""
624
625-#: music-app.qml:981
626+#: ../music-app.qml:981
627 msgid "Error: You didn't type a name."
628 msgstr ""
629+
630+#: com.ubuntu.music_music.desktop.in.in.h:2
631+msgid "A music application for Ubuntu"
632+msgstr ""
633+
634+#: com.ubuntu.music_music.desktop.in.in.h:3
635+msgid "music;songs;play;tracks;player;tunes;"
636+msgstr ""

Subscribers

People subscribed via source and target branches

to status/vote changes: