Ubuntu Music App

Merge lp:~vthompson/music-app/add-translator-notes into lp:music-app/remix

  1. add-translator-notes
  2. Merge into remix
Proposed by Victor Thompson
Status: Merged
Approved by: Andrew Hayzen
Approved revision: 818
Merged at revision: 817
Proposed branch: lp:~vthompson/music-app/add-translator-notes
Merge into: lp:music-app/remix
Diff against target: 462 lines (+92/-71)
5 files modified
MusicNowPlaying.qml (+7/-1)
MusicaddtoPlaylist.qml (+1/-0)
common/AlbumsPage.qml (+3/-0)
common/SongsPage.qml (+3/-0)
po/com.ubuntu.music.pot (+78/-70)
To merge this branch: bzr merge lp:~vthompson/music-app/add-translator-notes
Reviewer Review Type Date Requested Status
David Planella Approve
Andrew Hayzen Approve
Ubuntu Phone Apps Jenkins Bot continuous-integration Approve
Review via email: mp+247787@code.launchpad.net

Commit message

* Add notes to translators concerning string lengths.

Description of the change

* Add notes to translators concerning string lengths.

To post a comment you must log in.
lp:~vthompson/music-app/add-translator-notes updated
817. By Victor Thompson

remove newline

818. By Victor Thompson

remove newline

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

PASSED: Continuous integration, rev:818
http://91.189.93.70:8080/job/music-app-ci/1265/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-vivid/844
        deb: http://91.189.93.70:8080/job/generic-mediumtests-vivid/844/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/music-app-vivid-amd64-ci/117

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/music-app-ci/1265/rebuild

review: Approve (continuous-integration)
Revision history for this message
Andrew Hayzen (ahayzen) wrote :

LGTM :)

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

Looks good to me too, good work, translators will be happy :)

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'MusicNowPlaying.qml'
2--- MusicNowPlaying.qml 2015-01-26 03:20:37 +0000
3+++ MusicNowPlaying.qml 2015-01-28 02:32:37 +0000
4@@ -32,10 +32,14 @@
5 id: nowPlaying
6 flickable: isListView ? queueListLoader.item : null // Ensures that the header is shown in fullview
7 objectName: "nowPlayingPage"
8- title: isListView ? i18n.tr("Queue") : i18n.tr("Now playing")
9+ title: isListView ? queueTitle : nowPlayingTitle
10 visible: false
11
12 property bool isListView: false
13+ // TRANSLATORS: this appears in the header with limited space (around 20 characters)
14+ property string nowPlayingTitle: i18n.tr("Now playing")
15+ // TRANSLATORS: this appears in the header with limited space (around 20 characters)
16+ property string queueTitle: i18n.tr("Queue")
17
18 onIsListViewChanged: {
19 if (isListView) { // When changing to the queue positionAt the currentIndex
20@@ -87,6 +91,7 @@
21 Action {
22 enabled: trackQueue.model.count > 0
23 iconName: "add-to-playlist"
24+ // TRANSLATORS: this action appears in the overflow drawer with limited space (around 18 characters)
25 text: i18n.tr("Add to playlist")
26 onTriggered: {
27 var items = []
28@@ -107,6 +112,7 @@
29 enabled: trackQueue.model.count > 0
30 iconName: "delete"
31 objectName: "clearQueue"
32+ // TRANSLATORS: this action appears in the overflow drawer with limited space (around 18 characters)
33 text: i18n.tr("Clear queue")
34 onTriggered: {
35 pageStack.pop()
36
37=== modified file 'MusicaddtoPlaylist.qml'
38--- MusicaddtoPlaylist.qml 2015-01-25 16:44:49 +0000
39+++ MusicaddtoPlaylist.qml 2015-01-28 02:32:37 +0000
40@@ -39,6 +39,7 @@
41 MusicPage {
42 id: addToPlaylistPage
43 objectName: "addToPlaylistPage"
44+ // TRANSLATORS: this appears in the header with limited space (around 20 characters)
45 title: i18n.tr("Select playlist")
46 searchable: true
47 searchResultsCount: addToPlaylistModelFilter.count
48
49=== modified file 'common/AlbumsPage.qml'
50--- common/AlbumsPage.qml 2015-01-17 12:44:57 +0000
51+++ common/AlbumsPage.qml 2015-01-28 02:32:37 +0000
52@@ -60,6 +60,7 @@
53 centerIn: parent
54 }
55 color: "white"
56+ // TRANSLATORS: this appears in a button with limited space (around 14 characters)
57 text: i18n.tr("Shuffle")
58 }
59 onClicked: shuffleModel(songArtistModel)
60@@ -74,6 +75,7 @@
61 centerIn: parent
62 }
63 color: "white"
64+ // TRANSLATORS: this appears in a button with limited space (around 14 characters)
65 text: i18n.tr("Queue all")
66 }
67 onClicked: addQueueFromModel(songArtistModel)
68@@ -82,6 +84,7 @@
69 id: playRow
70 color: UbuntuColors.green
71 height: units.gu(4)
72+ // TRANSLATORS: this appears in a button with limited space (around 14 characters)
73 text: i18n.tr("Play all")
74 width: units.gu(15)
75 onClicked: trackClicked(songArtistModel, 0, true)
76
77=== modified file 'common/SongsPage.qml'
78--- common/SongsPage.qml 2015-01-26 03:20:37 +0000
79+++ common/SongsPage.qml 2015-01-28 02:32:37 +0000
80@@ -308,6 +308,7 @@
81 centerIn: parent
82 }
83 color: "white"
84+ // TRANSLATORS: this appears in a button with limited space (around 14 characters)
85 text: i18n.tr("Shuffle")
86 }
87 onClicked: {
88@@ -334,6 +335,7 @@
89 centerIn: parent
90 }
91 color: "white"
92+ // TRANSLATORS: this appears in a button with limited space (around 14 characters)
93 text: i18n.tr("Queue all")
94 }
95 onClicked: addQueueFromModel(albumtrackslist.model)
96@@ -342,6 +344,7 @@
97 id: playRow
98 color: UbuntuColors.green
99 height: units.gu(4)
100+ // TRANSLATORS: this appears in a button with limited space (around 14 characters)
101 text: i18n.tr("Play all")
102 width: units.gu(15)
103 onClicked: {
104
105=== modified file 'po/com.ubuntu.music.pot'
106--- po/com.ubuntu.music.pot 2015-01-21 01:16:38 +0000
107+++ po/com.ubuntu.music.pot 2015-01-28 02:32:37 +0000
108@@ -8,7 +8,7 @@
109 msgstr ""
110 "Project-Id-Version: music-app\n"
111 "Report-Msgid-Bugs-To: \n"
112-"POT-Creation-Date: 2015-01-21 01:16+0000\n"
113+"POT-Creation-Date: 2015-01-27 20:23-0600\n"
114 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
115 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
116 "Language-Team: LANGUAGE <LL@li.org>\n"
117@@ -22,18 +22,18 @@
118 msgid "Albums"
119 msgstr ""
120
121-#: ../MusicAlbums.qml:69 ../MusicStart.qml:78 ../common/AlbumsPage.qml:148
122-#: ../common/AlbumsPage.qml:162 ../common/SongsPage.qml:373
123+#: ../MusicAlbums.qml:69 ../MusicStart.qml:78 ../common/AlbumsPage.qml:152
124+#: ../common/AlbumsPage.qml:166 ../common/SongsPage.qml:380
125 msgid "Unknown Album"
126 msgstr ""
127
128 #: ../MusicAlbums.qml:70 ../MusicArtists.qml:77 ../MusicStart.qml:79
129-#: ../common/AlbumsPage.qml:104 ../common/AlbumsPage.qml:161
130-#: ../common/SongsPage.qml:394
131+#: ../common/AlbumsPage.qml:108 ../common/AlbumsPage.qml:165
132+#: ../common/SongsPage.qml:401
133 msgid "Unknown Artist"
134 msgstr ""
135
136-#: ../MusicAlbums.qml:81 ../MusicStart.qml:95 ../common/AlbumsPage.qml:160
137+#: ../MusicAlbums.qml:81 ../MusicStart.qml:95 ../common/AlbumsPage.qml:164
138 msgid "Album"
139 msgstr ""
140
141@@ -49,56 +49,60 @@
142 msgid "Genres"
143 msgstr ""
144
145-#: ../MusicGenres.qml:108 ../MusicGenres.qml:110 ../common/SongsPage.qml:312
146-#: ../common/SongsPage.qml:346 ../common/SongsPage.qml:360
147-#: ../common/SongsPage.qml:396 ../common/SongsPage.qml:415
148-#: ../common/SongsPage.qml:447
149+#: ../MusicGenres.qml:108 ../MusicGenres.qml:110 ../common/SongsPage.qml:317
150+#: ../common/SongsPage.qml:353 ../common/SongsPage.qml:367
151+#: ../common/SongsPage.qml:403 ../common/SongsPage.qml:422
152+#: ../common/SongsPage.qml:454
153 msgid "Genre"
154 msgstr ""
155
156-#: ../MusicNowPlaying.qml:35 ../music-app.qml:668 ../music-app.qml:700
157-#: ../music-app.qml:1059 ../music-app.qml:1262 ../music-app.qml:1274
158-#: ../music-app.qml:1302
159+#. TRANSLATORS: this appears in the header with limited space (around 20 characters)
160+#: ../MusicNowPlaying.qml:40 ../music-app.qml:672 ../music-app.qml:1050
161+#: ../music-app.qml:1253 ../music-app.qml:1294
162+msgid "Now playing"
163+msgstr ""
164+
165+#. TRANSLATORS: this appears in the header with limited space (around 20 characters)
166+#: ../MusicNowPlaying.qml:42 ../music-app.qml:672 ../music-app.qml:704
167+#: ../music-app.qml:1051 ../music-app.qml:1254 ../music-app.qml:1266
168+#: ../music-app.qml:1294
169 msgid "Queue"
170 msgstr ""
171
172-#: ../MusicNowPlaying.qml:35 ../music-app.qml:668 ../music-app.qml:1058
173-#: ../music-app.qml:1261 ../music-app.qml:1302
174-msgid "Now playing"
175-msgstr ""
176-
177-#: ../MusicNowPlaying.qml:90 ../MusicNowPlaying.qml:150 ../MusicTracks.qml:74
178+#. TRANSLATORS: this action appears in the overflow drawer with limited space (around 18 characters)
179+#: ../MusicNowPlaying.qml:96 ../MusicNowPlaying.qml:157 ../MusicTracks.qml:74
180 #: ../common/ListItemActions/AddToPlaylist.qml:26 ../common/SongsPage.qml:169
181 msgid "Add to playlist"
182 msgstr ""
183
184-#: ../MusicNowPlaying.qml:110
185+#. TRANSLATORS: this action appears in the overflow drawer with limited space (around 18 characters)
186+#: ../MusicNowPlaying.qml:117
187 msgid "Clear queue"
188 msgstr ""
189
190-#: ../MusicNowPlaying.qml:128 ../MusicTracks.qml:51
191+#: ../MusicNowPlaying.qml:135 ../MusicTracks.qml:51
192 #: ../common/SongsPage.qml:147
193 msgid "Cancel selection"
194 msgstr ""
195
196-#: ../MusicNowPlaying.qml:137 ../MusicTracks.qml:62
197+#: ../MusicNowPlaying.qml:144 ../MusicTracks.qml:62
198 #: ../common/SongsPage.qml:157
199 msgid "Select All"
200 msgstr ""
201
202-#: ../MusicNowPlaying.qml:173 ../common/SongsPage.qml:204
203+#: ../MusicNowPlaying.qml:180 ../common/SongsPage.qml:208
204 msgid "Delete"
205 msgstr ""
206
207 #. TRANSLATORS: this is the name of the playlists page shown in the tab header.
208 #. Remember to keep the translation short to fit the screen width
209-#: ../MusicPlaylists.qml:35 ../MusicaddtoPlaylist.qml:115
210+#: ../MusicPlaylists.qml:35 ../MusicaddtoPlaylist.qml:112
211 #: ../common/SongsPage.qml:85
212 msgid "Playlists"
213 msgstr ""
214
215-#: ../MusicPlaylists.qml:97 ../MusicaddtoPlaylist.qml:105
216-#: ../common/SongsPage.qml:416 ../common/SongsPage.qml:417
217+#: ../MusicPlaylists.qml:97 ../MusicaddtoPlaylist.qml:106
218+#: ../common/SongsPage.qml:423 ../common/SongsPage.qml:424
219 #, qt-format
220 msgid "%1 song"
221 msgid_plural "%1 songs"
222@@ -107,14 +111,14 @@
223
224 #: ../MusicPlaylists.qml:110 ../MusicPlaylists.qml:111 ../MusicStart.qml:79
225 #: ../MusicStart.qml:95 ../common/SongsPage.qml:64 ../common/SongsPage.qml:105
226-#: ../common/SongsPage.qml:205 ../common/SongsPage.qml:314
227-#: ../common/SongsPage.qml:348 ../common/SongsPage.qml:359
228-#: ../common/SongsPage.qml:395 ../common/SongsPage.qml:431
229-#: ../common/SongsPage.qml:434 ../common/SongsPage.qml:449
230+#: ../common/SongsPage.qml:209 ../common/SongsPage.qml:319
231+#: ../common/SongsPage.qml:355 ../common/SongsPage.qml:366
232+#: ../common/SongsPage.qml:402 ../common/SongsPage.qml:438
233+#: ../common/SongsPage.qml:441 ../common/SongsPage.qml:456
234 msgid "Playlist"
235 msgstr ""
236
237-#: ../MusicStart.qml:34 ../MusicaddtoPlaylist.qml:123
238+#: ../MusicStart.qml:34 ../MusicaddtoPlaylist.qml:120
239 #: ../common/SongsPage.qml:95
240 msgid "Recent"
241 msgstr ""
242@@ -131,23 +135,27 @@
243 msgid "Add to queue"
244 msgstr ""
245
246-#: ../MusicaddtoPlaylist.qml:42 ../music-app.qml:1414
247+#. TRANSLATORS: this appears in the header with limited space (around 20 characters)
248+#: ../MusicaddtoPlaylist.qml:43 ../music-app.qml:1406
249 msgid "Select playlist"
250 msgstr ""
251
252-#: ../common/AlbumsPage.qml:63 ../common/SongsPage.qml:307
253+#. TRANSLATORS: this appears in a button with limited space (around 14 characters)
254+#: ../common/AlbumsPage.qml:65 ../common/SongsPage.qml:312
255 msgid "Shuffle"
256 msgstr ""
257
258-#: ../common/AlbumsPage.qml:77 ../common/SongsPage.qml:333
259+#. TRANSLATORS: this appears in a button with limited space (around 14 characters)
260+#: ../common/AlbumsPage.qml:80 ../common/SongsPage.qml:339
261 msgid "Queue all"
262 msgstr ""
263
264-#: ../common/AlbumsPage.qml:85 ../common/SongsPage.qml:341
265+#. TRANSLATORS: this appears in a button with limited space (around 14 characters)
266+#: ../common/AlbumsPage.qml:89 ../common/SongsPage.qml:348
267 msgid "Play all"
268 msgstr ""
269
270-#: ../common/AlbumsPage.qml:123
271+#: ../common/AlbumsPage.qml:127
272 #, qt-format
273 msgid "%1 album"
274 msgid_plural "%1 albums"
275@@ -158,7 +166,7 @@
276 msgid "Add to Queue"
277 msgstr ""
278
279-#: ../common/ListItemActions/Remove.qml:27 ../common/SongsPage.qml:586
280+#: ../common/ListItemActions/Remove.qml:27 ../common/SongsPage.qml:593
281 msgid "Remove"
282 msgstr ""
283
284@@ -175,73 +183,73 @@
285 msgstr ""
286
287 #. TRANSLATORS: this is a title of a dialog with a prompt to rename a playlist
288-#: ../common/SongsPage.qml:521
289+#: ../common/SongsPage.qml:528
290 msgid "Rename playlist"
291 msgstr ""
292
293-#: ../common/SongsPage.qml:528 ../music-app.qml:1012
294+#: ../common/SongsPage.qml:535 ../music-app.qml:1004
295 msgid "Enter playlist name"
296 msgstr ""
297
298-#: ../common/SongsPage.qml:537
299+#: ../common/SongsPage.qml:544
300 msgid "Change"
301 msgstr ""
302
303-#: ../common/SongsPage.qml:558 ../music-app.qml:1038
304+#: ../common/SongsPage.qml:565 ../music-app.qml:1030
305 msgid "Playlist already exists"
306 msgstr ""
307
308-#: ../common/SongsPage.qml:562 ../music-app.qml:1043
309+#: ../common/SongsPage.qml:569 ../music-app.qml:1035
310 msgid "Please type in a name."
311 msgstr ""
312
313-#: ../common/SongsPage.qml:567 ../common/SongsPage.qml:605
314-#: ../music-app.qml:485 ../music-app.qml:1049
315+#: ../common/SongsPage.qml:574 ../common/SongsPage.qml:612
316+#: ../music-app.qml:488 ../music-app.qml:1041
317 msgid "Cancel"
318 msgstr ""
319
320 #. TRANSLATORS: this is a title of a dialog with a prompt to delete a playlist
321-#: ../common/SongsPage.qml:580
322+#: ../common/SongsPage.qml:587
323 msgid "Permanently delete playlist?"
324 msgstr ""
325
326-#: ../common/SongsPage.qml:581
327+#: ../common/SongsPage.qml:588
328 msgid "This cannot be undone"
329 msgstr ""
330
331-#: ../common/Walkthrough/Slide1.qml:56
332+#: ../common/Walkthrough/Slide1.qml:57
333 msgid "Welcome to Music"
334 msgstr ""
335
336-#: ../common/Walkthrough/Slide1.qml:68
337+#: ../common/Walkthrough/Slide1.qml:70
338 msgid ""
339 "Enjoy your favorite music with Ubuntu's Music App. Take a short tour on how "
340 "to get started or press skip to start listening now."
341 msgstr ""
342
343-#: ../common/Walkthrough/Slide2.qml:51
344+#: ../common/Walkthrough/Slide2.qml:52
345 msgid "Import your music"
346 msgstr ""
347
348-#: ../common/Walkthrough/Slide2.qml:62 ../music-app.qml:1399
349+#: ../common/Walkthrough/Slide2.qml:64 ../music-app.qml:1391
350 msgid ""
351 "Connect your device to any computer and simply drag files to the Music "
352 "folder or insert removable media with music."
353 msgstr ""
354
355-#: ../common/Walkthrough/Slide3.qml:51
356+#: ../common/Walkthrough/Slide3.qml:52
357 msgid "Download new music"
358 msgstr ""
359
360-#: ../common/Walkthrough/Slide3.qml:62
361+#: ../common/Walkthrough/Slide3.qml:64
362 msgid "Directly import music bought while browsing online."
363 msgstr ""
364
365-#: ../common/Walkthrough/Slide3.qml:76
366+#: ../common/Walkthrough/Slide3.qml:78
367 msgid "Start"
368 msgstr ""
369
370-#: ../common/Walkthrough/Walkthrough.qml:82
371+#: ../common/Walkthrough/Walkthrough.qml:85
372 msgid "Skip"
373 msgstr ""
374
375@@ -294,71 +302,71 @@
376 msgstr ""
377
378 #. TRANSLATORS: This string represents that the target destination filepath does not start with ~/Music/Imported/
379-#: ../music-app.qml:328
380+#: ../music-app.qml:331
381 msgid "Filepath must start with"
382 msgstr ""
383
384 #. TRANSLATORS: This string represents that a blank filepath destination has been used
385-#: ../music-app.qml:354
386+#: ../music-app.qml:357
387 msgid "Filepath must be a file"
388 msgstr ""
389
390 #. TRANSLATORS: This string represents that there was failure moving the file to the target destination
391-#: ../music-app.qml:360
392+#: ../music-app.qml:363
393 msgid "Failed to move file"
394 msgstr ""
395
396-#: ../music-app.qml:439
397+#: ../music-app.qml:442
398 msgid "Waiting for file(s)..."
399 msgstr ""
400
401-#: ../music-app.qml:458
402+#: ../music-app.qml:461
403 msgid "OK"
404 msgstr ""
405
406-#: ../music-app.qml:471
407+#: ../music-app.qml:474
408 msgid "Imported file not found"
409 msgstr ""
410
411-#: ../music-app.qml:475
412+#: ../music-app.qml:478
413 msgid "Wait"
414 msgstr ""
415
416 #. 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)
417-#: ../music-app.qml:496
418+#: ../music-app.qml:499
419 msgid "songs played today"
420 msgstr ""
421
422-#: ../music-app.qml:497
423+#: ../music-app.qml:500
424 msgid "No songs played today"
425 msgstr ""
426
427-#: ../music-app.qml:590 ../music-app.qml:1298
428+#: ../music-app.qml:593 ../music-app.qml:1290
429 #: com.ubuntu.music_music.desktop.in.in.h:1
430 msgid "Music"
431 msgstr ""
432
433-#: ../music-app.qml:609
434+#: ../music-app.qml:612
435 msgid "Debug: "
436 msgstr ""
437
438-#: ../music-app.qml:1008
439+#: ../music-app.qml:1000
440 msgid "New playlist"
441 msgstr ""
442
443-#: ../music-app.qml:1022
444+#: ../music-app.qml:1014
445 msgid "Create"
446 msgstr ""
447
448-#: ../music-app.qml:1388
449+#: ../music-app.qml:1380
450 msgid "No music found"
451 msgstr ""
452
453-#: ../music-app.qml:1427
454+#: ../music-app.qml:1419
455 msgid "No playlists found"
456 msgstr ""
457
458-#: ../music-app.qml:1438
459+#: ../music-app.qml:1430
460 #, qt-format
461 msgid ""
462 "Get more out of Music by tapping the %1 icon to start making playlists for "

Subscribers

People subscribed via source and target branches