Merge lp:~renatofilho/unity8/transfer-indicator-custom-state into lp:unity8

[Renato Araujo Oliveira Filho]

[transfer-indicator] Added support for custom state label.

[lp:~renatofilho/unity8/transfer-indicator-custom-state]

1935. By Renato Araujo Oliveira Filho on 2015-09-08

Added support for custom state label.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1935
http://jenkins.qa.ubuntu.com/job/unity8-ci/6279/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-wily-touch/639/console
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-wily/309
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-wily-amd64-ci/518
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-wily-i386-ci/519
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-wily-mako/370/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-wily-armhf/639
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-wily-armhf/639/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/23152

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/6279/rebuild

review: Needs Fixing (continuous-integration)

[Albert Astals Cid (aacid)]

Why the change to work in progress?

[Renato Araujo Oliveira Filho (renatofilho)]

We still working on the indicators changes. We intend to land this after land the changes on indicator.

Unmerged revisions

1935. By Renato Araujo Oliveira Filho on 2015-09-08

Added support for custom state label.

1934. By Launchpad Translations on behalf of unity-team on 2015-08-28

Launchpad automatic translations update.

1933. By CI Train Bot Account on 2015-08-27

Resync trunk.

1932. By CI Train Bot Account on 2015-08-26

Releasing 8.11+15.10.20150826-0ubuntu1

1931. By Michael Zanetti on 2015-08-26

no change rebuild for wily

1930. By Launchpad Translations on behalf of unity-team on 2015-08-26

Launchpad automatic translations update.

=== modified file 'qml/Panel/Indicators/MenuItemFactory.qml'
--- qml/Panel/Indicators/MenuItemFactory.qml	2015-06-13 11:30:34 +0000
+++ qml/Panel/Indicators/MenuItemFactory.qml	2015-09-08 20:16:57 +0000
@@ -783,6 +783,10 @@
             }
 
             stateText: {
+                var customState = transferState["state-label"]
+                if (customState)
+                    return customState;
+
                 switch (runningState) {
                     case Menus.TransferState.Queued:
                         return i18n.tr("In queue…");