Merge lp:~seb128/ubuntu-system-settings/update-cut-label into lp:ubuntu-system-settings

[Sebastien Bacher]

system-update: use the correct right-anchoring so the checking-for-updates
label is not cut, in some locales

system-update: use the correct right-anchoring so the checking-for-updates
label is not cut, in some locales

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1316
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/1980/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/1420
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-i386-ci/250
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/1258
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/1418
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/1418/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/18161

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-system-settings-ci/1980/rebuild

review: Needs Fixing (continuous-integration)

[Ken VanDine (ken-vandine)]

Thanks!

review: Approve

=== modified file 'plugins/system-update/PageComponent.qml'
--- plugins/system-update/PageComponent.qml	2015-01-30 18:09:06 +0000
+++ plugins/system-update/PageComponent.qml	2015-02-18 14:56:31 +0000
@@ -279,7 +279,7 @@
                     anchors {
                         left: activity.running ? activity.right : parent.left
                         top: parent.top
-                        right: btnRetry.left
+                        right: btnRetry.visible ? btnRetry.left : parent.right
                         rightMargin: units.gu(2)
                         leftMargin: units.gu(2)
                     }