[sword-svn] r212 - in trunk/source/data: . coll misc rbnf xml/collation xml/main

chrislit at crosswire.org chrislit at crosswire.org
Thu Jul 2 12:28:40 MST 2009


Author: chrislit
Date: 2009-07-02 12:28:39 -0700 (Thu, 02 Jul 2009)
New Revision: 212

Modified:
   trunk/source/data/coll/af.txt
   trunk/source/data/coll/ar.txt
   trunk/source/data/coll/as.txt
   trunk/source/data/coll/az.txt
   trunk/source/data/coll/be.txt
   trunk/source/data/coll/bg.txt
   trunk/source/data/coll/bn.txt
   trunk/source/data/coll/bn_IN.txt
   trunk/source/data/coll/ca.txt
   trunk/source/data/coll/cs.txt
   trunk/source/data/coll/cy.txt
   trunk/source/data/coll/da.txt
   trunk/source/data/coll/de.txt
   trunk/source/data/coll/el.txt
   trunk/source/data/coll/en.txt
   trunk/source/data/coll/en_BE.txt
   trunk/source/data/coll/eo.txt
   trunk/source/data/coll/es.txt
   trunk/source/data/coll/et.txt
   trunk/source/data/coll/fa.txt
   trunk/source/data/coll/fa_AF.txt
   trunk/source/data/coll/fi.txt
   trunk/source/data/coll/fo.txt
   trunk/source/data/coll/fr.txt
   trunk/source/data/coll/gu.txt
   trunk/source/data/coll/haw.txt
   trunk/source/data/coll/he.txt
   trunk/source/data/coll/hi.txt
   trunk/source/data/coll/hr.txt
   trunk/source/data/coll/hu.txt
   trunk/source/data/coll/is.txt
   trunk/source/data/coll/it.txt
   trunk/source/data/coll/ja.txt
   trunk/source/data/coll/kk.txt
   trunk/source/data/coll/kl.txt
   trunk/source/data/coll/km.txt
   trunk/source/data/coll/kn.txt
   trunk/source/data/coll/ko.txt
   trunk/source/data/coll/kok.txt
   trunk/source/data/coll/lt.txt
   trunk/source/data/coll/lv.txt
   trunk/source/data/coll/mk.txt
   trunk/source/data/coll/ml.txt
   trunk/source/data/coll/mr.txt
   trunk/source/data/coll/mt.txt
   trunk/source/data/coll/nb.txt
   trunk/source/data/coll/nn.txt
   trunk/source/data/coll/om.txt
   trunk/source/data/coll/or.txt
   trunk/source/data/coll/pa.txt
   trunk/source/data/coll/pl.txt
   trunk/source/data/coll/ps.txt
   trunk/source/data/coll/ro.txt
   trunk/source/data/coll/root.txt
   trunk/source/data/coll/ru.txt
   trunk/source/data/coll/si.txt
   trunk/source/data/coll/sk.txt
   trunk/source/data/coll/sl.txt
   trunk/source/data/coll/sq.txt
   trunk/source/data/coll/sr.txt
   trunk/source/data/coll/sr_Latn.txt
   trunk/source/data/coll/sv.txt
   trunk/source/data/coll/ta.txt
   trunk/source/data/coll/te.txt
   trunk/source/data/coll/th.txt
   trunk/source/data/coll/tr.txt
   trunk/source/data/coll/uk.txt
   trunk/source/data/coll/ur.txt
   trunk/source/data/coll/vi.txt
   trunk/source/data/coll/zh.txt
   trunk/source/data/coll/zh_Hant.txt
   trunk/source/data/misc/metazoneInfo.txt
   trunk/source/data/misc/numberingSystems.txt
   trunk/source/data/misc/supplementalData.txt
   trunk/source/data/misc/zoneinfo.txt
   trunk/source/data/pkgdataMakefile.in
   trunk/source/data/rbnf/af.txt
   trunk/source/data/rbnf/am.txt
   trunk/source/data/rbnf/ar.txt
   trunk/source/data/rbnf/az.txt
   trunk/source/data/rbnf/be.txt
   trunk/source/data/rbnf/bg.txt
   trunk/source/data/rbnf/ca.txt
   trunk/source/data/rbnf/cs.txt
   trunk/source/data/rbnf/cy.txt
   trunk/source/data/rbnf/da.txt
   trunk/source/data/rbnf/de.txt
   trunk/source/data/rbnf/el.txt
   trunk/source/data/rbnf/en.txt
   trunk/source/data/rbnf/eo.txt
   trunk/source/data/rbnf/es.txt
   trunk/source/data/rbnf/et.txt
   trunk/source/data/rbnf/fa.txt
   trunk/source/data/rbnf/fa_AF.txt
   trunk/source/data/rbnf/fi.txt
   trunk/source/data/rbnf/fo.txt
   trunk/source/data/rbnf/fr.txt
   trunk/source/data/rbnf/fr_BE.txt
   trunk/source/data/rbnf/fr_CH.txt
   trunk/source/data/rbnf/ga.txt
   trunk/source/data/rbnf/he.txt
   trunk/source/data/rbnf/hi.txt
   trunk/source/data/rbnf/hr.txt
   trunk/source/data/rbnf/hu.txt
   trunk/source/data/rbnf/hy.txt
   trunk/source/data/rbnf/id.txt
   trunk/source/data/rbnf/is.txt
   trunk/source/data/rbnf/it.txt
   trunk/source/data/rbnf/ja.txt
   trunk/source/data/rbnf/ka.txt
   trunk/source/data/rbnf/kl.txt
   trunk/source/data/rbnf/ko.txt
   trunk/source/data/rbnf/lt.txt
   trunk/source/data/rbnf/lv.txt
   trunk/source/data/rbnf/mk.txt
   trunk/source/data/rbnf/ms.txt
   trunk/source/data/rbnf/mt.txt
   trunk/source/data/rbnf/nb.txt
   trunk/source/data/rbnf/nl.txt
   trunk/source/data/rbnf/nn.txt
   trunk/source/data/rbnf/pl.txt
   trunk/source/data/rbnf/pt.txt
   trunk/source/data/rbnf/pt_PT.txt
   trunk/source/data/rbnf/ro.txt
   trunk/source/data/rbnf/root.txt
   trunk/source/data/rbnf/ru.txt
   trunk/source/data/rbnf/sk.txt
   trunk/source/data/rbnf/sl.txt
   trunk/source/data/rbnf/sq.txt
   trunk/source/data/rbnf/sr.txt
   trunk/source/data/rbnf/sr_Latn.txt
   trunk/source/data/rbnf/sv.txt
   trunk/source/data/rbnf/ta.txt
   trunk/source/data/rbnf/th.txt
   trunk/source/data/rbnf/tr.txt
   trunk/source/data/rbnf/uk.txt
   trunk/source/data/rbnf/vi.txt
   trunk/source/data/rbnf/zh.txt
   trunk/source/data/rbnf/zh_Hant.txt
   trunk/source/data/xml/collation/bn_IN.xml
   trunk/source/data/xml/collation/ur.xml
   trunk/source/data/xml/main/ha.xml
   trunk/source/data/xml/main/ha_Latn.xml
   trunk/source/data/xml/main/in.xml
   trunk/source/data/xml/main/kk_Cyrl.xml
   trunk/source/data/xml/main/ne.xml
   trunk/source/data/xml/main/pa_Arab.xml
   trunk/source/data/xml/main/pa_PK.xml
   trunk/source/data/xml/main/si.xml
   trunk/source/data/xml/main/zu.xml
Log:
ICU 4.2.1 update, fourth pass


Modified: trunk/source/data/coll/af.txt
===================================================================
--- trunk/source/data/coll/af.txt	2009-07-02 19:27:40 UTC (rev 211)
+++ trunk/source/data/coll/af.txt	2009-07-02 19:28:39 UTC (rev 212)
@@ -10,11 +10,11 @@
  *  ICU <specials> source: <path>/xml/collation/af.xml
  */
 af{
-    Version{"1.1"}
+    Version{"1.2"}
     collations{
         standard{
             Sequence{"&N<<<ʼn"}
-            Version{"1.6"}
+            Version{"1.7"}
         }
     }
 }

Modified: trunk/source/data/coll/ar.txt
===================================================================
--- trunk/source/data/coll/ar.txt	2009-07-02 19:27:40 UTC (rev 211)
+++ trunk/source/data/coll/ar.txt	2009-07-02 19:28:39 UTC (rev 212)
@@ -10,11 +10,11 @@
  *  ICU <specials> source: <path>/xml/collation/ar.xml
  */
 ar{
-    Version{"1.23"}
+    Version{"1.24"}
     collations{
         standard{
             Sequence{"&ة=ت"}
-            Version{"1.6"}
+            Version{"1.7"}
         }
     }
 }

Modified: trunk/source/data/coll/as.txt
===================================================================
--- trunk/source/data/coll/as.txt	2009-07-02 19:27:40 UTC (rev 211)
+++ trunk/source/data/coll/as.txt	2009-07-02 19:28:39 UTC (rev 212)
@@ -10,11 +10,11 @@
  *  ICU <specials> source: <path>/xml/collation/as.xml
  */
 as{
-    Version{"1.4"}
+    Version{"1.5"}
     collations{
         standard{
             Sequence{" [normalization on ]&ঔ<ং<ঁ<ঃ&[before 1]ত<ত্'\u200D'&হ<ক্ষ"}
-            Version{"1.6"}
+            Version{"1.7"}
         }
     }
 }

Modified: trunk/source/data/coll/az.txt
===================================================================
--- trunk/source/data/coll/az.txt	2009-07-02 19:27:40 UTC (rev 211)
+++ trunk/source/data/coll/az.txt	2009-07-02 19:28:39 UTC (rev 212)
@@ -10,7 +10,7 @@
  *  ICU <specials> source: <path>/xml/collation/az.xml
  */
 az{
-    Version{"1.2"}
+    Version{"1.3"}
     collations{
         standard{
             Sequence{
@@ -25,7 +25,7 @@
                 "&E<ə<<<Ə"
                 "&H<x<<<X"
             }
-            Version{"1.6"}
+            Version{"1.7"}
         }
     }
 }

Modified: trunk/source/data/coll/be.txt
===================================================================
--- trunk/source/data/coll/be.txt	2009-07-02 19:27:40 UTC (rev 211)
+++ trunk/source/data/coll/be.txt	2009-07-02 19:28:39 UTC (rev 212)
@@ -10,6 +10,6 @@
  *  ICU <specials> source: <path>/xml/collation/be.xml
  */
 be{
-    Version{"1.19"}
+    Version{"1.20"}
     collations:alias{"ru/collations"}
 }

Modified: trunk/source/data/coll/bg.txt
===================================================================
--- trunk/source/data/coll/bg.txt	2009-07-02 19:27:40 UTC (rev 211)
+++ trunk/source/data/coll/bg.txt	2009-07-02 19:28:39 UTC (rev 212)
@@ -10,6 +10,6 @@
  *  ICU <specials> source: <path>/xml/collation/bg.xml
  */
 bg{
-    Version{"1.19"}
+    Version{"1.20"}
     collations:alias{"ru/collations"}
 }

Modified: trunk/source/data/coll/bn.txt
===================================================================
--- trunk/source/data/coll/bn.txt	2009-07-02 19:27:40 UTC (rev 211)
+++ trunk/source/data/coll/bn.txt	2009-07-02 19:28:39 UTC (rev 212)
@@ -10,5 +10,5 @@
  *  ICU <specials> source: <path>/xml/collation/bn.xml
  */
 bn{
-    Version{"1.6"}
+    Version{"1.7"}
 }

Modified: trunk/source/data/coll/bn_IN.txt
===================================================================
--- trunk/source/data/coll/bn_IN.txt	2009-07-02 19:27:40 UTC (rev 211)
+++ trunk/source/data/coll/bn_IN.txt	2009-07-02 19:28:39 UTC (rev 212)
@@ -10,5 +10,5 @@
  *  ICU <specials> source: <path>/xml/collation/bn_IN.xml
  */
 bn_IN{
-    Version{"1.2"}
+    Version{"1.3"}
 }

Modified: trunk/source/data/coll/ca.txt
===================================================================
--- trunk/source/data/coll/ca.txt	2009-07-02 19:27:40 UTC (rev 211)
+++ trunk/source/data/coll/ca.txt	2009-07-02 19:28:39 UTC (rev 212)
@@ -10,11 +10,11 @@
  *  ICU <specials> source: <path>/xml/collation/ca.xml
  */
 ca{
-    Version{"1.25"}
+    Version{"1.26"}
     collations{
         standard{
             Sequence{" [backwards 2]&C<ch<<<Ch<<<CH&L<ll<<<l·l<<<Ll<<<L·l<<<LL<<<L·L"}
-            Version{"1.6"}
+            Version{"1.7"}
         }
     }
 }

Modified: trunk/source/data/coll/cs.txt
===================================================================
--- trunk/source/data/coll/cs.txt	2009-07-02 19:27:40 UTC (rev 211)
+++ trunk/source/data/coll/cs.txt	2009-07-02 19:28:39 UTC (rev 212)
@@ -10,11 +10,11 @@
  *  ICU <specials> source: <path>/xml/collation/cs.xml
  */
 cs{
-    Version{"1.25"}
+    Version{"1.26"}
     collations{
         standard{
             Sequence{"&C<č<<<Č&H<ch<<<cH<<<Ch<<<CH&R<ř<<<Ř&S<š<<<Š&Z<ž<<<Ž"}
-            Version{"1.6"}
+            Version{"1.7"}
         }
     }
 }

Modified: trunk/source/data/coll/cy.txt
===================================================================
--- trunk/source/data/coll/cy.txt	2009-07-02 19:27:40 UTC (rev 211)
+++ trunk/source/data/coll/cy.txt	2009-07-02 19:28:39 UTC (rev 212)
@@ -10,5 +10,5 @@
  *  ICU <specials> source: <path>/xml/collation/cy.xml
  */
 cy{
-    Version{"1.3"}
+    Version{"1.4"}
 }

Modified: trunk/source/data/coll/da.txt
===================================================================
--- trunk/source/data/coll/da.txt	2009-07-02 19:27:40 UTC (rev 211)
+++ trunk/source/data/coll/da.txt	2009-07-02 19:28:39 UTC (rev 212)
@@ -10,7 +10,7 @@
  *  ICU <specials> source: <path>/xml/collation/da.xml
  */
 da{
-    Version{"1.24"}
+    Version{"1.25"}
     collations{
         standard{
             Sequence{
@@ -22,7 +22,7 @@
                 "&[before 1]ʒ<æ<<<Æ<<ä<<<Ä<<ę<<<Ę<ø<<<Ø<<ö<<<Ö<<ő<<<Ő<<œ<<<Œ<å<<<Å<<<"
                 "aa<<<Aa<<<AA"
             }
-            Version{"1.6"}
+            Version{"1.7"}
         }
     }
 }

Modified: trunk/source/data/coll/de.txt
===================================================================
--- trunk/source/data/coll/de.txt	2009-07-02 19:27:40 UTC (rev 211)
+++ trunk/source/data/coll/de.txt	2009-07-02 19:28:39 UTC (rev 212)
@@ -10,15 +10,15 @@
  *  ICU <specials> source: <path>/xml/collation/de.xml
  */
 de{
-    Version{"1.25"}
+    Version{"1.26"}
     collations{
         phonebook{
             Sequence{"&a<<æ/e<<ä/e&A<<Æ/E<<Ä/E&œ<<ö/e&Œ<<Ö/E&u<<ü/e&U<<Ü/E"}
-            Version{"1.6"}
+            Version{"1.7"}
         }
         standard{
             Sequence{"&ae<<æ<<<Æ"}
-            Version{"1.6"}
+            Version{"1.7"}
         }
     }
 }

Modified: trunk/source/data/coll/el.txt
===================================================================
--- trunk/source/data/coll/el.txt	2009-07-02 19:27:40 UTC (rev 211)
+++ trunk/source/data/coll/el.txt	2009-07-02 19:28:39 UTC (rev 212)
@@ -10,11 +10,11 @@
  *  ICU <specials> source: <path>/xml/collation/el.xml
  */
 el{
-    Version{"1.23"}
+    Version{"1.24"}
     collations{
         standard{
             Sequence{" [normalization on ]"}
-            Version{"1.6"}
+            Version{"1.7"}
         }
     }
 }

Modified: trunk/source/data/coll/en.txt
===================================================================
--- trunk/source/data/coll/en.txt	2009-07-02 19:27:40 UTC (rev 211)
+++ trunk/source/data/coll/en.txt	2009-07-02 19:28:39 UTC (rev 212)
@@ -10,11 +10,11 @@
  *  ICU <specials> source: <path>/xml/collation/en.xml
  */
 en{
-    Version{"1.23"}
+    Version{"1.24"}
     collations{
         standard{
             Sequence{"&ae<<æ<<<Æ"}
-            Version{"1.6"}
+            Version{"1.7"}
         }
     }
 }

Modified: trunk/source/data/coll/en_BE.txt
===================================================================
--- trunk/source/data/coll/en_BE.txt	2009-07-02 19:27:40 UTC (rev 211)
+++ trunk/source/data/coll/en_BE.txt	2009-07-02 19:28:39 UTC (rev 212)
@@ -10,11 +10,11 @@
  *  ICU <specials> source: <path>/xml/collation/en_BE.xml
  */
 en_BE{
-    Version{"1.22"}
+    Version{"1.23"}
     collations{
         standard{
             Sequence{" [backwards 2]"}
-            Version{"1.6"}
+            Version{"1.7"}
         }
     }
 }

Modified: trunk/source/data/coll/eo.txt
===================================================================
--- trunk/source/data/coll/eo.txt	2009-07-02 19:27:40 UTC (rev 211)
+++ trunk/source/data/coll/eo.txt	2009-07-02 19:28:39 UTC (rev 212)
@@ -10,11 +10,11 @@
  *  ICU <specials> source: <path>/xml/collation/eo.xml
  */
 eo{
-    Version{"1.21"}
+    Version{"1.22"}
     collations{
         standard{
             Sequence{"&C<ĉ<<<Ĉ&G<ĝ<<<Ĝ&H<ĥ<<<Ĥ&J<ĵ<<<Ĵ&S<ŝ<<<Ŝ&U<ŭ<<<Ŭ"}
-            Version{"1.6"}
+            Version{"1.7"}
         }
     }
 }

Modified: trunk/source/data/coll/es.txt
===================================================================
--- trunk/source/data/coll/es.txt	2009-07-02 19:27:40 UTC (rev 211)
+++ trunk/source/data/coll/es.txt	2009-07-02 19:28:39 UTC (rev 212)
@@ -10,15 +10,15 @@
  *  ICU <specials> source: <path>/xml/collation/es.xml
  */
 es{
-    Version{"1.25"}
+    Version{"1.26"}
     collations{
         standard{
             Sequence{"&N<ñ<<<Ñ&ae<<æ<<<Æ"}
-            Version{"1.6"}
+            Version{"1.7"}
         }
         traditional{
             Sequence{"&N<ñ<<<Ñ&C<ch<<<Ch<<<CH&l<ll<<<Ll<<<LL"}
-            Version{"1.6"}
+            Version{"1.7"}
         }
     }
 }

Modified: trunk/source/data/coll/et.txt
===================================================================
--- trunk/source/data/coll/et.txt	2009-07-02 19:27:40 UTC (rev 211)
+++ trunk/source/data/coll/et.txt	2009-07-02 19:28:39 UTC (rev 212)
@@ -10,7 +10,7 @@
  *  ICU <specials> source: <path>/xml/collation/et.xml
  */
 et{
-    Version{"1.22"}
+    Version{"1.23"}
     collations{
         standard{
             Sequence{
@@ -18,7 +18,7 @@
                 "&v<<w<<<W"
                 "&[before 1]X<õ<<<Õ<ä<<<Ä<ö<<<Ö<ü<<<Ü"
             }
-            Version{"1.6"}
+            Version{"1.7"}
         }
     }
 }

Modified: trunk/source/data/coll/fa.txt
===================================================================
--- trunk/source/data/coll/fa.txt	2009-07-02 19:27:40 UTC (rev 211)
+++ trunk/source/data/coll/fa.txt	2009-07-02 19:28:39 UTC (rev 212)
@@ -10,7 +10,7 @@
  *  ICU <specials> source: <path>/xml/collation/fa.xml
  */
 fa{
-    Version{"1.23"}
+    Version{"1.24"}
     collations{
         standard{
             Sequence{
@@ -22,7 +22,7 @@
                 "&ۏ<ه<<ە<<ہ<<ة<<ۃ<<ۀ<<ھ"
                 "&ی<<ى<<ے<<ي<<ې<<ۑ<<ۍ<<ێ"
             }
-            Version{"1.6"}
+            Version{"1.7"}
         }
     }
 }

Modified: trunk/source/data/coll/fa_AF.txt
===================================================================
--- trunk/source/data/coll/fa_AF.txt	2009-07-02 19:27:40 UTC (rev 211)
+++ trunk/source/data/coll/fa_AF.txt	2009-07-02 19:28:39 UTC (rev 212)
@@ -10,6 +10,6 @@
  *  ICU <specials> source: <path>/xml/collation/fa_AF.xml
  */
 fa_AF{
-    Version{"1.18"}
+    Version{"1.19"}
     collations:alias{"ps/collations"}
 }

Modified: trunk/source/data/coll/fi.txt
===================================================================
--- trunk/source/data/coll/fi.txt	2009-07-02 19:27:40 UTC (rev 211)
+++ trunk/source/data/coll/fi.txt	2009-07-02 19:28:39 UTC (rev 212)
@@ -10,7 +10,7 @@
  *  ICU <specials> source: <path>/xml/collation/fi.xml
  */
 fi{
-    Version{"1.27"}
+    Version{"1.28"}
     collations{
         default{"phonebook"}
         phonebook{
@@ -23,7 +23,7 @@
                 "&Z'\u0020'̵<<ʒ<<<Ʒ"
                 "&ʑ<å<<<Å<ä<<<Ä<<æ<<<Æ<ö<<<Ö<<ø<<<Ø"
             }
-            Version{"1.6"}
+            Version{"1.7"}
         }
         standard{
             Sequence{
@@ -34,7 +34,7 @@
                 "&Y<<ü<<<Ü<<ű<<<Ű"
                 "&[before 1]ʒ<å<<<Å<ä<<<Ä<<æ<<<Æ<ö<<<Ö<<ø<<<Ø<<ő<<<Ő<<õ<<<Õ<<œ<<<Œ"
             }
-            Version{"1.6"}
+            Version{"1.7"}
         }
     }
 }

Modified: trunk/source/data/coll/fo.txt
===================================================================
--- trunk/source/data/coll/fo.txt	2009-07-02 19:27:40 UTC (rev 211)
+++ trunk/source/data/coll/fo.txt	2009-07-02 19:28:39 UTC (rev 212)
@@ -10,7 +10,7 @@
  *  ICU <specials> source: <path>/xml/collation/fo.xml
  */
 fo{
-    Version{"1.24"}
+    Version{"1.25"}
     collations{
         standard{
             Sequence{
@@ -21,7 +21,7 @@
                 "&[before 1]ʒ<æ<<<Æ<<ä<<<Ä<<ę<<<Ę<ø<<<Ø<<ö<<<Ö<<ő<<<Ő<<œ<<<Œ<å<<<Å<<<"
                 "aa<<<Aa<<<AA"
             }
-            Version{"1.6"}
+            Version{"1.7"}
         }
     }
 }

Modified: trunk/source/data/coll/fr.txt
===================================================================
--- trunk/source/data/coll/fr.txt	2009-07-02 19:27:40 UTC (rev 211)
+++ trunk/source/data/coll/fr.txt	2009-07-02 19:28:39 UTC (rev 212)
@@ -10,11 +10,11 @@
  *  ICU <specials> source: <path>/xml/collation/fr.xml
  */
 fr{
-    Version{"1.23"}
+    Version{"1.24"}
     collations{
         standard{
             Sequence{" [backwards 2]&ae<<æ<<<Æ"}
-            Version{"1.6"}
+            Version{"1.7"}
         }
     }
 }

Modified: trunk/source/data/coll/gu.txt
===================================================================
--- trunk/source/data/coll/gu.txt	2009-07-02 19:27:40 UTC (rev 211)
+++ trunk/source/data/coll/gu.txt	2009-07-02 19:28:39 UTC (rev 212)
@@ -10,11 +10,11 @@
  *  ICU <specials> source: <path>/xml/collation/gu.xml
  */
 gu{
-    Version{"1.25"}
+    Version{"1.26"}
     collations{
         standard{
             Sequence{" [normalization on ]&હ<઼<ઁ<ં<ઃ&ઽ<્"}
-            Version{"1.6"}
+            Version{"1.7"}
         }
     }
 }

Modified: trunk/source/data/coll/haw.txt
===================================================================
--- trunk/source/data/coll/haw.txt	2009-07-02 19:27:40 UTC (rev 211)
+++ trunk/source/data/coll/haw.txt	2009-07-02 19:28:39 UTC (rev 212)
@@ -28,7 +28,7 @@
                 "&p<<<P"
                 "&w<<<W"
             }
-            Version{"1.6"}
+            Version{"1.7"}
         }
     }
 }

Modified: trunk/source/data/coll/he.txt
===================================================================
--- trunk/source/data/coll/he.txt	2009-07-02 19:27:40 UTC (rev 211)
+++ trunk/source/data/coll/he.txt	2009-07-02 19:28:39 UTC (rev 212)
@@ -10,11 +10,11 @@
  *  ICU <specials> source: <path>/xml/collation/he.xml
  */
 he{
-    Version{"1.23"}
+    Version{"1.24"}
     collations{
         standard{
             Sequence{" [normalization on ]"}
-            Version{"1.6"}
+            Version{"1.7"}
         }
     }
 }

Modified: trunk/source/data/coll/hi.txt
===================================================================
--- trunk/source/data/coll/hi.txt	2009-07-02 19:27:40 UTC (rev 211)
+++ trunk/source/data/coll/hi.txt	2009-07-02 19:28:39 UTC (rev 212)
@@ -10,7 +10,7 @@
  *  ICU <specials> source: <path>/xml/collation/hi.xml
  */
 hi{
-    Version{"1.25"}
+    Version{"1.26"}
     collations{
         direct{
             Sequence{
@@ -19,11 +19,11 @@
                 "<ी<ु<ू<ृ<ॄ<ॅ<ॆ<े<ै<ॉ<ॊ<ो<ौ<्<ॐ<॑<॒<॓<॔<क़<ख़<ग़<ज़<ड़<ढ़<फ़<य़<ॠ<ॡ<ॢ"
                 "<ॣ<।<॥<०<१<२<३<४<५<६<७<८<९<॰"
             }
-            Version{"1.6"}
+            Version{"1.7"}
         }
         standard{
             Sequence{" [normalization on ]&[before 1]0<ॐ<।<॥<॰&ह<़<ँ<ं<ः<॑<॒<॓<॔&ऽ<्"}
-            Version{"1.6"}
+            Version{"1.7"}
         }
     }
 }

Modified: trunk/source/data/coll/hr.txt
===================================================================
--- trunk/source/data/coll/hr.txt	2009-07-02 19:27:40 UTC (rev 211)
+++ trunk/source/data/coll/hr.txt	2009-07-02 19:28:39 UTC (rev 212)
@@ -10,7 +10,7 @@
  *  ICU <specials> source: <path>/xml/collation/hr.xml
  */
 hr{
-    Version{"1.25"}
+    Version{"1.26"}
     collations{
         standard{
             Sequence{
@@ -21,7 +21,7 @@
                 "&S<š<<<Š"
                 "&Z<ž<<<Ž"
             }
-            Version{"1.6"}
+            Version{"1.7"}
         }
     }
 }

Modified: trunk/source/data/coll/hu.txt
===================================================================
--- trunk/source/data/coll/hu.txt	2009-07-02 19:27:40 UTC (rev 211)
+++ trunk/source/data/coll/hu.txt	2009-07-02 19:28:39 UTC (rev 212)
@@ -10,7 +10,7 @@
  *  ICU <specials> source: <path>/xml/collation/hu.xml
  */
 hu{
-    Version{"1.24"}
+    Version{"1.25"}
     collations{
         standard{
             Sequence{
@@ -53,7 +53,7 @@
                 "&Zs<<<Zzs/zs"
                 "&ZS<<<ZZS/ZS"
             }
-            Version{"1.6"}
+            Version{"1.7"}
         }
     }
 }

Modified: trunk/source/data/coll/is.txt
===================================================================
--- trunk/source/data/coll/is.txt	2009-07-02 19:27:40 UTC (rev 211)
+++ trunk/source/data/coll/is.txt	2009-07-02 19:28:39 UTC (rev 212)
@@ -10,7 +10,7 @@
  *  ICU <specials> source: <path>/xml/collation/is.xml
  */
 is{
-    Version{"1.22"}
+    Version{"1.23"}
     collations{
         standard{
             Sequence{
@@ -23,7 +23,7 @@
                 "&[before 1]z<ý<<<Ý"
                 "&[before 1]ʒ<þ<<<Þ<æ<<<Æ<<ä<<<Ä<ö<<<Ö<<ø<<<Ø<å<<<Å"
             }
-            Version{"1.6"}
+            Version{"1.7"}
         }
     }
 }

Modified: trunk/source/data/coll/it.txt
===================================================================
--- trunk/source/data/coll/it.txt	2009-07-02 19:27:40 UTC (rev 211)
+++ trunk/source/data/coll/it.txt	2009-07-02 19:28:39 UTC (rev 212)
@@ -10,11 +10,11 @@
  *  ICU <specials> source: <path>/xml/collation/it.xml
  */
 it{
-    Version{"1.23"}
+    Version{"1.24"}
     collations{
         standard{
             Sequence{"&ae<<æ<<<Æ"}
-            Version{"1.6"}
+            Version{"1.7"}
         }
     }
 }

Modified: trunk/source/data/coll/ja.txt
===================================================================
--- trunk/source/data/coll/ja.txt	2009-07-02 19:27:40 UTC (rev 211)
+++ trunk/source/data/coll/ja.txt	2009-07-02 19:28:39 UTC (rev 212)
@@ -10,7 +10,7 @@
  *  ICU <specials> source: <path>/xml/collation/ja.xml
  */
 ja{
-    Version{"1.30"}
+    Version{"1.31"}
     collations{
         standard{
             Sequence{
@@ -511,7 +511,7 @@
                 "<黨<黯<黴<黶<黷<黹<黻<黼<黽<鼇<鼈<皷<鼕<鼡<鼬<鼾<齊<齒<齔<齣<齟<齠<齡<齦<齧<齬<齪<齷<齲<齶<龕<龜<龠<堯"
                 "<槇<遙<瑤<凜<熙"
             }
-            Version{"1.6"}
+            Version{"1.7"}
         }
         unihan{
             Sequence{
@@ -3560,7 +3560,7 @@
                 "<𪛄<龞<𪛅<𪛆<𪛇<𪛈<龠<龡<䶳<𪛊<龢<龣<䶴<𪛋<𪛌<𪛍<龤<龥<𪛎<𪛏<𪛐<𪛑<䶵<𪛒<𪛓<𪛔"
                 "<𪛕<𪛖"
             }
-            Version{"1.6"}
+            Version{"1.7"}
         }
     }
 }

Modified: trunk/source/data/coll/kk.txt
===================================================================
--- trunk/source/data/coll/kk.txt	2009-07-02 19:27:40 UTC (rev 211)
+++ trunk/source/data/coll/kk.txt	2009-07-02 19:28:39 UTC (rev 212)
@@ -10,11 +10,11 @@
  *  ICU <specials> source: <path>/xml/collation/kk.xml
  */
 kk{
-    Version{"1.24"}
+    Version{"1.25"}
     collations{
         standard{
             Sequence{" [normalization on ][suppressContractions [Ѐ-џ] ]&[before 1]ү<ұ<<<Ұ"}
-            Version{"1.6"}
+            Version{"1.7"}
         }
     }
 }

Modified: trunk/source/data/coll/kl.txt
===================================================================
--- trunk/source/data/coll/kl.txt	2009-07-02 19:27:40 UTC (rev 211)
+++ trunk/source/data/coll/kl.txt	2009-07-02 19:28:39 UTC (rev 212)
@@ -10,7 +10,7 @@
  *  ICU <specials> source: <path>/xml/collation/kl.xml
  */
 kl{
-    Version{"1.22"}
+    Version{"1.23"}
     collations{
         standard{
             Sequence{
@@ -20,7 +20,7 @@
                 "&Y<<ü<<<Ü<<ű<<<Ű"
                 "&[before 1]ʒ<æ<<<Æ<<ä<<<Ä<<ę<<<Ę<ø<<<Ø<<ö<<<Ö<<ő<<<Ő<<œ<<<Œ<å<<<Å"
             }
-            Version{"1.6"}
+            Version{"1.7"}
         }
     }
 }

Modified: trunk/source/data/coll/km.txt
===================================================================
--- trunk/source/data/coll/km.txt	2009-07-02 19:27:40 UTC (rev 211)
+++ trunk/source/data/coll/km.txt	2009-07-02 19:28:39 UTC (rev 212)
@@ -71,7 +71,7 @@
                 "&អៅ=ឳ"
                 "&ៅ<ុំ<ំ<ាំ<ះ"
             }
-            Version{"1.6"}
+            Version{"1.7"}
         }
     }
 }

Modified: trunk/source/data/coll/kn.txt
===================================================================
--- trunk/source/data/coll/kn.txt	2009-07-02 19:27:40 UTC (rev 211)
+++ trunk/source/data/coll/kn.txt	2009-07-02 19:28:39 UTC (rev 212)
@@ -10,11 +10,11 @@
  *  ICU <specials> source: <path>/xml/collation/kn.xml
  */
 kn{
-    Version{"1.25"}
+    Version{"1.26"}
     collations{
         standard{
             Sequence{" [normalization on ]"}
-            Version{"1.6"}
+            Version{"1.7"}
         }
     }
 }

Modified: trunk/source/data/coll/ko.txt
===================================================================
--- trunk/source/data/coll/ko.txt	2009-07-02 19:27:40 UTC (rev 211)
+++ trunk/source/data/coll/ko.txt	2009-07-02 19:28:39 UTC (rev 212)
@@ -10,7 +10,7 @@
  *  ICU <specials> source: <path>/xml/collation/ko.xml
  */
 ko{
-    Version{"1.28"}
+    Version{"1.29"}
     collations{
         standard{
             Sequence{
@@ -681,7 +681,7 @@
                 "<<嘻<<悕<<戲<<暿<<欷<<燹<<爔<<豨<<餼"
                 "&힐<<詰<<犵<<纈<<襭<<頡<<黠"
             }
-            Version{"1.6"}
+            Version{"1.7"}
         }
         unihan{
             Sequence{
@@ -3422,7 +3422,7 @@
                 "<𪛄<龞<𪛅<𪛆<𪛇<𪛈<龠<龡<䶳<𪛊<龢<龣<䶴<𪛋<𪛌<𪛍<龤<龥<𪛎<𪛏<𪛐<𪛑<䶵<𪛒<𪛓<𪛔"
                 "<𪛕<𪛖"
             }
-            Version{"1.6"}
+            Version{"1.7"}
         }
     }
 }

Modified: trunk/source/data/coll/kok.txt
===================================================================
--- trunk/source/data/coll/kok.txt	2009-07-02 19:27:40 UTC (rev 211)
+++ trunk/source/data/coll/kok.txt	2009-07-02 19:28:39 UTC (rev 212)
@@ -10,5 +10,5 @@
  *  ICU <specials> source: <path>/xml/collation/kok.xml
  */
 kok{
-    Version{"1.6"}
+    Version{"1.7"}
 }

Modified: trunk/source/data/coll/lt.txt
===================================================================
--- trunk/source/data/coll/lt.txt	2009-07-02 19:27:40 UTC (rev 211)
+++ trunk/source/data/coll/lt.txt	2009-07-02 19:28:39 UTC (rev 212)
@@ -10,7 +10,7 @@
  *  ICU <specials> source: <path>/xml/collation/lt.xml
  */
 lt{
-    Version{"1.25"}
+    Version{"1.26"}
     collations{
         standard{
             Sequence{
@@ -20,7 +20,7 @@
                 "&[before 1]T<š<<<Š"
                 "&[before 1]Ʒ<ž<<<Ž"
             }
-            Version{"1.6"}
+            Version{"1.7"}
         }
     }
 }

Modified: trunk/source/data/coll/lv.txt
===================================================================
--- trunk/source/data/coll/lv.txt	2009-07-02 19:27:40 UTC (rev 211)
+++ trunk/source/data/coll/lv.txt	2009-07-02 19:28:39 UTC (rev 212)
@@ -10,7 +10,7 @@
  *  ICU <specials> source: <path>/xml/collation/lv.xml
  */
 lv{
-    Version{"1.24"}
+    Version{"1.25"}
     collations{
         standard{
             Sequence{
@@ -24,7 +24,7 @@
                 "&[before 1]T<š<<<Š"
                 "&[before 1]Ʒ<ž<<<Ž"
             }
-            Version{"1.6"}
+            Version{"1.7"}
         }
     }
 }

Modified: trunk/source/data/coll/mk.txt
===================================================================
--- trunk/source/data/coll/mk.txt	2009-07-02 19:27:40 UTC (rev 211)
+++ trunk/source/data/coll/mk.txt	2009-07-02 19:28:39 UTC (rev 212)
@@ -10,6 +10,6 @@
  *  ICU <specials> source: <path>/xml/collation/mk.xml
  */
 mk{
-    Version{"1.19"}
+    Version{"1.20"}
     collations:alias{"ru/collations"}
 }

Modified: trunk/source/data/coll/ml.txt
===================================================================
--- trunk/source/data/coll/ml.txt	2009-07-02 19:27:40 UTC (rev 211)
+++ trunk/source/data/coll/ml.txt	2009-07-02 19:28:39 UTC (rev 212)
@@ -10,7 +10,7 @@
  *  ICU <specials> source: <path>/xml/collation/ml.xml
  */
 ml{
-    Version{"1.13"}
+    Version{"1.14"}
     collations{
         standard{
             Sequence{
@@ -29,7 +29,7 @@
                 "&മ്<<ം"
                 "&ന്<<<ൻ്"
             }
-            Version{"1.6"}
+            Version{"1.7"}
         }
     }
 }

Modified: trunk/source/data/coll/mr.txt
===================================================================
--- trunk/source/data/coll/mr.txt	2009-07-02 19:27:40 UTC (rev 211)
+++ trunk/source/data/coll/mr.txt	2009-07-02 19:28:39 UTC (rev 212)
@@ -10,11 +10,11 @@
  *  ICU <specials> source: <path>/xml/collation/mr.xml
  */
 mr{
-    Version{"1.25"}
+    Version{"1.26"}
     collations{
         standard{
             Sequence{" [normalization on ]"}
-            Version{"1.6"}
+            Version{"1.7"}
         }
     }
 }

Modified: trunk/source/data/coll/mt.txt
===================================================================
--- trunk/source/data/coll/mt.txt	2009-07-02 19:27:40 UTC (rev 211)
+++ trunk/source/data/coll/mt.txt	2009-07-02 19:28:39 UTC (rev 212)
@@ -10,7 +10,7 @@
  *  ICU <specials> source: <path>/xml/collation/mt.xml
  */
 mt{
-    Version{"1.22"}
+    Version{"1.23"}
     collations{
         standard{
             Sequence{
@@ -21,7 +21,7 @@
                 "&[before 1]i<Ħ<<<ħ"
                 "&[before 1]z<Ż<<<ż"
             }
-            Version{"1.6"}
+            Version{"1.7"}
         }
     }
 }

Modified: trunk/source/data/coll/nb.txt
===================================================================
--- trunk/source/data/coll/nb.txt	2009-07-02 19:27:40 UTC (rev 211)
+++ trunk/source/data/coll/nb.txt	2009-07-02 19:28:39 UTC (rev 212)
@@ -10,7 +10,7 @@
  *  ICU <specials> source: <path>/xml/collation/nb.xml
  */
 nb{
-    Version{"1.22"}
+    Version{"1.23"}
     collations{
         standard{
             Sequence{
@@ -20,7 +20,7 @@
                 "&Y<<ü<<<Ü<<ű<<<Ű"
                 "&[before 1]ʒ<æ<<<Æ<<ä<<<Ä<<ę<<<Ę<ø<<<Ø<<ö<<<Ö<<ő<<<Ő<<œ<<<Œ<å<<<Å"
             }
-            Version{"1.6"}
+            Version{"1.7"}
         }
     }
 }

Modified: trunk/source/data/coll/nn.txt
===================================================================
--- trunk/source/data/coll/nn.txt	2009-07-02 19:27:40 UTC (rev 211)
+++ trunk/source/data/coll/nn.txt	2009-07-02 19:28:39 UTC (rev 212)
@@ -10,7 +10,7 @@
  *  ICU <specials> source: <path>/xml/collation/nn.xml
  */
 nn{
-    Version{"1.22"}
+    Version{"1.23"}
     collations{
         standard{
             Sequence{
@@ -20,7 +20,7 @@
                 "&Y<<ü<<<Ü<<ű<<<Ű"
                 "&[before 1]ʒ<æ<<<Æ<<ä<<<Ä<<ę<<<Ę<ø<<<Ø<<ö<<<Ö<<ő<<<Ő<<œ<<<Œ<å<<<Å"
             }
-            Version{"1.6"}
+            Version{"1.7"}
         }
     }
 }

Modified: trunk/source/data/coll/om.txt
===================================================================
--- trunk/source/data/coll/om.txt	2009-07-02 19:27:40 UTC (rev 211)
+++ trunk/source/data/coll/om.txt	2009-07-02 19:28:39 UTC (rev 212)
@@ -10,14 +10,14 @@
  *  ICU <specials> source: <path>/xml/collation/om.xml
  */
 om{
-    Version{"1.15"}
+    Version{"1.16"}
     collations{
         standard{
             Sequence{
                 "&Z<ch<<<Ch<<<CH<dh<<<Dh<<<DH<kh<<<Kh<<<KH<ny<<<Ny<<<NY<ph<<<Ph<<<PH<"
                 "sh<<<Sh"
             }
-            Version{"1.6"}
+            Version{"1.7"}
         }
     }
 }

Modified: trunk/source/data/coll/or.txt
===================================================================
--- trunk/source/data/coll/or.txt	2009-07-02 19:27:40 UTC (rev 211)
+++ trunk/source/data/coll/or.txt	2009-07-02 19:28:39 UTC (rev 212)
@@ -10,11 +10,11 @@
  *  ICU <specials> source: <path>/xml/collation/or.xml
  */
 or{
-    Version{"1.11"}
+    Version{"1.12"}
     collations{
         standard{
             Sequence{" [normalization on ]&ହ<କ୍ଷ<ଡ଼<ଢ଼<ୟ<ୱ<ଵ<ଂ<ଃ<ଁ<୍<଼"}
-            Version{"1.6"}
+            Version{"1.7"}
         }
     }
 }

Modified: trunk/source/data/coll/pa.txt
===================================================================
--- trunk/source/data/coll/pa.txt	2009-07-02 19:27:40 UTC (rev 211)
+++ trunk/source/data/coll/pa.txt	2009-07-02 19:28:39 UTC (rev 212)
@@ -10,11 +10,11 @@
  *  ICU <specials> source: <path>/xml/collation/pa.xml
  */
 pa{
-    Version{"1.29"}
+    Version{"1.30"}
     collations{
         standard{
             Sequence{" [normalization on ]"}
-            Version{"1.6"}
+            Version{"1.7"}
         }
     }
 }

Modified: trunk/source/data/coll/pl.txt
===================================================================
--- trunk/source/data/coll/pl.txt	2009-07-02 19:27:40 UTC (rev 211)
+++ trunk/source/data/coll/pl.txt	2009-07-02 19:28:39 UTC (rev 212)
@@ -10,7 +10,7 @@
  *  ICU <specials> source: <path>/xml/collation/pl.xml
  */
 pl{
-    Version{"1.23"}
+    Version{"1.24"}
     collations{
         standard{
             Sequence{
@@ -23,7 +23,7 @@
                 "&S<ś<<<Ś"
                 "&Z<ź<<<Ź<ż<<<Ż"
             }
-            Version{"1.6"}
+            Version{"1.7"}
         }
     }
 }

Modified: trunk/source/data/coll/ps.txt
===================================================================
--- trunk/source/data/coll/ps.txt	2009-07-02 19:27:40 UTC (rev 211)
+++ trunk/source/data/coll/ps.txt	2009-07-02 19:28:39 UTC (rev 212)
@@ -10,7 +10,7 @@
  *  ICU <specials> source: <path>/xml/collation/ps.xml
  */
 ps{
-    Version{"1.23"}
+    Version{"1.24"}
     collations{
         standard{
             Sequence{
@@ -32,7 +32,7 @@
                 "&ی<<ى<<ے<<ي<<ې<<ۍ<<یٔ<<<ىٔ<<<ئ"
                 "&'\u00A0'<<'\u200C'<<'\u200D'"
             }
-            Version{"1.6"}
+            Version{"1.7"}
         }
     }
 }

Modified: trunk/source/data/coll/ro.txt
===================================================================
--- trunk/source/data/coll/ro.txt	2009-07-02 19:27:40 UTC (rev 211)
+++ trunk/source/data/coll/ro.txt	2009-07-02 19:28:39 UTC (rev 212)
@@ -10,11 +10,11 @@
  *  ICU <specials> source: <path>/xml/collation/ro.xml
  */
 ro{
-    Version{"1.25"}
+    Version{"1.26"}
     collations{
         standard{
             Sequence{"&A<ă<<<Ă<â<<<Â&D<đ<<<Đ&I<î<<<Î&S<ş=ș<<<Ş=Ș&T<ţ=ț<<<Ţ=Ț&Z<ż<<<Ż"}
-            Version{"1.6"}
+            Version{"1.7"}
         }
     }
 }

Modified: trunk/source/data/coll/root.txt
===================================================================
--- trunk/source/data/coll/root.txt	2009-07-02 19:27:40 UTC (rev 211)
+++ trunk/source/data/coll/root.txt	2009-07-02 19:28:39 UTC (rev 212)
@@ -11,12 +11,12 @@
  */
 root{
     UCARules:process(uca_rules){"../unidata/UCARules.txt"}
-    Version{"1.28"}
+    Version{"1.29"}
     collations{
         default{"standard"}
         standard{
             Sequence{""}
-            Version{"1.6"}
+            Version{"1.7"}
         }
     }
     depends:process(dependency){"ucadata.icu"}

Modified: trunk/source/data/coll/ru.txt
===================================================================
--- trunk/source/data/coll/ru.txt	2009-07-02 19:27:40 UTC (rev 211)
+++ trunk/source/data/coll/ru.txt	2009-07-02 19:28:39 UTC (rev 212)
@@ -10,11 +10,11 @@
  *  ICU <specials> source: <path>/xml/collation/ru.xml
  */
 ru{
-    Version{"1.24"}
+    Version{"1.25"}
     collations{
         standard{
             Sequence{"[suppressContractions [Ѐ-ЗК-зк-џ] ]"}
-            Version{"1.6"}
+            Version{"1.7"}
         }
     }
 }

Modified: trunk/source/data/coll/si.txt
===================================================================
--- trunk/source/data/coll/si.txt	2009-07-02 19:27:40 UTC (rev 211)
+++ trunk/source/data/coll/si.txt	2009-07-02 19:28:39 UTC (rev 212)
@@ -10,15 +10,15 @@
  *  ICU <specials> source: <path>/xml/collation/si.xml
  */
 si{
-    Version{"1.1"}
+    Version{"1.2"}
     collations{
         dictionary{
             Sequence{" [normalization on ]&෴<අ&ඖ<ං<ඃ&ෳ<්&ෘ<ෲ<ෟ<ෳ&ජ්ඤ<<ඥ"}
-            Version{"1.6"}
+            Version{"1.7"}
         }
         standard{
             Sequence{" [normalization on ]&෴<අ&ඖ<ං<ඃ&ෳ<්&ෘ<ෲ<ෟ<ෳ&ඥ<ඤ"}
-            Version{"1.6"}
+            Version{"1.7"}
         }
     }
 }

Modified: trunk/source/data/coll/sk.txt
===================================================================
--- trunk/source/data/coll/sk.txt	2009-07-02 19:27:40 UTC (rev 211)
+++ trunk/source/data/coll/sk.txt	2009-07-02 19:28:39 UTC (rev 212)
@@ -10,7 +10,7 @@
  *  ICU <specials> source: <path>/xml/collation/sk.xml
  */
 sk{
-    Version{"1.27"}
+    Version{"1.28"}
     collations{
         standard{
             Sequence{
@@ -24,7 +24,7 @@
                 "&S<š<<<Š"
                 "&Z<ž<<<Ž<ż<<<Ż"
             }
-            Version{"1.6"}
+            Version{"1.7"}
         }
     }
 }

Modified: trunk/source/data/coll/sl.txt
===================================================================
--- trunk/source/data/coll/sl.txt	2009-07-02 19:27:40 UTC (rev 211)
+++ trunk/source/data/coll/sl.txt	2009-07-02 19:28:39 UTC (rev 212)
@@ -10,11 +10,11 @@
  *  ICU <specials> source: <path>/xml/collation/sl.xml
  */
 sl{
-    Version{"1.24"}
+    Version{"1.25"}
     collations{
         standard{
             Sequence{"&C<č<<<Č<ć<<<Ć&S<š<<<Š&Z<ž<<<Ž"}
-            Version{"1.6"}
+            Version{"1.7"}
         }
     }
 }

Modified: trunk/source/data/coll/sq.txt
===================================================================
--- trunk/source/data/coll/sq.txt	2009-07-02 19:27:40 UTC (rev 211)
+++ trunk/source/data/coll/sq.txt	2009-07-02 19:28:39 UTC (rev 212)
@@ -10,7 +10,7 @@
  *  ICU <specials> source: <path>/xml/collation/sq.xml
  */
 sq{
-    Version{"1.24"}
+    Version{"1.25"}
     collations{
         standard{
             Sequence{
@@ -26,7 +26,7 @@
                 "&[before 1]Y<xh<<<Xh<<<XH"
                 "&[before 1]Ʒ<zh<<<Zh<<<ZH"
             }
-            Version{"1.6"}
+            Version{"1.7"}
         }
     }
 }

Modified: trunk/source/data/coll/sr.txt
===================================================================
--- trunk/source/data/coll/sr.txt	2009-07-02 19:27:40 UTC (rev 211)
+++ trunk/source/data/coll/sr.txt	2009-07-02 19:28:39 UTC (rev 212)
@@ -10,6 +10,6 @@
  *  ICU <specials> source: <path>/xml/collation/sr.xml
  */
 sr{
-    Version{"1.23"}
+    Version{"1.24"}
     collations:alias{"ru/collations"}
 }

Modified: trunk/source/data/coll/sr_Latn.txt
===================================================================
--- trunk/source/data/coll/sr_Latn.txt	2009-07-02 19:27:40 UTC (rev 211)
+++ trunk/source/data/coll/sr_Latn.txt	2009-07-02 19:28:39 UTC (rev 212)
@@ -10,6 +10,6 @@
  *  ICU <specials> source: <path>/xml/collation/sr_Latn.xml
  */
 sr_Latn{
-    Version{"1.3"}
+    Version{"1.4"}
     collations:alias{"hr/collations"}
 }

Modified: trunk/source/data/coll/sv.txt
===================================================================
--- trunk/source/data/coll/sv.txt	2009-07-02 19:27:40 UTC (rev 211)
+++ trunk/source/data/coll/sv.txt	2009-07-02 19:28:39 UTC (rev 212)
@@ -10,7 +10,7 @@
  *  ICU <specials> source: <path>/xml/collation/sv.xml
  */
 sv{
-    Version{"1.26"}
+    Version{"1.27"}
     collations{
         default{"reformed"}
         reformed{
@@ -22,7 +22,7 @@
                 "&[before 1]ʒ<å<<<Å<ä<<<Ä<<æ<<<Æ<<ę<<<Ę<ö<<<Ö<<ø<<<Ø<<ő<<<Ő<<œ<<<Œ<<ô"
                 "<<<Ô"
             }
-            Version{"1.6"}
+            Version{"1.7"}
         }
         standard{
             Sequence{
@@ -35,7 +35,7 @@
                 "&[before 1]ʒ<å<<<Å<ä<<<Ä<<æ<<<Æ<<ę<<<Ę<ö<<<Ö<<ø<<<Ø<<ő<<<Ő<<œ<<<Œ<<ô"
                 "<<<Ô"
             }
-            Version{"1.6"}
+            Version{"1.7"}
         }
     }
 }

Modified: trunk/source/data/coll/ta.txt
===================================================================
--- trunk/source/data/coll/ta.txt	2009-07-02 19:27:40 UTC (rev 211)
+++ trunk/source/data/coll/ta.txt	2009-07-02 19:28:39 UTC (rev 212)
@@ -10,11 +10,11 @@
  *  ICU <specials> source: <path>/xml/collation/ta.xml
  */
 ta{
-    Version{"1.27"}
+    Version{"1.28"}
     collations{
         standard{
             Sequence{" [normalization on ]"}
-            Version{"1.6"}
+            Version{"1.7"}
         }
     }
 }

Modified: trunk/source/data/coll/te.txt
===================================================================
--- trunk/source/data/coll/te.txt	2009-07-02 19:27:40 UTC (rev 211)
+++ trunk/source/data/coll/te.txt	2009-07-02 19:28:39 UTC (rev 212)
@@ -10,11 +10,11 @@
  *  ICU <specials> source: <path>/xml/collation/te.xml
  */
 te{
-    Version{"1.25"}
+    Version{"1.26"}
     collations{
         standard{
             Sequence{" [normalization on ]&హ<ఁ<ం<ః<్"}
-            Version{"1.6"}
+            Version{"1.7"}
         }
     }
 }

Modified: trunk/source/data/coll/th.txt
===================================================================
--- trunk/source/data/coll/th.txt	2009-07-02 19:27:40 UTC (rev 211)
+++ trunk/source/data/coll/th.txt	2009-07-02 19:28:39 UTC (rev 212)
@@ -10,7 +10,7 @@
  *  ICU <specials> source: <path>/xml/collation/th.xml
  */
 th{
-    Version{"1.24"}
+    Version{"1.25"}
     collations{
         standard{
             Sequence{
@@ -23,7 +23,7 @@
                 "&[last secondary ignorable ]<<<'\u0020'<<<'-'<<<'.'<<<'...'<<<ฯ<<<ๆ<"
                 "<<๏<<<๚<<<๛"
             }
-            Version{"1.6"}
+            Version{"1.7"}
         }
     }
 }

Modified: trunk/source/data/coll/tr.txt
===================================================================
--- trunk/source/data/coll/tr.txt	2009-07-02 19:27:40 UTC (rev 211)
+++ trunk/source/data/coll/tr.txt	2009-07-02 19:28:39 UTC (rev 212)
@@ -10,11 +10,11 @@
  *  ICU <specials> source: <path>/xml/collation/tr.xml
  */
 tr{
-    Version{"1.22"}
+    Version{"1.23"}
     collations{
         standard{
             Sequence{"&C<ç<<<Ç&G<ğ<<<Ğ&[before 1]i<ı<<<I&i<<<İ&O<ö<<<Ö&S<ş<<<Ş&U<ü<<<Ü"}
-            Version{"1.6"}
+            Version{"1.7"}
         }
     }
 }

Modified: trunk/source/data/coll/uk.txt
===================================================================
--- trunk/source/data/coll/uk.txt	2009-07-02 19:27:40 UTC (rev 211)
+++ trunk/source/data/coll/uk.txt	2009-07-02 19:28:39 UTC (rev 212)
@@ -10,11 +10,11 @@
  *  ICU <specials> source: <path>/xml/collation/uk.xml
  */
 uk{
-    Version{"1.22"}
+    Version{"1.23"}
     collations{
         standard{
             Sequence{"&Г<ґ<<<Ґ"}
-            Version{"1.6"}
+            Version{"1.7"}
         }
     }
 }

Modified: trunk/source/data/coll/ur.txt
===================================================================
--- trunk/source/data/coll/ur.txt	2009-07-02 19:27:40 UTC (rev 211)
+++ trunk/source/data/coll/ur.txt	2009-07-02 19:28:39 UTC (rev 212)
@@ -10,7 +10,7 @@
  *  ICU <specials> source: <path>/xml/collation/ur.xml
  */
 ur{
-    Version{"1.3"}
+    Version{"1.4"}
     collations{
         default{"standard"}
         standard{
@@ -20,7 +20,7 @@
                 "&ِ<<ُ<<ٰ<<ٖ<<ٗ<<ً<<ٍ<<ٌ<<ٔ<<ّ<<٘<<ٓ"
                 "&ؐ<<<ؑ<<<ؒ<<<ؓ<<<ؔ<<<َ"
             }
-            Version{"1.6"}
+            Version{"1.7"}
         }
     }
 }

Modified: trunk/source/data/coll/vi.txt
===================================================================
--- trunk/source/data/coll/vi.txt	2009-07-02 19:27:40 UTC (rev 211)
+++ trunk/source/data/coll/vi.txt	2009-07-02 19:28:39 UTC (rev 212)
@@ -10,7 +10,7 @@
  *  ICU <specials> source: <path>/xml/collation/vi.xml
  */
 vi{
-    Version{"1.22"}
+    Version{"1.23"}
     collations{
         standard{
             Sequence{
@@ -22,7 +22,7 @@
                 "&o<ô<<<Ô<ơ<<<Ơ"
                 "&u<ư<<<Ư"
             }
-            Version{"1.6"}
+            Version{"1.7"}
         }
     }
 }

Modified: trunk/source/data/coll/zh.txt
===================================================================
--- trunk/source/data/coll/zh.txt	2009-07-02 19:27:40 UTC (rev 211)
+++ trunk/source/data/coll/zh.txt	2009-07-02 19:28:39 UTC (rev 212)
@@ -10,7 +10,7 @@
  *  ICU <specials> source: <path>/xml/collation/zh.xml
  */
 zh{
-    Version{"1.35"}
+    Version{"1.36"}
     collations{
         big5han{
             Sequence{
@@ -409,7 +409,7 @@
                 "<蠿<讞<貜<躩<軉<靋<顳<顴<飌<饡<馫<驤<驦<驧<鬤<鸕<鸗<齈<戇<欞<爧<虌<躨<钂<钀<钁<驩<驨<鬮<鸙<爩<虋<讟<钃"
                 "<鱹<麷<癵<驫<鱺<鸝<灩<灪<麤<齾<齉<龘"
             }
-            Version{"1.6"}
+            Version{"1.7"}
         }
         default{"pinyin"}
         gb2312han{
@@ -624,7 +624,7 @@
                 "<骼<髁<髀<髅<髂<髋<髌<髑<魅<魃<魇<魉<魈<魍<魑<飨<餍<餮<饕<饔<髟<髡<髦<髯<髫<髻<髭<髹<鬈<鬏<鬓<鬟<鬣<麽"
                 "<麾<縻<麂<麇<麈<麋<麒<鏖<麝<麟<黛<黜<黝<黠<黟<黢<黩<黧<黥<黪<黯<鼢<鼬<鼯<鼹<鼷<鼽<鼾<齄"
             }
-            Version{"1.6"}
+            Version{"1.7"}
         }
         pinyin{
             Sequence{
@@ -1262,7 +1262,7 @@
                 "<鳟<鱒<鷷<僔<噂<撙<譐<捘<銌<昨<秨<莋<捽<椊<葃<稓<筰<鈼<左<佐<繓<作<坐<阼<岝<岞<怍<侳<柞<祚<胙<唑<座<袏"
                 "<做<葄<蓙<飵<糳<咗"
             }
-            Version{"1.6"}
+            Version{"1.7"}
         }
         standard{
             Sequence{
@@ -1276,7 +1276,7 @@
                 "&[before 2]u<<ū<<<Ū<<ú<<<Ú<<ǔ<<<Ǔ<<ù<<<Ù"
                 "&U<<ǖ<<<Ǖ<<ǘ<<<Ǘ<<ǚ<<<Ǚ<<ǜ<<<Ǜ<<ü<<<Ü"
             }
-            Version{"1.6"}
+            Version{"1.7"}
         }
         stroke{
             Sequence{
@@ -1675,7 +1675,7 @@
                 "<驤<驦<驧<鬤<鸕<鸗<齈<豔<鑿<鸚<戇<欞<爧<虌<躨<钂<钀<钁<驩<驨<鸙<爨<驪<鬱<鸛<鸞<虋<讟<钃<鱹<麷<癵<驫<鱺"
                 "<鸝<灩<籲<灪<爩<麤<齾<齉<龘"
             }
-            Version{"1.6"}
+            Version{"1.7"}
         }
         unihan{
             Sequence{
@@ -4425,7 +4425,7 @@
                 "<𪛄<龞<𪛅<𪛆<𪛇<𪛈<龠<龡<䶳<𪛊<龢<龣<䶴<𪛋<𪛌<𪛍<龤<龥<𪛎<𪛏<𪛐<𪛑<䶵<𪛒<𪛓<𪛔"
                 "<𪛕<𪛖"
             }
-            Version{"1.6"}
+            Version{"1.7"}
         }
     }
 }

Modified: trunk/source/data/coll/zh_Hant.txt
===================================================================
--- trunk/source/data/coll/zh_Hant.txt	2009-07-02 19:27:40 UTC (rev 211)
+++ trunk/source/data/coll/zh_Hant.txt	2009-07-02 19:28:39 UTC (rev 212)
@@ -10,7 +10,7 @@
  *  ICU <specials> source: <path>/xml/collation/zh_Hant.xml
  */
 zh_Hant{
-    Version{"1.11"}
+    Version{"1.12"}
     collations{
         default{"stroke"}
     }

Modified: trunk/source/data/misc/metazoneInfo.txt
===================================================================
--- trunk/source/data/misc/metazoneInfo.txt	2009-07-02 19:27:40 UTC (rev 211)
+++ trunk/source/data/misc/metazoneInfo.txt	2009-07-02 19:28:39 UTC (rev 212)
@@ -1,4 +1,4 @@
-// ***************************************************************************
+// ***************************************************************************
 // *
 // * Copyright (C) 2009 International Business Machines
 // * Corporation and others.  All Rights Reserved.
@@ -2597,7 +2597,7 @@
         }
         "Asia:Taipei"{
             mz0{
-                "China",
+                "Taipei",
                 "1970-01-01 00:00",
                 "9999-12-31 23:59",
             }

Modified: trunk/source/data/misc/numberingSystems.txt
===================================================================
--- trunk/source/data/misc/numberingSystems.txt	2009-07-02 19:27:40 UTC (rev 211)
+++ trunk/source/data/misc/numberingSystems.txt	2009-07-02 19:28:39 UTC (rev 212)
@@ -130,7 +130,7 @@
         }
         mlym{
             algorithmic:int{0}
-            desc{"൦൧൨൩൪൬൭൮൯"}
+            desc{"൦൧൨൩൪൫൬൭൮൯"}
             radix:int{10}
         }
         mong{

Modified: trunk/source/data/misc/supplementalData.txt
===================================================================
--- trunk/source/data/misc/supplementalData.txt	2009-07-02 19:27:40 UTC (rev 211)
+++ trunk/source/data/misc/supplementalData.txt	2009-07-02 19:28:39 UTC (rev 212)
@@ -5268,7 +5268,7 @@
             "islamic-civil",
         }
     }
-    cldrVersion{"1.7"}
+    cldrVersion{"1.7.1"}
     languageData{
         aa{
             primary{
@@ -10945,7 +10945,6 @@
             "meta:Chile_AQ"{"Antarctica/Palmer"}
             "meta:China_001"{"Asia/Shanghai"}
             "meta:China_MO"{"Asia/Macau"}
-            "meta:China_TW"{"Asia/Taipei"}
             "meta:Choibalsan_001"{"Asia/Choibalsan"}
             "meta:Christmas_001"{"Indian/Christmas"}
             "meta:Cocos_001"{"Indian/Cocos"}
@@ -11122,6 +11121,7 @@
             "meta:Sverdlovsk_001"{"Asia/Yekaterinburg"}
             "meta:Syowa_001"{"Antarctica/Syowa"}
             "meta:Tahiti_001"{"Pacific/Tahiti"}
+            "meta:Taipei_001"{"Asia/Taipei"}
             "meta:Tajikistan_001"{"Asia/Dushanbe"}
             "meta:Tashkent_001"{"Asia/Tashkent"}
             "meta:Tbilisi_001"{"Asia/Tbilisi"}
@@ -11187,7 +11187,7 @@
             "GTB Standard Time"{"Europe/Istanbul"}
             "Georgian Standard Time"{"Etc/GMT-3"}
             "Greenland Standard Time"{"America/Godthab"}
-            "Greenwich Standard Time"{"Africa/Reykjavik"}
+            "Greenwich Standard Time"{"Atlantic/Reykjavik"}
             "Hawaiian Standard Time"{"Pacific/Honolulu"}
             "India Standard Time"{"Asia/Calcutta"}
             "Iran Standard Time"{"Asia/Tehran"}

Modified: trunk/source/data/misc/zoneinfo.txt
===================================================================
--- trunk/source/data/misc/zoneinfo.txt	2009-07-02 19:27:40 UTC (rev 211)
+++ trunk/source/data/misc/zoneinfo.txt	2009-07-02 19:28:39 UTC (rev 212)
@@ -3,17 +3,17 @@
 // Corporation and others.  All Rights Reserved.
 //---------------------------------------------------------
 // Build tool: tz2icu
-// Build date: Mon Apr 27 10:31:51 2009
+// Build date: Wed Jun 24 18:50:39 2009
 // Olson source: ftp://elsie.nci.nih.gov/pub/
-// Olson version: 2009g
-// ICU version: 4.1.5
+// Olson version: 2009j
+// ICU version: 4.2
 //---------------------------------------------------------
 // >> !!! >>   THIS IS A MACHINE-GENERATED FILE   << !!! <<
 // >> !!! >>>            DO NOT EDIT             <<< !!! <<
 //---------------------------------------------------------
 
 zoneinfo:table(nofallback) {
- TZVersion { "2009g" }
+ TZVersion { "2009j" }
  Zones:array { 
   /* ACT */ :int { 331 } //Z#0
 ,  /* AET */ :int { 343 } //Z#1
@@ -1224,7 +1224,7 @@
     :bin { "010002030203020302030203020302030203020302030202030203020302030203020302030203020302030203020302030202" }
   } //Z#224
 ,  /* Asia/Amman */ :array {
-    :intvector { -2147483648, -1230776624, 108165600, 118270800, 136591200, 149806800, 168127200, 181342800, 199749600, 215643600, 231285600, 244501200, 262735200, 275950800, 481154400, 496962000, 512949600, 528670800, 544399200, 560120400, 575848800, 592174800, 610581600, 623624400, 641167200, 655074000, 671839200, 685918800, 702856800, 717973200, 733701600, 749422800, 765151200, 779662800, 797205600, 811116000, 828655200, 843170400, 860104800, 874620000, 891554400, 906069600, 930780000, 938124000, 954367200, 970178400, 985816800, 1001628000, 1017352800, 1033077600, 1048802400, 1066946400, 1080252000, 1097791200, 1111701600, 1128031200, 1143756000, 1161900000 }
+    :intvector { -2147483648, -1230776624, 108165600, 118270800, 136591200, 149806800, 168127200, 181342800, 199749600, 215643600, 231285600, 244501200, 262735200, 275950800, 481154400, 496962000, 512949600, 528670800, 544399200, 560120400, 575848800, 592174800, 610581600, 623624400, 641167200, 655074000, 671839200, 685918800, 702856800, 717973200, 733701600, 749422800, 765151200, 779662800, 797205600, 811116000, 828655200, 843170400, 860104800, 874620000, 891554400, 906069600, 930780000, 938124000, 954367200, 970178400, 985816800, 1001628000, 1017352800, 1033077600, 1048802400, 1066946400, 1080252000, 1097791200, 1112306400, 1128031200, 1143756000, 1161900000 }
     :intvector { 7200, 0, 7200, 3600, 8624, 0 }
     :bin { "02000100010001000100010001000100010001000100010001000100010001000100010001000100010001000100010001000100010001000100" }
     "Jordan"
@@ -1320,9 +1320,9 @@
     :intvector { 7200, 2010 }
   } //Z#244
 ,  /* Asia/Dhaka */ :array {
-    :intvector { -2147483648, -891582800, -872058600, -862637400, -576138600, 38772000 }
-    :intvector { 19800, 0, 21200, 0, 21600, 0, 23400, 0 }
-    :bin { "010300030202" }
+    :intvector { -2147483648, -891582800, -872058600, -862637400, -576138600, 38772000, 1245430800 }
+    :intvector { 19800, 0, 21200, 0, 21600, 0, 21600, 3600, 23400, 0 }
+    :bin { "01040004020203" }
     :intvector { 243, 245, 349 }
   } //Z#245
 ,  /* Asia/Dili */ :array {
@@ -3002,7 +3002,7 @@
     8, 1, -1, 7200, 0, 3, 15, -1, 7200, 0, 3600
   } //_#16
   Jordan:intvector {
-    2, -31, -6, 0, 1, 9, -31, -6, 0, 1, 3600
+    2, -31, -5, 86400, 0, 9, -31, -6, 0, 1, 3600
   } //_#17
   LH:intvector {
     9, 1, -1, 7200, 0, 3, 1, -1, 7200, 0, 1800

Modified: trunk/source/data/pkgdataMakefile.in
===================================================================
--- trunk/source/data/pkgdataMakefile.in	2009-07-02 19:27:40 UTC (rev 211)
+++ trunk/source/data/pkgdataMakefile.in	2009-07-02 19:28:39 UTC (rev 212)
@@ -1,40 +1,40 @@
-## pkgdataMakefile.in for ICU data
-## Copyright (c) 2008-2009, International Business Machines Corporation and
-## others. All Rights Reserved.
-
-## Source directory information
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-
-# So that you have $(top_builddir)/config.status
-top_builddir = ..
-
-## All the flags and other definitions are included here.
-include $(top_builddir)/icudefs.mk
-
-OUTPUTFILE=icupkg.inc
-MIDDLE_SO_TARGET=
-
-all : clean 
-	@echo GENCCODE_ASSEMBLY_TYPE=$(GENCCODE_ASSEMBLY) >> $(OUTPUTFILE)
-	@echo SO=$(SO) >> $(OUTPUTFILE)
-	@echo SOBJ=$(SOBJ) >> $(OUTPUTFILE)
-	@echo A=$(A) >> $(OUTPUTFILE)
-	@echo LIBPREFIX=$(LIBPREFIX) >> $(OUTPUTFILE)
-	@echo LIB_EXT_ORDER=$(FINAL_SO_TARGET) >> $(OUTPUTFILE)
-	@echo COMPILE="$(COMPILE.c)" >> $(OUTPUTFILE)
-	@echo LIBFLAGS="-I$(top_srcdir)/common -I$(top_builddir)/common $(SHAREDLIBCPPFLAGS) $(SHAREDLIBCFLAGS)" >> $(OUTPUTFILE)
-	@echo GENLIB="$(SHLIB.c)" >> $(OUTPUTFILE)
-	@echo LDICUDTFLAGS=$(LDFLAGSICUDT) >> $(OUTPUTFILE)
-	@echo LD_SONAME=$(LD_SONAME) >> $(OUTPUTFILE)
-	@echo RPATH_FLAGS=$(RPATH_FLAGS) >> $(OUTPUTFILE)
-	@echo BIR_LDFLAGS=$(BIR_LDFLAGS) >> $(OUTPUTFILE)
-	@echo AR=$(AR) >> $(OUTPUTFILE)
-	@echo ARFLAGS=$(ARFLAGS) >> $(OUTPUTFILE)
-	@echo RANLIB=$(RANLIB) >> $(OUTPUTFILE)
-	@echo INSTALL_CMD=$(INSTALL_DATA) >> $(OUTPUTFILE)
-
-
-clean : 
-	$(RMV) $(OUTPUTFILE)
-
+## pkgdataMakefile.in for ICU data
+## Copyright (c) 2008-2009, International Business Machines Corporation and
+## others. All Rights Reserved.
+
+## Source directory information
+srcdir = @srcdir@
+top_srcdir = @top_srcdir@
+
+# So that you have $(top_builddir)/config.status
+top_builddir = ..
+
+## All the flags and other definitions are included here.
+include $(top_builddir)/icudefs.mk
+
+OUTPUTFILE=icupkg.inc
+MIDDLE_SO_TARGET=
+
+all : clean 
+	@echo GENCCODE_ASSEMBLY_TYPE=$(GENCCODE_ASSEMBLY) >> $(OUTPUTFILE)
+	@echo SO=$(SO) >> $(OUTPUTFILE)
+	@echo SOBJ=$(SOBJ) >> $(OUTPUTFILE)
+	@echo A=$(A) >> $(OUTPUTFILE)
+	@echo LIBPREFIX=$(LIBPREFIX) >> $(OUTPUTFILE)
+	@echo LIB_EXT_ORDER=$(FINAL_SO_TARGET) >> $(OUTPUTFILE)
+	@echo COMPILE="$(COMPILE.c)" >> $(OUTPUTFILE)
+	@echo LIBFLAGS="-I$(top_srcdir)/common -I$(top_builddir)/common $(SHAREDLIBCPPFLAGS) $(SHAREDLIBCFLAGS)" >> $(OUTPUTFILE)
+	@echo GENLIB="$(SHLIB.c)" >> $(OUTPUTFILE)
+	@echo LDICUDTFLAGS=$(LDFLAGSICUDT) >> $(OUTPUTFILE)
+	@echo LD_SONAME=$(LD_SONAME) >> $(OUTPUTFILE)
+	@echo RPATH_FLAGS=$(RPATH_FLAGS) >> $(OUTPUTFILE)
+	@echo BIR_LDFLAGS=$(BIR_LDFLAGS) >> $(OUTPUTFILE)
+	@echo AR=$(AR) >> $(OUTPUTFILE)
+	@echo ARFLAGS=$(ARFLAGS) >> $(OUTPUTFILE)
+	@echo RANLIB=$(RANLIB) >> $(OUTPUTFILE)
+	@echo INSTALL_CMD=$(INSTALL_DATA) >> $(OUTPUTFILE)
+
+
+clean : 
+	$(RMV) $(OUTPUTFILE)
+

Modified: trunk/source/data/rbnf/af.txt
===================================================================
--- trunk/source/data/rbnf/af.txt	2009-07-02 19:27:40 UTC (rev 211)
+++ trunk/source/data/rbnf/af.txt	2009-07-02 19:28:39 UTC (rev 212)
@@ -12,26 +12,32 @@
 af{
     RBNFRules{
         OrdinalRules{
-            "%digits-ordinal:",
-            "0: =#,##0==%%digits-ordinal-indicator=;",
-            "-x: \u2212>>;",
             "%%digits-ordinal-indicator:",
             "0: ste;",
             "1: ste;",
             "2: de;",
             "20: ste;",
             "100: >>;",
+            "%digits-ordinal:",
+            "-x: \u2212>>;",
+            "0: =#,##0==%%digits-ordinal-indicator=;",
         }
         SpelloutRules{
             "%%2d-year:",
             "0: honderd[ >%spellout-numbering>];",
             "1: nul =%spellout-numbering=;",
             "10: =%spellout-numbering=;",
-            "%%ord-ste:",
-            "0: ste;",
-            "1: ' en =%spellout-ordinal=;",
-            "2: ' =%spellout-ordinal=;",
+            "%spellout-numbering-year:",
+            "-x: min >>;",
+            "x.x: =#,###0.#=;",
+            "0: =%spellout-numbering=;",
+            "1100/100: << >%%2d-year>;",
+            "10000: =%spellout-numbering=;",
+            "%spellout-numbering:",
+            "0: =%spellout-cardinal=;",
             "%spellout-cardinal:",
+            "-x: min >>;",
+            "x.x: << komma >>;",
             "0: nul;",
             "1: een;",
             "2: twee;",
@@ -70,17 +76,13 @@
             "1000000000000: << biljoen[ >>];",
             "1000000000000000: << biljard[ >>];",
             "1000000000000000000: =#,##0=;",
+            "%%ord-ste:",
+            "0: ste;",
+            "1: ' en =%spellout-ordinal=;",
+            "2: ' =%spellout-ordinal=;",
+            "%spellout-ordinal:",
             "-x: min >>;",
-            "x.x: << komma >>;",
-            "%spellout-numbering:",
-            "0: =%spellout-cardinal=;",
-            "%spellout-numbering-year:",
-            "0: =%spellout-numbering=;",
-            "1100/100: << >%%2d-year>;",
-            "10000: =%spellout-numbering=;",
-            "-x: min >>;",
-            "x.x: =#,###0.#=;",
-            "%spellout-ordinal:",
+            "x.x: =#,##0.#=;",
             "0: nulste;",
             "1: eerste;",
             "2: tweede;",
@@ -94,9 +96,7 @@
             "1000000000000: <%spellout-numbering< biljoen>%%ord-ste>;",
             "1000000000000000: <%spellout-numbering< biljard>%%ord-ste>;",
             "1000000000000000000: =#,##0=.;",
-            "-x: min >>;",
-            "x.x: =#,##0.#=;",
         }
     }
-    Version{"1.5"}
+    Version{"1.6"}
 }

Modified: trunk/source/data/rbnf/am.txt
===================================================================
--- trunk/source/data/rbnf/am.txt	2009-07-02 19:27:40 UTC (rev 211)
+++ trunk/source/data/rbnf/am.txt	2009-07-02 19:28:39 UTC (rev 212)
@@ -13,11 +13,21 @@
     RBNFRules{
         OrdinalRules{
             "%digits-ordinal:",
+            "-x: \u2212>>;",
             "0: =#,##0=\u129B;",
-            "-x: \u2212>>;",
         }
         SpelloutRules{
+            "%spellout-numbering-year:",
+            "-x: --- >>;",
+            "x.x: =#,###0.#=;",
+            "0: =%spellout-numbering=;",
+            "1100/100: << \u1218\u1276[ >>];",
+            "10000: =%spellout-numbering=;",
+            "%spellout-numbering:",
+            "0: =%spellout-cardinal=;",
             "%spellout-cardinal:",
+            "-x: --- >>;",
+            "x.x: << ... >>;",
             "0: \u1263\u12F6;",
             "1: \u12A0\u1295\u12F5;",
             "2: \u1201\u1208\u1275;",
@@ -48,21 +58,11 @@
             "1000000000000: << bilion[ >>];",
             "1000000000000000: << biliard[ >>];",
             "1000000000000000000: =#,##0=;",
-            "-x: --- >>;",
-            "x.x: << ... >>;",
-            "%spellout-numbering:",
-            "0: =%spellout-cardinal=;",
-            "%spellout-numbering-year:",
-            "0: =%spellout-numbering=;",
-            "1100/100: << \u1218\u1276[ >>];",
-            "10000: =%spellout-numbering=;",
-            "-x: --- >>;",
-            "x.x: =#,###0.#=;",
             "%spellout-ordinal:",
-            "0: =%spellout-numbering=\u129B;",
             "-x: --- >>;",
             "x.x: =#,##0.#=;",
+            "0: =%spellout-numbering=\u129B;",
         }
     }
-    Version{"1.1"}
+    Version{"1.2"}
 }

Modified: trunk/source/data/rbnf/ar.txt
===================================================================
--- trunk/source/data/rbnf/ar.txt	2009-07-02 19:27:40 UTC (rev 211)
+++ trunk/source/data/rbnf/ar.txt	2009-07-02 19:28:39 UTC (rev 212)
@@ -13,27 +13,71 @@
     RBNFRules{
         OrdinalRules{
             "%digits-ordinal:",
+            "-x: \u2212>>;",
             "0: =#,##0=.;",
-            "-x: \u2212>>;",
         }
         SpelloutRules{
+            "%spellout-numbering-year:",
+            "x.x: =#,###0.#=;",
+            "0: =%spellout-numbering=;",
+            "%spellout-numbering:",
+            "-x: \u0646\u0627\u0642\u0635 >>;",
+            "x.x: << \u0641\u0627\u0635\u0644\u0629 >>;",
+            "0: \u0635\u0641\u0631;",
+            "1: \u0648\u0627\u062D\u062F;",
+            "2: \u0625\u062B\u0646\u0627\u0646;",
+            "3: \u062B\u0644\u0627\u062B\u0629;",
+            "4: \u0623\u0631\u0628\u0639\u0629;",
+            "5: \u062E\u0645\u0633\u0629;",
+            "6: \u0633\u062A\u0629;",
+            "7: \u0633\u0628\u0639\u0629;",
+            "8: \u062B\u0645\u0627\u0646\u064A\u0629;",
+            "9: \u062A\u0633\u0639\u0629;",
+            "10: \u0639\u0634\u0631\u0629;",
+            "11: \u0625\u062D\u062F\u0649 \u0639\u0634\u0631;",
+            "12: \u0625\u062B\u0646\u0627 \u0639\u0634\u0631;",
+            "13: >%spellout-numbering> \u0639\u0634\u0631;",
+            "20: [>%spellout-numbering> \u0648]\u0639\u0634\u0631\u0648\u0646;",
+            "30: [>%spellout-numbering> \u0648]\u062B\u0644\u0627\u062B\u0648\u0646;",
+            "40: [>%spellout-numbering> \u0648]\u0623\u0631\u0628\u0639\u0648\u0646;",
+            "50: [>%spellout-numbering> \u0648]\u062E\u0645\u0633\u0648\u0646;",
+            "60: [>%spellout-numbering> \u0648]\u0633\u062A\u0648\u0646;",
+            "70: [>%spellout-numbering> \u0648]\u0633\u0628\u0639\u0648\u0646;",
+            "80: [>%spellout-numbering> \u0648]\u062B\u0645\u0627\u0646\u0648\u0646;",
+            "90: [>%spellout-numbering> \u0648]\u062A\u0633\u0639\u0648\u0646;",
+            "100: \u0645\u0627\u0626\u0629[ >%spellout-numbering>];",
+            "200: \u0645\u0627\u0626\u062A\u0627\u0646[ >%spellout-numbering>];",
+            "300: <%spellout-numbering< \u0645\u0627\u0626\u0629[ >%spellout-numbering>];",
+            "1000: \u0623\u0644\u0641[ >%spellout-numbering>];",
+            "2000: \u0623\u0644\u0641\u064A[ >%spellout-numbering>];",
+            "3000: <%spellout-numbering< \u0622\u0644\u0627\u0641[ >%spellout-numbering>];",
+            "11000/1000: <%%spellout-numbering-m< \u0623\u0644\u0641[ >%spellout-numbering>];",
+            "1000000: \u0645\u0644\u064A\u0648\u0646[ >%spellout-numbering>];",
+            "2000000: <%%spellout-numbering-m< \u0645\u0644\u064A\u0648\u0646[ >%spellout-numbering>];",
+            "1000000000: \u0645\u0644\u064A\u0627\u0631[ >%spellout-numbering>];",
+            "2000000000: <%%spellout-numbering-m< \u0645\u0644\u064A\u0627\u0631[ >%spellout-numbering>];",
+            "1000000000000: \u0628\u0644\u064A\u0648\u0646[ >%spellout-numbering>];",
+            "2000000000000: <%%spellout-numbering-m< \u0628\u0644\u064A\u0648\u0646[ >%spellout-numbering>];",
+            "1000000000000000: \u0628\u0644\u064A\u0627\u0631[ >%spellout-numbering>];",
+            "2000000000000000: <%%spellout-numbering-m< \u0628\u0644\u064A\u0627\u0631[ >%spellout-numbering>];",
+            "1000000000000000000: =#,##0=;",
+            "%spellout-cardinal-feminine-prefixpart:",
+            "-x: \u0646\u0627\u0642\u0635 >>;",
+            "x.x: <%spellout-numbering< \u0641\u0627\u0635\u0644\u0629 >%%zz-fraction-feminine> ;",
+            "0: \u0635\u0641\u0631 ;",
+            "1: ;",
+            "3: =%%spellout-cardinal-feminine-prefx= ;",
             "%spellout-cardinal-feminine-postfixpart:",
+            "-x: >>;",
+            "x.x: ;",
             "0: ;",
             "1: ' =%%spellout-cardinal-feminine-postfx=;",
             "3: ;",
-            "-x: >>;",
-            "x.x: ;",
             "%%spellout-cardinal-feminine-postfx:",
             "0: ;",
             "1: \u0648\u0627\u062D\u062F;",
             "2: \u0625\u062B\u0646\u0627\u0646;",
             "3: ;",
-            "%spellout-cardinal-feminine-prefixpart:",
-            "0: \u0635\u0641\u0631 ;",
-            "1: ;",
-            "3: =%%spellout-cardinal-feminine-prefx= ;",
-            "-x: \u0646\u0627\u0642\u0635 >>;",
-            "x.x: <%spellout-numbering< \u0641\u0627\u0635\u0644\u0629 >%%zz-fraction-feminine> ;",
             "%%spellout-cardinal-feminine-prefx:",
             "0: \u0635\u0641\u0631;",
             "1: ;",
@@ -72,26 +116,10 @@
             "1000000000000000: \u0628\u0644\u064A\u0627\u0631[ >%spellout-numbering>];",
             "2000000000000000: <%%spellout-numbering-m< \u0628\u0644\u064A\u0627\u0631[ >%spellout-numbering>];",
             "1000000000000000000: =#,##0=;",
-            "%spellout-cardinal-masculine-postfixpart:",
-            "0: ;",
-            "1: ' =%%spellout-cardinal-masculine-postfx=;",
-            "3: ;",
-            "-x: >>;",
-            "x.x: ;",
-            "%%spellout-cardinal-masculine-postfx:",
-            "0: ;",
+            "%%spellout-numbering-m:",
+            "0: \u0635\u0641\u0631;",
             "1: \u0648\u0627\u062D\u062F\u0629;",
             "2: \u0625\u062B\u0646\u0627\u0646\u0629;",
-            "3: ;",
-            "%spellout-cardinal-masculine-prefixpart:",
-            "0: \u0635\u0641\u0631 ;",
-            "1: ;",
-            "3: =%%spellout-cardinal-masculine-prefx= ;",
-            "-x: \u0646\u0627\u0642\u0635 >>;",
-            "x.x: <%%spellout-numbering-m< \u0641\u0627\u0635\u0644\u0629 >%%zz-fraction-masculine> ;",
-            "%%spellout-cardinal-masculine-prefx:",
-            "0: \u0635\u0641\u0631;",
-            "1: ;",
             "3: \u062B\u0644\u0627\u062B\u0629\u0629;",
             "4: \u0623\u0631\u0628\u0639\u0629;",
             "5: \u062E\u0645\u0633\u0629;",
@@ -127,51 +155,26 @@
             "1000000000000000: \u0628\u0644\u064A\u0627\u0631[ >%%spellout-numbering-m>];",
             "2000000000000000: <%%spellout-numbering-m< \u0628\u0644\u064A\u0627\u0631[ >%%spellout-numbering-m>];",
             "1000000000000000000: =#,##0=;",
-            "%spellout-numbering:",
-            "0: \u0635\u0641\u0631;",
-            "1: \u0648\u0627\u062D\u062F;",
-            "2: \u0625\u062B\u0646\u0627\u0646;",
-            "3: \u062B\u0644\u0627\u062B\u0629;",
-            "4: \u0623\u0631\u0628\u0639\u0629;",
-            "5: \u062E\u0645\u0633\u0629;",
-            "6: \u0633\u062A\u0629;",
-            "7: \u0633\u0628\u0639\u0629;",
-            "8: \u062B\u0645\u0627\u0646\u064A\u0629;",
-            "9: \u062A\u0633\u0639\u0629;",
-            "10: \u0639\u0634\u0631\u0629;",
-            "11: \u0625\u062D\u062F\u0649 \u0639\u0634\u0631;",
-            "12: \u0625\u062B\u0646\u0627 \u0639\u0634\u0631;",
-            "13: >%spellout-numbering> \u0639\u0634\u0631;",
-            "20: [>%spellout-numbering> \u0648]\u0639\u0634\u0631\u0648\u0646;",
-            "30: [>%spellout-numbering> \u0648]\u062B\u0644\u0627\u062B\u0648\u0646;",
-            "40: [>%spellout-numbering> \u0648]\u0623\u0631\u0628\u0639\u0648\u0646;",
-            "50: [>%spellout-numbering> \u0648]\u062E\u0645\u0633\u0648\u0646;",
-            "60: [>%spellout-numbering> \u0648]\u0633\u062A\u0648\u0646;",
-            "70: [>%spellout-numbering> \u0648]\u0633\u0628\u0639\u0648\u0646;",
-            "80: [>%spellout-numbering> \u0648]\u062B\u0645\u0627\u0646\u0648\u0646;",
-            "90: [>%spellout-numbering> \u0648]\u062A\u0633\u0639\u0648\u0646;",
-            "100: \u0645\u0627\u0626\u0629[ >%spellout-numbering>];",
-            "200: \u0645\u0627\u0626\u062A\u0627\u0646[ >%spellout-numbering>];",
-            "300: <%spellout-numbering< \u0645\u0627\u0626\u0629[ >%spellout-numbering>];",
-            "1000: \u0623\u0644\u0641[ >%spellout-numbering>];",
-            "2000: \u0623\u0644\u0641\u064A[ >%spellout-numbering>];",
-            "3000: <%spellout-numbering< \u0622\u0644\u0627\u0641[ >%spellout-numbering>];",
-            "11000/1000: <%%spellout-numbering-m< \u0623\u0644\u0641[ >%spellout-numbering>];",
-            "1000000: \u0645\u0644\u064A\u0648\u0646[ >%spellout-numbering>];",
-            "2000000: <%%spellout-numbering-m< \u0645\u0644\u064A\u0648\u0646[ >%spellout-numbering>];",
-            "1000000000: \u0645\u0644\u064A\u0627\u0631[ >%spellout-numbering>];",
-            "2000000000: <%%spellout-numbering-m< \u0645\u0644\u064A\u0627\u0631[ >%spellout-numbering>];",
-            "1000000000000: \u0628\u0644\u064A\u0648\u0646[ >%spellout-numbering>];",
-            "2000000000000: <%%spellout-numbering-m< \u0628\u0644\u064A\u0648\u0646[ >%spellout-numbering>];",
-            "1000000000000000: \u0628\u0644\u064A\u0627\u0631[ >%spellout-numbering>];",
-            "2000000000000000: <%%spellout-numbering-m< \u0628\u0644\u064A\u0627\u0631[ >%spellout-numbering>];",
-            "1000000000000000000: =#,##0=;",
+            "%spellout-cardinal-masculine-prefixpart:",
             "-x: \u0646\u0627\u0642\u0635 >>;",
-            "x.x: << \u0641\u0627\u0635\u0644\u0629 >>;",
-            "%%spellout-numbering-m:",
-            "0: \u0635\u0641\u0631;",
+            "x.x: <%%spellout-numbering-m< \u0641\u0627\u0635\u0644\u0629 >%%zz-fraction-masculine> ;",
+            "0: \u0635\u0641\u0631 ;",
+            "1: ;",
+            "3: =%%spellout-cardinal-masculine-prefx= ;",
+            "%spellout-cardinal-masculine-postfixpart:",
+            "-x: >>;",
+            "x.x: ;",
+            "0: ;",
+            "1: ' =%%spellout-cardinal-masculine-postfx=;",
+            "3: ;",
+            "%%spellout-cardinal-masculine-postfx:",
+            "0: ;",
             "1: \u0648\u0627\u062D\u062F\u0629;",
             "2: \u0625\u062B\u0646\u0627\u0646\u0629;",
+            "3: ;",
+            "%%spellout-cardinal-masculine-prefx:",
+            "0: \u0635\u0641\u0631;",
+            "1: ;",
             "3: \u062B\u0644\u0627\u062B\u0629\u0629;",
             "4: \u0623\u0631\u0628\u0639\u0629;",
             "5: \u062E\u0645\u0633\u0629;",
@@ -207,9 +210,6 @@
             "1000000000000000: \u0628\u0644\u064A\u0627\u0631[ >%%spellout-numbering-m>];",
             "2000000000000000: <%%spellout-numbering-m< \u0628\u0644\u064A\u0627\u0631[ >%%spellout-numbering-m>];",
             "1000000000000000000: =#,##0=;",
-            "%spellout-numbering-year:",
-            "0: =%spellout-numbering=;",
-            "x.x: =#,###0.#=;",
             "%%zz-fraction-feminine:",
             "10: <%spellout-numbering<<;",
             "100: <%spellout-numbering<<;",
@@ -234,5 +234,5 @@
             "10000000000: <#,##0<<;",
         }
     }
-    Version{"1.2"}
+    Version{"1.4"}
 }

Modified: trunk/source/data/rbnf/az.txt
===================================================================
--- trunk/source/data/rbnf/az.txt	2009-07-02 19:27:40 UTC (rev 211)
+++ trunk/source/data/rbnf/az.txt	2009-07-02 19:28:39 UTC (rev 212)
@@ -12,20 +12,21 @@
 az{
     RBNFRules{
         OrdinalRules{
+            "%%digits-ordinal-indicator:",
+            "0: ''inci;",
             "%digits-ordinal:",
+            "-x: \u2212>>;",
             "0: =#,##0==%%digits-ordinal-indicator=;",
-            "-x: \u2212>>;",
-            "%%digits-ordinal-indicator:",
-            "0: ''inci;",
         }
         SpelloutRules{
-            "%%inci:",
-            "0: inci;",
-            "1: ' =%spellout-ordinal=;",
-            "%%nci:",
-            "0: nci;",
-            "1: ' =%spellout-ordinal=;",
+            "%spellout-numbering-year:",
+            "x.x: =#,###0.#=;",
+            "0: =%spellout-numbering=;",
+            "%spellout-numbering:",
+            "0: =%spellout-cardinal=;",
             "%spellout-cardinal:",
+            "-x: eks\u0131 >>;",
+            "x.x: << virg\u00FCl >>;",
             "0: s\u0131f\u0131r;",
             "1: bir;",
             "2: iki;",
@@ -52,14 +53,24 @@
             "1000000000000: << bilyon[ >>];",
             "1000000000000000: << bilyard[ >>];",
             "1000000000000000000: =#,##0=;",
+            "%%inci:",
+            "0: inci;",
+            "1: ' =%spellout-ordinal=;",
+            "%%üncü:",
+            "0: uncu;",
+            "1: ' =%spellout-ordinal=;",
+            "%%nci:",
+            "0: nci;",
+            "1: ' =%spellout-ordinal=;",
+            "%%uncu:",
+            "0: uncu;",
+            "1: ' =%spellout-ordinal=;",
+            "%%ıncı:",
+            "0: \u0131nc\u0131;",
+            "1: ' =%spellout-ordinal=;",
+            "%spellout-ordinal:",
             "-x: eks\u0131 >>;",
-            "x.x: << virg\u00FCl >>;",
-            "%spellout-numbering:",
-            "0: =%spellout-cardinal=;",
-            "%spellout-numbering-year:",
-            "0: =%spellout-numbering=;",
-            "x.x: =#,###0.#=;",
-            "%spellout-ordinal:",
+            "x.x: =#,##0.#=;",
             "0: s\u0131f\u0131r\u0131nc\u0131;",
             "1: birinci;",
             "2: ikinci;",
@@ -86,18 +97,7 @@
             "1000000000000: <%spellout-numbering< bilyon>%%uncu>;",
             "1000000000000000: <%spellout-numbering< bilyar>%%\u0131nc\u0131>;",
             "1000000000000000000: =#,##0='inci;",
-            "-x: eks\u0131 >>;",
-            "x.x: =#,##0.#=;",
-            "%%uncu:",
-            "0: uncu;",
-            "1: ' =%spellout-ordinal=;",
-            "%%üncü:",
-            "0: uncu;",
-            "1: ' =%spellout-ordinal=;",
-            "%%ıncı:",
-            "0: \u0131nc\u0131;",
-            "1: ' =%spellout-ordinal=;",
         }
     }
-    Version{"1.1"}
+    Version{"1.2"}
 }

Modified: trunk/source/data/rbnf/be.txt
===================================================================
--- trunk/source/data/rbnf/be.txt	2009-07-02 19:27:40 UTC (rev 211)
+++ trunk/source/data/rbnf/be.txt	2009-07-02 19:28:39 UTC (rev 212)
@@ -14,11 +14,34 @@
         SpelloutRules{
             "%%lenient-parse:",
             "&[last primary ignorable ] << ' ' << ',' << '-' << '\u00AD';",
-            "%spellout-cardinal-feminine:",
+            "%spellout-numbering-year:",
+            "x.x: =#,###0.#=;",
+            "0: =%spellout-numbering=;",
+            "%spellout-numbering:",
+            "0: =%spellout-cardinal-masculine=;",
+            "%spellout-cardinal-masculine:",
+            "-x: \u043C\u0438\u043D\u0443\u0441 >>;",
+            "x.x: << \u043A\u043E\u043C\u0430 >>;",
             "0: \u043D\u0443\u043B\u0430;",
-            "1: \u0430\u0434\u043D\u0430;",
-            "2: \u0434\u0437\u0432\u0435;",
-            "3: =%spellout-cardinal-masculine=;",
+            "1: \u0430\u0434\u0437i\u043D;",
+            "2: \u0434\u0432\u0430;",
+            "3: \u0442\u0440\u044B;",
+            "4: \u0447\u0430\u0442\u044B\u0440\u044B;",
+            "5: \u043F\u044F\u0446\u044C;",
+            "6: \u0448\u044D\u0441\u0446\u044C;",
+            "7: \u0441\u0435\u043C;",
+            "8: \u0432\u043E\u0441\u0435\u043C;",
+            "9: \u0434\u0437\u0435\u0432\u044F\u0446\u044C;",
+            "10: \u0434\u0437\u0435\u0441\u044F\u0446\u044C;",
+            "11: \u0430\u0434\u0437\u0456\u043D\u0430\u0446\u0446\u0430\u0446\u044C;",
+            "12: \u0434\u0432\u0430\u043D\u0430\u0446\u0446\u0430\u0446\u044C;",
+            "13: \u0442\u0440\u044B\u043D\u0430\u0446\u0446\u0430\u0446\u044C;",
+            "14: \u0447\u0430\u0442\u044B\u0440\u043D\u0430\u0446\u0446\u0430\u0446\u044C;",
+            "15: \u043F\u044F\u0442\u043D\u0430\u0446\u0446\u0430\u0446\u044C;",
+            "16: \u0448\u0430\u0441\u043D\u0430\u0446\u0446\u0430\u0446\u044C;",
+            "17: \u0441\u0435\u043C\u043D\u0430\u0446\u0446\u0430\u0446\u044C;",
+            "18: \u0432\u0430\u0441\u0435\u043C\u043D\u0430\u0446\u0446\u0430\u0446\u044C;",
+            "19: \u0434\u0437\u0435\u0432\u044F\u0442\u043D\u0430\u0446\u0446\u0430\u0446\u044C;",
             "20: \u0434\u0432\u0430\u0446\u0446\u0430\u0446\u044C[ >>];",
             "30: \u0442\u0440\u044B\u0446\u0446\u0430\u0446\u044C[ >>];",
             "40: \u0441\u043E\u0440\u0430\u043A[ >>];",
@@ -52,29 +75,13 @@
             "2000000000000000: <%spellout-cardinal-masculine< \u0431\u0456\u043B\u044C\u044F\u0440\u0434\u0438[ >>];",
             "5000000000000000: <%spellout-cardinal-masculine< \u0431\u0456\u043B\u044C\u044F\u0440\u0434\u0456\u0432[ >>];",
             "1000000000000000000: =#,##0=;",
+            "%spellout-cardinal-neutre:",
             "-x: \u043C\u0438\u043D\u0443\u0441 >>;",
             "x.x: << \u043A\u043E\u043C\u0430 >>;",
-            "%spellout-cardinal-masculine:",
             "0: \u043D\u0443\u043B\u0430;",
-            "1: \u0430\u0434\u0437i\u043D;",
+            "1: \u0430\u0434\u043D\u043E;",
             "2: \u0434\u0432\u0430;",
-            "3: \u0442\u0440\u044B;",
-            "4: \u0447\u0430\u0442\u044B\u0440\u044B;",
-            "5: \u043F\u044F\u0446\u044C;",
-            "6: \u0448\u044D\u0441\u0446\u044C;",
-            "7: \u0441\u0435\u043C;",
-            "8: \u0432\u043E\u0441\u0435\u043C;",
-            "9: \u0434\u0437\u0435\u0432\u044F\u0446\u044C;",
-            "10: \u0434\u0437\u0435\u0441\u044F\u0446\u044C;",
-            "11: \u0430\u0434\u0437\u0456\u043D\u0430\u0446\u0446\u0430\u0446\u044C;",
-            "12: \u0434\u0432\u0430\u043D\u0430\u0446\u0446\u0430\u0446\u044C;",
-            "13: \u0442\u0440\u044B\u043D\u0430\u0446\u0446\u0430\u0446\u044C;",
-            "14: \u0447\u0430\u0442\u044B\u0440\u043D\u0430\u0446\u0446\u0430\u0446\u044C;",
-            "15: \u043F\u044F\u0442\u043D\u0430\u0446\u0446\u0430\u0446\u044C;",
-            "16: \u0448\u0430\u0441\u043D\u0430\u0446\u0446\u0430\u0446\u044C;",
-            "17: \u0441\u0435\u043C\u043D\u0430\u0446\u0446\u0430\u0446\u044C;",
-            "18: \u0432\u0430\u0441\u0435\u043C\u043D\u0430\u0446\u0446\u0430\u0446\u044C;",
-            "19: \u0434\u0437\u0435\u0432\u044F\u0442\u043D\u0430\u0446\u0446\u0430\u0446\u044C;",
+            "3: =%spellout-cardinal-masculine=;",
             "20: \u0434\u0432\u0430\u0446\u0446\u0430\u0446\u044C[ >>];",
             "30: \u0442\u0440\u044B\u0446\u0446\u0430\u0446\u044C[ >>];",
             "40: \u0441\u043E\u0440\u0430\u043A[ >>];",
@@ -108,12 +115,12 @@
             "2000000000000000: <%spellout-cardinal-masculine< \u0431\u0456\u043B\u044C\u044F\u0440\u0434\u0438[ >>];",
             "5000000000000000: <%spellout-cardinal-masculine< \u0431\u0456\u043B\u044C\u044F\u0440\u0434\u0456\u0432[ >>];",
             "1000000000000000000: =#,##0=;",
+            "%spellout-cardinal-feminine:",
             "-x: \u043C\u0438\u043D\u0443\u0441 >>;",
             "x.x: << \u043A\u043E\u043C\u0430 >>;",
-            "%spellout-cardinal-neutre:",
             "0: \u043D\u0443\u043B\u0430;",
-            "1: \u0430\u0434\u043D\u043E;",
-            "2: \u0434\u0432\u0430;",
+            "1: \u0430\u0434\u043D\u0430;",
+            "2: \u0434\u0437\u0432\u0435;",
             "3: =%spellout-cardinal-masculine=;",
             "20: \u0434\u0432\u0430\u0446\u0446\u0430\u0446\u044C[ >>];",
             "30: \u0442\u0440\u044B\u0446\u0446\u0430\u0446\u044C[ >>];",
@@ -148,14 +155,7 @@
             "2000000000000000: <%spellout-cardinal-masculine< \u0431\u0456\u043B\u044C\u044F\u0440\u0434\u0438[ >>];",
             "5000000000000000: <%spellout-cardinal-masculine< \u0431\u0456\u043B\u044C\u044F\u0440\u0434\u0456\u0432[ >>];",
             "1000000000000000000: =#,##0=;",
-            "-x: \u043C\u0438\u043D\u0443\u0441 >>;",
-            "x.x: << \u043A\u043E\u043C\u0430 >>;",
-            "%spellout-numbering:",
-            "0: =%spellout-cardinal-masculine=;",
-            "%spellout-numbering-year:",
-            "0: =%spellout-numbering=;",
-            "x.x: =#,###0.#=;",
         }
     }
-    Version{"1.1"}
+    Version{"1.2"}
 }

Modified: trunk/source/data/rbnf/bg.txt
===================================================================
--- trunk/source/data/rbnf/bg.txt	2009-07-02 19:27:40 UTC (rev 211)
+++ trunk/source/data/rbnf/bg.txt	2009-07-02 19:28:39 UTC (rev 212)
@@ -14,29 +14,14 @@
         SpelloutRules{
             "%%lenient-parse:",
             "&[last primary ignorable ] << ' ' << ',' << '-' << '\u00AD';",
-            "%spellout-cardinal-feminine:",
-            "0: \u043D\u0443\u043B\u0430;",
-            "1: \u0435\u0434\u043D\u0430;",
-            "2: \u0434\u0432\u0435;",
-            "3: =%spellout-cardinal-masculine=;",
-            "20: \u0434\u0432\u0430\u0435\u0441\u0435\u0442[ \u0438 >>];",
-            "30: \u0442\u0440\u0438\u0435\u0441\u0435\u0442[ \u0438 >>];",
-            "40: \u0447\u0435\u0442\u0438\u0440\u0438\u0435\u0441\u0435\u0442[ \u0438 >>];",
-            "50: \u043F\u0435\u0434\u0435\u0441\u0435\u0442[ \u0438 >>];",
-            "60: \u0448\u0435\u0435\u0441\u0435\u0442[ \u0438 >>];",
-            "70: \u0441\u0435\u0434\u0443\u043C\u0434\u0435\u0441\u0435\u0442[ \u0438 >>];",
-            "80: \u043E\u0441\u0443\u043C\u0434\u0435\u0441\u0435\u0442[ \u0438 >>];",
-            "90: \u0434\u0435\u0432\u0435\u0434\u0435\u0441\u0435\u0442[ \u0438 >>];",
-            "100: <%spellout-cardinal-feminine<\u0441\u0442\u043E[ >>];",
-            "1000: <%spellout-cardinal-feminine< \u0438\u043B\u0458\u0430\u0434\u0430[ >>];",
-            "1000000: <%spellout-cardinal-masculine< \u043C\u0438\u043B\u0438\u043E\u043D[ >>];",
-            "1000000000: <%spellout-cardinal-masculine< \u043C\u0438\u043B\u0438\u0458\u0430\u0440\u0434\u0430[ >>];",
-            "1000000000000: <%spellout-cardinal-masculine< \u0431\u0438\u043B\u0438\u043E\u043D[ >>];",
-            "1000000000000000: <%spellout-cardinal-masculine< \u0431\u0438\u043B\u0438\u0458\u0430\u0440\u0434\u0430[ >>];",
-            "1000000000000000000: =#,##0=;",
+            "%spellout-numbering-year:",
+            "x.x: =#,###0.#=;",
+            "0: =%spellout-numbering=;",
+            "%spellout-numbering:",
+            "0: =%spellout-cardinal-masculine=;",
+            "%spellout-cardinal-masculine:",
             "-x: \u043C\u0438\u043D\u0443\u0441 >>;",
             "x.x: << \u043A\u043E\u043C\u0430 >>;",
-            "%spellout-cardinal-masculine:",
             "0: \u043D\u0443\u043B\u0430;",
             "1: \u0435\u0434\u0435\u043D;",
             "2: \u0434\u0432\u0430;",
@@ -72,9 +57,9 @@
             "1000000000000: <%spellout-cardinal-masculine< \u0431\u0438\u043B\u0438\u043E\u043D[ >>];",
             "1000000000000000: <%spellout-cardinal-masculine< \u0431\u0438\u043B\u0438\u0458\u0430\u0440\u0434\u0430[ >>];",
             "1000000000000000000: =#,##0=;",
+            "%spellout-cardinal-neutre:",
             "-x: \u043C\u0438\u043D\u0443\u0441 >>;",
             "x.x: << \u043A\u043E\u043C\u0430 >>;",
-            "%spellout-cardinal-neutre:",
             "0: \u043D\u0443\u043B\u0430;",
             "1: \u0435\u0434\u043D\u043E;",
             "2: \u0434\u0432\u0430;",
@@ -94,14 +79,29 @@
             "1000000000000: <%spellout-cardinal-masculine< \u0431\u0438\u043B\u0438\u043E\u043D[ >>];",
             "1000000000000000: <%spellout-cardinal-masculine< \u0431\u0438\u043B\u0438\u0458\u0430\u0440\u0434\u0430[ >>];",
             "1000000000000000000: =#,##0=;",
+            "%spellout-cardinal-feminine:",
             "-x: \u043C\u0438\u043D\u0443\u0441 >>;",
             "x.x: << \u043A\u043E\u043C\u0430 >>;",
-            "%spellout-numbering:",
-            "0: =%spellout-cardinal-masculine=;",
-            "%spellout-numbering-year:",
-            "0: =%spellout-numbering=;",
-            "x.x: =#,###0.#=;",
+            "0: \u043D\u0443\u043B\u0430;",
+            "1: \u0435\u0434\u043D\u0430;",
+            "2: \u0434\u0432\u0435;",
+            "3: =%spellout-cardinal-masculine=;",
+            "20: \u0434\u0432\u0430\u0435\u0441\u0435\u0442[ \u0438 >>];",
+            "30: \u0442\u0440\u0438\u0435\u0441\u0435\u0442[ \u0438 >>];",
+            "40: \u0447\u0435\u0442\u0438\u0440\u0438\u0435\u0441\u0435\u0442[ \u0438 >>];",
+            "50: \u043F\u0435\u0434\u0435\u0441\u0435\u0442[ \u0438 >>];",
+            "60: \u0448\u0435\u0435\u0441\u0435\u0442[ \u0438 >>];",
+            "70: \u0441\u0435\u0434\u0443\u043C\u0434\u0435\u0441\u0435\u0442[ \u0438 >>];",
+            "80: \u043E\u0441\u0443\u043C\u0434\u0435\u0441\u0435\u0442[ \u0438 >>];",
+            "90: \u0434\u0435\u0432\u0435\u0434\u0435\u0441\u0435\u0442[ \u0438 >>];",
+            "100: <%spellout-cardinal-feminine<\u0441\u0442\u043E[ >>];",
+            "1000: <%spellout-cardinal-feminine< \u0438\u043B\u0458\u0430\u0434\u0430[ >>];",
+            "1000000: <%spellout-cardinal-masculine< \u043C\u0438\u043B\u0438\u043E\u043D[ >>];",
+            "1000000000: <%spellout-cardinal-masculine< \u043C\u0438\u043B\u0438\u0458\u0430\u0440\u0434\u0430[ >>];",
+            "1000000000000: <%spellout-cardinal-masculine< \u0431\u0438\u043B\u0438\u043E\u043D[ >>];",
+            "1000000000000000: <%spellout-cardinal-masculine< \u0431\u0438\u043B\u0438\u0458\u0430\u0440\u0434\u0430[ >>];",
+            "1000000000000000000: =#,##0=;",
         }
     }
-    Version{"1.1"}
+    Version{"1.2"}
 }

Modified: trunk/source/data/rbnf/ca.txt
===================================================================
--- trunk/source/data/rbnf/ca.txt	2009-07-02 19:27:40 UTC (rev 211)
+++ trunk/source/data/rbnf/ca.txt	2009-07-02 19:28:39 UTC (rev 212)
@@ -12,11 +12,6 @@
 ca{
     RBNFRules{
         OrdinalRules{
-            "%digits-ordinal:",
-            "0: =%digits-ordinal-masculine=;",
-            "%digits-ordinal-feminine:",
-            "0: =#,##0=a;",
-            "-x: \u2212>>;",
             "%%digits-ordinal-indicator-m:",
             "0: \u00E8;",
             "1: r;",
@@ -27,17 +22,29 @@
             "20: >>;",
             "100: >>;",
             "%digits-ordinal-masculine:",
+            "-x: \u2212>>;",
             "0: =#,##0==%%digits-ordinal-indicator-m=;",
+            "%digits-ordinal-feminine:",
             "-x: \u2212>>;",
+            "0: =#,##0=a;",
+            "%digits-ordinal:",
+            "0: =%digits-ordinal-masculine=;",
         }
         SpelloutRules{
             "%%lenient-parse:",
             "&[last primary ignorable ] << ' ' << ',' << '-' << '\u00AD';",
-            "%spellout-cardinal-feminine:",
+            "%spellout-numbering-year:",
+            "x.x: =#,###0.#=;",
+            "0: =%spellout-numbering=;",
+            "%%spellout-numbering-cents:",
+            "0: s;",
+            "1: ' =%spellout-cardinal-masculine=;",
+            "%spellout-numbering:",
+            "-x: menys >>;",
+            "x.x: << coma >>;",
             "0: zero;",
-            "1: una;",
-            "2: dues;",
-            "3: =%spellout-cardinal-masculine=;",
+            "1: u;",
+            "2: =%spellout-cardinal-masculine=;",
             "20: vint[-i->>];",
             "30: trenta[->>];",
             "40: quaranta[->>];",
@@ -47,7 +54,7 @@
             "80: vuitanta[->>];",
             "90: noranta[->>];",
             "100: cent[->>];",
-            "200: <%spellout-cardinal-masculine<-cent>%%spellout-cardinal-feminine-cents>;",
+            "200: <%spellout-cardinal-masculine<-cent>%%spellout-numbering-cents>;",
             "1000: mil[ >>];",
             "2000: <%spellout-cardinal-masculine< mil[ >>];",
             "1000000: un mili\u00F3[ >>];",
@@ -59,12 +66,12 @@
             "1000000000000000: un biliard[ >>];",
             "2000000000000000: <%spellout-cardinal-masculine< biliards[ >>];",
             "1000000000000000000: =#,##0=;",
+            "%%spellout-cardinal-masculine-cents:",
+            "0: s;",
+            "1: ' =%spellout-cardinal-masculine=;",
+            "%spellout-cardinal-masculine:",
             "-x: menys >>;",
             "x.x: << coma >>;",
-            "%%spellout-cardinal-feminine-cents:",
-            "0: s;",
-            "1: ' =%spellout-cardinal-feminine=;",
-            "%spellout-cardinal-masculine:",
             "0: zero;",
             "1: un;",
             "2: dos;",
@@ -106,15 +113,16 @@
             "1000000000000000: un biliard[ >>];",
             "2000000000000000: <%spellout-cardinal-masculine< biliards[ >>];",
             "1000000000000000000: =#,##0=;",
+            "%%spellout-cardinal-feminine-cents:",
+            "0: s;",
+            "1: ' =%spellout-cardinal-feminine=;",
+            "%spellout-cardinal-feminine:",
             "-x: menys >>;",
             "x.x: << coma >>;",
-            "%%spellout-cardinal-masculine-cents:",
-            "0: s;",
-            "1: ' =%spellout-cardinal-masculine=;",
-            "%spellout-numbering:",
             "0: zero;",
-            "1: u;",
-            "2: =%spellout-cardinal-masculine=;",
+            "1: una;",
+            "2: dues;",
+            "3: =%spellout-cardinal-masculine=;",
             "20: vint[-i->>];",
             "30: trenta[->>];",
             "40: quaranta[->>];",
@@ -124,7 +132,7 @@
             "80: vuitanta[->>];",
             "90: noranta[->>];",
             "100: cent[->>];",
-            "200: <%spellout-cardinal-masculine<-cent>%%spellout-numbering-cents>;",
+            "200: <%spellout-cardinal-masculine<-cent>%%spellout-cardinal-feminine-cents>;",
             "1000: mil[ >>];",
             "2000: <%spellout-cardinal-masculine< mil[ >>];",
             "1000000: un mili\u00F3[ >>];",
@@ -136,74 +144,15 @@
             "1000000000000000: un biliard[ >>];",
             "2000000000000000: <%spellout-cardinal-masculine< biliards[ >>];",
             "1000000000000000000: =#,##0=;",
+            "%%spellout-ordinal-masculine-cont:",
+            "0: \u00E8;",
+            "1: ' =%spellout-ordinal-masculine=;",
+            "%%spellout-ordinal-masculine-conts:",
+            "0: \u00E8;",
+            "1: s =%spellout-ordinal-masculine=;",
+            "%spellout-ordinal-masculine:",
             "-x: menys >>;",
-            "x.x: << coma >>;",
-            "%%spellout-numbering-cents:",
-            "0: s;",
-            "1: ' =%spellout-cardinal-masculine=;",
-            "%spellout-numbering-year:",
-            "0: =%spellout-numbering=;",
-            "x.x: =#,###0.#=;",
-            "%spellout-ordinal-feminine:",
-            "0: zerona;",
-            "1: primera;",
-            "2: segona;",
-            "3: tercera;",
-            "4: quarta;",
-            "5: cinquena;",
-            "6: sisena;",
-            "7: setena;",
-            "8: vuitena;",
-            "9: novena;",
-            "10: desena;",
-            "11: onzena;",
-            "12: dotzena;",
-            "13: tretzena;",
-            "14: catorzena;",
-            "15: quinzena;",
-            "16: setzena;",
-            "17: dissetena;",
-            "18: divuitena;",
-            "19: dinovena;",
-            "20: vintena;",
-            "21: vint-i->>;",
-            "30: trentena;",
-            "31: trenta->>;",
-            "40: quarantena;",
-            "41: quaranta->>;",
-            "50: cinquantena;",
-            "51: cinquanta->>;",
-            "60: seixantena;",
-            "61: seixanta->>;",
-            "70: setantena;",
-            "71: setanta->>;",
-            "80: vuitantena;",
-            "81: vuitanta->>;",
-            "90: norantena;",
-            "91: noranta->>;",
-            "100: centena;",
-            "101: cent->>;",
-            "200: <%spellout-cardinal-masculine<-cent>%%spellout-ordinal-feminine-cont>;",
-            "1000: mil>%%spellout-ordinal-feminine-cont>;",
-            "2000: <%spellout-cardinal-masculine< mil>%%spellout-ordinal-feminine-cont>;",
-            "1000000: un milion>%%spellout-ordinal-feminine-cont>;",
-            "2000000: <%spellout-cardinal-masculine< milion>%%spellout-ordinal-feminine-conts>;",
-            "1000000000: un miliard>%%spellout-ordinal-feminine-cont>;",
-            "2000000000: <%spellout-cardinal-masculine< miliard>%%spellout-ordinal-feminine-conts>;",
-            "1000000000000: un bilion>%%spellout-ordinal-feminine-cont>;",
-            "2000000000000: <%spellout-cardinal-masculine< bilion>%%spellout-ordinal-feminine-conts>;",
-            "1000000000000000: un biliard>%%spellout-ordinal-feminine-cont>;",
-            "2000000000000000: <%spellout-cardinal-masculine< biliard>%%spellout-ordinal-feminine-conts>;",
-            "1000000000000000000: =#,##0=ena;",
-            "-x: menys >>;",
             "x.x: =#,##0.#=;",
-            "%%spellout-ordinal-feminine-cont:",
-            "0: ena;",
-            "1: ' =%spellout-ordinal-feminine=;",
-            "%%spellout-ordinal-feminine-conts:",
-            "0: ena;",
-            "1: s =%spellout-ordinal-feminine=;",
-            "%spellout-ordinal-masculine:",
             "0: zero\u00E8;",
             "1: primer;",
             "2: segon;",
@@ -254,15 +203,66 @@
             "1000000000000000: un biliard>%%spellout-ordinal-masculine-cont>;",
             "2000000000000000: <%spellout-cardinal-masculine< biliard>%%spellout-ordinal-masculine-conts>;",
             "1000000000000000000: =#,##0=\u00E8;",
+            "%%spellout-ordinal-feminine-cont:",
+            "0: ena;",
+            "1: ' =%spellout-ordinal-feminine=;",
+            "%%spellout-ordinal-feminine-conts:",
+            "0: ena;",
+            "1: s =%spellout-ordinal-feminine=;",
+            "%spellout-ordinal-feminine:",
             "-x: menys >>;",
             "x.x: =#,##0.#=;",
-            "%%spellout-ordinal-masculine-cont:",
-            "0: \u00E8;",
-            "1: ' =%spellout-ordinal-masculine=;",
-            "%%spellout-ordinal-masculine-conts:",
-            "0: \u00E8;",
-            "1: s =%spellout-ordinal-masculine=;",
+            "0: zerona;",
+            "1: primera;",
+            "2: segona;",
+            "3: tercera;",
+            "4: quarta;",
+            "5: cinquena;",
+            "6: sisena;",
+            "7: setena;",
+            "8: vuitena;",
+            "9: novena;",
+            "10: desena;",
+            "11: onzena;",
+            "12: dotzena;",
+            "13: tretzena;",
+            "14: catorzena;",
+            "15: quinzena;",
+            "16: setzena;",
+            "17: dissetena;",
+            "18: divuitena;",
+            "19: dinovena;",
+            "20: vintena;",
+            "21: vint-i->>;",
+            "30: trentena;",
+            "31: trenta->>;",
+            "40: quarantena;",
+            "41: quaranta->>;",
+            "50: cinquantena;",
+            "51: cinquanta->>;",
+            "60: seixantena;",
+            "61: seixanta->>;",
+            "70: setantena;",
+            "71: setanta->>;",
+            "80: vuitantena;",
+            "81: vuitanta->>;",
+            "90: norantena;",
+            "91: noranta->>;",
+            "100: centena;",
+            "101: cent->>;",
+            "200: <%spellout-cardinal-masculine<-cent>%%spellout-ordinal-feminine-cont>;",
+            "1000: mil>%%spellout-ordinal-feminine-cont>;",
+            "2000: <%spellout-cardinal-masculine< mil>%%spellout-ordinal-feminine-cont>;",
+            "1000000: un milion>%%spellout-ordinal-feminine-cont>;",
+            "2000000: <%spellout-cardinal-masculine< milion>%%spellout-ordinal-feminine-conts>;",
+            "1000000000: un miliard>%%spellout-ordinal-feminine-cont>;",
+            "2000000000: <%spellout-cardinal-masculine< miliard>%%spellout-ordinal-feminine-conts>;",
+            "1000000000000: un bilion>%%spellout-ordinal-feminine-cont>;",
+            "2000000000000: <%spellout-cardinal-masculine< bilion>%%spellout-ordinal-feminine-conts>;",
+            "1000000000000000: un biliard>%%spellout-ordinal-feminine-cont>;",
+            "2000000000000000: <%spellout-cardinal-masculine< biliard>%%spellout-ordinal-feminine-conts>;",
+            "1000000000000000000: =#,##0=ena;",
         }
     }
-    Version{"1.5"}
+    Version{"1.6"}
 }

Modified: trunk/source/data/rbnf/cs.txt
===================================================================
--- trunk/source/data/rbnf/cs.txt	2009-07-02 19:27:40 UTC (rev 211)
+++ trunk/source/data/rbnf/cs.txt	2009-07-02 19:28:39 UTC (rev 212)
@@ -12,11 +12,34 @@
 cs{
     RBNFRules{
         SpelloutRules{
-            "%spellout-cardinal-feminine:",
+            "%spellout-numbering-year:",
+            "x.x: =#,###0.#=;",
+            "0: =%spellout-numbering=;",
+            "%spellout-numbering:",
+            "0: =%spellout-cardinal-masculine=;",
+            "%spellout-cardinal-masculine:",
+            "-x: minus >>;",
+            "x.x: << \u010D\u00E1rka >>;",
             "0: nula;",
-            "1: jedna;",
-            "2: dv\u011B;",
-            "3: =%spellout-cardinal-masculine=;",
+            "1: jeden;",
+            "2: dva;",
+            "3: t\u0159i;",
+            "4: \u010Dty\u0159i;",
+            "5: p\u011Bt;",
+            "6: \u0161est;",
+            "7: sedm;",
+            "8: osm;",
+            "9: dev\u011Bt;",
+            "10: deset;",
+            "11: jeden\u00E1ct;",
+            "12: dvan\u00E1ct;",
+            "13: t\u0159in\u00E1ct;",
+            "14: \u010Dtrn\u00E1ct;",
+            "15: patn\u00E1ct;",
+            "16: \u0161estn\u00E1ct;",
+            "17: sedmn\u00E1ct;",
+            "18: osmn\u00E1ct;",
+            "19: devaten\u00E1ct;",
             "20: <%spellout-cardinal-masculine<cet[ >>];",
             "50: pades\u00E1t[ >>];",
             "60: \u0161edes\u00E1t[ >>];",
@@ -43,29 +66,13 @@
             "2000000000000000: <%spellout-cardinal-masculine< biliardy[ >>];",
             "5000000000000000: <%spellout-cardinal-masculine< biliard\u016F[ >>];",
             "1000000000000000000: =#,##0=;",
+            "%spellout-cardinal-neutre:",
             "-x: minus >>;",
             "x.x: << \u010D\u00E1rka >>;",
-            "%spellout-cardinal-masculine:",
             "0: nula;",
-            "1: jeden;",
-            "2: dva;",
-            "3: t\u0159i;",
-            "4: \u010Dty\u0159i;",
-            "5: p\u011Bt;",
-            "6: \u0161est;",
-            "7: sedm;",
-            "8: osm;",
-            "9: dev\u011Bt;",
-            "10: deset;",
-            "11: jeden\u00E1ct;",
-            "12: dvan\u00E1ct;",
-            "13: t\u0159in\u00E1ct;",
-            "14: \u010Dtrn\u00E1ct;",
-            "15: patn\u00E1ct;",
-            "16: \u0161estn\u00E1ct;",
-            "17: sedmn\u00E1ct;",
-            "18: osmn\u00E1ct;",
-            "19: devaten\u00E1ct;",
+            "1: jedno;",
+            "2: dv\u011B;",
+            "3: =%spellout-cardinal-masculine=;",
             "20: <%spellout-cardinal-masculine<cet[ >>];",
             "50: pades\u00E1t[ >>];",
             "60: \u0161edes\u00E1t[ >>];",
@@ -92,11 +99,11 @@
             "2000000000000000: <%spellout-cardinal-masculine< biliardy[ >>];",
             "5000000000000000: <%spellout-cardinal-masculine< biliard\u016F[ >>];",
             "1000000000000000000: =#,##0=;",
+            "%spellout-cardinal-feminine:",
             "-x: minus >>;",
             "x.x: << \u010D\u00E1rka >>;",
-            "%spellout-cardinal-neutre:",
             "0: nula;",
-            "1: jedno;",
+            "1: jedna;",
             "2: dv\u011B;",
             "3: =%spellout-cardinal-masculine=;",
             "20: <%spellout-cardinal-masculine<cet[ >>];",
@@ -125,14 +132,7 @@
             "2000000000000000: <%spellout-cardinal-masculine< biliardy[ >>];",
             "5000000000000000: <%spellout-cardinal-masculine< biliard\u016F[ >>];",
             "1000000000000000000: =#,##0=;",
-            "-x: minus >>;",
-            "x.x: << \u010D\u00E1rka >>;",
-            "%spellout-numbering:",
-            "0: =%spellout-cardinal-masculine=;",
-            "%spellout-numbering-year:",
-            "0: =%spellout-numbering=;",
-            "x.x: =#,###0.#=;",
         }
     }
-    Version{"1.5"}
+    Version{"1.6"}
 }

Modified: trunk/source/data/rbnf/cy.txt
===================================================================
--- trunk/source/data/rbnf/cy.txt	2009-07-02 19:27:40 UTC (rev 211)
+++ trunk/source/data/rbnf/cy.txt	2009-07-02 19:28:39 UTC (rev 212)
@@ -14,12 +14,19 @@
         SpelloutRules{
             "%%lenient-parse:",
             "& ' ' , ',' ;",
-            "%spellout-cardinal-feminine:",
+            "%spellout-numbering-year:",
+            "x.x: =#,###0.#=;",
+            "0: =%spellout-numbering=;",
+            "%spellout-numbering:",
+            "0: =%spellout-cardinal-masculine=;",
+            "%spellout-cardinal-masculine:",
+            "-x: m\u00EDneas >>;",
+            "x.x: << pointe >>;",
             "0: dim;",
             "1: un;",
-            "2: dwy;",
-            "3: tair;",
-            "4: pedair;",
+            "2: dau;",
+            "3: tri;",
+            "4: pedwar;",
             "5: pump;",
             "6: chwech;",
             "7: saith;",
@@ -35,14 +42,14 @@
             "1000000000000: <%spellout-cardinal-masculine-before-consonant< triliwn[ >>];",
             "1000000000000000: <%spellout-cardinal-masculine-before-consonant< kwadriliwn[ >>];",
             "1000000000000000000: =#,##0=;",
+            "%spellout-cardinal-masculine-before-consonant:",
             "-x: m\u00EDneas >>;",
             "x.x: << pointe >>;",
-            "%spellout-cardinal-feminine-before-consonant:",
             "0: dim;",
             "1: un;",
-            "2: dwy;",
-            "3: tair;",
-            "4: pedair;",
+            "2: dau;",
+            "3: tri;",
+            "4: pedwar;",
             "5: pum;",
             "6: chwe;",
             "7: saith;",
@@ -58,17 +65,17 @@
             "1000000000000: <%spellout-cardinal-masculine-before-consonant< triliwn[ >>];",
             "1000000000000000: <%spellout-cardinal-masculine-before-consonant< kwadriliwn[ >>];",
             "1000000000000000000: =#,##0=;",
+            "%spellout-cardinal-feminine:",
             "-x: m\u00EDneas >>;",
             "x.x: << pointe >>;",
-            "%spellout-cardinal-masculine:",
             "0: dim;",
             "1: un;",
-            "2: dau;",
-            "3: tri;",
-            "4: pedwar;",
+            "2: dwy;",
+            "3: tair;",
+            "4: pedair;",
             "5: pump;",
             "6: chwech;",
-            "7: 7. saith;",
+            "7: saith;",
             "8: wyth;",
             "9: naw;",
             "10: un deg[ >>];",
@@ -81,14 +88,14 @@
             "1000000000000: <%spellout-cardinal-masculine-before-consonant< triliwn[ >>];",
             "1000000000000000: <%spellout-cardinal-masculine-before-consonant< kwadriliwn[ >>];",
             "1000000000000000000: =#,##0=;",
+            "%spellout-cardinal-feminine-before-consonant:",
             "-x: m\u00EDneas >>;",
             "x.x: << pointe >>;",
-            "%spellout-cardinal-masculine-before-consonant:",
             "0: dim;",
             "1: un;",
-            "2: dau;",
-            "3: tri;",
-            "4: pedwar;",
+            "2: dwy;",
+            "3: tair;",
+            "4: pedair;",
             "5: pum;",
             "6: chwe;",
             "7: saith;",
@@ -104,14 +111,7 @@
             "1000000000000: <%spellout-cardinal-masculine-before-consonant< triliwn[ >>];",
             "1000000000000000: <%spellout-cardinal-masculine-before-consonant< kwadriliwn[ >>];",
             "1000000000000000000: =#,##0=;",
-            "-x: m\u00EDneas >>;",
-            "x.x: << pointe >>;",
-            "%spellout-numbering:",
-            "0: =%spellout-cardinal-masculine=;",
-            "%spellout-numbering-year:",
-            "0: =%spellout-numbering=;",
-            "x.x: =#,###0.#=;",
         }
     }
-    Version{"1.1"}
+    Version{"1.3"}
 }

Modified: trunk/source/data/rbnf/da.txt
===================================================================
--- trunk/source/data/rbnf/da.txt	2009-07-02 19:27:40 UTC (rev 211)
+++ trunk/source/data/rbnf/da.txt	2009-07-02 19:28:39 UTC (rev 212)
@@ -14,17 +14,27 @@
         SpelloutRules{
             "%%lenient-parse:",
             "&[last primary ignorable ] << ' ' << ',' << '-' << '\u00AD';",
-            "%spellout-cardinal-feminine:",
+            "%spellout-numbering-year:",
+            "-x: minus >>;",
+            "x.x: =#,###0.#=;",
+            "0: =%spellout-numbering=;",
+            "1100/100: <<\u00ADhundred[ og >>];",
+            "10000: =%spellout-numbering=;",
+            "%spellout-numbering:",
             "0: =%spellout-cardinal-reale=;",
-            "%spellout-cardinal-masculine:",
-            "0: =%spellout-cardinal-reale=;",
             "%spellout-cardinal-neutre:",
+            "-x: minus >>;",
+            "x.x: << komma >>;",
             "0: nul;",
             "1: et;",
             "2: =%spellout-cardinal-reale=;",
+            "%spellout-cardinal-masculine:",
+            "0: =%spellout-cardinal-reale=;",
+            "%spellout-cardinal-feminine:",
+            "0: =%spellout-cardinal-reale=;",
+            "%spellout-cardinal-reale:",
             "-x: minus >>;",
             "x.x: << komma >>;",
-            "%spellout-cardinal-reale:",
             "0: nul;",
             "1: en;",
             "2: to;",
@@ -66,17 +76,7 @@
             "1000000000000000: en billiard[ og >>];",
             "2000000000000000: << billiarder[ og >>];",
             "1000000000000000000: =#,##0=;",
-            "-x: minus >>;",
-            "x.x: << komma >>;",
-            "%spellout-numbering:",
-            "0: =%spellout-cardinal-reale=;",
-            "%spellout-numbering-year:",
-            "0: =%spellout-numbering=;",
-            "1100/100: <<\u00ADhundred[ og >>];",
-            "10000: =%spellout-numbering=;",
-            "-x: minus >>;",
-            "x.x: =#,###0.#=;",
         }
     }
-    Version{"1.5"}
+    Version{"1.6"}
 }

Modified: trunk/source/data/rbnf/de.txt
===================================================================
--- trunk/source/data/rbnf/de.txt	2009-07-02 19:27:40 UTC (rev 211)
+++ trunk/source/data/rbnf/de.txt	2009-07-02 19:28:39 UTC (rev 212)
@@ -14,10 +14,37 @@
         SpelloutRules{
             "%%lenient-parse:",
             "&ue=\u00FC&ae=\u00E4&oe=\u00F6&[last primary ignorable ] << ' ' << ',' << '-' << '\u00AD';",
-            "%spellout-cardinal-feminine:",
+            "%spellout-numbering-year:",
+            "-x: minus >>;",
+            "x.x: =#,###0.#=;",
+            "0: =%spellout-numbering=;",
+            "1100/100: <%spellout-cardinal-masculine<\u00ADhundert[\u00AD>>];",
+            "10000: =%spellout-numbering=;",
+            "%spellout-numbering:",
+            "-x: minus >>;",
+            "x.x: << Komma >>;",
             "0: null;",
-            "1: eine;",
-            "2: =%spellout-numbering=;",
+            "1: eins;",
+            "2: zwei;",
+            "3: drei;",
+            "4: vier;",
+            "5: f\u00FCnf;",
+            "6: sechs;",
+            "7: sieben;",
+            "8: acht;",
+            "9: neun;",
+            "10: zehn;",
+            "11: elf;",
+            "12: zw\u00F6lf;",
+            "13: >>zehn;",
+            "20: [>%spellout-cardinal-masculine>\u00ADund\u00AD]zwanzig;",
+            "30: [>%spellout-cardinal-masculine>\u00ADund\u00AD]drei\u00DFig;",
+            "40: [>%spellout-cardinal-masculine>\u00ADund\u00AD]vierzig;",
+            "50: [>%spellout-cardinal-masculine>\u00ADund\u00AD]f\u00FCnfzig;",
+            "60: [>%spellout-cardinal-masculine>\u00ADund\u00AD]sechzig;",
+            "70: [>%spellout-cardinal-masculine>\u00ADund\u00AD]siebzig;",
+            "80: [>%spellout-cardinal-masculine>\u00ADund\u00AD]achtzig;",
+            "90: [>%spellout-cardinal-masculine>\u00ADund\u00AD]neunzig;",
             "100: <%spellout-cardinal-masculine<\u00ADhundert[\u00AD>>];",
             "1000: <%spellout-cardinal-masculine<\u00ADtausend[\u00AD>>];",
             "1000000: eine Million[ >>];",
@@ -29,9 +56,11 @@
             "1000000000000000: eine Billiarde[ >>];",
             "2000000000000000: <%spellout-cardinal-feminine< Billiarden[ >>];",
             "1000000000000000000: =#,##0=;",
+            "%spellout-cardinal-neutre:",
+            "0: =%spellout-cardinal-masculine=;",
+            "%spellout-cardinal-masculine:",
             "-x: minus >>;",
             "x.x: << Komma >>;",
-            "%spellout-cardinal-masculine:",
             "0: null;",
             "1: ein;",
             "2: =%spellout-numbering=;",
@@ -46,33 +75,12 @@
             "1000000000000000: eine Billiarde[ >>];",
             "2000000000000000: <%spellout-cardinal-feminine< Billiarden[ >>];",
             "1000000000000000000: =#,##0=;",
+            "%spellout-cardinal-feminine:",
             "-x: minus >>;",
             "x.x: << Komma >>;",
-            "%spellout-cardinal-neutre:",
-            "0: =%spellout-cardinal-masculine=;",
-            "%spellout-numbering:",
             "0: null;",
-            "1: eins;",
-            "2: zwei;",
-            "3: drei;",
-            "4: vier;",
-            "5: f\u00FCnf;",
-            "6: sechs;",
-            "7: sieben;",
-            "8: acht;",
-            "9: neun;",
-            "10: zehn;",
-            "11: elf;",
-            "12: zw\u00F6lf;",
-            "13: >>zehn;",
-            "20: [>%spellout-cardinal-masculine>\u00ADund\u00AD]zwanzig;",
-            "30: [>%spellout-cardinal-masculine>\u00ADund\u00AD]drei\u00DFig;",
-            "40: [>%spellout-cardinal-masculine>\u00ADund\u00AD]vierzig;",
-            "50: [>%spellout-cardinal-masculine>\u00ADund\u00AD]f\u00FCnfzig;",
-            "60: [>%spellout-cardinal-masculine>\u00ADund\u00AD]sechzig;",
-            "70: [>%spellout-cardinal-masculine>\u00ADund\u00AD]siebzig;",
-            "80: [>%spellout-cardinal-masculine>\u00ADund\u00AD]achtzig;",
-            "90: [>%spellout-cardinal-masculine>\u00ADund\u00AD]neunzig;",
+            "1: eine;",
+            "2: =%spellout-numbering=;",
             "100: <%spellout-cardinal-masculine<\u00ADhundert[\u00AD>>];",
             "1000: <%spellout-cardinal-masculine<\u00ADtausend[\u00AD>>];",
             "1000000: eine Million[ >>];",
@@ -84,15 +92,15 @@
             "1000000000000000: eine Billiarde[ >>];",
             "2000000000000000: <%spellout-cardinal-feminine< Billiarden[ >>];",
             "1000000000000000000: =#,##0=;",
+            "%%ste:",
+            "0: ste;",
+            "1: \u00AD=%spellout-ordinal=;",
+            "%%ste2:",
+            "0: ste;",
+            "1: ' =%spellout-ordinal=;",
+            "%spellout-ordinal:",
             "-x: minus >>;",
-            "x.x: << Komma >>;",
-            "%spellout-numbering-year:",
-            "0: =%spellout-numbering=;",
-            "1100/100: <%spellout-cardinal-masculine<\u00ADhundert[\u00AD>>];",
-            "10000: =%spellout-numbering=;",
-            "-x: minus >>;",
-            "x.x: =#,###0.#=;",
-            "%spellout-ordinal:",
+            "x.x: =#,##0.#=;",
             "0: nullte;",
             "1: erste;",
             "2: zweite;",
@@ -115,15 +123,7 @@
             "1000000000000000: eine Billiarde>%%ste2>;",
             "2000000000000000: <%spellout-cardinal-feminine< Billiarden>%%ste2>;",
             "1000000000000000000: =#,##0=.;",
-            "-x: minus >>;",
-            "x.x: =#,##0.#=;",
-            "%%ste:",
-            "0: ste;",
-            "1: \u00AD=%spellout-ordinal=;",
-            "%%ste2:",
-            "0: ste;",
-            "1: ' =%spellout-ordinal=;",
         }
     }
-    Version{"1.6"}
+    Version{"1.7"}
 }

Modified: trunk/source/data/rbnf/el.txt
===================================================================
--- trunk/source/data/rbnf/el.txt	2009-07-02 19:27:40 UTC (rev 211)
+++ trunk/source/data/rbnf/el.txt	2009-07-02 19:28:39 UTC (rev 212)
@@ -12,9 +12,16 @@
 el{
     RBNFRules{
         SpelloutRules{
-            "%spellout-cardinal-feminine:",
+            "%spellout-numbering-year:",
+            "x.x: =#,###0.#=;",
+            "0: =%spellout-numbering=;",
+            "%spellout-numbering:",
+            "0: =%spellout-cardinal-neutre=;",
+            "%spellout-cardinal-masculine:",
+            "-x: \u03BC\u03B5\u03AF\u03BF\u03BD >>;",
+            "x.x: << \u03BA\u03CC\u03BC\u03BC\u03B1 >>;",
             "0: \u03BC\u03B7\u03B4\u03AD\u03BD;",
-            "1: \u03BC\u03AF\u03B1;",
+            "1: \u03AD\u03BD\u03B1\u03C2;",
             "2: \u03B4\u03CD\u03BF;",
             "3: \u03C4\u03C1\u03B5\u03B9\u03C2;",
             "4: \u03C4\u03AD\u03C3\u03C3\u03B5\u03C1\u03B9\u03C2;",
@@ -36,15 +43,15 @@
             "80: \u03BF\u03B3\u03B4\u03CC\u03BD\u03C4\u03B1[ >>];",
             "90: \u03B5\u03BD\u03BD\u03B5\u03BD\u03AE\u03BD\u03C4\u03B1[ >>];",
             "100: \u03B5\u03BA\u03B1\u03C4\u03CC[\u03BD >>];",
-            "200: \u03B4\u03B9\u03B1\u03BA\u03CC\u03C3\u03B9\u03B5\u03C2[ >>];",
-            "300: \u03C4\u03C1\u03B9\u03B1\u03BA\u03CC\u03C3\u03B9\u03B5\u03C2[ >>];",
-            "400: \u03C4\u03B5\u03C4\u03C1\u03B1\u03BA\u03CC\u03C3\u03B9\u03B5\u03C2[ >>];",
-            "500: \u03C0\u03B5\u03BD\u03C4\u03B1\u03BA\u03CC\u03C3\u03B9\u03B5\u03C2[ >>];",
-            "600: \u03B5\u03BE\u03B1\u03BA\u03CC\u03C3\u03B9\u03B5\u03C2[ >>];",
-            "700: \u03B5\u03C0\u03C4\u03B1\u03BA\u03CC\u03C3\u03B9\u03B5\u03C2[ >>];",
-            "800: \u03BF\u03BA\u03C4\u03B1\u03BA\u03CC\u03C3\u03B9\u03B5\u03C2[ >>];",
-            "900: \u03B5\u03BD\u03BD\u03B9\u03B1\u03BA\u03CC\u03C3\u03B9\u03B5\u03C2[ >>];",
-            "1000: \u03C7\u03AF\u03BB\u03B9\u03B5\u03C2[ >>];",
+            "200: \u03B4\u03B9\u03B1\u03BA\u03CC\u03C3\u03B9\u03BF\u03B9[ >>];",
+            "300: \u03C4\u03C1\u03B9\u03B1\u03BA\u03CC\u03C3\u03B9\u03BF\u03B9[ >>];",
+            "400: \u03C4\u03B5\u03C4\u03C1\u03B1\u03BA\u03CC\u03C3\u03B9\u03BF\u03B9[ >>];",
+            "500: \u03C0\u03B5\u03BD\u03C4\u03B1\u03BA\u03CC\u03C3\u03B9\u03BF\u03B9[ >>];",
+            "600: \u03B5\u03BE\u03B1\u03BA\u03CC\u03C3\u03B9\u03BF\u03B9[ >>];",
+            "700: \u03B5\u03C0\u03C4\u03B1\u03BA\u03CC\u03C3\u03B9\u03BF\u03B9[ >>];",
+            "800: \u03BF\u03BA\u03C4\u03B1\u03BA\u03CC\u03C3\u03B9\u03BF\u03B9[ >>];",
+            "900: \u03B5\u03BD\u03BD\u03B9\u03B1\u03BA\u03CC\u03C3\u03B9\u03BF\u03B9[ >>];",
+            "1000: \u03C7\u03AF\u03BB\u03B9\u03BF\u03B9[ >>];",
             "2000: <%spellout-cardinal-feminine< \u03C7\u03AF\u03BB\u03B9\u03AC\u03B4\u03B5\u03C2[ >>];",
             "1000000: <%spellout-cardinal-neutre< \u03B5\u03BA\u03B1\u03C4\u03BF\u03BC\u03BC\u03CD\u03C1\u03B9\u03BF[ >>];",
             "2000000: <%spellout-cardinal-neutre< \u03B5\u03BA\u03B1\u03C4\u03BF\u03BC\u03BC\u03CD\u03C1\u03B9\u03B1[ >>];",
@@ -55,11 +62,11 @@
             "1000000000000000: <%spellout-cardinal-neutre< \u03C4\u03B5\u03C4\u03C1\u03AC\u03BA\u03B9\u03C2 \u03B5\u03BA\u03B1\u03C4\u03BF\u03BC\u03BC\u03CD\u03C1\u03B9\u03BF[ >>];",
             "2000000000000000: <%spellout-cardinal-neutre< \u03C4\u03B5\u03C4\u03C1\u03AC\u03BA\u03B9\u03C2 \u03B5\u03BA\u03B1\u03C4\u03BF\u03BC\u03BC\u03CD\u03C1\u03B9\u03B1[ >>];",
             "1000000000000000000: =#,##0=;",
+            "%spellout-cardinal-feminine:",
             "-x: \u03BC\u03B5\u03AF\u03BF\u03BD >>;",
             "x.x: << \u03BA\u03CC\u03BC\u03BC\u03B1 >>;",
-            "%spellout-cardinal-masculine:",
             "0: \u03BC\u03B7\u03B4\u03AD\u03BD;",
-            "1: \u03AD\u03BD\u03B1\u03C2;",
+            "1: \u03BC\u03AF\u03B1;",
             "2: \u03B4\u03CD\u03BF;",
             "3: \u03C4\u03C1\u03B5\u03B9\u03C2;",
             "4: \u03C4\u03AD\u03C3\u03C3\u03B5\u03C1\u03B9\u03C2;",
@@ -81,15 +88,15 @@
             "80: \u03BF\u03B3\u03B4\u03CC\u03BD\u03C4\u03B1[ >>];",
             "90: \u03B5\u03BD\u03BD\u03B5\u03BD\u03AE\u03BD\u03C4\u03B1[ >>];",
             "100: \u03B5\u03BA\u03B1\u03C4\u03CC[\u03BD >>];",
-            "200: \u03B4\u03B9\u03B1\u03BA\u03CC\u03C3\u03B9\u03BF\u03B9[ >>];",
-            "300: \u03C4\u03C1\u03B9\u03B1\u03BA\u03CC\u03C3\u03B9\u03BF\u03B9[ >>];",
-            "400: \u03C4\u03B5\u03C4\u03C1\u03B1\u03BA\u03CC\u03C3\u03B9\u03BF\u03B9[ >>];",
-            "500: \u03C0\u03B5\u03BD\u03C4\u03B1\u03BA\u03CC\u03C3\u03B9\u03BF\u03B9[ >>];",
-            "600: \u03B5\u03BE\u03B1\u03BA\u03CC\u03C3\u03B9\u03BF\u03B9[ >>];",
-            "700: \u03B5\u03C0\u03C4\u03B1\u03BA\u03CC\u03C3\u03B9\u03BF\u03B9[ >>];",
-            "800: \u03BF\u03BA\u03C4\u03B1\u03BA\u03CC\u03C3\u03B9\u03BF\u03B9[ >>];",
-            "900: \u03B5\u03BD\u03BD\u03B9\u03B1\u03BA\u03CC\u03C3\u03B9\u03BF\u03B9[ >>];",
-            "1000: \u03C7\u03AF\u03BB\u03B9\u03BF\u03B9[ >>];",
+            "200: \u03B4\u03B9\u03B1\u03BA\u03CC\u03C3\u03B9\u03B5\u03C2[ >>];",
+            "300: \u03C4\u03C1\u03B9\u03B1\u03BA\u03CC\u03C3\u03B9\u03B5\u03C2[ >>];",
+            "400: \u03C4\u03B5\u03C4\u03C1\u03B1\u03BA\u03CC\u03C3\u03B9\u03B5\u03C2[ >>];",
+            "500: \u03C0\u03B5\u03BD\u03C4\u03B1\u03BA\u03CC\u03C3\u03B9\u03B5\u03C2[ >>];",
+            "600: \u03B5\u03BE\u03B1\u03BA\u03CC\u03C3\u03B9\u03B5\u03C2[ >>];",
+            "700: \u03B5\u03C0\u03C4\u03B1\u03BA\u03CC\u03C3\u03B9\u03B5\u03C2[ >>];",
+            "800: \u03BF\u03BA\u03C4\u03B1\u03BA\u03CC\u03C3\u03B9\u03B5\u03C2[ >>];",
+            "900: \u03B5\u03BD\u03BD\u03B9\u03B1\u03BA\u03CC\u03C3\u03B9\u03B5\u03C2[ >>];",
+            "1000: \u03C7\u03AF\u03BB\u03B9\u03B5\u03C2[ >>];",
             "2000: <%spellout-cardinal-feminine< \u03C7\u03AF\u03BB\u03B9\u03AC\u03B4\u03B5\u03C2[ >>];",
             "1000000: <%spellout-cardinal-neutre< \u03B5\u03BA\u03B1\u03C4\u03BF\u03BC\u03BC\u03CD\u03C1\u03B9\u03BF[ >>];",
             "2000000: <%spellout-cardinal-neutre< \u03B5\u03BA\u03B1\u03C4\u03BF\u03BC\u03BC\u03CD\u03C1\u03B9\u03B1[ >>];",
@@ -100,9 +107,9 @@
             "1000000000000000: <%spellout-cardinal-neutre< \u03C4\u03B5\u03C4\u03C1\u03AC\u03BA\u03B9\u03C2 \u03B5\u03BA\u03B1\u03C4\u03BF\u03BC\u03BC\u03CD\u03C1\u03B9\u03BF[ >>];",
             "2000000000000000: <%spellout-cardinal-neutre< \u03C4\u03B5\u03C4\u03C1\u03AC\u03BA\u03B9\u03C2 \u03B5\u03BA\u03B1\u03C4\u03BF\u03BC\u03BC\u03CD\u03C1\u03B9\u03B1[ >>];",
             "1000000000000000000: =#,##0=;",
+            "%spellout-cardinal-neutre:",
             "-x: \u03BC\u03B5\u03AF\u03BF\u03BD >>;",
             "x.x: << \u03BA\u03CC\u03BC\u03BC\u03B1 >>;",
-            "%spellout-cardinal-neutre:",
             "0: \u03BC\u03B7\u03B4\u03AD\u03BD;",
             "1: \u03AD\u03BD\u03B1;",
             "2: \u03B4\u03CD\u03BF;",
@@ -145,64 +152,9 @@
             "1000000000000000: <%spellout-cardinal-neutre< \u03C4\u03B5\u03C4\u03C1\u03AC\u03BA\u03B9\u03C2 \u03B5\u03BA\u03B1\u03C4\u03BF\u03BC\u03BC\u03CD\u03C1\u03B9\u03BF[ >>];",
             "2000000000000000: <%spellout-cardinal-neutre< \u03C4\u03B5\u03C4\u03C1\u03AC\u03BA\u03B9\u03C2 \u03B5\u03BA\u03B1\u03C4\u03BF\u03BC\u03BC\u03CD\u03C1\u03B9\u03B1[ >>];",
             "1000000000000000000: =#,##0=;",
+            "%spellout-ordinal-masculine:",
             "-x: \u03BC\u03B5\u03AF\u03BF\u03BD >>;",
-            "x.x: << \u03BA\u03CC\u03BC\u03BC\u03B1 >>;",
-            "%spellout-numbering:",
-            "0: =%spellout-cardinal-neutre=;",
-            "%spellout-numbering-year:",
-            "0: =%spellout-numbering=;",
-            "x.x: =#,###0.#=;",
-            "%spellout-ordinal-feminine:",
-            "0: \u03BC\u03B7\u03B4\u03B5\u03BD\u03B9\u03BA\u03AE;",
-            "1: \u03C0\u03C1\u03CE\u03C4\u03B7;",
-            "2: \u03B4\u03B5\u03CD\u03C4\u03B5\u03C1\u03B7;",
-            "3: \u03C4\u03C1\u03AF\u03C4\u03B7;",
-            "4: \u03C4\u03AD\u03C4\u03B1\u03C1\u03C4\u03B7;",
-            "5: \u03C0\u03AD\u03BC\u03C0\u03C4\u03B7;",
-            "6: \u03AD\u03BA\u03C4\u03B7;",
-            "7: \u03AD\u03B2\u03B4\u03BF\u03BC\u03B7;",
-            "8: \u03CC\u03B3\u03B4\u03BF\u03B7;",
-            "9: \u03AD\u03BD\u03B1\u03C4\u03B7;",
-            "10: \u03B4\u03AD\u03BA\u03B1\u03C4\u03B7;",
-            "11: \u03B5\u03BD\u03B4\u03AD\u03BA\u03B1\u03C4\u03B7;",
-            "12: \u03B4\u03C9\u03B4\u03AD\u03BA\u03B1\u03C4\u03B7;",
-            "13: \u03B4\u03AD\u03BA\u03B1\u03C4\u03B7[ >>];",
-            "20: \u03B5\u03B9\u03BA\u03BF\u03C3\u03C4\u03AE[ >>];",
-            "30: \u03C4\u03C1\u03B9\u03B1\u03BA\u03BF\u03C3\u03C4\u03AE[ >>];",
-            "40: \u03C4\u03B5\u03C3\u03C3\u03B1\u03C1\u03B1\u03BA\u03BF\u03C3\u03C4\u03AE[ >>];",
-            "50: \u03C0\u03B5\u03BD\u03C4\u03B7\u03BA\u03BF\u03C3\u03C4\u03AE[ >>];",
-            "60: \u03B5\u03BE\u03B7\u03BA\u03BF\u03C3\u03C4\u03AE[ >>];",
-            "70: \u03B5\u03B2\u03B4\u03BF\u03BC\u03B7\u03BA\u03BF\u03C3\u03C4\u03AE[ >>];",
-            "80: \u03BF\u03B3\u03B4\u03BF\u03B7\u03BA\u03BF\u03C3\u03C4\u03AE[ >>];",
-            "90: \u03B5\u03BD\u03BD\u03B5\u03BD\u03B7\u03BA\u03BF\u03C3\u03C4\u03AE[ >>];",
-            "100: \u03B5\u03BA\u03B1\u03C4\u03BF\u03C3\u03C4\u03AE[ >>];",
-            "200: \u03B4\u03B9\u03B1\u03BA\u03BF\u03C3\u03B9\u03BF\u03C3\u03C4\u03AE[ >>];",
-            "300: \u03C4\u03C1\u03B9\u03B1\u03BA\u03BF\u03C3\u03B9\u03BF\u03C3\u03C4\u03AE[ >>];",
-            "400: \u03C4\u03C1\u03B5\u03C4\u03C1\u03B1\u03BA\u03BF\u03C3\u03B9\u03BF\u03C3\u03C4\u03AE[ >>];",
-            "500: \u03C0\u03B5\u03BD\u03C4\u03B1\u03BA\u03BF\u03C3\u03B9\u03BF\u03C3\u03C4\u03AE[ >>];",
-            "600: \u03B5\u03BE\u03B1\u03BA\u03BF\u03C3\u03B9\u03BF\u03C3\u03C4\u03AE[ >>];",
-            "700: \u03B5\u03C0\u03C4\u03B1\u03BA\u03BF\u03C3\u03B9\u03BF\u03C3\u03C4\u03AE[ >>];",
-            "800: \u03BF\u03BA\u03C4\u03B1\u03BA\u03BF\u03C3\u03B9\u03BF\u03C3\u03C4\u03AE[ >>];",
-            "900: \u03B5\u03BD\u03BD\u03B5\u03B1\u03BA\u03BF\u03C3\u03B9\u03BF\u03C3\u03C4\u03AE[ >>];",
-            "1000: \u03C7\u03B9\u03BB\u03B9\u03BF\u03C3\u03C4\u03AE[ >>];",
-            "2000: \u03B4\u03B9\u03C3\u03C7\u03B9\u03BB\u03B9\u03BF\u03C3\u03C4\u03AE[ >>];",
-            "3000: \u03C4\u03C1\u03B9\u03C3\u03C7\u03B9\u03BB\u03B9\u03BF\u03C3\u03C4\u03AE[ >>];",
-            "4000: \u03C4\u03B5\u03C4\u03C1\u03AC\u03BA\u03B9\u03C2 \u03C7\u03B9\u03BB\u03B9\u03BF\u03C3\u03C4\u03AE[ >>];",
-            "5000: \u03C0\u03B5\u03BD\u03C4\u03AC\u03BA\u03B9\u03C2 \u03C7\u03B9\u03BB\u03B9\u03BF\u03C3\u03C4\u03AE[ >>];",
-            "6000: \u03B5\u03BE\u03AC\u03BA\u03B9\u03C2 \u03C7\u03B9\u03BB\u03B9\u03BF\u03C3\u03C4\u03AE[ >>];",
-            "7000: \u03B5\u03C0\u03C4\u03AC\u03BA\u03B9\u03C2 \u03C7\u03B9\u03BB\u03B9\u03BF\u03C3\u03C4\u03AE[ >>];",
-            "8000: \u03BF\u03BA\u03C4\u03AC\u03BA\u03B9\u03C2 \u03C7\u03B9\u03BB\u03B9\u03BF\u03C3\u03C4\u03AE[ >>];",
-            "9000: \u03B5\u03BD\u03BD\u03B5\u03AC\u03BA\u03B9\u03C2 \u03C7\u03B9\u03BB\u03B9\u03BF\u03C3\u03C4\u03AE[ >>];",
-            "10000/1000: \u03B4\u03B5\u03BA\u03AC\u03BA\u03B9\u03C2 \u03C7\u03B9\u03BB\u03B9\u03BF\u03C3\u03C4\u03AE[ >>];",
-            "11000/1000: <%spellout-cardinal-neutre< \u03C7\u03B9\u03BB\u03B9\u03BF\u03C3\u03C4\u03AE[ >>];",
-            "1000000: <%spellout-cardinal-neutre< \u03B5\u03BA\u03B1\u03C4\u03BF\u03BC\u03BC\u03C5\u03C1\u03B9\u03BF\u03C3\u03C4\u03AE [ >>];",
-            "1000000000: <%spellout-cardinal-neutre< \u03B4\u03B9\u03C3\u03B5\u03BA\u03B1\u03C4\u03BF\u03BC\u03BC\u03C5\u03C1\u03B9\u03BF\u03C3\u03C4\u03AE[ >>];",
-            "1000000000000: <%spellout-cardinal-neutre< \u03C4\u03C1\u03B9\u03C3\u03B5\u03BA\u03B1\u03C4\u03BF\u03BC\u03BC\u03C5\u03C1\u03B9\u03BF\u03C3\u03C4\u03AE[ >>];",
-            "1000000000000000: <%spellout-cardinal-neutre< \u03C4\u03B5\u03C4\u03C1\u03AC\u03BA\u03B9\u03C2 \u03B5\u03BA\u03B1\u03C4\u03BF\u03BC\u03BC\u03C5\u03C1\u03B9\u03BF\u03C3\u03C4\u03AE[ >>];",
-            "1000000000000000000: =#,##0=.;",
-            "-x: \u03BC\u03B5\u03AF\u03BF\u03BD >>;",
             "x.x: =#,##0.#=;",
-            "%spellout-ordinal-masculine:",
             "0: \u03BC\u03B7\u03B4\u03B5\u03BD\u03B9\u03BA\u03CC\u03C2;",
             "1: \u03C0\u03C1\u03CE\u03C4\u03BF\u03C2;",
             "2: \u03B4\u03B5\u03CD\u03C4\u03B5\u03C1\u03BF\u03C2;",
@@ -250,9 +202,58 @@
             "1000000000000: <%spellout-cardinal-neutre< \u03C4\u03C1\u03B9\u03C3\u03B5\u03BA\u03B1\u03C4\u03BF\u03BC\u03BC\u03C5\u03C1\u03B9\u03BF\u03C3\u03C4\u03CC\u03C2[ >>];",
             "1000000000000000: <%spellout-cardinal-neutre< \u03C4\u03B5\u03C4\u03C1\u03AC\u03BA\u03B9\u03C2 \u03B5\u03BA\u03B1\u03C4\u03BF\u03BC\u03BC\u03C5\u03C1\u03B9\u03BF\u03C3\u03C4\u03CC\u03C2[ >>];",
             "1000000000000000000: =#,##0=.;",
+            "%spellout-ordinal-feminine:",
             "-x: \u03BC\u03B5\u03AF\u03BF\u03BD >>;",
             "x.x: =#,##0.#=;",
+            "0: \u03BC\u03B7\u03B4\u03B5\u03BD\u03B9\u03BA\u03AE;",
+            "1: \u03C0\u03C1\u03CE\u03C4\u03B7;",
+            "2: \u03B4\u03B5\u03CD\u03C4\u03B5\u03C1\u03B7;",
+            "3: \u03C4\u03C1\u03AF\u03C4\u03B7;",
+            "4: \u03C4\u03AD\u03C4\u03B1\u03C1\u03C4\u03B7;",
+            "5: \u03C0\u03AD\u03BC\u03C0\u03C4\u03B7;",
+            "6: \u03AD\u03BA\u03C4\u03B7;",
+            "7: \u03AD\u03B2\u03B4\u03BF\u03BC\u03B7;",
+            "8: \u03CC\u03B3\u03B4\u03BF\u03B7;",
+            "9: \u03AD\u03BD\u03B1\u03C4\u03B7;",
+            "10: \u03B4\u03AD\u03BA\u03B1\u03C4\u03B7;",
+            "11: \u03B5\u03BD\u03B4\u03AD\u03BA\u03B1\u03C4\u03B7;",
+            "12: \u03B4\u03C9\u03B4\u03AD\u03BA\u03B1\u03C4\u03B7;",
+            "13: \u03B4\u03AD\u03BA\u03B1\u03C4\u03B7[ >>];",
+            "20: \u03B5\u03B9\u03BA\u03BF\u03C3\u03C4\u03AE[ >>];",
+            "30: \u03C4\u03C1\u03B9\u03B1\u03BA\u03BF\u03C3\u03C4\u03AE[ >>];",
+            "40: \u03C4\u03B5\u03C3\u03C3\u03B1\u03C1\u03B1\u03BA\u03BF\u03C3\u03C4\u03AE[ >>];",
+            "50: \u03C0\u03B5\u03BD\u03C4\u03B7\u03BA\u03BF\u03C3\u03C4\u03AE[ >>];",
+            "60: \u03B5\u03BE\u03B7\u03BA\u03BF\u03C3\u03C4\u03AE[ >>];",
+            "70: \u03B5\u03B2\u03B4\u03BF\u03BC\u03B7\u03BA\u03BF\u03C3\u03C4\u03AE[ >>];",
+            "80: \u03BF\u03B3\u03B4\u03BF\u03B7\u03BA\u03BF\u03C3\u03C4\u03AE[ >>];",
+            "90: \u03B5\u03BD\u03BD\u03B5\u03BD\u03B7\u03BA\u03BF\u03C3\u03C4\u03AE[ >>];",
+            "100: \u03B5\u03BA\u03B1\u03C4\u03BF\u03C3\u03C4\u03AE[ >>];",
+            "200: \u03B4\u03B9\u03B1\u03BA\u03BF\u03C3\u03B9\u03BF\u03C3\u03C4\u03AE[ >>];",
+            "300: \u03C4\u03C1\u03B9\u03B1\u03BA\u03BF\u03C3\u03B9\u03BF\u03C3\u03C4\u03AE[ >>];",
+            "400: \u03C4\u03C1\u03B5\u03C4\u03C1\u03B1\u03BA\u03BF\u03C3\u03B9\u03BF\u03C3\u03C4\u03AE[ >>];",
+            "500: \u03C0\u03B5\u03BD\u03C4\u03B1\u03BA\u03BF\u03C3\u03B9\u03BF\u03C3\u03C4\u03AE[ >>];",
+            "600: \u03B5\u03BE\u03B1\u03BA\u03BF\u03C3\u03B9\u03BF\u03C3\u03C4\u03AE[ >>];",
+            "700: \u03B5\u03C0\u03C4\u03B1\u03BA\u03BF\u03C3\u03B9\u03BF\u03C3\u03C4\u03AE[ >>];",
+            "800: \u03BF\u03BA\u03C4\u03B1\u03BA\u03BF\u03C3\u03B9\u03BF\u03C3\u03C4\u03AE[ >>];",
+            "900: \u03B5\u03BD\u03BD\u03B5\u03B1\u03BA\u03BF\u03C3\u03B9\u03BF\u03C3\u03C4\u03AE[ >>];",
+            "1000: \u03C7\u03B9\u03BB\u03B9\u03BF\u03C3\u03C4\u03AE[ >>];",
+            "2000: \u03B4\u03B9\u03C3\u03C7\u03B9\u03BB\u03B9\u03BF\u03C3\u03C4\u03AE[ >>];",
+            "3000: \u03C4\u03C1\u03B9\u03C3\u03C7\u03B9\u03BB\u03B9\u03BF\u03C3\u03C4\u03AE[ >>];",
+            "4000: \u03C4\u03B5\u03C4\u03C1\u03AC\u03BA\u03B9\u03C2 \u03C7\u03B9\u03BB\u03B9\u03BF\u03C3\u03C4\u03AE[ >>];",
+            "5000: \u03C0\u03B5\u03BD\u03C4\u03AC\u03BA\u03B9\u03C2 \u03C7\u03B9\u03BB\u03B9\u03BF\u03C3\u03C4\u03AE[ >>];",
+            "6000: \u03B5\u03BE\u03AC\u03BA\u03B9\u03C2 \u03C7\u03B9\u03BB\u03B9\u03BF\u03C3\u03C4\u03AE[ >>];",
+            "7000: \u03B5\u03C0\u03C4\u03AC\u03BA\u03B9\u03C2 \u03C7\u03B9\u03BB\u03B9\u03BF\u03C3\u03C4\u03AE[ >>];",
+            "8000: \u03BF\u03BA\u03C4\u03AC\u03BA\u03B9\u03C2 \u03C7\u03B9\u03BB\u03B9\u03BF\u03C3\u03C4\u03AE[ >>];",
+            "9000: \u03B5\u03BD\u03BD\u03B5\u03AC\u03BA\u03B9\u03C2 \u03C7\u03B9\u03BB\u03B9\u03BF\u03C3\u03C4\u03AE[ >>];",
+            "10000/1000: \u03B4\u03B5\u03BA\u03AC\u03BA\u03B9\u03C2 \u03C7\u03B9\u03BB\u03B9\u03BF\u03C3\u03C4\u03AE[ >>];",
+            "11000/1000: <%spellout-cardinal-neutre< \u03C7\u03B9\u03BB\u03B9\u03BF\u03C3\u03C4\u03AE[ >>];",
+            "1000000: <%spellout-cardinal-neutre< \u03B5\u03BA\u03B1\u03C4\u03BF\u03BC\u03BC\u03C5\u03C1\u03B9\u03BF\u03C3\u03C4\u03AE [ >>];",
+            "1000000000: <%spellout-cardinal-neutre< \u03B4\u03B9\u03C3\u03B5\u03BA\u03B1\u03C4\u03BF\u03BC\u03BC\u03C5\u03C1\u03B9\u03BF\u03C3\u03C4\u03AE[ >>];",
+            "1000000000000: <%spellout-cardinal-neutre< \u03C4\u03C1\u03B9\u03C3\u03B5\u03BA\u03B1\u03C4\u03BF\u03BC\u03BC\u03C5\u03C1\u03B9\u03BF\u03C3\u03C4\u03AE[ >>];",
+            "1000000000000000: <%spellout-cardinal-neutre< \u03C4\u03B5\u03C4\u03C1\u03AC\u03BA\u03B9\u03C2 \u03B5\u03BA\u03B1\u03C4\u03BF\u03BC\u03BC\u03C5\u03C1\u03B9\u03BF\u03C3\u03C4\u03AE[ >>];",
+            "1000000000000000000: =#,##0=.;",
             "%spellout-ordinal-neutre:",
+            "-x: \u03BC\u03B5\u03AF\u03BF\u03BD >>;",
             "0: \u03BC\u03B7\u03B4\u03B5\u03BD\u03B9\u03BA\u03CC;",
             "1: \u03C0\u03C1\u03CE\u03C4\u03BF;",
             "2: \u03B4\u03B5\u03CD\u03C4\u03B5\u03C1\u03BF;",
@@ -300,8 +301,7 @@
             "1000000000000: <%spellout-cardinal-neutre< \u03C4\u03C1\u03B9\u03C3\u03B5\u03BA\u03B1\u03C4\u03BF\u03BC\u03BC\u03C5\u03C1\u03B9\u03BF\u03C3\u03C4\u03CC[ >>];",
             "1000000000000000: <%spellout-cardinal-neutre< \u03C4\u03B5\u03C4\u03C1\u03AC\u03BA\u03B9\u03C2 \u03B5\u03BA\u03B1\u03C4\u03BF\u03BC\u03BC\u03C5\u03C1\u03B9\u03BF\u03C3\u03C4\u03CC[ >>];",
             "1000000000000000000: =#,##0=.;",
-            "-x: \u03BC\u03B5\u03AF\u03BF\u03BD >>;",
         }
     }
-    Version{"1.5"}
+    Version{"1.6"}
 }

Modified: trunk/source/data/rbnf/en.txt
===================================================================
--- trunk/source/data/rbnf/en.txt	2009-07-02 19:27:40 UTC (rev 211)
+++ trunk/source/data/rbnf/en.txt	2009-07-02 19:28:39 UTC (rev 212)
@@ -12,34 +12,31 @@
 en{
     RBNFRules{
         DurationRules{
-            "%duration:",
-            "0: =%in-numerals=;",
+            "%with-words:",
+            "0: 0 seconds; 1 second; =0= seconds;",
+            "60/60: <%%min<[, >>];",
+            "3600/60: <%%hr<[, >>>];",
+            "%%min:",
+            "0: 0 minutes; 1 minute; =0= minutes;",
             "%%hr:",
             "0: 0 hours; 1 hour; =0= hours;",
-            "%%hr-min-sec:",
-            "0: :=00=;",
-            "60/60: <00<>>;",
-            "3600/60: <#,##0<:>>>;",
             "%in-numerals:",
             "0: =0= sec.;",
             "60: =%%min-sec=;",
             "3600: =%%hr-min-sec=;",
-            "%%lenient-parse:",
-            "& ':' = '.' = ' ' = '-';",
-            "%%min:",
-            "0: 0 minutes; 1 minute; =0= minutes;",
             "%%min-sec:",
             "0: :=00=;",
             "60/60: <0<>>;",
-            "%with-words:",
-            "0: 0 seconds; 1 second; =0= seconds;",
-            "60/60: <%%min<[, >>];",
-            "3600/60: <%%hr<[, >>>];",
+            "%%hr-min-sec:",
+            "0: :=00=;",
+            "60/60: <00<>>;",
+            "3600/60: <#,##0<:>>>;",
+            "%duration:",
+            "0: =%in-numerals=;",
+            "%%lenient-parse:",
+            "& ':' = '.' = ' ' = '-';",
         }
         OrdinalRules{
-            "%digits-ordinal:",
-            "0: =#,##0==%%digits-ordinal-indicator=;",
-            "-x: \u2212>>;",
             "%%digits-ordinal-indicator:",
             "0: \u1D57\u02B0;",
             "1: \u02E2\u1D57;",
@@ -48,33 +45,28 @@
             "4: \u1D57\u02B0;",
             "20: >>;",
             "100: >>;",
+            "%digits-ordinal:",
+            "-x: \u2212>>;",
+            "0: =#,##0==%%digits-ordinal-indicator=;",
         }
         SpelloutRules{
             "%%2d-year:",
             "0: hundred[ and >%spellout-numbering>];",
             "1: oh-=%spellout-numbering=;",
             "10: =%spellout-numbering=;",
-            "%%and:",
-            "1: ' and =%spellout-cardinal-verbose=;",
-            "100: ' =%spellout-cardinal-verbose=;",
-            "%%and-o:",
-            "0: th;",
-            "1: ' and =%spellout-ordinal-verbose=;",
-            "100: ' =%spellout-ordinal-verbose=;",
-            "%%commas:",
-            "1: ' and =%spellout-cardinal-verbose=;",
-            "100: , =%spellout-cardinal-verbose=;",
-            "1000: , <%spellout-cardinal-verbose< thousand[>%%commas>];",
-            "1000000: , =%spellout-cardinal-verbose=;",
-            "%%commas-o:",
-            "0: th;",
-            "1: ' and =%spellout-ordinal-verbose=;",
-            "100: , =%spellout-ordinal-verbose=;",
-            "1000: , <%spellout-cardinal-verbose< thousand>%%commas-o>;",
-            "1000000: , =%spellout-ordinal-verbose=;",
-            "%%lenient-parse:",
-            "&[last primary ignorable ] << ' ' << ',' << '-' << '\u00AD';",
+            "%spellout-numbering-year:",
+            "-x: minus >>;",
+            "x.x: =#,###0.#=;",
+            "0: =%spellout-numbering=;",
+            "1000/100: << >%%2d-year>;",
+            "10000: =%spellout-numbering=;",
+            "%spellout-numbering:",
+            "0: =%spellout-cardinal=;",
+            "%spellout-numbering-verbose:",
+            "0: =%spellout-cardinal-verbose=;",
             "%spellout-cardinal:",
+            "-x: minus >>;",
+            "x.x: << point >>;",
             "0: zero;",
             "1: one;",
             "2: two;",
@@ -110,9 +102,17 @@
             "1000000000000: << trillion[ >>];",
             "1000000000000000: << quadrillion[ >>];",
             "1000000000000000000: =#,##0=;",
+            "%%and:",
+            "1: ' and =%spellout-cardinal-verbose=;",
+            "100: ' =%spellout-cardinal-verbose=;",
+            "%%commas:",
+            "1: ' and =%spellout-cardinal-verbose=;",
+            "100: , =%spellout-cardinal-verbose=;",
+            "1000: , <%spellout-cardinal-verbose< thousand[>%%commas>];",
+            "1000000: , =%spellout-cardinal-verbose=;",
+            "%spellout-cardinal-verbose:",
             "-x: minus >>;",
             "x.x: << point >>;",
-            "%spellout-cardinal-verbose:",
             "0: =%spellout-numbering=;",
             "100: << hundred[>%%and>];",
             "1000: << thousand[>%%and>];",
@@ -122,19 +122,17 @@
             "1000000000000: << trillion[>%%commas>];",
             "1000000000000000: << quadrillion[>%%commas>];",
             "1000000000000000000: =#,##0=;",
+            "%%lenient-parse:",
+            "&[last primary ignorable ] << ' ' << ',' << '-' << '\u00AD';",
+            "%%tieth:",
+            "0: tieth;",
+            "1: ty-=%spellout-ordinal=;",
+            "%%th:",
+            "0: th;",
+            "1: ' =%spellout-ordinal=;",
+            "%spellout-ordinal:",
             "-x: minus >>;",
-            "x.x: << point >>;",
-            "%spellout-numbering:",
-            "0: =%spellout-cardinal=;",
-            "%spellout-numbering-verbose:",
-            "0: =%spellout-cardinal-verbose=;",
-            "%spellout-numbering-year:",
-            "0: =%spellout-numbering=;",
-            "1000/100: << >%%2d-year>;",
-            "10000: =%spellout-numbering=;",
-            "-x: minus >>;",
-            "x.x: =#,###0.#=;",
-            "%spellout-ordinal:",
+            "x.x: =#,##0.#=;",
             "0: zeroth;",
             "1: first;",
             "2: second;",
@@ -164,9 +162,19 @@
             "1000000000000: <%spellout-numbering< trillion>%%th>;",
             "1000000000000000: <%spellout-numbering< quadrillion>%%th>;",
             "1000000000000000000: =#,##0=.;",
+            "%%and-o:",
+            "0: th;",
+            "1: ' and =%spellout-ordinal-verbose=;",
+            "100: ' =%spellout-ordinal-verbose=;",
+            "%%commas-o:",
+            "0: th;",
+            "1: ' and =%spellout-ordinal-verbose=;",
+            "100: , =%spellout-ordinal-verbose=;",
+            "1000: , <%spellout-cardinal-verbose< thousand>%%commas-o>;",
+            "1000000: , =%spellout-ordinal-verbose=;",
+            "%spellout-ordinal-verbose:",
             "-x: minus >>;",
             "x.x: =#,##0.#=;",
-            "%spellout-ordinal-verbose:",
             "0: =%spellout-ordinal=;",
             "100: <%spellout-numbering-verbose< hundred>%%and-o>;",
             "1000: <%spellout-numbering-verbose< thousand>%%and-o>;",
@@ -176,15 +184,7 @@
             "1000000000000: <%spellout-numbering-verbose< trillion>%%commas-o>;",
             "1000000000000000: <%spellout-numbering-verbose< quadrillion>%%commas-o>;",
             "1000000000000000000: =#,##0=.;",
-            "-x: minus >>;",
-            "x.x: =#,##0.#=;",
-            "%%th:",
-            "0: th;",
-            "1: ' =%spellout-ordinal=;",
-            "%%tieth:",
-            "0: tieth;",
-            "1: ty-=%spellout-ordinal=;",
         }
     }
-    Version{"1.5"}
+    Version{"1.6"}
 }

Modified: trunk/source/data/rbnf/eo.txt
===================================================================
--- trunk/source/data/rbnf/eo.txt	2009-07-02 19:27:40 UTC (rev 211)
+++ trunk/source/data/rbnf/eo.txt	2009-07-02 19:28:39 UTC (rev 212)
@@ -12,7 +12,14 @@
 eo{
     RBNFRules{
         SpelloutRules{
+            "%spellout-numbering-year:",
+            "x.x: =#,###0.#=;",
+            "0: =%spellout-numbering=;",
+            "%spellout-numbering:",
+            "0: =%spellout-cardinal=;",
             "%spellout-cardinal:",
+            "-x: minus >>;",
+            "x.x: << komo >>;",
             "0: nulo;",
             "1: unu;",
             "2: du;",
@@ -38,16 +45,9 @@
             "1000000000000000: biliardo[ >>];",
             "2000000000000000: << biliardoj[ >>];",
             "1000000000000000000: =#,##0=;",
-            "-x: minus >>;",
-            "x.x: << komo >>;",
-            "%spellout-numbering:",
-            "0: =%spellout-cardinal=;",
-            "%spellout-numbering-year:",
-            "0: =%spellout-numbering=;",
-            "x.x: =#,###0.#=;",
             "%spellout-ordinal:",
             "0: =%spellout-cardinal=a;",
         }
     }
-    Version{"1.5"}
+    Version{"1.6"}
 }

Modified: trunk/source/data/rbnf/es.txt
===================================================================
--- trunk/source/data/rbnf/es.txt	2009-07-02 19:27:40 UTC (rev 211)
+++ trunk/source/data/rbnf/es.txt	2009-07-02 19:28:39 UTC (rev 212)
@@ -12,16 +12,6 @@
 es{
     RBNFRules{
         OrdinalRules{
-            "%digits-ordinal:",
-            "0: =%digits-ordinal-masculine=;",
-            "%digits-ordinal-feminine:",
-            "0: =#,##0==%%dord-femabbrev=;",
-            "-x: \u2212>>;",
-            "%digits-ordinal-masculine:",
-            "0: =#,##0==%%dord-mascabbrev=;",
-            "-x: \u2212>>;",
-            "%%dord-femabbrev:",
-            "0: \u1D43;",
             "%%dord-mascabbrev:",
             "0: \u1D52;",
             "1: \u1D49\u02B3;",
@@ -30,16 +20,52 @@
             "4: \u1D52;",
             "20: >>;",
             "100: >>;",
+            "%digits-ordinal-masculine:",
+            "-x: \u2212>>;",
+            "0: =#,##0==%%dord-mascabbrev=;",
+            "%%dord-femabbrev:",
+            "0: \u1D43;",
+            "%digits-ordinal-feminine:",
+            "-x: \u2212>>;",
+            "0: =#,##0==%%dord-femabbrev=;",
+            "%digits-ordinal:",
+            "0: =%digits-ordinal-masculine=;",
         }
         SpelloutRules{
             "%%lenient-parse:",
             "&[last primary ignorable ] << ' ' << ',' << '-' << '\u00AD';",
-            "%spellout-cardinal-feminine:",
+            "%spellout-numbering-year:",
+            "x.x: =#,###0.#=;",
+            "0: =%spellout-numbering=;",
+            "%spellout-numbering:",
+            "-x: menos >>;",
+            "x.x: << coma >>;",
             "0: cero;",
-            "1: una;",
-            "2: =%spellout-numbering=;",
-            "21: veintiuna;",
-            "22: =%spellout-numbering=;",
+            "1: uno;",
+            "2: dos;",
+            "3: tres;",
+            "4: cuatro;",
+            "5: cinco;",
+            "6: seis;",
+            "7: siete;",
+            "8: ocho;",
+            "9: nueve;",
+            "10: diez;",
+            "11: once;",
+            "12: doce;",
+            "13: trece;",
+            "14: catorce;",
+            "15: quince;",
+            "16: diecis\u00E9is;",
+            "17: dieci>>;",
+            "20: veinte;",
+            "21: veintiuno;",
+            "22: veintid\u00F3s;",
+            "23: veintitr\u00E9s;",
+            "24: veinticuatro;",
+            "25: veinticinco;",
+            "26: veintis\u00E9is;",
+            "27: veinti>>;",
             "30: treinta[ y >>];",
             "40: cuarenta[ y >>];",
             "50: cincuenta[ y >>];",
@@ -48,15 +74,15 @@
             "80: ochenta[ y >>];",
             "90: noventa[ y >>];",
             "100: cien;",
-            "101: cienta >>;",
-            "200: dos\u00ADcientas[ >>];",
-            "300: tres\u00ADcientas[ >>];",
-            "400: cuatro\u00ADcientas[ >>];",
-            "500: quinientas[ >>];",
-            "600: seis\u00ADcientas[ >>];",
-            "700: sete\u00ADcientas[ >>];",
-            "800: ocho\u00ADcientas[ >>];",
-            "900: nove\u00ADcientas[ >>];",
+            "101: ciento >>;",
+            "200: doscientos[ >>];",
+            "300: trescientos[ >>];",
+            "400: cuatrocientos[ >>];",
+            "500: quinientos[ >>];",
+            "600: seiscientos[ >>];",
+            "700: setecientos[ >>];",
+            "800: ochocientos[ >>];",
+            "900: novecientos[ >>];",
             "1000: mil[ >>];",
             "2000: <%spellout-cardinal-masculine< mil[ >>];",
             "1000000: un mill\u00F3n[ >>];",
@@ -68,9 +94,9 @@
             "1000000000000000: un billardo[ >>];",
             "2000000000000000: <%spellout-cardinal-masculine< billardos[ >>];",
             "1000000000000000000: =#,##0=;",
+            "%spellout-cardinal-masculine:",
             "-x: menos >>;",
             "x.x: << coma >>;",
-            "%spellout-cardinal-masculine:",
             "0: cero;",
             "1: un;",
             "2: =%spellout-numbering=;",
@@ -104,35 +130,14 @@
             "1000000000000000: un billardo[ >>];",
             "2000000000000000: <%spellout-cardinal-masculine< billardos[ >>];",
             "1000000000000000000: =#,##0=;",
+            "%spellout-cardinal-feminine:",
             "-x: menos >>;",
             "x.x: << coma >>;",
-            "%spellout-numbering:",
             "0: cero;",
-            "1: uno;",
-            "2: dos;",
-            "3: tres;",
-            "4: cuatro;",
-            "5: cinco;",
-            "6: seis;",
-            "7: siete;",
-            "8: ocho;",
-            "9: nueve;",
-            "10: diez;",
-            "11: once;",
-            "12: doce;",
-            "13: trece;",
-            "14: catorce;",
-            "15: quince;",
-            "16: diecis\u00E9is;",
-            "17: dieci>>;",
-            "20: veinte;",
-            "21: veintiuno;",
-            "22: veintid\u00F3s;",
-            "23: veintitr\u00E9s;",
-            "24: veinticuatro;",
-            "25: veinticinco;",
-            "26: veintis\u00E9is;",
-            "27: veinti>>;",
+            "1: una;",
+            "2: =%spellout-numbering=;",
+            "21: veintiuna;",
+            "22: =%spellout-numbering=;",
             "30: treinta[ y >>];",
             "40: cuarenta[ y >>];",
             "50: cincuenta[ y >>];",
@@ -141,15 +146,15 @@
             "80: ochenta[ y >>];",
             "90: noventa[ y >>];",
             "100: cien;",
-            "101: ciento >>;",
-            "200: doscientos[ >>];",
-            "300: trescientos[ >>];",
-            "400: cuatrocientos[ >>];",
-            "500: quinientos[ >>];",
-            "600: seiscientos[ >>];",
-            "700: setecientos[ >>];",
-            "800: ochocientos[ >>];",
-            "900: novecientos[ >>];",
+            "101: cienta >>;",
+            "200: dos\u00ADcientas[ >>];",
+            "300: tres\u00ADcientas[ >>];",
+            "400: cuatro\u00ADcientas[ >>];",
+            "500: quinientas[ >>];",
+            "600: seis\u00ADcientas[ >>];",
+            "700: sete\u00ADcientas[ >>];",
+            "800: ocho\u00ADcientas[ >>];",
+            "900: nove\u00ADcientas[ >>];",
             "1000: mil[ >>];",
             "2000: <%spellout-cardinal-masculine< mil[ >>];",
             "1000000: un mill\u00F3n[ >>];",
@@ -161,57 +166,9 @@
             "1000000000000000: un billardo[ >>];",
             "2000000000000000: <%spellout-cardinal-masculine< billardos[ >>];",
             "1000000000000000000: =#,##0=;",
+            "%spellout-ordinal-masculine:",
             "-x: menos >>;",
-            "x.x: << coma >>;",
-            "%spellout-numbering-year:",
-            "0: =%spellout-numbering=;",
-            "x.x: =#,###0.#=;",
-            "%spellout-ordinal-feminine:",
-            "0: cero;",
-            "1: primera;",
-            "2: segunda;",
-            "3: tercera;",
-            "4: cuarta;",
-            "5: quinta;",
-            "6: sexta;",
-            "7: s\u00E9ptima;",
-            "8: octava;",
-            "9: novena;",
-            "10: d\u00E9cima;",
-            "11: und\u00E9cima;",
-            "12: duod\u00E9cima;",
-            "13: decima>>;",
-            "20: vig\u00E9sima[ >>];",
-            "30: trig\u00E9sima[ >>];",
-            "40: cuadrag\u00E9sima[ >>];",
-            "50: quincuag\u00E9sima[ >>];",
-            "60: sexag\u00E9sima[ >>];",
-            "70: septuag\u00E9sima[ >>];",
-            "80: octog\u00E9sima[ >>];",
-            "90: nonag\u00E9sima[ >>];",
-            "100: cent\u00E9sima[ >>];",
-            "200: ducent\u00E9sima[ >>];",
-            "300: tricent\u00E9sima[ >>];",
-            "400: cuadringent\u00E9sima[ >>];",
-            "500: quingent\u00E9sima[ >>];",
-            "600: sexcent\u00E9sima[ >>];",
-            "700: septingent\u00E9sima[ >>];",
-            "800: octing\u00E9sima[ >>];",
-            "900: noningent\u00E9sima[ >>];",
-            "1000: mil\u00E9sima[ >>];",
-            "2000: <%spellout-cardinal-masculine< mil\u00E9sima[ >>];",
-            "1000000: un millon\u00E9sima[ >>];",
-            "2000000: <%spellout-cardinal-masculine< millon\u00E9sima[ >>];",
-            "1000000000: un millard\u00E9simo[ >>];",
-            "2000000000: <%spellout-cardinal-masculine< millard\u00E9sima[ >>];",
-            "1000000000000: un billon\u00E9sima[ >>];",
-            "2000000000000: <%spellout-cardinal-masculine< billon\u00E9sima[ >>];",
-            "1000000000000000: un billard\u00E9sima[ >>];",
-            "2000000000000000: <%spellout-cardinal-masculine< billard\u00E9sima[ >>];",
-            "1000000000000000000: =#,##0=\u1D43;",
-            "-x: menos >>;",
             "x.x: =#,##0.#=;",
-            "%spellout-ordinal-masculine:",
             "0: cero;",
             "1: primero;",
             "2: segundo;",
@@ -254,9 +211,52 @@
             "1000000000000000: un billard\u00E9simo[ >>];",
             "2000000000000000: <%spellout-cardinal-masculine< billard\u00E9simo[ >>];",
             "1000000000000000000: =#,##0=\u1D52;",
+            "%spellout-ordinal-feminine:",
             "-x: menos >>;",
             "x.x: =#,##0.#=;",
+            "0: cero;",
+            "1: primera;",
+            "2: segunda;",
+            "3: tercera;",
+            "4: cuarta;",
+            "5: quinta;",
+            "6: sexta;",
+            "7: s\u00E9ptima;",
+            "8: octava;",
+            "9: novena;",
+            "10: d\u00E9cima;",
+            "11: und\u00E9cima;",
+            "12: duod\u00E9cima;",
+            "13: decima>>;",
+            "20: vig\u00E9sima[ >>];",
+            "30: trig\u00E9sima[ >>];",
+            "40: cuadrag\u00E9sima[ >>];",
+            "50: quincuag\u00E9sima[ >>];",
+            "60: sexag\u00E9sima[ >>];",
+            "70: septuag\u00E9sima[ >>];",
+            "80: octog\u00E9sima[ >>];",
+            "90: nonag\u00E9sima[ >>];",
+            "100: cent\u00E9sima[ >>];",
+            "200: ducent\u00E9sima[ >>];",
+            "300: tricent\u00E9sima[ >>];",
+            "400: cuadringent\u00E9sima[ >>];",
+            "500: quingent\u00E9sima[ >>];",
+            "600: sexcent\u00E9sima[ >>];",
+            "700: septingent\u00E9sima[ >>];",
+            "800: octing\u00E9sima[ >>];",
+            "900: noningent\u00E9sima[ >>];",
+            "1000: mil\u00E9sima[ >>];",
+            "2000: <%spellout-cardinal-masculine< mil\u00E9sima[ >>];",
+            "1000000: un millon\u00E9sima[ >>];",
+            "2000000: <%spellout-cardinal-masculine< millon\u00E9sima[ >>];",
+            "1000000000: un millard\u00E9simo[ >>];",
+            "2000000000: <%spellout-cardinal-masculine< millard\u00E9sima[ >>];",
+            "1000000000000: un billon\u00E9sima[ >>];",
+            "2000000000000: <%spellout-cardinal-masculine< billon\u00E9sima[ >>];",
+            "1000000000000000: un billard\u00E9sima[ >>];",
+            "2000000000000000: <%spellout-cardinal-masculine< billard\u00E9sima[ >>];",
+            "1000000000000000000: =#,##0=\u1D43;",
         }
     }
-    Version{"1.6"}
+    Version{"1.7"}
 }

Modified: trunk/source/data/rbnf/et.txt
===================================================================
--- trunk/source/data/rbnf/et.txt	2009-07-02 19:27:40 UTC (rev 211)
+++ trunk/source/data/rbnf/et.txt	2009-07-02 19:28:39 UTC (rev 212)
@@ -12,7 +12,17 @@
 et{
     RBNFRules{
         SpelloutRules{
+            "%spellout-numbering-year:",
+            "-x: miinus >>;",
+            "x.x: =#,###0.#=;",
+            "0: =%spellout-numbering=;",
+            "1100/100: << sada[ >>];",
+            "10000: =%spellout-numbering=;",
+            "%spellout-numbering:",
+            "0: =%spellout-cardinal=;",
             "%spellout-cardinal:",
+            "-x: miinus >>;",
+            "x.x: << koma >>;",
             "0: null;",
             "1: \u00FCks;",
             "2: kaks;",
@@ -37,17 +47,7 @@
             "1000000000000000: << biljard[ >>];",
             "2000000000000000: << biljardit[ >>];",
             "1000000000000000000: =#,##0=;",
-            "-x: miinus >>;",
-            "x.x: << koma >>;",
-            "%spellout-numbering:",
-            "0: =%spellout-cardinal=;",
-            "%spellout-numbering-year:",
-            "0: =%spellout-numbering=;",
-            "1100/100: << sada[ >>];",
-            "10000: =%spellout-numbering=;",
-            "-x: miinus >>;",
-            "x.x: =#,###0.#=;",
         }
     }
-    Version{"1.4"}
+    Version{"1.5"}
 }

Modified: trunk/source/data/rbnf/fa.txt
===================================================================
--- trunk/source/data/rbnf/fa.txt	2009-07-02 19:27:40 UTC (rev 211)
+++ trunk/source/data/rbnf/fa.txt	2009-07-02 19:28:39 UTC (rev 212)
@@ -12,7 +12,14 @@
 fa{
     RBNFRules{
         SpelloutRules{
+            "%spellout-numbering-year:",
+            "x.x: =#,###0.#=;",
+            "0: =%spellout-numbering=;",
+            "%spellout-numbering:",
+            "0: =%spellout-cardinal=;",
             "%spellout-cardinal:",
+            "-x: \u0645\u0646\u0641\u06CC >>;",
+            "x.x: << \u0645\u0645\u06CC\u0632 >>;",
             "0: \u0635\u0641\u0631;",
             "1: \u06CC\u06A9;",
             "2: \u062F\u0648;",
@@ -53,14 +60,7 @@
             "1000000000000: << \u0628\u06CC\u0644\u06CC\u0648\u0646[ \u0648 >>];",
             "1000000000000000: << \u0628\u06CC\u0644\u06CC\u0627\u0631\u062F[ \u0648 >>];",
             "1000000000000000000: =#,##0=;",
-            "-x: \u0645\u0646\u0641\u06CC >>;",
-            "x.x: << \u0645\u0645\u06CC\u0632 >>;",
-            "%spellout-numbering:",
-            "0: =%spellout-cardinal=;",
-            "%spellout-numbering-year:",
-            "0: =%spellout-numbering=;",
-            "x.x: =#,###0.#=;",
         }
     }
-    Version{"1.4"}
+    Version{"1.5"}
 }

Modified: trunk/source/data/rbnf/fa_AF.txt
===================================================================
--- trunk/source/data/rbnf/fa_AF.txt	2009-07-02 19:27:40 UTC (rev 211)
+++ trunk/source/data/rbnf/fa_AF.txt	2009-07-02 19:28:39 UTC (rev 212)
@@ -12,7 +12,14 @@
 fa_AF{
     RBNFRules{
         SpelloutRules{
+            "%spellout-numbering-year:",
+            "x.x: =#,###0.#=;",
+            "0: =%spellout-numbering=;",
+            "%spellout-numbering:",
+            "0: =%spellout-cardinal=;",
             "%spellout-cardinal:",
+            "-x: \u0645\u0646\u0641\u06CC >>;",
+            "x.x: << \u0639\u0634\u0627\u0631\u06CC\u0647 >>;",
             "0: \u0635\u0641\u0631;",
             "1: \u06CC\u06A9;",
             "2: \u062F\u0648;",
@@ -51,14 +58,7 @@
             "1000000000000: << \u0628\u06CC\u0644\u06CC\u0648\u0646[ \u0648 >>];",
             "1000000000000000: << \u0628\u06CC\u0644\u06CC\u0627\u0631\u062F[ \u0648 >>];",
             "1000000000000000000: =#,##0=;",
-            "-x: \u0645\u0646\u0641\u06CC >>;",
-            "x.x: << \u0639\u0634\u0627\u0631\u06CC\u0647 >>;",
-            "%spellout-numbering:",
-            "0: =%spellout-cardinal=;",
-            "%spellout-numbering-year:",
-            "0: =%spellout-numbering=;",
-            "x.x: =#,###0.#=;",
         }
     }
-    Version{"1.4"}
+    Version{"1.5"}
 }

Modified: trunk/source/data/rbnf/fi.txt
===================================================================
--- trunk/source/data/rbnf/fi.txt	2009-07-02 19:27:40 UTC (rev 211)
+++ trunk/source/data/rbnf/fi.txt	2009-07-02 19:28:39 UTC (rev 212)
@@ -12,7 +12,17 @@
 fi{
     RBNFRules{
         SpelloutRules{
+            "%spellout-numbering-year:",
+            "-x: miinus >>;",
+            "x.x: =#,###0.#=;",
+            "0: =%spellout-numbering=;",
+            "1100/100: <<\u00ADsataa[\u00AD>>];",
+            "10000: =%spellout-numbering=;",
+            "%spellout-numbering:",
+            "0: =%spellout-cardinal=;",
             "%spellout-cardinal:",
+            "-x: miinus >>;",
+            "x.x: << pilkku >>;",
             "0: nolla;",
             "1: yksi;",
             "2: kaksi;",
@@ -39,17 +49,7 @@
             "1000000000000000: << biljardi[ >>];",
             "2000000000000000: << biljardin[ >>];",
             "1000000000000000000: =#,##0=;",
-            "-x: miinus >>;",
-            "x.x: << pilkku >>;",
-            "%spellout-numbering:",
-            "0: =%spellout-cardinal=;",
-            "%spellout-numbering-year:",
-            "0: =%spellout-numbering=;",
-            "1100/100: <<\u00ADsataa[\u00AD>>];",
-            "10000: =%spellout-numbering=;",
-            "-x: miinus >>;",
-            "x.x: =#,###0.#=;",
         }
     }
-    Version{"1.4"}
+    Version{"1.5"}
 }

Modified: trunk/source/data/rbnf/fo.txt
===================================================================
--- trunk/source/data/rbnf/fo.txt	2009-07-02 19:27:40 UTC (rev 211)
+++ trunk/source/data/rbnf/fo.txt	2009-07-02 19:28:39 UTC (rev 212)
@@ -14,35 +14,17 @@
         SpelloutRules{
             "%%lenient-parse:",
             "&[last primary ignorable ] << ' ' << ',' << '-' << '\u00AD';",
-            "%spellout-cardinal-feminine:",
-            "0: null;",
-            "1: ein;",
-            "2: tv\u00E6r;",
-            "3: tr\u00EDggjar;",
-            "4: f\u00FDre;",
-            "5: =%spellout-cardinal-masculine=;",
-            "20: tj\u00FAgo[\u00AD>>];",
-            "30: tr\u00EDati[\u00AD>>];",
-            "40: f\u00FDrati[\u00AD>>];",
-            "50: fimmti[\u00AD>>];",
-            "60: seksti[\u00AD>>];",
-            "70: sjeyti[\u00AD>>];",
-            "80: \u00E1ttati[\u00AD>>];",
-            "90: n\u00EDti[\u00AD>>];",
-            "100: <%spellout-cardinal-neutre<\u00ADhundra\u00F0[\u00ADog\u00AD>>];",
-            "1000: <%spellout-cardinal-neutre< tusin[ og >>];",
-            "1000000: ein milli\u00F3n[ og >>];",
-            "2000000: <%spellout-cardinal-feminine< milli\u00F3ner[ og >>];",
-            "1000000000: ein milliard[ og >>];",
-            "2000000000: <%spellout-cardinal-feminine< milliarder[ og >>];",
-            "1000000000000: ein billi\u00F3n[ og >>];",
-            "2000000000000: <%spellout-cardinal-feminine< billi\u00F3ner[ og >>];",
-            "1000000000000000: ein billiard[ og >>];",
-            "2000000000000000: <%spellout-cardinal-feminine< billiarder[ og >>];",
-            "1000000000000000000: =#,##0=;",
+            "%spellout-numbering-year:",
+            "-x: m\u00EDnus >>;",
+            "x.x: =#,###0.#=;",
+            "0: =%spellout-numbering=;",
+            "1100/100: <<\u00ADhundra\u00F0[\u00ADog\u00AD>>];",
+            "10000: =%spellout-numbering=;",
+            "%spellout-numbering:",
+            "0: =%spellout-cardinal-masculine=;",
+            "%spellout-cardinal-masculine:",
             "-x: minus >>;",
             "x.x: << komma >>;",
-            "%spellout-cardinal-masculine:",
             "0: null;",
             "1: ein;",
             "2: tveir;",
@@ -82,9 +64,9 @@
             "1000000000000000: ein billiard[ og >>];",
             "2000000000000000: <%spellout-cardinal-feminine< billiarder[ og >>];",
             "1000000000000000000: =#,##0=;",
+            "%spellout-cardinal-neutre:",
             "-x: minus >>;",
             "x.x: << komma >>;",
-            "%spellout-cardinal-neutre:",
             "0: null;",
             "1: eitt;",
             "2: tvey;",
@@ -110,17 +92,35 @@
             "1000000000000000: ein billiard[ og >>];",
             "2000000000000000: <%spellout-cardinal-feminine< billiarder[ og >>];",
             "1000000000000000000: =#,##0=;",
+            "%spellout-cardinal-feminine:",
             "-x: minus >>;",
             "x.x: << komma >>;",
-            "%spellout-numbering:",
-            "0: =%spellout-cardinal-masculine=;",
-            "%spellout-numbering-year:",
-            "0: =%spellout-numbering=;",
-            "1100/100: <<\u00ADhundra\u00F0[\u00ADog\u00AD>>];",
-            "10000: =%spellout-numbering=;",
-            "-x: m\u00EDnus >>;",
-            "x.x: =#,###0.#=;",
+            "0: null;",
+            "1: ein;",
+            "2: tv\u00E6r;",
+            "3: tr\u00EDggjar;",
+            "4: f\u00FDre;",
+            "5: =%spellout-cardinal-masculine=;",
+            "20: tj\u00FAgo[\u00AD>>];",
+            "30: tr\u00EDati[\u00AD>>];",
+            "40: f\u00FDrati[\u00AD>>];",
+            "50: fimmti[\u00AD>>];",
+            "60: seksti[\u00AD>>];",
+            "70: sjeyti[\u00AD>>];",
+            "80: \u00E1ttati[\u00AD>>];",
+            "90: n\u00EDti[\u00AD>>];",
+            "100: <%spellout-cardinal-neutre<\u00ADhundra\u00F0[\u00ADog\u00AD>>];",
+            "1000: <%spellout-cardinal-neutre< tusin[ og >>];",
+            "1000000: ein milli\u00F3n[ og >>];",
+            "2000000: <%spellout-cardinal-feminine< milli\u00F3ner[ og >>];",
+            "1000000000: ein milliard[ og >>];",
+            "2000000000: <%spellout-cardinal-feminine< milliarder[ og >>];",
+            "1000000000000: ein billi\u00F3n[ og >>];",
+            "2000000000000: <%spellout-cardinal-feminine< billi\u00F3ner[ og >>];",
+            "1000000000000000: ein billiard[ og >>];",
+            "2000000000000000: <%spellout-cardinal-feminine< billiarder[ og >>];",
+            "1000000000000000000: =#,##0=;",
         }
     }
-    Version{"1.5"}
+    Version{"1.6"}
 }

Modified: trunk/source/data/rbnf/fr.txt
===================================================================
--- trunk/source/data/rbnf/fr.txt	2009-07-02 19:27:40 UTC (rev 211)
+++ trunk/source/data/rbnf/fr.txt	2009-07-02 19:28:39 UTC (rev 212)
@@ -12,68 +12,45 @@
 fr{
     RBNFRules{
         OrdinalRules{
-            "%digits-ordinal:",
-            "0: =%digits-ordinal-masculine=;",
-            "%digits-ordinal-feminine:",
-            "0: =#,##0==%%dord-femabbrev=;",
+            "%%dord-mascabbrev:",
+            "0: \u1D49;",
+            "1: \u1D49\u02B3;",
+            "2: \u1D49;",
+            "%digits-ordinal-masculine:",
             "-x: \u2212>>;",
-            "%digits-ordinal-masculine:",
             "0: =#,##0==%%dord-mascabbrev=;",
-            "-x: \u2212>>;",
             "%%dord-femabbrev:",
             "0: \u1D49;",
             "1: \u02B3\u1D49;",
             "2: \u1D49;",
-            "%%dord-mascabbrev:",
-            "0: \u1D49;",
-            "1: \u1D49\u02B3;",
-            "2: \u1D49;",
+            "%digits-ordinal-feminine:",
+            "-x: \u2212>>;",
+            "0: =#,##0==%%dord-femabbrev=;",
+            "%digits-ordinal:",
+            "0: =%digits-ordinal-masculine=;",
         }
         SpelloutRules{
-            "%%cents-f:",
-            "0: s;",
-            "1: -=%spellout-cardinal-feminine=;",
-            "%%cents-m:",
-            "0: s;",
-            "1: -=%spellout-cardinal-masculine=;",
+            "%%lenient-parse:",
+            "&[last primary ignorable ] << ' ' << ',' << '-' << '\u00AD';",
+            "%spellout-numbering-year:",
+            "-x: moins >>;",
+            "x.x: =#,###0.#=;",
+            "0: =%spellout-numbering=;",
+            "1100/100: <%spellout-cardinal-masculine<-cent>%%cents-m>;",
+            "10000: =%spellout-numbering=;",
+            "%spellout-numbering:",
+            "0: =%spellout-cardinal-masculine=;",
             "%%et-un:",
             "1: et-un;",
             "2: =%spellout-cardinal-masculine=;",
             "11: et-onze;",
             "12: =%spellout-cardinal-masculine=;",
-            "%%et-une:",
-            "1: et-une;",
-            "2: =%spellout-cardinal-feminine=;",
-            "11: et-onze;",
-            "12: =%spellout-cardinal-feminine=;",
-            "%%lenient-parse:",
-            "&[last primary ignorable ] << ' ' << ',' << '-' << '\u00AD';",
-            "%spellout-cardinal-feminine:",
-            "0: z\u00E9ro;",
-            "1: une;",
-            "2: =%spellout-cardinal-masculine=;",
-            "20: vingt[->%%et-une>];",
-            "30: trente[->%%et-une>];",
-            "40: quarante[->%%et-une>];",
-            "50: cinquante[->%%et-une>];",
-            "60/20: soixante[->%%et-une>];",
-            "80/20: quatre-vingt>%%cents-f>;",
-            "100: cent[->>];",
-            "200: <%spellout-cardinal-masculine<-cent>%%cents-f>;",
-            "1000: mille[->>];",
-            "2000: <%spellout-cardinal-masculine<-mille[->>];",
-            "1000000: un million[ >>];",
-            "2000000: <%spellout-cardinal-masculine< millions[ >>];",
-            "1000000000: un milliard[ >>];",
-            "2000000000: <%spellout-cardinal-masculine< milliards[ >>];",
-            "1000000000000: un billion[ >>];",
-            "2000000000000: <%spellout-cardinal-masculine< billions[ >>];",
-            "1000000000000000: un billiard[ >>];",
-            "2000000000000000: <%spellout-cardinal-masculine< billiards[ >>];",
-            "1000000000000000000: =#,##0=;",
+            "%%cents-m:",
+            "0: s;",
+            "1: -=%spellout-cardinal-masculine=;",
+            "%spellout-cardinal-masculine:",
             "-x: moins >>;",
             "x.x: << virgule >>;",
-            "%spellout-cardinal-masculine:",
             "0: z\u00E9ro;",
             "1: un;",
             "2: deux;",
@@ -111,29 +88,52 @@
             "1000000000000000: un billiard[ >>];",
             "2000000000000000: <%spellout-cardinal-masculine< billiards[ >>];",
             "1000000000000000000: =#,##0=;",
+            "%%et-une:",
+            "1: et-une;",
+            "2: =%spellout-cardinal-feminine=;",
+            "11: et-onze;",
+            "12: =%spellout-cardinal-feminine=;",
+            "%%cents-f:",
+            "0: s;",
+            "1: -=%spellout-cardinal-feminine=;",
+            "%spellout-cardinal-feminine:",
             "-x: moins >>;",
             "x.x: << virgule >>;",
-            "%spellout-numbering:",
-            "0: =%spellout-cardinal-masculine=;",
-            "%spellout-numbering-year:",
-            "0: =%spellout-numbering=;",
-            "1100/100: <%spellout-cardinal-masculine<-cent>%%cents-m>;",
-            "10000: =%spellout-numbering=;",
+            "0: z\u00E9ro;",
+            "1: une;",
+            "2: =%spellout-cardinal-masculine=;",
+            "20: vingt[->%%et-une>];",
+            "30: trente[->%%et-une>];",
+            "40: quarante[->%%et-une>];",
+            "50: cinquante[->%%et-une>];",
+            "60/20: soixante[->%%et-une>];",
+            "80/20: quatre-vingt>%%cents-f>;",
+            "100: cent[->>];",
+            "200: <%spellout-cardinal-masculine<-cent>%%cents-f>;",
+            "1000: mille[->>];",
+            "2000: <%spellout-cardinal-masculine<-mille[->>];",
+            "1000000: un million[ >>];",
+            "2000000: <%spellout-cardinal-masculine< millions[ >>];",
+            "1000000000: un milliard[ >>];",
+            "2000000000: <%spellout-cardinal-masculine< milliards[ >>];",
+            "1000000000000: un billion[ >>];",
+            "2000000000000: <%spellout-cardinal-masculine< billions[ >>];",
+            "1000000000000000: un billiard[ >>];",
+            "2000000000000000: <%spellout-cardinal-masculine< billiards[ >>];",
+            "1000000000000000000: =#,##0=;",
+            "%spellout-ordinal-masculine:",
             "-x: moins >>;",
-            "x.x: =#,###0.#=;",
-            "%spellout-ordinal-feminine:",
+            "x.x: =#,##0.#=;",
             "0: z\u00E9roi\u00E8me;",
-            "1: premi\u00E8re;",
+            "1: premier;",
             "2: =%spellout-cardinal-masculine=i\u00E8me;",
+            "%spellout-ordinal-feminine:",
             "-x: moins >>;",
             "x.x: =#,##0.#=;",
-            "%spellout-ordinal-masculine:",
             "0: z\u00E9roi\u00E8me;",
-            "1: premier;",
+            "1: premi\u00E8re;",
             "2: =%spellout-cardinal-masculine=i\u00E8me;",
-            "-x: moins >>;",
-            "x.x: =#,##0.#=;",
         }
     }
-    Version{"1.6"}
+    Version{"1.7"}
 }

Modified: trunk/source/data/rbnf/fr_BE.txt
===================================================================
--- trunk/source/data/rbnf/fr_BE.txt	2009-07-02 19:27:40 UTC (rev 211)
+++ trunk/source/data/rbnf/fr_BE.txt	2009-07-02 19:28:39 UTC (rev 212)
@@ -12,70 +12,45 @@
 fr_BE{
     RBNFRules{
         OrdinalRules{
-            "%digits-ordinal:",
-            "0: =%digits-ordinal-masculine=;",
-            "%digits-ordinal-feminine:",
-            "0: =#,##0==%%dord-femabbrev=;",
+            "%%dord-mascabbrev:",
+            "0: \u1D49;",
+            "1: \u1D49\u02B3;",
+            "2: \u1D49;",
+            "%digits-ordinal-masculine:",
             "-x: \u2212>>;",
-            "%digits-ordinal-masculine:",
             "0: =#,##0==%%dord-mascabbrev=;",
-            "-x: \u2212>>;",
             "%%dord-femabbrev:",
             "0: \u1D49;",
             "1: \u02B3\u1D49;",
             "2: \u1D49;",
-            "%%dord-mascabbrev:",
-            "0: \u1D49;",
-            "1: \u1D49\u02B3;",
-            "2: \u1D49;",
+            "%digits-ordinal-feminine:",
+            "-x: \u2212>>;",
+            "0: =#,##0==%%dord-femabbrev=;",
+            "%digits-ordinal:",
+            "0: =%digits-ordinal-masculine=;",
         }
         SpelloutRules{
-            "%%cents-f:",
-            "0: s;",
-            "1: -=%spellout-cardinal-feminine=;",
-            "%%cents-m:",
-            "0: s;",
-            "1: -=%spellout-cardinal-masculine=;",
+            "%%lenient-parse:",
+            "&[last primary ignorable ] << ' ' << ',' << '-' << '\u00AD';",
+            "%spellout-numbering-year:",
+            "-x: moins >>;",
+            "x.x: =#,###0.#=;",
+            "0: =%spellout-numbering=;",
+            "1100/100: <%spellout-cardinal-masculine<-cent>%%cents-m>;",
+            "10000: =%spellout-numbering=;",
+            "%spellout-numbering:",
+            "0: =%spellout-cardinal-masculine=;",
             "%%et-un:",
             "1: et-un;",
             "2: =%spellout-cardinal-masculine=;",
             "11: et-onze;",
             "12: =%spellout-cardinal-masculine=;",
-            "%%et-une:",
-            "1: et-une;",
-            "2: =%spellout-cardinal-feminine=;",
-            "11: et-onze;",
-            "12: =%spellout-cardinal-feminine=;",
-            "%%lenient-parse:",
-            "&[last primary ignorable ] << ' ' << ',' << '-' << '\u00AD';",
-            "%spellout-cardinal-feminine:",
-            "0: z\u00E9ro;",
-            "1: une;",
-            "2: =%spellout-cardinal-masculine=;",
-            "20: vingt[->%%et-une>];",
-            "30: trente[->%%et-une>];",
-            "40: quarante[->%%et-une>];",
-            "50: cinquante[->%%et-une>];",
-            "60: soixante[->%%et-une>];",
-            "70: septante[->%%et-une>];",
-            "80: quatre-vingt>%%cents-f>;",
-            "90: nonante[->%%et-une>];",
-            "100: cent[->>];",
-            "200: <%spellout-cardinal-masculine<-cent>%%cents-f>;",
-            "1000: mille[->>];",
-            "2000: <%spellout-cardinal-masculine<-mille[->>];",
-            "1000000: un million[ >>];",
-            "2000000: <%spellout-cardinal-masculine< millions[ >>];",
-            "1000000000: un milliard[ >>];",
-            "2000000000: <%spellout-cardinal-masculine< milliards[ >>];",
-            "1000000000000: un billion[ >>];",
-            "2000000000000: <%spellout-cardinal-masculine< billions[ >>];",
-            "1000000000000000: un billiard[ >>];",
-            "2000000000000000: <%spellout-cardinal-masculine< billiards[ >>];",
-            "1000000000000000000: =#,##0=;",
+            "%%cents-m:",
+            "0: s;",
+            "1: -=%spellout-cardinal-masculine=;",
+            "%spellout-cardinal-masculine:",
             "-x: moins >>;",
             "x.x: << virgule >>;",
-            "%spellout-cardinal-masculine:",
             "0: z\u00E9ro;",
             "1: un;",
             "2: deux;",
@@ -115,29 +90,54 @@
             "1000000000000000: un billiard[ >>];",
             "2000000000000000: <%spellout-cardinal-masculine< billiards[ >>];",
             "1000000000000000000: =#,##0=;",
+            "%%et-une:",
+            "1: et-une;",
+            "2: =%spellout-cardinal-feminine=;",
+            "11: et-onze;",
+            "12: =%spellout-cardinal-feminine=;",
+            "%%cents-f:",
+            "0: s;",
+            "1: -=%spellout-cardinal-feminine=;",
+            "%spellout-cardinal-feminine:",
             "-x: moins >>;",
             "x.x: << virgule >>;",
-            "%spellout-numbering:",
-            "0: =%spellout-cardinal-masculine=;",
-            "%spellout-numbering-year:",
-            "0: =%spellout-numbering=;",
-            "1100/100: <%spellout-cardinal-masculine<-cent>%%cents-m>;",
-            "10000: =%spellout-numbering=;",
+            "0: z\u00E9ro;",
+            "1: une;",
+            "2: =%spellout-cardinal-masculine=;",
+            "20: vingt[->%%et-une>];",
+            "30: trente[->%%et-une>];",
+            "40: quarante[->%%et-une>];",
+            "50: cinquante[->%%et-une>];",
+            "60: soixante[->%%et-une>];",
+            "70: septante[->%%et-une>];",
+            "80: quatre-vingt>%%cents-f>;",
+            "90: nonante[->%%et-une>];",
+            "100: cent[->>];",
+            "200: <%spellout-cardinal-masculine<-cent>%%cents-f>;",
+            "1000: mille[->>];",
+            "2000: <%spellout-cardinal-masculine<-mille[->>];",
+            "1000000: un million[ >>];",
+            "2000000: <%spellout-cardinal-masculine< millions[ >>];",
+            "1000000000: un milliard[ >>];",
+            "2000000000: <%spellout-cardinal-masculine< milliards[ >>];",
+            "1000000000000: un billion[ >>];",
+            "2000000000000: <%spellout-cardinal-masculine< billions[ >>];",
+            "1000000000000000: un billiard[ >>];",
+            "2000000000000000: <%spellout-cardinal-masculine< billiards[ >>];",
+            "1000000000000000000: =#,##0=;",
+            "%spellout-ordinal-masculine:",
             "-x: moins >>;",
-            "x.x: =#,###0.#=;",
-            "%spellout-ordinal-feminine:",
+            "x.x: =#,##0.#=;",
             "0: z\u00E9roi\u00E8me;",
-            "1: premi\u00E8re;",
+            "1: premier;",
             "2: =%spellout-cardinal-masculine=i\u00E8me;",
+            "%spellout-ordinal-feminine:",
             "-x: moins >>;",
             "x.x: =#,##0.#=;",
-            "%spellout-ordinal-masculine:",
             "0: z\u00E9roi\u00E8me;",
-            "1: premier;",
+            "1: premi\u00E8re;",
             "2: =%spellout-cardinal-masculine=i\u00E8me;",
-            "-x: moins >>;",
-            "x.x: =#,##0.#=;",
         }
     }
-    Version{"1.5"}
+    Version{"1.6"}
 }

Modified: trunk/source/data/rbnf/fr_CH.txt
===================================================================
--- trunk/source/data/rbnf/fr_CH.txt	2009-07-02 19:27:40 UTC (rev 211)
+++ trunk/source/data/rbnf/fr_CH.txt	2009-07-02 19:28:39 UTC (rev 212)
@@ -12,70 +12,45 @@
 fr_CH{
     RBNFRules{
         OrdinalRules{
-            "%digits-ordinal:",
-            "0: =%digits-ordinal-masculine=;",
-            "%digits-ordinal-feminine:",
-            "0: =#,##0==%%dord-femabbrev=;",
+            "%%dord-mascabbrev:",
+            "0: \u1D49;",
+            "1: \u1D49\u02B3;",
+            "2: \u1D49;",
+            "%digits-ordinal-masculine:",
             "-x: \u2212>>;",
-            "%digits-ordinal-masculine:",
             "0: =#,##0==%%dord-mascabbrev=;",
-            "-x: \u2212>>;",
             "%%dord-femabbrev:",
             "0: \u1D49;",
             "1: \u02B3\u1D49;",
             "2: \u1D49;",
-            "%%dord-mascabbrev:",
-            "0: \u1D49;",
-            "1: \u1D49\u02B3;",
-            "2: \u1D49;",
+            "%digits-ordinal-feminine:",
+            "-x: \u2212>>;",
+            "0: =#,##0==%%dord-femabbrev=;",
+            "%digits-ordinal:",
+            "0: =%digits-ordinal-masculine=;",
         }
         SpelloutRules{
-            "%%cents-f:",
-            "0: s;",
-            "1: -=%spellout-cardinal-feminine=;",
-            "%%cents-m:",
-            "0: s;",
-            "1: -=%spellout-cardinal-masculine=;",
+            "%%lenient-parse:",
+            "&[last primary ignorable ] << ' ' << ',' << '-' << '\u00AD';",
+            "%spellout-numbering-year:",
+            "-x: moins >>;",
+            "x.x: =#,###0.#=;",
+            "0: =%spellout-numbering=;",
+            "1100/100: <%spellout-cardinal-masculine<-cent>%%cents-m>;",
+            "10000: =%spellout-numbering=;",
+            "%spellout-numbering:",
+            "0: =%spellout-cardinal-masculine=;",
             "%%et-un:",
             "1: et-un;",
             "2: =%spellout-cardinal-masculine=;",
             "11: et-onze;",
             "12: =%spellout-cardinal-masculine=;",
-            "%%et-une:",
-            "1: et-une;",
-            "2: =%spellout-cardinal-feminine=;",
-            "11: et-onze;",
-            "12: =%spellout-cardinal-feminine=;",
-            "%%lenient-parse:",
-            "&[last primary ignorable ] << ' ' << ',' << '-' << '\u00AD';",
-            "%spellout-cardinal-feminine:",
-            "0: z\u00E9ro;",
-            "1: une;",
-            "2: =%spellout-cardinal-masculine=;",
-            "20: vingt[->%%et-une>];",
-            "30: trente[->%%et-une>];",
-            "40: quarante[->%%et-une>];",
-            "50: cinquante[->%%et-une>];",
-            "60: soixante[->%%et-une>];",
-            "70: septante[->%%et-une>];",
-            "80: huitante[->%%et-une>];",
-            "90: nonante[->%%et-une>];",
-            "100: cent[->>];",
-            "200: <%spellout-cardinal-masculine<-cent>%%cents-f>;",
-            "1000: mille[->>];",
-            "2000: <%spellout-cardinal-masculine<-mille[->>];",
-            "1000000: un-million[->>];",
-            "2000000: <%spellout-cardinal-masculine<-millions[->>];",
-            "1000000000: un-milliard[->>];",
-            "2000000000: <%spellout-cardinal-masculine<-milliards[->>];",
-            "1000000000000: un-billion[->>];",
-            "2000000000000: <%spellout-cardinal-masculine<-billions[->>];",
-            "1000000000000000: un-billiard[->>];",
-            "2000000000000000: <%spellout-cardinal-masculine<-billiards[->>];",
-            "1000000000000000000: =#,##0=;",
+            "%%cents-m:",
+            "0: s;",
+            "1: -=%spellout-cardinal-masculine=;",
+            "%spellout-cardinal-masculine:",
             "-x: moins >>;",
             "x.x: << virgule >>;",
-            "%spellout-cardinal-masculine:",
             "0: z\u00E9ro;",
             "1: un;",
             "2: deux;",
@@ -115,29 +90,54 @@
             "1000000000000000: un billiard[ >>];",
             "2000000000000000: <%spellout-cardinal-masculine< billiards[ >>];",
             "1000000000000000000: =#,##0=;",
+            "%%et-une:",
+            "1: et-une;",
+            "2: =%spellout-cardinal-feminine=;",
+            "11: et-onze;",
+            "12: =%spellout-cardinal-feminine=;",
+            "%%cents-f:",
+            "0: s;",
+            "1: -=%spellout-cardinal-feminine=;",
+            "%spellout-cardinal-feminine:",
             "-x: moins >>;",
             "x.x: << virgule >>;",
-            "%spellout-numbering:",
-            "0: =%spellout-cardinal-masculine=;",
-            "%spellout-numbering-year:",
-            "0: =%spellout-numbering=;",
-            "1100/100: <%spellout-cardinal-masculine<-cent>%%cents-m>;",
-            "10000: =%spellout-numbering=;",
+            "0: z\u00E9ro;",
+            "1: une;",
+            "2: =%spellout-cardinal-masculine=;",
+            "20: vingt[->%%et-une>];",
+            "30: trente[->%%et-une>];",
+            "40: quarante[->%%et-une>];",
+            "50: cinquante[->%%et-une>];",
+            "60: soixante[->%%et-une>];",
+            "70: septante[->%%et-une>];",
+            "80: huitante[->%%et-une>];",
+            "90: nonante[->%%et-une>];",
+            "100: cent[->>];",
+            "200: <%spellout-cardinal-masculine<-cent>%%cents-f>;",
+            "1000: mille[->>];",
+            "2000: <%spellout-cardinal-masculine<-mille[->>];",
+            "1000000: un-million[->>];",
+            "2000000: <%spellout-cardinal-masculine<-millions[->>];",
+            "1000000000: un-milliard[->>];",
+            "2000000000: <%spellout-cardinal-masculine<-milliards[->>];",
+            "1000000000000: un-billion[->>];",
+            "2000000000000: <%spellout-cardinal-masculine<-billions[->>];",
+            "1000000000000000: un-billiard[->>];",
+            "2000000000000000: <%spellout-cardinal-masculine<-billiards[->>];",
+            "1000000000000000000: =#,##0=;",
+            "%spellout-ordinal-masculine:",
             "-x: moins >>;",
-            "x.x: =#,###0.#=;",
-            "%spellout-ordinal-feminine:",
+            "x.x: =#,##0.#=;",
             "0: z\u00E9roi\u00E8me;",
-            "1: premi\u00E8re;",
+            "1: premier;",
             "2: =%spellout-cardinal-masculine=i\u00E8me;",
+            "%spellout-ordinal-feminine:",
             "-x: moins >>;",
             "x.x: =#,##0.#=;",
-            "%spellout-ordinal-masculine:",
             "0: z\u00E9roi\u00E8me;",
-            "1: premier;",
+            "1: premi\u00E8re;",
             "2: =%spellout-cardinal-masculine=i\u00E8me;",
-            "-x: moins >>;",
-            "x.x: =#,##0.#=;",
         }
     }
-    Version{"1.5"}
+    Version{"1.6"}
 }

Modified: trunk/source/data/rbnf/ga.txt
===================================================================
--- trunk/source/data/rbnf/ga.txt	2009-07-02 19:27:40 UTC (rev 211)
+++ trunk/source/data/rbnf/ga.txt	2009-07-02 19:28:39 UTC (rev 212)
@@ -12,12 +12,12 @@
 ga{
     RBNFRules{
         DurationRules{
-            "%duration:",
-            "0: =%in-numerals=;",
-            "%hms:",
-            "0: :=00=;",
-            "60/60: <00<>>>",
-            "3600/60: <#,##0<>>>;",
+            "%with-words:",
+            "0: =0= soicind;",
+            "60/60: <%%min<[, >>];",
+            "3600/60: <%%hr<[, >>>];",
+            "%%min:",
+            "0: =0= n\u00C3\u00B3im\u00C3\u00A9ad;",
             "%%hr:",
             "0: =0= uair;",
             "3: =0= huaire;",
@@ -27,156 +27,68 @@
             "10: =0= n-uair;",
             "11: =0= >%%uaire>;",
             "20: =0= uair; =0= >%%uaire>;",
-            "%%hr-min-sec:",
+            "%%uaire:",
+            "1: uair;",
+            "3: huaire;",
+            "5: uaire;",
+            "6: huaire;",
+            "7: n-uaire;",
+            "%hms:",
             "0: :=00=;",
-            "60/60: <00<>>;",
-            "3600/60: <#,##0<:>>>;",
+            "60/60: <00<>>>",
+            "3600/60: <#,##0<>>>;",
             "%in-numerals:",
             "0: =0= sec.;",
             "60: =%%min-sec=;",
             "3600: =%%hr-min-sec=;",
-            "%%lenient-parse:",
-            "& ':' = '.' = ' ' = '-';",
-            "%%min:",
-            "0: =0= n\u00C3\u00B3im\u00C3\u00A9ad;",
             "%%min-sec:",
             "0: :=00=;",
             "60/60: <0<>>;",
-            "%%uaire:",
-            "1: uair;",
-            "3: huaire;",
-            "5: uaire;",
-            "6: huaire;",
-            "7: n-uaire;",
-            "%with-words:",
-            "0: =0= soicind;",
-            "60/60: <%%min<[, >>];",
-            "3600/60: <%%hr<[, >>>];",
+            "%%hr-min-sec:",
+            "0: :=00=;",
+            "60/60: <00<>>;",
+            "3600/60: <#,##0<:>>>;",
+            "%duration:",
+            "0: =%in-numerals=;",
+            "%%lenient-parse:",
+            "& ':' = '.' = ' ' = '-';",
         }
         OrdinalRules{
             "%digits-ordinal:",
+            "-x: \u2212>>;",
             "0: =#,##0=\u00FA;",
-            "-x: \u2212>>;",
         }
         SpelloutRules{
             "%%2d-year:",
             "0: agus =%spellout-numbering=;",
             "10: =%%spellout-numbering-no-a=;",
-            "%%billions:",
-            "1: billi\u00FAn;",
-            "2: =%spellout-cardinal-prefixpart= billi\u00FAn=%spellout-cardinal-postfixpart=;",
-            "100: <%%hundreds<>%%is-billions>;",
-            "%%hundred:",
-            "0: gc\u00E9ad;",
-            "1: ch\u00E9ad;",
-            "7: gc\u00E9ad;",
-            "11: >>;",
-            "%%hundredp:",
-            "2: =%%hundred==%spellout-cardinal-postfixpart=;",
-            "%%hundreds:",
-            "1: c\u00E9ad;",
-            "2: =%spellout-cardinal-prefixpart= =%%hundredp=;",
-            "%%is:",
-            "0: ' is;",
-            "1: ;",
-            "10: >>;",
-            "%%is-billions:",
-            "0: ' billi\u00FAn;",
-            "1: ' is =%spellout-cardinal-prefixpart= billi\u00FAn;",
-            "11: ' is =%%billions=;",
-            "20: =%%is= =%%billions=;",
-            "%%is-millions:",
-            "0: ' =%%million=;",
-            "1: ' is =%spellout-cardinal-prefixpart= =%%million=;",
-            "11: ' is =%%millions=;",
-            "20: =%%is= =%%millions=;",
-            "%%is-number:",
-            "0: =%%is= =%spellout-numbering=;",
-            "%%is-numberp:",
-            "0: =%%is= =%%numberp=;",
-            "%%is-quadrillions:",
-            "0: ' quadrilli\u00FAn;",
-            "1: ' is =%spellout-cardinal-prefixpart= quadrilli\u00FAn;",
-            "11: ' is =%%quadrillions=;",
-            "20: =%%is= =%%quadrillions=;",
-            "%%is-thousands:",
-            "0: ' =%%thousand=;",
-            "1: ' is =%spellout-cardinal-prefixpart= =%%thousand=;",
-            "11: ' is =%%thousands=;",
-            "20: =%%is= =%%thousands=;",
-            "%%is-trillions:",
-            "0: ' =%%trillion=;",
-            "1: ' is =%spellout-cardinal-prefixpart= =%%trillion=;",
-            "11: ' is =%%trillions=;",
-            "20: =%%is= =%%trillions=;",
             "%%lenient-parse:",
             "& ' ' , ',' ;",
-            "%%million:",
-            "0: milli\u00FAn;",
-            "1: mhilli\u00FAn;",
-            "7: milli\u00FAn;",
-            "11: >>;",
-            "%%millions:",
-            "1: milli\u00FAn;",
-            "2: =%spellout-cardinal-prefixpart= =%%millionsp=;",
-            "100: <%%hundreds<>%%is-millions>;",
-            "%%millionsp:",
-            "2: =%%million==%spellout-cardinal-postfixpart=;",
-            "%%numberp:",
-            "0: =%spellout-cardinal-prefixpart=;",
-            "12: d\u00F3=%spellout-cardinal-postfixparth=;",
-            "13: =%spellout-cardinal-prefixpart==%spellout-cardinal-postfixpart=;",
-            "%%quadrillions:",
-            "1: quadrilli\u00FAn;",
-            "2: =%spellout-cardinal-prefixpart= quadrilli\u00FAn=%spellout-cardinal-postfixpart=;",
-            "100: <%%hundreds<>%%is-quadrillions>;",
-            "%spellout-cardinal-postfixpart:",
-            "0: ;",
-            "1: ' amh\u00E1in;",
-            "2: ;",
-            "11: ' d\u00E9ag;",
-            "20: ;",
-            "-x: >>;",
-            "x.x: ;",
-            "%spellout-cardinal-postfixparth:",
-            "0: ;",
-            "1: ' amh\u00E1in;",
-            "2: ;",
-            "11: ' dh\u00E9ag;",
-            "20: ;",
-            "-x: >>;",
-            "x.x: ;",
-            "%spellout-cardinal-prefixpart:",
+            "%spellout-numbering-year:",
+            "-x: m\u00EDneas >>;",
+            "x.x: =#,##0.#=;",
+            "0: =%spellout-numbering=;",
+            "1000/100: <%%spellout-numbering-no-a< >%%2d-year>;",
+            "10000: =%spellout-numbering=;",
+            "%%spellout-numbering-no-a:",
             "0: n\u00E1id;",
             "1: aon;",
-            "2: dh\u00E1;",
+            "2: d\u00F3;",
             "3: tr\u00ED;",
-            "4: ceithre;",
+            "4: ceathair;",
             "5: c\u00FAig;",
             "6: s\u00E9;",
             "7: seacht;",
             "8: ocht;",
             "9: naoi;",
             "10: deich;",
-            "11: >>;",
-            "20: fiche[ is >>];",
-            "30: tr\u00EDocha[ is >>];",
-            "40: daichead[ is >>];",
-            "50: caoga[ is >>];",
-            "60: seasca[ is >>];",
-            "70: seacht\u00F3[ is >>];",
-            "80: ocht\u00F3[ is >>];",
-            "90: n\u00F3cha[ is >>];",
-            "100: <%%hundreds<[>%%is-numberp>];",
-            "1000: <%%thousands<[, >%%numberp>];",
-            "1000000: <%%millions<[, >%%numberp>];",
-            "1000000000: <%%billions<[, >%%numberp>];",
-            "1000000000000: <%%trillions<[, >%%numberp>];",
-            "1000000000000000: <%%quadrillions<[, >%%numberp>];",
-            "1000000000000000000: =#,##0=;",
+            "11: >>=%spellout-cardinal-postfixpart=;",
+            "12: >>=%spellout-cardinal-postfixparth=;",
+            "13: >>=%spellout-cardinal-postfixpart=;",
+            "20: =%spellout-numbering=;",
+            "%spellout-numbering:",
             "-x: m\u00EDneas >>;",
-            "x.x: <%%numberp< pointe >>;",
-            "%spellout-numbering:",
+            "x.x: << pointe >>;",
             "0: a n\u00E1id;",
             "1: a haon;",
             "2: a d\u00F3;",
@@ -206,53 +118,141 @@
             "1000000000000: <%%trillions<[, >%spellout-numbering>];",
             "1000000000000000: <%%quadrillions<[, >%spellout-numbering>];",
             "1000000000000000000: =#,##0=;",
+            "%%is-number:",
+            "0: =%%is= =%spellout-numbering=;",
+            "%%is-numberp:",
+            "0: =%%is= =%%numberp=;",
+            "%%numberp:",
+            "0: =%spellout-cardinal-prefixpart=;",
+            "12: d\u00F3=%spellout-cardinal-postfixparth=;",
+            "13: =%spellout-cardinal-prefixpart==%spellout-cardinal-postfixpart=;",
+            "%spellout-cardinal-prefixpart:",
             "-x: m\u00EDneas >>;",
-            "x.x: << pointe >>;",
-            "%%spellout-numbering-no-a:",
+            "x.x: <%%numberp< pointe >>;",
             "0: n\u00E1id;",
             "1: aon;",
-            "2: d\u00F3;",
+            "2: dh\u00E1;",
             "3: tr\u00ED;",
-            "4: ceathair;",
+            "4: ceithre;",
             "5: c\u00FAig;",
             "6: s\u00E9;",
             "7: seacht;",
             "8: ocht;",
             "9: naoi;",
             "10: deich;",
-            "11: >>=%spellout-cardinal-postfixpart=;",
-            "12: >>=%spellout-cardinal-postfixparth=;",
-            "13: >>=%spellout-cardinal-postfixpart=;",
-            "20: =%spellout-numbering=;",
-            "%spellout-numbering-year:",
-            "0: =%spellout-numbering=;",
-            "1000/100: <%%spellout-numbering-no-a< >%%2d-year>;",
-            "10000: =%spellout-numbering=;",
-            "-x: m\u00EDneas >>;",
-            "x.x: =#,##0.#=;",
-            "%%thousand:",
-            "0: m\u00EDle;",
-            "1: mh\u00EDle;",
-            "7: m\u00EDle;",
             "11: >>;",
-            "%%thousandp:",
-            "2: =%%thousand==%spellout-cardinal-postfixparth=;",
+            "20: fiche[ is >>];",
+            "30: tr\u00EDocha[ is >>];",
+            "40: daichead[ is >>];",
+            "50: caoga[ is >>];",
+            "60: seasca[ is >>];",
+            "70: seacht\u00F3[ is >>];",
+            "80: ocht\u00F3[ is >>];",
+            "90: n\u00F3cha[ is >>];",
+            "100: <%%hundreds<[>%%is-numberp>];",
+            "1000: <%%thousands<[, >%%numberp>];",
+            "1000000: <%%millions<[, >%%numberp>];",
+            "1000000000: <%%billions<[, >%%numberp>];",
+            "1000000000000: <%%trillions<[, >%%numberp>];",
+            "1000000000000000: <%%quadrillions<[, >%%numberp>];",
+            "1000000000000000000: =#,##0=;",
+            "%spellout-cardinal-postfixpart:",
+            "-x: >>;",
+            "x.x: ;",
+            "0: ;",
+            "1: ' amh\u00E1in;",
+            "2: ;",
+            "11: ' d\u00E9ag;",
+            "20: ;",
+            "%spellout-cardinal-postfixparth:",
+            "-x: >>;",
+            "x.x: ;",
+            "0: ;",
+            "1: ' amh\u00E1in;",
+            "2: ;",
+            "11: ' dh\u00E9ag;",
+            "20: ;",
+            "%%is:",
+            "0: ' is;",
+            "1: ;",
+            "10: >>;",
+            "%%hundreds:",
+            "1: c\u00E9ad;",
+            "2: =%spellout-cardinal-prefixpart= =%%hundredp=;",
+            "%%hundredp:",
+            "2: =%%hundred==%spellout-cardinal-postfixpart=;",
+            "%%hundred:",
+            "0: gc\u00E9ad;",
+            "1: ch\u00E9ad;",
+            "7: gc\u00E9ad;",
+            "11: >>;",
             "%%thousands:",
             "1: m\u00EDle;",
             "2: =%spellout-cardinal-prefixpart= =%%thousandp=;",
             "100: <%%hundreds<>%%is-thousands>;",
-            "%%trillion:",
-            "0: dtrilli\u00FAn;",
-            "1: thrilli\u00FAn;",
-            "7: dtrilli\u00FAn;",
+            "%%thousandp:",
+            "2: =%%thousand==%spellout-cardinal-postfixparth=;",
+            "%%thousand:",
+            "0: m\u00EDle;",
+            "1: mh\u00EDle;",
+            "7: m\u00EDle;",
             "11: >>;",
+            "%%is-thousands:",
+            "0: ' =%%thousand=;",
+            "1: ' is =%spellout-cardinal-prefixpart= =%%thousand=;",
+            "11: ' is =%%thousands=;",
+            "20: =%%is= =%%thousands=;",
+            "%%millions:",
+            "1: milli\u00FAn;",
+            "2: =%spellout-cardinal-prefixpart= =%%millionsp=;",
+            "100: <%%hundreds<>%%is-millions>;",
+            "%%millionsp:",
+            "2: =%%million==%spellout-cardinal-postfixpart=;",
+            "%%million:",
+            "0: milli\u00FAn;",
+            "1: mhilli\u00FAn;",
+            "7: milli\u00FAn;",
+            "11: >>;",
+            "%%is-millions:",
+            "0: ' =%%million=;",
+            "1: ' is =%spellout-cardinal-prefixpart= =%%million=;",
+            "11: ' is =%%millions=;",
+            "20: =%%is= =%%millions=;",
+            "%%billions:",
+            "1: billi\u00FAn;",
+            "2: =%spellout-cardinal-prefixpart= billi\u00FAn=%spellout-cardinal-postfixpart=;",
+            "100: <%%hundreds<>%%is-billions>;",
+            "%%is-billions:",
+            "0: ' billi\u00FAn;",
+            "1: ' is =%spellout-cardinal-prefixpart= billi\u00FAn;",
+            "11: ' is =%%billions=;",
+            "20: =%%is= =%%billions=;",
             "%%trillions:",
             "1: thrilli\u00FAn;",
             "2: =%spellout-cardinal-prefixpart= =%%trillionsp=;",
             "100: <%%hundreds<>%%is-trillions>;",
             "%%trillionsp:",
             "2: =%%trillion==%spellout-cardinal-postfixpart=;",
+            "%%trillion:",
+            "0: dtrilli\u00FAn;",
+            "1: thrilli\u00FAn;",
+            "7: dtrilli\u00FAn;",
+            "11: >>;",
+            "%%is-trillions:",
+            "0: ' =%%trillion=;",
+            "1: ' is =%spellout-cardinal-prefixpart= =%%trillion=;",
+            "11: ' is =%%trillions=;",
+            "20: =%%is= =%%trillions=;",
+            "%%quadrillions:",
+            "1: quadrilli\u00FAn;",
+            "2: =%spellout-cardinal-prefixpart= quadrilli\u00FAn=%spellout-cardinal-postfixpart=;",
+            "100: <%%hundreds<>%%is-quadrillions>;",
+            "%%is-quadrillions:",
+            "0: ' quadrilli\u00FAn;",
+            "1: ' is =%spellout-cardinal-prefixpart= quadrilli\u00FAn;",
+            "11: ' is =%%quadrillions=;",
+            "20: =%%is= =%%quadrillions=;",
         }
     }
-    Version{"1.5"}
+    Version{"1.7"}
 }

Modified: trunk/source/data/rbnf/he.txt
===================================================================
--- trunk/source/data/rbnf/he.txt	2009-07-02 19:27:40 UTC (rev 211)
+++ trunk/source/data/rbnf/he.txt	2009-07-02 19:28:39 UTC (rev 212)
@@ -12,124 +12,70 @@
 he{
     RBNFRules{
         SpelloutRules{
-            "%%and-feminine:",
-            "1: \u05D5=%spellout-numbering=;",
-            "21: \u05E2\u05E9\u05E8\u05D9\u05DD >>;",
-            "30: \u05D5\u05E9\u05DC\u05D5\u05E9\u05D9\u05DD;",
-            "31: \u05E9\u05DC\u05D5\u05E9\u05D9\u05DD >>;",
-            "40: \u05D5\u05D0\u05E8\u05D1\u05E2\u05D9\u05DD;",
-            "41: \u05D0\u05E8\u05D1\u05E2\u05D9\u05DD >>;",
-            "50: \u05D5\u05D7\u05DE\u05D9\u05E9\u05D9\u05DD;",
-            "51: \u05D7\u05DE\u05D9\u05E9\u05D9\u05DD >>;",
-            "60: \u05D5\u05E9\u05D9\u05E9\u05D9\u05DD;",
-            "61: \u05E9\u05D9\u05E9\u05D9\u05DD >>;",
-            "70: \u05D5\u05E9\u05D1\u05E2\u05D9\u05DD;",
-            "71: \u05E9\u05D1\u05E2\u05D9\u05DD >>;",
-            "80: \u05D5\u05E9\u05DE\u05D5\u05E0\u05D9\u05DD;",
-            "81: \u05E9\u05DE\u05D5\u05E0\u05D9\u05DD >>;",
-            "90: \u05D5\u05EA\u05E9\u05E2\u05D9\u05DD;",
-            "91: \u05EA\u05E9\u05E2\u05D9\u05DD >>;",
-            "100: \u05D5\u05DE\u05D0\u05D4;",
-            "101: \u05DE\u05D0\u05D4 >>;",
-            "200: \u05D5\u05DE\u05D0\u05EA\u05D9\u05D9\u05DD;",
-            "201: \u05DE\u05D0\u05EA\u05D9\u05D9\u05DD >>;",
-            "300: \u05D5\u05E9\u05DC\u05D5\u05E9 \u05DE\u05D0\u05D5\u05EA;",
-            "301: \u05E9\u05DC\u05D5\u05E9 \u05DE\u05D0\u05D5\u05EA >>;",
-            "400: \u05D5\u05D0\u05E8\u05D1\u05E2 \u05DE\u05D0\u05D5\u05EA;",
-            "401: \u05D0\u05E8\u05D1\u05E2 \u05DE\u05D0\u05D5\u05EA >>;",
-            "500: \u05D5\u05D7\u05DE\u05E9 \u05DE\u05D0\u05D5\u05EA;",
-            "501: \u05D7\u05DE\u05E9 \u05DE\u05D0\u05D5\u05EA >>;",
-            "600: \u05D5\u05E9\u05E9 \u05DE\u05D0\u05D5\u05EA;",
-            "601: \u05E9\u05E9 \u05DE\u05D0\u05D5\u05EA >>;",
-            "700: \u05D5\u05E9\u05D1\u05E2 \u05DE\u05D0\u05D5\u05EA;",
-            "701: \u05E9\u05D1\u05E2 \u05DE\u05D0\u05D5\u05EA >>;",
-            "800: \u05D5\u05E9\u05DE\u05D5\u05E0\u05D4 \u05DE\u05D0\u05D5\u05EA;",
-            "801: \u05E9\u05DE\u05D5\u05E0\u05D4 \u05DE\u05D0\u05D5\u05EA >>;",
-            "900: \u05D5\u05EA\u05E9\u05E2 \u05DE\u05D0\u05D5\u05EA;",
-            "901: \u05EA\u05E9\u05E2 \u05DE\u05D0\u05D5\u05EA >>;",
-            "1000: \u05D5\u05D0\u05DC\u05E3[ >>];",
-            "2000: \u05D5\u05D0\u05DC\u05E4\u05D9\u05D9\u05DD[ >>];",
-            "3000: <%%and-thousands< \u05D0\u05DC\u05E4\u05D9\u05DD[ >>];",
-            "11000/1000: <%%and-masculine< \u05D0\u05DC\u05E3[ >>];",
-            "1000000: \u05D5\u05DE\u05D9\u05DC\u05D9\u05D5\u05DF[ >>];",
-            "2000000: \u05D5\u05E9\u05E0\u05D9 \u05DE\u05D9\u05DC\u05D9\u05D5\u05DF[ >>];",
-            "3000000: <%%and-masculine< \u05DE\u05D9\u05DC\u05D9\u05D5\u05DF[ >>];",
-            "1000000000: \u05D5\u05DE\u05D9\u05DC\u05D9\u05E8\u05D3[ >>];",
-            "2000000000: \u05D5\u05E9\u05E0\u05D9 \u05DE\u05D9\u05DC\u05D9\u05E8\u05D3[ >>];",
-            "3000000000: <%%and-masculine< \u05DE\u05D9\u05DC\u05D9\u05E8\u05D3[ >>];",
-            "1000000000000: \u05D5\u05D8\u05E8\u05D9\u05DC\u05D9\u05D5\u05DF[ >>];",
-            "2000000000000: \u05D5\u05E9\u05E0\u05D9 \u05D8\u05E8\u05D9\u05DC\u05D9\u05D5\u05DF[ >>];",
-            "3000000000000: <%%and-masculine< \u05D8\u05E8\u05D9\u05DC\u05D9\u05D5\u05DF[ >>];",
+            "%spellout-numbering-year:",
+            "x.x: =#,###0.#=;",
+            "0: =%spellout-numbering=;",
+            "%spellout-numbering:",
+            "-x: \u05DE\u05D9\u05E0\u05D5\u05E1 >>;",
+            "x.x: << \u05E0\u05E7\u05D5\u05D3\u05D4 >>;",
+            "0: \u05D0\u05E4\u05E1;",
+            "1: \u05D0\u05D7\u05EA;",
+            "2: \u05E9\u05EA\u05D9\u05D9\u05DD;",
+            "3: \u05E9\u05DC\u05D5\u05E9;",
+            "4: \u05D0\u05E8\u05D1\u05E2;",
+            "5: \u05D7\u05DE\u05E9;",
+            "6: \u05E9\u05E9;",
+            "7: \u05E9\u05D1\u05E2;",
+            "8: \u05E9\u05DE\u05D5\u05E0\u05D4;",
+            "9: \u05EA\u05E9\u05E2;",
+            "10: \u05E2\u05E9\u05E8;",
+            "11: \u05D0\u05D7\u05EA \u05E2\u05E9\u05E8\u05D4;",
+            "12: \u05E9\u05EA\u05D9\u05DD \u05E2\u05E9\u05E8\u05D4;",
+            "13: >> \u05E2\u05E9\u05E8\u05D4;",
+            "20: \u05E2\u05E9\u05E8\u05D9\u05DD[ >%%and-feminine>];",
+            "30: \u05E9\u05DC\u05D5\u05E9\u05D9\u05DD[ >%%and-feminine>];",
+            "40: \u05D0\u05E8\u05D1\u05E2\u05D9\u05DD[ >%%and-feminine>];",
+            "50: \u05D7\u05DE\u05D9\u05E9\u05D9\u05DD[ >%%and-feminine>];",
+            "60: \u05E9\u05D9\u05E9\u05D9\u05DD[ >%%and-feminine>];",
+            "70: \u05E9\u05D1\u05E2\u05D9\u05DD[ >%%and-feminine>];",
+            "80: \u05E9\u05DE\u05D5\u05E0\u05D9\u05DD[ >%%and-feminine>];",
+            "90: \u05EA\u05E9\u05E2\u05D9\u05DD[ >%%and-feminine>];",
+            "100: \u05DE\u05D0\u05D4[ >%%and-feminine>];",
+            "200: \u05DE\u05D0\u05EA\u05D9\u05D9\u05DD[ >%%and-feminine>];",
+            "300: <%spellout-numbering< \u05DE\u05D0\u05D5\u05EA[ >%%and-feminine>];",
+            "1000: \u05D0\u05DC\u05E3[ >%%and-feminine>];",
+            "2000: \u05D0\u05DC\u05E4\u05D9\u05D9\u05DD[ >%%and-feminine>];",
+            "3000: <%%thousands< \u05D0\u05DC\u05E4\u05D9\u05DD[ >%%and-feminine>];",
+            "11000/1000: <%%spellout-numbering-m< \u05D0\u05DC\u05E3[ >%%and-feminine>];",
+            "1000000: \u05DE\u05D9\u05DC\u05D9\u05D5\u05DF[ >%%and-feminine>];",
+            "2000000: \u05E9\u05E0\u05D9 \u05DE\u05D9\u05DC\u05D9\u05D5\u05DF[ >%%and-feminine>];",
+            "3000000: <%%spellout-numbering-m< \u05DE\u05D9\u05DC\u05D9\u05D5\u05DF[ >%%and-feminine>];",
+            "1000000000: \u05DE\u05D9\u05DC\u05D9\u05E8\u05D3[ >%%and-feminine>];",
+            "2000000000: \u05E9\u05E0\u05D9 \u05DE\u05D9\u05DC\u05D9\u05E8\u05D3[ >%%and-feminine>];",
+            "3000000000: <%%spellout-numbering-m< \u05DE\u05D9\u05DC\u05D9\u05E8\u05D3[ >%%and-feminine>];",
+            "1000000000000: \u05D8\u05E8\u05D9\u05DC\u05D9\u05D5\u05DF[ >%%and-feminine>];",
+            "2000000000000: \u05E9\u05E0\u05D9 \u05D8\u05E8\u05D9\u05DC\u05D9\u05D5\u05DF[ >%%and-feminine>];",
+            "3000000000000: <%%spellout-numbering-m< \u05D8\u05E8\u05D9\u05DC\u05D9\u05D5\u05DF[ >%%and-feminine>];",
+            "1000000000000000: \u05D8\u05E8\u05D9\u05DC\u05D9\u05E8\u05D3[ >%%and-feminine>];",
+            "2000000000000000: \u05E9\u05E0\u05D9 \u05D8\u05E8\u05D9\u05DC\u05D9\u05E8\u05D3[ >%%and-feminine>];",
+            "3000000000000000: <%%spellout-numbering-m< \u05D8\u05E8\u05D9\u05DC\u05D9\u05E8\u05D3[ >%%and-feminine>];",
             "1000000000000000000: =#,##0=;",
-            "%%and-masculine:",
-            "1: \u05D5=%%spellout-numbering-m=;",
-            "21: \u05E2\u05E9\u05E8\u05D9\u05DD >>;",
-            "30: \u05D5\u05E9\u05DC\u05D5\u05E9\u05D9\u05DD;",
-            "31: \u05E9\u05DC\u05D5\u05E9\u05D9\u05DD >>;",
-            "40: \u05D5\u05D0\u05E8\u05D1\u05E2\u05D9\u05DD;",
-            "41: \u05D0\u05E8\u05D1\u05E2\u05D9\u05DD >>;",
-            "50: \u05D5\u05D7\u05DE\u05D9\u05E9\u05D9\u05DD;",
-            "51: \u05D7\u05DE\u05D9\u05E9\u05D9\u05DD >>;",
-            "60: \u05D5\u05E9\u05D9\u05E9\u05D9\u05DD;",
-            "61: \u05E9\u05D9\u05E9\u05D9\u05DD >>;",
-            "70: \u05D5\u05E9\u05D1\u05E2\u05D9\u05DD;",
-            "71: \u05E9\u05D1\u05E2\u05D9\u05DD >>;",
-            "80: \u05D5\u05E9\u05DE\u05D5\u05E0\u05D9\u05DD;",
-            "81: \u05E9\u05DE\u05D5\u05E0\u05D9\u05DD >>;",
-            "90: \u05D5\u05EA\u05E9\u05E2\u05D9\u05DD;",
-            "91: \u05EA\u05E9\u05E2\u05D9\u05DD >>;",
-            "100: \u05D5\u05DE\u05D0\u05D4;",
-            "101: \u05DE\u05D0\u05D4 >>;",
-            "200: \u05D5\u05DE\u05D0\u05EA\u05D9\u05D9\u05DD;",
-            "201: \u05DE\u05D0\u05EA\u05D9\u05D9\u05DD >>;",
-            "300: \u05D5\u05E9\u05DC\u05D5\u05E9 \u05DE\u05D0\u05D5\u05EA;",
-            "301: \u05E9\u05DC\u05D5\u05E9 \u05DE\u05D0\u05D5\u05EA >>;",
-            "400: \u05D5\u05D0\u05E8\u05D1\u05E2 \u05DE\u05D0\u05D5\u05EA;",
-            "401: \u05D0\u05E8\u05D1\u05E2 \u05DE\u05D0\u05D5\u05EA >>;",
-            "500: \u05D5\u05D7\u05DE\u05E9 \u05DE\u05D0\u05D5\u05EA;",
-            "501: \u05D7\u05DE\u05E9 \u05DE\u05D0\u05D5\u05EA >>;",
-            "600: \u05D5\u05E9\u05E9 \u05DE\u05D0\u05D5\u05EA;",
-            "601: \u05E9\u05E9 \u05DE\u05D0\u05D5\u05EA >>;",
-            "700: \u05D5\u05E9\u05D1\u05E2 \u05DE\u05D0\u05D5\u05EA;",
-            "701: \u05E9\u05D1\u05E2 \u05DE\u05D0\u05D5\u05EA >>;",
-            "800: \u05D5\u05E9\u05DE\u05D5\u05E0\u05D4 \u05DE\u05D0\u05D5\u05EA;",
-            "801: \u05E9\u05DE\u05D5\u05E0\u05D4 \u05DE\u05D0\u05D5\u05EA >>;",
-            "900: \u05D5\u05EA\u05E9\u05E2 \u05DE\u05D0\u05D5\u05EA;",
-            "901: \u05EA\u05E9\u05E2 \u05DE\u05D0\u05D5\u05EA >>;",
-            "1000: \u05D5\u05D0\u05DC\u05E3[ >>];",
-            "2000: \u05D5\u05D0\u05DC\u05E4\u05D9\u05D9\u05DD[ >>];",
-            "3000: <%%and-thousands< \u05D0\u05DC\u05E4\u05D9\u05DD[ >>];",
-            "11000/1000: <%%and-masculine< \u05D0\u05DC\u05E3[ >>];",
-            "1000000: \u05D5\u05DE\u05D9\u05DC\u05D9\u05D5\u05DF[ >>];",
-            "2000000: \u05D5\u05E9\u05E0\u05D9 \u05DE\u05D9\u05DC\u05D9\u05D5\u05DF[ >>];",
-            "3000000: <%%and-masculine< \u05DE\u05D9\u05DC\u05D9\u05D5\u05DF[ >>];",
-            "1000000000: \u05D5\u05DE\u05D9\u05DC\u05D9\u05E8\u05D3[ >>];",
-            "2000000000: \u05D5\u05E9\u05E0\u05D9 \u05DE\u05D9\u05DC\u05D9\u05E8\u05D3[ >>];",
-            "3000000000: <%%and-masculine< \u05DE\u05D9\u05DC\u05D9\u05E8\u05D3[ >>];",
-            "1000000000000: \u05D5\u05D8\u05E8\u05D9\u05DC\u05D9\u05D5\u05DF[ >>];",
-            "2000000000000: \u05D5\u05E9\u05E0\u05D9 \u05D8\u05E8\u05D9\u05DC\u05D9\u05D5\u05DF[ >>];",
-            "3000000000000: <%%and-masculine< \u05D8\u05E8\u05D9\u05DC\u05D9\u05D5\u05DF[ >>];",
-            "1000000000000000000: =#,##0=;",
-            "%%and-thousands:",
-            "1: ERROR-=0=;",
-            "3: \u05D5=%%thousands=;",
-            "11: ERROR-=0=;",
+            "%spellout-cardinal-feminine-prefixpart:",
+            "-x: \u05DE\u05D9\u05E0\u05D5\u05E1 >>;",
+            "x.x: <%spellout-numbering< \u05E0\u05E7\u05D5\u05D3\u05D4 >%%zz-fraction-feminine> ;",
+            "0: \u05D0\u05E4\u05E1 ;",
+            "1: ;",
+            "2: =%%spellout-cardinal-feminine-prefx= ;",
             "%spellout-cardinal-feminine-postfixpart:",
+            "-x: >>;",
+            "x.x: ;",
             "0: ;",
             "1: ' =%%spellout-cardinal-feminine-postfx=;",
             "2: ;",
-            "-x: >>;",
-            "x.x: ;",
             "%%spellout-cardinal-feminine-postfx:",
             "0: ;",
             "1: \u05D0\u05D7\u05EA;",
             "2: ;",
-            "%spellout-cardinal-feminine-prefixpart:",
-            "0: \u05D0\u05E4\u05E1 ;",
-            "1: ;",
-            "2: =%%spellout-cardinal-feminine-prefx= ;",
-            "-x: \u05DE\u05D9\u05E0\u05D5\u05E1 >>;",
-            "x.x: <%spellout-numbering< \u05E0\u05E7\u05D5\u05D3\u05D4 >%%zz-fraction-feminine> ;",
             "%%spellout-cardinal-feminine-prefx:",
             "0: \u05D0\u05E4\u05E1;",
             "1: ;",
@@ -173,25 +119,58 @@
             "2000000000000000: \u05E9\u05E0\u05D9 \u05D8\u05E8\u05D9\u05DC\u05D9\u05E8\u05D3[ >%%and-feminine>];",
             "3000000000000000: <%%spellout-numbering-m< \u05D8\u05E8\u05D9\u05DC\u05D9\u05E8\u05D3[ >%%and-feminine>];",
             "1000000000000000000: =#,##0=;",
-            "%spellout-cardinal-masculine-postfixpart:",
-            "0: ;",
-            "1: ' =%%spellout-cardinal-masculine-postfx=;",
-            "2: ;",
-            "-x: >>;",
-            "x.x: ;",
-            "%%spellout-cardinal-masculine-postfx:",
-            "0: ;",
+            "%%and-feminine:",
+            "1: \u05D5=%spellout-numbering=;",
+            "21: \u05E2\u05E9\u05E8\u05D9\u05DD >>;",
+            "30: \u05D5\u05E9\u05DC\u05D5\u05E9\u05D9\u05DD;",
+            "31: \u05E9\u05DC\u05D5\u05E9\u05D9\u05DD >>;",
+            "40: \u05D5\u05D0\u05E8\u05D1\u05E2\u05D9\u05DD;",
+            "41: \u05D0\u05E8\u05D1\u05E2\u05D9\u05DD >>;",
+            "50: \u05D5\u05D7\u05DE\u05D9\u05E9\u05D9\u05DD;",
+            "51: \u05D7\u05DE\u05D9\u05E9\u05D9\u05DD >>;",
+            "60: \u05D5\u05E9\u05D9\u05E9\u05D9\u05DD;",
+            "61: \u05E9\u05D9\u05E9\u05D9\u05DD >>;",
+            "70: \u05D5\u05E9\u05D1\u05E2\u05D9\u05DD;",
+            "71: \u05E9\u05D1\u05E2\u05D9\u05DD >>;",
+            "80: \u05D5\u05E9\u05DE\u05D5\u05E0\u05D9\u05DD;",
+            "81: \u05E9\u05DE\u05D5\u05E0\u05D9\u05DD >>;",
+            "90: \u05D5\u05EA\u05E9\u05E2\u05D9\u05DD;",
+            "91: \u05EA\u05E9\u05E2\u05D9\u05DD >>;",
+            "100: \u05D5\u05DE\u05D0\u05D4;",
+            "101: \u05DE\u05D0\u05D4 >>;",
+            "200: \u05D5\u05DE\u05D0\u05EA\u05D9\u05D9\u05DD;",
+            "201: \u05DE\u05D0\u05EA\u05D9\u05D9\u05DD >>;",
+            "300: \u05D5\u05E9\u05DC\u05D5\u05E9 \u05DE\u05D0\u05D5\u05EA;",
+            "301: \u05E9\u05DC\u05D5\u05E9 \u05DE\u05D0\u05D5\u05EA >>;",
+            "400: \u05D5\u05D0\u05E8\u05D1\u05E2 \u05DE\u05D0\u05D5\u05EA;",
+            "401: \u05D0\u05E8\u05D1\u05E2 \u05DE\u05D0\u05D5\u05EA >>;",
+            "500: \u05D5\u05D7\u05DE\u05E9 \u05DE\u05D0\u05D5\u05EA;",
+            "501: \u05D7\u05DE\u05E9 \u05DE\u05D0\u05D5\u05EA >>;",
+            "600: \u05D5\u05E9\u05E9 \u05DE\u05D0\u05D5\u05EA;",
+            "601: \u05E9\u05E9 \u05DE\u05D0\u05D5\u05EA >>;",
+            "700: \u05D5\u05E9\u05D1\u05E2 \u05DE\u05D0\u05D5\u05EA;",
+            "701: \u05E9\u05D1\u05E2 \u05DE\u05D0\u05D5\u05EA >>;",
+            "800: \u05D5\u05E9\u05DE\u05D5\u05E0\u05D4 \u05DE\u05D0\u05D5\u05EA;",
+            "801: \u05E9\u05DE\u05D5\u05E0\u05D4 \u05DE\u05D0\u05D5\u05EA >>;",
+            "900: \u05D5\u05EA\u05E9\u05E2 \u05DE\u05D0\u05D5\u05EA;",
+            "901: \u05EA\u05E9\u05E2 \u05DE\u05D0\u05D5\u05EA >>;",
+            "1000: \u05D5\u05D0\u05DC\u05E3[ >>];",
+            "2000: \u05D5\u05D0\u05DC\u05E4\u05D9\u05D9\u05DD[ >>];",
+            "3000: <%%and-thousands< \u05D0\u05DC\u05E4\u05D9\u05DD[ >>];",
+            "11000/1000: <%%and-masculine< \u05D0\u05DC\u05E3[ >>];",
+            "1000000: \u05D5\u05DE\u05D9\u05DC\u05D9\u05D5\u05DF[ >>];",
+            "2000000: \u05D5\u05E9\u05E0\u05D9 \u05DE\u05D9\u05DC\u05D9\u05D5\u05DF[ >>];",
+            "3000000: <%%and-masculine< \u05DE\u05D9\u05DC\u05D9\u05D5\u05DF[ >>];",
+            "1000000000: \u05D5\u05DE\u05D9\u05DC\u05D9\u05E8\u05D3[ >>];",
+            "2000000000: \u05D5\u05E9\u05E0\u05D9 \u05DE\u05D9\u05DC\u05D9\u05E8\u05D3[ >>];",
+            "3000000000: <%%and-masculine< \u05DE\u05D9\u05DC\u05D9\u05E8\u05D3[ >>];",
+            "1000000000000: \u05D5\u05D8\u05E8\u05D9\u05DC\u05D9\u05D5\u05DF[ >>];",
+            "2000000000000: \u05D5\u05E9\u05E0\u05D9 \u05D8\u05E8\u05D9\u05DC\u05D9\u05D5\u05DF[ >>];",
+            "3000000000000: <%%and-masculine< \u05D8\u05E8\u05D9\u05DC\u05D9\u05D5\u05DF[ >>];",
+            "1000000000000000000: =#,##0=;",
+            "%%spellout-numbering-m:",
+            "0: \u05D0\u05E4\u05E1;",
             "1: \u05D0\u05D7\u05D3;",
-            "2: ;",
-            "%spellout-cardinal-masculine-prefixpart:",
-            "0: \u05D0\u05E4\u05E1 ;",
-            "1: ;",
-            "2: =%%spellout-cardinal-masculine-prefx= ;",
-            "-x: \u05DE\u05D9\u05E0\u05D5\u05E1 >>;",
-            "x.x: <%%spellout-numbering-m< \u05E0\u05E7\u05D5\u05D3\u05D4 >%%zz-fraction-masculine> ;",
-            "%%spellout-cardinal-masculine-prefx:",
-            "0: \u05D0\u05E4\u05E1;",
-            "1: ;",
             "2: \u05E9\u05E0\u05D9\u05D9\u05DD;",
             "3: \u05E9\u05DC\u05D5\u05E9\u05D4;",
             "4: \u05D0\u05E8\u05D1\u05E2\u05D4;",
@@ -232,54 +211,25 @@
             "2000000000000000: \u05E9\u05E0\u05D9 \u05D8\u05E8\u05D9\u05DC\u05D9\u05E8\u05D3[ >%%and-masculine>];",
             "3000000000000000: <%%spellout-numbering-m< \u05D8\u05E8\u05D9\u05DC\u05D9\u05E8\u05D3[ >%%and-masculine>];",
             "1000000000000000000: =#,##0=;",
-            "%spellout-numbering:",
-            "0: \u05D0\u05E4\u05E1;",
-            "1: \u05D0\u05D7\u05EA;",
-            "2: \u05E9\u05EA\u05D9\u05D9\u05DD;",
-            "3: \u05E9\u05DC\u05D5\u05E9;",
-            "4: \u05D0\u05E8\u05D1\u05E2;",
-            "5: \u05D7\u05DE\u05E9;",
-            "6: \u05E9\u05E9;",
-            "7: \u05E9\u05D1\u05E2;",
-            "8: \u05E9\u05DE\u05D5\u05E0\u05D4;",
-            "9: \u05EA\u05E9\u05E2;",
-            "10: \u05E2\u05E9\u05E8;",
-            "11: \u05D0\u05D7\u05EA \u05E2\u05E9\u05E8\u05D4;",
-            "12: \u05E9\u05EA\u05D9\u05DD \u05E2\u05E9\u05E8\u05D4;",
-            "13: >> \u05E2\u05E9\u05E8\u05D4;",
-            "20: \u05E2\u05E9\u05E8\u05D9\u05DD[ >%%and-feminine>];",
-            "30: \u05E9\u05DC\u05D5\u05E9\u05D9\u05DD[ >%%and-feminine>];",
-            "40: \u05D0\u05E8\u05D1\u05E2\u05D9\u05DD[ >%%and-feminine>];",
-            "50: \u05D7\u05DE\u05D9\u05E9\u05D9\u05DD[ >%%and-feminine>];",
-            "60: \u05E9\u05D9\u05E9\u05D9\u05DD[ >%%and-feminine>];",
-            "70: \u05E9\u05D1\u05E2\u05D9\u05DD[ >%%and-feminine>];",
-            "80: \u05E9\u05DE\u05D5\u05E0\u05D9\u05DD[ >%%and-feminine>];",
-            "90: \u05EA\u05E9\u05E2\u05D9\u05DD[ >%%and-feminine>];",
-            "100: \u05DE\u05D0\u05D4[ >%%and-feminine>];",
-            "200: \u05DE\u05D0\u05EA\u05D9\u05D9\u05DD[ >%%and-feminine>];",
-            "300: <%spellout-numbering< \u05DE\u05D0\u05D5\u05EA[ >%%and-feminine>];",
-            "1000: \u05D0\u05DC\u05E3[ >%%and-feminine>];",
-            "2000: \u05D0\u05DC\u05E4\u05D9\u05D9\u05DD[ >%%and-feminine>];",
-            "3000: <%%thousands< \u05D0\u05DC\u05E4\u05D9\u05DD[ >%%and-feminine>];",
-            "11000/1000: <%%spellout-numbering-m< \u05D0\u05DC\u05E3[ >%%and-feminine>];",
-            "1000000: \u05DE\u05D9\u05DC\u05D9\u05D5\u05DF[ >%%and-feminine>];",
-            "2000000: \u05E9\u05E0\u05D9 \u05DE\u05D9\u05DC\u05D9\u05D5\u05DF[ >%%and-feminine>];",
-            "3000000: <%%spellout-numbering-m< \u05DE\u05D9\u05DC\u05D9\u05D5\u05DF[ >%%and-feminine>];",
-            "1000000000: \u05DE\u05D9\u05DC\u05D9\u05E8\u05D3[ >%%and-feminine>];",
-            "2000000000: \u05E9\u05E0\u05D9 \u05DE\u05D9\u05DC\u05D9\u05E8\u05D3[ >%%and-feminine>];",
-            "3000000000: <%%spellout-numbering-m< \u05DE\u05D9\u05DC\u05D9\u05E8\u05D3[ >%%and-feminine>];",
-            "1000000000000: \u05D8\u05E8\u05D9\u05DC\u05D9\u05D5\u05DF[ >%%and-feminine>];",
-            "2000000000000: \u05E9\u05E0\u05D9 \u05D8\u05E8\u05D9\u05DC\u05D9\u05D5\u05DF[ >%%and-feminine>];",
-            "3000000000000: <%%spellout-numbering-m< \u05D8\u05E8\u05D9\u05DC\u05D9\u05D5\u05DF[ >%%and-feminine>];",
-            "1000000000000000: \u05D8\u05E8\u05D9\u05DC\u05D9\u05E8\u05D3[ >%%and-feminine>];",
-            "2000000000000000: \u05E9\u05E0\u05D9 \u05D8\u05E8\u05D9\u05DC\u05D9\u05E8\u05D3[ >%%and-feminine>];",
-            "3000000000000000: <%%spellout-numbering-m< \u05D8\u05E8\u05D9\u05DC\u05D9\u05E8\u05D3[ >%%and-feminine>];",
-            "1000000000000000000: =#,##0=;",
+            "%spellout-cardinal-masculine-prefixpart:",
             "-x: \u05DE\u05D9\u05E0\u05D5\u05E1 >>;",
-            "x.x: << \u05E0\u05E7\u05D5\u05D3\u05D4 >>;",
-            "%%spellout-numbering-m:",
+            "x.x: <%%spellout-numbering-m< \u05E0\u05E7\u05D5\u05D3\u05D4 >%%zz-fraction-masculine> ;",
+            "0: \u05D0\u05E4\u05E1 ;",
+            "1: ;",
+            "2: =%%spellout-cardinal-masculine-prefx= ;",
+            "%spellout-cardinal-masculine-postfixpart:",
+            "-x: >>;",
+            "x.x: ;",
+            "0: ;",
+            "1: ' =%%spellout-cardinal-masculine-postfx=;",
+            "2: ;",
+            "%%spellout-cardinal-masculine-postfx:",
+            "0: ;",
+            "1: \u05D0\u05D7\u05D3;",
+            "2: ;",
+            "%%spellout-cardinal-masculine-prefx:",
             "0: \u05D0\u05E4\u05E1;",
-            "1: \u05D0\u05D7\u05D3;",
+            "1: ;",
             "2: \u05E9\u05E0\u05D9\u05D9\u05DD;",
             "3: \u05E9\u05DC\u05D5\u05E9\u05D4;",
             "4: \u05D0\u05E8\u05D1\u05E2\u05D4;",
@@ -320,45 +270,65 @@
             "2000000000000000: \u05E9\u05E0\u05D9 \u05D8\u05E8\u05D9\u05DC\u05D9\u05E8\u05D3[ >%%and-masculine>];",
             "3000000000000000: <%%spellout-numbering-m< \u05D8\u05E8\u05D9\u05DC\u05D9\u05E8\u05D3[ >%%and-masculine>];",
             "1000000000000000000: =#,##0=;",
-            "%spellout-numbering-year:",
-            "0: =%spellout-numbering=;",
-            "x.x: =#,###0.#=;",
-            "%spellout-ordinal-feminine:",
-            "0: \u05DE\u05E1\u05E4\u05E8 \u05D0\u05E4\u05E1;",
-            "1: \u05E8\u05D0\u05E9\u05D5\u05E0\u05D4;",
-            "2: \u05E9\u05E0\u05D9\u05D4;",
-            "3: \u05E9\u05DC\u05D9\u05E9\u05D9\u05EA;",
-            "4: \u05E8\u05D1\u05D9\u05E2\u05D9\u05EA;",
-            "5: \u05D7\u05DE\u05D9\u05E9\u05D9\u05EA;",
-            "6: \u05E9\u05D9\u05E9\u05D9\u05EA;",
-            "7: \u05E9\u05D1\u05D9\u05E2\u05D9\u05EA;",
-            "8: \u05E9\u05DE\u05D9\u05E0\u05D9\u05EA;",
-            "9: \u05EA\u05E9\u05D9\u05E2\u05D9\u05EA;",
-            "10: \u05E2\u05E9\u05D9\u05E8\u05D9\u05EA;",
-            "11: =%spellout-numbering=;",
-            "-x: \u05DE\u05D9\u05E0\u05D5\u05E1 >>;",
-            "x.x: =#,##0.#=;",
-            "%spellout-ordinal-masculine:",
-            "0: \u05DE\u05E1\u05E4\u05E8 \u05D0\u05E4\u05E1;",
-            "1: \u05E8\u05D0\u05E9\u05D5\u05DF;",
-            "2: \u05E9\u05E0\u05D9;",
-            "3: \u05E9\u05DC\u05D9\u05E9\u05D9;",
-            "4: \u05E8\u05D1\u05D9\u05E2\u05D9;",
-            "5: \u05D7\u05DE\u05D9\u05E9\u05D9;",
-            "6: \u05E9\u05D9\u05E9\u05D9;",
-            "7: \u05E9\u05D1\u05D9\u05E2\u05D9;",
-            "8: \u05E9\u05DE\u05D9\u05E0\u05D9;",
-            "9: \u05EA\u05E9\u05D9\u05E2\u05D9;",
-            "10: \u05E2\u05E9\u05D9\u05E8\u05D9;",
-            "11: =%%spellout-numbering-m=;",
-            "-x: \u05DE\u05D9\u05E0\u05D5\u05E1 >>;",
-            "x.x: =#,##0.#=;",
+            "%%and-masculine:",
+            "1: \u05D5=%%spellout-numbering-m=;",
+            "21: \u05E2\u05E9\u05E8\u05D9\u05DD >>;",
+            "30: \u05D5\u05E9\u05DC\u05D5\u05E9\u05D9\u05DD;",
+            "31: \u05E9\u05DC\u05D5\u05E9\u05D9\u05DD >>;",
+            "40: \u05D5\u05D0\u05E8\u05D1\u05E2\u05D9\u05DD;",
+            "41: \u05D0\u05E8\u05D1\u05E2\u05D9\u05DD >>;",
+            "50: \u05D5\u05D7\u05DE\u05D9\u05E9\u05D9\u05DD;",
+            "51: \u05D7\u05DE\u05D9\u05E9\u05D9\u05DD >>;",
+            "60: \u05D5\u05E9\u05D9\u05E9\u05D9\u05DD;",
+            "61: \u05E9\u05D9\u05E9\u05D9\u05DD >>;",
+            "70: \u05D5\u05E9\u05D1\u05E2\u05D9\u05DD;",
+            "71: \u05E9\u05D1\u05E2\u05D9\u05DD >>;",
+            "80: \u05D5\u05E9\u05DE\u05D5\u05E0\u05D9\u05DD;",
+            "81: \u05E9\u05DE\u05D5\u05E0\u05D9\u05DD >>;",
+            "90: \u05D5\u05EA\u05E9\u05E2\u05D9\u05DD;",
+            "91: \u05EA\u05E9\u05E2\u05D9\u05DD >>;",
+            "100: \u05D5\u05DE\u05D0\u05D4;",
+            "101: \u05DE\u05D0\u05D4 >>;",
+            "200: \u05D5\u05DE\u05D0\u05EA\u05D9\u05D9\u05DD;",
+            "201: \u05DE\u05D0\u05EA\u05D9\u05D9\u05DD >>;",
+            "300: \u05D5\u05E9\u05DC\u05D5\u05E9 \u05DE\u05D0\u05D5\u05EA;",
+            "301: \u05E9\u05DC\u05D5\u05E9 \u05DE\u05D0\u05D5\u05EA >>;",
+            "400: \u05D5\u05D0\u05E8\u05D1\u05E2 \u05DE\u05D0\u05D5\u05EA;",
+            "401: \u05D0\u05E8\u05D1\u05E2 \u05DE\u05D0\u05D5\u05EA >>;",
+            "500: \u05D5\u05D7\u05DE\u05E9 \u05DE\u05D0\u05D5\u05EA;",
+            "501: \u05D7\u05DE\u05E9 \u05DE\u05D0\u05D5\u05EA >>;",
+            "600: \u05D5\u05E9\u05E9 \u05DE\u05D0\u05D5\u05EA;",
+            "601: \u05E9\u05E9 \u05DE\u05D0\u05D5\u05EA >>;",
+            "700: \u05D5\u05E9\u05D1\u05E2 \u05DE\u05D0\u05D5\u05EA;",
+            "701: \u05E9\u05D1\u05E2 \u05DE\u05D0\u05D5\u05EA >>;",
+            "800: \u05D5\u05E9\u05DE\u05D5\u05E0\u05D4 \u05DE\u05D0\u05D5\u05EA;",
+            "801: \u05E9\u05DE\u05D5\u05E0\u05D4 \u05DE\u05D0\u05D5\u05EA >>;",
+            "900: \u05D5\u05EA\u05E9\u05E2 \u05DE\u05D0\u05D5\u05EA;",
+            "901: \u05EA\u05E9\u05E2 \u05DE\u05D0\u05D5\u05EA >>;",
+            "1000: \u05D5\u05D0\u05DC\u05E3[ >>];",
+            "2000: \u05D5\u05D0\u05DC\u05E4\u05D9\u05D9\u05DD[ >>];",
+            "3000: <%%and-thousands< \u05D0\u05DC\u05E4\u05D9\u05DD[ >>];",
+            "11000/1000: <%%and-masculine< \u05D0\u05DC\u05E3[ >>];",
+            "1000000: \u05D5\u05DE\u05D9\u05DC\u05D9\u05D5\u05DF[ >>];",
+            "2000000: \u05D5\u05E9\u05E0\u05D9 \u05DE\u05D9\u05DC\u05D9\u05D5\u05DF[ >>];",
+            "3000000: <%%and-masculine< \u05DE\u05D9\u05DC\u05D9\u05D5\u05DF[ >>];",
+            "1000000000: \u05D5\u05DE\u05D9\u05DC\u05D9\u05E8\u05D3[ >>];",
+            "2000000000: \u05D5\u05E9\u05E0\u05D9 \u05DE\u05D9\u05DC\u05D9\u05E8\u05D3[ >>];",
+            "3000000000: <%%and-masculine< \u05DE\u05D9\u05DC\u05D9\u05E8\u05D3[ >>];",
+            "1000000000000: \u05D5\u05D8\u05E8\u05D9\u05DC\u05D9\u05D5\u05DF[ >>];",
+            "2000000000000: \u05D5\u05E9\u05E0\u05D9 \u05D8\u05E8\u05D9\u05DC\u05D9\u05D5\u05DF[ >>];",
+            "3000000000000: <%%and-masculine< \u05D8\u05E8\u05D9\u05DC\u05D9\u05D5\u05DF[ >>];",
+            "1000000000000000000: =#,##0=;",
             "%%thousands:",
             "1: ERROR-=0=;",
             "3: =%spellout-numbering=\u05EA;",
             "8: \u05E9\u05DE\u05D5\u05E0\u05EA;",
             "9: =%spellout-numbering=\u05EA;",
             "11: ERROR-=0=;",
+            "%%and-thousands:",
+            "1: ERROR-=0=;",
+            "3: \u05D5=%%thousands=;",
+            "11: ERROR-=0=;",
             "%%zz-fraction-feminine:",
             "10: <%spellout-numbering<<;",
             "100: <%spellout-numbering<<;",
@@ -381,7 +351,37 @@
             "100000000: <%%spellout-numbering-m<<;",
             "1000000000: <%%spellout-numbering-m<<;",
             "10000000000: <#,##0<<;",
+            "%spellout-ordinal-masculine:",
+            "-x: \u05DE\u05D9\u05E0\u05D5\u05E1 >>;",
+            "x.x: =#,##0.#=;",
+            "0: \u05DE\u05E1\u05E4\u05E8 \u05D0\u05E4\u05E1;",
+            "1: \u05E8\u05D0\u05E9\u05D5\u05DF;",
+            "2: \u05E9\u05E0\u05D9;",
+            "3: \u05E9\u05DC\u05D9\u05E9\u05D9;",
+            "4: \u05E8\u05D1\u05D9\u05E2\u05D9;",
+            "5: \u05D7\u05DE\u05D9\u05E9\u05D9;",
+            "6: \u05E9\u05D9\u05E9\u05D9;",
+            "7: \u05E9\u05D1\u05D9\u05E2\u05D9;",
+            "8: \u05E9\u05DE\u05D9\u05E0\u05D9;",
+            "9: \u05EA\u05E9\u05D9\u05E2\u05D9;",
+            "10: \u05E2\u05E9\u05D9\u05E8\u05D9;",
+            "11: =%%spellout-numbering-m=;",
+            "%spellout-ordinal-feminine:",
+            "-x: \u05DE\u05D9\u05E0\u05D5\u05E1 >>;",
+            "x.x: =#,##0.#=;",
+            "0: \u05DE\u05E1\u05E4\u05E8 \u05D0\u05E4\u05E1;",
+            "1: \u05E8\u05D0\u05E9\u05D5\u05E0\u05D4;",
+            "2: \u05E9\u05E0\u05D9\u05D4;",
+            "3: \u05E9\u05DC\u05D9\u05E9\u05D9\u05EA;",
+            "4: \u05E8\u05D1\u05D9\u05E2\u05D9\u05EA;",
+            "5: \u05D7\u05DE\u05D9\u05E9\u05D9\u05EA;",
+            "6: \u05E9\u05D9\u05E9\u05D9\u05EA;",
+            "7: \u05E9\u05D1\u05D9\u05E2\u05D9\u05EA;",
+            "8: \u05E9\u05DE\u05D9\u05E0\u05D9\u05EA;",
+            "9: \u05EA\u05E9\u05D9\u05E2\u05D9\u05EA;",
+            "10: \u05E2\u05E9\u05D9\u05E8\u05D9\u05EA;",
+            "11: =%spellout-numbering=;",
         }
     }
-    Version{"1.8"}
+    Version{"1.10"}
 }

Modified: trunk/source/data/rbnf/hi.txt
===================================================================
--- trunk/source/data/rbnf/hi.txt	2009-07-02 19:27:40 UTC (rev 211)
+++ trunk/source/data/rbnf/hi.txt	2009-07-02 19:28:39 UTC (rev 212)
@@ -13,11 +13,18 @@
     RBNFRules{
         OrdinalRules{
             "%digits-ordinal:",
+            "-x: \u2212>>;",
             "0: =#,##,##0=.;",
-            "-x: \u2212>>;",
         }
         SpelloutRules{
+            "%spellout-numbering-year:",
+            "x.x: =#,###0.#=;",
+            "0: =%spellout-numbering=;",
+            "%spellout-numbering:",
+            "0: =%spellout-cardinal=;",
             "%spellout-cardinal:",
+            "-x: \u090B\u0923 >>;",
+            "x.x: << ... >>;",
             "0: \u0936\u0942\u0928\u094D\u092F;",
             "1: \u090F\u0915;",
             "2: \u0926\u094B;",
@@ -125,14 +132,7 @@
             "1000000000: << \u0905\u0930\u092C[ >>];",
             "100000000000: << \u0916\u0930\u092C[ >>];",
             "1000000000000000000: =#,##,##0=;",
-            "-x: \u090B\u0923 >>;",
-            "x.x: << ... >>;",
-            "%spellout-numbering:",
-            "0: =%spellout-cardinal=;",
-            "%spellout-numbering-year:",
-            "0: =%spellout-numbering=;",
-            "x.x: =#,###0.#=;",
         }
     }
-    Version{"1.1"}
+    Version{"1.2"}
 }

Modified: trunk/source/data/rbnf/hr.txt
===================================================================
--- trunk/source/data/rbnf/hr.txt	2009-07-02 19:27:40 UTC (rev 211)
+++ trunk/source/data/rbnf/hr.txt	2009-07-02 19:28:39 UTC (rev 212)
@@ -12,11 +12,34 @@
 hr{
     RBNFRules{
         SpelloutRules{
-            "%spellout-cardinal-feminine:",
+            "%spellout-numbering-year:",
+            "x.x: =#,###0.#=;",
+            "0: =%spellout-numbering=;",
+            "%spellout-numbering:",
+            "0: =%spellout-cardinal-masculine=;",
+            "%spellout-cardinal-masculine:",
+            "-x: minus >>;",
+            "x.x: << zarez >>;",
             "0: nula;",
-            "1: jedinica;",
-            "2: dve;",
-            "3: =%spellout-cardinal-masculine=;",
+            "1: jedan;",
+            "2: dva;",
+            "3: tri;",
+            "4: \u010Detiri;",
+            "5: pet;",
+            "6: \u0161est;",
+            "7: sedam;",
+            "8: osam;",
+            "9: devet;",
+            "10: deset;",
+            "11: jedenaest;",
+            "12: dvanaest;",
+            "13: trinaest;",
+            "14: \u010Detrnaest;",
+            "15: petnaest;",
+            "16: \u0161estnaest;",
+            "17: sedamnaest;",
+            "18: osamnaest;",
+            "19: devetnaest;",
             "20: dvadeset[ i >>];",
             "30: trideset[ i >>];",
             "40: \u010Detrdeset[ i >>];",
@@ -35,7 +58,7 @@
             "800: osamsto[ >>];",
             "900: devetsto[ >>];",
             "1000: tisu\u0107u[ >>];",
-            "2000: <%spellout-cardinal-feminine< tisu\u0107e[ >>];",
+            "2000: <%spellout-cardinal-feminine< tisu\u0107a[ >>];",
             "5000: <%spellout-cardinal-feminine< tisu\u0107u[ >>];",
             "1000000: <%spellout-cardinal-masculine< milijun[ >>];",
             "2000000: <%spellout-cardinal-masculine< milijuny[ >>];",
@@ -50,29 +73,13 @@
             "2000000000000000: <%spellout-cardinal-masculine< biliardy[ >>];",
             "5000000000000000: <%spellout-cardinal-masculine< biliarda[ >>];",
             "1000000000000000000: =#,##0=;",
+            "%spellout-cardinal-neutre:",
             "-x: minus >>;",
             "x.x: << zarez >>;",
-            "%spellout-cardinal-masculine:",
             "0: nula;",
-            "1: jedan;",
+            "1: jedno;",
             "2: dva;",
-            "3: tri;",
-            "4: \u010Detiri;",
-            "5: pet;",
-            "6: \u0161est;",
-            "7: sedam;",
-            "8: osam;",
-            "9: devet;",
-            "10: deset;",
-            "11: jedenaest;",
-            "12: dvanaest;",
-            "13: trinaest;",
-            "14: \u010Detrnaest;",
-            "15: petnaest;",
-            "16: \u0161estnaest;",
-            "17: sedamnaest;",
-            "18: osamnaest;",
-            "19: devetnaest;",
+            "3: =%spellout-cardinal-masculine=;",
             "20: dvadeset[ i >>];",
             "30: trideset[ i >>];",
             "40: \u010Detrdeset[ i >>];",
@@ -91,7 +98,7 @@
             "800: osamsto[ >>];",
             "900: devetsto[ >>];",
             "1000: tisu\u0107u[ >>];",
-            "2000: <%spellout-cardinal-feminine< tisu\u0107a[ >>];",
+            "2000: <%spellout-cardinal-feminine< tisu\u0107e[ >>];",
             "5000: <%spellout-cardinal-feminine< tisu\u0107u[ >>];",
             "1000000: <%spellout-cardinal-masculine< milijun[ >>];",
             "2000000: <%spellout-cardinal-masculine< milijuny[ >>];",
@@ -106,12 +113,12 @@
             "2000000000000000: <%spellout-cardinal-masculine< biliardy[ >>];",
             "5000000000000000: <%spellout-cardinal-masculine< biliarda[ >>];",
             "1000000000000000000: =#,##0=;",
+            "%spellout-cardinal-feminine:",
             "-x: minus >>;",
             "x.x: << zarez >>;",
-            "%spellout-cardinal-neutre:",
             "0: nula;",
-            "1: jedno;",
-            "2: dva;",
+            "1: jedinica;",
+            "2: dve;",
             "3: =%spellout-cardinal-masculine=;",
             "20: dvadeset[ i >>];",
             "30: trideset[ i >>];",
@@ -146,14 +153,7 @@
             "2000000000000000: <%spellout-cardinal-masculine< biliardy[ >>];",
             "5000000000000000: <%spellout-cardinal-masculine< biliarda[ >>];",
             "1000000000000000000: =#,##0=;",
-            "-x: minus >>;",
-            "x.x: << zarez >>;",
-            "%spellout-numbering:",
-            "0: =%spellout-cardinal-masculine=;",
-            "%spellout-numbering-year:",
-            "0: =%spellout-numbering=;",
-            "x.x: =#,###0.#=;",
         }
     }
-    Version{"1.1"}
+    Version{"1.2"}
 }

Modified: trunk/source/data/rbnf/hu.txt
===================================================================
--- trunk/source/data/rbnf/hu.txt	2009-07-02 19:27:40 UTC (rev 211)
+++ trunk/source/data/rbnf/hu.txt	2009-07-02 19:28:39 UTC (rev 212)
@@ -12,7 +12,17 @@
 hu{
     RBNFRules{
         SpelloutRules{
+            "%spellout-numbering-year:",
+            "-x: minusz >>;",
+            "x.x: =#,###0.#=;",
+            "0: =%spellout-numbering=;",
+            "1100/100: <<\u00ADsz\u00E1z[\u00AD>>];",
+            "10000: =%spellout-numbering=;",
+            "%spellout-numbering:",
+            "0: =%spellout-cardinal=;",
             "%spellout-cardinal:",
+            "-x: minusz >>;",
+            "x.x: << vessz\u0151 >>;",
             "0: nulla;",
             "1: egy;",
             "2: kett\u0151;",
@@ -41,17 +51,7 @@
             "1000000000000: << billi\u00F3[ >>];",
             "1000000000000000: << billi\u00E1rd[ >>];",
             "1000000000000000000: =#,##0=;",
-            "-x: minusz >>;",
-            "x.x: << vessz\u0151 >>;",
-            "%spellout-numbering:",
-            "0: =%spellout-cardinal=;",
-            "%spellout-numbering-year:",
-            "0: =%spellout-numbering=;",
-            "1100/100: <<\u00ADsz\u00E1z[\u00AD>>];",
-            "10000: =%spellout-numbering=;",
-            "-x: minusz >>;",
-            "x.x: =#,###0.#=;",
         }
     }
-    Version{"1.4"}
+    Version{"1.5"}
 }

Modified: trunk/source/data/rbnf/hy.txt
===================================================================
--- trunk/source/data/rbnf/hy.txt	2009-07-02 19:27:40 UTC (rev 211)
+++ trunk/source/data/rbnf/hy.txt	2009-07-02 19:28:39 UTC (rev 212)
@@ -12,7 +12,14 @@
 hy{
     RBNFRules{
         SpelloutRules{
+            "%spellout-numbering-year:",
+            "x.x: =#,###0.#=;",
+            "0: =%spellout-numbering=;",
+            "%spellout-numbering:",
+            "0: =%spellout-cardinal=;",
             "%spellout-cardinal:",
+            "-x: \u0570\u0561\u0576\u0561\u056E >>;",
+            "x.x: << \u057D\u057F\u0578\u0580\u0561\u056F\u0565\u056C >>;",
             "0: \u0566\u0580\u0578;",
             "1: \u0574\u0565\u056F;",
             "2: \u0565\u0580\u056F\u0578\u0582;",
@@ -39,14 +46,7 @@
             "1000000000000: << \u0562\u056B\u056C\u056B\u0585\u0576[ >>];",
             "1000000000000000: << \u0562\u056B\u056C\u056B\u0561\u0580[ >>];",
             "1000000000000000000: =#,##0=;",
-            "-x: \u0570\u0561\u0576\u0561\u056E >>;",
-            "x.x: << \u057D\u057F\u0578\u0580\u0561\u056F\u0565\u056C >>;",
-            "%spellout-numbering:",
-            "0: =%spellout-cardinal=;",
-            "%spellout-numbering-year:",
-            "0: =%spellout-numbering=;",
-            "x.x: =#,###0.#=;",
         }
     }
-    Version{"1.4"}
+    Version{"1.5"}
 }

Modified: trunk/source/data/rbnf/id.txt
===================================================================
--- trunk/source/data/rbnf/id.txt	2009-07-02 19:27:40 UTC (rev 211)
+++ trunk/source/data/rbnf/id.txt	2009-07-02 19:28:39 UTC (rev 212)
@@ -13,11 +13,18 @@
     RBNFRules{
         OrdinalRules{
             "%digits-ordinal:",
+            "-x: ke\u2212>#,##0>;",
             "0: ke=#,##0=;",
-            "-x: ke\u2212>#,##0>;",
         }
         SpelloutRules{
+            "%spellout-numbering-year:",
+            "x.x: =#,###0.#=;",
+            "0: =%spellout-numbering=;",
+            "%spellout-numbering:",
+            "0: =%spellout-cardinal=;",
             "%spellout-cardinal:",
+            "-x: minus >>;",
+            "x.x: << titik >>;",
             "0: kosong;",
             "1: satu;",
             "2: dua;",
@@ -41,17 +48,10 @@
             "1000000000000: << bilyun[ >>];",
             "1000000000000000: << bilyar[ >>];",
             "1000000000000000000: =#,##0.#=;",
-            "-x: minus >>;",
-            "x.x: << titik >>;",
-            "%spellout-numbering:",
-            "0: =%spellout-cardinal=;",
-            "%spellout-numbering-year:",
-            "0: =%spellout-numbering=;",
-            "x.x: =#,###0.#=;",
             "%spellout-ordinal:",
+            "x.x: =#,##0.#=;",
             "0: ke=%spellout-cardinal=;",
-            "x.x: =#,##0.#=;",
         }
     }
-    Version{"1.1"}
+    Version{"1.2"}
 }

Modified: trunk/source/data/rbnf/is.txt
===================================================================
--- trunk/source/data/rbnf/is.txt	2009-07-02 19:27:40 UTC (rev 211)
+++ trunk/source/data/rbnf/is.txt	2009-07-02 19:28:39 UTC (rev 212)
@@ -14,35 +14,17 @@
         SpelloutRules{
             "%%lenient-parse:",
             "&[last primary ignorable ] << ' ' << ',' << '-' << '\u00AD';",
-            "%spellout-cardinal-feminine:",
-            "0: n\u00FAll;",
-            "1: ein;",
-            "2: tv\u00E6r;",
-            "3: \u00FErj\u00E1r;",
-            "4: fj\u00F3rar;",
-            "5: =%spellout-cardinal-masculine=;",
-            "20: tuttugu[ og >>];",
-            "30: \u00FErj\u00E1t\u00EDu[ og >>];",
-            "40: fj\u00F6rut\u00EDu[ og >>];",
-            "50: fimmt\u00EDu[ og >>];",
-            "60: sext\u00EDu[ og >>];",
-            "70: sj\u00F6t\u00EDu[ og >>];",
-            "80: \u00E1ttat\u00EDu[ og >>];",
-            "90: n\u00EDut\u00EDu[ og >>];",
-            "100: <%spellout-cardinal-neutre<\u00ADhundra\u00F0[ og >>];",
-            "1000: <%spellout-cardinal-neutre< \u00FE\u00FAsund[ og >>];",
-            "1000000: ein milli\u00F3n[ og >>];",
-            "2000000: <%spellout-cardinal-feminine< milli\u00F3nur[ og >>];",
-            "1000000000: ein milliar\u00F0[ og >>];",
-            "2000000000: <%spellout-cardinal-feminine< milliar\u00F0ur[ og >>];",
-            "1000000000000: ein billi\u00F3n[ og >>];",
-            "2000000000000: <%spellout-cardinal-feminine< billi\u00F3nur[ og >>];",
-            "1000000000000000: ein billiar\u00F0[ og >>];",
-            "2000000000000000: <%spellout-cardinal-feminine< billiar\u00F0ur[ og >>];",
-            "1000000000000000000: =#,##0.#=;",
+            "%spellout-numbering-year:",
             "-x: m\u00EDnus >>;",
+            "x.x: =#,###0.#=;",
+            "0: =%spellout-numbering=;",
+            "1100/100: << hundra\u00F0[ og >>];",
+            "10000: =%spellout-numbering=;",
+            "%spellout-numbering:",
+            "0: =%spellout-cardinal-masculine=;",
+            "%spellout-cardinal-masculine:",
+            "-x: m\u00EDnus >>;",
             "x.x: << komma >>;",
-            "%spellout-cardinal-masculine:",
             "0: n\u00FAll;",
             "1: einn;",
             "2: tveir;",
@@ -82,9 +64,9 @@
             "1000000000000000: ein billiar\u00F0[ og >>];",
             "2000000000000000: <%spellout-cardinal-feminine< billiar\u00F0ur[ og >>];",
             "1000000000000000000: =#,##0=;",
+            "%spellout-cardinal-neutre:",
             "-x: m\u00EDnus >>;",
             "x.x: << komma >>;",
-            "%spellout-cardinal-neutre:",
             "0: n\u00FAll;",
             "1: eitt;",
             "2: tv\u00F6;",
@@ -110,17 +92,35 @@
             "1000000000000000: ein billiar\u00F0[ og >>];",
             "2000000000000000: <%spellout-cardinal-feminine< billiar\u00F0ur[ og >>];",
             "1000000000000000000: =#,##0=;",
+            "%spellout-cardinal-feminine:",
             "-x: m\u00EDnus >>;",
             "x.x: << komma >>;",
-            "%spellout-numbering:",
-            "0: =%spellout-cardinal-masculine=;",
-            "%spellout-numbering-year:",
-            "0: =%spellout-numbering=;",
-            "1100/100: << hundra\u00F0[ og >>];",
-            "10000: =%spellout-numbering=;",
-            "-x: m\u00EDnus >>;",
-            "x.x: =#,###0.#=;",
+            "0: n\u00FAll;",
+            "1: ein;",
+            "2: tv\u00E6r;",
+            "3: \u00FErj\u00E1r;",
+            "4: fj\u00F3rar;",
+            "5: =%spellout-cardinal-masculine=;",
+            "20: tuttugu[ og >>];",
+            "30: \u00FErj\u00E1t\u00EDu[ og >>];",
+            "40: fj\u00F6rut\u00EDu[ og >>];",
+            "50: fimmt\u00EDu[ og >>];",
+            "60: sext\u00EDu[ og >>];",
+            "70: sj\u00F6t\u00EDu[ og >>];",
+            "80: \u00E1ttat\u00EDu[ og >>];",
+            "90: n\u00EDut\u00EDu[ og >>];",
+            "100: <%spellout-cardinal-neutre<\u00ADhundra\u00F0[ og >>];",
+            "1000: <%spellout-cardinal-neutre< \u00FE\u00FAsund[ og >>];",
+            "1000000: ein milli\u00F3n[ og >>];",
+            "2000000: <%spellout-cardinal-feminine< milli\u00F3nur[ og >>];",
+            "1000000000: ein milliar\u00F0[ og >>];",
+            "2000000000: <%spellout-cardinal-feminine< milliar\u00F0ur[ og >>];",
+            "1000000000000: ein billi\u00F3n[ og >>];",
+            "2000000000000: <%spellout-cardinal-feminine< billi\u00F3nur[ og >>];",
+            "1000000000000000: ein billiar\u00F0[ og >>];",
+            "2000000000000000: <%spellout-cardinal-feminine< billiar\u00F0ur[ og >>];",
+            "1000000000000000000: =#,##0.#=;",
         }
     }
-    Version{"1.5"}
+    Version{"1.6"}
 }

Modified: trunk/source/data/rbnf/it.txt
===================================================================
--- trunk/source/data/rbnf/it.txt	2009-07-02 19:27:40 UTC (rev 211)
+++ trunk/source/data/rbnf/it.txt	2009-07-02 19:28:39 UTC (rev 212)
@@ -12,78 +12,80 @@
 it{
     RBNFRules{
         OrdinalRules{
-            "%digits-ordinal:",
-            "0: =%digits-ordinal-masculine=;",
-            "%digits-ordinal-feminine:",
-            "0: =#,##0==%%dord-femabbrev=;",
+            "%%dord-mascabbrev:",
+            "0: \u1D52;",
+            "%digits-ordinal-masculine:",
             "-x: \u2212>>;",
-            "%digits-ordinal-masculine:",
             "0: =#,##0==%%dord-mascabbrev=;",
-            "-x: \u2212>>;",
             "%%dord-femabbrev:",
             "0: \u1D43;",
-            "%%dord-mascabbrev:",
-            "0: \u1D52;",
+            "%digits-ordinal-feminine:",
+            "-x: \u2212>>;",
+            "0: =#,##0==%%dord-femabbrev=;",
+            "%digits-ordinal:",
+            "0: =%digits-ordinal-masculine=;",
         }
         SpelloutRules{
-            "%%fem-with-a:",
-            "0: a;",
-            "1: \u00ADuna;",
-            "2: =%%msco-with-a=;",
-            "%%fem-with-i:",
-            "0: i;",
-            "1: \u00ADuna;",
-            "2: =%%msco-with-i=;",
-            "%%fem-with-o:",
-            "0: o;",
-            "1: \u00ADuna;",
-            "2: =%%msco-with-o=;",
             "%%lenient-parse:",
             "&[last primary ignorable ] << ' ' << ',' << '-' << '\u00AD';",
-            "%%msc-no-final:",
-            "0: ERROR;",
-            "2: =%spellout-cardinal-masculine=;",
-            "20: vent>%%msc-with-i-nofinal>;",
-            "30: trent>%%msc-with-a-nofinal>;",
-            "40: quarant>%%msc-with-a-nofinal>;",
-            "50: cinquant>%%msc-with-a-nofinal>;",
-            "60: sessant>%%msc-with-a-nofinal>;",
-            "70: settant>%%msc-with-a-nofinal>;",
-            "80: ottant>%%msc-with-a-nofinal>;",
-            "90: novant>%%msc-with-a-nofinal>;",
-            "100: cent>%%msc-with-o-nofinal>;",
-            "200: <<\u00ADcent>%%msc-with-o-nofinal>;",
-            "1000: ERROR;",
-            "%%msc-with-a:",
-            "0: a;",
-            "1: \u00ADun;",
-            "2: =%%msco-with-a=;",
-            "%%msc-with-a-nofinal:",
-            "0: =%%msc-with-a=;",
-            "3: a\u00ADtre;",
-            "4: =%%msc-with-a=;",
-            "%%msc-with-i:",
+            "%spellout-numbering-year:",
+            "x.x: =#,###0.#=;",
+            "0: =%spellout-numbering=;",
+            "%spellout-numbering:",
+            "0: =%spellout-cardinal-masculine-o=;",
+            "%spellout-cardinal-masculine-o:",
+            "-x: meno >>;",
+            "x.x: << virgola >>;",
+            "0: zero;",
+            "1: uno;",
+            "2: due;",
+            "3: tre;",
+            "4: quattro;",
+            "5: cinque;",
+            "6: sei;",
+            "7: sette;",
+            "8: otto;",
+            "9: nove;",
+            "10: dieci;",
+            "11: undici;",
+            "12: dodici;",
+            "13: tredici;",
+            "14: quattordici;",
+            "15: quindici;",
+            "16: sedici;",
+            "17: diciasette;",
+            "18: diciotto;",
+            "19: diciannove;",
+            "20: vent>%%msco-with-i>;",
+            "30: trent>%%msco-with-a>;",
+            "40: quarant>%%msco-with-a>;",
+            "50: cinquant>%%msco-with-a>;",
+            "60: sessant>%%msco-with-a>;",
+            "70: settant>%%msco-with-a>;",
+            "80: ottant>%%msco-with-a>;",
+            "90: novant>%%msco-with-a>;",
+            "100: cent>%%msco-with-o>;",
+            "200: <<\u00ADcent>%%msco-with-o>;",
+            "1000: mille[\u00AD>>];",
+            "2000: <%%msc-no-final<\u00ADmila[\u00AD>>];",
+            "1000000: un milione[ >>];",
+            "2000000: <%spellout-cardinal-masculine< milioni[ >>];",
+            "1000000000: un miliardo[ >>];",
+            "2000000000: <%spellout-cardinal-masculine< miliardi[ >>];",
+            "1000000000000: un bilione[ >>];",
+            "2000000000000: <%spellout-cardinal-masculine< bilioni[ >>];",
+            "1000000000000000: un biliardo[ >>];",
+            "2000000000000000: <%spellout-cardinal-masculine< biliardi[ >>];",
+            "1000000000000000000: =#,##0=;",
+            "%%msco-with-i:",
             "0: i;",
-            "1: \u00ADun;",
-            "2: =%%msco-with-i=;",
-            "%%msc-with-i-nofinal:",
-            "0: =%%msc-with-i=;",
-            "3: a\u00ADtre;",
-            "4: =%%msc-with-i=;",
-            "%%msc-with-o:",
-            "0: o;",
             "1: \u00ADuno;",
-            "2: o\u00ADdue;",
-            "3: o\u00ADtr\u00E9;",
-            "4: o\u00AD=%spellout-cardinal-masculine-o=;",
+            "2: i\u00ADdue;",
+            "3: i\u00ADtr\u00E9;",
+            "4: i\u00AD=%spellout-cardinal-masculine-o=;",
             "8: \u00ADotto;",
-            "9: o\u00AD=%spellout-cardinal-masculine-o=;",
-            "80: \u00AD=%spellout-cardinal-masculine-o=;",
-            "90: o\u00AD=%spellout-cardinal-masculine-o=;",
-            "%%msc-with-o-nofinal:",
-            "0: =%%msc-with-o=;",
-            "3: o\u00ADtre;",
-            "4: =%%msc-with-o=;",
+            "9: i\u00ADnove;",
+            "10: ERROR;",
             "%%msco-with-a:",
             "0: a;",
             "1: \u00ADuno;",
@@ -93,15 +95,6 @@
             "8: \u00ADotto;",
             "9: a\u00ADnove;",
             "10: ERROR;",
-            "%%msco-with-i:",
-            "0: i;",
-            "1: \u00ADuno;",
-            "2: i\u00ADdue;",
-            "3: i\u00ADtr\u00E9;",
-            "4: i\u00AD=%spellout-cardinal-masculine-o=;",
-            "8: \u00ADotto;",
-            "9: i\u00ADnove;",
-            "10: ERROR;",
             "%%msco-with-o:",
             "0: o;",
             "1: \u00ADuno;",
@@ -112,34 +105,9 @@
             "9: o\u00AD=%spellout-cardinal-masculine-o=;",
             "80: \u00AD=%spellout-cardinal-masculine-o=;",
             "90: o\u00AD=%spellout-cardinal-masculine-o=;",
-            "%spellout-cardinal-feminine:",
-            "0: zero;",
-            "1: una;",
-            "2: =%spellout-cardinal-masculine-o=;",
-            "20: vent>%%fem-with-i>;",
-            "30: trent>%%fem-with-a>;",
-            "40: quarant>%%fem-with-a>;",
-            "50: cinquant>%%fem-with-a>;",
-            "60: sessant>%%fem-with-a>;",
-            "70: settant>%%fem-with-a>;",
-            "80: ottant>%%fem-with-a>;",
-            "90: novant>%%fem-with-a>;",
-            "100: cent>%%fem-with-o>;",
-            "200: <<\u00ADcent>%%fem-with-o>;",
-            "1000: mille[\u00AD>>];",
-            "2000: <%%msc-no-final<\u00ADmila[\u00AD>>];",
-            "1000000: un milione[ >>];",
-            "2000000: <%spellout-cardinal-masculine< milioni[ >>];",
-            "1000000000: un miliardo[ >>];",
-            "2000000000: <%spellout-cardinal-masculine< miliardi[ >>];",
-            "1000000000000: un bilione[ >>];",
-            "2000000000000: <%spellout-cardinal-masculine< bilioni[ >>];",
-            "1000000000000000: un biliardo[ >>];",
-            "2000000000000000: <%spellout-cardinal-masculine< biliardi[ >>];",
-            "1000000000000000000: =#,##0=;",
+            "%spellout-cardinal-masculine:",
             "-x: meno >>;",
             "x.x: << virgola >>;",
-            "%spellout-cardinal-masculine:",
             "0: zero;",
             "1: un;",
             "2: =%spellout-cardinal-masculine-o=;",
@@ -164,39 +132,66 @@
             "1000000000000000: un biliardo[ >>];",
             "2000000000000000: <%spellout-cardinal-masculine< biliardi[ >>];",
             "1000000000000000000: =#,##0=;",
+            "%%msc-with-i:",
+            "0: i;",
+            "1: \u00ADun;",
+            "2: =%%msco-with-i=;",
+            "%%msc-with-a:",
+            "0: a;",
+            "1: \u00ADun;",
+            "2: =%%msco-with-a=;",
+            "%%msc-with-o:",
+            "0: o;",
+            "1: \u00ADuno;",
+            "2: o\u00ADdue;",
+            "3: o\u00ADtr\u00E9;",
+            "4: o\u00AD=%spellout-cardinal-masculine-o=;",
+            "8: \u00ADotto;",
+            "9: o\u00AD=%spellout-cardinal-masculine-o=;",
+            "80: \u00AD=%spellout-cardinal-masculine-o=;",
+            "90: o\u00AD=%spellout-cardinal-masculine-o=;",
+            "%%msc-no-final:",
+            "0: ERROR;",
+            "2: =%spellout-cardinal-masculine=;",
+            "20: vent>%%msc-with-i-nofinal>;",
+            "30: trent>%%msc-with-a-nofinal>;",
+            "40: quarant>%%msc-with-a-nofinal>;",
+            "50: cinquant>%%msc-with-a-nofinal>;",
+            "60: sessant>%%msc-with-a-nofinal>;",
+            "70: settant>%%msc-with-a-nofinal>;",
+            "80: ottant>%%msc-with-a-nofinal>;",
+            "90: novant>%%msc-with-a-nofinal>;",
+            "100: cent>%%msc-with-o-nofinal>;",
+            "200: <<\u00ADcent>%%msc-with-o-nofinal>;",
+            "1000: ERROR;",
+            "%%msc-with-i-nofinal:",
+            "0: =%%msc-with-i=;",
+            "3: a\u00ADtre;",
+            "4: =%%msc-with-i=;",
+            "%%msc-with-a-nofinal:",
+            "0: =%%msc-with-a=;",
+            "3: a\u00ADtre;",
+            "4: =%%msc-with-a=;",
+            "%%msc-with-o-nofinal:",
+            "0: =%%msc-with-o=;",
+            "3: o\u00ADtre;",
+            "4: =%%msc-with-o=;",
+            "%spellout-cardinal-feminine:",
             "-x: meno >>;",
             "x.x: << virgola >>;",
-            "%spellout-cardinal-masculine-o:",
             "0: zero;",
-            "1: uno;",
-            "2: due;",
-            "3: tre;",
-            "4: quattro;",
-            "5: cinque;",
-            "6: sei;",
-            "7: sette;",
-            "8: otto;",
-            "9: nove;",
-            "10: dieci;",
-            "11: undici;",
-            "12: dodici;",
-            "13: tredici;",
-            "14: quattordici;",
-            "15: quindici;",
-            "16: sedici;",
-            "17: diciasette;",
-            "18: diciotto;",
-            "19: diciannove;",
-            "20: vent>%%msco-with-i>;",
-            "30: trent>%%msco-with-a>;",
-            "40: quarant>%%msco-with-a>;",
-            "50: cinquant>%%msco-with-a>;",
-            "60: sessant>%%msco-with-a>;",
-            "70: settant>%%msco-with-a>;",
-            "80: ottant>%%msco-with-a>;",
-            "90: novant>%%msco-with-a>;",
-            "100: cent>%%msco-with-o>;",
-            "200: <<\u00ADcent>%%msco-with-o>;",
+            "1: una;",
+            "2: =%spellout-cardinal-masculine-o=;",
+            "20: vent>%%fem-with-i>;",
+            "30: trent>%%fem-with-a>;",
+            "40: quarant>%%fem-with-a>;",
+            "50: cinquant>%%fem-with-a>;",
+            "60: sessant>%%fem-with-a>;",
+            "70: settant>%%fem-with-a>;",
+            "80: ottant>%%fem-with-a>;",
+            "90: novant>%%fem-with-a>;",
+            "100: cent>%%fem-with-o>;",
+            "200: <<\u00ADcent>%%fem-with-o>;",
             "1000: mille[\u00AD>>];",
             "2000: <%%msc-no-final<\u00ADmila[\u00AD>>];",
             "1000000: un milione[ >>];",
@@ -208,14 +203,19 @@
             "1000000000000000: un biliardo[ >>];",
             "2000000000000000: <%spellout-cardinal-masculine< biliardi[ >>];",
             "1000000000000000000: =#,##0=;",
-            "-x: meno >>;",
-            "x.x: << virgola >>;",
-            "%spellout-numbering:",
-            "0: =%spellout-cardinal-masculine-o=;",
-            "%spellout-numbering-year:",
-            "0: =%spellout-numbering=;",
-            "x.x: =#,###0.#=;",
+            "%%fem-with-i:",
+            "0: i;",
+            "1: \u00ADuna;",
+            "2: =%%msco-with-i=;",
+            "%%fem-with-a:",
+            "0: a;",
+            "1: \u00ADuna;",
+            "2: =%%msco-with-a=;",
+            "%%fem-with-o:",
+            "0: o;",
+            "1: \u00ADuna;",
+            "2: =%%msco-with-o=;",
         }
     }
-    Version{"1.5"}
+    Version{"1.6"}
 }

Modified: trunk/source/data/rbnf/ja.txt
===================================================================
--- trunk/source/data/rbnf/ja.txt	2009-07-02 19:27:40 UTC (rev 211)
+++ trunk/source/data/rbnf/ja.txt	2009-07-02 19:28:39 UTC (rev 212)
@@ -13,11 +13,40 @@
     RBNFRules{
         OrdinalRules{
             "%digits-ordinal:",
+            "-x: \u7B2C\u2212>#,###0>;",
             "0: \u7B2C=#,###0=;",
-            "-x: \u7B2C\u2212>#,###0>;",
         }
         SpelloutRules{
+            "%spellout-numbering-year:",
+            "x.x: =#,###0.#=;",
+            "0: =%spellout-numbering=;",
+            "%spellout-numbering:",
+            "0: =%spellout-cardinal=;",
+            "%spellout-cardinal-financial:",
+            "-x: \u30DE\u30A4\u30CA\u30B9>>;",
+            "x.x: <<\u70B9>>>;",
+            "0: \u96F6;",
+            "1: \u58F1;",
+            "2: \u5F10;",
+            "3: \u53C2;",
+            "4: \u56DB;",
+            "5: \u4F0D;",
+            "6: \u516D;",
+            "7: \u4E03;",
+            "8: \u516B;",
+            "9: \u4E5D;",
+            "10: \u62FE[>>];",
+            "20: <<\u62FE[>>];",
+            "100: <<\u767E[>>];",
+            "1000: <<\u5343[>>];",
+            "10000: <<\u842C[>>];",
+            "100000000: <<\u5104[>>];",
+            "1000000000000: <<\u5146[>>];",
+            "10000000000000000: <<\u4EAC[>>];",
+            "1000000000000000000: =#,###0=;",
             "%spellout-cardinal:",
+            "-x: \u30DE\u30A4\u30CA\u30B9>>;",
+            "x.x: <<\u30FB>>>;",
             "0: \u3007;",
             "1: \u4E00;",
             "2: \u4E8C;",
@@ -39,39 +68,10 @@
             "1000000000000: <<\u5146[>>];",
             "10000000000000000: <<\u4EAC[>>];",
             "1000000000000000000: =#,###0=;",
-            "-x: \u30DE\u30A4\u30CA\u30B9>>;",
-            "x.x: <<\u30FB>>>;",
-            "%spellout-cardinal-financial:",
-            "0: \u96F6;",
-            "1: \u58F1;",
-            "2: \u5F10;",
-            "3: \u53C2;",
-            "4: \u56DB;",
-            "5: \u4F0D;",
-            "6: \u516D;",
-            "7: \u4E03;",
-            "8: \u516B;",
-            "9: \u4E5D;",
-            "10: \u62FE[>>];",
-            "20: <<\u62FE[>>];",
-            "100: <<\u767E[>>];",
-            "1000: <<\u5343[>>];",
-            "10000: <<\u842C[>>];",
-            "100000000: <<\u5104[>>];",
-            "1000000000000: <<\u5146[>>];",
-            "10000000000000000: <<\u4EAC[>>];",
-            "1000000000000000000: =#,###0=;",
-            "-x: \u30DE\u30A4\u30CA\u30B9>>;",
-            "x.x: <<\u70B9>>>;",
-            "%spellout-numbering:",
-            "0: =%spellout-cardinal=;",
-            "%spellout-numbering-year:",
-            "0: =%spellout-numbering=;",
+            "%spellout-ordinal:",
             "x.x: =#,###0.#=;",
-            "%spellout-ordinal:",
             "0: \u7B2C=%spellout-numbering=;",
-            "x.x: =#,###0.#=;",
         }
     }
-    Version{"1.6"}
+    Version{"1.7"}
 }

Modified: trunk/source/data/rbnf/ka.txt
===================================================================
--- trunk/source/data/rbnf/ka.txt	2009-07-02 19:27:40 UTC (rev 211)
+++ trunk/source/data/rbnf/ka.txt	2009-07-02 19:28:39 UTC (rev 212)
@@ -12,10 +12,14 @@
 ka{
     RBNFRules{
         SpelloutRules{
-            "%%hundred:",
-            "0: \u10D8;",
-            "1: \u00AD=%spellout-cardinal=;",
+            "%spellout-numbering-year:",
+            "x.x: =#,###0.#=;",
+            "0: =%spellout-numbering=;",
+            "%spellout-numbering:",
+            "0: =%spellout-cardinal=;",
             "%spellout-cardinal:",
+            "-x: \u10DB\u10D8\u10DC\u10E3\u10E1 >>;",
+            "x.x: << \u10DB\u10EB\u10D8\u10DB\u10D4 >>;",
             "0: \u10DC\u10E3\u10DA\u10D8;",
             "1: \u10D4\u10E0\u10D7\u10D8;",
             "2: \u10DD\u10E0\u10D8;",
@@ -60,17 +64,13 @@
             "1000000000000: << \u10D1\u10D8\u10DA\u10D8\u10DD\u10DC>%%th>;",
             "1000000000000000: << \u10D1\u10D8\u10DA\u10D8\u10D0\u10E0\u10D3>%%th>;",
             "1000000000000000000: =#,##0=;",
-            "-x: \u10DB\u10D8\u10DC\u10E3\u10E1 >>;",
-            "x.x: << \u10DB\u10EB\u10D8\u10DB\u10D4 >>;",
-            "%spellout-numbering:",
-            "0: =%spellout-cardinal=;",
-            "%spellout-numbering-year:",
-            "0: =%spellout-numbering=;",
-            "x.x: =#,###0.#=;",
+            "%%hundred:",
+            "0: \u10D8;",
+            "1: \u00AD=%spellout-cardinal=;",
             "%%th:",
             "0: \u10D8;",
             "1: ' =%spellout-cardinal=;",
         }
     }
-    Version{"1.5"}
+    Version{"1.6"}
 }

Modified: trunk/source/data/rbnf/kl.txt
===================================================================
--- trunk/source/data/rbnf/kl.txt	2009-07-02 19:27:40 UTC (rev 211)
+++ trunk/source/data/rbnf/kl.txt	2009-07-02 19:28:39 UTC (rev 212)
@@ -12,6 +12,11 @@
 kl{
     RBNFRules{
         SpelloutRules{
+            "%spellout-numbering-year:",
+            "x.x: =#,###0.#=;",
+            "0: =%spellout-numbering=;",
+            "%spellout-numbering:",
+            "0: =%spellout-cardinal=;",
             "%%numbertimes:",
             "1: ataaseq;",
             "2: marlunnik;",
@@ -36,6 +41,8 @@
             "100: uutritit[ >>];",
             "200: <%%numbertimes< uutritillit[ >>];",
             "%spellout-cardinal:",
+            "-x: minus >>;",
+            "x.x: << komma >>;",
             "0: nuulu;",
             "1: ataaseq;",
             "2: marluk;",
@@ -70,14 +77,7 @@
             "1000000000000000: billiardit[ >>];",
             "2000000000000000: <%%numbertimes< billiardillit[ >>];",
             "1000000000000000000: =#,##0=;",
-            "-x: minus >>;",
-            "x.x: << komma >>;",
-            "%spellout-numbering:",
-            "0: =%spellout-cardinal=;",
-            "%spellout-numbering-year:",
-            "0: =%spellout-numbering=;",
-            "x.x: =#,###0.#=;",
         }
     }
-    Version{"1.4"}
+    Version{"1.5"}
 }

Modified: trunk/source/data/rbnf/ko.txt
===================================================================
--- trunk/source/data/rbnf/ko.txt	2009-07-02 19:27:40 UTC (rev 211)
+++ trunk/source/data/rbnf/ko.txt	2009-07-02 19:28:39 UTC (rev 212)
@@ -13,11 +13,39 @@
     RBNFRules{
         OrdinalRules{
             "%digits-ordinal:",
+            "-x: \uC81C\u2212>#,###0>;",
             "0: \uC81C=#,###0=;",
-            "-x: \uC81C\u2212>#,###0>;",
         }
         SpelloutRules{
+            "%spellout-numbering-year:",
+            "x.x: =#,###0.#=;",
+            "0: =%spellout-numbering=;",
+            "%spellout-numbering:",
+            "0: =%spellout-cardinal-sinokorean=;",
+            "%spellout-cardinal-sinokorean:",
+            "-x: \uB9C8\uC774\uB108\uC2A4 >>;",
+            "x.x: << \uC810 >>;",
+            "0: \uC601;",
+            "1: \uC77C;",
+            "2: \uC774;",
+            "3: \uC0BC;",
+            "4: \uC0AC;",
+            "5: \uC624;",
+            "6: \uC721;",
+            "7: \uCE60;",
+            "8: \uD314;",
+            "9: \uAD6C;",
+            "10: <<\uC2ED[ >>];",
+            "100: <<\uBC31[>>];",
+            "1000: <<\uCC9C[ >>];",
+            "10000: <<\uB9CC[ >>];",
+            "100000000: <<\uC5B5[ >>];",
+            "1000000000000: <<\uC870[ >>];",
+            "10000000000000000: <<\uACBD[ >>];",
+            "1000000000000000000: =#,###0=;",
             "%spellout-cardinal-native:",
+            "-x: \uB9C8\uC774\uB108\uC2A4 >>;",
+            "x.x: << \uC810 >>;",
             "0: \uACF5;",
             "1: \uD558\uB098;",
             "2: \uB458;",
@@ -44,38 +72,10 @@
             "1000000000000: <<\uC870[ >>];",
             "10000000000000000: <<\uACBD[ >>];",
             "1000000000000000000: =#,###0=;",
-            "-x: \uB9C8\uC774\uB108\uC2A4 >>;",
-            "x.x: << \uC810 >>;",
-            "%spellout-cardinal-sinokorean:",
-            "0: \uC601;",
-            "1: \uC77C;",
-            "2: \uC774;",
-            "3: \uC0BC;",
-            "4: \uC0AC;",
-            "5: \uC624;",
-            "6: \uC721;",
-            "7: \uCE60;",
-            "8: \uD314;",
-            "9: \uAD6C;",
-            "10: <<\uC2ED[ >>];",
-            "100: <<\uBC31[>>];",
-            "1000: <<\uCC9C[ >>];",
-            "10000: <<\uB9CC[ >>];",
-            "100000000: <<\uC5B5[ >>];",
-            "1000000000000: <<\uC870[ >>];",
-            "10000000000000000: <<\uACBD[ >>];",
-            "1000000000000000000: =#,###0=;",
-            "-x: \uB9C8\uC774\uB108\uC2A4 >>;",
-            "x.x: << \uC810 >>;",
-            "%spellout-numbering:",
-            "0: =%spellout-cardinal-sinokorean=;",
-            "%spellout-numbering-year:",
-            "0: =%spellout-numbering=;",
+            "%spellout-ordinal:",
             "x.x: =#,###0.#=;",
-            "%spellout-ordinal:",
             "0: \uC81C =%spellout-cardinal-sinokorean=;",
-            "x.x: =#,###0.#=;",
         }
     }
-    Version{"1.6"}
+    Version{"1.7"}
 }

Modified: trunk/source/data/rbnf/lt.txt
===================================================================
--- trunk/source/data/rbnf/lt.txt	2009-07-02 19:27:40 UTC (rev 211)
+++ trunk/source/data/rbnf/lt.txt	2009-07-02 19:28:39 UTC (rev 212)
@@ -12,29 +12,11 @@
 lt{
     RBNFRules{
         SpelloutRules{
-            "%spellout-cardinal-feminine:",
-            "0: nulis;",
-            "1: viena;",
-            "2: dvi;",
-            "3: trys;",
-            "4: =%spellout-cardinal-masculine=os;",
-            "10: =%spellout-cardinal-masculine=;",
-            "20: <%%spellout-cardinal-feminine-accusative<de\u0161imt[ >>];",
-            "100: \u0161imtas[ >>];",
-            "200: <%spellout-cardinal-masculine< \u0161imtai[ >>];",
-            "1000: t\u016Bkstantis[ >>];",
-            "2000: <%spellout-cardinal-masculine< t\u016Bkstant\u0173[ >>];",
-            "1000000: vienas milijonas[ >>];",
-            "2000000: <%spellout-cardinal-masculine< milijon\u0173[ >>];",
-            "1000000000: vienas milijardas[ >>];",
-            "2000000000: <%spellout-cardinal-masculine< milijard\u0173[ >>];",
-            "1000000000000: vienas trilijonas[ >>];",
-            "2000000000000: <%spellout-cardinal-masculine< trilijon\u0173[ >>];",
-            "1000000000000000: vienas kvadrilijonas[ >>];",
-            "2000000000000000: <%spellout-cardinal-masculine< kvadrilijon\u0173[ >>];",
-            "1000000000000000000: =#,##0=;",
-            "-x: m\u012Bnus >>;",
-            "x.x: << kablelis >>;",
+            "%spellout-numbering-year:",
+            "x.x: =#,###0.#=;",
+            "0: =%spellout-numbering=;",
+            "%spellout-numbering:",
+            "0: =%spellout-cardinal-masculine=;",
             "%%spellout-cardinal-feminine-accusative:",
             "0: ERROR;",
             "2: dvi;",
@@ -47,6 +29,8 @@
             "9: devynias;",
             "10: ERROR;",
             "%spellout-cardinal-masculine:",
+            "-x: m\u012Bnus >>;",
+            "x.x: << kablelis >>;",
             "0: nulis;",
             "1: vienas;",
             "2: du;",
@@ -76,14 +60,30 @@
             "1000000000000000: vienas kvadrilijonas[ >>];",
             "2000000000000000: <%spellout-cardinal-masculine< kvadrilijon\u0173[ >>];",
             "1000000000000000000: =#,##0=;",
+            "%spellout-cardinal-feminine:",
             "-x: m\u012Bnus >>;",
             "x.x: << kablelis >>;",
-            "%spellout-numbering:",
-            "0: =%spellout-cardinal-masculine=;",
-            "%spellout-numbering-year:",
-            "0: =%spellout-numbering=;",
-            "x.x: =#,###0.#=;",
+            "0: nulis;",
+            "1: viena;",
+            "2: dvi;",
+            "3: trys;",
+            "4: =%spellout-cardinal-masculine=os;",
+            "10: =%spellout-cardinal-masculine=;",
+            "20: <%%spellout-cardinal-feminine-accusative<de\u0161imt[ >>];",
+            "100: \u0161imtas[ >>];",
+            "200: <%spellout-cardinal-masculine< \u0161imtai[ >>];",
+            "1000: t\u016Bkstantis[ >>];",
+            "2000: <%spellout-cardinal-masculine< t\u016Bkstant\u0173[ >>];",
+            "1000000: vienas milijonas[ >>];",
+            "2000000: <%spellout-cardinal-masculine< milijon\u0173[ >>];",
+            "1000000000: vienas milijardas[ >>];",
+            "2000000000: <%spellout-cardinal-masculine< milijard\u0173[ >>];",
+            "1000000000000: vienas trilijonas[ >>];",
+            "2000000000000: <%spellout-cardinal-masculine< trilijon\u0173[ >>];",
+            "1000000000000000: vienas kvadrilijonas[ >>];",
+            "2000000000000000: <%spellout-cardinal-masculine< kvadrilijon\u0173[ >>];",
+            "1000000000000000000: =#,##0=;",
         }
     }
-    Version{"1.4"}
+    Version{"1.5"}
 }

Modified: trunk/source/data/rbnf/lv.txt
===================================================================
--- trunk/source/data/rbnf/lv.txt	2009-07-02 19:27:40 UTC (rev 211)
+++ trunk/source/data/rbnf/lv.txt	2009-07-02 19:28:39 UTC (rev 212)
@@ -12,18 +12,38 @@
 lv{
     RBNFRules{
         SpelloutRules{
-            "%spellout-cardinal-feminine:",
+            "%spellout-numbering-year:",
+            "x.x: =#,###0.#=;",
+            "0: =%spellout-numbering=;",
+            "%spellout-numbering:",
+            "0: =%spellout-cardinal-masculine=;",
+            "%%spellout-prefixed:",
+            "0: ERROR;",
+            "1: vien;",
+            "2: div;",
+            "3: tr\u012Bs;",
+            "4: \u010Detr;",
+            "5: piec;",
+            "6: \u0161e\u0161;",
+            "7: septi\u0146;",
+            "8: asto\u0146;",
+            "9: devi\u0146;",
+            "10: ERROR;",
+            "%spellout-cardinal-masculine:",
+            "-x: m\u012Bnus >>;",
+            "x.x: << komats >>;",
             "0: nulle;",
-            "1: viena;",
-            "2: divas;",
+            "1: viens;",
+            "2: divi;",
             "3: tr\u012Bs;",
-            "4: \u010Detras;",
-            "5: piecas;",
-            "6: se\u0161as;",
-            "7: septi\u0146as;",
-            "8: asto\u0146as;",
-            "9: devi\u0146as;",
-            "10: =%spellout-cardinal-masculine=;",
+            "4: \u010Detri;",
+            "5: pieci;",
+            "6: se\u0161i;",
+            "7: septi\u0146i;",
+            "8: asto\u0146i;",
+            "9: devi\u0146i;",
+            "10: desmit;",
+            "11: >%%spellout-prefixed>padsmit;",
             "20: <%%spellout-prefixed<desmit[ >>];",
             "100: simt[ >>];",
             "200: <%%spellout-prefixed<simt[ >>];",
@@ -39,21 +59,20 @@
             "1000000000000000: viens biljards[ >>];",
             "2000000000000000: <%spellout-cardinal-masculine< biljardi[ >>];",
             "1000000000000000000: =#,##0=;",
+            "%spellout-cardinal-feminine:",
             "-x: m\u012Bnus >>;",
             "x.x: << komats >>;",
-            "%spellout-cardinal-masculine:",
             "0: nulle;",
-            "1: viens;",
-            "2: divi;",
+            "1: viena;",
+            "2: divas;",
             "3: tr\u012Bs;",
-            "4: \u010Detri;",
-            "5: pieci;",
-            "6: se\u0161i;",
-            "7: septi\u0146i;",
-            "8: asto\u0146i;",
-            "9: devi\u0146i;",
-            "10: desmit;",
-            "11: >%%spellout-prefixed>padsmit;",
+            "4: \u010Detras;",
+            "5: piecas;",
+            "6: se\u0161as;",
+            "7: septi\u0146as;",
+            "8: asto\u0146as;",
+            "9: devi\u0146as;",
+            "10: =%spellout-cardinal-masculine=;",
             "20: <%%spellout-prefixed<desmit[ >>];",
             "100: simt[ >>];",
             "200: <%%spellout-prefixed<simt[ >>];",
@@ -69,26 +88,7 @@
             "1000000000000000: viens biljards[ >>];",
             "2000000000000000: <%spellout-cardinal-masculine< biljardi[ >>];",
             "1000000000000000000: =#,##0=;",
-            "-x: m\u012Bnus >>;",
-            "x.x: << komats >>;",
-            "%spellout-numbering:",
-            "0: =%spellout-cardinal-masculine=;",
-            "%spellout-numbering-year:",
-            "0: =%spellout-numbering=;",
-            "x.x: =#,###0.#=;",
-            "%%spellout-prefixed:",
-            "0: ERROR;",
-            "1: vien;",
-            "2: div;",
-            "3: tr\u012Bs;",
-            "4: \u010Detr;",
-            "5: piec;",
-            "6: \u0161e\u0161;",
-            "7: septi\u0146;",
-            "8: asto\u0146;",
-            "9: devi\u0146;",
-            "10: ERROR;",
         }
     }
-    Version{"1.4"}
+    Version{"1.5"}
 }

Modified: trunk/source/data/rbnf/mk.txt
===================================================================
--- trunk/source/data/rbnf/mk.txt	2009-07-02 19:27:40 UTC (rev 211)
+++ trunk/source/data/rbnf/mk.txt	2009-07-02 19:28:39 UTC (rev 212)
@@ -14,29 +14,14 @@
         SpelloutRules{
             "%%lenient-parse:",
             "&[last primary ignorable ] << ' ' << ',' << '-' << '\u00AD';",
-            "%spellout-cardinal-feminine:",
-            "0: \u043D\u0443\u043B\u0430;",
-            "1: \u0435\u0434\u043D\u0430;",
-            "2: \u0434\u0432\u0435;",
-            "3: =%spellout-cardinal-masculine=;",
-            "20: \u0434\u0432\u0430\u0435\u0441\u0435\u0442[ \u0438 >>];",
-            "30: \u0442\u0440\u0438\u0435\u0441\u0435\u0442[ \u0438 >>];",
-            "40: \u0447\u0435\u0442\u0438\u0440\u0438\u0435\u0441\u0435\u0442[ \u0438 >>];",
-            "50: \u043F\u0435\u0434\u0435\u0441\u0435\u0442[ \u0438 >>];",
-            "60: \u0448\u0435\u0435\u0441\u0435\u0442[ \u0438 >>];",
-            "70: \u0441\u0435\u0434\u0443\u043C\u0434\u0435\u0441\u0435\u0442[ \u0438 >>];",
-            "80: \u043E\u0441\u0443\u043C\u0434\u0435\u0441\u0435\u0442[ \u0438 >>];",
-            "90: \u0434\u0435\u0432\u0435\u0434\u0435\u0441\u0435\u0442[ \u0438 >>];",
-            "100: <%spellout-cardinal-feminine<\u0441\u0442\u043E[ >>];",
-            "1000: <%spellout-cardinal-feminine< \u0438\u043B\u0458\u0430\u0434\u0430[ >>];",
-            "1000000: <%spellout-cardinal-masculine< \u043C\u0438\u043B\u0438\u043E\u043D[ >>];",
-            "1000000000: <%spellout-cardinal-masculine< \u043C\u0438\u043B\u0438\u0458\u0430\u0440\u0434\u0430[ >>];",
-            "1000000000000: <%spellout-cardinal-masculine< \u0431\u0438\u043B\u0438\u043E\u043D[ >>];",
-            "1000000000000000: <%spellout-cardinal-masculine< \u0431\u0438\u043B\u0438\u0458\u0430\u0440\u0434\u0430[ >>];",
-            "1000000000000000000: =#,##0=;",
+            "%spellout-numbering-year:",
+            "x.x: =#,###0.#=;",
+            "0: =%spellout-numbering=;",
+            "%spellout-numbering:",
+            "0: =%spellout-cardinal-masculine=;",
+            "%spellout-cardinal-masculine:",
             "-x: \u043C\u0438\u043D\u0443\u0441 >>;",
             "x.x: << \u043A\u043E\u043C\u0430 >>;",
-            "%spellout-cardinal-masculine:",
             "0: \u043D\u0443\u043B\u0430;",
             "1: \u0435\u0434\u0435\u043D;",
             "2: \u0434\u0432\u0430;",
@@ -72,9 +57,9 @@
             "1000000000000: <%spellout-cardinal-masculine< \u0431\u0438\u043B\u0438\u043E\u043D[ >>];",
             "1000000000000000: <%spellout-cardinal-masculine< \u0431\u0438\u043B\u0438\u0458\u0430\u0440\u0434\u0430[ >>];",
             "1000000000000000000: =#,##0=;",
+            "%spellout-cardinal-neutre:",
             "-x: \u043C\u0438\u043D\u0443\u0441 >>;",
             "x.x: << \u043A\u043E\u043C\u0430 >>;",
-            "%spellout-cardinal-neutre:",
             "0: \u043D\u0443\u043B\u0430;",
             "1: \u0435\u0434\u043D\u043E;",
             "2: \u0434\u0432\u0430;",
@@ -94,14 +79,29 @@
             "1000000000000: <%spellout-cardinal-masculine< \u0431\u0438\u043B\u0438\u043E\u043D[ >>];",
             "1000000000000000: <%spellout-cardinal-masculine< \u0431\u0438\u043B\u0438\u0458\u0430\u0440\u0434\u0430[ >>];",
             "1000000000000000000: =#,##0=;",
+            "%spellout-cardinal-feminine:",
             "-x: \u043C\u0438\u043D\u0443\u0441 >>;",
             "x.x: << \u043A\u043E\u043C\u0430 >>;",
-            "%spellout-numbering:",
-            "0: =%spellout-cardinal-masculine=;",
-            "%spellout-numbering-year:",
-            "0: =%spellout-numbering=;",
-            "x.x: =#,###0.#=;",
+            "0: \u043D\u0443\u043B\u0430;",
+            "1: \u0435\u0434\u043D\u0430;",
+            "2: \u0434\u0432\u0435;",
+            "3: =%spellout-cardinal-masculine=;",
+            "20: \u0434\u0432\u0430\u0435\u0441\u0435\u0442[ \u0438 >>];",
+            "30: \u0442\u0440\u0438\u0435\u0441\u0435\u0442[ \u0438 >>];",
+            "40: \u0447\u0435\u0442\u0438\u0440\u0438\u0435\u0441\u0435\u0442[ \u0438 >>];",
+            "50: \u043F\u0435\u0434\u0435\u0441\u0435\u0442[ \u0438 >>];",
+            "60: \u0448\u0435\u0435\u0441\u0435\u0442[ \u0438 >>];",
+            "70: \u0441\u0435\u0434\u0443\u043C\u0434\u0435\u0441\u0435\u0442[ \u0438 >>];",
+            "80: \u043E\u0441\u0443\u043C\u0434\u0435\u0441\u0435\u0442[ \u0438 >>];",
+            "90: \u0434\u0435\u0432\u0435\u0434\u0435\u0441\u0435\u0442[ \u0438 >>];",
+            "100: <%spellout-cardinal-feminine<\u0441\u0442\u043E[ >>];",
+            "1000: <%spellout-cardinal-feminine< \u0438\u043B\u0458\u0430\u0434\u0430[ >>];",
+            "1000000: <%spellout-cardinal-masculine< \u043C\u0438\u043B\u0438\u043E\u043D[ >>];",
+            "1000000000: <%spellout-cardinal-masculine< \u043C\u0438\u043B\u0438\u0458\u0430\u0440\u0434\u0430[ >>];",
+            "1000000000000: <%spellout-cardinal-masculine< \u0431\u0438\u043B\u0438\u043E\u043D[ >>];",
+            "1000000000000000: <%spellout-cardinal-masculine< \u0431\u0438\u043B\u0438\u0458\u0430\u0440\u0434\u0430[ >>];",
+            "1000000000000000000: =#,##0=;",
         }
     }
-    Version{"1.1"}
+    Version{"1.2"}
 }

Modified: trunk/source/data/rbnf/ms.txt
===================================================================
--- trunk/source/data/rbnf/ms.txt	2009-07-02 19:27:40 UTC (rev 211)
+++ trunk/source/data/rbnf/ms.txt	2009-07-02 19:28:39 UTC (rev 212)
@@ -13,11 +13,18 @@
     RBNFRules{
         OrdinalRules{
             "%digits-ordinal:",
+            "-x: ke\u2212>#,##0>;",
             "0: ke=#,##0=;",
-            "-x: ke\u2212>#,##0>;",
         }
         SpelloutRules{
+            "%spellout-numbering-year:",
+            "x.x: =#,###0.#=;",
+            "0: =%spellout-numbering=;",
+            "%spellout-numbering:",
+            "0: =%spellout-cardinal=;",
             "%spellout-cardinal:",
+            "-x: minus >>;",
+            "x.x: << titik >>;",
             "0: kosong;",
             "1: satu;",
             "2: dua;",
@@ -41,20 +48,13 @@
             "1000000000000: << bilyun[ >>];",
             "1000000000000000: << bilyar[ >>];",
             "1000000000000000000: =#,##0=;",
+            "%spellout-ordinal:",
             "-x: minus >>;",
-            "x.x: << titik >>;",
-            "%spellout-numbering:",
-            "0: =%spellout-cardinal=;",
-            "%spellout-numbering-year:",
-            "0: =%spellout-numbering=;",
-            "x.x: =#,###0.#=;",
-            "%spellout-ordinal:",
+            "x.x: =#,##0.#=;",
             "0: kekosong;",
             "1: pertama;",
             "2: ke=%spellout-cardinal=;",
-            "-x: minus >>;",
-            "x.x: =#,##0.#=;",
         }
     }
-    Version{"1.1"}
+    Version{"1.2"}
 }

Modified: trunk/source/data/rbnf/mt.txt
===================================================================
--- trunk/source/data/rbnf/mt.txt	2009-07-02 19:27:40 UTC (rev 211)
+++ trunk/source/data/rbnf/mt.txt	2009-07-02 19:28:39 UTC (rev 212)
@@ -12,161 +12,144 @@
 mt{
     RBNFRules{
         DurationRules{
-            "%duration:",
-            "0: =%in-numerals=;",
+            "%with-words:",
+            "0: 0 sekondi; 1 sekonda; =0= sekondi;",
+            "60/60: <%%min<[, >>];",
+            "3600/60: <%%hr<[, >>>];",
+            "%%min:",
+            "0: 0 minuti; 1 minuta; =0= minuti;",
             "%%hr:",
             "0: 0 sieg\u0127at; 1 sieg\u0127a; =0= sieg\u0127at;",
-            "%%hr-min-sec:",
-            "0: :=00=;",
-            "60/60: <00<>>;",
-            "3600/60: <#,##0<:>>>;",
             "%in-numerals:",
             "0: =0= sek.;",
             "60: =%%min-sec=;",
             "3600: =%%hr-min-sec=;",
-            "%%lenient-parse:",
-            "& ':' = '.' = ' ' = '-';",
-            "%%min:",
-            "0: 0 minuti; 1 minuta; =0= minuti;",
             "%%min-sec:",
             "0: :=00=;",
             "60/60: <0<>>;",
-            "%with-words:",
-            "0: 0 sekondi; 1 sekonda; =0= sekondi;",
-            "60/60: <%%min<[, >>];",
-            "3600/60: <%%hr<[, >>>];",
+            "%%hr-min-sec:",
+            "0: :=00=;",
+            "60/60: <00<>>;",
+            "3600/60: <#,##0<:>>>;",
+            "%duration:",
+            "0: =%in-numerals=;",
+            "%%lenient-parse:",
+            "& ':' = '.' = ' ' = '-';",
         }
         SpelloutRules{
-            "%%and-typeA-feminine:",
-            "0: ;",
-            "1: ' u =%%spellout-cardinal-feminine=;",
-            "%%and-typeA-masculine:",
-            "0: ;",
-            "1: ' u =%%spellout-cardinal-masculine=;",
-            "%%and-typeB-feminine:",
-            "0: ;",
-            "1: ' u =%%spellout-cardinal-typeB-feminine=;",
+            "%spellout-numbering-year:",
+            "x.x: =#,###0.#=;",
+            "0: =%spellout-numbering=;",
+            "%spellout-numbering:",
+            "0: =%%spellout-cardinal-typeB-masculine=;",
+            "%%spellout-cardinal-typeB-masculine:",
+            "-x: minus >>;",
+            "x.x: << punt >>;",
+            "0: \u017Cero;",
+            "1: wie\u0127ed;",
+            "2: tnejn;",
+            "3: tlieta;",
+            "4: erbg\u0127a;",
+            "5: \u0127amsa;",
+            "6: sitta;",
+            "7: sebg\u0127a;",
+            "8: tmienja;",
+            "9: disg\u0127a;",
+            "10: g\u0127axra;",
+            "11: \u0127dax;",
+            "12: tnax;",
+            "13: tlettax;",
+            "14: erbatax;",
+            "15: \u0127mistax;",
+            "16: sittax;",
+            "17: sbatax;",
+            "18: tmintax;",
+            "19: dsatax;",
+            "20: [>> u ]g\u0127oxrin;",
+            "30: [>> u ]tletin;",
+            "40: [>> u ]erbg\u0127in;",
+            "50: [>> u ]\u0127amsin;",
+            "60: [>> u ]sittin;",
+            "70: [>> u ]sebg\u0127in;",
+            "80: [>> u ]tmenin;",
+            "90: [>> u ]disg\u0127in;",
+            "100: mija[ u >>];",
+            "200: mitejn[ u >>];",
+            "300: <%%spellout-cardinal-masculine< mija[ u >>];",
+            "1000: elf[>%%and-typeB-masculine>];",
+            "2000: elfejn[>%%and-typeB-masculine>];",
+            "3000: <%%thousands< elef[>%%and-typeB-masculine>];",
+            "11000/1000: <%%spellout-cardinal-masculine< elf[>%%and-typeB-masculine>];",
+            "1000000: miljun[>%%and-typeB-masculine>];",
+            "2000000: <%%spellout-cardinal-masculine< miljuni[>%%and-typeB-masculine>];",
+            "11000000/1,000: <%%spellout-cardinal-masculine< miljun[>%%and-typeB-masculine>];",
+            "1000000000: biljun[>%%and-typeB-masculine>];",
+            "2000000000: <%%spellout-cardinal-masculine< biljuni[>%%and-typeB-masculine>];",
+            "11000000000/1,000: <%%spellout-cardinal-masculine< biljun[>%%and-typeB-masculine>];",
+            "1000000000000: triljun[>%%and-typeB-masculine>];",
+            "2000000000000: <%%spellout-cardinal-masculine< triljuni[>%%and-typeB-masculine>];",
+            "11000000000000/1,000: <%%spellout-cardinal-masculine< triljun[>%%and-typeB-masculine>];",
+            "1000000000000000: kvadriljun[>%%and-typeB-masculine>];",
+            "2000000000000000: <%%spellout-cardinal-masculine< kvadriljuni[>%%and-typeB-masculine>];",
+            "11000000000000000/1,000: <%%spellout-cardinal-masculine< kvadriljun[>%%and-typeB-masculine>];",
+            "1000000000000000000: =#,##0=;",
             "%%and-typeB-masculine:",
             "0: ;",
             "1: ' u =%%spellout-cardinal-typeB-masculine=;",
-            "%%lenient-parse:",
-            "&[last primary ignorable ] << ' ' << ',' << '-' << '\u00AD';",
-            "%%spellout-cardinal-feminine:",
+            "%%spellout-cardinal-typeB-feminine:",
+            "-x: minus >>;",
+            "x.x: << punt >>;",
             "0: \u017Cero;",
             "1: wa\u0127da;",
-            "2: \u017Cew\u0121;",
-            "3: tliet;",
-            "4: erba\u02BC;",
-            "5: \u0127ames;",
-            "6: sitt;",
-            "7: seba\u02BC;",
-            "8: tmien;",
-            "9: disa\u02BC;",
-            "10: g\u0127axar;",
-            "11: \u0127dax-il;",
-            "12: tnax-il;",
-            "13: tlettax-il;",
-            "14: erbatax-il;",
-            "15: \u0127mistax-il;",
-            "16: sittax-il;",
-            "17: sbatax-il;",
-            "18: tmintax-il;",
-            "19: dsatax-il;",
-            "20: [>%%spellout-cardinal-feminine> u ]g\u0127oxrin;",
-            "30: [>%%spellout-cardinal-feminine> u ]tletin;",
-            "40: [>%%spellout-cardinal-feminine> u ]erbg\u0127in;",
-            "50: [>%%spellout-cardinal-feminine> u ]\u0127amsin;",
-            "60: [>%%spellout-cardinal-feminine> u ]sittin;",
-            "70: [>%%spellout-cardinal-feminine> u ]sebg\u0127in;",
-            "80: [>%%spellout-cardinal-feminine> u ]tmenin;",
-            "90: [>%%spellout-cardinal-feminine> u ]disg\u0127in;",
-            "100: mitt;",
-            "101: mija u >%%spellout-cardinal-feminine>;",
-            "200: mitejn[ u >%%spellout-cardinal-feminine>];",
-            "300: <%%spellout-cardinal-masculine< mija[>%%and-typeA-feminine>];",
-            "1000: elf[>%%and-typeA-feminine>];",
-            "2000: elfejn[>%%and-typeA-feminine>];",
-            "3000: <%%thousands< elef[>%%and-typeA-feminine>];",
-            "11000/1000: <%%spellout-cardinal-masculine< elf[>%%and-typeA-feminine>];",
-            "1000000: miljun[>%%and-typeA-feminine>];",
-            "2000000: <%%spellout-cardinal-masculine< miljuni[>%%and-typeA-feminine>];",
-            "11000000/1,000: <%%spellout-cardinal-masculine< miljun[>%%and-typeA-feminine>];",
-            "1000000000: biljun[>%%and-typeA-feminine>];",
-            "2000000000: <%%spellout-cardinal-masculine< biljuni[>%%and-typeA-feminine>];",
-            "11000000000/1,000: <%%spellout-cardinal-masculine< biljun[>%%and-typeA-feminine>];",
-            "1000000000000: triljun[>%%and-typeA-feminine>];",
-            "2000000000000: <%%spellout-cardinal-masculine< triljuni[>%%and-typeA-feminine>];",
-            "11000000000000/1,000: <%%spellout-cardinal-masculine< triljun[>%%and-typeA-feminine>];",
-            "1000000000000000: kvadriljun[>%%and-typeA-feminine>];",
-            "2000000000000000: <%%spellout-cardinal-masculine< kvadriljuni[>%%and-typeA-feminine>];",
-            "11000000000000000/1,000: <%%spellout-cardinal-masculine< kvadriljun[>%%and-typeA-feminine>];",
+            "2: tnejn;",
+            "3: tlieta;",
+            "4: erbg\u0127a;",
+            "5: \u0127amsa;",
+            "6: sitta;",
+            "7: sebg\u0127a;",
+            "8: tmienja;",
+            "9: disg\u0127a;",
+            "10: g\u0127axra;",
+            "11: \u0127dax;",
+            "12: tnax;",
+            "13: tlettax;",
+            "14: erbatax;",
+            "15: \u0127mistax;",
+            "16: sittax;",
+            "17: sbatax;",
+            "18: tmintax;",
+            "19: dsatax;",
+            "20: [>> u ]g\u0127oxrin;",
+            "30: [>> u ]tletin;",
+            "40: [>> u ]erbg\u0127in;",
+            "50: [>> u ]\u0127amsin;",
+            "60: [>> u ]sittin;",
+            "70: [>> u ]sebg\u0127in;",
+            "80: [>> u ]tmenin;",
+            "90: [>> u ]disg\u0127in;",
+            "100: mija[ u >>];",
+            "200: mitejn[ u >>];",
+            "300: <%%spellout-cardinal-masculine< mija[ u >>];",
+            "1000: elf[>%%and-typeB-feminine>];",
+            "2000: elfejn[>%%and-typeB-feminine>];",
+            "3000: <%%thousands< elef[>%%and-typeB-feminine>];",
+            "11000/1000: <%%spellout-cardinal-masculine< elf[>%%and-typeB-feminine>];",
+            "1000000: miljun[>%%and-typeB-feminine>];",
+            "2000000: <%%spellout-cardinal-masculine< miljuni[>%%and-typeB-feminine>];",
+            "11000000/1,000: <%%spellout-cardinal-masculine< miljun[>%%and-typeB-feminine>];",
+            "1000000000: biljun[>%%and-typeB-feminine>];",
+            "2000000000: <%%spellout-cardinal-masculine< biljuni[>%%and-typeB-feminine>];",
+            "11000000000/1,000: <%%spellout-cardinal-masculine< biljun[>%%and-typeB-feminine>];",
+            "1000000000000: triljun[>%%and-typeB-feminine>];",
+            "2000000000000: <%%spellout-cardinal-masculine< triljuni[>%%and-typeB-feminine>];",
+            "11000000000000/1,000: <%%spellout-cardinal-masculine< triljun[>%%and-typeB-feminine>];",
+            "1000000000000000: kvadriljun[>%%and-typeB-feminine>];",
+            "2000000000000000: <%%spellout-cardinal-masculine< kvadriljuni[>%%and-typeB-feminine>];",
+            "11000000000000000/1,000: <%%spellout-cardinal-masculine< kvadriljun[>%%and-typeB-feminine>];",
             "1000000000000000000: =#,##0=;",
-            "%spellout-cardinal-feminine-postfixpart:",
+            "%%and-typeB-feminine:",
             "0: ;",
-            "1: ' =%%spellout-cardinal-feminine-postfx=;",
-            "2: ;",
-            "-x: >>;",
-            "x.x: ;",
-            "%%spellout-cardinal-feminine-postfx:",
-            "0: ;",
-            "1: wa\u0127da;",
-            "2: ;",
-            "%spellout-cardinal-feminine-prefixpart:",
-            "0: \u017Cero ;",
-            "1: ;",
-            "2: =%%spellout-cardinal-feminine-prefx= ;",
-            "-x: minus >>;",
-            "x.x: <%%spellout-cardinal-feminine< punt >%%zz-fraction-feminine> ;",
-            "%%spellout-cardinal-feminine-prefx:",
-            "0: \u017Cero;",
-            "1: ;",
-            "2: \u017Cew\u0121;",
-            "3: tliet;",
-            "4: erba\u02BC;",
-            "5: \u0127ames;",
-            "6: sitt;",
-            "7: seba\u02BC;",
-            "8: tmien;",
-            "9: disa\u02BC;",
-            "10: g\u0127axar;",
-            "11: \u0127dax-il;",
-            "12: tnax-il;",
-            "13: tlettax-il;",
-            "14: erbatax-il;",
-            "15: \u0127mistax-il;",
-            "16: sittax-il;",
-            "17: sbatax-il;",
-            "18: tmintax-il;",
-            "19: dsatax-il;",
-            "20: [>%%spellout-cardinal-feminine> u ]g\u0127oxrin;",
-            "30: [>%%spellout-cardinal-feminine> u ]tletin;",
-            "40: [>%%spellout-cardinal-feminine> u ]erbg\u0127in;",
-            "50: [>%%spellout-cardinal-feminine> u ]\u0127amsin;",
-            "60: [>%%spellout-cardinal-feminine> u ]sittin;",
-            "70: [>%%spellout-cardinal-feminine> u ]sebg\u0127in;",
-            "80: [>%%spellout-cardinal-feminine> u ]tmenin;",
-            "90: [>%%spellout-cardinal-feminine> u ]disg\u0127in;",
-            "100: mitt;",
-            "101: mija u >%%spellout-cardinal-feminine>;",
-            "200: mitejn[ u >%%spellout-cardinal-feminine>];",
-            "300: <%%spellout-cardinal-masculine< mija[>%%and-typeA-feminine>];",
-            "1000: elf[>%%and-typeA-feminine>];",
-            "2000: elfejn[>%%and-typeA-feminine>];",
-            "3000: <%%thousands< elef[>%%and-typeA-feminine>];",
-            "11000/1000: <%%spellout-cardinal-masculine< elf[>%%and-typeA-feminine>];",
-            "1000000: miljun[>%%and-typeA-feminine>];",
-            "2000000: <%%spellout-cardinal-masculine< miljuni[>%%and-typeA-feminine>];",
-            "11000000/1,000: <%%spellout-cardinal-masculine< miljun[>%%and-typeA-feminine>];",
-            "1000000000: biljun[>%%and-typeA-feminine>];",
-            "2000000000: <%%spellout-cardinal-masculine< biljuni[>%%and-typeA-feminine>];",
-            "11000000000/1,000: <%%spellout-cardinal-masculine< biljun[>%%and-typeA-feminine>];",
-            "1000000000000: triljun[>%%and-typeA-feminine>];",
-            "2000000000000: <%%spellout-cardinal-masculine< triljuni[>%%and-typeA-feminine>];",
-            "11000000000000/1,000: <%%spellout-cardinal-masculine< triljun[>%%and-typeA-feminine>];",
-            "1000000000000000: kvadriljun[>%%and-typeA-feminine>];",
-            "2000000000000000: <%%spellout-cardinal-masculine< kvadriljuni[>%%and-typeA-feminine>];",
-            "11000000000000000/1,000: <%%spellout-cardinal-masculine< kvadriljun[>%%and-typeA-feminine>];",
-            "1000000000000000000: =#,##0=;",
+            "1: ' u =%%spellout-cardinal-typeB-feminine=;",
             "%%spellout-cardinal-masculine:",
             "0: \u017Cero;",
             "1: wie\u0127ed;",
@@ -217,22 +200,24 @@
             "2000000000000000: <%%spellout-cardinal-masculine< kvadriljuni[>%%and-typeA-masculine>];",
             "11000000000000000/1,000: <%%spellout-cardinal-masculine< kvadriljun[>%%and-typeA-masculine>];",
             "1000000000000000000: =#,##0=;",
+            "%spellout-cardinal-masculine-prefixpart:",
+            "-x: minus >>;",
+            "x.x: <%%spellout-cardinal-masculine< punt >%%zz-fraction-masculine> ;",
+            "0: \u017Cero ;",
+            "1: ;",
+            "2: =%%spellout-cardinal-masculine-prefx= ;",
+            "%%lenient-parse:",
+            "&[last primary ignorable ] << ' ' << ',' << '-' << '\u00AD';",
             "%spellout-cardinal-masculine-postfixpart:",
+            "-x: >>;",
+            "x.x: ;",
             "0: ;",
             "1: ' =%%spellout-cardinal-masculine-postfx=;",
             "2: ;",
-            "-x: >>;",
-            "x.x: ;",
             "%%spellout-cardinal-masculine-postfx:",
             "0: ;",
             "1: wie\u0127ed;",
             "2: ;",
-            "%spellout-cardinal-masculine-prefixpart:",
-            "0: \u017Cero ;",
-            "1: ;",
-            "2: =%%spellout-cardinal-masculine-prefx= ;",
-            "-x: minus >>;",
-            "x.x: <%%spellout-cardinal-masculine< punt >%%zz-fraction-masculine> ;",
             "%%spellout-cardinal-masculine-prefx:",
             "0: \u017Cero;",
             "1: ;",
@@ -283,113 +268,128 @@
             "2000000000000000: <%%spellout-cardinal-masculine< kvadriljuni[>%%and-typeA-masculine>];",
             "11000000000000000/1,000: <%%spellout-cardinal-masculine< kvadriljun[>%%and-typeA-masculine>];",
             "1000000000000000000: =#,##0=;",
-            "%%spellout-cardinal-typeB-feminine:",
+            "%%and-typeA-masculine:",
+            "0: ;",
+            "1: ' u =%%spellout-cardinal-masculine=;",
+            "%%spellout-cardinal-feminine:",
             "0: \u017Cero;",
             "1: wa\u0127da;",
-            "2: tnejn;",
-            "3: tlieta;",
-            "4: erbg\u0127a;",
-            "5: \u0127amsa;",
-            "6: sitta;",
-            "7: sebg\u0127a;",
-            "8: tmienja;",
-            "9: disg\u0127a;",
-            "10: g\u0127axra;",
-            "11: \u0127dax;",
-            "12: tnax;",
-            "13: tlettax;",
-            "14: erbatax;",
-            "15: \u0127mistax;",
-            "16: sittax;",
-            "17: sbatax;",
-            "18: tmintax;",
-            "19: dsatax;",
-            "20: [>> u ]g\u0127oxrin;",
-            "30: [>> u ]tletin;",
-            "40: [>> u ]erbg\u0127in;",
-            "50: [>> u ]\u0127amsin;",
-            "60: [>> u ]sittin;",
-            "70: [>> u ]sebg\u0127in;",
-            "80: [>> u ]tmenin;",
-            "90: [>> u ]disg\u0127in;",
-            "100: mija[ u >>];",
-            "200: mitejn[ u >>];",
-            "300: <%%spellout-cardinal-masculine< mija[ u >>];",
-            "1000: elf[>%%and-typeB-feminine>];",
-            "2000: elfejn[>%%and-typeB-feminine>];",
-            "3000: <%%thousands< elef[>%%and-typeB-feminine>];",
-            "11000/1000: <%%spellout-cardinal-masculine< elf[>%%and-typeB-feminine>];",
-            "1000000: miljun[>%%and-typeB-feminine>];",
-            "2000000: <%%spellout-cardinal-masculine< miljuni[>%%and-typeB-feminine>];",
-            "11000000/1,000: <%%spellout-cardinal-masculine< miljun[>%%and-typeB-feminine>];",
-            "1000000000: biljun[>%%and-typeB-feminine>];",
-            "2000000000: <%%spellout-cardinal-masculine< biljuni[>%%and-typeB-feminine>];",
-            "11000000000/1,000: <%%spellout-cardinal-masculine< biljun[>%%and-typeB-feminine>];",
-            "1000000000000: triljun[>%%and-typeB-feminine>];",
-            "2000000000000: <%%spellout-cardinal-masculine< triljuni[>%%and-typeB-feminine>];",
-            "11000000000000/1,000: <%%spellout-cardinal-masculine< triljun[>%%and-typeB-feminine>];",
-            "1000000000000000: kvadriljun[>%%and-typeB-feminine>];",
-            "2000000000000000: <%%spellout-cardinal-masculine< kvadriljuni[>%%and-typeB-feminine>];",
-            "11000000000000000/1,000: <%%spellout-cardinal-masculine< kvadriljun[>%%and-typeB-feminine>];",
+            "2: \u017Cew\u0121;",
+            "3: tliet;",
+            "4: erba\u02BC;",
+            "5: \u0127ames;",
+            "6: sitt;",
+            "7: seba\u02BC;",
+            "8: tmien;",
+            "9: disa\u02BC;",
+            "10: g\u0127axar;",
+            "11: \u0127dax-il;",
+            "12: tnax-il;",
+            "13: tlettax-il;",
+            "14: erbatax-il;",
+            "15: \u0127mistax-il;",
+            "16: sittax-il;",
+            "17: sbatax-il;",
+            "18: tmintax-il;",
+            "19: dsatax-il;",
+            "20: [>%%spellout-cardinal-feminine> u ]g\u0127oxrin;",
+            "30: [>%%spellout-cardinal-feminine> u ]tletin;",
+            "40: [>%%spellout-cardinal-feminine> u ]erbg\u0127in;",
+            "50: [>%%spellout-cardinal-feminine> u ]\u0127amsin;",
+            "60: [>%%spellout-cardinal-feminine> u ]sittin;",
+            "70: [>%%spellout-cardinal-feminine> u ]sebg\u0127in;",
+            "80: [>%%spellout-cardinal-feminine> u ]tmenin;",
+            "90: [>%%spellout-cardinal-feminine> u ]disg\u0127in;",
+            "100: mitt;",
+            "101: mija u >%%spellout-cardinal-feminine>;",
+            "200: mitejn[ u >%%spellout-cardinal-feminine>];",
+            "300: <%%spellout-cardinal-masculine< mija[>%%and-typeA-feminine>];",
+            "1000: elf[>%%and-typeA-feminine>];",
+            "2000: elfejn[>%%and-typeA-feminine>];",
+            "3000: <%%thousands< elef[>%%and-typeA-feminine>];",
+            "11000/1000: <%%spellout-cardinal-masculine< elf[>%%and-typeA-feminine>];",
+            "1000000: miljun[>%%and-typeA-feminine>];",
+            "2000000: <%%spellout-cardinal-masculine< miljuni[>%%and-typeA-feminine>];",
+            "11000000/1,000: <%%spellout-cardinal-masculine< miljun[>%%and-typeA-feminine>];",
+            "1000000000: biljun[>%%and-typeA-feminine>];",
+            "2000000000: <%%spellout-cardinal-masculine< biljuni[>%%and-typeA-feminine>];",
+            "11000000000/1,000: <%%spellout-cardinal-masculine< biljun[>%%and-typeA-feminine>];",
+            "1000000000000: triljun[>%%and-typeA-feminine>];",
+            "2000000000000: <%%spellout-cardinal-masculine< triljuni[>%%and-typeA-feminine>];",
+            "11000000000000/1,000: <%%spellout-cardinal-masculine< triljun[>%%and-typeA-feminine>];",
+            "1000000000000000: kvadriljun[>%%and-typeA-feminine>];",
+            "2000000000000000: <%%spellout-cardinal-masculine< kvadriljuni[>%%and-typeA-feminine>];",
+            "11000000000000000/1,000: <%%spellout-cardinal-masculine< kvadriljun[>%%and-typeA-feminine>];",
             "1000000000000000000: =#,##0=;",
+            "%spellout-cardinal-feminine-prefixpart:",
             "-x: minus >>;",
-            "x.x: << punt >>;",
-            "%%spellout-cardinal-typeB-masculine:",
+            "x.x: <%%spellout-cardinal-feminine< punt >%%zz-fraction-feminine> ;",
+            "0: \u017Cero ;",
+            "1: ;",
+            "2: =%%spellout-cardinal-feminine-prefx= ;",
+            "%spellout-cardinal-feminine-postfixpart:",
+            "-x: >>;",
+            "x.x: ;",
+            "0: ;",
+            "1: ' =%%spellout-cardinal-feminine-postfx=;",
+            "2: ;",
+            "%%spellout-cardinal-feminine-postfx:",
+            "0: ;",
+            "1: wa\u0127da;",
+            "2: ;",
+            "%%spellout-cardinal-feminine-prefx:",
             "0: \u017Cero;",
-            "1: wie\u0127ed;",
-            "2: tnejn;",
-            "3: tlieta;",
-            "4: erbg\u0127a;",
-            "5: \u0127amsa;",
-            "6: sitta;",
-            "7: sebg\u0127a;",
-            "8: tmienja;",
-            "9: disg\u0127a;",
-            "10: g\u0127axra;",
-            "11: \u0127dax;",
-            "12: tnax;",
-            "13: tlettax;",
-            "14: erbatax;",
-            "15: \u0127mistax;",
-            "16: sittax;",
-            "17: sbatax;",
-            "18: tmintax;",
-            "19: dsatax;",
-            "20: [>> u ]g\u0127oxrin;",
-            "30: [>> u ]tletin;",
-            "40: [>> u ]erbg\u0127in;",
-            "50: [>> u ]\u0127amsin;",
-            "60: [>> u ]sittin;",
-            "70: [>> u ]sebg\u0127in;",
-            "80: [>> u ]tmenin;",
-            "90: [>> u ]disg\u0127in;",
-            "100: mija[ u >>];",
-            "200: mitejn[ u >>];",
-            "300: <%%spellout-cardinal-masculine< mija[ u >>];",
-            "1000: elf[>%%and-typeB-masculine>];",
-            "2000: elfejn[>%%and-typeB-masculine>];",
-            "3000: <%%thousands< elef[>%%and-typeB-masculine>];",
-            "11000/1000: <%%spellout-cardinal-masculine< elf[>%%and-typeB-masculine>];",
-            "1000000: miljun[>%%and-typeB-masculine>];",
-            "2000000: <%%spellout-cardinal-masculine< miljuni[>%%and-typeB-masculine>];",
-            "11000000/1,000: <%%spellout-cardinal-masculine< miljun[>%%and-typeB-masculine>];",
-            "1000000000: biljun[>%%and-typeB-masculine>];",
-            "2000000000: <%%spellout-cardinal-masculine< biljuni[>%%and-typeB-masculine>];",
-            "11000000000/1,000: <%%spellout-cardinal-masculine< biljun[>%%and-typeB-masculine>];",
-            "1000000000000: triljun[>%%and-typeB-masculine>];",
-            "2000000000000: <%%spellout-cardinal-masculine< triljuni[>%%and-typeB-masculine>];",
-            "11000000000000/1,000: <%%spellout-cardinal-masculine< triljun[>%%and-typeB-masculine>];",
-            "1000000000000000: kvadriljun[>%%and-typeB-masculine>];",
-            "2000000000000000: <%%spellout-cardinal-masculine< kvadriljuni[>%%and-typeB-masculine>];",
-            "11000000000000000/1,000: <%%spellout-cardinal-masculine< kvadriljun[>%%and-typeB-masculine>];",
+            "1: ;",
+            "2: \u017Cew\u0121;",
+            "3: tliet;",
+            "4: erba\u02BC;",
+            "5: \u0127ames;",
+            "6: sitt;",
+            "7: seba\u02BC;",
+            "8: tmien;",
+            "9: disa\u02BC;",
+            "10: g\u0127axar;",
+            "11: \u0127dax-il;",
+            "12: tnax-il;",
+            "13: tlettax-il;",
+            "14: erbatax-il;",
+            "15: \u0127mistax-il;",
+            "16: sittax-il;",
+            "17: sbatax-il;",
+            "18: tmintax-il;",
+            "19: dsatax-il;",
+            "20: [>%%spellout-cardinal-feminine> u ]g\u0127oxrin;",
+            "30: [>%%spellout-cardinal-feminine> u ]tletin;",
+            "40: [>%%spellout-cardinal-feminine> u ]erbg\u0127in;",
+            "50: [>%%spellout-cardinal-feminine> u ]\u0127amsin;",
+            "60: [>%%spellout-cardinal-feminine> u ]sittin;",
+            "70: [>%%spellout-cardinal-feminine> u ]sebg\u0127in;",
+            "80: [>%%spellout-cardinal-feminine> u ]tmenin;",
+            "90: [>%%spellout-cardinal-feminine> u ]disg\u0127in;",
+            "100: mitt;",
+            "101: mija u >%%spellout-cardinal-feminine>;",
+            "200: mitejn[ u >%%spellout-cardinal-feminine>];",
+            "300: <%%spellout-cardinal-masculine< mija[>%%and-typeA-feminine>];",
+            "1000: elf[>%%and-typeA-feminine>];",
+            "2000: elfejn[>%%and-typeA-feminine>];",
+            "3000: <%%thousands< elef[>%%and-typeA-feminine>];",
+            "11000/1000: <%%spellout-cardinal-masculine< elf[>%%and-typeA-feminine>];",
+            "1000000: miljun[>%%and-typeA-feminine>];",
+            "2000000: <%%spellout-cardinal-masculine< miljuni[>%%and-typeA-feminine>];",
+            "11000000/1,000: <%%spellout-cardinal-masculine< miljun[>%%and-typeA-feminine>];",
+            "1000000000: biljun[>%%and-typeA-feminine>];",
+            "2000000000: <%%spellout-cardinal-masculine< biljuni[>%%and-typeA-feminine>];",
+            "11000000000/1,000: <%%spellout-cardinal-masculine< biljun[>%%and-typeA-feminine>];",
+            "1000000000000: triljun[>%%and-typeA-feminine>];",
+            "2000000000000: <%%spellout-cardinal-masculine< triljuni[>%%and-typeA-feminine>];",
+            "11000000000000/1,000: <%%spellout-cardinal-masculine< triljun[>%%and-typeA-feminine>];",
+            "1000000000000000: kvadriljun[>%%and-typeA-feminine>];",
+            "2000000000000000: <%%spellout-cardinal-masculine< kvadriljuni[>%%and-typeA-feminine>];",
+            "11000000000000000/1,000: <%%spellout-cardinal-masculine< kvadriljun[>%%and-typeA-feminine>];",
             "1000000000000000000: =#,##0=;",
-            "-x: minus >>;",
-            "x.x: << punt >>;",
-            "%spellout-numbering:",
-            "0: =%%spellout-cardinal-typeB-masculine=;",
-            "%spellout-numbering-year:",
-            "0: =%spellout-numbering=;",
-            "x.x: =#,###0.#=;",
+            "%%and-typeA-feminine:",
+            "0: ;",
+            "1: ' u =%%spellout-cardinal-feminine=;",
             "%%thousands:",
             "0: ERROR-=0=;",
             "3: tlitt;",
@@ -425,5 +425,5 @@
             "10000000000: <#,##0<<;",
         }
     }
-    Version{"1.5"}
+    Version{"1.7"}
 }

Modified: trunk/source/data/rbnf/nb.txt
===================================================================
--- trunk/source/data/rbnf/nb.txt	2009-07-02 19:27:40 UTC (rev 211)
+++ trunk/source/data/rbnf/nb.txt	2009-07-02 19:28:39 UTC (rev 212)
@@ -14,17 +14,27 @@
         SpelloutRules{
             "%%lenient-parse:",
             "&[last primary ignorable ] << ' ' << ',' << '-' << '\u00AD';",
-            "%spellout-cardinal-feminine:",
+            "%spellout-numbering-year:",
+            "-x: minus >>;",
+            "x.x: =#,###0.#=;",
+            "0: =%spellout-numbering=;",
+            "1100/100: <<\u00ADhundre[\u00ADog\u00AD>>];",
+            "10000: =%spellout-numbering=;",
+            "%spellout-numbering:",
             "0: =%spellout-cardinal-reale=;",
-            "%spellout-cardinal-masculine:",
-            "0: =%spellout-cardinal-reale=;",
             "%spellout-cardinal-neutre:",
+            "-x: minus >>;",
+            "x.x: << komma >>;",
             "0: null;",
             "1: et;",
             "2: =%spellout-cardinal-reale=;",
+            "%spellout-cardinal-masculine:",
+            "0: =%spellout-cardinal-reale=;",
+            "%spellout-cardinal-feminine:",
+            "0: =%spellout-cardinal-reale=;",
+            "%spellout-cardinal-reale:",
             "-x: minus >>;",
             "x.x: << komma >>;",
-            "%spellout-cardinal-reale:",
             "0: null;",
             "1: \u00E9n;",
             "2: to;",
@@ -65,17 +75,7 @@
             "1000000000000000: \u00E9n billiard[ >>];",
             "2000000000000000: << billiarder[ >>];",
             "1000000000000000000: =#,##0=;",
-            "-x: minus >>;",
-            "x.x: << komma >>;",
-            "%spellout-numbering:",
-            "0: =%spellout-cardinal-reale=;",
-            "%spellout-numbering-year:",
-            "0: =%spellout-numbering=;",
-            "1100/100: <<\u00ADhundre[\u00ADog\u00AD>>];",
-            "10000: =%spellout-numbering=;",
-            "-x: minus >>;",
-            "x.x: =#,###0.#=;",
         }
     }
-    Version{"1.5"}
+    Version{"1.6"}
 }

Modified: trunk/source/data/rbnf/nl.txt
===================================================================
--- trunk/source/data/rbnf/nl.txt	2009-07-02 19:27:40 UTC (rev 211)
+++ trunk/source/data/rbnf/nl.txt	2009-07-02 19:28:39 UTC (rev 212)
@@ -12,31 +12,37 @@
 nl{
     RBNFRules{
         OrdinalRules{
-            "%digits-ordinal:",
-            "0: =#,##0==%%digits-ordinal-indicator=;",
-            "-x: \u2212>>;",
             "%%digits-ordinal-indicator:",
             "0: ste;",
             "1: ste;",
             "2: de;",
             "20: ste;",
             "100: >>;",
+            "%digits-ordinal:",
+            "-x: \u2212>>;",
+            "0: =#,##0==%%digits-ordinal-indicator=;",
         }
         SpelloutRules{
             "%%2d-year:",
             "0: honderd[ >%spellout-numbering>];",
             "1: nul =%spellout-numbering=;",
             "10: =%spellout-numbering=;",
+            "%spellout-numbering-year:",
+            "-x: min >>;",
+            "x.x: =#,###0.#=;",
+            "0: =%spellout-numbering=;",
+            "1100/100: <<\u00AD>%%2d-year>;",
+            "10000: =%spellout-numbering=;",
+            "%spellout-numbering:",
+            "0: =%spellout-cardinal=;",
             "%%number-en:",
             "1: een\u00ADen\u00AD;",
             "2: twee\u00AD\u00EBn\u00AD;",
             "3: drie\u00AD\u00EBn\u00AD;",
             "4: =%spellout-cardinal=\u00ADen\u00AD;",
-            "%%ord-ste:",
-            "0: ste;",
-            "1: \u00ADen\u00AD=%spellout-ordinal=;",
-            "2: \u00AD=%spellout-ordinal=;",
             "%spellout-cardinal:",
+            "-x: min >>;",
+            "x.x: << komma >>;",
             "0: nul;",
             "1: een;",
             "2: twee;",
@@ -76,17 +82,13 @@
             "1000000000000: << biljoen[ >>];",
             "1000000000000000: << biljard[ >>];",
             "1000000000000000000: =#,##0=;",
+            "%%ord-ste:",
+            "0: ste;",
+            "1: \u00ADen\u00AD=%spellout-ordinal=;",
+            "2: \u00AD=%spellout-ordinal=;",
+            "%spellout-ordinal:",
             "-x: min >>;",
-            "x.x: << komma >>;",
-            "%spellout-numbering:",
-            "0: =%spellout-cardinal=;",
-            "%spellout-numbering-year:",
-            "0: =%spellout-numbering=;",
-            "1100/100: <<\u00AD>%%2d-year>;",
-            "10000: =%spellout-numbering=;",
-            "-x: min >>;",
-            "x.x: =#,###0.#=;",
-            "%spellout-ordinal:",
+            "x.x: =#,##0.#=;",
             "0: nulste;",
             "1: eerste;",
             "2: tweede;",
@@ -100,9 +102,7 @@
             "1000000000000: <%spellout-cardinal< biljoen>%%ord-ste>;",
             "1000000000000000: <%spellout-cardinal< biljard>%%ord-ste>;",
             "1000000000000000000: =#,##0=.;",
-            "-x: min >>;",
-            "x.x: =#,##0.#=;",
         }
     }
-    Version{"1.6"}
+    Version{"1.7"}
 }

Modified: trunk/source/data/rbnf/nn.txt
===================================================================
--- trunk/source/data/rbnf/nn.txt	2009-07-02 19:27:40 UTC (rev 211)
+++ trunk/source/data/rbnf/nn.txt	2009-07-02 19:28:39 UTC (rev 212)
@@ -14,17 +14,27 @@
         SpelloutRules{
             "%%lenient-parse:",
             "&[last primary ignorable ] << ' ' << ',' << '-' << '\u00AD';",
-            "%spellout-cardinal-feminine:",
+            "%spellout-numbering-year:",
+            "-x: minus >>;",
+            "x.x: =#,###0.#=;",
+            "0: =%spellout-numbering=;",
+            "1100/100: << hundre[ og >>];",
+            "10000: =%spellout-numbering=;",
+            "%spellout-numbering:",
             "0: =%spellout-cardinal-reale=;",
-            "%spellout-cardinal-masculine:",
-            "0: =%spellout-cardinal-reale=;",
             "%spellout-cardinal-neutre:",
+            "-x: minus >>;",
+            "x.x: << komma >>;",
             "0: null;",
             "1: eitt;",
             "2: =%spellout-cardinal-reale=;",
+            "%spellout-cardinal-masculine:",
+            "0: =%spellout-cardinal-reale=;",
+            "%spellout-cardinal-feminine:",
+            "0: =%spellout-cardinal-reale=;",
+            "%spellout-cardinal-reale:",
             "-x: minus >>;",
             "x.x: << komma >>;",
-            "%spellout-cardinal-reale:",
             "0: null;",
             "1: \u00E9in;",
             "2: to;",
@@ -64,17 +74,7 @@
             "1000000000000000: \u00E9in biljard[ >>];",
             "2000000000000000: << biljarder[ >>];",
             "1000000000000000000: =#,##0=;",
-            "-x: minus >>;",
-            "x.x: << komma >>;",
-            "%spellout-numbering:",
-            "0: =%spellout-cardinal-reale=;",
-            "%spellout-numbering-year:",
-            "0: =%spellout-numbering=;",
-            "1100/100: << hundre[ og >>];",
-            "10000: =%spellout-numbering=;",
-            "-x: minus >>;",
-            "x.x: =#,###0.#=;",
         }
     }
-    Version{"1.5"}
+    Version{"1.6"}
 }

Modified: trunk/source/data/rbnf/pl.txt
===================================================================
--- trunk/source/data/rbnf/pl.txt	2009-07-02 19:27:40 UTC (rev 211)
+++ trunk/source/data/rbnf/pl.txt	2009-07-02 19:28:39 UTC (rev 212)
@@ -12,11 +12,34 @@
 pl{
     RBNFRules{
         SpelloutRules{
-            "%spellout-cardinal-feminine:",
+            "%spellout-numbering-year:",
+            "x.x: =#,###0.#=;",
+            "0: =%spellout-numbering=;",
+            "%spellout-numbering:",
+            "0: =%spellout-cardinal-masculine=;",
+            "%spellout-cardinal-masculine:",
+            "-x: minus >>;",
+            "x.x: << przecinek >>;",
             "0: zero;",
-            "1: jedna;",
-            "2: dwie;",
-            "3: =%spellout-cardinal-masculine=;",
+            "1: jeden;",
+            "2: dwa;",
+            "3: trzy;",
+            "4: cztery;",
+            "5: pi\u0119\u0107;",
+            "6: sze\u015B\u0107;",
+            "7: siedem;",
+            "8: osiem;",
+            "9: dziewi\u0119\u0107;",
+            "10: dziesi\u0119\u0107;",
+            "11: jedena\u015Bcie;",
+            "12: dwana\u015Bcie;",
+            "13: trzyna\u015Bcie;",
+            "14: czterna\u015Bcie;",
+            "15: pi\u0119tna\u015Bcie;",
+            "16: szesna\u015Bcie;",
+            "17: siedemna\u015Bcie;",
+            "18: osiemna\u015Bcie;",
+            "19: dziewi\u0119tna\u015Bcie;",
             "20: dwadzie\u015Bcia[ >>];",
             "30: trzydzie\u015Bci[ >>];",
             "40: czterdzie\u015Bci[ >>];",
@@ -41,29 +64,12 @@
             "2000000000000000: <%spellout-cardinal-masculine< biliardy[ >>];",
             "5000000000000000: <%spellout-cardinal-masculine< biliard\u00F3w[ >>];",
             "1000000000000000000: =#,##0=;",
+            "%spellout-cardinal-neutre:",
             "-x: minus >>;",
             "x.x: << przecinek >>;",
-            "%spellout-cardinal-masculine:",
             "0: zero;",
-            "1: jeden;",
-            "2: dwa;",
-            "3: trzy;",
-            "4: cztery;",
-            "5: pi\u0119\u0107;",
-            "6: sze\u015B\u0107;",
-            "7: siedem;",
-            "8: osiem;",
-            "9: dziewi\u0119\u0107;",
-            "10: dziesi\u0119\u0107;",
-            "11: jedena\u015Bcie;",
-            "12: dwana\u015Bcie;",
-            "13: trzyna\u015Bcie;",
-            "14: czterna\u015Bcie;",
-            "15: pi\u0119tna\u015Bcie;",
-            "16: szesna\u015Bcie;",
-            "17: siedemna\u015Bcie;",
-            "18: osiemna\u015Bcie;",
-            "19: dziewi\u0119tna\u015Bcie;",
+            "1: jedno;",
+            "2: =%spellout-cardinal-masculine=;",
             "20: dwadzie\u015Bcia[ >>];",
             "30: trzydzie\u015Bci[ >>];",
             "40: czterdzie\u015Bci[ >>];",
@@ -88,12 +94,13 @@
             "2000000000000000: <%spellout-cardinal-masculine< biliardy[ >>];",
             "5000000000000000: <%spellout-cardinal-masculine< biliard\u00F3w[ >>];",
             "1000000000000000000: =#,##0=;",
+            "%spellout-cardinal-feminine:",
             "-x: minus >>;",
             "x.x: << przecinek >>;",
-            "%spellout-cardinal-neutre:",
             "0: zero;",
-            "1: jedno;",
-            "2: =%spellout-cardinal-masculine=;",
+            "1: jedna;",
+            "2: dwie;",
+            "3: =%spellout-cardinal-masculine=;",
             "20: dwadzie\u015Bcia[ >>];",
             "30: trzydzie\u015Bci[ >>];",
             "40: czterdzie\u015Bci[ >>];",
@@ -118,14 +125,7 @@
             "2000000000000000: <%spellout-cardinal-masculine< biliardy[ >>];",
             "5000000000000000: <%spellout-cardinal-masculine< biliard\u00F3w[ >>];",
             "1000000000000000000: =#,##0=;",
-            "-x: minus >>;",
-            "x.x: << przecinek >>;",
-            "%spellout-numbering:",
-            "0: =%spellout-cardinal-masculine=;",
-            "%spellout-numbering-year:",
-            "0: =%spellout-numbering=;",
-            "x.x: =#,###0.#=;",
         }
     }
-    Version{"1.5"}
+    Version{"1.6"}
 }

Modified: trunk/source/data/rbnf/pt.txt
===================================================================
--- trunk/source/data/rbnf/pt.txt	2009-07-02 19:27:40 UTC (rev 211)
+++ trunk/source/data/rbnf/pt.txt	2009-07-02 19:28:39 UTC (rev 212)
@@ -12,16 +12,6 @@
 pt{
     RBNFRules{
         OrdinalRules{
-            "%digits-ordinal:",
-            "0: =%digits-ordinal-masculine=;",
-            "%digits-ordinal-feminine:",
-            "0: =#,##0==%%dord-femabbrev=;",
-            "-x: \u2212>>;",
-            "%digits-ordinal-masculine:",
-            "0: =#,##0==%%dord-mascabbrev=;",
-            "-x: \u2212>>;",
-            "%%dord-femabbrev:",
-            "0: \u1D43;",
             "%%dord-mascabbrev:",
             "0: \u1D52;",
             "1: \u1D49\u02B3;",
@@ -30,47 +20,28 @@
             "4: \u1D52;",
             "20: >>;",
             "100: >>;",
+            "%digits-ordinal-masculine:",
+            "-x: \u2212>>;",
+            "0: =#,##0==%%dord-mascabbrev=;",
+            "%%dord-femabbrev:",
+            "0: \u1D43;",
+            "%digits-ordinal-feminine:",
+            "-x: \u2212>>;",
+            "0: =#,##0==%%dord-femabbrev=;",
+            "%digits-ordinal:",
+            "0: =%digits-ordinal-masculine=;",
         }
         SpelloutRules{
             "%%lenient-parse:",
             "&[last primary ignorable ] << ' ' << ',' << '-' << '\u00AD';",
-            "%spellout-cardinal-feminine:",
-            "0: zero;",
-            "1: uma;",
-            "2: duas;",
-            "3: =%spellout-cardinal-masculine=;",
-            "20: vinte[ e >>];",
-            "30: trinta[ e >>];",
-            "40: quarenta[ e >>];",
-            "50: cinquenta[ e >>];",
-            "60: sessenta[ e >>];",
-            "70: setenta[ e >>];",
-            "80: oitenta[ e >>];",
-            "90: noventa[ e >>];",
-            "100: cem;",
-            "101: centa e >>;",
-            "200: duzcentas[ e >>];",
-            "300: trezentas[ e >>];",
-            "400: quatrocentas[ e >>];",
-            "500: quinhentas[ e >>];",
-            "600: seiscentas[ e >>];",
-            "700: setecentas[ e >>];",
-            "800: oitocentas[ e >>];",
-            "900: novecentas[ e >>];",
-            "1000: mil[ e >>];",
-            "2000: <%spellout-cardinal-masculine< mil[ e >>];",
-            "1000000: um milh\u00E3o[ e >>];",
-            "2000000: <%spellout-cardinal-masculine< miliones[ e >>];",
-            "1000000000: um bilh\u00E3o[ e >>];",
-            "2000000000: <%spellout-cardinal-masculine< biliones[ e >>];",
-            "1000000000000: um trilh\u00E3o[ e >>];",
-            "2000000000000: <%spellout-cardinal-masculine< triliones[ e >>];",
-            "1000000000000000: um quatrilh\u00E3o[ e >>];",
-            "2000000000000000: <%spellout-cardinal-masculine< quatriliones[ e >>];",
-            "1000000000000000000: =#,##0=;",
+            "%spellout-numbering-year:",
+            "x.x: =#,###0.#=;",
+            "0: =%spellout-numbering=;",
+            "%spellout-numbering:",
+            "0: =%spellout-cardinal-masculine=;",
+            "%spellout-cardinal-masculine:",
             "-x: menos >>;",
             "x.x: << v\u00EDrgula >>;",
-            "%spellout-cardinal-masculine:",
             "0: zero;",
             "1: um;",
             "2: dois;",
@@ -120,56 +91,45 @@
             "1000000000000000: um quatrilh\u00E3o[ e >>];",
             "2000000000000000: <%spellout-cardinal-masculine< quatriliones[ e >>];",
             "1000000000000000000: =#,##0=;",
+            "%spellout-cardinal-feminine:",
             "-x: menos >>;",
             "x.x: << v\u00EDrgula >>;",
-            "%spellout-numbering:",
-            "0: =%spellout-cardinal-masculine=;",
-            "%spellout-numbering-year:",
-            "0: =%spellout-numbering=;",
-            "x.x: =#,###0.#=;",
-            "%spellout-ordinal-feminine:",
             "0: zero;",
-            "1: primeira;",
-            "2: segunda;",
-            "3: terceira;",
-            "4: quarta;",
-            "5: quinta;",
-            "6: sexta;",
-            "7: s\u00E9tima;",
-            "8: oitava;",
-            "9: nona;",
-            "10: d\u00E9cima[ >>];",
-            "20: vig\u00E9sima[ >>];",
-            "30: trig\u00E9sima[ >>];",
-            "40: quadrag\u00E9sima[ >>];",
-            "50: quinquag\u00E9sima[ >>];",
-            "60: sexag\u00E9sima[ >>];",
-            "70: septuag\u00E9sima[ >>];",
-            "80: octog\u00E9sima[ >>];",
-            "90: nonag\u00E9sima[ >>];",
-            "100: cent\u00E9sima[ >>];",
-            "200: ducent\u00E9sima[ >>];",
-            "300: tricent\u00E9sima[ >>];",
-            "400: quadringent\u00E9sima[ >>];",
-            "500: quingent\u00E9sima[ >>];",
-            "600: sexcent\u00E9sima[ >>];",
-            "700: septingent\u00E9sima[ >>];",
-            "800: octingent\u00E9sima[ >>];",
-            "900: noningent\u00E9sima[ >>];",
-            "1000: mil\u00E9sima[ >>];",
-            "2000: <%spellout-cardinal-masculine<\u00ADmil\u00E9sima[ >>];",
-            "1000000: un milion\u00E9sima[ >>];",
-            "2000000: <%spellout-cardinal-masculine< milion\u00E9sima[ >>];",
-            "1000000000: un bilion\u00E9sima[ >>];",
-            "2000000000: <%spellout-cardinal-masculine< bilion\u00E9sima[ >>];",
-            "1000000000000: un trilion\u00E9sima[ >>];",
-            "2000000000000: <%spellout-cardinal-masculine< trilion\u00E9sima[ >>];",
-            "1000000000000000: un quadrilion\u00E9sima[ >>];",
-            "2000000000000000: <%spellout-cardinal-masculine< quadrilion\u00E9sima[ >>];",
-            "1000000000000000000: =#,##0=\u1D43;",
+            "1: uma;",
+            "2: duas;",
+            "3: =%spellout-cardinal-masculine=;",
+            "20: vinte[ e >>];",
+            "30: trinta[ e >>];",
+            "40: quarenta[ e >>];",
+            "50: cinquenta[ e >>];",
+            "60: sessenta[ e >>];",
+            "70: setenta[ e >>];",
+            "80: oitenta[ e >>];",
+            "90: noventa[ e >>];",
+            "100: cem;",
+            "101: centa e >>;",
+            "200: duzcentas[ e >>];",
+            "300: trezentas[ e >>];",
+            "400: quatrocentas[ e >>];",
+            "500: quinhentas[ e >>];",
+            "600: seiscentas[ e >>];",
+            "700: setecentas[ e >>];",
+            "800: oitocentas[ e >>];",
+            "900: novecentas[ e >>];",
+            "1000: mil[ e >>];",
+            "2000: <%spellout-cardinal-masculine< mil[ e >>];",
+            "1000000: um milh\u00E3o[ e >>];",
+            "2000000: <%spellout-cardinal-masculine< miliones[ e >>];",
+            "1000000000: um bilh\u00E3o[ e >>];",
+            "2000000000: <%spellout-cardinal-masculine< biliones[ e >>];",
+            "1000000000000: um trilh\u00E3o[ e >>];",
+            "2000000000000: <%spellout-cardinal-masculine< triliones[ e >>];",
+            "1000000000000000: um quatrilh\u00E3o[ e >>];",
+            "2000000000000000: <%spellout-cardinal-masculine< quatriliones[ e >>];",
+            "1000000000000000000: =#,##0=;",
+            "%spellout-ordinal-masculine:",
             "-x: menos >>;",
             "x.x: =#,##0.#=;",
-            "%spellout-ordinal-masculine:",
             "0: zero;",
             "1: primeiro;",
             "2: segundo;",
@@ -209,9 +169,49 @@
             "1000000000000000: un quadrilion\u00E9simo[ >>];",
             "2000000000000000: <%spellout-cardinal-masculine< quadrilion\u00E9simo[ >>];",
             "1000000000000000000: =#,##0=\u1D52;",
+            "%spellout-ordinal-feminine:",
             "-x: menos >>;",
             "x.x: =#,##0.#=;",
+            "0: zero;",
+            "1: primeira;",
+            "2: segunda;",
+            "3: terceira;",
+            "4: quarta;",
+            "5: quinta;",
+            "6: sexta;",
+            "7: s\u00E9tima;",
+            "8: oitava;",
+            "9: nona;",
+            "10: d\u00E9cima[ >>];",
+            "20: vig\u00E9sima[ >>];",
+            "30: trig\u00E9sima[ >>];",
+            "40: quadrag\u00E9sima[ >>];",
+            "50: quinquag\u00E9sima[ >>];",
+            "60: sexag\u00E9sima[ >>];",
+            "70: septuag\u00E9sima[ >>];",
+            "80: octog\u00E9sima[ >>];",
+            "90: nonag\u00E9sima[ >>];",
+            "100: cent\u00E9sima[ >>];",
+            "200: ducent\u00E9sima[ >>];",
+            "300: tricent\u00E9sima[ >>];",
+            "400: quadringent\u00E9sima[ >>];",
+            "500: quingent\u00E9sima[ >>];",
+            "600: sexcent\u00E9sima[ >>];",
+            "700: septingent\u00E9sima[ >>];",
+            "800: octingent\u00E9sima[ >>];",
+            "900: noningent\u00E9sima[ >>];",
+            "1000: mil\u00E9sima[ >>];",
+            "2000: <%spellout-cardinal-masculine<\u00ADmil\u00E9sima[ >>];",
+            "1000000: un milion\u00E9sima[ >>];",
+            "2000000: <%spellout-cardinal-masculine< milion\u00E9sima[ >>];",
+            "1000000000: un bilion\u00E9sima[ >>];",
+            "2000000000: <%spellout-cardinal-masculine< bilion\u00E9sima[ >>];",
+            "1000000000000: un trilion\u00E9sima[ >>];",
+            "2000000000000: <%spellout-cardinal-masculine< trilion\u00E9sima[ >>];",
+            "1000000000000000: un quadrilion\u00E9sima[ >>];",
+            "2000000000000000: <%spellout-cardinal-masculine< quadrilion\u00E9sima[ >>];",
+            "1000000000000000000: =#,##0=\u1D43;",
         }
     }
-    Version{"1.6"}
+    Version{"1.7"}
 }

Modified: trunk/source/data/rbnf/pt_PT.txt
===================================================================
--- trunk/source/data/rbnf/pt_PT.txt	2009-07-02 19:27:40 UTC (rev 211)
+++ trunk/source/data/rbnf/pt_PT.txt	2009-07-02 19:28:39 UTC (rev 212)
@@ -12,16 +12,6 @@
 pt_PT{
     RBNFRules{
         OrdinalRules{
-            "%digits-ordinal:",
-            "0: =%digits-ordinal-masculine=;",
-            "%digits-ordinal-feminine:",
-            "0: =#,##0==%%dord-femabbrev=;",
-            "-x: \u2212>>;",
-            "%digits-ordinal-masculine:",
-            "0: =#,##0==%%dord-mascabbrev=;",
-            "-x: \u2212>>;",
-            "%%dord-femabbrev:",
-            "0: \u1D43;",
             "%%dord-mascabbrev:",
             "0: \u1D52;",
             "1: \u1D49\u02B3;",
@@ -30,43 +20,28 @@
             "4: \u1D52;",
             "20: >>;",
             "100: >>;",
+            "%digits-ordinal-masculine:",
+            "-x: \u2212>>;",
+            "0: =#,##0==%%dord-mascabbrev=;",
+            "%%dord-femabbrev:",
+            "0: \u1D43;",
+            "%digits-ordinal-feminine:",
+            "-x: \u2212>>;",
+            "0: =#,##0==%%dord-femabbrev=;",
+            "%digits-ordinal:",
+            "0: =%digits-ordinal-masculine=;",
         }
         SpelloutRules{
             "%%lenient-parse:",
             "&[last primary ignorable ] << ' ' << ',' << '-' << '\u00AD';",
-            "%spellout-cardinal-feminine:",
-            "0: zero;",
-            "1: uma;",
-            "2: duas;",
-            "3: =%spellout-cardinal-masculine=;",
-            "20: vinte[ e >>];",
-            "30: trinta[ e >>];",
-            "40: quarenta[ e >>];",
-            "50: cinquenta[ e >>];",
-            "60: sessenta[ e >>];",
-            "70: setenta[ e >>];",
-            "80: oitenta[ e >>];",
-            "90: noventa[ e >>];",
-            "100: cem;",
-            "101: centa e >>;",
-            "200: duzcentas[ e >>];",
-            "300: trezentas[ e >>];",
-            "400: quatrocentas[ e >>];",
-            "500: quinhentas[ e >>];",
-            "600: seiscentas[ e >>];",
-            "700: setecentas[ e >>];",
-            "800: oitocentas[ e >>];",
-            "900: novecentas[ e >>];",
-            "1000: mil[ e >>];",
-            "2000: <%spellout-cardinal-masculine< mil[ e >>];",
-            "1000000: um milh\u00E3o[ e >>];",
-            "2000000: <%spellout-cardinal-masculine< milh\u00F5es[ e >>];",
-            "1000000000000: um bilh\u00E3o[ e >>];",
-            "2000000000000: <%spellout-cardinal-masculine< bilh\u00F5es[ e >>];",
-            "1000000000000000000: =#,##0=;",
+            "%spellout-numbering-year:",
+            "x.x: =#,###0.#=;",
+            "0: =%spellout-numbering=;",
+            "%spellout-numbering:",
+            "0: =%spellout-cardinal-masculine=;",
+            "%spellout-cardinal-masculine:",
             "-x: menos >>;",
             "x.x: << v\u00EDrgula >>;",
-            "%spellout-cardinal-masculine:",
             "0: zero;",
             "1: um;",
             "2: dois;",
@@ -112,52 +87,41 @@
             "1000000000000: um bilh\u00E3o[ e >>];",
             "2000000000000: <%spellout-cardinal-masculine< bilh\u00F5es[ e >>];",
             "1000000000000000000: =#,##0=;",
+            "%spellout-cardinal-feminine:",
             "-x: menos >>;",
             "x.x: << v\u00EDrgula >>;",
-            "%spellout-numbering:",
-            "0: =%spellout-cardinal-masculine=;",
-            "%spellout-numbering-year:",
-            "0: =%spellout-numbering=;",
-            "x.x: =#,###0.#=;",
-            "%spellout-ordinal-feminine:",
             "0: zero;",
-            "1: primeira;",
-            "2: segunda;",
-            "3: terceira;",
-            "4: quarta;",
-            "5: quinta;",
-            "6: sexta;",
-            "7: s\u00E9tima;",
-            "8: oitava;",
-            "9: nona;",
-            "10: d\u00E9cima[ >>];",
-            "20: vig\u00E9sima[ >>];",
-            "30: trig\u00E9sima[ >>];",
-            "40: quadrag\u00E9sima[ >>];",
-            "50: quinquag\u00E9sima[ >>];",
-            "60: sexag\u00E9sima[ >>];",
-            "70: septuag\u00E9sima[ >>];",
-            "80: octog\u00E9sima[ >>];",
-            "90: nonag\u00E9sima[ >>];",
-            "100: cent\u00E9sima[ >>];",
-            "200: ducent\u00E9sima[ >>];",
-            "300: tricent\u00E9sima[ >>];",
-            "400: quadringent\u00E9sima[ >>];",
-            "500: quingent\u00E9sima[ >>];",
-            "600: sexcent\u00E9sima[ >>];",
-            "700: septingent\u00E9sima[ >>];",
-            "800: octingent\u00E9sima[ >>];",
-            "900: noningent\u00E9sima[ >>];",
-            "1000: mil\u00E9sima[ >>];",
-            "2000: <%spellout-cardinal-masculine<\u00ADmil\u00E9sima[ >>];",
-            "1000000: un milion\u00E9sima[ >>];",
-            "2000000: <%spellout-cardinal-masculine< milion\u00E9sima[ >>];",
-            "1000000000000: un bilh\u00F5\u00E9sima[ >>];",
-            "2000000000000: <%spellout-cardinal-masculine< bilion\u00E9sima[ >>];",
-            "1000000000000000000: =#,##0=\u1D43;",
+            "1: uma;",
+            "2: duas;",
+            "3: =%spellout-cardinal-masculine=;",
+            "20: vinte[ e >>];",
+            "30: trinta[ e >>];",
+            "40: quarenta[ e >>];",
+            "50: cinquenta[ e >>];",
+            "60: sessenta[ e >>];",
+            "70: setenta[ e >>];",
+            "80: oitenta[ e >>];",
+            "90: noventa[ e >>];",
+            "100: cem;",
+            "101: centa e >>;",
+            "200: duzcentas[ e >>];",
+            "300: trezentas[ e >>];",
+            "400: quatrocentas[ e >>];",
+            "500: quinhentas[ e >>];",
+            "600: seiscentas[ e >>];",
+            "700: setecentas[ e >>];",
+            "800: oitocentas[ e >>];",
+            "900: novecentas[ e >>];",
+            "1000: mil[ e >>];",
+            "2000: <%spellout-cardinal-masculine< mil[ e >>];",
+            "1000000: um milh\u00E3o[ e >>];",
+            "2000000: <%spellout-cardinal-masculine< milh\u00F5es[ e >>];",
+            "1000000000000: um bilh\u00E3o[ e >>];",
+            "2000000000000: <%spellout-cardinal-masculine< bilh\u00F5es[ e >>];",
+            "1000000000000000000: =#,##0=;",
+            "%spellout-ordinal-masculine:",
             "-x: menos >>;",
             "x.x: =#,##0.#=;",
-            "%spellout-ordinal-masculine:",
             "0: zero;",
             "1: primeiro;",
             "2: segundo;",
@@ -193,9 +157,45 @@
             "1000000000000: un bilion\u00E9simo[ >>];",
             "2000000000000: <%spellout-cardinal-masculine< bilion\u00E9simo[ >>];",
             "1000000000000000000: =#,##0=\u1D52;",
+            "%spellout-ordinal-feminine:",
             "-x: menos >>;",
             "x.x: =#,##0.#=;",
+            "0: zero;",
+            "1: primeira;",
+            "2: segunda;",
+            "3: terceira;",
+            "4: quarta;",
+            "5: quinta;",
+            "6: sexta;",
+            "7: s\u00E9tima;",
+            "8: oitava;",
+            "9: nona;",
+            "10: d\u00E9cima[ >>];",
+            "20: vig\u00E9sima[ >>];",
+            "30: trig\u00E9sima[ >>];",
+            "40: quadrag\u00E9sima[ >>];",
+            "50: quinquag\u00E9sima[ >>];",
+            "60: sexag\u00E9sima[ >>];",
+            "70: septuag\u00E9sima[ >>];",
+            "80: octog\u00E9sima[ >>];",
+            "90: nonag\u00E9sima[ >>];",
+            "100: cent\u00E9sima[ >>];",
+            "200: ducent\u00E9sima[ >>];",
+            "300: tricent\u00E9sima[ >>];",
+            "400: quadringent\u00E9sima[ >>];",
+            "500: quingent\u00E9sima[ >>];",
+            "600: sexcent\u00E9sima[ >>];",
+            "700: septingent\u00E9sima[ >>];",
+            "800: octingent\u00E9sima[ >>];",
+            "900: noningent\u00E9sima[ >>];",
+            "1000: mil\u00E9sima[ >>];",
+            "2000: <%spellout-cardinal-masculine<\u00ADmil\u00E9sima[ >>];",
+            "1000000: un milion\u00E9sima[ >>];",
+            "2000000: <%spellout-cardinal-masculine< milion\u00E9sima[ >>];",
+            "1000000000000: un bilh\u00F5\u00E9sima[ >>];",
+            "2000000000000: <%spellout-cardinal-masculine< bilion\u00E9sima[ >>];",
+            "1000000000000000000: =#,##0=\u1D43;",
         }
     }
-    Version{"1.6"}
+    Version{"1.7"}
 }

Modified: trunk/source/data/rbnf/ro.txt
===================================================================
--- trunk/source/data/rbnf/ro.txt	2009-07-02 19:27:40 UTC (rev 211)
+++ trunk/source/data/rbnf/ro.txt	2009-07-02 19:28:39 UTC (rev 212)
@@ -13,15 +13,30 @@
     RBNFRules{
         OrdinalRules{
             "%digits-ordinal:",
+            "-x: \u2212>>;",
             "0: =#,##0=a;",
-            "-x: \u2212>>;",
         }
         SpelloutRules{
-            "%spellout-cardinal-feminine:",
+            "%spellout-numbering-year:",
+            "x.x: =#,###0.#=;",
+            "0: =%spellout-numbering=;",
+            "%spellout-numbering:",
+            "0: =%spellout-cardinal-masculine=;",
+            "%spellout-cardinal-masculine:",
+            "-x: minus >>;",
+            "x.x: << virgul\u0103 >>;",
             "0: zero;",
-            "1: una;",
-            "2: dou\u0103;",
-            "3: =%spellout-cardinal-masculine=;",
+            "1: unu;",
+            "2: doi;",
+            "3: trei;",
+            "4: patru;",
+            "5: cinci;",
+            "6: \u015Fase;",
+            "7: \u015Fapte;",
+            "8: opt;",
+            "9: nou\u0103;",
+            "10: zece;",
+            "11: unsprezece;",
             "12: >>sprezece;",
             "20: <%spellout-cardinal-feminine<zeci[ \u015Fi >>];",
             "100: una sut\u0103[ >>];",
@@ -37,21 +52,13 @@
             "1000000000000000: <%spellout-cardinal-neutre< biliard[ >>];",
             "2000000000000000: <%spellout-cardinal-neutre< biliarde[ >>];",
             "1000000000000000000: =#,##0=;",
+            "%spellout-cardinal-feminine:",
             "-x: minus >>;",
             "x.x: << virgul\u0103 >>;",
-            "%spellout-cardinal-masculine:",
             "0: zero;",
-            "1: unu;",
-            "2: doi;",
-            "3: trei;",
-            "4: patru;",
-            "5: cinci;",
-            "6: \u015Fase;",
-            "7: \u015Fapte;",
-            "8: opt;",
-            "9: nou\u0103;",
-            "10: zece;",
-            "11: unsprezece;",
+            "1: una;",
+            "2: dou\u0103;",
+            "3: =%spellout-cardinal-masculine=;",
             "12: >>sprezece;",
             "20: <%spellout-cardinal-feminine<zeci[ \u015Fi >>];",
             "100: una sut\u0103[ >>];",
@@ -67,9 +74,9 @@
             "1000000000000000: <%spellout-cardinal-neutre< biliard[ >>];",
             "2000000000000000: <%spellout-cardinal-neutre< biliarde[ >>];",
             "1000000000000000000: =#,##0=;",
+            "%spellout-cardinal-neutre:",
             "-x: minus >>;",
             "x.x: << virgul\u0103 >>;",
-            "%spellout-cardinal-neutre:",
             "0: zero;",
             "1: unu;",
             "2: =%spellout-cardinal-feminine=;",
@@ -87,14 +94,7 @@
             "1000000000000000: <%spellout-cardinal-neutre< biliard[ >>];",
             "2000000000000000: <%spellout-cardinal-neutre< biliarde[ >>];",
             "1000000000000000000: =#,##0=;",
-            "-x: minus >>;",
-            "x.x: << virgul\u0103 >>;",
-            "%spellout-numbering:",
-            "0: =%spellout-cardinal-masculine=;",
-            "%spellout-numbering-year:",
-            "0: =%spellout-numbering=;",
-            "x.x: =#,###0.#=;",
         }
     }
-    Version{"1.5"}
+    Version{"1.6"}
 }

Modified: trunk/source/data/rbnf/root.txt
===================================================================
--- trunk/source/data/rbnf/root.txt	2009-07-02 19:27:40 UTC (rev 211)
+++ trunk/source/data/rbnf/root.txt	2009-07-02 19:28:39 UTC (rev 212)
@@ -16,84 +16,8 @@
             "0: =#,##0=;",
         }
         NumberingSystemRules{
-            "%%GREEK-NUMERAL-MAJUSCULES:",
-            "1: \u0391;",
-            "2: \u0392;",
-            "3: \u0393;",
-            "4: \u0394;",
-            "5: \u0395;",
-            "6: \u03DC;",
-            "7: \u0396;",
-            "8: \u0397;",
-            "9: \u0398;",
-            "10: \u0399[>>];",
-            "20: \u039A[>>];",
-            "30: \u039B[>>];",
-            "40: \u039C[>>];",
-            "50: \u039D[>>];",
-            "60: \u039E[>>];",
-            "70: \u039F[>>];",
-            "80: \u03A0[>>];",
-            "90: \u03DE[>>];",
-            "100: \u03A1[>>];",
-            "200: \u03A3[>>];",
-            "300: \u03A4[>>];",
-            "400: \u03A5[>>];",
-            "500: \u03A6[>>];",
-            "600: \u03A7[>>];",
-            "700: \u03A8[>>];",
-            "800: \u03A9[>>];",
-            "900: \u03E0[>>];",
-            "1000: \u0375\u0391[>>];",
-            "2000: \u0375\u0392[>>];",
-            "3000: \u0375\u0393[>>];",
-            "4000: \u0375\u0394[>>];",
-            "5000: \u0375\u0395[>>];",
-            "6000: \u0375\u03DC[>>];",
-            "7000: \u0375\u0396[>>];",
-            "8000: \u0375\u0397[>>];",
-            "9000: \u0375\u0398[>>];",
-            "%armenian-lower:",
-            "0: 0;",
-            "1: \u0561;",
-            "2: \u0562;",
-            "3: \u0563;",
-            "4: \u0564;",
-            "5: \u0565;",
-            "6: \u0566;",
-            "7: \u0567;",
-            "8: \u0568;",
-            "9: \u0569;",
-            "10: \u056A[>>];",
-            "20: \u056B[>>];",
-            "30: \u056C[>>];",
-            "40: \u056D[>>];",
-            "50: \u056E[>>];",
-            "60: \u056F[>>];",
-            "70: \u0570[>>];",
-            "80: \u0571[>>];",
-            "90: \u0572[>>];",
-            "100: \u0573[>>];",
-            "200: \u0574[>>];",
-            "300: \u0575[>>];",
-            "400: \u0576[>>];",
-            "500: \u0577[>>];",
-            "600: \u0578[>>];",
-            "700: \u0579[>>];",
-            "800: \u057A[>>];",
-            "900: \u057B[>>];",
-            "1000: \u057C[>>];",
-            "2000: \u057D[>>];",
-            "3000: \u057E[>>];",
-            "4000: \u057F[>>];",
-            "5000: \u0580[>>];",
-            "6000: \u0581[>>];",
-            "7000: \u0582[>>];",
-            "8000: \u0583[>>];",
-            "9000: \u0584[>>];",
-            "10000: =#,##0=;",
+            "%armenian-upper:",
             "-x: \u2212>>;",
-            "%armenian-upper:",
             "0: 0;",
             "1: \u0531;",
             "2: \u0532;",
@@ -132,8 +56,48 @@
             "8000: \u0553[>>];",
             "9000: \u0554[>>];",
             "10000: =#,##0=;",
+            "%armenian-lower:",
             "-x: \u2212>>;",
+            "0: 0;",
+            "1: \u0561;",
+            "2: \u0562;",
+            "3: \u0563;",
+            "4: \u0564;",
+            "5: \u0565;",
+            "6: \u0566;",
+            "7: \u0567;",
+            "8: \u0568;",
+            "9: \u0569;",
+            "10: \u056A[>>];",
+            "20: \u056B[>>];",
+            "30: \u056C[>>];",
+            "40: \u056D[>>];",
+            "50: \u056E[>>];",
+            "60: \u056F[>>];",
+            "70: \u0570[>>];",
+            "80: \u0571[>>];",
+            "90: \u0572[>>];",
+            "100: \u0573[>>];",
+            "200: \u0574[>>];",
+            "300: \u0575[>>];",
+            "400: \u0576[>>];",
+            "500: \u0577[>>];",
+            "600: \u0578[>>];",
+            "700: \u0579[>>];",
+            "800: \u057A[>>];",
+            "900: \u057B[>>];",
+            "1000: \u057C[>>];",
+            "2000: \u057D[>>];",
+            "3000: \u057E[>>];",
+            "4000: \u057F[>>];",
+            "5000: \u0580[>>];",
+            "6000: \u0581[>>];",
+            "7000: \u0582[>>];",
+            "8000: \u0583[>>];",
+            "9000: \u0584[>>];",
+            "10000: =#,##0=;",
             "%ethiopic:",
+            "-x: =#,##0=;",
             "0: \u1263\u12F6;",
             "1: \u1369;",
             "2: \u136A;",
@@ -160,7 +124,6 @@
             "2000000/1000000: <<\u137B>%%ethiopic3>;",
             "100000000/100000000: <<\u137C>%%ethiopic4>;",
             "10000000000: =#,##0=;",
-            "-x: =#,##0=;",
             "%%ethiopic2:",
             "0: \u137B;\u137B=%ethiopic=;",
             "100/100: <%ethiopic<\u137B[>%ethiopic>];",
@@ -173,6 +136,7 @@
             "10000/10000: \u137B<%ethiopic<\u137B[>%ethiopic>];",
             "1000000/1000000: =%ethiopic=;",
             "%georgian:",
+            "-x: =#,##0=;",
             "0: =#,##0=;",
             "1: \u10D0;",
             "2: \u10D1;",
@@ -212,12 +176,11 @@
             "9000: \u10F5[>>];",
             "10000: \u10EF[>>];",
             "20000: =#,##0=;",
-            "-x: =#,##0=;",
             "%greek-lower:",
+            "-x: \u2212>>;",
             "0: 00;",
             "1: =%%greek-numeral-minuscules=\u00B4;",
             "10000: =#,##0=;",
-            "-x: \u2212>>;",
             "%%greek-numeral-minuscules:",
             "1: \u03B1;",
             "2: \u03B2;",
@@ -256,11 +219,49 @@
             "8000: \u0375\u03B7[>>];",
             "9000: \u0375\u03B8[>>];",
             "%greek-upper:",
+            "-x: \u2212>>;",
             "0: 00;",
             "1: =%%GREEK-NUMERAL-MAJUSCULES=\u00B4;",
             "10000: =#,##0=;",
-            "-x: \u2212>>;",
+            "%%GREEK-NUMERAL-MAJUSCULES:",
+            "1: \u0391;",
+            "2: \u0392;",
+            "3: \u0393;",
+            "4: \u0394;",
+            "5: \u0395;",
+            "6: \u03DC;",
+            "7: \u0396;",
+            "8: \u0397;",
+            "9: \u0398;",
+            "10: \u0399[>>];",
+            "20: \u039A[>>];",
+            "30: \u039B[>>];",
+            "40: \u039C[>>];",
+            "50: \u039D[>>];",
+            "60: \u039E[>>];",
+            "70: \u039F[>>];",
+            "80: \u03A0[>>];",
+            "90: \u03DE[>>];",
+            "100: \u03A1[>>];",
+            "200: \u03A3[>>];",
+            "300: \u03A4[>>];",
+            "400: \u03A5[>>];",
+            "500: \u03A6[>>];",
+            "600: \u03A7[>>];",
+            "700: \u03A8[>>];",
+            "800: \u03A9[>>];",
+            "900: \u03E0[>>];",
+            "1000: \u0375\u0391[>>];",
+            "2000: \u0375\u0392[>>];",
+            "3000: \u0375\u0393[>>];",
+            "4000: \u0375\u0394[>>];",
+            "5000: \u0375\u0395[>>];",
+            "6000: \u0375\u03DC[>>];",
+            "7000: \u0375\u0396[>>];",
+            "8000: \u0375\u0397[>>];",
+            "9000: \u0375\u0398[>>];",
             "%hebrew:",
+            "-x: =#,##0=;",
             "0: \u05D0\u05E4\u05E1;",
             "1: \u05D0\u05F3;",
             "2: \u05D1\u05F3;",
@@ -318,18 +319,6 @@
             "3001: <%%hebrew_thousands<[>>];",
             "1000000: \u05D0\u05DC\u05E3 \u05D0\u05DC\u05E4\u05D9\u05DD;",
             "1000001: =#,##0=;",
-            "-x: =#,##0=;",
-            "%%hebrew_digit:",
-            "0: \u05D0\u05E4\u05E1;",
-            "1: \u05D0;",
-            "2: \u05D1;",
-            "3: \u05D2;",
-            "4: \u05D3;",
-            "5: \u05D4;",
-            "6: \u05D5;",
-            "7: \u05D6;",
-            "8: \u05D7;",
-            "9: \u05D8;",
             "%%hebrew_final:",
             "0: \u05D0\u05E4\u05E1;",
             "1: \u05F4\u05D0;",
@@ -362,6 +351,17 @@
             "81: \u05E4\u05F4[>%%hebrew_digit>];",
             "90: \u05F4\u05E6;",
             "91: \u05E6\u05F4[>%%hebrew_digit>];",
+            "%%hebrew_digit:",
+            "0: \u05D0\u05E4\u05E1;",
+            "1: \u05D0;",
+            "2: \u05D1;",
+            "3: \u05D2;",
+            "4: \u05D3;",
+            "5: \u05D4;",
+            "6: \u05D5;",
+            "7: \u05D6;",
+            "8: \u05D7;",
+            "9: \u05D8;",
             "%%hebrew_thousands:",
             "0: =%hebrew=;",
             "10: =%hebrew=;=%hebrew=\u05F3;",
@@ -378,6 +378,7 @@
             "300: =%hebrew=;=%hebrew=\u05F3;",
             "400: =%hebrew=;=%hebrew=\u05F3;",
             "%roman-lower:",
+            "-x: >>n;",
             "0: n;",
             "1: i;",
             "2: ii;",
@@ -411,8 +412,8 @@
             "3000: mmm[>>];",
             "4000: mmmm[>>];",
             "5000: =#,##0=;",
-            "-x: >>n;",
             "%roman-upper:",
+            "-x: >>N;",
             "0: N;",
             "1: I;",
             "2: II;",
@@ -463,8 +464,8 @@
             "200000: \u2188\u2188[>>];",
             "300000: \u2188\u2188\u2188[>>];",
             "400000: =#,##0=;",
-            "-x: >>N;",
             "%tamil:",
+            "-x: =#,##,##0=;",
             "0: \u0BE6;",
             "1: \u0BE7;",
             "2: \u0BE8;",
@@ -483,30 +484,29 @@
             "2000: <<\u0BF2[>>];",
             "1000000/100000: <<\u0BF1\u0BF2[>%%tamil_thousands>];",
             "100000000: =#,##,##0=;",
-            "-x: =#,##,##0=;",
             "%%tamil_thousands:",
             "0: =%tamil=;",
             "1000: <<\u0BF2[>>];",
         }
         OrdinalRules{
             "%digits-ordinal:",
+            "-x: \u2212>>;",
             "0: =#,##0=.;",
-            "-x: \u2212>>;",
         }
         SpelloutRules{
-            "%spellout-cardinal:",
-            "0: =#,##0.#=;",
+            "%spellout-numbering-year:",
             "-x: \u2212>>;",
+            "0: =#,###0.#=;",
             "%spellout-numbering:",
+            "-x: \u2212>>;",
             "0: =#,##0.#=;",
+            "%spellout-cardinal:",
             "-x: \u2212>>;",
-            "%spellout-numbering-year:",
-            "0: =#,###0.#=;",
+            "0: =#,##0.#=;",
+            "%spellout-ordinal:",
             "-x: \u2212>>;",
-            "%spellout-ordinal:",
             "0: =#,##0.#=.;",
-            "-x: \u2212>>;",
         }
     }
-    Version{"1.9"}
+    Version{"1.10"}
 }

Modified: trunk/source/data/rbnf/ru.txt
===================================================================
--- trunk/source/data/rbnf/ru.txt	2009-07-02 19:27:40 UTC (rev 211)
+++ trunk/source/data/rbnf/ru.txt	2009-07-02 19:28:39 UTC (rev 212)
@@ -14,11 +14,34 @@
         SpelloutRules{
             "%%lenient-parse:",
             "&[last primary ignorable ] << ' ' << ',' << '-' << '\u00AD';",
-            "%spellout-cardinal-feminine:",
+            "%spellout-numbering-year:",
+            "x.x: =#,###0.#=;",
+            "0: =%spellout-numbering=;",
+            "%spellout-numbering:",
+            "0: =%spellout-cardinal-masculine=;",
+            "%spellout-cardinal-masculine:",
+            "-x: \u043C\u0438\u043D\u0443\u0441 >>;",
+            "x.x: << \u0437\u0430\u043F\u044F\u0442\u0430\u044F >>;",
             "0: \u043D\u043E\u043B\u044C;",
-            "1: \u043E\u0434\u043D\u0430;",
-            "2: \u0434\u0432\u0435;",
-            "3: =%spellout-cardinal-masculine=;",
+            "1: \u043E\u0434\u0438\u043D;",
+            "2: \u0434\u0432\u0430;",
+            "3: \u0442\u0440\u0438;",
+            "4: \u0447\u0435\u0442\u044B\u0440\u0435;",
+            "5: \u043F\u044F\u0442\u044C;",
+            "6: \u0448\u0435\u0441\u0442\u044C;",
+            "7: \u0441\u0435\u043C\u044C;",
+            "8: \u0432\u043E\u0441\u0435\u043C\u044C;",
+            "9: \u0434\u0435\u0432\u044F\u0442\u044C;",
+            "10: \u0434\u0435\u0441\u044F\u0442\u044C;",
+            "11: \u043E\u0434\u0438\u043D\u043D\u0430\u0434\u0446\u0430\u0442\u044C;",
+            "12: \u0434\u0432\u0435\u043D\u0430\u0434\u0446\u0430\u0442\u044C;",
+            "13: \u0442\u0440\u0438\u043D\u0430\u0434\u0446\u0430\u0442\u044C;",
+            "14: \u0447\u0435\u0442\u044B\u0440\u043D\u0430\u0434\u0446\u0430\u0442\u044C;",
+            "15: \u043F\u044F\u0442\u043D\u0430\u0434\u0446\u0430\u0442\u044C;",
+            "16: \u0448\u0435\u0441\u0442\u043D\u0430\u0434\u0446\u0430\u0442\u044C;",
+            "17: \u0441\u0435\u043C\u043D\u0430\u0434\u0446\u0430\u0442\u044C;",
+            "18: \u0432\u043E\u0441\u0435\u043C\u043D\u0430\u0434\u0446\u0430\u0442\u044C;",
+            "19: \u0434\u0435\u0432\u044F\u0442\u043D\u0430\u0434\u0446\u0430\u0442\u044C;",
             "20: \u0434\u0432\u0430\u0434\u0446\u0430\u0442\u044C[ >>];",
             "30: \u0442\u0440\u0438\u0434\u0446\u0430\u0442\u044C[ >>];",
             "40: \u0441\u043E\u0440\u043E\u043A[ >>];",
@@ -47,29 +70,13 @@
             "2000000000000000: <%spellout-cardinal-masculine< \u0431\u0438\u043B\u043B\u0438\u0430\u0440\u0434\u044B[ >>];",
             "5000000000000000: <%spellout-cardinal-masculine< \u0431\u0438\u043B\u043B\u0438\u0430\u0440\u0434\u043E\u0432[ >>];",
             "1000000000000000000: =#,##0=;",
+            "%spellout-cardinal-neutre:",
             "-x: \u043C\u0438\u043D\u0443\u0441 >>;",
             "x.x: << \u0437\u0430\u043F\u044F\u0442\u0430\u044F >>;",
-            "%spellout-cardinal-masculine:",
             "0: \u043D\u043E\u043B\u044C;",
-            "1: \u043E\u0434\u0438\u043D;",
+            "1: \u043E\u0434\u043D\u043E;",
             "2: \u0434\u0432\u0430;",
-            "3: \u0442\u0440\u0438;",
-            "4: \u0447\u0435\u0442\u044B\u0440\u0435;",
-            "5: \u043F\u044F\u0442\u044C;",
-            "6: \u0448\u0435\u0441\u0442\u044C;",
-            "7: \u0441\u0435\u043C\u044C;",
-            "8: \u0432\u043E\u0441\u0435\u043C\u044C;",
-            "9: \u0434\u0435\u0432\u044F\u0442\u044C;",
-            "10: \u0434\u0435\u0441\u044F\u0442\u044C;",
-            "11: \u043E\u0434\u0438\u043D\u043D\u0430\u0434\u0446\u0430\u0442\u044C;",
-            "12: \u0434\u0432\u0435\u043D\u0430\u0434\u0446\u0430\u0442\u044C;",
-            "13: \u0442\u0440\u0438\u043D\u0430\u0434\u0446\u0430\u0442\u044C;",
-            "14: \u0447\u0435\u0442\u044B\u0440\u043D\u0430\u0434\u0446\u0430\u0442\u044C;",
-            "15: \u043F\u044F\u0442\u043D\u0430\u0434\u0446\u0430\u0442\u044C;",
-            "16: \u0448\u0435\u0441\u0442\u043D\u0430\u0434\u0446\u0430\u0442\u044C;",
-            "17: \u0441\u0435\u043C\u043D\u0430\u0434\u0446\u0430\u0442\u044C;",
-            "18: \u0432\u043E\u0441\u0435\u043C\u043D\u0430\u0434\u0446\u0430\u0442\u044C;",
-            "19: \u0434\u0435\u0432\u044F\u0442\u043D\u0430\u0434\u0446\u0430\u0442\u044C;",
+            "3: =%spellout-cardinal-masculine=;",
             "20: \u0434\u0432\u0430\u0434\u0446\u0430\u0442\u044C[ >>];",
             "30: \u0442\u0440\u0438\u0434\u0446\u0430\u0442\u044C[ >>];",
             "40: \u0441\u043E\u0440\u043E\u043A[ >>];",
@@ -98,12 +105,12 @@
             "2000000000000000: <%spellout-cardinal-masculine< \u0431\u0438\u043B\u043B\u0438\u0430\u0440\u0434\u044B[ >>];",
             "5000000000000000: <%spellout-cardinal-masculine< \u0431\u0438\u043B\u043B\u0438\u0430\u0440\u0434\u043E\u0432[ >>];",
             "1000000000000000000: =#,##0=;",
+            "%spellout-cardinal-feminine:",
             "-x: \u043C\u0438\u043D\u0443\u0441 >>;",
             "x.x: << \u0437\u0430\u043F\u044F\u0442\u0430\u044F >>;",
-            "%spellout-cardinal-neutre:",
             "0: \u043D\u043E\u043B\u044C;",
-            "1: \u043E\u0434\u043D\u043E;",
-            "2: \u0434\u0432\u0430;",
+            "1: \u043E\u0434\u043D\u0430;",
+            "2: \u0434\u0432\u0435;",
             "3: =%spellout-cardinal-masculine=;",
             "20: \u0434\u0432\u0430\u0434\u0446\u0430\u0442\u044C[ >>];",
             "30: \u0442\u0440\u0438\u0434\u0446\u0430\u0442\u044C[ >>];",
@@ -133,14 +140,7 @@
             "2000000000000000: <%spellout-cardinal-masculine< \u0431\u0438\u043B\u043B\u0438\u0430\u0440\u0434\u044B[ >>];",
             "5000000000000000: <%spellout-cardinal-masculine< \u0431\u0438\u043B\u043B\u0438\u0430\u0440\u0434\u043E\u0432[ >>];",
             "1000000000000000000: =#,##0=;",
-            "-x: \u043C\u0438\u043D\u0443\u0441 >>;",
-            "x.x: << \u0437\u0430\u043F\u044F\u0442\u0430\u044F >>;",
-            "%spellout-numbering:",
-            "0: =%spellout-cardinal-masculine=;",
-            "%spellout-numbering-year:",
-            "0: =%spellout-numbering=;",
-            "x.x: =#,###0.#=;",
         }
     }
-    Version{"1.5"}
+    Version{"1.6"}
 }

Modified: trunk/source/data/rbnf/sk.txt
===================================================================
--- trunk/source/data/rbnf/sk.txt	2009-07-02 19:27:40 UTC (rev 211)
+++ trunk/source/data/rbnf/sk.txt	2009-07-02 19:28:39 UTC (rev 212)
@@ -12,33 +12,14 @@
 sk{
     RBNFRules{
         SpelloutRules{
-            "%spellout-cardinal-feminine:",
-            "0: nula;",
-            "1: jedna;",
-            "2: dve;",
-            "3: =%spellout-cardinal-masculine=;",
-            "20: dvasa\u0165[\u00AD>>];",
-            "30: trisa\u0165[\u00AD>>];",
-            "40: \u0161tyridsa\u0165[\u00AD>>];",
-            "50: <<desiat[\u00AD>>];",
-            "100: <%spellout-cardinal-feminine<\u00ADsto[ >>];",
-            "1000: <%spellout-cardinal-feminine< tis\u00EDc[ >>];",
-            "1000000: <%spellout-cardinal-masculine< mili\u00F3n[ >>];",
-            "2000000: <%spellout-cardinal-masculine< mili\u00F3ny[ >>];",
-            "5000000: <%spellout-cardinal-masculine< mili\u00F3nov[ >>];",
-            "1000000000: <%spellout-cardinal-masculine< miliarda[ >>];",
-            "2000000000: <%spellout-cardinal-masculine< miliardy[ >>];",
-            "5000000000: <%spellout-cardinal-masculine< miliardov[ >>];",
-            "1000000000000: <%spellout-cardinal-masculine< bili\u00F3n[ >>];",
-            "2000000000000: <%spellout-cardinal-masculine< bili\u00F3ny[ >>];",
-            "5000000000000: <%spellout-cardinal-masculine< bili\u00F3nov[ >>];",
-            "1000000000000000: <%spellout-cardinal-masculine< biliarda[ >>];",
-            "2000000000000000: <%spellout-cardinal-masculine< biliardy[ >>];",
-            "5000000000000000: <%spellout-cardinal-masculine< biliardov[ >>];",
-            "1000000000000000000: =#,##0=;",
+            "%spellout-numbering-year:",
+            "x.x: =#,###0.#=;",
+            "0: =%spellout-numbering=;",
+            "%spellout-numbering:",
+            "0: =%spellout-cardinal-masculine=;",
+            "%spellout-cardinal-masculine:",
             "-x: minus >>;",
             "x.x: << \u010Diarka >>;",
-            "%spellout-cardinal-masculine:",
             "0: nula;",
             "1: jeden;",
             "2: dva;",
@@ -78,9 +59,9 @@
             "2000000000000000: <%spellout-cardinal-masculine< biliardy[ >>];",
             "5000000000000000: <%spellout-cardinal-masculine< biliardov[ >>];",
             "1000000000000000000: =#,##0=;",
+            "%spellout-cardinal-neutre:",
             "-x: minus >>;",
             "x.x: << \u010Diarka >>;",
-            "%spellout-cardinal-neutre:",
             "0: nula;",
             "1: jedno;",
             "2: dve;",
@@ -104,14 +85,33 @@
             "2000000000000000: <%spellout-cardinal-masculine< biliardy[ >>];",
             "5000000000000000: <%spellout-cardinal-masculine< biliardov[ >>];",
             "1000000000000000000: =#,##0=;",
+            "%spellout-cardinal-feminine:",
             "-x: minus >>;",
             "x.x: << \u010Diarka >>;",
-            "%spellout-numbering:",
-            "0: =%spellout-cardinal-masculine=;",
-            "%spellout-numbering-year:",
-            "0: =%spellout-numbering=;",
-            "x.x: =#,###0.#=;",
+            "0: nula;",
+            "1: jedna;",
+            "2: dve;",
+            "3: =%spellout-cardinal-masculine=;",
+            "20: dvasa\u0165[\u00AD>>];",
+            "30: trisa\u0165[\u00AD>>];",
+            "40: \u0161tyridsa\u0165[\u00AD>>];",
+            "50: <<desiat[\u00AD>>];",
+            "100: <%spellout-cardinal-feminine<\u00ADsto[ >>];",
+            "1000: <%spellout-cardinal-feminine< tis\u00EDc[ >>];",
+            "1000000: <%spellout-cardinal-masculine< mili\u00F3n[ >>];",
+            "2000000: <%spellout-cardinal-masculine< mili\u00F3ny[ >>];",
+            "5000000: <%spellout-cardinal-masculine< mili\u00F3nov[ >>];",
+            "1000000000: <%spellout-cardinal-masculine< miliarda[ >>];",
+            "2000000000: <%spellout-cardinal-masculine< miliardy[ >>];",
+            "5000000000: <%spellout-cardinal-masculine< miliardov[ >>];",
+            "1000000000000: <%spellout-cardinal-masculine< bili\u00F3n[ >>];",
+            "2000000000000: <%spellout-cardinal-masculine< bili\u00F3ny[ >>];",
+            "5000000000000: <%spellout-cardinal-masculine< bili\u00F3nov[ >>];",
+            "1000000000000000: <%spellout-cardinal-masculine< biliarda[ >>];",
+            "2000000000000000: <%spellout-cardinal-masculine< biliardy[ >>];",
+            "5000000000000000: <%spellout-cardinal-masculine< biliardov[ >>];",
+            "1000000000000000000: =#,##0=;",
         }
     }
-    Version{"1.5"}
+    Version{"1.6"}
 }

Modified: trunk/source/data/rbnf/sl.txt
===================================================================
--- trunk/source/data/rbnf/sl.txt	2009-07-02 19:27:40 UTC (rev 211)
+++ trunk/source/data/rbnf/sl.txt	2009-07-02 19:28:39 UTC (rev 212)
@@ -12,11 +12,34 @@
 sl{
     RBNFRules{
         SpelloutRules{
-            "%spellout-cardinal-feminine:",
+            "%spellout-numbering-year:",
+            "x.x: =#,###0.#=;",
+            "0: =%spellout-numbering=;",
+            "%spellout-numbering:",
+            "0: =%spellout-cardinal-masculine=;",
+            "%spellout-cardinal-masculine:",
+            "-x: minus >>;",
+            "x.x: << vejica >>;",
             "0: ni\u010D;",
             "1: ena;",
-            "2: dvije;",
-            "3: =%spellout-cardinal-masculine=;",
+            "2: dva;",
+            "3: tri;",
+            "4: \u0161tiri;",
+            "5: pet;",
+            "6: \u0161est;",
+            "7: sedem;",
+            "8: osem;",
+            "9: devet;",
+            "10: deset;",
+            "11: enajst;",
+            "12: dvanajst;",
+            "13: trinajst;",
+            "14: \u0161trinajst;",
+            "15: petnajst;",
+            "16: \u0161estnajst;",
+            "17: sedemnajst;",
+            "18: asemnajst;",
+            "19: devetnajst;",
             "20: dvaset[ >>];",
             "30: <<deset[ >>];",
             "100: sto[ >>];",
@@ -44,29 +67,13 @@
             "2000000000000000: <%spellout-cardinal-masculine< biliardy[ >>];",
             "5000000000000000: <%spellout-cardinal-masculine< biliarda[ >>];",
             "1000000000000000000: =#,##0=;",
+            "%spellout-cardinal-neutre:",
             "-x: minus >>;",
             "x.x: << vejica >>;",
-            "%spellout-cardinal-masculine:",
             "0: ni\u010D;",
             "1: ena;",
-            "2: dva;",
-            "3: tri;",
-            "4: \u0161tiri;",
-            "5: pet;",
-            "6: \u0161est;",
-            "7: sedem;",
-            "8: osem;",
-            "9: devet;",
-            "10: deset;",
-            "11: enajst;",
-            "12: dvanajst;",
-            "13: trinajst;",
-            "14: \u0161trinajst;",
-            "15: petnajst;",
-            "16: \u0161estnajst;",
-            "17: sedemnajst;",
-            "18: asemnajst;",
-            "19: devetnajst;",
+            "2: dve;",
+            "3: =%spellout-cardinal-masculine=;",
             "20: dvaset[ >>];",
             "30: <<deset[ >>];",
             "100: sto[ >>];",
@@ -94,12 +101,12 @@
             "2000000000000000: <%spellout-cardinal-masculine< biliardy[ >>];",
             "5000000000000000: <%spellout-cardinal-masculine< biliarda[ >>];",
             "1000000000000000000: =#,##0=;",
+            "%spellout-cardinal-feminine:",
             "-x: minus >>;",
             "x.x: << vejica >>;",
-            "%spellout-cardinal-neutre:",
             "0: ni\u010D;",
             "1: ena;",
-            "2: dve;",
+            "2: dvije;",
             "3: =%spellout-cardinal-masculine=;",
             "20: dvaset[ >>];",
             "30: <<deset[ >>];",
@@ -128,14 +135,7 @@
             "2000000000000000: <%spellout-cardinal-masculine< biliardy[ >>];",
             "5000000000000000: <%spellout-cardinal-masculine< biliarda[ >>];",
             "1000000000000000000: =#,##0=;",
-            "-x: minus >>;",
-            "x.x: << vejica >>;",
-            "%spellout-numbering:",
-            "0: =%spellout-cardinal-masculine=;",
-            "%spellout-numbering-year:",
-            "0: =%spellout-numbering=;",
-            "x.x: =#,###0.#=;",
         }
     }
-    Version{"1.1"}
+    Version{"1.2"}
 }

Modified: trunk/source/data/rbnf/sq.txt
===================================================================
--- trunk/source/data/rbnf/sq.txt	2009-07-02 19:27:40 UTC (rev 211)
+++ trunk/source/data/rbnf/sq.txt	2009-07-02 19:28:39 UTC (rev 212)
@@ -12,12 +12,26 @@
 sq{
     RBNFRules{
         SpelloutRules{
-            "%spellout-cardinal-feminine:",
+            "%spellout-numbering-year:",
+            "x.x: =#,###0.#=;",
+            "0: =%spellout-numbering=;",
+            "%spellout-numbering:",
+            "0: =%spellout-cardinal-masculine=;",
+            "%spellout-cardinal-masculine:",
+            "-x: minus >>;",
+            "x.x: << presje >>;",
             "0: zero;",
             "1: nj\u00EB;",
             "2: dy;",
-            "3: tri;",
-            "4: =%spellout-cardinal-masculine=;",
+            "3: tre;",
+            "4: kat\u00EBr;",
+            "5: pes\u00EB;",
+            "6: gjasht\u00EB;",
+            "7: shtat\u00EB;",
+            "8: tet\u00EB;",
+            "9: n\u00EBnt\u00EB;",
+            "10: dhjet\u00EB;",
+            "11: >%spellout-cardinal-masculine>mb\u00EBdhjet\u00EB;",
             "20: nj\u00EBzet[ e >>];",
             "30: tridhjet\u00EB[ e >>];",
             "40: dyzet[ e >>];",
@@ -33,21 +47,14 @@
             "1000000000000000: nj\u00EB biliar[ e >>];",
             "2000000000000000: <%spellout-cardinal-feminine< biliar\u00EB[ e >>];",
             "1000000000000000000: =#,##0=;",
+            "%spellout-cardinal-feminine:",
             "-x: minus >>;",
             "x.x: << presje >>;",
-            "%spellout-cardinal-masculine:",
             "0: zero;",
             "1: nj\u00EB;",
             "2: dy;",
-            "3: tre;",
-            "4: kat\u00EBr;",
-            "5: pes\u00EB;",
-            "6: gjasht\u00EB;",
-            "7: shtat\u00EB;",
-            "8: tet\u00EB;",
-            "9: n\u00EBnt\u00EB;",
-            "10: dhjet\u00EB;",
-            "11: >%spellout-cardinal-masculine>mb\u00EBdhjet\u00EB;",
+            "3: tri;",
+            "4: =%spellout-cardinal-masculine=;",
             "20: nj\u00EBzet[ e >>];",
             "30: tridhjet\u00EB[ e >>];",
             "40: dyzet[ e >>];",
@@ -63,14 +70,7 @@
             "1000000000000000: nj\u00EB biliar[ e >>];",
             "2000000000000000: <%spellout-cardinal-feminine< biliar\u00EB[ e >>];",
             "1000000000000000000: =#,##0=;",
-            "-x: minus >>;",
-            "x.x: << presje >>;",
-            "%spellout-numbering:",
-            "0: =%spellout-cardinal-masculine=;",
-            "%spellout-numbering-year:",
-            "0: =%spellout-numbering=;",
-            "x.x: =#,###0.#=;",
         }
     }
-    Version{"1.4"}
+    Version{"1.5"}
 }

Modified: trunk/source/data/rbnf/sr.txt
===================================================================
--- trunk/source/data/rbnf/sr.txt	2009-07-02 19:27:40 UTC (rev 211)
+++ trunk/source/data/rbnf/sr.txt	2009-07-02 19:28:39 UTC (rev 212)
@@ -14,39 +14,14 @@
         SpelloutRules{
             "%%lenient-parse:",
             "&[last primary ignorable ] << ' ' << ',' << '-' << '\u00AD';",
-            "%%ordi:",
-            "0: \u0438;",
-            "1: ' \u0438 =%spellout-ordinal=;",
-            "%%ordti:",
-            "0: \u0442\u0438;",
-            "1: ' =%spellout-ordinal=;",
-            "%spellout-cardinal-feminine:",
-            "0: \u043D\u0443\u043B\u0430;",
-            "1: \u0458\u0435\u0434\u043D\u0430;",
-            "2: \u0434\u0432\u0435;",
-            "3: =%spellout-cardinal-masculine=;",
-            "20: \u0434\u0432\u0430\u0434\u0435\u0441\u0435\u0442[ \u0438 >>];",
-            "30: \u0442\u0440\u0438\u0434\u0435\u0441\u0435\u0442[ \u0438 >>];",
-            "40: \u0447\u0435\u0442\u0440\u0434\u0435\u0441\u0435\u0442[ \u0438 >>];",
-            "50: \u043F\u0435\u0434\u0435\u0441\u0435\u0442[ \u0438 >>];",
-            "60: \u0448\u0435\u0437\u0434\u0435\u0441\u0435\u0442[ \u0438 >>];",
-            "70: \u0441\u0435\u0434\u0430\u043C\u0434\u0435\u0441\u0435\u0442[ \u0438 >>];",
-            "80: \u043E\u0441\u0430\u043C\u0434\u0435\u0441\u0435\u0442[ \u0438 >>];",
-            "90: \u0434\u0435\u0432\u0435\u0434\u0435\u0441\u0435\u0442[ \u0438 >>];",
-            "100: \u0441\u0442\u043E[ >>];",
-            "200: \u0434\u0432\u0435\u0441\u0442\u0430[ >>];",
-            "300: \u0442\u0440\u0438\u0441\u0442\u0430[ >>];",
-            "400: <%spellout-cardinal-feminine<\u0441\u0442\u043E[ >>];",
-            "1000: <%spellout-cardinal-feminine< \u0445\u0438\u0459\u0430\u0434\u0443[ >>];",
-            "2000: <%spellout-cardinal-feminine< \u0445\u0438\u0459\u0430\u0434\u0430[ >>];",
-            "1000000: <%spellout-cardinal-masculine< \u043C\u0438\u043B\u0438\u043E\u043D[ >>];",
-            "1000000000: <%spellout-cardinal-masculine< \u043C\u0438\u043B\u0438\u0458\u0430\u0440\u0434\u0430[ >>];",
-            "1000000000000: <%spellout-cardinal-masculine< \u0431\u0438\u043B\u0438\u043E\u043D[ >>];",
-            "1000000000000000: <%spellout-cardinal-masculine< \u0431\u0438\u043B\u0438\u0458\u0430\u0440\u0434\u0430[ >>];",
-            "1000000000000000000: =#,##0=;",
+            "%spellout-numbering-year:",
+            "x.x: =#,###0.#=;",
+            "0: =%spellout-numbering=;",
+            "%spellout-numbering:",
+            "0: =%spellout-cardinal-masculine=;",
+            "%spellout-cardinal-masculine:",
             "-x: \u043C\u0438\u043D\u0443\u0441 >>;",
             "x.x: << \u043A\u043E\u043C\u0430 >>;",
-            "%spellout-cardinal-masculine:",
             "0: \u043D\u0443\u043B\u0430;",
             "1: \u0458\u0435\u0434\u0430\u043D;",
             "2: \u0434\u0432\u0430;",
@@ -86,9 +61,9 @@
             "1000000000000: <%spellout-cardinal-masculine< \u0431\u0438\u043B\u0438\u043E\u043D[ >>];",
             "1000000000000000: <%spellout-cardinal-masculine< \u0431\u0438\u043B\u0438\u0458\u0430\u0440\u0434\u0430[ >>];",
             "1000000000000000000: =#,##0=;",
+            "%spellout-cardinal-neutre:",
             "-x: \u043C\u0438\u043D\u0443\u0441 >>;",
             "x.x: << \u043A\u043E\u043C\u0430 >>;",
-            "%spellout-cardinal-neutre:",
             "0: \u043D\u0443\u043B\u0430;",
             "1: \u0458\u0435\u0434\u043D\u043E;",
             "2: \u0434\u0432\u0430;",
@@ -112,14 +87,41 @@
             "1000000000000: <%spellout-cardinal-masculine< \u0431\u0438\u043B\u0438\u043E\u043D[ >>];",
             "1000000000000000: <%spellout-cardinal-masculine< \u0431\u0438\u043B\u0438\u0458\u0430\u0440\u0434\u0430[ >>];",
             "1000000000000000000: =#,##0=;",
+            "%spellout-cardinal-feminine:",
             "-x: \u043C\u0438\u043D\u0443\u0441 >>;",
             "x.x: << \u043A\u043E\u043C\u0430 >>;",
-            "%spellout-numbering:",
-            "0: =%spellout-cardinal-masculine=;",
-            "%spellout-numbering-year:",
-            "0: =%spellout-numbering=;",
-            "x.x: =#,###0.#=;",
+            "0: \u043D\u0443\u043B\u0430;",
+            "1: \u0458\u0435\u0434\u043D\u0430;",
+            "2: \u0434\u0432\u0435;",
+            "3: =%spellout-cardinal-masculine=;",
+            "20: \u0434\u0432\u0430\u0434\u0435\u0441\u0435\u0442[ \u0438 >>];",
+            "30: \u0442\u0440\u0438\u0434\u0435\u0441\u0435\u0442[ \u0438 >>];",
+            "40: \u0447\u0435\u0442\u0440\u0434\u0435\u0441\u0435\u0442[ \u0438 >>];",
+            "50: \u043F\u0435\u0434\u0435\u0441\u0435\u0442[ \u0438 >>];",
+            "60: \u0448\u0435\u0437\u0434\u0435\u0441\u0435\u0442[ \u0438 >>];",
+            "70: \u0441\u0435\u0434\u0430\u043C\u0434\u0435\u0441\u0435\u0442[ \u0438 >>];",
+            "80: \u043E\u0441\u0430\u043C\u0434\u0435\u0441\u0435\u0442[ \u0438 >>];",
+            "90: \u0434\u0435\u0432\u0435\u0434\u0435\u0441\u0435\u0442[ \u0438 >>];",
+            "100: \u0441\u0442\u043E[ >>];",
+            "200: \u0434\u0432\u0435\u0441\u0442\u0430[ >>];",
+            "300: \u0442\u0440\u0438\u0441\u0442\u0430[ >>];",
+            "400: <%spellout-cardinal-feminine<\u0441\u0442\u043E[ >>];",
+            "1000: <%spellout-cardinal-feminine< \u0445\u0438\u0459\u0430\u0434\u0443[ >>];",
+            "2000: <%spellout-cardinal-feminine< \u0445\u0438\u0459\u0430\u0434\u0430[ >>];",
+            "1000000: <%spellout-cardinal-masculine< \u043C\u0438\u043B\u0438\u043E\u043D[ >>];",
+            "1000000000: <%spellout-cardinal-masculine< \u043C\u0438\u043B\u0438\u0458\u0430\u0440\u0434\u0430[ >>];",
+            "1000000000000: <%spellout-cardinal-masculine< \u0431\u0438\u043B\u0438\u043E\u043D[ >>];",
+            "1000000000000000: <%spellout-cardinal-masculine< \u0431\u0438\u043B\u0438\u0458\u0430\u0440\u0434\u0430[ >>];",
+            "1000000000000000000: =#,##0=;",
+            "%%ordi:",
+            "0: \u0438;",
+            "1: ' \u0438 =%spellout-ordinal=;",
+            "%%ordti:",
+            "0: \u0442\u0438;",
+            "1: ' =%spellout-ordinal=;",
             "%spellout-ordinal:",
+            "-x: \u043C\u0438\u043D\u0443\u0441 >>;",
+            "x.x: =#,##0.#=;",
             "0: \u043D\u0443\u043B\u0442\u0438;",
             "1: \u043F\u0440\u0432\u0438;",
             "2: \u0434\u0440\u0443\u0433\u0438;",
@@ -152,9 +154,7 @@
             "200: \u0434\u0432\u0435\u0441\u0442\u0430>%%ordti>;",
             "300: \u0442\u0440\u0438\u0441\u0442\u0430>%%ordti>;",
             "400: <%spellout-cardinal-feminine<\u0441\u0442\u043E>%%ordti>;",
-            "-x: \u043C\u0438\u043D\u0443\u0441 >>;",
-            "x.x: =#,##0.#=;",
         }
     }
-    Version{"1.1"}
+    Version{"1.2"}
 }

Modified: trunk/source/data/rbnf/sr_Latn.txt
===================================================================
--- trunk/source/data/rbnf/sr_Latn.txt	2009-07-02 19:27:40 UTC (rev 211)
+++ trunk/source/data/rbnf/sr_Latn.txt	2009-07-02 19:28:39 UTC (rev 212)
@@ -12,11 +12,34 @@
 sr_Latn{
     RBNFRules{
         SpelloutRules{
-            "%spellout-cardinal-feminine:",
+            "%spellout-numbering-year:",
+            "x.x: =#,###0.#=;",
+            "0: =%spellout-numbering=;",
+            "%spellout-numbering:",
+            "0: =%spellout-cardinal-masculine=;",
+            "%spellout-cardinal-masculine:",
+            "-x: minus >>;",
+            "x.x: << zarez >>;",
             "0: nula;",
-            "1: jedinica;",
-            "2: dve;",
-            "3: =%spellout-cardinal-masculine=;",
+            "1: jedan;",
+            "2: dva;",
+            "3: tri;",
+            "4: \u010Detiri;",
+            "5: pet;",
+            "6: \u0161est;",
+            "7: sedam;",
+            "8: osam;",
+            "9: devet;",
+            "10: deset;",
+            "11: jedenaest;",
+            "12: dvanaest;",
+            "13: trinaest;",
+            "14: \u010Detrnaest;",
+            "15: petnaest;",
+            "16: \u0161estnaest;",
+            "17: sedamnaest;",
+            "18: osamnaest;",
+            "19: devetnaest;",
             "20: dvadeset[ >>];",
             "30: trideset[ >>];",
             "40: \u010Detrdeset[ >>];",
@@ -35,7 +58,7 @@
             "800: osamsto[ >>];",
             "900: devetsto[ >>];",
             "1000: tisu\u0107u[ >>];",
-            "2000: <%spellout-cardinal-feminine< tisu\u0107e[ >>];",
+            "2000: <%spellout-cardinal-feminine< tisu\u0107a[ >>];",
             "5000: <%spellout-cardinal-feminine< tisu\u0107u[ >>];",
             "1000000: <%spellout-cardinal-masculine< milijun[ >>];",
             "2000000: <%spellout-cardinal-masculine< milijuny[ >>];",
@@ -50,29 +73,13 @@
             "2000000000000000: <%spellout-cardinal-masculine< biliardy[ >>];",
             "5000000000000000: <%spellout-cardinal-masculine< biliarda[ >>];",
             "1000000000000000000: =#,##0=;",
+            "%spellout-cardinal-neutre:",
             "-x: minus >>;",
             "x.x: << zarez >>;",
-            "%spellout-cardinal-masculine:",
             "0: nula;",
-            "1: jedan;",
+            "1: jedno;",
             "2: dva;",
-            "3: tri;",
-            "4: \u010Detiri;",
-            "5: pet;",
-            "6: \u0161est;",
-            "7: sedam;",
-            "8: osam;",
-            "9: devet;",
-            "10: deset;",
-            "11: jedenaest;",
-            "12: dvanaest;",
-            "13: trinaest;",
-            "14: \u010Detrnaest;",
-            "15: petnaest;",
-            "16: \u0161estnaest;",
-            "17: sedamnaest;",
-            "18: osamnaest;",
-            "19: devetnaest;",
+            "3: =%spellout-cardinal-masculine=;",
             "20: dvadeset[ >>];",
             "30: trideset[ >>];",
             "40: \u010Detrdeset[ >>];",
@@ -91,7 +98,7 @@
             "800: osamsto[ >>];",
             "900: devetsto[ >>];",
             "1000: tisu\u0107u[ >>];",
-            "2000: <%spellout-cardinal-feminine< tisu\u0107a[ >>];",
+            "2000: <%spellout-cardinal-feminine< tisu\u0107e[ >>];",
             "5000: <%spellout-cardinal-feminine< tisu\u0107u[ >>];",
             "1000000: <%spellout-cardinal-masculine< milijun[ >>];",
             "2000000: <%spellout-cardinal-masculine< milijuny[ >>];",
@@ -106,12 +113,12 @@
             "2000000000000000: <%spellout-cardinal-masculine< biliardy[ >>];",
             "5000000000000000: <%spellout-cardinal-masculine< biliarda[ >>];",
             "1000000000000000000: =#,##0=;",
+            "%spellout-cardinal-feminine:",
             "-x: minus >>;",
             "x.x: << zarez >>;",
-            "%spellout-cardinal-neutre:",
             "0: nula;",
-            "1: jedno;",
-            "2: dva;",
+            "1: jedinica;",
+            "2: dve;",
             "3: =%spellout-cardinal-masculine=;",
             "20: dvadeset[ >>];",
             "30: trideset[ >>];",
@@ -146,14 +153,7 @@
             "2000000000000000: <%spellout-cardinal-masculine< biliardy[ >>];",
             "5000000000000000: <%spellout-cardinal-masculine< biliarda[ >>];",
             "1000000000000000000: =#,##0=;",
-            "-x: minus >>;",
-            "x.x: << zarez >>;",
-            "%spellout-numbering:",
-            "0: =%spellout-cardinal-masculine=;",
-            "%spellout-numbering-year:",
-            "0: =%spellout-numbering=;",
-            "x.x: =#,###0.#=;",
         }
     }
-    Version{"1.1"}
+    Version{"1.2"}
 }

Modified: trunk/source/data/rbnf/sv.txt
===================================================================
--- trunk/source/data/rbnf/sv.txt	2009-07-02 19:27:40 UTC (rev 211)
+++ trunk/source/data/rbnf/sv.txt	2009-07-02 19:28:39 UTC (rev 212)
@@ -12,92 +12,40 @@
 sv{
     RBNFRules{
         OrdinalRules{
-            "%digits-ordinal:",
-            "0: =%digits-ordinal-masculine=;",
-            "%digits-ordinal-feminine:",
-            "0: =#,##0==%%dord-femabbrev=;",
+            "%digits-ordinal-masculine:",
             "-x: \u2212>>;",
-            "%digits-ordinal-masculine:",
             "0: =#,##0==%%dord-mascabbrev=;",
-            "-x: \u2212>>;",
+            "%%dord-mascabbrev:",
+            "0: :e",
             "%digits-ordinal-neutre:",
             "0: =%digits-ordinal-feminine=;",
             "%digits-ordinal-reale:",
             "0: =%digits-ordinal-feminine=;",
+            "%digits-ordinal-feminine:",
+            "-x: \u2212>>;",
+            "0: =#,##0==%%dord-femabbrev=;",
             "%%dord-femabbrev:",
-            "0: :e",
-            "1: :a",
-            "2: :a",
-            "3: :e",
+            "0: :e;",
+            "1: :a;",
+            "2: :a;",
+            "3: :e;",
             "20: >>;",
             "100: >>;",
-            "%%dord-mascabbrev:",
-            "0: :e",
+            "%digits-ordinal:",
+            "0: =%digits-ordinal-masculine=;",
         }
         SpelloutRules{
             "%%lenient-parse:",
             "&[last primary ignorable ] << ' ' << ',' << '-' << '\u00AD';",
-            "%%ord-fem-de:",
-            "0: de;",
-            "1: ' =%spellout-ordinal-feminine=;",
-            "%%ord-fem-nde:",
-            "0: nde;",
-            "1: \u00AD=%spellout-ordinal-feminine=;",
-            "%%ord-fem-te:",
-            "0: te;",
-            "1: ' =%spellout-ordinal-feminine=;",
-            "%%ord-fem-teer:",
-            "0: te;",
-            "1: er =%spellout-ordinal-feminine=;",
-            "%%ord-masc-de:",
-            "0: de;",
-            "1: ' =%spellout-ordinal-masculine=;",
-            "%%ord-masc-nde:",
-            "0: nde;",
-            "1: \u00AD=%spellout-ordinal-masculine=;",
-            "%%ord-masc-te:",
-            "0: te;",
-            "1: ' =%spellout-ordinal-masculine=;",
-            "%%ord-masc-teer:",
-            "0: te;",
-            "1: er =%spellout-ordinal-masculine=;",
-            "%spellout-cardinal-feminine:",
-            "0: =%spellout-cardinal-reale=;",
-            "%spellout-cardinal-masculine:",
-            "0: =%spellout-cardinal-reale=;",
-            "%spellout-cardinal-neutre:",
-            "0: noll;",
-            "1: ett;",
-            "2: =%spellout-cardinal-reale=;",
+            "%spellout-numbering-year:",
             "-x: minus >>;",
-            "x.x: << komma >>;",
-            "%spellout-cardinal-reale:",
-            "0: noll;",
-            "1: en;",
-            "2: =%spellout-numbering=;",
-            "20: tjugo[\u00AD>>];",
-            "30: trettio[\u00AD>>];",
-            "40: fyrtio[\u00AD>>];",
-            "50: femtio[\u00AD>>];",
-            "60: sextio[\u00AD>>];",
-            "70: sjuttio[\u00AD>>];",
-            "80: \u00E5ttio[\u00AD>>];",
-            "90: nittio[\u00AD>>];",
-            "100: <%spellout-cardinal-neutre<\u00ADhundra[\u00AD>>];",
-            "1000: ettusen[ >>];",
-            "2000: <%spellout-cardinal-reale<\u00ADtusen[ >>];",
-            "1000000: en miljon[ >>];",
-            "2000000: <%spellout-cardinal-reale< miljoner[ >>];",
-            "1000000000: en miljard[ >>];",
-            "2000000000: <%spellout-cardinal-reale< miljarder[ >>];",
-            "1000000000000: en biljon[ >>];",
-            "2000000000000: <%spellout-cardinal-reale< biljoner[ >>];",
-            "1000000000000000: en biljard[ >>];",
-            "2000000000000000: <%spellout-cardinal-reale< biljarder[ >>];",
-            "1000000000000000000: =#,##0=;",
+            "x.x: =#,###0.#=;",
+            "0: =%spellout-numbering=;",
+            "1100/100: <<\u00ADhundra[\u00AD>>];",
+            "10000: =%spellout-numbering=;",
+            "%spellout-numbering:",
             "-x: minus >>;",
             "x.x: << komma >>;",
-            "%spellout-numbering:",
             "0: noll;",
             "1: ett;",
             "2: tv\u00E5;",
@@ -139,17 +87,45 @@
             "1000000000000000: en biljard[ >>];",
             "2000000000000000: <%spellout-cardinal-reale< biljarder[ >>];",
             "1000000000000000000: =#,##0=;",
+            "%spellout-cardinal-neutre:",
             "-x: minus >>;",
             "x.x: << komma >>;",
-            "%spellout-numbering-year:",
-            "0: =%spellout-numbering=;",
-            "1100/100: <<\u00ADhundra[\u00AD>>];",
-            "10000: =%spellout-numbering=;",
+            "0: noll;",
+            "1: ett;",
+            "2: =%spellout-cardinal-reale=;",
+            "%spellout-cardinal-masculine:",
+            "0: =%spellout-cardinal-reale=;",
+            "%spellout-cardinal-feminine:",
+            "0: =%spellout-cardinal-reale=;",
+            "%spellout-cardinal-reale:",
             "-x: minus >>;",
-            "x.x: =#,###0.#=;",
-            "%spellout-ordinal-feminine:",
-            "0: =%spellout-ordinal-neutre=;",
+            "x.x: << komma >>;",
+            "0: noll;",
+            "1: en;",
+            "2: =%spellout-numbering=;",
+            "20: tjugo[\u00AD>>];",
+            "30: trettio[\u00AD>>];",
+            "40: fyrtio[\u00AD>>];",
+            "50: femtio[\u00AD>>];",
+            "60: sextio[\u00AD>>];",
+            "70: sjuttio[\u00AD>>];",
+            "80: \u00E5ttio[\u00AD>>];",
+            "90: nittio[\u00AD>>];",
+            "100: <%spellout-cardinal-neutre<\u00ADhundra[\u00AD>>];",
+            "1000: ettusen[ >>];",
+            "2000: <%spellout-cardinal-reale<\u00ADtusen[ >>];",
+            "1000000: en miljon[ >>];",
+            "2000000: <%spellout-cardinal-reale< miljoner[ >>];",
+            "1000000000: en miljard[ >>];",
+            "2000000000: <%spellout-cardinal-reale< miljarder[ >>];",
+            "1000000000000: en biljon[ >>];",
+            "2000000000000: <%spellout-cardinal-reale< biljoner[ >>];",
+            "1000000000000000: en biljard[ >>];",
+            "2000000000000000: <%spellout-cardinal-reale< biljarder[ >>];",
+            "1000000000000000000: =#,##0=;",
             "%spellout-ordinal-masculine:",
+            "-x: minus >>;",
+            "x.x: =#,##0.#=;",
             "0: nollte;",
             "1: f\u00F6rste;",
             "2: andre;",
@@ -185,9 +161,25 @@
             "1000000000000000: en biljard>%%ord-masc-te>;",
             "2000000000000000: <%spellout-cardinal-reale< biljard>%%ord-masc-teer>;",
             "1000000000000000000: =#,##0=':e;",
+            "%%ord-masc-nde:",
+            "0: nde;",
+            "1: \u00AD=%spellout-ordinal-masculine=;",
+            "%%ord-masc-de:",
+            "0: de;",
+            "1: ' =%spellout-ordinal-masculine=;",
+            "%%ord-masc-te:",
+            "0: te;",
+            "1: ' =%spellout-ordinal-masculine=;",
+            "%%ord-masc-teer:",
+            "0: te;",
+            "1: er =%spellout-ordinal-masculine=;",
+            "%spellout-ordinal-feminine:",
+            "0: =%spellout-ordinal-neutre=;",
+            "%spellout-ordinal-reale:",
+            "0: =%spellout-ordinal-neutre=;",
+            "%spellout-ordinal-neutre:",
             "-x: minus >>;",
             "x.x: =#,##0.#=;",
-            "%spellout-ordinal-neutre:",
             "0: nollte;",
             "1: f\u00F6rsta;",
             "2: andra;",
@@ -213,11 +205,19 @@
             "1000000000000000: en biljard>%%ord-fem-te>;",
             "2000000000000000: <%spellout-cardinal-reale< biljard>%%ord-fem-teer>;",
             "1000000000000000000: =#,##0=':e;",
-            "-x: minus >>;",
-            "x.x: =#,##0.#=;",
-            "%spellout-ordinal-reale:",
-            "0: =%spellout-ordinal-neutre=;",
+            "%%ord-fem-nde:",
+            "0: nde;",
+            "1: \u00AD=%spellout-ordinal-feminine=;",
+            "%%ord-fem-de:",
+            "0: de;",
+            "1: ' =%spellout-ordinal-feminine=;",
+            "%%ord-fem-te:",
+            "0: te;",
+            "1: ' =%spellout-ordinal-feminine=;",
+            "%%ord-fem-teer:",
+            "0: te;",
+            "1: er =%spellout-ordinal-feminine=;",
         }
     }
-    Version{"1.6"}
+    Version{"1.7"}
 }

Modified: trunk/source/data/rbnf/ta.txt
===================================================================
--- trunk/source/data/rbnf/ta.txt	2009-07-02 19:27:40 UTC (rev 211)
+++ trunk/source/data/rbnf/ta.txt	2009-07-02 19:28:39 UTC (rev 212)
@@ -13,11 +13,18 @@
     RBNFRules{
         OrdinalRules{
             "%digits-ordinal:",
+            "-x: \u2212>>;",
             "0: =#,##,##0=.;",
-            "-x: \u2212>>;",
         }
         SpelloutRules{
+            "%spellout-numbering-year:",
+            "x.x: =#,###0.#=;",
+            "0: =%spellout-numbering=;",
+            "%spellout-numbering:",
+            "0: =%spellout-cardinal=;",
             "%spellout-cardinal:",
+            "-x: --- >>;",
+            "x.x: << ... >>;",
             "0: \u0BAA\u0BC2\u0B9C\u0BCD\u0BAF\u0BAE\u0BCD;",
             "1: \u0B92\u0BA9\u0BCD\u0BB1\u0BC1;",
             "2: \u0B87\u0BB0\u0BA3\u0BCD\u0B9F\u0BC1;",
@@ -59,14 +66,7 @@
             "100000: << \u0BB2\u0B9F\u0BCD\u0B9A\u0BAE\u0BCD[ >>];",
             "10000000: << \u0B95\u0BCB\u0B9F\u0BBF[ >>];",
             "1000000000000000000: =#,##,##0=;",
-            "-x: --- >>;",
-            "x.x: << ... >>;",
-            "%spellout-numbering:",
-            "0: =%spellout-cardinal=;",
-            "%spellout-numbering-year:",
-            "0: =%spellout-numbering=;",
-            "x.x: =#,###0.#=;",
         }
     }
-    Version{"1.1"}
+    Version{"1.2"}
 }

Modified: trunk/source/data/rbnf/th.txt
===================================================================
--- trunk/source/data/rbnf/th.txt	2009-07-02 19:27:40 UTC (rev 211)
+++ trunk/source/data/rbnf/th.txt	2009-07-02 19:28:39 UTC (rev 212)
@@ -13,14 +13,18 @@
     RBNFRules{
         OrdinalRules{
             "%digits-ordinal:",
+            "-x: \u0E17\u0E35\u0E48\u2212>#,##0>;",
             "0: \u0E17\u0E35\u0E48\u200B=#,##0=;",
-            "-x: \u0E17\u0E35\u0E48\u2212>#,##0>;",
         }
         SpelloutRules{
-            "%%alt-ones:",
-            "1: \u0E40\u0E2D\u0E47\u0E14;",
-            "2: =%spellout-cardinal=;",
+            "%spellout-numbering-year:",
+            "x.x: =#,###0.#=;",
+            "0: =%spellout-numbering=;",
+            "%spellout-numbering:",
+            "0: =%spellout-cardinal=;",
             "%spellout-cardinal:",
+            "-x: \u0E25\u0E1A\u200B>>;",
+            "x.x: <<\u200B\u0E08\u0E38\u0E14\u200B>>>;",
             "0: \u0E28\u0E39\u0E19\u0E22\u0E4C;",
             "1: \u0E2B\u0E19\u0E36\u0E48\u0E07;",
             "2: \u0E2A\u0E2D\u0E07;",
@@ -40,17 +44,13 @@
             "100000: <<\u200B\u0E41\u0E2A\u0E19[\u200B>>];",
             "1000000: <<\u200B\u0E25\u0E49\u0E32\u0E19[\u200B>>];",
             "1000000000000000000: =#,##0=;",
-            "-x: \u0E25\u0E1A\u200B>>;",
-            "x.x: <<\u200B\u0E08\u0E38\u0E14\u200B>>>;",
-            "%spellout-numbering:",
-            "0: =%spellout-cardinal=;",
-            "%spellout-numbering-year:",
-            "0: =%spellout-numbering=;",
-            "x.x: =#,###0.#=;",
+            "%%alt-ones:",
+            "1: \u0E40\u0E2D\u0E47\u0E14;",
+            "2: =%spellout-cardinal=;",
             "%spellout-ordinal:",
+            "x.x: =#,##0.#=;",
             "0: \u0E17\u0E35\u0E48\u200B=%spellout-cardinal=;",
-            "x.x: =#,##0.#=;",
         }
     }
-    Version{"1.4"}
+    Version{"1.5"}
 }

Modified: trunk/source/data/rbnf/tr.txt
===================================================================
--- trunk/source/data/rbnf/tr.txt	2009-07-02 19:27:40 UTC (rev 211)
+++ trunk/source/data/rbnf/tr.txt	2009-07-02 19:28:39 UTC (rev 212)
@@ -12,23 +12,21 @@
 tr{
     RBNFRules{
         OrdinalRules{
+            "%%digits-ordinal-indicator:",
+            "0: ''inci;",
             "%digits-ordinal:",
+            "-x: \u2212>>;",
             "0: =#,##0==%%digits-ordinal-indicator=;",
-            "-x: \u2212>>;",
-            "%%digits-ordinal-indicator:",
-            "0: ''inci;",
         }
         SpelloutRules{
-            "%%inci:",
-            "0: inci;",
-            "1: \u00AD=%spellout-ordinal=;",
-            "%%inci2:",
-            "0: inci;",
-            "1: ' =%spellout-ordinal=;",
-            "%%nci:",
-            "0: nci;",
-            "1: \u00AD=%spellout-ordinal=;",
+            "%spellout-numbering-year:",
+            "x.x: =#,###0.#=;",
+            "0: =%spellout-numbering=;",
+            "%spellout-numbering:",
+            "0: =%spellout-cardinal=;",
             "%spellout-cardinal:",
+            "-x: eks\u0131 >>;",
+            "x.x: << virg\u00FCl >>;",
             "0: s\u0131f\u0131r;",
             "1: bir;",
             "2: iki;",
@@ -55,14 +53,33 @@
             "1000000000000: << bilyon[ >>];",
             "1000000000000000: << bilyar[ >>];",
             "1000000000000000000: =#,##0=;",
+            "%%inci:",
+            "0: inci;",
+            "1: \u00AD=%spellout-ordinal=;",
+            "%%üncü:",
+            "0: uncu;",
+            "1: \u00AD=%spellout-ordinal=;",
+            "%%nci:",
+            "0: nci;",
+            "1: \u00AD=%spellout-ordinal=;",
+            "%%uncu:",
+            "0: uncu;",
+            "1: \u00AD=%spellout-ordinal=;",
+            "%%uncu2:",
+            "0: uncu;",
+            "1: ' =%spellout-ordinal=;",
+            "%%ıncı:",
+            "0: \u0131nc\u0131;",
+            "1: \u00AD=%spellout-ordinal=;",
+            "%%inci2:",
+            "0: inci;",
+            "1: ' =%spellout-ordinal=;",
+            "%%ıncı2:",
+            "0: \u0131nc\u0131;",
+            "1: ' =%spellout-ordinal=;",
+            "%spellout-ordinal:",
             "-x: eks\u0131 >>;",
-            "x.x: << virg\u00FCl >>;",
-            "%spellout-numbering:",
-            "0: =%spellout-cardinal=;",
-            "%spellout-numbering-year:",
-            "0: =%spellout-numbering=;",
-            "x.x: =#,###0.#=;",
-            "%spellout-ordinal:",
+            "x.x: =#,##0.#=;",
             "0: s\u0131f\u0131r\u0131nc\u0131;",
             "1: birinci;",
             "2: ikinci;",
@@ -89,24 +106,7 @@
             "1000000000000: <%spellout-numbering< bilyon>%%uncu2>;",
             "1000000000000000: <%spellout-numbering< bilyar>%%\u0131nc\u01312>;",
             "1000000000000000000: =#,##0='inci;",
-            "-x: eks\u0131 >>;",
-            "x.x: =#,##0.#=;",
-            "%%uncu:",
-            "0: uncu;",
-            "1: \u00AD=%spellout-ordinal=;",
-            "%%uncu2:",
-            "0: uncu;",
-            "1: ' =%spellout-ordinal=;",
-            "%%üncü:",
-            "0: uncu;",
-            "1: \u00AD=%spellout-ordinal=;",
-            "%%ıncı:",
-            "0: \u0131nc\u0131;",
-            "1: \u00AD=%spellout-ordinal=;",
-            "%%ıncı2:",
-            "0: \u0131nc\u0131;",
-            "1: ' =%spellout-ordinal=;",
         }
     }
-    Version{"1.4"}
+    Version{"1.5"}
 }

Modified: trunk/source/data/rbnf/uk.txt
===================================================================
--- trunk/source/data/rbnf/uk.txt	2009-07-02 19:27:40 UTC (rev 211)
+++ trunk/source/data/rbnf/uk.txt	2009-07-02 19:28:39 UTC (rev 212)
@@ -14,11 +14,34 @@
         SpelloutRules{
             "%%lenient-parse:",
             "&[last primary ignorable ] << ' ' << ',' << '-' << '\u00AD';",
-            "%spellout-cardinal-feminine:",
+            "%spellout-numbering-year:",
+            "x.x: =#,###0.#=;",
+            "0: =%spellout-numbering=;",
+            "%spellout-numbering:",
+            "0: =%spellout-cardinal-masculine=;",
+            "%spellout-cardinal-masculine:",
+            "-x: \u043C\u0456\u043D\u0443\u0441 >>;",
+            "x.x: << \u043A\u043E\u043C\u0430 >>;",
             "0: \u043D\u0443\u043B\u044C;",
-            "1: \u043E\u0434\u043D\u0430;",
-            "2: \u0434\u0432\u0456;",
-            "3: =%spellout-cardinal-masculine=;",
+            "1: \u043E\u0434\u0438\u043D;",
+            "2: \u0434\u0432\u0430;",
+            "3: \u0442\u0440\u0438;",
+            "4: \u0447\u043E\u0442\u0438\u0440\u0438;",
+            "5: \u043F\u02BC\u044F\u0442\u044C;",
+            "6: \u0448\u0456\u0441\u0442\u044C;",
+            "7: \u0441\u0456\u043C;",
+            "8: \u0432\u0456\u0441\u0456\u043C;",
+            "9: \u0434\u0435\u0432\u02BC\u044F\u0442\u044C;",
+            "10: \u0434\u0435\u0441\u044F\u0442\u044C;",
+            "11: \u043E\u0434\u0438\u043D\u0430\u0434\u0446\u044F\u0442\u044C;",
+            "12: \u0434\u0432\u0430\u043D\u0430\u0434\u0446\u044F\u0442\u044C;",
+            "13: \u0442\u0440\u0438\u043D\u0430\u0434\u0446\u044F\u0442\u044C;",
+            "14: \u0447\u043E\u0442\u0438\u0440\u043D\u0430\u0434\u0446\u044F\u0442\u044C;",
+            "15: \u043F\u02BC\u044F\u0442\u043D\u0430\u0434\u0446\u044F\u0442\u044C;",
+            "16: \u0448\u0456\u0441\u0442\u043D\u0430\u0434\u0446\u044F\u0442\u044C;",
+            "17: \u0441\u0456\u043C\u043D\u0430\u0434\u0446\u044F\u0442\u044C;",
+            "18: \u0432\u0456\u0441\u0456\u043C\u043D\u0430\u0434\u0446\u044F\u0442\u044C;",
+            "19: \u0434\u0435\u0432\u02BC\u044F\u0442\u043D\u0430\u0434\u0446\u044F\u0442\u044C;",
             "20: \u0434\u0432\u0430\u0434\u0446\u044F\u0442\u044C[ >>];",
             "30: \u0442\u0440\u0438\u0434\u0446\u044F\u0442\u044C[ >>];",
             "40: \u0441\u043E\u0440\u043E\u043A[ >>];",
@@ -52,29 +75,13 @@
             "2000000000000000: <%spellout-cardinal-masculine< \u0431\u0456\u043B\u044C\u044F\u0440\u0434\u0438[ >>];",
             "5000000000000000: <%spellout-cardinal-masculine< \u0431\u0456\u043B\u044C\u044F\u0440\u0434\u0456\u0432[ >>];",
             "1000000000000000000: =#,##0=;",
+            "%spellout-cardinal-neutre:",
             "-x: \u043C\u0456\u043D\u0443\u0441 >>;",
             "x.x: << \u043A\u043E\u043C\u0430 >>;",
-            "%spellout-cardinal-masculine:",
             "0: \u043D\u0443\u043B\u044C;",
-            "1: \u043E\u0434\u0438\u043D;",
+            "1: \u043E\u0434\u043D\u0435;",
             "2: \u0434\u0432\u0430;",
-            "3: \u0442\u0440\u0438;",
-            "4: \u0447\u043E\u0442\u0438\u0440\u0438;",
-            "5: \u043F\u02BC\u044F\u0442\u044C;",
-            "6: \u0448\u0456\u0441\u0442\u044C;",
-            "7: \u0441\u0456\u043C;",
-            "8: \u0432\u0456\u0441\u0456\u043C;",
-            "9: \u0434\u0435\u0432\u02BC\u044F\u0442\u044C;",
-            "10: \u0434\u0435\u0441\u044F\u0442\u044C;",
-            "11: \u043E\u0434\u0438\u043D\u0430\u0434\u0446\u044F\u0442\u044C;",
-            "12: \u0434\u0432\u0430\u043D\u0430\u0434\u0446\u044F\u0442\u044C;",
-            "13: \u0442\u0440\u0438\u043D\u0430\u0434\u0446\u044F\u0442\u044C;",
-            "14: \u0447\u043E\u0442\u0438\u0440\u043D\u0430\u0434\u0446\u044F\u0442\u044C;",
-            "15: \u043F\u02BC\u044F\u0442\u043D\u0430\u0434\u0446\u044F\u0442\u044C;",
-            "16: \u0448\u0456\u0441\u0442\u043D\u0430\u0434\u0446\u044F\u0442\u044C;",
-            "17: \u0441\u0456\u043C\u043D\u0430\u0434\u0446\u044F\u0442\u044C;",
-            "18: \u0432\u0456\u0441\u0456\u043C\u043D\u0430\u0434\u0446\u044F\u0442\u044C;",
-            "19: \u0434\u0435\u0432\u02BC\u044F\u0442\u043D\u0430\u0434\u0446\u044F\u0442\u044C;",
+            "3: =%spellout-cardinal-masculine=;",
             "20: \u0434\u0432\u0430\u0434\u0446\u044F\u0442\u044C[ >>];",
             "30: \u0442\u0440\u0438\u0434\u0446\u044F\u0442\u044C[ >>];",
             "40: \u0441\u043E\u0440\u043E\u043A[ >>];",
@@ -108,12 +115,12 @@
             "2000000000000000: <%spellout-cardinal-masculine< \u0431\u0456\u043B\u044C\u044F\u0440\u0434\u0438[ >>];",
             "5000000000000000: <%spellout-cardinal-masculine< \u0431\u0456\u043B\u044C\u044F\u0440\u0434\u0456\u0432[ >>];",
             "1000000000000000000: =#,##0=;",
+            "%spellout-cardinal-feminine:",
             "-x: \u043C\u0456\u043D\u0443\u0441 >>;",
             "x.x: << \u043A\u043E\u043C\u0430 >>;",
-            "%spellout-cardinal-neutre:",
             "0: \u043D\u0443\u043B\u044C;",
-            "1: \u043E\u0434\u043D\u0435;",
-            "2: \u0434\u0432\u0430;",
+            "1: \u043E\u0434\u043D\u0430;",
+            "2: \u0434\u0432\u0456;",
             "3: =%spellout-cardinal-masculine=;",
             "20: \u0434\u0432\u0430\u0434\u0446\u044F\u0442\u044C[ >>];",
             "30: \u0442\u0440\u0438\u0434\u0446\u044F\u0442\u044C[ >>];",
@@ -148,14 +155,7 @@
             "2000000000000000: <%spellout-cardinal-masculine< \u0431\u0456\u043B\u044C\u044F\u0440\u0434\u0438[ >>];",
             "5000000000000000: <%spellout-cardinal-masculine< \u0431\u0456\u043B\u044C\u044F\u0440\u0434\u0456\u0432[ >>];",
             "1000000000000000000: =#,##0=;",
-            "-x: \u043C\u0456\u043D\u0443\u0441 >>;",
-            "x.x: << \u043A\u043E\u043C\u0430 >>;",
-            "%spellout-numbering:",
-            "0: =%spellout-cardinal-masculine=;",
-            "%spellout-numbering-year:",
-            "0: =%spellout-numbering=;",
-            "x.x: =#,###0.#=;",
         }
     }
-    Version{"1.5"}
+    Version{"1.6"}
 }

Modified: trunk/source/data/rbnf/vi.txt
===================================================================
--- trunk/source/data/rbnf/vi.txt	2009-07-02 19:27:40 UTC (rev 211)
+++ trunk/source/data/rbnf/vi.txt	2009-07-02 19:28:39 UTC (rev 212)
@@ -13,11 +13,18 @@
     RBNFRules{
         OrdinalRules{
             "%digits-ordinal:",
+            "-x: \u2212>>;",
             "0: th\u1EE9 =#,##0=;",
-            "-x: \u2212>>;",
         }
         SpelloutRules{
+            "%spellout-numbering-year:",
+            "x.x: =#,###0.#=;",
+            "0: =%spellout-numbering=;",
+            "%spellout-numbering:",
+            "0: =%spellout-cardinal=;",
             "%spellout-cardinal:",
+            "-x: tr\u1EEB >>;",
+            "x.x: << ph\u1EA9y >>;",
             "0: kh\u00F4ng;",
             "1: m\u1ED9t;",
             "2: hai;",
@@ -35,17 +42,10 @@
             "1000000: << tri\u1EC7u[ >>];",
             "1000000000: << t\u1EF7[ >>];",
             "1000000000000000000: =#,##0=;",
-            "-x: tr\u1EEB >>;",
-            "x.x: << ph\u1EA9y >>;",
-            "%spellout-numbering:",
-            "0: =%spellout-cardinal=;",
-            "%spellout-numbering-year:",
-            "0: =%spellout-numbering=;",
-            "x.x: =#,###0.#=;",
             "%spellout-ordinal:",
+            "x.x: =#,##0.#=;",
             "0: th\u1EE9 =%spellout-cardinal=;",
-            "x.x: =#,##0.#=;",
         }
     }
-    Version{"1.4"}
+    Version{"1.5"}
 }

Modified: trunk/source/data/rbnf/zh.txt
===================================================================
--- trunk/source/data/rbnf/zh.txt	2009-07-02 19:27:40 UTC (rev 211)
+++ trunk/source/data/rbnf/zh.txt	2009-07-02 19:28:39 UTC (rev 212)
@@ -13,15 +13,37 @@
     RBNFRules{
         OrdinalRules{
             "%digits-ordinal:",
+            "-x: \u7B2C\u2212>#,###0>;",
             "0: \u7B2C=#,###0=;",
-            "-x: \u7B2C\u2212>#,###0>;",
         }
         SpelloutRules{
-            "%%financialnumber13:",
-            "1: \u96F6=%spellout-cardinal-financial=;",
-            "10: \u96F6\u58F9=%spellout-cardinal-financial=;",
-            "20: \u96F6=%spellout-cardinal-financial=;",
-            "1000000000000: =%spellout-cardinal-financial=;",
+            "%spellout-numbering-year:",
+            "x.x: =#,###0.#=;",
+            "0: =%spellout-numbering=;",
+            "%spellout-numbering:",
+            "0: =%spellout-cardinal=;",
+            "%spellout-cardinal-financial:",
+            "-x: \u8D1F>>;",
+            "x.x: <<\u70B9>>>;",
+            "0: \u96F6;",
+            "1: \u58F9;",
+            "2: \u8D30;",
+            "3: \u53C1;",
+            "4: \u8086;",
+            "5: \u4F0D;",
+            "6: \u9646;",
+            "7: \u67D2;",
+            "8: \u634C;",
+            "9: \u7396;",
+            "10: \u62FE[>>];",
+            "20: <<\u62FE[>>];",
+            "100: <<\u4F70[>%%financialnumber2>];",
+            "1000: <<\u4EDF[>%%financialnumber3>];",
+            "10000: <%spellout-cardinal-financial<\u842C[>%%financialnumber4>];",
+            "100000000: <%spellout-cardinal-financial<\u5104[>%%financialnumber5>];",
+            "1000000000000: <%spellout-cardinal-financial<\u5146[>%%financialnumber8>];",
+            "10000000000000000: <%spellout-cardinal-financial<\u4EAC[>%%financialnumber13>];",
+            "1000000000000000000: =#,###0=;",
             "%%financialnumber2:",
             "1: \u96F6=%spellout-cardinal-financial=;",
             "10: \u58F9=%spellout-cardinal-financial=;",
@@ -46,11 +68,33 @@
             "10: \u96F6\u58F9=%spellout-cardinal-financial=;",
             "20: \u96F6=%spellout-cardinal-financial=;",
             "10000000: =%spellout-cardinal-financial=;",
-            "%%number13:",
-            "1: \u3007=%spellout-cardinal=;",
-            "10: \u3007\u4E00=%spellout-cardinal=;",
-            "20: \u3007=%spellout-cardinal=;",
-            "1000000000000: =%spellout-cardinal=;",
+            "%%financialnumber13:",
+            "1: \u96F6=%spellout-cardinal-financial=;",
+            "10: \u96F6\u58F9=%spellout-cardinal-financial=;",
+            "20: \u96F6=%spellout-cardinal-financial=;",
+            "1000000000000: =%spellout-cardinal-financial=;",
+            "%spellout-cardinal:",
+            "-x: \u8D1F>>;",
+            "x.x: <<\u70B9>>>;",
+            "0: \u3007;",
+            "1: \u4E00;",
+            "2: \u4E8C;",
+            "3: \u4E09;",
+            "4: \u56DB;",
+            "5: \u4E94;",
+            "6: \u516D;",
+            "7: \u4E03;",
+            "8: \u516B;",
+            "9: \u4E5D;",
+            "10: \u5341[>>];",
+            "20: <<\u5341[>>];",
+            "100: <<\u767E[>%%number2>];",
+            "1000: <<\u5343[>%%number3>];",
+            "10000: <%spellout-cardinal<\u4E07[>%%number4>];",
+            "100000000: <%spellout-cardinal<\u4EBF[>%%number5>];",
+            "1000000000000: <%spellout-cardinal<\u5146[>%%number8>];",
+            "10000000000000000: <%spellout-cardinal<\u4EAC[>%%number13>];",
+            "1000000000000000000: =#,###0=;",
             "%%number2:",
             "1: \u3007=%spellout-cardinal=;",
             "10: \u4E00=%spellout-cardinal=;",
@@ -75,59 +119,15 @@
             "10: \u3007\u4E00=%spellout-cardinal=;",
             "20: \u3007=%spellout-cardinal=;",
             "10000000: =%spellout-cardinal=;",
-            "%spellout-cardinal:",
-            "0: \u3007;",
-            "1: \u4E00;",
-            "2: \u4E8C;",
-            "3: \u4E09;",
-            "4: \u56DB;",
-            "5: \u4E94;",
-            "6: \u516D;",
-            "7: \u4E03;",
-            "8: \u516B;",
-            "9: \u4E5D;",
-            "10: \u5341[>>];",
-            "20: <<\u5341[>>];",
-            "100: <<\u767E[>%%number2>];",
-            "1000: <<\u5343[>%%number3>];",
-            "10000: <%spellout-cardinal<\u4E07[>%%number4>];",
-            "100000000: <%spellout-cardinal<\u4EBF[>%%number5>];",
-            "1000000000000: <%spellout-cardinal<\u5146[>%%number8>];",
-            "10000000000000000: <%spellout-cardinal<\u4EAC[>%%number13>];",
-            "1000000000000000000: =#,###0=;",
-            "-x: \u8D1F>>;",
-            "x.x: <<\u70B9>>>;",
-            "%spellout-cardinal-financial:",
-            "0: \u96F6;",
-            "1: \u58F9;",
-            "2: \u8D30;",
-            "3: \u53C1;",
-            "4: \u8086;",
-            "5: \u4F0D;",
-            "6: \u9646;",
-            "7: \u67D2;",
-            "8: \u634C;",
-            "9: \u7396;",
-            "10: \u62FE[>>];",
-            "20: <<\u62FE[>>];",
-            "100: <<\u4F70[>%%financialnumber2>];",
-            "1000: <<\u4EDF[>%%financialnumber3>];",
-            "10000: <%spellout-cardinal-financial<\u842C[>%%financialnumber4>];",
-            "100000000: <%spellout-cardinal-financial<\u5104[>%%financialnumber5>];",
-            "1000000000000: <%spellout-cardinal-financial<\u5146[>%%financialnumber8>];",
-            "10000000000000000: <%spellout-cardinal-financial<\u4EAC[>%%financialnumber13>];",
-            "1000000000000000000: =#,###0=;",
-            "-x: \u8D1F>>;",
-            "x.x: <<\u70B9>>>;",
-            "%spellout-numbering:",
-            "0: =%spellout-cardinal=;",
-            "%spellout-numbering-year:",
-            "0: =%spellout-numbering=;",
+            "%%number13:",
+            "1: \u3007=%spellout-cardinal=;",
+            "10: \u3007\u4E00=%spellout-cardinal=;",
+            "20: \u3007=%spellout-cardinal=;",
+            "1000000000000: =%spellout-cardinal=;",
+            "%spellout-ordinal:",
             "x.x: =#,###0.#=;",
-            "%spellout-ordinal:",
             "0: \u7B2C=%spellout-numbering=;",
-            "x.x: =#,###0.#=;",
         }
     }
-    Version{"1.9"}
+    Version{"1.10"}
 }

Modified: trunk/source/data/rbnf/zh_Hant.txt
===================================================================
--- trunk/source/data/rbnf/zh_Hant.txt	2009-07-02 19:27:40 UTC (rev 211)
+++ trunk/source/data/rbnf/zh_Hant.txt	2009-07-02 19:28:39 UTC (rev 212)
@@ -13,15 +13,37 @@
     RBNFRules{
         OrdinalRules{
             "%digits-ordinal:",
+            "-x: \u7B2C\u2212>#,###0>;",
             "0: \u7B2C=#,###0=;",
-            "-x: \u7B2C\u2212>#,###0>;",
         }
         SpelloutRules{
-            "%%financialnumber13:",
-            "1: \u96F6=%spellout-cardinal-financial=;",
-            "10: \u96F6\u58F9=%spellout-cardinal-financial=;",
-            "20: \u96F6=%spellout-cardinal-financial=;",
-            "1000000000000: =%spellout-cardinal-financial=;",
+            "%spellout-numbering-year:",
+            "x.x: =#,###0.#=;",
+            "0: =%spellout-numbering=;",
+            "%spellout-numbering:",
+            "0: =%spellout-cardinal=;",
+            "%spellout-cardinal-financial:",
+            "-x: \u8CA0>>;",
+            "x.x: <<\u9EDE>>>;",
+            "0: \u96F6;",
+            "1: \u58F9;",
+            "2: \u8CB3;",
+            "3: \u53C4;",
+            "4: \u8086;",
+            "5: \u4F0D;",
+            "6: \u9678;",
+            "7: \u67D2;",
+            "8: \u634C;",
+            "9: \u7396;",
+            "10: \u62FE[>>];",
+            "20: <<\u62FE[>>];",
+            "100: <<\u4F70[>%%financialnumber2>];",
+            "1000: <<\u4EDF[>%%financialnumber3>];",
+            "10000: <%spellout-cardinal-financial<\u842C[>%%financialnumber4>];",
+            "100000000: <%spellout-cardinal-financial<\u5104[>%%financialnumber5>];",
+            "1000000000000: <%spellout-cardinal-financial<\u5146[>%%financialnumber8>];",
+            "10000000000000000: <%spellout-cardinal-financial<\u4EAC[>%%financialnumber13>];",
+            "1000000000000000000: =#,###0=;",
             "%%financialnumber2:",
             "1: \u96F6=%spellout-cardinal-financial=;",
             "10: \u58F9=%spellout-cardinal-financial=;",
@@ -46,11 +68,33 @@
             "10: \u96F6\u58F9=%spellout-cardinal-financial=;",
             "20: \u96F6=%spellout-cardinal-financial=;",
             "10000000: =%spellout-cardinal-financial=;",
-            "%%number13:",
-            "1: \u3007=%spellout-cardinal=;",
-            "10: \u3007\u4E00=%spellout-cardinal=;",
-            "20: \u3007=%spellout-cardinal=;",
-            "1000000000000: =%spellout-cardinal=;",
+            "%%financialnumber13:",
+            "1: \u96F6=%spellout-cardinal-financial=;",
+            "10: \u96F6\u58F9=%spellout-cardinal-financial=;",
+            "20: \u96F6=%spellout-cardinal-financial=;",
+            "1000000000000: =%spellout-cardinal-financial=;",
+            "%spellout-cardinal:",
+            "-x: \u8CA0>>;",
+            "x.x: <<\u9EDE>>>;",
+            "0: \u3007;",
+            "1: \u4E00;",
+            "2: \u4E8C;",
+            "3: \u4E09;",
+            "4: \u56DB;",
+            "5: \u4E94;",
+            "6: \u516D;",
+            "7: \u4E03;",
+            "8: \u516B;",
+            "9: \u4E5D;",
+            "10: \u5341[>>];",
+            "20: <<\u5341[>>];",
+            "100: <<\u767E[>%%number2>];",
+            "1000: <<\u5343[>%%number3>];",
+            "10000: <%spellout-cardinal<\u842C[>%%number4>];",
+            "100000000: <%spellout-cardinal<\u5104[>%%number5>];",
+            "1000000000000: <%spellout-cardinal<\u5146[>%%number8>];",
+            "10000000000000000: <%spellout-cardinal<\u4EAC[>%%number13>];",
+            "1000000000000000000: =#,###0=;",
             "%%number2:",
             "1: \u3007=%spellout-cardinal=;",
             "10: \u4E00=%spellout-cardinal=;",
@@ -75,59 +119,15 @@
             "10: \u3007\u4E00=%spellout-cardinal=;",
             "20: \u3007=%spellout-cardinal=;",
             "10000000: =%spellout-cardinal=;",
-            "%spellout-cardinal:",
-            "0: \u3007;",
-            "1: \u4E00;",
-            "2: \u4E8C;",
-            "3: \u4E09;",
-            "4: \u56DB;",
-            "5: \u4E94;",
-            "6: \u516D;",
-            "7: \u4E03;",
-            "8: \u516B;",
-            "9: \u4E5D;",
-            "10: \u5341[>>];",
-            "20: <<\u5341[>>];",
-            "100: <<\u767E[>%%number2>];",
-            "1000: <<\u5343[>%%number3>];",
-            "10000: <%spellout-cardinal<\u842C[>%%number4>];",
-            "100000000: <%spellout-cardinal<\u5104[>%%number5>];",
-            "1000000000000: <%spellout-cardinal<\u5146[>%%number8>];",
-            "10000000000000000: <%spellout-cardinal<\u4EAC[>%%number13>];",
-            "1000000000000000000: =#,###0=;",
-            "-x: \u8CA0>>;",
-            "x.x: <<\u9EDE>>>;",
-            "%spellout-cardinal-financial:",
-            "0: \u96F6;",
-            "1: \u58F9;",
-            "2: \u8CB3;",
-            "3: \u53C4;",
-            "4: \u8086;",
-            "5: \u4F0D;",
-            "6: \u9678;",
-            "7: \u67D2;",
-            "8: \u634C;",
-            "9: \u7396;",
-            "10: \u62FE[>>];",
-            "20: <<\u62FE[>>];",
-            "100: <<\u4F70[>%%financialnumber2>];",
-            "1000: <<\u4EDF[>%%financialnumber3>];",
-            "10000: <%spellout-cardinal-financial<\u842C[>%%financialnumber4>];",
-            "100000000: <%spellout-cardinal-financial<\u5104[>%%financialnumber5>];",
-            "1000000000000: <%spellout-cardinal-financial<\u5146[>%%financialnumber8>];",
-            "10000000000000000: <%spellout-cardinal-financial<\u4EAC[>%%financialnumber13>];",
-            "1000000000000000000: =#,###0=;",
-            "-x: \u8CA0>>;",
-            "x.x: <<\u9EDE>>>;",
-            "%spellout-numbering:",
-            "0: =%spellout-cardinal=;",
-            "%spellout-numbering-year:",
-            "0: =%spellout-numbering=;",
+            "%%number13:",
+            "1: \u3007=%spellout-cardinal=;",
+            "10: \u3007\u4E00=%spellout-cardinal=;",
+            "20: \u3007=%spellout-cardinal=;",
+            "1000000000000: =%spellout-cardinal=;",
+            "%spellout-ordinal:",
             "x.x: =#,###0.#=;",
-            "%spellout-ordinal:",
             "0: \u7B2C=%spellout-numbering=;",
-            "x.x: =#,###0.#=;",
         }
     }
-    Version{"1.8"}
+    Version{"1.9"}
 }

Modified: trunk/source/data/xml/collation/bn_IN.xml
===================================================================
--- trunk/source/data/xml/collation/bn_IN.xml	2009-07-02 19:27:40 UTC (rev 211)
+++ trunk/source/data/xml/collation/bn_IN.xml	2009-07-02 19:28:39 UTC (rev 212)
@@ -1,20 +1,20 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!--
- Copyright (c) 2002-2008 International Business Machines Corporation and others. All rights reserved.
--->
-<!DOCTYPE ldml SYSTEM "http://www.unicode.org/cldr/dtd/1.6/ldml.dtd"
-[
-   <!ENTITY % icu SYSTEM " http://www.unicode.org/cldr/dtd/1.6/ldmlICU.dtd">
-   %icu;
-]
->
-<ldml>
-	<identity>
-		<version number="$Revision: 1.5 $"/>
-		<generation date="$Date: 2007/06/04 01:05:45 $"/>
-		<language type="bn"/> 
-		<territory type="IN"/> 
-	</identity>
-	
-</ldml>
-
+<?xml version="1.0" encoding="UTF-8" ?>
+<!--
+ Copyright (c) 2002-2008 International Business Machines Corporation and others. All rights reserved.
+-->
+<!DOCTYPE ldml SYSTEM "http://www.unicode.org/cldr/dtd/1.6/ldml.dtd"
+[
+   <!ENTITY % icu SYSTEM " http://www.unicode.org/cldr/dtd/1.6/ldmlICU.dtd">
+   %icu;
+]
+>
+<ldml>
+	<identity>
+		<version number="$Revision: 1.5 $"/>
+		<generation date="$Date: 2007/06/04 01:05:45 $"/>
+		<language type="bn"/> 
+		<territory type="IN"/> 
+	</identity>
+	
+</ldml>
+

Modified: trunk/source/data/xml/collation/ur.xml
===================================================================
--- trunk/source/data/xml/collation/ur.xml	2009-07-02 19:27:40 UTC (rev 211)
+++ trunk/source/data/xml/collation/ur.xml	2009-07-02 19:28:39 UTC (rev 212)
@@ -1,19 +1,19 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!--
- Copyright (c) 2002-2008 International Business Machines Corporation and others. All rights reserved.
--->
-<!DOCTYPE ldml SYSTEM "http://www.unicode.org/cldr/dtd/1.6/ldml.dtd"
-[
-   <!ENTITY % icu SYSTEM " http://www.unicode.org/cldr/dtd/1.6/ldmlICU.dtd">
-   %icu;
-]
->
-<ldml>
-	<identity>
-		<version number="$Revision: 1.1 $"/>
-		<generation date="$Date: 2007/06/04 01:05:45 $"/>
-		<language type="ur"/> 
-	</identity>
-	
-</ldml>
-
+<?xml version="1.0" encoding="UTF-8" ?>
+<!--
+ Copyright (c) 2002-2008 International Business Machines Corporation and others. All rights reserved.
+-->
+<!DOCTYPE ldml SYSTEM "http://www.unicode.org/cldr/dtd/1.6/ldml.dtd"
+[
+   <!ENTITY % icu SYSTEM " http://www.unicode.org/cldr/dtd/1.6/ldmlICU.dtd">
+   %icu;
+]
+>
+<ldml>
+	<identity>
+		<version number="$Revision: 1.1 $"/>
+		<generation date="$Date: 2007/06/04 01:05:45 $"/>
+		<language type="ur"/> 
+	</identity>
+	
+</ldml>
+

Modified: trunk/source/data/xml/main/ha.xml
===================================================================
--- trunk/source/data/xml/main/ha.xml	2009-07-02 19:27:40 UTC (rev 211)
+++ trunk/source/data/xml/main/ha.xml	2009-07-02 19:28:39 UTC (rev 212)
@@ -1,25 +1,25 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!--
- Copyright (c) 2002-2008 International Business Machines Corporation and others. All rights reserved.
--->
-<!DOCTYPE ldml SYSTEM "http://www.unicode.org/cldr/dtd/1.6/ldml.dtd"
-[
-   <!ENTITY % icu SYSTEM " http://www.unicode.org/cldr/dtd/1.6/ldmlICU.dtd">
-   %icu;
-]
->
-<ldml>
-	<identity>
-		<version number="$Revision: 1.23 $"/>
-		<generation date="$Date: 2008/05/25 01:05:51 $"/>
-		<language type="ha"/> 
-	</identity>
-	<characters>
-		<special xmlns:icu="http://www.icu-project.org/">
-			<icu:scripts>
-				<icu:script type="1">Latn</icu:script>
-			</icu:scripts>
-		</special>
-	</characters>
-</ldml>
-
+<?xml version="1.0" encoding="UTF-8" ?>
+<!--
+ Copyright (c) 2002-2008 International Business Machines Corporation and others. All rights reserved.
+-->
+<!DOCTYPE ldml SYSTEM "http://www.unicode.org/cldr/dtd/1.6/ldml.dtd"
+[
+   <!ENTITY % icu SYSTEM " http://www.unicode.org/cldr/dtd/1.6/ldmlICU.dtd">
+   %icu;
+]
+>
+<ldml>
+	<identity>
+		<version number="$Revision: 1.23 $"/>
+		<generation date="$Date: 2008/05/25 01:05:51 $"/>
+		<language type="ha"/> 
+	</identity>
+	<characters>
+		<special xmlns:icu="http://www.icu-project.org/">
+			<icu:scripts>
+				<icu:script type="1">Latn</icu:script>
+			</icu:scripts>
+		</special>
+	</characters>
+</ldml>
+

Modified: trunk/source/data/xml/main/ha_Latn.xml
===================================================================
--- trunk/source/data/xml/main/ha_Latn.xml	2009-07-02 19:27:40 UTC (rev 211)
+++ trunk/source/data/xml/main/ha_Latn.xml	2009-07-02 19:28:39 UTC (rev 212)
@@ -1,26 +1,26 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!--
- Copyright (c) 2002-2008 International Business Machines Corporation and others. All rights reserved.
--->
-<!DOCTYPE ldml SYSTEM "http://www.unicode.org/cldr/dtd/1.6/ldml.dtd"
-[
-   <!ENTITY % icu SYSTEM " http://www.unicode.org/cldr/dtd/1.6/ldmlICU.dtd">
-   %icu;
-]
->
-<ldml>
-	<identity>
-		<version number="$Revision: 1.23 $"/>
-		<generation date="$Date: 2008/05/25 01:05:51 $"/>
-		<language type="ha"/> 
-		<script type="Latn"/> 
-	</identity>
-	<characters>
-		<special xmlns:icu="http://www.icu-project.org/">
-			<icu:scripts>
-				<icu:script type="1">Latn</icu:script>
-			</icu:scripts>
-		</special>
-	</characters>
-</ldml>
-
+<?xml version="1.0" encoding="UTF-8" ?>
+<!--
+ Copyright (c) 2002-2008 International Business Machines Corporation and others. All rights reserved.
+-->
+<!DOCTYPE ldml SYSTEM "http://www.unicode.org/cldr/dtd/1.6/ldml.dtd"
+[
+   <!ENTITY % icu SYSTEM " http://www.unicode.org/cldr/dtd/1.6/ldmlICU.dtd">
+   %icu;
+]
+>
+<ldml>
+	<identity>
+		<version number="$Revision: 1.23 $"/>
+		<generation date="$Date: 2008/05/25 01:05:51 $"/>
+		<language type="ha"/> 
+		<script type="Latn"/> 
+	</identity>
+	<characters>
+		<special xmlns:icu="http://www.icu-project.org/">
+			<icu:scripts>
+				<icu:script type="1">Latn</icu:script>
+			</icu:scripts>
+		</special>
+	</characters>
+</ldml>
+

Modified: trunk/source/data/xml/main/in.xml
===================================================================
--- trunk/source/data/xml/main/in.xml	2009-07-02 19:27:40 UTC (rev 211)
+++ trunk/source/data/xml/main/in.xml	2009-07-02 19:28:39 UTC (rev 212)
@@ -1,25 +1,25 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!--
- Copyright (c) 2002-2008 International Business Machines Corporation and others. All rights reserved.
--->
-<!DOCTYPE ldml SYSTEM "http://www.unicode.org/cldr/dtd/1.6/ldml.dtd"
-[
-   <!ENTITY % icu SYSTEM " http://www.unicode.org/cldr/dtd/1.6/ldmlICU.dtd">
-   %icu;
-]
->
-<ldml>
-	<identity>
-		<version number="$Revision: 1.23 $"/>
-		<generation date="$Date: 2008/05/25 01:05:55 $"/>
-		<language type="in"/> 
-	</identity>
-	<characters>
-		<special xmlns:icu="http://www.icu-project.org/">
-			<icu:scripts>
-				<icu:script type="1">Latn</icu:script>
-			</icu:scripts>
-		</special>
-	</characters>
-</ldml>
-
+<?xml version="1.0" encoding="UTF-8" ?>
+<!--
+ Copyright (c) 2002-2008 International Business Machines Corporation and others. All rights reserved.
+-->
+<!DOCTYPE ldml SYSTEM "http://www.unicode.org/cldr/dtd/1.6/ldml.dtd"
+[
+   <!ENTITY % icu SYSTEM " http://www.unicode.org/cldr/dtd/1.6/ldmlICU.dtd">
+   %icu;
+]
+>
+<ldml>
+	<identity>
+		<version number="$Revision: 1.23 $"/>
+		<generation date="$Date: 2008/05/25 01:05:55 $"/>
+		<language type="in"/> 
+	</identity>
+	<characters>
+		<special xmlns:icu="http://www.icu-project.org/">
+			<icu:scripts>
+				<icu:script type="1">Latn</icu:script>
+			</icu:scripts>
+		</special>
+	</characters>
+</ldml>
+

Modified: trunk/source/data/xml/main/kk_Cyrl.xml
===================================================================
--- trunk/source/data/xml/main/kk_Cyrl.xml	2009-07-02 19:27:40 UTC (rev 211)
+++ trunk/source/data/xml/main/kk_Cyrl.xml	2009-07-02 19:28:39 UTC (rev 212)
@@ -1,26 +1,26 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!--
- Copyright (c) 2002-2008 International Business Machines Corporation and others. All rights reserved.
--->
-<!DOCTYPE ldml SYSTEM "http://www.unicode.org/cldr/dtd/1.6/ldml.dtd"
-[
-   <!ENTITY % icu SYSTEM " http://www.unicode.org/cldr/dtd/1.6/ldmlICU.dtd">
-   %icu;
-]
->
-<ldml>
-	<identity>
-		<version number="$Revision: 1.22 $"/>
-		<generation date="$Date: 2008/05/25 01:05:53 $"/>
-		<language type="kk"/> 
-		<script type="Cyrl"/> 
-	</identity>
-	<characters>
-		<special xmlns:icu="http://www.icu-project.org/">
-			<icu:scripts>
-				<icu:script type="1">Cyrl</icu:script>
-			</icu:scripts>
-		</special>
-	</characters>
-</ldml>
-
+<?xml version="1.0" encoding="UTF-8" ?>
+<!--
+ Copyright (c) 2002-2008 International Business Machines Corporation and others. All rights reserved.
+-->
+<!DOCTYPE ldml SYSTEM "http://www.unicode.org/cldr/dtd/1.6/ldml.dtd"
+[
+   <!ENTITY % icu SYSTEM " http://www.unicode.org/cldr/dtd/1.6/ldmlICU.dtd">
+   %icu;
+]
+>
+<ldml>
+	<identity>
+		<version number="$Revision: 1.22 $"/>
+		<generation date="$Date: 2008/05/25 01:05:53 $"/>
+		<language type="kk"/> 
+		<script type="Cyrl"/> 
+	</identity>
+	<characters>
+		<special xmlns:icu="http://www.icu-project.org/">
+			<icu:scripts>
+				<icu:script type="1">Cyrl</icu:script>
+			</icu:scripts>
+		</special>
+	</characters>
+</ldml>
+

Modified: trunk/source/data/xml/main/ne.xml
===================================================================
--- trunk/source/data/xml/main/ne.xml	2009-07-02 19:27:40 UTC (rev 211)
+++ trunk/source/data/xml/main/ne.xml	2009-07-02 19:28:39 UTC (rev 212)
@@ -1,25 +1,25 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!--
- Copyright (c) 2002-2008 International Business Machines Corporation and others. All rights reserved.
--->
-<!DOCTYPE ldml SYSTEM "http://www.unicode.org/cldr/dtd/1.6/ldml.dtd"
-[
-   <!ENTITY % icu SYSTEM " http://www.unicode.org/cldr/dtd/1.6/ldmlICU.dtd">
-   %icu;
-]
->
-<ldml>
-	<identity>
-		<version number="$Revision: 1.23 $"/>
-		<generation date="$Date: 2008/05/25 01:05:52 $"/>
-		<language type="ne"/> 
-	</identity>
-	<characters>
-		<special xmlns:icu="http://www.icu-project.org/">
-			<icu:scripts>
-				<icu:script type="1">Deva</icu:script>
-			</icu:scripts>
-		</special>
-	</characters>
-</ldml>
-
+<?xml version="1.0" encoding="UTF-8" ?>
+<!--
+ Copyright (c) 2002-2008 International Business Machines Corporation and others. All rights reserved.
+-->
+<!DOCTYPE ldml SYSTEM "http://www.unicode.org/cldr/dtd/1.6/ldml.dtd"
+[
+   <!ENTITY % icu SYSTEM " http://www.unicode.org/cldr/dtd/1.6/ldmlICU.dtd">
+   %icu;
+]
+>
+<ldml>
+	<identity>
+		<version number="$Revision: 1.23 $"/>
+		<generation date="$Date: 2008/05/25 01:05:52 $"/>
+		<language type="ne"/> 
+	</identity>
+	<characters>
+		<special xmlns:icu="http://www.icu-project.org/">
+			<icu:scripts>
+				<icu:script type="1">Deva</icu:script>
+			</icu:scripts>
+		</special>
+	</characters>
+</ldml>
+

Modified: trunk/source/data/xml/main/pa_Arab.xml
===================================================================
--- trunk/source/data/xml/main/pa_Arab.xml	2009-07-02 19:27:40 UTC (rev 211)
+++ trunk/source/data/xml/main/pa_Arab.xml	2009-07-02 19:28:39 UTC (rev 212)
@@ -1,25 +1,25 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!--
- Copyright (c) 2002-2008 International Business Machines Corporation and others. All rights reserved.
--->
-<!DOCTYPE ldml SYSTEM "http://www.unicode.org/cldr/dtd/1.6/ldml.dtd"
-[
-   <!ENTITY % icu SYSTEM " http://www.unicode.org/cldr/dtd/1.6/ldmlICU.dtd">
-   %icu;
-]
->
-<ldml>
-	<identity>
-		<version number="$Revision: 1.2 $"/>
-		<generation date="$Date: 2008/05/25 01:05:57 $"/>
-		<language type="pa"/> 
-	        <script type="Arab"/> 
-	</identity>
-	<characters>
-		<special xmlns:icu="http://www.icu-project.org/">
-			<icu:scripts>
-				<icu:script type="1">Arab</icu:script>
-			</icu:scripts>
-		</special>
-	</characters>
-</ldml>
+<?xml version="1.0" encoding="UTF-8" ?>
+<!--
+ Copyright (c) 2002-2008 International Business Machines Corporation and others. All rights reserved.
+-->
+<!DOCTYPE ldml SYSTEM "http://www.unicode.org/cldr/dtd/1.6/ldml.dtd"
+[
+   <!ENTITY % icu SYSTEM " http://www.unicode.org/cldr/dtd/1.6/ldmlICU.dtd">
+   %icu;
+]
+>
+<ldml>
+	<identity>
+		<version number="$Revision: 1.2 $"/>
+		<generation date="$Date: 2008/05/25 01:05:57 $"/>
+		<language type="pa"/> 
+	        <script type="Arab"/> 
+	</identity>
+	<characters>
+		<special xmlns:icu="http://www.icu-project.org/">
+			<icu:scripts>
+				<icu:script type="1">Arab</icu:script>
+			</icu:scripts>
+		</special>
+	</characters>
+</ldml>

Modified: trunk/source/data/xml/main/pa_PK.xml
===================================================================
--- trunk/source/data/xml/main/pa_PK.xml	2009-07-02 19:27:40 UTC (rev 211)
+++ trunk/source/data/xml/main/pa_PK.xml	2009-07-02 19:28:39 UTC (rev 212)
@@ -1,19 +1,19 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!--
- Copyright (c) 2002-2008 International Business Machines Corporation and others. All rights reserved.
--->
-<!DOCTYPE ldml SYSTEM "http://www.unicode.org/cldr/dtd/1.6/ldml.dtd"
-[
-   <!ENTITY % icu SYSTEM " http://www.unicode.org/cldr/dtd/1.6/ldmlICU.dtd">
-   %icu;
-]
->
-<ldml>
-	<identity>
-		<version number="$Revision: 1.19 $"/>
-		<generation date="$Date: 2008/05/25 01:05:50 $"/>
-		<language type="pa"/> 
-		<territory type="PK"/> 
-	</identity>
-</ldml>
-
+<?xml version="1.0" encoding="UTF-8" ?>
+<!--
+ Copyright (c) 2002-2008 International Business Machines Corporation and others. All rights reserved.
+-->
+<!DOCTYPE ldml SYSTEM "http://www.unicode.org/cldr/dtd/1.6/ldml.dtd"
+[
+   <!ENTITY % icu SYSTEM " http://www.unicode.org/cldr/dtd/1.6/ldmlICU.dtd">
+   %icu;
+]
+>
+<ldml>
+	<identity>
+		<version number="$Revision: 1.19 $"/>
+		<generation date="$Date: 2008/05/25 01:05:50 $"/>
+		<language type="pa"/> 
+		<territory type="PK"/> 
+	</identity>
+</ldml>
+

Modified: trunk/source/data/xml/main/si.xml
===================================================================
--- trunk/source/data/xml/main/si.xml	2009-07-02 19:27:40 UTC (rev 211)
+++ trunk/source/data/xml/main/si.xml	2009-07-02 19:28:39 UTC (rev 212)
@@ -1,25 +1,25 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!--
- Copyright (c) 2002-2008 International Business Machines Corporation and others. All rights reserved.
--->
-<!DOCTYPE ldml SYSTEM "http://www.unicode.org/cldr/dtd/1.6/ldml.dtd"
-[
-   <!ENTITY % icu SYSTEM " http://www.unicode.org/cldr/dtd/1.6/ldmlICU.dtd">
-   %icu;
-]
->
-<ldml>
-	<identity>
-		<version number="$Revision: 1.22 $"/>
-		<generation date="$Date: 2008/05/25 01:05:53 $"/>
-		<language type="si"/> 
-	</identity>
-	<characters>
-		<special xmlns:icu="http://www.icu-project.org/">
-			<icu:scripts>
-				<icu:script type="1">Sinh</icu:script>
-			</icu:scripts>
-		</special>
-	</characters>
-</ldml>
-
+<?xml version="1.0" encoding="UTF-8" ?>
+<!--
+ Copyright (c) 2002-2008 International Business Machines Corporation and others. All rights reserved.
+-->
+<!DOCTYPE ldml SYSTEM "http://www.unicode.org/cldr/dtd/1.6/ldml.dtd"
+[
+   <!ENTITY % icu SYSTEM " http://www.unicode.org/cldr/dtd/1.6/ldmlICU.dtd">
+   %icu;
+]
+>
+<ldml>
+	<identity>
+		<version number="$Revision: 1.22 $"/>
+		<generation date="$Date: 2008/05/25 01:05:53 $"/>
+		<language type="si"/> 
+	</identity>
+	<characters>
+		<special xmlns:icu="http://www.icu-project.org/">
+			<icu:scripts>
+				<icu:script type="1">Sinh</icu:script>
+			</icu:scripts>
+		</special>
+	</characters>
+</ldml>
+

Modified: trunk/source/data/xml/main/zu.xml
===================================================================
--- trunk/source/data/xml/main/zu.xml	2009-07-02 19:27:40 UTC (rev 211)
+++ trunk/source/data/xml/main/zu.xml	2009-07-02 19:28:39 UTC (rev 212)
@@ -1,25 +1,25 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!--
- Copyright (c) 2002-2008 International Business Machines Corporation and others. All rights reserved.
--->
-<!DOCTYPE ldml SYSTEM "http://www.unicode.org/cldr/dtd/1.6/ldml.dtd"
-[
-   <!ENTITY % icu SYSTEM " http://www.unicode.org/cldr/dtd/1.6/ldmlICU.dtd">
-   %icu;
-]
->
-<ldml>
-	<identity>
-		<version number="$Revision: 1.23 $"/>
-		<generation date="$Date: 2008/05/25 01:05:51 $"/>
-		<language type="zu"/> 
-	</identity>
-	<characters>
-		<special xmlns:icu="http://www.icu-project.org/">
-			<icu:scripts>
-				<icu:script type="1">Latn</icu:script>
-			</icu:scripts>
-		</special>
-	</characters>
-</ldml>
-
+<?xml version="1.0" encoding="UTF-8" ?>
+<!--
+ Copyright (c) 2002-2008 International Business Machines Corporation and others. All rights reserved.
+-->
+<!DOCTYPE ldml SYSTEM "http://www.unicode.org/cldr/dtd/1.6/ldml.dtd"
+[
+   <!ENTITY % icu SYSTEM " http://www.unicode.org/cldr/dtd/1.6/ldmlICU.dtd">
+   %icu;
+]
+>
+<ldml>
+	<identity>
+		<version number="$Revision: 1.23 $"/>
+		<generation date="$Date: 2008/05/25 01:05:51 $"/>
+		<language type="zu"/> 
+	</identity>
+	<characters>
+		<special xmlns:icu="http://www.icu-project.org/">
+			<icu:scripts>
+				<icu:script type="1">Latn</icu:script>
+			</icu:scripts>
+		</special>
+	</characters>
+</ldml>
+




More information about the sword-cvs mailing list