Updated group names for all a* files

7 files changed, 27 insertions, 28 deletions

diff --git a/symbols/ad b/symbols/ad
index 23e02d00..0b152017 100644
--- a/symbols/ad
+++ b/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/symbols/af b/symbols/af
index d7d866d3..c4355dd4 100644
--- a/symbols/af
+++ b/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/symbols/al b/symbols/al
index acb742e8..75e7f52d 100644
--- a/symbols/al
+++ b/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/symbols/am b/symbols/am
index 7efd4309..29931474 100644
--- a/symbols/am
+++ b/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/symbols/ara b/symbols/ara
index 9fe705f8..76e03b1d 100644
--- a/symbols/ara
+++ b/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/symbols/at b/symbols/at
index 8b79f67a..bd4ba988 100644
--- a/symbols/at
+++ b/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/symbols/az b/symbols/az
index 744b32de..3c399cf9 100644
--- a/symbols/az
+++ b/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         ] };