X-Git-Url: https://git.saurik.com/apple/icu.git/blobdiff_plain/f59164e3d128c7675a4d3934206346a3384e53a5..f3c0d7a59d99c2a94c6b8822291f0e42be3773c9:/icuSources/data/misc/plurals.txt

diff --git a/icuSources/data/misc/plurals.txt b/icuSources/data/misc/plurals.txt
index f5b24d13..bca32304 100644
--- a/icuSources/data/misc/plurals.txt
+++ b/icuSources/data/misc/plurals.txt
@@ -1,87 +1,81 @@
-// ***************************************************************************
-// *
-// * Copyright (C) 2016 International Business Machines
-// * Corporation and others. All Rights Reserved.
-// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
-// * Source File: <path>/plurals.xml, ordinals.xml
-// *
-// ***************************************************************************
+// © 2016 and later: Unicode, Inc. and others.
+// License & terms of use: http://www.unicode.org/copyright.html#License
 plurals:table(nofallback){
     locales{
         af{"set8"}
-        ak{"set5"}
+        ak{"set6"}
         am{"set1"}
-        ar{"set34"}
-        ars{"set34"}
+        ar{"set33"}
+        ars{"set33"}
         as{"set1"}
         asa{"set8"}
-        ast{"set3"}
+        ast{"set4"}
         az{"set8"}
-        be{"set27"}
+        be{"set26"}
         bem{"set8"}
         bez{"set8"}
         bg{"set8"}
-        bh{"set5"}
+        bh{"set6"}
         bm{"set0"}
         bn{"set1"}
         bo{"set0"}
-        br{"set31"}
+        br{"set30"}
         brx{"set8"}
-        bs{"set20"}
-        ca{"set3"}
+        bs{"set19"}
+        ca{"set4"}
         ce{"set8"}
         cgg{"set8"}
         chr{"set8"}
         ckb{"set8"}
-        cs{"set25"}
-        cy{"set35"}
-        da{"set10"}
-        de{"set3"}
-        dsb{"set23"}
+        cs{"set24"}
+        cy{"set34"}
+        da{"set9"}
+        de{"set4"}
+        dsb{"set22"}
         dv{"set8"}
         dz{"set0"}
         ee{"set8"}
         el{"set8"}
-        en{"set3"}
+        en{"set4"}
         eo{"set8"}
         es{"set8"}
-        et{"set3"}
+        et{"set4"}
         eu{"set8"}
         fa{"set1"}
         ff{"set2"}
-        fi{"set3"}
-        fil{"set13"}
+        fi{"set4"}
+        fil{"set12"}
         fo{"set8"}
         fr{"set2"}
         fur{"set8"}
-        fy{"set3"}
-        ga{"set32"}
-        gd{"set21"}
-        gl{"set3"}
+        fy{"set4"}
+        ga{"set31"}
+        gd{"set20"}
+        gl{"set4"}
         gsw{"set8"}
         gu{"set1"}
-        guw{"set5"}
-        gv{"set33"}
+        guw{"set6"}
+        gv{"set32"}
         ha{"set8"}
         haw{"set8"}
-        he{"set24"}
+        he{"set23"}
         hi{"set1"}
-        hr{"set20"}
-        hsb{"set23"}
+        hr{"set19"}
+        hsb{"set22"}
         hu{"set8"}
         hy{"set2"}
         id{"set0"}
         ig{"set0"}
         ii{"set0"}
         in{"set0"}
-        is{"set11"}
-        it{"set3"}
-        iu{"set17"}
-        iw{"set24"}
+        is{"set10"}
+        it{"set4"}
+        iu{"set16"}
+        iw{"set23"}
         ja{"set0"}
         jbo{"set0"}
         jgo{"set8"}
-        ji{"set3"}
+        ji{"set4"}
         jmc{"set8"}
         jv{"set0"}
         jw{"set0"}
@@ -99,205 +93,207 @@ plurals:table(nofallback){
         ko{"set0"}
         ks{"set8"}
         ksb{"set8"}
-        ksh{"set16"}
+        ksh{"set15"}
         ku{"set8"}
-        kw{"set17"}
+        kw{"set16"}
         ky{"set8"}
-        lag{"set15"}
+        lag{"set14"}
         lb{"set8"}
         lg{"set8"}
         lkt{"set0"}
-        ln{"set5"}
+        ln{"set6"}
         lo{"set0"}
-        lt{"set28"}
-        lv{"set14"}
+        lt{"set27"}
+        lv{"set13"}
         mas{"set8"}
-        mg{"set5"}
+        mg{"set6"}
         mgo{"set8"}
-        mk{"set12"}
+        mk{"set11"}
         ml{"set8"}
         mn{"set8"}
-        mo{"set19"}
+        mo{"set18"}
         mr{"set1"}
         ms{"set0"}
-        mt{"set29"}
+        mt{"set28"}
         my{"set0"}
         nah{"set8"}
-        naq{"set17"}
+        naq{"set16"}
         nb{"set8"}
         nd{"set8"}
         ne{"set8"}
-        nl{"set3"}
+        nl{"set4"}
         nn{"set8"}
         nnh{"set8"}
         no{"set8"}
         nqo{"set0"}
         nr{"set8"}
-        nso{"set5"}
+        nso{"set6"}
         ny{"set8"}
         nyn{"set8"}
         om{"set8"}
         or{"set8"}
         os{"set8"}
-        pa{"set5"}
+        pa{"set6"}
         pap{"set8"}
-        pl{"set26"}
-        prg{"set14"}
+        pl{"set25"}
+        prg{"set13"}
         ps{"set8"}
-        pt{"set7"}
-        pt_PT{"set9"}
+        pt{"set3"}
+        pt_PT{"set4"}
         rm{"set8"}
-        ro{"set19"}
+        ro{"set18"}
         rof{"set8"}
         root{"set0"}
-        ru{"set30"}
+        ru{"set29"}
         rwk{"set8"}
         sah{"set0"}
         saq{"set8"}
         sdh{"set8"}
-        se{"set17"}
+        se{"set16"}
         seh{"set8"}
         ses{"set0"}
         sg{"set0"}
-        sh{"set20"}
-        shi{"set18"}
-        si{"set4"}
-        sk{"set25"}
-        sl{"set22"}
-        sma{"set17"}
-        smi{"set17"}
-        smj{"set17"}
-        smn{"set17"}
-        sms{"set17"}
+        sh{"set19"}
+        shi{"set17"}
+        si{"set5"}
+        sk{"set24"}
+        sl{"set21"}
+        sma{"set16"}
+        smi{"set16"}
+        smj{"set16"}
+        smn{"set16"}
+        sms{"set16"}
         sn{"set8"}
         so{"set8"}
         sq{"set8"}
-        sr{"set20"}
+        sr{"set19"}
         ss{"set8"}
         ssy{"set8"}
         st{"set8"}
-        sv{"set3"}
-        sw{"set3"}
+        sv{"set4"}
+        sw{"set4"}
         syr{"set8"}
         ta{"set8"}
         te{"set8"}
         teo{"set8"}
         th{"set0"}
-        ti{"set5"}
+        ti{"set6"}
         tig{"set8"}
         tk{"set8"}
-        tl{"set13"}
+        tl{"set12"}
         tn{"set8"}
         to{"set0"}
         tr{"set8"}
         ts{"set8"}
-        tzm{"set6"}
+        tzm{"set7"}
         ug{"set8"}
-        uk{"set30"}
-        ur{"set3"}
+        uk{"set29"}
+        ur{"set4"}
         uz{"set8"}
         ve{"set8"}
         vi{"set0"}
         vo{"set8"}
         vun{"set8"}
-        wa{"set5"}
+        wa{"set6"}
         wae{"set8"}
         wo{"set0"}
         xh{"set8"}
         xog{"set8"}
-        yi{"set3"}
+        yi{"set4"}
         yo{"set0"}
+        yue{"set0"}
         zh{"set0"}
         zu{"set1"}
     }
     locales_ordinals{
-        af{"set36"}
-        am{"set36"}
-        ar{"set36"}
-        ars{"set36"}
-        as{"set53"}
-        az{"set51"}
-        be{"set41"}
-        bg{"set36"}
-        bn{"set53"}
-        bs{"set36"}
-        ca{"set49"}
-        ce{"set36"}
-        cs{"set36"}
-        cy{"set54"}
-        da{"set36"}
-        de{"set36"}
-        dsb{"set36"}
-        el{"set36"}
-        en{"set47"}
-        es{"set36"}
-        et{"set36"}
-        eu{"set36"}
-        fa{"set36"}
-        fi{"set36"}
-        fil{"set38"}
-        fr{"set38"}
-        fy{"set36"}
-        ga{"set38"}
-        gl{"set36"}
-        gu{"set52"}
-        he{"set36"}
-        hi{"set52"}
-        hr{"set36"}
-        hsb{"set36"}
-        hu{"set39"}
-        hy{"set38"}
-        id{"set36"}
-        in{"set36"}
-        is{"set36"}
-        it{"set44"}
-        iw{"set36"}
-        ja{"set36"}
-        ka{"set45"}
-        kk{"set43"}
-        km{"set36"}
-        kn{"set36"}
-        ko{"set36"}
-        ky{"set36"}
-        lo{"set38"}
-        lt{"set36"}
-        lv{"set36"}
-        mk{"set50"}
-        ml{"set36"}
-        mn{"set36"}
-        mo{"set38"}
-        mr{"set48"}
-        ms{"set38"}
-        my{"set36"}
-        nb{"set36"}
-        ne{"set40"}
-        nl{"set36"}
-        pa{"set36"}
-        pl{"set36"}
-        prg{"set36"}
-        pt{"set36"}
-        ro{"set38"}
-        root{"set36"}
-        ru{"set36"}
-        sh{"set36"}
-        si{"set36"}
-        sk{"set36"}
-        sl{"set36"}
-        sq{"set46"}
-        sr{"set36"}
-        sv{"set37"}
-        sw{"set36"}
-        ta{"set36"}
-        te{"set36"}
-        th{"set36"}
-        tl{"set38"}
-        tr{"set36"}
-        uk{"set42"}
-        ur{"set36"}
-        uz{"set36"}
-        vi{"set38"}
-        zh{"set36"}
-        zu{"set36"}
+        af{"set35"}
+        am{"set35"}
+        ar{"set35"}
+        as{"set52"}
+        az{"set50"}
+        be{"set40"}
+        bg{"set35"}
+        bn{"set52"}
+        bs{"set35"}
+        ca{"set48"}
+        ce{"set35"}
+        cs{"set35"}
+        cy{"set53"}
+        da{"set35"}
+        de{"set35"}
+        dsb{"set35"}
+        el{"set35"}
+        en{"set46"}
+        es{"set35"}
+        et{"set35"}
+        eu{"set35"}
+        fa{"set35"}
+        fi{"set35"}
+        fil{"set37"}
+        fr{"set37"}
+        fy{"set35"}
+        ga{"set37"}
+        gl{"set35"}
+        gsw{"set35"}
+        gu{"set51"}
+        he{"set35"}
+        hi{"set51"}
+        hr{"set35"}
+        hsb{"set35"}
+        hu{"set38"}
+        hy{"set37"}
+        id{"set35"}
+        in{"set35"}
+        is{"set35"}
+        it{"set43"}
+        iw{"set35"}
+        ja{"set35"}
+        ka{"set44"}
+        kk{"set42"}
+        km{"set35"}
+        kn{"set35"}
+        ko{"set35"}
+        ky{"set35"}
+        lo{"set37"}
+        lt{"set35"}
+        lv{"set35"}
+        mk{"set49"}
+        ml{"set35"}
+        mn{"set35"}
+        mo{"set37"}
+        mr{"set47"}
+        ms{"set37"}
+        my{"set35"}
+        nb{"set35"}
+        ne{"set39"}
+        nl{"set35"}
+        pa{"set35"}
+        pl{"set35"}
+        prg{"set35"}
+        pt{"set35"}
+        ro{"set37"}
+        root{"set35"}
+        ru{"set35"}
+        sh{"set35"}
+        si{"set35"}
+        sk{"set35"}
+        sl{"set35"}
+        sq{"set45"}
+        sr{"set35"}
+        sv{"set36"}
+        sw{"set35"}
+        ta{"set35"}
+        te{"set35"}
+        th{"set35"}
+        tl{"set37"}
+        tr{"set35"}
+        uk{"set41"}
+        ur{"set35"}
+        uz{"set35"}
+        vi{"set37"}
+        yue{"set35"}
+        zh{"set35"}
+        zu{"set35"}
     }
     rules{
         set0{
@@ -314,13 +310,6 @@ plurals:table(nofallback){
             }
         }
         set10{
-            one{"n = 1 or t != 0 and i = 0,1 @integer 1 @decimal 0.1~1.6"}
-            other{
-                " @integer 0, 2~16, 100, 1000, 10000, 100000, 1000000, … @decimal 0.0"
-                ", 2.0~3.4, 10.0, 100.0, 1000.0, 10000.0, 100000.0, 1000000.0, …"
-            }
-        }
-        set11{
             one{
                 "t = 0 and i % 10 = 1 and i % 100 != 11 or t != 0 @integer 1, 21, 31,"
                 " 41, 51, 61, 71, 81, 101, 1001, … @decimal 0.1~1.6, 10.1, 100.1, 100"
@@ -332,7 +321,7 @@ plurals:table(nofallback){
                 "00000.0, 1000000.0, …"
             }
         }
-        set12{
+        set11{
             one{
                 "v = 0 and i % 10 = 1 or f % 10 = 1 @integer 1, 11, 21, 31, 41, 51, 6"
                 "1, 71, 101, 1001, … @decimal 0.1, 1.1, 2.1, 3.1, 4.1, 5.1, 6.1, 7.1,"
@@ -344,7 +333,7 @@ plurals:table(nofallback){
                 "000000.0, …"
             }
         }
-        set13{
+        set12{
             one{
                 "v = 0 and i = 1,2,3 or v = 0 and i % 10 != 4,6,9 or v != 0 and f % 1"
                 "0 != 4,6,9 @integer 0~3, 5, 7, 8, 10~13, 15, 17, 18, 20, 21, 100, 10"
@@ -357,7 +346,7 @@ plurals:table(nofallback){
                 "6, 0.9, 1.4, 1.6, 1.9, 2.4, 2.6, 10.4, 100.4, 1000.4, …"
             }
         }
-        set14{
+        set13{
             one{
                 "n % 10 = 1 and n % 100 != 11 or v = 2 and f % 10 = 1 and f % 100 != "
                 "11 or v != 2 and f % 10 = 1 @integer 1, 21, 31, 41, 51, 61, 71, 81, "
@@ -375,7 +364,7 @@ plurals:table(nofallback){
                 "10000.0, 100000.0, 1000000.0, …"
             }
         }
-        set15{
+        set14{
             one{"i = 0,1 and n != 0 @integer 1 @decimal 0.1~1.6"}
             other{
                 " @integer 2~17, 100, 1000, 10000, 100000, 1000000, … @decimal 2.0~3."
@@ -383,7 +372,7 @@ plurals:table(nofallback){
             }
             zero{"n = 0 @integer 0 @decimal 0.0, 0.00, 0.000, 0.0000"}
         }
-        set16{
+        set15{
             one{"n = 1 @integer 1 @decimal 1.0, 1.00, 1.000, 1.0000"}
             other{
                 " @integer 2~17, 100, 1000, 10000, 100000, 1000000, … @decimal 0.1~0."
@@ -391,7 +380,7 @@ plurals:table(nofallback){
             }
             zero{"n = 0 @integer 0 @decimal 0.0, 0.00, 0.000, 0.0000"}
         }
-        set17{
+        set16{
             one{"n = 1 @integer 1 @decimal 1.0, 1.00, 1.000, 1.0000"}
             other{
                 " @integer 0, 3~17, 100, 1000, 10000, 100000, 1000000, … @decimal 0.0"
@@ -399,7 +388,7 @@ plurals:table(nofallback){
             }
             two{"n = 2 @integer 2 @decimal 2.0, 2.00, 2.000, 2.0000"}
         }
-        set18{
+        set17{
             few{
                 "n = 2..10 @integer 2~10 @decimal 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, "
                 "9.0, 10.0, 2.00, 3.00, 4.00, 5.00, 6.00, 7.00, 8.00"
@@ -410,7 +399,7 @@ plurals:table(nofallback){
                 ".9, 2.1~2.7, 10.1, 100.0, 1000.0, 10000.0, 100000.0, 1000000.0, …"
             }
         }
-        set19{
+        set18{
             few{
                 "v != 0 or n = 0 or n != 1 and n % 100 = 1..19 @integer 0, 2~16, 101,"
                 " 1001, … @decimal 0.0~1.5, 10.0, 100.0, 1000.0, 10000.0, 100000.0, 1"
@@ -419,14 +408,7 @@ plurals:table(nofallback){
             one{"i = 1 and v = 0 @integer 1"}
             other{" @integer 20~35, 100, 1000, 10000, 100000, 1000000, …"}
         }
-        set2{
-            one{"i = 0,1 @integer 0, 1 @decimal 0.0~1.5"}
-            other{
-                " @integer 2~17, 100, 1000, 10000, 100000, 1000000, … @decimal 2.0~3."
-                "5, 10.0, 100.0, 1000.0, 10000.0, 100000.0, 1000000.0, …"
-            }
-        }
-        set20{
+        set19{
             few{
                 "v = 0 and i % 10 = 2..4 and i % 100 != 12..14 or f % 10 = 2..4 and f"
                 " % 100 != 12..14 @integer 2~4, 22~24, 32~34, 42~44, 52~54, 62, 102, "
@@ -444,7 +426,14 @@ plurals:table(nofallback){
                 " 1000000.0, …"
             }
         }
-        set21{
+        set2{
+            one{"i = 0,1 @integer 0, 1 @decimal 0.0~1.5"}
+            other{
+                " @integer 2~17, 100, 1000, 10000, 100000, 1000000, … @decimal 2.0~3."
+                "5, 10.0, 100.0, 1000.0, 10000.0, 100000.0, 1000000.0, …"
+            }
+        }
+        set20{
             few{
                 "n = 3..10,13..19 @integer 3~10, 13~19 @decimal 3.0, 4.0, 5.0, 6.0, 7"
                 ".0, 8.0, 9.0, 10.0, 13.0, 14.0, 15.0, 16.0, 17.0, 18.0, 19.0, 3.00"
@@ -462,7 +451,7 @@ plurals:table(nofallback){
                 "00, 2.0000"
             }
         }
-        set22{
+        set21{
             few{
                 "v = 0 and i % 100 = 3..4 or v != 0 @integer 3, 4, 103, 104, 203, 204"
                 ", 303, 304, 403, 404, 503, 504, 603, 604, 703, 704, 1003, … @decimal"
@@ -478,7 +467,7 @@ plurals:table(nofallback){
                 " 1002, …"
             }
         }
-        set23{
+        set22{
             few{
                 "v = 0 and i % 100 = 3..4 or f % 100 = 3..4 @integer 3, 4, 103, 104, "
                 "203, 204, 303, 304, 403, 404, 503, 504, 603, 604, 703, 704, 1003, … "
@@ -501,7 +490,7 @@ plurals:table(nofallback){
                 "7.2, 10.2, 100.2, 1000.2, …"
             }
         }
-        set24{
+        set23{
             many{
                 "v = 0 and n != 0..10 and n % 10 = 0 @integer 20, 30, 40, 50, 60, 70,"
                 " 80, 90, 100, 1000, 10000, 100000, 1000000, …"
@@ -513,7 +502,7 @@ plurals:table(nofallback){
             }
             two{"i = 2 and v = 0 @integer 2"}
         }
-        set25{
+        set24{
             few{"i = 2..4 and v = 0 @integer 2~4"}
             many{
                 "v != 0   @decimal 0.0~1.5, 10.0, 100.0, 1000.0, 10000.0, 100000.0, 1"
@@ -522,7 +511,7 @@ plurals:table(nofallback){
             one{"i = 1 and v = 0 @integer 1"}
             other{" @integer 0, 5~19, 100, 1000, 10000, 100000, 1000000, …"}
         }
-        set26{
+        set25{
             few{
                 "v = 0 and i % 10 = 2..4 and i % 100 != 12..14 @integer 2~4, 22~24, 3"
                 "2~34, 42~44, 52~54, 62, 102, 1002, …"
@@ -538,7 +527,7 @@ plurals:table(nofallback){
                 ".0, …"
             }
         }
-        set27{
+        set26{
             few{
                 "n % 10 = 2..4 and n % 100 != 12..14 @integer 2~4, 22~24, 32~34, 42~4"
                 "4, 52~54, 62, 102, 1002, … @decimal 2.0, 3.0, 4.0, 22.0, 23.0, 24.0,"
@@ -556,7 +545,7 @@ plurals:table(nofallback){
             }
             other{"   @decimal 0.1~0.9, 1.1~1.7, 10.1, 100.1, 1000.1, …"}
         }
-        set28{
+        set27{
             few{
                 "n % 10 = 2..9 and n % 100 != 11..19 @integer 2~9, 22~29, 102, 1002, "
                 "… @decimal 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0, 22.0, 102.0, 1002"
@@ -574,7 +563,7 @@ plurals:table(nofallback){
                 "1000.0, 10000.0, 100000.0, 1000000.0, …"
             }
         }
-        set29{
+        set28{
             few{
                 "n = 0 or n % 100 = 2..10 @integer 0, 2~10, 102~107, 1002, … @decimal"
                 " 0.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 10.0, 102.0, 1002.0, …"
@@ -589,14 +578,7 @@ plurals:table(nofallback){
                 ".9, 1.1~1.7, 10.1, 100.0, 1000.0, 10000.0, 100000.0, 1000000.0, …"
             }
         }
-        set3{
-            one{"i = 1 and v = 0 @integer 1"}
-            other{
-                " @integer 0, 2~16, 100, 1000, 10000, 100000, 1000000, … @decimal 0.0"
-                "~1.5, 10.0, 100.0, 1000.0, 10000.0, 100000.0, 1000000.0, …"
-            }
-        }
-        set30{
+        set29{
             few{
                 "v = 0 and i % 10 = 2..4 and i % 100 != 12..14 @integer 2~4, 22~24, 3"
                 "2~34, 42~44, 52~54, 62, 102, 1002, …"
@@ -614,7 +596,14 @@ plurals:table(nofallback){
                 ".0, …"
             }
         }
-        set31{
+        set3{
+            one{"i = 0..1 @integer 0, 1 @decimal 0.0~1.5"}
+            other{
+                " @integer 2~17, 100, 1000, 10000, 100000, 1000000, … @decimal 2.0~3."
+                "5, 10.0, 100.0, 1000.0, 10000.0, 100000.0, 1000000.0, …"
+            }
+        }
+        set30{
             few{
                 "n % 10 = 3..4,9 and n % 100 != 10..19,70..79,90..99 @integer 3, 4, 9"
                 ", 23, 24, 29, 33, 34, 39, 43, 44, 49, 103, 1003, … @decimal 3.0, 4.0"
@@ -639,7 +628,7 @@ plurals:table(nofallback){
                 "2.0, 1002.0, …"
             }
         }
-        set32{
+        set31{
             few{
                 "n = 3..6 @integer 3~6 @decimal 3.0, 4.0, 5.0, 6.0, 3.00, 4.00, 5.00,"
                 " 6.00, 3.000, 4.000, 5.000, 6.000, 3.0000, 4.0000, 5.0000, 6.0000"
@@ -656,7 +645,7 @@ plurals:table(nofallback){
             }
             two{"n = 2 @integer 2 @decimal 2.0, 2.00, 2.000, 2.0000"}
         }
-        set33{
+        set32{
             few{
                 "v = 0 and i % 100 = 0,20,40,60,80 @integer 0, 20, 40, 60, 80, 100, 1"
                 "20, 140, 1000, 10000, 100000, 1000000, …"
@@ -675,7 +664,7 @@ plurals:table(nofallback){
                 "02, …"
             }
         }
-        set34{
+        set33{
             few{
                 "n % 100 = 3..10 @integer 3~10, 103~110, 1003, … @decimal 3.0, 4.0, 5"
                 ".0, 6.0, 7.0, 8.0, 9.0, 10.0, 103.0, 1003.0, …"
@@ -693,7 +682,7 @@ plurals:table(nofallback){
             two{"n = 2 @integer 2 @decimal 2.0, 2.00, 2.000, 2.0000"}
             zero{"n = 0 @integer 0 @decimal 0.0, 0.00, 0.000, 0.0000"}
         }
-        set35{
+        set34{
             few{"n = 3 @integer 3 @decimal 3.0, 3.00, 3.000, 3.0000"}
             many{"n = 6 @integer 6 @decimal 6.0, 6.00, 6.000, 6.0000"}
             one{"n = 1 @integer 1 @decimal 1.0, 1.00, 1.000, 1.0000"}
@@ -705,53 +694,50 @@ plurals:table(nofallback){
             two{"n = 2 @integer 2 @decimal 2.0, 2.00, 2.000, 2.0000"}
             zero{"n = 0 @integer 0 @decimal 0.0, 0.00, 0.000, 0.0000"}
         }
-        set36{
+        set35{
             other{" @integer 0~15, 100, 1000, 10000, 100000, 1000000, …"}
         }
-        set37{
+        set36{
             one{
                 "n % 10 = 1,2 and n % 100 != 11,12 @integer 1, 2, 21, 22, 31, 32, 41,"
                 " 42, 51, 52, 61, 62, 71, 72, 81, 82, 101, 1001, …"
             }
             other{" @integer 0, 3~17, 100, 1000, 10000, 100000, 1000000, …"}
         }
-        set38{
+        set37{
             one{"n = 1 @integer 1"}
             other{" @integer 0, 2~16, 100, 1000, 10000, 100000, 1000000, …"}
         }
-        set39{
+        set38{
             one{"n = 1,5 @integer 1, 5"}
             other{" @integer 0, 2~4, 6~17, 100, 1000, 10000, 100000, 1000000, …"}
         }
+        set39{
+            one{"n = 1..4 @integer 1~4"}
+            other{" @integer 0, 5~19, 100, 1000, 10000, 100000, 1000000, …"}
+        }
         set4{
-            one{
-                "n = 0,1 or i = 0 and f = 1 @integer 0, 1 @decimal 0.0, 0.1, 1.0, 0.0"
-                "0, 0.01, 1.00, 0.000, 0.001, 1.000, 0.0000, 0.0001, 1.0000"
-            }
+            one{"i = 1 and v = 0 @integer 1"}
             other{
-                " @integer 2~17, 100, 1000, 10000, 100000, 1000000, … @decimal 0.2~0."
-                "9, 1.1~1.8, 10.0, 100.0, 1000.0, 10000.0, 100000.0, 1000000.0, …"
+                " @integer 0, 2~16, 100, 1000, 10000, 100000, 1000000, … @decimal 0.0"
+                "~1.5, 10.0, 100.0, 1000.0, 10000.0, 100000.0, 1000000.0, …"
             }
         }
         set40{
-            one{"n = 1..4 @integer 1~4"}
-            other{" @integer 0, 5~19, 100, 1000, 10000, 100000, 1000000, …"}
-        }
-        set41{
             few{
                 "n % 10 = 2,3 and n % 100 != 12,13 @integer 2, 3, 22, 23, 32, 33, 42,"
                 " 43, 52, 53, 62, 63, 72, 73, 82, 83, 102, 1002, …"
             }
             other{" @integer 0, 1, 4~17, 100, 1000, 10000, 100000, 1000000, …"}
         }
-        set42{
+        set41{
             few{
                 "n % 10 = 3 and n % 100 != 13 @integer 3, 23, 33, 43, 53, 63, 73, 83,"
                 " 103, 1003, …"
             }
             other{" @integer 0~2, 4~16, 100, 1000, 10000, 100000, 1000000, …"}
         }
-        set43{
+        set42{
             many{
                 "n % 10 = 6 or n % 10 = 9 or n % 10 = 0 and n != 0 @integer 6, 9, 10,"
                 " 16, 19, 20, 26, 29, 30, 36, 39, 40, 100, 1000, 10000, 100000, 10000"
@@ -759,16 +745,16 @@ plurals:table(nofallback){
             }
             other{" @integer 0~5, 7, 8, 11~15, 17, 18, 21, 101, 1001, …"}
         }
-        set44{
+        set43{
             many{"n = 11,8,80,800 @integer 8, 11, 80, 800"}
             other{" @integer 0~7, 9, 10, 12~17, 100, 1000, 10000, 100000, 1000000, …"}
         }
-        set45{
+        set44{
             many{"i = 0 or i % 100 = 2..20,40,60,80 @integer 0, 2~16, 102, 1002, …"}
             one{"i = 1 @integer 1"}
             other{" @integer 21~36, 100, 1000, 10000, 100000, 1000000, …"}
         }
-        set46{
+        set45{
             many{
                 "n % 10 = 4 and n % 100 != 14 @integer 4, 24, 34, 44, 54, 64, 74, 84,"
                 " 104, 1004, …"
@@ -776,7 +762,7 @@ plurals:table(nofallback){
             one{"n = 1 @integer 1"}
             other{" @integer 0, 2, 3, 5~17, 100, 1000, 10000, 100000, 1000000, …"}
         }
-        set47{
+        set46{
             few{
                 "n % 10 = 3 and n % 100 != 13 @integer 3, 23, 33, 43, 53, 63, 73, 83,"
                 " 103, 1003, …"
@@ -791,29 +777,19 @@ plurals:table(nofallback){
                 " 102, 1002, …"
             }
         }
-        set48{
+        set47{
             few{"n = 4 @integer 4"}
             one{"n = 1 @integer 1"}
             other{" @integer 0, 5~19, 100, 1000, 10000, 100000, 1000000, …"}
             two{"n = 2,3 @integer 2, 3"}
         }
-        set49{
+        set48{
             few{"n = 4 @integer 4"}
             one{"n = 1,3 @integer 1, 3"}
             other{" @integer 0, 5~19, 100, 1000, 10000, 100000, 1000000, …"}
             two{"n = 2 @integer 2"}
         }
-        set5{
-            one{
-                "n = 0..1 @integer 0, 1 @decimal 0.0, 1.0, 0.00, 1.00, 0.000, 1.000, "
-                "0.0000, 1.0000"
-            }
-            other{
-                " @integer 2~17, 100, 1000, 10000, 100000, 1000000, … @decimal 0.1~0."
-                "9, 1.1~1.7, 10.0, 100.0, 1000.0, 10000.0, 100000.0, 1000000.0, …"
-            }
-        }
-        set50{
+        set49{
             many{
                 "i % 10 = 7,8 and i % 100 != 17,18 @integer 7, 8, 27, 28, 37, 38, 47,"
                 " 48, 57, 58, 67, 68, 77, 78, 87, 88, 107, 1007, …"
@@ -828,7 +804,17 @@ plurals:table(nofallback){
                 " 102, 1002, …"
             }
         }
-        set51{
+        set5{
+            one{
+                "n = 0,1 or i = 0 and f = 1 @integer 0, 1 @decimal 0.0, 0.1, 1.0, 0.0"
+                "0, 0.01, 1.00, 0.000, 0.001, 1.000, 0.0000, 0.0001, 1.0000"
+            }
+            other{
+                " @integer 2~17, 100, 1000, 10000, 100000, 1000000, … @decimal 0.2~0."
+                "9, 1.1~1.8, 10.0, 100.0, 1000.0, 10000.0, 100000.0, 1000000.0, …"
+            }
+        }
+        set50{
             few{
                 "i % 10 = 3,4 or i % 1000 = 100,200,300,400,500,600,700,800,900 @inte"
                 "ger 3, 4, 13, 14, 23, 24, 33, 34, 43, 44, 53, 54, 63, 64, 73, 74, 10"
@@ -847,21 +833,21 @@ plurals:table(nofallback){
                 "00000, 1000000, …"
             }
         }
-        set52{
+        set51{
             few{"n = 4 @integer 4"}
             many{"n = 6 @integer 6"}
             one{"n = 1 @integer 1"}
             other{" @integer 0, 5, 7~20, 100, 1000, 10000, 100000, 1000000, …"}
             two{"n = 2,3 @integer 2, 3"}
         }
-        set53{
+        set52{
             few{"n = 4 @integer 4"}
             many{"n = 6 @integer 6"}
             one{"n = 1,5,7,8,9,10 @integer 1, 5, 7~10"}
             other{" @integer 0, 11~25, 100, 1000, 10000, 100000, 1000000, …"}
             two{"n = 2,3 @integer 2, 3"}
         }
-        set54{
+        set53{
             few{"n = 3,4 @integer 3, 4"}
             many{"n = 5,6 @integer 5, 6"}
             one{"n = 1 @integer 1"}
@@ -871,23 +857,23 @@ plurals:table(nofallback){
         }
         set6{
             one{
-                "n = 0..1 or n = 11..99 @integer 0, 1, 11~24 @decimal 0.0, 1.0, 11.0,"
-                " 12.0, 13.0, 14.0, 15.0, 16.0, 17.0, 18.0, 19.0, 20.0, 21.0, 22.0, 2"
-                "3.0, 24.0"
+                "n = 0..1 @integer 0, 1 @decimal 0.0, 1.0, 0.00, 1.00, 0.000, 1.000, "
+                "0.0000, 1.0000"
             }
             other{
-                " @integer 2~10, 100~106, 1000, 10000, 100000, 1000000, … @decimal 0."
-                "1~0.9, 1.1~1.7, 10.0, 100.0, 1000.0, 10000.0, 100000.0, 1000000.0, …"
+                " @integer 2~17, 100, 1000, 10000, 100000, 1000000, … @decimal 0.1~0."
+                "9, 1.1~1.7, 10.0, 100.0, 1000.0, 10000.0, 100000.0, 1000000.0, …"
             }
         }
         set7{
             one{
-                "n = 0..2 and n != 2 @integer 0, 1 @decimal 0.0, 1.0, 0.00, 1.00, 0.0"
-                "00, 1.000, 0.0000, 1.0000"
+                "n = 0..1 or n = 11..99 @integer 0, 1, 11~24 @decimal 0.0, 1.0, 11.0,"
+                " 12.0, 13.0, 14.0, 15.0, 16.0, 17.0, 18.0, 19.0, 20.0, 21.0, 22.0, 2"
+                "3.0, 24.0"
             }
             other{
-                " @integer 2~17, 100, 1000, 10000, 100000, 1000000, … @decimal 0.1~0."
-                "9, 1.1~1.7, 10.0, 100.0, 1000.0, 10000.0, 100000.0, 1000000.0, …"
+                " @integer 2~10, 100~106, 1000, 10000, 100000, 1000000, … @decimal 0."
+                "1~0.9, 1.1~1.7, 10.0, 100.0, 1000.0, 10000.0, 100000.0, 1000000.0, …"
             }
         }
         set8{
@@ -898,10 +884,10 @@ plurals:table(nofallback){
             }
         }
         set9{
-            one{"n = 1 and v = 0 @integer 1"}
+            one{"n = 1 or t != 0 and i = 0,1 @integer 1 @decimal 0.1~1.6"}
             other{
                 " @integer 0, 2~16, 100, 1000, 10000, 100000, 1000000, … @decimal 0.0"
-                "~1.5, 10.0, 100.0, 1000.0, 10000.0, 100000.0, 1000000.0, …"
+                ", 2.0~3.4, 10.0, 100.0, 1000.0, 10000.0, 100000.0, 1000000.0, …"
             }
         }
     }