Ubuntu Music App

Merge lp://staging/~anthonywong/music-app/fix-typo into lp://staging/music-app/trusty

  1. fix-typo
  2. Merge into trusty
Proposed by Anthony Wong
Status: Merged
Approved by: Victor Thompson
Approved revision: 475
Merged at revision: 479
Proposed branch: lp://staging/~anthonywong/music-app/fix-typo
Merge into: lp://staging/music-app/trusty
Diff against target: 25 lines (+2/-2)
2 files modified
MusicSettings.qml (+1/-1)
po/com.ubuntu.music.pot (+1/-1)
To merge this branch: bzr merge lp://staging/~anthonywong/music-app/fix-typo
Reviewer Review Type Date Requested Status
Ubuntu Phone Apps Jenkins Bot continuous-integration Approve
Anthony Wong (community) Needs Resubmitting
Victor Thompson Abstain
Andrew Hayzen Approve
Alan Pope 🍺🐧🐱 🦄 (community) Approve
Adolfo Jayme Barrientos (community) Approve
Review via email: mp+221254@code.staging.launchpad.net

Commit message

Correct spelling of 'Acoustic' from 'Accoustic'

Description of the change

Just correct the spelling of 'Acoustic' from 'Accoustic'

To post a comment you must log in.
Revision history for this message
Adolfo Jayme Barrientos (fitojb) wrote :

Thanks for updating the .pot as well!

review: Approve
Revision history for this message
Alan Pope 🍺🐧🐱 🦄 (popey) wrote :

Thanks for the fix!

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

Thanks, lets get this merged :)

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

Thanks for the update. As a side note, in the future I'd rather we remove code that will not be used in the near term (like the code being fixed here), rather than have dead code that requires needless maintenance for both us and translators.

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

FAILED: Autolanding.
No commit message was specified in the merge proposal. Hit 'Add commit message' on the merge proposal web page or follow the link below. You can approve the merge proposal yourself to rerun.
https://code.launchpad.net/~anthonywong/music-app/fix-typo/+merge/221254/+edit-commit-message

review: Needs Fixing (continuous-integration)
Revision history for this message
Anthony Wong (anthonywong) :
review: Approve
Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :

FAILED: Autolanding.
More details in the following jenkins job:
http://91.189.93.70:8080/job/music-app-autolanding/468/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/music-app-utopic-amd64-autolanding/9/console

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

Unfortunately, it looks like there's a conflict in the pot file that needs to be resolved. Sorry for the extra work involved here. To resolve this please do the following (from your branch's directory):

bzr merge lp:music-app
<edit po/com.ubuntu.music.pot to remove the conflicting information around "POT-Creation-Data">
bzr resolve po/com.ubuntu.music.pot
bzr commit -m "Resolved merge conflicts"
bzr push lp:~anthonywong/music-app/fix-typo

lp://staging/~anthonywong/music-app/fix-typo updated
475. By Anthony Wong

Resolved merge conflicts

Revision history for this message
Anthony Wong (anthonywong) wrote :

Thanks Victor for the instructions, the conflict has now been resolved, could you please take a look?

review: Needs Resubmitting
Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-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

to status/vote changes: