diff options
| author | marha <marha@users.sourceforge.net> | 2013-08-19 09:07:37 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2013-08-19 09:07:37 +0200 |
| commit | 2d042f719910c5aa1ba9f4a47b21009c729c345e (patch) | |
| tree | 2b20d89d5f1ca342ca6f1d817c18b324adf7086f /xorg-server/xkeyboard-config/symbols/us | |
| parent | c3d3ea464f7f4e53e8fe3e11ecada36cb209ba4d (diff) | |
| parent | 854ec4da20ddff9b830be0a7d5b81d8cb4774132 (diff) | |
| download | vcxsrv-2d042f719910c5aa1ba9f4a47b21009c729c345e.tar.gz vcxsrv-2d042f719910c5aa1ba9f4a47b21009c729c345e.tar.bz2 vcxsrv-2d042f719910c5aa1ba9f4a47b21009c729c345e.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
fontconfig libX11 libXdmcp libxcb xkeyboard-config mesa pixman xserver git update 19 aug 2013
Conflicts:
fontconfig/src/fccache.c
Diffstat (limited to 'xorg-server/xkeyboard-config/symbols/us')
| -rw-r--r-- | xorg-server/xkeyboard-config/symbols/us | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/xorg-server/xkeyboard-config/symbols/us b/xorg-server/xkeyboard-config/symbols/us index b34bedc0f..5ad2ae072 100644 --- a/xorg-server/xkeyboard-config/symbols/us +++ b/xorg-server/xkeyboard-config/symbols/us @@ -853,7 +853,7 @@ xkb_symbols "altgr-intl" { partial alphanumeric_keys xkb_symbols "classmate" { include "us(basic)" - name[Group1]= "USA - ClassmatePC"; + name[Group1]= "English (US)"; key <LSGT> { [ backslash, bar, backslash, bar ] }; @@ -1052,14 +1052,14 @@ xkb_symbols "olpc" { partial alphanumeric_keys xkb_symbols "olpc2" { include "us(olpc)" - name[Group1]= "English (layout toggle on multiply/divide key)"; + name[Group1]= "English (the divide/multiply keys toggle the layout)"; include "group(olpc)" }; xkb_symbols "olpcm" { include "us(basic)" - name[Group1]= "USA"; + name[Group1]= "English (US)"; // Mechanical (non-membrane) OLPC int'l US English keyboard layout. // See: http://wiki.laptop.org/go/OLPC_English_Non-membrane_Keyboard |