diff options
| author | marha <marha@users.sourceforge.net> | 2011-04-13 07:19:47 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-04-13 07:19:47 +0000 |
| commit | d92d86b5e751381366dcde13cf983e041e300ee2 (patch) | |
| tree | dd51efa32957d8d98d06e6ecd0f287322a933025 /xorg-server/xkeyboard-config/symbols/us | |
| parent | e2c8d047679db3bbb166d709b86e18180be6d713 (diff) | |
| parent | 125aba11ec484309e4dc5b2abf1b15ac98784159 (diff) | |
| download | vcxsrv-d92d86b5e751381366dcde13cf983e041e300ee2.tar.gz vcxsrv-d92d86b5e751381366dcde13cf983e041e300ee2.tar.bz2 vcxsrv-d92d86b5e751381366dcde13cf983e041e300ee2.zip | |
svn merge ^/branches/released .
Diffstat (limited to 'xorg-server/xkeyboard-config/symbols/us')
| -rw-r--r-- | xorg-server/xkeyboard-config/symbols/us | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/xorg-server/xkeyboard-config/symbols/us b/xorg-server/xkeyboard-config/symbols/us index 10351796e..396dde6a9 100644 --- a/xorg-server/xkeyboard-config/symbols/us +++ b/xorg-server/xkeyboard-config/symbols/us @@ -2,7 +2,7 @@ default partial alphanumeric_keys modifier_keys
xkb_symbols "basic" {
- name[Group1]= "English (USA)";
+ name[Group1]= "English (US)";
// Alphanumeric section
key <TLDE> { [ grave, asciitilde ] };
@@ -554,7 +554,7 @@ partial alphanumeric_keys xkb_symbols "dvp" {
include "us(dvorak)"
- name[Group1] = "USA - Programmer Dvorak";
+ name[Group1] = "English (programmer Dvorak)";
// Unmodified Shift AltGr Shift+AltGr
// symbols row, left side
@@ -1123,7 +1123,7 @@ xkb_symbols "chr" { partial alphanumeric_keys
xkb_symbols "hbs" {
- name[Group1]= "Serbo-Croatian (USA)";
+ name[Group1]= "Serbo-Croatian (US)";
include "us"
@@ -1212,7 +1212,7 @@ xkb_symbols "htcdream" { partial alphanumeric_keys
xkb_symbols "intl-unicode" {
- name[Group1]= "USA - International (AltGr Unicode combining)";
+ name[Group1]= "English (US, international AltGr Unicode combining)";
include "us(intl)"
include "level3(ralt_switch)"
@@ -1262,7 +1262,7 @@ xkb_symbols "intl-unicode" { partial alphanumeric_keys
xkb_symbols "alt-intl-unicode" {
- name[Group1]= "USA - International (AltGr Unicode combining, alternative)";
+ name[Group1]= "English (US, international AltGr Unicode combining, alternative)";
include "extras/us(intl-unicode)"
include "level3(ralt_switch)"
@@ -1282,7 +1282,7 @@ xkb_symbols "ats" { include "us"
- name[Group1]= "USA - Atsina";
+ name[Group1]= "Atsina";
//Using Dead key to get COMBINING COMMA ABOVE for ejectives on
//q, l, t, s, m, g, k, p, w, y, r
@@ -1313,7 +1313,7 @@ xkb_symbols "crd" { include "us"
- name[Group1]= "USA - Couer D'alene Salish";
+ name[Group1]= "Couer D'alene Salish";
// Alphanumeric section
key <AD02> { [ w, W, U02B7, U02B7 ] };
|