Added lv(dvorak), fixed some descriptions

https://bugs.freedesktop.org/show_bug.cgi?id=34935

2 files changed, 47 insertions, 9 deletions

diff --git a/rules/base.extras.xml.in b/rules/base.extras.xml.in
index b068589f..1118bec4 100644
--- a/rules/base.extras.xml.in
+++ b/rules/base.extras.xml.in
@@ -23,7 +23,7 @@
         <variant>
           <configItem>
             <name>ave</name>
-            <_description>Iran Avestan</_description>
+            <_description>Iran - Avestan</_description>
             <languageList><iso639Id>ave</iso639Id></languageList>
           </configItem>
         </variant>
@@ -31,6 +31,22 @@
     </layout>
     <layout>
       <configItem>
+        <name>lt</name>
+        <_shortDescription>Ltu</_shortDescription>
+        <_description>Lithuania</_description>
+        <languageList><iso639Id>lit</iso639Id></languageList>
+      </configItem>
+      <variantList>
+        <variant>
+          <configItem>
+            <name>dvorak</name>
+            <_description>Lithuania - Dvorak</_description>
+          </configItem>
+        </variant>
+      </variantList>
+    </layout>
+    <layout>
+      <configItem>
         <name>us</name>
         <_shortDescription>USA</_shortDescription>
         <_description>USA</_description>
@@ -40,26 +56,26 @@
         <variant>
           <configItem>
             <name>intl-unicode</name>
-            <_description>USA International (AltGr Unicode combining)</_description>
+            <_description>USA - International (AltGr Unicode combining)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>alt-intl-unicode</name>
-            <_description>USA International (AltGr Unicode combining, alternative)</_description>
+            <_description>USA - International (AltGr Unicode combining, alternative)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>ats</name>
-            <_description>USA Atsina</_description>
+            <_description>USA - Atsina</_description>
             <!-- No ISO code in ISO639-2, only draft ISO693-3 -->
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>crd</name>
-            <_description>USA Couer D'alene Salish</_description>
+            <_description>USA - Couer D'alene Salish</_description>
             <languageList><iso639Id>crd</iso639Id></languageList>
           </configItem>
         </variant>
@@ -76,7 +92,7 @@
         <variant>
           <configItem>
             <name>ergonomic</name>
-            <_description>Ergonomic Touchtype</_description>
+            <_description>Romania - Ergonomic Touchtype</_description>
           </configItem>
         </variant>
       </variantList>
@@ -84,7 +100,7 @@
     <layout>
       <configItem>
         <name>rs</name>
-        <_shortDescription>SRB</_shortDescription>
+        <_shortDescription>Srb</_shortDescription>
         <_description>Serbia</_description>
         <languageList><iso639Id>srp</iso639Id></languageList>
       </configItem>
@@ -92,7 +108,7 @@
         <variant>
           <configItem>
             <name>combiningkeys</name>
-            <_description>Serbia Combining accents instead of dead keys</_description>
+            <_description>Serbia - Combining accents instead of dead keys</_description>
           </configItem>
         </variant>
       </variantList>
@@ -107,7 +123,7 @@
         <variant>
           <configItem>
             <name>chu</name>
-            <description>Russia Church Slavonic</description>
+            <description>Russia - Church Slavonic</description>
             <languageList><iso639Id>chu</iso639Id></languageList>
           </configItem>
         </variant>
diff --git a/symbols/lt b/symbols/lt
index 3b6dc752..c19629f9 100644
--- a/symbols/lt
+++ b/symbols/lt
@@ -294,3 +294,25 @@ xkb_symbols "lekpa" {
     key <AB09> {[      aogonek,             Aogonek,       greater ]};
     key <AB10> {[            h,                   H                ]};
 };
+
+partial alphanumeric_keys modifier_keys
+xkb_symbols "dvorak" {
+
+    include "us(dvorak)"
+
+    name[Group1]="Lithuania - Dvorak";
+
+    key <AE01>	{ [   aogonek,      Aogonek,        1,      exclam ] };
+    key <AE02>	{ [    ccaron,       Ccaron,        2,          at ] };
+    key <AE03>	{ [   eogonek,      Eogonek,        3,  numbersign ] };
+    key <AE04>	{ [ eabovedot,    Eabovedot,        4,      dollar ] };
+    key <AE05>	{ [   iogonek,      Iogonek,        5,     percent ] };
+    key <AE06>	{ [    scaron,       Scaron,        6, asciicircum ] };
+    key <AE07>	{ [   uogonek,      Uogonek,        7,   ampersand ] };
+    key <AE08>	{ [   umacron,      Umacron,        8,    asterisk ] };
+    key <AE09>	{ [doublelowquotemark,  parenleft,  9,   parenleft ] };
+    key <AE10>	{ [leftdoublequotemark,parenright,  0,  parenright ] };
+    key <AD12>	{ [    zcaron,       Zcaron,    equal,        plus ] };
+
+    include "level3(ralt_switch)"
+};