gallery-app

Merge lp:~bfiller/gallery-app/fix-sharing-string into lp:gallery-app

  1. fix-sharing-string
  2. Merge into trunk
Proposed by Bill Filler
Status: Merged
Approved by: Bill Filler
Approved revision: 1082
Merged at revision: 1082
Proposed branch: lp:~bfiller/gallery-app/fix-sharing-string
Merge into: lp:gallery-app
Diff against target: 12 lines (+1/-1)
1 file modified
rc/qml/MediaViewer/MediaViewer.qml (+1/-1)
To merge this branch: bzr merge lp:~bfiller/gallery-app/fix-sharing-string
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Needs Fixing
Ubuntu Phablet Team Pending
Review via email: mp+235996@code.launchpad.net

Commit message

using "Share" instead of "Share photo" in action as it may be a video

Description of the change

using "Share" instead of "Share photo" in action as it may be a video

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

FAILED: Continuous integration, rev:1082
http://jenkins.qa.ubuntu.com/job/gallery-app-ci/1042/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-utopic-amd64-ci/217
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-utopic-armhf-ci/217
        deb: http://jenkins.qa.ubuntu.com/job/gallery-app-utopic-armhf-ci/217/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-utopic-i386-ci/217
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-utopic-touch/457
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/3791
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-runner-mako/599
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-builder-utopic-armhf/721
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/13765
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/3177
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/4102
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/4102/artifact/work/output/*zip*/output.zip

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

review: Needs Fixing (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'rc/qml/MediaViewer/MediaViewer.qml'
2--- rc/qml/MediaViewer/MediaViewer.qml 2014-09-16 16:15:58 +0000
3+++ rc/qml/MediaViewer/MediaViewer.qml 2014-09-25 16:24:58 +0000
4@@ -539,7 +539,7 @@
5 }
6 },
7 Action {
8- text: i18n.tr("Share photo")
9+ text: i18n.tr("Share")
10 iconName: "share"
11 visible: !APP.desktopMode
12 onTriggered: sharePicker.visible = true;

Subscribers

People subscribed via source and target branches