]> git.saurik.com Git - apple/icu.git/commitdiff
ICU-62123.0.1.tar.gz macos-10144 v62123.0.1
authorApple <opensource@apple.com>
Tue, 18 Jun 2019 01:08:18 +0000 (01:08 +0000)
committerApple <opensource@apple.com>
Tue, 18 Jun 2019 01:08:18 +0000 (01:08 +0000)
85 files changed:
icuSources/data/curr/ar.txt
icuSources/data/curr/ca.txt
icuSources/data/curr/cs.txt
icuSources/data/curr/da.txt
icuSources/data/curr/de.txt
icuSources/data/curr/el.txt
icuSources/data/curr/en.txt
icuSources/data/curr/es.txt
icuSources/data/curr/es_MX.txt
icuSources/data/curr/fi.txt
icuSources/data/curr/fr.txt
icuSources/data/curr/he.txt
icuSources/data/curr/hi.txt
icuSources/data/curr/hr.txt
icuSources/data/curr/hu.txt
icuSources/data/curr/id.txt
icuSources/data/curr/it.txt
icuSources/data/curr/ja.txt
icuSources/data/curr/ko.txt
icuSources/data/curr/ms.txt
icuSources/data/curr/nb.txt
icuSources/data/curr/nl.txt
icuSources/data/curr/pl.txt
icuSources/data/curr/pt.txt
icuSources/data/curr/pt_PT.txt
icuSources/data/curr/ro.txt
icuSources/data/curr/ru.txt
icuSources/data/curr/sk.txt
icuSources/data/curr/sv.txt
icuSources/data/curr/th.txt
icuSources/data/curr/tr.txt
icuSources/data/curr/uk.txt
icuSources/data/curr/vi.txt
icuSources/data/curr/yue.txt
icuSources/data/curr/yue_Hans.txt
icuSources/data/curr/zh.txt
icuSources/data/curr/zh_Hant.txt
icuSources/data/curr/zh_Hant_HK.txt
icuSources/data/locales/es_MX.txt
icuSources/data/misc/currencyNumericCodes.txt
icuSources/data/misc/supplementalData.txt
icuSources/data/region/ar.txt
icuSources/data/region/ar_SA.txt
icuSources/data/region/ca.txt
icuSources/data/region/cs.txt
icuSources/data/region/da.txt
icuSources/data/region/de.txt
icuSources/data/region/el.txt
icuSources/data/region/en.txt
icuSources/data/region/es.txt
icuSources/data/region/es_419.txt
icuSources/data/region/fi.txt
icuSources/data/region/fr.txt
icuSources/data/region/he.txt
icuSources/data/region/hi.txt
icuSources/data/region/hr.txt
icuSources/data/region/hu.txt
icuSources/data/region/id.txt
icuSources/data/region/it.txt
icuSources/data/region/ja.txt
icuSources/data/region/ko.txt
icuSources/data/region/ms.txt
icuSources/data/region/nb.txt
icuSources/data/region/nl.txt
icuSources/data/region/nn.txt
icuSources/data/region/pl.txt
icuSources/data/region/pt.txt
icuSources/data/region/ro.txt
icuSources/data/region/ru.txt
icuSources/data/region/sk.txt
icuSources/data/region/sv.txt
icuSources/data/region/th.txt
icuSources/data/region/tr.txt
icuSources/data/region/uk.txt
icuSources/data/region/vi.txt
icuSources/data/region/yue.txt
icuSources/data/region/yue_Hans.txt
icuSources/data/region/zh.txt
icuSources/data/region/zh_Hant.txt
icuSources/i18n/measunit.cpp
icuSources/test/cintltst/cbiapts.c
icuSources/test/cintltst/cdattst.c
icuSources/test/cintltst/cloctst.c
icuSources/test/intltest/loctest.cpp
makefile

index 965550578f0281c8ab3cb099fbd4958352f9ae41..104adf1f6fc27f9248e3bc6cc8ae77a9fbe748a2 100644 (file)
@@ -900,6 +900,10 @@ ar{
         }
         VEF{
             "VEF",
+            "بوليفار فنزويلي - 2008–2018",
+        }
+        VES{
+            "VES",
             "بوليفار فنزويلي",
         }
         VND{
@@ -2329,6 +2333,14 @@ ar{
             zero{"سوم أوزبكستاني"}
         }
         VEF{
+            few{"بوليفار فنزويلي - 2008–2018"}
+            many{"بوليفار فنزويلي - 2008–2018"}
+            one{"بوليفار فنزويلي - 2008–2018"}
+            other{"بوليفار فنزويلي - 2008–2018"}
+            two{"بوليفار فنزويلي - 2008–2018"}
+            zero{"بوليفار فنزويلي - 2008–2018"}
+        }
+        VES{
             few{"بوليفار فنزويلي"}
             many{"بوليفار فنزويلي"}
             one{"بوليفار فنزويلي"}
index 2ec70e490319cb296041c4c64af32e1fd313b765..a506f9b311f9f20b5e9177e31cb6cd3c13c08fb7 100644 (file)
@@ -1041,6 +1041,10 @@ ca{
         }
         VEF{
             "VEF",
+            "bolívar veneçolà (2008–2018)",
+        }
+        VES{
+            "VES",
             "bolívar veneçolà",
         }
         VND{
@@ -2334,6 +2338,10 @@ ca{
             other{"bolívars veneçolans (1871–2008)"}
         }
         VEF{
+            one{"bolívar veneçolà (2008–2018)"}
+            other{"bolívars veneçolans (2008–2018)"}
+        }
+        VES{
             one{"bolívar veneçolà"}
             other{"bolívars veneçolans"}
         }
index c3cb35c3fdd10258d3ffe44b4b865782c41196ac..ce21f7bc2e8de49ee5a0dfd25a7103d11d5cb6d6 100644 (file)
@@ -1044,6 +1044,10 @@ cs{
         }
         VEF{
             "VEF",
+            "venezuelský bolívar (2008–2018)",
+        }
+        VES{
+            "VES",
             "venezuelský bolívar",
         }
         VND{
@@ -2873,6 +2877,12 @@ cs{
             other{"venezuelských bolívarů (1871–2008)"}
         }
         VEF{
+            few{"venezuelské bolívary (2008–2018)"}
+            many{"venezuelského bolívaru (2008–2018)"}
+            one{"venezuelský bolívar (2008–2018)"}
+            other{"venezuelských bolívarů (2008–2018)"}
+        }
+        VES{
             few{"venezuelské bolívary"}
             many{"venezuelského bolívaru"}
             one{"venezuelský bolívar"}
index 1ce347671b065c649eb4ffb0512cb0de4cac58ea..1dee052787366875a66b354b185c5a62fc0268b7 100644 (file)
@@ -948,6 +948,10 @@ da{
         }
         VEF{
             "VEF",
+            "venezuelansk bolivar (2008–2018)",
+        }
+        VES{
+            "VES",
             "venezuelansk bolivar",
         }
         VND{
@@ -2133,8 +2137,12 @@ da{
             other{"Venezuelanske bolivar (1871–2008)"}
         }
         VEF{
+            one{"venezuelansk bolivar (2008–2018)"}
+            other{"venezuelanske bolivarer (2008–2018)"}
+        }
+        VES{
             one{"venezuelansk bolivar"}
-            other{"venezuelanske bolivar"}
+            other{"venezuelanske bolivarer"}
         }
         VND{
             one{"vietnamesisk dong"}
index 012d29cab7a4e6342ccc05fc5e022ce9bcf7ec44..0e569783a51068c821a7f1bc3dbe4112e49ec72a 100644 (file)
@@ -1044,6 +1044,10 @@ de{
         }
         VEF{
             "VEF",
+            "Venezolanischer Bolívar (2008–2018)",
+        }
+        VES{
+            "VES",
             "Venezolanischer Bolívar",
         }
         VND{
@@ -2351,6 +2355,10 @@ de{
             other{"Venezolanische Bolívares (1871–2008)"}
         }
         VEF{
+            one{"Venezolanischer Bolívar (2008–2018)"}
+            other{"Venezolanische Bolívares (2008–2018)"}
+        }
+        VES{
             one{"Venezolanischer Bolívar"}
             other{"Venezolanische Bolívares"}
         }
index 69b197edcb01a2c16eaa094a5f2d6e9438c8f096..a7d66594b0a0a17e3ce3a01b20db1c250312fb1e 100644 (file)
@@ -965,6 +965,10 @@ el{
         }
         VEF{
             "VEF",
+            "Μπολιβάρ Βενεζουέλας (2008–2018)",
+        }
+        VES{
+            "VES",
             "Μπολιβάρ Βενεζουέλας",
         }
         VND{
@@ -2134,6 +2138,10 @@ el{
             other{"μπολιβάρ Βενεζουέλας (1871–2008)"}
         }
         VEF{
+            one{"μπολιβάρ Βενεζουέλας (2008–2018)"}
+            other{"μπολιβάρ Βενεζουέλας (2008–2018)"}
+        }
+        VES{
             one{"μπολιβάρ Βενεζουέλας"}
             other{"μπολιβάρ Βενεζουέλας"}
         }
index 8049c200ce438b372c9b8b2a5d957d42a98c8030..13727fa46d2c456af6776de2cfbc9168136c6be1 100644 (file)
@@ -1044,6 +1044,10 @@ en{
         }
         VEF{
             "VEF",
+            "Venezuelan Bolívar (2008–2018)",
+        }
+        VES{
+            "VES",
             "Venezuelan Bolívar",
         }
         VND{
@@ -2249,6 +2253,10 @@ en{
             other{"Venezuelan bolívars (1871–2008)"}
         }
         VEF{
+            one{"Venezuelan bolívar (2008–2018)"}
+            other{"Venezuelan bolívars (2008–2018)"}
+        }
+        VES{
             one{"Venezuelan bolívar"}
             other{"Venezuelan bolívars"}
         }
index 8809d9822eeebbd4b8734fdb31fe87a0b0b15b93..5e68700e4d7efd508c73607b8cc3661dd8a78180 100644 (file)
@@ -972,6 +972,10 @@ es{
         }
         VEF{
             "VEF",
+            "bolívar venezolano (2008–2018)",
+        }
+        VES{
+            "VES",
             "bolívar venezolano",
         }
         VND{
@@ -2109,6 +2113,10 @@ es{
             other{"bolívares venezolanos (1871–2008)"}
         }
         VEF{
+            one{"bolívar venezolano (2008–2018)"}
+            other{"bolívares venezolanos (2008–2018)"}
+        }
+        VES{
             one{"bolívar venezolano"}
             other{"bolívares venezolanos"}
         }
index f7812b14deb73460085e0e130508be9c33fa829f..9cd2eb96d29a6c076924774411a4a95c54596e88 100644 (file)
@@ -31,6 +31,14 @@ es_MX{
             "UZS",
             "sum",
         }
+        VEF{
+            "VEF",
+            "bolívar venezolano (2008–2018)",
+        }
+        VES{
+            "VES",
+            "bolívar venezolano",
+        }
         ZMW{
             "ZMW",
             "kwacha zambiano",
@@ -71,6 +79,14 @@ es_MX{
             one{"sum"}
             other{"sums"}
         }
+        VEF{
+            one{"bolívar venezolano (2008–2018)"}
+            other{"bolívares venezolanos (2008–2018)"}
+        }
+        VES{
+            one{"bolívar venezolano"}
+            other{"bolivares venezolanos"}
+        }
         XXX{
             one{"(moneda desconocida)"}
         }
index fdf8b8edbfe7093fb8cf533eaed130be2db9e17f..87891f41b7a2c48b246b8d9cdaecafc5e3c56628 100644 (file)
@@ -1040,11 +1040,15 @@ fi{
         }
         VEB{
             "VEB",
-            "Venezuelan bolivar (1871–2008)",
+            "Venezuelan bolívar (1871–2008)",
         }
         VEF{
             "VEF",
-            "Venezuelan bolivar",
+            "Venezuelan bolívar (2008–2018)",
+        }
+        VES{
+            "VES",
+            "Venezuelan suvereeni bolívar",
         }
         VND{
             "VND",
@@ -2352,8 +2356,12 @@ fi{
             other{"Venezuelan bolivaria (1871–2008)"}
         }
         VEF{
-            one{"Venezuelan bolivar"}
-            other{"Venezuelan bolivaria"}
+            one{"Venezuelan bolívar (2008–2018)"}
+            other{"Venezuelan bolívaria (2008–2018)"}
+        }
+        VES{
+            one{"Venezuelan suvereeni bolívar"}
+            other{"Venezuelan suvereenia bolívaria"}
         }
         VND{
             one{"Vietnamin dong"}
index 00f985ada6c5afd99e1ffc1667cf5d8aba55b631..7df6acdab26730a7b88588ba0009d12ede419793 100644 (file)
@@ -976,6 +976,10 @@ fr{
         }
         VEF{
             "VEF",
+            "bolivar vénézuélien (2008–2018)",
+        }
+        VES{
+            "VES",
             "bolivar vénézuélien",
         }
         VND{
@@ -2197,6 +2201,10 @@ fr{
             other{"bolivar vénézuélien (1871–2008)"}
         }
         VEF{
+            one{"bolivar vénézuélien (2008–2018)"}
+            other{"bolivars vénézuéliens (2008–2018)"}
+        }
+        VES{
             one{"bolivar vénézuélien"}
             other{"bolivars vénézuéliens"}
         }
index fd37871e078e1e4b454929f4e90c9ea731f5e121..8595a6258f2a74c5dd1ff9856b4c9a34c945732f 100644 (file)
@@ -812,6 +812,10 @@ he{
         }
         VEF{
             "VEF",
+            "בוליבר ונצואלי (2008–2018)",
+        }
+        VES{
+            "VES",
             "בוליבר ונצואלי",
         }
         VND{
@@ -1910,6 +1914,12 @@ he{
             two{"סום אוזבקי"}
         }
         VEF{
+            many{"בוליבר ונצואלי (2008–2018)"}
+            one{"בוליבר ונצואלי (2008–2018)"}
+            other{"בוליבר ונצואלי (2008–2018)"}
+            two{"בוליבר ונצואלי (2008–2018)"}
+        }
+        VES{
             many{"בוליבר ונצואלי"}
             one{"בוליבר ונצואלי"}
             other{"בוליבר ונצואלי"}
index be48ef98da8b6312b80479b44752431e19cac809..3b846cefc58ceccddce0e719c0815b69b47f3bdc 100644 (file)
@@ -688,6 +688,10 @@ hi{
         }
         VEF{
             "VEF",
+            "वेनेज़ुएला बोलिवर (2008–2018)",
+        }
+        VES{
+            "VES",
             "वेनेज़ुएला बोलिवर",
         }
         VND{
@@ -1437,6 +1441,10 @@ hi{
             other{"उज़्बेकिस्तान सोम"}
         }
         VEF{
+            one{"वेनेज़ुएला बोलिवर (2008–2018)"}
+            other{"वेनेज़ुएला बोलिवर (2008–2018)"}
+        }
+        VES{
             one{"वेनेज़ुएला बोलिवर"}
             other{"वेनेज़ुएला बोलिवर"}
         }
index 908708168d41bde6c36578cff566491be36a8e82..aeb059079a33f98db149c9026ef46e0cce5fc1f1 100644 (file)
@@ -1044,6 +1044,10 @@ hr{
         }
         VEF{
             "VEF",
+            "venezuelanski bolivar (2008. – 2018.)",
+        }
+        VES{
+            "VES",
             "venezuelanski bolivar",
         }
         VND{
@@ -2601,6 +2605,11 @@ hr{
             other{"venezuelanskih bolivara (1871.–2008.)"}
         }
         VEF{
+            few{"venezuelanska bolivara (2008. – 2018.)"}
+            one{"venezuelanski bolivar (2008. – 2018.)"}
+            other{"venezuelanskih bolivara (2008. – 2018.)"}
+        }
+        VES{
             few{"venezuelanska bolivara"}
             one{"venezuelanski bolivar"}
             other{"venezuelanskih bolivara"}
index b5c303e1c25097ebf3b54929e0b6762e4fdc17bc..58e1bf3bc28074ec1833499f8111ee181a1bf037 100644 (file)
@@ -972,6 +972,10 @@ hu{
         }
         VEF{
             "VEF",
+            "venezuelai bolivar (2008–2018)",
+        }
+        VES{
+            "VES",
             "venezuelai bolivar",
         }
         VND{
@@ -1949,6 +1953,10 @@ hu{
             other{"Venezuelai bolivar (1871–2008)"}
         }
         VEF{
+            one{"venezuelai bolivar (2008–2018)"}
+            other{"venezuelai bolivar (2008–2018)"}
+        }
+        VES{
             one{"venezuelai bolivar"}
             other{"venezuelai bolivar"}
         }
index 813d4a73bc746b2fc806dbf3332953d45f686971..f295dabcc1bc937ffdd70aa19289d03a11e09539 100644 (file)
@@ -1036,6 +1036,10 @@ id{
         }
         VEF{
             "VEF",
+            "Bolivar Venezuela (2008–2018)",
+        }
+        VES{
+            "VES",
             "Bolivar Venezuela",
         }
         VND{
@@ -1862,6 +1866,9 @@ id{
             other{"Bolivar Venezuela (1871–2008)"}
         }
         VEF{
+            other{"Bolivar Venezuela (2008–2018)"}
+        }
+        VES{
             other{"Bolivar Venezuela"}
         }
         VND{
index 7cffeab08d76f23cce3d38f767145c3473e7744b..bcf25ffe43cf628ee52a3cf7e2ea898a46fcf84f 100644 (file)
@@ -957,6 +957,10 @@ it{
         }
         VEF{
             "VEF",
+            "bolívar venezuelano (2008–2018)",
+        }
+        VES{
+            "VES",
             "bolívar venezuelano",
         }
         VND{
@@ -1814,6 +1818,10 @@ it{
             other{"bolivares venezuelani (1871–2008)"}
         }
         VEF{
+            one{"bolívar venezuelano (2008–2018)"}
+            other{"bolívares venezuelani (2008–2018)"}
+        }
+        VES{
             one{"bolívar venezuelano"}
             other{"bolívares venezuelani"}
         }
index 1b4a6382b2995579baa6b497e6e7c96b8f57fd13..68a3a1f68ede5259f4a7fc9e30b5264b641a1631 100644 (file)
@@ -1044,6 +1044,10 @@ ja{
         }
         VEF{
             "VEF",
+            "ベネズエラ ボリバル (2008–2018)",
+        }
+        VES{
+            "VES",
             "ベネズエラ ボリバル",
         }
         VND{
@@ -2090,6 +2094,9 @@ ja{
             other{"ベネズエラ ボリバル (1871–2008)"}
         }
         VEF{
+            other{"ベネズエラ ボリバル (2008–2018)"}
+        }
+        VES{
             other{"ベネズエラ ボリバル"}
         }
         VND{
index deec9567db82c1c1b88591a2e481562a0b3ab86c..87c083c405e7067169fc8b9b29b51b6a8ba7b7b2 100644 (file)
@@ -1016,6 +1016,10 @@ ko{
         }
         VEF{
             "VEF",
+            "베네수엘라 볼리바르 (2008–2018)",
+        }
+        VES{
+            "VES",
             "베네수엘라 볼리바르",
         }
         VND{
@@ -1716,6 +1720,9 @@ ko{
             other{"우즈베키스탄 숨"}
         }
         VEF{
+            other{"베네수엘라 볼리바르 (2008–2018)"}
+        }
+        VES{
             other{"베네수엘라 볼리바르"}
         }
         VND{
index b26b82604a4e61517e88c32ca5a9cbd45faffa53..f28661a831f75ec0d467178192adcc08fafe033f 100644 (file)
@@ -604,6 +604,10 @@ ms{
         }
         VEF{
             "VEF",
+            "Bolivar Venezuela (2008–2018)",
+        }
+        VES{
+            "VES",
             "Bolivar Venezuela",
         }
         VND{
@@ -1203,6 +1207,9 @@ ms{
             other{"Som Uzbekistan"}
         }
         VEF{
+            other{"Bolivar Venezuela (2008–2018)"}
+        }
+        VES{
             other{"Bolivar Venezuela"}
         }
         VND{
index 020ff85a2544131a6cefe32699c4d5e7a467a762..9a113234c722fb532ab63a1c280f4fac72c454f9 100644 (file)
@@ -1044,6 +1044,10 @@ nb{
         }
         VEF{
             "VEF",
+            "venezuelanske bolivar (2008–2018)",
+        }
+        VES{
+            "VES",
             "venezuelanske bolivar",
         }
         VND{
@@ -2343,6 +2347,10 @@ nb{
             other{"venezuelanske bolivar (1871–2008)"}
         }
         VEF{
+            one{"venezuelansk bolivar (2008–2018)"}
+            other{"venezuelanske bolivar (2008–2018)"}
+        }
+        VES{
             one{"venezuelansk bolivar"}
             other{"venezuelanske bolivar"}
         }
index 3632cc530622c69a1d2478897489197357ed934e..54bc350ff631390bb87e4ce0bc41f6bf3fd96f1b 100644 (file)
@@ -1044,6 +1044,10 @@ nl{
         }
         VEF{
             "VEF",
+            "Venezolaanse bolivar (2008–2018)",
+        }
+        VES{
+            "VES",
             "Venezolaanse bolivar",
         }
         VND{
@@ -2351,6 +2355,10 @@ nl{
             other{"Venezolaanse bolivar (1871–2008)"}
         }
         VEF{
+            one{"Venezolaanse bolivar (2008–2018)"}
+            other{"Venezolaanse bolivar (2008–2018)"}
+        }
+        VES{
             one{"Venezolaanse bolivar"}
             other{"Venezolaanse bolivar"}
         }
index 9fa16f172b4269fe87f81edea15341628265ef2b..68e1ab3da51e30d14b8febf67c127ea4b583e203 100644 (file)
@@ -936,6 +936,10 @@ pl{
         }
         VEF{
             "VEF",
+            "boliwar wenezuelski (2008–2018)",
+        }
+        VES{
+            "VES",
             "boliwar wenezuelski",
         }
         VND{
@@ -2237,6 +2241,12 @@ pl{
             other{"boliwary wenezuelskiego (1871–2008)"}
         }
         VEF{
+            few{"boliwary wenezuelskie (2008–2018)"}
+            many{"boliwarów wenezuelskich (2008–2018)"}
+            one{"boliwar wenezuelski (2008–2018)"}
+            other{"boliwara wenezuelskiego (2008–2018)"}
+        }
+        VES{
             few{"boliwary wenezuelskie"}
             many{"boliwarów wenezuelskich"}
             one{"boliwar wenezuelski"}
index 4a0b45dce145e72b3acbd738898f17e3a61c8793..ab23557021c652bc47dd48c8c3896f9ba5898813 100644 (file)
@@ -1040,6 +1040,10 @@ pt{
         }
         VEF{
             "VEF",
+            "Bolívar venezuelano (2008–2018)",
+        }
+        VES{
+            "VES",
             "Bolívar venezuelano",
         }
         VND{
@@ -2333,6 +2337,10 @@ pt{
             other{"Bolívares venezuelanos (1871–2008)"}
         }
         VEF{
+            one{"Bolívar venezuelano (2008–2018)"}
+            other{"Bolívares venezuelanos (2008–2018)"}
+        }
+        VES{
             one{"Bolívar venezuelano"}
             other{"Bolívares venezuelanos"}
         }
index 5e7ecc486e872b05bfb25410812eba449fd68453..b45b7239b49c9683efe444a5bc747fe540cb382e 100644 (file)
@@ -457,6 +457,10 @@ pt_PT{
         }
         VEF{
             "VEF",
+            "bolívar (2008–2018)",
+        }
+        VES{
+            "VES",
             "bolívar",
         }
         VUV{
@@ -910,6 +914,10 @@ pt_PT{
             other{"Sons do Uzbequistão"}
         }
         VEF{
+            one{"bolívar (2008–2018)"}
+            other{"bolívares (2008–2018)"}
+        }
+        VES{
             one{"bolívar"}
             other{"bolívares"}
         }
index 09431c28c7c01edb66165da6bfc20d9242a314d7..bb2e219dfe91300c343098e51411d815ccc05f4b 100644 (file)
@@ -864,6 +864,10 @@ ro{
         }
         VEF{
             "VEF",
+            "bolivar venezuelean (2008–2018)",
+        }
+        VES{
+            "VES",
             "bolivar venezuelean",
         }
         VND{
@@ -2110,6 +2114,11 @@ ro{
             other{"bolivari Venezuela (1871–2008)"}
         }
         VEF{
+            few{"bolivari venezueleni (2008–2018)"}
+            one{"bolivar venezuelean (2008–2018)"}
+            other{"bolivari venezueleni (2008–2018)"}
+        }
+        VES{
             few{"bolivari venezueleni"}
             one{"bolivar venezuelean"}
             other{"bolivari venezueleni"}
index 7e706b1a8f9ae36aef45fce67c91f8b78a42a341..d8d7be480063ff93cf962d2153e05d58b5f023eb 100644 (file)
@@ -972,6 +972,10 @@ ru{
         }
         VEF{
             "VEF",
+            "венесуэльский боливар (2008–2018)",
+        }
+        VES{
+            "VES",
             "венесуэльский боливар",
         }
         VND{
@@ -2142,6 +2146,12 @@ ru{
             other{"узбекского сума"}
         }
         VEF{
+            few{"венесуэльских боливара (2008–2018)"}
+            many{"венесуэльских боливаров (2008–2018)"}
+            one{"венесуэльский боливар (2008–2018)"}
+            other{"венесуэльского боливара (2008–2018)"}
+        }
+        VES{
             few{"венесуэльских боливара"}
             many{"венесуэльских боливаров"}
             one{"венесуэльский боливар"}
index 87ee33fd50227337ad6ca94a631bf2a8ccaef86c..746e5b60d6519a609198c709fa74be31db892351 100644 (file)
@@ -1044,6 +1044,10 @@ sk{
         }
         VEF{
             "VEF",
+            "venezuelský bolívar (2008–2018)",
+        }
+        VES{
+            "VES",
             "venezuelský bolívar",
         }
         VND{
@@ -2874,6 +2878,12 @@ sk{
             other{"venezuelských bolívarov (1871 – 2008)"}
         }
         VEF{
+            few{"venezuelské bolívary (2008–2018)"}
+            many{"venezuelského bolívaru (2008–2018)"}
+            one{"venezuelský bolívar (2008–2018)"}
+            other{"venezuelských bolívarov (2008–2018)"}
+        }
+        VES{
             few{"venezuelské bolívary"}
             many{"venezuelského bolívaru"}
             one{"venezuelský bolívar"}
index e950cfd8d4eab3b0c5147c767432b939eceab64c..257ff8034861923cec1049a23dafeb362519f57b 100644 (file)
@@ -1044,6 +1044,10 @@ sv{
         }
         VEF{
             "VEF",
+            "venezuelansk bolívar (2008–2018)",
+        }
+        VES{
+            "VES",
             "venezuelansk bolívar",
         }
         VND{
@@ -2350,6 +2354,10 @@ sv{
             other{"venezuelanska bolivar (1871–2008)"}
         }
         VEF{
+            one{"venezuelansk bolívar (2008–2018)"}
+            other{"venezuelanska bolívar (2008–2018)"}
+        }
+        VES{
             one{"venezuelansk bolívar"}
             other{"venezuelanska bolívar"}
         }
index dbc2685aba1e807c7c8e9a91e775184d48ca626a..de9af15e719b9bf96e81147e2645bdccc80a4f54 100644 (file)
@@ -1026,6 +1026,10 @@ th{
             "VEF",
             "โบลิวาร์เวเนซุเอลา",
         }
+        VES{
+            "VES",
+            "โบลีวาร์เวเนซุเอลา",
+        }
         VND{
             "₫",
             "ดองเวียดนาม",
@@ -1748,6 +1752,9 @@ th{
         VEF{
             other{"โบลิวาร์เวเนซุเอลา"}
         }
+        VES{
+            other{"โบลีวาร์แห่งเวเนซุเอลา"}
+        }
         VND{
             other{"ดองเวียดนาม"}
         }
index 0345bc6389873625de3e5a1384320b32652f7b8c..9acb96b2b30b04c289b5efbd1ef28fcf6f0b98fb 100644 (file)
@@ -1049,6 +1049,10 @@ tr{
         }
         VEF{
             "VEF",
+            "Venezuela Bolivarı (2008–2018)",
+        }
+        VES{
+            "VES",
             "Venezuela Bolivarı",
         }
         VND{
@@ -2284,6 +2288,10 @@ tr{
             other{"Venezuela Bolivarı (1871–2008)"}
         }
         VEF{
+            one{"Venezuela bolivarı (2008–2018)"}
+            other{"Venezuela bolivarı (2008–2018)"}
+        }
+        VES{
             one{"Venezuela bolivarı"}
             other{"Venezuela bolivarı"}
         }
index 4637afba24bb2a88c61f25fd2eb3202b18625f7e..840966796af91786944f9d0d6ca2096d03eb6c29 100644 (file)
@@ -972,6 +972,10 @@ uk{
         }
         VEF{
             "VEF",
+            "венесуельський болівар (2008–2018)",
+        }
+        VES{
+            "VES",
             "венесуельський болівар",
         }
         VND{
@@ -2208,6 +2212,12 @@ uk{
             other{"узбецького сума"}
         }
         VEF{
+            few{"венесуельські болівари (2008–2018)"}
+            many{"венесуельських боліварів (2008–2018)"}
+            one{"венесуельський болівар (2008–2018)"}
+            other{"венесуельського болівара (2008–2018)"}
+        }
+        VES{
             few{"венесуельські болівари"}
             many{"венесуельських боліварів"}
             one{"венесуельський болівар"}
index ad6dd70fa77f72d749b2635619ebae7f9d47878c..1a6b7ae711c65f16b9c6e0125ffd1860790a1779 100644 (file)
@@ -1024,6 +1024,10 @@ vi{
         }
         VEF{
             "VEF",
+            "Bolívar Venezuela (2008–2018)",
+        }
+        VES{
+            "VES",
             "Bolívar Venezuela",
         }
         VND{
@@ -1731,6 +1735,9 @@ vi{
             other{"Som Uzbekistan"}
         }
         VEF{
+            other{"Bolívar Venezuela (2008–2018)"}
+        }
+        VES{
             other{"Bolívar Venezuela"}
         }
         VND{
index 547427cfc14b5626e361e365b4f2b4c79c9b8304..0e815e42b8057f019a5e500038e416c74707d4a5 100644 (file)
@@ -1044,6 +1044,10 @@ yue{
         }
         VEF{
             "VEF",
+            "委內瑞拉玻利瓦 (VEF)",
+        }
+        VES{
+            "VES",
             "委內瑞拉玻利瓦",
         }
         VND{
@@ -2088,6 +2092,9 @@ yue{
             other{"委內瑞拉玻利瓦 (1871–2008)"}
         }
         VEF{
+            other{"委內瑞拉玻利瓦 (VEF)"}
+        }
+        VES{
             other{"委內瑞拉玻利瓦"}
         }
         VND{
index 41e30cdef6c3e68c5fda17e27e127bdcd2052279..3ce8a4c18a29988d18d4deccf204b1daf244d646 100644 (file)
@@ -1045,6 +1045,10 @@ yue_Hans{
         }
         VEF{
             "VEF",
+            "委内瑞拉玻利瓦 (2008–2018)",
+        }
+        VES{
+            "VES",
             "委内瑞拉玻利瓦",
         }
         VND{
@@ -2089,6 +2093,9 @@ yue_Hans{
             other{"委内瑞拉玻利瓦 (1871–2008)"}
         }
         VEF{
+            other{"委内瑞拉玻利瓦 (2008–2018)"}
+        }
+        VES{
             other{"委内瑞拉玻利瓦"}
         }
         VND{
index f2575303a018ab9ba263723be8c0de1a874846fa..c0c178a05906e11dba009649550764cad7c2222e 100644 (file)
@@ -1040,6 +1040,10 @@ zh{
         }
         VEF{
             "VEF",
+            "委内瑞拉玻利瓦尔 (2008–2018)",
+        }
+        VES{
+            "VES",
             "委内瑞拉玻利瓦尔",
         }
         VND{
@@ -2061,6 +2065,9 @@ zh{
             other{"委内瑞拉玻利瓦尔 (1871–2008)"}
         }
         VEF{
+            other{"委内瑞拉玻利瓦尔 (2008–2018)"}
+        }
+        VES{
             other{"委内瑞拉玻利瓦尔"}
         }
         VND{
index 8660f9cba864654f57a3d982aecc4c7aabea5424..76d019682f4c5413f9f10caf39be1ebced9f6179 100644 (file)
@@ -1045,6 +1045,10 @@ zh_Hant{
         }
         VEF{
             "VEF",
+            "委內瑞拉玻利瓦 (2008–2018)",
+        }
+        VES{
+            "VES",
             "委內瑞拉玻利瓦",
         }
         VND{
@@ -2086,6 +2090,9 @@ zh_Hant{
             other{"委內瑞拉玻利瓦 (1871–2008)"}
         }
         VEF{
+            other{"委內瑞拉玻利瓦 (2008–2018)"}
+        }
+        VES{
             other{"委內瑞拉玻利瓦"}
         }
         VND{
index 9088a692689407e59d8233842ea4339f48c16ae3..b1d99bf0835931b0c4638fdd317c71d4ebc0c045 100644 (file)
@@ -238,6 +238,10 @@ zh_Hant_HK{
             "TZS",
             "坦桑尼亞先令",
         }
+        VES{
+            "VES",
+            "VES",
+        }
         VUV{
             "VUV",
             "瓦努阿圖瓦圖",
index 8bdd783691f806b9b6c680745f666a9651dae523..06f37500f36268513fcb722ad7d1936fb728eff2 100644 (file)
@@ -5,6 +5,9 @@ es_MX{
     MoreInformation{"[...]"}
     NumberElements{
         latn{
+            patterns{
+                percentFormat{"#,##0%"}
+            }
             patternsLong{
                 decimalFormat{
                     1000000000000{
index fd8d1e3315ac32570efbdfd3c863585431c840dc..19d0bbf576845fde6f6da3f6eb637e3cb408cd01 100644 (file)
@@ -273,6 +273,7 @@ currencyNumericCodes:table(nofallback){
         UZS:int{860}
         VEB:int{862}
         VEF:int{937}
+        VES:int{928}
         VNC:int{704}
         VND:int{704}
         VUV:int{548}
index 5de3becb0fd28682f70957c1482ca9bb4f9488a3..5fc791b08f9412fd72a9763e52c5ee5c59fadb32 100644 (file)
@@ -3990,6 +3990,10 @@ supplementalData:table(nofallback){
             "VEF",
             "937",
         }
+        {
+            "VES",
+            "928",
+        }
         {
             "VND",
             "704",
@@ -4195,6 +4199,7 @@ supplementalData:table(nofallback){
                 "UYI",
                 "UYP",
                 "VEB",
+                "VEF",
                 "VNN",
                 "XAG",
                 "XAU",
@@ -4366,7 +4371,7 @@ supplementalData:table(nofallback){
                 "USD",
                 "UYU",
                 "UZS",
-                "VEF",
+                "VES",
                 "VND",
                 "VUV",
                 "WST",
index 4cd232371d9e4f57923f94afc09d29a0db421e02..2c534cf3cea50dc146cc3c1be34de0e535afabd2 100644 (file)
@@ -81,7 +81,7 @@ ar{
         CK{"جزر كوك"}
         CL{"تشيلي"}
         CM{"الكاميرون"}
-        CN{"اÙ\84صÙ\8aÙ\86"}
+        CN{"بر Ø§Ù\84صÙ\8aÙ\86 Ø§Ù\84رئÙ\8aسÙ\8a"}
         CO{"كولومبيا"}
         CP{"جزيرة كليبيرتون"}
         CR{"كوستاريكا"}
@@ -133,7 +133,7 @@ ar{
         GU{"غوام"}
         GW{"غينيا بيساو"}
         GY{"غيانا"}
-        HK{"Ù\87Ù\88Ù\86غ Ù\83Ù\88Ù\86غ (اÙ\84صÙ\8aÙ\86)"}
+        HK{"Ù\87Ù\88Ù\86ج Ù\83Ù\88Ù\86ج"}
         HM{"جزيرة هيرد وجزر ماكدونالد"}
         HN{"هندوراس"}
         HR{"كرواتيا"}
@@ -187,7 +187,7 @@ ar{
         ML{"مالي"}
         MM{"ميانمار (بورما)"}
         MN{"منغوليا"}
-        MO{"مكاو (الصين)"}
+        MO{"ماكاو"}
         MP{"جزر ماريانا الشمالية"}
         MQ{"جزر المارتينيك"}
         MR{"موريتانيا"}
@@ -297,8 +297,6 @@ ar{
     }
     Countries%short{
         GB{"المملكة المتحدة"}
-        HK{"هونغ كونغ"}
-        MO{"مكاو"}
         PS{"فلسطين"}
         UN{"الأمم المتحدة"}
         US{"الولايات المتحدة"}
index a0865507ed5fdd8eb78a6bd7ffef3558d23a8ebd..92f73b1f8645b9dc4af9b4969f36a05766aeccdc 100644 (file)
@@ -5,14 +5,10 @@ ar_SA{
         AC{"جزيرة أسينشين"}
         BS{"جزر البهاما"}
         EA{"سبتة ومليلية"}
-        MO{"ماكاو الصينية (منطقة إدارية خاصة)"}
         MS{"مونتيسيرات"}
         PM{"سان بيير وميكولون"}
         UY{"أوروغواي"}
     }
-    Countries%short{
-        MO{"ماكاو"}
-    }
     Countries%variant{
         CZ{"التشيك"}
     }
index db3db26e88809be197659d809f2c14cc035eedd8..bc1faa9e059032e75455495c2bd8d127e4c34227 100644 (file)
@@ -81,7 +81,7 @@ ca{
         CK{"Illes Cook"}
         CL{"Xile"}
         CM{"Camerun"}
-        CN{"Xina"}
+        CN{"Xina continental"}
         CO{"Colòmbia"}
         CP{"Illa Clipperton"}
         CR{"Costa Rica"}
@@ -133,7 +133,7 @@ ca{
         GU{"Guam"}
         GW{"Guinea Bissau"}
         GY{"Guyana"}
-        HK{"Hong Kong (Xina)"}
+        HK{"Hong Kong"}
         HM{"Illa Heard i Illes McDonald"}
         HN{"Hondures"}
         HR{"Croàcia"}
@@ -187,7 +187,7 @@ ca{
         ML{"Mali"}
         MM{"Myanmar (Birmània)"}
         MN{"Mongòlia"}
-        MO{"Macau (Xina)"}
+        MO{"Macau"}
         MP{"Illes Mariannes del Nord"}
         MQ{"Martinica"}
         MR{"Mauritània"}
@@ -297,8 +297,6 @@ ca{
     }
     Countries%short{
         GB{"RU"}
-        HK{"Hong Kong"}
-        MO{"Macau"}
         PS{"Palestina"}
         UN{"ONU"}
         US{"EUA"}
index 777870bd31268aa93184c0243424f8681e83198d..c881827596b9673cf274f4d1a658e9d6eda5c419 100644 (file)
@@ -81,7 +81,7 @@ cs{
         CK{"Cookovy ostrovy"}
         CL{"Chile"}
         CM{"Kamerun"}
-        CN{"Čína"}
+        CN{"Čína – kontinentální"}
         CO{"Kolumbie"}
         CP{"Clippertonův ostrov"}
         CR{"Kostarika"}
@@ -133,7 +133,7 @@ cs{
         GU{"Guam"}
         GW{"Guinea-Bissau"}
         GY{"Guyana"}
-        HK{"Hongkong - Čína"}
+        HK{"Hongkong"}
         HM{"Heardův ostrov a McDonaldovy ostrovy"}
         HN{"Honduras"}
         HR{"Chorvatsko"}
@@ -187,7 +187,7 @@ cs{
         ML{"Mali"}
         MM{"Myanmar (Barma)"}
         MN{"Mongolsko"}
-        MO{"Macao – Čína"}
+        MO{"Macao"}
         MP{"Severní Mariany"}
         MQ{"Martinik"}
         MR{"Mauritánie"}
@@ -297,8 +297,6 @@ cs{
     }
     Countries%short{
         GB{"GB"}
-        HK{"Hongkong"}
-        MO{"Macao"}
         PS{"Palestina"}
         UN{"OSN"}
         US{"USA"}
index feeaaa84ae4f95958b4528d8da0f9b4d2e564c64..6cc96009be3f64e843da265e9518a9efde126372 100644 (file)
@@ -81,7 +81,7 @@ da{
         CK{"Cookøerne"}
         CL{"Chile"}
         CM{"Cameroun"}
-        CN{"Kina"}
+        CN{"Kina, fastlandet"}
         CO{"Colombia"}
         CP{"Clippertonøen"}
         CR{"Costa Rica"}
@@ -133,7 +133,7 @@ da{
         GU{"Guam"}
         GW{"Guinea-Bissau"}
         GY{"Guyana"}
-        HK{"Hongkong (Kina)"}
+        HK{"Hongkong"}
         HM{"Heard Island og McDonald Islands"}
         HN{"Honduras"}
         HR{"Kroatien"}
@@ -187,7 +187,7 @@ da{
         ML{"Mali"}
         MM{"Myanmar (Burma)"}
         MN{"Mongoliet"}
-        MO{"Macau (Kina)"}
+        MO{"Macao"}
         MP{"Nordmarianerne"}
         MQ{"Martinique"}
         MR{"Mauretanien"}
@@ -297,8 +297,6 @@ da{
     }
     Countries%short{
         GB{"UK"}
-        HK{"Hongkong"}
-        MO{"Macao"}
         PS{"Palæstina"}
         UN{"FN"}
         US{"USA"}
index 75681a8ba00cd780b5ca3c4fab66ecd1b60280d0..82b192e9e23b38b8676bcbf471f2c0aa4d540541 100644 (file)
@@ -80,7 +80,7 @@ de{
         CK{"Cookinseln"}
         CL{"Chile"}
         CM{"Kamerun"}
-        CN{"China"}
+        CN{"China, Festland"}
         CO{"Kolumbien"}
         CP{"Clipperton-Insel"}
         CR{"Costa Rica"}
@@ -132,7 +132,7 @@ de{
         GU{"Guam"}
         GW{"Guinea-Bissau"}
         GY{"Guyana"}
-        HK{"Hongkong (China)"}
+        HK{"Hongkong"}
         HM{"Heard und McDonaldinseln"}
         HN{"Honduras"}
         HR{"Kroatien"}
@@ -186,7 +186,7 @@ de{
         ML{"Mali"}
         MM{"Myanmar"}
         MN{"Mongolei"}
-        MO{"Macau (China)"}
+        MO{"Macao"}
         MP{"Nördliche Marianen"}
         MQ{"Martinique"}
         MR{"Mauretanien"}
@@ -296,8 +296,6 @@ de{
     }
     Countries%short{
         GB{"GB"}
-        HK{"Hongkong"}
-        MO{"Macau"}
         PS{"Palästina"}
         UN{"UN"}
         US{"USA"}
index bfb225bf7d82ca01f063151922e6be42198c3ec4..ec2fe2a4e1be491e1d0eabbfa0c066e7c6e6f303 100644 (file)
@@ -81,7 +81,7 @@ el{
         CK{"Νήσοι Κουκ"}
         CL{"Χιλή"}
         CM{"Καμερούν"}
-        CN{"Κίνα"}
+        CN{"Κίνα ηπειρωτική"}
         CO{"Κολομβία"}
         CP{"Νήσος Κλίπερτον"}
         CR{"Κόστα Ρίκα"}
@@ -133,7 +133,7 @@ el{
         GU{"Γκουάμ"}
         GW{"Γουινέα Μπισάου"}
         GY{"Γουιάνα"}
-        HK{"Χονγκ Κονγκ (Κίνα)"}
+        HK{"Χονγκ Κονγκ"}
         HM{"Νήσοι Χερντ και Μακντόναλντ"}
         HN{"Ονδούρα"}
         HR{"Κροατία"}
@@ -187,7 +187,7 @@ el{
         ML{"Μάλι"}
         MM{"Μιανμάρ (Βιρμανία)"}
         MN{"Μογγολία"}
-        MO{"Μακάο (Κίνα)"}
+        MO{"Μακάο"}
         MP{"Νήσοι Βόρειες Μαριάνες"}
         MQ{"Μαρτινίκα"}
         MR{"Μαυριτανία"}
@@ -297,8 +297,6 @@ el{
     }
     Countries%short{
         GB{"ΗΒ"}
-        HK{"Χονγκ Κονγκ"}
-        MO{"Μακάο"}
         PS{"Παλαιστίνη"}
         UN{"ΟΗΕ"}
         US{"ΗΠΑ"}
index bdb5b134031df0af83b0b29d4b446644a9ab4bd2..a02c5b00054a4565efade3be71b215eb6acf9edf 100644 (file)
@@ -81,7 +81,7 @@ en{
         CK{"Cook Islands"}
         CL{"Chile"}
         CM{"Cameroon"}
-        CN{"China"}
+        CN{"China mainland"}
         CO{"Colombia"}
         CP{"Clipperton Island"}
         CR{"Costa Rica"}
@@ -133,7 +133,7 @@ en{
         GU{"Guam"}
         GW{"Guinea-Bissau"}
         GY{"Guyana"}
-        HK{"Hong Kong (China)"}
+        HK{"Hong Kong"}
         HM{"Heard & McDonald Islands"}
         HN{"Honduras"}
         HR{"Croatia"}
@@ -187,7 +187,7 @@ en{
         ML{"Mali"}
         MM{"Myanmar (Burma)"}
         MN{"Mongolia"}
-        MO{"Macau (China)"}
+        MO{"Macau"}
         MP{"Northern Mariana Islands"}
         MQ{"Martinique"}
         MR{"Mauritania"}
@@ -298,9 +298,7 @@ en{
     Countries%short{
         BA{"Bosnia"}
         GB{"UK"}
-        HK{"Hong Kong"}
         MM{"Myanmar"}
-        MO{"Macau"}
         PS{"Palestine"}
         UN{"UN"}
         US{"US"}
index e3c9939060ac9f9713e363d335e9afc85b3b6534..35c53a5331e258085d5f96b1d8c01eb49946d678 100644 (file)
@@ -81,7 +81,7 @@ es{
         CK{"Islas Cook"}
         CL{"Chile"}
         CM{"Camerún"}
-        CN{"China"}
+        CN{"China continental"}
         CO{"Colombia"}
         CP{"Isla Clipperton"}
         CR{"Costa Rica"}
@@ -133,7 +133,7 @@ es{
         GU{"Guam"}
         GW{"Guinea-Bisáu"}
         GY{"Guyana"}
-        HK{"Hong Kong (China)"}
+        HK{"Hong Kong"}
         HM{"Islas Heard y McDonald"}
         HN{"Honduras"}
         HR{"Croacia"}
@@ -187,7 +187,7 @@ es{
         ML{"Mali"}
         MM{"Myanmar (Birmania)"}
         MN{"Mongolia"}
-        MO{"Macao (China)"}
+        MO{"Macao"}
         MP{"Islas Marianas del Norte"}
         MQ{"Martinica"}
         MR{"Mauritania"}
@@ -297,8 +297,6 @@ es{
     }
     Countries%short{
         GB{"RU"}
-        HK{"Hong Kong"}
-        MO{"Macao"}
         PS{"Palestina"}
         US{"EE. UU."}
     }
index 53bba86d8ec3acd1df5a24ee77af3bec36cef9c5..ce19aa27b577f768e19368b1797efb92b3eb57ce 100644 (file)
@@ -20,6 +20,7 @@ es_419{
         CI{"Costa de Marfil"}
         EZ{"Eurozona"}
         GG{"Guernesey"}
+        HK{"Hong-Kong"}
         IC{"Islas Canarias"}
         QO{"Islas Ultramarinas"}
         TA{"Tristán da Cunha"}
index 82795d940bf9307bb913bcc6427dfe9c41dfc29f..a006a4012c9a69fb0da67442bc59ed5570323bd1 100644 (file)
@@ -81,7 +81,7 @@ fi{
         CK{"Cookinsaaret"}
         CL{"Chile"}
         CM{"Kamerun"}
-        CN{"Kiina"}
+        CN{"Kiina, manner-"}
         CO{"Kolumbia"}
         CP{"Clippertoninsaari"}
         CR{"Costa Rica"}
@@ -133,7 +133,7 @@ fi{
         GU{"Guam"}
         GW{"Guinea-Bissau"}
         GY{"Guyana"}
-        HK{"Hongkong (Kiina)"}
+        HK{"Hongkong"}
         HM{"Heard ja McDonaldinsaaret"}
         HN{"Honduras"}
         HR{"Kroatia"}
@@ -187,7 +187,7 @@ fi{
         ML{"Mali"}
         MM{"Myanmar (Burma)"}
         MN{"Mongolia"}
-        MO{"Macao (Kiina)"}
+        MO{"Macao"}
         MP{"Pohjois-Mariaanit"}
         MQ{"Martinique"}
         MR{"Mauritania"}
@@ -297,8 +297,6 @@ fi{
     }
     Countries%short{
         GB{"Britannia"}
-        HK{"Hongkong"}
-        MO{"Macao"}
         PS{"Palestiina"}
         UN{"YK"}
         US{"USA"}
index 663a65dda077c96fe6b9437ddce7a2cd6f34bed0..04d2d6be411bc3b53828bcaca650a40d513352fa 100644 (file)
@@ -81,7 +81,7 @@ fr{
         CK{"Îles Cook"}
         CL{"Chili"}
         CM{"Cameroun"}
-        CN{"Chine"}
+        CN{"Chine continentale"}
         CO{"Colombie"}
         CP{"Île Clipperton"}
         CR{"Costa Rica"}
@@ -133,7 +133,7 @@ fr{
         GU{"Guam"}
         GW{"Guinée-Bissau"}
         GY{"Guyana"}
-        HK{"Hong Kong (Chine)"}
+        HK{"Hong Kong"}
         HM{"Îles Heard et McDonald"}
         HN{"Honduras"}
         HR{"Croatie"}
@@ -187,7 +187,7 @@ fr{
         ML{"Mali"}
         MM{"Myanmar (Birmanie)"}
         MN{"Mongolie"}
-        MO{"Macao (Chine)"}
+        MO{"Macao"}
         MP{"Îles Mariannes du Nord"}
         MQ{"Martinique"}
         MR{"Mauritanie"}
@@ -297,8 +297,6 @@ fr{
     }
     Countries%short{
         GB{"R.-U."}
-        HK{"Hong Kong"}
-        MO{"Macao"}
         PS{"Palestine"}
         UN{"NU"}
         US{"É.-U."}
index 69c68e0506c6f7d2e723fa884e8d74b7c87a4310..22112b168a411c4037dba635a989e9638d2401d5 100644 (file)
@@ -81,7 +81,7 @@ he{
         CK{"איי קוק"}
         CL{"צ׳ילה"}
         CM{"קמרון"}
-        CN{"סין"}
+        CN{"סין היבשתית"}
         CO{"קולומביה"}
         CP{"האי קליפרטון"}
         CR{"קוסטה ריקה"}
@@ -133,7 +133,7 @@ he{
         GU{"גואם"}
         GW{"גינאה-ביסאו"}
         GY{"גיאנה"}
-        HK{"הונג קונג (סין)"}
+        HK{"הונג קונג"}
         HM{"איי הרד ומקדונלד"}
         HN{"הונדורס"}
         HR{"קרואטיה"}
@@ -187,7 +187,7 @@ he{
         ML{"מאלי"}
         MM{"מיאנמר (בורמה)"}
         MN{"מונגוליה"}
-        MO{"מקאו (סין)"}
+        MO{"מקאו"}
         MP{"איי מריאנה הצפוניים"}
         MQ{"מרטיניק"}
         MR{"מאוריטניה"}
@@ -297,8 +297,6 @@ he{
     }
     Countries%short{
         GB{"בריטניה"}
-        HK{"הונג קונג"}
-        MO{"מקאו"}
         PS{"פלסטין"}
         US{"ארה״ב"}
     }
index 5370ffa8c9bfa6b8023d0d68358487312804f19d..a1c19c1725e559a177c1972db4b5061685cacecb 100644 (file)
@@ -81,7 +81,7 @@ hi{
         CK{"कुक द्वीपसमूह"}
         CL{"चिली"}
         CM{"कैमरून"}
-        CN{"चीन"}
+        CN{"चीन मुख्यभूमि"}
         CO{"कोलंबिया"}
         CP{"क्लिपर्टन द्वीप"}
         CR{"कोस्टा रीका"}
@@ -133,7 +133,7 @@ hi{
         GU{"गुआम"}
         GW{"गिनी-बिसाउ"}
         GY{"गुयाना"}
-        HK{"हाँग काँग (चीन)"}
+        HK{"हाँग काँग"}
         HM{"हर्ड द्वीप और मैकडोनॉल्ड द्वीपसमूह"}
         HN{"होंडूरास"}
         HR{"क्रोएशिया"}
@@ -187,7 +187,7 @@ hi{
         ML{"माली"}
         MM{"म्यांमार (बर्मा)"}
         MN{"मंगोलिया"}
-        MO{"मà¤\95ाà¤\8a (à¤\9aà¥\80न)"}
+        MO{"मà¤\95ाà¤\93"}
         MP{"उत्तरी मारियाना द्वीपसमूह"}
         MQ{"मार्टीनिक"}
         MR{"मॉरिटानिया"}
@@ -297,8 +297,6 @@ hi{
     }
     Countries%short{
         GB{"यू॰के॰"}
-        HK{"हाँग काँग"}
-        MO{"मकाऊ"}
         PS{"फ़िलिस्तीन"}
         UN{"संयुक्त राष्ट्र"}
         US{"यू॰एस॰"}
index 64fcac01608e7a624498e7712e67892b1fd253f9..a8a27e5dba843a53b8ca3105db5ab8196a678572 100644 (file)
@@ -81,7 +81,7 @@ hr{
         CK{"Cookovi Otoci"}
         CL{"Čile"}
         CM{"Kamerun"}
-        CN{"Kina"}
+        CN{"Kina, kontinentalna"}
         CO{"Kolumbija"}
         CP{"Otok Clipperton"}
         CR{"Kostarika"}
@@ -133,7 +133,7 @@ hr{
         GU{"Guam"}
         GW{"Gvineja Bisau"}
         GY{"Gvajana"}
-        HK{"Hong Kong (Kina)"}
+        HK{"Hong Kong"}
         HM{"Otoci Heard i McDonald"}
         HN{"Honduras"}
         HR{"Hrvatska"}
@@ -187,7 +187,7 @@ hr{
         ML{"Mali"}
         MM{"Mjanmar (Burma)"}
         MN{"Mongolija"}
-        MO{"Makao (Kina)"}
+        MO{"Makao"}
         MP{"Sjevernomarijanski otoci"}
         MQ{"Martinique"}
         MR{"Mauretanija"}
@@ -297,8 +297,6 @@ hr{
     }
     Countries%short{
         GB{"UK"}
-        HK{"Hong Kong"}
-        MO{"Makao"}
         PS{"Palestina"}
         UN{"UN"}
         US{"SAD"}
index a8e76401735fc60c93c7a0ee0d265793084a6d42..a9212a25d4583c463df47fcd1fe0c24a52c450ff 100644 (file)
@@ -81,7 +81,7 @@ hu{
         CK{"Cook-szigetek"}
         CL{"Chile"}
         CM{"Kamerun"}
-        CN{"Kína"}
+        CN{"Kína - kontinentális"}
         CO{"Kolumbia"}
         CP{"Clipperton-sziget"}
         CR{"Costa Rica"}
@@ -133,7 +133,7 @@ hu{
         GU{"Guam"}
         GW{"Bissau-Guinea"}
         GY{"Guyana"}
-        HK{"Hongkong (Kína)"}
+        HK{"Hongkong"}
         HM{"Heard-sziget és McDonald-szigetek"}
         HN{"Honduras"}
         HR{"Horvátország"}
@@ -187,7 +187,7 @@ hu{
         ML{"Mali"}
         MM{"Mianmar (Burma)"}
         MN{"Mongólia"}
-        MO{"Makaó (Kína)"}
+        MO{"Makaó"}
         MP{"Északi Mariana-szigetek"}
         MQ{"Martinique"}
         MR{"Mauritánia"}
@@ -297,8 +297,6 @@ hu{
     }
     Countries%short{
         GB{"UK"}
-        HK{"Hongkong"}
-        MO{"Makaó"}
         PS{"Palesztina"}
         UN{"ENSZ"}
         US{"USA"}
index 3e696729857b44e1a7104d9f4bed693ae26fc96b..ac35bce2496f23f021a548beef4b5804d1f4d5a6 100644 (file)
@@ -81,7 +81,7 @@ id{
         CK{"Kepulauan Cook"}
         CL{"Cile"}
         CM{"Kamerun"}
-        CN{"Tiongkok"}
+        CN{"Tiongkok daratan"}
         CO{"Kolombia"}
         CP{"Pulau Clipperton"}
         CR{"Kosta Rika"}
@@ -133,7 +133,7 @@ id{
         GU{"Guam"}
         GW{"Guinea-Bissau"}
         GY{"Guyana"}
-        HK{"Hong Kong (Tiongkok)"}
+        HK{"Hong Kong"}
         HM{"Pulau Heard dan Kepulauan McDonald"}
         HN{"Honduras"}
         HR{"Kroasia"}
@@ -187,7 +187,7 @@ id{
         ML{"Mali"}
         MM{"Myanmar (Burma)"}
         MN{"Mongolia"}
-        MO{"Makau (Tiongkok)"}
+        MO{"Makau"}
         MP{"Kepulauan Mariana Utara"}
         MQ{"Martinik"}
         MR{"Mauritania"}
@@ -297,8 +297,6 @@ id{
     }
     Countries%short{
         GB{"UK"}
-        HK{"Hong Kong"}
-        MO{"Makau"}
         PS{"Palestina"}
         UN{"PBB"}
         US{"A.S."}
index 0d53635ff2179e0738dc95c9c972d55abf0e748a..c188c8c2bad0b4309ae7911886e25223cca80cb3 100644 (file)
@@ -81,7 +81,7 @@ it{
         CK{"Isole Cook"}
         CL{"Cile"}
         CM{"Camerun"}
-        CN{"Cina"}
+        CN{"Cina continentale"}
         CO{"Colombia"}
         CP{"Isola di Clipperton"}
         CR{"Costa Rica"}
@@ -133,7 +133,7 @@ it{
         GU{"Guam"}
         GW{"Guinea-Bissau"}
         GY{"Guyana"}
-        HK{"Hong Kong (Cina)"}
+        HK{"Hong Kong"}
         HM{"Isole Heard e McDonald"}
         HN{"Honduras"}
         HR{"Croazia"}
@@ -187,7 +187,7 @@ it{
         ML{"Mali"}
         MM{"Myanmar (Birmania)"}
         MN{"Mongolia"}
-        MO{"Macao (Cina)"}
+        MO{"Macao"}
         MP{"Isole Marianne settentrionali"}
         MQ{"Martinica"}
         MR{"Mauritania"}
@@ -297,8 +297,6 @@ it{
     }
     Countries%short{
         GB{"UK"}
-        HK{"Hong Kong"}
-        MO{"Macao"}
         PS{"Palestina"}
         UN{"ONU"}
         US{"USA"}
index c6a046d0bd45d1cec9e04ce3f2c362f0260b1927..a3871e7a9d817ff90a376e14e5fede57078e2b0c 100644 (file)
@@ -81,7 +81,7 @@ ja{
         CK{"クック諸島"}
         CL{"チリ"}
         CM{"カメルーン"}
-        CN{"中国"}
+        CN{"中国大陸"}
         CO{"コロンビア"}
         CP{"クリッパートン島"}
         CR{"コスタリカ"}
@@ -133,7 +133,7 @@ ja{
         GU{"グアム"}
         GW{"ギニアビサウ"}
         GY{"ガイアナ"}
-        HK{"香港(中国)"}
+        HK{"香港"}
         HM{"ハード島・マクドナルド諸島"}
         HN{"ホンジュラス"}
         HR{"クロアチア"}
@@ -187,7 +187,7 @@ ja{
         ML{"マリ"}
         MM{"ミャンマー (ビルマ)"}
         MN{"モンゴル"}
-        MO{"マカオ(中国)"}
+        MO{"マカオ"}
         MP{"北マリアナ諸島"}
         MQ{"マルティニーク"}
         MR{"モーリタニア"}
@@ -297,8 +297,6 @@ ja{
     }
     Countries%short{
         GB{"英国"}
-        HK{"香港"}
-        MO{"マカオ"}
         PS{"パレスチナ"}
         UN{"国連"}
         US{"アメリカ"}
index b6e66e83c5245d61c5bdcb02993d62431fd2488e..6fdc5ba45fd6b0b036f82417cfcbc2da94cb53c1 100644 (file)
@@ -81,7 +81,7 @@ ko{
         CK{"쿡 제도"}
         CL{"칠레"}
         CM{"카메룬"}
-        CN{"중국"}
+        CN{"중국 본토"}
         CO{"콜롬비아"}
         CP{"클립퍼튼 섬"}
         CR{"코스타리카"}
@@ -133,7 +133,7 @@ ko{
         GU{"괌"}
         GW{"기니비사우"}
         GY{"가이아나"}
-        HK{"홍콩(중국)"}
+        HK{"홍콩"}
         HM{"허드 맥도널드 제도"}
         HN{"온두라스"}
         HR{"크로아티아"}
@@ -187,7 +187,7 @@ ko{
         ML{"말리"}
         MM{"미얀마"}
         MN{"몽골"}
-        MO{"마카오(중국)"}
+        MO{"마카오"}
         MP{"북마리아나제도"}
         MQ{"마르티니크"}
         MR{"모리타니"}
@@ -297,8 +297,6 @@ ko{
     }
     Countries%short{
         GB{"영국"}
-        HK{"홍콩"}
-        MO{"마카오"}
         PS{"팔레스타인"}
         UN{"유엔"}
         US{"미국"}
index 40587f4e25bd734f353c509f95a6a1104b3e91fd..098a4cdd406c061f0eac5eb1a5b291a66f440670 100644 (file)
@@ -81,7 +81,7 @@ ms{
         CK{"Kepulauan Cook"}
         CL{"Chile"}
         CM{"Cameroon"}
-        CN{"China"}
+        CN{"China, Tanah Besar"}
         CO{"Colombia"}
         CP{"Pulau Clipperton"}
         CR{"Costa Rica"}
@@ -133,7 +133,7 @@ ms{
         GU{"Guam"}
         GW{"Guinea Bissau"}
         GY{"Guyana"}
-        HK{"Hong Kong (China)"}
+        HK{"Hong Kong"}
         HM{"Kepulauan Heard & McDonald"}
         HN{"Honduras"}
         HR{"Croatia"}
@@ -187,7 +187,7 @@ ms{
         ML{"Mali"}
         MM{"Myanmar (Burma)"}
         MN{"Mongolia"}
-        MO{"Macau (China)"}
+        MO{"Macau"}
         MP{"Kepulauan Mariana Utara"}
         MQ{"Martinique"}
         MR{"Mauritania"}
@@ -297,8 +297,6 @@ ms{
     }
     Countries%short{
         GB{"UK"}
-        HK{"Hong Kong"}
-        MO{"Macau"}
         PS{"Palestin"}
         UN{"PBB"}
         US{"A.S"}
index d1d68c8cdc8e887de69a2a2a207c13b5e5cd5930..01f773a79def733a6164fcd474fb56cf8f21f09d 100644 (file)
@@ -81,7 +81,7 @@ nb{
         CK{"Cookøyene"}
         CL{"Chile"}
         CM{"Kamerun"}
-        CN{"Kina"}
+        CN{"Kina, fastlandet"}
         CO{"Colombia"}
         CP{"Clippertonøya"}
         CR{"Costa Rica"}
@@ -133,7 +133,7 @@ nb{
         GU{"Guam"}
         GW{"Guinea-Bissau"}
         GY{"Guyana"}
-        HK{"Hongkong (Kina)"}
+        HK{"Hongkong"}
         HM{"Heard- og McDonaldøyene"}
         HN{"Honduras"}
         HR{"Kroatia"}
@@ -187,7 +187,7 @@ nb{
         ML{"Mali"}
         MM{"Myanmar (Burma)"}
         MN{"Mongolia"}
-        MO{"Macao (Kina)"}
+        MO{"Macao"}
         MP{"Nord-Marianene"}
         MQ{"Martinique"}
         MR{"Mauritania"}
@@ -297,8 +297,6 @@ nb{
     }
     Countries%short{
         GB{"Storbritannia"}
-        HK{"Hongkong"}
-        MO{"Macao"}
         PS{"Palestina"}
         UN{"FN"}
         US{"USA"}
index c8df92a5529752990acd8a654b452f9adfa8b09c..d8619fc6634f7d65458c3cf416f3eaa9a68254ea 100644 (file)
@@ -81,7 +81,7 @@ nl{
         CK{"Cookeilanden"}
         CL{"Chili"}
         CM{"Kameroen"}
-        CN{"China"}
+        CN{"China, vasteland"}
         CO{"Colombia"}
         CP{"Clipperton"}
         CR{"Costa Rica"}
@@ -133,7 +133,7 @@ nl{
         GU{"Guam"}
         GW{"Guinee-Bissau"}
         GY{"Guyana"}
-        HK{"Hongkong (China)"}
+        HK{"Hongkong"}
         HM{"Heard en McDonaldeilanden"}
         HN{"Honduras"}
         HR{"Kroatië"}
@@ -187,7 +187,7 @@ nl{
         ML{"Mali"}
         MM{"Myanmar (Birma)"}
         MN{"Mongolië"}
-        MO{"Macau (China)"}
+        MO{"Macau"}
         MP{"Noordelijke Marianen"}
         MQ{"Martinique"}
         MR{"Mauritanië"}
@@ -297,8 +297,6 @@ nl{
     }
     Countries%short{
         GB{"VK"}
-        HK{"Hongkong"}
-        MO{"Macau"}
         PS{"Palestina"}
         UN{"VN"}
         US{"VS"}
index c5121d47644bcbcd0678c13dc2c5c32b138bd3c7..1cf3fa544ab0257828aef7174d4adfd5735c0634 100644 (file)
@@ -80,7 +80,7 @@ nn{
         CK{"Cookøyane"}
         CL{"Chile"}
         CM{"Kamerun"}
-        CN{"Kina"}
+        CN{"Kina, fastlandet"}
         CO{"Colombia"}
         CP{"Clippertonøya"}
         CR{"Costa Rica"}
@@ -132,7 +132,7 @@ nn{
         GU{"Guam"}
         GW{"Guinea-Bissau"}
         GY{"Guyana"}
-        HK{"Hongkong S.A.R. Kina"}
+        HK{"Hongkong"}
         HM{"Heardøya og McDonaldøyane"}
         HN{"Honduras"}
         HR{"Kroatia"}
@@ -186,7 +186,7 @@ nn{
         ML{"Mali"}
         MM{"Myanmar (Burma)"}
         MN{"Mongolia"}
-        MO{"Macao S.A.R. Kina"}
+        MO{"Macao"}
         MP{"Nord-Marianane"}
         MQ{"Martinique"}
         MR{"Mauritania"}
@@ -296,8 +296,6 @@ nn{
     }
     Countries%short{
         GB{"Storbritannia"}
-        HK{"Hongkong"}
-        MO{"Macao"}
         PS{"Palestina"}
         US{"USA"}
     }
index ed4610a81787b0621f7d52ba553aa7bef900d6bf..11258cdd415af58c5c94a233dce17e95fb376b15 100644 (file)
@@ -81,7 +81,7 @@ pl{
         CK{"Wyspy Cooka"}
         CL{"Chile"}
         CM{"Kamerun"}
-        CN{"Chiny"}
+        CN{"Chiny kontynentalne"}
         CO{"Kolumbia"}
         CP{"Clipperton"}
         CR{"Kostaryka"}
@@ -133,7 +133,7 @@ pl{
         GU{"Guam"}
         GW{"Gwinea Bissau"}
         GY{"Gujana"}
-        HK{"Hongkong (Chiny)"}
+        HK{"Hongkong"}
         HM{"Wyspy Heard i McDonalda"}
         HN{"Honduras"}
         HR{"Chorwacja"}
@@ -187,7 +187,7 @@ pl{
         ML{"Mali"}
         MM{"Mjanma (Birma)"}
         MN{"Mongolia"}
-        MO{"Makau (Chiny)"}
+        MO{"Makau"}
         MP{"Mariany Północne"}
         MQ{"Martynika"}
         MR{"Mauretania"}
@@ -297,8 +297,6 @@ pl{
     }
     Countries%short{
         GB{"Wlk. Bryt."}
-        HK{"Hongkong"}
-        MO{"Makau"}
         PS{"Palestyna"}
         UN{"ONZ"}
         US{"USA"}
index 58de32c17b147dff1b1762b54f222f5b5334aa41..6a6f7b299978de8c620dc9445fade61cd2a57aab 100644 (file)
@@ -80,7 +80,7 @@ pt{
         CK{"Ilhas Cook"}
         CL{"Chile"}
         CM{"Camarões"}
-        CN{"China"}
+        CN{"China continental"}
         CO{"Colômbia"}
         CP{"Ilha de Clipperton"}
         CR{"Costa Rica"}
@@ -132,7 +132,7 @@ pt{
         GU{"Guam"}
         GW{"Guiné-Bissau"}
         GY{"Guiana"}
-        HK{"Hong Kong (China)"}
+        HK{"Hong Kong"}
         HM{"Ilhas Heard e McDonald"}
         HN{"Honduras"}
         HR{"Croácia"}
@@ -186,7 +186,7 @@ pt{
         ML{"Mali"}
         MM{"Mianmar (Birmânia)"}
         MN{"Mongólia"}
-        MO{"Macau (China)"}
+        MO{"Macau"}
         MP{"Ilhas Marianas do Norte"}
         MQ{"Martinica"}
         MR{"Mauritânia"}
@@ -296,8 +296,6 @@ pt{
     }
     Countries%short{
         GB{"Reino Unido"}
-        HK{"Hong Kong"}
-        MO{"Macau"}
         PS{"Palestina"}
         UN{"ONU"}
         US{"EUA"}
index 49370f7d3d5d967061fa1a0310551d9d66c26815..cf01f7db4bad9da25eed03351f7c181dc4d42b7f 100644 (file)
@@ -81,7 +81,7 @@ ro{
         CK{"Insulele Cook"}
         CL{"Chile"}
         CM{"Camerun"}
-        CN{"China"}
+        CN{"China continentală"}
         CO{"Columbia"}
         CP{"Insula Clipperton"}
         CR{"Costa Rica"}
@@ -133,7 +133,7 @@ ro{
         GU{"Guam"}
         GW{"Guineea-Bissau"}
         GY{"Guyana"}
-        HK{"Hong Kong (China)"}
+        HK{"Hong Kong"}
         HM{"Insula Heard și Insulele McDonald"}
         HN{"Honduras"}
         HR{"Croația"}
@@ -187,7 +187,7 @@ ro{
         ML{"Mali"}
         MM{"Myanmar (Birmania)"}
         MN{"Mongolia"}
-        MO{"Macao (China)"}
+        MO{"Macao"}
         MP{"Insulele Mariane de Nord"}
         MQ{"Martinica"}
         MR{"Mauritania"}
@@ -297,8 +297,6 @@ ro{
     }
     Countries%short{
         GB{"Regatul Unit"}
-        HK{"Hong Kong"}
-        MO{"Macao"}
         PS{"Palestina"}
         UN{"ONU"}
         US{"S.U.A."}
index 4587b587df4072fae6184daf6f89dcede3b2e592..ba21aa12c9da8ada5b07723ef170d4260ddeadfc 100644 (file)
@@ -81,7 +81,7 @@ ru{
         CK{"Острова Кука"}
         CL{"Чили"}
         CM{"Камерун"}
-        CN{"Китай"}
+        CN{"Китай континентальный"}
         CO{"Колумбия"}
         CP{"о-в Клиппертон"}
         CR{"Коста-Рика"}
@@ -133,7 +133,7 @@ ru{
         GU{"Гуам"}
         GW{"Гвинея-Бисау"}
         GY{"Гайана"}
-        HK{"Гонконг (Китай)"}
+        HK{"Гонконг"}
         HM{"о-ва Херд и Макдональд"}
         HN{"Гондурас"}
         HR{"Хорватия"}
@@ -187,7 +187,7 @@ ru{
         ML{"Мали"}
         MM{"Мьянма (Бирма)"}
         MN{"Монголия"}
-        MO{"Макао (Китай)"}
+        MO{"Макао"}
         MP{"Северные Марианские о-ва"}
         MQ{"Мартиника"}
         MR{"Мавритания"}
@@ -297,8 +297,6 @@ ru{
     }
     Countries%short{
         GB{"Британия"}
-        HK{"Гонконг"}
-        MO{"Макао"}
         PS{"Палестина"}
         UN{"ООН"}
         US{"США"}
index 91246fb413933283b525ab816c62a4fca9a38beb..da3897d37772ed3223515f4d3835bcf4ccb3df6f 100644 (file)
@@ -81,7 +81,7 @@ sk{
         CK{"Cookove ostrovy"}
         CL{"Čile"}
         CM{"Kamerun"}
-        CN{"Čína"}
+        CN{"Čína – kontinentálna"}
         CO{"Kolumbia"}
         CP{"Clipperton"}
         CR{"Kostarika"}
@@ -133,7 +133,7 @@ sk{
         GU{"Guam"}
         GW{"Guinea-Bissau"}
         GY{"Guyana"}
-        HK{"Hongkong (Čína)"}
+        HK{"Hong Kong"}
         HM{"Heardov ostrov a Macdonaldove ostrovy"}
         HN{"Honduras"}
         HR{"Chorvátsko"}
@@ -187,7 +187,7 @@ sk{
         ML{"Mali"}
         MM{"Mjanmarsko"}
         MN{"Mongolsko"}
-        MO{"Macao (Čína)"}
+        MO{"Macau"}
         MP{"Severné Mariány"}
         MQ{"Martinik"}
         MR{"Mauritánia"}
@@ -297,8 +297,6 @@ sk{
     }
     Countries%short{
         GB{"UK"}
-        HK{"Hongkong"}
-        MO{"Macao"}
         PS{"Palestínska samospráva"}
         UN{"OSN"}
         US{"USA"}
index b7642884ceaed4a5534532ad61d55777fd55258b..a5483fb76f4aa585e5931911b3c1b9d7da055e54 100644 (file)
@@ -81,7 +81,7 @@ sv{
         CK{"Cooköarna"}
         CL{"Chile"}
         CM{"Kamerun"}
-        CN{"Kina"}
+        CN{"Kina, fastlandet"}
         CO{"Colombia"}
         CP{"Clippertonön"}
         CR{"Costa Rica"}
@@ -133,7 +133,7 @@ sv{
         GU{"Guam"}
         GW{"Guinea-Bissau"}
         GY{"Guyana"}
-        HK{"Hongkong (Kina)"}
+        HK{"Hongkong"}
         HM{"Heardön och McDonaldöarna"}
         HN{"Honduras"}
         HR{"Kroatien"}
@@ -187,7 +187,7 @@ sv{
         ML{"Mali"}
         MM{"Myanmar (Burma)"}
         MN{"Mongoliet"}
-        MO{"Macao (Kina)"}
+        MO{"Macau"}
         MP{"Nordmarianerna"}
         MQ{"Martinique"}
         MR{"Mauretanien"}
@@ -297,8 +297,6 @@ sv{
     }
     Countries%short{
         GB{"Storbritannien"}
-        HK{"Hongkong"}
-        MO{"Macao"}
         PS{"Palestina"}
         UN{"FN"}
         US{"USA"}
index 16ab6b4acbaa38747119898cc74b660bf5c1be66..871e91bf098d5e9b1b739c54cb79857bcdbd8a96 100644 (file)
@@ -81,7 +81,7 @@ th{
         CK{"หมู่เกาะคุก"}
         CL{"ชิลี"}
         CM{"แคเมอรูน"}
-        CN{"จีน"}
+        CN{"จีนแผ่นดินใหญ่"}
         CO{"โคลอมเบีย"}
         CP{"เกาะคลิปเปอร์ตัน"}
         CR{"คอสตาริกา"}
@@ -133,7 +133,7 @@ th{
         GU{"กวม"}
         GW{"กินี-บิสเซา"}
         GY{"กายอานา"}
-        HK{"ฮ่องกง (จีน)"}
+        HK{"ฮ่องกง"}
         HM{"เกาะเฮิร์ดและหมู่เกาะแมกดอนัลด์"}
         HN{"ฮอนดูรัส"}
         HR{"โครเอเชีย"}
@@ -187,7 +187,7 @@ th{
         ML{"มาลี"}
         MM{"เมียนมาร์ (พม่า)"}
         MN{"มองโกเลีย"}
-        MO{"มาเก๊า (จีน)"}
+        MO{"มาเก๊า"}
         MP{"หมู่เกาะนอร์เทิร์นมาเรียนา"}
         MQ{"มาร์ตินีก"}
         MR{"มอริเตเนีย"}
@@ -297,8 +297,6 @@ th{
     }
     Countries%short{
         GB{"อังกฤษ"}
-        HK{"ฮ่องกง"}
-        MO{"มาเก๊า"}
         PS{"ปาเลสไตน์"}
         UN{"สหประชาชาติ"}
         US{"สหรัฐฯ"}
index 09af056e035511caa6cea68b17e5f6d36445eabd..f8b86f73334dad43a1f816fed503e6398c0fba10 100644 (file)
@@ -81,7 +81,7 @@ tr{
         CK{"Cook Adaları"}
         CL{"Şili"}
         CM{"Kamerun"}
-        CN{"Çin"}
+        CN{"Çin anakarası"}
         CO{"Kolombiya"}
         CP{"Clipperton Adası"}
         CR{"Kosta Rika"}
@@ -133,7 +133,7 @@ tr{
         GU{"Guam"}
         GW{"Gine-Bissau"}
         GY{"Guyana"}
-        HK{"Hong Kong (Çin)"}
+        HK{"Hong Kong"}
         HM{"Heard Adası ve McDonald Adaları"}
         HN{"Honduras"}
         HR{"Hırvatistan"}
@@ -187,7 +187,7 @@ tr{
         ML{"Mali"}
         MM{"Myanmar (Burma)"}
         MN{"Moğolistan"}
-        MO{"Makao (Çin)"}
+        MO{"Makao"}
         MP{"Kuzey Mariana Adaları"}
         MQ{"Martinik"}
         MR{"Moritanya"}
@@ -297,8 +297,6 @@ tr{
     }
     Countries%short{
         GB{"BK"}
-        HK{"Hong Kong"}
-        MO{"Makao"}
         PS{"Filistin"}
         UN{"BM"}
         US{"ABD"}
index a90135ff5bc5b60e23c30f2c5cc1118865e4ec78..135af19041a48fa428963f2d6c57c9a06474f04f 100644 (file)
@@ -81,7 +81,7 @@ uk{
         CK{"Острови Кука"}
         CL{"Чілі"}
         CM{"Камерун"}
-        CN{"Китай"}
+        CN{"Китай материковий"}
         CO{"Колумбія"}
         CP{"Острів Кліппертон"}
         CR{"Коста-Ріка"}
@@ -133,7 +133,7 @@ uk{
         GU{"Ґуам"}
         GW{"Гвінея-Бісау"}
         GY{"Ґайана"}
-        HK{"Гонконґ (Китай)"}
+        HK{"Гонконг"}
         HM{"острів Герд і острови Макдоналд"}
         HN{"Гондурас"}
         HR{"Хорватія"}
@@ -187,7 +187,7 @@ uk{
         ML{"Малі"}
         MM{"Мʼянма (Бірма)"}
         MN{"Монголія"}
-        MO{"Макао (Китай)"}
+        MO{"Макао"}
         MP{"Північні Маріанські Острови"}
         MQ{"Мартініка"}
         MR{"Мавританія"}
@@ -297,8 +297,6 @@ uk{
     }
     Countries%short{
         GB{"Велика Британія"}
-        HK{"Гонконг"}
-        MO{"Макао"}
         PS{"Палестина"}
         UN{"ООН"}
         US{"США"}
index fd6a0c22d61b9bf5936ac19ed3c3022a90fe2397..982da084020dd9fce3567d324942a19675752f33 100644 (file)
@@ -81,7 +81,7 @@ vi{
         CK{"Quần đảo Cook"}
         CL{"Chile"}
         CM{"Cameroon"}
-        CN{"Trung Quốc"}
+        CN{"Trung Quốc đại lục"}
         CO{"Colombia"}
         CP{"Đảo Clipperton"}
         CR{"Costa Rica"}
@@ -133,7 +133,7 @@ vi{
         GU{"Guam"}
         GW{"Guinea-Bissau"}
         GY{"Guyana"}
-        HK{"Hồng Kông (Trung Quốc)"}
+        HK{"Hồng Kông"}
         HM{"Quần đảo Heard và McDonald"}
         HN{"Honduras"}
         HR{"Croatia"}
@@ -187,7 +187,7 @@ vi{
         ML{"Mali"}
         MM{"Myanmar (Miến Điện)"}
         MN{"Mông Cổ"}
-        MO{"Macao (Trung Quốc)"}
+        MO{"Ma Cao"}
         MP{"Quần đảo Bắc Mariana"}
         MQ{"Martinique"}
         MR{"Mauritania"}
@@ -297,8 +297,6 @@ vi{
     }
     Countries%short{
         GB{"Vương quốc Anh"}
-        HK{"Hồng Kông"}
-        MO{"Macao"}
         PS{"Palestine"}
         UN{"Liên hiệp quốc"}
         US{"Hoa Kỳ"}
index cba2f7f3862e84eaecbe861644ead74a328c4f31..c19738b848598f4d5579d2327bcfa994568f04fc 100644 (file)
@@ -132,7 +132,7 @@ yue{
         GU{"關島"}
         GW{"幾內亞比索"}
         GY{"蓋亞那"}
-        HK{"中華人民共和國香港特別行政區"}
+        HK{"香港"}
         HM{"赫德島同麥克唐納群島"}
         HN{"宏都拉斯"}
         HR{"克羅埃西亞"}
@@ -186,7 +186,7 @@ yue{
         ML{"馬利"}
         MM{"緬甸"}
         MN{"蒙古"}
-        MO{"中è\8f¯äººæ°\91å\85±å\92\8cå\9c\8bæ¾³é\96\80ç\89¹å\88¥è¡\8cæ\94¿å\8d\80"}
+        MO{"æ¾³é\96\80"}
         MP{"北馬里亞納群島"}
         MQ{"馬丁尼克島"}
         MR{"茅利塔尼亞"}
@@ -296,8 +296,6 @@ yue{
     }
     Countries%short{
         GB{"英國"}
-        HK{"香港"}
-        MO{"澳門"}
         PS{"巴勒斯坦"}
         US{"美國"}
     }
index 4c75fd941fa9bbe4636c26f086ce6656aa901b40..741d27560d7a75244cca80d882a67cfaf844aaa5 100644 (file)
@@ -81,7 +81,7 @@ yue_Hans{
         CK{"库克群岛"}
         CL{"智利"}
         CM{"喀麦隆"}
-        CN{"中å\8d\8e人æ°\91å\85±å\92\8cå\9b½"}
+        CN{"中å\9b½å¤§é\99\86"}
         CO{"哥伦比亚"}
         CP{"克里派顿岛"}
         CR{"哥斯大黎加"}
@@ -133,7 +133,7 @@ yue_Hans{
         GU{"关岛"}
         GW{"几内亚比索"}
         GY{"盖亚那"}
-        HK{"中华人民共和国香港特别行政区"}
+        HK{"香港"}
         HM{"赫德岛同麦克唐纳群岛"}
         HN{"宏都拉斯"}
         HR{"克罗埃西亚"}
@@ -187,7 +187,7 @@ yue_Hans{
         ML{"马利"}
         MM{"缅甸"}
         MN{"蒙古"}
-        MO{"中华人民共和国澳门特别行政区"}
+        MO{"澳门"}
         MP{"北马里亚纳群岛"}
         MQ{"马丁尼克岛"}
         MR{"茅利塔尼亚"}
@@ -297,8 +297,6 @@ yue_Hans{
     }
     Countries%short{
         GB{"英国"}
-        HK{"香港"}
-        MO{"澳门"}
         PS{"巴勒斯坦"}
         US{"美国"}
     }
index 35ab2ca1a8396eb46f3a37f88c5095c13f2d45ca..48254070817a6b35aa693b49dcec8bcb083194e3 100644 (file)
@@ -81,7 +81,7 @@ zh{
         CK{"库克群岛"}
         CL{"智利"}
         CM{"喀麦隆"}
-        CN{"中国"}
+        CN{"中国大陆"}
         CO{"哥伦比亚"}
         CP{"克利珀顿岛"}
         CR{"哥斯达黎加"}
@@ -133,7 +133,7 @@ zh{
         GU{"关岛"}
         GW{"几内亚比绍"}
         GY{"圭亚那"}
-        HK{"香港(中国)"}
+        HK{"香港"}
         HM{"赫德岛和麦克唐纳群岛"}
         HN{"洪都拉斯"}
         HR{"克罗地亚"}
@@ -187,7 +187,7 @@ zh{
         ML{"马里"}
         MM{"缅甸"}
         MN{"蒙古"}
-        MO{"澳门(中国)"}
+        MO{"澳门"}
         MP{"北马里亚纳群岛"}
         MQ{"马提尼克"}
         MR{"毛里塔尼亚"}
@@ -297,8 +297,6 @@ zh{
     }
     Countries%short{
         GB{"英国"}
-        HK{"香港"}
-        MO{"澳门"}
         PS{"巴勒斯坦"}
         UN{"联合国"}
         US{"美国"}
index 5961f352dfa04002ba9cc786eb28260e9bdcf6a0..b5df673282eb9918a8e93d1d0a65775229523aa4 100644 (file)
@@ -82,7 +82,7 @@ zh_Hant{
         CK{"庫克群島"}
         CL{"智利"}
         CM{"喀麥隆"}
-        CN{"中國"}
+        CN{"中國大陸"}
         CO{"哥倫比亞"}
         CP{"克里派頓島"}
         CR{"哥斯大黎加"}
@@ -134,7 +134,7 @@ zh_Hant{
         GU{"關島"}
         GW{"幾內亞比索"}
         GY{"蓋亞那"}
-        HK{"香港(中國)"}
+        HK{"香港"}
         HM{"赫德島及麥唐納群島"}
         HN{"宏都拉斯"}
         HR{"克羅埃西亞"}
@@ -188,7 +188,7 @@ zh_Hant{
         ML{"馬利"}
         MM{"緬甸"}
         MN{"蒙古"}
-        MO{"澳門(中國)"}
+        MO{"澳門"}
         MP{"北馬利安納群島"}
         MQ{"馬丁尼克"}
         MR{"茅利塔尼亞"}
@@ -298,8 +298,6 @@ zh_Hant{
     }
     Countries%short{
         GB{"英國"}
-        HK{"香港"}
-        MO{"澳門"}
         PS{"巴勒斯坦"}
         UN{"聯合國"}
         US{"美國"}
index 211d9591e03de2a83ef925d04f3a9c64c3fe5901..667c73992fe616c12bc9f8371564c68a909d7e86 100644 (file)
@@ -41,21 +41,21 @@ static const int32_t gOffsets[] = {
     16,
     20,
     24,
-    321,
-    331,
-    342,
-    346,
-    352,
-    356,
-    376,
+    322,
+    332,
+    343,
+    347,
+    353,
+    357,
     377,
-    388,
-    391,
-    397,
-    402,
-    406,
-    410,
-    435
+    378,
+    389,
+    392,
+    398,
+    403,
+    407,
+    411,
+    436
 };
 
 static const int32_t gIndexes[] = {
@@ -391,6 +391,7 @@ static const char * const gSubTypes[] = {
     "UZS",
     "VEB",
     "VEF",
+    "VES",
     "VNC",
     "VND",
     "VUV",
@@ -547,14 +548,14 @@ static const char * const gSubTypes[] = {
 
 // Must be sorted by first value and then second value.
 static int32_t unitPerUnitToSingleUnit[][4] = {
-        {363, 333, 17, 0},
-        {365, 339, 17, 2},
-        {367, 333, 17, 3},
-        {367, 424, 4, 2},
-        {367, 425, 4, 3},
-        {382, 422, 3, 1},
-        {385, 11, 16, 4},
-        {427, 363, 4, 1}
+        {364, 334, 17, 0},
+        {366, 340, 17, 2},
+        {368, 334, 17, 3},
+        {368, 425, 4, 2},
+        {368, 426, 4, 3},
+        {383, 423, 3, 1},
+        {386, 11, 16, 4},
+        {428, 364, 4, 1}
 };
 
 // Shortcuts to the base unit in order to make the default constructor fast
index 451116a8c748d75c5f5488651228ff72e0f05f89..cd75269dbaf8dfe3b931b99e618e2fc0e80db2c2 100644 (file)
@@ -1192,18 +1192,23 @@ static void TestBreakIteratorSuppressions(void) {
 
 #if APPLE_ADDITIONS
 #include <stdio.h>
-#include <unistd.h>
-#include "unicode/urbtok.h"
-#include "cstring.h"
 #if U_PLATFORM_IS_DARWIN_BASED
+#include <unistd.h>
 #include <mach/mach_time.h>
 #define GET_START() mach_absolute_time()
 #define GET_DURATION(start, info) ((mach_absolute_time() - start) * info.numer)/info.denom
-#else
+#elif !U_PLATFORM_HAS_WIN32_API
+#include <unistd.h>
 #include "putilimp.h"
 #define GET_START() (uint64_t)uprv_getUTCtime()
 #define GET_DURATION(start, info) ((uint64_t)uprv_getUTCtime() - start)
+#else
+#include "putilimp.h"
+#define GET_START() (unsigned long long)uprv_getUTCtime()
+#define GET_DURATION(start, info) ((unsigned long long)uprv_getUTCtime() - start)
 #endif
+#include "unicode/urbtok.h"
+#include "cstring.h"
 
 typedef struct {
     RuleBasedTokenRange token;
@@ -2230,7 +2235,11 @@ static void handleTokResults(const char* testItem, const char* tokClass, const c
 
 static void TestRuleBasedTokenizer(void) {
     const TokRulesAndTests* ruleTypePtr;
+#if !U_PLATFORM_HAS_WIN32_API
     uint64_t start, duration;
+#else
+    unsigned long long start, duration;
+#endif
 #if U_PLATFORM_IS_DARWIN_BASED
     mach_timebase_info_data_t info;
 
index 37e5ec2fd5c352ff9e0a4858065d5364c9d515ae..ca4ae88db943bebd0d99b870dd26e903d46e66b1 100644 (file)
@@ -32,7 +32,9 @@
 #include "cdattst.h"
 #include "cformtst.h"
 #include "cmemory.h"
+#if !U_PLATFORM_HAS_WIN32_API
 #include "unicode/uatimeunitformat.h" /* Apple-specific */
+#endif
 
 #include <math.h>
 
@@ -46,7 +48,9 @@ static void TestFormatForFields(void);
 static void TestStandardPatterns(void);
 static void TestApplyPatnOverridesTimeSep(void);
 static void Test12HrFormats(void);
+#if !U_PLATFORM_HAS_WIN32_API
 static void TestTimeUnitFormat(void); /* Apple-specific */
+#endif
 static void TestRemapPatternWithOpts(void); /* Apple-specific */
 
 void addDateForTest(TestNode** root);
@@ -70,7 +74,9 @@ void addDateForTest(TestNode** root)
     TESTCASE(TestStandardPatterns);
     TESTCASE(TestApplyPatnOverridesTimeSep);
     TESTCASE(Test12HrFormats);
+#if !U_PLATFORM_HAS_WIN32_API
     TESTCASE(TestTimeUnitFormat); /* Apple-specific */
+#endif
     TESTCASE(TestRemapPatternWithOpts); /* Apple-specific */
 }
 /* Testing the DateFormat API */
@@ -2151,6 +2157,7 @@ static void Test12HrFormats(void) {
     }
 }
 
+#if !U_PLATFORM_HAS_WIN32_API
 /* *** */
 
 typedef struct {
@@ -2235,6 +2242,7 @@ static void TestTimeUnitFormat(void) { /* Apple-specific */
     }
 
 }
+#endif
 
 typedef enum RemapTesttype {
     REMAP_TESTTYPE_FULL     = UDAT_FULL,       // 0
index ea59ec22111398c630888b91fed91830b79b011f..662af053d7be5c5028fd9a77d7252cebbed08e6e 100644 (file)
@@ -40,7 +40,9 @@
 #include "unicode/uldnames.h"
 #include "unicode/parseerr.h" /* may not be included with some uconfig switches */
 #include "udbgutil.h"
+#if !U_PLATFORM_HAS_WIN32_API
 #include "unicode/ualoc.h" /* Apple-specific */
+#endif
 
 static void TestNullDefault(void);
 static void TestNonexistentLanguageExemplars(void);
@@ -55,9 +57,11 @@ static void TestIsRightToLeft(void);
 static void TestBadLocaleIDs(void);
 
 static void TestUldnNameVariants(void);
+#if !U_PLATFORM_HAS_WIN32_API
 static void TestGetLanguagesForRegion(void);
 static void TestGetAppleParent(void);
 static void TestAppleLocalizationsToUse(void);
+#endif
 
 void PrintDataTable();
 
@@ -92,12 +96,12 @@ static const char* const rawData2[LOCALE_INFO_SIZE][LOCALE_SIZE] = {
     /* display script code (English) */
     {   "",     "",     "",     "",     "",     "Simplified Han", "", "", ""       },
     /* display country (English) */
-    {   "United States",    "France",   "Spain",  "Greece",   "Norway", "China", "Germany", "", "Japan"       },
+    {   "United States",    "France",   "Spain",  "Greece",   "Norway", "China mainland", "Germany", "", "Japan"       },
     /* display variant (English) */
     {   "",     "",     "",     "",     "NY",  "", "", "", ""       },
     /* display name (English) */
     {   "English (United States)", "French (France)", "Catalan (Spain)", 
-        "Greek (Greece)", "Norwegian (Norway, NY)", "Chinese (Simplified, China)", 
+        "Greek (Greece)", "Norwegian (Norway, NY)", "Chinese (Simplified, China mainland)", 
         "German (Germany, Sort Order=Phonebook Sort Order)", "Spanish (Sort Order=Traditional Sort Order)", "Japanese (Japan, Calendar=Japanese Calendar)" },
 
     /* display language (French) */
@@ -105,12 +109,12 @@ static const char* const rawData2[LOCALE_INFO_SIZE][LOCALE_SIZE] = {
     /* display script code (French) */
     {   "",     "",     "",     "",     "",     "sinogrammes simplifi\\u00e9s", "", "", ""         },
     /* display country (French) */
-    {   "\\u00C9tats-Unis",    "France",   "Espagne",  "Gr\\u00E8ce",   "Norv\\u00E8ge",    "Chine", "Allemagne", "", "Japon"       },
+    {   "\\u00C9tats-Unis",    "France",   "Espagne",  "Gr\\u00E8ce",   "Norv\\u00E8ge",    "Chine continentale", "Allemagne", "", "Japon"       },
     /* display variant (French) */
     {   "",     "",     "",     "",     "NY",   "", "", "", ""       },
     /* display name (French) */
     {   "anglais (\\u00C9tats-Unis)", "fran\\u00E7ais (France)", "catalan (Espagne)", 
-        "grec (Gr\\u00E8ce)", "norv\\u00E9gien (Norv\\u00E8ge, NY)",  "chinois (simplifi\\u00e9, Chine)", 
+        "grec (Gr\\u00E8ce)", "norv\\u00E9gien (Norv\\u00E8ge, NY)",  "chinois (simplifi\\u00e9, Chine continentale)", 
         "allemand (Allemagne, ordre de tri=ordre de l\\u2019annuaire)", "espagnol (ordre de tri=ordre traditionnel)", "japonais (Japon, calendrier=calendrier japonais)" },
 
     /* display language (Catalan) */
@@ -118,12 +122,12 @@ static const char* const rawData2[LOCALE_INFO_SIZE][LOCALE_SIZE] = {
     /* display script code (Catalan) */
     {   "",     "",     "",     "",     "",     "han simplificat", "", "", ""         },
     /* display country (Catalan) */
-    {   "Estats Units", "Fran\\u00E7a", "Espanya",  "Gr\\u00E8cia", "Noruega",  "Xina", "Alemanya", "", "Jap\\u00F3"    },
+    {   "Estats Units", "Fran\\u00E7a", "Espanya",  "Gr\\u00E8cia", "Noruega",  "Xina continental", "Alemanya", "", "Jap\\u00F3"    },
     /* display variant (Catalan) */
     {   "", "", "",                    "", "NY",    "", "", "", ""    },
     /* display name (Catalan) */
     {   "angl\\u00E8s (Estats Units)", "franc\\u00E8s (Fran\\u00E7a)", "catal\\u00E0 (Espanya)", 
-    "grec (Gr\\u00E8cia)", "noruec (Noruega, NY)", "xin\\u00E8s (simplificat, Xina)", 
+    "grec (Gr\\u00E8cia)", "noruec (Noruega, NY)", "xin\\u00E8s (simplificat, Xina continental)", 
     "alemany (Alemanya, ordenaci\\u00F3=ordre de la guia telef\\u00F2nica)", "espanyol (ordenaci\\u00F3=ordre tradicional)", "japon\\u00E8s (Jap\\u00F3, calendari=calendari japon\\u00e8s)" },
 
     /* display language (Greek) */
@@ -148,7 +152,7 @@ static const char* const rawData2[LOCALE_INFO_SIZE][LOCALE_SIZE] = {
         "\\u0399\\u03c3\\u03c0\\u03b1\\u03bd\\u03af\\u03b1",
         "\\u0395\\u03bb\\u03bb\\u03ac\\u03b4\\u03b1",
         "\\u039d\\u03bf\\u03c1\\u03b2\\u03b7\\u03b3\\u03af\\u03b1",
-        "\\u039A\\u03AF\\u03BD\\u03B1", 
+        "\\u039A\\u03AF\\u03BD\\u03B1 \\u03B7\\u03C0\\u03B5\\u03B9\\u03C1\\u03C9\\u03C4\\u03B9\\u03BA\\u03AE", 
         "\\u0393\\u03B5\\u03C1\\u03BC\\u03B1\\u03BD\\u03AF\\u03B1", 
         "", 
         "\\u0399\\u03B1\\u03C0\\u03C9\\u03BD\\u03AF\\u03B1"   
@@ -162,7 +166,7 @@ static const char* const rawData2[LOCALE_INFO_SIZE][LOCALE_SIZE] = {
         "\\u039a\\u03b1\\u03c4\\u03b1\\u03bb\\u03b1\\u03bd\\u03b9\\u03ba\\u03ac (\\u0399\\u03c3\\u03c0\\u03b1\\u03bd\\u03af\\u03b1)",
         "\\u0395\\u03bb\\u03bb\\u03b7\\u03bd\\u03b9\\u03ba\\u03ac (\\u0395\\u03bb\\u03bb\\u03ac\\u03b4\\u03b1)",
         "\\u039d\\u03bf\\u03c1\\u03b2\\u03b7\\u03b3\\u03b9\\u03ba\\u03ac (\\u039d\\u03bf\\u03c1\\u03b2\\u03b7\\u03b3\\u03af\\u03b1, NY)",
-        "\\u039A\\u03B9\\u03BD\\u03B5\\u03B6\\u03B9\\u03BA\\u03AC (\\u0391\\u03c0\\u03bb\\u03bf\\u03c0\\u03bf\\u03b9\\u03b7\\u03bc\\u03ad\\u03bd\\u03b1, \\u039A\\u03AF\\u03BD\\u03B1)",
+        "\\u039A\\u03B9\\u03BD\\u03B5\\u03B6\\u03B9\\u03BA\\u03AC (\\u0391\\u03c0\\u03bb\\u03bf\\u03c0\\u03bf\\u03b9\\u03b7\\u03bc\\u03ad\\u03bd\\u03b1, \\u039A\\u03AF\\u03BD\\u03B1 \\u03B7\\u03C0\\u03B5\\u03B9\\u03C1\\u03C9\\u03C4\\u03B9\\u03BA\\u03AE)",
         "\\u0393\\u03b5\\u03c1\\u03bc\\u03b1\\u03bd\\u03b9\\u03ba\\u03ac (\\u0393\\u03b5\\u03c1\\u03bc\\u03b1\\u03bd\\u03af\\u03b1, \\u03a3\\u03b5\\u03b9\\u03c1\\u03ac \\u03c4\\u03b1\\u03be\\u03b9\\u03bd\\u03cc\\u03bc\\u03b7\\u03c3\\u03b7\\u03c2=\\u03a3\\u03b5\\u03b9\\u03c1\\u03ac \\u03c4\\u03b1\\u03be\\u03b9\\u03bd\\u03cc\\u03bc\\u03b7\\u03c3\\u03b7\\u03c2 \\u03c4\\u03b7\\u03bb\\u03b5\\u03c6\\u03c9\\u03bd\\u03b9\\u03ba\\u03bf\\u03cd \\u03ba\\u03b1\\u03c4\\u03b1\\u03bb\\u03cc\\u03b3\\u03bf\\u03c5)",
         "\\u0399\\u03c3\\u03c0\\u03b1\\u03bd\\u03b9\\u03ba\\u03ac (\\u03a3\\u03b5\\u03b9\\u03c1\\u03ac \\u03c4\\u03b1\\u03be\\u03b9\\u03bd\\u03cc\\u03bc\\u03b7\\u03c3\\u03b7\\u03c2=\\u03a0\\u03b1\\u03c1\\u03b1\\u03b4\\u03bf\\u03c3\\u03b9\\u03b1\\u03ba\\u03ae \\u03c3\\u03b5\\u03b9\\u03c1\\u03ac \\u03c4\\u03b1\\u03be\\u03b9\\u03bd\\u03cc\\u03bc\\u03b7\\u03c3\\u03b7\\u03c2)",
         "\\u0399\\u03b1\\u03c0\\u03c9\\u03bd\\u03b9\\u03ba\\u03ac (\\u0399\\u03b1\\u03c0\\u03c9\\u03bd\\u03af\\u03b1, \\u0397\\u03bc\\u03b5\\u03c1\\u03bf\\u03bb\\u03cc\\u03b3\\u03b9\\u03bf=\\u0399\\u03b1\\u03c0\\u03c9\\u03bd\\u03b9\\u03ba\\u03cc \\u03b7\\u03bc\\u03b5\\u03c1\\u03bf\\u03bb\\u03cc\\u03b3\\u03b9\\u03bf)"
@@ -269,9 +273,11 @@ void addLocaleTest(TestNode** root)
     TESTCASE(TestToLegacyType);
     TESTCASE(TestBadLocaleIDs);
     TESTCASE(TestUldnNameVariants);
+#if !U_PLATFORM_HAS_WIN32_API
     TESTCASE(TestGetLanguagesForRegion);
     TESTCASE(TestGetAppleParent);
     TESTCASE(TestAppleLocalizationsToUse);
+#endif
 }
 
 
@@ -6411,7 +6417,7 @@ static const UldnItem en_StdMidLong[] = {
        { "US",                     TEST_ULDN_REGION, "United States" },
        { "CA",                     TEST_ULDN_REGION, "Canada" },
        { "GB",                     TEST_ULDN_REGION, "United Kingdom" },
-       { "HK",                     TEST_ULDN_REGION, "Hong Kong (China)" },
+       { "HK",                     TEST_ULDN_REGION, "Hong Kong" },
 };
 
 static const UldnItem en_StdMidShrt[] = {
@@ -6451,7 +6457,7 @@ static const UldnItem en_DiaMidLong[] = {
        { "US",                     TEST_ULDN_REGION, "United States" },
        { "CA",                     TEST_ULDN_REGION, "Canada" },
        { "GB",                     TEST_ULDN_REGION, "United Kingdom" },
-       { "HK",                     TEST_ULDN_REGION, "Hong Kong (China)" },
+       { "HK",                     TEST_ULDN_REGION, "Hong Kong" },
 };
 
 static const UldnItem en_DiaMidShrt[] = {
@@ -6477,7 +6483,7 @@ static const UldnItem en_DiaMidShrt[] = {
 static const UldnItem fr_StdMidLong[] = {
        { "en_US",                  TEST_ULDN_LOCALE, "anglais (\\u00C9.-U.)" },
        { "US",                     TEST_ULDN_REGION, "\\u00C9tats-Unis" },
-       { "HK",                     TEST_ULDN_REGION, "Hong Kong (Chine)" },
+       { "HK",                     TEST_ULDN_REGION, "Hong Kong" },
 };
 
 static const UldnItem fr_StdMidShrt[] = {
@@ -6580,6 +6586,7 @@ static void TestUldnNameVariants() {
     }
 }
 
+#if !U_PLATFORM_HAS_WIN32_API
 /* Apple-specific, test for Apple-specific function ualoc_getAppleParent */
 static const char* localesAndAppleParent[] = {
     "en",               "root",
@@ -7588,4 +7595,4 @@ static void TestAppleLocalizationsToUse() {
         }
    }
 }
-
+#endif
index 708c27c54f7dd69adbb9b6728e86e51b4e49d1a7..caee27e9d57bbea8633874a8c73cc875df43530a 100644 (file)
@@ -48,25 +48,25 @@ static const char* const rawData[33][8] = {
         // display script (English)
         {   "",     "",     "",     "",     "",   "",     "",   "Simplified Han" },
         // display country (English)
-        {   "United States",    "France",   "Spain",  "Greece",   "Norway",   "",     "YY",   "China" },
+        {   "United States",    "France",   "Spain",  "Greece",   "Norway",   "",     "YY",   "China mainland" },
         // display variant (English)
         {   "",     "",     "",     "",     "NY",   "",     "",   ""},
         // display name (English)
         // Updated no_NO_NY English display name for new pattern-based algorithm
         // (part of Euro support).
-        {   "English (United States)", "French (France)", "Catalan (Spain)", "Greek (Greece)", "Norwegian (Norway, NY)", "Italian", "xx (YY)", "Chinese (Simplified, China)" },
+        {   "English (United States)", "French (France)", "Catalan (Spain)", "Greek (Greece)", "Norwegian (Norway, NY)", "Italian", "xx (YY)", "Chinese (Simplified, China mainland)" },
 
         // display langage (French)
         {   "anglais",  "fran\\u00E7ais",   "catalan", "grec",    "norv\\u00E9gien",    "italien", "xx", "chinois" },
         // display script (French)
         {   "",     "",     "",     "",     "",     "",     "",   "sinogrammes simplifi\\u00E9s" },
         // display country (French)
-        {   "\\u00C9tats-Unis",    "France",   "Espagne",  "Gr\\u00E8ce",   "Norv\\u00E8ge", "", "YY", "Chine" },
+        {   "\\u00C9tats-Unis",    "France",   "Espagne",  "Gr\\u00E8ce",   "Norv\\u00E8ge", "", "YY", "Chine continentale" },
         // display variant (French)
         {   "",     "",     "",     "",     "NY",     "",     "",   "" },
         // display name (French)
         //{   "anglais (Etats-Unis)", "francais (France)", "catalan (Espagne)", "grec (Grece)", "norvegien (Norvege,Nynorsk)", "italien", "xx (YY)" },
-        {   "anglais (\\u00C9tats-Unis)", "fran\\u00E7ais (France)", "catalan (Espagne)", "grec (Gr\\u00E8ce)", "norv\\u00E9gien (Norv\\u00E8ge, NY)", "italien", "xx (YY)", "chinois (simplifi\\u00E9, Chine)" },
+        {   "anglais (\\u00C9tats-Unis)", "fran\\u00E7ais (France)", "catalan (Espagne)", "grec (Gr\\u00E8ce)", "norv\\u00E9gien (Norv\\u00E8ge, NY)", "italien", "xx (YY)", "chinois (simplifi\\u00E9, Chine continentale)" },
 
 
         /* display language (Catalan) */
@@ -74,11 +74,11 @@ static const char* const rawData[33][8] = {
         /* display script (Catalan) */
         {   "", "", "",                    "", "", "", "", "han simplificat" },
         /* display country (Catalan) */
-        {   "Estats Units", "Fran\\u00E7a", "Espanya",  "Gr\\u00E8cia", "Noruega", "", "", "Xina" },
+        {   "Estats Units", "Fran\\u00E7a", "Espanya",  "Gr\\u00E8cia", "Noruega", "", "", "Xina continental" },
         /* display variant (Catalan) */
         {   "", "", "",                    "", "NY", "", "" },
         /* display name (Catalan) */
-        {   "angl\\u00E8s (Estats Units)", "franc\\u00E8s (Fran\\u00E7a)", "catal\\u00E0 (Espanya)", "grec (Gr\\u00E8cia)", "noruec (Noruega, NY)", "itali\\u00E0", "", "xin\\u00E8s (simplificat, Xina)" },
+        {   "angl\\u00E8s (Estats Units)", "franc\\u00E8s (Fran\\u00E7a)", "catal\\u00E0 (Espanya)", "grec (Gr\\u00E8cia)", "noruec (Noruega, NY)", "itali\\u00E0", "", "xin\\u00E8s (simplificat, Xina continental)" },
 
         // display langage (Greek)[actual values listed below]
         {   "\\u0391\\u03b3\\u03b3\\u03bb\\u03b9\\u03ba\\u03ac",
@@ -100,7 +100,7 @@ static const char* const rawData[33][8] = {
             "\\u039d\\u03bf\\u03c1\\u03b2\\u03b7\\u03b3\\u03af\\u03b1",
             "",
             "",
-            "\\u039A\\u03AF\\u03BD\\u03B1"
+            "\\u039A\\u03AF\\u03BD\\u03B1 \\u03B7\\u03C0\\u03B5\\u03B9\\u03C1\\u03C9\\u03C4\\u03B9\\u03BA\\u03AE"
         },
         // display variant (Greek)
         {   "", "", "", "", "NY", "", "" },
@@ -112,7 +112,7 @@ static const char* const rawData[33][8] = {
             "\\u039d\\u03bf\\u03c1\\u03b2\\u03b7\\u03b3\\u03b9\\u03ba\\u03ac (\\u039d\\u03bf\\u03c1\\u03b2\\u03b7\\u03b3\\u03af\\u03b1, NY)",
             "\\u0399\\u03c4\\u03b1\\u03bb\\u03b9\\u03ba\\u03ac",
             "",
-            "\\u039A\\u03B9\\u03BD\\u03B5\\u03B6\\u03B9\\u03BA\\u03AC (\\u0391\\u03c0\\u03bb\\u03bf\\u03c0\\u03bf\\u03b9\\u03b7\\u03bc\\u03ad\\u03bd\\u03b1, \\u039A\\u03AF\\u03BD\\u03B1)"
+            "\\u039A\\u03B9\\u03BD\\u03B5\\u03B6\\u03B9\\u03BA\\u03AC (\\u0391\\u03c0\\u03bb\\u03bf\\u03c0\\u03bf\\u03b9\\u03b7\\u03bc\\u03ad\\u03bd\\u03b1, \\u039A\\u03AF\\u03BD\\u03B1 \\u03B7\\u03C0\\u03B5\\u03B9\\u03C1\\u03C9\\u03C4\\u03B9\\u03BA\\u03AE)"
         },
 
         // display langage (<root>)
index ac867c0d39872f93856bb3357cb2093124a023f3..6d1483ad87d2c46e36b8204ba1c89ee0f87f052d 100644 (file)
--- a/makefile
+++ b/makefile
@@ -58,7 +58,9 @@
 # Either this should be run indirectly from the VS command prompt via the
 # BuildICUForAAS script or project, using the instructions there (which build
 # both 32-bit and 64-bit), or it should be run from within Cygwin using the
-# following instructions or equivalent (different steps for 32-bit or 64-bit):
+# following instructions or equivalent (different steps for 32-bit or 64-bit
+# targets, details may also differ if you have the 32-bit cygwin install vs the
+# 64-bit one, i.e. cygwin vs cygwin64):
 #
 # 1. From VS command prompt, run vcvarsall.bat to set various environment variables.
 #    For a 32-bit build:
@@ -66,7 +68,7 @@
 #    For a 64-bit build:
 #    > "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" amd64
 #
-# 2. Launch Cygwin, e.g.
+# 2. Launch Cygwin, e.g. for the 64-bit cygwin install:
 #    > C:\cygwin64\cygwin.bat
 #
 # 3. Within cygwin, cd to the top level of the ICU sources directory, e.g.
@@ -113,6 +115,7 @@ ifdef RC_PROJECTSOURCEVERSION
        RC_ProjectSourceVersion=$(RC_PROJECTSOURCEVERSION)
 endif
 endif
+$(info # RC_XBS=$(RC_XBS))
 $(info # RC_ARCHS=$(RC_ARCHS))
 $(info # RC_ProjectName=$(RC_ProjectName))
 $(info # RC_ProjectSourceVersion=$(RC_ProjectSourceVersion))
@@ -233,10 +236,10 @@ $(info # SDKPATH=$(SDKPATH))
 #
 ifneq "$(RC_ProjectSourceVersion)" ""
        ifeq "$(WINDOWS)" "YES"
-               ICU_BUILD_AA  := $(shell echo $(RC_ProjectSourceVersion) | sed -r -e 's/([0-9]+)([0-9]{2})(\.([0-9])([0-9])?(\.([0-9]{1,2}))?)?/\2/')
-               ICU_BUILD_B1 := $(shell echo $(RC_ProjectSourceVersion) | sed -r -e 's/([0-9]+)([0-9]{2})(\.([0-9])([0-9])?(\.([0-9]{1,2}))?)?/\4/')
-               ICU_BUILD_B2 := $(shell echo $(RC_ProjectSourceVersion) | sed -r -e 's/([0-9]+)([0-9]{2})(\.([0-9])([0-9])?(\.([0-9]{1,2}))?)?/\5/')
-               ICU_TRAIN_CODE := $(shell echo $(RC_ProjectSourceVersion) | sed -r -e 's/([0-9]+)([0-9]{2})(\.([0-9])([0-9])?(\.([0-9]{1,2}))?)?/\7/')
+               ICU_BUILD_AA  := $(shell echo $(RC_ProjectSourceVersion) | /usr/bin/sed -r -e 's/([0-9]+)([0-9]{2})(\.([0-9])([0-9])?(\.([0-9]{1,2}))?)?/\2/')
+               ICU_BUILD_B1 := $(shell echo $(RC_ProjectSourceVersion) | /usr/bin/sed -r -e 's/([0-9]+)([0-9]{2})(\.([0-9])([0-9])?(\.([0-9]{1,2}))?)?/\4/')
+               ICU_BUILD_B2 := $(shell echo $(RC_ProjectSourceVersion) | /usr/bin/sed -r -e 's/([0-9]+)([0-9]{2})(\.([0-9])([0-9])?(\.([0-9]{1,2}))?)?/\5/')
+               ICU_TRAIN_CODE := $(shell echo $(RC_ProjectSourceVersion) | /usr/bin/sed -r -e 's/([0-9]+)([0-9]{2})(\.([0-9])([0-9])?(\.([0-9]{1,2}))?)?/\7/')
        else
                ICU_BUILD_AA  := $(shell echo $(RC_ProjectSourceVersion) | sed -E -e 's/([0-9]+)([0-9]{2})(\.([0-9])([0-9])?(\.([0-9]{1,2}))?)?/\2/')
                ICU_BUILD_B1 := $(shell echo $(RC_ProjectSourceVersion) | sed -E -e 's/([0-9]+)([0-9]{2})(\.([0-9])([0-9])?(\.([0-9]{1,2}))?)?/\4/')
@@ -877,19 +880,19 @@ LIBOVERRIDES=LIBICUDT="-L$(OBJROOT_CURRENT) -l$(LIB_NAME)" \
 # options here and also the update the LINK.EXE lines in the TARGETS section below.
 ifeq "$(WINDOWS)" "YES"
        ifeq "$(ARCH64)" "YES"
-               ENV= CFLAGS="/O2 /Ob2 /MD /GF /GS /Zi /nologo /D_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES" \
-                       CXXFLAGS="/O2 /Ob2 /MD /GF /GS /Zi /nologo /D_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES /EHsc /Zc:wchar_t" \
+               ENV= CFLAGS="/utf-8 /O2 /Ob2 /MD /GF /GS /Zi /nologo /D_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES" \
+                       CXXFLAGS="/utf-8 /O2 /Ob2 /MD /GF /GS /Zi /nologo /D_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES /EHsc /Zc:wchar_t /DU_SHOW_CPLUSPLUS_API=1" \
                        LDFLAGS="/NXCOMPAT /DYNAMICBASE /DEBUG /OPT:REF"
        else
-               ENV= CFLAGS="/O2 /Ob2 /MD /GF /GS /Zi /nologo /D_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES" \
-                       CXXFLAGS="/O2 /Ob2 /MD /GF /GS /Zi /nologo /D_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES /EHsc /Zc:wchar_t" \
+               ENV= CFLAGS="/utf-8 /O2 /Ob2 /MD /GF /GS /Zi /nologo /D_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES" \
+                       CXXFLAGS="/utf-8 /O2 /Ob2 /MD /GF /GS /Zi /nologo /D_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES /EHsc /Zc:wchar_t /DU_SHOW_CPLUSPLUS_API=1" \
                        LDFLAGS="/NXCOMPAT /SAFESEH /DYNAMICBASE /DEBUG /OPT:REF"
        endif
        ENV_CONFIGURE= CPPFLAGS="-DU_DISABLE_RENAMING=1 $(DEFINE_BUILD_LEVEL)" \
-               CFLAGS="/O2 /Ob2 /MD /GF /GS /nologo /D_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES" \
-               CXXFLAGS="/O2 /Ob2 /MD /GF /GS /nologo /D_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES /EHsc /Zc:wchar_t"
-       ENV_DEBUG= CFLAGS="/O2 /Ob2 /MDd /GF /GS /Zi /D_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES" \
-               CXXFLAGS="/O2 /Ob2 /MDd /GF /GS /Zi /D_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES /EHsc" \
+               CFLAGS="/utf-8 /O2 /Ob2 /MD /GF /GS /nologo /D_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES" \
+               CXXFLAGS="/utf-8 /O2 /Ob2 /MD /GF /GS /nologo /D_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES /EHsc /Zc:wchar_t /DU_SHOW_CPLUSPLUS_API=1"
+       ENV_DEBUG= CFLAGS="/utf-8 /O2 /Ob2 /MDd /GF /GS /Zi /D_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES" \
+               CXXFLAGS="/utf-8 /O2 /Ob2 /MDd /GF /GS /Zi /D_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES /EHsc /DU_SHOW_CPLUSPLUS_API=1" \
                LDFLAGS="/DEBUG /DYNAMICBASE"
        ENV_PROFILE=
 else ifeq "$(LINUX)" "YES"
@@ -1062,12 +1065,13 @@ crossbuildhost icutztoolsforsdk
 #
 # The various patchconfig files should assume the current directory is icuSources.
 #
-# Note that if sources have been installed by installsrc (only run as part of buildit
-# or B&I builds), then
-#    $(SRCROOT)/.git is not present, and
+# Note that if sources have been installed by installsrc (only run as part of buildit or
+# submitproject for Apple platforms, not for Windows/Linux), then
+#    $(SRCROOT)/installsrcNotRunFlag is not present, and
 #    ADJUST_SOURCES has already have been run.
-# Otherwise, if we are doing a local build (e.g. make check, make install), then
-#    $(SRCROOT)/.git is present, and
+# Otherwise, if we are doing a local build (e.g. make check, make install), or if
+# sources were submitted using submitproject for non-Apple platforms (Windows/Linux) then
+#    $(SRCROOT)/installsrcNotRunFlag is present, and
 #    ADJUST_SOURCES has not been run (run it after copying sources to OBJROOT_CURRENT)
 #
 
@@ -1207,7 +1211,7 @@ crossbuildhost : $(CROSSHOST_OBJROOT)/Makefile
 icutztoolsforsdk : $(OBJROOT_CURRENT)/Makefile
        echo "# make icutztoolsforsdk";
        (cd $(OBJROOT_CURRENT); \
-               if test ! -d $(SRCROOT)/.git ; then patch -N -p1 <$(SRCROOT)/crosshostpatchconfig.txt; fi; \
+               if test ! -e $(SRCROOT)/installsrcNotRunFlag ; then patch -N -p1 <$(SRCROOT)/crosshostpatchconfig.txt; fi; \
                $(MAKE) $($(ENV)) || exit 1; \
                echo '# build' $(TOOLS_DYLIB_FORTOOLS) 'linked against' $(LIB_NAME) ; \
                $($(ENV)) $(CXX) -current_version $(ICU_VERS).$(ICU_SUBVERS) -compatibility_version 1 -dynamiclib -dynamic \
@@ -1269,7 +1273,7 @@ endif
        fi;
        cp -Rpf $(SRCROOT)/icuSources/* $(OBJROOT_CURRENT)/;
        (cd $(OBJROOT_CURRENT); \
-               if test -d $(SRCROOT)/.git ; then $(ADJUST_SOURCES); fi; \
+               if test -e $(SRCROOT)/installsrcNotRunFlag ; then $(ADJUST_SOURCES); fi; \
                if test -f $(TZAUXFILESDIR)/metaZones.txt ; then cp -p $(TZAUXFILESDIR)/metaZones.txt data/misc/; fi; \
                if test -f $(TZAUXFILESDIR)/timezoneTypes.txt ; then cp -p $(TZAUXFILESDIR)/timezoneTypes.txt data/misc/; fi; \
                if test -f $(TZAUXFILESDIR)/windowsZones.txt ; then cp -p $(TZAUXFILESDIR)/windowsZones.txt data/misc/; fi; \
@@ -1300,7 +1304,7 @@ $(CROSSHOST_OBJROOT)/Makefile :
        fi;
        cp -Rpf $(SRCROOT)/icuSources/* $(CROSSHOST_OBJROOT);
        (cd $(CROSSHOST_OBJROOT); \
-               if test -d $(SRCROOT)/.git; then $(ADJUST_SOURCES); fi; \
+               if test -e $(SRCROOT)/installsrcNotRunFlag; then $(ADJUST_SOURCES); fi; \
                if test -f $(TZAUXFILESDIR)/metaZones.txt ; then cp -p $(TZAUXFILESDIR)/metaZones.txt data/misc/; fi; \
                if test -f $(TZAUXFILESDIR)/timezoneTypes.txt ; then cp -p $(TZAUXFILESDIR)/timezoneTypes.txt data/misc/; fi; \
                if test -f $(TZAUXFILESDIR)/windowsZones.txt ; then cp -p $(TZAUXFILESDIR)/windowsZones.txt data/misc/; fi; \
@@ -1319,8 +1323,8 @@ $(CROSSHOST_OBJROOT)/Makefile :
 
 # Since our sources are in icuSources (ignore the ICU subdirectory for now), we wish to
 # copy them to somewhere else. We tar it to stdout, cd to the appropriate directory, and
-# untar from stdin.  We then look for all the CVS directories and remove them. We may have
-# to remove the .cvsignore files also.
+# untar from stdin.
+# Do NOT include installsrcNotRunFlag in the list of files to tar up, that defeats the purpose.
 
 installsrc :
        if test ! -d $(SRCROOT); then mkdir $(SRCROOT); fi;
@@ -1342,12 +1346,14 @@ endif
 MKINSTALLDIRS=$(SHELL) $(SRCROOT)/icuSources/mkinstalldirs
 INSTALL_DATA=${INSTALL} -m 644
 
-ifeq "$(RC_XBS)" "YES"
-installhdrsint :
-else
+ifneq "$(ICU_FOR_APPLE_PLATFORMS)" "YES"
+installhdrsint : $(OBJROOT_CURRENT)/Makefile
+else ifneq "$(RC_XBS)" "YES"
 installhdrsint : $(OBJROOT_CURRENT)/Makefile
+else
+installhdrsint :
 endif
-       (if test -d $(SRCROOT)/.git; then cd $(OBJROOT_CURRENT); else cd $(SRCROOT)/icuSources/; fi; \
+       (if test -e $(SRCROOT)/installsrcNotRunFlag; then cd $(OBJROOT_CURRENT); else cd $(SRCROOT)/icuSources/; fi; \
                $(MKINSTALLDIRS) $(DSTROOT)/$(PRIVATE_HDR_PREFIX)/include/unicode/; \
                for subdir in $(HDR_MAKE_SUBDIR); do \
                        echo "# Subdir $$subdir"; \