| Index: source/data/misc/plurals.txt
|
| diff --git a/source/data/misc/plurals.txt b/source/data/misc/plurals.txt
|
| index e6c683929b25b95171767e5d6eefebecc633a917..9216e02eaa08f5877dd43dc66d96467457047687 100644
|
| --- a/source/data/misc/plurals.txt
|
| +++ b/source/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
|
| @@ -12,6 +12,7 @@ plurals:table(nofallback){
|
| ak{"set5"}
|
| am{"set1"}
|
| ar{"set34"}
|
| + as{"set1"}
|
| asa{"set8"}
|
| ast{"set3"}
|
| az{"set8"}
|
| @@ -27,6 +28,7 @@ plurals:table(nofallback){
|
| brx{"set8"}
|
| bs{"set20"}
|
| ca{"set3"}
|
| + ce{"set8"}
|
| cgg{"set8"}
|
| chr{"set8"}
|
| ckb{"set8"}
|
| @@ -151,6 +153,7 @@ plurals:table(nofallback){
|
| rwk{"set8"}
|
| sah{"set0"}
|
| saq{"set8"}
|
| + sdh{"set8"}
|
| se{"set17"}
|
| seh{"set8"}
|
| ses{"set0"}
|
| @@ -210,18 +213,21 @@ plurals:table(nofallback){
|
| af{"set36"}
|
| am{"set36"}
|
| ar{"set36"}
|
| - az{"set50"}
|
| + as{"set53"}
|
| + az{"set51"}
|
| + be{"set41"}
|
| bg{"set36"}
|
| - bn{"set52"}
|
| + bn{"set53"}
|
| bs{"set36"}
|
| - ca{"set48"}
|
| + ca{"set49"}
|
| + ce{"set36"}
|
| cs{"set36"}
|
| - cy{"set53"}
|
| + cy{"set54"}
|
| da{"set36"}
|
| de{"set36"}
|
| dsb{"set36"}
|
| el{"set36"}
|
| - en{"set46"}
|
| + en{"set47"}
|
| es{"set36"}
|
| et{"set36"}
|
| eu{"set36"}
|
| @@ -230,10 +236,11 @@ plurals:table(nofallback){
|
| fil{"set38"}
|
| fr{"set38"}
|
| fy{"set36"}
|
| + ga{"set38"}
|
| gl{"set36"}
|
| - gu{"set51"}
|
| + gu{"set52"}
|
| he{"set36"}
|
| - hi{"set51"}
|
| + hi{"set52"}
|
| hr{"set36"}
|
| hsb{"set36"}
|
| hu{"set39"}
|
| @@ -241,11 +248,11 @@ plurals:table(nofallback){
|
| id{"set36"}
|
| in{"set36"}
|
| is{"set36"}
|
| - it{"set43"}
|
| + it{"set44"}
|
| iw{"set36"}
|
| ja{"set36"}
|
| - ka{"set44"}
|
| - kk{"set42"}
|
| + ka{"set45"}
|
| + kk{"set43"}
|
| km{"set36"}
|
| kn{"set36"}
|
| ko{"set36"}
|
| @@ -253,11 +260,11 @@ plurals:table(nofallback){
|
| lo{"set38"}
|
| lt{"set36"}
|
| lv{"set36"}
|
| - mk{"set49"}
|
| + mk{"set50"}
|
| ml{"set36"}
|
| mn{"set36"}
|
| mo{"set38"}
|
| - mr{"set47"}
|
| + mr{"set48"}
|
| ms{"set38"}
|
| my{"set36"}
|
| nb{"set36"}
|
| @@ -274,7 +281,7 @@ plurals:table(nofallback){
|
| si{"set36"}
|
| sk{"set36"}
|
| sl{"set36"}
|
| - sq{"set45"}
|
| + sq{"set46"}
|
| sr{"set36"}
|
| sv{"set37"}
|
| sw{"set36"}
|
| @@ -283,7 +290,7 @@ plurals:table(nofallback){
|
| th{"set36"}
|
| tl{"set38"}
|
| tr{"set36"}
|
| - uk{"set41"}
|
| + uk{"set42"}
|
| ur{"set36"}
|
| uz{"set36"}
|
| vi{"set38"}
|
| @@ -730,12 +737,19 @@ plurals:table(nofallback){
|
| }
|
| 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{
|
| + 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{
|
| + set43{
|
| 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"
|
| @@ -743,16 +757,16 @@ plurals:table(nofallback){
|
| }
|
| other{" @integer 0~5, 7, 8, 11~15, 17, 18, 21, 101, 1001, …"}
|
| }
|
| - set43{
|
| + set44{
|
| many{"n = 11,8,80,800 @integer 8, 11, 80, 800"}
|
| other{" @integer 0~7, 9, 10, 12~17, 100, 1000, 10000, 100000, 1000000, …"}
|
| }
|
| - set44{
|
| + set45{
|
| 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, …"}
|
| }
|
| - set45{
|
| + set46{
|
| many{
|
| "n % 10 = 4 and n % 100 != 14 @integer 4, 24, 34, 44, 54, 64, 74, 84,"
|
| " 104, 1004, …"
|
| @@ -760,7 +774,7 @@ plurals:table(nofallback){
|
| one{"n = 1 @integer 1"}
|
| other{" @integer 0, 2, 3, 5~17, 100, 1000, 10000, 100000, 1000000, …"}
|
| }
|
| - set46{
|
| + set47{
|
| few{
|
| "n % 10 = 3 and n % 100 != 13 @integer 3, 23, 33, 43, 53, 63, 73, 83,"
|
| " 103, 1003, …"
|
| @@ -775,19 +789,29 @@ plurals:table(nofallback){
|
| " 102, 1002, …"
|
| }
|
| }
|
| - set47{
|
| + set48{
|
| 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"}
|
| }
|
| - set48{
|
| + set49{
|
| 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"}
|
| }
|
| - set49{
|
| + 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{
|
| 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, …"
|
| @@ -802,17 +826,7 @@ plurals:table(nofallback){
|
| " 102, 1002, …"
|
| }
|
| }
|
| - 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{
|
| + set51{
|
| 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"
|
| @@ -831,21 +845,21 @@ plurals:table(nofallback){
|
| "00000, 1000000, …"
|
| }
|
| }
|
| - set51{
|
| + set52{
|
| 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"}
|
| }
|
| - set52{
|
| + set53{
|
| 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"}
|
| }
|
| - set53{
|
| + set54{
|
| few{"n = 3,4 @integer 3, 4"}
|
| many{"n = 5,6 @integer 5, 6"}
|
| one{"n = 1 @integer 1"}
|
|
|