From 7b73bb3f41098c215cdd3d9f9de3562838a49f1c Mon Sep 17 00:00:00 2001 From: David Drysdale Date: Fri, 9 Aug 2024 15:43:43 +0200 Subject: [PATCH] Merge metadata changes from upstream 8.13.43 Includes changes in resources/ up to and including upstream commit b1d50c182b75: "[maven-release-plugin] prepare release v8.13.43" --- resources/PhoneNumberMetadata.xml | 824 +++++++++++++++++++++++++++--- resources/carrier/en/229.txt | 1 + resources/carrier/en/237.txt | 3 +- resources/carrier/en/244.txt | 1 + resources/carrier/en/27.txt | 1 + resources/carrier/en/33.txt | 6 +- resources/carrier/en/34.txt | 1 + resources/carrier/en/41.txt | 8 +- resources/carrier/en/852.txt | 2 + resources/carrier/zh/852.txt | 2 + 10 files changed, 766 insertions(+), 83 deletions(-) diff --git a/resources/PhoneNumberMetadata.xml b/resources/PhoneNumberMetadata.xml index 4d501ee19..21cbf8ecf 100644 --- a/resources/PhoneNumberMetadata.xml +++ b/resources/PhoneNumberMetadata.xml @@ -796,7 +796,7 @@ 923123456 - 9[1-579]\d{7} + 9[1-79]\d{7} @@ -3244,7 +3244,7 @@ [13-9]| - 22 + 2[23] $1-$2 @@ -3464,7 +3464,7 @@ )\d{4}| (?: 2(?: - 2\d| + [23]\d| [45] )\d\d| 3(?: @@ -4048,7 +4048,7 @@ - + @@ -4065,6 +4065,7 @@ 20211234 + 2090\d{4}| 2(?: 02| 1[037]| @@ -4083,7 +4084,7 @@ 90011234 (?: - 4[0-7]| + 4[0-8]| [56]\d| 9[013-9] )\d{6} @@ -6307,7 +6308,10 @@ (?: 24[23]| - 6[25-9]\d + 6(?: + [25-9]\d| + 40 + ) )\d{6} @@ -6363,7 +6367,33 @@ NA - 10 + + 1(?: + 0| + 23 + )| + 781| + [1-9]12 + + + 1(?: + 0| + 23 + )| + 7812| + [1-9]123 + + + 1(?: + 0| + 23(?: + [0-8]| + 9[0-46-9] + ) + )| + 78123| + [1-9]123 + $1 NA @@ -6374,26 +6404,339 @@ (?: 10| 2[0-57-9] - )[19] + )[19]| + 3(?: + [157]| + 35| + 49| + 9[1-68] + )| + 4(?: + 1[124-9]| + 2[179]| + 6[47-9]| + 7| + 8[23] + )| + 5(?: + [1357]| + 2[37]| + 4[36]| + 6[1-46]| + 80 + )| + 6(?: + 3[1-5]| + 6[0238]| + 9[12] + )| + 7(?: + 01| + [1579]| + 2[248]| + 3[014-9]| + 4[3-6]| + 6[023689] + )| + 8(?: + 07| + 1[236-8]| + 2[5-7]| + [37]| + 8[36-8]| + 9[1-8] + )| + 9(?: + 0[1-3689]| + 1[1-79]| + 3| + 4[13]| + 5[1-5]| + 7[0-79]| + 9[0-35-9] + )| + (?: + 4[35]| + 59| + 85 + )[1-9] (?: 10| 2[0-57-9] )(?: - 10| + 1[02]| 9[56] - ) + )| + 8078| + (?: + 3(?: + [157]\d| + 35| + 49| + 9[1-68] + )| + 4(?: + 1[124-9]| + 2[179]| + [35][1-9]| + 6[47-9]| + 7\d| + 8[23] + )| + 5(?: + [1357]\d| + 2[37]| + 4[36]| + 6[1-46]| + 80| + 9[1-9] + )| + 6(?: + 3[1-5]| + 6[0238]| + 9[12] + )| + 7(?: + 01| + [1579]\d| + 2[248]| + 3[014-9]| + 4[3-6]| + 6[023689] + )| + 8(?: + 1[236-8]| + 2[5-7]| + [37]\d| + 5[1-9]| + 8[36-8]| + 9[1-8] + )| + 9(?: + 0[1-3689]| + 1[1-79]| + 3\d| + 4[13]| + 5[1-5]| + 7[0-79]| + 9[0-35-9] + ) + )1 10(?: - 10| + 1(?: + 0| + 23 + )| 9[56] )| 2[0-57-9](?: - 100| + 1(?: + 00| + 23 + )| 9[56] - ) + )| + 80781| + (?: + 3(?: + [157]\d| + 35| + 49| + 9[1-68] + )| + 4(?: + 1[124-9]| + 2[179]| + [35][1-9]| + 6[47-9]| + 7\d| + 8[23] + )| + 5(?: + [1357]\d| + 2[37]| + 4[36]| + 6[1-46]| + 80| + 9[1-9] + )| + 6(?: + 3[1-5]| + 6[0238]| + 9[12] + )| + 7(?: + 01| + [1579]\d| + 2[248]| + 3[014-9]| + 4[3-6]| + 6[023689] + )| + 8(?: + 1[236-8]| + 2[5-7]| + [37]\d| + 5[1-9]| + 8[36-8]| + 9[1-8] + )| + 9(?: + 0[1-3689]| + 1[1-79]| + 3\d| + 4[13]| + 5[1-5]| + 7[0-79]| + 9[0-35-9] + ) + )12 + + + 10(?: + 1(?: + 0| + 23 + )| + 9[56] + )| + 2[0-57-9](?: + 1(?: + 00| + 23 + )| + 9[56] + )| + 807812| + (?: + 3(?: + [157]\d| + 35| + 49| + 9[1-68] + )| + 4(?: + 1[124-9]| + 2[179]| + [35][1-9]| + 6[47-9]| + 7\d| + 8[23] + )| + 5(?: + [1357]\d| + 2[37]| + 4[36]| + 6[1-46]| + 80| + 9[1-9] + )| + 6(?: + 3[1-5]| + 6[0238]| + 9[12] + )| + 7(?: + 01| + [1579]\d| + 2[248]| + 3[014-9]| + 4[3-6]| + 6[023689] + )| + 8(?: + 1[236-8]| + 2[5-7]| + [37]\d| + 5[1-9]| + 8[36-8]| + 9[1-8] + )| + 9(?: + 0[1-3689]| + 1[1-79]| + 3\d| + 4[13]| + 5[1-5]| + 7[0-79]| + 9[0-35-9] + ) + )123 + + + 10(?: + 1(?: + 0| + 23 + )| + 9[56] + )| + 2[0-57-9](?: + 1(?: + 00| + 23 + )| + 9[56] + )| + (?: + 3(?: + [157]\d| + 35| + 49| + 9[1-68] + )| + 4(?: + 1[124-9]| + 2[179]| + [35][1-9]| + 6[47-9]| + 7\d| + 8[23] + )| + 5(?: + [1357]\d| + 2[37]| + 4[36]| + 6[1-46]| + 80| + 9[1-9] + )| + 6(?: + 3[1-5]| + 6[0238]| + 9[12] + )| + 7(?: + 01| + [1579]\d| + 2[248]| + 3[014-9]| + 4[3-6]| + 6[023689] + )| + 8(?: + 078| + 1[236-8]| + 2[5-7]| + [37]\d| + 5[1-9]| + 8[36-8]| + 9[1-8] + )| + 9(?: + 0[1-3689]| + 1[1-79]| + 3\d| + 4[13]| + 5[1-5]| + 7[0-79]| + 9[0-35-9] + ) + )123 $1 $2 @@ -6404,17 +6747,185 @@ 26| [3-9]| (?: - 10| - 2[0-57-9] + 10| + 2[0-57-9] + )(?: + [0-8]| + 9[0-47-9] + ) + + + 1(?: + 0(?: + [02-8]| + 1(?: + [013-9]| + 2[0-24-9] + )| + 9[0-47-9] + )| + [1-9] + )| + 2(?: + [0-57-9](?: + [02-8]| + 1(?: + 0[1-9]| + [13-9]| + 2[0-24-9] + )| + 9[0-47-9] + )| + 6 + )| + [3-9] + + + 1(?: + 0(?: + [02-8]| + 1(?: + [013-9]| + 2[0-24-9] + )| + 9[0-47-9] + )| + [1-9] + )| + 2(?: + [0-57-9](?: + [02-8]| + 1(?: + 0[1-9]| + [13-9]| + 2[0-24-9] + )| + 9[0-47-9] + )| + 6 + )| + 3(?: + [0268]| + 3[0-46-9]| + 4[0-8]| + 9[079] + )| + 4(?: + [049]| + 1[03]| + 2[02-68]| + [35]0| + 6[0-356]| + 8[014-9] + )| + 5(?: + 0| + 2[0-24-689]| + 4[0-2457-9]| + 6[057-9]| + 8[1-9]| + 90 + )| + 6(?: + [0-24578]| + 3[06-9]| + 6[14-79]| + 9[03-9] + )| + 7(?: + 0[02-9]| + 2[0135-79]| + 3[23]| + 4[0-27-9]| + 6[1457]| + 8 + )| + 8(?: + [046]| + 1[01459]| + 2[0-489]| + 50| + 8[0-2459]| + 9[09] + )| + 9(?: + 0[0457]| + 1[08]| + [268]| + 4[024-9]| + 5[06-9]| + 78| + 94 + )| + (?: + 3(?: + [157]\d| + 35| + 49| + 9[1-68] + )| + 4(?: + 1[124-9]| + 2[179]| + [35][1-9]| + 6[47-9]| + 7\d| + 8[23] + )| + 5(?: + [1357]\d| + 2[37]| + 4[36]| + 6[1-46]| + 80| + 9[1-9] + )| + 6(?: + 3[1-5]| + 6[0238]| + 9[12] + )| + 7(?: + 01| + [1579]\d| + 2[248]| + 3[014-9]| + 4[3-6]| + 6[023689] + )| + 8(?: + 1[236-8]| + 2[5-7]| + [37]\d| + 5[1-9]| + 8[36-8]| + 9[1-8] + )| + 9(?: + 0[1-3689]| + 1[1-79]| + 3\d| + 4[13]| + 5[1-5]| + 7[0-79]| + 9[0-35-9] + ) )(?: - [0-8]| - 9[0-47-9] + [02-9]| + 1(?: + [013-9]| + 2[0-24-9] + ) ) 1(?: 0(?: - [0-8]| + [02-8]| + 1(?: + [013-9]| + 2[0-24-9] + )| 9[0-47-9] )| [1-9] @@ -6424,13 +6935,131 @@ [02-8]| 1(?: 0[1-9]| - [1-9] + [13-9]| + 2[0-24-9] )| 9[0-47-9] )| 6 )| - [3-9] + 3(?: + [0268]| + 3[0-46-9]| + 4[0-8]| + 9[079] + )| + 4(?: + [049]| + 1[03]| + 2[02-68]| + [35]0| + 6[0-356]| + 8[014-9] + )| + 5(?: + 0| + 2[0-24-689]| + 4[0-2457-9]| + 6[057-9]| + 8[1-9]| + 90 + )| + 6(?: + [0-24578]| + 3[06-9]| + 6[14-79]| + 9[03-9] + )| + 7(?: + 0[02-9]| + 2[0135-79]| + 3[23]| + 4[0-27-9]| + 6[1457]| + 8 + )| + 8(?: + 0(?: + [0-689]| + 7[0-79] + )| + 1[01459]| + 2[0-489]| + [46]| + 50| + 8[0-2459]| + 9[09] + )| + 9(?: + 0[0457]| + 1[08]| + [268]| + 4[024-9]| + 5[06-9]| + 78| + 94 + )| + (?: + 3(?: + [157]\d| + 35| + 49| + 9[1-68] + )| + 4(?: + 1[124-9]| + 2[179]| + [35][1-9]| + 6[47-9]| + 7\d| + 8[23] + )| + 5(?: + [1357]\d| + 2[37]| + 4[36]| + 6[1-46]| + 80| + 9[1-9] + )| + 6(?: + 3[1-5]| + 6[0238]| + 9[12] + )| + 7(?: + 01| + [1579]\d| + 2[248]| + 3[014-9]| + 4[3-6]| + 6[023689] + )| + 8(?: + 078| + 1[236-8]| + 2[5-7]| + [37]\d| + 5[1-9]| + 8[36-8]| + 9[1-8] + )| + 9(?: + 0[1-3689]| + 1[1-79]| + 3\d| + 4[13]| + 5[1-5]| + 7[0-79]| + 9[0-35-9] + ) + )(?: + [02-9]| + 1(?: + [013-9]| + 2[0-24-9] + ) + ) $1 $2 NA @@ -7071,20 +7700,24 @@ - 1[127]\d{8,9}| - 2\d{9}(?: - \d{2} - )?| - [12]\d{6,7}| - 86\d{6}| (?: - 1[03-689]\d| + (?: + 1[03-689]| + 2\d + )\d\d| 6 - )\d{7,9}| + )\d{8}| + 1\d{10}| + [126]\d{6}(?: + \d(?: + \d{2} + )? + )?| + 86\d{5,6}| (?: [3-579]\d| 8[0-57-9] - )\d{6,9} + )\d{5,9} @@ -7104,9 +7737,9 @@ 28, 2011. 0551 increased to 8 digits and 0565 was cancelled on Dec 8, 2012. 0871 increased to 8 digits on December 16, 2012. 0475 is the prefix for Tongliao but is not in the ITU data. - 10xxx and 95xxx(x) numbers with area codes are also included here, as they behave - exactly like fixed-line numbers. We don't support them for 4-digit area codes though, - as they don't seem to be used there based on making actual phone calls. --> + 10xxx, 123xx and 95xxx(x) numbers with area codes are also included here, as they + behave exactly like fixed-line numbers. We don't support them for 4-digit area codes + though, as they don't seem to be used there based on making actual phone calls. --> 1012345678 @@ -7119,36 +7752,63 @@ [1-9]\d ) )| - 21(?: - [18](?: - 0[1-9]| - [1-9]\d - )| - [2-79]\d\d - ) + 2(?: + [02-57-9]\d{3}| + 1(?: + [18](?: + 0[1-9]| + [1-9]\d + )| + [2-79]\d\d + ) + )| + (?: + 41[03]| + 8078| + 9(?: + 78| + 94 + ) + )\d\d )\d{5}| + (?: + 10| + 2[0-57-9] + )(?: + 1(?: + 00| + 23 + )\d\d| + 95\d{3,4} + )| + (?: + 41[03]| + 9(?: + 78| + 94 + ) + )(?: + 100\d\d| + 95\d{3,4} + )| + 8078123| (?: 43[35]| - 754 + 754| + 851 )\d{7,8}| - 8(?: - 078\d{7}| - 51\d{7,8} - )| (?: - 10| - (?: - 2| - 85 - )1| 43[35]| - 754 + 754| + 851 )(?: - 100\d\d| + 1(?: + 00\d| + 23 + )\d| 95\d{3,4} )| (?: - 2[02-57-9]| 3(?: 11| 7[179] @@ -7183,7 +7843,13 @@ )?| [1-9]\d{5} )| - [1-9]\d{6} + [13-9]\d{6}| + 2(?: + [0-24-9]\d{5}| + 3\d(?: + \d{4} + )? + ) )| 9(?: [0-46-9]\d{6}| @@ -7204,7 +7870,7 @@ 9[1-68] )| 4(?: - 1[02-9]| + 1[24-9]| 2[179]| 3[46-9]| 5[2-9]| @@ -7248,9 +7914,11 @@ 9(?: 0[1-3689]| 1[1-79]| - [379]\d| + 3\d| 4[13]| - 5[1-5] + 5[1-5]| + 7[0-79]| + 9[0-35-9] ) )(?: [02-8]\d{6}| @@ -7261,7 +7929,13 @@ )?| [1-9]\d{4} )| - [1-9]\d{5} + [13-9]\d{5}| + 2(?: + [0-24-9]\d{4}| + 3\d(?: + \d{3} + )? + ) )| 9(?: [0-46-9]\d{5}| @@ -8511,14 +9185,15 @@ 15123456789 - 15(?: - [0-25-9]\d\d| - 310 - )\d{6}| + 15310\d{6}| 1(?: 6[023]| - 7\d - )\d{7,8} + 7[0-57-9] + )\d{7,8}| + 1(?: + 5[0-25-9]| + 76 + )\d{8} @@ -9060,7 +9735,7 @@ 5(?: 4[0-29]| 5\d| - 6[0-2] + 6[0-3] )| 6(?: [569]\d| @@ -9405,7 +10080,7 @@ 57 )\d{6,7}| (?: - 2[2-4]| + 2\d| 3| 4[05-8]| 5[05]| @@ -10318,7 +10993,7 @@ 8(?: 1[01]| 2[0156]| - 4[02]| + 4[024]| 84 )\d{6} @@ -12511,7 +13186,7 @@ )\d| 8(?: 4[0-8]| - [59]\d| + [579]\d| 6[0-2] ) )| @@ -12560,7 +13235,7 @@ )\d{4}| (?: 4(?: - 4[0-35-8]| + 4[0-35-9]| 6[02357-9]| 70 )| @@ -12576,7 +13251,7 @@ 7[0-79] )| 70[1-39]| - 84[0-29]| + 84[0-39]| 9(?: 0[1-9]| 1[02-9]| @@ -13640,7 +14315,7 @@ 7(?: 38(?: 0\d| - 5[0-259]| + 5[0-2569]| 88 )| 8(?: @@ -30925,9 +31600,12 @@ 9[12]\d\d )| (?: - 6\d| - 7[0-46-9] - )\d{3}| + 6\d\d| + 7(?: + [0-46-9]\d| + 5[0-4] + ) + )\d\d| 8(?: 5\d{3}| 7(?: diff --git a/resources/carrier/en/229.txt b/resources/carrier/en/229.txt index e8608f020..5310e3227 100644 --- a/resources/carrier/en/229.txt +++ b/resources/carrier/en/229.txt @@ -13,6 +13,7 @@ # limitations under the License. # Libercom is brand name of Benintelecoms and Moov is brand name of Etisalat. +# Celtiis is brand name of SBIN. 2294|Celtiis 22942|MTN diff --git a/resources/carrier/en/237.txt b/resources/carrier/en/237.txt index 4bdeaa5c7..306894100 100644 --- a/resources/carrier/en/237.txt +++ b/resources/carrier/en/237.txt @@ -13,6 +13,7 @@ # limitations under the License. 23762|Camtel +23764|Orange 237650|MTN Cameroon 237651|MTN Cameroon 237652|MTN Cameroon @@ -34,5 +35,5 @@ 237686|Orange 237687|Orange 237688|Orange -237689|NEXTTEL +237689|Orange 23769|Orange diff --git a/resources/carrier/en/244.txt b/resources/carrier/en/244.txt index 9918cef28..97db63d55 100644 --- a/resources/carrier/en/244.txt +++ b/resources/carrier/en/244.txt @@ -17,5 +17,6 @@ 24493|UNITEL 24494|UNITEL 24495|Africell +24496|Africell 24497|UNITEL 24499|Movicel diff --git a/resources/carrier/en/27.txt b/resources/carrier/en/27.txt index 541ae99fa..8032e0c48 100644 --- a/resources/carrier/en/27.txt +++ b/resources/carrier/en/27.txt @@ -125,6 +125,7 @@ 2772|Vodacom 2773|MTN 2774|Cell C +2775|Telkom Mobile 2776|Vodacom 2778|MTN 2779|Vodacom diff --git a/resources/carrier/en/33.txt b/resources/carrier/en/33.txt index 27a5d0140..ba372be95 100644 --- a/resources/carrier/en/33.txt +++ b/resources/carrier/en/33.txt @@ -195,8 +195,8 @@ 3375075|Alphalink 3375076|Globalstar Europe 3375077|Globalstar Europe -3375078|China Telecom (France) Limited -3375079|China Telecom (France) Limited +3375078|Bouygues +3375079|Bouygues 337508|SFR 337509|SFR 33751|Lycamobile @@ -296,6 +296,8 @@ 3375759|Twilio Ireland Limited 3375760|Twilio Ireland Limited 3375763|Euroinformation Telecom +3375764|Bouygues +3375765|Bouygues 3375767|Euroinformation Telecom 3375770|SFR 3375771|SFR diff --git a/resources/carrier/en/34.txt b/resources/carrier/en/34.txt index 5559f7492..be583fdc2 100644 --- a/resources/carrier/en/34.txt +++ b/resources/carrier/en/34.txt @@ -329,5 +329,6 @@ 3474448|Aire Networks 3474449|Alai 347446|PTV +347449|Alai 347477|Orange 347478|Orange diff --git a/resources/carrier/en/41.txt b/resources/carrier/en/41.txt index e9b03f523..44815275e 100644 --- a/resources/carrier/en/41.txt +++ b/resources/carrier/en/41.txt @@ -75,13 +75,7 @@ 4178461|Tismi 4178462|Tismi 4178463|Tismi -4178470|MTEL -4178471|MTEL -4178472|MTEL -4178473|MTEL -4178474|MTEL -4178475|MTEL -4178476|MTEL +417847|MTEL 4178480|Nexphone 4178481|Nexphone 4178482|Nexphone diff --git a/resources/carrier/en/852.txt b/resources/carrier/en/852.txt index dd1274f13..629073d92 100644 --- a/resources/carrier/en/852.txt +++ b/resources/carrier/en/852.txt @@ -32,6 +32,7 @@ 852446|Hutchison Telecom 852447|China Mobile 852448|Hutchison Telecom +852449|Hutchison Telecom 852460|China Unicom 8524607|Multibyte 8524608|HKT @@ -314,6 +315,7 @@ 852840|China Mobile 852841|Hutchison Telecom 852842|HKT +852843|Hutchison Telecom 8528480|HKT 8528481|HKT 8528482|HKT diff --git a/resources/carrier/zh/852.txt b/resources/carrier/zh/852.txt index cd86c2766..0f4fe7465 100644 --- a/resources/carrier/zh/852.txt +++ b/resources/carrier/zh/852.txt @@ -26,6 +26,7 @@ 852446|和記電話有限公司 852447|中国移动 852448|和記電話有限公司 +852449|和記電話有限公司 852460|中国联通 8524607|Multibyte 8524608|香港移动通讯 @@ -308,6 +309,7 @@ 852840|中国移动 852841|和記電話有限公司 852842|香港移动通讯 +852843|和記電話有限公司 8528480|香港移动通讯 8528481|香港移动通讯 8528482|香港移动通讯