ubuntu-keyboard

Merge lp:~michael-sheldon/ubuntu-keyboard/fix-icelandic-k into lp:ubuntu-keyboard

  1. fix-icelandic-k
  2. Merge into trunk
Proposed by Michael Sheldon
Status: Merged
Approved by: Bill Filler
Approved revision: 457
Merged at revision: 459
Proposed branch: lp:~michael-sheldon/ubuntu-keyboard/fix-icelandic-k
Merge into: lp:ubuntu-keyboard
Diff against target: 47 lines (+4/-0)
4 files modified
plugins/is/qml/Keyboard_is.qml (+1/-0)
plugins/is/qml/Keyboard_is_email.qml (+1/-0)
plugins/is/qml/Keyboard_is_url.qml (+1/-0)
plugins/is/qml/Keyboard_is_url_search.qml (+1/-0)
To merge this branch: bzr merge lp:~michael-sheldon/ubuntu-keyboard/fix-icelandic-k
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Needs Fixing
Ubuntu Phablet Team Pending
Review via email: mp+290996@code.launchpad.net

Commit message

Fix missing character on Icelandic layout

Description of the change

Fix missing character on Icelandic layout

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:457
http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-ci/672/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/6792/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-vivid-amd64-ci/171
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-vivid-armhf-ci/172
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-vivid-armhf-ci/172/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-vivid-i386-ci/171
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-touch/5147/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/6803
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/6803/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/28054

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

review: Needs Fixing (continuous-integration)
Revision history for this message
Michael Sheldon (michael-sheldon) wrote :

Are there any related MPs required for this MP to build/function as expected? Please list.

 * No

Is your branch in sync with latest trunk (e.g. bzr pull lp:trunk -> no changes)

 * Yes

Did you perform an exploratory manual test run of your code change and any related functionality on device or emulator?

 * Yes

Did you successfully run all tests found in your component's Test Plan (https://wiki.ubuntu.com/Process/Merges/TestPlan/ubuntu-keyboard) on device or emulator?

 * Yes

If you changed the UI, was the change specified/approved by design?

 * No change

If you changed UI labels, did you update the pot file?

 * No change

If you changed the packaging (debian), did you add a core-dev as a reviewer to this MP?

 * No change

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'plugins/is/qml/Keyboard_is.qml'
2--- plugins/is/qml/Keyboard_is.qml 2016-01-25 16:02:23 +0000
3+++ plugins/is/qml/Keyboard_is.qml 2016-04-05 14:32:13 +0000
4@@ -56,6 +56,7 @@
5 CharKey { label: "g"; shifted: "G"; }
6 CharKey { label: "h"; shifted: "H"; }
7 CharKey { label: "j"; shifted: "J"; }
8+ CharKey { label: "k"; shifted: "K"; }
9 CharKey { label: "l"; shifted: "L"; }
10 CharKey { label: "æ"; shifted: "Æ"; }
11 CharKey { label: "ö"; shifted: "Ö"; rightSide: true; }
12
13=== modified file 'plugins/is/qml/Keyboard_is_email.qml'
14--- plugins/is/qml/Keyboard_is_email.qml 2016-01-25 16:02:23 +0000
15+++ plugins/is/qml/Keyboard_is_email.qml 2016-04-05 14:32:13 +0000
16@@ -56,6 +56,7 @@
17 CharKey { label: "g"; shifted: "G"; }
18 CharKey { label: "h"; shifted: "H"; }
19 CharKey { label: "j"; shifted: "J"; }
20+ CharKey { label: "k"; shifted: "K"; }
21 CharKey { label: "l"; shifted: "L"; }
22 CharKey { label: "æ"; shifted: "Æ"; }
23 CharKey { label: "ö"; shifted: "Ö"; rightSide: true; }
24
25=== modified file 'plugins/is/qml/Keyboard_is_url.qml'
26--- plugins/is/qml/Keyboard_is_url.qml 2016-01-25 16:02:23 +0000
27+++ plugins/is/qml/Keyboard_is_url.qml 2016-04-05 14:32:13 +0000
28@@ -56,6 +56,7 @@
29 CharKey { label: "g"; shifted: "G"; }
30 CharKey { label: "h"; shifted: "H"; }
31 CharKey { label: "j"; shifted: "J"; }
32+ CharKey { label: "k"; shifted: "K"; }
33 CharKey { label: "l"; shifted: "L"; }
34 CharKey { label: "æ"; shifted: "Æ"; }
35 CharKey { label: "ö"; shifted: "Ö"; rightSide: true; }
36
37=== modified file 'plugins/is/qml/Keyboard_is_url_search.qml'
38--- plugins/is/qml/Keyboard_is_url_search.qml 2016-01-25 16:02:23 +0000
39+++ plugins/is/qml/Keyboard_is_url_search.qml 2016-04-05 14:32:13 +0000
40@@ -56,6 +56,7 @@
41 CharKey { label: "g"; shifted: "G"; }
42 CharKey { label: "h"; shifted: "H"; }
43 CharKey { label: "j"; shifted: "J"; }
44+ CharKey { label: "k"; shifted: "K"; }
45 CharKey { label: "l"; shifted: "L"; }
46 CharKey { label: "æ"; shifted: "Æ"; }
47 CharKey { label: "ö"; shifted: "Ö"; rightSide: true; }

Subscribers

People subscribed via source and target branches