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
=== modified file '.bzrignore'
--- .bzrignore 2014-04-27 18:25:48 +0000
+++ .bzrignore 2014-06-06 14:52:43 +0000
@@ -13,5 +13,7 @@
13*.gmo13*.gmo
14*.mo14*.mo
15*.desktop15*.desktop
16*.desktop.in
17*.desktop.in.in.h
16.excludes18.excludes
17music-app.json19music-app.json
1820
=== modified file 'CMakeLists.txt'
--- CMakeLists.txt 2014-04-27 18:25:48 +0000
+++ CMakeLists.txt 2014-06-06 14:52:43 +0000
@@ -1,5 +1,7 @@
1project(com.ubuntu.music)1project(com.ubuntu.music)
2cmake_minimum_required(VERSION 2.8.9)2cmake_minimum_required(VERSION 2.8.9)
3find_program(INTLTOOL_MERGE intltool-merge)
4find_program(INTLTOOL_EXTRACT intltool-extract)
35
4# Standard install paths6# Standard install paths
5include(GNUInstallDirs)7include(GNUInstallDirs)
@@ -41,10 +43,12 @@
41endif(CLICK_MODE)43endif(CLICK_MODE)
4244
43file(GLOB_RECURSE I18N_SRC_FILES45file(GLOB_RECURSE I18N_SRC_FILES
44 RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}46 RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}/po
45 *.qml *.js ${DESKTOP_FILE}.in)47 *.qml *.js)
48list(APPEND I18N_SRC_FILES ${DESKTOP_FILE}.in.in.h)
46list(SORT I18N_SRC_FILES)49list(SORT I18N_SRC_FILES)
47list(REMOVE_ITEM I18N_SRC_FILES .build/${DESKTOP_FILE}.in)50
51message("Found ${I18N_SRC_FILES}")
4852
49file(GLOB SRC_FILES53file(GLOB SRC_FILES
50 RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}54 RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
@@ -52,13 +56,12 @@
52install(DIRECTORY common images DESTINATION ${DATA_DIR})56install(DIRECTORY common images DESTINATION ${DATA_DIR})
53install(FILES ${SRC_FILES} ${ICON_FILE} DESTINATION ${DATA_DIR})57install(FILES ${SRC_FILES} ${ICON_FILE} DESTINATION ${DATA_DIR})
5458
55configure_file(${DESKTOP_FILE}.in ${DESKTOP_FILE}.in @ONLY)59configure_file(${DESKTOP_FILE}.in.in ${DESKTOP_FILE}.in)
56file(REMOVE ${CMAKE_CURRENT_BINARY_DIR}/${DESKTOP_FILE})60
57file(STRINGS ${CMAKE_CURRENT_BINARY_DIR}/${DESKTOP_FILE}.in DESKTOP_FILE_CONTENTS)61add_custom_target(${DESKTOP_FILE} ALL
58foreach(LINE ${DESKTOP_FILE_CONTENTS})62 COMMENT "Merging translations into ${DESKTOP_FILE}"
59 string(REGEX REPLACE "tr\\\(\"(.*)\"\\\)" "\\1" LINE "${LINE}")63 COMMAND LC_ALL=C ${INTLTOOL_MERGE} -d -u ${CMAKE_SOURCE_DIR}/po ${DESKTOP_FILE}.in ${DESKTOP_FILE}
60 file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/${DESKTOP_FILE} "${LINE}\n")64)
61endforeach(LINE)
6265
63install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${DESKTOP_FILE}66install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${DESKTOP_FILE}
64 DESTINATION ${DESKTOP_DIR})67 DESTINATION ${DESKTOP_DIR})
6568
=== modified file 'click/manifest.json.in'
--- click/manifest.json.in 2014-04-11 21:37:48 +0000
+++ click/manifest.json.in 2014-06-06 14:52:43 +0000
@@ -1,5 +1,5 @@
1{1{
2 "description": "Music application for ubuntu",2 "description": "A music application for Ubuntu",
3 "framework": "ubuntu-sdk-14.04-dev1",3 "framework": "ubuntu-sdk-14.04-dev1",
4 "architecture": "armhf",4 "architecture": "armhf",
5 "hooks": {5 "hooks": {
66
=== removed file 'com.ubuntu.music_music.desktop.in'
--- com.ubuntu.music_music.desktop.in 2014-06-06 10:37:44 +0000
+++ com.ubuntu.music_music.desktop.in 1970-01-01 00:00:00 +0000
@@ -1,11 +0,0 @@
1[Desktop Entry]
2Version=1.0
3Type=Application
4Terminal=false
5Exec=@EXEC@
6Icon=@ICON@
7Name=tr("Music")
8Comment=Ubuntu Touch Music Player
9StartupNotify=true
10X-Ubuntu-Touch=true
11X-Ubuntu-Single-Instance=true
120
=== added file 'com.ubuntu.music_music.desktop.in.in'
--- com.ubuntu.music_music.desktop.in.in 1970-01-01 00:00:00 +0000
+++ com.ubuntu.music_music.desktop.in.in 2014-06-06 14:52:43 +0000
@@ -0,0 +1,11 @@
1[Desktop Entry]
2_Name=Music
3_Comment=A music application for Ubuntu
4_Keywords=music;songs;play;tracks;player;tunes;
5Type=Application
6Terminal=false
7Exec=@EXEC@
8Icon=@ICON@
9StartupNotify=true
10X-Ubuntu-Touch=true
11X-Ubuntu-Single-Instance=true
012
=== modified file 'debian/control'
--- debian/control 2014-04-30 03:04:06 +0000
+++ debian/control 2014-06-06 14:52:43 +0000
@@ -4,6 +4,7 @@
4Maintainer: Ubuntu App Cats <ubuntu-touch-coreapps@lists.launchpad.net>4Maintainer: Ubuntu App Cats <ubuntu-touch-coreapps@lists.launchpad.net>
5Build-Depends: cmake,5Build-Depends: cmake,
6 debhelper (>= 9),6 debhelper (>= 9),
7 intltool,
7 python,8 python,
8 qt5-default,9 qt5-default,
9Standards-Version: 3.9.410Standards-Version: 3.9.4
1011
=== modified file 'po/CMakeLists.txt'
--- po/CMakeLists.txt 2014-04-27 18:25:48 +0000
+++ po/CMakeLists.txt 2014-06-06 14:52:43 +0000
@@ -8,11 +8,14 @@
8# Creates the .pot file containing the translations template8# Creates the .pot file containing the translations template
9add_custom_target(${POT_FILE} ALL9add_custom_target(${POT_FILE} ALL
10 COMMENT "Generating translation template"10 COMMENT "Generating translation template"
11 COMMAND ${INTLTOOL_EXTRACT} --update --type=gettext/ini
12 --srcdir=${CMAKE_SOURCE_DIR} ${DESKTOP_FILE}.in.in
11 COMMAND ${GETTEXT_XGETTEXT_EXECUTABLE} -o ${POT_FILE}13 COMMAND ${GETTEXT_XGETTEXT_EXECUTABLE} -o ${POT_FILE}
12 -D ${CMAKE_SOURCE_DIR}14 -D ${CMAKE_CURRENT_SOURCE_DIR}
15 -D ${CMAKE_CURRENT_BINARY_DIR}
13 --from-code=UTF-816 --from-code=UTF-8
14 --c++ --qt --add-comments=TRANSLATORS17 --c++ --qt --add-comments=TRANSLATORS
15 --keyword=tr --keyword=tr:1,218 --keyword=tr --keyword=tr:1,2 --keyword=N_
16 --package-name='${APP_HARDCODE}'19 --package-name='${APP_HARDCODE}'
17 --copyright-holder='Canonical Ltd.'20 --copyright-holder='Canonical Ltd.'
18 ${I18N_SRC_FILES})21 ${I18N_SRC_FILES})
1922
=== modified file 'po/com.ubuntu.music.pot'
--- po/com.ubuntu.music.pot 2014-06-03 16:59:27 +0000
+++ po/com.ubuntu.music.pot 2014-06-06 14:52:43 +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: 2014-06-02 17:52+0200\n"11"POT-Creation-Date: 2014-06-06 12:31+0100\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,383 +18,391 @@
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:50 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:5625#: ../LoginLastFM.qml:56
26msgid "Login to be able to scrobble."26msgid "Login to be able to scrobble."
27msgstr ""27msgstr ""
2828
29#: LoginLastFM.qml:6429#: ../LoginLastFM.qml:64
30msgid "Username"30msgid "Username"
31msgstr ""31msgstr ""
3232
33#: LoginLastFM.qml:7433#: ../LoginLastFM.qml:74
34msgid "Password"34msgid "Password"
35msgstr ""35msgstr ""
3636
37#: LoginLastFM.qml:9637#: ../LoginLastFM.qml:96
38msgid "Login"38msgid "Login"
39msgstr ""39msgstr ""
4040
41#: LoginLastFM.qml:10341#: ../LoginLastFM.qml:103
42msgid "Trying to login..."42msgid "Trying to login..."
43msgstr ""43msgstr ""
4444
45#: LoginLastFM.qml:11745#: ../LoginLastFM.qml:117
46msgid "Login Successful"46msgid "Login Successful"
47msgstr ""47msgstr ""
4848
49#: LoginLastFM.qml:12349#: ../LoginLastFM.qml:123
50msgid "Login Failed"50msgid "Login Failed"
51msgstr ""51msgstr ""
5252
53#: LoginLastFM.qml:12953#: ../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 MusicStart.qml:33357#: ../MusicAlbums.qml:33 ../MusicStart.qml:333
58msgid "Albums"58msgid "Albums"
59msgstr ""59msgstr ""
6060
61#: MusicArtists.qml:3361#: ../MusicArtists.qml:33
62msgid "Artists"62msgid "Artists"
63msgstr ""63msgstr ""
6464
65#: MusicArtists.qml:107 common/AlbumsSheet.qml:11665#: ../MusicArtists.qml:107 ../common/AlbumsSheet.qml:116
66#, qt-format66#, qt-format
67msgid "%1 album"67msgid "%1 album"
68msgid_plural "%1 albums"68msgid_plural "%1 albums"
69msgstr[0] ""69msgstr[0] ""
70msgstr[1] ""70msgstr[1] ""
7171
72#: MusicArtists.qml:124 MusicPlaylists.qml:186 MusicStart.qml:31472#: ../MusicArtists.qml:124 ../MusicPlaylists.qml:186 ../MusicStart.qml:314
73#: common/SongsSheet.qml:12973#: ../common/SongsSheet.qml:129
74#, qt-format74#, qt-format
75msgid "%1 song"75msgid "%1 song"
76msgid_plural "%1 songs"76msgid_plural "%1 songs"
77msgstr[0] ""77msgstr[0] ""
78msgstr[1] ""78msgstr[1] ""
7979
80#: MusicNowPlaying.qml:3380#: ../MusicNowPlaying.qml:33
81msgid "Now Playing"81msgid "Now Playing"
82msgstr ""82msgstr ""
8383
84#. TRANSLATORS: this is the name of the playlists page shown in the tab header.84#. TRANSLATORS: this is the name of the playlists page shown in the tab header.
85#. Remember to keep the translation short to fit the screen width85#. Remember to keep the translation short to fit the screen width
86#: MusicPlaylists.qml:3886#: ../MusicPlaylists.qml:38
87msgid "Playlists"87msgid "Playlists"
88msgstr ""88msgstr ""
8989
90#. TRANSLATORS: this is a title of a dialog with a prompt to rename a playlist90#. TRANSLATORS: this is a title of a dialog with a prompt to rename a playlist
91#: MusicPlaylists.qml:5991#: ../MusicPlaylists.qml:59
92msgid "Change name"92msgid "Change name"
93msgstr ""93msgstr ""
9494
95#: MusicPlaylists.qml:6095#: ../MusicPlaylists.qml:60
96msgid "Enter the new name of the playlist."96msgid "Enter the new name of the playlist."
97msgstr ""97msgstr ""
9898
99#: MusicPlaylists.qml:7199#: ../MusicPlaylists.qml:71
100msgid "Change"100msgid "Change"
101msgstr ""101msgstr ""
102102
103#: MusicPlaylists.qml:84103#: ../MusicPlaylists.qml:84
104msgid "You didn't type in a name."104msgid "You didn't type in a name."
105msgstr ""105msgstr ""
106106
107#: MusicPlaylists.qml:89 MusicPlaylists.qml:115 music-app.qml:987107#: ../MusicPlaylists.qml:89 ../MusicPlaylists.qml:115 ../music-app.qml:987
108msgid "Cancel"108msgid "Cancel"
109msgstr ""109msgstr ""
110110
111#. TRANSLATORS: this is a title of a dialog with a prompt to delete a playlist111#. TRANSLATORS: this is a title of a dialog with a prompt to delete a playlist
112#: MusicPlaylists.qml:102112#: ../MusicPlaylists.qml:102
113msgid "Are you sure?"113msgid "Are you sure?"
114msgstr ""114msgstr ""
115115
116#: MusicPlaylists.qml:103116#: ../MusicPlaylists.qml:103
117msgid "This will delete your playlist."117msgid "This will delete your playlist."
118msgstr ""118msgstr ""
119119
120#: MusicPlaylists.qml:106120#: ../MusicPlaylists.qml:106
121msgid "Remove"121msgid "Remove"
122msgstr ""122msgstr ""
123123
124#: MusicSearch.qml:42 MusicToolbar.qml:508 music-app.qml:93 music-app.qml:141124#: ../MusicSearch.qml:42 ../MusicToolbar.qml:508 ../music-app.qml:93
125#: music-app.qml:147125#: ../music-app.qml:141 ../music-app.qml:147
126msgid "Search"126msgid "Search"
127msgstr ""127msgstr ""
128128
129#: MusicSettings.qml:30 music-app.qml:191129#: ../MusicSettings.qml:30 ../music-app.qml:191
130msgid "Settings"130msgid "Settings"
131msgstr ""131msgstr ""
132132
133#: MusicSettings.qml:81133#: ../MusicSettings.qml:81
134msgid "Equaliser"134msgid "Equaliser"
135msgstr ""135msgstr ""
136136
137#: MusicSettings.qml:82137#: ../MusicSettings.qml:82
138msgid "Default"138msgid "Default"
139msgstr ""139msgstr ""
140140
141#: MusicSettings.qml:83141#: ../MusicSettings.qml:83
142msgid "Acoustic"142msgid "Acoustic"
143msgstr ""143msgstr ""
144144
145#: MusicSettings.qml:84145#: ../MusicSettings.qml:84
146msgid "Classical"146msgid "Classical"
147msgstr ""147msgstr ""
148148
149#: MusicSettings.qml:85149#: ../MusicSettings.qml:85
150msgid "Electronic"150msgid "Electronic"
151msgstr ""151msgstr ""
152152
153#: MusicSettings.qml:86153#: ../MusicSettings.qml:86
154msgid "Flat"154msgid "Flat"
155msgstr ""155msgstr ""
156156
157#: MusicSettings.qml:87157#: ../MusicSettings.qml:87
158msgid "Hip Hop"158msgid "Hip Hop"
159msgstr ""159msgstr ""
160160
161#: MusicSettings.qml:88161#: ../MusicSettings.qml:88
162msgid "Jazz"162msgid "Jazz"
163msgstr ""163msgstr ""
164164
165#: MusicSettings.qml:89165#: ../MusicSettings.qml:89
166msgid "Metal"166msgid "Metal"
167msgstr ""167msgstr ""
168168
169#: MusicSettings.qml:90169#: ../MusicSettings.qml:90
170msgid "Pop"170msgid "Pop"
171msgstr ""171msgstr ""
172172
173#: MusicSettings.qml:91173#: ../MusicSettings.qml:91
174msgid "Rock"174msgid "Rock"
175msgstr ""175msgstr ""
176176
177#: MusicSettings.qml:92177#: ../MusicSettings.qml:92
178msgid "Custom"178msgid "Custom"
179msgstr ""179msgstr ""
180180
181#: MusicSettings.qml:112181#: ../MusicSettings.qml:112
182msgid ""182msgid ""
183"Snap to current song \n"183"Snap to current song \n"
184"when opening toolbar"184"when opening toolbar"
185msgstr ""185msgstr ""
186186
187#: MusicSettings.qml:132187#: ../MusicSettings.qml:132
188msgid "Accounts"188msgid "Accounts"
189msgstr ""189msgstr ""
190190
191#: MusicSettings.qml:146191#: ../MusicSettings.qml:146
192msgid "Login to scrobble and import playlists"192msgid "Login to scrobble and import playlists"
193msgstr ""193msgstr ""
194194
195#: MusicSettings.qml:169195#: ../MusicSettings.qml:169
196msgid "Music Streaming"196msgid "Music Streaming"
197msgstr ""197msgstr ""
198198
199#: MusicSettings.qml:179199#: ../MusicSettings.qml:179
200msgid "Ubuntu One"200msgid "Ubuntu One"
201msgstr ""201msgstr ""
202202
203#: MusicSettings.qml:180203#: ../MusicSettings.qml:180
204msgid "Sign in to stream your cloud music"204msgid "Sign in to stream your cloud music"
205msgstr ""205msgstr ""
206206
207#: MusicSettings.qml:196207#: ../MusicSettings.qml:196
208msgid "Stream only on Wi-Fi"208msgid "Stream only on Wi-Fi"
209msgstr ""209msgstr ""
210210
211#: MusicSettings.qml:230211#: ../MusicSettings.qml:230
212msgid "Clean everything!"212msgid "Clean everything!"
213msgstr ""213msgstr ""
214214
215#: MusicStart.qml:33 com.ubuntu.music_music.desktop.in:7 music-app.qml:366215#: ../MusicStart.qml:33 ../music-app.qml:366 ../music-app.qml:1002
216#: music-app.qml:1002216#: com.ubuntu.music_music.desktop.in.in.h:1
217msgid "Music"217msgid "Music"
218msgstr ""218msgstr ""
219219
220#: MusicStart.qml:80220#: ../MusicStart.qml:80
221msgid "Recent"221msgid "Recent"
222msgstr ""222msgstr ""
223223
224#: MusicStart.qml:108224#: ../MusicStart.qml:108
225msgid "Clear History"225msgid "Clear History"
226msgstr ""226msgstr ""
227227
228#: MusicStart.qml:217228#: ../MusicStart.qml:217
229msgid "Genres"229msgid "Genres"
230msgstr ""230msgstr ""
231231
232#: MusicToolbar.qml:739232#: ../MusicToolbar.qml:739
233msgid "No songs queued"233msgid "No songs queued"
234msgstr ""234msgstr ""
235235
236#: MusicToolbar.qml:749236#: ../MusicToolbar.qml:749
237msgid "Tap play or any item to start"237msgid "Tap play or any item to start"
238msgstr ""238msgstr ""
239239
240#: MusicTracks.qml:33240#: ../MusicTracks.qml:33
241msgid "Songs"241msgid "Songs"
242msgstr ""242msgstr ""
243243
244#: MusicaddtoPlaylist.qml:38 common/ExpanderItems/AddToPlaylist.qml:59244#: ../MusicaddtoPlaylist.qml:38 ../common/ExpanderItems/AddToPlaylist.qml:59
245#: music-app.qml:934245#: ../music-app.qml:934
246msgid "Select playlist"246msgid "Select playlist"
247msgstr ""247msgstr ""
248248
249#: MusicaddtoPlaylist.qml:130249#: ../MusicaddtoPlaylist.qml:130
250msgid "New playlist"250msgid "New playlist"
251msgstr ""251msgstr ""
252252
253#: common/AlbumsSheet.qml:163 common/AlbumsSheet.qml:351253#: ../common/AlbumsSheet.qml:163 ../common/AlbumsSheet.qml:351
254#: common/SongsSheet.qml:158254#: ../common/SongsSheet.qml:158
255msgid "Play all"255msgid "Play all"
256msgstr ""256msgstr ""
257257
258#: common/AlbumsSheet.qml:214 common/AlbumsSheet.qml:399258#: ../common/AlbumsSheet.qml:214 ../common/AlbumsSheet.qml:399
259#: common/ExpanderItems/AddToQueue.qml:45 common/SongsSheet.qml:209259#: ../common/ExpanderItems/AddToQueue.qml:45 ../common/SongsSheet.qml:209
260#: music-app.qml:909260#: ../music-app.qml:909
261msgid "Add to queue"261msgid "Add to queue"
262msgstr ""262msgstr ""
263263
264#: common/AlbumsSheet.qml:323 common/SongsSheet.qml:128264#: ../common/AlbumsSheet.qml:323 ../common/SongsSheet.qml:128
265#, qt-format265#, qt-format
266msgid " | %1 song"266msgid " | %1 song"
267msgid_plural " | %1 songs"267msgid_plural " | %1 songs"
268msgstr[0] ""268msgstr[0] ""
269msgstr[1] ""269msgstr[1] ""
270270
271#: common/ExpanderItems/AddToPlaylist.qml:47 music-app.qml:923271#: ../common/ExpanderItems/AddToPlaylist.qml:47 ../music-app.qml:923
272msgid "Add to playlist"272msgid "Add to playlist"
273msgstr ""273msgstr ""
274274
275#. TRANSLATORS: this refers to deleting a playlist275#. TRANSLATORS: this refers to deleting a playlist
276#: common/ExpanderItems/DeletePlaylist.qml:48276#: ../common/ExpanderItems/DeletePlaylist.qml:48
277msgid "Delete"277msgid "Delete"
278msgstr ""278msgstr ""
279279
280#. TRANSLATORS: this refers to editing a playlist280#. TRANSLATORS: this refers to editing a playlist
281#: common/ExpanderItems/EditPlaylist.qml:48281#: ../common/ExpanderItems/EditPlaylist.qml:48
282msgid "Edit"282msgid "Edit"
283msgstr ""283msgstr ""
284284
285#: common/LoadingSpinnerComponent.qml:44285#: ../common/LoadingSpinnerComponent.qml:44
286msgid "Loading..."286msgid "Loading..."
287msgstr ""287msgstr ""
288288
289#: common/SwipeDelete.qml:51 common/SwipeDelete.qml:86289#: ../common/SwipeDelete.qml:51 ../common/SwipeDelete.qml:86
290msgid "Clear"290msgid "Clear"
291msgstr ""291msgstr ""
292292
293#: meta-database.js:444 meta-database.js:447 music-app.qml:695293#: ../meta-database.js:444 ../meta-database.js:447 ../music-app.qml:695
294msgid "Unknown Album"294msgid "Unknown Album"
295msgstr ""295msgstr ""
296296
297#: meta-database.js:445 music-app.qml:694297#: ../meta-database.js:445 ../music-app.qml:694
298msgid "Unknown Artist"298msgid "Unknown Artist"
299msgstr ""299msgstr ""
300300
301#: music-app.qml:142301#: ../music-app.qml:142
302msgid "Search Track"302msgid "Search Track"
303msgstr ""303msgstr ""
304304
305#: music-app.qml:154305#: ../music-app.qml:154
306msgid "Next"306msgid "Next"
307msgstr ""307msgstr ""
308308
309#: music-app.qml:155309#: ../music-app.qml:155
310msgid "Next Track"310msgid "Next Track"
311msgstr ""311msgstr ""
312312
313#: music-app.qml:161313#: ../music-app.qml:161
314msgid "Pause"314msgid "Pause"
315msgstr ""315msgstr ""
316316
317#: music-app.qml:161317#: ../music-app.qml:161
318msgid "Play"318msgid "Play"
319msgstr ""319msgstr ""
320320
321#: music-app.qml:163321#: ../music-app.qml:163
322msgid "Pause Playback"322msgid "Pause Playback"
323msgstr ""323msgstr ""
324324
325#: music-app.qml:163325#: ../music-app.qml:163
326msgid "Continue or start playback"326msgid "Continue or start playback"
327msgstr ""327msgstr ""
328328
329#: music-app.qml:168329#: ../music-app.qml:168
330msgid "Back"330msgid "Back"
331msgstr ""331msgstr ""
332332
333#: music-app.qml:169333#: ../music-app.qml:169
334msgid "Go back to last page"334msgid "Go back to last page"
335msgstr ""335msgstr ""
336336
337#: music-app.qml:177337#: ../music-app.qml:177
338msgid "Previous"338msgid "Previous"
339msgstr ""339msgstr ""
340340
341#: music-app.qml:178341#: ../music-app.qml:178
342msgid "Previous Track"342msgid "Previous Track"
343msgstr ""343msgstr ""
344344
345#: music-app.qml:183345#: ../music-app.qml:183
346msgid "Stop"346msgid "Stop"
347msgstr ""347msgstr ""
348348
349#: music-app.qml:184349#: ../music-app.qml:184
350msgid "Stop Playback"350msgid "Stop Playback"
351msgstr ""351msgstr ""
352352
353#: music-app.qml:192353#: ../music-app.qml:192
354msgid "Music Settings"354msgid "Music Settings"
355msgstr ""355msgstr ""
356356
357#. 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)357#. 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)
358#: music-app.qml:294358#: ../music-app.qml:294
359msgid "songs played today"359msgid "songs played today"
360msgstr ""360msgstr ""
361361
362#: music-app.qml:295362#: ../music-app.qml:295
363msgid "No songs played today"363msgid "No songs played today"
364msgstr ""364msgstr ""
365365
366#: music-app.qml:392366#: ../music-app.qml:392
367msgid "Debug: "367msgid "Debug: "
368msgstr ""368msgstr ""
369369
370#: music-app.qml:701370#: ../music-app.qml:701
371msgid "Unknown Year"371msgid "Unknown Year"
372msgstr ""372msgstr ""
373373
374#: music-app.qml:702374#: ../music-app.qml:702
375msgid "Unknown Genre"375msgid "Unknown Genre"
376msgstr ""376msgstr ""
377377
378#: music-app.qml:947378#: ../music-app.qml:947
379msgid "New Playlist"379msgid "New Playlist"
380msgstr ""380msgstr ""
381381
382#: music-app.qml:948382#: ../music-app.qml:948
383msgid "Name your playlist."383msgid "Name your playlist."
384msgstr ""384msgstr ""
385385
386#: music-app.qml:952386#: ../music-app.qml:952
387msgid "Name"387msgid "Name"
388msgstr ""388msgstr ""
389389
390#: music-app.qml:960390#: ../music-app.qml:960
391msgid "Create"391msgid "Create"
392msgstr ""392msgstr ""
393393
394#: music-app.qml:976394#: ../music-app.qml:976
395msgid "Error: "395msgid "Error: "
396msgstr ""396msgstr ""
397397
398#: music-app.qml:981398#: ../music-app.qml:981
399msgid "Error: You didn't type a name."399msgid "Error: You didn't type a name."
400msgstr ""400msgstr ""
401
402#: com.ubuntu.music_music.desktop.in.in.h:2
403msgid "A music application for Ubuntu"
404msgstr ""
405
406#: com.ubuntu.music_music.desktop.in.in.h:3
407msgid "music;songs;play;tracks;player;tunes;"
408msgstr ""

Subscribers

People subscribed via source and target branches

to status/vote changes: