mediaplayer-app

Merge lp://staging/~renatofilho/mediaplayer-app/fix-1382317 into lp://staging/mediaplayer-app

  1. fix-1382317
  2. Merge into trunk
Proposed by Renato Araujo Oliveira Filho
Status: Superseded
Proposed branch: lp://staging/~renatofilho/mediaplayer-app/fix-1382317
Merge into: lp://staging/mediaplayer-app
Diff against target: 8359 lines (+1889/-1559)
62 files modified
po/CMakeLists.txt (+24/-6)
po/am.po (+28/-19)
po/ar.po (+32/-28)
po/ast.po (+28/-19)
po/az.po (+30/-26)
po/bg.po (+30/-26)
po/br.po (+32/-28)
po/bs.po (+32/-27)
po/ca.po (+32/-28)
po/ca@valencia.po (+28/-19)
po/cs.po (+32/-28)
po/da.po (+33/-28)
po/de.po (+30/-21)
po/el.po (+28/-24)
po/en_AU.po (+28/-19)
po/en_GB.po (+32/-28)
po/es.po (+33/-29)
po/eu.po (+33/-28)
po/fa.po (+28/-19)
po/fi.po (+30/-26)
po/fo.po (+28/-21)
po/fr.po (+28/-19)
po/gd.po (+28/-20)
po/gl.po (+30/-26)
po/he.po (+30/-26)
po/hi.po (+28/-24)
po/hr.po (+28/-24)
po/hu.po (+30/-26)
po/hy.po (+28/-24)
po/id.po (+32/-28)
po/is.po (+32/-29)
po/it.po (+33/-29)
po/ja.po (+32/-27)
po/km.po (+32/-28)
po/ko.po (+32/-27)
po/lo.po (+28/-24)
po/lv.po (+32/-28)
po/mediaplayer-app.pot (+28/-20)
po/mk.po (+28/-19)
po/ml.po (+28/-24)
po/ms.po (+33/-28)
po/my.po (+32/-29)
po/nb.po (+30/-26)
po/ne.po (+32/-29)
po/nl.po (+33/-29)
po/pl.po (+30/-26)
po/pt.po (+30/-26)
po/pt_BR.po (+33/-24)
po/ro.po (+33/-29)
po/ru.po (+32/-27)
po/shn.po (+28/-19)
po/sl.po (+30/-26)
po/sr.po (+30/-26)
po/sv.po (+33/-31)
po/ta.po (+33/-29)
po/te.po (+28/-24)
po/tr.po (+33/-29)
po/ug.po (+30/-26)
po/uk.po (+30/-26)
po/zh_CN.po (+32/-27)
po/zh_HK.po (+33/-27)
po/zh_TW.po (+33/-27)
To merge this branch: bzr merge lp://staging/~renatofilho/mediaplayer-app/fix-1382317
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Needs Fixing
Ubuntu Phablet Team Pending
Review via email: mp+240757@code.staging.launchpad.net

This proposal has been superseded by a proposal from 2014-11-06.

Commit message

Fixed cmake script to generate the necessary translations for desktop file.

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:303
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~renatofilho/mediaplayer-app/fix-1382317/+merge/240757/+edit-commit-message

http://jenkins.qa.ubuntu.com/job/mediaplayer-app-ci/242/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/6490
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/4305
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mediaplayer-app-utopic-amd64-ci/50
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mediaplayer-app-utopic-armhf-ci/50
        deb: http://jenkins.qa.ubuntu.com/job/mediaplayer-app-utopic-armhf-ci/50/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mediaplayer-app-utopic-i386-ci/50
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/6077
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/7742
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/7742/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/15489
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/3656
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/4699
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/4699/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mediaplayer-app-ci/242/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
Renato Araujo Oliveira Filho (renatofilho) wrote :

Is your branch in sync with latest trunk? YES

Did you perform an exploratory manual test run of your code change and any related functionality on device or emulator? YES

Did you successfully run all tests found in your component's Test Plan on device or emulator? YES

If you changed the UI, was the change specified/approved by design? NO UI CHANGED

If you changed UI labels, did you update the pot file? NO LABEL CHANGED

If you changed the packaging (debian), did you add a core-dev as a reviewer to this MP? NO PACKAGE CHANGE

lp://staging/~renatofilho/mediaplayer-app/fix-1382317 updated
267. By Renato Araujo Oliveira Filho

Resync trunk.

268. By Bill Filler

update translations

269. By Renato Araujo Oliveira Filho

Fixed cmake script to generate the necessary translations for desktop file.

Unmerged revisions

269. By Renato Araujo Oliveira Filho

Fixed cmake script to generate the necessary translations for desktop file.

268. By Bill Filler

update translations

267. By Renato Araujo Oliveira Filho

Resync trunk.

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