Ubuntu UI Toolkit

Merge lp:~tpeeters/ubuntu-ui-toolkit/lp1391617 into lp:ubuntu-ui-toolkit/staging

  1. lp1391617
  2. Merge into staging
Proposed by Tim Peeters
Status: Merged
Approved by: Zsombor Egri
Approved revision: 1328
Merged at revision: 1329
Proposed branch: lp:~tpeeters/ubuntu-ui-toolkit/lp1391617
Merge into: lp:ubuntu-ui-toolkit/staging
Diff against target: 11 lines (+1/-1)
1 file modified
modules/Ubuntu/Components/Themes/Ambiance/ProgressBarStyle.qml (+1/-1)
To merge this branch: bzr merge lp:~tpeeters/ubuntu-ui-toolkit/lp1391617
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Needs Fixing
Zsombor Egri Approve
Review via email: mp+241959@code.launchpad.net

Commit message

Fix untranslated "In Progress" label

To post a comment you must log in.
Revision history for this message
Tim Peeters (tpeeters) wrote :

I applied seb128's suggestion from the bug report.

Revision history for this message
Zsombor Egri (zsombi) wrote :

Fair change!

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

FAILED: Continuous integration, rev:1328
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/1224/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/6555/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-amd64-ci/1057
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-armhf-ci/1056
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-armhf-ci/1056/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-i386-ci/1056
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/6130/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/7807
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/7807/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/15888

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/1224/rebuild

review: Needs Fixing (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'modules/Ubuntu/Components/Themes/Ambiance/ProgressBarStyle.qml'
--- modules/Ubuntu/Components/Themes/Ambiance/ProgressBarStyle.qml 2014-10-23 19:57:31 +0000
+++ modules/Ubuntu/Components/Themes/Ambiance/ProgressBarStyle.qml 2014-11-17 13:35:51 +0000
@@ -59,7 +59,7 @@
59 anchors.centerIn: background59 anchors.centerIn: background
60 fontSize: "medium"60 fontSize: "medium"
61 color: backgroundTextColor61 color: backgroundTextColor
62 text: progressBar.indeterminate ? i18n.tr("In Progress")62 text: progressBar.indeterminate ? i18n.dtr("ubuntu-ui-toolkit", "In Progress")
63 : "%1%".arg(Number(progressBarStyle.progress * 100.0).toFixed(0))63 : "%1%".arg(Number(progressBarStyle.progress * 100.0).toFixed(0))
64 visible: !progressBar.hasOwnProperty("showProgressPercentage") || progressBar.showProgressPercentage64 visible: !progressBar.hasOwnProperty("showProgressPercentage") || progressBar.showProgressPercentage
6565

Subscribers

People subscribed via source and target branches