clarify names and descriptions of tamil variants

3 files changed, 24 insertions, 24 deletions

diff --git a/rules/base.xml.in b/rules/base.xml.in
index 24ff8ee6..3608b60d 100644
--- a/rules/base.xml.in
+++ b/rules/base.xml.in
@@ -2039,10 +2039,10 @@
         </variant>
         <variant>
           <configItem>
-            <name>tam_unicode</name>
+            <name>tam_tamilnet</name>
             <!-- Keyboard indicator for Tamil layouts -->
             <_shortDescription>ta</_shortDescription>
-            <_description>Tamil (Unicode)</_description>
+            <_description>Tamil (TamilNet '99)</_description>
             <languageList>
               <iso639Id>tam</iso639Id>
             </languageList>
@@ -2050,10 +2050,10 @@
         </variant>
         <variant>
           <configItem>
-            <name>tam_keyboard_with_numerals</name>
+            <name>tam_tamilnet_with_tam_nums</name>
             <!-- Keyboard indicator for Tamil layouts -->
             <_shortDescription>ta</_shortDescription>
-            <_description>Tamil (keyboard with numerals)</_description>
+            <_description>Tamil (TamilNet '99 with Tamil numerals)</_description>
             <languageList>
               <iso639Id>tam</iso639Id>
             </languageList>
@@ -2061,10 +2061,10 @@
         </variant>
         <variant>
           <configItem>
-            <name>tam_TAB</name>
+            <name>tam_tamilnet_TAB</name>
             <!-- Keyboard indicator for Tamil layouts -->
             <_shortDescription>ta</_shortDescription>
-            <_description>Tamil (TAB typewriter)</_description>
+            <_description>Tamil (TamilNet '99, TAB encoding)</_description>
             <languageList>
               <iso639Id>tam</iso639Id>
             </languageList>
@@ -2072,10 +2072,10 @@
         </variant>
         <variant>
           <configItem>
-            <name>tam_TSCII</name>
+            <name>tam_tamilnet_TSCII</name>
             <!-- Keyboard indicator for Tamil layouts -->
             <_shortDescription>ta</_shortDescription>
-            <_description>Tamil (TSCII typewriter)</_description>
+            <_description>Tamil (TamilNet '99, TSCII encoding)</_description>
             <languageList>
               <iso639Id>tam</iso639Id>
             </languageList>
@@ -2086,7 +2086,7 @@
             <name>tam</name>
             <!-- Keyboard indicator for Tamil layouts -->
             <_shortDescription>ta</_shortDescription>
-            <_description>Tamil</_description>
+            <_description>Tamil (Inscript)</_description>
             <languageList>
               <iso639Id>tam</iso639Id>
             </languageList>
@@ -5130,7 +5130,7 @@
             <name>tam_unicode</name>
             <!-- Keyboard indicator for Tamil layouts -->
             <_shortDescription>ta</_shortDescription>
-            <_description>Tamil (Sri Lanka, Unicode)</_description>
+            <_description>Tamil (Sri Lanka, TamilNet '99)</_description>
             <languageList>
               <iso639Id>tam</iso639Id>
             </languageList>
@@ -5139,7 +5139,7 @@
         <variant>
           <configItem>
             <name>tam_TAB</name>
-            <_description>Tamil (Sri Lanka, TAB Typewriter)</_description>
+            <_description>Tamil (Sri Lanka, TamilNet '99, TAB encoding)</_description>
             <languageList>
               <iso639Id>tam</iso639Id>
             </languageList>
diff --git a/symbols/in b/symbols/in
index 79d5099b..4f46e56b 100644
--- a/symbols/in
+++ b/symbols/in
@@ -1053,7 +1053,7 @@ xkb_symbols "ori" {
 // INSCRIPT
 partial alphanumeric_keys
 xkb_symbols "tam" {
-      name[Group1]= "Tamil";
+      name[Group1]= "Tamil (Inscript)";
 
       key <TLDE> { [      U0BCA, U0B92	]	};
 
@@ -1118,7 +1118,7 @@ xkb_symbols "tam" {
 };
 
 partial alphanumeric_keys
-xkb_symbols "tam_unicode" {
+xkb_symbols "tam_tamilnet" {
 
 // Description: A keymap based on the TamilNet'99 typewriter keyboard 
 // Encoding: Unicode (http://www.unicode.org)
@@ -1128,7 +1128,7 @@ xkb_symbols "tam_unicode" {
 // Date  : Fri Sep 4 11:32:00 CST 2009
 // Mapping:
 
-    name[Group1]= "Tamil (Unicode)";
+    name[Group1]= "Tamil (TamilNet '99)";
 
     // granthas
     key <TLDE> {  [ apostrophe, asciitilde ] };
@@ -1184,7 +1184,7 @@ xkb_symbols "tam_unicode" {
 };
 
 partial alphanumeric_keys
-xkb_symbols "tam_keyboard_with_numerals" {
+xkb_symbols "tam_tamilnet_with_tam_nums" {
 
 // Description: A keymap based on the TamilNet'99 typewriter keyboard 
 // Encoding: Unicode (http://www.unicode.org)
@@ -1193,7 +1193,7 @@ xkb_symbols "tam_keyboard_with_numerals" {
 // Date  : Fri Sep 4 11:33:00 CST 2009
 // Mapping:
 
-      name[Group1]= "Tamil (keyboard with numerals)";
+      name[Group1]= "Tamil (TamilNet '99 with Tamil numerals)";
 
       // Mainly numbers.
       key <TLDE> { [ apostrophe, asciitilde ] };
@@ -1249,7 +1249,7 @@ xkb_symbols "tam_keyboard_with_numerals" {
 };
 
 partial alphanumeric_keys
-xkb_symbols "tam_TSCII" {
+xkb_symbols "tam_tamilnet_TSCII" {
 
 // Description	: A Tamil typewrite-style keymap 
 //		  loosely based on TamilNet'99 reommendations 
@@ -1257,7 +1257,7 @@ xkb_symbols "tam_TSCII" {
 // Author	: Thuraiappah Vaseeharan <vasee@ieee.org>
 // Last Modified: Sat Jan  5 17:11:26 CST 2002
 
-    name[Group1]= "Tamil (TSCII typewriter)";
+    name[Group1]= "Tamil (TamilNet '99, TSCII encoding)";
 
     key <AE01> {  [ 0x10000b7, 0x10000a4 ] }; // aytham
     key <AE02> {  [ 0x1000082, 0x10000a5 ] }; // shri
@@ -1305,14 +1305,14 @@ xkb_symbols "tam_TSCII" {
 };
 
 partial alphanumeric_keys
-xkb_symbols "tam_TAB" {
+xkb_symbols "tam_tamilnet_TAB" {
 
 // Description: A keymap based on the TamilNet'99 typewriter keyboard 
 // Encoding: TAB (http://www.tamilnet99.org)
 // Author: Thuraiappah Vaseeharan <t_vasee@yahoo.com>
 // Date  : Sun Aug 12 02:23:00 CDT 2001
 
-    name[Group1]= "Tamil (TAB typewriter)";
+    name[Group1]= "Tamil (TamilNet '99, TAB encoding)";
 
     // numeral row
     key <AE01> {  [ 0x10000e7, 0x10000a7 ] } ;
diff --git a/symbols/lk b/symbols/lk
index 88b6aad4..1a85f3de 100644
--- a/symbols/lk
+++ b/symbols/lk
@@ -78,14 +78,14 @@ xkb_symbols "sin_phonetic" {
 
 partial alphanumeric_keys
 xkb_symbols "tam_unicode" {
-    include "in(tam_unicode)"
-    name[Group1]= "Tamil (Sri Lanka, Unicode)";
+    include "in(tam_tamilnet)"
+    name[Group1]= "Tamil (Sri Lanka, TamilNet '99)";
 };
 
 partial alphanumeric_keys
 xkb_symbols "tam_TAB" {
-    include "in(tam_TAB)"
-    name[Group1]= "Tamil (Sri Lanka, TAB Typewriter)";
+    include "in(tam_tamilnet_TAB)"
+    name[Group1]= "Tamil (Sri Lanka, TamilNet '99, TAB encoding)";
 };
 
 // SINHALA - US, SUBSTITUTES SOME AND ADDS SOME