aboutsummaryrefslogtreecommitdiff
path: root/xorg-server/xkeyboard-config/symbols
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2011-04-05 14:52:19 +0000
committermarha <marha@users.sourceforge.net>2011-04-05 14:52:19 +0000
commit6254e74e8b2ff8a2a1e8476a3300a7bdd65b7ad6 (patch)
tree02e0d5fd297602d526b582dc527e007fe20a326f /xorg-server/xkeyboard-config/symbols
parent1d142834bdb30308784a0654a39b7c0de7e37695 (diff)
parenteaedc21febeadad4cf0e370f5d97e7bdb4470870 (diff)
downloadvcxsrv-6254e74e8b2ff8a2a1e8476a3300a7bdd65b7ad6.tar.gz
vcxsrv-6254e74e8b2ff8a2a1e8476a3300a7bdd65b7ad6.tar.bz2
vcxsrv-6254e74e8b2ff8a2a1e8476a3300a7bdd65b7ad6.zip
svn merge ^/branches/released .
Diffstat (limited to 'xorg-server/xkeyboard-config/symbols')
-rw-r--r--xorg-server/xkeyboard-config/symbols/ad2
-rw-r--r--xorg-server/xkeyboard-config/symbols/af13
-rw-r--r--xorg-server/xkeyboard-config/symbols/al2
-rw-r--r--xorg-server/xkeyboard-config/symbols/am14
-rw-r--r--xorg-server/xkeyboard-config/symbols/ara12
-rw-r--r--xorg-server/xkeyboard-config/symbols/at8
-rw-r--r--xorg-server/xkeyboard-config/symbols/az4
-rw-r--r--xorg-server/xkeyboard-config/symbols/ba10
-rw-r--r--xorg-server/xkeyboard-config/symbols/bd5
-rw-r--r--xorg-server/xkeyboard-config/symbols/be16
-rw-r--r--xorg-server/xkeyboard-config/symbols/bg6
-rw-r--r--xorg-server/xkeyboard-config/symbols/br16
-rw-r--r--xorg-server/xkeyboard-config/symbols/bt2
-rw-r--r--xorg-server/xkeyboard-config/symbols/by6
-rw-r--r--xorg-server/xkeyboard-config/symbols/ca20
-rw-r--r--xorg-server/xkeyboard-config/symbols/cd.in138
-rw-r--r--xorg-server/xkeyboard-config/symbols/cn8
-rw-r--r--xorg-server/xkeyboard-config/symbols/cz12
-rw-r--r--xorg-server/xkeyboard-config/symbols/de32
-rw-r--r--xorg-server/xkeyboard-config/symbols/dk10
-rw-r--r--xorg-server/xkeyboard-config/symbols/ee8
-rw-r--r--xorg-server/xkeyboard-config/symbols/fi10
-rw-r--r--xorg-server/xkeyboard-config/symbols/fo4
-rw-r--r--xorg-server/xkeyboard-config/symbols/fr36
-rw-r--r--xorg-server/xkeyboard-config/symbols/ge10
-rw-r--r--xorg-server/xkeyboard-config/symbols/gh18
-rw-r--r--xorg-server/xkeyboard-config/symbols/gn2
-rw-r--r--xorg-server/xkeyboard-config/symbols/gr10
-rw-r--r--xorg-server/xkeyboard-config/symbols/hr10
-rw-r--r--xorg-server/xkeyboard-config/symbols/hu40
-rw-r--r--xorg-server/xkeyboard-config/symbols/il8
-rw-r--r--xorg-server/xkeyboard-config/symbols/in46
-rw-r--r--xorg-server/xkeyboard-config/symbols/iq10
-rw-r--r--xorg-server/xkeyboard-config/symbols/ir14
-rw-r--r--xorg-server/xkeyboard-config/symbols/is10
-rw-r--r--xorg-server/xkeyboard-config/symbols/it12
-rw-r--r--xorg-server/xkeyboard-config/symbols/ma16
-rw-r--r--xorg-server/xkeyboard-config/symbols/nl8
-rw-r--r--xorg-server/xkeyboard-config/symbols/pt4
-rw-r--r--xorg-server/xkeyboard-config/symbols/ro46
-rw-r--r--xorg-server/xkeyboard-config/symbols/tr14
-rw-r--r--xorg-server/xkeyboard-config/symbols/ua22
-rw-r--r--xorg-server/xkeyboard-config/symbols/us36
-rw-r--r--xorg-server/xkeyboard-config/symbols/uz22
44 files changed, 344 insertions, 408 deletions
diff --git a/xorg-server/xkeyboard-config/symbols/ad b/xorg-server/xkeyboard-config/symbols/ad
index bce6f6140..bd9004792 100644
--- a/xorg-server/xkeyboard-config/symbols/ad
+++ b/xorg-server/xkeyboard-config/symbols/ad
@@ -9,7 +9,7 @@ partial default alphanumeric_keys
xkb_symbols "basic" {
include "us"
- name[Group1]="Andorra";
+ name[Group1]="Catalan";
key <AE02> { [ 2, at, dead_diaeresis ] };
key <AE07> { [ 7, ampersand, dead_acute ] };
diff --git a/xorg-server/xkeyboard-config/symbols/af b/xorg-server/xkeyboard-config/symbols/af
index 691b0a07c..9054b8070 100644
--- a/xorg-server/xkeyboard-config/symbols/af
+++ b/xorg-server/xkeyboard-config/symbols/af
@@ -12,8 +12,7 @@
partial default alphanumeric_keys
xkb_symbols "basic" {
- //name[Group1]= "Afghanistan Dari";
- name[Group1]= "Afghanistan";
+ name[Group1]= "Afghani";
key <TLDE> { [ 0x100200d, 0x10000f7, dead_tilde ] };
key <AE01> { [ 0x10006f1, exclam, 0x1000060 ] };
@@ -84,7 +83,7 @@ xkb_symbols "basic" {
partial alphanumeric_keys
xkb_symbols "ps" {
- name[Group1]= "Afghanistan - Pashto";
+ name[Group1]= "Pashto";
key <TLDE> { [ 0x100200d, 0x10000f7, dead_tilde ] };
key <AE01> { [ 0x10006f1, exclam, 0x1000060 ] };
@@ -155,7 +154,7 @@ xkb_symbols "ps" {
partial alphanumeric_keys
xkb_symbols "uz" {
- name[Group1]= "Afghanistan - Southern Uzbek";
+ name[Group1]= "Uzbek (Afghanistan)";
key <TLDE> { [ 0x100200d, 0x10000f7, dead_tilde ] };
key <AE01> { [ 0x10006f1, exclam, 0x1000060 ] };
@@ -216,7 +215,7 @@ xkb_symbols "uz" {
partial alphanumeric_keys
xkb_symbols "olpc-ps" {
- name[Group1]= "Afghanistan - OLPC Pashto";
+ name[Group1]= "Pashto (Afghanistan, OLPC)";
key <TLDE> { [ 0x100200D, 0x1000654, grave ] }; // zero width joiner, Arabic hamza above
key <AE01> { [ 0x10006F1, exclam, asciitilde ] }; // Arabic one
@@ -277,7 +276,7 @@ xkb_symbols "olpc-ps" {
partial alphanumeric_keys
xkb_symbols "fa-olpc" {
- name[Group1]= "Afghanistan - OLPC Dari";
+ name[Group1]= "Persian (Afghanistan, Dari OLPC)";
key <TLDE> { [ 0x100200D, division, asciitilde ] }; // zero width joiner
key <AE01> { [ 0x10006F1, exclam, grave ] }; // Arabic one
@@ -338,7 +337,7 @@ xkb_symbols "fa-olpc" {
partial alphanumeric_keys
xkb_symbols "uz-olpc" {
- name[Group1]= "Afghanistan - OLPC Southern Uzbek";
+ name[Group1]= "Uzbek (Afghanistan, OLPC)";
key <TLDE> { [ 0x100200D, division, asciitilde ] }; // zero width joiner
key <AE01> { [ 0x10006F1, exclam, grave ] }; // Arabic one
diff --git a/xorg-server/xkeyboard-config/symbols/al b/xorg-server/xkeyboard-config/symbols/al
index 9f006748c..cc46068c1 100644
--- a/xorg-server/xkeyboard-config/symbols/al
+++ b/xorg-server/xkeyboard-config/symbols/al
@@ -8,7 +8,7 @@ xkb_symbols "basic" {
include "latin(type3)"
- name[Group1]="Albania";
+ name[Group1]="Albanian";
key <AE01> { [ 1, exclam, asciitilde, dead_tilde ] };
key <AE02> { [ 2, quotedbl, dead_caron, oneeighth ] };
diff --git a/xorg-server/xkeyboard-config/symbols/am b/xorg-server/xkeyboard-config/symbols/am
index f83548118..49543ded5 100644
--- a/xorg-server/xkeyboard-config/symbols/am
+++ b/xorg-server/xkeyboard-config/symbols/am
@@ -3,7 +3,7 @@
partial default alphanumeric_keys
xkb_symbols "basic" {
- name[Group1]= "Armenia";
+ name[Group1]= "Armenian";
// Alphanumeric section
key <TLDE> { [ 0x100055d, 0x100055c ] };
@@ -65,14 +65,14 @@ xkb_symbols "basic" {
partial alphanumeric_keys
xkb_symbols "olpc" {
include "am(basic)"
- name[Group1]= "Armenia";
+ name[Group1]= "Armenian";
include "group(olpc)"
};
xkb_symbols "phonetic" {
include "am(basic)"
- name[Group1]= "Armenia - Phonetic";
+ name[Group1]= "Armenian (phonetic)";
key <BKSL> { [ 0x1000577, 0x1000547 ] };
@@ -130,7 +130,7 @@ xkb_symbols "phonetic" {
partial alphanumeric_keys
xkb_symbols "phonetic-alt" {
include "am(phonetic)"
- name[Group1]= "Armenia - Alternative Phonetic";
+ name[Group1]= "Armenian (alternative phonetic)";
key <AE08> { [ 0x1000580, 0x1000550 ] };
key <LatR> { [ 0x100057c, 0x100054c ] };
@@ -140,7 +140,7 @@ xkb_symbols "phonetic-alt" {
partial alphanumeric_keys
xkb_symbols "eastern" {
- name[Group1]="Armenia - Eastern";
+ name[Group1]="Armenian (eastern)";
// This is the closer phonetic transliteration for Eastern Armenian
// than the Windows XP layout for Eastern Armenian, which seems
@@ -205,7 +205,7 @@ xkb_symbols "eastern" {
partial alphanumeric_keys
xkb_symbols "western" {
include "am(eastern)"
- name[Group1]="Armenia - Western";
+ name[Group1]="Armenian (western)";
// This is exactly the same layout for Western Armenian
// as in Windows XP, except:
@@ -227,7 +227,7 @@ xkb_symbols "western" {
partial alphanumeric_keys
xkb_symbols "eastern-alt" {
include "am(eastern)"
- name[Group1]="Armenia - Alternative Eastern";
+ name[Group1]="Armenian (alternative eastern)";
// This replicates the Windows XP keyboard layout for Eastern
// Armenian exactly (including the bug), except:
diff --git a/xorg-server/xkeyboard-config/symbols/ara b/xorg-server/xkeyboard-config/symbols/ara
index 4606ee719..4af02ed8c 100644
--- a/xorg-server/xkeyboard-config/symbols/ara
+++ b/xorg-server/xkeyboard-config/symbols/ara
@@ -70,13 +70,13 @@ xkb_symbols "basic" {
partial alphanumeric_keys
xkb_symbols "qwerty" {
include "ara(basic)"
- name[Group1]= "Arabic - qwerty";
+ name[Group1]= "Arabic (qwerty)";
};
partial alphanumeric_keys
xkb_symbols "azerty" {
include "ara(basic)"
- name[Group1]= "Arabic - azerty";
+ name[Group1]= "Arabic (azerty)";
// the north african arabic keyboard differs from the middle east one
// by the numeric row; it follows French keyboard style
@@ -104,7 +104,7 @@ xkb_symbols "azerty" {
partial alphanumeric_keys
xkb_symbols "digits" {
include "ara(basic)"
- name[Group1]= "Arabic - digits";
+ name[Group1]= "Arabic (digits)";
// use arabic script digits
@@ -123,13 +123,13 @@ xkb_symbols "digits" {
partial alphanumeric_keys
xkb_symbols "qwerty_digits" {
include "ara(digits)"
- name[Group1]= "Arabic - qwerty/digits";
+ name[Group1]= "Arabic (qwerty/digits)";
};
partial alphanumeric_keys
xkb_symbols "azerty_digits" {
include "ara(azerty)"
- name[Group1]= "Arabic - azerty/digits";
+ name[Group1]= "Arabic (azerty/digits)";
key <AE01> { [ ampersand, 0x1000661 ] };
key <AE02> { [ eacute, 0x1000662 ] };
@@ -151,7 +151,7 @@ xkb_symbols "azerty_digits" {
partial alphanumeric_keys
xkb_symbols "buckwalter" {
- name[Group1]= "Arabic - Buckwalter";
+ name[Group1]= "Arabic (Buckwalter)";
// ARABIC LETTER SUPERSCRIPT ALEF
key <TLDE> { [ 0x1000670, Arabic_shadda ] };
diff --git a/xorg-server/xkeyboard-config/symbols/at b/xorg-server/xkeyboard-config/symbols/at
index 52382f9c0..b11f8e031 100644
--- a/xorg-server/xkeyboard-config/symbols/at
+++ b/xorg-server/xkeyboard-config/symbols/at
@@ -5,7 +5,7 @@ xkb_symbols "basic" {
include "de(basic)"
- name[Group1]="Austria";
+ name[Group1]="German (Austria)";
};
partial alphanumeric_keys
@@ -13,7 +13,7 @@ xkb_symbols "nodeadkeys" {
include "de(nodeadkeys)"
- name[Group1]="Austria - Eliminate dead keys";
+ name[Group1]="German (Austria, eliminate dead keys)";
};
partial alphanumeric_keys
@@ -21,7 +21,7 @@ xkb_symbols "mac" {
include "de(mac)"
- name[Group1]= "Austria - Macintosh";
+ name[Group1]= "German (Austria, Macintosh)";
};
partial alphanumeric_keys
@@ -29,6 +29,6 @@ xkb_symbols "sundeadkeys" {
include "de(Sundeadkeys)"
- name[Group1]="Austria - Sun dead keys";
+ name[Group1]="German (Austria, Sun dead keys)";
};
diff --git a/xorg-server/xkeyboard-config/symbols/az b/xorg-server/xkeyboard-config/symbols/az
index 4227bc944..5df2173d3 100644
--- a/xorg-server/xkeyboard-config/symbols/az
+++ b/xorg-server/xkeyboard-config/symbols/az
@@ -7,7 +7,7 @@ xkb_symbols "latin" {
include "us"
- name[Group1]= "Azerbaijan";
+ name[Group1]= "Azerbaijani";
key <TLDE> { [ grave, asciitilde, dead_grave, dead_tilde ] };
@@ -40,7 +40,7 @@ xkb_symbols "latin" {
partial alphanumeric_keys
xkb_symbols "cyrillic" {
- name[Group1]= "Azerbaijan - Cyrillic";
+ name[Group1]= "Azerbaijani (Cyrillic)";
key <AE02> {[ 2, quotedbl ] };
key <AE03> {[ 3, numbersign ] };
diff --git a/xorg-server/xkeyboard-config/symbols/ba b/xorg-server/xkeyboard-config/symbols/ba
index 4507d4033..7e52d3dd3 100644
--- a/xorg-server/xkeyboard-config/symbols/ba
+++ b/xorg-server/xkeyboard-config/symbols/ba
@@ -1,7 +1,7 @@
default partial alphanumeric_keys
xkb_symbols "basic" {
- name[Group1]="Bosnia and Herzegovina";
+ name[Group1]="Bosnian";
include "rs(latin)"
};
@@ -9,7 +9,7 @@ xkb_symbols "basic" {
partial alphanumeric_keys
xkb_symbols "us" {
- name[Group1]= "Bosnia and Herzegovina - US keyboard with Bosnian letters";
+ name[Group1]= "Bosnian (US keyboard with Bosnian letters)";
include "rs(latinyz)"
};
@@ -18,7 +18,7 @@ xkb_symbols "us" {
partial alphanumeric_keys
xkb_symbols "alternatequotes" {
- name[Group1]= "Bosnia and Herzegovina - Use guillemets for quotes";
+ name[Group1]= "Bosnian (use guillemets for quotes)";
include "rs(latinalternatequotes)"
};
@@ -26,7 +26,7 @@ xkb_symbols "alternatequotes" {
partial alphanumeric_keys
xkb_symbols "unicode" {
- name[Group1]= "Bosnia and Herzegovina - Use Bosnian digraphs";
+ name[Group1]= "Bosnian (use Bosnian digraphs)";
include "rs(latinunicode)"
};
@@ -34,7 +34,7 @@ xkb_symbols "unicode" {
partial alphanumeric_keys
xkb_symbols "unicodeus" {
- name[Group1]= "Bosnia and Herzegovina - US keyboard with Bosnian digraphs";
+ name[Group1]= "Bosnian (US keyboard with Bosnian digraphs)";
include "rs(latinunicodeyz)"
};
diff --git a/xorg-server/xkeyboard-config/symbols/bd b/xorg-server/xkeyboard-config/symbols/bd
index 4146f1c8f..49261f18f 100644
--- a/xorg-server/xkeyboard-config/symbols/bd
+++ b/xorg-server/xkeyboard-config/symbols/bd
@@ -15,9 +15,8 @@
//
default partial alphanumeric_keys
-
xkb_symbols "basic" {
- name[Group1]= "Bangladesh";
+ name[Group1]= "Bengali";
key <ESC> { [ Escape ] };
// numbers
@@ -93,5 +92,5 @@ xkb_symbols "basic" {
xkb_symbols "probhat" {
include "in(ben_probhat)"
- name[Group1]= "Bangladesh - Probhat";
+ name[Group1]= "Bengali (Probhat)";
};
diff --git a/xorg-server/xkeyboard-config/symbols/be b/xorg-server/xkeyboard-config/symbols/be
index 8e096e24c..feb1fd928 100644
--- a/xorg-server/xkeyboard-config/symbols/be
+++ b/xorg-server/xkeyboard-config/symbols/be
@@ -5,7 +5,7 @@ xkb_symbols "basic" {
include "latin"
- name[Group1]="Belgium";
+ name[Group1]="Belgian";
key <AE01> { [ ampersand, 1, bar, exclamdown ] };
key <AE02> { [ eacute, 2, at, oneeighth ] };
@@ -69,7 +69,7 @@ xkb_symbols "oss" {
include "fr(oss)"
include "be(oss_frbe)"
- name[Group1]="Belgium - Alternative";
+ name[Group1]="Belgian (alternative)";
};
partial alphanumeric_keys
@@ -110,7 +110,7 @@ xkb_symbols "oss_latin9" {
include "be(oss_frbe)"
include "keypad(oss_latin9)"
- name[Group1]="Belgium - Alternative, latin-9 only";
+ name[Group1]="Belgian (alternative, latin-9 only)";
// First row
key <TLDE> { [ twosuperior, threesuperior, onesuperior, less ] }; // ² ³ ¹ <
@@ -159,14 +159,14 @@ xkb_symbols "oss_sundeadkeys" {
include "be(oss_Sundeadkeys)"
- name[Group1]="Belgium - Alternative, Sun dead keys";
+ name[Group1]="Belgian (alternative, Sun dead keys)";
};
partial alphanumeric_keys
xkb_symbols "iso-alternate" {
include "be(basic)"
- name[Group1]="Belgium - ISO Alternate";
+ name[Group1]="Belgian (ISO alternate)";
key <AD01> { [ a, A, ae, AE ] };
key <AD02> { [ z, Z, guillemotleft, less ] };
@@ -182,7 +182,7 @@ xkb_symbols "sundeadkeys" {
// Use the Sun dead keys
include "be(basic)"
- name[Group1]="Belgium - Sun dead keys";
+ name[Group1]="Belgian (Sun dead keys)";
key <AD11> { [dead_circumflex, dead_diaeresis, bracketleft, bracketleft] };
key <AC11> { [ ugrave, percent, dead_acute, dead_acute ] };
@@ -206,7 +206,7 @@ xkb_symbols "nodeadkeys" {
// Eliminates dead keys from the basic Belgian layout
include "be(basic)"
- name[Group1]="Belgium - Eliminate dead keys";
+ name[Group1]="Belgian (eliminate dead keys)";
key <AE12> { [ minus, underscore, cedilla, ogonek ] };
key <AD11> { [asciicircum, diaeresis, bracketleft, bracketleft] };
@@ -224,7 +224,7 @@ xkb_symbols "wang" {
include "be(basic)"
include "keypad(legacy_wang)"
- name[Group1]="Belgium - Wang model 724 azerty";
+ name[Group1]="Belgian (Wang model 724 azerty)";
// Engravings on Wang 725-3771-ae
key <TLDE> { [ twosuperior, threesuperior, notsign, asciitilde ] };
diff --git a/xorg-server/xkeyboard-config/symbols/bg b/xorg-server/xkeyboard-config/symbols/bg
index d1e6a6356..7e7d5a7cb 100644
--- a/xorg-server/xkeyboard-config/symbols/bg
+++ b/xorg-server/xkeyboard-config/symbols/bg
@@ -47,7 +47,7 @@
partial default alphanumeric_keys
xkb_symbols "bds" {
- name[Group1]= "Bulgaria";
+ name[Group1]= "Bulgarian";
key <TLDE> { [ parenleft, parenright,
bracketleft, bracketright ] };
@@ -138,7 +138,7 @@ xkb_symbols "bds" {
// symbols in levels 3 and 4 are added.
partial alphanumeric_keys
xkb_symbols "phonetic" {
- name[Group1]= "Bulgaria - Traditional phonetic";
+ name[Group1]= "Bulgarian (traditional phonetic)";
key <TLDE> { [ Cyrillic_che, Cyrillic_CHE ] };
key <AE01> { [ 1, exclam ] };
@@ -230,7 +230,7 @@ xkb_symbols "phonetic" {
partial alphanumeric_keys
xkb_symbols "bas_phonetic" {
include "bg(phonetic)"
- name[Group1]= "Bulgaria - New phonetic";
+ name[Group1]= "Bulgarian (new phonetic)";
key <TLDE> { [ Cyrillic_yu, Cyrillic_YU ] };
key <AD01> { [ Cyrillic_che, Cyrillic_CHE ] };
diff --git a/xorg-server/xkeyboard-config/symbols/br b/xorg-server/xkeyboard-config/symbols/br
index be0cd7cc2..c76edfd34 100644
--- a/xorg-server/xkeyboard-config/symbols/br
+++ b/xorg-server/xkeyboard-config/symbols/br
@@ -10,7 +10,7 @@ default
xkb_symbols "abnt2" {
include "latin"
- name[Group1]="Brazil";
+ name[Group1]="Portuguese (Brazil)";
key <AE02> { [ 2, at, twosuperior, onehalf ] };
key <AE03> { [ 3, numbersign, threesuperior, threequarters ] };
@@ -52,7 +52,7 @@ partial alphanumeric_keys
xkb_symbols "nodeadkeys" {
include "br(abnt2)" // for consistent naming
- name[Group1]="Brazil - Eliminate dead keys";
+ name[Group1]="Portuguese (Brazil, eliminate dead keys)";
key <AE06> { [ 6, diaeresis, notsign, notsign ] };
key <AD11> { [apostrophe, grave ] };
@@ -69,7 +69,7 @@ partial alphanumeric_keys
xkb_symbols "thinkpad" {
include "br(abnt2)" // for consistent naming
- name[Group1]="Brazil";
+ name[Group1]="Portuguese (Brazil)";
key <RCTL> { [ slash, question, degree, questiondown ] };
};
@@ -79,7 +79,7 @@ partial alphanumeric_keys
xkb_symbols "olpc" {
include "us(basic)"
- name[Group1]="Brazil";
+ name[Group1]="Portuguese (Brazil)";
key <TLDE> { [ apostrophe, quotedbl ] };
@@ -122,7 +122,7 @@ xkb_symbols "olpc" {
partial alphanumeric_keys
xkb_symbols "dvorak" {
- name[Group1]="Brazil - Dvorak";
+ name[Group1]="Portuguese (Brazil, Dvorak)";
// Numeric row
key <TLDE> { [ apostrophe, quotedbl, dead_caron, dead_doubleacute ] };
@@ -203,7 +203,7 @@ xkb_symbols "dvorak" {
partial alphanumeric_keys
xkb_symbols "nativo" {
- name[Group1]="Brazil - Nativo";
+ name[Group1]="Portuguese (Brazil, nativo)";
// Numeric row
key <TLDE> { [ equal, plus, section, plusminus ] };
@@ -283,7 +283,7 @@ partial alphanumeric_keys
xkb_symbols "nativo-us" {
include "br(nativo)"
- name[Group1]="Brazil - Nativo for USA keyboards";
+ name[Group1]="Portuguese (Brazil, nativo for USA keyboards)";
// Lower row
key <AB01> { [ y, Y, ccedilla, Ccedilla ] };
@@ -302,7 +302,7 @@ partial alphanumeric_keys
xkb_symbols "nativo-epo" {
include "br(nativo)"
- name[Group1]="Brazil - Nativo for Esperanto";
+ name[Group1]="Portuguese (Brazil, nativo for Esperanto)";
// Upper row Esperanto
key <AD04> { [ h, H, hcircumflex, Hcircumflex ] };
diff --git a/xorg-server/xkeyboard-config/symbols/bt b/xorg-server/xkeyboard-config/symbols/bt
index b1ac22625..97d7047e8 100644
--- a/xorg-server/xkeyboard-config/symbols/bt
+++ b/xorg-server/xkeyboard-config/symbols/bt
@@ -15,7 +15,7 @@
partial default alphanumeric_keys
xkb_symbols "basic" {
- name[Group1]= "Bhutan";
+ name[Group1]= "Dzongkha";
key <TLDE> { [ 0x1000F09, 0x1000F0A, 0x1000F6C, 0x1000F6D ] };
diff --git a/xorg-server/xkeyboard-config/symbols/by b/xorg-server/xkeyboard-config/symbols/by
index 2c16f9e7a..205a3430b 100644
--- a/xorg-server/xkeyboard-config/symbols/by
+++ b/xorg-server/xkeyboard-config/symbols/by
@@ -8,7 +8,7 @@
partial default alphanumeric_keys
xkb_symbols "basic" {
include "ru(winkeys)"
- name[Group1]= "Belarus";
+ name[Group1]= "Belarusian";
key <AD09> { [ Byelorussian_shortu, Byelorussian_SHORTU ] };
key <AD12> { [ apostrophe, apostrophe ] };
@@ -18,7 +18,7 @@ xkb_symbols "basic" {
partial alphanumeric_keys
xkb_symbols "legacy" {
include "by(basic)"
- name[Group1]= "Belarus - Legacy";
+ name[Group1]= "Belarusian (legacy)";
key <AE03> { [ 3, numbersign ] };
key <AE04> { [ 4, asterisk ] };
@@ -35,7 +35,7 @@ xkb_symbols "legacy" {
partial alphanumeric_keys
xkb_symbols "latin" {
include "latin"
- name[Group1]= "Belarus - Latin";
+ name[Group1]= "Belarusian (Latin)";
key <AD02> { [ w, W, scaron, Scaron ] };
key <AD07> { [ u, U, ubreve, Ubreve ] };
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)"
};
diff --git a/xorg-server/xkeyboard-config/symbols/cd.in b/xorg-server/xkeyboard-config/symbols/cd.in
index e11b82233..938bf2b69 100644
--- a/xorg-server/xkeyboard-config/symbols/cd.in
+++ b/xorg-server/xkeyboard-config/symbols/cd.in
@@ -1,69 +1,69 @@
-// based on us_intl keyboard map file and a Sinhala keyboard map
-// version 0.3
-
-partial default alphanumeric_keys
-xkb_symbols "basic" {
-
- name[Group1]= "Congo, Democratic Republic of the";
-
- key.type[Group1] = "FOUR_LEVEL";
-
- // Alphanumeric section
- // TILDE, COMBINING TILDE
- key <TLDE> { [ grave, asciitilde, 0x01000303] };
- key <AE01> { [ ampersand, 1, numbersign ] };
- key <AE02> { [0x01000301, 2, at ] };
- key <AE03> { [0x01000300, 3, guillemotleft ] };
- key <AE04> { [ parenleft, 4, bracketleft ] };
- key <AE05> { [ braceleft, 5, less ] };
- key <AE06> { [ braceright, 6, greater ] };
- key <AE07> { [parenright, 7, bracketright ] };
- key <AE08> { [0x01000302, 8, guillemotright ] };
- key <AE09> { [0x0100030c, 9, 0x0100030D ] };
- key <AE10> { [0x01000308, 0, at ] };
- key <AE11> { [ minus, underscore, percent, degree ] };
- key <AE12> { [ equal, plus, multiply, division ] };
-
- key <AD01> { [ a, A, ae, AE ] };
- key <AD02> { [ z, Z ] };
- key <AD03> { [ e, E, oe, OE ] };
- key <AD04> { [ r, R ] };
- key <AD05> { [ t, T ] };
- key <AD06> { [ y, Y ] };
- key <AD07> { [ u, U, 0x01000289, 0x01001d7e ] };
- key <AD08> { [ i, I, 0x01000268, 0x01000197 ] };
- key <AD09> { [ o, O, oslash, Ooblique ] };
- key <AD10> { [ p, P ] };
- key <AD11> { [0x0100025B, 0x01000190, asciicircum ] };
- key <AD12> { [ asterisk, asciicircum, dollar ] };
-
- key <AC01> { [ q, Q ] };
- key <AC02> { [ s, S ] };
- key <AC03> { [ d, D ] };
- key <AC04> { [ f, F ] };
- key <AC05> { [ g, G ] };
- key <AC06> { [ h, H ] };
- key <AC07> { [ j, J ] };
- key <AC08> { [ k, K ] };
- key <AC09> { [ l, L ] };
- key <AC10> { [ m, M ] };
- key <AC11> { [0x01000254, 0x01000186 ] };
- key <LSGT> { [ backslash, bar ] };
-
- key <AB01> { [ w, W ] };
- key <AB02> { [ x, X ] };
- key <AB03> { [ c, C, ccedilla, Ccedilla ] };
- key <AB04> { [ v, V ] };
- key <AB05> { [ b, B ] };
- key <AB06> { [ n, N ] };
- key <AB07> { [ comma, question, 0x01000327 ] };
- key <AB08> { [ semicolon, period ] };
- key <AB09> { [ colon, slash ] };
- key <AB10> { [ exclam, apostrophe, 0x01002019 ] };
- key <BKSL> { [ quotedbl, backslash, bar ] };
-
- // SPACE, SPACE, SPACE, NO-BREAK SPACE, SPACE
- key <SPCE> { [ space, space, nobreakspace, 0x0100202F ] };
-
- include "level3(ralt_switch)"
-};
+// based on us_intl keyboard map file and a Sinhala keyboard map
+// version 0.3
+
+partial default alphanumeric_keys
+xkb_symbols "basic" {
+
+ name[Group1]= "French (Democratic Republic of the Congo)";
+
+ key.type[Group1] = "FOUR_LEVEL";
+
+ // Alphanumeric section
+ // TILDE, COMBINING TILDE
+ key <TLDE> { [ grave, asciitilde, 0x01000303] };
+ key <AE01> { [ ampersand, 1, numbersign ] };
+ key <AE02> { [0x01000301, 2, at ] };
+ key <AE03> { [0x01000300, 3, guillemotleft ] };
+ key <AE04> { [ parenleft, 4, bracketleft ] };
+ key <AE05> { [ braceleft, 5, less ] };
+ key <AE06> { [ braceright, 6, greater ] };
+ key <AE07> { [parenright, 7, bracketright ] };
+ key <AE08> { [0x01000302, 8, guillemotright ] };
+ key <AE09> { [0x0100030c, 9, 0x0100030D ] };
+ key <AE10> { [0x01000308, 0, at ] };
+ key <AE11> { [ minus, underscore, percent, degree ] };
+ key <AE12> { [ equal, plus, multiply, division ] };
+
+ key <AD01> { [ a, A, ae, AE ] };
+ key <AD02> { [ z, Z ] };
+ key <AD03> { [ e, E, oe, OE ] };
+ key <AD04> { [ r, R ] };
+ key <AD05> { [ t, T ] };
+ key <AD06> { [ y, Y ] };
+ key <AD07> { [ u, U, 0x01000289, 0x01001d7e ] };
+ key <AD08> { [ i, I, 0x01000268, 0x01000197 ] };
+ key <AD09> { [ o, O, oslash, Ooblique ] };
+ key <AD10> { [ p, P ] };
+ key <AD11> { [0x0100025B, 0x01000190, asciicircum ] };
+ key <AD12> { [ asterisk, asciicircum, dollar ] };
+
+ key <AC01> { [ q, Q ] };
+ key <AC02> { [ s, S ] };
+ key <AC03> { [ d, D ] };
+ key <AC04> { [ f, F ] };
+ key <AC05> { [ g, G ] };
+ key <AC06> { [ h, H ] };
+ key <AC07> { [ j, J ] };
+ key <AC08> { [ k, K ] };
+ key <AC09> { [ l, L ] };
+ key <AC10> { [ m, M ] };
+ key <AC11> { [0x01000254, 0x01000186 ] };
+ key <LSGT> { [ backslash, bar ] };
+
+ key <AB01> { [ w, W ] };
+ key <AB02> { [ x, X ] };
+ key <AB03> { [ c, C, ccedilla, Ccedilla ] };
+ key <AB04> { [ v, V ] };
+ key <AB05> { [ b, B ] };
+ key <AB06> { [ n, N ] };
+ key <AB07> { [ comma, question, 0x01000327 ] };
+ key <AB08> { [ semicolon, period ] };
+ key <AB09> { [ colon, slash ] };
+ key <AB10> { [ exclam, apostrophe, 0x01002019 ] };
+ key <BKSL> { [ quotedbl, backslash, bar ] };
+
+ // SPACE, SPACE, SPACE, NO-BREAK SPACE, SPACE
+ key <SPCE> { [ space, space, nobreakspace, 0x0100202F ] };
+
+ include "level3(ralt_switch)"
+};
diff --git a/xorg-server/xkeyboard-config/symbols/cn b/xorg-server/xkeyboard-config/symbols/cn
index 0d62ab3d4..51b350a48 100644
--- a/xorg-server/xkeyboard-config/symbols/cn
+++ b/xorg-server/xkeyboard-config/symbols/cn
@@ -5,7 +5,7 @@ partial default alphanumeric_keys
xkb_symbols "basic" {
include "us(basic)"
- name[Group1]= "China";
+ name[Group1]= "Chinese";
};
// Tibetan Standard Keyboard map for XKB/X.org
@@ -61,7 +61,7 @@ xkb_symbols "basic" {
partial alphanumeric_keys
xkb_symbols "tib" {
- name[Group1]= "China - Tibetan";
+ name[Group1]= "Tibetan";
key <TLDE> { [ 0x1000f68, 0x1000f01, 0x1000fb8, 0x1000f00 ] }; # ཨ ༁ ྸ ༀ
key <AE01> { [ 0x1000f21, 0x1000f2a, 0x1000f04, 0x1000f76 ] }; # ༡ ༪ ༄ ྲྀ
@@ -135,7 +135,7 @@ partial alphanumeric_keys
xkb_symbols "tib_asciinum" {
include "cn(tib)"
- name[Group1]= "China - Tibetan (with ASCII numerals)";
+ name[Group1]= "Tibetan (with ASCII numerals)";
key <AE01> { [ 1, 0x1000f21, 0x1000f04, 0x1000f76 ] }; # 1 ༡ ༄ ྲྀ
key <AE02> { [ 2, 0x1000f22, 0x1000f05, 0x1000f77 ] }; # 2 ༢ ༅ ཷ
@@ -159,7 +159,7 @@ xkb_symbols "tib_asciinum" {
partial alphanumeric_keys
xkb_symbols "uig" {
- name[Group1]= "China - Uyghur";
+ name[Group1]= "Uyghur";
key <TLDE> { [ grave, asciitilde ] };
diff --git a/xorg-server/xkeyboard-config/symbols/cz b/xorg-server/xkeyboard-config/symbols/cz
index d53b8364b..696f91732 100644
--- a/xorg-server/xkeyboard-config/symbols/cz
+++ b/xorg-server/xkeyboard-config/symbols/cz
@@ -7,7 +7,7 @@ xkb_symbols "basic" {
include "latin"
- name[Group1]= "Czechia";
+ name[Group1]= "Czech";
key <TLDE> { [ semicolon, dead_abovering, grave, asciitilde ] };
key <AE01> { [ plus, 1, exclam, dead_tilde ] };
@@ -72,7 +72,7 @@ xkb_symbols "basic" {
// Use <BKSL> instead of <LSGT> (useful for keyboard without <LSGT> key)
xkb_symbols "bksl" {
include "cz(basic)"
- name[Group1]= "Czechia - With <\|> key";
+ name[Group1]= "Czech (with <\|> key)";
key <BKSL> { [ backslash, bar, slash, NoSymbol ] };
};
@@ -85,7 +85,7 @@ xkb_symbols "qwerty" {
// 2001 by Kamil Toman <ktoman@email.cz>
include "cz(basic)"
- name[Group1]= "Czechia - qwerty";
+ name[Group1]= "Czech (qwerty)";
key <AB01> { [ z, Z, degree, NoSymbol ] };
key <AD06> { [ y, Y, NoSymbol, NoSymbol ] };
@@ -95,7 +95,7 @@ xkb_symbols "qwerty" {
xkb_symbols "qwerty_bksl" {
include "cz(qwerty)"
- name[Group1]= "Czechia - qwerty, extended Backslash";
+ name[Group1]= "Czech (qwerty, extended Backslash)";
key <BKSL> { [ backslash, bar, slash, NoSymbol ] };
};
@@ -107,7 +107,7 @@ xkb_symbols "ucw" {
// accented characters only, no 'latin' set.
// 2008 by Milan Vancura <mvancura@suse.cz>
- name[Group1]= "Czechia - UCW layout (accented letters only)";
+ name[Group1]= "Czech (UCW layout, accented letters only)";
key <AB01> { [zcaron, Zcaron ] };
key <AB02> { [ssharp ] };
@@ -146,7 +146,7 @@ xkb_symbols "dvorak-ucw" {
include "us(dvorak)"
- name[Group1]= "Czechia - US Dvorak with CZ UCW support";
+ name[Group1]= "Czech (US Dvorak with CZ UCW support)";
key <AB03> { [ j, J, eacute, Eacute ] };
key <AB04> { [ k, K, uacute, Uacute ] };
diff --git a/xorg-server/xkeyboard-config/symbols/de b/xorg-server/xkeyboard-config/symbols/de
index cfe803afb..d87140f45 100644
--- a/xorg-server/xkeyboard-config/symbols/de
+++ b/xorg-server/xkeyboard-config/symbols/de
@@ -5,7 +5,7 @@ xkb_symbols "basic" {
include "latin(type4)"
- name[Group1]="Germany";
+ name[Group1]="German";
key <AE02> { [ 2, quotedbl, twosuperior, oneeighth ] };
key <AE03> { [ 3, section, threesuperior, sterling ] };
@@ -55,7 +55,7 @@ xkb_symbols "nodeadkeys" {
// modify the basic German layout to not have any dead keys
include "de(basic)"
- name[Group1]="Germany - Eliminate dead keys";
+ name[Group1]="German (eliminate dead keys)";
key <TLDE> { [asciicircum, degree, notsign, notsign ] };
key <AE12> { [ acute, grave, cedilla, cedilla ] };
@@ -74,7 +74,7 @@ xkb_symbols "deadgraveacute" {
// in many programming languages)
include "de(basic)"
- name[Group1]="Germany - Dead grave acute";
+ name[Group1]="German (dead grave acute)";
key <TLDE> { [asciicircum, degree, notsign, notsign ] };
key <AD12> { [ plus, asterisk, asciitilde, dead_macron ] };
@@ -89,7 +89,7 @@ xkb_symbols "deadacute" {
include "de(deadgraveacute)"
- name[Group1]="Germany - Dead acute";
+ name[Group1]="German (dead acute)";
key <AE12> { [dead_acute, grave, dead_cedilla, dead_ogonek ] };
key <BKSL> { [numbersign, apostrophe, dead_grave, dead_grave ] };
@@ -105,7 +105,7 @@ xkb_symbols "ro" {
include "de(basic)"
- name[Group1]="Germany - Romanian keyboard with German letters";
+ name[Group1]="Romanian (Germany)";
key <AD05> { [ t, T, tcedilla, Tcedilla ] };
key <AD08> { [ i, I, icircumflex, Icircumflex ] };
@@ -120,7 +120,7 @@ xkb_symbols "ro_nodeadkeys" {
// Read the comment for de_ro !
include "de(nodeadkeys)"
- name[Group1]="Germany - Romanian keyboard with German letters, eliminate dead keys";
+ name[Group1]="Romanian (Germany, eliminate dead keys)";
key <AD05> { [ t, T, tcedilla, Tcedilla ] };
key <AD08> { [ i, I, icircumflex, Icircumflex ] };
@@ -138,7 +138,7 @@ partial alphanumeric_keys
xkb_symbols "dvorak" {
include "us(dvorak)"
- name[Group1]="Germany - Dvorak";
+ name[Group1]="German (Dvorak)";
key <TLDE> { [ asciicircum, degree ] };
@@ -204,7 +204,7 @@ xkb_symbols "sundeadkeys" {
include "de(Sundeadkeys)"
- name[Group1]="Germany - Sun dead keys";
+ name[Group1]="German (Sun dead keys)";
};
@@ -380,7 +380,7 @@ xkb_symbols "neo" {
include "de(neo_base)"
- name[Group1]= "Germany - Neo 2";
+ name[Group1]= "German (Neo 2)";
include "shift(both_capslock)"
include "level3(caps_switch)"
@@ -396,7 +396,7 @@ partial alphanumeric_keys
xkb_symbols "mac" {
include "de"
- name[Group1]= "Germany - Macintosh";
+ name[Group1]= "German (Macintosh)";
// Alphanumeric section
key <AE01> { [ 1, exclam, exclamdown, at ] };
@@ -424,7 +424,7 @@ partial alphanumeric_keys
xkb_symbols "mac_nodeadkeys" {
// modify the standard German mac layout to not have any dead keys
include "de(mac)"
- name[Group1]= "Germany - Macintosh, eliminate dead keys";
+ name[Group1]= "German (Macintosh, eliminate dead keys)";
key <AE04> { [ 4, dollar, onequarter, currency ] };
key <TLDE> { [ asciicircum, degree, notsign ] };
@@ -440,7 +440,7 @@ xkb_symbols "mac_nodeadkeys" {
partial alphanumeric_keys
xkb_symbols "dsb"
{
- name[Group1] = "Germany - Lower Sorbian";
+ name[Group1] = "Lower Sorbian";
include "latin(basic)"
include "level3(ralt_switch)"
include "kpdl(comma)"
@@ -463,7 +463,7 @@ xkb_symbols "dsb"
partial alphanumeric_keys
xkb_symbols "dsb_qwertz"
{
- name[Group1] = "Germany - Lower Sorbian (qwertz)";
+ name[Group1] = "Lower Sorbian (qwertz)";
include "latin(basic)"
include "level3(ralt_switch)"
include "kpdl(comma)"
@@ -494,7 +494,7 @@ xkb_symbols "qwerty" {
include "de(basic)"
- name[Group1] = "Germany - qwerty";
+ name[Group1] = "German (qwerty)";
key <AB01> { [ z, Z, leftarrow, yen ] };
key <AD06> { [ y, Y, guillemotleft, less ] };
@@ -509,7 +509,7 @@ xkb_symbols "ru" {
include "de(basic)"
- name[Group1]= "Germany - Russian phonetic";
+ name[Group1]= "Russian (Germany, phonetic)";
key.type[group1]="FOUR_LEVEL_ALPHABETIC";
@@ -554,7 +554,7 @@ partial alphanumeric_keys
xkb_symbols "htcdream" {
include "inet(htcdream)"
- name[Group1]= "Germany - htcdream";
+ name[Group1]= "German";
//second row
key <AD01> { [ q, Q, Tab, Tab ] };
diff --git a/xorg-server/xkeyboard-config/symbols/dk b/xorg-server/xkeyboard-config/symbols/dk
index c652ebbb6..3fdef9251 100644
--- a/xorg-server/xkeyboard-config/symbols/dk
+++ b/xorg-server/xkeyboard-config/symbols/dk
@@ -5,7 +5,7 @@ xkb_symbols "basic" {
include "latin(type2)"
- name[Group1]="Denmark";
+ name[Group1]="Danish";
key <AE11> { [ plus, question, plusminus, questiondown ] };
key <AE12> { [dead_acute, dead_grave, bar, brokenbar ] };
@@ -29,7 +29,7 @@ xkb_symbols "nodeadkeys" {
include "dk(basic)"
- name[Group1]="Denmark - Eliminate dead keys";
+ name[Group1]="Danish (eliminate dead keys)";
key <AE12> { [ acute, grave, bar, ogonek ] };
key <AD11> { [ aring, Aring, diaeresis, degree ] };
@@ -47,7 +47,7 @@ partial alphanumeric_keys
xkb_symbols "mac" {
include "dk"
- name[Group1]= "Denmark - Macintosh";
+ name[Group1]= "Danish (Macintosh)";
key <SPCE> { [ space, space, nobreakspace, nobreakspace ] };
key <AB10> { [ minus, underscore, hyphen, macron ] };
@@ -58,7 +58,7 @@ xkb_symbols "mac" {
partial alphanumeric_keys
xkb_symbols "mac_nodeadkeys" {
include "dk(mac)"
- name[Group1]= "Denmark - Macintosh, eliminate dead keys";
+ name[Group1]= "Danish (Macintosh, eliminate dead keys)";
key <AE12> { [ acute, grave, bar, ogonek ] };
key <AD12> { [diaeresis, asciicircum, asciitilde, dead_macron ] };
@@ -68,5 +68,5 @@ partial alphanumeric_keys
xkb_symbols "dvorak" {
include "no(dvorak)"
- name[Group1]= "Denmark - Dvorak";
+ name[Group1]= "Danish (Dvorak)";
};
diff --git a/xorg-server/xkeyboard-config/symbols/ee b/xorg-server/xkeyboard-config/symbols/ee
index e85037b04..260702ec7 100644
--- a/xorg-server/xkeyboard-config/symbols/ee
+++ b/xorg-server/xkeyboard-config/symbols/ee
@@ -11,7 +11,7 @@ xkb_symbols "basic" {
include "latin(type4)"
- name[Group1]="Estonia";
+ name[Group1]="Estonian";
key <AE03> { [ 3, numbersign, sterling, sterling ] };
key <AE04> { [ 4, currency, dollar, dollar ] };
@@ -41,7 +41,7 @@ xkb_symbols "nodeadkeys" {
// Modifies the basic Estonian layout to eliminate all dead keys
include "ee(basic)"
- name[Group1]="Estonia - Eliminate dead keys";
+ name[Group1]="Estonian (eliminate dead keys)";
key <TLDE> { [asciicircum,asciitilde ] };
key <AE12> { [apostrophe, grave ] };
@@ -57,7 +57,7 @@ xkb_symbols "nodeadkeys" {
partial alphanumeric_keys
xkb_symbols "dvorak" {
include "us(dvorak)"
- name[Group1]= "Estonia - Dvorak";
+ name[Group1]= "Estonian (Dvorak)";
key <AE03> { [ 3, numbersign, sterling ] };
key <AE04> { [ 4, dollar, section, currency ] };
@@ -80,7 +80,7 @@ xkb_symbols "dvorak" {
partial alphanumeric_keys
xkb_symbols "us" {
include "us(euro)"
- name[Group1] = "Estonia - US keyboard with Estonian letters";
+ name[Group1] = "Estonian (US keyboard with Estonian letters)";
// ž, Ž
key <AB01> { [ z, Z, zcaron, Zcaron ] };
diff --git a/xorg-server/xkeyboard-config/symbols/fi b/xorg-server/xkeyboard-config/symbols/fi
index 35c9da7a4..825e77435 100644
--- a/xorg-server/xkeyboard-config/symbols/fi
+++ b/xorg-server/xkeyboard-config/symbols/fi
@@ -29,7 +29,7 @@ xkb_symbols "kotoistus" {
//
// Annex 3 of the standard is implemented in fi_FI.UTF-8/Compose
- name[Group1]="Finland";
+ name[Group1]="Finnish";
key <TLDE> { [ section, onehalf, dead_stroke, NoSymbol ] };
key <AE01> { [ 1, exclam, NoSymbol, exclamdown ] };
@@ -95,7 +95,7 @@ xkb_symbols "classic" {
include "fi(fi)"
- name[Group1]="Finland - Classic";
+ name[Group1]="Finnish (classic)";
};
partial alphanumeric_keys hidden
@@ -169,7 +169,7 @@ xkb_symbols "nodeadkeys" {
include "fi(fi)"
- name[Group1]="Finland - Classic, eliminate dead keys";
+ name[Group1]="Finnish (classic, eliminate dead keys)";
key <AE12> { [ acute, grave, cedilla, ogonek ] };
key <AD12> { [ diaeresis, asciicircum, asciitilde, caron ] };
@@ -189,7 +189,7 @@ xkb_symbols "smi" {
include "no(smi)"
- name[Group1]="Finland - Northern Saami";
+ name[Group1]="Saami (Finland)";
key <AC10> { [ odiaeresis, Odiaeresis, oslash, Oslash ] };
key <AC11> { [ adiaeresis, Adiaeresis, ae, AE ] };
@@ -202,5 +202,5 @@ xkb_symbols "mac" {
include "se(mac)"
- name[Group1]="Finland - Macintosh";
+ name[Group1]="Finnish (Macintosh)";
};
diff --git a/xorg-server/xkeyboard-config/symbols/fo b/xorg-server/xkeyboard-config/symbols/fo
index b57c917af..d3d378a69 100644
--- a/xorg-server/xkeyboard-config/symbols/fo
+++ b/xorg-server/xkeyboard-config/symbols/fo
@@ -3,7 +3,7 @@ xkb_symbols "basic" {
include "latin(type2)"
- name[Group1]= "Faroe Islands";
+ name[Group1]= "Faroese";
key <TLDE> { [ onehalf, section, threequarters, paragraph ] };
key <LSGT> { [ less, greater, backslash, notsign ] };
@@ -35,7 +35,7 @@ xkb_symbols "nodeadkeys" {
include "fo(basic)"
- name[Group1]= "Faroe Islands - Eliminate dead keys";
+ name[Group1]= "Faroese (eliminate dead keys)";
key <AE12> { [ acute, grave, bar, ogonek ] };
key <AD11> { [ aring, Aring, diaeresis, degree ] };
diff --git a/xorg-server/xkeyboard-config/symbols/fr b/xorg-server/xkeyboard-config/symbols/fr
index c804eb09e..d9f654b25 100644
--- a/xorg-server/xkeyboard-config/symbols/fr
+++ b/xorg-server/xkeyboard-config/symbols/fr
@@ -5,7 +5,7 @@ xkb_symbols "basic" {
include "latin"
- name[Group1]="France";
+ name[Group1]="French";
key <AE01> { [ ampersand, 1, onesuperior, exclamdown ] };
key <AE02> { [ eacute, 2, asciitilde, oneeighth ] };
@@ -46,7 +46,7 @@ xkb_symbols "olpc" {
// Contact: Sayamindu Dasgupta <sayamindu@laptop.org>
include "fr(basic)"
- name[Group1]="France";
+ name[Group1]="French";
key <AD02> { [ z, Z, VoidSymbol, guillemotleft ] };
@@ -72,7 +72,7 @@ partial alphanumeric_keys
xkb_symbols "sundeadkeys" {
include "fr(Sundeadkeys)"
- name[Group1]="France - Sun dead keys";
+ name[Group1]="French (Sun dead keys)";
};
partial alphanumeric_keys
@@ -82,7 +82,7 @@ xkb_symbols "nodeadkeys" {
include "fr(basic)"
- name[Group1]="France - Eliminate dead keys";
+ name[Group1]="French (eliminate dead keys)";
key <AE12> { [ equal, plus, braceright, ogonek ] };
key <AD11> { [asciicircum, diaeresis ] };
@@ -128,7 +128,7 @@ xkb_symbols "oss" {
include "nbsp(level4nl)"
include "keypad(oss)"
- name[Group1]="France - Alternative";
+ name[Group1]="French (alternative)";
// First row
key <TLDE> { [ twosuperior, threesuperior, onesuperior, dead_cedilla ] }; // ² ³ ¹ ¸
@@ -195,7 +195,7 @@ xkb_symbols "oss_latin9" {
include "fr(oss)"
include "keypad(oss_latin9)"
- name[Group1]="France - Alternative, latin-9 only";
+ name[Group1]="French (alternative, latin-9 only)";
// First row
key <AE01> { [ ampersand, 1, dead_caron, dead_cedilla ] }; // & 1 ˇ ¸
@@ -249,7 +249,7 @@ xkb_symbols "oss_sundeadkeys" {
include "fr(oss_Sundeadkeys)"
- name[Group1]="France - Alternative, Sun dead keys";
+ name[Group1]="French (alternative, Sun dead keys)";
};
partial alphanumeric_keys
@@ -259,7 +259,7 @@ xkb_symbols "oss_nodeadkeys" {
include "fr(oss)"
- name[Group1]="France - Alternative, eliminate dead keys";
+ name[Group1]="French (alternative, eliminate dead keys)";
key <TLDE> { [ twosuperior, threesuperior, onesuperior, cedilla ] }; // ² ³ ¹ ¸
key <AE01> { [ ampersand, 1, caron, ogonek ] }; // & 1 ˇ ̨
@@ -342,7 +342,7 @@ xkb_symbols "latin9" {
include "latin"
include "nbsp(level3)"
- name[Group1]="France - (Legacy) Alternative";
+ name[Group1]="French (legacy, alternative)";
key <TLDE> { [ oe, OE, leftdoublequotemark, rightdoublequotemark ] };
key <AE01> { [ ampersand, 1, dead_acute, periodcentered ] };
@@ -421,7 +421,7 @@ xkb_symbols "latin9_sundeadkeys" {
include "fr(latin9_Sundeadkeys)"
- name[Group1]="France - (Legacy) Alternative, Sun dead keys";
+ name[Group1]="French (legacy, alternative, Sun dead keys)";
};
partial alphanumeric_keys
@@ -431,7 +431,7 @@ xkb_symbols "latin9_nodeadkeys" {
include "fr(latin9)"
- name[Group1]="France - (Legacy) Alternative, eliminate dead keys";
+ name[Group1]="French (legacy, alternative, eliminate dead keys)";
key <AE01> { [ ampersand, 1, apostrophe, periodcentered ] };
key <AE07> { [ egrave, 7, grave, Egrave ] };
@@ -473,7 +473,7 @@ xkb_symbols "bepo" {
include "level3(ralt_switch)"
include "keypad(oss)"
- name[Group1]= "France - Bepo, ergonomic, Dvorak way";
+ name[Group1]= "French (Bepo, ergonomic, Dvorak way)";
// First row
key <TLDE> { [ dollar, numbersign, endash, paragraph ] }; // $ # – ¶
@@ -542,7 +542,7 @@ xkb_symbols "bepo_latin9" {
include "fr(bepo)"
include "keypad(oss_latin9)"
- name[Group1]="France - Bepo, ergonomic, Dvorak way, latin-9 only";
+ name[Group1]="French (Bepo, ergonomic, Dvorak way, latin-9 only)";
key <TLDE> { [ dollar, numbersign, dollar, paragraph ] }; // $ # $ ¶
@@ -622,7 +622,7 @@ xkb_symbols "bepo_latin9" {
partial alphanumeric_keys modifier_keys
xkb_symbols "dvorak" {
- name[Group1]="France - Dvorak";
+ name[Group1]="French (Dvorak)";
// First row
key <TLDE> { type[group1] = "FOUR_LEVEL_SEMIALPHABETIC", [ underscore, asterisk ] };
@@ -713,7 +713,7 @@ xkb_symbols "bre" {
include "keypad(oss)"
- name[Group1]= "France - Breton";
+ name[Group1]= "French (Breton)";
// First row
key <TLDE> { [ twosuperior, dead_tilde, dead_abovedot, Greek_GAMMA ] };
@@ -811,7 +811,7 @@ xkb_symbols "oci" {
include "keypad(oss)"
- name[Group1]= "France - Occitan";
+ name[Group1]= "Occitan";
// First row
key <TLDE> { [ twosuperior, threesuperior, onesuperior, dead_cedilla ] }; // ² ³ ¹ ¸
@@ -896,7 +896,7 @@ xkb_symbols "oci" {
partial alphanumeric_keys
xkb_symbols "mac" {
- name[Group1]= "France - Macintosh";
+ name[Group1]= "French (Macintosh)";
// Alphanumeric section
key <TLDE> { [ at, numbersign, periodcentered, Ydiaeresis ] }; // MISSING: Ydiaeresis; eherlent : ok in Latin9
@@ -964,7 +964,7 @@ partial alphanumeric_keys
xkb_symbols "geo" {
include "ge(basic)"
- name[Group1]= "France - Georgian AZERTY Tskapo";
+ name[Group1]= "Georgian (France, AZERTY Tskapo)";
key <TLDE> { [ exclam, noSymbol ] };
key <AE01> { [ 0x0100201e, 1 ] };
diff --git a/xorg-server/xkeyboard-config/symbols/ge b/xorg-server/xkeyboard-config/symbols/ge
index 0746295b5..18b062d13 100644
--- a/xorg-server/xkeyboard-config/symbols/ge
+++ b/xorg-server/xkeyboard-config/symbols/ge
@@ -18,7 +18,7 @@
partial default alphanumeric_keys
xkb_symbols "basic" {
- name[Group1]= "Georgia";
+ name[Group1]= "Georgian";
key <TLDE> { [ 0x0100201e, 0x0100201c, 0x0100201e, asciitilde ] };
key <AE01> { [ 1, exclam, apostrophe ] };
@@ -85,7 +85,7 @@ partial alphanumeric_keys
xkb_symbols "ergonomic" {
include "ge(basic)"
- name[Group1]= "Georgia - Ergonomic";
+ name[Group1]= "Georgian (ergonomic)";
key <TLDE> { [ 0x0100201e, apostrophe, 0x0100201e, asciitilde ] };
key <AE01> { [ exclam, 1, exclam ] };
@@ -147,7 +147,7 @@ partial alphanumeric_keys
xkb_symbols "mess" {
include "ge(basic)"
- name[Group1]= "Georgia - MESS";
+ name[Group1]= "Georgian (MESS)";
key <TLDE> { [ 0x010010ed, backslash, quoteleft ] };
key <AE01> { [ 1, exclam, apostrophe ] };
@@ -206,7 +206,7 @@ xkb_symbols "mess" {
partial alphanumeric_keys
xkb_symbols "ru" {
- name[Group1]= "Georgia - Russian";
+ name[Group1]= "Russian (Georgia)";
key <TLDE> { [ asciicircum, asciitilde ] };
key <AE01> { [ 1, exclam ] };
@@ -267,6 +267,6 @@ xkb_symbols "os" {
include "ru(os_legacy)"
- name[Group1]= "Georgia - Ossetian";
+ name[Group1]= "Ossetian (Georgia)";
};
diff --git a/xorg-server/xkeyboard-config/symbols/gh b/xorg-server/xkeyboard-config/symbols/gh
index 04c7a8ed4..8879cea47 100644
--- a/xorg-server/xkeyboard-config/symbols/gh
+++ b/xorg-server/xkeyboard-config/symbols/gh
@@ -3,7 +3,7 @@ xkb_symbols "basic" {
include "us"
- name[Group1]= "Ghana";
+ name[Group1]= "English (Ghana)";
key <AE04> { [ 4, 0x010020B5, dollar, cent ] };
include "level3(ralt_switch)"
@@ -13,7 +13,7 @@ partial alphanumeric_keys
xkb_symbols "akan" {
include "gh(basic)"
- name[Group1]= "Ghana - Akan";
+ name[Group1]= "Akan";
key <AD01> { [ 0x0100025B, 0x01000190, q, Q ] };
key <AB02> { [ 0x01000254, 0x01000186, x, X ] };
@@ -23,7 +23,7 @@ partial alphanumeric_keys
xkb_symbols "ga" {
include "gh(basic)"
- name[Group1]= "Ghana - Ga";
+ name[Group1]= "Ga";
key <AD01> { [ 0x0100025B, 0x01000190, q, Q ] };
key <AB02> { [ 0x01000254, 0x01000186, x, X ] };
@@ -34,7 +34,7 @@ partial alphanumeric_keys
xkb_symbols "ewe" {
include "gh(basic)"
- name[Group1]= "Ghana - Ewe";
+ name[Group1]= "Ewe";
key <AD01> { [ 0x0100025B, 0x01000190, q, Q ] };
key <AB03> { [ 0x0100014B, 0x0100014A, c, C ] };
@@ -50,7 +50,7 @@ partial alphanumeric_keys
xkb_symbols "fula" {
include "gh(basic)"
- name[Group1]= "Ghana - Fula";
+ name[Group1]= "Fula";
key <AD01> { [ 0x01000071, 0x01000051, q, Q ] };
key <AD02> { [ udiaeresis, Udiaeresis, w, W ] };
@@ -71,14 +71,14 @@ partial alphanumeric_keys
xkb_symbols "hausa" {
include "gh(fula)"
- name[Group1]= "Ghana - Hausa";
+ name[Group1]= "Hausa";
};
partial alphanumeric_keys
xkb_symbols "generic" {
include "gh(basic)"
- name[Group1]= "Ghana - Multilingual";
+ name[Group1]= "English (Ghana, multilingual)";
key <AD03> { [ e, E, 0x0100025b, 0x01000190 ] };
key <AB03> { [ c, C, 0x01000254, 0x01000186 ] };
@@ -97,7 +97,7 @@ partial alphanumeric_keys
xkb_symbols "avn" {
include "gh(basic)"
- name[Group1]= "Ghana - Avatime";
+ name[Group1]= "Avatime";
key <TLDE> { [ grave, asciitilde, 0x01000300, 0x01000303 ] }; // combining grave; combining tilde
key <AE04> { [ 4, dollar, cent, 0x010020B5 ] }; // ¢, ₵
@@ -127,7 +127,7 @@ partial alphanumeric_keys
xkb_symbols "gillbt" {
include "gh(basic)"
- name[Group1]= "Ghana - GILLBT";
+ name[Group1]= "English (Ghana, GILLBT)";
key <TLDE> { [ grave, asciitilde, 0x01000300, 0x01000303 ] }; // combining grave; combining tilde
key <AE04> { [ 4, dollar, cent, 0x010020B5 ] }; // ¢, ₵
diff --git a/xorg-server/xkeyboard-config/symbols/gn b/xorg-server/xkeyboard-config/symbols/gn
index 3a693afd6..8cfe16485 100644
--- a/xorg-server/xkeyboard-config/symbols/gn
+++ b/xorg-server/xkeyboard-config/symbols/gn
@@ -4,7 +4,7 @@
partial default alphanumeric_keys
xkb_symbols "basic" {
- name[Group1]="Guinea";
+ name[Group1]="French (Guinea)";
key <AE01> { [0x010007F1, 0x010007C1 ] };
key <AE02> { [0x010007EB, 0x010007C2 ] };
diff --git a/xorg-server/xkeyboard-config/symbols/gr b/xorg-server/xkeyboard-config/symbols/gr
index 5fe302200..3feb5267c 100644
--- a/xorg-server/xkeyboard-config/symbols/gr
+++ b/xorg-server/xkeyboard-config/symbols/gr
@@ -11,7 +11,7 @@ default partial alphanumeric_keys alternate_group
xkb_symbols "basic" {
include "gr(simple)"
- name[Group1] = "Greece";
+ name[Group1] = "Greek";
include "eurosign(e)"
include "eurosign(5)"
@@ -56,7 +56,7 @@ xkb_symbols "simple" {
include "gr(bare)"
- name[Group1] = "Greece - Simple";
+ name[Group1] = "Greek (simple)";
key <TLDE> { [ grave, asciitilde ] }; // ` ~
key <AE01> { [ 1, exclam ] }; // 1 !
@@ -147,7 +147,7 @@ xkb_symbols "extended" {
include "gr(simple)"
- name[Group1] = "Greece - Extended";
+ name[Group1] = "Greek (extended)";
key.type[Group1] = "THREE_LEVEL";
@@ -172,7 +172,7 @@ xkb_symbols "polytonic" {
include "gr(extended)"
- name[Group1] = "Greece - Polytonic";
+ name[Group1] = "Greek (polytonic)";
key.type[Group1] = "THREE_LEVEL";
@@ -188,7 +188,7 @@ xkb_symbols "nodeadkeys" {
include "gr(simple)"
- name[Group1] = "Greece - Eliminate dead keys";
+ name[Group1] = "Greek (eliminate dead keys)";
key <AC10> { [ semicolon, colon ] }; // ; :
};
diff --git a/xorg-server/xkeyboard-config/symbols/hr b/xorg-server/xkeyboard-config/symbols/hr
index 71b23b607..874ba0e32 100644
--- a/xorg-server/xkeyboard-config/symbols/hr
+++ b/xorg-server/xkeyboard-config/symbols/hr
@@ -1,7 +1,7 @@
default partial alphanumeric_keys
xkb_symbols "basic" {
- name[Group1]="Croatia";
+ name[Group1]="Croatian";
include "rs(latin)"
@@ -16,7 +16,7 @@ xkb_symbols "basic" {
partial alphanumeric_keys
xkb_symbols "us" {
- name[Group1]= "Croatia - US keyboard with Croatian letters";
+ name[Group1]= "Croatian (US keyboard with Croatian letters)";
include "us"
@@ -51,7 +51,7 @@ xkb_symbols "us" {
partial alphanumeric_keys
xkb_symbols "alternatequotes" {
- name[Group1]= "Croatia - Use guillemets for quotes";
+ name[Group1]= "Croatian (use guillemets for quotes)";
include "rs(latinalternatequotes)"
};
@@ -59,7 +59,7 @@ xkb_symbols "alternatequotes" {
partial alphanumeric_keys
xkb_symbols "unicode" {
- name[Group1]= "Croatia - Use Croatian digraphs";
+ name[Group1]= "Croatian (use Croatian digraphs)";
include "rs(latinunicode)"
};
@@ -67,7 +67,7 @@ xkb_symbols "unicode" {
partial alphanumeric_keys
xkb_symbols "unicodeus" {
- name[Group1]= "Croatia - US keyboard with Croatian digraphs";
+ name[Group1]= "Croatian (US keyboard with Croatian digraphs)";
include "rs(latinunicodeyz)"
};
diff --git a/xorg-server/xkeyboard-config/symbols/hu b/xorg-server/xkeyboard-config/symbols/hu
index 4595f1d22..41ba681e8 100644
--- a/xorg-server/xkeyboard-config/symbols/hu
+++ b/xorg-server/xkeyboard-config/symbols/hu
@@ -28,28 +28,28 @@
default partial
xkb_symbols "basic" {
include "hu(102_qwertz_comma_dead)"
- name[Group1] = "Hungary";
+ name[Group1] = "Hungarian";
};
// Standard layout
partial
xkb_symbols "standard" {
include "hu(102_qwertz_comma_dead)"
- name[Group1] = "Hungary - Standard";
+ name[Group1] = "Hungarian (standard)";
};
// Standard layout without dead key support
partial
xkb_symbols "nodeadkeys" {
include "hu(102_qwertz_comma_nodead)"
- name[Group1] = "Hungary - Eliminate dead keys";
+ name[Group1] = "Hungarian (eliminate dead keys)";
};
// Qwerty layout
partial
xkb_symbols "qwerty" {
include "hu(101_qwerty_comma_dead)"
- name[Group1] = "Hungary - qwerty";
+ name[Group1] = "Hungarian (qwerty)";
};
// Main layouts
@@ -60,7 +60,7 @@ xkb_symbols "qwerty" {
// and with dead key support
partial
xkb_symbols "101_qwertz_comma_dead" {
- name[Group1] = "Hungary - 101/qwertz/comma/Dead keys";
+ name[Group1] = "Hungarian (101/qwertz/comma/dead keys)";
include "latin"
include "hu(def_101)"
include "hu(def_qwertz)"
@@ -76,7 +76,7 @@ xkb_symbols "101_qwertz_comma_dead" {
// and without dead key support
partial
xkb_symbols "101_qwertz_comma_nodead" {
- name[Group1] = "Hungary - 101/qwertz/comma/Eliminate dead keys";
+ name[Group1] = "Hungarian (101/qwertz/comma/eliminate dead keys)";
include "latin"
include "hu(def_101)"
include "hu(def_qwertz)"
@@ -92,7 +92,7 @@ xkb_symbols "101_qwertz_comma_nodead" {
// and with dead key support
partial
xkb_symbols "101_qwertz_dot_dead" {
- name[Group1] = "Hungary - 101/qwertz/dot/Dead keys";
+ name[Group1] = "Hungarian (101/qwertz/dot/dead keys)";
include "latin"
include "hu(def_101)"
include "hu(def_qwertz)"
@@ -108,7 +108,7 @@ xkb_symbols "101_qwertz_dot_dead" {
// and without dead key support
partial
xkb_symbols "101_qwertz_dot_nodead" {
- name[Group1] = "Hungary - 101/qwertz/dot/Eliminate dead keys";
+ name[Group1] = "Hungarian (101/qwertz/dot/eliminate dead keys)";
include "latin"
include "hu(def_101)"
include "hu(def_qwertz)"
@@ -124,7 +124,7 @@ xkb_symbols "101_qwertz_dot_nodead" {
// and with dead key support
partial
xkb_symbols "101_qwerty_comma_dead" {
- name[Group1] = "Hungary - 101/qwerty/comma/Dead keys";
+ name[Group1] = "Hungarian (101/qwerty/comma/dead keys)";
include "latin"
include "hu(def_101)"
include "hu(def_qwerty)"
@@ -140,7 +140,7 @@ xkb_symbols "101_qwerty_comma_dead" {
// and without dead key support
partial
xkb_symbols "101_qwerty_comma_nodead" {
- name[Group1] = "Hungary - 101/qwerty/comma/Eliminate dead keys";
+ name[Group1] = "Hungarian (101/qwerty/comma/eliminate dead keys)";
include "latin"
include "hu(def_101)"
include "hu(def_qwerty)"
@@ -156,7 +156,7 @@ xkb_symbols "101_qwerty_comma_nodead" {
// and with dead key support
partial
xkb_symbols "101_qwerty_dot_dead" {
- name[Group1] = "Hungary - 101/qwerty/dot/Dead keys";
+ name[Group1] = "Hungarian (101/qwerty/dot/dead keys)";
include "latin"
include "hu(def_101)"
include "hu(def_qwerty)"
@@ -172,7 +172,7 @@ xkb_symbols "101_qwerty_dot_dead" {
// and without dead key support
partial
xkb_symbols "101_qwerty_dot_nodead" {
- name[Group1] = "Hungary - 101/qwerty/dot/Eliminate dead keys";
+ name[Group1] = "Hungarian (101/qwerty/dot/eliminate dead keys)";
include "latin"
include "hu(def_101)"
include "hu(def_qwerty)"
@@ -188,7 +188,7 @@ xkb_symbols "101_qwerty_dot_nodead" {
// and with dead key support
partial
xkb_symbols "102_qwertz_comma_dead" {
- name[Group1] = "Hungary - 102/qwertz/comma/Dead keys";
+ name[Group1] = "Hungarian (102/qwertz/comma/dead keys)";
include "latin"
include "hu(def_102)"
include "hu(def_qwertz)"
@@ -204,7 +204,7 @@ xkb_symbols "102_qwertz_comma_dead" {
// and without dead key support
partial
xkb_symbols "102_qwertz_comma_nodead" {
- name[Group1] = "Hungary - 102/qwertz/comma/Eliminate dead keys";
+ name[Group1] = "Hungarian (102/qwertz/comma/eliminate dead keys)";
include "latin"
include "hu(def_102)"
include "hu(def_qwertz)"
@@ -220,7 +220,7 @@ xkb_symbols "102_qwertz_comma_nodead" {
// and with dead key support
partial
xkb_symbols "102_qwertz_dot_dead" {
- name[Group1] = "Hungary - 102/qwertz/dot/Dead keys";
+ name[Group1] = "Hungarian (102/qwertz/dot/dead keys)";
include "latin"
include "hu(def_102)"
include "hu(def_qwertz)"
@@ -236,7 +236,7 @@ xkb_symbols "102_qwertz_dot_dead" {
// and without dead key support
partial
xkb_symbols "102_qwertz_dot_nodead" {
- name[Group1] = "Hungary - 102/qwertz/dot/Eliminate dead keys";
+ name[Group1] = "Hungarian (102/qwertz/dot/eliminate dead keys)";
include "latin"
include "hu(def_102)"
include "hu(def_qwertz)"
@@ -252,7 +252,7 @@ xkb_symbols "102_qwertz_dot_nodead" {
// and with dead key support
partial
xkb_symbols "102_qwerty_comma_dead" {
- name[Group1] = "Hungary - 102/qwerty/comma/Dead keys";
+ name[Group1] = "Hungarian (102/qwerty/comma/dead keys)";
include "latin"
include "hu(def_102)"
include "hu(def_qwerty)"
@@ -268,7 +268,7 @@ xkb_symbols "102_qwerty_comma_dead" {
// and without dead key support
partial
xkb_symbols "102_qwerty_comma_nodead" {
- name[Group1] = "Hungary - 102/qwerty/comma/Eliminate dead keys";
+ name[Group1] = "Hungarian (102/qwerty/comma/eliminate dead keys)";
include "latin"
include "hu(def_102)"
include "hu(def_qwerty)"
@@ -284,7 +284,7 @@ xkb_symbols "102_qwerty_comma_nodead" {
// and with dead key support
partial
xkb_symbols "102_qwerty_dot_dead" {
- name[Group1] = "Hungary - 102/qwerty/dot/Dead keys";
+ name[Group1] = "Hungarian (102/qwerty/dot/dead keys)";
include "latin"
include "hu(def_102)"
include "hu(def_qwerty)"
@@ -300,7 +300,7 @@ xkb_symbols "102_qwerty_dot_dead" {
// and without dead key support
partial
xkb_symbols "102_qwerty_dot_nodead" {
- name[Group1] = "Hungary - 102/qwerty/dot/Eliminate dead keys";
+ name[Group1] = "Hungarian (102/qwerty/dot/eliminate dead keys)";
include "latin"
include "hu(def_102)"
include "hu(def_qwerty)"
diff --git a/xorg-server/xkeyboard-config/symbols/il b/xorg-server/xkeyboard-config/symbols/il
index 1ae574335..a3779bf8c 100644
--- a/xorg-server/xkeyboard-config/symbols/il
+++ b/xorg-server/xkeyboard-config/symbols/il
@@ -8,7 +8,7 @@ partial default alphanumeric_keys
xkb_symbols "basic" {
// uses the kbd layout in use in Israel.
- name[Group1]= "Israel";
+ name[Group1]= "Hebrew";
key <AD01> { [ slash, Q ] };
key <AD02> { [ apostrophe, W ] };
@@ -81,7 +81,7 @@ xkb_symbols "basic" {
// nikud patter based on Dekel Tsur's Hebrew mapping for LyX
partial alphanumeric_keys
xkb_symbols "lyx" {
- name[Group1]= "Israel - lyx";
+ name[Group1]= "Hebrew (lyx)";
key <TLDE> { [ semicolon, asciitilde ] };
// On some key (e.g. AD01, right below) there is not yet mapping for the
@@ -139,7 +139,7 @@ xkb_symbols "phonetic" {
// uses the phonetic layout from old Slackware 'il.map' file
- name[Group1]= "Israel - Phonetic";
+ name[Group1]= "Hebrew (phonetic)";
key <AE12> { [ equal, plus, hebrew_doublelowline, hebrew_doublelowline ]};
@@ -193,7 +193,7 @@ xkb_symbols "phonetic" {
partial alphanumeric_keys
xkb_symbols "biblical" {
- name[Group1]= "Israel - Biblical Hebrew (Tiro)";
+ name[Group1]= "Hebrew (Biblical, Tiro)";
key.type = "FOUR_LEVEL_SEMIALPHABETIC";
key <TLDE> { [ U05C3, U05AE, semicolon, asciitilde ] };
diff --git a/xorg-server/xkeyboard-config/symbols/in b/xorg-server/xkeyboard-config/symbols/in
index c46a05373..ab6dbb50e 100644
--- a/xorg-server/xkeyboard-config/symbols/in
+++ b/xorg-server/xkeyboard-config/symbols/in
@@ -22,7 +22,7 @@
default partial alphanumeric_keys
xkb_symbols "deva" {
// March 2004 -- David Holl <smyrph+dev_xkb@ece.wpi.edu>
- name[Group1]="India";
+ name[Group1]="Indian";
key.type="FOUR_LEVEL";
@@ -97,7 +97,7 @@ xkb_symbols "deva" {
partial alphanumeric_keys
xkb_symbols "bolnagri" {
- name[Group1] = "India - Hindi Bolnagri";
+ name[Group1] = "Hindi (Bolnagri)";
key.type="FOUR_LEVEL";
//Top Alphanumeric row
// Roman digits
@@ -167,7 +167,7 @@ xkb_symbols "bolnagri" {
partial alphanumeric_keys
xkb_symbols "ben" {
- name[Group1]= "India - Bengali";
+ name[Group1]= "Bengali";
// Mainly numbers.
key <AE01> { [ U09E7 ] };
@@ -232,7 +232,7 @@ xkb_symbols "ben" {
};
xkb_symbols "ben_probhat" {
- name[Group1]= "India - Bengali Probhat";
+ name[Group1]= "Bengali (Probhat)";
key <ESC> { [ Escape ] };
// numbers
@@ -306,7 +306,7 @@ xkb_symbols "ben_probhat" {
partial alphanumeric_keys
xkb_symbols "guj" {
- name[Group1]= "India - Gujarati";
+ name[Group1]= "Gujarati";
// Mainly numbers.
key <AE01> { [ U0AE7, U0A8D ] };
@@ -377,7 +377,7 @@ xkb_symbols "kan" {
// Date : Wed Nov 13 17:22:58 IST 2002
// Kannada digits mapped in basic only
- name[Group1]= "India - Kannada";
+ name[Group1]= "Kannada";
key <TLDE> { [ U0cca, U0c92 ] };
key <AE01> { [ U0ce7 ] };
@@ -445,7 +445,7 @@ xkb_symbols "kan" {
partial alphanumeric_keys
xkb_symbols "mal" {
- name[Group1] = "India - Malayalam";
+ name[Group1] = "Malayalam";
//From grave to backslash (\)
@@ -534,7 +534,7 @@ xkb_symbols "mal" {
partial alphanumeric_keys
xkb_symbols "mal_lalitha" {
- name[Group1] = "India - Malayalam Lalitha";
+ name[Group1] = "Malayalam (Lalitha)";
key.type="FOUR_LEVEL";
//Top Alphanumeric row
// Roman digits
@@ -607,7 +607,7 @@ xkb_symbols "ori" {
// Author: G Karunakar <karunakar@freedomink.org>
// Date: Wed Nov 13 18:16:19 IST 2002
- name[Group1]= "India - Oriya";
+ name[Group1]= "Oriya";
key <AE01> { [ U0b67 ] };
key <AE02> { [ U0b68 ] };
@@ -667,7 +667,7 @@ xkb_symbols "ori" {
// INSCRIPT
partial alphanumeric_keys
xkb_symbols "tam" {
- name[Group1]= "India - Tamil";
+ name[Group1]= "Tamil";
key <TLDE> { [ U0BCA, U0B92 ] };
@@ -739,7 +739,7 @@ xkb_symbols "tam_unicode" {
// Date : Fri Sep 4 11:32:00 CST 2009
// Mapping:
- name[Group1]= "India - Tamil Unicode";
+ name[Group1]= "Tamil (Unicode)";
// granthas
key <TLDE> { [ apostrophe, asciitilde ] };
@@ -804,7 +804,7 @@ xkb_symbols "tam_keyboard_with_numerals" {
// Date : Fri Sep 4 11:33:00 CST 2009
// Mapping:
- name[Group1]= "India - Tamil Keyboard with Numerals";
+ name[Group1]= "Tamil (keyboard with numerals)";
// Mainly numbers.
key <TLDE> { [ apostrophe, asciitilde ] };
@@ -868,7 +868,7 @@ xkb_symbols "tam_TSCII" {
// Author : Thuraiappah Vaseeharan <vasee@ieee.org>
// Last Modified: Sat Jan 5 17:11:26 CST 2002
- name[Group1]= "India - Tamil TSCII Typewriter";
+ name[Group1]= "Tamil (TSCII typewriter)";
key <AE01> { [ 0x10000b7, 0x10000a4 ] }; // aytham
key <AE02> { [ 0x1000082, 0x10000a5 ] }; // shri
@@ -924,7 +924,7 @@ xkb_symbols "tam_TAB" {
// Author: Thuraiappah Vaseeharan <t_vasee@yahoo.com>
// Date : Sun Aug 12 02:23:00 CDT 2001
- name[Group1]= "India - Tamil TAB Typewriter";
+ name[Group1]= "Tamil (TAB typewriter)";
// numeral row
key <AE01> { [ 0x10000e7, 0x10000a7 ] } ;
@@ -980,7 +980,7 @@ xkb_symbols "tel" {
// Date:
// See layout at http://www.indlinux.org/keymap/telugu.php
- name[Group1]= "India - Telugu";
+ name[Group1]= "Telugu";
key <TLDE> { [ U0c4a, U0c12 ] };
key <AE01> { [ U0c67 ] };
@@ -1042,26 +1042,26 @@ xkb_symbols "tel" {
partial alphanumeric_keys
xkb_symbols "urd-phonetic" {
include "pk(urd-phonetic)"
- name[Group1]= "India - Urdu, Phonetic";
+ name[Group1]= "Urdu (phonetic)";
};
partial alphanumeric_keys
xkb_symbols "urd-phonetic3" {
include "pk(urd-crulp)"
- name[Group1]= "India - Urdu, Alternative phonetic";
+ name[Group1]= "Urdu (alternative phonetic)";
};
partial alphanumeric_keys
xkb_symbols "urd-winkeys" {
include "pk(urd-nla)"
- name[Group1]= "India - Urdu, Winkeys";
+ name[Group1]= "Urdu (WinKeys)";
};
// based on a keyboard map from an 'xkb/symbols/gur' file
partial alphanumeric_keys
xkb_symbols "guru" {
- name[Group1]= "India - Gurmukhi";
+ name[Group1]= "Punjabi (Gurmukhi)";
// Mainly numbers.
key <AE01> { [ U0A67 ] };
@@ -1132,7 +1132,7 @@ xkb_symbols "guru" {
partial alphanumeric_keys
xkb_symbols "jhelum" {
- name[Group1] = "India - Gurmukhi Jhelum";
+ name[Group1] = "Punjabi (Gurmukhi Jhelum)";
key.type="FOUR_LEVEL";
//Top Alphanumeric row
// Roman digits
@@ -1265,7 +1265,7 @@ xkb_symbols "olpc" {
partial alphanumeric_keys
xkb_symbols "hin-wx" {
- name[Group1]= "India - Hindi Wx";
+ name[Group1]= "Hindi (Wx)";
key <TLDE> { [ grave, asciitilde, 2, 3 ] };
@@ -1330,7 +1330,7 @@ xkb_symbols "hin-wx" {
partial alphanumeric_keys
xkb_symbols "eng" {
- name[Group1]= "India - English with RupeeSign";
+ name[Group1]= "English (India, with RupeeSign)";
include "us(basic)"
@@ -1351,7 +1351,7 @@ xkb_symbols "eng" {
partial alphanumeric_keys
xkb_symbols "mal_enhanced" {
- name[Group1] = "India - Malayalam enhanced Inscript with Rupee Sign";
+ name[Group1] = "Malayalam (enhanced Inscript with Rupee Sign)";
//From grave to backslash (\)
diff --git a/xorg-server/xkeyboard-config/symbols/iq b/xorg-server/xkeyboard-config/symbols/iq
index f30332940..b3d341bc8 100644
--- a/xorg-server/xkeyboard-config/symbols/iq
+++ b/xorg-server/xkeyboard-config/symbols/iq
@@ -5,29 +5,29 @@
partial default alphanumeric_keys
xkb_symbols "basic" {
include "ara(basic)"
- name[Group1]= "Iraq";
+ name[Group1]= "Iraqi";
};
partial alphanumeric_keys
xkb_symbols "ku" {
include "tr(ku)"
- name[Group1]= "Iraq - Kurdish, Latin Q";
+ name[Group1]= "Kurdish (Iraq, Latin Q)";
};
partial alphanumeric_keys
xkb_symbols "ku_f" {
include "tr(ku_f)"
- name[Group1]= "Iraq - Kurdish, (F)";
+ name[Group1]= "Kurdish (Iraq, F)";
};
partial alphanumeric_keys
xkb_symbols "ku_alt" {
include "tr(ku_alt)"
- name[Group1]= "Iraq - Kurdish, Latin Alt-Q";
+ name[Group1]= "Kurdish (Iraq, Latin Alt-Q)";
};
partial alphanumeric_keys
xkb_symbols "ku_ara" {
include "ir(ku_ara)"
- name[Group1]= "Iraq - Kurdish, Arabic-Latin";
+ name[Group1]= "Kurdish (Iraq, Arabic-Latin)";
};
diff --git a/xorg-server/xkeyboard-config/symbols/ir b/xorg-server/xkeyboard-config/symbols/ir
index 28b8dc17d..723c8b5ae 100644
--- a/xorg-server/xkeyboard-config/symbols/ir
+++ b/xorg-server/xkeyboard-config/symbols/ir
@@ -14,7 +14,7 @@
partial default alphanumeric_keys
xkb_symbols "pes" {
- name[Group1]= "Iran";
+ name[Group1]= "Persian";
include "ir(pes_part_basic)"
include "ir(pes_part_ext)"
@@ -26,7 +26,7 @@ xkb_symbols "pes" {
partial alphanumeric_keys
xkb_symbols "pes_keypad" {
- name[Group1]= "Iran - Persian, with Persian Keypad";
+ name[Group1]= "Persian (with Persian Keypad)";
include "ir(pes_part_basic)"
include "ir(pes_part_keypad)"
@@ -146,19 +146,19 @@ xkb_symbols "pes_part_keypad" {
partial alphanumeric_keys
xkb_symbols "ku" {
include "tr(ku)"
- name[Group1]= "Iran - Kurdish, Latin Q";
+ name[Group1]= "Kurdish (Iran, Latin Q)";
};
partial alphanumeric_keys
xkb_symbols "ku_f" {
include "tr(ku_f)"
- name[Group1]= "Iran - Kurdish, (F)";
+ name[Group1]= "Kurdish (Iran, F)";
};
partial alphanumeric_keys
xkb_symbols "ku_alt" {
include "tr(ku_alt)"
- name[Group1]= "Iran - Kurdish, Latin Alt-Q";
+ name[Group1]= "Kurdish (Iran, Latin Alt-Q)";
};
////////////////////////////////////////
@@ -179,7 +179,7 @@ xkb_symbols "ku_alt" {
partial alphanumeric_keys
xkb_symbols "ku_ara" {
- name[Group1]= "Iran - Kurdish, Arabic-Latin";
+ name[Group1]= "Kurdish (Iran, Arabic-Latin)";
// Other 3-Level symbols
key <TLDE> { [ 0x100200d, division, asciitilde ] };
@@ -254,7 +254,7 @@ xkb_symbols "ku_ara" {
partial default alphanumeric_keys
xkb_symbols "ave"
{
- name[Group1] = "Iran - Avestan";
+ name[Group1] = "Avestan";
key <AB01> { [ U10B30, U10B32 ] }; // 𐬰 𐬲
key <AB02> { [ U10B11, U10B12 ] }; // 𐬑 𐬒
diff --git a/xorg-server/xkeyboard-config/symbols/is b/xorg-server/xkeyboard-config/symbols/is
index 2a37f9da1..c22213c58 100644
--- a/xorg-server/xkeyboard-config/symbols/is
+++ b/xorg-server/xkeyboard-config/symbols/is
@@ -8,7 +8,7 @@ xkb_symbols "basic" {
include "latin(type4)"
- name[Group1]="Iceland";
+ name[Group1]="Icelandic";
key <AE02> { [ 2, quotedbl, twosuperior, oneeighth ] };
key <AE04> { [ 4, dollar, onequarter, currency ] };
@@ -35,7 +35,7 @@ xkb_symbols "Sundeadkeys" {
include "is(basic)"
- name[Group1]="Iceland - Sun dead keys";
+ name[Group1]="Icelandic (Sun dead keys)";
key <TLDE> { [dead_circumflex, degree, notsign, notsign ] };
key <AE12> { [dead_acute, dead_grave, dead_cedilla, dead_cedilla ] };
@@ -53,7 +53,7 @@ xkb_symbols "nodeadkeys" {
include "is(basic)"
- name[Group1]="Iceland - Eliminate dead keys";
+ name[Group1]="Icelandic (eliminate dead keys)";
key <TLDE> { [asciicircum, degree, notsign, notsign ] };
key <AE12> { [apostrophe, grave, cedilla, cedilla ] };
@@ -98,7 +98,7 @@ xkb_symbols "nodeadkeys" {
// Copied from macintosh_vndr/is
partial alphanumeric_keys
xkb_symbols "mac" {
- name[Group1]= "Iceland - Macintosh";
+ name[Group1]= "Icelandic (Macintosh)";
//-- Row 5 (E) --//
key <TLDE> { [ sterling, section, UF8FF, apostrophe ] };
@@ -183,7 +183,7 @@ xkb_symbols "mac" {
// Icelandic Dvorak
partial alphanumeric_keys
xkb_symbols "dvorak" {
- name[Group1]= "Iceland - Dvorak";
+ name[Group1]= "Icelandic (Dvorak)";
include "us(dvorak)"
include "eurosign(4)"
diff --git a/xorg-server/xkeyboard-config/symbols/it b/xorg-server/xkeyboard-config/symbols/it
index 631fae591..b75b35de8 100644
--- a/xorg-server/xkeyboard-config/symbols/it
+++ b/xorg-server/xkeyboard-config/symbols/it
@@ -6,7 +6,7 @@ xkb_symbols "basic" {
include "latin(type4)"
- name[Group1]="Italy";
+ name[Group1]="Italian";
key <TLDE> { [ backslash, bar, notsign, brokenbar ] };
@@ -43,7 +43,7 @@ xkb_symbols "nodeadkeys" {
include "it(basic)"
- name[Group1]="Italy - Eliminate dead keys";
+ name[Group1]="Italian (eliminate dead keys)";
key <AE02> { [ 2, quotedbl, twosuperior, doubleacute ] };
key <AE03> { [ 3, sterling,threesuperior, asciitilde ] };
@@ -65,7 +65,7 @@ xkb_symbols "nodeadkeys" {
partial alphanumeric_keys
xkb_symbols "mac" {
- name[Group1]= "Italy - Macintosh";
+ name[Group1]= "Italian (Macintosh)";
// Alphanumeric section
key <LSGT> { [ less, greater ] };
@@ -133,7 +133,7 @@ xkb_symbols "geo" {
include "it"
include "ge(basic)"
- name[Group1]= "Italy - Georgian";
+ name[Group1]= "Georgian (Italy)";
key <TLDE> { [ backslash, bar, notsign, brokenbar ] };
key <AE01> { [ 1, exclam, onesuperior ] };
key <AE02> { [ 2, quotedbl, twosuperior, dead_doubleacute ] };
@@ -175,7 +175,7 @@ xkb_symbols "olpc" {
partial alphanumeric_keys modifier_keys
xkb_symbols "us" {
- name[Group1]= "Italy - US keyboard with Italian letters";
+ name[Group1]= "Italian (US keyboard with Italian letters)";
include "us(euro)"
@@ -215,7 +215,7 @@ xkb_symbols "us" {
partial alphanumeric_keys
xkb_symbols "htcdream" {
include "inet(htcdream)"
- name[Group1]= "Italy - htcdream";
+ name[Group1]= "Italian";
//second row
key <AD01> { [ q, Q, Tab, Tab ] };
diff --git a/xorg-server/xkeyboard-config/symbols/ma b/xorg-server/xkeyboard-config/symbols/ma
index b49d0c762..971ed394e 100644
--- a/xorg-server/xkeyboard-config/symbols/ma
+++ b/xorg-server/xkeyboard-config/symbols/ma
@@ -3,7 +3,7 @@ partial default alphanumeric_keys
xkb_symbols "arabic" {
include "ara(azerty)"
- name[Group1]="Morocco";
+ name[Group1]="Arabic (Morocco)";
};
// French AZERTY keyboard used when typing French
@@ -11,7 +11,7 @@ partial alphanumeric_keys
xkb_symbols "french" {
include "fr(basic)"
- name[Group1]="Morocco - French";
+ name[Group1]="French (Morocco)";
};
// Clavier unicode tifinaghe de base réalisé par l'IRCAM (Institut Royal de la Culture Amazighe du Maroc) http://www.ircam.ma/
@@ -24,7 +24,7 @@ xkb_symbols "french" {
partial alphanumeric_keys
xkb_symbols "tifinagh" {
- name[Group1]="Morocco - Tifinagh";
+ name[Group1]="Berber (Morocco, Tifinagh)";
key <TLDE> { [ twosuperior, NoAction ] };
key <AE01> { [ ampersand, 1 ] };
@@ -83,7 +83,7 @@ xkb_symbols "tifinagh" {
partial alphanumeric_keys
xkb_symbols "tifinagh-phonetic" {
- name[Group1]="Morocco - Tifinagh phonetic";
+ name[Group1]="Berber (Morocco, Tifinagh phonetic)";
include "ma(tifinagh)"
key <LatA> { [ 0x1002d30 ] };
@@ -128,7 +128,7 @@ xkb_symbols "tifinagh-phonetic" {
partial alphanumeric_keys
xkb_symbols "tifinagh-extended" {
- name[Group1]="Morocco - Tifinagh extended";
+ name[Group1]="Berber (Morocco, Tifinagh extended)";
key <TLDE> { [ twosuperior,0x100200C ] };
key <AE01> { [ ampersand, 1 ] };
@@ -188,7 +188,7 @@ partial alphanumeric_keys
xkb_symbols "tifinagh-extended-phonetic" {
include "ma(tifinagh-extended)"
- name[Group1]="Morocco - Tifinagh extended phonetic";
+ name[Group1]="Berber (Morocco, Tifinagh extended phonetic)";
key <LatA> { [ 0x1002d30 ] };
key <LatZ> { [ 0x1002d63, 0x1002d65 ] };
@@ -229,7 +229,7 @@ xkb_symbols "tifinagh-extended-phonetic" {
partial alphanumeric_keys
xkb_symbols "tifinagh-alt" {
- name[Group1]="Morocco - Tifinagh alternative";
+ name[Group1]="Berber (Morocco, Tifinagh alternative)";
key <TLDE> { [ twosuperior, asciitilde ] };
key <AE01> { [ ampersand, 1 ] };
@@ -289,7 +289,7 @@ partial alphanumeric_keys
xkb_symbols "tifinagh-alt-phonetic" {
include "ma(tifinagh-alt)"
- name[Group1]="Morocco - Tifinagh alternative phonetic";
+ name[Group1]="Berber (Morocco, Tifinagh alternative phonetic)";
key <LatA> { [ 0x1002d30 ] };
key <LatZ> { [ 0x1002d63, 0x1002d65, 0x1002d64 ] };
diff --git a/xorg-server/xkeyboard-config/symbols/nl b/xorg-server/xkeyboard-config/symbols/nl
index 727410545..4130817ee 100644
--- a/xorg-server/xkeyboard-config/symbols/nl
+++ b/xorg-server/xkeyboard-config/symbols/nl
@@ -13,7 +13,7 @@ xkb_symbols "basic" {
include "latin"
- name[Group1]="Netherlands";
+ name[Group1]="Dutch";
key <AE02> { [ 2, quotedbl, twosuperior, oneeighth ] };
key <AE06> { [ 6, ampersand, threequarters, fiveeighths ] };
@@ -56,7 +56,7 @@ xkb_symbols "basic" {
partial alphanumeric_keys
xkb_symbols "std" {
- name[Group1]= "Netherlands - Standard";
+ name[Group1]= "Dutch (standard)";
key <TLDE> { [ at, section, notsign ] };
key <AE01> { [ 1, exclam, onesuperior ] };
@@ -129,7 +129,7 @@ xkb_symbols "sundeadkeys" {
// For naming consistency
include "nl(Sundeadkeys)"
- name[Group1]="Netherlands - Sun dead keys";
+ name[Group1]="Dutch (Sun dead keys)";
};
// Copied from macintosh_vndr/nl
@@ -141,7 +141,7 @@ xkb_symbols "mac" {
include "latin"
- name[Group1]= "Netherlands - Macintosh";
+ name[Group1]= "Dutch (Macintosh)";
include "level3(ralt_switch)"
diff --git a/xorg-server/xkeyboard-config/symbols/pt b/xorg-server/xkeyboard-config/symbols/pt
index 951639603..7ce8ef5ce 100644
--- a/xorg-server/xkeyboard-config/symbols/pt
+++ b/xorg-server/xkeyboard-config/symbols/pt
@@ -5,7 +5,7 @@ xkb_symbols "basic" {
include "latin(type4)"
- name[Group1]="Portugal";
+ name[Group1]="Portuguese";
key <LSGT> { [ less, greater ] };
key <AE03> { [ 3, numbersign, sterling, sterling ] };
@@ -39,7 +39,7 @@ partial alphanumeric_keys
xkb_symbols "sundeadkeys" {
include "pt(Sundeadkeys)" // for consistent naming
- name[Group1]="Portugal - Sun dead keys";
+ name[Group1]="Portuguese (Sun dead keys)";
};
partial alphanumeric_keys
diff --git a/xorg-server/xkeyboard-config/symbols/ro b/xorg-server/xkeyboard-config/symbols/ro
index 44660ad1e..483b5c6a0 100644
--- a/xorg-server/xkeyboard-config/symbols/ro
+++ b/xorg-server/xkeyboard-config/symbols/ro
@@ -192,44 +192,24 @@ xkb_symbols "winkeys" {
};
-// Crimean Tatar (Crimean Turkish) layouts.
partial
-xkb_symbols "crh_f" {
- include "tr(crh_f)"
+xkb_symbols "crh_dobruja" {
+ // Romania-specific Crimean Tatar (Crimean Turkish) Q layout.
+ // This layout is not yet standard. Common Alt-Q and F layouts are now also
+ // available right next to this layout in the new language-centric UI.
+ // Reşat SABIQ <tilde.birlik @ gmail . com>, 2009, 2011
+ // Özgür Qarahan <qarahan @ gmail . com>, 2009
- name[Group1]="Romania - Crimean Tatar (Turkish F)";
-};
-
-partial
-xkb_symbols "crh_alt" {
- include "tr(crh_alt)"
-
- name[Group1]="Romania - Crimean Tatar (Turkish Alt-Q)";
-};
-
-partial
-xkb_symbols "crh_dobruca1" {
include "tr(crh)"
- name[Group1]="Romania - Crimean Tatar (Dobruca-1 Q)";
-
- key <AD05> { [ t, T, tcedilla, Tcedilla ] };
- key <AD10> { [ p, P, abreve, Abreve ] };
-
- key <AC04> { [ f, F, ibreve, Ibreve ] };
- key <AC07> { [ iacute, Iacute, j, J ] };
-
- key <AB07> { [ m, M, trademark, masculine ] };
-};
-
-partial
-xkb_symbols "crh_dobruca2" {
- include "ro(crh_dobruca1)"
-
- name[Group1]="Romania - Crimean Tatar (Dobruca-2 Q)";
+ name[Group1]="Romania - Crimean Tatar (Dobruja Q)";
- key <AC04> { [ f, F, iacute, Iacute ] };
- key <AC07> { [ ibreve, Ibreve, j, J ] };
+ key <AD02> { [ w, W, abreve, Abreve ] };
+ key <AD05> { [ t, T, 0x100021b, 0x100021a ] };
+ key <AD10> { [ p, P, section ] };
+ key <AC02> { [ s, S, 0x1000219, 0x1000218 ] };
+ key <AC07> { [ ibreve, Ibreve, j, J ] };
+ key <AB07> { [ m, M, trademark, masculine ] };
};
// EXTRAS:
diff --git a/xorg-server/xkeyboard-config/symbols/tr b/xorg-server/xkeyboard-config/symbols/tr
index 9e9758c0e..aa1b83222 100644
--- a/xorg-server/xkeyboard-config/symbols/tr
+++ b/xorg-server/xkeyboard-config/symbols/tr
@@ -294,12 +294,14 @@ xkb_symbols "olpc" {
};
-// Crimean Tatar (Crimean Turkish) layouts.
-// First released: 2009.
-// These layouts are currently experimental. In particular, the mapping of letter 'x',
-// included for foreign words and shortcuts, might change in the future...
-// Reşat SABIQ <tilde.birlik @ gmail . com>
-// Özgür Qarahan <qarahan @ gmail . com>
+// Crimean Tatar (Crimean Turkish) layouts.
+// First released (by Ubuntu): 2009-02-24.
+// These layouts are not yet standard. In particular, the mapping of
+// letter 'x' might change in the future. This letter is not used in the
+// current official alphabet, but is included in the layouts for foreign words
+// and shortcuts.
+// Reşat SABIQ <tilde.birlik @ gmail . com>, 2009
+// Özgür Qarahan <qarahan @ gmail . com>, 2009
// Crimean Tatar (Crimean Turkish) Q Layout
partial
diff --git a/xorg-server/xkeyboard-config/symbols/ua b/xorg-server/xkeyboard-config/symbols/ua
index a585ea2b3..1fba1368b 100644
--- a/xorg-server/xkeyboard-config/symbols/ua
+++ b/xorg-server/xkeyboard-config/symbols/ua
@@ -306,25 +306,3 @@ xkb_symbols "homophonic" {
key <AB09> { [ period, greater ] };
key <AB10> { [ slash, question ] };
};
-
-// Crimean Tatar (Crimean Turkish) layouts.
-partial
-xkb_symbols "crh" {
- include "tr(crh)"
-
- name[Group1]="Ukraine - Crimean Tatar (Turkish Q)";
-};
-
-partial
-xkb_symbols "crh_f" {
- include "tr(crh_f)"
-
- name[Group1]="Ukraine - Crimean Tatar (Turkish F)";
-};
-
-partial
-xkb_symbols "crh_alt" {
- include "tr(crh_alt)"
-
- name[Group1]="Ukraine - Crimean Tatar (Turkish Alt-Q)";
-};
diff --git a/xorg-server/xkeyboard-config/symbols/us b/xorg-server/xkeyboard-config/symbols/us
index 5258b96ce..10351796e 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]= "USA";
+ name[Group1]= "English (USA)";
// Alphanumeric section
key <TLDE> { [ grave, asciitilde ] };
@@ -62,7 +62,7 @@ xkb_symbols "basic" {
partial alphanumeric_keys
xkb_symbols "euro" {
- name[Group1]= "USA - With EuroSign on 5";
+ name[Group1]= "English (US, with euro on 5)";
include "us(basic)"
@@ -75,7 +75,7 @@ xkb_symbols "euro" {
partial alphanumeric_keys
xkb_symbols "intl" {
- name[Group1]= "USA - International (with dead keys)";
+ name[Group1]= "English (US, international with dead keys)";
include "us(basic)"
@@ -165,7 +165,7 @@ xkb_symbols "intl" {
partial alphanumeric_keys
xkb_symbols "alt-intl" {
- name[Group1]= "USA - Alternative international";
+ name[Group1]= "English (US, alternative international)";
include "us"
@@ -194,7 +194,7 @@ xkb_symbols "alt-intl" {
partial alphanumeric_keys
xkb_symbols "dvorak" {
- name[Group1]= "USA - Dvorak";
+ name[Group1]= "English (Dvorak)";
// Alphanumeric section
@@ -259,7 +259,7 @@ xkb_symbols "dvorak" {
partial alphanumeric_keys
xkb_symbols "dvorak-intl" {
- name[Group1]= "USA - Dvorak international (with dead keys)";
+ name[Group1]= "English (Dvorak international with dead keys)";
include "us(dvorak)"
@@ -338,7 +338,7 @@ xkb_symbols "dvorak-intl" {
partial alphanumeric_keys
xkb_symbols "dvorak-alt-intl" {
- name[Group1]= "USA - Dvorak alternative international (no dead keys)";
+ name[Group1]= "English (Dvorak alternative international no dead keys)";
include "us(dvorak)"
@@ -373,7 +373,7 @@ partial alphanumeric_keys
xkb_symbols "dvorak-l" {
include "us(dvorak)"
- name[Group1]= "USA - Left handed Dvorak";
+ name[Group1]= "English (left handed Dvorak)";
key <AE01> { [ bracketleft, braceleft ] };
key <AE02> { [ bracketright, braceright ] };
@@ -429,7 +429,7 @@ partial alphanumeric_keys
xkb_symbols "dvorak-r" {
include "us(dvorak)"
- name[Group1]= "USA - Right handed Dvorak";
+ name[Group1]= "English (right handed Dvorak)";
key <AE01> { [ 1, exclam ] };
key <AE02> { [ 2, at ] };
@@ -488,7 +488,7 @@ xkb_symbols "dvorak-r" {
partial alphanumeric_keys
xkb_symbols "dvorak-classic" {
- name[Group1]= "USA - Classic Dvorak";
+ name[Group1]= "English (classic Dvorak)";
// Alphanumeric section
@@ -620,7 +620,7 @@ xkb_symbols "dvp" {
partial alphanumeric_keys
xkb_symbols "rus" {
- name[Group1]= "USA - Russian phonetic";
+ name[Group1]= "Russian (US, phonetic)";
include "us(basic)"
@@ -667,7 +667,7 @@ partial alphanumeric_keys
xkb_symbols "mac" {
include "us(basic)"
- name[Group1]= "USA - Macintosh";
+ name[Group1]= "English (Macintosh)";
key.type[group1]="FOUR_LEVEL";
// Slightly improvised from http://homepage.mac.com/thgewecke/kblayout.jpg
@@ -734,7 +734,7 @@ xkb_symbols "mac" {
partial alphanumeric_keys
xkb_symbols "colemak" {
include "us"
- name[Group1]= "USA - Colemak";
+ name[Group1]= "English (Colemak)";
// Alphanumeric section
key <TLDE> { [ grave, asciitilde, dead_tilde, asciitilde ] };
@@ -814,7 +814,7 @@ xkb_symbols "colemak" {
partial alphanumeric_keys
xkb_symbols "altgr-intl" {
- name[Group1]= "USA - International (AltGr dead keys)";
+ name[Group1]= "English (international AltGr dead keys)";
include "us(intl)"
@@ -1050,7 +1050,7 @@ xkb_symbols "olpc" {
partial alphanumeric_keys
xkb_symbols "olpc2" {
include "us(olpc)"
- name[Group1]= "USA - Layout toggle on multiply/divide key";
+ name[Group1]= "English (layout toggle on multiply/divide key)";
include "group(olpc)"
};
@@ -1060,7 +1060,7 @@ xkb_symbols "olpc2" {
partial alphanumeric_keys modifier_keys
xkb_symbols "chr" {
- name[Group1]= "USA - Cherokee";
+ name[Group1]= "Cherokee";
key.type[group1]="ALPHABETIC";
// Alphanumeric section
@@ -1123,7 +1123,7 @@ xkb_symbols "chr" {
partial alphanumeric_keys
xkb_symbols "hbs" {
- name[Group1]= "USA - Serbo-Croatian";
+ name[Group1]= "Serbo-Croatian (USA)";
include "us"
@@ -1146,7 +1146,7 @@ xkb_symbols "hbs" {
partial alphanumeric_keys
xkb_symbols "htcdream" {
include "inet(htcdream)"
- name[Group1]= "USA - htcdream";
+ name[Group1]= "English (USA)";
//second row
key <AD01> { [ q, Q, Tab, Tab ] };
diff --git a/xorg-server/xkeyboard-config/symbols/uz b/xorg-server/xkeyboard-config/symbols/uz
index a6c67e8d1..53bbebe0f 100644
--- a/xorg-server/xkeyboard-config/symbols/uz
+++ b/xorg-server/xkeyboard-config/symbols/uz
@@ -96,25 +96,3 @@ xkb_symbols "latin" {
name[Group1]= "Uzbekistan - Latin";
key <AC11> { [0x010002BB, quotedbl] };
};
-
-// Crimean Tatar (Crimean Turkish) layouts.
-partial
-xkb_symbols "crh" {
- include "tr(crh)"
-
- name[Group1]="Uzbekistan - Crimean Tatar (Turkish Q)";
-};
-
-partial
-xkb_symbols "crh_f" {
- include "tr(crh_f)"
-
- name[Group1]="Uzbekistan - Crimean Tatar (Turkish F)";
-};
-
-partial
-xkb_symbols "crh_alt" {
- include "tr(crh_alt)"
-
- name[Group1]="Uzbekistan - Crimean Tatar (Turkish Alt-Q)";
-};