Ubuntu Terminal App

Merge lp://qastaging/~nikwen/ubuntu-terminal-app/layout-i18n into lp://qastaging/~ubuntu-terminal-dev/ubuntu-terminal-app/reboot

  1. layout-i18n
  2. Merge into reboot
Proposed by Niklas Wenzel
Status: Merged
Approved by: Alan Pope 🍺🐧🐱 🦄
Approved revision: 106
Merged at revision: 112
Proposed branch: lp://qastaging/~nikwen/ubuntu-terminal-app/layout-i18n
Merge into: lp://qastaging/~ubuntu-terminal-dev/ubuntu-terminal-app/reboot
Diff against target: 776 lines (+298/-75)
11 files modified
po/com.ubuntu.terminal.pot (+93/-1)
src/app/qml/KeyboardRows/JsonTranslator.qml (+115/-0)
src/app/qml/KeyboardRows/KeyboardLayout.qml (+31/-9)
src/app/qml/KeyboardRows/Layouts/ControlKeys.json (+1/-7)
src/app/qml/KeyboardRows/Layouts/FunctionKeys.json (+14/-27)
src/app/qml/KeyboardRows/Layouts/Nano.json (+0/-12)
src/app/qml/KeyboardRows/Layouts/ScrollKeys.json (+8/-9)
src/app/qml/KeyboardRows/Layouts/SimpleCommands.json (+1/-2)
src/app/qml/KeyboardRows/jsonParser.js (+22/-6)
src/app/qml/TerminalSettings.qml (+8/-2)
src/app/qml/ubuntu-terminal-app.qml (+5/-0)
To merge this branch: bzr merge lp://qastaging/~nikwen/ubuntu-terminal-app/layout-i18n
Reviewer Review Type Date Requested Status
Ubuntu Phone Apps Jenkins Bot continuous-integration Approve
Alan Pope 🍺🐧🐱 🦄 (community) Approve
Review via email: mp+264620@code.qastaging.launchpad.net

Commit message

Add the ability to translate strings from json profiles

Description of the change

Add the ability to translate strings from json profiles

To post a comment you must log in.
Revision history for this message
Niklas Wenzel (nikwen) wrote :

Just found something while looking through the diff. Will fix it. :)

Revision history for this message
Niklas Wenzel (nikwen) wrote :

Should be fixed now. :)

Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :

PASSED: Continuous integration, rev:102
http://91.189.93.70:8080/job/ubuntu-terminal-app-ci/161/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic/3073
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/3073/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-terminal-app-utopic-amd64-ci/82
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-terminal-app-vivid-amd64-ci/45

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

review: Approve (continuous-integration)
Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :

PASSED: Continuous integration, rev:103
http://91.189.93.70:8080/job/ubuntu-terminal-app-ci/162/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic/3075
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/3075/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-terminal-app-utopic-amd64-ci/83
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-terminal-app-vivid-amd64-ci/46

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

review: Approve (continuous-integration)
Revision history for this message
Alan Pope 🍺🐧🐱 🦄 (popey) wrote :

Looks good, thanks Niklas!

review: Approve
Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :

FAILED: Autolanding.
More details in the following jenkins job:
http://91.189.93.70:8080/job/ubuntu-terminal-app-autolanding/96/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/generic-mediumtests-utopic/3149/console
    FAILURE: http://91.189.93.70:8080/job/ubuntu-terminal-app-utopic-amd64-autolanding/53/console
    FAILURE: http://91.189.93.70:8080/job/ubuntu-terminal-app-vivid-amd64-autolanding/28/console

review: Needs Fixing (continuous-integration)
Revision history for this message
Alan Pope 🍺🐧🐱 🦄 (popey) wrote :

Looks like a couple of merge conflicts.

Revision history for this message
Niklas Wenzel (nikwen) wrote :

I'll get to them. Thank you for reviewing this one as well. :)

lp://qastaging/~nikwen/ubuntu-terminal-app/layout-i18n updated
104. By Niklas Wenzel

Merge master

105. By Niklas Wenzel

Update JsonTranslator to the new UITK as well

Revision history for this message
Niklas Wenzel (nikwen) wrote :

I resolved the conflicts. Should be ready for merging now. :)

Revision history for this message
Niklas Wenzel (nikwen) wrote :

Oh no! I found a bug!

Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :

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

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

review: Approve (continuous-integration)
lp://qastaging/~nikwen/ubuntu-terminal-app/layout-i18n updated
106. By Niklas Wenzel

Fix error due to which the layout descriptions would not appear in the KeyboardBar

Revision history for this message
Niklas Wenzel (nikwen) wrote :

Fixed now. :)

Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :

PASSED: Continuous integration, rev:106
http://91.189.93.70:8080/job/ubuntu-terminal-app-ci/168/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic/3158
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/3158/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-terminal-app-utopic-amd64-ci/89
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-terminal-app-vivid-amd64-ci/52

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

review: Approve (continuous-integration)
Revision history for this message
Niklas Wenzel (nikwen) wrote :

Thanks for merging. :)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches