Metadata update v7.0.3

diff --git a/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/225_en b/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/225_en
index 0bcd97a..3a61f8e 100644 (file)
Binary files a/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/225_en and b/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/225_en differ

diff --git a/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/233_en b/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/233_en
index f1714cc..5aa76bd 100644 (file)
Binary files a/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/233_en and b/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/233_en differ

diff --git a/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/677_en b/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/677_en
index 98ef66b..51bed88 100644 (file)
Binary files a/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/677_en and b/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/677_en differ

diff --git a/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/973_en b/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/973_en
index a50573a..0a4e1d0 100644 (file)
Binary files a/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/973_en and b/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/973_en differ

diff --git a/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1418_en b/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1418_en
index b08761e..a7dfe64 100644 (file)
Binary files a/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1418_en and b/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1418_en differ

diff --git a/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1438_en b/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1438_en
index fe31ca9..e253749 100644 (file)
Binary files a/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1438_en and b/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1438_en differ

diff --git a/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1450_en b/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1450_en
index 6e4ea08..4feb4c7 100644 (file)
Binary files a/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1450_en and b/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1450_en differ

diff --git a/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1514_en b/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1514_en
index b0540cc..736eb7d 100644 (file)
Binary files a/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1514_en and b/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1514_en differ

diff --git a/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1819_en b/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1819_en
index cf175f9..ecebe32 100644 (file)
Binary files a/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1819_en and b/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1819_en differ

diff --git a/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/64_en b/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/64_en
new file mode 100644 (file)
index 0000000..c347a2a
Binary files /dev/null and b/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/64_en differ

diff --git a/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/86_en b/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/86_en
index 8fd663b..ebbda29 100644 (file)
Binary files a/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/86_en and b/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/86_en differ

diff --git a/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/86_zh b/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/86_zh
index 406d851..db537eb 100644 (file)
Binary files a/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/86_zh and b/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/86_zh differ

diff --git a/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/config b/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/config
index df72e10..dbb1475 100644 (file)
Binary files a/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/config and b/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/config differ

diff --git a/java/geocoder/src/com/google/i18n/phonenumbers/timezones/data/map_data b/java/geocoder/src/com/google/i18n/phonenumbers/timezones/data/map_data
index aa574da..26c66a5 100644 (file)
Binary files a/java/geocoder/src/com/google/i18n/phonenumbers/timezones/data/map_data and b/java/geocoder/src/com/google/i18n/phonenumbers/timezones/data/map_data differ

diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AR b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AR
index b9a27fd..dc775bb 100644 (file)
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AR and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AR differ

diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BH b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BH
index 6d37f63..4ccb059 100644 (file)
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BH and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BH differ

diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BY b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BY
index c1be2b9..bf010ac 100644 (file)
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BY and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BY differ

diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CI b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CI
index 972c334..880fb25 100644 (file)
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CI and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CI differ

diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CN b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CN
index ed06d7c..f09a601 100644 (file)
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CN and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CN differ

diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GH b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GH
index b237efb..410c1b4 100644 (file)
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GH and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GH differ

diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KR b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KR
index 9e587ee..200201e 100644 (file)
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KR and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KR differ

diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KW b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KW
index 19da153..27ffde3 100644 (file)
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KW and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KW differ

diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LU b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LU
index 466bea5..bb5f53e 100644 (file)
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LU and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LU differ

diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_ME b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_ME
index cdcb96d..1fe1d4d 100644 (file)
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_ME and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_ME differ

diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NZ b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NZ
index ca43140..b980f3f 100644 (file)
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NZ and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NZ differ

diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SB b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SB
index bfd2828..d063ccf 100644 (file)
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SB and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SB differ

diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_WS b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_WS
index 02cced6..fb630c2 100644 (file)
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_WS and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_WS differ

diff --git a/java/release_notes.txt b/java/release_notes.txt
index 7f85eba..8fef93e 100644 (file)
--- a/java/release_notes.txt
+++ b/java/release_notes.txt
@@ -1,3 +1,13 @@
+Mar 02, 2015: libphonenumber-7.0.3
+* Metadata changes:
+ - Updated phone metadata for region code(s):
+   AR, BH, BY, CI, CN, GH, KR, KW, LU, ME, NZ, SB, WS
+ - New geocoding data for country calling code(s): 64 (en)
+ - Updated geocoding data for country calling code(s):
+   86 (en, zh), 1418 (en), 1438 (en), 1450 (en), 1514 (en), 1819 (en)
+ - Updated carrier data for country calling code(s):
+   225 (en), 233 (en), 677 (en), 973 (en)
+
 Jan 09, 2015: libphonenumber-7.0.2
 * Metadata changes:
  - Updated phone metadata for region code(s):

diff --git a/javascript/i18n/phonenumbers/metadata.js b/javascript/i18n/phonenumbers/metadata.js
index 3bcce08..3825b0a 100644 (file)
--- a/javascript/i18n/phonenumbers/metadata.js
+++ b/javascript/i18n/phonenumbers/metadata.js
@@ -417,7 +417,7 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
-,"AR",54,"00","0",,,"0?(?:(11|2(?:2(?:02?|[13]|2[13-79]|4[1-6]|5[2457]|6[124-8]|7[1-4]|8[13-6]|9[1267])|3(?:02?|1[467]|2[03-6]|3[13-8]|[49][2-6]|5[2-8]|[67])|4(?:7[3-578]|9)|6(?:[0136]|2[24-6]|4[6-8]?|5[15-8])|80|9(?:0[1-3]|[19]|2\\d|3[1-6]|4[02568]?|5[2-4]|6[2-46]|72?|8[23]?))|3(?:3(?:2[79]|6|8[2578])|4(?:0[124-9]|[12]|3[5-8]?|4[24-7]|5[4-68]?|6[02-9]|7[126]|8[2379]?|9[1-36-8])|5(?:1|2[1245]|3[237]?|4[1-46-9]|6[2-4]|7[1-6]|8[2-5]?)|6[24]|7(?:1[1568]|2[15]|3[145]|4[13]|5[14-8]|[069]|7[2-57]|8[126])|8(?:[01]|2[15-7]|3[2578]?|4[13-6]|5[4-8]?|6[1-357-9]|7[36-8]?|8[5-8]?|9[124])))?15)?","9$1",,,[[,"([68]\\d{2})(\\d{3})(\\d{4})","$1-$2-$3",["[68]"]
+,"AR",54,"00","0",,,"0?(?:(11|2(?:2(?:02?|[13]|2[13-79]|4[1-6]|5[2457]|6[124-8]|7[1-4]|8[13-6]|9[1267])|3(?:02?|1[467]|2[03-6]|3[13-8]|[49][2-6]|5[2-8]|[67])|4(?:7[3-578]|9)|6(?:[0136]|2[24-6]|4[6-8]?|5[15-8])|80|9(?:0[1-3]|[19]|2\\d|3[1-6]|4[02568]?|5[2-4]|6[2-46]|72?|8[23]?))|3(?:3(?:2[79]|6|8[2578])|4(?:0[0-24-9]|[12]|3[5-8]?|4[24-7]|5[4-68]?|6[02-9]|7[126]|8[2379]?|9[1-36-8])|5(?:1|2[1245]|3[237]?|4[1-46-9]|6[2-4]|7[1-6]|8[2-5]?)|6[24]|7(?:[069]|1[1568]|2[15]|3[145]|4[13]|5[14-8]|7[2-57]|8[126])|8(?:[01]|2[15-7]|3[2578]?|4[13-6]|5[4-8]?|6[1-357-9]|7[36-8]?|8[5-8]?|9[124])))?15)?","9$1",,,[[,"([68]\\d{2})(\\d{3})(\\d{4})","$1-$2-$3",["[68]"]
 ,"0$1","",0]
 ,[,"(\\d{2})(\\d{4})","$1-$2",["[2-9]"]
 ,"$1","",0]
@@ -427,13 +427,13 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,"$1","",0]
 ,[,"(9)(11)(\\d{4})(\\d{4})","$2 15-$3-$4",["911"]
 ,"0$1","",0]
-,[,"(9)(\\d{3})(\\d{3})(\\d{4})","$2 15-$3-$4",["9(?:2[234689]|3[3-8])","9(?:2(?:2[013]|3[067]|49|6[01346]|80|9[147-9])|3(?:36|4[12358]|5[138]|6[24]|7[069]|8[013578]))","9(?:2(?:2[013]|3[067]|49|6[01346]|80|9(?:[179]|4[13479]|8[014-9]))|3(?:36|4[12358]|5(?:[18]|3[014-689])|6[24]|7[069]|8(?:[01]|3[013469]|5[0-39]|7[0-2459]|8[0-49])))"]
+,[,"(9)(\\d{3})(\\d{3})(\\d{4})","$2 15-$3-$4",["9(?:2[234689]|3[3-8])","9(?:2(?:2[013]|3[067]|49|6[01346]|80|9[147-9])|3(?:36|4[1-358]|5[138]|6[24]|7[069]|8[013578]))","9(?:2(?:2(?:0[013-9]|[13])|3(?:0[013-9]|[67])|49|6(?:[0136]|4[0-59])|8|9(?:[19]|44|7[013-9]|8[14]))|3(?:36|4(?:[12]|[358]4)|5(?:1|3[0-24-689]|8[46])|6|7[069]|8(?:[01]|34|[578][45])))"]
 ,"0$1","",0]
 ,[,"(9)(\\d{4})(\\d{2})(\\d{4})","$2 15-$3-$4",["9[23]"]
 ,"0$1","",0]
 ,[,"(11)(\\d{4})(\\d{4})","$1 $2-$3",["1"]
 ,"0$1","",1]
-,[,"(\\d{3})(\\d{3})(\\d{4})","$1 $2-$3",["2(?:2[013]|3[067]|49|6[01346]|80|9[147-9])|3(?:36|4[12358]|5[138]|6[24]|7[069]|8[013578])","2(?:2[013]|3[067]|49|6[01346]|80|9(?:[179]|4[13479]|8[014-9]))|3(?:36|4[12358]|5(?:[18]|3[0-689])|6[24]|7[069]|8(?:[01]|3[013469]|5[0-39]|7[0-2459]|8[0-49]))"]
+,[,"(\\d{3})(\\d{3})(\\d{4})","$1 $2-$3",["2(?:2[013]|3[067]|49|6[01346]|80|9[147-9])|3(?:36|4[1-358]|5[138]|6[24]|7[069]|8[013578])","2(?:2(?:0[013-9]|[13])|3(?:0[013-9]|[67])|49|6(?:[0136]|4[0-59])|8|9(?:[19]|44|7[013-9]|8[14]))|3(?:36|4(?:[12]|[358]4)|5(?:1|3[0-24-689]|8[46])|6|7[069]|8(?:[01]|34|[578][45]))"]
 ,"0$1","",1]
 ,[,"(\\d{4})(\\d{2})(\\d{4})","$1 $2-$3",["[23]"]
 ,"0$1","",1]
@@ -444,13 +444,13 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,"0$1","",0]
 ,[,"(9)(11)(\\d{4})(\\d{4})","$1 $2 $3-$4",["911"]
 ]
-,[,"(9)(\\d{3})(\\d{3})(\\d{4})","$1 $2 $3-$4",["9(?:2[234689]|3[3-8])","9(?:2(?:2[013]|3[067]|49|6[01346]|80|9[147-9])|3(?:36|4[12358]|5[138]|6[24]|7[069]|8[013578]))","9(?:2(?:2[013]|3[067]|49|6[01346]|80|9(?:[179]|4[13479]|8[014-9]))|3(?:36|4[12358]|5(?:[18]|3[014-689])|6[24]|7[069]|8(?:[01]|3[013469]|5[0-39]|7[0-2459]|8[0-49])))"]
+,[,"(9)(\\d{3})(\\d{3})(\\d{4})","$1 $2 $3-$4",["9(?:2[234689]|3[3-8])","9(?:2(?:2[013]|3[067]|49|6[01346]|80|9[147-9])|3(?:36|4[1-358]|5[138]|6[24]|7[069]|8[013578]))","9(?:2(?:2(?:0[013-9]|[13])|3(?:0[013-9]|[67])|49|6(?:[0136]|4[0-59])|8|9(?:[19]|44|7[013-9]|8[14]))|3(?:36|4(?:[12]|[358]4)|5(?:1|3[0-24-689]|8[46])|6|7[069]|8(?:[01]|34|[578][45])))"]
 ]
 ,[,"(9)(\\d{4})(\\d{2})(\\d{4})","$1 $2 $3-$4",["9[23]"]
 ]
 ,[,"(11)(\\d{4})(\\d{4})","$1 $2-$3",["1"]
 ,"0$1","",1]
-,[,"(\\d{3})(\\d{3})(\\d{4})","$1 $2-$3",["2(?:2[013]|3[067]|49|6[01346]|80|9[147-9])|3(?:36|4[12358]|5[138]|6[24]|7[069]|8[013578])","2(?:2[013]|3[067]|49|6[01346]|80|9(?:[179]|4[13479]|8[014-9]))|3(?:36|4[12358]|5(?:[18]|3[0-689])|6[24]|7[069]|8(?:[01]|3[013469]|5[0-39]|7[0-2459]|8[0-49]))"]
+,[,"(\\d{3})(\\d{3})(\\d{4})","$1 $2-$3",["2(?:2[013]|3[067]|49|6[01346]|80|9[147-9])|3(?:36|4[1-358]|5[138]|6[24]|7[069]|8[013578])","2(?:2(?:0[013-9]|[13])|3(?:0[013-9]|[67])|49|6(?:[0136]|4[0-59])|8|9(?:[19]|44|7[013-9]|8[14]))|3(?:36|4(?:[12]|[358]4)|5(?:1|3[0-24-689]|8[46])|6|7[069]|8(?:[01]|34|[578][45]))"]
 ,"0$1","",1]
 ,[,"(\\d{4})(\\d{2})(\\d{4})","$1 $2-$3",["[23]"]
 ,"0$1","",1]
@@ -698,8 +698,8 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,,,[,,"NA","NA"]
 ]
 ,"BH":[,[,,"[136-9]\\d{7}","\\d{8}"]
-,[,,"(?:1(?:3[13-6]|6[0156]|7\\d)\\d|6(?:1[16]\\d|500|6(?:0\\d|3[12]|44|88)|9[69][69])|7(?:7\\d{2}|178))\\d{4}","\\d{8}",,,"17001234"]
-,[,,"(?:3(?:[1-4679]\\d|5[01356]|8[0-48])\\d|6(?:3(?:00|33|6[16])|6(?:[69]\\d|3[03-9])))\\d{4}","\\d{8}",,,"36001234"]
+,[,,"(?:1(?:3[1356]|6[0156]|7\\d)\\d|6(?:1[16]\\d|500|6(?:0\\d|3[12]|44|7[7-9])|9[69][69])|7(?:1(?:11|78)|7\\d{2}))\\d{4}","\\d{8}",,,"17001234"]
+,[,,"(?:3(?:[1-4679]\\d|5[013569]|8[0-47-9])\\d|6(?:3(?:00|33|6[16])|6(?:[69]\\d|3[03-9]|7[0-6])))\\d{4}","\\d{8}",,,"36001234"]
 ,[,,"80\\d{6}","\\d{8}",,,"80123456"]
 ,[,,"(?:87|9[014578])\\d{6}","\\d{8}",,,"90123456"]
 ,[,,"84\\d{6}","\\d{8}",,,"84123456"]
@@ -909,7 +909,7 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"(?:810|902)\\d{7}","\\d{10}",,,"9021234567"]
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
-,[,,"NA","NA"]
+,[,,"249\\d{6}","\\d{9}",,,"249123456"]
 ,"BY",375,"810","8",,,"8?0?",,"8~10",,[[,"(\\d{2})(\\d{3})(\\d{2})(\\d{2})","$1 $2-$3-$4",["17[0-3589]|2[4-9]|[34]","17(?:[02358]|1[0-2]|9[0189])|2[4-9]|[34]"]
 ,"8 0$1","",0]
 ,[,"(\\d{3})(\\d{2})(\\d{2})(\\d{2})","$1 $2-$3-$4",["1(?:5[24]|6[235]|7[467])|2(?:1[246]|2[25]|3[26])","1(?:5[24]|6(?:2|3[04-9]|5[0346-9])|7(?:[46]|7[37-9]))|2(?:1[246]|2[25]|3[26])"]
@@ -1047,7 +1047,7 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ]
 ,"CI":[,[,,"[02-7]\\d{7}","\\d{8}"]
 ,[,,"(?:2(?:0[023]|1[02357]|[23][045]|4[03-5])|3(?:0[06]|1[069]|[2-4][07]|5[09]|6[08]))\\d{5}","\\d{8}",,,"21234567"]
-,[,,"(?:0[1-9]|4[0-24-9]|5[4-9]|6[015-79]|7[57])\\d{6}","\\d{8}",,,"01234567"]
+,[,,"(?:0[1-9]|4[0-24-9]|5[4-9]|6[015-79]|7[578])\\d{6}","\\d{8}",,,"01234567"]
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
@@ -1144,15 +1144,15 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ,,,[,,"NA","NA"]
 ]
-,"CN":[,[,,"[1-7]\\d{6,11}|8[0-357-9]\\d{6,9}|9\\d{7,9}","\\d{4,12}"]
-,[,,"21(?:100\\d{2}|95\\d{3,4}|\\d{8,10})|(?:10|2[02-57-9]|3(?:11|7[179])|4(?:[15]1|3[12])|5(?:1\\d|2[37]|3[12]|51|7[13-79]|9[15])|7(?:31|5[457]|6[09]|91)|8(?:71|98))(?:100\\d{2}|95\\d{3,4}|\\d{8})|(?:3(?:1[02-9]|35|49|5\\d|7[02-68]|9[1-68])|4(?:1[02-9]|2[179]|3[3-9]|5[2-9]|6[4789]|7\\d|8[23])|5(?:3[03-9]|4[36]|5[02-9]|6[1-46]|7[028]|80|9[2-46-9])|6(?:3[1-5]|6[0238]|9[12])|7(?:01|[17]\\d|2[248]|3[04-9]|4[3-6]|5[0-3689]|6[2368]|9[02-9])|8(?:1[236-8]|2[5-7]|3\\d|5[1-9]|7[02-9]|8[3678]|9[1-7])|9(?:0[1-3689]|1[1-79]|[379]\\d|4[13]|5[1-5]))(?:100\\d{2}|95\\d{3,4}|\\d{7})|80(?:29|6[03578]|7[018]|81)\\d{4}","\\d{4,12}",,,"1012345678"]
+,"CN":[,[,,"[1-7]\\d{6,11}|8[0-357-9]\\d{6,9}|9\\d{7,10}","\\d{4,12}"]
+,[,,"21(?:100\\d{2}|95\\d{3,4}|\\d{8,10})|(?:10|2[02-57-9]|3(?:11|7[179])|4(?:[15]1|3[12])|5(?:1\\d|2[37]|3[12]|51|7[13-79]|9[15])|7(?:31|5[457]|6[09]|91)|8(?:[57]1|98))(?:100\\d{2}|95\\d{3,4}|\\d{8})|(?:3(?:1[02-9]|35|49|5\\d|7[02-68]|9[1-68])|4(?:1[02-9]|2[179]|3[3-9]|5[2-9]|6[4789]|7\\d|8[23])|5(?:3[03-9]|4[36]|5[02-9]|6[1-46]|7[028]|80|9[2-46-9])|6(?:3[1-5]|6[0238]|9[12])|7(?:01|[17]\\d|2[248]|3[04-9]|4[3-6]|5[0-3689]|6[2368]|9[02-9])|8(?:1[236-8]|2[5-7]|3\\d|5[4-9]|7[02-9]|8[3678]|9[1-7])|9(?:0[1-3689]|1[1-79]|[379]\\d|4[13]|5[1-5]))(?:100\\d{2}|95\\d{3,4}|\\d{7})|80(?:29|6[03578]|7[018]|81)\\d{4}","\\d{4,12}",,,"1012345678"]
 ,[,,"1(?:[38]\\d|4[57]|5[0-35-9]|7[06-8])\\d{8}","\\d{11}",,,"13123456789"]
 ,[,,"(?:10)?800\\d{7}","\\d{10,12}",,,"8001234567"]
 ,[,,"16[08]\\d{5}","\\d{8}",,,"16812345"]
-,[,,"400\\d{7}|(?:10|2[0-57-9]|3(?:[157]\\d|35|49|9[1-68])|4(?:[17]\\d|2[179]|[35][1-9]|6[4789]|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[3678]|9[1-8])|9(?:0[1-3689]|1[1-79]|[379]\\d|4[13]|5[1-5]))96\\d{3,4}","\\d{7,10}",,,"4001234567"]
+,[,,"400\\d{7}|950\\d{7,8}|(?:10|2[0-57-9]|3(?:[157]\\d|35|49|9[1-68])|4(?:[17]\\d|2[179]|[35][1-9]|6[4789]|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[14-9]|8[3678]|9[1-8])|9(?:0[1-3689]|1[1-79]|[379]\\d|4[13]|5[1-5]))96\\d{3,4}","\\d{7,11}",,,"4001234567"]
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
-,"CN",86,"(1[1279]\\d{3})?00","0",,,"(1[1279]\\d{3})|0",,"00",,[[,"(80\\d{2})(\\d{4})","$1 $2",["80[2678]"]
+,"CN",86,"(1(?:[129]\\d{3}|79\\d{2}))?00","0",,,"(1(?:[129]\\d{3}|79\\d{2}))|0",,"00",,[[,"(80\\d{2})(\\d{4})","$1 $2",["80[2678]"]
 ,"0$1","$CC $1",1]
 ,[,"([48]00)(\\d{3})(\\d{4})","$1 $2 $3",["[48]00"]
 ,"","",0]
@@ -1168,14 +1168,16 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,"0$1","$CC $1",1]
 ,[,"([12]\\d)(\\d{4})(\\d{4})","$1 $2 $3",["10[1-9]|2[02-9]","10[1-9]|2[02-9]","10(?:[1-79]|8(?:[1-9]|0[1-9]))|2[02-9]"]
 ,"0$1","$CC $1",1]
-,[,"(\\d{3})(\\d{4})(\\d{4})","$1 $2 $3",["3(?:11|7[179])|4(?:[15]1|3[12])|5(?:1|2[37]|3[12]|51|7[13-79]|9[15])|7(?:31|5[457]|6[09]|91)|8(?:71|98)"]
+,[,"(\\d{3})(\\d{4})(\\d{4})","$1 $2 $3",["3(?:11|7[179])|4(?:[15]1|3[12])|5(?:1|2[37]|3[12]|51|7[13-79]|9[15])|7(?:31|5[457]|6[09]|91)|8(?:[57]1|98)"]
 ,"0$1","$CC $1",1]
-,[,"(\\d{3})(\\d{3})(\\d{4})","$1 $2 $3",["3(?:1[02-9]|35|49|5|7[02-68]|9[1-68])|4(?:1[02-9]|2[179]|[35][2-9]|6[4789]|7\\d|8[23])|5(?:3[03-9]|4[36]|5[02-9]|6[1-46]|7[028]|80|9[2-46-9])|6(?:3[1-5]|6[0238]|9[12])|7(?:01|[1579]|2[248]|3[04-9]|4[3-6]|6[2368])|8(?:1[236-8]|2[5-7]|3|5[1-9]|7[02-9]|8[3678]|9[1-7])|9(?:0[1-3689]|1[1-79]|[379]|4[13]|5[1-5])"]
+,[,"(\\d{3})(\\d{3})(\\d{4})","$1 $2 $3",["3(?:1[02-9]|35|49|5|7[02-68]|9[1-68])|4(?:1[02-9]|2[179]|[35][2-9]|6[4789]|7\\d|8[23])|5(?:3[03-9]|4[36]|5[02-9]|6[1-46]|7[028]|80|9[2-46-9])|6(?:3[1-5]|6[0238]|9[12])|7(?:01|[1579]|2[248]|3[04-9]|4[3-6]|6[2368])|8(?:1[236-8]|2[5-7]|3|5[4-9]|7[02-9]|8[3678]|9[1-7])|9(?:0[1-3689]|1[1-79]|[379]|4[13]|5[1-5])"]
 ,"0$1","$CC $1",1]
 ,[,"(\\d{3})(\\d{4})(\\d{4})","$1 $2 $3",["1[3-578]"]
 ,"","$CC $1",0]
 ,[,"(10800)(\\d{3})(\\d{4})","$1 $2 $3",["108","1080","10800"]
 ,"","",0]
+,[,"(\\d{3})(\\d{7,8})","$1 $2",["950"]
+,"","",0]
 ]
 ,[[,"(80\\d{2})(\\d{4})","$1 $2",["80[2678]"]
 ,"0$1","$CC $1",1]
@@ -1189,17 +1191,19 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,"0$1","$CC $1",1]
 ,[,"([12]\\d)(\\d{4})(\\d{4})","$1 $2 $3",["10[1-9]|2[02-9]","10[1-9]|2[02-9]","10(?:[1-79]|8(?:[1-9]|0[1-9]))|2[02-9]"]
 ,"0$1","$CC $1",1]
-,[,"(\\d{3})(\\d{4})(\\d{4})","$1 $2 $3",["3(?:11|7[179])|4(?:[15]1|3[12])|5(?:1|2[37]|3[12]|51|7[13-79]|9[15])|7(?:31|5[457]|6[09]|91)|8(?:71|98)"]
+,[,"(\\d{3})(\\d{4})(\\d{4})","$1 $2 $3",["3(?:11|7[179])|4(?:[15]1|3[12])|5(?:1|2[37]|3[12]|51|7[13-79]|9[15])|7(?:31|5[457]|6[09]|91)|8(?:[57]1|98)"]
 ,"0$1","$CC $1",1]
-,[,"(\\d{3})(\\d{3})(\\d{4})","$1 $2 $3",["3(?:1[02-9]|35|49|5|7[02-68]|9[1-68])|4(?:1[02-9]|2[179]|[35][2-9]|6[4789]|7\\d|8[23])|5(?:3[03-9]|4[36]|5[02-9]|6[1-46]|7[028]|80|9[2-46-9])|6(?:3[1-5]|6[0238]|9[12])|7(?:01|[1579]|2[248]|3[04-9]|4[3-6]|6[2368])|8(?:1[236-8]|2[5-7]|3|5[1-9]|7[02-9]|8[3678]|9[1-7])|9(?:0[1-3689]|1[1-79]|[379]|4[13]|5[1-5])"]
+,[,"(\\d{3})(\\d{3})(\\d{4})","$1 $2 $3",["3(?:1[02-9]|35|49|5|7[02-68]|9[1-68])|4(?:1[02-9]|2[179]|[35][2-9]|6[4789]|7\\d|8[23])|5(?:3[03-9]|4[36]|5[02-9]|6[1-46]|7[028]|80|9[2-46-9])|6(?:3[1-5]|6[0238]|9[12])|7(?:01|[1579]|2[248]|3[04-9]|4[3-6]|6[2368])|8(?:1[236-8]|2[5-7]|3|5[4-9]|7[02-9]|8[3678]|9[1-7])|9(?:0[1-3689]|1[1-79]|[379]|4[13]|5[1-5])"]
 ,"0$1","$CC $1",1]
 ,[,"(\\d{3})(\\d{4})(\\d{4})","$1 $2 $3",["1[3-578]"]
 ,"","$CC $1",0]
 ,[,"(10800)(\\d{3})(\\d{4})","$1 $2 $3",["108","1080","10800"]
 ,"","",0]
+,[,"(\\d{3})(\\d{7,8})","$1 $2",["950"]
+,"","",0]
 ]
 ,[,,"NA","NA"]
-,,,[,,"(?:4|(?:10)?8)00\\d{7}","\\d{10,12}",,,"4001234567"]
+,,,[,,"(?:4|(?:10)?8)00\\d{7}|950\\d{7,8}","\\d{10,12}",,,"4001234567"]
 ,[,,"NA","NA"]
 ,,,[,,"NA","NA"]
 ]
@@ -1818,7 +1822,7 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ]
 ,"GH":[,[,,"[235]\\d{8}|8\\d{7}","\\d{7,9}"]
 ,[,,"3(?:0[237]\\d|[167](?:2[0-6]|7\\d)|2(?:2[0-5]|7\\d)|3(?:2[0-3]|7\\d)|4(?:2[013-9]|3[01]|7\\d)|5(?:2[0-7]|7\\d)|8(?:2[0-2]|7\\d)|9(?:20|7\\d))\\d{5}","\\d{7,9}",,,"302345678"]
-,[,,"(?:2[034678]\\d|5(?:[047]\\d|54|6[01]))\\d{6}","\\d{9}",,,"231234567"]
+,[,,"(?:2[034678]\\d|5(?:[047]\\d|5[3-6]|6[01]))\\d{6}","\\d{9}",,,"231234567"]
 ,[,,"800\\d{5}","\\d{8}",,,"80012345"]
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
@@ -2598,7 +2602,7 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ]
 ,"KR":[,[,,"[1-7]\\d{3,9}|8\\d{8}","\\d{4,10}"]
 ,[,,"(?:2|3[1-3]|[46][1-4]|5[1-5])(?:1\\d{2,3}|[1-9]\\d{6,7})","\\d{4,10}",,,"22123456"]
-,[,,"1[0-26-9]\\d{7,8}","\\d{9,10}",,,"1023456789"]
+,[,,"1[0-26-9]\\d{7,8}","\\d{9,10}",,,"1000000000"]
 ,[,,"80\\d{7}","\\d{9}",,,"801234567"]
 ,[,,"60[2-9]\\d{6}","\\d{9}",,,"602345678"]
 ,[,,"NA","NA"]
@@ -2632,7 +2636,7 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ]
 ,"KW":[,[,,"[12569]\\d{6,7}","\\d{7,8}"]
 ,[,,"(?:18\\d|2(?:[23]\\d{2}|4(?:[1-35-9]\\d|44)|5(?:0[034]|[2-46]\\d|5[1-3]|7[1-7])))\\d{4}","\\d{7,8}",,,"22345678"]
-,[,,"(?:5(?:[05]\\d|1[0-6])|6(?:0[034679]|5[015-9]|6\\d|7[067]|9[0369])|9(?:0[09]|4[049]|55|6[069]|[79]\\d|8[089]))\\d{5}","\\d{8}",,,"50012345"]
+,[,,"(?:5(?:[05]\\d|1[0-7])|6(?:0[034679]|5[015-9]|6\\d|7[067]|9[0369])|9(?:0[09]|4[049]|55|6[069]|[79]\\d|8[07-9]))\\d{5}","\\d{8}",,,"50012345"]
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
@@ -2829,7 +2833,7 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,,,[,,"NA","NA"]
 ]
 ,"LU":[,[,,"[24-9]\\d{3,10}|3(?:[0-46-9]\\d{2,9}|5[013-9]\\d{1,8})","\\d{4,11}"]
-,[,,"(?:2(?:[259]\\d{2,9}|[346-8]\\d{4}(?:\\d{2})?)|(?:[3457]\\d{2}|8(?:0[2-9]|[13-9]\\d)|9(?:0[89]|[2-579]\\d))\\d{1,8})","\\d{4,11}",,,"27123456"]
+,[,,"(?:2(?:[259]\\d{2,9}|[346-8]\\d{4,6})|(?:[3457]\\d{2}|8(?:0[2-9]|[13-9]\\d)|9(?:0[89]|[2-579]\\d))\\d{1,8})","\\d{4,11}",,,"27123456"]
 ,[,,"6[2679][18]\\d{6}","\\d{9}",,,"628123456"]
 ,[,,"800\\d{5}","\\d{8}",,,"80012345"]
 ,[,,"90[01]\\d{5}","\\d{8}",,,"90012345"]
@@ -2955,14 +2959,14 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,,,[,,"NA","NA"]
 ]
 ,"ME":[,[,,"[2-9]\\d{7,8}","\\d{6,9}"]
-,[,,"(?:20[2-8]|3(?:0[2-7]|1[35-7]|2[3567]|3[4-7])|4(?:0[237]|1[27])|5(?:0[47]|1[27]|2[378]))\\d{5}","\\d{6,8}",,,"30234567"]
-,[,,"6(?:32\\d|[89]\\d{2}|7(?:[0-8]\\d|9(?:[3-9]|[0-2]\\d)))\\d{4}","\\d{8,9}",,,"67622901"]
-,[,,"800[28]\\d{4}","\\d{8}",,,"80080002"]
-,[,,"(?:88\\d|9(?:4[13-8]|5[16-8]))\\d{5}","\\d{8}",,,"94515151"]
+,[,,"(?:20[2-8]|3(?:0[2-7]|[12][35-7]|3[4-7])|4(?:0[2367]|1[267])|5(?:0[467]|1[267]|2[367]))\\d{5}","\\d{6,8}",,,"30234567"]
+,[,,"6(?:00\\d|32\\d|[89]\\d{2}|61\\d|7(?:[0-8]\\d|9(?:[3-9]|[0-2]\\d)))\\d{4}","\\d{8,9}",,,"67622901"]
+,[,,"80\\d{6}","\\d{8}",,,"80080002"]
+,[,,"(?:9(?:4[1568]|5[178]))\\d{5}","\\d{8}",,,"94515151"]
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
 ,[,,"78[1-9]\\d{5}","\\d{8}",,,"78108780"]
-,"ME",382,"00","0",,,"0",,,,[[,"(\\d{2})(\\d{3})(\\d{3})","$1 $2 $3",["[2-57-9]|6[3789]","[2-57-9]|6(?:[389]|7(?:[0-8]|9[3-9]))"]
+,"ME",382,"00","0",,,"0",,,,[[,"(\\d{2})(\\d{3})(\\d{3})","$1 $2 $3",["[2-57-9]|6[036-9]","[2-57-9]|6(?:[03689]|7(?:[0-8]|9[3-9]))"]
 ,"0$1","",0]
 ,[,"(67)(9)(\\d{3})(\\d{3})","$1 $2 $3 $4",["679","679[0-2]"]
 ,"0$1","",0]
@@ -3535,20 +3539,20 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,,,[,,"NA","NA"]
 ]
 ,"NZ":[,[,,"6[235-9]\\d{6}|[2-57-9]\\d{7,10}","\\d{7,11}"]
-,[,,"(?:3[2-79]|[49][2-689]|6[235-9]|7[2-5789])\\d{6}|24099\\d{3}","\\d{7,8}",,,"32345678"]
+,[,,"(?:3[2-79]|[49][2-9]|6[235-9]|7[2-57-9])\\d{6}|24099\\d{3}","\\d{7,8}",,,"32345678"]
 ,[,,"2(?:[028]\\d{7,8}|1(?:[03]\\d{5,7}|[12457]\\d{5,6}|[689]\\d{5})|[79]\\d{7})","\\d{8,10}",,,"211234567"]
 ,[,,"508\\d{6,7}|80\\d{6,8}","\\d{8,10}",,,"800123456"]
 ,[,,"90\\d{7,9}","\\d{9,11}",,,"900123456"]
 ,[,,"NA","NA"]
+,[,,"70\\d{7}","\\d{9}",,,"701234567"]
 ,[,,"NA","NA"]
-,[,,"NA","NA"]
-,"NZ",64,"0(?:0|161)","0",,,"0",,"00",,[[,"([34679])(\\d{3})(\\d{4})","$1-$2 $3",["[3467]|9[1-9]"]
+,"NZ",64,"0(?:0|161)","0",,,"0",,"00",,[[,"([34679])(\\d{3})(\\d{4})","$1-$2 $3",["[346]|7[2-57-9]|9[1-9]"]
 ,"0$1","",0]
 ,[,"(24099)(\\d{3})","$1 $2",["240","2409","24099"]
 ,"0$1","",0]
 ,[,"(\\d{2})(\\d{3})(\\d{3})","$1 $2 $3",["21"]
 ,"0$1","",0]
-,[,"(\\d{2})(\\d{3})(\\d{3,5})","$1 $2 $3",["2(?:1[1-9]|[69]|7[0-35-9])|86"]
+,[,"(\\d{2})(\\d{3})(\\d{3,5})","$1 $2 $3",["2(?:1[1-9]|[69]|7[0-35-9])|70|86"]
 ,"0$1","",0]
 ,[,"(2\\d)(\\d{3,4})(\\d{4})","$1 $2 $3",["2[028]"]
 ,"0$1","",0]
@@ -3999,7 +4003,7 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ]
 ,"SB":[,[,,"[1-9]\\d{4,6}","\\d{5,7}"]
 ,[,,"(?:1[4-79]|[23]\\d|4[01]|5[03]|6[0-37])\\d{3}","\\d{5}",,,"40123"]
-,[,,"48\\d{3}|7(?:[46-8]\\d|5[025-9]|9[0-4])\\d{4}|8[4-8]\\d{5}|9(?:1[2-9]|2[013-9]|3[0-2]|[46]\\d|5[0-46-9]|7[0-689]|8[0-79]|9[0-8])\\d{4}","\\d{5,7}",,,"7421234"]
+,[,,"48\\d{3}|7(?:30|[46-8]\\d|5[025-9]|9[0-5])\\d{4}|8[4-8]\\d{5}|9(?:1[2-9]|2[013-9]|3[0-2]|[46]\\d|5[0-46-9]|7[0-689]|8[0-79]|9[0-8])\\d{4}","\\d{5,7}",,,"7421234"]
 ,[,,"1[38]\\d{3}","\\d{5}",,,"18123"]
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
@@ -4899,6 +4903,8 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,"","",0]
 ,[,"(7\\d)(\\d{5})","$1 $2",["7"]
 ,"","",0]
+,[,"(\\d{5})","$1",["[2-6]"]
+,"","",0]
 ]
 ,,[,,"NA","NA"]
 ,,,[,,"NA","NA"]

diff --git a/javascript/i18n/phonenumbers/metadatalite.js b/javascript/i18n/phonenumbers/metadatalite.js
index 46257a4..d77de3e 100644 (file)
--- a/javascript/i18n/phonenumbers/metadatalite.js
+++ b/javascript/i18n/phonenumbers/metadatalite.js
@@ -417,7 +417,7 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
-,"AR",54,"00","0",,,"0?(?:(11|2(?:2(?:02?|[13]|2[13-79]|4[1-6]|5[2457]|6[124-8]|7[1-4]|8[13-6]|9[1267])|3(?:02?|1[467]|2[03-6]|3[13-8]|[49][2-6]|5[2-8]|[67])|4(?:7[3-578]|9)|6(?:[0136]|2[24-6]|4[6-8]?|5[15-8])|80|9(?:0[1-3]|[19]|2\\d|3[1-6]|4[02568]?|5[2-4]|6[2-46]|72?|8[23]?))|3(?:3(?:2[79]|6|8[2578])|4(?:0[124-9]|[12]|3[5-8]?|4[24-7]|5[4-68]?|6[02-9]|7[126]|8[2379]?|9[1-36-8])|5(?:1|2[1245]|3[237]?|4[1-46-9]|6[2-4]|7[1-6]|8[2-5]?)|6[24]|7(?:1[1568]|2[15]|3[145]|4[13]|5[14-8]|[069]|7[2-57]|8[126])|8(?:[01]|2[15-7]|3[2578]?|4[13-6]|5[4-8]?|6[1-357-9]|7[36-8]?|8[5-8]?|9[124])))?15)?","9$1",,,[[,"([68]\\d{2})(\\d{3})(\\d{4})","$1-$2-$3",["[68]"]
+,"AR",54,"00","0",,,"0?(?:(11|2(?:2(?:02?|[13]|2[13-79]|4[1-6]|5[2457]|6[124-8]|7[1-4]|8[13-6]|9[1267])|3(?:02?|1[467]|2[03-6]|3[13-8]|[49][2-6]|5[2-8]|[67])|4(?:7[3-578]|9)|6(?:[0136]|2[24-6]|4[6-8]?|5[15-8])|80|9(?:0[1-3]|[19]|2\\d|3[1-6]|4[02568]?|5[2-4]|6[2-46]|72?|8[23]?))|3(?:3(?:2[79]|6|8[2578])|4(?:0[0-24-9]|[12]|3[5-8]?|4[24-7]|5[4-68]?|6[02-9]|7[126]|8[2379]?|9[1-36-8])|5(?:1|2[1245]|3[237]?|4[1-46-9]|6[2-4]|7[1-6]|8[2-5]?)|6[24]|7(?:[069]|1[1568]|2[15]|3[145]|4[13]|5[14-8]|7[2-57]|8[126])|8(?:[01]|2[15-7]|3[2578]?|4[13-6]|5[4-8]?|6[1-357-9]|7[36-8]?|8[5-8]?|9[124])))?15)?","9$1",,,[[,"([68]\\d{2})(\\d{3})(\\d{4})","$1-$2-$3",["[68]"]
 ,"0$1","",0]
 ,[,"(\\d{2})(\\d{4})","$1-$2",["[2-9]"]
 ,"$1","",0]
@@ -427,13 +427,13 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,"$1","",0]
 ,[,"(9)(11)(\\d{4})(\\d{4})","$2 15-$3-$4",["911"]
 ,"0$1","",0]
-,[,"(9)(\\d{3})(\\d{3})(\\d{4})","$2 15-$3-$4",["9(?:2[234689]|3[3-8])","9(?:2(?:2[013]|3[067]|49|6[01346]|80|9[147-9])|3(?:36|4[12358]|5[138]|6[24]|7[069]|8[013578]))","9(?:2(?:2[013]|3[067]|49|6[01346]|80|9(?:[179]|4[13479]|8[014-9]))|3(?:36|4[12358]|5(?:[18]|3[014-689])|6[24]|7[069]|8(?:[01]|3[013469]|5[0-39]|7[0-2459]|8[0-49])))"]
+,[,"(9)(\\d{3})(\\d{3})(\\d{4})","$2 15-$3-$4",["9(?:2[234689]|3[3-8])","9(?:2(?:2[013]|3[067]|49|6[01346]|80|9[147-9])|3(?:36|4[1-358]|5[138]|6[24]|7[069]|8[013578]))","9(?:2(?:2(?:0[013-9]|[13])|3(?:0[013-9]|[67])|49|6(?:[0136]|4[0-59])|8|9(?:[19]|44|7[013-9]|8[14]))|3(?:36|4(?:[12]|[358]4)|5(?:1|3[0-24-689]|8[46])|6|7[069]|8(?:[01]|34|[578][45])))"]
 ,"0$1","",0]
 ,[,"(9)(\\d{4})(\\d{2})(\\d{4})","$2 15-$3-$4",["9[23]"]
 ,"0$1","",0]
 ,[,"(11)(\\d{4})(\\d{4})","$1 $2-$3",["1"]
 ,"0$1","",1]
-,[,"(\\d{3})(\\d{3})(\\d{4})","$1 $2-$3",["2(?:2[013]|3[067]|49|6[01346]|80|9[147-9])|3(?:36|4[12358]|5[138]|6[24]|7[069]|8[013578])","2(?:2[013]|3[067]|49|6[01346]|80|9(?:[179]|4[13479]|8[014-9]))|3(?:36|4[12358]|5(?:[18]|3[0-689])|6[24]|7[069]|8(?:[01]|3[013469]|5[0-39]|7[0-2459]|8[0-49]))"]
+,[,"(\\d{3})(\\d{3})(\\d{4})","$1 $2-$3",["2(?:2[013]|3[067]|49|6[01346]|80|9[147-9])|3(?:36|4[1-358]|5[138]|6[24]|7[069]|8[013578])","2(?:2(?:0[013-9]|[13])|3(?:0[013-9]|[67])|49|6(?:[0136]|4[0-59])|8|9(?:[19]|44|7[013-9]|8[14]))|3(?:36|4(?:[12]|[358]4)|5(?:1|3[0-24-689]|8[46])|6|7[069]|8(?:[01]|34|[578][45]))"]
 ,"0$1","",1]
 ,[,"(\\d{4})(\\d{2})(\\d{4})","$1 $2-$3",["[23]"]
 ,"0$1","",1]
@@ -444,13 +444,13 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,"0$1","",0]
 ,[,"(9)(11)(\\d{4})(\\d{4})","$1 $2 $3-$4",["911"]
 ]
-,[,"(9)(\\d{3})(\\d{3})(\\d{4})","$1 $2 $3-$4",["9(?:2[234689]|3[3-8])","9(?:2(?:2[013]|3[067]|49|6[01346]|80|9[147-9])|3(?:36|4[12358]|5[138]|6[24]|7[069]|8[013578]))","9(?:2(?:2[013]|3[067]|49|6[01346]|80|9(?:[179]|4[13479]|8[014-9]))|3(?:36|4[12358]|5(?:[18]|3[014-689])|6[24]|7[069]|8(?:[01]|3[013469]|5[0-39]|7[0-2459]|8[0-49])))"]
+,[,"(9)(\\d{3})(\\d{3})(\\d{4})","$1 $2 $3-$4",["9(?:2[234689]|3[3-8])","9(?:2(?:2[013]|3[067]|49|6[01346]|80|9[147-9])|3(?:36|4[1-358]|5[138]|6[24]|7[069]|8[013578]))","9(?:2(?:2(?:0[013-9]|[13])|3(?:0[013-9]|[67])|49|6(?:[0136]|4[0-59])|8|9(?:[19]|44|7[013-9]|8[14]))|3(?:36|4(?:[12]|[358]4)|5(?:1|3[0-24-689]|8[46])|6|7[069]|8(?:[01]|34|[578][45])))"]
 ]
 ,[,"(9)(\\d{4})(\\d{2})(\\d{4})","$1 $2 $3-$4",["9[23]"]
 ]
 ,[,"(11)(\\d{4})(\\d{4})","$1 $2-$3",["1"]
 ,"0$1","",1]
-,[,"(\\d{3})(\\d{3})(\\d{4})","$1 $2-$3",["2(?:2[013]|3[067]|49|6[01346]|80|9[147-9])|3(?:36|4[12358]|5[138]|6[24]|7[069]|8[013578])","2(?:2[013]|3[067]|49|6[01346]|80|9(?:[179]|4[13479]|8[014-9]))|3(?:36|4[12358]|5(?:[18]|3[0-689])|6[24]|7[069]|8(?:[01]|3[013469]|5[0-39]|7[0-2459]|8[0-49]))"]
+,[,"(\\d{3})(\\d{3})(\\d{4})","$1 $2-$3",["2(?:2[013]|3[067]|49|6[01346]|80|9[147-9])|3(?:36|4[1-358]|5[138]|6[24]|7[069]|8[013578])","2(?:2(?:0[013-9]|[13])|3(?:0[013-9]|[67])|49|6(?:[0136]|4[0-59])|8|9(?:[19]|44|7[013-9]|8[14]))|3(?:36|4(?:[12]|[358]4)|5(?:1|3[0-24-689]|8[46])|6|7[069]|8(?:[01]|34|[578][45]))"]
 ,"0$1","",1]
 ,[,"(\\d{4})(\\d{2})(\\d{4})","$1 $2-$3",["[23]"]
 ,"0$1","",1]
@@ -698,8 +698,8 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,,,[,,"NA","NA"]
 ]
 ,"BH":[,[,,"[136-9]\\d{7}","\\d{8}"]
-,[,,"(?:1(?:3[13-6]|6[0156]|7\\d)\\d|6(?:1[16]\\d|500|6(?:0\\d|3[12]|44|88)|9[69][69])|7(?:7\\d{2}|178))\\d{4}","\\d{8}"]
-,[,,"(?:3(?:[1-4679]\\d|5[01356]|8[0-48])\\d|6(?:3(?:00|33|6[16])|6(?:[69]\\d|3[03-9])))\\d{4}","\\d{8}"]
+,[,,"(?:1(?:3[1356]|6[0156]|7\\d)\\d|6(?:1[16]\\d|500|6(?:0\\d|3[12]|44|7[7-9])|9[69][69])|7(?:1(?:11|78)|7\\d{2}))\\d{4}","\\d{8}"]
+,[,,"(?:3(?:[1-4679]\\d|5[013569]|8[0-47-9])\\d|6(?:3(?:00|33|6[16])|6(?:[69]\\d|3[03-9]|7[0-6])))\\d{4}","\\d{8}"]
 ,[,,"80\\d{6}","\\d{8}"]
 ,[,,"(?:87|9[014578])\\d{6}","\\d{8}"]
 ,[,,"84\\d{6}","\\d{8}"]
@@ -909,7 +909,7 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"(?:810|902)\\d{7}","\\d{10}"]
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
-,[,,"NA","NA"]
+,[,,"249\\d{6}","\\d{9}"]
 ,"BY",375,"810","8",,,"8?0?",,"8~10",,[[,"(\\d{2})(\\d{3})(\\d{2})(\\d{2})","$1 $2-$3-$4",["17[0-3589]|2[4-9]|[34]","17(?:[02358]|1[0-2]|9[0189])|2[4-9]|[34]"]
 ,"8 0$1","",0]
 ,[,"(\\d{3})(\\d{2})(\\d{2})(\\d{2})","$1 $2-$3-$4",["1(?:5[24]|6[235]|7[467])|2(?:1[246]|2[25]|3[26])","1(?:5[24]|6(?:2|3[04-9]|5[0346-9])|7(?:[46]|7[37-9]))|2(?:1[246]|2[25]|3[26])"]
@@ -1047,7 +1047,7 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ]
 ,"CI":[,[,,"[02-7]\\d{7}","\\d{8}"]
 ,[,,"(?:2(?:0[023]|1[02357]|[23][045]|4[03-5])|3(?:0[06]|1[069]|[2-4][07]|5[09]|6[08]))\\d{5}","\\d{8}"]
-,[,,"(?:0[1-9]|4[0-24-9]|5[4-9]|6[015-79]|7[57])\\d{6}","\\d{8}"]
+,[,,"(?:0[1-9]|4[0-24-9]|5[4-9]|6[015-79]|7[578])\\d{6}","\\d{8}"]
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
@@ -1144,15 +1144,15 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ,,,[,,"NA","NA"]
 ]
-,"CN":[,[,,"[1-7]\\d{6,11}|8[0-357-9]\\d{6,9}|9\\d{7,9}","\\d{4,12}"]
-,[,,"21(?:100\\d{2}|95\\d{3,4}|\\d{8,10})|(?:10|2[02-57-9]|3(?:11|7[179])|4(?:[15]1|3[12])|5(?:1\\d|2[37]|3[12]|51|7[13-79]|9[15])|7(?:31|5[457]|6[09]|91)|8(?:71|98))(?:100\\d{2}|95\\d{3,4}|\\d{8})|(?:3(?:1[02-9]|35|49|5\\d|7[02-68]|9[1-68])|4(?:1[02-9]|2[179]|3[3-9]|5[2-9]|6[4789]|7\\d|8[23])|5(?:3[03-9]|4[36]|5[02-9]|6[1-46]|7[028]|80|9[2-46-9])|6(?:3[1-5]|6[0238]|9[12])|7(?:01|[17]\\d|2[248]|3[04-9]|4[3-6]|5[0-3689]|6[2368]|9[02-9])|8(?:1[236-8]|2[5-7]|3\\d|5[1-9]|7[02-9]|8[3678]|9[1-7])|9(?:0[1-3689]|1[1-79]|[379]\\d|4[13]|5[1-5]))(?:100\\d{2}|95\\d{3,4}|\\d{7})|80(?:29|6[03578]|7[018]|81)\\d{4}","\\d{4,12}"]
+,"CN":[,[,,"[1-7]\\d{6,11}|8[0-357-9]\\d{6,9}|9\\d{7,10}","\\d{4,12}"]
+,[,,"21(?:100\\d{2}|95\\d{3,4}|\\d{8,10})|(?:10|2[02-57-9]|3(?:11|7[179])|4(?:[15]1|3[12])|5(?:1\\d|2[37]|3[12]|51|7[13-79]|9[15])|7(?:31|5[457]|6[09]|91)|8(?:[57]1|98))(?:100\\d{2}|95\\d{3,4}|\\d{8})|(?:3(?:1[02-9]|35|49|5\\d|7[02-68]|9[1-68])|4(?:1[02-9]|2[179]|3[3-9]|5[2-9]|6[4789]|7\\d|8[23])|5(?:3[03-9]|4[36]|5[02-9]|6[1-46]|7[028]|80|9[2-46-9])|6(?:3[1-5]|6[0238]|9[12])|7(?:01|[17]\\d|2[248]|3[04-9]|4[3-6]|5[0-3689]|6[2368]|9[02-9])|8(?:1[236-8]|2[5-7]|3\\d|5[4-9]|7[02-9]|8[3678]|9[1-7])|9(?:0[1-3689]|1[1-79]|[379]\\d|4[13]|5[1-5]))(?:100\\d{2}|95\\d{3,4}|\\d{7})|80(?:29|6[03578]|7[018]|81)\\d{4}","\\d{4,12}"]
 ,[,,"1(?:[38]\\d|4[57]|5[0-35-9]|7[06-8])\\d{8}","\\d{11}"]
 ,[,,"(?:10)?800\\d{7}","\\d{10,12}"]
 ,[,,"16[08]\\d{5}","\\d{8}"]
-,[,,"400\\d{7}|(?:10|2[0-57-9]|3(?:[157]\\d|35|49|9[1-68])|4(?:[17]\\d|2[179]|[35][1-9]|6[4789]|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[3678]|9[1-8])|9(?:0[1-3689]|1[1-79]|[379]\\d|4[13]|5[1-5]))96\\d{3,4}","\\d{7,10}"]
+,[,,"400\\d{7}|950\\d{7,8}|(?:10|2[0-57-9]|3(?:[157]\\d|35|49|9[1-68])|4(?:[17]\\d|2[179]|[35][1-9]|6[4789]|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[14-9]|8[3678]|9[1-8])|9(?:0[1-3689]|1[1-79]|[379]\\d|4[13]|5[1-5]))96\\d{3,4}","\\d{7,11}"]
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
-,"CN",86,"(1[1279]\\d{3})?00","0",,,"(1[1279]\\d{3})|0",,"00",,[[,"(80\\d{2})(\\d{4})","$1 $2",["80[2678]"]
+,"CN",86,"(1(?:[129]\\d{3}|79\\d{2}))?00","0",,,"(1(?:[129]\\d{3}|79\\d{2}))|0",,"00",,[[,"(80\\d{2})(\\d{4})","$1 $2",["80[2678]"]
 ,"0$1","$CC $1",1]
 ,[,"([48]00)(\\d{3})(\\d{4})","$1 $2 $3",["[48]00"]
 ,"","",0]
@@ -1168,14 +1168,16 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,"0$1","$CC $1",1]
 ,[,"([12]\\d)(\\d{4})(\\d{4})","$1 $2 $3",["10[1-9]|2[02-9]","10[1-9]|2[02-9]","10(?:[1-79]|8(?:[1-9]|0[1-9]))|2[02-9]"]
 ,"0$1","$CC $1",1]
-,[,"(\\d{3})(\\d{4})(\\d{4})","$1 $2 $3",["3(?:11|7[179])|4(?:[15]1|3[12])|5(?:1|2[37]|3[12]|51|7[13-79]|9[15])|7(?:31|5[457]|6[09]|91)|8(?:71|98)"]
+,[,"(\\d{3})(\\d{4})(\\d{4})","$1 $2 $3",["3(?:11|7[179])|4(?:[15]1|3[12])|5(?:1|2[37]|3[12]|51|7[13-79]|9[15])|7(?:31|5[457]|6[09]|91)|8(?:[57]1|98)"]
 ,"0$1","$CC $1",1]
-,[,"(\\d{3})(\\d{3})(\\d{4})","$1 $2 $3",["3(?:1[02-9]|35|49|5|7[02-68]|9[1-68])|4(?:1[02-9]|2[179]|[35][2-9]|6[4789]|7\\d|8[23])|5(?:3[03-9]|4[36]|5[02-9]|6[1-46]|7[028]|80|9[2-46-9])|6(?:3[1-5]|6[0238]|9[12])|7(?:01|[1579]|2[248]|3[04-9]|4[3-6]|6[2368])|8(?:1[236-8]|2[5-7]|3|5[1-9]|7[02-9]|8[3678]|9[1-7])|9(?:0[1-3689]|1[1-79]|[379]|4[13]|5[1-5])"]
+,[,"(\\d{3})(\\d{3})(\\d{4})","$1 $2 $3",["3(?:1[02-9]|35|49|5|7[02-68]|9[1-68])|4(?:1[02-9]|2[179]|[35][2-9]|6[4789]|7\\d|8[23])|5(?:3[03-9]|4[36]|5[02-9]|6[1-46]|7[028]|80|9[2-46-9])|6(?:3[1-5]|6[0238]|9[12])|7(?:01|[1579]|2[248]|3[04-9]|4[3-6]|6[2368])|8(?:1[236-8]|2[5-7]|3|5[4-9]|7[02-9]|8[3678]|9[1-7])|9(?:0[1-3689]|1[1-79]|[379]|4[13]|5[1-5])"]
 ,"0$1","$CC $1",1]
 ,[,"(\\d{3})(\\d{4})(\\d{4})","$1 $2 $3",["1[3-578]"]
 ,"","$CC $1",0]
 ,[,"(10800)(\\d{3})(\\d{4})","$1 $2 $3",["108","1080","10800"]
 ,"","",0]
+,[,"(\\d{3})(\\d{7,8})","$1 $2",["950"]
+,"","",0]
 ]
 ,[[,"(80\\d{2})(\\d{4})","$1 $2",["80[2678]"]
 ,"0$1","$CC $1",1]
@@ -1189,17 +1191,19 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,"0$1","$CC $1",1]
 ,[,"([12]\\d)(\\d{4})(\\d{4})","$1 $2 $3",["10[1-9]|2[02-9]","10[1-9]|2[02-9]","10(?:[1-79]|8(?:[1-9]|0[1-9]))|2[02-9]"]
 ,"0$1","$CC $1",1]
-,[,"(\\d{3})(\\d{4})(\\d{4})","$1 $2 $3",["3(?:11|7[179])|4(?:[15]1|3[12])|5(?:1|2[37]|3[12]|51|7[13-79]|9[15])|7(?:31|5[457]|6[09]|91)|8(?:71|98)"]
+,[,"(\\d{3})(\\d{4})(\\d{4})","$1 $2 $3",["3(?:11|7[179])|4(?:[15]1|3[12])|5(?:1|2[37]|3[12]|51|7[13-79]|9[15])|7(?:31|5[457]|6[09]|91)|8(?:[57]1|98)"]
 ,"0$1","$CC $1",1]
-,[,"(\\d{3})(\\d{3})(\\d{4})","$1 $2 $3",["3(?:1[02-9]|35|49|5|7[02-68]|9[1-68])|4(?:1[02-9]|2[179]|[35][2-9]|6[4789]|7\\d|8[23])|5(?:3[03-9]|4[36]|5[02-9]|6[1-46]|7[028]|80|9[2-46-9])|6(?:3[1-5]|6[0238]|9[12])|7(?:01|[1579]|2[248]|3[04-9]|4[3-6]|6[2368])|8(?:1[236-8]|2[5-7]|3|5[1-9]|7[02-9]|8[3678]|9[1-7])|9(?:0[1-3689]|1[1-79]|[379]|4[13]|5[1-5])"]
+,[,"(\\d{3})(\\d{3})(\\d{4})","$1 $2 $3",["3(?:1[02-9]|35|49|5|7[02-68]|9[1-68])|4(?:1[02-9]|2[179]|[35][2-9]|6[4789]|7\\d|8[23])|5(?:3[03-9]|4[36]|5[02-9]|6[1-46]|7[028]|80|9[2-46-9])|6(?:3[1-5]|6[0238]|9[12])|7(?:01|[1579]|2[248]|3[04-9]|4[3-6]|6[2368])|8(?:1[236-8]|2[5-7]|3|5[4-9]|7[02-9]|8[3678]|9[1-7])|9(?:0[1-3689]|1[1-79]|[379]|4[13]|5[1-5])"]
 ,"0$1","$CC $1",1]
 ,[,"(\\d{3})(\\d{4})(\\d{4})","$1 $2 $3",["1[3-578]"]
 ,"","$CC $1",0]
 ,[,"(10800)(\\d{3})(\\d{4})","$1 $2 $3",["108","1080","10800"]
 ,"","",0]
+,[,"(\\d{3})(\\d{7,8})","$1 $2",["950"]
+,"","",0]
 ]
 ,[,,"NA","NA"]
-,,,[,,"(?:4|(?:10)?8)00\\d{7}","\\d{10,12}"]
+,,,[,,"(?:4|(?:10)?8)00\\d{7}|950\\d{7,8}","\\d{10,12}"]
 ,[,,"NA","NA"]
 ,,,[,,"NA","NA"]
 ]
@@ -1818,7 +1822,7 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ]
 ,"GH":[,[,,"[235]\\d{8}|8\\d{7}","\\d{7,9}"]
 ,[,,"3(?:0[237]\\d|[167](?:2[0-6]|7\\d)|2(?:2[0-5]|7\\d)|3(?:2[0-3]|7\\d)|4(?:2[013-9]|3[01]|7\\d)|5(?:2[0-7]|7\\d)|8(?:2[0-2]|7\\d)|9(?:20|7\\d))\\d{5}","\\d{7,9}"]
-,[,,"(?:2[034678]\\d|5(?:[047]\\d|54|6[01]))\\d{6}","\\d{9}"]
+,[,,"(?:2[034678]\\d|5(?:[047]\\d|5[3-6]|6[01]))\\d{6}","\\d{9}"]
 ,[,,"800\\d{5}","\\d{8}"]
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
@@ -2632,7 +2636,7 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ]
 ,"KW":[,[,,"[12569]\\d{6,7}","\\d{7,8}"]
 ,[,,"(?:18\\d|2(?:[23]\\d{2}|4(?:[1-35-9]\\d|44)|5(?:0[034]|[2-46]\\d|5[1-3]|7[1-7])))\\d{4}","\\d{7,8}"]
-,[,,"(?:5(?:[05]\\d|1[0-6])|6(?:0[034679]|5[015-9]|6\\d|7[067]|9[0369])|9(?:0[09]|4[049]|55|6[069]|[79]\\d|8[089]))\\d{5}","\\d{8}"]
+,[,,"(?:5(?:[05]\\d|1[0-7])|6(?:0[034679]|5[015-9]|6\\d|7[067]|9[0369])|9(?:0[09]|4[049]|55|6[069]|[79]\\d|8[07-9]))\\d{5}","\\d{8}"]
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
@@ -2829,7 +2833,7 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,,,[,,"NA","NA"]
 ]
 ,"LU":[,[,,"[24-9]\\d{3,10}|3(?:[0-46-9]\\d{2,9}|5[013-9]\\d{1,8})","\\d{4,11}"]
-,[,,"(?:2(?:[259]\\d{2,9}|[346-8]\\d{4}(?:\\d{2})?)|(?:[3457]\\d{2}|8(?:0[2-9]|[13-9]\\d)|9(?:0[89]|[2-579]\\d))\\d{1,8})","\\d{4,11}"]
+,[,,"(?:2(?:[259]\\d{2,9}|[346-8]\\d{4,6})|(?:[3457]\\d{2}|8(?:0[2-9]|[13-9]\\d)|9(?:0[89]|[2-579]\\d))\\d{1,8})","\\d{4,11}"]
 ,[,,"6[2679][18]\\d{6}","\\d{9}"]
 ,[,,"800\\d{5}","\\d{8}"]
 ,[,,"90[01]\\d{5}","\\d{8}"]
@@ -2955,14 +2959,14 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,,,[,,"NA","NA"]
 ]
 ,"ME":[,[,,"[2-9]\\d{7,8}","\\d{6,9}"]
-,[,,"(?:20[2-8]|3(?:0[2-7]|1[35-7]|2[3567]|3[4-7])|4(?:0[237]|1[27])|5(?:0[47]|1[27]|2[378]))\\d{5}","\\d{6,8}"]
-,[,,"6(?:32\\d|[89]\\d{2}|7(?:[0-8]\\d|9(?:[3-9]|[0-2]\\d)))\\d{4}","\\d{8,9}"]
-,[,,"800[28]\\d{4}","\\d{8}"]
-,[,,"(?:88\\d|9(?:4[13-8]|5[16-8]))\\d{5}","\\d{8}"]
+,[,,"(?:20[2-8]|3(?:0[2-7]|[12][35-7]|3[4-7])|4(?:0[2367]|1[267])|5(?:0[467]|1[267]|2[367]))\\d{5}","\\d{6,8}"]
+,[,,"6(?:00\\d|32\\d|[89]\\d{2}|61\\d|7(?:[0-8]\\d|9(?:[3-9]|[0-2]\\d)))\\d{4}","\\d{8,9}"]
+,[,,"80\\d{6}","\\d{8}"]
+,[,,"(?:9(?:4[1568]|5[178]))\\d{5}","\\d{8}"]
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
 ,[,,"78[1-9]\\d{5}","\\d{8}"]
-,"ME",382,"00","0",,,"0",,,,[[,"(\\d{2})(\\d{3})(\\d{3})","$1 $2 $3",["[2-57-9]|6[3789]","[2-57-9]|6(?:[389]|7(?:[0-8]|9[3-9]))"]
+,"ME",382,"00","0",,,"0",,,,[[,"(\\d{2})(\\d{3})(\\d{3})","$1 $2 $3",["[2-57-9]|6[036-9]","[2-57-9]|6(?:[03689]|7(?:[0-8]|9[3-9]))"]
 ,"0$1","",0]
 ,[,"(67)(9)(\\d{3})(\\d{3})","$1 $2 $3 $4",["679","679[0-2]"]
 ,"0$1","",0]
@@ -3535,20 +3539,20 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,,,[,,"NA","NA"]
 ]
 ,"NZ":[,[,,"6[235-9]\\d{6}|[2-57-9]\\d{7,10}","\\d{7,11}"]
-,[,,"(?:3[2-79]|[49][2-689]|6[235-9]|7[2-5789])\\d{6}|24099\\d{3}","\\d{7,8}"]
+,[,,"(?:3[2-79]|[49][2-9]|6[235-9]|7[2-57-9])\\d{6}|24099\\d{3}","\\d{7,8}"]
 ,[,,"2(?:[028]\\d{7,8}|1(?:[03]\\d{5,7}|[12457]\\d{5,6}|[689]\\d{5})|[79]\\d{7})","\\d{8,10}"]
 ,[,,"508\\d{6,7}|80\\d{6,8}","\\d{8,10}"]
 ,[,,"90\\d{7,9}","\\d{9,11}"]
 ,[,,"NA","NA"]
+,[,,"70\\d{7}","\\d{9}"]
 ,[,,"NA","NA"]
-,[,,"NA","NA"]
-,"NZ",64,"0(?:0|161)","0",,,"0",,"00",,[[,"([34679])(\\d{3})(\\d{4})","$1-$2 $3",["[3467]|9[1-9]"]
+,"NZ",64,"0(?:0|161)","0",,,"0",,"00",,[[,"([34679])(\\d{3})(\\d{4})","$1-$2 $3",["[346]|7[2-57-9]|9[1-9]"]
 ,"0$1","",0]
 ,[,"(24099)(\\d{3})","$1 $2",["240","2409","24099"]
 ,"0$1","",0]
 ,[,"(\\d{2})(\\d{3})(\\d{3})","$1 $2 $3",["21"]
 ,"0$1","",0]
-,[,"(\\d{2})(\\d{3})(\\d{3,5})","$1 $2 $3",["2(?:1[1-9]|[69]|7[0-35-9])|86"]
+,[,"(\\d{2})(\\d{3})(\\d{3,5})","$1 $2 $3",["2(?:1[1-9]|[69]|7[0-35-9])|70|86"]
 ,"0$1","",0]
 ,[,"(2\\d)(\\d{3,4})(\\d{4})","$1 $2 $3",["2[028]"]
 ,"0$1","",0]
@@ -3999,7 +4003,7 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ]
 ,"SB":[,[,,"[1-9]\\d{4,6}","\\d{5,7}"]
 ,[,,"(?:1[4-79]|[23]\\d|4[01]|5[03]|6[0-37])\\d{3}","\\d{5}"]
-,[,,"48\\d{3}|7(?:[46-8]\\d|5[025-9]|9[0-4])\\d{4}|8[4-8]\\d{5}|9(?:1[2-9]|2[013-9]|3[0-2]|[46]\\d|5[0-46-9]|7[0-689]|8[0-79]|9[0-8])\\d{4}","\\d{5,7}"]
+,[,,"48\\d{3}|7(?:30|[46-8]\\d|5[025-9]|9[0-5])\\d{4}|8[4-8]\\d{5}|9(?:1[2-9]|2[013-9]|3[0-2]|[46]\\d|5[0-46-9]|7[0-689]|8[0-79]|9[0-8])\\d{4}","\\d{5,7}"]
 ,[,,"1[38]\\d{3}","\\d{5}"]
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
@@ -4899,6 +4903,8 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,"","",0]
 ,[,"(7\\d)(\\d{5})","$1 $2",["7"]
 ,"","",0]
+,[,"(\\d{5})","$1",["[2-6]"]
+,"","",0]
 ]
 ,,[,,"NA","NA"]
 ,,,[,,"NA","NA"]

diff --git a/resources/PhoneNumberMetadata.xml b/resources/PhoneNumberMetadata.xml
index 6a737ff..8e73406 100644 (file)
--- a/resources/PhoneNumberMetadata.xml
+++ b/resources/PhoneNumberMetadata.xml
@@ -688,8 +688,8 @@
          -->
     <territory id="AR" countryCode="54" internationalPrefix="00" nationalPrefix="0"
        nationalPrefixForParsing="
-         0?(?:
-           (11|
+         0?(?:(
+            11|
             2(?:
               2(?:
                 02?|
@@ -741,7 +741,7 @@
                8[2578]
              )|
              4(?:
-               0[124-9]|
+               0[0-24-9]|
                [12]|
                3[5-8]?|
                4[24-7]|
@@ -762,12 +762,12 @@
              )|
              6[24]|
              7(?:
+               [069]|
                1[1568]|
                2[15]|
                3[145]|
                4[13]|
                5[14-8]|
-               [069]|
                7[2-57]|
                8[126]
              )|
@@ -783,8 +783,7 @@
                9[124]
              )
            )
-         )?15
-       )?"
+         )?15)?"
        nationalPrefixTransformRule="9$1" nationalPrefixFormattingRule="$NP$FG"
        mobileNumberPortableRegion="true">
       <references>
@@ -792,6 +791,8 @@
         <!-- On the following link, click on Indicativos Interurbanos to access detailed
              information. -->
         <sourceUrl>http://www.cnc.gov.ar/infotecnica/numeracion/Index.asp</sourceUrl>
+        <!-- Download XLS spreadsheet from "Númeración Geográfica" link on following page: -->
+        <sourceUrl>http://www.cnc.gob.ar/asignaciones-a-la-fecha_p445</sourceUrl>
         <sourceUrl>http://en.wikipedia.org/wiki/+54</sourceUrl>
       </references>
       <availableFormats>
@@ -823,14 +824,40 @@
           <intlFormat>$1 $2 $3-$4</intlFormat>
         </numberFormat>
         <numberFormat pattern="(9)(\d{3})(\d{3})(\d{4})">
-          <!-- Some 4-digit area codes actually are caught by this rule. Preference is given however
-               to the 3-digit area codes, since they are considerably larger communities. -->
+          <!-- The regular expressions below were generated semi-automatically from data extracted
+               from the XLS spreadsheet downloaded from the "Númeración Geográfica" link cited
+               above. Each pattern captures all 3-3-4 prefixes for its length, but may also capture
+               some 4-2-4 cases.
+
+               In cases where a range contains both 3-3-4 and 4-2-4 prefixes, the most commonly used
+               one should be considered the default.
+               * If there are more distinct 4-2-4 prefixes, then the regular expression should
+                 INCLUDE only the explicitly mentioned 3-3-4 prefixes.
+               * If there are more distinct 3-3-4 prefixes, then the regular expression should
+                 EXCLUDE only the explicitly mentioned 4-2-4 prefixes.
+               This should help maximize the chances of new ranges automatically being assigned to
+               the right form.
+
+               In the final (most specific) regular expression, the few remaining ambiguous cases
+               are decided by comparing usage counts. Any manual edits to these expressions not
+               reflected in the XLS spreadsheet must be clearly called out below:
+
+               Added Manually as 3-3-4 format:
+               * 2981 (General Roca, Río Negro) : Numbers found online suggest 3-3-4
+
+               See also:
+               https://github.com/googlei18n/libphonenumber/issues/611
+               https://github.com/googlei18n/libphonenumber/issues/559
+               -->
+          <!-- Do NOT copy this into the section below. Removing the leading '9' will make it match
+               only 2 digits and the first <leadingDigits> section must always match 3 digits. -->
           <leadingDigits>
             9(?:
               2[234689]|
               3[3-8]
             )
           </leadingDigits>
+          <!-- If modified, copy this expression into the section below, minus the leading '9' -->
           <leadingDigits>
             9(?:
               2(?:
@@ -843,7 +870,7 @@
               )|
               3(?:
                 36|
-                4[12358]|
+                4[1-358]|
                 5[138]|
                 6[24]|
                 7[069]|
@@ -851,37 +878,67 @@
               )
             )
           </leadingDigits>
-          <!-- We exclude here several 294X four-digit area codes: 2940, 2942, 2945, 2946 and 2948,
-               298[23], and several 38[3578]X four-digit area codes. -->
+          <!-- Note that some patterns appear as both 3 and 4 digit area codes. In these cases
+               (to avoid going to 6 digits of discrimination) we simply pick the one with the
+               most uses. Patterns excluded from this expression will be treated as 4-2-4:
+               - XXXX (usage count as 3-digit code:usage count as 4-digit code)
+               - 2646 (7:15)   - excluded
+               - 3435 (39:63)  - excluded
+               - 3436 (16:54)  - excluded
+               - 3454 (90:48)
+               - 3455 (13:94)  - excluded
+               - 3456 (3:93)   - excluded
+               - 3584 (143:65)
+               - 3585 (21:42)  - excluded
+               - 3854 (115:73)
+               - 3855 (76:40)
+               - 3856 (19:44)  - excluded
+               - 3876 (56:99)  - excluded
+               - 3885 (120:45)
+               - 3886 (3:137)  - excluded
+               -->
+          <!-- If modified, copy this expression into the section below, minus the leading '9' -->
           <leadingDigits>
             9(?:
               2(?:
-                2[013]|
-                3[067]|
+                2(?:
+                  0[013-9]|
+                  [13]
+                )|
+                3(?:
+                  0[013-9]|
+                  [67]
+                )|
                 49|
-                6[01346]|
-                80|
+                6(?:
+                  [0136]|
+                  4[0-59]
+                )|
+                8|
                 9(?:
-                  [179]|
-                  4[13479]|
-                  8[014-9]
+                  [19]|
+                  44|
+                  7[013-9]|
+                  8[14]
                 )
               )|
               3(?:
                 36|
-                4[12358]|
+                4(?:
+                  [12]|
+                  [358]4
+                )|
                 5(?:
-                  [18]|
-                  3[014-689]
+                  1|
+                  3[0-24-689]|
+                  8[46]
                 )|
-                6[24]|
+                6|
                 7[069]|
                 8(?:
                   [01]|
-                  3[013469]|
-                  5[0-39]|
-                  7[0-2459]|
-                  8[0-49]
+                  34|
+                  [578][45]
                 )
               )
             )
@@ -902,6 +959,7 @@
         </numberFormat>
         <!-- These patterns are a copy of the mobile patterns with the leading 9 removed. -->
         <numberFormat pattern="(\d{3})(\d{3})(\d{4})" nationalPrefixOptionalWhenFormatting="true">
+          <!-- Never modify this manually, always copy from above and remove leading '9' -->
           <leadingDigits>
             2(?:
               2[013]|
@@ -913,43 +971,54 @@
             )|
             3(?:
               36|
-              4[12358]|
+              4[1-358]|
               5[138]|
               6[24]|
               7[069]|
               8[013578]
             )
           </leadingDigits>
-          <!-- We exclude here several 294X four-digit area codes: 2940, 2942, 2945, 2946 and 2948,
-               298[23], and several 38[3578]X four-digit area codes. -->
+          <!-- Never modify this manually, always copy from above and remove leading '9' -->
           <leadingDigits>
             2(?:
-              2[013]|
-              3[067]|
+              2(?:
+                0[013-9]|
+                [13]
+              )|
+              3(?:
+                0[013-9]|
+                [67]
+              )|
               49|
-              6[01346]|
-              80|
+              6(?:
+                [0136]|
+                4[0-59]
+              )|
+              8|
               9(?:
-                [179]|
-                4[13479]|
-                8[014-9]
+                [19]|
+                44|
+                7[013-9]|
+                8[14]
               )
             )|
             3(?:
               36|
-              4[12358]|
+              4(?:
+                [12]|
+                [358]4
+              )|
               5(?:
-                [18]|
-                3[0-689]
+                1|
+                3[0-24-689]|
+                8[46]
               )|
-              6[24]|
+              6|
               7[069]|
               8(?:
                 [01]|
-                3[013469]|
-                5[0-39]|
-                7[0-2459]|
-                8[0-49]
+                34|
+                [578][45]
               )
             )
           </leadingDigits>
@@ -2634,7 +2703,7 @@
         <nationalNumberPattern>
           (?:
             1(?:
-              3[13-6]|
+              3[1356]|
               6[0156]|
               7\d
             )\d|
@@ -2645,28 +2714,30 @@
                 0\d|
                 3[12]|
                 44|
-                88
+                7[7-9]
               )|
               9[69][69]
             )|
             7(?:
-              7\d{2}|
-              178
+              1(?:
+                11|
+                78
+              )|
+              7\d{2}
             )
           )\d{4}
         </nationalNumberPattern>
         <exampleNumber>17001234</exampleNumber>
       </fixedLine>
       <!-- 31 is assigned to Royal Court, as per documents on Bahrain's own telecom site, even
-           though it is omitted from the ITU document. 356 was added based on numbers found
-           online. -->
+           though it is omitted from the ITU document. -->
       <mobile>
         <nationalNumberPattern>
           (?:
             3(?:
               [1-4679]\d|
-              5[01356]|
-              8[0-48]
+              5[013569]|
+              8[0-47-9]
             )\d|
             6(?:
               3(?:
@@ -2676,7 +2747,8 @@
               )|
               6(?:
                 [69]\d|
-                3[03-9]
+                3[03-9]|
+                7[0-6]
               )
             )
           )\d{4}
@@ -4180,7 +4252,7 @@
             4[0-24-9]|
             5[4-9]|
             6[015-79]|
-            7[57]
+            7[578]
           )\d{6}
         </nationalNumberPattern>
         <exampleNumber>01234567</exampleNumber>
@@ -4437,9 +4509,11 @@
     </territory>
 
     <!-- China -->
-    <territory id="CN" countryCode="86" internationalPrefix="(1[1279]\d{3})?00"
+    <!-- The international/national prefix patterns must not collide with valid prefixes such
+         as 170, 176, 177 and 178. 179XX00 is a valid calling prefix, see: www.chahaoba.com/179 -->
+    <territory id="CN" countryCode="86" internationalPrefix="(1(?:[129]\d{3}|79\d{2}))?00"
                preferredInternationalPrefix="00" nationalPrefix="0"
-               nationalPrefixForParsing="(1[1279]\d{3})|0">
+               nationalPrefixForParsing="(1(?:[129]\d{3}|79\d{2}))|0">
       <references>
         <sourceUrl>http://www.itu.int/oth/T020200002B/en</sourceUrl>
       </references>
@@ -4579,7 +4653,7 @@
               91
             )|
             8(?:
-              71|
+              [57]1|
               98
             )
           </leadingDigits>
@@ -4631,7 +4705,7 @@
               1[236-8]|
               2[5-7]|
               3|
-              5[1-9]|
+              5[4-9]|
               7[02-9]|
               8[3678]|
               9[1-7]
@@ -4656,12 +4730,16 @@
           <leadingDigits>10800</leadingDigits>
           <format>$1 $2 $3</format>
         </numberFormat>
+        <numberFormat pattern="(\d{3})(\d{7,8})">
+          <leadingDigits>950</leadingDigits>
+          <format>$1 $2</format>
+        </numberFormat>
       </availableFormats>
       <generalDesc>
         <nationalNumberPattern>
           [1-7]\d{6,11}|
           8[0-357-9]\d{6,9}|
-          9\d{7,9}
+          9\d{7,10}
         </nationalNumberPattern>
         <possibleNumberPattern>\d{4,12}</possibleNumberPattern>
       </generalDesc>
@@ -4672,7 +4750,8 @@
             (?:
               10
             )?8
-          )00\d{7}
+          )00\d{7}|
+          950\d{7,8}
         </nationalNumberPattern>
         <possibleNumberPattern>\d{10,12}</possibleNumberPattern>
         <exampleNumber>4001234567</exampleNumber>
@@ -4718,7 +4797,7 @@
               91
             )|
             8(?:
-              71|
+              [57]1|
               98
             )
           )(?:
@@ -4772,7 +4851,7 @@
               1[236-8]|
               2[5-7]|
               3\d|
-              5[1-9]|
+              5[4-9]|
               7[02-9]|
               8[3678]|
               9[1-7]
@@ -4836,6 +4915,7 @@
              based on online searches. -->
         <nationalNumberPattern>
           400\d{7}|
+          950\d{7,8}|
           (?:
             10|
             2[0-57-9]|
@@ -4877,7 +4957,7 @@
               1[236-8]|
               2[5-7]|
               [37]\d|
-              5[1-9]|
+              5[14-9]|
               8[3678]|
               9[1-8]
             )|
@@ -4890,7 +4970,7 @@
             )
           )96\d{3,4}
         </nationalNumberPattern>
-        <possibleNumberPattern>\d{7,10}</possibleNumberPattern>
+        <possibleNumberPattern>\d{7,11}</possibleNumberPattern>
         <exampleNumber>4001234567</exampleNumber>
       </sharedCost>
     </territory>
@@ -8265,7 +8345,7 @@
             2[034678]\d|
             5(?:
               [047]\d|
-              54|
+              5[3-6]|
               6[01]
             )
           )\d{6}
@@ -13431,7 +13511,7 @@
       <mobile>
         <nationalNumberPattern>1[0-26-9]\d{7,8}</nationalNumberPattern>
         <possibleNumberPattern>\d{9,10}</possibleNumberPattern>
-        <exampleNumber>1023456789</exampleNumber>
+        <exampleNumber>1000000000</exampleNumber>
       </mobile>
       <pager>
         <nationalNumberPattern>15\d{7,8}</nationalNumberPattern>
@@ -13537,7 +13617,7 @@
           (?:
             5(?:
               [05]\d|
-              1[0-6]
+              1[0-7]
             )|
             6(?:
               0[034679]|
@@ -13552,7 +13632,7 @@
               55|
               6[069]|
               [79]\d|
-              8[089]
+              8[07-9]
             )
           )\d{5}
         </nationalNumberPattern>
@@ -14557,12 +14637,12 @@
         <!-- Even though 20 is listed in the fixed-line plan, other documentation clarify that it is
              for VOIP. Furthermore, even though the plan says that numbers beginning with 2[346-8]
              must be exactly 8 digits, from information found online it seems that they can actually
-             be 6 (but not 7) digits long. -->
+             be 6 or 7 digits long. -->
         <nationalNumberPattern>
           (?:
             2(?:
               [259]\d{2,9}|
-              [346-8]\d{4}(?:\d{2})?
+              [346-8]\d{4,6}
             )|
             (?:
               [3457]\d{2}|
@@ -15003,6 +15083,10 @@
     </territory>
 
     <!-- Montenegro -->
+    <!-- According to EKIP, the detailed phone number assignments are published on their
+         website (regulation:
+         http://www.ekip.me/download/Law%20on%20Electronic%20Communications%20(updated)%204.9.2013%20(1)nova%20verzija.pdf
+         ). Thus ITU updates always need to be combined with the information at the below ekip.me source URL. -->
     <territory id="ME" countryCode="382" internationalPrefix="00" nationalPrefix="0"
                nationalPrefixFormattingRule="$NP$FG">
       <references>
@@ -15012,11 +15096,11 @@
       </references>
       <availableFormats>
          <numberFormat pattern="(\d{2})(\d{3})(\d{3})">
-          <leadingDigits>[2-57-9]|6[3789]</leadingDigits>
+          <leadingDigits>[2-57-9]|6[036-9]</leadingDigits>
           <leadingDigits>
             [2-57-9]|
             6(?:
-              [389]|
+              [03689]|
               7(?:
                 [0-8]|
                 9[3-9]
@@ -15044,18 +15128,17 @@
             20[2-8]|
             3(?:
               0[2-7]|
-              1[35-7]|
-              2[3567]|
+              [12][35-7]|
               3[4-7]
             )|
             4(?:
-              0[237]|
-              1[27]
+              0[2367]|
+              1[267]
             )|
             5(?:
-              0[47]|
-              1[27]|
-              2[378]
+              0[467]|
+              1[267]|
+              2[367]
             )
           )\d{5}
         </nationalNumberPattern>
@@ -15063,11 +15146,13 @@
         <exampleNumber>30234567</exampleNumber>
       </fixedLine>
       <mobile>
-        <!-- Mobile numbers start with 632, 67, 68 or 69. -->
+        <!-- Mobile numbers start with 600, 632, 661, 67, 68 or 69. -->
         <nationalNumberPattern>
           6(?:
+            00\d|
             32\d|
             [89]\d{2}|
+            61\d|
             7(?:
               [0-8]\d|
               9(?:
@@ -15084,19 +15169,18 @@
         <exampleNumber>67622901</exampleNumber>
       </mobile>
       <tollFree>
-        <!-- All toll free numbers have prefix 80 followed by 02 or 08. -->
-        <nationalNumberPattern>800[28]\d{4}</nationalNumberPattern>
+        <!-- All toll free numbers have prefix 80. -->
+        <nationalNumberPattern>80\d{6}</nationalNumberPattern>
         <possibleNumberPattern>\d{8}</possibleNumberPattern>
         <exampleNumber>80080002</exampleNumber>
       </tollFree>
       <premiumRate>
-        <!-- Numbers with prefix 88, 94 or 95 are services with additional charges. -->
+        <!-- Numbers with prefix 94 or 95 are services with additional charges. -->
         <nationalNumberPattern>
           (?:
-            88\d|
             9(?:
-              4[13-8]|
-              5[16-8]
+              4[1568]|
+              5[178]
             )
           )\d{5}
         </nationalNumberPattern>
@@ -17587,7 +17671,8 @@
         <!-- Pattern for fixed-line formats. -->
         <numberFormat pattern="([34679])(\d{3})(\d{4})">
           <leadingDigits>
-            [3467]|
+            [346]|
+            7[2-57-9]|
             9[1-9]
           </leadingDigits>
           <format>$1-$2 $3</format>
@@ -17614,6 +17699,7 @@
               [69]|
               7[0-35-9]
             )|
+            70|
             86
           </leadingDigits>
           <format>$1 $2 $3</format>
@@ -17647,14 +17733,12 @@
         <possibleNumberPattern>\d{7,11}</possibleNumberPattern>
       </generalDesc>
       <fixedLine>
-        <!-- 07 788 was assigned to Voxbox according to
-             http://www.nad.org.nz/07GeographicalCodes.php -->
         <nationalNumberPattern>
           (?:
             3[2-79]|
-            [49][2-689]|
+            [49][2-9]|
             6[235-9]|
-            7[2-5789]
+            7[2-57-9]
           )\d{6}|
           24099\d{3}
         </nationalNumberPattern>
@@ -17700,6 +17784,11 @@
         <possibleNumberPattern>\d{9,11}</possibleNumberPattern>
         <exampleNumber>900123456</exampleNumber>
       </premiumRate>
+      <personalNumber>
+        <nationalNumberPattern>70\d{7}</nationalNumberPattern>
+        <possibleNumberPattern>\d{9}</possibleNumberPattern>
+        <exampleNumber>701234567</exampleNumber>
+      </personalNumber>
     </territory>
 
     <!-- Oman -->
@@ -19750,12 +19839,15 @@
         <exampleNumber>40123</exampleNumber>
       </fixedLine>
       <mobile>
+        <!-- The 795 prefix is not in the ITU plan (5.XII.2014), but was added because such a number
+             was dialed successfully. -->
         <nationalNumberPattern>
           48\d{3}|
           7(?:
+            30|
             [46-8]\d|
             5[025-9]|
-            9[0-4]
+            9[0-5]
           )\d{4}|
           8[4-8]\d{5}|
           9(?:
@@ -23769,7 +23861,6 @@
         <sourceUrl>http://www.itu.int/oth/T02020000B4/en</sourceUrl>
       </references>
       <availableFormats>
-        <!-- Should be formatted in one block, apart from the specific series below. -->
         <numberFormat pattern="(8\d{2})(\d{3,4})">
           <leadingDigits>8</leadingDigits>
           <format>$1 $2</format>
@@ -23778,6 +23869,10 @@
           <leadingDigits>7</leadingDigits>
           <format>$1 $2</format>
         </numberFormat>
+        <numberFormat pattern="(\d{5})">
+          <leadingDigits>[2-6]</leadingDigits>
+          <format>$1</format>
+        </numberFormat>
       </availableFormats>
       <generalDesc>
         <nationalNumberPattern>[2-8]\d{4,6}</nationalNumberPattern>

diff --git a/resources/carrier/en/225.txt b/resources/carrier/en/225.txt
index 0fa7181..22eff05 100644 (file)
--- a/resources/carrier/en/225.txt
+++ b/resources/carrier/en/225.txt
@@ -50,3 +50,4 @@
 22569|Aircom
 22575|MTN
 22577|Orange
+22578|Orange

diff --git a/resources/carrier/en/233.txt b/resources/carrier/en/233.txt
index af592d2..6bde299 100644 (file)
--- a/resources/carrier/en/233.txt
+++ b/resources/carrier/en/233.txt
@@ -19,8 +19,10 @@
 23327|tiGO
 23328|Expresso
 23350|Vodafone
-23354|MTN
+233553|MTN
 233554|MTN
+233555|MTN
+233556|MTN
 233560|Airtel
 233561|Airtel
 23357|tiGO

diff --git a/resources/carrier/en/677.txt b/resources/carrier/en/677.txt
index fe5f053..baaba62 100644 (file)
--- a/resources/carrier/en/677.txt
+++ b/resources/carrier/en/677.txt
@@ -14,6 +14,7 @@
 
 # Data from ITU: http://www.itu.int/oth/T02020000BF/en
 
+67773|Solomon Telekom
 67774|Solomon Telekom
 67775|Solomon Telekom
 67776|Solomon Telekom

diff --git a/resources/carrier/en/973.txt b/resources/carrier/en/973.txt
index b4ab0a3..5d2a952 100644 (file)
--- a/resources/carrier/en/973.txt
+++ b/resources/carrier/en/973.txt
@@ -27,4 +27,5 @@
 97363|VIVA
 973663|zain BH
 973666|zain BH
+973667|Batelco
 973669|zain BH

diff --git a/resources/geocoding/en/64.txt b/resources/geocoding/en/64.txt
new file mode 100644 (file)
index 0000000..95e10ff
--- /dev/null
+++ b/resources/geocoding/en/64.txt
@@ -0,0 +1,124 @@
+# Copyright (C) 2015 The Libphonenumber Authors
+
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+
+# http://www.apache.org/licenses/LICENSE-2.0
+
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# Originally sourced from:
+# http://en.wikipedia.org/wiki/Telephone_numbers_in_New_Zealand#Landlines
+
+642409|Scott Base
+643|South Island
+64320|Gore/Edendale
+64321|Invercargill/Stewart Island/Rakiura
+64322|Otautau
+64323|Riverton/Winton
+64324|Tokanui/Lumsden/Te Anau
+64330|Ashburton/Akaroa/Chatham Islands
+64331|Rangiora/Amberley/Culverden/Darfield/Cheviot/Kaikoura
+64332|Christchurch
+64333|Christchurch
+64334|Christchurch/Rolleston
+64335|Christchurch
+64337|Christchurch
+64338|Christchurch
+643409|Queenstown
+64341|Balclutha/Milton
+64343|Oamaru/Mount Cook/Twizel/Kurow
+64344|Queenstown/Cromwell/Alexandra/Wanaka/Ranfurly/Roxburgh
+64345|Dunedin/Queenstown
+64346|Dunedin/Palmerston
+64347|Dunedin
+64348|Dunedin/Lawrence/Mosgiel
+64352|Murchison/Takaka/Motueka
+64354|Nelson
+64357|Blenheim
+64361|Timaru
+64368|Timaru/Waimate/Fairlie
+64369|Geraldine
+64373|Greymouth
+64375|Hokitika/Franz Josef Glacier/Fox Glacier/Haast
+64376|Greymouth
+64378|Westport
+64390|Ashburton
+64394|Christchurch/Invercargill
+64395|Dunedin/Timaru
+64396|Christchurch
+64397|Christchurch
+64398|Christchurch/Blenheim/Nelson
+64423|Wellington/Porirua/Tawa
+64429|Paraparaumu
+6443|Wellington
+6444|Wellington
+6445|Wellington/Hutt Valley
+64480|Wellington
+6449|Wellington
+64490|Paraparaumu
+64627|Hawera
+64630|Featherston
+64632|Palmerston North/Marton
+64634|Wanganui
+64635|Palmerston North City
+64636|Levin
+64637|Masterton/Dannevirke/Pahiatua
+64638|Taihape/Ohakune/Waiouru
+64675|New Plymouth/Mokau
+64676|New Plymouth/Opunake/Stratford
+64683|Napier/Wairoa
+64684|Napier City
+64685|Waipukurau
+64686|Gisborne/Ruatoria
+64687|Napier/Hastings
+64694|Masterton/Levin
+64695|Palmerston North/New Plymouth
+64696|Wanganui/New Plymouth
+64697|Napier
+64698|Gisborne
+64730|Whakatane
+64731|Whakatane/Opotiki
+64732|Whakatane
+64733|Rotorua/Taupo
+64734|Rotorua
+64735|Rotorua
+64736|Rotorua
+64737|Taupo
+64738|Taupo
+64754|Tauranga
+64757|Tauranga
+64782|Hamilton/Huntly
+64783|Hamilton
+64784|Hamilton
+64785|Hamilton
+64786|Paeroa/Waihi/Thames/Whangamata
+64787|Te Awamutu/Otorohanga/Te Kuiti
+64788|Matamata/Putaruru/Morrinsville
+64789|Taumarunui
+64790|Taupo
+64792|Rotorua/Whakatane/Tauranga
+64793|Tauranga
+64795|Hamilton
+64796|Hamilton
+6492|Auckland
+64923|Pukekohe
+6493|Auckland/Waiheke Island
+64940|Kaikohe/Kaitaia/Kawakawa
+64941|Auckland
+64942|Helensville/Warkworth/Hibiscus Coast/Great Barrier Island
+64943|Whangarei/Maungaturoto
+64944|Auckland
+64947|Auckland
+64948|Auckland
+6495|Auckland
+6496|Auckland
+6498|Auckland
+6499|Auckland
+64990|Warkworth
+64998|Whangarei

diff --git a/resources/geocoding/en/86.txt b/resources/geocoding/en/86.txt
index b1ae65b..6d2a14b 100644 (file)
--- a/resources/geocoding/en/86.txt
+++ b/resources/geocoding/en/86.txt
@@ -145729,9 +145729,7 @@
 86837|MaErkang, Sichuan
 86838|Deyang, Sichuan
 86839|Guangyuan, Sichuan
-86851|Guiyang, Guizhou
-86852|Zunyi, Guizhou
-86853|Anshun, Guizhou
+86851|Guiyang/Zunyi/Anshun, Guizhou
 86854|Duyun, Guizhou
 86855|Kaili, Guizhou
 86856|Tongren, Guizhou

diff --git a/resources/geocoding/zh/86.txt b/resources/geocoding/zh/86.txt
index 5ce81b5..1a25930 100644 (file)
--- a/resources/geocoding/zh/86.txt
+++ b/resources/geocoding/zh/86.txt
@@ -145729,9 +145729,7 @@
 86837|四川省阿坝藏族羌族自治州
 86838|四川省德阳市
 86839|四川省广元市
-86851|贵州省贵阳市
-86852|贵州省遵义市
-86853|贵州省安顺市
+86851|贵州省贵阳市、遵义市、安顺市
 86854|贵州省黔南布依族苗族自治州
 86855|贵州省黔东南苗族侗族自治州
 86856|贵州省铜仁地区