Merge lp:~seb128/ubuntu-system-settings/license-use-standard-text into lp:ubuntu-system-settings

[Sebastien Bacher]

license: use Label widget instead of Text, it looks more integrated

license: use Label widget instead of Text, it looks more integrated

[Sebastien Bacher (seb128)]

(resubmitting using Label, that's the recommended widget here)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:641
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/678/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/3650
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-touch/3255
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-trusty-amd64-ci/194
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-trusty-armhf-ci/182
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-trusty-i386-ci/181
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-trusty/3211
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/3654
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/3654/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/3257
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/3257/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/5632
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/4451

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

review: Approve (continuous-integration)

[Iain Lane (laney)]

(Why is there an unmerged translation update here?)

Looks fine, I tried it and it's more readable. Thanks.

review: Approve

[Sebastien Bacher (seb128)]

> (Why is there an unmerged translation update here?)

dunno, weird, it's not creating any diff though so seems alright...

=== modified file 'plugins/about/License.qml'
--- plugins/about/License.qml	2014-02-27 21:17:09 +0000
+++ plugins/about/License.qml	2014-03-04 12:51:57 +0000
@@ -25,7 +25,7 @@
            otherwise the UI might end up in a situation where scrolling doesn't work */
         flickableDirection: Flickable.VerticalFlick
 
-        Text {
+        Label {
             id: textId
             text: backendInfo.licenseInfo(binary)
             width: scrollWidget.width