Ubuntu Music App

Merge lp://qastaging/~vthompson/music-app/fix-1378143 into lp://qastaging/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://qastaging/~vthompson/music-app/fix-1378143
Merge into: lp://qastaging/music-app
Prerequisite: lp://qastaging/~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://qastaging/~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.qastaging.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://qastaging/~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
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches