Merge lp:~ahayzen/music-app/remix-update-pot-001 into lp:music-app/remix

Proposed by Andrew Hayzen
Status: Rejected
Rejected by: Andrew Hayzen
Proposed branch: lp:~ahayzen/music-app/remix-update-pot-001
Merge into: lp:music-app/remix
Diff against target: 412 lines (+85/-86)
1 file modified
po/com.ubuntu.music.pot (+85/-86)
To merge this branch: bzr merge lp:~ahayzen/music-app/remix-update-pot-001
Reviewer Review Type Date Requested Status
Victor Thompson Needs Information
Ubuntu Phone Apps Jenkins Bot continuous-integration Approve
Review via email: mp+239970@code.launchpad.net

Commit message

* Update .pot

Description of the change

* Update .pot

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: Approve (continuous-integration)
Revision history for this message
Victor Thompson (vthompson) wrote :

There are effectively no changes to any translatable strings in this MP. Wouldn't we expect there to be some if we are updating the .pot file?

review: Needs Information

Unmerged revisions

722. By Andrew Hayzen

* Update .pot

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'po/com.ubuntu.music.pot'
2--- po/com.ubuntu.music.pot 2014-10-22 18:23:18 +0000
3+++ po/com.ubuntu.music.pot 2014-10-29 10:20:31 +0000
4@@ -8,7 +8,7 @@
5 msgstr ""
6 "Project-Id-Version: music-app\n"
7 "Report-Msgid-Bugs-To: \n"
8-"POT-Creation-Date: 2014-10-22 19:22+0100\n"
9+"POT-Creation-Date: 2014-10-29 10:10+0000\n"
10 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
11 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
12 "Language-Team: LANGUAGE <LL@li.org>\n"
13@@ -22,7 +22,7 @@
14 msgid "Albums"
15 msgstr ""
16
17-#: ../MusicAlbums.qml:57 ../MusicStart.qml:71 ../common/AlbumsPage.qml:155
18+#: ../MusicAlbums.qml:58 ../MusicStart.qml:94 ../common/AlbumsPage.qml:146
19 msgid "Album"
20 msgstr ""
21
22@@ -30,7 +30,7 @@
23 msgid "Artists"
24 msgstr ""
25
26-#: ../MusicArtists.qml:77
27+#: ../MusicArtists.qml:80
28 msgid "Artist"
29 msgstr ""
30
31@@ -38,66 +38,73 @@
32 msgid "Genres"
33 msgstr ""
34
35-#: ../MusicGenres.qml:89 ../MusicGenres.qml:91 ../common/SongsPage.qml:223
36-#: ../common/SongsPage.qml:261 ../common/SongsPage.qml:274
37-#: ../common/SongsPage.qml:310 ../common/SongsPage.qml:329
38-#: ../common/SongsPage.qml:361
39+#: ../MusicGenres.qml:92 ../MusicGenres.qml:94 ../common/SongsPage.qml:285
40+#: ../common/SongsPage.qml:319 ../common/SongsPage.qml:333
41+#: ../common/SongsPage.qml:369 ../common/SongsPage.qml:388
42+#: ../common/SongsPage.qml:420
43 msgid "Genre"
44 msgstr ""
45
46-#: ../MusicNowPlaying.qml:33
47+#: ../MusicNowPlaying.qml:34 ../music-app.qml:659 ../music-app.qml:691
48+#: ../music-app.qml:1035 ../music-app.qml:1047 ../music-app.qml:1075
49+#: ../music-app.qml:1076
50 msgid "Queue"
51 msgstr ""
52
53-#: ../MusicNowPlaying.qml:33
54+#: ../MusicNowPlaying.qml:34 ../music-app.qml:659 ../music-app.qml:883
55+#: ../music-app.qml:1034 ../music-app.qml:1075 ../music-app.qml:1076
56 msgid "Now playing"
57 msgstr ""
58
59-#: ../MusicNowPlaying.qml:76 ../MusicNowPlaying.qml:131 ../MusicTracks.qml:61
60-#: ../common/ListItemActions/AddToPlaylist.qml:25 ../common/SongsPage.qml:108
61+#: ../MusicNowPlaying.qml:100 ../MusicNowPlaying.qml:161 ../MusicTracks.qml:61
62+#: ../common/ListItemActions/AddToPlaylist.qml:25 ../common/SongsPage.qml:147
63 msgid "Add to playlist"
64 msgstr ""
65
66-#: ../MusicNowPlaying.qml:93
67+#: ../MusicNowPlaying.qml:123
68 msgid "Clear queue"
69 msgstr ""
70
71-#: ../MusicNowPlaying.qml:112 ../MusicTracks.qml:42 ../common/SongsPage.qml:89
72+#: ../MusicNowPlaying.qml:142 ../MusicTracks.qml:42
73+#: ../common/SongsPage.qml:128
74 msgid "Cancel selection"
75 msgstr ""
76
77-#: ../MusicNowPlaying.qml:118 ../MusicTracks.qml:49 ../common/SongsPage.qml:96
78+#: ../MusicNowPlaying.qml:148 ../MusicTracks.qml:49
79+#: ../common/SongsPage.qml:135
80 msgid "Select All"
81 msgstr ""
82
83-#: ../MusicNowPlaying.qml:148 ../common/SongsPage.qml:137
84+#: ../MusicNowPlaying.qml:184 ../common/SongsPage.qml:182
85 msgid "Delete"
86 msgstr ""
87
88 #. TRANSLATORS: this is the name of the playlists page shown in the tab header.
89 #. Remember to keep the translation short to fit the screen width
90-#: ../MusicPlaylists.qml:35
91+#: ../MusicPlaylists.qml:35 ../MusicaddtoPlaylist.qml:91
92+#: ../common/SongsPage.qml:66
93 msgid "Playlists"
94 msgstr ""
95
96-#: ../MusicPlaylists.qml:61 ../MusicaddtoPlaylist.qml:77
97-#: ../common/SongsPage.qml:330 ../common/SongsPage.qml:331
98+#: ../MusicPlaylists.qml:73 ../MusicaddtoPlaylist.qml:81
99+#: ../common/SongsPage.qml:389 ../common/SongsPage.qml:390
100 #, qt-format
101 msgid "%1 song"
102 msgid_plural "%1 songs"
103 msgstr[0] ""
104 msgstr[1] ""
105
106-#: ../MusicPlaylists.qml:66 ../MusicPlaylists.qml:70 ../MusicStart.qml:57
107-#: ../MusicStart.qml:71 ../common/SongsPage.qml:47 ../common/SongsPage.qml:138
108-#: ../common/SongsPage.qml:226 ../common/SongsPage.qml:264
109-#: ../common/SongsPage.qml:273 ../common/SongsPage.qml:309
110-#: ../common/SongsPage.qml:345 ../common/SongsPage.qml:348
111-#: ../common/SongsPage.qml:364
112+#: ../MusicPlaylists.qml:86 ../MusicPlaylists.qml:87 ../MusicStart.qml:79
113+#: ../MusicStart.qml:94 ../common/SongsPage.qml:86 ../common/SongsPage.qml:183
114+#: ../common/SongsPage.qml:287 ../common/SongsPage.qml:321
115+#: ../common/SongsPage.qml:332 ../common/SongsPage.qml:368
116+#: ../common/SongsPage.qml:404 ../common/SongsPage.qml:407
117+#: ../common/SongsPage.qml:422
118 msgid "Playlist"
119 msgstr ""
120
121-#: ../MusicStart.qml:34
122+#: ../MusicStart.qml:34 ../MusicaddtoPlaylist.qml:99
123+#: ../common/SongsPage.qml:76
124 msgid "Recent"
125 msgstr ""
126
127@@ -109,42 +116,42 @@
128 msgid "Songs"
129 msgstr ""
130
131-#: ../MusicTracks.qml:78 ../common/SongsPage.qml:125
132+#: ../MusicTracks.qml:84 ../common/SongsPage.qml:170
133 msgid "Add to queue"
134 msgstr ""
135
136-#: ../MusicaddtoPlaylist.qml:41
137+#: ../MusicaddtoPlaylist.qml:42
138 msgid "Select playlist"
139 msgstr ""
140
141-#: ../MusicaddtoPlaylist.qml:48
142+#: ../MusicaddtoPlaylist.qml:52
143 msgid "New playlist"
144 msgstr ""
145
146-#: ../common/AlbumsPage.qml:55 ../common/SongsPage.qml:216
147+#: ../common/AlbumsPage.qml:55 ../common/SongsPage.qml:280
148 msgid "Shuffle"
149 msgstr ""
150
151-#: ../common/AlbumsPage.qml:72 ../common/SongsPage.qml:243
152+#: ../common/AlbumsPage.qml:69 ../common/SongsPage.qml:306
153 msgid "Queue all"
154 msgstr ""
155
156-#: ../common/AlbumsPage.qml:83 ../common/SongsPage.qml:254
157+#: ../common/AlbumsPage.qml:77 ../common/SongsPage.qml:314
158 msgid "Play all"
159 msgstr ""
160
161-#: ../common/AlbumsPage.qml:124
162+#: ../common/AlbumsPage.qml:115
163 #, qt-format
164 msgid "%1 album"
165 msgid_plural "%1 albums"
166 msgstr[0] ""
167 msgstr[1] ""
168
169-#: ../common/ListItemActions/AddToQueue.qml:25
170+#: ../common/ListItemActions/AddToQueue.qml:27
171 msgid "Add to Queue"
172 msgstr ""
173
174-#: ../common/ListItemActions/Remove.qml:27 ../common/SongsPage.qml:495
175+#: ../common/ListItemActions/Remove.qml:27 ../common/SongsPage.qml:559
176 msgid "Remove"
177 msgstr ""
178
179@@ -153,190 +160,182 @@
180 msgstr ""
181
182 #. TRANSLATORS: this is a title of a dialog with a prompt to rename a playlist
183-#: ../common/SongsPage.qml:428
184+#: ../common/SongsPage.qml:492
185 msgid "Change name"
186 msgstr ""
187
188-#: ../common/SongsPage.qml:429
189+#: ../common/SongsPage.qml:493
190 msgid "Enter the new name of the playlist."
191 msgstr ""
192
193-#: ../common/SongsPage.qml:446
194+#: ../common/SongsPage.qml:510
195 msgid "Change"
196 msgstr ""
197
198-#: ../common/SongsPage.qml:467 ../music-app.qml:825
199+#: ../common/SongsPage.qml:531 ../music-app.qml:863
200 msgid "Playlist already exists"
201 msgstr ""
202
203-#: ../common/SongsPage.qml:471 ../music-app.qml:830
204+#: ../common/SongsPage.qml:535 ../music-app.qml:868
205 msgid "Please type in a name."
206 msgstr ""
207
208-#: ../common/SongsPage.qml:476 ../common/SongsPage.qml:514
209-#: ../music-app.qml:485 ../music-app.qml:836
210+#: ../common/SongsPage.qml:540 ../common/SongsPage.qml:578
211+#: ../music-app.qml:492 ../music-app.qml:874
212 msgid "Cancel"
213 msgstr ""
214
215 #. TRANSLATORS: this is a title of a dialog with a prompt to delete a playlist
216-#: ../common/SongsPage.qml:489
217+#: ../common/SongsPage.qml:553
218 msgid "Are you sure?"
219 msgstr ""
220
221-#: ../common/SongsPage.qml:490
222+#: ../common/SongsPage.qml:554
223 msgid "This will delete your playlist."
224 msgstr ""
225
226-#: ../meta-database.js:90 ../meta-database.js:92
227-msgid "Unknown Album"
228-msgstr ""
229-
230-#: ../meta-database.js:91
231-msgid "Unknown Artist"
232-msgstr ""
233-
234-#: ../music-app.qml:85 ../music-app.qml:131 ../music-app.qml:137
235+#: ../music-app.qml:94 ../music-app.qml:140 ../music-app.qml:146
236 msgid "Search"
237 msgstr ""
238
239-#: ../music-app.qml:132
240+#: ../music-app.qml:141
241 msgid "Search Track"
242 msgstr ""
243
244-#: ../music-app.qml:144
245+#: ../music-app.qml:153
246 msgid "Next"
247 msgstr ""
248
249-#: ../music-app.qml:145
250+#: ../music-app.qml:154
251 msgid "Next Track"
252 msgstr ""
253
254-#: ../music-app.qml:151
255+#: ../music-app.qml:160
256 msgid "Pause"
257 msgstr ""
258
259-#: ../music-app.qml:151
260+#: ../music-app.qml:160
261 msgid "Play"
262 msgstr ""
263
264-#: ../music-app.qml:153
265+#: ../music-app.qml:162
266 msgid "Pause Playback"
267 msgstr ""
268
269-#: ../music-app.qml:153
270+#: ../music-app.qml:162
271 msgid "Continue or start playback"
272 msgstr ""
273
274-#: ../music-app.qml:158
275+#: ../music-app.qml:167
276 msgid "Back"
277 msgstr ""
278
279-#: ../music-app.qml:159
280+#: ../music-app.qml:168
281 msgid "Go back to last page"
282 msgstr ""
283
284-#: ../music-app.qml:167
285+#: ../music-app.qml:176
286 msgid "Previous"
287 msgstr ""
288
289-#: ../music-app.qml:168
290+#: ../music-app.qml:177
291 msgid "Previous Track"
292 msgstr ""
293
294-#: ../music-app.qml:173
295+#: ../music-app.qml:182
296 msgid "Stop"
297 msgstr ""
298
299-#: ../music-app.qml:174
300+#: ../music-app.qml:183
301 msgid "Stop Playback"
302 msgstr ""
303
304 #. TRANSLATORS: This string represents that the target destination filepath does not start with ~/Music/Imported/
305-#: ../music-app.qml:328
306+#: ../music-app.qml:335
307 msgid "Filepath must start with"
308 msgstr ""
309
310 #. TRANSLATORS: This string represents that a blank filepath destination has been used
311-#: ../music-app.qml:354
312+#: ../music-app.qml:361
313 msgid "Filepath must be a file"
314 msgstr ""
315
316 #. TRANSLATORS: This string represents that there was failure moving the file to the target destination
317-#: ../music-app.qml:360
318+#: ../music-app.qml:367
319 msgid "Failed to move file"
320 msgstr ""
321
322-#: ../music-app.qml:439
323+#: ../music-app.qml:446
324 msgid "Waiting for file(s)..."
325 msgstr ""
326
327-#: ../music-app.qml:458
328+#: ../music-app.qml:465
329 msgid "OK"
330 msgstr ""
331
332-#: ../music-app.qml:471
333+#: ../music-app.qml:478
334 msgid "Imported file not found"
335 msgstr ""
336
337-#: ../music-app.qml:475
338+#: ../music-app.qml:482
339 msgid "Wait"
340 msgstr ""
341
342 #. 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)
343-#: ../music-app.qml:496
344+#: ../music-app.qml:503
345 msgid "songs played today"
346 msgstr ""
347
348-#: ../music-app.qml:497
349+#: ../music-app.qml:504
350 msgid "No songs played today"
351 msgstr ""
352
353-#: ../music-app.qml:563 ../music-app.qml:1038
354+#: ../music-app.qml:582 ../music-app.qml:1071
355 #: com.ubuntu.music_music.desktop.in.in.h:1
356 msgid "Music"
357 msgstr ""
358
359-#: ../music-app.qml:581
360+#: ../music-app.qml:600
361 msgid "Debug: "
362 msgstr ""
363
364-#: ../music-app.qml:794
365+#: ../music-app.qml:832
366 msgid "New Playlist"
367 msgstr ""
368
369-#: ../music-app.qml:795
370+#: ../music-app.qml:833
371 msgid "Name your playlist."
372 msgstr ""
373
374-#: ../music-app.qml:799
375+#: ../music-app.qml:837
376 msgid "Name"
377 msgstr ""
378
379-#: ../music-app.qml:809
380+#: ../music-app.qml:847
381 msgid "Create"
382 msgstr ""
383
384-#: ../music-app.qml:1068
385+#: ../music-app.qml:1101
386 msgid "No music found"
387 msgstr ""
388
389-#: ../music-app.qml:1075
390+#: ../music-app.qml:1108
391 msgid "Please import music"
392 msgstr ""
393
394-#: ../music-app.qml:1098
395+#: ../music-app.qml:1131
396 msgid "No playlists found"
397 msgstr ""
398
399-#: ../music-app.qml:1105
400+#: ../music-app.qml:1138
401 msgid "Click the + to create a playlist"
402 msgstr ""
403
404-#: ../music-app.qml:1128
405+#: ../music-app.qml:1161
406 msgid "No recent albums or playlists found"
407 msgstr ""
408
409-#: ../music-app.qml:1135
410+#: ../music-app.qml:1168
411 msgid "Play some music to see your favorites"
412 msgstr ""
413

Subscribers

People subscribed via source and target branches