gallery-app

Merge lp://qastaging/~phablet-team/gallery-app/gallery-app-new-album-i18n into lp://qastaging/gallery-app

  1. gallery-app-new-album-i18n
  2. Merge into trunk
Proposed by Ugo Riboni
Status: Merged
Approved by: Bill Filler
Approved revision: 1050
Merged at revision: 1053
Proposed branch: lp://qastaging/~phablet-team/gallery-app/gallery-app-new-album-i18n
Merge into: lp://qastaging/gallery-app
Diff against target: 75 lines (+5/-19)
4 files modified
rc/qml/AlbumEditor/AlbumEditor.qml (+0/-14)
rc/qml/AlbumsOverview.qml (+2/-0)
rc/qml/Components/PopupAlbumPicker.qml (+2/-0)
src/album/album.cpp (+1/-5)
To merge this branch: bzr merge lp://qastaging/~phablet-team/gallery-app/gallery-app-new-album-i18n
Reviewer Review Type Date Requested Status
Arthur Mello (community) Approve
PS Jenkins bot continuous-integration Needs Fixing
Review via email: mp+233018@code.qastaging.launchpad.net

Commit message

Move the new album strings to QML to make them translatable. Remove some dead code.

Description of the change

Move the new album strings to QML to make them translatable. Remove some dead code.

To post a comment you must log in.
lp://qastaging/~phablet-team/gallery-app/gallery-app-new-album-i18n updated
1050. By Ugo Riboni

merge changes from trunk

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:1049
http://jenkins.qa.ubuntu.com/job/gallery-app-ci/973/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-utopic-amd64-ci/148
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-utopic-armhf-ci/148
        deb: http://jenkins.qa.ubuntu.com/job/gallery-app-utopic-armhf-ci/148/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-utopic-i386-ci/148
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-utopic-touch/314
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/3239
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-runner-mako/455
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-builder-utopic-armhf/509
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/12466
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/2656
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/3532
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/3532/artifact/work/output/*zip*/output.zip

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

review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:1050
http://jenkins.qa.ubuntu.com/job/gallery-app-ci/974/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-utopic-amd64-ci/149
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-utopic-armhf-ci/149
        deb: http://jenkins.qa.ubuntu.com/job/gallery-app-utopic-armhf-ci/149/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-utopic-i386-ci/149
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-utopic-touch/315
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/3240
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-runner-mako/456
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-builder-utopic-armhf/510
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/12469
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/2657
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/3533
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/3533/artifact/work/output/*zip*/output.zip

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

review: Needs Fixing (continuous-integration)
Revision history for this message
Arthur Mello (artmello) wrote :

lgtm

review: Approve

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 all changes: