From 4945e1c758f06687cd19c2d82460529daa9070d7 Mon Sep 17 00:00:00 2001 From: "Sergey V. Udaltsov" Date: Mon, 4 Apr 2011 23:13:41 +0100 Subject: [PATCH] A number of group names synced with rules/base.xml.in --- symbols/ba | 10 +++++----- symbols/bd | 5 ++--- symbols/be | 16 ++++++++-------- symbols/bg | 6 +++--- symbols/br | 16 ++++++++-------- symbols/bt | 2 +- symbols/by | 6 +++--- symbols/ca | 20 ++++++++++---------- symbols/cd | 2 +- symbols/cn | 8 ++++---- symbols/cz | 12 ++++++------ symbols/de | 32 ++++++++++++++++---------------- symbols/dk | 10 +++++----- symbols/ee | 8 ++++---- symbols/fi | 10 +++++----- symbols/fo | 4 ++-- symbols/fr | 36 ++++++++++++++++++------------------ symbols/ge | 10 +++++----- symbols/gh | 18 +++++++++--------- symbols/gn | 2 +- symbols/gr | 10 +++++----- symbols/hr | 10 +++++----- symbols/hu | 40 ++++++++++++++++++++-------------------- symbols/il | 8 ++++---- symbols/in | 46 +++++++++++++++++++++++----------------------- symbols/iq | 10 +++++----- symbols/ir | 14 +++++++------- symbols/is | 10 +++++----- symbols/it | 12 ++++++------ symbols/ma | 16 ++++++++-------- symbols/nl | 8 ++++---- symbols/pt | 4 ++-- symbols/us | 36 ++++++++++++++++++------------------ 33 files changed, 228 insertions(+), 229 deletions(-) diff --git a/symbols/ba b/symbols/ba index bf3eea2..7345cc3 100644 --- a/symbols/ba +++ b/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/symbols/bd b/symbols/bd index 680156a..34879eb 100644 --- a/symbols/bd +++ b/symbols/bd @@ -15,9 +15,8 @@ // default partial alphanumeric_keys - xkb_symbols "basic" { - name[Group1]= "Bangladesh"; + name[Group1]= "Bengali"; key { [ 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/symbols/be b/symbols/be index acfffde..e39fccf 100644 --- a/symbols/be +++ b/symbols/be @@ -5,7 +5,7 @@ xkb_symbols "basic" { include "latin" - name[Group1]="Belgium"; + name[Group1]="Belgian"; key { [ ampersand, 1, bar, exclamdown ] }; key { [ 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 { [ 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 { [ a, A, ae, AE ] }; key { [ 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 { [dead_circumflex, dead_diaeresis, bracketleft, bracketleft] }; key { [ 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 { [ minus, underscore, cedilla, ogonek ] }; key { [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 { [ twosuperior, threesuperior, notsign, asciitilde ] }; diff --git a/symbols/bg b/symbols/bg index 1f3241a..2bef5ea 100644 --- a/symbols/bg +++ b/symbols/bg @@ -47,7 +47,7 @@ partial default alphanumeric_keys xkb_symbols "bds" { - name[Group1]= "Bulgaria"; + name[Group1]= "Bulgarian"; key { [ 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 { [ Cyrillic_che, Cyrillic_CHE ] }; key { [ 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 { [ Cyrillic_yu, Cyrillic_YU ] }; key { [ Cyrillic_che, Cyrillic_CHE ] }; diff --git a/symbols/br b/symbols/br index eb1c509..8ead57c 100644 --- a/symbols/br +++ b/symbols/br @@ -10,7 +10,7 @@ default xkb_symbols "abnt2" { include "latin" - name[Group1]="Brazil"; + name[Group1]="Portuguese (Brazil)"; key { [ 2, at, twosuperior, onehalf ] }; key { [ 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 { [ 6, diaeresis, notsign, notsign ] }; key { [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 { [ 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 { [ 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 { [ 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 { [ 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 { [ 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 { [ h, H, hcircumflex, Hcircumflex ] }; diff --git a/symbols/bt b/symbols/bt index 4e130f4..980b5c6 100644 --- a/symbols/bt +++ b/symbols/bt @@ -15,7 +15,7 @@ partial default alphanumeric_keys xkb_symbols "basic" { - name[Group1]= "Bhutan"; + name[Group1]= "Dzongkha"; key { [ 0x1000F09, 0x1000F0A, 0x1000F6C, 0x1000F6D ] }; diff --git a/symbols/by b/symbols/by index a8b8e63..36994d3 100644 --- a/symbols/by +++ b/symbols/by @@ -8,7 +8,7 @@ partial default alphanumeric_keys xkb_symbols "basic" { include "ru(winkeys)" - name[Group1]= "Belarus"; + name[Group1]= "Belarusian"; key { [ Byelorussian_shortu, Byelorussian_SHORTU ] }; key { [ 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 { [ 3, numbersign ] }; key { [ 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 { [ w, W, scaron, Scaron ] }; key { [ u, U, ubreve, Ubreve ] }; diff --git a/symbols/ca b/symbols/ca index 6a03b24..cfb7b25 100644 --- a/symbols/ca +++ b/symbols/ca @@ -1,6 +1,6 @@ default partial xkb_symbols "fr" { - name[Group1] = "Canada"; + name[Group1] = "French (Canada)"; key { [ numbersign, bar, backslash ] }; key { [ 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 { [ numbersign, bar, backslash ] }; key { [ 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 { [ NoSymbol, hyphen ] }; key { [ onesuperior, exclamdown ] }; @@ -269,7 +269,7 @@ xkb_symbols "multi-2gr" { alphanumeric_keys xkb_symbols "ike" { - name[Group1]= "Canada - Inuktitut"; + name[Group1]= "Inuktitut"; key { [ 0x01001595, 1 ] }; key { [ 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 { [ 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/symbols/cd b/symbols/cd index 69fac06..938bf2b 100644 --- a/symbols/cd +++ b/symbols/cd @@ -4,7 +4,7 @@ partial default alphanumeric_keys xkb_symbols "basic" { - name[Group1]= "Congo, Democratic Republic of the"; + name[Group1]= "French (Democratic Republic of the Congo)"; key.type[Group1] = "FOUR_LEVEL"; diff --git a/symbols/cn b/symbols/cn index 4f947da..cceb64b 100644 --- a/symbols/cn +++ b/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 { [ 0x1000f68, 0x1000f01, 0x1000fb8, 0x1000f00 ] }; # ཨ ༁ ྸ ༀ key { [ 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 { [ 1, 0x1000f21, 0x1000f04, 0x1000f76 ] }; # 1 ༡ ༄ ྲྀ key { [ 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 { [ grave, asciitilde ] }; diff --git a/symbols/cz b/symbols/cz index 577df19..2d8680c 100644 --- a/symbols/cz +++ b/symbols/cz @@ -7,7 +7,7 @@ xkb_symbols "basic" { include "latin" - name[Group1]= "Czechia"; + name[Group1]= "Czech"; key { [ semicolon, dead_abovering, grave, asciitilde ] }; key { [ plus, 1, exclam, dead_tilde ] }; @@ -72,7 +72,7 @@ xkb_symbols "basic" { // Use instead of (useful for keyboard without key) xkb_symbols "bksl" { include "cz(basic)" - name[Group1]= "Czechia - With <\|> key"; + name[Group1]= "Czech (with <\|> key)"; key { [ backslash, bar, slash, NoSymbol ] }; }; @@ -85,7 +85,7 @@ xkb_symbols "qwerty" { // 2001 by Kamil Toman include "cz(basic)" - name[Group1]= "Czechia - qwerty"; + name[Group1]= "Czech (qwerty)"; key { [ z, Z, degree, NoSymbol ] }; key { [ 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 { [ backslash, bar, slash, NoSymbol ] }; }; @@ -107,7 +107,7 @@ xkb_symbols "ucw" { // accented characters only, no 'latin' set. // 2008 by Milan Vancura - name[Group1]= "Czechia - UCW layout (accented letters only)"; + name[Group1]= "Czech (UCW layout, accented letters only)"; key { [zcaron, Zcaron ] }; key { [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 { [ j, J, eacute, Eacute ] }; key { [ k, K, uacute, Uacute ] }; diff --git a/symbols/de b/symbols/de index 02241db..c30cb9f 100644 --- a/symbols/de +++ b/symbols/de @@ -5,7 +5,7 @@ xkb_symbols "basic" { include "latin(type4)" - name[Group1]="Germany"; + name[Group1]="German"; key { [ 2, quotedbl, twosuperior, oneeighth ] }; key { [ 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 { [asciicircum, degree, notsign, notsign ] }; key { [ 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 { [asciicircum, degree, notsign, notsign ] }; key { [ 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 { [dead_acute, grave, dead_cedilla, dead_ogonek ] }; key { [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 { [ t, T, tcedilla, Tcedilla ] }; key { [ 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 { [ t, T, tcedilla, Tcedilla ] }; key { [ 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 { [ 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 { [ 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 { [ 4, dollar, onequarter, currency ] }; key { [ 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 { [ z, Z, leftarrow, yen ] }; key { [ 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 { [ q, Q, Tab, Tab ] }; diff --git a/symbols/dk b/symbols/dk index 8fa315c..1187a99 100644 --- a/symbols/dk +++ b/symbols/dk @@ -5,7 +5,7 @@ xkb_symbols "basic" { include "latin(type2)" - name[Group1]="Denmark"; + name[Group1]="Danish"; key { [ plus, question, plusminus, questiondown ] }; key { [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 { [ acute, grave, bar, ogonek ] }; key { [ 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 { [ space, space, nobreakspace, nobreakspace ] }; key { [ 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 { [ acute, grave, bar, ogonek ] }; key { [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/symbols/ee b/symbols/ee index 3f26547..fe1092e 100644 --- a/symbols/ee +++ b/symbols/ee @@ -11,7 +11,7 @@ xkb_symbols "basic" { include "latin(type4)" - name[Group1]="Estonia"; + name[Group1]="Estonian"; key { [ 3, numbersign, sterling, sterling ] }; key { [ 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 { [asciicircum,asciitilde ] }; key { [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 { [ 3, numbersign, sterling ] }; key { [ 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 { [ z, Z, zcaron, Zcaron ] }; diff --git a/symbols/fi b/symbols/fi index a2ddeeb..ec944e9 100644 --- a/symbols/fi +++ b/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 { [ section, onehalf, dead_stroke, NoSymbol ] }; key { [ 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 { [ acute, grave, cedilla, ogonek ] }; key { [ diaeresis, asciicircum, asciitilde, caron ] }; @@ -189,7 +189,7 @@ xkb_symbols "smi" { include "no(smi)" - name[Group1]="Finland - Northern Saami"; + name[Group1]="Saami (Finland)"; key { [ odiaeresis, Odiaeresis, oslash, Oslash ] }; key { [ 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/symbols/fo b/symbols/fo index dddf121..b0b24ce 100644 --- a/symbols/fo +++ b/symbols/fo @@ -3,7 +3,7 @@ xkb_symbols "basic" { include "latin(type2)" - name[Group1]= "Faroe Islands"; + name[Group1]= "Faroese"; key { [ onehalf, section, threequarters, paragraph ] }; key { [ 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 { [ acute, grave, bar, ogonek ] }; key { [ aring, Aring, diaeresis, degree ] }; diff --git a/symbols/fr b/symbols/fr index f8ecac9..8bb7213 100644 --- a/symbols/fr +++ b/symbols/fr @@ -5,7 +5,7 @@ xkb_symbols "basic" { include "latin" - name[Group1]="France"; + name[Group1]="French"; key { [ ampersand, 1, onesuperior, exclamdown ] }; key { [ eacute, 2, asciitilde, oneeighth ] }; @@ -46,7 +46,7 @@ xkb_symbols "olpc" { // Contact: Sayamindu Dasgupta include "fr(basic)" - name[Group1]="France"; + name[Group1]="French"; key { [ 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 { [ equal, plus, braceright, ogonek ] }; key { [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 { [ 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 { [ 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 { [ twosuperior, threesuperior, onesuperior, cedilla ] }; // ² ³ ¹ ¸ key { [ 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 { [ oe, OE, leftdoublequotemark, rightdoublequotemark ] }; key { [ 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 { [ ampersand, 1, apostrophe, periodcentered ] }; key { [ 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 { [ 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 { [ 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 { 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 { [ 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 { [ 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 { [ 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 { [ exclam, noSymbol ] }; key { [ 0x0100201e, 1 ] }; diff --git a/symbols/ge b/symbols/ge index 5c33251..d188d48 100644 --- a/symbols/ge +++ b/symbols/ge @@ -18,7 +18,7 @@ partial default alphanumeric_keys xkb_symbols "basic" { - name[Group1]= "Georgia"; + name[Group1]= "Georgian"; key { [ 0x0100201e, 0x0100201c, 0x0100201e, asciitilde ] }; key { [ 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 { [ 0x0100201e, apostrophe, 0x0100201e, asciitilde ] }; key { [ 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 { [ 0x010010ed, backslash, quoteleft ] }; key { [ 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 { [ asciicircum, asciitilde ] }; key { [ 1, exclam ] }; @@ -267,6 +267,6 @@ xkb_symbols "os" { include "ru(os_legacy)" - name[Group1]= "Georgia - Ossetian"; + name[Group1]= "Ossetian (Georgia)"; }; diff --git a/symbols/gh b/symbols/gh index cb05c31..93015a7 100644 --- a/symbols/gh +++ b/symbols/gh @@ -3,7 +3,7 @@ xkb_symbols "basic" { include "us" - name[Group1]= "Ghana"; + name[Group1]= "English (Ghana)"; key { [ 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 { [ 0x0100025B, 0x01000190, q, Q ] }; key { [ 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 { [ 0x0100025B, 0x01000190, q, Q ] }; key { [ 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 { [ 0x0100025B, 0x01000190, q, Q ] }; key { [ 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 { [ 0x01000071, 0x01000051, q, Q ] }; key { [ 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 { [ e, E, 0x0100025b, 0x01000190 ] }; key { [ 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 { [ grave, asciitilde, 0x01000300, 0x01000303 ] }; // combining grave; combining tilde key { [ 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 { [ grave, asciitilde, 0x01000300, 0x01000303 ] }; // combining grave; combining tilde key { [ 4, dollar, cent, 0x010020B5 ] }; // ¢, ₵ diff --git a/symbols/gn b/symbols/gn index 0d5ccef..f85e98e 100644 --- a/symbols/gn +++ b/symbols/gn @@ -4,7 +4,7 @@ partial default alphanumeric_keys xkb_symbols "basic" { - name[Group1]="Guinea"; + name[Group1]="French (Guinea)"; key { [0x010007F1, 0x010007C1 ] }; key { [0x010007EB, 0x010007C2 ] }; diff --git a/symbols/gr b/symbols/gr index ee96522..f4364cf 100644 --- a/symbols/gr +++ b/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 { [ grave, asciitilde ] }; // ` ~ key { [ 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 { [ semicolon, colon ] }; // ; : }; diff --git a/symbols/hr b/symbols/hr index bce79ed..8275259 100644 --- a/symbols/hr +++ b/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/symbols/hu b/symbols/hu index 59c5ff6..16631b7 100644 --- a/symbols/hu +++ b/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/symbols/il b/symbols/il index 6a6abfc..8bbeaaa 100644 --- a/symbols/il +++ b/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 { [ slash, Q ] }; key { [ 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 { [ 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 { [ 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 { [ U05C3, U05AE, semicolon, asciitilde ] }; diff --git a/symbols/in b/symbols/in index 7544714..822c12a 100644 --- a/symbols/in +++ b/symbols/in @@ -22,7 +22,7 @@ default partial alphanumeric_keys xkb_symbols "deva" { // March 2004 -- David Holl - 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 { [ U09E7 ] }; @@ -232,7 +232,7 @@ xkb_symbols "ben" { }; xkb_symbols "ben_probhat" { - name[Group1]= "India - Bengali Probhat"; + name[Group1]= "Bengali (Probhat)"; key { [ 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 { [ 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 { [ U0cca, U0c92 ] }; key { [ 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 // Date: Wed Nov 13 18:16:19 IST 2002 - name[Group1]= "India - Oriya"; + name[Group1]= "Oriya"; key { [ U0b67 ] }; key { [ U0b68 ] }; @@ -667,7 +667,7 @@ xkb_symbols "ori" { // INSCRIPT partial alphanumeric_keys xkb_symbols "tam" { - name[Group1]= "India - Tamil"; + name[Group1]= "Tamil"; key { [ 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 { [ 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 { [ apostrophe, asciitilde ] }; @@ -868,7 +868,7 @@ xkb_symbols "tam_TSCII" { // Author : Thuraiappah Vaseeharan // Last Modified: Sat Jan 5 17:11:26 CST 2002 - name[Group1]= "India - Tamil TSCII Typewriter"; + name[Group1]= "Tamil (TSCII typewriter)"; key { [ 0x10000b7, 0x10000a4 ] }; // aytham key { [ 0x1000082, 0x10000a5 ] }; // shri @@ -924,7 +924,7 @@ xkb_symbols "tam_TAB" { // Author: Thuraiappah Vaseeharan // Date : Sun Aug 12 02:23:00 CDT 2001 - name[Group1]= "India - Tamil TAB Typewriter"; + name[Group1]= "Tamil (TAB typewriter)"; // numeral row key { [ 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 { [ U0c4a, U0c12 ] }; key { [ 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 { [ 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 { [ 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/symbols/iq b/symbols/iq index a930625..5430b53 100644 --- a/symbols/iq +++ b/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/symbols/ir b/symbols/ir index 1832e81..94bdede 100644 --- a/symbols/ir +++ b/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 { [ 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 { [ U10B30, U10B32 ] }; // 𐬰 𐬲 key { [ U10B11, U10B12 ] }; // 𐬑 𐬒 diff --git a/symbols/is b/symbols/is index 46b4ce5..c40b8a9 100644 --- a/symbols/is +++ b/symbols/is @@ -8,7 +8,7 @@ xkb_symbols "basic" { include "latin(type4)" - name[Group1]="Iceland"; + name[Group1]="Icelandic"; key { [ 2, quotedbl, twosuperior, oneeighth ] }; key { [ 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 { [dead_circumflex, degree, notsign, notsign ] }; key { [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 { [asciicircum, degree, notsign, notsign ] }; key { [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 { [ 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/symbols/it b/symbols/it index d35239a..90fb7f5 100644 --- a/symbols/it +++ b/symbols/it @@ -6,7 +6,7 @@ xkb_symbols "basic" { include "latin(type4)" - name[Group1]="Italy"; + name[Group1]="Italian"; key { [ 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 { [ 2, quotedbl, twosuperior, doubleacute ] }; key { [ 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 { [ less, greater ] }; @@ -133,7 +133,7 @@ xkb_symbols "geo" { include "it" include "ge(basic)" - name[Group1]= "Italy - Georgian"; + name[Group1]= "Georgian (Italy)"; key { [ backslash, bar, notsign, brokenbar ] }; key { [ 1, exclam, onesuperior ] }; key { [ 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 { [ q, Q, Tab, Tab ] }; diff --git a/symbols/ma b/symbols/ma index 1c1c332..f7985ea 100644 --- a/symbols/ma +++ b/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 { [ twosuperior, NoAction ] }; key { [ 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 { [ 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 { [ twosuperior,0x100200C ] }; key { [ 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 { [ 0x1002d30 ] }; key { [ 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 { [ twosuperior, asciitilde ] }; key { [ 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 { [ 0x1002d30 ] }; key { [ 0x1002d63, 0x1002d65, 0x1002d64 ] }; diff --git a/symbols/nl b/symbols/nl index 88c000b..4c94a65 100644 --- a/symbols/nl +++ b/symbols/nl @@ -13,7 +13,7 @@ xkb_symbols "basic" { include "latin" - name[Group1]="Netherlands"; + name[Group1]="Dutch"; key { [ 2, quotedbl, twosuperior, oneeighth ] }; key { [ 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 { [ at, section, notsign ] }; key { [ 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/symbols/pt b/symbols/pt index ac13a9f..e4472d1 100644 --- a/symbols/pt +++ b/symbols/pt @@ -5,7 +5,7 @@ xkb_symbols "basic" { include "latin(type4)" - name[Group1]="Portugal"; + name[Group1]="Portuguese"; key { [ less, greater ] }; key { [ 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/symbols/us b/symbols/us index 871dfbd..cb94922 100644 --- a/symbols/us +++ b/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 { [ 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 { [ bracketleft, braceleft ] }; key { [ 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 { [ 1, exclam ] }; key { [ 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 { [ 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 { [ q, Q, Tab, Tab ] }; -- 2.32.0.93.g670b81a890