JAVA/JS/CPP: libphonenumber v5.2.1, metadata updates.

debian/changelog

@@ -1,3 +1,12 @@
+libphonenumber (5.2.1) lucid; urgency=low
+
+  * Metadata changes:
+    - Updated metadata for region code(s):
+    AE, AW, BF, CN, DE, JO, KE, KH, LT, MM, MU, NG, RW, SR, TR, VU
+    - New geocoding data for country calling code(s): 359 (bg, en)
+
+ -- Lara Rennie <lararennie@google.com>  Mon, 26 Nov 2012 18:31:02 +0100
+
 libphonenumber (5.2) lucid; urgency=low
 
   * Metadata changes:

java/release_notes.txt

@@ -1,3 +1,9 @@
+Nov 26, 2012: libphonenumber-5.2.1
+* Metadata changes:
+ - Updated metadata for region code(s):
+   AE, AW, BF, CN, DE, JO, KE, KH, LT, MM, MU, NG, RW, SR, TR, VU
+ - New geocoding data for country calling code(s): 359 (bg, en)
+
 Oct 10, 2012: libphonenumber-5.2
 * Code changes:
  - Adds isNumberGeographical() method.

javascript/i18n/phonenumbers/metadata.js

@@ -287,7 +287,7 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ]
 ,"AE":[,[,,"[2-79]\\d{7,8}|800\\d{2,9}","\\d{5,12}"]
-,[,,"(?:[2-4679][2-8]\\d|600[25])\\d{5}","\\d{7,9}",,,"22345678"]
+,[,,"[2-4679][2-8]\\d{6}","\\d{7,8}",,,"22345678"]
 ,[,,"5[0256]\\d{7}","\\d{9}",,,"501234567"]
 ,[,,"400\\d{6}|800\\d{2,9}","\\d{5,12}",,,"800123456"]
 ,[,,"900[02]\\d{5}","\\d{9}",,,"900234567"]
@@ -298,14 +298,14 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,"0$1","",0]
 ,[,"(5[0256])(\\d{3})(\\d{4})","$1 $2 $3",["5"]
 ,"0$1","",0]
-,[,"([4679]00)(\\d)(\\d{5})","$1 $2 $3",["[4679]0"]
+,[,"([479]00)(\\d)(\\d{5})","$1 $2 $3",["[479]0"]
 ,"$1","",0]
-,[,"(800)(\\d{2,9})","$1 $2",["8"]
+,[,"([68]00)(\\d{2,9})","$1 $2",["60|8"]
 ,"$1","",0]
 ]
 ,,[,,"NA","NA"]
 ,,,[,,"NA","NA"]
-,[,,"NA","NA"]
+,[,,"600[25]\\d{5}","\\d{9}",,,"600212345"]
 ,,[,,"112|99[789]","\\d{3}",,,"112"]
 ,[,,"NA","NA"]
 ]
@@ -541,7 +541,7 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ]
 ,"AW":[,[,,"[25-9]\\d{6}","\\d{7}"]
 ,[,,"5(?:2\\d|8[1-9])\\d{4}","\\d{7}",,,"5212345"]
-,[,,"(?:5(?:6\\d|9[2-478])|6(?:[039]0|22|[46][01])|7[34]\\d|9(?:6[45]|9[4-8]))\\d{4}","\\d{7}",,,"5601234"]
+,[,,"(?:5(?:6\\d|9[2-478])|6(?:[039]0|22|4[01]|6[0-2])|7[34]\\d|9(?:6[45]|9[4-8]))\\d{4}","\\d{7}",,,"5601234"]
 ,[,,"800\\d{4}","\\d{7}",,,"8001234"]
 ,[,,"900\\d{4}","\\d{7}",,,"9001234"]
 ,[,,"NA","NA"]
@@ -673,7 +673,7 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ]
 ,"BF":[,[,,"[24-7]\\d{7}","\\d{8}"]
 ,[,,"(?:20(?:49|5[23]|9[016-9])|40(?:4[56]|5[4-6]|7[0179])|50[34]\\d)\\d{4}","\\d{8}",,,"20491234"]
-,[,,"(?:6(?:[05]\\d|1[01]|6[0-7]|8[0-2])|7(?:[02-68]\\d|1[0-4689]|7[0-69]|9[0-689]))\\d{5}","\\d{8}",,,"70123456"]
+,[,,"(?:6(?:[056]\\d|1[0-3]|8[0-2]|90)|7(?:[02-68]\\d|1[0-4689]|7[0-69]|9[0-689]))\\d{5}","\\d{8}",,,"70123456"]
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
@@ -1145,7 +1145,7 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ]
 ,"CN":[,[,,"[1-79]\\d{7,11}|8[0-357-9]\\d{6,9}","\\d{4,12}"]
 ,[,,"21\\d{8,10}|(?:10|2[02-57-9]|3(?:11|7[179])|4(?:[15]1|3[12])|5(?:1\\d|2[37]|3[12]|7[13-79]|9[15])|7(?:31|5[457]|6[09]|91)|898)\\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\\d|6[1-6]|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]|[37]\\d|5[1-9]|8[3678]|9[1-7])|9(?:0[1-3689]|1[1-79]|[379]\\d|4[13]|5[1-5]))\\d{7}|80(?:29|6[03578]|7[018]|81)\\d{4}","\\d{4,12}",,,"1012345678"]
-,[,,"1(?:3\\d|4[57]|5[0-35-9]|8[0235-9])\\d{8}","\\d{11}",,,"13123456789"]
+,[,,"1(?:3\\d|4[57]|[58][0-35-9])\\d{8}","\\d{11}",,,"13123456789"]
 ,[,,"(?:10)?800\\d{7}","\\d{10,12}",,,"8001234567"]
 ,[,,"16[08]\\d{5}","\\d{8}",,,"16812345"]
 ,[,,"400\\d{7}","\\d{10}",,,"4001234567"]
@@ -1347,7 +1347,7 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,,[,,"1(?:12|5[058])","\\d{3}",,,"112"]
 ,[,,"9(?:3\\d{9}|6\\d{7,10})","\\d{9,12}",,,"93123456789"]
 ]
-,"DE":[,[,,"[1-35-9]\\d{3,14}|4(?:[0-8]\\d{4,12}|9(?:[0-37]\\d|4[1-8]|5\\d{1,2}|6[1-8]\\d?)\\d{2,7})","\\d{2,15}"]
+,"DE":[,[,,"[1-35-9]\\d{3,14}|4(?:[0-8]\\d{4,12}|9(?:[0-37]\\d|4(?:[1-35-8]|4\\d?)|5\\d{1,2}|6[1-8]\\d?)\\d{2,7})","\\d{2,15}"]
 ,[,,"[246]\\d{5,13}|3(?:[03-9]\\d{4,13}|2\\d{9})|5(?:0[2-8]|[1256]\\d|[38][0-8]|4\\d{0,2}|[79][0-7])\\d{3,11}|7(?:0[2-8]|[1-9]\\d)\\d{3,10}|8(?:0[2-9]|[1-9]\\d)\\d{3,10}|9(?:0[6-9]|[1-9]\\d)\\d{3,10}","\\d{2,15}",,,"30123456"]
 ,[,,"1(?:5[0-2579]\\d{8}|6[023]\\d{7,8}|7(?:[0-57-9]\\d?|6\\d)\\d{7})","\\d{10,11}",,,"15123456789"]
 ,[,,"800\\d{7,10}","\\d{10,13}",,,"8001234567890"]
@@ -2411,7 +2411,7 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ]
 ,"JO":[,[,,"[235-9]\\d{7,8}","\\d{7,9}"]
 ,[,,"(?:2(?:6(?:2[0-35-9]|3[0-57-8]|4[24-7]|5[0-24-8]|[6-9][02])|7(?:0[1-79]|10|2[014-7]|3[0-689]|4[019]|5[0-3578]))|32(?:0[1-69]|1[1-35-7]|2[024-7]|3\\d|[457][02]|60)|53(?:[013][02]|2[0-59]|49|5[0-35-9]|6[15]|7[45]|8[1-6]|9[0-36-9])|6(?:2[50]0|300|4(?:0[0125]|1[2-7]|2[0569]|[38][07-9]|4[025689]|6[0-589]|7\\d|9[0-2])|5(?:[01][056]|2[034]|3[0-57-9]|4[17-8]|5[0-69]|6[0-35-9]|7[1-379]|8[0-68]|9[02-39]))|87(?:[02]0|7[08]|9[09]))\\d{4}","\\d{7,8}",,,"62001234"]
-,[,,"7(?:55|7[25-79]|8[5-8]|9[05-9])\\d{6}","\\d{9}",,,"790123456"]
+,[,,"7(?:55|7[25-9]|8[5-9]|9[05-9])\\d{6}","\\d{9}",,,"790123456"]
 ,[,,"80\\d{6}","\\d{8}",,,"80012345"]
 ,[,,"900\\d{5}","\\d{8}",,,"90012345"]
 ,[,,"85\\d{6}","\\d{8}",,,"85012345"]
@@ -2479,7 +2479,7 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ]
 ,"KE":[,[,,"20\\d{6,7}|[4-9]\\d{6,9}","\\d{5,10}"]
 ,[,,"20\\d{6,7}|4(?:[013]\\d{7}|[24-6]\\d{5,7})|5(?:[0-36-8]\\d{5,7}|[459]\\d{5})|6(?:[08]\\d{5}|[14-79]\\d{5,7}|2\\d{7})","\\d{5,9}",,,"202012345"]
-,[,,"7(?:0[0-8]|[123]\\d|5[0-5]|7[0-5]|8[5-9])\\d{6}","\\d{9}",,,"712123456"]
+,[,,"7(?:0[0-8]|[123]\\d|5[0-6]|7[0-5]|8[5-9])\\d{6}","\\d{9}",,,"712123456"]
 ,[,,"800[24-8]\\d{5,6}","\\d{9,10}",,,"800223456"]
 ,[,,"900[02-578]\\d{5}","\\d{9}",,,"900223456"]
 ,[,,"NA","NA"]
@@ -2520,7 +2520,7 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ]
 ,"KH":[,[,,"[1-9]\\d{7,9}","\\d{6,10}"]
-,[,,"(?:2[3-6]|3[2-6]|4[2-4]|[567][2-5])(?:[2-46-9]|5\\d)\\d{5}","\\d{6,9}",,,"23456789"]
+,[,,"(?:2[3-6]|3[2-6]|4[2-4]|[567][2-5])(?:[2-47-9]|5\\d|6\\d?)\\d{5}","\\d{6,9}",,,"23456789"]
 ,[,,"(?:(?:1\\d|[67][06-9])[1-9]|8(?:0[89]|[134679]\\d|5[2-689]|8\\d{2})|9(?:[0-589][1-9]|[67][1-9]\\d?))\\d{5}","\\d{8,9}",,,"91234567"]
 ,[,,"1800(?:1\\d|2[019])\\d{4}","\\d{10}",,,"1800123456"]
 ,[,,"1900(?:1\\d|2[09])\\d{4}","\\d{10}",,,"1900123456"]
@@ -2826,11 +2826,11 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"(?:3[1478]|4[124-6]|52)\\d{6}","\\d{8}",,,"31234567"]
 ,[,,"6\\d{7}","\\d{8}",,,"61234567"]
 ,[,,"800\\d{5}","\\d{8}",,,"80012345"]
-,[,,"90[0239]\\d{5}","\\d{8}",,,"90012345"]
-,[,,"NA","NA"]
+,[,,"9(?:0[0239]|10)\\d{5}","\\d{8}",,,"90012345"]
+,[,,"808\\d{5}","\\d{8}",,,"80812345"]
 ,[,,"700\\d{5}","\\d{8}",,,"70012345"]
 ,[,,"NA","NA"]
-,"LT",370,"00","8",,,"8",,,,[[,"([34]\\d)(\\d{6})","$1 $2",["37|4(?:1|5[45]|6[2-4])"]
+,"LT",370,"00","8",,,"[08]",,,,[[,"([34]\\d)(\\d{6})","$1 $2",["37|4(?:1|5[45]|6[2-4])"]
 ,"(8-$1)","",0]
 ,[,"([3-6]\\d{2})(\\d{5})","$1 $2",["3[148]|4(?:[24]|6[09])|528|6"]
 ,"(8-$1)","",0]
@@ -2841,7 +2841,7 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ]
 ,,[,,"NA","NA"]
 ,,,[,,"NA","NA"]
-,[,,"NA","NA"]
+,[,,"70[67]\\d{5}","\\d{8}",,,"70712345"]
 ,,[,,"0(?:11?|22?|33?)|1(?:0[123]|12)","\\d{2,3}",,,"112"]
 ,[,,"NA","NA"]
 ]
@@ -3077,27 +3077,27 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,,[,,"1[578]","\\d{2}",,,"17"]
 ,[,,"NA","NA"]
 ]
-,"MM":[,[,,"[124-8]\\d{5,7}|9(?:[25689]|4\\d{1,2}|7\\d)\\d{6}","\\d{5,10}"]
-,[,,"(?:1\\d|2|4[2-6]|5[2-9]|6(?:[0-689]|7\\d?)|7[0-5]|8(?:[2-6]|1\\d?))\\d{5}|1333\\d{4}","\\d{5,8}",,,"1234567"]
-,[,,"9(?:[25689]|4(?:[0256]\\d|[1349])|7\\d)\\d{6}","\\d{8,10}",,,"92123456"]
-,[,,"NA","NA"]
+,"MM":[,[,,"[14578]\\d{5,7}|[26]\\d{5,8}|9(?:[258]|4\\d{1,2}|[679]\\d?)\\d{6}","\\d{5,10}"]
+,[,,"1(?:2\\d{1,2}|[3-5]\\d|6\\d?|[89][0-6]\\d)\\d{4}|2(?:[236-9]\\d{4}|4(?:0\\d{5}|\\d{4})|5(?:1\\d{3,6}|[02-9]\\d{3,5}))|4(?:2[245-8]|[346][2-6]|5[3-5])\\d{4}|5(?:2(?:20?|[3-8])|3[2-68]|4(?:21?|[4-8])|5[23]|6[2-4]|7[2-8]|8[24-7]|9[2-7])\\d{4}|6(?:0[23]|1[2356]|[24][2-6]|3[24-6]|5[2-4]|6[2-8]|7(?:[2367]|4\\d|5\\d?|8[145]\\d)|8[245]|9[24])\\d{4}|7(?:[04][24-8]|[15][2-7]|22|3[2-4])\\d{4}|8(?:1(?:2\\d?|[3-689])|2[2-8]|3[24]|4[24-7]|5[245]|6[23])\\d{4}","\\d{5,9}",,,"1234567"]
+,[,,"17[01]\\d{4}|9(?:2[0-4]|4(?:0[0-4]\\d|[1379]\\d|[24][0-589]\\d|5\\d{2}|88)|5[0-6]|61?\\d|73\\d|8\\d|9(?:1\\d|[089]))\\d{5}","\\d{7,10}",,,"92123456"]
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
-,"MM",95,"00","0",,,"0",,,,[[,"(1)(\\d{3})(\\d{3})","$1 $2 $3",["1"]
+,[,,"1333\\d{4}","\\d{8}",,,"13331234"]
+,"MM",95,"00","0",,,"0",,,,[[,"(\\d)(\\d{3})(\\d{3,4})","$1 $2 $3",["1|2[45]"]
 ,"0$1","",0]
-,[,"(1)(3)(33\\d)(\\d{3})","$1 $2 $3 $4",["133","1333"]
+,[,"(2)(\\d{4})(\\d{4})","$1 $2 $3",["251"]
 ,"0$1","",0]
-,[,"(2)(\\d{2})(\\d{3})","$1 $2 $3",["2"]
+,[,"(\\d)(\\d{2})(\\d{3})","$1 $2 $3",["16|2"]
 ,"0$1","",0]
-,[,"(\\d{2})(\\d{3})(\\d{3})","$1 $2 $3",["67|81"]
+,[,"(\\d{2})(\\d{3})(\\d{3,4})","$1 $2 $3",["67|81"]
 ,"0$1","",0]
-,[,"(\\d{2})(\\d{2})(\\d{3})","$1 $2 $3",["[4-8]"]
+,[,"(\\d{2})(\\d{2})(\\d{3,4})","$1 $2 $3",["[4-8]"]
 ,"0$1","",0]
-,[,"(9)(\\d{3})(\\d{4,5})","$1 $2 $3",["9(?:[25-9]|4[1349])"]
+,[,"(9)(\\d{3})(\\d{4,5})","$1 $2 $3",["9(?:[25-9]|4[13789])"]
 ,"0$1","",0]
-,[,"(9)(4\\d{4})(\\d{4})","$1 $2 $3",["94[0256]"]
+,[,"(9)(4\\d{4})(\\d{4})","$1 $2 $3",["94[0245]"]
 ,"0$1","",0]
 ]
 ,,[,,"NA","NA"]
@@ -3224,7 +3224,7 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ]
 ,"MU":[,[,,"[2-9]\\d{6}","\\d{7}"]
-,[,,"(?:2(?:[034789]\\d|1[0-7])|4(?:[013-8]\\d|2[4-7])|[56]\\d{2}|8(?:14|3[129]))\\d{4}","\\d{7}",,,"2012345"]
+,[,,"(?:2(?:[034789]\\d|1[0-7]|6[1-69])|4(?:[013-8]\\d|2[4-7])|[56]\\d{2}|8(?:14|3[129]))\\d{4}","\\d{7}",,,"2012345"]
 ,[,,"(?:25\\d|4(?:2[12389]|9\\d)|7\\d{2}|87[15-8]|9[1-8]\\d)\\d{4}","\\d{7}",,,"2512345"]
 ,[,,"80[012]\\d{4}","\\d{7}",,,"8001234"]
 ,[,,"30\\d{5}","\\d{7}",,,"3012345"]
@@ -3436,7 +3436,7 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ]
 ,"NG":[,[,,"[1-69]\\d{5,8}|[78]\\d{5,13}","\\d{5,14}"]
 ,[,,"[12]\\d{6,7}|9\\d{7}|(?:3\\d|4[023568]|5[02368]|6[02-469]|7[4-69]|8[2-9])\\d{6}|(?:4[47]|5[14579]|6[1578]|7[0-357])\\d{5,6}|(?:78|41)\\d{5}","\\d{5,9}",,,"12345678"]
-,[,,"(?:1(?:7[34]\\d|8(?:04|[124579]\\d|8[0-3])|95\\d)|287[0-7]|3(?:18[1-8]|88[0-7]|9(?:8[5-9]|6[1-5]))|4(?:28[0-2]|6(?:7[1-9]|8[02-47])|88[0-2])|5(?:2(?:7[7-9]|8\\d)|38[1-79]|48[0-7]|68[4-7])|6(?:2(?:7[7-9]|8\\d)|4(?:3[7-9]|[68][129]|7[04-69]|9[1-8])|58[0-2]|98[7-9])|7(?:38[0-7]|69[1-8]|78[2-4])|8(?:28[3-9]|38[0-2]|4(?:2[12]|3[147-9]|5[346]|7[4-9]|8[014-689])|58[1-8]|78[2-9]|88[5-7])|98[07]\\d)\\d{4}|(?:70(?:[3-9]\\d|2[1-9])|8(?:0[2-9]|1[0235-9])\\d)\\d{6}","\\d{8,10}",,,"8021234567"]
+,[,,"(?:1(?:7[34]\\d|8(?:04|[124579]\\d|8[0-3])|95\\d)|287[0-7]|3(?:18[1-8]|88[0-7]|9(?:8[5-9]|6[1-5]))|4(?:28[0-2]|6(?:7[1-9]|8[02-47])|88[0-2])|5(?:2(?:7[7-9]|8\\d)|38[1-79]|48[0-7]|68[4-7])|6(?:2(?:7[7-9]|8\\d)|4(?:3[7-9]|[68][129]|7[04-69]|9[1-8])|58[0-2]|98[7-9])|7(?:38[0-7]|69[1-8]|78[2-4])|8(?:28[3-9]|38[0-2]|4(?:2[12]|3[147-9]|5[346]|7[4-9]|8[014-689]|90)|58[1-8]|78[2-9]|88[5-7])|98[07]\\d)\\d{4}|(?:70(?:[3-9]\\d|2[1-9])|8(?:0[2-9]|1[0-35-9])\\d)\\d{6}","\\d{8,10}",,,"8021234567"]
 ,[,,"800\\d{7,11}","\\d{10,14}",,,"80017591759"]
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
@@ -4005,7 +4005,7 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ]
 ,"RW":[,[,,"[027-9]\\d{7,8}","\\d{8,9}"]
 ,[,,"2[258]\\d{7}|06\\d{6}","\\d{8,9}",,,"250123456"]
-,[,,"7[258]\\d{7}","\\d{9}",,,"720123456"]
+,[,,"7[238]\\d{7}","\\d{9}",,,"720123456"]
 ,[,,"800\\d{6}","\\d{9}",,,"800123456"]
 ,[,,"900\\d{6}","\\d{9}",,,"900123456"]
 ,[,,"NA","NA"]
@@ -4329,7 +4329,7 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ]
 ,"SR":[,[,,"[2-8]\\d{5,6}","\\d{6,7}"]
 ,[,,"(?:2[1-3]|3[0-7]|4\\d|5[2-58]|68\\d)\\d{4}","\\d{6,7}",,,"211234"]
-,[,,"(?:7[1-5]|8[1-9])\\d{5}","\\d{7}",,,"7412345"]
+,[,,"(?:7[1-57]|8[1-9])\\d{5}","\\d{7}",,,"7412345"]
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
@@ -4634,7 +4634,7 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ]
 ,"TR":[,[,,"[2-589]\\d{9}|444\\d{4}","\\d{7,10}"]
 ,[,,"(?:2(?:[13][26]|[28][2468]|[45][268]|[67][246])|3(?:[13][28]|[24-6][2468]|[78][02468]|92)|4(?:[16][246]|[23578][2468]|4[26]))\\d{7}","\\d{10}",,,"2123456789"]
-,[,,"5(?:0[1-35-7]|22|3\\d|4[1-79]|5[1-5]|9[246])\\d{7}","\\d{10}",,,"5012345678"]
+,[,,"5(?:0[1-7]|22|[34]\\d|5[1-59]|9[246])\\d{7}","\\d{10}",,,"5012345678"]
 ,[,,"800\\d{7}","\\d{10}",,,"8001234567"]
 ,[,,"900\\d{7}","\\d{10}",,,"9001234567"]
 ,[,,"NA","NA"]
@@ -4927,7 +4927,7 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ]
 ,"VU":[,[,,"[2-57-9]\\d{4,6}","\\d{5,7}"]
-,[,,"(?:2[2-9]\\d|3(?:[67]\\d|8[0-8])|48[4-9]|88\\d)\\d{2}","\\d{5}",,,"22123"]
+,[,,"(?:2[2-9]\\d|3(?:[5-7]\\d|8[0-8])|48[4-9]|88\\d)\\d{2}","\\d{5}",,,"22123"]
 ,[,,"(?:5(?:7[2-5]|[3-69]\\d)|7[013-7]\\d)\\d{4}","\\d{7}",,,"5912345"]
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
@@ -4939,7 +4939,7 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ]
 ,,[,,"NA","NA"]
 ,,,[,,"NA","NA"]
-,[,,"30\\d{3}|900\\d{4}","\\d{5,7}",,,"30123"]
+,[,,"3[03]\\d{3}|900\\d{4}","\\d{5,7}",,,"30123"]
 ,,[,,"112","\\d{3}",,,"112"]
 ,[,,"NA","NA"]
 ]

javascript/i18n/phonenumbers/metadatalite.js

@@ -287,7 +287,7 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ]
 ,"AE":[,[,,"[2-79]\\d{7,8}|800\\d{2,9}","\\d{5,12}"]
-,[,,"(?:[2-4679][2-8]\\d|600[25])\\d{5}","\\d{7,9}"]
+,[,,"[2-4679][2-8]\\d{6}","\\d{7,8}"]
 ,[,,"5[0256]\\d{7}","\\d{9}"]
 ,[,,"400\\d{6}|800\\d{2,9}","\\d{5,12}"]
 ,[,,"900[02]\\d{5}","\\d{9}"]
@@ -298,14 +298,14 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,"0$1","",0]
 ,[,"(5[0256])(\\d{3})(\\d{4})","$1 $2 $3",["5"]
 ,"0$1","",0]
-,[,"([4679]00)(\\d)(\\d{5})","$1 $2 $3",["[4679]0"]
+,[,"([479]00)(\\d)(\\d{5})","$1 $2 $3",["[479]0"]
 ,"$1","",0]
-,[,"(800)(\\d{2,9})","$1 $2",["8"]
+,[,"([68]00)(\\d{2,9})","$1 $2",["60|8"]
 ,"$1","",0]
 ]
 ,,[,,"NA","NA"]
 ,,,[,,"NA","NA"]
-,[,,"NA","NA"]
+,[,,"600[25]\\d{5}","\\d{9}"]
 ,,[,,"112|99[789]","\\d{3}"]
 ,[,,"NA","NA"]
 ]
@@ -541,7 +541,7 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ]
 ,"AW":[,[,,"[25-9]\\d{6}","\\d{7}"]
 ,[,,"5(?:2\\d|8[1-9])\\d{4}","\\d{7}"]
-,[,,"(?:5(?:6\\d|9[2-478])|6(?:[039]0|22|[46][01])|7[34]\\d|9(?:6[45]|9[4-8]))\\d{4}","\\d{7}"]
+,[,,"(?:5(?:6\\d|9[2-478])|6(?:[039]0|22|4[01]|6[0-2])|7[34]\\d|9(?:6[45]|9[4-8]))\\d{4}","\\d{7}"]
 ,[,,"800\\d{4}","\\d{7}"]
 ,[,,"900\\d{4}","\\d{7}"]
 ,[,,"NA","NA"]
@@ -673,7 +673,7 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ]
 ,"BF":[,[,,"[24-7]\\d{7}","\\d{8}"]
 ,[,,"(?:20(?:49|5[23]|9[016-9])|40(?:4[56]|5[4-6]|7[0179])|50[34]\\d)\\d{4}","\\d{8}"]
-,[,,"(?:6(?:[05]\\d|1[01]|6[0-7]|8[0-2])|7(?:[02-68]\\d|1[0-4689]|7[0-69]|9[0-689]))\\d{5}","\\d{8}"]
+,[,,"(?:6(?:[056]\\d|1[0-3]|8[0-2]|90)|7(?:[02-68]\\d|1[0-4689]|7[0-69]|9[0-689]))\\d{5}","\\d{8}"]
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
@@ -1145,7 +1145,7 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ]
 ,"CN":[,[,,"[1-79]\\d{7,11}|8[0-357-9]\\d{6,9}","\\d{4,12}"]
 ,[,,"21\\d{8,10}|(?:10|2[02-57-9]|3(?:11|7[179])|4(?:[15]1|3[12])|5(?:1\\d|2[37]|3[12]|7[13-79]|9[15])|7(?:31|5[457]|6[09]|91)|898)\\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\\d|6[1-6]|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]|[37]\\d|5[1-9]|8[3678]|9[1-7])|9(?:0[1-3689]|1[1-79]|[379]\\d|4[13]|5[1-5]))\\d{7}|80(?:29|6[03578]|7[018]|81)\\d{4}","\\d{4,12}"]
-,[,,"1(?:3\\d|4[57]|5[0-35-9]|8[0235-9])\\d{8}","\\d{11}"]
+,[,,"1(?:3\\d|4[57]|[58][0-35-9])\\d{8}","\\d{11}"]
 ,[,,"(?:10)?800\\d{7}","\\d{10,12}"]
 ,[,,"16[08]\\d{5}","\\d{8}"]
 ,[,,"400\\d{7}","\\d{10}"]
@@ -1347,7 +1347,7 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,,[,,"1(?:12|5[058])","\\d{3}"]
 ,[,,"9(?:3\\d{9}|6\\d{7,10})","\\d{9,12}"]
 ]
-,"DE":[,[,,"[1-35-9]\\d{3,14}|4(?:[0-8]\\d{4,12}|9(?:[0-37]\\d|4[1-8]|5\\d{1,2}|6[1-8]\\d?)\\d{2,7})","\\d{2,15}"]
+,"DE":[,[,,"[1-35-9]\\d{3,14}|4(?:[0-8]\\d{4,12}|9(?:[0-37]\\d|4(?:[1-35-8]|4\\d?)|5\\d{1,2}|6[1-8]\\d?)\\d{2,7})","\\d{2,15}"]
 ,[,,"[246]\\d{5,13}|3(?:[03-9]\\d{4,13}|2\\d{9})|5(?:0[2-8]|[1256]\\d|[38][0-8]|4\\d{0,2}|[79][0-7])\\d{3,11}|7(?:0[2-8]|[1-9]\\d)\\d{3,10}|8(?:0[2-9]|[1-9]\\d)\\d{3,10}|9(?:0[6-9]|[1-9]\\d)\\d{3,10}","\\d{2,15}"]
 ,[,,"1(?:5[0-2579]\\d{8}|6[023]\\d{7,8}|7(?:[0-57-9]\\d?|6\\d)\\d{7})","\\d{10,11}"]
 ,[,,"800\\d{7,10}","\\d{10,13}"]
@@ -2411,7 +2411,7 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ]
 ,"JO":[,[,,"[235-9]\\d{7,8}","\\d{7,9}"]
 ,[,,"(?:2(?:6(?:2[0-35-9]|3[0-57-8]|4[24-7]|5[0-24-8]|[6-9][02])|7(?:0[1-79]|10|2[014-7]|3[0-689]|4[019]|5[0-3578]))|32(?:0[1-69]|1[1-35-7]|2[024-7]|3\\d|[457][02]|60)|53(?:[013][02]|2[0-59]|49|5[0-35-9]|6[15]|7[45]|8[1-6]|9[0-36-9])|6(?:2[50]0|300|4(?:0[0125]|1[2-7]|2[0569]|[38][07-9]|4[025689]|6[0-589]|7\\d|9[0-2])|5(?:[01][056]|2[034]|3[0-57-9]|4[17-8]|5[0-69]|6[0-35-9]|7[1-379]|8[0-68]|9[02-39]))|87(?:[02]0|7[08]|9[09]))\\d{4}","\\d{7,8}"]
-,[,,"7(?:55|7[25-79]|8[5-8]|9[05-9])\\d{6}","\\d{9}"]
+,[,,"7(?:55|7[25-9]|8[5-9]|9[05-9])\\d{6}","\\d{9}"]
 ,[,,"80\\d{6}","\\d{8}"]
 ,[,,"900\\d{5}","\\d{8}"]
 ,[,,"85\\d{6}","\\d{8}"]
@@ -2479,7 +2479,7 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ]
 ,"KE":[,[,,"20\\d{6,7}|[4-9]\\d{6,9}","\\d{5,10}"]
 ,[,,"20\\d{6,7}|4(?:[013]\\d{7}|[24-6]\\d{5,7})|5(?:[0-36-8]\\d{5,7}|[459]\\d{5})|6(?:[08]\\d{5}|[14-79]\\d{5,7}|2\\d{7})","\\d{5,9}"]
-,[,,"7(?:0[0-8]|[123]\\d|5[0-5]|7[0-5]|8[5-9])\\d{6}","\\d{9}"]
+,[,,"7(?:0[0-8]|[123]\\d|5[0-6]|7[0-5]|8[5-9])\\d{6}","\\d{9}"]
 ,[,,"800[24-8]\\d{5,6}","\\d{9,10}"]
 ,[,,"900[02-578]\\d{5}","\\d{9}"]
 ,[,,"NA","NA"]
@@ -2520,7 +2520,7 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ]
 ,"KH":[,[,,"[1-9]\\d{7,9}","\\d{6,10}"]
-,[,,"(?:2[3-6]|3[2-6]|4[2-4]|[567][2-5])(?:[2-46-9]|5\\d)\\d{5}","\\d{6,9}"]
+,[,,"(?:2[3-6]|3[2-6]|4[2-4]|[567][2-5])(?:[2-47-9]|5\\d|6\\d?)\\d{5}","\\d{6,9}"]
 ,[,,"(?:(?:1\\d|[67][06-9])[1-9]|8(?:0[89]|[134679]\\d|5[2-689]|8\\d{2})|9(?:[0-589][1-9]|[67][1-9]\\d?))\\d{5}","\\d{8,9}"]
 ,[,,"1800(?:1\\d|2[019])\\d{4}","\\d{10}"]
 ,[,,"1900(?:1\\d|2[09])\\d{4}","\\d{10}"]
@@ -2826,11 +2826,11 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"(?:3[1478]|4[124-6]|52)\\d{6}","\\d{8}"]
 ,[,,"6\\d{7}","\\d{8}"]
 ,[,,"800\\d{5}","\\d{8}"]
-,[,,"90[0239]\\d{5}","\\d{8}"]
-,[,,"NA","NA"]
+,[,,"9(?:0[0239]|10)\\d{5}","\\d{8}"]
+,[,,"808\\d{5}","\\d{8}"]
 ,[,,"700\\d{5}","\\d{8}"]
 ,[,,"NA","NA"]
-,"LT",370,"00","8",,,"8",,,,[[,"([34]\\d)(\\d{6})","$1 $2",["37|4(?:1|5[45]|6[2-4])"]
+,"LT",370,"00","8",,,"[08]",,,,[[,"([34]\\d)(\\d{6})","$1 $2",["37|4(?:1|5[45]|6[2-4])"]
 ,"(8-$1)","",0]
 ,[,"([3-6]\\d{2})(\\d{5})","$1 $2",["3[148]|4(?:[24]|6[09])|528|6"]
 ,"(8-$1)","",0]
@@ -2841,7 +2841,7 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ]
 ,,[,,"NA","NA"]
 ,,,[,,"NA","NA"]
-,[,,"NA","NA"]
+,[,,"70[67]\\d{5}","\\d{8}"]
 ,,[,,"0(?:11?|22?|33?)|1(?:0[123]|12)","\\d{2,3}"]
 ,[,,"NA","NA"]
 ]
@@ -3077,27 +3077,27 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,,[,,"1[578]","\\d{2}"]
 ,[,,"NA","NA"]
 ]
-,"MM":[,[,,"[124-8]\\d{5,7}|9(?:[25689]|4\\d{1,2}|7\\d)\\d{6}","\\d{5,10}"]
-,[,,"(?:1\\d|2|4[2-6]|5[2-9]|6(?:[0-689]|7\\d?)|7[0-5]|8(?:[2-6]|1\\d?))\\d{5}|1333\\d{4}","\\d{5,8}"]
-,[,,"9(?:[25689]|4(?:[0256]\\d|[1349])|7\\d)\\d{6}","\\d{8,10}"]
-,[,,"NA","NA"]
+,"MM":[,[,,"[14578]\\d{5,7}|[26]\\d{5,8}|9(?:[258]|4\\d{1,2}|[679]\\d?)\\d{6}","\\d{5,10}"]
+,[,,"1(?:2\\d{1,2}|[3-5]\\d|6\\d?|[89][0-6]\\d)\\d{4}|2(?:[236-9]\\d{4}|4(?:0\\d{5}|\\d{4})|5(?:1\\d{3,6}|[02-9]\\d{3,5}))|4(?:2[245-8]|[346][2-6]|5[3-5])\\d{4}|5(?:2(?:20?|[3-8])|3[2-68]|4(?:21?|[4-8])|5[23]|6[2-4]|7[2-8]|8[24-7]|9[2-7])\\d{4}|6(?:0[23]|1[2356]|[24][2-6]|3[24-6]|5[2-4]|6[2-8]|7(?:[2367]|4\\d|5\\d?|8[145]\\d)|8[245]|9[24])\\d{4}|7(?:[04][24-8]|[15][2-7]|22|3[2-4])\\d{4}|8(?:1(?:2\\d?|[3-689])|2[2-8]|3[24]|4[24-7]|5[245]|6[23])\\d{4}","\\d{5,9}"]
+,[,,"17[01]\\d{4}|9(?:2[0-4]|4(?:0[0-4]\\d|[1379]\\d|[24][0-589]\\d|5\\d{2}|88)|5[0-6]|61?\\d|73\\d|8\\d|9(?:1\\d|[089]))\\d{5}","\\d{7,10}"]
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
-,"MM",95,"00","0",,,"0",,,,[[,"(1)(\\d{3})(\\d{3})","$1 $2 $3",["1"]
+,[,,"1333\\d{4}","\\d{8}"]
+,"MM",95,"00","0",,,"0",,,,[[,"(\\d)(\\d{3})(\\d{3,4})","$1 $2 $3",["1|2[45]"]
 ,"0$1","",0]
-,[,"(1)(3)(33\\d)(\\d{3})","$1 $2 $3 $4",["133","1333"]
+,[,"(2)(\\d{4})(\\d{4})","$1 $2 $3",["251"]
 ,"0$1","",0]
-,[,"(2)(\\d{2})(\\d{3})","$1 $2 $3",["2"]
+,[,"(\\d)(\\d{2})(\\d{3})","$1 $2 $3",["16|2"]
 ,"0$1","",0]
-,[,"(\\d{2})(\\d{3})(\\d{3})","$1 $2 $3",["67|81"]
+,[,"(\\d{2})(\\d{3})(\\d{3,4})","$1 $2 $3",["67|81"]
 ,"0$1","",0]
-,[,"(\\d{2})(\\d{2})(\\d{3})","$1 $2 $3",["[4-8]"]
+,[,"(\\d{2})(\\d{2})(\\d{3,4})","$1 $2 $3",["[4-8]"]
 ,"0$1","",0]
-,[,"(9)(\\d{3})(\\d{4,5})","$1 $2 $3",["9(?:[25-9]|4[1349])"]
+,[,"(9)(\\d{3})(\\d{4,5})","$1 $2 $3",["9(?:[25-9]|4[13789])"]
 ,"0$1","",0]
-,[,"(9)(4\\d{4})(\\d{4})","$1 $2 $3",["94[0256]"]
+,[,"(9)(4\\d{4})(\\d{4})","$1 $2 $3",["94[0245]"]
 ,"0$1","",0]
 ]
 ,,[,,"NA","NA"]
@@ -3224,7 +3224,7 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ]
 ,"MU":[,[,,"[2-9]\\d{6}","\\d{7}"]
-,[,,"(?:2(?:[034789]\\d|1[0-7])|4(?:[013-8]\\d|2[4-7])|[56]\\d{2}|8(?:14|3[129]))\\d{4}","\\d{7}"]
+,[,,"(?:2(?:[034789]\\d|1[0-7]|6[1-69])|4(?:[013-8]\\d|2[4-7])|[56]\\d{2}|8(?:14|3[129]))\\d{4}","\\d{7}"]
 ,[,,"(?:25\\d|4(?:2[12389]|9\\d)|7\\d{2}|87[15-8]|9[1-8]\\d)\\d{4}","\\d{7}"]
 ,[,,"80[012]\\d{4}","\\d{7}"]
 ,[,,"30\\d{5}","\\d{7}"]
@@ -3436,7 +3436,7 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ]
 ,"NG":[,[,,"[1-69]\\d{5,8}|[78]\\d{5,13}","\\d{5,14}"]
 ,[,,"[12]\\d{6,7}|9\\d{7}|(?:3\\d|4[023568]|5[02368]|6[02-469]|7[4-69]|8[2-9])\\d{6}|(?:4[47]|5[14579]|6[1578]|7[0-357])\\d{5,6}|(?:78|41)\\d{5}","\\d{5,9}"]
-,[,,"(?:1(?:7[34]\\d|8(?:04|[124579]\\d|8[0-3])|95\\d)|287[0-7]|3(?:18[1-8]|88[0-7]|9(?:8[5-9]|6[1-5]))|4(?:28[0-2]|6(?:7[1-9]|8[02-47])|88[0-2])|5(?:2(?:7[7-9]|8\\d)|38[1-79]|48[0-7]|68[4-7])|6(?:2(?:7[7-9]|8\\d)|4(?:3[7-9]|[68][129]|7[04-69]|9[1-8])|58[0-2]|98[7-9])|7(?:38[0-7]|69[1-8]|78[2-4])|8(?:28[3-9]|38[0-2]|4(?:2[12]|3[147-9]|5[346]|7[4-9]|8[014-689])|58[1-8]|78[2-9]|88[5-7])|98[07]\\d)\\d{4}|(?:70(?:[3-9]\\d|2[1-9])|8(?:0[2-9]|1[0235-9])\\d)\\d{6}","\\d{8,10}"]
+,[,,"(?:1(?:7[34]\\d|8(?:04|[124579]\\d|8[0-3])|95\\d)|287[0-7]|3(?:18[1-8]|88[0-7]|9(?:8[5-9]|6[1-5]))|4(?:28[0-2]|6(?:7[1-9]|8[02-47])|88[0-2])|5(?:2(?:7[7-9]|8\\d)|38[1-79]|48[0-7]|68[4-7])|6(?:2(?:7[7-9]|8\\d)|4(?:3[7-9]|[68][129]|7[04-69]|9[1-8])|58[0-2]|98[7-9])|7(?:38[0-7]|69[1-8]|78[2-4])|8(?:28[3-9]|38[0-2]|4(?:2[12]|3[147-9]|5[346]|7[4-9]|8[014-689]|90)|58[1-8]|78[2-9]|88[5-7])|98[07]\\d)\\d{4}|(?:70(?:[3-9]\\d|2[1-9])|8(?:0[2-9]|1[0-35-9])\\d)\\d{6}","\\d{8,10}"]
 ,[,,"800\\d{7,11}","\\d{10,14}"]
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
@@ -4005,7 +4005,7 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ]
 ,"RW":[,[,,"[027-9]\\d{7,8}","\\d{8,9}"]
 ,[,,"2[258]\\d{7}|06\\d{6}","\\d{8,9}"]
-,[,,"7[258]\\d{7}","\\d{9}"]
+,[,,"7[238]\\d{7}","\\d{9}"]
 ,[,,"800\\d{6}","\\d{9}"]
 ,[,,"900\\d{6}","\\d{9}"]
 ,[,,"NA","NA"]
@@ -4329,7 +4329,7 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ]
 ,"SR":[,[,,"[2-8]\\d{5,6}","\\d{6,7}"]
 ,[,,"(?:2[1-3]|3[0-7]|4\\d|5[2-58]|68\\d)\\d{4}","\\d{6,7}"]
-,[,,"(?:7[1-5]|8[1-9])\\d{5}","\\d{7}"]
+,[,,"(?:7[1-57]|8[1-9])\\d{5}","\\d{7}"]
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
@@ -4634,7 +4634,7 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ]
 ,"TR":[,[,,"[2-589]\\d{9}|444\\d{4}","\\d{7,10}"]
 ,[,,"(?:2(?:[13][26]|[28][2468]|[45][268]|[67][246])|3(?:[13][28]|[24-6][2468]|[78][02468]|92)|4(?:[16][246]|[23578][2468]|4[26]))\\d{7}","\\d{10}"]
-,[,,"5(?:0[1-35-7]|22|3\\d|4[1-79]|5[1-5]|9[246])\\d{7}","\\d{10}"]
+,[,,"5(?:0[1-7]|22|[34]\\d|5[1-59]|9[246])\\d{7}","\\d{10}"]
 ,[,,"800\\d{7}","\\d{10}"]
 ,[,,"900\\d{7}","\\d{10}"]
 ,[,,"NA","NA"]
@@ -4927,7 +4927,7 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ]
 ,"VU":[,[,,"[2-57-9]\\d{4,6}","\\d{5,7}"]
-,[,,"(?:2[2-9]\\d|3(?:[67]\\d|8[0-8])|48[4-9]|88\\d)\\d{2}","\\d{5}"]
+,[,,"(?:2[2-9]\\d|3(?:[5-7]\\d|8[0-8])|48[4-9]|88\\d)\\d{2}","\\d{5}"]
 ,[,,"(?:5(?:7[2-5]|[3-69]\\d)|7[013-7]\\d)\\d{4}","\\d{7}"]
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
@@ -4939,7 +4939,7 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ]
 ,,[,,"NA","NA"]
 ,,,[,,"NA","NA"]
-,[,,"30\\d{3}|900\\d{4}","\\d{5,7}"]
+,[,,"3[03]\\d{3}|900\\d{4}","\\d{5,7}"]
 ,,[,,"112","\\d{3}"]
 ,[,,"NA","NA"]
 ]

resources/PhoneNumberMetaData.xml

@@ -196,12 +196,15 @@
           <leadingDigits>5</leadingDigits>
           <format>$1 $2 $3</format>
         </numberFormat>
-        <numberFormat pattern="([4679]00)(\d)(\d{5})" nationalPrefixFormattingRule="$FG">
-          <leadingDigits>[4679]0</leadingDigits>
+        <numberFormat pattern="([479]00)(\d)(\d{5})" nationalPrefixFormattingRule="$FG">
+          <leadingDigits>[479]0</leadingDigits>
           <format>$1 $2 $3</format>
         </numberFormat>
-        <numberFormat pattern="(800)(\d{2,9})" nationalPrefixFormattingRule="$FG">
-          <leadingDigits>8</leadingDigits>
+        <numberFormat pattern="([68]00)(\d{2,9})" nationalPrefixFormattingRule="$FG">
+          <leadingDigits>
+            60|
+            8
+          </leadingDigits>
           <format>$1 $2</format>
         </numberFormat>
       </availableFormats>
@@ -213,13 +216,8 @@
         <possibleNumberPattern>\d{5,12}</possibleNumberPattern>
       </generalDesc>
       <fixedLine>
-        <nationalNumberPattern>
-          (?:
-            [2-4679][2-8]\d|
-            600[25]
-          )\d{5}
-        </nationalNumberPattern>
-        <possibleNumberPattern>\d{7,9}</possibleNumberPattern>
+        <nationalNumberPattern>[2-4679][2-8]\d{6}</nationalNumberPattern>
+        <possibleNumberPattern>\d{7,8}</possibleNumberPattern>
         <exampleNumber>22345678</exampleNumber>
       </fixedLine>
       <mobile>
@@ -245,6 +243,11 @@
         <possibleNumberPattern>\d{9}</possibleNumberPattern>
         <exampleNumber>700012345</exampleNumber>
       </sharedCost>
+      <uan>
+        <nationalNumberPattern>600[25]\d{5}</nationalNumberPattern>
+        <possibleNumberPattern>\d{9}</possibleNumberPattern>
+        <exampleNumber>600212345</exampleNumber>
+      </uan>
       <emergency>
         <nationalNumberPattern>
           112|
@@ -1657,8 +1660,8 @@
         <exampleNumber>5212345</exampleNumber>
       </fixedLine>
       <mobile>
-        <!-- The prefixes 994 & 96[45], while not in the plan, seem to be used in mobile numbers
-             found online. -->
+        <!-- The prefixes 662, 994 & 96[45], while not in the plan, seem to be used in mobile
+             numbers found online. -->
         <nationalNumberPattern>
           (?:
             5(?:
@@ -1668,7 +1671,8 @@
             6(?:
               [039]0|
               22|
-              [46][01]
+              4[01]|
+              6[0-2]
             )|
             7[34]\d|
             9(?:
@@ -2420,15 +2424,14 @@
       <mobile>
         <!-- Including the whole range of 75 despite the document restricting it to only a few,
              since diallable numbers have been found outside the range that the document specifies.
-             Including 716 as well since many numbers seem to have this prefix. Including 65 as a
-             prefix for Airtel, since they have informed us they are using it. -->
+             Including 716 as well since many numbers seem to have this prefix. -->
         <nationalNumberPattern>
           (?:
             6(?:
-              [05]\d|
-              1[01]|
-              6[0-7]|
-              8[0-2]
+              [056]\d|
+              1[0-3]|
+              8[0-2]|
+              90
             )|
             7(?:
               [02-68]\d|
@@ -4566,8 +4569,7 @@
           1(?:
             3\d|
             4[57]|
-            5[0-35-9]|
-            8[0235-9]
+            [58][0-35-9]
           )\d{8}
         </nationalNumberPattern>
         <possibleNumberPattern>\d{11}</possibleNumberPattern>
@@ -4743,8 +4745,6 @@
         <exampleNumber>22123456</exampleNumber>
       </fixedLine>
       <mobile>
-        <!-- Adding 8[5-7] prefix after numbers were found online where these prefixes have been
-             assigned.-->
         <nationalNumberPattern>
           5(?:
             0[0-4]|
@@ -5488,7 +5488,10 @@
             [0-8]\d{4,12}|
             9(?:
               [0-37]\d|
-              4[1-8]|
+              4(?:
+                [1-35-8]|
+                4\d?
+              )|
               5\d{1,2}|
               6[1-8]\d?
             )\d{2,7}
@@ -11912,8 +11915,8 @@
         <nationalNumberPattern>
           7(?:
             55|
-            7[25-79]|
-            8[5-8]|
+            7[25-9]|
+            8[5-9]|
             9[05-9]
           )\d{6}
         </nationalNumberPattern>
@@ -13019,7 +13022,7 @@
           7(?:
             0[0-8]|
             [123]\d|
-            5[0-5]|
+            5[0-6]|
             7[0-5]|
             8[5-9]
           )\d{6}
@@ -13205,7 +13208,9 @@
       <fixedLine>
         <!-- Allowing subscriber numbers beginning with 5 since Mobitel have informed us they have
              started issuing fixed-line numbers like this. Apparently, mobile-company-issued
-             fixed-line numbers are one digit longer than government-issued numbers. -->
+             fixed-line numbers are one digit longer than government-issued numbers. Moreover, the
+             range beginning with 6 seems to include some numbers that are one digit longer as well.
+             -->
         <nationalNumberPattern>
           (?:
             2[3-6]|
@@ -13213,8 +13218,9 @@
             4[2-4]|
             [567][2-5]
           )(?:
-            [2-46-9]|
-            5\d
+            [2-47-9]|
+            5\d|
+            6\d?
           )\d{5}
         </nationalNumberPattern>
         <possibleNumberPattern>\d{6,9}</possibleNumberPattern>
@@ -14692,8 +14698,11 @@
 
     <!-- Lithuania -->
     <!-- http://www.itu.int/oth/T020200007C/en -->
+    <!-- Note that Lithuania is switching to a national prefix of 0. We support
+         both 0 and 8 when parsing until this switch is complete. -->
     <territory id="LT" countryCode="370" internationalPrefix="00"
-               nationalPrefix="8" nationalPrefixFormattingRule="($NP-$FG)">
+               nationalPrefix="8" nationalPrefixForParsing="[08]"
+               nationalPrefixFormattingRule="($NP-$FG)">
       <!-- National Prefix formatting rule from www.yellowpages.lt -->
       <availableFormats>
         <!-- Two-digit area codes -->
@@ -14754,13 +14763,27 @@
         <exampleNumber>80012345</exampleNumber>
       </tollFree>
       <premiumRate>
-        <nationalNumberPattern>90[0239]\d{5}</nationalNumberPattern>
+        <nationalNumberPattern>
+          9(?:
+            0[0239]|
+            10
+          )\d{5}
+        </nationalNumberPattern>
         <exampleNumber>90012345</exampleNumber>
       </premiumRate>
       <personalNumber>
         <nationalNumberPattern>700\d{5}</nationalNumberPattern>
         <exampleNumber>70012345</exampleNumber>
       </personalNumber>
+      <sharedCost>
+        <nationalNumberPattern>808\d{5}</nationalNumberPattern>
+        <exampleNumber>80812345</exampleNumber>
+      </sharedCost>
+      <uan>
+        <!-- Including government service numbers here too. -->
+        <nationalNumberPattern>70[67]\d{5}</nationalNumberPattern>
+        <exampleNumber>70712345</exampleNumber>
+      </uan>
       <emergency>
         <nationalNumberPattern>
           0(?:
@@ -15828,28 +15851,32 @@
     <territory id="MM" countryCode="95" internationalPrefix="00" nationalPrefix="0"
                nationalPrefixFormattingRule="$NP$FG">
       <availableFormats>
-        <numberFormat pattern="(1)(\d{3})(\d{3})">
-          <leadingDigits>1</leadingDigits>
+        <numberFormat pattern="(\d)(\d{3})(\d{3,4})">
+          <leadingDigits>
+            1|
+            2[45]
+          </leadingDigits>
           <format>$1 $2 $3</format>
         </numberFormat>
-        <!-- This overlaps with the previous pattern. -->
-        <numberFormat pattern="(1)(3)(33\d)(\d{3})">
-          <leadingDigits>133</leadingDigits>
-          <leadingDigits>1333</leadingDigits>
-          <format>$1 $2 $3 $4</format>
+        <numberFormat pattern="(2)(\d{4})(\d{4})">
+          <leadingDigits>251</leadingDigits>
+          <format>$1 $2 $3</format>
         </numberFormat>
-        <numberFormat pattern="(2)(\d{2})(\d{3})">
-          <leadingDigits>2</leadingDigits>
+        <numberFormat pattern="(\d)(\d{2})(\d{3})">
+          <leadingDigits>
+            16|
+            2
+          </leadingDigits>
           <format>$1 $2 $3</format>
         </numberFormat>
-        <numberFormat pattern="(\d{2})(\d{3})(\d{3})">
+        <numberFormat pattern="(\d{2})(\d{3})(\d{3,4})">
           <leadingDigits>
             67|
             81
           </leadingDigits>
           <format>$1 $2 $3</format>
         </numberFormat>
-        <numberFormat pattern="(\d{2})(\d{2})(\d{3})">
+        <numberFormat pattern="(\d{2})(\d{2})(\d{3,4})">
           <leadingDigits>[4-8]</leadingDigits>
           <format>$1 $2 $3</format>
         </numberFormat>
@@ -15857,68 +15884,136 @@
           <leadingDigits>
             9(?:
               [25-9]|
-              4[1349]
+              4[13789]
             )
           </leadingDigits>
           <format>$1 $2 $3</format>
         </numberFormat>
         <numberFormat pattern="(9)(4\d{4})(\d{4})">
-          <leadingDigits>94[0256]</leadingDigits>
+          <leadingDigits>94[0245]</leadingDigits>
           <format>$1 $2 $3</format>
         </numberFormat>
       </availableFormats>
       <generalDesc>
         <nationalNumberPattern>
-          [124-8]\d{5,7}|
+          [14578]\d{5,7}|
+          [26]\d{5,8}|
           9(?:
-            [25689]|
+            [258]|
             4\d{1,2}|
-            7\d
+            [679]\d?
           )\d{6}
         </nationalNumberPattern>
         <possibleNumberPattern>\d{5,10}</possibleNumberPattern>
       </generalDesc>
       <fixedLine>
-        <!-- Fixed satellite network numbers (1 3 33X XXX) are also included here. It seems as well
-             that numbers starting with 081 may be followed by six digits, as well as five, so we
-             support both. -->
         <nationalNumberPattern>
-          (?:
-            1\d|
-            2|
-            4[2-6]|
-            5[2-9]|
-            6(?:
-              [0-689]|
-              7\d?
+          1(?:
+            2\d{1,2}|
+            [3-5]\d|
+            6\d?|
+            [89][0-6]\d
+          )\d{4}|
+          2(?:
+            [236-9]\d{4}|
+            4(?:
+              0\d{5}|
+              \d{4}
             )|
-            7[0-5]|
-            8(?:
-              [2-6]|
-              1\d?
+            5(?:
+              1\d{3,6}|
+              [02-9]\d{3,5}
             )
-          )\d{5}|
-          1333\d{4}
+          )|
+          4(?:
+            2[245-8]|
+            [346][2-6]|
+            5[3-5]
+          )\d{4}|
+          5(?:
+            2(?:
+              20?|
+              [3-8]
+            )|
+            3[2-68]|
+            4(?:
+              21?|
+              [4-8]
+            )|
+            5[23]|
+            6[2-4]|
+            7[2-8]|
+            8[24-7]|
+            9[2-7]
+          )\d{4}|
+          6(?:
+            0[23]|
+            1[2356]|
+            [24][2-6]|
+            3[24-6]|
+            5[2-4]|
+            6[2-8]|
+            7(?:
+              [2367]|
+              4\d|
+              5\d?|
+              8[145]\d
+            )|
+            8[245]|
+            9[24]
+          )\d{4}|
+          7(?:
+            [04][24-8]|
+            [15][2-7]|
+            22|
+            3[2-4]
+          )\d{4}|
+          8(?:
+            1(?:
+              2\d?|
+              [3-689]
+            )|
+            2[2-8]|
+            3[24]|
+            4[24-7]|
+            5[245]|
+            6[23]
+          )\d{4}
         </nationalNumberPattern>
-        <possibleNumberPattern>\d{5,8}</possibleNumberPattern>
+        <possibleNumberPattern>\d{5,9}</possibleNumberPattern>
         <exampleNumber>1234567</exampleNumber>
       </fixedLine>
       <mobile>
-        <!-- Mobile numbers starting with 09 7XX and 09 4[139]X have been found online, despite not
-             being in the plan, so we support these here.-->
+        <!-- Adding 99[089] (8 digits) from numbers found online, and 961 with 9 digits. -->
         <nationalNumberPattern>
+          17[01]\d{4}|
           9(?:
-            [25689]|
+            2[0-4]|
             4(?:
-              [0256]\d|
-              [1349]
+              0[0-4]\d|
+              [1379]\d|
+              [24][0-589]\d|
+              5\d{2}|
+              88
             )|
-            7\d
-          )\d{6}
+            5[0-6]|
+            61?\d|
+            73\d|
+            8\d|
+            9(?:
+              1\d|
+              [089]
+            )
+          )\d{5}
         </nationalNumberPattern>
-        <possibleNumberPattern>\d{8,10}</possibleNumberPattern>
+        <possibleNumberPattern>\d{7,10}</possibleNumberPattern>
         <exampleNumber>92123456</exampleNumber>
       </mobile>
+      <voip>
+        <nationalNumberPattern>1333\d{4}</nationalNumberPattern>
+        <possibleNumberPattern>\d{8}</possibleNumberPattern>
+        <exampleNumber>13331234</exampleNumber>
+      </voip>
       <!-- No information on other types of phone numbers for Myanmar has been found. -->
       <emergency>
         <nationalNumberPattern>199</nationalNumberPattern>
@@ -16432,12 +16527,15 @@
       </generalDesc>
       <fixedLine>
         <!-- Wireless local loop numbers are considered to be fixed, since there is almost no
-             roaming capability. -->
+             roaming capability. 26X prefixes were added after numbers containing them marked as
+             "landline" were found online. These are also mentioned on
+             http://www.wtng.info/wtng-230-mu.html. -->
         <nationalNumberPattern>
           (?:
             2(?:
               [034789]\d|
-              1[0-7]
+              1[0-7]|
+              6[1-69]
             )|
             4(?:
               [013-8]\d|
@@ -17483,9 +17581,9 @@
       </fixedLine>
       <mobile>
         <!-- More 81X prefixes have been added based on online numbers, including the prefix 817
-             from Etisalat. Furthermore, the fixed-line prefixes owned by Starcomms have
-             apparently, according to the company, been used for mobile numbers too, despite
-             the ITU plan, so we list them here as well. -->
+             from Etisalat, and 811 from Glo. Furthermore, the fixed-line prefixes owned by
+             Starcomms have apparently, according to the company, been used for mobile numbers too,
+             despite the ITU plan, so we list them here as well. -->
         <nationalNumberPattern>
           (?:
             1(?:
@@ -17550,7 +17648,8 @@
                 3[147-9]|
                 5[346]|
                 7[4-9]|
-                8[014-689]
+                8[014-689]|
+                90
               )|
               58[1-8]|
               78[2-9]|
@@ -17565,7 +17664,7 @@
             )|
             8(?:
               0[2-9]|
-              1[0235-9]
+              1[0-35-9]
             )\d
           )\d{6}
         </nationalNumberPattern>
@@ -20118,7 +20217,10 @@
         <exampleNumber>250123456</exampleNumber>
       </fixedLine>
       <mobile>
-        <nationalNumberPattern>7[258]\d{7}</nationalNumberPattern>
+        <!-- Adding 73X for Airtel - this is on the wikipedia page, but not yet in the Rwanda
+             telecommunications numbering plan. Removing 75 - that was Rwandatel but they had their
+             license revoked. -->
+        <nationalNumberPattern>7[238]\d{7}</nationalNumberPattern>
         <possibleNumberPattern>\d{9}</possibleNumberPattern>
         <exampleNumber>720123456</exampleNumber>
       </mobile>
@@ -21384,7 +21486,7 @@
         <!-- Adding 74 from numbers found online. -->
         <nationalNumberPattern>
           (?:
-            7[1-5]|
+            7[1-57]|
             8[1-9]
           )\d{5}
         </nationalNumberPattern>
@@ -22460,16 +22562,18 @@
         <exampleNumber>2123456789</exampleNumber>
       </fixedLine>
       <mobile>
+        <!-- There are some differences between the Turkish and English wikipedia pages here, and
+             some number prefixes do not seem to be able to be found online. Omitting 500, 508 and
+             509 from the English page because of this. -->
         <nationalNumberPattern>
           5(?:
-            0[1-35-7]|
+            0[1-7]|
             22|
-            3\d|
-            4[1-79]|
-            5[1-5]|
+            [34]\d|
+            5[1-59]|
             9[246]
           )\d{7}
-          </nationalNumberPattern>
+        </nationalNumberPattern>
         <possibleNumberPattern>\d{10}</possibleNumberPattern>
         <exampleNumber>5012345678</exampleNumber>
       </mobile>
@@ -24305,7 +24409,7 @@
           (?:
             2[2-9]\d|
             3(?:
-              [67]\d|
+              [5-7]\d|
               8[0-8]
             )|
             48[4-9]|
@@ -24328,10 +24432,11 @@
         <possibleNumberPattern>\d{7}</possibleNumberPattern>
         <exampleNumber>5912345</exampleNumber>
       </mobile>
-      <!-- Using this for non-geographical numbers, since they have not been clearly defined. -->
+      <!-- Using this for non-geographical numbers, since they have not been clearly defined, and
+           for government fixed-line numbers. -->
       <uan>
         <nationalNumberPattern>
-          30\d{3}|
+          3[03]\d{3}|
           900\d{4}
         </nationalNumberPattern>
         <possibleNumberPattern>\d{5,7}</possibleNumberPattern>