X-Git-Url: https://git.saurik.com/apple/icu.git/blobdiff_plain/57a6839dcb3bba09e8228b822b290604668416fe..a0b4f637ba1a6c3c5651b61a69303b029bacf7d3:/icuSources/data/misc/plurals.txt

diff --git a/icuSources/data/misc/plurals.txt b/icuSources/data/misc/plurals.txt
index 5bf53412..569fcb8c 100644
--- a/icuSources/data/misc/plurals.txt
+++ b/icuSources/data/misc/plurals.txt
@@ -1,6 +1,6 @@
 // ***************************************************************************
 // *
-// * Copyright (C) 2014 International Business Machines
+// * Copyright (C) 2015 International Business Machines
 // * Corporation and others. All Rights Reserved.
 // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter
 // * Source File: <path>/plurals.xml, ordinals.xml
@@ -9,31 +9,34 @@
 plurals:table(nofallback){
     locales{
         af{"set8"}
-        ak{"set6"}
+        ak{"set5"}
         am{"set1"}
-        ar{"set33"}
+        ar{"set34"}
+        as{"set1"}
         asa{"set8"}
         ast{"set3"}
         az{"set8"}
-        be{"set26"}
+        be{"set27"}
         bem{"set8"}
         bez{"set8"}
         bg{"set8"}
-        bh{"set6"}
+        bh{"set5"}
         bm{"set0"}
         bn{"set1"}
         bo{"set0"}
-        br{"set30"}
+        br{"set31"}
         brx{"set8"}
         bs{"set20"}
         ca{"set3"}
+        ce{"set8"}
         cgg{"set8"}
         chr{"set8"}
         ckb{"set8"}
-        cs{"set24"}
-        cy{"set34"}
+        cs{"set25"}
+        cy{"set35"}
         da{"set10"}
         de{"set3"}
+        dsb{"set23"}
         dv{"set8"}
         dz{"set0"}
         ee{"set8"}
@@ -51,18 +54,19 @@ plurals:table(nofallback){
         fr{"set2"}
         fur{"set8"}
         fy{"set3"}
-        ga{"set31"}
+        ga{"set32"}
         gd{"set21"}
         gl{"set3"}
         gsw{"set8"}
         gu{"set1"}
-        guw{"set6"}
-        gv{"set32"}
+        guw{"set5"}
+        gv{"set33"}
         ha{"set8"}
         haw{"set8"}
-        he{"set23"}
+        he{"set24"}
         hi{"set1"}
         hr{"set20"}
+        hsb{"set23"}
         hu{"set8"}
         hy{"set2"}
         id{"set0"}
@@ -72,7 +76,7 @@ plurals:table(nofallback){
         is{"set11"}
         it{"set3"}
         iu{"set17"}
-        iw{"set23"}
+        iw{"set24"}
         ja{"set0"}
         jbo{"set0"}
         jgo{"set8"}
@@ -102,12 +106,12 @@ plurals:table(nofallback){
         lb{"set8"}
         lg{"set8"}
         lkt{"set0"}
-        ln{"set6"}
+        ln{"set5"}
         lo{"set0"}
-        lt{"set27"}
+        lt{"set28"}
         lv{"set14"}
         mas{"set8"}
-        mg{"set6"}
+        mg{"set5"}
         mgo{"set8"}
         mk{"set12"}
         ml{"set8"}
@@ -115,7 +119,7 @@ plurals:table(nofallback){
         mo{"set19"}
         mr{"set1"}
         ms{"set0"}
-        mt{"set28"}
+        mt{"set29"}
         my{"set0"}
         nah{"set8"}
         naq{"set17"}
@@ -128,24 +132,24 @@ plurals:table(nofallback){
         no{"set8"}
         nqo{"set0"}
         nr{"set8"}
-        nso{"set6"}
+        nso{"set5"}
         ny{"set8"}
         nyn{"set8"}
         om{"set8"}
         or{"set8"}
         os{"set8"}
-        pa{"set6"}
+        pa{"set5"}
         pap{"set8"}
-        pl{"set25"}
+        pl{"set26"}
         prg{"set14"}
         ps{"set8"}
-        pt{"set4"}
+        pt{"set7"}
         pt_PT{"set9"}
         rm{"set8"}
         ro{"set19"}
         rof{"set8"}
         root{"set0"}
-        ru{"set29"}
+        ru{"set30"}
         rwk{"set8"}
         sah{"set0"}
         saq{"set8"}
@@ -155,8 +159,8 @@ plurals:table(nofallback){
         sg{"set0"}
         sh{"set20"}
         shi{"set18"}
-        si{"set5"}
-        sk{"set24"}
+        si{"set4"}
+        sk{"set25"}
         sl{"set22"}
         sma{"set17"}
         smi{"set17"}
@@ -177,7 +181,7 @@ plurals:table(nofallback){
         te{"set8"}
         teo{"set8"}
         th{"set0"}
-        ti{"set6"}
+        ti{"set5"}
         tig{"set8"}
         tk{"set8"}
         tl{"set13"}
@@ -185,16 +189,16 @@ plurals:table(nofallback){
         to{"set0"}
         tr{"set8"}
         ts{"set8"}
-        tzm{"set7"}
+        tzm{"set6"}
         ug{"set8"}
-        uk{"set29"}
+        uk{"set30"}
         ur{"set3"}
         uz{"set8"}
         ve{"set8"}
         vi{"set0"}
         vo{"set8"}
         vun{"set8"}
-        wa{"set6"}
+        wa{"set5"}
         wae{"set8"}
         wo{"set0"}
         xh{"set8"}
@@ -205,85 +209,90 @@ plurals:table(nofallback){
         zu{"set1"}
     }
     locales_ordinals{
-        af{"set35"}
-        am{"set35"}
-        ar{"set35"}
-        az{"set48"}
-        bg{"set35"}
-        bn{"set50"}
-        ca{"set46"}
-        cs{"set35"}
-        cy{"set51"}
-        da{"set35"}
-        de{"set35"}
-        el{"set35"}
-        en{"set44"}
-        es{"set35"}
-        et{"set35"}
-        eu{"set35"}
-        fa{"set35"}
-        fi{"set35"}
-        fil{"set37"}
-        fr{"set37"}
-        fy{"set35"}
-        gl{"set35"}
-        gu{"set49"}
-        he{"set35"}
-        hi{"set49"}
-        hr{"set35"}
-        hu{"set38"}
-        hy{"set37"}
-        id{"set35"}
-        in{"set35"}
-        is{"set35"}
-        it{"set41"}
-        iw{"set35"}
-        ja{"set35"}
-        ka{"set42"}
-        kk{"set40"}
-        km{"set35"}
-        kn{"set35"}
-        ko{"set35"}
-        ky{"set35"}
-        lo{"set37"}
-        lt{"set35"}
-        lv{"set35"}
-        mk{"set47"}
-        ml{"set35"}
-        mn{"set35"}
-        mo{"set37"}
-        mr{"set45"}
-        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{"set43"}
-        sr{"set35"}
-        sv{"set36"}
-        sw{"set35"}
-        ta{"set35"}
-        te{"set35"}
-        th{"set35"}
-        tl{"set37"}
-        tr{"set35"}
-        uk{"set35"}
-        ur{"set35"}
-        uz{"set35"}
-        vi{"set37"}
-        zh{"set35"}
-        zu{"set35"}
+        af{"set36"}
+        am{"set36"}
+        ar{"set36"}
+        as{"set52"}
+        az{"set50"}
+        bg{"set36"}
+        bn{"set52"}
+        bs{"set36"}
+        ca{"set48"}
+        ce{"set36"}
+        cs{"set36"}
+        cy{"set53"}
+        da{"set36"}
+        de{"set36"}
+        dsb{"set36"}
+        el{"set36"}
+        en{"set46"}
+        es{"set36"}
+        et{"set36"}
+        eu{"set36"}
+        fa{"set36"}
+        fi{"set36"}
+        fil{"set38"}
+        fr{"set38"}
+        fy{"set36"}
+        gl{"set36"}
+        gu{"set51"}
+        he{"set36"}
+        hi{"set51"}
+        hr{"set36"}
+        hsb{"set36"}
+        hu{"set39"}
+        hy{"set38"}
+        id{"set36"}
+        in{"set36"}
+        is{"set36"}
+        it{"set43"}
+        iw{"set36"}
+        ja{"set36"}
+        ka{"set44"}
+        kk{"set42"}
+        km{"set36"}
+        kn{"set36"}
+        ko{"set36"}
+        ky{"set36"}
+        lo{"set38"}
+        lt{"set36"}
+        lv{"set36"}
+        mk{"set49"}
+        ml{"set36"}
+        mn{"set36"}
+        mo{"set38"}
+        mr{"set47"}
+        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{"set45"}
+        sr{"set36"}
+        sv{"set37"}
+        sw{"set36"}
+        ta{"set36"}
+        te{"set36"}
+        th{"set36"}
+        tl{"set38"}
+        tr{"set36"}
+        uk{"set41"}
+        ur{"set36"}
+        uz{"set36"}
+        vi{"set38"}
+        zh{"set36"}
+        zu{"set36"}
     }
     rules{
         set0{
@@ -465,6 +474,29 @@ plurals:table(nofallback){
             }
         }
         set23{
+            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, … "
+                "@decimal 0.3, 0.4, 1.3, 1.4, 2.3, 2.4, 3.3, 3.4, 4.3, 4.4, 5.3, 5.4,"
+                " 6.3, 6.4, 7.3, 7.4, 10.3, 100.3, 1000.3, …"
+            }
+            one{
+                "v = 0 and i % 100 = 1 or f % 100 = 1 @integer 1, 101, 201, 301, 401,"
+                " 501, 601, 701, 1001, … @decimal 0.1, 1.1, 2.1, 3.1, 4.1, 5.1, 6.1, "
+                "7.1, 10.1, 100.1, 1000.1, …"
+            }
+            other{
+                " @integer 0, 5~19, 100, 1000, 10000, 100000, 1000000, … @decimal 0.0"
+                ", 0.5~1.0, 1.5~2.0, 2.5~2.7, 10.0, 100.0, 1000.0, 10000.0, 100000.0,"
+                " 1000000.0, …"
+            }
+            two{
+                "v = 0 and i % 100 = 2 or f % 100 = 2 @integer 2, 102, 202, 302, 402,"
+                " 502, 602, 702, 1002, … @decimal 0.2, 1.2, 2.2, 3.2, 4.2, 5.2, 6.2, "
+                "7.2, 10.2, 100.2, 1000.2, …"
+            }
+        }
+        set24{
             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, …"
@@ -476,7 +508,7 @@ plurals:table(nofallback){
             }
             two{"i = 2 and v = 0 @integer 2"}
         }
-        set24{
+        set25{
             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"
@@ -485,7 +517,7 @@ plurals:table(nofallback){
             one{"i = 1 and v = 0 @integer 1"}
             other{" @integer 0, 5~19, 100, 1000, 10000, 100000, 1000000, …"}
         }
-        set25{
+        set26{
             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, …"
@@ -501,7 +533,7 @@ plurals:table(nofallback){
                 ".0, …"
             }
         }
-        set26{
+        set27{
             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,"
@@ -519,7 +551,7 @@ plurals:table(nofallback){
             }
             other{"   @decimal 0.1~0.9, 1.1~1.7, 10.1, 100.1, 1000.1, …"}
         }
-        set27{
+        set28{
             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"
@@ -537,7 +569,7 @@ plurals:table(nofallback){
                 "1000.0, 10000.0, 100000.0, 1000000.0, …"
             }
         }
-        set28{
+        set29{
             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, …"
@@ -552,7 +584,14 @@ plurals:table(nofallback){
                 ".9, 1.1~1.7, 10.1, 100.0, 1000.0, 10000.0, 100000.0, 1000000.0, …"
             }
         }
-        set29{
+        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{
             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, …"
@@ -570,14 +609,7 @@ plurals:table(nofallback){
                 ".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{
+        set31{
             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"
@@ -602,7 +634,7 @@ plurals:table(nofallback){
                 "2.0, 1002.0, …"
             }
         }
-        set31{
+        set32{
             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"
@@ -619,7 +651,7 @@ plurals:table(nofallback){
             }
             two{"n = 2 @integer 2 @decimal 2.0, 2.00, 2.000, 2.0000"}
         }
-        set32{
+        set33{
             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, …"
@@ -638,7 +670,7 @@ plurals:table(nofallback){
                 "02, …"
             }
         }
-        set33{
+        set34{
             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, …"
@@ -656,7 +688,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"}
         }
-        set34{
+        set35{
             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"}
@@ -668,39 +700,46 @@ 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{
+        set36{
             other{" @integer 0~15, 100, 1000, 10000, 100000, 1000000, …"}
         }
-        set36{
+        set37{
             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, …"}
         }
-        set37{
+        set38{
             one{"n = 1 @integer 1"}
             other{" @integer 0, 2~16, 100, 1000, 10000, 100000, 1000000, …"}
         }
-        set38{
+        set39{
             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{
-                "i = 1 and v = 0 or i = 0 and t = 1 @integer 1 @decimal 0.1, 0.01, 0."
-                "10, 0.001, 0.010, 0.100, 0.0001, 0.0010, 0.0100, 0.1000"
+                "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 0, 2~16, 100, 1000, 10000, 100000, 1000000, … @decimal 0.0"
-                ", 0.2~1.6, 10.0, 100.0, 1000.0, 10000.0, 100000.0, 1000000.0, …"
+                " @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, …"
             }
         }
         set40{
+            one{"n = 1..4 @integer 1~4"}
+            other{" @integer 0, 5~19, 100, 1000, 10000, 100000, 1000000, …"}
+        }
+        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, …"}
+        }
+        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"
@@ -708,16 +747,16 @@ plurals:table(nofallback){
             }
             other{" @integer 0~5, 7, 8, 11~15, 17, 18, 21, 101, 1001, …"}
         }
-        set41{
+        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, …"}
         }
-        set42{
+        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, …"}
         }
-        set43{
+        set45{
             many{
                 "n % 10 = 4 and n % 100 != 14 @integer 4, 24, 34, 44, 54, 64, 74, 84,"
                 " 104, 1004, …"
@@ -725,7 +764,7 @@ plurals:table(nofallback){
             one{"n = 1 @integer 1"}
             other{" @integer 0, 2, 3, 5~17, 100, 1000, 10000, 100000, 1000000, …"}
         }
-        set44{
+        set46{
             few{
                 "n % 10 = 3 and n % 100 != 13 @integer 3, 23, 33, 43, 53, 63, 73, 83,"
                 " 103, 1003, …"
@@ -740,19 +779,19 @@ plurals:table(nofallback){
                 " 102, 1002, …"
             }
         }
-        set45{
+        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"}
         }
-        set46{
+        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"}
         }
-        set47{
+        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, …"
@@ -767,7 +806,17 @@ plurals:table(nofallback){
                 " 102, 1002, …"
             }
         }
-        set48{
+        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{
             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"
@@ -786,31 +835,21 @@ plurals:table(nofallback){
                 "00000, 1000000, …"
             }
         }
-        set49{
+        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"}
         }
-        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{
+        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"}
         }
-        set51{
+        set53{
             few{"n = 3,4 @integer 3, 4"}
             many{"n = 5,6 @integer 5, 6"}
             one{"n = 1 @integer 1"}
@@ -820,23 +859,23 @@ plurals:table(nofallback){
         }
         set6{
             one{
-                "n = 0..1 @integer 0, 1 @decimal 0.0, 1.0, 0.00, 1.00, 0.000, 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, …"
             }
         }
         set7{
             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..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"
             }
             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, …"
             }
         }
         set8{