Merge lp:~nikwen/ubuntu-terminal-app/ctrl-esc-keys-translatable into lp:ubuntu-terminal-app

[Niklas Wenzel]

Make Ctrl and ESC keys translatable.

Make Ctrl and ESC keys translatable. For example, the Ctrl key is labeled "Strg" on German keyboards.

[lp:~nikwen/ubuntu-terminal-app/ctrl-esc-keys-translatable]

167. By Niklas Wenzel on 2014-10-18

Add translators comments

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

FAILED: Continuous integration, rev:167
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~nikwen/ubuntu-terminal-app/ctrl-esc-keys-translatable/+merge/238805/+edit-commit-message

http://91.189.93.70:8080/job/ubuntu-terminal-app-ci/122/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-vivid/365
        deb: http://91.189.93.70:8080/job/generic-mediumtests-vivid/365/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-terminal-app-vivid-amd64-ci/6

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-terminal-app-ci/122/rebuild

review: Needs Fixing (continuous-integration)

[Niklas Wenzel (nikwen)]

The rebuild link somehow doesn't work for me. How can I make the Jenkins bot recognize my commit message?

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

PASSED: Continuous integration, rev:167
http://91.189.93.70:8080/job/ubuntu-terminal-app-ci/123/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-vivid/820
        deb: http://91.189.93.70:8080/job/generic-mediumtests-vivid/820/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-terminal-app-vivid-amd64-ci/7

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-terminal-app-ci/123/rebuild

review: Approve (continuous-integration)

[Niklas Wenzel (nikwen)]

Thanks for merging, even though this was for the pre-reboot version. :)

=== modified file 'src/app/qml/Terminal.qml'
--- src/app/qml/Terminal.qml	2014-09-20 10:54:37 +0000
+++ src/app/qml/Terminal.qml	2014-10-18 20:27:27 +0000
@@ -185,7 +185,9 @@
                     visible: false
                     x: parent.x + (parent.width - width) / 2
                     y: parent.y + (kterm.height - height) / 2
-                    circleButtonLable: "CTRL +"
+
+                    // TRANSLATORS: "Ctrl" refers to the Ctrl key on the keyboard
+                    circleButtonLable: i18n.tr("CTRL +")
                     sideButtons: ["A", "C", "D", "S", "X", "Z"]
 
 

=== modified file 'src/app/qml/extraPanel/CtrlKeys.qml'
--- src/app/qml/extraPanel/CtrlKeys.qml	2014-09-20 10:54:37 +0000
+++ src/app/qml/extraPanel/CtrlKeys.qml	2014-10-18 20:27:27 +0000
@@ -22,25 +22,29 @@
             spacing: units.gu(1)
 
             Button {
-                Label {text: "ESC"; color: buttonColor; anchors.centerIn: parent; fontSize: "medium"}
+                // TRANSLATORS: "ESC" refers to the ESC key on the keyboard
+                Label {text: i18n.tr("ESC"); color: buttonColor; anchors.centerIn: parent; fontSize: "medium"}
                 width: btn_width
                 onClicked: keyPressed(Qt.Key_Escape, Qt.NoModifier)
             }
 
             Button {
-                Label {text: "Ctrl+Z"; color: buttonColor; anchors.centerIn: parent; fontSize: "medium"}
+                // TRANSLATORS: "Ctrl" refers to the Ctrl key on the keyboard
+                Label {text: i18n.tr("Ctrl+Z"); color: buttonColor; anchors.centerIn: parent; fontSize: "medium"}
                 width: btn_width*1.5
                 onClicked: keyPressed(Qt.Key_Z, Qt.ControlModifier)
             }
 
             Button {
-                Label {text: "Ctrl+X"; color: buttonColor; anchors.centerIn: parent; fontSize: "medium"}
+                // TRANSLATORS: "Ctrl" refers to the Ctrl key on the keyboard
+                Label {text: i18n.tr("Ctrl+X"); color: buttonColor; anchors.centerIn: parent; fontSize: "medium"}
                 width: btn_width*1.5
                 onClicked: keyPressed(Qt.Key_X, Qt.ControlModifier)
             }
 
             Button {
-                Label {text: "Ctrl+C"; color: buttonColor; anchors.centerIn: parent; fontSize: "medium"}
+                // TRANSLATORS: "Ctrl" refers to the Ctrl key on the keyboard
+                Label {text: i18n.tr("Ctrl+C"); color: buttonColor; anchors.centerIn: parent; fontSize: "medium"}
                 width: btn_width*1.5
                 onClicked: keyPressed(Qt.Key_C, Qt.ControlModifier)
             }