diff options
| author | marha <marha@users.sourceforge.net> | 2011-04-27 15:56:59 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-04-27 15:56:59 +0000 |
| commit | 100633b3e7619842f345cb7603b0db6b5761dd11 (patch) | |
| tree | 3c3af754c7e801c07263269837d6a05072ff834c /xorg-server/xkeyboard-config/symbols/us | |
| parent | 205a4bdae76f287126db9f45a4f0ba631e3efca1 (diff) | |
| parent | 96d6df5da9cddedf4931bf8e17f96e242467c661 (diff) | |
| download | vcxsrv-100633b3e7619842f345cb7603b0db6b5761dd11.tar.gz vcxsrv-100633b3e7619842f345cb7603b0db6b5761dd11.tar.bz2 vcxsrv-100633b3e7619842f345cb7603b0db6b5761dd11.zip | |
svn merge ^/branches/released .
Diffstat (limited to 'xorg-server/xkeyboard-config/symbols/us')
| -rw-r--r-- | xorg-server/xkeyboard-config/symbols/us | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/xorg-server/xkeyboard-config/symbols/us b/xorg-server/xkeyboard-config/symbols/us index 396dde6a9..5b5f03988 100644 --- a/xorg-server/xkeyboard-config/symbols/us +++ b/xorg-server/xkeyboard-config/symbols/us @@ -992,7 +992,7 @@ partial alphanumeric_keys xkb_symbols "olpc" {
include "us(basic)"
- name[Group1]= "USA";
+ name[Group1]= "English (US)";
// OLPC international US English keyboard layout.
// It's a little different from the usual international layout.
@@ -1146,7 +1146,7 @@ xkb_symbols "hbs" { partial alphanumeric_keys
xkb_symbols "htcdream" {
include "inet(htcdream)"
- name[Group1]= "English (USA)";
+ name[Group1]= "English (US)";
//second row
key <AD01> { [ q, Q, Tab, Tab ] };
|