Ubuntu Music App

Merge lp:~vthompson/music-app/fix-1378143 into lp:music-app

  1. fix-1378143
  2. Merge into trunk
Proposed by Victor Thompson
Status: Merged
Approved by: Andrew Hayzen
Approved revision: 969
Merged at revision: 972
Proposed branch: lp:~vthompson/music-app/fix-1378143
Merge into: lp:music-app
Prerequisite: lp:~vthompson/music-app/release-2.3
Diff against target: 426 lines (+78/-78)
8 files modified
app/components/Helpers/UserMetricsHelper.qml (+3/-3)
app/ui/AddToPlaylist.qml (+1/-1)
app/ui/ContentHubExport.qml (+1/-1)
app/ui/Playlists.qml (+1/-1)
app/ui/Songs.qml (+1/-1)
app/ui/SongsView.qml (+2/-2)
debian/changelog (+1/-0)
po/com.ubuntu.music.pot (+68/-69)
To merge this branch: bzr merge lp:~vthompson/music-app/fix-1378143
Reviewer Review Type Date Requested Status
Jenkins Bot continuous-integration Approve
Andrew Hayzen Approve
Alan Pope 🍺🐧🐱 🦄 (community) Approve
Review via email: mp+284380@code.launchpad.net

Commit message

Change translation strings to use the word track, rather than song.

Description of the change

Change translation strings to use the word track, rather than song.

To post a comment you must log in.
Revision history for this message
Alan Pope 🍺🐧🐱 🦄 (popey) wrote :

LGTM.

review: Approve
Revision history for this message
Jenkins Bot (ubuntu-core-apps-jenkins-bot) wrote :

FAILED: Continuous integration, rev:966
https://core-apps-jenkins.ubuntu.com/job/run-ap-tests-ci/202/
Executed test runs:
    None: https://core-apps-jenkins.ubuntu.com/job/generic-update-mp/488/console

Click here to trigger a rebuild:
https://core-apps-jenkins.ubuntu.com/job/run-ap-tests-ci/202/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
Jenkins Bot (ubuntu-core-apps-jenkins-bot) wrote :

FAILED: Continuous integration, rev:967
https://core-apps-jenkins.ubuntu.com/job/run-ap-tests-ci/213/
Executed test runs:
    None: https://core-apps-jenkins.ubuntu.com/job/generic-update-mp/499/console

Click here to trigger a rebuild:
https://core-apps-jenkins.ubuntu.com/job/run-ap-tests-ci/213/rebuild

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

I think the files should be renamed to Tracks.qml etc and any mention of songs in the autopilot tests should be updated, so we don't become confused again.

review: Needs Fixing
Revision history for this message
Victor Thompson (vthompson) wrote :

I'd like to avoid doing any large rename internally to avoid any regressions. This is simply to get the translatable strings in place so the app has time to get translate (hence why it was the first MP proposed).

Revision history for this message
Jenkins Bot (ubuntu-core-apps-jenkins-bot) wrote :

PASSED: Continuous integration, rev:968
https://core-apps-jenkins.ubuntu.com/job/run-ap-tests-ci/223/
Executed test runs:
    None: https://core-apps-jenkins.ubuntu.com/job/generic-update-mp/514/console

Click here to trigger a rebuild:
https://core-apps-jenkins.ubuntu.com/job/run-ap-tests-ci/223/rebuild

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

OK, LGTM :-)

review: Approve
Revision history for this message
Jenkins Bot (ubuntu-core-apps-jenkins-bot) wrote :

FAILED: Autolanding.
More details in the following jenkins job:
https://core-apps-jenkins.ubuntu.com/job/music-app-autolanding/80/
Executed test runs:
    None: https://core-apps-jenkins.ubuntu.com/job/generic-land-mp/5614/console

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

Retrieving 'lp:~vthompson/music-app/fix-1378143' to put at 'build_dir'.
Merging 'lp:music-app' in to 'build_dir'.
Text conflict in debian/changelog
1 conflicts encountered.
bzr: ERROR: Conflicts from merge

lp:~vthompson/music-app/fix-1378143 updated
969. By Victor Thompson

Merge of trunk and resolve conflict

Revision history for this message
Victor Thompson (vthompson) wrote :

Fixed.

Revision history for this message
Jenkins Bot (ubuntu-core-apps-jenkins-bot) :
review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'app/components/Helpers/UserMetricsHelper.qml'
2--- app/components/Helpers/UserMetricsHelper.qml 2016-01-21 17:06:22 +0000
3+++ app/components/Helpers/UserMetricsHelper.qml 2016-02-21 16:07:15 +0000
4@@ -27,9 +27,9 @@
5 Metric {
6 id: songsMetric
7 name: "music-metrics"
8- // 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)
9- format: "<b>%1</b> " + i18n.tr("songs played today")
10- emptyFormat: i18n.tr("No songs played today")
11+ // TRANSLATORS: this refers to a number of tracks 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)
12+ format: "<b>%1</b> " + i18n.tr("tracks played today")
13+ emptyFormat: i18n.tr("No tracks played today")
14 domain: "com.ubuntu.music"
15 }
16
17
18=== modified file 'app/ui/AddToPlaylist.qml'
19--- app/ui/AddToPlaylist.qml 2016-01-12 01:06:16 +0000
20+++ app/ui/AddToPlaylist.qml 2016-02-21 16:07:15 +0000
21@@ -96,7 +96,7 @@
22 property string count: model.count
23
24 primaryText: playlist.name
25- secondaryText: i18n.tr("%1 song", "%1 songs", playlist.count).arg(playlist.count)
26+ secondaryText: i18n.tr("%1 track", "%1 track", playlist.count).arg(playlist.count)
27
28 onClicked: {
29 Playlists.addToPlaylistList(name, chosenElements)
30
31=== modified file 'app/ui/ContentHubExport.qml'
32--- app/ui/ContentHubExport.qml 2016-01-16 01:30:31 +0000
33+++ app/ui/ContentHubExport.qml 2016-02-21 16:07:15 +0000
34@@ -30,7 +30,7 @@
35
36 MusicPage {
37 id: contentHubExportPage
38- title: i18n.tr("Export Song")
39+ title: i18n.tr("Export Track")
40 searchResultsCount: songsModelFilter.count
41 showToolbar: false
42 state: "default"
43
44=== modified file 'app/ui/Playlists.qml'
45--- app/ui/Playlists.qml 2016-01-12 01:06:16 +0000
46+++ app/ui/Playlists.qml 2016-02-21 16:07:15 +0000
47@@ -91,7 +91,7 @@
48 coverSources: Playlists.getPlaylistCovers(model.name)
49 objectName: "playlistCardItem" + index
50 primaryText: model.name
51- secondaryText: i18n.tr("%1 song", "%1 songs", model.count).arg(model.count)
52+ secondaryText: i18n.tr("%1 track", "%1 tracks", model.count).arg(model.count)
53
54 onClicked: {
55 albumTracksModel.filterPlaylistTracks(model.name)
56
57=== modified file 'app/ui/Songs.qml'
58--- app/ui/Songs.qml 2016-01-12 00:51:50 +0000
59+++ app/ui/Songs.qml 2016-02-21 16:07:15 +0000
60@@ -33,7 +33,7 @@
61 MusicPage {
62 id: songsPage
63 objectName: "songsPage"
64- title: i18n.tr("Songs")
65+ title: i18n.tr("Tracks")
66 searchable: true
67 searchResultsCount: songsModelFilter.count
68 state: "default"
69
70=== modified file 'app/ui/SongsView.qml'
71--- app/ui/SongsView.qml 2016-01-09 12:49:43 +0000
72+++ app/ui/SongsView.qml 2016-02-21 16:07:15 +0000
73@@ -288,8 +288,8 @@
74 fontSize: "small"
75 maximumLineCount: 1
76 text: isAlbum && line1 !== i18n.tr("Genre")
77- ? (year !== "" ? year + " | " : "") + i18n.tr("%1 song", "%1 songs", albumtrackslist.count).arg(albumtrackslist.count)
78- : i18n.tr("%1 song", "%1 songs", albumtrackslist.count).arg(albumtrackslist.count)
79+ ? (year !== "" ? year + " | " : "") + i18n.tr("%1 track", "%1 tracks", albumtrackslist.count).arg(albumtrackslist.count)
80+ : i18n.tr("%1 track", "%1 tracks", albumtrackslist.count).arg(albumtrackslist.count)
81 wrapMode: Text.NoWrap
82 }
83 }
84
85=== modified file 'debian/changelog'
86--- debian/changelog 2016-01-31 00:00:13 +0000
87+++ debian/changelog 2016-02-21 16:07:15 +0000
88@@ -3,6 +3,7 @@
89 [ Victor Thompson ]
90 * Release 2.3 and start 2.4
91 * Remove repeater for getting album titles in Artists.qml (LP: #1515067).
92+ * Change translation strings from song to track (LP: #1378143).
93
94 -- Victor <victor@victor-virtual-machine> Wed, 27 Jan 2016 19:40:55 -0600
95
96
97=== modified file 'po/com.ubuntu.music.pot'
98--- po/com.ubuntu.music.pot 2015-10-24 19:09:41 +0000
99+++ po/com.ubuntu.music.pot 2016-02-21 16:07:15 +0000
100@@ -1,6 +1,6 @@
101 # SOME DESCRIPTIVE TITLE.
102 # Copyright (C) YEAR Canonical Ltd.
103-# This file is distributed under the same license as the PACKAGE package.
104+# This file is distributed under the same license as the music-app package.
105 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
106 #
107 #, fuzzy
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-10-24 14:06-0500\n"
113+"POT-Creation-Date: 2016-01-28 20:27-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@@ -37,7 +37,7 @@
118 msgid "Cancel"
119 msgstr ""
120
121-#: ../app/components/Dialog/ContentHubWaitDialog.qml:33
122+#: ../app/components/Dialog/ContentHubWaitDialog.qml:34
123 msgid "Waiting for file(s)..."
124 msgstr ""
125
126@@ -87,26 +87,26 @@
127 msgid "Remove"
128 msgstr ""
129
130-#: ../app/components/HeadState/MultiSelectHeadState.qml:27
131+#: ../app/components/HeadState/MultiSelectHeadState.qml:28
132 msgid "Select All"
133 msgstr ""
134
135 #. TRANSLATORS: this action appears in the overflow drawer with limited space (around 18 characters)
136-#: ../app/components/HeadState/MultiSelectHeadState.qml:39
137+#: ../app/components/HeadState/MultiSelectHeadState.qml:40
138 #: ../app/components/ListItemActions/AddToPlaylist.qml:26
139-#: ../app/ui/NowPlaying.qml:108
140+#: ../app/ui/NowPlaying.qml:105
141 msgid "Add to playlist"
142 msgstr ""
143
144-#: ../app/components/HeadState/MultiSelectHeadState.qml:56
145+#: ../app/components/HeadState/MultiSelectHeadState.qml:58
146 msgid "Add to queue"
147 msgstr ""
148
149-#: ../app/components/HeadState/MultiSelectHeadState.qml:74
150+#: ../app/components/HeadState/MultiSelectHeadState.qml:77
151 msgid "Delete"
152 msgstr ""
153
154-#: ../app/components/HeadState/MultiSelectHeadState.qml:86
155+#: ../app/components/HeadState/MultiSelectHeadState.qml:89
156 msgid "Cancel selection"
157 msgstr ""
158
159@@ -129,13 +129,13 @@
160 msgid "Failed to move file"
161 msgstr ""
162
163-#. 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)
164+#. TRANSLATORS: this refers to a number of tracks 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)
165 #: ../app/components/Helpers/UserMetricsHelper.qml:31
166-msgid "songs played today"
167+msgid "tracks played today"
168 msgstr ""
169
170 #: ../app/components/Helpers/UserMetricsHelper.qml:32
171-msgid "No songs played today"
172+msgid "No tracks played today"
173 msgstr ""
174
175 #: ../app/components/ListItemActions/AddToQueue.qml:28
176@@ -171,12 +171,12 @@
177 msgstr ""
178
179 #. TRANSLATORS: this appears in a button with limited space (around 14 characters)
180-#: ../app/components/ViewButton/QueueAllButton.qml:42
181+#: ../app/components/ViewButton/QueueAllButton.qml:46
182 msgid "Queue all"
183 msgstr ""
184
185 #. TRANSLATORS: this appears in a button with limited space (around 14 characters)
186-#: ../app/components/ViewButton/ShuffleButton.qml:42
187+#: ../app/components/ViewButton/ShuffleButton.qml:46
188 msgid "Shuffle"
189 msgstr ""
190
191@@ -195,7 +195,7 @@
192 msgstr ""
193
194 #: ../app/components/Walkthrough/Slide2.qml:67
195-#: ../app/ui/LibraryEmptyState.qml:123
196+#: ../app/ui/LibraryEmptyState.qml:131
197 msgid ""
198 "Connect your device to any computer and simply drag files to the Music "
199 "folder or insert removable media with music."
200@@ -213,94 +213,93 @@
201 msgid "Start"
202 msgstr ""
203
204-#: ../app/components/Walkthrough/Walkthrough.qml:120
205+#: ../app/components/Walkthrough/Walkthrough.qml:119
206 msgid "Skip"
207 msgstr ""
208
209-#: ../app/music-app.qml:156
210+#: ../app/music-app.qml:158
211 msgid "Next"
212 msgstr ""
213
214-#: ../app/music-app.qml:157
215+#: ../app/music-app.qml:159
216 msgid "Next Track"
217 msgstr ""
218
219-#: ../app/music-app.qml:163
220+#: ../app/music-app.qml:165
221 msgid "Pause"
222 msgstr ""
223
224-#: ../app/music-app.qml:163
225+#: ../app/music-app.qml:165
226 msgid "Play"
227 msgstr ""
228
229-#: ../app/music-app.qml:165
230+#: ../app/music-app.qml:167
231 msgid "Pause Playback"
232 msgstr ""
233
234-#: ../app/music-app.qml:165
235+#: ../app/music-app.qml:167
236 msgid "Continue or start playback"
237 msgstr ""
238
239-#: ../app/music-app.qml:170
240+#: ../app/music-app.qml:172
241 msgid "Back"
242 msgstr ""
243
244-#: ../app/music-app.qml:171
245+#: ../app/music-app.qml:173
246 msgid "Go back to last page"
247 msgstr ""
248
249-#: ../app/music-app.qml:179
250+#: ../app/music-app.qml:181
251 msgid "Previous"
252 msgstr ""
253
254-#: ../app/music-app.qml:180
255+#: ../app/music-app.qml:182
256 msgid "Previous Track"
257 msgstr ""
258
259-#: ../app/music-app.qml:185
260+#: ../app/music-app.qml:187
261 msgid "Stop"
262 msgstr ""
263
264-#: ../app/music-app.qml:186
265+#: ../app/music-app.qml:188
266 msgid "Stop Playback"
267 msgstr ""
268
269-#: ../app/music-app.qml:277 com.ubuntu.music_music.desktop.in.in.h:1
270+#: ../app/music-app.qml:273 com.ubuntu.music_music.desktop.in.in.h:1
271 msgid "Music"
272 msgstr ""
273
274-#: ../app/music-app.qml:307
275+#: ../app/music-app.qml:303
276 msgid "Debug: "
277 msgstr ""
278
279 #. TRANSLATORS: this appears in the header with limited space (around 20 characters)
280-#: ../app/music-app.qml:372 ../app/music-app.qml:982
281-#: ../app/ui/NowPlaying.qml:38
282+#: ../app/music-app.qml:848 ../app/ui/NowPlaying.qml:38
283 msgid "Now playing"
284 msgstr ""
285
286 #. TRANSLATORS: this appears in the header with limited space (around 20 characters)
287-#: ../app/ui/AddToPlaylist.qml:45
288+#: ../app/ui/AddToPlaylist.qml:43
289 msgid "Select playlist"
290 msgstr ""
291
292-#: ../app/ui/AddToPlaylist.qml:93 ../app/ui/Playlists.qml:86
293-#: ../app/ui/SongsView.qml:292 ../app/ui/SongsView.qml:293
294+#: ../app/ui/AddToPlaylist.qml:99 ../app/ui/Playlists.qml:94
295+#: ../app/ui/SongsView.qml:291 ../app/ui/SongsView.qml:292
296 #, qt-format
297-msgid "%1 song"
298-msgid_plural "%1 songs"
299+msgid "%1 track"
300+msgid_plural "%1 track"
301 msgstr[0] ""
302 msgstr[1] ""
303
304 #. TRANSLATORS: this is the name of the playlists page shown in the tab header.
305 #. Remember to keep the translation short to fit the screen width
306-#: ../app/ui/AddToPlaylist.qml:98 ../app/ui/Playlists.qml:37
307-#: ../app/ui/SongsView.qml:103
308+#: ../app/ui/AddToPlaylist.qml:104 ../app/ui/Playlists.qml:36
309+#: ../app/ui/SongsView.qml:102
310 msgid "Playlists"
311 msgstr ""
312
313-#: ../app/ui/AddToPlaylist.qml:108 ../app/ui/Recent.qml:36
314-#: ../app/ui/SongsView.qml:91
315+#: ../app/ui/AddToPlaylist.qml:114 ../app/ui/Recent.qml:34
316+#: ../app/ui/SongsView.qml:90
317 msgid "Recent"
318 msgstr ""
319
320@@ -308,54 +307,54 @@
321 msgid "Albums"
322 msgstr ""
323
324-#: ../app/ui/Albums.qml:72 ../app/ui/ArtistView.qml:128
325-#: ../app/ui/ArtistView.qml:141 ../app/ui/Recent.qml:81
326-#: ../app/ui/SongsView.qml:249
327+#: ../app/ui/Albums.qml:82 ../app/ui/ArtistView.qml:136
328+#: ../app/ui/ArtistView.qml:149 ../app/ui/Recent.qml:88
329+#: ../app/ui/SongsView.qml:248
330 msgid "Unknown Album"
331 msgstr ""
332
333-#: ../app/ui/Albums.qml:73 ../app/ui/ArtistView.qml:84
334-#: ../app/ui/ArtistView.qml:140 ../app/ui/Artists.qml:79
335-#: ../app/ui/Recent.qml:82 ../app/ui/SongsView.qml:270
336+#: ../app/ui/Albums.qml:83 ../app/ui/ArtistView.qml:75
337+#: ../app/ui/ArtistView.qml:148 ../app/ui/Artists.qml:86
338+#: ../app/ui/Recent.qml:89 ../app/ui/SongsView.qml:269
339 msgid "Unknown Artist"
340 msgstr ""
341
342-#: ../app/ui/Albums.qml:83 ../app/ui/ArtistView.qml:139
343-#: ../app/ui/Recent.qml:97
344+#: ../app/ui/Albums.qml:93 ../app/ui/ArtistView.qml:147
345+#: ../app/ui/Recent.qml:104
346 msgid "Album"
347 msgstr ""
348
349-#: ../app/ui/ArtistView.qml:103
350+#: ../app/ui/ArtistView.qml:94
351 #, qt-format
352 msgid "%1 album"
353 msgid_plural "%1 albums"
354 msgstr[0] ""
355 msgstr[1] ""
356
357-#: ../app/ui/Artists.qml:37
358+#: ../app/ui/Artists.qml:36
359 msgid "Artists"
360 msgstr ""
361
362-#: ../app/ui/Artists.qml:107
363+#: ../app/ui/Artists.qml:114
364 msgid "Artist"
365 msgstr ""
366
367 #: ../app/ui/ContentHubExport.qml:33
368-msgid "Export Song"
369+msgid "Export Track"
370 msgstr ""
371
372 #: ../app/ui/Genres.qml:32
373 msgid "Genres"
374 msgstr ""
375
376-#: ../app/ui/Genres.qml:110 ../app/ui/Genres.qml:112
377-#: ../app/ui/SongsView.qml:201 ../app/ui/SongsView.qml:220
378-#: ../app/ui/SongsView.qml:235 ../app/ui/SongsView.qml:272
379-#: ../app/ui/SongsView.qml:291 ../app/ui/SongsView.qml:334
380+#: ../app/ui/Genres.qml:118 ../app/ui/Genres.qml:120
381+#: ../app/ui/SongsView.qml:200 ../app/ui/SongsView.qml:219
382+#: ../app/ui/SongsView.qml:234 ../app/ui/SongsView.qml:271
383+#: ../app/ui/SongsView.qml:290 ../app/ui/SongsView.qml:317
384 msgid "Genre"
385 msgstr ""
386
387-#: ../app/ui/LibraryEmptyState.qml:112
388+#: ../app/ui/LibraryEmptyState.qml:119
389 msgid "No music found"
390 msgstr ""
391
392@@ -370,23 +369,23 @@
393 msgstr ""
394
395 #. TRANSLATORS: this action appears in the overflow drawer with limited space (around 18 characters)
396-#: ../app/ui/NowPlaying.qml:123
397+#: ../app/ui/NowPlaying.qml:122
398 msgid "Clear queue"
399 msgstr ""
400
401-#: ../app/ui/Playlists.qml:98 ../app/ui/Playlists.qml:99
402-#: ../app/ui/Recent.qml:82 ../app/ui/Recent.qml:97 ../app/ui/SongsView.qml:67
403-#: ../app/ui/SongsView.qml:82 ../app/ui/SongsView.qml:114
404-#: ../app/ui/SongsView.qml:154 ../app/ui/SongsView.qml:188
405-#: ../app/ui/SongsView.qml:203 ../app/ui/SongsView.qml:222
406-#: ../app/ui/SongsView.qml:234 ../app/ui/SongsView.qml:271
407-#: ../app/ui/SongsView.qml:319 ../app/ui/SongsView.qml:322
408-#: ../app/ui/SongsView.qml:336
409+#: ../app/ui/Playlists.qml:106 ../app/ui/Playlists.qml:107
410+#: ../app/ui/Recent.qml:89 ../app/ui/Recent.qml:104 ../app/ui/SongsView.qml:66
411+#: ../app/ui/SongsView.qml:81 ../app/ui/SongsView.qml:113
412+#: ../app/ui/SongsView.qml:153 ../app/ui/SongsView.qml:187
413+#: ../app/ui/SongsView.qml:202 ../app/ui/SongsView.qml:221
414+#: ../app/ui/SongsView.qml:233 ../app/ui/SongsView.qml:270
415+#: ../app/ui/SongsView.qml:300 ../app/ui/SongsView.qml:303
416+#: ../app/ui/SongsView.qml:319
417 msgid "Playlist"
418 msgstr ""
419
420-#: ../app/ui/Songs.qml:37
421-msgid "Songs"
422+#: ../app/ui/Songs.qml:36
423+msgid "Tracks"
424 msgstr ""
425
426 #: com.ubuntu.music_music.desktop.in.in.h:2

Subscribers

People subscribed via source and target branches