diff options
author | marha <marha@users.sourceforge.net> | 2011-04-05 14:52:19 +0000 |
---|---|---|
committer | marha <marha@users.sourceforge.net> | 2011-04-05 14:52:19 +0000 |
commit | 6254e74e8b2ff8a2a1e8476a3300a7bdd65b7ad6 (patch) | |
tree | 02e0d5fd297602d526b582dc527e007fe20a326f /xorg-server/xkeyboard-config/symbols/ca | |
parent | 1d142834bdb30308784a0654a39b7c0de7e37695 (diff) | |
parent | eaedc21febeadad4cf0e370f5d97e7bdb4470870 (diff) | |
download | vcxsrv-6254e74e8b2ff8a2a1e8476a3300a7bdd65b7ad6.tar.gz vcxsrv-6254e74e8b2ff8a2a1e8476a3300a7bdd65b7ad6.tar.bz2 vcxsrv-6254e74e8b2ff8a2a1e8476a3300a7bdd65b7ad6.zip |
svn merge ^/branches/released .
Diffstat (limited to 'xorg-server/xkeyboard-config/symbols/ca')
-rw-r--r-- | xorg-server/xkeyboard-config/symbols/ca | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/xorg-server/xkeyboard-config/symbols/ca b/xorg-server/xkeyboard-config/symbols/ca index 10427e959..00ef316f8 100644 --- a/xorg-server/xkeyboard-config/symbols/ca +++ b/xorg-server/xkeyboard-config/symbols/ca @@ -1,6 +1,6 @@ default partial
xkb_symbols "fr" {
- name[Group1] = "Canada";
+ name[Group1] = "French (Canada)";
key <TLDE> { [ numbersign, bar, backslash ] };
key <AE01> { [ 1, exclam, plusminus ] };
@@ -60,7 +60,7 @@ xkb_symbols "fr" { };
xkb_symbols "fr-dvorak" {
- name[Group1] = "Canada - French Dvorak";
+ name[Group1] = "French (Canada, Dvorak)";
key <TLDE> { [ numbersign, bar, backslash ] };
key <AE01> { [ 1, exclam, plusminus ] };
@@ -122,7 +122,7 @@ xkb_symbols "fr-dvorak" { partial
xkb_symbols "fr-legacy" {
- name[Group1] = "Canada - French (legacy)";
+ name[Group1] = "French (Canada, legacy)";
include "ca(fr)"
@@ -168,7 +168,7 @@ xkb_symbols "fr-legacy" { partial
xkb_symbols "multi" {
- name[Group1] = "Canada - Multilingual, first part";
+ name[Group1] = "Canadian Multilingual (first part)";
include "ca(fr)"
@@ -206,7 +206,7 @@ xkb_symbols "multi" { partial
xkb_symbols "multi-2gr" {
- name[Group1] = "Canada - Multilingual, second part";
+ name[Group1] = "Canadian Multilingual (second part)";
key <TLDE> { [ NoSymbol, hyphen ] };
key <AE01> { [ onesuperior, exclamdown ] };
@@ -269,7 +269,7 @@ xkb_symbols "multi-2gr" { alphanumeric_keys
xkb_symbols "ike" {
- name[Group1]= "Canada - Inuktitut";
+ name[Group1]= "Inuktitut";
key <AE01> { [ 0x01001595, 1 ] };
key <AE02> { [ 0x01001449, 2 ] };
@@ -330,7 +330,7 @@ xkb_symbols "ike" { partial
xkb_symbols "multix" {
- name[Group1] = "Canada - Multilingual";
+ name[Group1] = "Canadian Multilingual";
key.type[group1]="EIGHT_LEVEL_SEMIALPHABETIC";
key <TLDE> { [ slash, backslash, bar, NoSymbol,
@@ -459,7 +459,7 @@ xkb_symbols "shs" { include "us"
- name[Group1]= "Canada - Secwepemctsin";
+ name[Group1]= "Secwepemctsin";
//Using Dead key to get COMBINING COMMA ABOVE for ejectives on
//q, l, t, s, m, g, k, p, w, y, r
@@ -497,7 +497,7 @@ xkb_symbols "kut" { //Ejective U0313 and compose accents are from shs layout
include "ca(shs)"
- name[Group1]= "Canada - Ktunaxa";
+ name[Group1]= "Kutenai";
// Alphanumeric section
@@ -522,6 +522,6 @@ xkb_symbols "kut" { partial alphanumeric_keys
xkb_symbols "eng" {
- name[Group1] = "Canada - English";
+ name[Group1] = "English (Canada)";
include "us(basic)"
};
|