ubuntu-keyboard

Merge lp:~lukas-kde/ubuntu-keyboard/fixCsLayoutUppercaseU-WITH-RING-ABOVE into lp:ubuntu-keyboard

  1. fixCsLayoutUppercaseU-WITH-RING-ABOVE
  2. Merge into trunk
Proposed by Lukáš Tinkl
Status: Merged
Approved by: Michael Sheldon
Approved revision: 489
Merged at revision: 500
Proposed branch: lp:~lukas-kde/ubuntu-keyboard/fixCsLayoutUppercaseU-WITH-RING-ABOVE
Merge into: lp:ubuntu-keyboard
Diff against target: 51 lines (+4/-4)
4 files modified
plugins/cs/qml/Keyboard_cs.qml (+1/-1)
plugins/cs/qml/Keyboard_cs_email.qml (+1/-1)
plugins/cs/qml/Keyboard_cs_url.qml (+1/-1)
plugins/cs/qml/Keyboard_cs_url_search.qml (+1/-1)
To merge this branch: bzr merge lp:~lukas-kde/ubuntu-keyboard/fixCsLayoutUppercaseU-WITH-RING-ABOVE
Reviewer Review Type Date Requested Status
Michael Sheldon (community) Approve
PS Jenkins bot continuous-integration Pending
Review via email: mp+298685@code.launchpad.net

Commit message

Fix uppercase variant of "ů" -> "Ů" in the Czech layout

Description of the change

Fix uppercase variant of "ů" -> "Ů" in the Czech layout

To post a comment you must log in.
Revision history for this message
Lukáš Tinkl (lukas-kde) wrote :

A friendly monthly ping reminder :)

Revision history for this message
Michael Sheldon (michael-sheldon) wrote :

Hi Lukas,

 This is in silo 31, it'll get a final review and sign off when we do the full test run on that silo; unfortunately that's slightly stalled at the moment as the recent Qt 5.6.1 landing in Yakkety has broken Yakkety keyboard builds, so we need to get that fixed before this will land.

Revision history for this message
Michael Sheldon (michael-sheldon) wrote :

Looks good :)

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'plugins/cs/qml/Keyboard_cs.qml'
2--- plugins/cs/qml/Keyboard_cs.qml 2016-01-25 16:02:23 +0000
3+++ plugins/cs/qml/Keyboard_cs.qml 2016-06-29 17:47:10 +0000
4@@ -38,7 +38,7 @@
5 CharKey { label: "r"; shifted: "R"; extended: ["4", "ř","ŕ"]; extendedShifted: ["4", "Ř","Ŕ"] }
6 CharKey { label: "t"; shifted: "T"; extended: ["5", "ť","ţ"]; extendedShifted: ["5", "Ť","Ţ"] }
7 CharKey { label: "z"; shifted: "Z"; extended: ["6", "ž","ź","ż"]; extendedShifted: ["6", "Ž","Ź","Ż"] }
8- CharKey { label: "u"; shifted: "U"; extended: ["7", "ů","ú","ü","ű","ù","û"]; extendedShifted: ["7", "Û","Ú","Ü","Ű","Ù","Û"] }
9+ CharKey { label: "u"; shifted: "U"; extended: ["7", "ů","ú","ü","ű","ù","û"]; extendedShifted: ["7", "Ů","Ú","Ü","Ű","Ù","Û"] }
10 CharKey { label: "i"; shifted: "I"; extended: ["8", "í","î"]; extendedShifted: ["8", "Í","Î"] }
11 CharKey { label: "o"; shifted: "O"; extended: ["9", "ó","ö","ő","ô"]; extendedShifted: ["9", "Ó","Ö","Ő","Ô"] }
12 CharKey { label: "p"; shifted: "P"; extended: ["0"]; extendedShifted: ["0"]; rightSide: true; }
13
14=== modified file 'plugins/cs/qml/Keyboard_cs_email.qml'
15--- plugins/cs/qml/Keyboard_cs_email.qml 2016-01-25 16:02:23 +0000
16+++ plugins/cs/qml/Keyboard_cs_email.qml 2016-06-29 17:47:10 +0000
17@@ -38,7 +38,7 @@
18 CharKey { label: "r"; shifted: "R"; extended: ["4", "ř","ŕ"]; extendedShifted: ["4", "Ř","Ŕ"] }
19 CharKey { label: "t"; shifted: "T"; extended: ["5", "ť","ţ"]; extendedShifted: ["5", "Ť","Ţ"] }
20 CharKey { label: "z"; shifted: "Z"; extended: ["6", "ž","ź","ż"]; extendedShifted: ["6", "Ž","Ź","Ż"] }
21- CharKey { label: "u"; shifted: "U"; extended: ["7", "ů","ú","ü","ű","ù","û"]; extendedShifted: ["7", "Û","Ú","Ü","Ű","Ù","Û"] }
22+ CharKey { label: "u"; shifted: "U"; extended: ["7", "ů","ú","ü","ű","ù","û"]; extendedShifted: ["7", "Ů","Ú","Ü","Ű","Ù","Û"] }
23 CharKey { label: "i"; shifted: "I"; extended: ["8", "í","î"]; extendedShifted: ["8", "Í","Î"] }
24 CharKey { label: "o"; shifted: "O"; extended: ["9", "ó","ö","ő","ô"]; extendedShifted: ["9", "Ó","Ö","Ő","Ô"] }
25 CharKey { label: "p"; shifted: "P"; extended: ["0"]; extendedShifted: ["0"]; rightSide: true; }
26
27=== modified file 'plugins/cs/qml/Keyboard_cs_url.qml'
28--- plugins/cs/qml/Keyboard_cs_url.qml 2016-01-25 16:02:23 +0000
29+++ plugins/cs/qml/Keyboard_cs_url.qml 2016-06-29 17:47:10 +0000
30@@ -38,7 +38,7 @@
31 CharKey { label: "r"; shifted: "R"; extended: ["4", "ř","ŕ"]; extendedShifted: ["4", "Ř","Ŕ"] }
32 CharKey { label: "t"; shifted: "T"; extended: ["5", "ť","ţ"]; extendedShifted: ["5", "Ť","Ţ"] }
33 CharKey { label: "z"; shifted: "Z"; extended: ["6", "ž","ź","ż"]; extendedShifted: ["6", "Ž","Ź","Ż"] }
34- CharKey { label: "u"; shifted: "U"; extended: ["7", "ů","ú","ü","ű","ù","û"]; extendedShifted: ["7", "Û","Ú","Ü","Ű","Ù","Û"] }
35+ CharKey { label: "u"; shifted: "U"; extended: ["7", "ů","ú","ü","ű","ù","û"]; extendedShifted: ["7", "Ů","Ú","Ü","Ű","Ù","Û"] }
36 CharKey { label: "i"; shifted: "I"; extended: ["8", "í","î"]; extendedShifted: ["8", "Í","Î"] }
37 CharKey { label: "o"; shifted: "O"; extended: ["9", "ó","ö","ő","ô"]; extendedShifted: ["9", "Ó","Ö","Ő","Ô"] }
38 CharKey { label: "p"; shifted: "P"; extended: ["0"]; extendedShifted: ["0"]; rightSide: true; }
39
40=== modified file 'plugins/cs/qml/Keyboard_cs_url_search.qml'
41--- plugins/cs/qml/Keyboard_cs_url_search.qml 2016-01-25 16:02:23 +0000
42+++ plugins/cs/qml/Keyboard_cs_url_search.qml 2016-06-29 17:47:10 +0000
43@@ -38,7 +38,7 @@
44 CharKey { label: "r"; shifted: "R"; extended: ["4", "ř","ŕ"]; extendedShifted: ["4", "Ř","Ŕ"] }
45 CharKey { label: "t"; shifted: "T"; extended: ["5", "ť","ţ"]; extendedShifted: ["5", "Ť","Ţ"] }
46 CharKey { label: "z"; shifted: "Z"; extended: ["6", "ž","ź","ż"]; extendedShifted: ["6", "Ž","Ź","Ż"] }
47- CharKey { label: "u"; shifted: "U"; extended: ["7", "ů","ú","ü","ű","ù","û"]; extendedShifted: ["7", "Û","Ú","Ü","Ű","Ù","Û"] }
48+ CharKey { label: "u"; shifted: "U"; extended: ["7", "ů","ú","ü","ű","ù","û"]; extendedShifted: ["7", "Ů","Ú","Ü","Ű","Ù","Û"] }
49 CharKey { label: "i"; shifted: "I"; extended: ["8", "í","î"]; extendedShifted: ["8", "Í","Î"] }
50 CharKey { label: "o"; shifted: "O"; extended: ["9", "ó","ö","ő","ô"]; extendedShifted: ["9", "Ó","Ö","Ő","Ô"] }
51 CharKey { label: "p"; shifted: "P"; extended: ["0"]; extendedShifted: ["0"]; rightSide: true; }

Subscribers

People subscribed via source and target branches