Update Canadian keyboard layout to better match the X11 one

[Dmitry Timoshkov]

Hello,

Changelog:
    Dmitry Timoshkov <dmitry at codeweavers.com>
    Update Canadian keyboard layout to better match the X11 one.

--- cvs/hq/wine/dlls/x11drv/keyboard.c	2005-11-14 13:12:21.000000000 +080=
0
+++ wine/dlls/x11drv/keyboard.c	2005-12-23 17:09:24.000000000 +0800
@@ -401,7 +401,7 @@ static const char main_key_ET[MAIN_LEN][
  "<>"
 };
=20
-/*** Canadian French keyboard layout */
+/*** Canadian French keyboard layout (setxkbmap ca_enhanced) */
 static const char main_key_CF[MAIN_LEN][4] =3D
 {
  "#|\\","1!=B1","2\"@","3/=A3","4$=A2","5%=A4","6?=AC","7&=A6","8*=B2","=
9(=B3","0)=BC","-_=BD","=3D+=BE",
@@ -411,13 +411,11 @@ static const char main_key_CF[MAIN_LEN][
  "=AB=BB=B0"
 };
=20
-/*** Canadian CAN/CSA Z243.200-92 keyboard layout=20
- *** Contributed by Jean-Michel Dault <jmdault at revolutionlinux.com> */
+/*** Canadian keyboard layout (setxkbmap ca) */
 static const char main_key_CA[MAIN_LEN][4] =3D
 {
-
  "/\\","1!=B9=A1","2@=B2","3#=B3=A3","4$=BC=A4","5%=BD","6?=BE","7&","8*=
","9(","0)","-_","=3D+",
- "qQ","wW","eE","rR=B6=AE","tT","yY","uU","iI","oO=F8=D8","pP=FE=DE","^=A8=
=E5=C5","=E7=C7~",
+ "qQ","wW","eE","rR","tT","yY","uU","iI","oO=F8=D8","pP=FE=DE","^=A8=A8"=
,"=E7=C7~",
  "aA=E6=C6","sS=DF=A7","dD=F0=D0","fF","gG","hH","jJ","kK","lL",";:=B4",=
"=E8=C8","=E0=C0",
  "zZ","xX","cC=A2=A9","vV","bB","nN","mM=B5=BA",",'",".\"=B7=F7","=E9=C9=
",
  "=F9=D9"
@@ -901,7 +899,7 @@ static const struct {
  {0x0406, "Danish keyboard layout", &main_key_DA, &main_key_scan_qwerty,=
 &main_key_vkey_qwerty},
  {0x040c, "French keyboard layout", &main_key_FR, &main_key_scan_qwerty,=
 &main_key_vkey_azerty},
  {0x0c0c, "Canadian French keyboard layout", &main_key_CF, &main_key_sca=
n_qwerty, &main_key_vkey_qwerty},
- {0x0c0c, "Canadian CAN/CSA-Z243.200-92 keyboard layout", &main_key_CA, =
&main_key_scan_qwerty, &main_key_vkey_qwerty},
+ {0x0c0c, "Canadian keyboard layout", &main_key_CA, &main_key_scan_qwert=
y, &main_key_vkey_qwerty},
  {0x080c, "Belgian keyboard layout", &main_key_BE, &main_key_scan_qwerty=
, &main_key_vkey_azerty},
  {0x0816, "Portuguese keyboard layout", &main_key_PT, &main_key_scan_qwe=
rty, &main_key_vkey_qwerty},
  {0x0416, "Brazilian ABNT-2 keyboard layout", &main_key_PT_br, &main_key=
_scan_abnt_qwerty, &main_key_vkey_abnt_qwerty},