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