Google Git
Sign in
fuchsia/third_party/icu/refs/heads/upstream/chromium/m74^!/.
commit
8c67416ccb4da42d817e7081ff83a2193b1aabe7
[log] [tgz]
author
Jungshik Shin <jshin@chromium.org>
Wed Feb 27 22:59:56 2019 -0800
committer
Jungshik Shin <jshin@chromium.org>
Thu Feb 28 07:22:55 2019 +0000
tree
ede3c194dd880a08054750eb9f2aa554b8918e6c
parent
960f195aa87acaec46e6104ec93a596da7ae0843 [diff]
Apply region names patch for zh-Hant, lt and lv

Region-name patch was not applied to 3 locales (zh-Hant, lt, and lv)
when updating ICU to 63.1 by mistake.

This affects the region display names for HK, MO, and FK.

Update the patch file: locale_google.patch accordingly.

TBR=yyushkina@chromium.org
Bug: 926644
Test: In settings-language menu, HK's display name in zh-Hant is '香港'.
Change-Id: Idc259d75ffa092ff3fee5b126bcbd88db364979b
Reviewed-on: https://chromium-review.googlesource.com/c/1493786
Reviewed-by: Jungshik Shin <jshin@chromium.org>

diff --git a/android/icudtl.dat b/android/icudtl.dat
index 69a2e7c..eeafb90 100644
--- a/android/icudtl.dat
+++ b/android/icudtl.dat
Binary files differ

diff --git a/cast/icudtl.dat b/cast/icudtl.dat
index 6d2b6e7..888ea27 100644
--- a/cast/icudtl.dat
+++ b/cast/icudtl.dat
Binary files differ

diff --git a/common/icudtb.dat b/common/icudtb.dat
index 80614ad..02f9766 100644
--- a/common/icudtb.dat
+++ b/common/icudtb.dat
Binary files differ

diff --git a/common/icudtl.dat b/common/icudtl.dat
index 2cfe86c..4663760 100644
--- a/common/icudtl.dat
+++ b/common/icudtl.dat
Binary files differ

diff --git a/flutter/icudtl.dat b/flutter/icudtl.dat
index d0609ce..710a402 100644
--- a/flutter/icudtl.dat
+++ b/flutter/icudtl.dat
Binary files differ

diff --git a/ios/icudtl.dat b/ios/icudtl.dat
index 3a90a19..3c9fb01 100644
--- a/ios/icudtl.dat
+++ b/ios/icudtl.dat
Binary files differ

diff --git a/patches/locale_google.patch b/patches/locale_google.patch
index db4fb34..7669fc0 100644
--- a/patches/locale_google.patch
+++ b/patches/locale_google.patch

@@ -7330,3 +7330,186 @@
          }
          "meta:Kosrae"{
              ls{"코스라에섬 시간"}
+diff --git a/source/data/region/lt.txt b/source/data/region/lt.txt
+index 02aa1f60..047c201e 100644
+--- a/source/data/region/lt.txt
++++ b/source/data/region/lt.txt
+@@ -110,7 +110,7 @@ lt{
+         EZ{"euro zona"}
+         FI{"Suomija"}
+         FJ{"Fidžis"}
+-        FK{"Folklando Salos"}
++        FK{"Folklando (Malvinų) Salos"}
+         FM{"Mikronezija"}
+         FO{"Farerų Salos"}
+         FR{"Prancūzija"}
+@@ -133,7 +133,7 @@ lt{
+         GU{"Guamas"}
+         GW{"Bisau Gvinėja"}
+         GY{"Gajana"}
+-        HK{"Ypatingasis Administracinis Kinijos Regionas Honkongas"}
++        HK{"Honkongas"}
+         HM{"Herdo ir Makdonaldo Salos"}
+         HN{"Hondūras"}
+         HR{"Kroatija"}
+@@ -183,11 +183,11 @@ lt{
+         MF{"Sen Martenas"}
+         MG{"Madagaskaras"}
+         MH{"Maršalo Salos"}
+-        MK{"Makedonija"}
++        MK{"Makedonijos Respublika"}
+         ML{"Malis"}
+         MM{"Mianmaras (Birma)"}
+         MN{"Mongolija"}
+-        MO{"Ypatingasis Administracinis Kinijos Regionas Makao"}
++        MO{"Makao"}
+         MP{"Marianos Šiaurinės Salos"}
+         MQ{"Martinika"}
+         MR{"Mauritanija"}
+@@ -222,7 +222,7 @@ lt{
+         PM{"Sen Pjeras ir Mikelonas"}
+         PN{"Pitkerno salos"}
+         PR{"Puerto Rikas"}
+-        PS{"Palestinos teritorija"}
++        PS{"Palestina"}
+         PT{"Portugalija"}
+         PW{"Palau"}
+         PY{"Paragvajus"}
+@@ -297,9 +297,6 @@ lt{
+     }
+     Countries%short{
+         GB{"JK"}
+-        HK{"Honkongas"}
+-        MO{"Makao"}
+-        PS{"Palestina"}
+         UN{"JT"}
+         US{"JAV"}
+     }
+@@ -308,8 +305,6 @@ lt{
+         CG{"Kongo Respublika"}
+         CI{"Dramblio Kaulo Kranto Respublika"}
+         CZ{"Čekijos Respublika"}
+-        FK{"Folklando (Malvinų) Salos"}
+-        MK{"Makedonijos Respublika"}
+     }
+     Version{"2.1.44.91"}
+ }
+diff --git a/source/data/region/lv.txt b/source/data/region/lv.txt
+index 2d82c4f3..9215a6a4 100644
+--- a/source/data/region/lv.txt
++++ b/source/data/region/lv.txt
+@@ -110,7 +110,7 @@ lv{
+         EZ{"Eirozona"}
+         FI{"Somija"}
+         FJ{"Fidži"}
+-        FK{"Folklenda salas"}
++        FK{"Folklenda (Malvinu) salas"}
+         FM{"Mikronēzija"}
+         FO{"Fēru salas"}
+         FR{"Francija"}
+@@ -133,7 +133,7 @@ lv{
+         GU{"Guama"}
+         GW{"Gvineja-Bisava"}
+         GY{"Gajāna"}
+-        HK{"Ķīnas īpašās pārvaldes apgabals Honkonga"}
++        HK{"Honkonga"}
+         HM{"Hērda sala un Makdonalda salas"}
+         HN{"Hondurasa"}
+         HR{"Horvātija"}
+@@ -183,11 +183,11 @@ lv{
+         MF{"Senmartēna"}
+         MG{"Madagaskara"}
+         MH{"Māršala salas"}
+-        MK{"Maķedonija"}
++        MK{"bijusī Dienvidslāvijas Maķedonijas Republika"}
+         ML{"Mali"}
+         MM{"Mjanma (Birma)"}
+         MN{"Mongolija"}
+-        MO{"Ķīnas īpašās pārvaldes apgabals Makao"}
++        MO{"Makao"}
+         MP{"Ziemeļu Marianas salas"}
+         MQ{"Martinika"}
+         MR{"Mauritānija"}
+@@ -297,9 +297,6 @@ lv{
+     }
+     Countries%short{
+         GB{"Apvienotā Karaliste"}
+-        HK{"Honkonga"}
+-        MO{"Makao"}
+-        PS{"Palestīna"}
+         UN{"ANO"}
+         US{"ASV"}
+     }
+@@ -308,8 +305,6 @@ lv{
+         CG{"Kongo (Republika)"}
+         CI{"Ziloņkaula krasts"}
+         CZ{"Čehijas Republika"}
+-        FK{"Folklenda (Malvinu) salas"}
+-        MK{"bijusī Dienvidslāvijas Maķedonijas Republika"}
+     }
+     Version{"2.1.44.91"}
+ }
+diff --git a/source/data/region/zh_Hant.txt b/source/data/region/zh_Hant.txt
+index 8af4f241..24f94fdb 100644
+--- a/source/data/region/zh_Hant.txt
++++ b/source/data/region/zh_Hant.txt
+@@ -111,7 +111,7 @@ zh_Hant{
+         EZ{"歐元區"}
+         FI{"芬蘭"}
+         FJ{"斐濟"}
+-        FK{"福克蘭群島"}
++        FK{"福克蘭群島（馬爾維納斯群島）"}
+         FM{"密克羅尼西亞"}
+         FO{"法羅群島"}
+         FR{"法國"}
+@@ -134,7 +134,7 @@ zh_Hant{
+         GU{"關島"}
+         GW{"幾內亞比索"}
+         GY{"蓋亞那"}
+-        HK{"中國香港特別行政區"}
++        HK{"香港"}
+         HM{"赫德島及麥唐納群島"}
+         HN{"宏都拉斯"}
+         HR{"克羅埃西亞"}
+@@ -184,11 +184,11 @@ zh_Hant{
+         MF{"法屬聖馬丁"}
+         MG{"馬達加斯加"}
+         MH{"馬紹爾群島"}
+-        MK{"馬其頓"}
++        MK{"前南斯拉夫馬其頓共和國"}
+         ML{"馬利"}
+         MM{"緬甸"}
+         MN{"蒙古"}
+-        MO{"中國澳門特別行政區"}
++        MO{"澳門"}
+         MP{"北馬利安納群島"}
+         MQ{"馬丁尼克"}
+         MR{"茅利塔尼亞"}
+@@ -223,7 +223,7 @@ zh_Hant{
+         PM{"聖皮埃與密克隆群島"}
+         PN{"皮特肯群島"}
+         PR{"波多黎各"}
+-        PS{"巴勒斯坦自治區"}
++        PS{"巴勒斯坦"}
+         PT{"葡萄牙"}
+         PW{"帛琉"}
+         PY{"巴拉圭"}
+@@ -298,9 +298,6 @@ zh_Hant{
+     }
+     Countries%short{
+         GB{"英國"}
+-        HK{"香港"}
+-        MO{"澳門"}
+-        PS{"巴勒斯坦"}
+         UN{"聯合國"}
+         US{"美國"}
+     }
+@@ -308,8 +305,6 @@ zh_Hant{
+         CD{"剛果民主共和國"}
+         CG{"剛果共和國"}
+         CZ{"捷克共和國"}
+-        FK{"福克蘭群島（馬爾維納斯群島）"}
+-        MK{"前南斯拉夫馬其頓共和國"}
+     }
+     Version{"2.1.44.91"}
+ }

diff --git a/source/data/region/lt.txt b/source/data/region/lt.txt
index 02aa1f6..047c201 100644
--- a/source/data/region/lt.txt
+++ b/source/data/region/lt.txt

@@ -110,7 +110,7 @@
         EZ{"euro zona"}
         FI{"Suomija"}
         FJ{"Fidžis"}
-        FK{"Folklando Salos"}
+        FK{"Folklando (Malvinų) Salos"}
         FM{"Mikronezija"}
         FO{"Farerų Salos"}
         FR{"Prancūzija"}
@@ -133,7 +133,7 @@
         GU{"Guamas"}
         GW{"Bisau Gvinėja"}
         GY{"Gajana"}
-        HK{"Ypatingasis Administracinis Kinijos Regionas Honkongas"}
+        HK{"Honkongas"}
         HM{"Herdo ir Makdonaldo Salos"}
         HN{"Hondūras"}
         HR{"Kroatija"}
@@ -183,11 +183,11 @@
         MF{"Sen Martenas"}
         MG{"Madagaskaras"}
         MH{"Maršalo Salos"}
-        MK{"Makedonija"}
+        MK{"Makedonijos Respublika"}
         ML{"Malis"}
         MM{"Mianmaras (Birma)"}
         MN{"Mongolija"}
-        MO{"Ypatingasis Administracinis Kinijos Regionas Makao"}
+        MO{"Makao"}
         MP{"Marianos Šiaurinės Salos"}
         MQ{"Martinika"}
         MR{"Mauritanija"}
@@ -222,7 +222,7 @@
         PM{"Sen Pjeras ir Mikelonas"}
         PN{"Pitkerno salos"}
         PR{"Puerto Rikas"}
-        PS{"Palestinos teritorija"}
+        PS{"Palestina"}
         PT{"Portugalija"}
         PW{"Palau"}
         PY{"Paragvajus"}
@@ -297,9 +297,6 @@
     }
     Countries%short{
         GB{"JK"}
-        HK{"Honkongas"}
-        MO{"Makao"}
-        PS{"Palestina"}
         UN{"JT"}
         US{"JAV"}
     }
@@ -308,8 +305,6 @@
         CG{"Kongo Respublika"}
         CI{"Dramblio Kaulo Kranto Respublika"}
         CZ{"Čekijos Respublika"}
-        FK{"Folklando (Malvinų) Salos"}
-        MK{"Makedonijos Respublika"}
     }
     Version{"2.1.44.91"}
 }

diff --git a/source/data/region/lv.txt b/source/data/region/lv.txt
index 2d82c4f..9215a6a 100644
--- a/source/data/region/lv.txt
+++ b/source/data/region/lv.txt

@@ -110,7 +110,7 @@
         EZ{"Eirozona"}
         FI{"Somija"}
         FJ{"Fidži"}
-        FK{"Folklenda salas"}
+        FK{"Folklenda (Malvinu) salas"}
         FM{"Mikronēzija"}
         FO{"Fēru salas"}
         FR{"Francija"}
@@ -133,7 +133,7 @@
         GU{"Guama"}
         GW{"Gvineja-Bisava"}
         GY{"Gajāna"}
-        HK{"Ķīnas īpašās pārvaldes apgabals Honkonga"}
+        HK{"Honkonga"}
         HM{"Hērda sala un Makdonalda salas"}
         HN{"Hondurasa"}
         HR{"Horvātija"}
@@ -183,11 +183,11 @@
         MF{"Senmartēna"}
         MG{"Madagaskara"}
         MH{"Māršala salas"}
-        MK{"Maķedonija"}
+        MK{"bijusī Dienvidslāvijas Maķedonijas Republika"}
         ML{"Mali"}
         MM{"Mjanma (Birma)"}
         MN{"Mongolija"}
-        MO{"Ķīnas īpašās pārvaldes apgabals Makao"}
+        MO{"Makao"}
         MP{"Ziemeļu Marianas salas"}
         MQ{"Martinika"}
         MR{"Mauritānija"}
@@ -297,9 +297,6 @@
     }
     Countries%short{
         GB{"Apvienotā Karaliste"}
-        HK{"Honkonga"}
-        MO{"Makao"}
-        PS{"Palestīna"}
         UN{"ANO"}
         US{"ASV"}
     }
@@ -308,8 +305,6 @@
         CG{"Kongo (Republika)"}
         CI{"Ziloņkaula krasts"}
         CZ{"Čehijas Republika"}
-        FK{"Folklenda (Malvinu) salas"}
-        MK{"bijusī Dienvidslāvijas Maķedonijas Republika"}
     }
     Version{"2.1.44.91"}
 }

diff --git a/source/data/region/zh_Hant.txt b/source/data/region/zh_Hant.txt
index 8af4f24..24f94fd 100644
--- a/source/data/region/zh_Hant.txt
+++ b/source/data/region/zh_Hant.txt

@@ -111,7 +111,7 @@
         EZ{"歐元區"}
         FI{"芬蘭"}
         FJ{"斐濟"}
-        FK{"福克蘭群島"}
+        FK{"福克蘭群島（馬爾維納斯群島）"}
         FM{"密克羅尼西亞"}
         FO{"法羅群島"}
         FR{"法國"}
@@ -134,7 +134,7 @@
         GU{"關島"}
         GW{"幾內亞比索"}
         GY{"蓋亞那"}
-        HK{"中國香港特別行政區"}
+        HK{"香港"}
         HM{"赫德島及麥唐納群島"}
         HN{"宏都拉斯"}
         HR{"克羅埃西亞"}
@@ -184,11 +184,11 @@
         MF{"法屬聖馬丁"}
         MG{"馬達加斯加"}
         MH{"馬紹爾群島"}
-        MK{"馬其頓"}
+        MK{"前南斯拉夫馬其頓共和國"}
         ML{"馬利"}
         MM{"緬甸"}
         MN{"蒙古"}
-        MO{"中國澳門特別行政區"}
+        MO{"澳門"}
         MP{"北馬利安納群島"}
         MQ{"馬丁尼克"}
         MR{"茅利塔尼亞"}
@@ -223,7 +223,7 @@
         PM{"聖皮埃與密克隆群島"}
         PN{"皮特肯群島"}
         PR{"波多黎各"}
-        PS{"巴勒斯坦自治區"}
+        PS{"巴勒斯坦"}
         PT{"葡萄牙"}
         PW{"帛琉"}
         PY{"巴拉圭"}
@@ -298,9 +298,6 @@
     }
     Countries%short{
         GB{"英國"}
-        HK{"香港"}
-        MO{"澳門"}
-        PS{"巴勒斯坦"}
         UN{"聯合國"}
         US{"美國"}
     }
@@ -308,8 +305,6 @@
         CD{"剛果民主共和國"}
         CG{"剛果共和國"}
         CZ{"捷克共和國"}
-        FK{"福克蘭群島（馬爾維納斯群島）"}
-        MK{"前南斯拉夫馬其頓共和國"}
     }
     Version{"2.1.44.91"}
 }