Commits

Anonymous committed 4e815eb

JAVA/JS: Metadata changes only (v4.8.5)

Comments (0)

Files changed (21)

java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AC

Binary file modified.

java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CR

Binary file modified.

java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_DE

Binary file modified.

java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_DK

Binary file modified.

java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_IL

Binary file modified.

java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_IN

Binary file modified.

java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_IS

Binary file modified.

java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KH

Binary file modified.

java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LI

Binary file modified.

java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LR

Binary file modified.

java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MA

Binary file modified.

java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MD

Binary file modified.

java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MK

Binary file modified.

java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PA

Binary file modified.

java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SA

Binary file modified.

java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SG

Binary file modified.

java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SS

Binary file modified.

java/release_notes.txt

+June 14th, 2012: libphonenumber-4.8.5
+* Metadata update only:
+ - AC, CR, DE, DK, IL, IN, IS, KH, LI, LR, MA, MD, MK, PA, SA, SG, SS
+
 June 5th, 2012: libphonenumber-4.8.4
 * Metadata update only:
  - AE, RO

javascript/i18n/phonenumbers/metadata.js

 ,870:["001"]
 ,878:["001"]
 ,880:["BD"]
+,881:["001"]
 ,883:["001"]
 ,886:["TW"]
 ,888:["001"]
  */
 i18n.phonenumbers.metadata.countryToMetadata = {
 "AC":[,[,,"[2-467]\\d{3}","\\d{4}"]
-,[,,"(?:3[0-5]|4[4-6]|[26]\\d|70)\\d{2}","\\d{4}",,,"6889"]
+,[,,"(?:[267]\\d|3[0-5]|4[4-69])\\d{2}","\\d{4}",,,"6889"]
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
 ,[,,"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"]
-,[,,"5[056]\\d{7}","\\d{9}",,,"501234567"]
+,[,,"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"]
 ,[,,"700[05]\\d{5}","\\d{9}",,,"700012345"]
 ,[,,"NA","NA"]
 ,"AE",971,"00","0",,,"0",,,,[[,"([2-4679])(\\d{3})(\\d{4})","$1 $2 $3",["[2-4679][2-8]"]
 ,"0$1","",0]
-,[,"(5[056])(\\d{3})(\\d{4})","$1 $2 $3",["5"]
+,[,"(5[0256])(\\d{3})(\\d{4})","$1 $2 $3",["5"]
 ,"0$1","",0]
 ,[,"([4679]00)(\\d)(\\d{5})","$1 $2 $3",["[4679]0"]
 ,"$1","",0]
 ]
 ,"CR":[,[,,"[24-9]\\d{7,9}","\\d{8,10}"]
 ,[,,"2[24-7]\\d{6}","\\d{8}",,,"22123456"]
-,[,,"5(?:0[0-4]|7[01])\\d{5}|[67][01]\\d{6}|8[36-9]\\d{6}","\\d{8}",,,"83123456"]
+,[,,"5(?:0[0-4]|7[01])\\d{5}|[67][01]\\d{6}|8[35-9]\\d{6}","\\d{8}",,,"83123456"]
 ,[,,"800\\d{7}","\\d{10}",,,"8001234567"]
 ,[,,"90[059]\\d{7}","\\d{10}",,,"9001234567"]
 ,[,,"NA","NA"]
 ,"DE":[,[,,"[1-35-9]\\d{3,14}|4(?:[0-8]\\d{4,12}|9(?:4[1-8]|[0-35-7]\\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,9}","\\d{10,12}",,,"8001234567"]
+,[,,"800\\d{7,10}","\\d{10,13}",,,"8001234567890"]
 ,[,,"900(?:[135]\\d{6}|9\\d{7})","\\d{10,11}",,,"9001234567"]
 ,[,,"180\\d{5,11}","\\d{8,14}",,,"18012345"]
 ,[,,"700\\d{8}","\\d{11}",,,"70012345678"]
 ,"0$1","",0]
 ,[,"(\\d{5})(\\d{1,10})","$1/$2",["3"]
 ,"0$1","",0]
-,[,"([18]\\d{2})(\\d{7,9})","$1 $2",["1[5-7]|800"]
+,[,"([18]\\d{2})(\\d{7,10})","$1 $2",["1[5-7]|800"]
 ,"0$1","",0]
 ,[,"(\\d{3})(\\d)(\\d{4,10})","$1 $2 $3",["(?:18|90)0","180|900[1359]"]
 ,"0$1","",0]
 ,[,,"NA","NA"]
 ]
 ,"DK":[,[,,"[2-9]\\d{7}","\\d{8}"]
-,[,,"(?:[2-7]\\d|8[126-9]|9[6-9])\\d{6}","\\d{8}",,,"32123456"]
-,[,,"(?:[2-7]\\d|8[126-9]|9[6-9])\\d{6}","\\d{8}",,,"20123456"]
+,[,,"(?:[2-7]\\d|8[126-9]|9[16-9])\\d{6}","\\d{8}",,,"32123456"]
+,[,,"(?:[2-7]\\d|8[126-9]|9[16-9])\\d{6}","\\d{8}",,,"20123456"]
 ,[,,"80\\d{6}","\\d{8}",,,"80123456"]
 ,[,,"90\\d{6}","\\d{8}",,,"90123456"]
 ,[,,"NA","NA"]
 ]
 ,"IL":[,[,,"[17]\\d{6,9}|[2-589]\\d{3}(?:\\d{3,6})?|6\\d{3}","\\d{4,10}"]
 ,[,,"(?:[2-489]|7[2-46-8])\\d{7}","\\d{7,9}",,,"21234567"]
-,[,,"5(?:[0246-9]\\d{2}|5(?:22|33|44|5[58]|66|77|88))\\d{5}","\\d{9}",,,"501234567"]
+,[,,"5(?:[02346-9]\\d{2}|5(?:22|33|44|5[58]|66|77|88))\\d{5}","\\d{9}",,,"501234567"]
 ,[,,"1(?:80[019]\\d{3}|255)\\d{3}","\\d{7,10}",,,"1800123456"]
 ,[,,"1(?:212|(?:919|200)\\d{2})\\d{4}","\\d{8,10}",,,"1919123456"]
 ,[,,"1700\\d{6}","\\d{10}",,,"1700123456"]
 ]
 ,"IN":[,[,,"1\\d{7,12}|[2-9]\\d{9,10}","\\d{6,13}"]
 ,[,,"(?:11|2[02]|33|4[04]|79)[2-7]\\d{7}|80[2-467]\\d{7}|(?:1(?:2[0-249]|3[0-25]|4[145]|[59][14]|6[014]|7[1257]|8[01346])|2(?:1[257]|3[013]|4[01]|5[0137]|6[0158]|78|8[1568]|9[14])|3(?:26|4[1-3]|5[34]|6[01489]|7[02-46]|8[159])|4(?:1[36]|2[1-47]|3[15]|5[12]|6[126-9]|7[0-24-9]|8[013-57]|9[014-7])|5(?:[136][25]|22|4[28]|5[12]|[78]1|9[15])|6(?:12|[2345]1|57|6[13]|7[14]|80)|7(?:12|2[14]|3[134]|4[47]|5[15]|[67]1|88)|8(?:16|2[014]|3[126]|6[136]|7[078]|8[34]|91))[2-7]\\d{6}|(?:(?:1(?:2[35-8]|3[346-9]|4[236-9]|[59][0235-9]|6[235-9]|7[34689]|8[257-9])|2(?:1[134689]|3[24-8]|4[2-8]|5[25689]|6[2-4679]|7[13-79]|8[2-479]|9[235-9])|3(?:01|1[79]|2[1-5]|4[25-8]|5[125689]|6[235-7]|7[157-9]|8[2-467])|4(?:1[14578]|2[5689]|3[2-467]|5[4-7]|6[35]|73|8[2689]|9[2389])|5(?:[16][146-9]|2[14-8]|3[1346]|4[14-69]|5[46]|7[2-4]|8[2-8]|9[246])|6(?:1[1358]|2[2457]|3[2-4]|4[235-7]|[57][2-689]|6[24-58]|8[1-6])|8(?:1[1357-9]|2[235-8]|3[03-57-9]|4[0-24-9]|5\\d|6[2457-9]|7[1-6]|8[1256]|9[2-4]))\\d|7(?:(?:1[013-9]|2[0235-9]|3[2679]|4[1-35689]|5[2-46-9]|[67][02-9]|9\\d)\\d|8(?:2[0-6]|[013-8]\\d)))[2-7]\\d{5}","\\d{6,10}",,,"1123456789"]
-,[,,"(?:7(?:2(?:0[04-9]|5[09]|7[5-8]|9[389])|3(?:0[1-9]|[58]\\d|7[3679]|9[689])|4(?:0[1-9]|1[15-9]|[29][89]|39|8[389])|5(?:0\\d|[47]9|[25]0|6[6-9]|[89][7-9])|6(?:0[027]|12|20|3[19]|5[45]|6[5-9]|7[679]|9[6-9])|7(?:0[27-9]|[39][5-9]|42|60)|8(?:[03][07-9]|14|2[7-9]|4[25]|6[09]|7\\d|9[013-9]))|8(?:0(?:[01589]\\d|66)|1(?:[024]\\d|1[56]|30|7[19]|97)|2(?:[2369]\\d|52|7[0135789]|8[01567])|3(?:0[0235-8]|4[14789]|74|90)|4(?:[02-58]\\d|10|6[09])|5(?:0[07-9]|1[01]|[26]\\d|30|4[47]|5[39]|7[45]|8[56]|9[0157])|6(?:[0589]\\d|49|7[0-59])|7(?:1[24]|33|49|[2569]\\d)|8(?:[07-9]\\d|1[057]|2[024-8]|44|5[3589]|6[0167])|9(?:[05-9]\\d|2[35-9]|3[019]|4[036-8]))|9\\d{3})\\d{6}","\\d{10}",,,"9123456789"]
+,[,,"(?:7(?:2(?:0[04-9]|5[09]|7[5-8]|9[389])|3(?:0[1-9]|[58]\\d|7[3679]|9[689])|4(?:0[1-9]|1[15-9]|[29][89]|39|8[389])|5(?:0\\d|[47]9|[25]0|6[6-9]|[89][7-9])|6(?:0[027]|12|20|3[19]|5[45]|6[5-9]|7[679]|9[6-9])|7(?:0[27-9]|[39][5-9]|42|60)|8(?:[03][07-9]|14|2[7-9]|4[25]|6[09]|7\\d|9[013-9]))|8(?:0(?:[01589]\\d|66)|1(?:[024]\\d|1[56]|30|7[19]|97)|2(?:[2369]\\d|52|7[0135789]|8[01567])|3(?:0[0235-8]|4[14789]|5[7-9]|7[04]|90)|4(?:[02-58]\\d|10|6[09])|5(?:0[07-9]|1[01]|[26]\\d|30|4[47]|5[139]|7[45]|8[56]|9[0157])|6(?:[0589]\\d|49|7[0-59])|7(?:1[24]|33|49|[2569]\\d)|8(?:[07-9]\\d|1[057]|2[02-8]|44|5[3589]|6[0167])|9(?:[05-9]\\d|2[35-9]|3[019]|4[036-8]))|9\\d{3})\\d{6}","\\d{10}",,,"9123456789"]
 ,[,,"1(?:600\\d{6}|80(?:0\\d{4,8}|3\\d{9}))","\\d{8,13}",,,"1800123456"]
 ,[,,"186[12]\\d{9}","\\d{13}",,,"1861123456789"]
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
-,"IN",91,"00","0",,,"0",,,,[[,"(\\d{2})(\\d{2})(\\d{6})","$1 $2 $3",["7(?:2[0579]|3[057-9]|4[0-389]|5[024-9]|6[0-35-9]|7[03469]|8[0-4679])|8(?:0[01589]|1[0-479]|2[236-9]|3[0479]|4[0-68]|5|6[045789]|7[1-69]|8[0124-9]|9[02-9])|9","7(?:2(?:0[04-9]|5[09]|7[5-8]|9[389])|3(?:0[1-9]|[58]|7[3679]|9[689])|4(?:0[1-9]|1[15-9]|[29][89]|39|8[389])|5(?:0|[47]9|[25]0|6[6-9]|[89][7-9])|6(?:0[027]|12|20|3[19]|5[45]|6[5-9]|7[679]|9[6-9])|7(?:0[27-9]|3[5-9]|42|60|9[5-9])|8(?:[03][07-9]|14|2[7-9]|4[25]|6[09]|7|9[013-9]))|8(?:0[01589]|1(?:[024]|1[56]|30|7[19]|97)|2(?:[2369]|7[0135789]|8[01567])|3(?:0[0235-8]|4[14789]|74|90)|4(?:[02-58]|10|6[09])|5(?:0[07-9]|1[01]|[26]|30|4[47]|5[39]|8[56]|7[45]|9[0157])|6(?:[0589]|49|7[0-5])|7(?:1[24]|33|49|[2569])|8(?:[07-9]|1[057]|2[024-8]|44|5[3589]|6[0167])|9(?:[05-9]|2[35-9]|3[019]|4[03678]))|9"]
+,"IN",91,"00","0",,,"0",,,,[[,"(\\d{2})(\\d{2})(\\d{6})","$1 $2 $3",["7(?:2[0579]|3[057-9]|4[0-389]|5[024-9]|6[0-35-9]|7[03469]|8[0-4679])|8(?:0[01589]|1[0-479]|2[236-9]|3[04579]|4[0-68]|5|6[045789]|7[1-69]|8[0124-9]|9[02-9])|9","7(?:2(?:0[04-9]|5[09]|7[5-8]|9[389])|3(?:0[1-9]|[58]|7[3679]|9[689])|4(?:0[1-9]|1[15-9]|[29][89]|39|8[389])|5(?:0|[47]9|[25]0|6[6-9]|[89][7-9])|6(?:0[027]|12|20|3[19]|5[45]|6[5-9]|7[679]|9[6-9])|7(?:0[27-9]|3[5-9]|42|60|9[5-9])|8(?:[03][07-9]|14|2[7-9]|4[25]|6[09]|7|9[013-9]))|8(?:0[01589]|1(?:[024]|1[56]|30|7[19]|97)|2(?:[2369]|7[0135789]|8[01567])|3(?:0[0235-8]|4[14789]|5[7-9]|7[04]|90)|4(?:[02-58]|10|6[09])|5(?:0[07-9]|1[01]|[26]|30|4[47]|5[139]|8[56]|7[45]|9[0157])|6(?:[0589]|49|7[0-5])|7(?:1[24]|33|49|[2569])|8(?:[07-9]|1[057]|2[02-8]|44|5[3589]|6[0167])|9(?:[05-9]|2[35-9]|3[019]|4[03678]))|9"]
 ,"0$1","",1]
 ,[,"(\\d{2})(\\d{4})(\\d{4})","$1 $2 $3",["11|2[02]|33|4[04]|79|80[2-46]"]
 ,"0$1","",1]
 ,[,,"NA","NA"]
 ]
 ,"IS":[,[,,"[4-9]\\d{6}|38\\d{7}","\\d{7,9}"]
-,[,,"(?:4(?:1[0-245]|2[0-7]|[37][0-8]|4[0245]|5[0-356]|6\\d|8[0-46-8]|9[013-79])|5(?:05|[156]\\d|2[02578]|3[013-6]|4[03-6]|7[0-2578]|8[0-25-9]|9[013-689])|87[23])\\d{4}","\\d{7}",,,"4101234"]
-,[,,"38[59]\\d{6}|(?:6(?:1[0-8]|3[0-27-9]|4[0-27]|5[0-29]|[67][0-69]|9\\d)|7(?:5[057]|7[0-7])|8(?:2[0-5]|[469]\\d|5[1-9]))\\d{4}","\\d{7,9}",,,"6101234"]
+,[,,"(?:4(?:1[0-245]|2[0-7]|[37][0-8]|4[0245]|5[0-3568]|6\\d|8[0-36-8])|5(?:05|[156]\\d|2[02578]|3[013-7]|4[03-7]|7[0-2578]|8[0-25-9]|9[013-689])|87[23])\\d{4}","\\d{7}",,,"4101234"]
+,[,,"38[59]\\d{6}|(?:6(?:1[0-8]|3[0-27-9]|4[0-27]|5[0-29]|[67][0-69]|9\\d)|7(?:5[057]|7\\d)|8(?:2[0-5]|[469]\\d|5[1-9]))\\d{4}","\\d{7,9}",,,"6101234"]
 ,[,,"800\\d{4}","\\d{7}",,,"8001234"]
 ,[,,"90\\d{5}","\\d{7}",,,"9011234"]
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
-,[,,"49[013-79]\\d{4}","\\d{7}",,,"4931234"]
+,[,,"49[0-24-79]\\d{4}","\\d{7}",,,"4921234"]
 ,"IS",354,"00",,,,,,,,[[,"(\\d{3})(\\d{4})","$1 $2",["[4-9]"]
 ,"","",0]
 ,[,"(3\\d{2})(\\d{3})(\\d{3})","$1 $2 $3",["3"]
 ,[,,"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]\\d{5}","\\d{6,8}",,,"23456789"]
-,[,,"(?:(?:1[0-35-9]|6[6-9]|7[06-9])[1-9]|8(?:0[89]|5[2-689]|8\\d{2}|[13469]\\d|)|9(?:[0-689][1-9]|7[1-9]\\d?))\\d{5}","\\d{8,9}",,,"91234567"]
+,[,,"(?:2[3-6]|3[2-6]|4[2-4]|[567][2-5])(?:[2-46-9]|5\\d)\\d{5}","\\d{6,9}",,,"23456789"]
+,[,,"(?:(?:1\\d|6[6-9]|7[06-9])[1-9]|8(?:0[89]|5[2-689]|8\\d{2}|[13469]\\d|)|9(?:[0-689][1-9]|7[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"]
 ,[,,"NA","NA"]
 ,,[,,"9(?:11|99)","\\d{3}",,,"911"]
 ,[,,"NA","NA"]
 ]
-,"LI":[,[,,"(?:66|80|90)\\d{7}|[237-9]\\d{6}","\\d{7,9}"]
-,[,,"(?:2(?:17|3\\d|6[02-58]|96)|3(?:02|7[01357]|8[048]|9[0269])|870)\\d{4}","\\d{7}",,,"2345678"]
-,[,,"66(?:[0178][0-4]|2[025-9]|[36]\\d|4[129]|5[45]|9[019])\\d{5}|7(?:4[2-59]|56|[6-9]\\d)\\d{4}","\\d{7,9}",,,"661234567"]
-,[,,"80(?:0(?:07|2[238]|79|\\d{4})|9\\d{2})\\d{2}","\\d{7,9}",,,"8002222"]
-,[,,"NA","NA"]
-,[,,"90(?:0(?:2[278]|79|\\d{4})|1(?:23|\\d{4})|6(?:66|\\d{4}))\\d{2}","\\d{7,9}",,,"9002222"]
+,"LI":[,[,,"6\\d{8}|[23789]\\d{6}","\\d{7,9}"]
+,[,,"(?:2(?:01|1[27]|3\\d|6[02-578]|96)|3(?:7[0135-7]|8[048]|9[0269])|870)\\d{4}","\\d{7}",,,"2345678"]
+,[,,"6(?:51[01]|6(?:[01][0-4]|2[016-9]|88|92)|710)\\d{5}|7(?:36|4[25]|56|[6-9]\\d)\\d{4}","\\d{7,9}",,,"661234567"]
+,[,,"80(?:0(?:2[238]|79)|9\\d{2})\\d{2}","\\d{7}",,,"8002222"]
+,[,,"NA","NA"]
+,[,,"90(?:0(?:2[278]|79)|1(?:23|3[012])|6(?:4\\d|6[0126]))\\d{2}","\\d{7}",,,"9002222"]
 ,[,,"701\\d{4}","\\d{7}",,,"7011234"]
 ,[,,"NA","NA"]
-,"LI",423,"00","0",,,"0",,,,[[,"(\\d{3})(\\d{2})(\\d{2})","$1 $2 $3",["[23]|7[4-9]|87"]
+,"LI",423,"00","0",,,"0",,,,[[,"(\\d{3})(\\d{2})(\\d{2})","$1 $2 $3",["[23]|7[3-9]|87"]
 ,"","",0]
 ,[,"(6\\d)(\\d{3})(\\d{3})","$1 $2 $3",["6"]
 ,"","",0]
+,[,"(6[567]\\d)(\\d{3})(\\d{3})","$1 $2 $3",["6[567]"]
+,"","",0]
+,[,"(69)(7\\d{2})(\\d{4})","$1 $2 $3",["697"]
+,"","",0]
 ,[,"([7-9]0\\d)(\\d{2})(\\d{2})","$1 $2 $3",["[7-9]0"]
 ,"","",0]
 ,[,"([89]0\\d)(\\d{2})(\\d{2})(\\d{2})","$1 $2 $3 $4",["[89]0"]
 ]
 ,,[,,"NA","NA"]
 ,,,[,,"NA","NA"]
-,[,,"NA","NA"]
+,[,,"87(?:0[1289]|70)\\d{3}","\\d{7}",,,"8770123"]
 ,,[,,"1(?:1[278]|44)","\\d{3}",,,"112"]
-,[,,"NA","NA"]
+,[,,"697(?:[35]6|4[25]|[7-9]\\d)\\d{4}","\\d{9}",,,"697361234"]
 ]
 ,"LK":[,[,,"[1-9]\\d{8}","\\d{7,9}"]
 ,[,,"(?:[189]1|2[13-7]|3[1-8]|4[157]|5[12457]|6[35-7])[2-57]\\d{6}","\\d{7,9}",,,"112345678"]
 ]
 ,"LR":[,[,,"(?:[29]\\d|[4-6]|7\\d{1,2}|[38]\\d{2})\\d{6}","\\d{7,9}"]
 ,[,,"2\\d{7}","\\d{8}",,,"21234567"]
-,[,,"(?:4[67]|5\\d|6[4-8]|7(?:7[67]\\d|\\d{2})|880\\d)\\d{5}","\\d{7,9}",,,"4612345"]
+,[,,"(?:4[67]|5\\d|6[4-8]|7(?:7[67]\\d|\\d{2})|88\\d{2})\\d{5}","\\d{7,9}",,,"4612345"]
 ,[,,"NA","NA"]
 ,[,,"90\\d{6}","\\d{8}",,,"90123456"]
 ,[,,"NA","NA"]
 ]
 ,"MA":[,[,,"[5689]\\d{8}","\\d{9}"]
 ,[,,"5(?:2(?:(?:[015-7]\\d|2[2-9]|3[2-57]|4[2-8]|8[235-9]|)\\d|9(?:0\\d|[89]0))|3(?:(?:[0-4]\\d|[57][2-9]|6[235-8]|9[3-9])\\d|8(?:0\\d|[89]0)))\\d{4}","\\d{9}",,,"520123456"]
-,[,,"6(?:0[0-6]|[14-7]\\d|2[23679]|3[03458]|8[01]|99)\\d{6}","\\d{9}",,,"650123456"]
+,[,,"6(?:0[0-6]|[14-7]\\d|2[236-9]|3[03458]|8[01]|99)\\d{6}","\\d{9}",,,"650123456"]
 ,[,,"80\\d{7}","\\d{9}",,,"801234567"]
 ,[,,"89\\d{7}","\\d{9}",,,"891234567"]
 ,[,,"NA","NA"]
 ,,[,,"1(?:12|[578])","\\d{2,3}",,,"112"]
 ,[,,"NA","NA"]
 ]
-,"MD":[,[,,"[25-9]\\d{7}","\\d{8}"]
-,[,,"(?:2(?:1[0569]|2\\d|3[015-7]|4[1-46-9]|5[0-24689]|6[2-589]|7[1-37]|9[1347-9])|5(?:33|5[257]))\\d{5}","\\d{5,8}",,,"22212345"]
+,"MD":[,[,,"[235-9]\\d{7}","\\d{8}"]
+,[,,"(?:2(?:1[0569]|2\\d|3[015-7]|4[1-46-9]|5[0-24689]|6[2-589]|7[1-37]|9[1347-9])|5(?:33|5[257]))\\d{5}","\\d{8}",,,"22212345"]
 ,[,,"(?:562|6(?:50|7[1-5]|[089]\\d)|7(?:7[47-9]|[89]\\d))\\d{5}","\\d{8}",,,"65012345"]
 ,[,,"800\\d{5}","\\d{8}",,,"80012345"]
 ,[,,"90[056]\\d{5}","\\d{8}",,,"90012345"]
 ,[,,"808\\d{5}","\\d{8}",,,"80812345"]
 ,[,,"NA","NA"]
-,[,,"NA","NA"]
-,"MD",373,"00","0",,,"0",,,,[[,"(22)(\\d{3})(\\d{3})","$1 $2 $3",["22"]
+,[,,"3[08]\\d{6}","\\d{8}",,,"30123456"]
+,"MD",373,"00","0",,,"0",,,,[[,"(\\d{2})(\\d{3})(\\d{3})","$1 $2 $3",["22|3"]
 ,"0$1","",0]
 ,[,"([25-7]\\d{2})(\\d{2})(\\d{3})","$1 $2 $3",["2[13-79]|[5-7]"]
 ,"0$1","",0]
 ]
 ,"MK":[,[,,"[2-578]\\d{7}","\\d{8}"]
 ,[,,"(?:2(?:[23]\\d|5[125]|6[01])|3(?:1[3-6]|2[2-6]|3[2-5]|4[235])|4(?:[23][2-6]|4[3-6]|5[25]|6[25-8]|7[24-6]|8[4-6]))\\d{5}","\\d{6,8}",,,"22212345"]
-,[,,"7[0-25-8]\\d{6}","\\d{8}",,,"72345678"]
+,[,,"7(?:[0-25-8]\\d|33)\\d{5}","\\d{8}",,,"72345678"]
 ,[,,"800\\d{5}","\\d{8}",,,"80012345"]
 ,[,,"5[02-9]\\d{6}","\\d{8}",,,"50012345"]
 ,[,,"8(?:0[1-9]|[1-9]\\d)\\d{5}","\\d{8}",,,"80123456"]
 ,[,,"NA","NA"]
 ]
 ,"PA":[,[,,"[1-9]\\d{6,7}","\\d{7,8}"]
-,[,,"(?:1(?:0[02-579]|19|23|3[03]|4[479]|57|65|7[016-8]|8[58]|9[134])|2(?:[0235679]\\d|1[0-7]|4[04-9]|8[028])|3(?:0[0-7]|1[14-7]|2[0-3]|3[03]|4[0457]|5[56]|6[068]|7[078]|80|9\\d)|4(?:3[013-59]|4\\d|7[0-689])|5(?:[01]\\d|2[0-7]|[56]0|79)|7(?:0[09]|2[0-267]|[34]0|5[6-9]|7[0-24-7]|8[89])|8(?:[34]\\d|5[0-5]|8[02])|9(?:0[78]|1[0178]|2[0378]|3[379]|40|5[0489]|6[06-9]|7[046-9]|8[36-8]|9[1-9]))\\d{4}","\\d{7}",,,"2001234"]
+,[,,"(?:1(?:0[02-579]|19|2[37]|3[03]|4[479]|57|65|7[016-8]|8[58]|9[134])|2(?:[0235679]\\d|1[0-7]|4[04-9]|8[028])|3(?:0[0-7]|1[14-7]|2[0-3]|3[03]|4[0457]|5[56]|6[068]|7[078]|80|9\\d)|4(?:3[013-59]|4\\d|7[0-689])|5(?:[01]\\d|2[0-7]|[56]0|79)|7(?:0[09]|2[0-267]|[349]0|5[6-9]|7[0-24-7]|8[89])|8(?:[34]\\d|5[0-4]|8[02])|9(?:0[78]|1[0178]|2[0378]|3[379]|40|5[0489]|6[06-9]|7[046-9]|8[36-8]|9[1-9]))\\d{4}","\\d{7}",,,"2001234"]
 ,[,,"(?:1[16]1|21[89]|8(?:1[01]|7[23]))\\d{4}|6(?:[04-9]\\d|1[0-5]|2[0-6]|3[6-9])\\d{5}","\\d{7,8}",,,"60012345"]
 ,[,,"80[09]\\d{4}","\\d{7}",,,"8001234"]
-,[,,"(?:779|8(?:2[235]|60|7[578]|86|95)|9(?:0[0-2]|81))\\d{4}","\\d{7}",,,"8601234"]
+,[,,"(?:779|8(?:2[235]|55|60|7[578]|86|95)|9(?:0[0-2]|81))\\d{4}","\\d{7}",,,"8601234"]
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
 ,,[,,"1(?:12|[578])","\\d{2,3}",,,"15"]
 ,[,,"NA","NA"]
 ]
-,"RO":[,[,,"[237-9]\\d{8}","\\d{9}"]
-,[,,"[23][13-6]\\d{7}","\\d{9}",,,"211234567"]
+,"RO":[,[,,"2\\d{5,8}|[37-9]\\d{8}","\\d{6,9}"]
+,[,,"2(?:1(?:\\d{7}|9\\d{3})|[3-6](?:\\d{7}|\\d9\\d{2}))|3[13-6]\\d{7}","\\d{6,9}",,,"211234567"]
 ,[,,"7[1-8]\\d{7}","\\d{9}",,,"712345678"]
 ,[,,"800\\d{6}","\\d{9}",,,"800123456"]
 ,[,,"90[036]\\d{6}","\\d{9}",,,"900123456"]
 ,[,,"NA","NA"]
 ,"RO",40,"00","0"," int ",,"0",,,,[[,"([237]\\d)(\\d{3})(\\d{4})","$1 $2 $3",["[23]1|7"]
 ,"0$1","",0]
-,[,"(\\d{3})(\\d{3})(\\d{3})","$1 $2 $3",["[23][02-9]|[89]"]
+,[,"(21)(\\d{4})","$1 $2",["21"]
+,"0$1","",0]
+,[,"(\\d{3})(\\d{3})(\\d{3})","$1 $2 $3",["[23][3-7]|[89]"]
+,"0$1","",0]
+,[,"(2\\d{2})(\\d{3})","$1 $2",["2[3-6]"]
 ,"0$1","",0]
 ]
 ,,[,,"NA","NA"]
 ,1,[,,"112","\\d{3}",,,"112"]
 ,[,,"NA","NA"]
 ]
-,"SA":[,[,,"[1-467]\\d{7}|5\\d{8}|(?:8|92)\\d{9}","\\d{7,11}"]
+,"SA":[,[,,"(?:[1-467]|92)\\d{7}|5\\d{8}|8\\d{9}","\\d{7,10}"]
 ,[,,"(?:[12][24-8]|3[35-8]|4[3-68]|6[2-5]|7[235-7])\\d{6}","\\d{7,8}",,,"12345678"]
 ,[,,"(?:5[013-689]\\d|8111)\\d{6}","\\d{9,10}",,,"512345678"]
 ,[,,"800\\d{7}","\\d{10}",,,"8001234567"]
-,[,,"9200\\d{7}","\\d{11}",,,"92001234567"]
+,[,,"NA","NA"]
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
 ,"SA",966,"00","0",,,"0",,,,[[,"([1-467])(\\d{3})(\\d{4})","$1 $2 $3",["[1-467]"]
 ,"0$1","",0]
-,[,"(9200)(\\d{3})(\\d{4})","$1 $2 $3",["9"]
-,"0$1","",0]
 ,[,"(5\\d)(\\d{3})(\\d{4})","$1 $2 $3",["5"]
 ,"0$1","",0]
+,[,"(9200)(\\d{5})","$1 $2",["9"]
+,"$1","",0]
 ,[,"(800)(\\d{3})(\\d{4})","$1 $2 $3",["80"]
-,"0$1","",0]
+,"$1","",0]
 ,[,"(8111)(\\d{3})(\\d{3})","$1 $2 $3",["81"]
 ,"0$1","",0]
 ]
 ,,[,,"NA","NA"]
 ,,,[,,"NA","NA"]
-,[,,"NA","NA"]
+,[,,"9200\\d{5}","\\d{9}",,,"920012345"]
 ,,[,,"99[7-9]","\\d{3}",,,"999"]
 ,[,,"NA","NA"]
 ]
 ,[,,"NA","NA"]
 ]
 ,"SG":[,[,,"[36]\\d{7}|[17-9]\\d{7,10}","\\d{8,11}"]
-,[,,"6[1-8]\\d{6}","\\d{8}",,,"61234567"]
-,[,,"(?:8[1-6]|9[0-8])\\d{6}","\\d{8}",,,"81234567"]
+,[,,"6[1-9]\\d{6}","\\d{8}",,,"61234567"]
+,[,,"(?:8[1-7]|9[0-8])\\d{6}","\\d{8}",,,"81234567"]
 ,[,,"1?800\\d{7}","\\d{10,11}",,,"18001234567"]
 ,[,,"1900\\d{7}","\\d{11}",,,"19001234567"]
 ,[,,"NA","NA"]
 ,,[,,"115","\\d{3}",,,"115"]
 ,[,,"NA","NA"]
 ]
-,"SS":[,[,,"[1489]\\d{8}","\\d{9}"]
-,[,,"(?:1[67]\\d|811)\\d{6}","\\d{9}",,,"811123456"]
-,[,,"(?:1(?:02|2[1269])|477|9(?:0[03689]|1\\d|2[024-9]|5[5-79]|77|98))\\d{6}","\\d{9}",,,"977123456"]
+,"SS":[,[,,"[19]\\d{8}","\\d{9}"]
+,[,,"18\\d{7}","\\d{9}",,,"181234567"]
+,[,,"(?:12|9[1257])\\d{7}","\\d{9}",,,"977123456"]
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
 ,,[,,"NA","NA"]
 ,[,,"NA","NA"]
 ]
+,"881":[,[,,"[67]\\d{8}","\\d{9}",,,"612345678"]
+,[,,"NA","NA",,,"612345678"]
+,[,,"[67]\\d{8}","\\d{9}",,,"612345678"]
+,[,,"NA","NA"]
+,[,,"NA","NA"]
+,[,,"NA","NA"]
+,[,,"NA","NA"]
+,[,,"NA","NA"]
+,"001",881,"",,,,,,,,[[,"(\\d)(\\d{3})(\\d{5})","$1 $2 $3",["[67]"]
+,"","",0]
+]
+,,[,,"NA","NA"]
+,,,[,,"NA","NA"]
+,[,,"NA","NA"]
+,,[,,"NA","NA"]
+,[,,"NA","NA"]
+]
 ,"883":[,[,,"51\\d{7}(?:\\d{3})?","\\d{9}(?:\\d{3})?",,,"510012345"]
 ,[,,"NA","NA",,,"510012345"]
 ,[,,"NA","NA",,,"510012345"]

javascript/i18n/phonenumbers/metadatalite.js

 ,870:["001"]
 ,878:["001"]
 ,880:["BD"]
+,881:["001"]
 ,883:["001"]
 ,886:["TW"]
 ,888:["001"]
  */
 i18n.phonenumbers.metadata.countryToMetadata = {
 "AC":[,[,,"[2-467]\\d{3}","\\d{4}"]
-,[,,"(?:3[0-5]|4[4-6]|[26]\\d|70)\\d{2}","\\d{4}"]
+,[,,"(?:[267]\\d|3[0-5]|4[4-69])\\d{2}","\\d{4}"]
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
 ,[,,"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}"]
-,[,,"5[056]\\d{7}","\\d{9}"]
+,[,,"5[0256]\\d{7}","\\d{9}"]
 ,[,,"400\\d{6}|800\\d{2,9}","\\d{5,12}"]
 ,[,,"900[02]\\d{5}","\\d{9}"]
 ,[,,"700[05]\\d{5}","\\d{9}"]
 ,[,,"NA","NA"]
 ,"AE",971,"00","0",,,"0",,,,[[,"([2-4679])(\\d{3})(\\d{4})","$1 $2 $3",["[2-4679][2-8]"]
 ,"0$1","",0]
-,[,"(5[056])(\\d{3})(\\d{4})","$1 $2 $3",["5"]
+,[,"(5[0256])(\\d{3})(\\d{4})","$1 $2 $3",["5"]
 ,"0$1","",0]
 ,[,"([4679]00)(\\d)(\\d{5})","$1 $2 $3",["[4679]0"]
 ,"$1","",0]
 ]
 ,"CR":[,[,,"[24-9]\\d{7,9}","\\d{8,10}"]
 ,[,,"2[24-7]\\d{6}","\\d{8}"]
-,[,,"5(?:0[0-4]|7[01])\\d{5}|[67][01]\\d{6}|8[36-9]\\d{6}","\\d{8}"]
+,[,,"5(?:0[0-4]|7[01])\\d{5}|[67][01]\\d{6}|8[35-9]\\d{6}","\\d{8}"]
 ,[,,"800\\d{7}","\\d{10}"]
 ,[,,"90[059]\\d{7}","\\d{10}"]
 ,[,,"NA","NA"]
 ,"DE":[,[,,"[1-35-9]\\d{3,14}|4(?:[0-8]\\d{4,12}|9(?:4[1-8]|[0-35-7]\\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,9}","\\d{10,12}"]
+,[,,"800\\d{7,10}","\\d{10,13}"]
 ,[,,"900(?:[135]\\d{6}|9\\d{7})","\\d{10,11}"]
 ,[,,"180\\d{5,11}","\\d{8,14}"]
 ,[,,"700\\d{8}","\\d{11}"]
 ,"0$1","",0]
 ,[,"(\\d{5})(\\d{1,10})","$1/$2",["3"]
 ,"0$1","",0]
-,[,"([18]\\d{2})(\\d{7,9})","$1 $2",["1[5-7]|800"]
+,[,"([18]\\d{2})(\\d{7,10})","$1 $2",["1[5-7]|800"]
 ,"0$1","",0]
 ,[,"(\\d{3})(\\d)(\\d{4,10})","$1 $2 $3",["(?:18|90)0","180|900[1359]"]
 ,"0$1","",0]
 ,[,,"NA","NA"]
 ]
 ,"DK":[,[,,"[2-9]\\d{7}","\\d{8}"]
-,[,,"(?:[2-7]\\d|8[126-9]|9[6-9])\\d{6}","\\d{8}"]
-,[,,"(?:[2-7]\\d|8[126-9]|9[6-9])\\d{6}","\\d{8}"]
+,[,,"(?:[2-7]\\d|8[126-9]|9[16-9])\\d{6}","\\d{8}"]
+,[,,"(?:[2-7]\\d|8[126-9]|9[16-9])\\d{6}","\\d{8}"]
 ,[,,"80\\d{6}","\\d{8}"]
 ,[,,"90\\d{6}","\\d{8}"]
 ,[,,"NA","NA"]
 ]
 ,"IL":[,[,,"[17]\\d{6,9}|[2-589]\\d{3}(?:\\d{3,6})?|6\\d{3}","\\d{4,10}"]
 ,[,,"(?:[2-489]|7[2-46-8])\\d{7}","\\d{7,9}"]
-,[,,"5(?:[0246-9]\\d{2}|5(?:22|33|44|5[58]|66|77|88))\\d{5}","\\d{9}"]
+,[,,"5(?:[02346-9]\\d{2}|5(?:22|33|44|5[58]|66|77|88))\\d{5}","\\d{9}"]
 ,[,,"1(?:80[019]\\d{3}|255)\\d{3}","\\d{7,10}"]
 ,[,,"1(?:212|(?:919|200)\\d{2})\\d{4}","\\d{8,10}"]
 ,[,,"1700\\d{6}","\\d{10}"]
 ]
 ,"IN":[,[,,"1\\d{7,12}|[2-9]\\d{9,10}","\\d{6,13}"]
 ,[,,"(?:11|2[02]|33|4[04]|79)[2-7]\\d{7}|80[2-467]\\d{7}|(?:1(?:2[0-249]|3[0-25]|4[145]|[59][14]|6[014]|7[1257]|8[01346])|2(?:1[257]|3[013]|4[01]|5[0137]|6[0158]|78|8[1568]|9[14])|3(?:26|4[1-3]|5[34]|6[01489]|7[02-46]|8[159])|4(?:1[36]|2[1-47]|3[15]|5[12]|6[126-9]|7[0-24-9]|8[013-57]|9[014-7])|5(?:[136][25]|22|4[28]|5[12]|[78]1|9[15])|6(?:12|[2345]1|57|6[13]|7[14]|80)|7(?:12|2[14]|3[134]|4[47]|5[15]|[67]1|88)|8(?:16|2[014]|3[126]|6[136]|7[078]|8[34]|91))[2-7]\\d{6}|(?:(?:1(?:2[35-8]|3[346-9]|4[236-9]|[59][0235-9]|6[235-9]|7[34689]|8[257-9])|2(?:1[134689]|3[24-8]|4[2-8]|5[25689]|6[2-4679]|7[13-79]|8[2-479]|9[235-9])|3(?:01|1[79]|2[1-5]|4[25-8]|5[125689]|6[235-7]|7[157-9]|8[2-467])|4(?:1[14578]|2[5689]|3[2-467]|5[4-7]|6[35]|73|8[2689]|9[2389])|5(?:[16][146-9]|2[14-8]|3[1346]|4[14-69]|5[46]|7[2-4]|8[2-8]|9[246])|6(?:1[1358]|2[2457]|3[2-4]|4[235-7]|[57][2-689]|6[24-58]|8[1-6])|8(?:1[1357-9]|2[235-8]|3[03-57-9]|4[0-24-9]|5\\d|6[2457-9]|7[1-6]|8[1256]|9[2-4]))\\d|7(?:(?:1[013-9]|2[0235-9]|3[2679]|4[1-35689]|5[2-46-9]|[67][02-9]|9\\d)\\d|8(?:2[0-6]|[013-8]\\d)))[2-7]\\d{5}","\\d{6,10}"]
-,[,,"(?:7(?:2(?:0[04-9]|5[09]|7[5-8]|9[389])|3(?:0[1-9]|[58]\\d|7[3679]|9[689])|4(?:0[1-9]|1[15-9]|[29][89]|39|8[389])|5(?:0\\d|[47]9|[25]0|6[6-9]|[89][7-9])|6(?:0[027]|12|20|3[19]|5[45]|6[5-9]|7[679]|9[6-9])|7(?:0[27-9]|[39][5-9]|42|60)|8(?:[03][07-9]|14|2[7-9]|4[25]|6[09]|7\\d|9[013-9]))|8(?:0(?:[01589]\\d|66)|1(?:[024]\\d|1[56]|30|7[19]|97)|2(?:[2369]\\d|52|7[0135789]|8[01567])|3(?:0[0235-8]|4[14789]|74|90)|4(?:[02-58]\\d|10|6[09])|5(?:0[07-9]|1[01]|[26]\\d|30|4[47]|5[39]|7[45]|8[56]|9[0157])|6(?:[0589]\\d|49|7[0-59])|7(?:1[24]|33|49|[2569]\\d)|8(?:[07-9]\\d|1[057]|2[024-8]|44|5[3589]|6[0167])|9(?:[05-9]\\d|2[35-9]|3[019]|4[036-8]))|9\\d{3})\\d{6}","\\d{10}"]
+,[,,"(?:7(?:2(?:0[04-9]|5[09]|7[5-8]|9[389])|3(?:0[1-9]|[58]\\d|7[3679]|9[689])|4(?:0[1-9]|1[15-9]|[29][89]|39|8[389])|5(?:0\\d|[47]9|[25]0|6[6-9]|[89][7-9])|6(?:0[027]|12|20|3[19]|5[45]|6[5-9]|7[679]|9[6-9])|7(?:0[27-9]|[39][5-9]|42|60)|8(?:[03][07-9]|14|2[7-9]|4[25]|6[09]|7\\d|9[013-9]))|8(?:0(?:[01589]\\d|66)|1(?:[024]\\d|1[56]|30|7[19]|97)|2(?:[2369]\\d|52|7[0135789]|8[01567])|3(?:0[0235-8]|4[14789]|5[7-9]|7[04]|90)|4(?:[02-58]\\d|10|6[09])|5(?:0[07-9]|1[01]|[26]\\d|30|4[47]|5[139]|7[45]|8[56]|9[0157])|6(?:[0589]\\d|49|7[0-59])|7(?:1[24]|33|49|[2569]\\d)|8(?:[07-9]\\d|1[057]|2[02-8]|44|5[3589]|6[0167])|9(?:[05-9]\\d|2[35-9]|3[019]|4[036-8]))|9\\d{3})\\d{6}","\\d{10}"]
 ,[,,"1(?:600\\d{6}|80(?:0\\d{4,8}|3\\d{9}))","\\d{8,13}"]
 ,[,,"186[12]\\d{9}","\\d{13}"]
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
-,"IN",91,"00","0",,,"0",,,,[[,"(\\d{2})(\\d{2})(\\d{6})","$1 $2 $3",["7(?:2[0579]|3[057-9]|4[0-389]|5[024-9]|6[0-35-9]|7[03469]|8[0-4679])|8(?:0[01589]|1[0-479]|2[236-9]|3[0479]|4[0-68]|5|6[045789]|7[1-69]|8[0124-9]|9[02-9])|9","7(?:2(?:0[04-9]|5[09]|7[5-8]|9[389])|3(?:0[1-9]|[58]|7[3679]|9[689])|4(?:0[1-9]|1[15-9]|[29][89]|39|8[389])|5(?:0|[47]9|[25]0|6[6-9]|[89][7-9])|6(?:0[027]|12|20|3[19]|5[45]|6[5-9]|7[679]|9[6-9])|7(?:0[27-9]|3[5-9]|42|60|9[5-9])|8(?:[03][07-9]|14|2[7-9]|4[25]|6[09]|7|9[013-9]))|8(?:0[01589]|1(?:[024]|1[56]|30|7[19]|97)|2(?:[2369]|7[0135789]|8[01567])|3(?:0[0235-8]|4[14789]|74|90)|4(?:[02-58]|10|6[09])|5(?:0[07-9]|1[01]|[26]|30|4[47]|5[39]|8[56]|7[45]|9[0157])|6(?:[0589]|49|7[0-5])|7(?:1[24]|33|49|[2569])|8(?:[07-9]|1[057]|2[024-8]|44|5[3589]|6[0167])|9(?:[05-9]|2[35-9]|3[019]|4[03678]))|9"]
+,"IN",91,"00","0",,,"0",,,,[[,"(\\d{2})(\\d{2})(\\d{6})","$1 $2 $3",["7(?:2[0579]|3[057-9]|4[0-389]|5[024-9]|6[0-35-9]|7[03469]|8[0-4679])|8(?:0[01589]|1[0-479]|2[236-9]|3[04579]|4[0-68]|5|6[045789]|7[1-69]|8[0124-9]|9[02-9])|9","7(?:2(?:0[04-9]|5[09]|7[5-8]|9[389])|3(?:0[1-9]|[58]|7[3679]|9[689])|4(?:0[1-9]|1[15-9]|[29][89]|39|8[389])|5(?:0|[47]9|[25]0|6[6-9]|[89][7-9])|6(?:0[027]|12|20|3[19]|5[45]|6[5-9]|7[679]|9[6-9])|7(?:0[27-9]|3[5-9]|42|60|9[5-9])|8(?:[03][07-9]|14|2[7-9]|4[25]|6[09]|7|9[013-9]))|8(?:0[01589]|1(?:[024]|1[56]|30|7[19]|97)|2(?:[2369]|7[0135789]|8[01567])|3(?:0[0235-8]|4[14789]|5[7-9]|7[04]|90)|4(?:[02-58]|10|6[09])|5(?:0[07-9]|1[01]|[26]|30|4[47]|5[139]|8[56]|7[45]|9[0157])|6(?:[0589]|49|7[0-5])|7(?:1[24]|33|49|[2569])|8(?:[07-9]|1[057]|2[02-8]|44|5[3589]|6[0167])|9(?:[05-9]|2[35-9]|3[019]|4[03678]))|9"]
 ,"0$1","",1]
 ,[,"(\\d{2})(\\d{4})(\\d{4})","$1 $2 $3",["11|2[02]|33|4[04]|79|80[2-46]"]
 ,"0$1","",1]
 ,[,,"NA","NA"]
 ]
 ,"IS":[,[,,"[4-9]\\d{6}|38\\d{7}","\\d{7,9}"]
-,[,,"(?:4(?:1[0-245]|2[0-7]|[37][0-8]|4[0245]|5[0-356]|6\\d|8[0-46-8]|9[013-79])|5(?:05|[156]\\d|2[02578]|3[013-6]|4[03-6]|7[0-2578]|8[0-25-9]|9[013-689])|87[23])\\d{4}","\\d{7}"]
-,[,,"38[59]\\d{6}|(?:6(?:1[0-8]|3[0-27-9]|4[0-27]|5[0-29]|[67][0-69]|9\\d)|7(?:5[057]|7[0-7])|8(?:2[0-5]|[469]\\d|5[1-9]))\\d{4}","\\d{7,9}"]
+,[,,"(?:4(?:1[0-245]|2[0-7]|[37][0-8]|4[0245]|5[0-3568]|6\\d|8[0-36-8])|5(?:05|[156]\\d|2[02578]|3[013-7]|4[03-7]|7[0-2578]|8[0-25-9]|9[013-689])|87[23])\\d{4}","\\d{7}"]
+,[,,"38[59]\\d{6}|(?:6(?:1[0-8]|3[0-27-9]|4[0-27]|5[0-29]|[67][0-69]|9\\d)|7(?:5[057]|7\\d)|8(?:2[0-5]|[469]\\d|5[1-9]))\\d{4}","\\d{7,9}"]
 ,[,,"800\\d{4}","\\d{7}"]
 ,[,,"90\\d{5}","\\d{7}"]
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
-,[,,"49[013-79]\\d{4}","\\d{7}"]
+,[,,"49[0-24-79]\\d{4}","\\d{7}"]
 ,"IS",354,"00",,,,,,,,[[,"(\\d{3})(\\d{4})","$1 $2",["[4-9]"]
 ,"","",0]
 ,[,"(3\\d{2})(\\d{3})(\\d{3})","$1 $2 $3",["3"]
 ,[,,"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]\\d{5}","\\d{6,8}"]
-,[,,"(?:(?:1[0-35-9]|6[6-9]|7[06-9])[1-9]|8(?:0[89]|5[2-689]|8\\d{2}|[13469]\\d|)|9(?:[0-689][1-9]|7[1-9]\\d?))\\d{5}","\\d{8,9}"]
+,[,,"(?:2[3-6]|3[2-6]|4[2-4]|[567][2-5])(?:[2-46-9]|5\\d)\\d{5}","\\d{6,9}"]
+,[,,"(?:(?:1\\d|6[6-9]|7[06-9])[1-9]|8(?:0[89]|5[2-689]|8\\d{2}|[13469]\\d|)|9(?:[0-689][1-9]|7[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}"]
 ,[,,"NA","NA"]
 ,,[,,"9(?:11|99)","\\d{3}"]
 ,[,,"NA","NA"]
 ]
-,"LI":[,[,,"(?:66|80|90)\\d{7}|[237-9]\\d{6}","\\d{7,9}"]
-,[,,"(?:2(?:17|3\\d|6[02-58]|96)|3(?:02|7[01357]|8[048]|9[0269])|870)\\d{4}","\\d{7}"]
-,[,,"66(?:[0178][0-4]|2[025-9]|[36]\\d|4[129]|5[45]|9[019])\\d{5}|7(?:4[2-59]|56|[6-9]\\d)\\d{4}","\\d{7,9}"]
-,[,,"80(?:0(?:07|2[238]|79|\\d{4})|9\\d{2})\\d{2}","\\d{7,9}"]
-,[,,"NA","NA"]
-,[,,"90(?:0(?:2[278]|79|\\d{4})|1(?:23|\\d{4})|6(?:66|\\d{4}))\\d{2}","\\d{7,9}"]
+,"LI":[,[,,"6\\d{8}|[23789]\\d{6}","\\d{7,9}"]
+,[,,"(?:2(?:01|1[27]|3\\d|6[02-578]|96)|3(?:7[0135-7]|8[048]|9[0269])|870)\\d{4}","\\d{7}"]
+,[,,"6(?:51[01]|6(?:[01][0-4]|2[016-9]|88|92)|710)\\d{5}|7(?:36|4[25]|56|[6-9]\\d)\\d{4}","\\d{7,9}"]
+,[,,"80(?:0(?:2[238]|79)|9\\d{2})\\d{2}","\\d{7}"]
+,[,,"NA","NA"]
+,[,,"90(?:0(?:2[278]|79)|1(?:23|3[012])|6(?:4\\d|6[0126]))\\d{2}","\\d{7}"]
 ,[,,"701\\d{4}","\\d{7}"]
 ,[,,"NA","NA"]
-,"LI",423,"00","0",,,"0",,,,[[,"(\\d{3})(\\d{2})(\\d{2})","$1 $2 $3",["[23]|7[4-9]|87"]
+,"LI",423,"00","0",,,"0",,,,[[,"(\\d{3})(\\d{2})(\\d{2})","$1 $2 $3",["[23]|7[3-9]|87"]
 ,"","",0]
 ,[,"(6\\d)(\\d{3})(\\d{3})","$1 $2 $3",["6"]
 ,"","",0]
+,[,"(6[567]\\d)(\\d{3})(\\d{3})","$1 $2 $3",["6[567]"]
+,"","",0]
+,[,"(69)(7\\d{2})(\\d{4})","$1 $2 $3",["697"]
+,"","",0]
 ,[,"([7-9]0\\d)(\\d{2})(\\d{2})","$1 $2 $3",["[7-9]0"]
 ,"","",0]
 ,[,"([89]0\\d)(\\d{2})(\\d{2})(\\d{2})","$1 $2 $3 $4",["[89]0"]
 ]
 ,,[,,"NA","NA"]
 ,,,[,,"NA","NA"]
-,[,,"NA","NA"]
+,[,,"87(?:0[1289]|70)\\d{3}","\\d{7}"]
 ,,[,,"1(?:1[278]|44)","\\d{3}"]
-,[,,"NA","NA"]
+,[,,"697(?:[35]6|4[25]|[7-9]\\d)\\d{4}","\\d{9}"]
 ]
 ,"LK":[,[,,"[1-9]\\d{8}","\\d{7,9}"]
 ,[,,"(?:[189]1|2[13-7]|3[1-8]|4[157]|5[12457]|6[35-7])[2-57]\\d{6}","\\d{7,9}"]
 ]
 ,"LR":[,[,,"(?:[29]\\d|[4-6]|7\\d{1,2}|[38]\\d{2})\\d{6}","\\d{7,9}"]
 ,[,,"2\\d{7}","\\d{8}"]
-,[,,"(?:4[67]|5\\d|6[4-8]|7(?:7[67]\\d|\\d{2})|880\\d)\\d{5}","\\d{7,9}"]
+,[,,"(?:4[67]|5\\d|6[4-8]|7(?:7[67]\\d|\\d{2})|88\\d{2})\\d{5}","\\d{7,9}"]
 ,[,,"NA","NA"]
 ,[,,"90\\d{6}","\\d{8}"]
 ,[,,"NA","NA"]
 ]
 ,"MA":[,[,,"[5689]\\d{8}","\\d{9}"]
 ,[,,"5(?:2(?:(?:[015-7]\\d|2[2-9]|3[2-57]|4[2-8]|8[235-9]|)\\d|9(?:0\\d|[89]0))|3(?:(?:[0-4]\\d|[57][2-9]|6[235-8]|9[3-9])\\d|8(?:0\\d|[89]0)))\\d{4}","\\d{9}"]
-,[,,"6(?:0[0-6]|[14-7]\\d|2[23679]|3[03458]|8[01]|99)\\d{6}","\\d{9}"]
+,[,,"6(?:0[0-6]|[14-7]\\d|2[236-9]|3[03458]|8[01]|99)\\d{6}","\\d{9}"]
 ,[,,"80\\d{7}","\\d{9}"]
 ,[,,"89\\d{7}","\\d{9}"]
 ,[,,"NA","NA"]
 ,,[,,"1(?:12|[578])","\\d{2,3}"]
 ,[,,"NA","NA"]
 ]
-,"MD":[,[,,"[25-9]\\d{7}","\\d{8}"]
-,[,,"(?:2(?:1[0569]|2\\d|3[015-7]|4[1-46-9]|5[0-24689]|6[2-589]|7[1-37]|9[1347-9])|5(?:33|5[257]))\\d{5}","\\d{5,8}"]
+,"MD":[,[,,"[235-9]\\d{7}","\\d{8}"]
+,[,,"(?:2(?:1[0569]|2\\d|3[015-7]|4[1-46-9]|5[0-24689]|6[2-589]|7[1-37]|9[1347-9])|5(?:33|5[257]))\\d{5}","\\d{8}"]
 ,[,,"(?:562|6(?:50|7[1-5]|[089]\\d)|7(?:7[47-9]|[89]\\d))\\d{5}","\\d{8}"]
 ,[,,"800\\d{5}","\\d{8}"]
 ,[,,"90[056]\\d{5}","\\d{8}"]
 ,[,,"808\\d{5}","\\d{8}"]
 ,[,,"NA","NA"]
-,[,,"NA","NA"]
-,"MD",373,"00","0",,,"0",,,,[[,"(22)(\\d{3})(\\d{3})","$1 $2 $3",["22"]
+,[,,"3[08]\\d{6}","\\d{8}"]
+,"MD",373,"00","0",,,"0",,,,[[,"(\\d{2})(\\d{3})(\\d{3})","$1 $2 $3",["22|3"]
 ,"0$1","",0]
 ,[,"([25-7]\\d{2})(\\d{2})(\\d{3})","$1 $2 $3",["2[13-79]|[5-7]"]
 ,"0$1","",0]
 ]
 ,"MK":[,[,,"[2-578]\\d{7}","\\d{8}"]
 ,[,,"(?:2(?:[23]\\d|5[125]|6[01])|3(?:1[3-6]|2[2-6]|3[2-5]|4[235])|4(?:[23][2-6]|4[3-6]|5[25]|6[25-8]|7[24-6]|8[4-6]))\\d{5}","\\d{6,8}"]
-,[,,"7[0-25-8]\\d{6}","\\d{8}"]
+,[,,"7(?:[0-25-8]\\d|33)\\d{5}","\\d{8}"]
 ,[,,"800\\d{5}","\\d{8}"]
 ,[,,"5[02-9]\\d{6}","\\d{8}"]
 ,[,,"8(?:0[1-9]|[1-9]\\d)\\d{5}","\\d{8}"]
 ,[,,"NA","NA"]
 ]
 ,"PA":[,[,,"[1-9]\\d{6,7}","\\d{7,8}"]
-,[,,"(?:1(?:0[02-579]|19|23|3[03]|4[479]|57|65|7[016-8]|8[58]|9[134])|2(?:[0235679]\\d|1[0-7]|4[04-9]|8[028])|3(?:0[0-7]|1[14-7]|2[0-3]|3[03]|4[0457]|5[56]|6[068]|7[078]|80|9\\d)|4(?:3[013-59]|4\\d|7[0-689])|5(?:[01]\\d|2[0-7]|[56]0|79)|7(?:0[09]|2[0-267]|[34]0|5[6-9]|7[0-24-7]|8[89])|8(?:[34]\\d|5[0-5]|8[02])|9(?:0[78]|1[0178]|2[0378]|3[379]|40|5[0489]|6[06-9]|7[046-9]|8[36-8]|9[1-9]))\\d{4}","\\d{7}"]
+,[,,"(?:1(?:0[02-579]|19|2[37]|3[03]|4[479]|57|65|7[016-8]|8[58]|9[134])|2(?:[0235679]\\d|1[0-7]|4[04-9]|8[028])|3(?:0[0-7]|1[14-7]|2[0-3]|3[03]|4[0457]|5[56]|6[068]|7[078]|80|9\\d)|4(?:3[013-59]|4\\d|7[0-689])|5(?:[01]\\d|2[0-7]|[56]0|79)|7(?:0[09]|2[0-267]|[349]0|5[6-9]|7[0-24-7]|8[89])|8(?:[34]\\d|5[0-4]|8[02])|9(?:0[78]|1[0178]|2[0378]|3[379]|40|5[0489]|6[06-9]|7[046-9]|8[36-8]|9[1-9]))\\d{4}","\\d{7}"]
 ,[,,"(?:1[16]1|21[89]|8(?:1[01]|7[23]))\\d{4}|6(?:[04-9]\\d|1[0-5]|2[0-6]|3[6-9])\\d{5}","\\d{7,8}"]
 ,[,,"80[09]\\d{4}","\\d{7}"]
-,[,,"(?:779|8(?:2[235]|60|7[578]|86|95)|9(?:0[0-2]|81))\\d{4}","\\d{7}"]
+,[,,"(?:779|8(?:2[235]|55|60|7[578]|86|95)|9(?:0[0-2]|81))\\d{4}","\\d{7}"]
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
 ,,[,,"1(?:12|[578])","\\d{2,3}"]
 ,[,,"NA","NA"]
 ]
-,"RO":[,[,,"[237-9]\\d{8}","\\d{9}"]
-,[,,"[23][13-6]\\d{7}","\\d{9}"]
+,"RO":[,[,,"2\\d{5,8}|[37-9]\\d{8}","\\d{6,9}"]
+,[,,"2(?:1(?:\\d{7}|9\\d{3})|[3-6](?:\\d{7}|\\d9\\d{2}))|3[13-6]\\d{7}","\\d{6,9}"]
 ,[,,"7[1-8]\\d{7}","\\d{9}"]
 ,[,,"800\\d{6}","\\d{9}"]
 ,[,,"90[036]\\d{6}","\\d{9}"]
 ,[,,"NA","NA"]
 ,"RO",40,"00","0"," int ",,"0",,,,[[,"([237]\\d)(\\d{3})(\\d{4})","$1 $2 $3",["[23]1|7"]
 ,"0$1","",0]
-,[,"(\\d{3})(\\d{3})(\\d{3})","$1 $2 $3",["[23][02-9]|[89]"]
+,[,"(21)(\\d{4})","$1 $2",["21"]
+,"0$1","",0]
+,[,"(\\d{3})(\\d{3})(\\d{3})","$1 $2 $3",["[23][3-7]|[89]"]
+,"0$1","",0]
+,[,"(2\\d{2})(\\d{3})","$1 $2",["2[3-6]"]
 ,"0$1","",0]
 ]
 ,,[,,"NA","NA"]
 ,1,[,,"112","\\d{3}"]
 ,[,,"NA","NA"]
 ]
-,"SA":[,[,,"[1-467]\\d{7}|5\\d{8}|(?:8|92)\\d{9}","\\d{7,11}"]
+,"SA":[,[,,"(?:[1-467]|92)\\d{7}|5\\d{8}|8\\d{9}","\\d{7,10}"]
 ,[,,"(?:[12][24-8]|3[35-8]|4[3-68]|6[2-5]|7[235-7])\\d{6}","\\d{7,8}"]
 ,[,,"(?:5[013-689]\\d|8111)\\d{6}","\\d{9,10}"]
 ,[,,"800\\d{7}","\\d{10}"]
-,[,,"9200\\d{7}","\\d{11}"]
+,[,,"NA","NA"]
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
 ,"SA",966,"00","0",,,"0",,,,[[,"([1-467])(\\d{3})(\\d{4})","$1 $2 $3",["[1-467]"]
 ,"0$1","",0]
-,[,"(9200)(\\d{3})(\\d{4})","$1 $2 $3",["9"]
-,"0$1","",0]
 ,[,"(5\\d)(\\d{3})(\\d{4})","$1 $2 $3",["5"]
 ,"0$1","",0]
+,[,"(9200)(\\d{5})","$1 $2",["9"]
+,"$1","",0]
 ,[,"(800)(\\d{3})(\\d{4})","$1 $2 $3",["80"]
-,"0$1","",0]
+,"$1","",0]
 ,[,"(8111)(\\d{3})(\\d{3})","$1 $2 $3",["81"]
 ,"0$1","",0]
 ]
 ,,[,,"NA","NA"]
 ,,,[,,"NA","NA"]
-,[,,"NA","NA"]
+,[,,"9200\\d{5}","\\d{9}"]
 ,,[,,"99[7-9]","\\d{3}"]
 ,[,,"NA","NA"]
 ]
 ,[,,"NA","NA"]
 ]
 ,"SG":[,[,,"[36]\\d{7}|[17-9]\\d{7,10}","\\d{8,11}"]
-,[,,"6[1-8]\\d{6}","\\d{8}"]
-,[,,"(?:8[1-6]|9[0-8])\\d{6}","\\d{8}"]
+,[,,"6[1-9]\\d{6}","\\d{8}"]
+,[,,"(?:8[1-7]|9[0-8])\\d{6}","\\d{8}"]
 ,[,,"1?800\\d{7}","\\d{10,11}"]
 ,[,,"1900\\d{7}","\\d{11}"]
 ,[,,"NA","NA"]
 ,,[,,"115","\\d{3}"]
 ,[,,"NA","NA"]
 ]
-,"SS":[,[,,"[1489]\\d{8}","\\d{9}"]
-,[,,"(?:1[67]\\d|811)\\d{6}","\\d{9}"]
-,[,,"(?:1(?:02|2[1269])|477|9(?:0[03689]|1\\d|2[024-9]|5[5-79]|77|98))\\d{6}","\\d{9}"]
+,"SS":[,[,,"[19]\\d{8}","\\d{9}"]
+,[,,"18\\d{7}","\\d{9}"]
+,[,,"(?:12|9[1257])\\d{7}","\\d{9}"]
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
 ,,[,,"NA","NA"]
 ,[,,"NA","NA"]
 ]
+,"881":[,[,,"[67]\\d{8}","\\d{9}"]
+,[,,"NA","NA"]
+,[,,"[67]\\d{8}","\\d{9}"]
+,[,,"NA","NA"]
+,[,,"NA","NA"]
+,[,,"NA","NA"]
+,[,,"NA","NA"]
+,[,,"NA","NA"]
+,"001",881,"",,,,,,,,[[,"(\\d)(\\d{3})(\\d{5})","$1 $2 $3",["[67]"]
+,"","",0]
+]
+,,[,,"NA","NA"]
+,,,[,,"NA","NA"]
+,[,,"NA","NA"]
+,,[,,"NA","NA"]
+,[,,"NA","NA"]
+]
 ,"883":[,[,,"51\\d{7}(?:\\d{3})?","\\d{9}(?:\\d{3})?"]
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]

resources/PhoneNumberMetaData.xml

         <possibleNumberPattern>\d{4}</possibleNumberPattern>
       </generalDesc>
       <fixedLine>
-        <!-- The prefix 70 has been added since it has been seen online, such as for the number of
-             the Ascension Island local government itself. -->
-        <nationalNumberPattern>
-          (?:
+        <nationalNumberPattern>
+          (?:
+            [267]\d|
             3[0-5]|
-            4[4-6]|
-            [26]\d|
-            70
+            4[4-69]
           )\d{2}
         </nationalNumberPattern>
         <possibleNumberPattern>\d{4}</possibleNumberPattern>
         <exampleNumber>22123456</exampleNumber>
       </fixedLine>
       <mobile>
-        <!-- Adding 8[67] prefix after numbers were found online where these prefixes have been
+        <!-- Adding 8[5-7] prefix after numbers were found online where these prefixes have been
              assigned.-->
         <nationalNumberPattern>
           5(?:
             7[01]
           )\d{5}|
           [67][01]\d{6}|
-          8[36-9]\d{6}
+          8[35-9]\d{6}
         </nationalNumberPattern>
         <possibleNumberPattern>\d{8}</possibleNumberPattern>
         <exampleNumber>83123456</exampleNumber>
           <format>$1/$2</format>
         </numberFormat>
         <!-- http://www.t-mobile.de/servicehotlines/0,13401,17660-_,00.html -->
-        <numberFormat pattern="([18]\d{2})(\d{7,9})">
+        <numberFormat pattern="([18]\d{2})(\d{7,10})">
           <leadingDigits>
             1[5-7]|
             800
         <exampleNumber>16412345</exampleNumber>
       </pager>
       <tollFree>
-        <nationalNumberPattern>800\d{7,9}</nationalNumberPattern>
-        <possibleNumberPattern>\d{10,12}</possibleNumberPattern>
-        <exampleNumber>8001234567</exampleNumber>
+        <nationalNumberPattern>800\d{7,10}</nationalNumberPattern>
+        <possibleNumberPattern>\d{10,13}</possibleNumberPattern>
+        <exampleNumber>8001234567890</exampleNumber>
       </tollFree>
       <premiumRate>
         <nationalNumberPattern>
         <nationalNumberPattern>[2-9]\d{7}</nationalNumberPattern>
         <possibleNumberPattern>\d{8}</possibleNumberPattern>
       </generalDesc>
-      <!-- There are some overlaps for some number prefixes - the plan says that they are 'mainly'
-           used for a certain type of number. For this reason, both "mainly mobile" and "mainly
-           fixed-line" are put under both number types. -->
+      <!-- Note that "mainly mobile" and "mainly fixed-line" are put under both number types to be
+           safe. -->
       <fixedLine>
         <nationalNumberPattern>
           (?:
             [2-7]\d|
             8[126-9]|
-            9[6-9]
+            9[16-9]
           )\d{6}
         </nationalNumberPattern>
         <exampleNumber>32123456</exampleNumber>
           (?:
             [2-7]\d|
             8[126-9]|
-            9[6-9]
+            9[16-9]
           )\d{6}
         </nationalNumberPattern>
         <exampleNumber>20123456</exampleNumber>
       <mobile>
         <nationalNumberPattern>
           5(?:
-            [0246-9]\d{2}|
+            [02346-9]\d{2}|
             5(?:
               22|
               33|
                0[01589]|
                1[0-479]|
                2[236-9]|
-               3[0479]|
+               3[04579]|
                4[0-68]|
                5|
                6[045789]|
                3(?:
                  0[0235-8]|
                  4[14789]|
-                 74|
+                 5[7-9]|
+                 7[04]|
                  90
                )|
                4(?:
                  [26]|
                  30|
                  4[47]|
-                 5[39]|
+                 5[139]|
                  8[56]|
                  7[45]|
                  9[0157]
                8(?:
                  [07-9]|
                  1[057]|
-                 2[024-8]|
+                 2[02-8]|
                  44|
                  5[3589]|
                  6[0167]
         <!-- A couple of additional prefixes not found on the wikipedia page, are added because SMS
              messages have been successfully sent to these numbers. It seems almost impossible to
              know for some of these numbers whether they are land-line or mobile, since the ranges
-             overlap. Extra prefixes added: 7277, 730[124-689], 735[0-24-8], 738[0-57], 740[34679],
-             750[679], 7796, 787[34], 7896, 810[1-358], 811[56], 812[02569], 814[01], 8171, 8179,
-             822[1-689], 823[0-24-9], 826[0-35-7], 827[0137-9], 828[01], 829[0-2479], the ranges in
-             83X excepting 830[037], 834[14] and 8390, 840[02-57-9], 842[24-689], 843[0-59],
-             844[0-489], 845[0-24-689], 846[09], 847[0135], 848[0-8], 850[7-9], 8510, 852[02-589],
-             8530, 854[47], 8559, 856[0-5], 8586, 859[57], 860[1259], 8649, 865[03-79], 867[0-59],
-             868[349], 869[0-46], 872[013-9], 8749, 875[1-35-9], 876[0-47], 879[4589], 881[05],
-             8824, 8859, 892[67], 894[6-8], 896[3-6]. -->
+             overlap. Extra prefixes added: 730[125689], 735[0-24-8], 738[0-4], 740[34679],
+             750[679], 7796, 7874, 7896, 810[158], 8115, 812[25], 814[01], 8179, 822[1-689],
+             823[0-24-9], 826[0-35-7], 827[0137-9], 828[01], 829[0-2479], the ranges in 83X
+             excepting 830[0378], 834[149] 835[7-9], 8370, and 8390, 840[2-57-9], 842[24-689],
+             843[0-359], 844[0-489], 845[0-24-689], 8469, 847[0135], 848[0-8], 850[7-9], 8510,
+             852[02-589], 8530, 8544, 8559, 856[0-5], 8586, 8597, 860[1259], 8649, 865[03-79],
+             867[0-59], 868[349], 869[0-46], 872[013-79], 8749, 875[1-36-9], 876[0-47], 879[489],
+             881[05], 8824, 8859, 892[67], 894[6-8], 896[3-6]. -->
         <nationalNumberPattern>
           (?:
             7(?:
               3(?:
                 0[0235-8]|
                 4[14789]|
-                74|
+                5[7-9]|
+                7[04]|
                 90
               )|
               4(?:
                 [26]\d|
                 30|
                 4[47]|
-                5[39]|
+                5[139]|
                 7[45]|
                 8[56]|
                 9[0157]
               8(?:
                 [07-9]\d|
                 1[057]|
-                2[024-8]|
+                2[02-8]|
                 44|
                 5[3589]|
                 6[0167]
               2[0-7]|
               [37][0-8]|
               4[0245]|
-              5[0-356]|
+              5[0-3568]|
               6\d|
-              8[0-46-8]|
-              9[013-79]
+              8[0-36-8]
             )|
             5(?:
               05|
               [156]\d|
               2[02578]|
-              3[013-6]|
-              4[03-6]|
+              3[013-7]|
+              4[03-7]|
               7[0-2578]|
               8[0-25-9]|
               9[013-689]
             )|
             7(?:
               5[057]|
-              7[0-7]
+              7\d
             )|
             8(?:
               2[0-5]|
         <exampleNumber>9011234</exampleNumber>
       </premiumRate>
       <voip>
-        <nationalNumberPattern>49[013-79]\d{4}</nationalNumberPattern>
-        <possibleNumberPattern>\d{7}</possibleNumberPattern>
-        <exampleNumber>4931234</exampleNumber>
+        <nationalNumberPattern>49[0-24-79]\d{4}</nationalNumberPattern>
+        <possibleNumberPattern>\d{7}</possibleNumberPattern>
+        <exampleNumber>4921234</exampleNumber>
       </voip>
       <voicemail>
         <nationalNumberPattern>
         <possibleNumberPattern>\d{6,10}</possibleNumberPattern>
       </generalDesc>
       <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. -->
         <nationalNumberPattern>
           (?:
             2[3-6]|
             3[2-6]|
             4[2-4]|
             [567][2-5]
-          )[2-46-9]\d{5}
-        </nationalNumberPattern>
-        <possibleNumberPattern>\d{6,8}</possibleNumberPattern>
+          )(?:
+            [2-46-9]|
+            5\d
+          )\d{5}
+        </nationalNumberPattern>
+        <possibleNumberPattern>\d{6,9}</possibleNumberPattern>
         <exampleNumber>23456789</exampleNumber>
       </fixedLine>
       <mobile>
         <!-- Adding 86 from numbers found online, along with 88 (these numbers seem to be one digit
              longer as well.) Adding 97 followed by 7 digits as such numbers have been found online.
-             -->
+             Adding 14 as Mobitel have informed us they are using this prefix. -->
         <nationalNumberPattern>
           (?:
             (?:
-              1[0-35-9]|
+              1\d|
               6[6-9]|
               7[06-9]
             )[1-9]|
         <numberFormat pattern="(\d{3})(\d{2})(\d{2})">
           <leadingDigits>
             [23]|
-            7[4-9]|
+            7[3-9]|
             87
           </leadingDigits>
           <format>$1 $2 $3</format>
           <leadingDigits>6</leadingDigits>
           <format>$1 $2 $3</format>
         </numberFormat>
+        <numberFormat pattern="(6[567]\d)(\d{3})(\d{3})">
+          <leadingDigits>6[567]</leadingDigits>
+          <format>$1 $2 $3</format>
+        </numberFormat>
+        <numberFormat pattern="(69)(7\d{2})(\d{4})">
+          <leadingDigits>697</leadingDigits>
+          <format>$1 $2 $3</format>
+        </numberFormat>
         <numberFormat pattern="([7-9]0\d)(\d{2})(\d{2})">
           <leadingDigits>[7-9]0</leadingDigits>
           <format>$1 $2 $3</format>
         </numberFormat>
+        <!-- Numbers of the form [89]00\d{6} are Swiss numbers callable from Liechtenstein. -->
         <numberFormat pattern="([89]0\d)(\d{2})(\d{2})(\d{2})"
           nationalPrefixFormattingRule="$NP$FG">
           <leadingDigits>[89]0</leadingDigits>
       </availableFormats>
       <generalDesc>
         <nationalNumberPattern>
-          (?:
-            66|
-            80|
-            90
-          )\d{7}|
-          [237-9]\d{6}
+          6\d{8}|
+          [23789]\d{6}
         </nationalNumberPattern>
         <possibleNumberPattern>\d{7,9}</possibleNumberPattern>
       </generalDesc>
         <nationalNumberPattern>
           (?:
             2(?:
-              17|
+              01|
+              1[27]|
               3\d|
-              6[02-58]|
+              6[02-578]|
               96
             )|
             3(?:
-              02|
-              7[01357]|
+              7[0135-7]|
               8[048]|
               9[0269]
             )|
       </fixedLine>
       <mobile>
         <nationalNumberPattern>
-          66(?:
-            [0178][0-4]|
-            2[025-9]|
-            [36]\d|
-            4[129]|
-            5[45]|
-            9[019]
+          6(?:
+            51[01]|
+            6(?:
+              [01][0-4]|
+              2[016-9]|
+              88|
+              92
+            )|
+            710
           )\d{5}|
           7(?:
-            4[2-59]|
+            36|
+            4[25]|
             56|
             [6-9]\d
           )\d{4}
         <possibleNumberPattern>\d{7,9}</possibleNumberPattern>
         <exampleNumber>661234567</exampleNumber>
       </mobile>
+      <!-- The prefix 809 seems to be used for AT&T and Verizon access lines from Liechtenstein,
+           even though it doesn't appear in the plan. -->
       <tollFree>
         <nationalNumberPattern>
           80(?:
             0(?:
-              07|
               2[238]|
-              79|
-              \d{4}
+              79
             )|
             9\d{2}
           )\d{2}
         </nationalNumberPattern>
-        <possibleNumberPattern>\d{7,9}</possibleNumberPattern>
+        <possibleNumberPattern>\d{7}</possibleNumberPattern>
         <exampleNumber>8002222</exampleNumber>
       </tollFree>
       <sharedCost>
           90(?:
             0(?:
               2[278]|
-              79|
-              \d{4}
+              79
             )|
             1(?:
               23|
-              \d{4}
-            )|
-            6(?:
-              66|
-              \d{4}
+              3[012]
+            )|
+            6(?:
+              4\d|
+              6[0126]
             )
           )\d{2}
         </nationalNumberPattern>
-        <possibleNumberPattern>\d{7,9}</possibleNumberPattern>
+        <possibleNumberPattern>\d{7}</possibleNumberPattern>
         <exampleNumber>9002222</exampleNumber>
       </sharedCost>
+      <uan>
+        <nationalNumberPattern>
+          87(?:
+            0[1289]|
+            70
+          )\d{3}
+        <possibleNumberPattern>\d{7}</possibleNumberPattern>
+        <exampleNumber>8770123</exampleNumber>
+        </nationalNumberPattern>
+      </uan>
+      <voicemail>
+        <nationalNumberPattern>
+          697(?:
+            [35]6|
+            4[25]|
+            [7-9]\d
+          )\d{4}
+        </nationalNumberPattern>
+        <possibleNumberPattern>\d{9}</possibleNumberPattern>
+        <exampleNumber>697361234</exampleNumber>
+      </voicemail>
       <personalNumber>
         <nationalNumberPattern>701\d{4}</nationalNumberPattern>
         <possibleNumberPattern>\d{7}</possibleNumberPattern>
         <exampleNumber>21234567</exampleNumber>
       </fixedLine>
       <mobile>
-        <!-- Added 66, 67 and 68 as prefixes because of online numbers fitting this pattern. It
-             seems that 88-0xx is also being used, for 9-digit long numbers, and that some numbers
-             beginning with 77[67] are also 9 digits long now. -->
+        <!-- According to information from Lonestar Communications Corporation, the prefix 6 is
+             being removed, but as of June 2012 is in parallel running with their new prefix 88.
+             It seems some numbers beginning with 77[67] are also 9 digits long now. -->
         <nationalNumberPattern>
           (?:
             4[67]|
               7[67]\d|
               \d{2}
             )|
-            880\d
+            88\d{2}
           )\d{5}
         </nationalNumberPattern>
         <exampleNumber>4612345</exampleNumber>
         <exampleNumber>520123456</exampleNumber>
       </fixedLine>
       <mobile>
-        <!-- Prefixes 60[1-5], 62[79], 63[0458] and 68[01] are from numbers found online,
+        <!-- Prefixes 60[1-5], 62[7-9], 63[0458] and 68[01] are from numbers found online,
              bug-reports, and information provided directly by the carriers. -->
         <nationalNumberPattern>
           6(?:
             0[0-6]|
             [14-7]\d|
-            2[23679]|
+            2[236-9]|
             3[03458]|
             8[01]|
             99
     <!-- http://www.itu.int/oth/T020200008C/en -->
     <!-- http://en.anrceti.md -->
     <territory id="MD" countryCode="373" internationalPrefix="00"
-               nationalPrefix="0" nationalPrefixFormattingRule="$NP$FG">
-      <availableFormats>
-        <numberFormat pattern="(22)(\d{3})(\d{3})">
-          <leadingDigits>22</leadingDigits>
+               nationalPrefix="0" nationalPrefixFormattingRule="$NP$FG" >
+      <availableFormats>
+        <numberFormat pattern="(\d{2})(\d{3})(\d{3})">
+          <leadingDigits>
+            22|
+            3
+          </leadingDigits>
           <format>$1 $2 $3</format>
         </numberFormat>
         <numberFormat pattern="([25-7]\d{2})(\d{2})(\d{3})">
         </numberFormat>
       </availableFormats>
       <generalDesc>
-        <nationalNumberPattern>[25-9]\d{7}</nationalNumberPattern>
+        <nationalNumberPattern>[235-9]\d{7}</nationalNumberPattern>
         <possibleNumberPattern>\d{8}</possibleNumberPattern>
       </generalDesc>
       <fixedLine>
             )
           )\d{5}
         </nationalNumberPattern>
-        <possibleNumberPattern>\d{5,8}</possibleNumberPattern>
         <exampleNumber>22212345</exampleNumber>
       </fixedLine>
       <mobile>
         </nationalNumberPattern>
         <exampleNumber>80312345</exampleNumber>
       </uan>
+      <voip>
+        <!-- Used for "nomadic numbers". -->
+        <nationalNumberPattern>3[08]\d{6}</nationalNumberPattern>
+        <exampleNumber>30123456</exampleNumber>
+      </voip>
       <shortCode>
         <nationalNumberPattern>
           1(?:
     </territory>
 
     <!-- Macedonia, Former Yugoslav Rep. of -->
-    <!-- http://en.wikipedia.org/wiki/%2B389
-         http://www.aek.mk/ go to Telecommunications, Numbering, then Numbering plan. -->
+    <!-- http://www.itu.int/oth/T02020000CE/en -->
     <territory id="MK" countryCode="389" internationalPrefix="00"
                nationalPrefix="0" nationalPrefixFormattingRule="$NP$FG">
       <availableFormats>
         <exampleNumber>22212345</exampleNumber>
       </fixedLine>
       <mobile>
-        <nationalNumberPattern>7[0-25-8]\d{6}</nationalNumberPattern>
+        <nationalNumberPattern>
+          7(?:
+            [0-25-8]\d|
+            33
+          )\d{5}</nationalNumberPattern>
         <exampleNumber>72345678</exampleNumber>
       </mobile>
       <tollFree>
     </territory>
 
     <!-- Panama -->
-    <!-- http://www.asep.gob.pa/telecom/pnn/default.asp - last read March 22th 2012. -->
+    <!-- http://www.asep.gob.pa/telecom/pnn/default.asp - last read June 6th 2012. -->
     <!-- http://en.wikipedia.org/wiki/%2B507 - although it omits the fact that mobile phones are 8
          digits long. -->
     <territory id="PA" countryCode="507" internationalPrefix="00">
             1(?:
               0[02-579]|
               19|
-              23|
+              2[37]|
               3[03]|
               4[479]|
               57|
             7(?:
               0[09]|
               2[0-267]|
-              [34]0|
+              [349]0|
               5[6-9]|
               7[0-24-7]|
               8[89]
             )|
             8(?:
               [34]\d|
-              5[0-5]|
+              5[0-4]|
               8[02]
             )|
             9(?:
             779|
             8(?:
               2[235]|
+              55|
               60|
               7[578]|
               86|
           <leadingDigits>[1-467]</leadingDigits>
           <format>$1 $2 $3</format>
         </numberFormat>
-        <numberFormat pattern="(9200)(\d{3})(\d{4})">
-          <leadingDigits>9</leadingDigits>
-          <format>$1 $2 $3</format>
-        </numberFormat>
         <numberFormat pattern="(5\d)(\d{3})(\d{4})">
           <leadingDigits>5</leadingDigits>
           <format>$1 $2 $3</format>
         </numberFormat>
-        <numberFormat pattern="(800)(\d{3})(\d{4})">
+        <!-- It seems that the trunk prefix is not used for these numbers, based on wikipedia and on
+             the fact that no numbers of this form found online have a trunk prefix added. -->
+        <numberFormat pattern="(9200)(\d{5})" nationalPrefixFormattingRule="$FG">
+          <leadingDigits>9</leadingDigits>
+          <format>$1 $2</format>
+        </numberFormat>
+        <numberFormat pattern="(800)(\d{3})(\d{4})" nationalPrefixFormattingRule="$FG">
           <leadingDigits>80</leadingDigits>
           <format>$1 $2 $3</format>
         </numberFormat>
         <!-- The more detailed pattern here is to allow the country-code to be stripped off for
              fixed-line numbers. -->
         <nationalNumberPattern>
-          [1-467]\d{7}|
+          (?:
+            [1-467]|
+            92
+          )\d{7}|
           5\d{8}|
-          (?:
-            8|
-            92
-          )\d{9}
-        </nationalNumberPattern>
-        <possibleNumberPattern>\d{7,11}</possibleNumberPattern>
+          8\d{9}
+        </nationalNumberPattern>
+        <possibleNumberPattern>\d{7,10}</possibleNumberPattern>
       </generalDesc>
       <fixedLine>
         <!-- Adding 18 as a prefix after numbers found with this prefix online.  -->
         <possibleNumberPattern>\d{10}</possibleNumberPattern>
         <exampleNumber>8001234567</exampleNumber>
       </tollFree>
-      <premiumRate>
-        <nationalNumberPattern>9200\d{7}</nationalNumberPattern>
-        <possibleNumberPattern>\d{11}</possibleNumberPattern>
-        <exampleNumber>92001234567</exampleNumber>
-      </premiumRate>
+      <uan>
+        <nationalNumberPattern>9200\d{5}</nationalNumberPattern>
+        <possibleNumberPattern>\d{9}</possibleNumberPattern>
+        <exampleNumber>920012345</exampleNumber>
+      </uan>
       <shortCode>
         <nationalNumberPattern>
           9(
         <possibleNumberPattern>\d{8,11}</possibleNumberPattern>
       </generalDesc>
       <fixedLine>
-        <nationalNumberPattern>6[1-8]\d{6}</nationalNumberPattern>
+        <nationalNumberPattern>6[1-9]\d{6}</nationalNumberPattern>
         <possibleNumberPattern>\d{8}</possibleNumberPattern>
         <exampleNumber>61234567</exampleNumber>
       </fixedLine>
       <mobile>
         <nationalNumberPattern>
           (?:
-            8[1-6]|
+            8[1-7]|
             9[0-8]
           )\d{6}
         </nationalNumberPattern>
     <!-- South Sudan -->
     <!-- http://www.itu.int/oth/T02020000F9/en -->
     <!-- http://en.wikipedia.org/wiki/+211 -->
-    <!-- These number sources disagree over whether the number length should be 7 or 10 digits. The
-         contact numbers for the South Sudan telecommunications authority, along with all numbers
-         seen online, are 9 digits, so we follow this instead. -->
     <territory id="SS" countryCode="211" internationalPrefix="00" nationalPrefix="0">
       <availableFormats>
         <numberFormat pattern="(\d{3})(\d{3})(\d{3})" nationalPrefixFormattingRule="$NP$FG">
         </numberFormat>
       </availableFormats>
       <generalDesc>
-        <nationalNumberPattern>[1489]\d{8}</nationalNumberPattern>
-        <possibleNumberPattern>\d{9}</possibleNumberPattern>
-      </generalDesc>
-      <fixedLine>
-        <!-- 1[67] has been included as per the ITU document, even though no online numbers can be
-             found. -->
-        <nationalNumberPattern>
-          (?:
-            1[67]\d|
-            811
-          )\d{6}
-        </nationalNumberPattern>
-        <exampleNumber>811123456</exampleNumber>
-      </fixedLine>
-      <mobile>
-        <!-- Online numbers indicate that 95 is used by Vivacell, [49]77 by Gemtel, 91 by Zain,
-             9[29] by MTN (although it is unclear if 477 is still in use). 12 has been ascribed
-             to "Sudani", but it is not clear whether they are in fact still operating in South
-             Sudan. Patterns here are derived entirely from numbers found online. -->
-        <nationalNumberPattern>
-          (?:
-            1(?:
-              02|
-              2[1269]
-            )|
-            477|
-            9(?:
-              0[03689]|
-              1\d|
-              2[024-9]|
-              5[5-79]|
-              77|
-              98
-            )
-          )\d{6}
+        <nationalNumberPattern>[19]\d{8}</nationalNumberPattern>
+        <possibleNumberPattern>\d{9}</possibleNumberPattern>
+      </generalDesc>
+      <fixedLine>
+        <nationalNumberPattern>18\d{7}</nationalNumberPattern>
+        <exampleNumber>181234567</exampleNumber>
+      </fixedLine>
+      <mobile>
+        <nationalNumberPattern>
+          (?:
+            12|
+            9[1257]
+          )\d{7}
         </nationalNumberPattern>
         <exampleNumber>977123456</exampleNumber>
       </mobile>