Merge lp:~bfiller/messaging-app/i18n-send into lp:messaging-app

[Bill Filler]

Mark the "Send" string for translation. This will require an update of the .pot file too.

Mark the "Send" string for translation. This will require an update of the .pot file too.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:168
http://jenkins.qa.ubuntu.com/job/messaging-app-ci/334/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/2772
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/2213
    SUCCESS: http://jenkins.qa.ubuntu.com/job/messaging-app-utopic-amd64-ci/128
    SUCCESS: http://jenkins.qa.ubuntu.com/job/messaging-app-utopic-armhf-ci/128
        deb: http://jenkins.qa.ubuntu.com/job/messaging-app-utopic-armhf-ci/128/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/messaging-app-utopic-i386-ci/128
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/2863
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/4015
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/4015/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/10727
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/1833
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/2472
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/2472/artifact/work/output/*zip*/output.zip

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

review: Approve (continuous-integration)

[Leo Arias (elopio)]

Thanks David. We need somebody to top approve this.

review: Approve

[Leo Arias (elopio)]

Oh David, on the other branch you mentioned that the branch should also update the pot.
Is that with make messaging-app.pot ?

[Albert Astals Cid (aacid)]

I think this should be discarded in favour of https://code.launchpad.net/~aacid/messaging-app/update_pot/+merge/231534

[Albert Astals Cid (aacid)]

And since now my branch as been discarded, no this should not be discarded.

=== modified file 'src/qml/Messages.qml'
--- src/qml/Messages.qml	2014-08-20 15:34:00 +0000
+++ src/qml/Messages.qml	2014-08-28 16:18:33 +0000
@@ -913,7 +913,7 @@
             anchors.bottom: parent.bottom
             anchors.right: parent.right
             anchors.rightMargin: units.gu(2)
-            text: "Send"
+            text: i18n.tr("Send")
             color: enabled ? "#38b44a" : "#b2b2b2"
             width: units.gu(7)
             height: units.gu(4)