Index: incubator/apertium-kmr-eng/apertium-kmr-eng.kmr-eng.dix
===================================================================
--- incubator/apertium-kmr-eng/apertium-kmr-eng.kmr-eng.dix	(revision 70071)
+++ incubator/apertium-kmr-eng/apertium-kmr-eng.kmr-eng.dix	(revision 70073)
@@ -267,6 +267,26 @@
      <e><p><l>yekem<s n="num"/><s n="ord"/></l><r>first<s n="adj"/></r></p></e>
 
      <!-- SECTION: Nouns -->
+     <e><p><l>kod<s n="n"/><s n="f"/></l><r>code<s n="n"/></r></p></e>
+     <e><p><l>Windows<s n="n"/><s n="f"/></l><r>Windows<s n="n"/></r></p></e>
+     <e><p><l>form<s n="n"/><s n="f"/></l><r>form<s n="n"/></r></p></e>
+     <e><p><l>bajarok<s n="n"/><s n="m"/></l><r>town<s n="n"/></r></p></e>
+     <e><p><l>têgihiştin<s n="n"/><s n="f"/></l><r>understanding<s n="n"/></r></p></e>
+     <e><p><l>bijîşk<s n="n"/><s n="f"/></l><r>doctor<s n="n"/></r></p></e>
+     <e><p><l>bijîşk<s n="n"/><s n="m"/></l><r>doctor<s n="n"/></r></p></e>
+     <e><p><l>BZ<s n="n"/><s n="acr"/><s n="f"/></l><r>BZ<s n="n"/><s n="acr"/></r></p></e>
+     <e><p><l>bahs<s n="n"/><s n="f"/></l><r>discussion<s n="n"/></r></p></e>
+     <e><p><l>ketin<s n="n"/><s n="f"/></l><r>falling<s n="n"/></r></p></e>
+     <e><p><l>nexweşî<s n="n"/><s n="f"/></l><r>sickness<s n="n"/></r></p></e>
+     <e><p><l>piştgirî<s n="n"/><s n="f"/></l><r>cooperation<s n="n"/></r></p></e>
+     <e><p><l>agahî<s n="n"/><s n="f"/></l><r>information<s n="n"/></r></p></e>
+     <e><p><l>rêveberî<s n="n"/><s n="f"/></l><r>administration<s n="n"/></r></p></e>
+     <e><p><l>berhem<s n="n"/><s n="f"/></l><r>product<s n="n"/></r></p></e>
+     <e><p><l>derketin<s n="n"/><s n="f"/></l><r>emergence<s n="n"/></r></p></e>
+     <e><p><l>BR<s n="n"/><s n="acr"/><s n="f"/></l><r>BR<s n="n"/><s n="acr"/></r></p></e>
+     <e><p><l>desthilatdarî<s n="n"/><s n="f"/></l><r>government<s n="n"/></r></p></e>
+     <e><p><l>berfanbarê<s n="n"/><s n="f"/></l><r>december<s n="n"/></r></p></e>
+     <e><p><l>rezberê<s n="n"/><s n="f"/></l><r>september<s n="n"/></r></p></e>
      <e><p><l>derengî<s n="n"/><s n="f"/></l><r>lateness<s n="n"/></r></p></e>
      <e><p><l>pist<s n="n"/><s n="f"/></l><r>back<s n="n"/></r></p></e>
      <e><p><l>Mewlana<s n="n"/><s n="f"/></l><r>Molana<s n="n"/></r></p></e>
@@ -8959,6 +8979,8 @@
       <e><p><l>dîwan<s n="n"/><s n="f"/></l><r>anthology<s n="n"/></r></p></e> <!-- collected works-->
 
      <!-- SECTION: Proper nouns-->
+     <e><p><l>University<s n="np"/><s n="top"/><s n="f"/></l><r>University<s n="np"/><s n="top"/></r></p></e>
+     <e><p><l>San<s n="np"/><s n="ant"/><s n="m"/></l><r>San<s n="np"/><s n="ant"/></r></p></e>
      <e><p><l>Wetsin<s n="np"/><s n="ant"/><s n="m"/></l><r>Watson<s n="np"/><s n="ant"/></r></p></e>
      <e><p><l>Şerlok<s n="np"/><s n="ant"/><s n="m"/></l><r>Sherlock<s n="np"/><s n="ant"/><s n="m"/></r></p></e>
      <e><p><l>Rweylot<s n="np"/><s n="ant"/><s n="m"/></l><r>Roylott<s n="np"/><s n="ant"/></r></p></e>
@@ -9306,6 +9328,17 @@
       <e><p><l>Tîrêj<s n="np"/><s n="al"/><s n="f"/></l><r>Tîrêj<s n="np"/><s n="al"/></r></p></e>
 
      <!-- SECTION: Adjectives -->
+     <e><p><l>nivîsî<s n="adj"/></l><r>written<s n="adj"/></r></p></e>
+     <e><p><l>wenda<s n="adj"/></l><r>lost<s n="adj"/></r></p></e>
+     <e><p><l>navnetewî<s n="adj"/></l><r>international<s n="adj"/></r></p></e>
+     <e><p><l>tevahî<s n="adj"/></l><r>general<s n="adj"/></r></p></e>
+     <e><p><l>amadeyî<s n="adj"/></l><r>preparatory<s n="adj"/></r></p></e>
+     <e><p><l>birîndar<s n="adj"/></l><r>wounded<s n="adj"/></r></p></e>
+     <e><p><l>nivîskî<s n="adj"/></l><r>written<s n="adj"/></r></p></e>
+     <e><p><l>çandinî<s n="adj"/></l><r>agricultural<s n="adj"/></r></p></e>
+     <e><p><l>berfireh<s n="adj"/></l><r>detailed<s n="adj"/></r></p></e>
+     <e><p><l>berfireh<s n="adj"/></l><r>inclusive<s n="adj"/></r></p></e>
+     <e><p><l>hişk<s n="adj"/></l><r>hard<s n="adj"/></r></p></e>
      <e><p><l>ecêb<s n="adj"/></l><r>strange<s n="adj"/></r></p></e>
      <e><p><l>xwerû<s n="adj"/></l><r>original<s n="adj"/></r></p></e>
      <e><p><l>xwerû<s n="adj"/></l><r>pure<s n="adj"/></r></p></e>
@@ -12354,6 +12387,10 @@
       <e><p><l>zû<s n="adj"/></l><r>quick<s n="adj"/><s n="sint"/></r></p></e>
   
      <!-- SECTION: Adverbs -->
+     <e><p><l>seranser<s n="adv"/></l><r>entirely<s n="adv"/></r></p></e>
+     <e><p><l>carnan<s n="adv"/></l><r>sometimes<s n="adv"/></r></p></e>
+     <e><p><l>gellek<s n="adv"/></l><r>very<s n="adv"/></r></p></e>
+     <e><p><l>îroj<s n="adv"/></l><r>today<s n="adv"/></r></p></e>
      <e><p><l>ne<s n="adv"/><s n="neg"/></l><r>not<s n="adv"/></r></p></e>
 
      <e><p><l>heta<s n="adv"/></l><r>in<b/>fact<s n="adv"/></r></p></e>
Index: incubator/apertium-kmr-eng/apertium-kmr-eng.kmr-eng.t1x
===================================================================
--- incubator/apertium-kmr-eng/apertium-kmr-eng.kmr-eng.t1x	(revision 70071)
+++ incubator/apertium-kmr-eng/apertium-kmr-eng.kmr-eng.t1x	(revision 70073)
@@ -234,27 +234,29 @@
 
     <rule comment="REGLA: nom">
       <pattern>
-        <pattern-item n="nom"/>
+        <pattern-item n="nom-con-def"/>
       </pattern>
       <action>
-        <choose>
-          <when>
-            <test><equal><clip pos="1" side="tl" part="a_case"/><lit-tag v="nom"/></equal></test>
-                <let><clip pos="1" side="tl" part="a_func"/><lit-tag v="subj"/></let>
-                <let><clip pos="1" side="tl" part="a_case"/><lit v=""/></let>
-          </when>
-        </choose>
         <out>
-          <chunk name="pers" case="caseFirstWord">
+          <chunk name="det-nom-of" case="caseFirstWord">
             <tags>
               <tag><lit-tag v="SN"/></tag>
             </tags>
             <lu>
-              <clip pos="1" side="tl" part="lemh"/>
+	      <lit v="the"/><lit-tag v="det.def.sp"/>
+            </lu>
+            <b/>
+            <lu>
+              <get-case-from pos="2">
+                <clip pos="1" side="tl" part="lemh"/></get-case-from>
               <clip pos="1" side="tl" part="a_nom"/>
               <clip pos="1" side="tl" part="a_nbr"/>
               <clip pos="1" side="tl" part="lemq"/>
             </lu>
+      <b/>
+      <lu>
+	      <lit v="of"/><lit-tag v="pr"/>
+      </lu>
           </chunk>
         </out>
       </action>
@@ -261,37 +263,36 @@
     </rule>
 
 
-<!-- ^Nav<n><m><sg><con><def>$ ^ez<prn><pers><p1><mf><sg><obl>$-->
-
-    <rule comment="REGLA: nom-con-def">
+    <rule comment="REGLA: nom">
       <pattern>
-        <pattern-item n="nom-con-def"/>
+        <pattern-item n="nom"/>
       </pattern>
       <action>
+        <choose>
+          <when>
+            <test><equal><clip pos="1" side="tl" part="a_case"/><lit-tag v="nom"/></equal></test>
+                <let><clip pos="1" side="tl" part="a_func"/><lit-tag v="subj"/></let>
+                <let><clip pos="1" side="tl" part="a_case"/><lit v=""/></let>
+          </when>
+        </choose>
         <out>
-          <chunk name="det-nom-of" case="caseFirstWord">
+          <chunk name="n" case="caseFirstWord">
             <tags>
               <tag><lit-tag v="SN"/></tag>
             </tags>
             <lu>
-	      <lit v="the"/><lit-tag v="det.def.sp"/>
-            </lu>
-            <b/>
-            <lu>
-              <get-case-from pos="2">
-                <clip pos="1" side="tl" part="lemh"/></get-case-from>
+              <clip pos="1" side="tl" part="lemh"/>
               <clip pos="1" side="tl" part="a_nom"/>
               <clip pos="1" side="tl" part="a_nbr"/>
               <clip pos="1" side="tl" part="lemq"/>
       </lu>
-      <lu>
-	      <lit v="of"/><lit-tag v="pr"/>
-      </lu>
           </chunk>
         </out>
       </action>
     </rule>
 
+
+<!-- ^Nav<n><m><sg><con><def>$ ^ez<prn><pers><p1><mf><sg><obl>$-->
     <rule comment="REGLA: nom-con prn-obl">
       <pattern>
         <pattern-item n="nom-con"/>
Index: incubator/apertium-kmr/apertium-kmr.kmr.dix
===================================================================
--- incubator/apertium-kmr/apertium-kmr.kmr.dix	(revision 70071)
+++ incubator/apertium-kmr/apertium-kmr.kmr.dix	(revision 70073)
@@ -1327,6 +1327,14 @@
     <!-- SECTION: Nouns -->
 
     <!-- New Feminines -->
+    <e lm="kod"><i>kod</i><par n="jin__n_f"/></e>
+    <e lm="Windows"><i>Windows</i><par n="jin__n_f"/></e>
+    <e lm="bijîşk"><i>bijîşk</i><par n="jin__n_f"/></e>
+    <e lm="BZ"><i>BZ</i><par n="YNK__n"/></e>
+    <e lm="bahs"><i>bahs</i><par n="jin__n_f"/></e>
+    <e lm="BR"><i>BR</i><par n="YNK__n"/></e>
+    <e lm="berfanbarê"><i>berfanbar</i><par n ="od/e__n"/></e>
+    <e lm="rezberê"><i>rezber</i><par n ="od/e__n"/></e>
     <e lm="derengî"><i>dereng</i><par n="piran/î__n_f"/></e>
     <e lm="spêde"><i>spêd</i><par n ="spêd/e__n_f"/></e>
     <e lm="Mewlana"><i>Mewlan</i><par n ="nîvro__n_f"/></e>
@@ -1497,6 +1505,8 @@
 
     
     <!-- New Masculines -->
+    <e lm="bajarok"><i>bajarok</i><par n="mirov__n_m"/></e>
+    <e lm="bijîşk"><i>bijîşk</i><par n="mirov__n_m"/></e>
     <e lm="Mewlana"><i>Mewlan</i><par n ="çiy/a__n_m"/></e>
     <e lm="fîzîknas"><i>fîzîknas</i><par n="mirov__n_m"/></e>
     <e lm="dimilî"><i>dimil</i><par n="xan/î__n_m"/></e>
@@ -12672,6 +12682,8 @@
     <e lm="HDP"><i>HDP</i><par n="YNK__n"/></e>
 
     <!-- SECTION: Proper nouns -->
+    <e lm="University"><i>University</i><par n="Kurdistan__np"/></e>
+    <e lm="San"><i>San</i><par n="Salih__np"/></e>
     <e lm="Wetsin"><i>Wetsin</i><par n="Salih__np"/></e>
     <e lm="Şerlok"><i>Şerlok</i><par n="Salih__np"/></e>
     <e lm="Rweylot"><i>Rweylot</i><par n="Salih__np"/></e>
@@ -13047,6 +13059,14 @@
     <!-- SECTION: Adjectives -->
 
     <!-- new comparables -->
+    <e lm="nivîsî"><i>nivîsî</i><par n="nû__adj"/></e>
+    <e lm="wenda"><i>wenda</i><par n="nû__adj"/></e>
+    <e lm="navnetewî"><i>navnetewî</i><par n="nû__adj"/></e>
+    <e lm="tevahî"><i>tevahî</i><par n="nû__adj"/></e>
+    <e lm="amadeyî"><i>amadeyî</i><par n="nû__adj"/></e>
+    <e lm="birîndar"><i>birîndar</i><par n="nû__adj"/></e>
+    <e lm="çandinî"><i>çandinî</i><par n="nû__adj"/></e>
+    <e lm="hişk"><i>hişk</i><par n="nû__adj"/></e>
     <e lm="ecêb"><i>ecêb</i><par n="nû__adj"/></e>
     <e lm="xwerû"><i>xwerû</i><par n="nû__adj"/></e>
     <e lm="sipî"><i>sipî</i><par n="nû__adj"/></e>
@@ -13128,6 +13148,7 @@
     <e lm="pirr"><i>pirr</i><par n="nû__adj"/></e>
     
     <!-- new non-comparables -->
+    <e lm="nivîskî"><i>nivîskî</i><par n="kurdî__adj"/></e>
     <e lm="zewicî"><i>zewicî</i><par n="kurdî__adj"/></e>
     <e lm="duwem"><i>duwem</i><par n="kurdî__adj"/></e>
     <e lm="Kurdistanî"><i>Kurdistanî</i><par n="kurdî__adj"/></e>
@@ -13202,6 +13223,10 @@
     <e lm="rewa"><i>rewa</i><par n="kurdî__adj"/></e>
 
     <!-- SECTION: Adverb entries -->
+    <e lm="seranser"><i>seranser</i><par n="niha__adv"/></e>
+    <e lm="carnan"><i>carnan</i><par n="niha__adv"/></e>
+    <e lm="gellek"><i>gellek</i><par n="niha__adv"/></e>
+    <e lm="îroj"><i>îroj</i><par n="niha__adv"/></e>
     <e lm="heta"><i>heta</i><par n="niha__adv"/></e>
     <e lm="bêguman"><i>bêguman</i><par n="niha__adv"/></e>
     <e lm="lêbelê"><i>lêbelê</i><par n="niha__adv"/></e>
@@ -13511,6 +13536,7 @@
     
     <!-- axaftin; ; axaft; axiv -->
     <e lm="axaftin"><p><l>axaft</l><r>axaftin</r></p><par n="axaft/__vblex_iv"/></e>
+    <e lm="axaftin"><p><l>diaxaft</l><r>axaftin</r></p><par n="diaxaft/__vblex_iv"/></e>
     <e lm="axaftin"><p><l>diaxiv</l><r>axaftin</r></p><par n="diaxiv/e__vblex_iv"/></e>
     <e lm="axaftin"><p><l>biaxiv</l><r>axaftin</r></p><par n="biaxiv/e__vblex_iv"/></e>
     <e lm="axaftin"><p><l>neaxaft</l><r>axaftin</r></p><par n="neaxaft/__vblex_iv"/></e>
@@ -13592,6 +13618,7 @@
     <!-- ketin type LVCs -->
     <!-- derketin; ; derket; der..kev -->
     <e lm="derketin"><p><l>derket</l><r>derketin</r></p><par n="kir/__vblex_tv"/></e>
+    <e lm="derketin"><p><l>derdiket</l><r>derketin</r></p><par n="dikir/__vblex_tv"/></e>
     <e lm="derketin"><p><l>derdikev</l><r>derketin</r></p><par n="dik/e__vblex_tv"/></e>
     <e lm="derketin"><p><l>derbikev</l><r>derketin</r></p><par n="bik/e__vblex_tv"/></e>
     <e lm="derketin"><p><l>derneket</l><r>derketin</r></p><par n="nekir/__vblex_tv"/></e>
@@ -13701,6 +13728,7 @@
 
     <!-- binavkirin; ; binavkir; binav..k -->
     <e lm="binavkirin"><p><l>binavkir</l><r>binavkirin</r></p><par n="kir/__vblex_tv"/></e>
+    <e lm="binavkirin"><p><l>binavdikir</l><r>binavkirin</r></p><par n="dikir/__vblex_tv"/></e>
     <e lm="binavkirin"><p><l>binavdik</l><r>binavkirin</r></p><par n="dik/e__vblex_tv"/></e>
     <e lm="binavkirin"><p><l>binavbik</l><r>binavkirin</r></p><par n="bik/e__vblex_tv"/></e>
     <e lm="binavkirin"><p><l>binavnekir</l><r>binavkirin</r></p><par n="nekir/__vblex_tv"/></e>