ubuntu-keyboard

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

  1. fix-croatian
  2. Merge into trunk
Proposed by Michael Sheldon
Status: Merged
Approved by: Bill Filler
Approved revision: 459
Merged at revision: 460
Proposed branch: lp:~michael-sheldon/ubuntu-keyboard/fix-croatian
Merge into: lp:ubuntu-keyboard
Diff against target: 216 lines (+45/-45)
4 files modified
plugins/hr/qml/Keyboard_hr.qml (+11/-11)
plugins/hr/qml/Keyboard_hr_email.qml (+12/-12)
plugins/hr/qml/Keyboard_hr_url.qml (+11/-11)
plugins/hr/qml/Keyboard_hr_url_search.qml (+11/-11)
To merge this branch: bzr merge lp:~michael-sheldon/ubuntu-keyboard/fix-croatian
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Approve
Ubuntu Phablet Team Pending
Review via email: mp+292374@code.launchpad.net

Commit message

Fix incorrect letters and URL key on Croatian layout

Description of the change

Fix incorrect letters and URL key on Croatian layout

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

PASSED: Continuous integration, rev:459
http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-ci/674/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/6843
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-vivid-amd64-ci/173
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-vivid-armhf-ci/174
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-vivid-armhf-ci/174/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-vivid-i386-ci/173
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-touch/5179
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/6854
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/6854/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/28095

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

review: Approve (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/hr/qml/Keyboard_hr.qml'
2--- plugins/hr/qml/Keyboard_hr.qml 2016-01-25 16:02:23 +0000
3+++ plugins/hr/qml/Keyboard_hr.qml 2016-04-20 12:40:44 +0000
4@@ -34,13 +34,13 @@
5
6 CharKey { label: "q"; shifted: "Q"; extended: ["1"]; extendedShifted: ["1"]; leftSide: true; }
7 CharKey { label: "w"; shifted: "W"; extended: ["2"]; extendedShifted: ["2"] }
8- CharKey { label: "e"; shifted: "E"; extended: ["3", "è", "é", "ê", "ë", "€"]; extendedShifted: ["3", "È","É", "Ê", "Ë", "€"] }
9+ CharKey { label: "e"; shifted: "E"; extended: ["3", "€"]; extendedShifted: ["3", "€"] }
10 CharKey { label: "r"; shifted: "R"; extended: ["4"]; extendedShifted: ["4"] }
11- CharKey { label: "t"; shifted: "T"; extended: ["5", "þ"]; extendedShifted: ["5", "Þ"] }
12+ CharKey { label: "t"; shifted: "T"; extended: ["5"]; extendedShifted: ["5"] }
13 CharKey { label: "z"; shifted: "Z"; extended: ["6", "ž"]; extendedShifted: ["6", "Ž"]}
14- CharKey { label: "u"; shifted: "U"; extended: ["7", "û","ù","ú","ü"]; extendedShifted: ["7", "Û","Ù","Ú","Ü"] }
15- CharKey { label: "i"; shifted: "I"; extended: ["8", "î","ï","ì","í"]; extendedShifted: ["8", "Î","Ï","Ì","Í"] }
16- CharKey { label: "o"; shifted: "O"; extended: ["9", "ö","ô","ò","ó"]; extendedShifted: ["9", "Ö","Ô","Ò","Ó"] }
17+ CharKey { label: "u"; shifted: "U"; extended: ["7"]; extendedShifted: ["7"] }
18+ CharKey { label: "i"; shifted: "I"; extended: ["8"]; extendedShifted: ["8"] }
19+ CharKey { label: "o"; shifted: "O"; extended: ["9"]; extendedShifted: ["9"] }
20 CharKey { label: "p"; shifted: "P"; extended: ["0"]; extendedShifted: ["0"]; rightSide: true; }
21 }
22
23@@ -48,9 +48,9 @@
24 anchors.horizontalCenter: parent.horizontalCenter;
25 spacing: 0
26
27- CharKey { label: "a"; shifted: "A"; extended: ["ä","à","â","ª","á","å", "æ"]; extendedShifted: ["Ä","À","Â","ª","Á","Å","Æ"]; leftSide: true; }
28- CharKey { label: "s"; shifted: "S"; extended: ["š","ß","$"]; extendedShifted: ["Š","$"] }
29- CharKey { label: "d"; shifted: "D"; extended: ["ð"]; extendedShifted: ["Ð"] }
30+ CharKey { label: "a"; shifted: "A"; leftSide: true; }
31+ CharKey { label: "s"; shifted: "S"; extended: ["š","$"]; extendedShifted: ["Š","$"] }
32+ CharKey { label: "d"; shifted: "D"; extended: ["đ"]; extendedShifted: ["Ð"] }
33 CharKey { label: "f"; shifted: "F"; }
34 CharKey { label: "g"; shifted: "G"; }
35 CharKey { label: "h"; shifted: "H"; }
36@@ -64,12 +64,12 @@
37 spacing: 0
38
39 ShiftKey {}
40- CharKey { label: "y"; shifted: "Y"; extended: ["ý", "¥"]; extendedShifted: ["Ý", "¥"] }
41+ CharKey { label: "y"; shifted: "Y"; extended: ["¥"]; extendedShifted: ["¥"] }
42 CharKey { label: "x"; shifted: "X"; }
43- CharKey { label: "c"; shifted: "C"; extended: ["č","ć","ç"]; extendedShifted: ["Č","Ć","Ç"] }
44+ CharKey { label: "c"; shifted: "C"; extended: ["č","ć"]; extendedShifted: ["Č","Ć"] }
45 CharKey { label: "v"; shifted: "V"; }
46 CharKey { label: "b"; shifted: "B"; }
47- CharKey { label: "n"; shifted: "N"; extended: ["ñ"]; extendedShifted: ["Ñ"] }
48+ CharKey { label: "n"; shifted: "N"; }
49 CharKey { label: "m"; shifted: "M"; }
50 BackspaceKey {}
51 }
52
53=== modified file 'plugins/hr/qml/Keyboard_hr_email.qml'
54--- plugins/hr/qml/Keyboard_hr_email.qml 2016-01-25 16:02:23 +0000
55+++ plugins/hr/qml/Keyboard_hr_email.qml 2016-04-20 12:40:44 +0000
56@@ -34,13 +34,13 @@
57
58 CharKey { label: "q"; shifted: "Q"; extended: ["1"]; extendedShifted: ["1"]; leftSide: true; }
59 CharKey { label: "w"; shifted: "W"; extended: ["2"]; extendedShifted: ["2"] }
60- CharKey { label: "e"; shifted: "E"; extended: ["3", "è", "é", "ê", "ë", "€"]; extendedShifted: ["3", "È","É", "Ê", "Ë", "€"] }
61+ CharKey { label: "e"; shifted: "E"; extended: ["3", "€"]; extendedShifted: ["3", "€"] }
62 CharKey { label: "r"; shifted: "R"; extended: ["4"]; extendedShifted: ["4"] }
63- CharKey { label: "t"; shifted: "T"; extended: ["5", "þ"]; extendedShifted: ["5", "Þ"] }
64+ CharKey { label: "t"; shifted: "T"; extended: ["5"]; extendedShifted: ["5"] }
65 CharKey { label: "z"; shifted: "Z"; extended: ["6", "ž"]; extendedShifted: ["6", "Ž"]}
66- CharKey { label: "u"; shifted: "U"; extended: ["7", "û","ù","ú","ü"]; extendedShifted: ["7", "Û","Ù","Ú","Ü"] }
67- CharKey { label: "i"; shifted: "I"; extended: ["8", "î","ï","ì","í"]; extendedShifted: ["8", "Î","Ï","Ì","Í"] }
68- CharKey { label: "o"; shifted: "O"; extended: ["9", "ö","ô","ò","ó"]; extendedShifted: ["9", "Ö","Ô","Ò","Ó"] }
69+ CharKey { label: "u"; shifted: "U"; extended: ["7"]; extendedShifted: ["7"] }
70+ CharKey { label: "i"; shifted: "I"; extended: ["8"]; extendedShifted: ["8"] }
71+ CharKey { label: "o"; shifted: "O"; extended: ["9"]; extendedShifted: ["9"] }
72 CharKey { label: "p"; shifted: "P"; extended: ["0"]; extendedShifted: ["0"]; rightSide: true; }
73 }
74
75@@ -48,9 +48,9 @@
76 anchors.horizontalCenter: parent.horizontalCenter;
77 spacing: 0
78
79- CharKey { label: "a"; shifted: "A"; extended: ["ä","à","â","ª","á","å", "æ"]; extendedShifted: ["Ä","À","Â","ª","Á","Å","Æ"]; leftSide: true; }
80- CharKey { label: "s"; shifted: "S"; extended: ["š","ß","$"]; extendedShifted: ["Š","$"] }
81- CharKey { label: "d"; shifted: "D"; extended: ["ð"]; extendedShifted: ["Ð"] }
82+ CharKey { label: "a"; shifted: "A"; leftSide: true; }
83+ CharKey { label: "s"; shifted: "S"; extended: ["š","$"]; extendedShifted: ["Š","$"] }
84+ CharKey { label: "d"; shifted: "D"; extended: ["đ"]; extendedShifted: ["Ð"] }
85 CharKey { label: "f"; shifted: "F"; }
86 CharKey { label: "g"; shifted: "G"; }
87 CharKey { label: "h"; shifted: "H"; }
88@@ -64,12 +64,12 @@
89 spacing: 0
90
91 ShiftKey {}
92- CharKey { label: "y"; shifted: "Y"; extended: ["ý", "¥"]; extendedShifted: ["Ý", "¥"] }
93+ CharKey { label: "y"; shifted: "Y"; extended: ["¥"]; extendedShifted: ["¥"] }
94 CharKey { label: "x"; shifted: "X"; }
95- CharKey { label: "c"; shifted: "C"; extended: ["č","ć","ç"]; extendedShifted: ["Č","Ć","Ç"] }
96+ CharKey { label: "c"; shifted: "C"; extended: ["č","ć"]; extendedShifted: ["Č","Ć"] }
97 CharKey { label: "v"; shifted: "V"; }
98 CharKey { label: "b"; shifted: "B"; }
99- CharKey { label: "n"; shifted: "N"; extended: ["ñ"]; extendedShifted: ["Ñ"] }
100+ CharKey { label: "n"; shifted: "N"; }
101 CharKey { label: "m"; shifted: "M"; }
102 BackspaceKey {}
103 }
104@@ -84,7 +84,7 @@
105 LanguageKey { id: languageMenuButton; anchors.left: symShiftKey.right; height: parent.height; }
106 CharKey { id: atKey; label: "@"; shifted: "@"; anchors.left: languageMenuButton.right; height: parent.height; }
107 SpaceKey { id: spaceKey; anchors.left: atKey.right; anchors.right: urlKey.left; noMagnifier: true; height: parent.height; }
108- UrlKey { id: urlKey; label: ".com"; extended: [".ba", "com.ba", ".net", ".org", ".edu.ba", ".gov.ba"]; anchors.right: dotKey.left; height: parent.height; }
109+ UrlKey { id: urlKey; label: ".com"; extended: [".hr", "com.hr", ".net", ".org", ".edu.hr", ".gov.hr"]; anchors.right: dotKey.left; height: parent.height; }
110 CharKey { id: dotKey; label: "."; shifted: "."; extended: ["?", "-", "_", "!", "+", "%","#","/"]; extendedShifted: ["?", "-", "_", "!", "+", "%","#","/"]; anchors.right: enterKey.left; height: parent.height; }
111 ReturnKey { id: enterKey; anchors.right: parent.right; height: parent.height; }
112 }
113
114=== modified file 'plugins/hr/qml/Keyboard_hr_url.qml'
115--- plugins/hr/qml/Keyboard_hr_url.qml 2016-01-25 16:02:23 +0000
116+++ plugins/hr/qml/Keyboard_hr_url.qml 2016-04-20 12:40:44 +0000
117@@ -34,13 +34,13 @@
118
119 CharKey { label: "q"; shifted: "Q"; extended: ["1"]; extendedShifted: ["1"]; leftSide: true; }
120 CharKey { label: "w"; shifted: "W"; extended: ["2"]; extendedShifted: ["2"] }
121- CharKey { label: "e"; shifted: "E"; extended: ["3", "è", "é", "ê", "ë", "€"]; extendedShifted: ["3", "È","É", "Ê", "Ë", "€"] }
122+ CharKey { label: "e"; shifted: "E"; extended: ["3", "€"]; extendedShifted: ["3", "€"] }
123 CharKey { label: "r"; shifted: "R"; extended: ["4"]; extendedShifted: ["4"] }
124- CharKey { label: "t"; shifted: "T"; extended: ["5", "þ"]; extendedShifted: ["5", "Þ"] }
125+ CharKey { label: "t"; shifted: "T"; extended: ["5"]; extendedShifted: ["5"] }
126 CharKey { label: "z"; shifted: "Z"; extended: ["6", "ž"]; extendedShifted: ["6", "Ž"]}
127- CharKey { label: "u"; shifted: "U"; extended: ["7", "û","ù","ú","ü"]; extendedShifted: ["7", "Û","Ù","Ú","Ü"] }
128- CharKey { label: "i"; shifted: "I"; extended: ["8", "î","ï","ì","í"]; extendedShifted: ["8", "Î","Ï","Ì","Í"] }
129- CharKey { label: "o"; shifted: "O"; extended: ["9", "ö","ô","ò","ó"]; extendedShifted: ["9", "Ö","Ô","Ò","Ó"] }
130+ CharKey { label: "u"; shifted: "U"; extended: ["7"]; extendedShifted: ["7"] }
131+ CharKey { label: "i"; shifted: "I"; extended: ["8"]; extendedShifted: ["8"] }
132+ CharKey { label: "o"; shifted: "O"; extended: ["9"]; extendedShifted: ["9"] }
133 CharKey { label: "p"; shifted: "P"; extended: ["0"]; extendedShifted: ["0"]; rightSide: true; }
134 }
135
136@@ -48,9 +48,9 @@
137 anchors.horizontalCenter: parent.horizontalCenter;
138 spacing: 0
139
140- CharKey { label: "a"; shifted: "A"; extended: ["ä","à","â","ª","á","å", "æ"]; extendedShifted: ["Ä","À","Â","ª","Á","Å","Æ"]; leftSide: true; }
141- CharKey { label: "s"; shifted: "S"; extended: ["š","ß","$"]; extendedShifted: ["Š","$"] }
142- CharKey { label: "d"; shifted: "D"; extended: ["ð"]; extendedShifted: ["Ð"] }
143+ CharKey { label: "a"; shifted: "A"; leftSide: true; }
144+ CharKey { label: "s"; shifted: "S"; extended: ["š","$"]; extendedShifted: ["Š","$"] }
145+ CharKey { label: "d"; shifted: "D"; extended: ["đ"]; extendedShifted: ["Ð"] }
146 CharKey { label: "f"; shifted: "F"; }
147 CharKey { label: "g"; shifted: "G"; }
148 CharKey { label: "h"; shifted: "H"; }
149@@ -64,12 +64,12 @@
150 spacing: 0
151
152 ShiftKey {}
153- CharKey { label: "y"; shifted: "Y"; extended: ["ý", "¥"]; extendedShifted: ["Ý", "¥"] }
154+ CharKey { label: "y"; shifted: "Y"; extended: ["¥"]; extendedShifted: ["¥"] }
155 CharKey { label: "x"; shifted: "X"; }
156- CharKey { label: "c"; shifted: "C"; extended: ["č","ć","ç"]; extendedShifted: ["Č","Ć","Ç"] }
157+ CharKey { label: "c"; shifted: "C"; extended: ["č","ć"]; extendedShifted: ["Č","Ć"] }
158 CharKey { label: "v"; shifted: "V"; }
159 CharKey { label: "b"; shifted: "B"; }
160- CharKey { label: "n"; shifted: "N"; extended: ["ñ"]; extendedShifted: ["Ñ"] }
161+ CharKey { label: "n"; shifted: "N"; }
162 CharKey { label: "m"; shifted: "M"; }
163 BackspaceKey {}
164 }
165
166=== modified file 'plugins/hr/qml/Keyboard_hr_url_search.qml'
167--- plugins/hr/qml/Keyboard_hr_url_search.qml 2016-01-25 16:02:23 +0000
168+++ plugins/hr/qml/Keyboard_hr_url_search.qml 2016-04-20 12:40:44 +0000
169@@ -35,13 +35,13 @@
170
171 CharKey { label: "q"; shifted: "Q"; extended: ["1"]; extendedShifted: ["1"]; leftSide: true; }
172 CharKey { label: "w"; shifted: "W"; extended: ["2"]; extendedShifted: ["2"] }
173- CharKey { label: "e"; shifted: "E"; extended: ["3", "è", "é", "ê", "ë", "€"]; extendedShifted: ["3", "È","É", "Ê", "Ë", "€"] }
174+ CharKey { label: "e"; shifted: "E"; extended: ["3", "€"]; extendedShifted: ["3", "€"] }
175 CharKey { label: "r"; shifted: "R"; extended: ["4"]; extendedShifted: ["4"] }
176- CharKey { label: "t"; shifted: "T"; extended: ["5", "þ"]; extendedShifted: ["5", "Þ"] }
177+ CharKey { label: "t"; shifted: "T"; extended: ["5"]; extendedShifted: ["5"] }
178 CharKey { label: "z"; shifted: "Z"; extended: ["6", "ž"]; extendedShifted: ["6", "Ž"]}
179- CharKey { label: "u"; shifted: "U"; extended: ["7", "û","ù","ú","ü"]; extendedShifted: ["7", "Û","Ù","Ú","Ü"] }
180- CharKey { label: "i"; shifted: "I"; extended: ["8", "î","ï","ì","í"]; extendedShifted: ["8", "Î","Ï","Ì","Í"] }
181- CharKey { label: "o"; shifted: "O"; extended: ["9", "ö","ô","ò","ó"]; extendedShifted: ["9", "Ö","Ô","Ò","Ó"] }
182+ CharKey { label: "u"; shifted: "U"; extended: ["7"]; extendedShifted: ["7"] }
183+ CharKey { label: "i"; shifted: "I"; extended: ["8"]; extendedShifted: ["8"] }
184+ CharKey { label: "o"; shifted: "O"; extended: ["9"]; extendedShifted: ["9"] }
185 CharKey { label: "p"; shifted: "P"; extended: ["0"]; extendedShifted: ["0"]; rightSide: true; }
186 }
187
188@@ -49,9 +49,9 @@
189 anchors.horizontalCenter: parent.horizontalCenter;
190 spacing: 0
191
192- CharKey { label: "a"; shifted: "A"; extended: ["ä","à","â","ª","á","å", "æ"]; extendedShifted: ["Ä","À","Â","ª","Á","Å","Æ"]; leftSide: true; }
193- CharKey { label: "s"; shifted: "S"; extended: ["š","ß","$"]; extendedShifted: ["Š","$"] }
194- CharKey { label: "d"; shifted: "D"; extended: ["ð"]; extendedShifted: ["Ð"] }
195+ CharKey { label: "a"; shifted: "A"; leftSide: true; }
196+ CharKey { label: "s"; shifted: "S"; extended: ["š","$"]; extendedShifted: ["Š","$"] }
197+ CharKey { label: "d"; shifted: "D"; extended: ["đ"]; extendedShifted: ["Ð"] }
198 CharKey { label: "f"; shifted: "F"; }
199 CharKey { label: "g"; shifted: "G"; }
200 CharKey { label: "h"; shifted: "H"; }
201@@ -65,12 +65,12 @@
202 spacing: 0
203
204 ShiftKey {}
205- CharKey { label: "y"; shifted: "Y"; extended: ["ý", "¥"]; extendedShifted: ["Ý", "¥"] }
206+ CharKey { label: "y"; shifted: "Y"; extended: ["¥"]; extendedShifted: ["¥"] }
207 CharKey { label: "x"; shifted: "X"; }
208- CharKey { label: "c"; shifted: "C"; extended: ["č","ć","ç"]; extendedShifted: ["Č","Ć","Ç"] }
209+ CharKey { label: "c"; shifted: "C"; extended: ["č","ć"]; extendedShifted: ["Č","Ć"] }
210 CharKey { label: "v"; shifted: "V"; }
211 CharKey { label: "b"; shifted: "B"; }
212- CharKey { label: "n"; shifted: "N"; extended: ["ñ"]; extendedShifted: ["Ñ"] }
213+ CharKey { label: "n"; shifted: "N"; }
214 CharKey { label: "m"; shifted: "M"; }
215 BackspaceKey {}
216 }

Subscribers

People subscribed via source and target branches