Merge ~3v1n0/ubuntu/+source/gnome-shell:ubuntu/bionic into ~ubuntu-desktop/ubuntu/+source/gnome-shell:ubuntu/bionic
- Git
- lp:~3v1n0/ubuntu/+source/gnome-shell
- ubuntu/bionic
- Merge into ubuntu/bionic
Proposed by
Marco Trevisan (Treviño)
Status: | Merged |
---|---|
Merged at revision: | f8d767d89ccc92e958a7fed3ae219c396a345e6d |
Proposed branch: | ~3v1n0/ubuntu/+source/gnome-shell:ubuntu/bionic |
Merge into: | ~ubuntu-desktop/ubuntu/+source/gnome-shell:ubuntu/bionic |
Diff against target: |
857 lines (+835/-0) 3 files modified
debian/changelog (+7/-0) debian/patches/osk-layouts-Fix-French-layout.patch (+827/-0) debian/patches/series (+1/-0) |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Ubuntu Desktop | Pending | ||
Review via email: mp+369345@code.launchpad.net |
Commit message
Description of the change
To post a comment you must log in.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1 | diff --git a/debian/changelog b/debian/changelog | |||
2 | index 1e6d367..5d4715d 100644 | |||
3 | --- a/debian/changelog | |||
4 | +++ b/debian/changelog | |||
5 | @@ -1,3 +1,10 @@ | |||
6 | 1 | gnome-shell (3.28.4-0ubuntu18.04.2) UNRELEASED; urgency=medium | ||
7 | 2 | |||
8 | 3 | * d/p/osk-layouts-Fix-French-layout.patch: | ||
9 | 4 | - osk-layouts: Fix French layout (LP: #1832875) | ||
10 | 5 | |||
11 | 6 | -- Marco Trevisan (Treviño) <marco@ubuntu.com> Wed, 26 Jun 2019 17:21:31 +0200 | ||
12 | 7 | |||
13 | 1 | gnome-shell (3.28.4-0ubuntu18.04.1) bionic; urgency=medium | 8 | gnome-shell (3.28.4-0ubuntu18.04.1) bionic; urgency=medium |
14 | 2 | 9 | ||
15 | 3 | * New upstream stable release | 10 | * New upstream stable release |
16 | diff --git a/debian/patches/osk-layouts-Fix-French-layout.patch b/debian/patches/osk-layouts-Fix-French-layout.patch | |||
17 | 4 | new file mode 100644 | 11 | new file mode 100644 |
18 | index 0000000..f8175da | |||
19 | --- /dev/null | |||
20 | +++ b/debian/patches/osk-layouts-Fix-French-layout.patch | |||
21 | @@ -0,0 +1,827 @@ | |||
22 | 1 | From: =?utf-8?q?Florian_M=C3=BCllner?= <fmuellner@gnome.org> | ||
23 | 2 | Date: Wed, 27 Feb 2019 20:11:35 +0100 | ||
24 | 3 | Subject: osk-layouts: Fix French layout | ||
25 | 4 | |||
26 | 5 | The script to convert XML keyboard layouts to json has a small bug | ||
27 | 6 | that causes the French-Canadian layout to end up as French. | ||
28 | 7 | |||
29 | 8 | https://gitlab.gnome.org/GNOME/gnome-shell/issues/997 | ||
30 | 9 | |||
31 | 10 | Origin: https://gitlab.gnome.org/GNOME/gnome-shell/commit/161beb71 | ||
32 | 11 | Bug-GNOME: https://gitlab.gnome.org/GNOME/gnome-shell/issues/997 | ||
33 | 12 | Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/gnome-shell/+bug/1832875 | ||
34 | 13 | Applied-Upstream: 3.28.5 | ||
35 | 14 | |||
36 | 15 | (cherry picked from commit 859aef78c4d2472b2545ce9ecc889c00b9893494) | ||
37 | 16 | --- | ||
38 | 17 | data/gnome-shell-osk-layouts.gresource.xml | 1 + | ||
39 | 18 | data/osk-layouts/ca.json | 599 +++++++++++++++++++++++++++++ | ||
40 | 19 | data/osk-layouts/fr.json | 89 +++-- | ||
41 | 20 | 3 files changed, 652 insertions(+), 37 deletions(-) | ||
42 | 21 | create mode 100644 data/osk-layouts/ca.json | ||
43 | 22 | |||
44 | 23 | diff --git a/data/gnome-shell-osk-layouts.gresource.xml b/data/gnome-shell-osk-layouts.gresource.xml | ||
45 | 24 | index 86d6cb9..0fab4e5 100644 | ||
46 | 25 | --- a/data/gnome-shell-osk-layouts.gresource.xml | ||
47 | 26 | +++ b/data/gnome-shell-osk-layouts.gresource.xml | ||
48 | 27 | @@ -6,6 +6,7 @@ | ||
49 | 28 | <file>be.json</file> | ||
50 | 29 | <file>bg.json</file> | ||
51 | 30 | <file>by.json</file> | ||
52 | 31 | + <file>ca.json</file> | ||
53 | 32 | <file>cz.json</file> | ||
54 | 33 | <file>de.json</file> | ||
55 | 34 | <file>dk.json</file> | ||
56 | 35 | diff --git a/data/osk-layouts/ca.json b/data/osk-layouts/ca.json | ||
57 | 36 | new file mode 100644 | ||
58 | 37 | index 0000000..2b2bedc | ||
59 | 38 | --- /dev/null | ||
60 | 39 | +++ b/data/osk-layouts/ca.json | ||
61 | 40 | @@ -0,0 +1,599 @@ | ||
62 | 41 | +{ | ||
63 | 42 | + "levels": [ | ||
64 | 43 | + { | ||
65 | 44 | + "level": "", | ||
66 | 45 | + "mode": "default", | ||
67 | 46 | + "rows": [ | ||
68 | 47 | + [ | ||
69 | 48 | + [ | ||
70 | 49 | + "q" | ||
71 | 50 | + ], | ||
72 | 51 | + [ | ||
73 | 52 | + "w" | ||
74 | 53 | + ], | ||
75 | 54 | + [ | ||
76 | 55 | + "e", | ||
77 | 56 | + "é", | ||
78 | 57 | + "è", | ||
79 | 58 | + "ê", | ||
80 | 59 | + "ë", | ||
81 | 60 | + "%", | ||
82 | 61 | + "ę", | ||
83 | 62 | + "ė", | ||
84 | 63 | + "ē" | ||
85 | 64 | + ], | ||
86 | 65 | + [ | ||
87 | 66 | + "r" | ||
88 | 67 | + ], | ||
89 | 68 | + [ | ||
90 | 69 | + "t" | ||
91 | 70 | + ], | ||
92 | 71 | + [ | ||
93 | 72 | + "y", | ||
94 | 73 | + "%", | ||
95 | 74 | + "ÿ" | ||
96 | 75 | + ], | ||
97 | 76 | + [ | ||
98 | 77 | + "u", | ||
99 | 78 | + "ù", | ||
100 | 79 | + "û", | ||
101 | 80 | + "%", | ||
102 | 81 | + "ü", | ||
103 | 82 | + "ú", | ||
104 | 83 | + "ū" | ||
105 | 84 | + ], | ||
106 | 85 | + [ | ||
107 | 86 | + "i", | ||
108 | 87 | + "î", | ||
109 | 88 | + "%", | ||
110 | 89 | + "ï", | ||
111 | 90 | + "ì", | ||
112 | 91 | + "í", | ||
113 | 92 | + "į", | ||
114 | 93 | + "ī" | ||
115 | 94 | + ], | ||
116 | 95 | + [ | ||
117 | 96 | + "o", | ||
118 | 97 | + "ô", | ||
119 | 98 | + "œ", | ||
120 | 99 | + "%", | ||
121 | 100 | + "ö", | ||
122 | 101 | + "ò", | ||
123 | 102 | + "ó", | ||
124 | 103 | + "õ", | ||
125 | 104 | + "ø", | ||
126 | 105 | + "ō", | ||
127 | 106 | + "º" | ||
128 | 107 | + ], | ||
129 | 108 | + [ | ||
130 | 109 | + "p" | ||
131 | 110 | + ] | ||
132 | 111 | + ], | ||
133 | 112 | + [ | ||
134 | 113 | + [ | ||
135 | 114 | + "a", | ||
136 | 115 | + "à", | ||
137 | 116 | + "â", | ||
138 | 117 | + "%", | ||
139 | 118 | + "æ", | ||
140 | 119 | + "á", | ||
141 | 120 | + "ä", | ||
142 | 121 | + "ã", | ||
143 | 122 | + "å", | ||
144 | 123 | + "ā", | ||
145 | 124 | + "ª" | ||
146 | 125 | + ], | ||
147 | 126 | + [ | ||
148 | 127 | + "s" | ||
149 | 128 | + ], | ||
150 | 129 | + [ | ||
151 | 130 | + "d" | ||
152 | 131 | + ], | ||
153 | 132 | + [ | ||
154 | 133 | + "f" | ||
155 | 134 | + ], | ||
156 | 135 | + [ | ||
157 | 136 | + "g" | ||
158 | 137 | + ], | ||
159 | 138 | + [ | ||
160 | 139 | + "h" | ||
161 | 140 | + ], | ||
162 | 141 | + [ | ||
163 | 142 | + "j" | ||
164 | 143 | + ], | ||
165 | 144 | + [ | ||
166 | 145 | + "k" | ||
167 | 146 | + ], | ||
168 | 147 | + [ | ||
169 | 148 | + "l" | ||
170 | 149 | + ] | ||
171 | 150 | + ], | ||
172 | 151 | + [ | ||
173 | 152 | + [ | ||
174 | 153 | + "z" | ||
175 | 154 | + ], | ||
176 | 155 | + [ | ||
177 | 156 | + "x" | ||
178 | 157 | + ], | ||
179 | 158 | + [ | ||
180 | 159 | + "c", | ||
181 | 160 | + "ç", | ||
182 | 161 | + "ć", | ||
183 | 162 | + "č" | ||
184 | 163 | + ], | ||
185 | 164 | + [ | ||
186 | 165 | + "v" | ||
187 | 166 | + ], | ||
188 | 167 | + [ | ||
189 | 168 | + "b" | ||
190 | 169 | + ], | ||
191 | 170 | + [ | ||
192 | 171 | + "n" | ||
193 | 172 | + ], | ||
194 | 173 | + [ | ||
195 | 174 | + "m" | ||
196 | 175 | + ] | ||
197 | 176 | + ], | ||
198 | 177 | + [ | ||
199 | 178 | + [ | ||
200 | 179 | + "," | ||
201 | 180 | + ], | ||
202 | 181 | + [ | ||
203 | 182 | + " " | ||
204 | 183 | + ], | ||
205 | 184 | + [ | ||
206 | 185 | + ".", | ||
207 | 186 | + "#", | ||
208 | 187 | + "!", | ||
209 | 188 | + ",", | ||
210 | 189 | + "?", | ||
211 | 190 | + "-", | ||
212 | 191 | + ":", | ||
213 | 192 | + "'", | ||
214 | 193 | + "@" | ||
215 | 194 | + ] | ||
216 | 195 | + ] | ||
217 | 196 | + ] | ||
218 | 197 | + }, | ||
219 | 198 | + { | ||
220 | 199 | + "level": "shift", | ||
221 | 200 | + "mode": "latched", | ||
222 | 201 | + "rows": [ | ||
223 | 202 | + [ | ||
224 | 203 | + [ | ||
225 | 204 | + "Q" | ||
226 | 205 | + ], | ||
227 | 206 | + [ | ||
228 | 207 | + "W" | ||
229 | 208 | + ], | ||
230 | 209 | + [ | ||
231 | 210 | + "E", | ||
232 | 211 | + "É", | ||
233 | 212 | + "È", | ||
234 | 213 | + "Ê", | ||
235 | 214 | + "Ë", | ||
236 | 215 | + "%", | ||
237 | 216 | + "Ę", | ||
238 | 217 | + "Ė", | ||
239 | 218 | + "Ē" | ||
240 | 219 | + ], | ||
241 | 220 | + [ | ||
242 | 221 | + "R" | ||
243 | 222 | + ], | ||
244 | 223 | + [ | ||
245 | 224 | + "T" | ||
246 | 225 | + ], | ||
247 | 226 | + [ | ||
248 | 227 | + "Y", | ||
249 | 228 | + "%", | ||
250 | 229 | + "Ÿ" | ||
251 | 230 | + ], | ||
252 | 231 | + [ | ||
253 | 232 | + "U", | ||
254 | 233 | + "Ù", | ||
255 | 234 | + "Û", | ||
256 | 235 | + "%", | ||
257 | 236 | + "Ü", | ||
258 | 237 | + "Ú", | ||
259 | 238 | + "Ū" | ||
260 | 239 | + ], | ||
261 | 240 | + [ | ||
262 | 241 | + "I", | ||
263 | 242 | + "Î", | ||
264 | 243 | + "%", | ||
265 | 244 | + "Ï", | ||
266 | 245 | + "Ì", | ||
267 | 246 | + "Í", | ||
268 | 247 | + "Į", | ||
269 | 248 | + "Ī" | ||
270 | 249 | + ], | ||
271 | 250 | + [ | ||
272 | 251 | + "O", | ||
273 | 252 | + "Ô", | ||
274 | 253 | + "Œ", | ||
275 | 254 | + "%", | ||
276 | 255 | + "Ö", | ||
277 | 256 | + "Ò", | ||
278 | 257 | + "Ó", | ||
279 | 258 | + "Õ", | ||
280 | 259 | + "Ø", | ||
281 | 260 | + "Ō", | ||
282 | 261 | + "º" | ||
283 | 262 | + ], | ||
284 | 263 | + [ | ||
285 | 264 | + "P" | ||
286 | 265 | + ] | ||
287 | 266 | + ], | ||
288 | 267 | + [ | ||
289 | 268 | + [ | ||
290 | 269 | + "A", | ||
291 | 270 | + "À", | ||
292 | 271 | + "Â", | ||
293 | 272 | + "%", | ||
294 | 273 | + "Æ", | ||
295 | 274 | + "Á", | ||
296 | 275 | + "Ä", | ||
297 | 276 | + "Ã", | ||
298 | 277 | + "Å", | ||
299 | 278 | + "Ā", | ||
300 | 279 | + "ª" | ||
301 | 280 | + ], | ||
302 | 281 | + [ | ||
303 | 282 | + "S" | ||
304 | 283 | + ], | ||
305 | 284 | + [ | ||
306 | 285 | + "D" | ||
307 | 286 | + ], | ||
308 | 287 | + [ | ||
309 | 288 | + "F" | ||
310 | 289 | + ], | ||
311 | 290 | + [ | ||
312 | 291 | + "G" | ||
313 | 292 | + ], | ||
314 | 293 | + [ | ||
315 | 294 | + "H" | ||
316 | 295 | + ], | ||
317 | 296 | + [ | ||
318 | 297 | + "J" | ||
319 | 298 | + ], | ||
320 | 299 | + [ | ||
321 | 300 | + "K" | ||
322 | 301 | + ], | ||
323 | 302 | + [ | ||
324 | 303 | + "L" | ||
325 | 304 | + ] | ||
326 | 305 | + ], | ||
327 | 306 | + [ | ||
328 | 307 | + [ | ||
329 | 308 | + "Z" | ||
330 | 309 | + ], | ||
331 | 310 | + [ | ||
332 | 311 | + "X" | ||
333 | 312 | + ], | ||
334 | 313 | + [ | ||
335 | 314 | + "C", | ||
336 | 315 | + "Ç", | ||
337 | 316 | + "Ć", | ||
338 | 317 | + "Č" | ||
339 | 318 | + ], | ||
340 | 319 | + [ | ||
341 | 320 | + "V" | ||
342 | 321 | + ], | ||
343 | 322 | + [ | ||
344 | 323 | + "B" | ||
345 | 324 | + ], | ||
346 | 325 | + [ | ||
347 | 326 | + "N" | ||
348 | 327 | + ], | ||
349 | 328 | + [ | ||
350 | 329 | + "M" | ||
351 | 330 | + ] | ||
352 | 331 | + ], | ||
353 | 332 | + [ | ||
354 | 333 | + [ | ||
355 | 334 | + "," | ||
356 | 335 | + ], | ||
357 | 336 | + [ | ||
358 | 337 | + " " | ||
359 | 338 | + ], | ||
360 | 339 | + [ | ||
361 | 340 | + ".", | ||
362 | 341 | + "#", | ||
363 | 342 | + "!", | ||
364 | 343 | + ",", | ||
365 | 344 | + "?", | ||
366 | 345 | + "-", | ||
367 | 346 | + ":", | ||
368 | 347 | + "'", | ||
369 | 348 | + "@" | ||
370 | 349 | + ] | ||
371 | 350 | + ] | ||
372 | 351 | + ] | ||
373 | 352 | + }, | ||
374 | 353 | + { | ||
375 | 354 | + "level": "opt", | ||
376 | 355 | + "mode": "locked", | ||
377 | 356 | + "rows": [ | ||
378 | 357 | + [ | ||
379 | 358 | + [ | ||
380 | 359 | + "1", | ||
381 | 360 | + "¹", | ||
382 | 361 | + "½", | ||
383 | 362 | + "⅓", | ||
384 | 363 | + "¼", | ||
385 | 364 | + "⅛" | ||
386 | 365 | + ], | ||
387 | 366 | + [ | ||
388 | 367 | + "2", | ||
389 | 368 | + "²", | ||
390 | 369 | + "⅔" | ||
391 | 370 | + ], | ||
392 | 371 | + [ | ||
393 | 372 | + "3", | ||
394 | 373 | + "³", | ||
395 | 374 | + "¾", | ||
396 | 375 | + "⅜" | ||
397 | 376 | + ], | ||
398 | 377 | + [ | ||
399 | 378 | + "4", | ||
400 | 379 | + "⁴" | ||
401 | 380 | + ], | ||
402 | 381 | + [ | ||
403 | 382 | + "5", | ||
404 | 383 | + "⅝" | ||
405 | 384 | + ], | ||
406 | 385 | + [ | ||
407 | 386 | + "6" | ||
408 | 387 | + ], | ||
409 | 388 | + [ | ||
410 | 389 | + "7", | ||
411 | 390 | + "⅞" | ||
412 | 391 | + ], | ||
413 | 392 | + [ | ||
414 | 393 | + "8" | ||
415 | 394 | + ], | ||
416 | 395 | + [ | ||
417 | 396 | + "9" | ||
418 | 397 | + ], | ||
419 | 398 | + [ | ||
420 | 399 | + "0", | ||
421 | 400 | + "ⁿ", | ||
422 | 401 | + "∅" | ||
423 | 402 | + ] | ||
424 | 403 | + ], | ||
425 | 404 | + [ | ||
426 | 405 | + [ | ||
427 | 406 | + "@" | ||
428 | 407 | + ], | ||
429 | 408 | + [ | ||
430 | 409 | + "#" | ||
431 | 410 | + ], | ||
432 | 411 | + [ | ||
433 | 412 | + "$", | ||
434 | 413 | + "¢", | ||
435 | 414 | + "£", | ||
436 | 415 | + "€", | ||
437 | 416 | + "¥", | ||
438 | 417 | + "₱" | ||
439 | 418 | + ], | ||
440 | 419 | + [ | ||
441 | 420 | + "%", | ||
442 | 421 | + "‰" | ||
443 | 422 | + ], | ||
444 | 423 | + [ | ||
445 | 424 | + "&" | ||
446 | 425 | + ], | ||
447 | 426 | + [ | ||
448 | 427 | + "-", | ||
449 | 428 | + "_", | ||
450 | 429 | + "–", | ||
451 | 430 | + "—", | ||
452 | 431 | + "·" | ||
453 | 432 | + ], | ||
454 | 433 | + [ | ||
455 | 434 | + "+", | ||
456 | 435 | + "±" | ||
457 | 436 | + ], | ||
458 | 437 | + [ | ||
459 | 438 | + "(", | ||
460 | 439 | + "<", | ||
461 | 440 | + "{", | ||
462 | 441 | + "[" | ||
463 | 442 | + ], | ||
464 | 443 | + [ | ||
465 | 444 | + ")", | ||
466 | 445 | + ">", | ||
467 | 446 | + "}", | ||
468 | 447 | + "]" | ||
469 | 448 | + ] | ||
470 | 449 | + ], | ||
471 | 450 | + [ | ||
472 | 451 | + [ | ||
473 | 452 | + "*", | ||
474 | 453 | + "†", | ||
475 | 454 | + "‡", | ||
476 | 455 | + "★" | ||
477 | 456 | + ], | ||
478 | 457 | + [ | ||
479 | 458 | + "\"", | ||
480 | 459 | + "“", | ||
481 | 460 | + "”", | ||
482 | 461 | + "«", | ||
483 | 462 | + "»" | ||
484 | 463 | + ], | ||
485 | 464 | + [ | ||
486 | 465 | + "'", | ||
487 | 466 | + "‘", | ||
488 | 467 | + "’", | ||
489 | 468 | + "‹", | ||
490 | 469 | + "›" | ||
491 | 470 | + ], | ||
492 | 471 | + [ | ||
493 | 472 | + ":" | ||
494 | 473 | + ], | ||
495 | 474 | + [ | ||
496 | 475 | + ";" | ||
497 | 476 | + ], | ||
498 | 477 | + [ | ||
499 | 478 | + "!", | ||
500 | 479 | + "¡" | ||
501 | 480 | + ], | ||
502 | 481 | + [ | ||
503 | 482 | + "?", | ||
504 | 483 | + "¿" | ||
505 | 484 | + ] | ||
506 | 485 | + ], | ||
507 | 486 | + [ | ||
508 | 487 | + [ | ||
509 | 488 | + "_" | ||
510 | 489 | + ], | ||
511 | 490 | + [ | ||
512 | 491 | + "/" | ||
513 | 492 | + ], | ||
514 | 493 | + [ | ||
515 | 494 | + " " | ||
516 | 495 | + ], | ||
517 | 496 | + [ | ||
518 | 497 | + "," | ||
519 | 498 | + ], | ||
520 | 499 | + [ | ||
521 | 500 | + ".", | ||
522 | 501 | + "…" | ||
523 | 502 | + ] | ||
524 | 503 | + ] | ||
525 | 504 | + ] | ||
526 | 505 | + }, | ||
527 | 506 | + { | ||
528 | 507 | + "level": "opt+shift", | ||
529 | 508 | + "mode": "locked", | ||
530 | 509 | + "rows": [ | ||
531 | 510 | + [ | ||
532 | 511 | + [ | ||
533 | 512 | + "~" | ||
534 | 513 | + ], | ||
535 | 514 | + [ | ||
536 | 515 | + "`" | ||
537 | 516 | + ], | ||
538 | 517 | + [ | ||
539 | 518 | + "|" | ||
540 | 519 | + ], | ||
541 | 520 | + [ | ||
542 | 521 | + "•", | ||
543 | 522 | + "♪", | ||
544 | 523 | + "♥", | ||
545 | 524 | + "♠", | ||
546 | 525 | + "♦", | ||
547 | 526 | + "♣" | ||
548 | 527 | + ], | ||
549 | 528 | + [ | ||
550 | 529 | + "√" | ||
551 | 530 | + ], | ||
552 | 531 | + [ | ||
553 | 532 | + "Π", | ||
554 | 533 | + "π" | ||
555 | 534 | + ], | ||
556 | 535 | + [ | ||
557 | 536 | + "÷" | ||
558 | 537 | + ], | ||
559 | 538 | + [ | ||
560 | 539 | + "×" | ||
561 | 540 | + ], | ||
562 | 541 | + [ | ||
563 | 542 | + "¶", | ||
564 | 543 | + "§" | ||
565 | 544 | + ], | ||
566 | 545 | + [ | ||
567 | 546 | + "∆" | ||
568 | 547 | + ] | ||
569 | 548 | + ], | ||
570 | 549 | + [ | ||
571 | 550 | + [ | ||
572 | 551 | + "£" | ||
573 | 552 | + ], | ||
574 | 553 | + [ | ||
575 | 554 | + "¢" | ||
576 | 555 | + ], | ||
577 | 556 | + [ | ||
578 | 557 | + "€" | ||
579 | 558 | + ], | ||
580 | 559 | + [ | ||
581 | 560 | + "¥" | ||
582 | 561 | + ], | ||
583 | 562 | + [ | ||
584 | 563 | + "^", | ||
585 | 564 | + "↑", | ||
586 | 565 | + "↓", | ||
587 | 566 | + "←", | ||
588 | 567 | + "→" | ||
589 | 568 | + ], | ||
590 | 569 | + [ | ||
591 | 570 | + "°", | ||
592 | 571 | + "′", | ||
593 | 572 | + "″" | ||
594 | 573 | + ], | ||
595 | 574 | + [ | ||
596 | 575 | + "=", | ||
597 | 576 | + "≠", | ||
598 | 577 | + "≈", | ||
599 | 578 | + "∞" | ||
600 | 579 | + ], | ||
601 | 580 | + [ | ||
602 | 581 | + "{" | ||
603 | 582 | + ], | ||
604 | 583 | + [ | ||
605 | 584 | + "}" | ||
606 | 585 | + ] | ||
607 | 586 | + ], | ||
608 | 587 | + [ | ||
609 | 588 | + [ | ||
610 | 589 | + "\\" | ||
611 | 590 | + ], | ||
612 | 591 | + [ | ||
613 | 592 | + "©" | ||
614 | 593 | + ], | ||
615 | 594 | + [ | ||
616 | 595 | + "®" | ||
617 | 596 | + ], | ||
618 | 597 | + [ | ||
619 | 598 | + "™" | ||
620 | 599 | + ], | ||
621 | 600 | + [ | ||
622 | 601 | + "℅" | ||
623 | 602 | + ], | ||
624 | 603 | + [ | ||
625 | 604 | + "[" | ||
626 | 605 | + ], | ||
627 | 606 | + [ | ||
628 | 607 | + "]" | ||
629 | 608 | + ] | ||
630 | 609 | + ], | ||
631 | 610 | + [ | ||
632 | 611 | + [ | ||
633 | 612 | + "<", | ||
634 | 613 | + "‹", | ||
635 | 614 | + "≤", | ||
636 | 615 | + "«" | ||
637 | 616 | + ], | ||
638 | 617 | + [ | ||
639 | 618 | + ">", | ||
640 | 619 | + "›", | ||
641 | 620 | + "≥", | ||
642 | 621 | + "»" | ||
643 | 622 | + ], | ||
644 | 623 | + [ | ||
645 | 624 | + " " | ||
646 | 625 | + ], | ||
647 | 626 | + [ | ||
648 | 627 | + "," | ||
649 | 628 | + ], | ||
650 | 629 | + [ | ||
651 | 630 | + ".", | ||
652 | 631 | + "…" | ||
653 | 632 | + ] | ||
654 | 633 | + ] | ||
655 | 634 | + ] | ||
656 | 635 | + } | ||
657 | 636 | + ], | ||
658 | 637 | + "locale": "fr-CA", | ||
659 | 638 | + "name": "French Canada" | ||
660 | 639 | +} | ||
661 | 640 | \ No newline at end of file | ||
662 | 641 | diff --git a/data/osk-layouts/fr.json b/data/osk-layouts/fr.json | ||
663 | 642 | index 2b2bedc..dd572b1 100644 | ||
664 | 643 | --- a/data/osk-layouts/fr.json | ||
665 | 644 | +++ b/data/osk-layouts/fr.json | ||
666 | 645 | @@ -6,10 +6,20 @@ | ||
667 | 646 | "rows": [ | ||
668 | 647 | [ | ||
669 | 648 | [ | ||
670 | 649 | - "q" | ||
671 | 650 | + "a", | ||
672 | 651 | + "à", | ||
673 | 652 | + "â", | ||
674 | 653 | + "%", | ||
675 | 654 | + "æ", | ||
676 | 655 | + "á", | ||
677 | 656 | + "ä", | ||
678 | 657 | + "ã", | ||
679 | 658 | + "å", | ||
680 | 659 | + "ā", | ||
681 | 660 | + "ª" | ||
682 | 661 | ], | ||
683 | 662 | [ | ||
684 | 663 | - "w" | ||
685 | 664 | + "z" | ||
686 | 665 | ], | ||
687 | 666 | [ | ||
688 | 667 | "e", | ||
689 | 668 | @@ -71,17 +81,7 @@ | ||
690 | 669 | ], | ||
691 | 670 | [ | ||
692 | 671 | [ | ||
693 | 672 | - "a", | ||
694 | 673 | - "à", | ||
695 | 674 | - "â", | ||
696 | 675 | - "%", | ||
697 | 676 | - "æ", | ||
698 | 677 | - "á", | ||
699 | 678 | - "ä", | ||
700 | 679 | - "ã", | ||
701 | 680 | - "å", | ||
702 | 681 | - "ā", | ||
703 | 682 | - "ª" | ||
704 | 683 | + "q" | ||
705 | 684 | ], | ||
706 | 685 | [ | ||
707 | 686 | "s" | ||
708 | 687 | @@ -106,11 +106,14 @@ | ||
709 | 688 | ], | ||
710 | 689 | [ | ||
711 | 690 | "l" | ||
712 | 691 | + ], | ||
713 | 692 | + [ | ||
714 | 693 | + "m" | ||
715 | 694 | ] | ||
716 | 695 | ], | ||
717 | 696 | [ | ||
718 | 697 | [ | ||
719 | 698 | - "z" | ||
720 | 699 | + "w" | ||
721 | 700 | ], | ||
722 | 701 | [ | ||
723 | 702 | "x" | ||
724 | 703 | @@ -131,7 +134,11 @@ | ||
725 | 704 | "n" | ||
726 | 705 | ], | ||
727 | 706 | [ | ||
728 | 707 | - "m" | ||
729 | 708 | + "'", | ||
730 | 709 | + "‘", | ||
731 | 710 | + "’", | ||
732 | 711 | + "‹", | ||
733 | 712 | + "›" | ||
734 | 713 | ] | ||
735 | 714 | ], | ||
736 | 715 | [ | ||
737 | 716 | @@ -161,10 +168,20 @@ | ||
738 | 717 | "rows": [ | ||
739 | 718 | [ | ||
740 | 719 | [ | ||
741 | 720 | - "Q" | ||
742 | 721 | + "A", | ||
743 | 722 | + "À", | ||
744 | 723 | + "Â", | ||
745 | 724 | + "%", | ||
746 | 725 | + "Æ", | ||
747 | 726 | + "Á", | ||
748 | 727 | + "Ä", | ||
749 | 728 | + "Ã", | ||
750 | 729 | + "Å", | ||
751 | 730 | + "Ā", | ||
752 | 731 | + "ª" | ||
753 | 732 | ], | ||
754 | 733 | [ | ||
755 | 734 | - "W" | ||
756 | 735 | + "Z" | ||
757 | 736 | ], | ||
758 | 737 | [ | ||
759 | 738 | "E", | ||
760 | 739 | @@ -226,17 +243,7 @@ | ||
761 | 740 | ], | ||
762 | 741 | [ | ||
763 | 742 | [ | ||
764 | 743 | - "A", | ||
765 | 744 | - "À", | ||
766 | 745 | - "Â", | ||
767 | 746 | - "%", | ||
768 | 747 | - "Æ", | ||
769 | 748 | - "Á", | ||
770 | 749 | - "Ä", | ||
771 | 750 | - "Ã", | ||
772 | 751 | - "Å", | ||
773 | 752 | - "Ā", | ||
774 | 753 | - "ª" | ||
775 | 754 | + "Q" | ||
776 | 755 | ], | ||
777 | 756 | [ | ||
778 | 757 | "S" | ||
779 | 758 | @@ -261,11 +268,14 @@ | ||
780 | 759 | ], | ||
781 | 760 | [ | ||
782 | 761 | "L" | ||
783 | 762 | + ], | ||
784 | 763 | + [ | ||
785 | 764 | + "M" | ||
786 | 765 | ] | ||
787 | 766 | ], | ||
788 | 767 | [ | ||
789 | 768 | [ | ||
790 | 769 | - "Z" | ||
791 | 770 | + "W" | ||
792 | 771 | ], | ||
793 | 772 | [ | ||
794 | 773 | "X" | ||
795 | 774 | @@ -286,7 +296,11 @@ | ||
796 | 775 | "N" | ||
797 | 776 | ], | ||
798 | 777 | [ | ||
799 | 778 | - "M" | ||
800 | 779 | + "'", | ||
801 | 780 | + "‘", | ||
802 | 781 | + "’", | ||
803 | 782 | + "‹", | ||
804 | 783 | + "›" | ||
805 | 784 | ] | ||
806 | 785 | ], | ||
807 | 786 | [ | ||
808 | 787 | @@ -369,10 +383,10 @@ | ||
809 | 788 | "#" | ||
810 | 789 | ], | ||
811 | 790 | [ | ||
812 | 791 | - "$", | ||
813 | 792 | + "€", | ||
814 | 793 | "¢", | ||
815 | 794 | "£", | ||
816 | 795 | - "€", | ||
817 | 796 | + "$", | ||
818 | 797 | "¥", | ||
819 | 798 | "₱" | ||
820 | 799 | ], | ||
821 | 800 | @@ -511,13 +525,14 @@ | ||
822 | 801 | "£" | ||
823 | 802 | ], | ||
824 | 803 | [ | ||
825 | 804 | - "¢" | ||
826 | 805 | + "¥" | ||
827 | 806 | ], | ||
828 | 807 | [ | ||
829 | 808 | - "€" | ||
830 | 809 | + "$", | ||
831 | 810 | + "¢" | ||
832 | 811 | ], | ||
833 | 812 | [ | ||
834 | 813 | - "¥" | ||
835 | 814 | + "¢" | ||
836 | 815 | ], | ||
837 | 816 | [ | ||
838 | 817 | "^", | ||
839 | 818 | @@ -594,6 +609,6 @@ | ||
840 | 819 | ] | ||
841 | 820 | } | ||
842 | 821 | ], | ||
843 | 822 | - "locale": "fr-CA", | ||
844 | 823 | - "name": "French Canada" | ||
845 | 824 | + "locale": "fr", | ||
846 | 825 | + "name": "French" | ||
847 | 826 | } | ||
848 | 827 | \ No newline at end of file | ||
849 | diff --git a/debian/patches/series b/debian/patches/series | |||
850 | index e9c28b3..da5bfc2 100644 | |||
851 | --- a/debian/patches/series | |||
852 | +++ b/debian/patches/series | |||
853 | @@ -25,3 +25,4 @@ CVE-2019-3820-1.patch | |||
854 | 25 | CVE-2019-3820-2.patch | 25 | CVE-2019-3820-2.patch |
855 | 26 | switchMonitor-switch-to-next-config-upon-initial-keypress.patch | 26 | switchMonitor-switch-to-next-config-upon-initial-keypress.patch |
856 | 27 | st-widget-Add-missing-g_return_val_if_fail.patch | 27 | st-widget-Add-missing-g_return_val_if_fail.patch |
857 | 28 | osk-layouts-Fix-French-layout.patch |