phonelib 0.6.2 → 0.6.3

data/data/libphonenumber/javascript/i18n/phonenumbers/metadatalite.js

@@ -557,8 +557,8 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,,,[,,"NA","NA"]
 ]
 ,"AZ":[,[,,"[1-9]\\d{8}","\\d{7,9}"]
-,[,,"(?:1[28]\\d|2(?:02|1[24]|2[2-4]|33|[45]2|6[23])|365)\\d{6}","\\d{7,9}"]
-,[,,"(?:4[04]|5[015]|60|7[07])\\d{7}","\\d{9}"]
+,[,,"(?:1[28]\\d{3}|2(?:02|1[24]|2[2-4]|33|[45]2|6[23])\\d{2}|365(?:[0-46-9]\\d|5[0-35-9]))\\d{4}","\\d{7,9}"]
+,[,,"(?:36554|(?:4[04]|5[015]|60|7[07])\\d{3})\\d{4}","\\d{9}"]
 ,[,,"88\\d{7}","\\d{9}"]
 ,[,,"900200\\d{3}","\\d{9}"]
 ,[,,"NA","NA"]
@@ -617,7 +617,7 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
 ,[,,"96(?:0[49]|1[0-4]|6[69])\\d{6}","\\d{10}"]
-,"BD",880,"00[12]?","0",,,"0",,"00",,[[,"(2)(\\d{7,8})","$1-$2",["2"]
+,"BD",880,"00","0",,,"0",,,,[[,"(2)(\\d{7,8})","$1-$2",["2"]
 ,"0$1"]
 ,[,"(\\d{2})(\\d{4,6})","$1-$2",["[3-79]1"]
 ,"0$1"]
@@ -669,14 +669,14 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,,,[,,"NA","NA"]
 ]
 ,"BG":[,[,,"[23567]\\d{5,7}|[489]\\d{6,8}","\\d{5,9}"]
-,[,,"2(?:[0-8]\\d{5,6}|9\\d{4,6})|(?:[36]\\d|5[1-9]|8[1-6]|9[1-7])\\d{5,6}|(?:4(?:[124-7]\\d|3[1-6])|7(?:0[1-9]|[1-9]\\d))\\d{4,5}","\\d{5,8}"]
+,[,,"2\\d{5,7}|(?:[36]\\d|5[1-9]|8[1-6]|9[1-7])\\d{5,6}|(?:4(?:[124-7]\\d|3[1-6])|7(?:0[1-9]|[1-9]\\d))\\d{4,5}","\\d{5,8}"]
 ,[,,"(?:8[7-9]\\d|9(?:8\\d|99))\\d{6}|4(?:3[0789]|8\\d)\\d{5}","\\d{8,9}"]
 ,[,,"800\\d{5}","\\d{8}"]
 ,[,,"90\\d{6}","\\d{8}"]
 ,[,,"NA","NA"]
 ,[,,"700\\d{5}","\\d{5,9}"]
 ,[,,"NA","NA"]
-,"BG",359,"00","0",,,"0",,,,[[,"(2)(\\d{5})","$1 $2",["29"]
+,"BG",359,"00","0",,,"0",,,,[[,"(2)(\\d)(\\d{2})(\\d{2})","$1 $2 $3 $4",["2"]
 ,"0$1"]
 ,[,"(2)(\\d{3})(\\d{3,4})","$1 $2 $3",["2"]
 ,"0$1"]
@@ -700,7 +700,7 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ]
 ,"BH":[,[,,"[136-9]\\d{7}","\\d{8}"]
 ,[,,"(?:1(?:3[1356]|6[0156]|7\\d)\\d|6(?:1[16]\\d|500|6(?:0\\d|3[12]|44|7[7-9])|9[69][69])|7(?:1(?:11|78)|7\\d{2}))\\d{4}","\\d{8}"]
-,[,,"(?:3(?:[1-4679]\\d|5[013569]|8[0-47-9])\\d|6(?:3(?:00|33|6[16])|6(?:[69]\\d|3[03-9]|7[0-6])))\\d{4}","\\d{8}"]
+,[,,"(?:3(?:[1-4679]\\d|5[013-69]|8[0-47-9])\\d|6(?:3(?:00|33|6[16])|6(?:[69]\\d|3[03-9]|7[0-6])))\\d{4}","\\d{8}"]
 ,[,,"80\\d{6}","\\d{8}"]
 ,[,,"(?:87|9[014578])\\d{6}","\\d{8}"]
 ,[,,"84\\d{6}","\\d{8}"]
@@ -1052,7 +1052,7 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ]
 ,"CI":[,[,,"[02-8]\\d{7}","\\d{8}"]
 ,[,,"(?:2(?:0[023]|1[02357]|[23][045]|4[03-5])|3(?:0[06]|1[069]|[2-4][07]|5[09]|6[08]))\\d{5}","\\d{8}"]
-,[,,"(?:0[1-9]|4\\d|5[14-9]|6[015-79]|7[578]|87)\\d{6}","\\d{8}"]
+,[,,"(?:0[1-9]|4\\d|5[14-9]|6[015-79]|7[578]|8[79])\\d{6}","\\d{8}"]
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
@@ -1151,7 +1151,7 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ]
 ,"CN":[,[,,"[1-7]\\d{6,11}|8[0-357-9]\\d{6,9}|9\\d{7,10}","\\d{4,12}"]
 ,[,,"21(?:100\\d{2}|95\\d{3,4}|\\d{8,10})|(?:10|2[02-57-9]|3(?:11|7[179])|4(?:[15]1|3[1-35])|5(?:1\\d|2[37]|3[12]|51|7[13-79]|9[15])|7(?:31|5[457]|6[09]|91)|8(?:[57]1|98))(?:100\\d{2}|95\\d{3,4}|\\d{8})|(?:3(?:1[02-9]|35|49|5\\d|7[02-68]|9[1-68])|4(?:1[02-9]|2[179]|3[3-9]|5[2-9]|6[4789]|7\\d|8[23])|5(?:3[03-9]|4[36]|5[02-9]|6[1-46]|7[028]|80|9[2-46-9])|6(?:3[1-5]|6[0238]|9[12])|7(?:01|[17]\\d|2[248]|3[04-9]|4[3-6]|5[0-4689]|6[2368]|9[02-9])|8(?:078|1[236-8]|2[5-7]|3\\d|5[1-9]|7[02-9]|8[3678]|9[1-7])|9(?:0[1-3689]|1[1-79]|[379]\\d|4[13]|5[1-5]))(?:100\\d{2}|95\\d{3,4}|\\d{7})|80(?:29|6[03578]|7[018]|81)\\d{4}","\\d{4,12}"]
-,[,,"1(?:[38]\\d|4[57]|5[0-35-9]|7[036-8])\\d{8}","\\d{11}"]
+,[,,"1(?:[38]\\d|4[57]|5[0-35-9]|7[0136-8])\\d{8}","\\d{11}"]
 ,[,,"(?:10)?800\\d{7}","\\d{10,12}"]
 ,[,,"16[08]\\d{5}","\\d{8}"]
 ,[,,"400\\d{7}|950\\d{7,8}|(?:10|2[0-57-9]|3(?:[157]\\d|35|49|9[1-68])|4(?:[17]\\d|2[179]|[35][1-9]|6[4789]|8[23])|5(?:[1357]\\d|2[37]|4[36]|6[1-46]|80|9[1-9])|6(?:3[1-5]|6[0238]|9[12])|7(?:01|[1579]\\d|2[248]|3[014-9]|4[3-6]|6[023689])|8(?:1[236-8]|2[5-7]|[37]\\d|5[14-9]|8[3678]|9[1-8])|9(?:0[1-3689]|1[1-79]|[379]\\d|4[13]|5[1-5]))96\\d{3,4}","\\d{7,11}"]
@@ -2046,7 +2046,7 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ,[,,"8[1-3]\\d{6}","\\d{8}"]
 ,[,,"NA","NA"]
-,"HK",852,"00",,,,,,,,[[,"(\\d{4})(\\d{4})","$1 $2",["[235-7]|[89](?:0[1-9]|[1-9])"]
+,"HK",852,"00(?:[126-9]|30|5[09])?",,,,,,"00",,[[,"(\\d{4})(\\d{4})","$1 $2",["[235-7]|[89](?:0[1-9]|[1-9])"]
 ]
 ,[,"(800)(\\d{3})(\\d{3})","$1 $2 $3",["800"]
 ]
@@ -2061,7 +2061,7 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,,,[,,"NA","NA"]
 ]
 ,"HN":[,[,,"[237-9]\\d{7}","\\d{8}"]
-,[,,"2(?:2(?:0[019]|1[1-36]|[23]\\d|4[056]|5[57]|7[01389]|8[0146-9]|9[012])|4(?:2[3-59]|3[13-689]|4[0-68]|5[1-35])|5(?:4[3-5]|5\\d|6[56]|74)|6(?:[056]\\d|3[04]|4[0-378]|[78][0-8]|9[01])|7(?:6[46-9]|7[02-9]|8[34])|8(?:79|8[0-35789]|9[1-57-9]))\\d{4}","\\d{8}"]
+,[,,"2(?:2(?:0[019]|1[1-36]|[23]\\d|4[056]|5[57]|7[01389]|8[0146-9]|9[012])|4(?:07|2[3-59]|3[13-689]|4[0-68]|5[1-35])|5(?:16|4[3-5]|5\\d|6[4-6]|74)|6(?:[056]\\d|17|3[04]|4[0-378]|[78][0-8]|9[01])|7(?:6[46-9]|7[02-9]|8[034])|8(?:79|8[0-35789]|9[1-57-9]))\\d{4}","\\d{8}"]
 ,[,,"[37-9]\\d{7}","\\d{8}"]
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
@@ -2249,15 +2249,15 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"3(?:08162\\d|3\\d{5}|4(?:40[49]06|5624\\d)|7(?:0624\\d|2299\\d))\\d{3}|55\\d{8}","\\d{10}"]
 ,,,[,,"NA","NA"]
 ]
-,"IN":[,[,,"1\\d{7,12}|[2-9]\\d{9,10}","\\d{6,13}"]
+,"IN":[,[,,"008\\d{9}|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[0-26-9]|7[0-24-9]|8[013-57]|9[014-7])|5(?:1[025]|[36][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-578]|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(?:0\\d{3}|2(?:[0235679]\\d|[14][017-9]|8[0-59]|9[389])\\d|3(?:[05-8]\\d{2}|1(?:[089]\\d|7[5-8])|2(?:[5-8]\\d|[01][089])|3[17-9]\\d|4(?:[07-9]\\d|11)|9[01689]\\d)|4(?:0[1-9]\\d|1(?:[015-9]\\d|4[08])|[29][89]\\d|39\\d|8[389]\\d)|5(?:[034678]\\d|2[03-9]|5[017-9]|9[7-9])\\d|6(?:0[0-47]|1[0-257-9]|2[0-4]|3[19]|5[4589]|[6-9]\\d)\\d|7(?:0[2-9]|[1-79]\\d|8[1-9])\\d|8[0-79]\\d{2}|99[4-9]\\d)|8(?:0(?:[01589]\\d|6[67])|1(?:[02-57-9]\\d|1[0135-9])|2(?:[236-9]\\d|5[1-9])|3(?:[0357-9]\\d|4[1-9])|[45]\\d{2}|6[02457-9]\\d|7(?:07|[1-69]\\d)|8(?:[0-26-9]\\d|44|5[2-9])|9(?:[035-9]\\d|2[2-9]|4[0-8]))\\d|9\\d{4})\\d{5}","\\d{10}"]
-,[,,"1(?:600\\d{6}|80(?:0\\d{4,9}|3\\d{9}))","\\d{8,13}"]
+,[,,"(?:7(?:0\\d{3}|2(?:[0235679]\\d{2}|[14][017-9]\\d|8(?:[0-59]\\d|6[089]|78)|9[389]\\d)|3(?:[05-8]\\d{2}|1(?:[089]\\d|7[5-8])|2(?:[5-8]\\d|[01][089])|3[17-9]\\d|4(?:[07-9]\\d|11)|9(?:[01689]\\d|59))|4(?:0[1-9]\\d|1(?:[015-9]\\d|4[08])|2(?:[1-7][089]|[89]\\d)|3(?:[0-8][089]|9\\d)|4(?:[089]\\d|11|7[02-8])|5(?:0[089]|[59]9)|7(?:0[3-9]|11|7[02-8]|[89]\\d)|8(?:[0-24-7][089]|[389]\\d)|9(?:[0-6][089]|7[08]|[89]\\d))|5(?:[034678]\\d|2[03-9]|5[017-9]|9[7-9])\\d|6(?:0[0-47]|1[0-257-9]|2[0-4]|3[19]|5[4589]|[6-9]\\d)\\d|7(?:0[2-9]|[1-79]\\d|8[1-9])\\d|8(?:[0-79]\\d{2}|88[01])|99[4-9]\\d)|8(?:0(?:[01589]\\d|6[67])|1(?:[02-57-9]\\d|1[0135-9])|2(?:[236-9]\\d|5[1-9])|3(?:[0357-9]\\d|4[1-9])|[45]\\d{2}|6[02457-9]\\d|7(?:07|[1-69]\\d)|8(?:[0-26-9]\\d|44|5[2-9])|9(?:[035-9]\\d|2[2-9]|4[0-8]))\\d|9\\d{4})\\d{5}","\\d{10}"]
+,[,,"00800\\d{7}|1(?:600\\d{6}|80(?:0\\d{4,9}|3\\d{9}))","\\d{8,13}"]
 ,[,,"186[12]\\d{9}","\\d{13}"]
 ,[,,"1860\\d{7}","\\d{11}"]
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
-,"IN",91,"00","0",,,"0",,,,[[,"(\\d{5})(\\d{5})","$1 $2",["7(?:[02357]|4[0-389]|6[0-35-9]|8[0-79]|99)|8(?:0[015689]|1[0-57-9]|2[2356-9]|3[0-57-9]|[45]|6[02457-9]|7[01-69]|8[0-24-9]|9[02-9])|9","7(?:0|2(?:[0235679]|[14][017-9]|8[0-59]|9[389])|3(?:[05-8]|1[07-9]|2[015-8]|3[17-9]|4[017-9]|9[01689])|4(?:0[1-9]|1[014-9]|[29][89]|39|8[389])|5(?:[034678]|2[03-9]|5[017-9]|9[7-9])|6(?:0[0-47]|1[0-257-9]|2[0-4]|3[19]|5[4589]|[6-9])|7(?:0[2-9]|[1-79]|8[1-9])|8[0-79]|99[4-9])|8(?:0(?:[01589]|6[67])|1(?:[02-57-9]|1[0135-9])|2(?:[236-9]|5[1-9])|3(?:[0357-9]|4[1-9])|[45]|6[02457-9]|7(?:07|[1-69])|8(?:[0-26-9]|44|5[2-9])|9(?:[035-9]|2[2-9]|4[0-8]))|9","7(?:0|2(?:[0235679]|[14][017-9]|8[0-59]|9[389])|3(?:[05-8]|1(?:[089]|7[5-9])|2(?:[5-8]|[01][089])|3[17-9]|4(?:[07-9]|11)|9[01689])|4(?:0[1-9]|1(?:[015-9]|4[08])|[29][89]|39|8[389])|5(?:[034678]|2[03-9]|5[017-9]|9[7-9])|6(?:0[0-47]|1[0-257-9]|2[0-4]|3[19]|5[4589]|[6-9])|7(?:0[2-9]|[1-79]|8[1-9])|8[0-79]|99[4-9])|8(?:0(?:[01589]|6[67])|1(?:[02-57-9]|1[0135-9])|2(?:[236-9]|5[1-9])|3(?:[0357-9]|4[1-9])|[45]|6[02457-9]|7(?:07|[1-69])|8(?:[0-26-9]|44|5[2-9])|9(?:[035-9]|2[2-9]|4[0-8]))|9"]
+,"IN",91,"00","0",,,"0",,,,[[,"(\\d{5})(\\d{5})","$1 $2",["7(?:[023578]|4[0-57-9]|6[0-35-9]|99)|8(?:0[015689]|1[0-57-9]|2[2356-9]|3[0-57-9]|[45]|6[02457-9]|7[01-69]|8[0-24-9]|9[02-9])|9","7(?:[08]|2(?:[0235679]|[14][017-9]|8[0-79]|9[389])|3(?:[05-8]|1[07-9]|2[015-8]|3[17-9]|4[017-9]|9[015689])|4(?:[02][1-9]|1[014-9]|3\\d|[47][017-9]|5[059]|[89])|5(?:[034678]|2[03-9]|5[017-9]|9[7-9])|6(?:0[0-47]|1[0-257-9]|2[0-4]|3[19]|5[4589]|[6-9])|7(?:0[2-9]|[1-79]|8[1-9])|99[4-9])|8(?:0(?:[01589]|6[67])|1(?:[02-57-9]|1[0135-9])|2(?:[236-9]|5[1-9])|3(?:[0357-9]|4[1-9])|[45]|6[02457-9]|7(?:07|[1-69])|8(?:[0-26-9]|44|5[2-9])|9(?:[035-9]|2[2-9]|4[0-8]))|9","7(?:0|2(?:[0235679]|[14][017-9]|8(?:[0-569]|78)|9[389])|3(?:[05-8]|1(?:[089]|7[5-9])|2(?:[5-8]|[01][089])|3[17-9]|4(?:[07-9]|11)|9(?:[01689]|59))|4(?:0[1-9]|1(?:[015-9]|4[08])|2(?:[1-7][089]|[89])|3(?:[0-8][089]|9)|4(?:[089]|11|7[02-8])|5(?:0[089]|[59]9)|7(?:0[3-9]|11|7[02-8]|[89])|8(?:[0-24-7][089]|[389])|9(?:[0-6][089]|7[08]|[89]))|5(?:[034678]|2[03-9]|5[017-9]|9[7-9])|6(?:0[0-47]|1[0-257-9]|2[0-4]|3[19]|5[4589]|[6-9])|7(?:0[2-9]|[1-79]|8[1-9])|8(?:[0-79]|88[01])|99[4-9])|8(?:0(?:[01589]|6[67])|1(?:[02-57-9]|1[0135-9])|2(?:[236-9]|5[1-9])|3(?:[0357-9]|4[1-9])|[45]|6[02457-9]|7(?:07|[1-69])|8(?:[0-26-9]|44|5[2-9])|9(?:[035-9]|2[2-9]|4[0-8]))|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]
@@ -2269,6 +2269,8 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,"0$1",,1]
 ,[,"(\\d{4})(\\d{3})(\\d{3})","$1 $2 $3",["1(?:[23579]|[468][1-9])|[2-8]"]
 ,"0$1",,1]
+,[,"(\\d{2})(\\d{3})(\\d{4})(\\d{3})","$1 $2 $3 $4",["008"]
+,"0$1",,1]
 ,[,"(1600)(\\d{2})(\\d{4})","$1 $2 $3",["160","1600"]
 ,"$1",,1]
 ,[,"(1800)(\\d{4,5})","$1 $2",["180","1800"]
@@ -2281,9 +2283,9 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,"$1",,1]
 ]
 ,,[,,"NA","NA"]
-,,,[,,"1(?:600\\d{6}|8(?:0(?:0\\d{4,9}|3\\d{9})|6(?:0\\d{7}|[12]\\d{9})))","\\d{8,13}"]
+,,,[,,"00800\\d{7}|1(?:600\\d{6}|8(?:0(?:0\\d{4,9}|3\\d{9})|6(?:0\\d{7}|[12]\\d{9})))","\\d{8,13}"]
 ,[,,"140\\d{7}","\\d{10}"]
-,,,[,,"NA","NA"]
+,1,,[,,"NA","NA"]
 ]
 ,"IO":[,[,,"3\\d{6}","\\d{7}"]
 ,[,,"37\\d{5}","\\d{7}"]
@@ -2595,7 +2597,7 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ]
 ,"KN":[,[,,"[589]\\d{9}","\\d{7}(?:\\d{3})?"]
 ,[,,"869(?:2(?:29|36)|302|4(?:6[015-9]|70))\\d{4}","\\d{7}(?:\\d{3})?"]
-,[,,"869(?:5(?:5[6-8]|6[5-7])|66\\d|76[02-6])\\d{4}","\\d{10}"]
+,[,,"869(?:5(?:5[6-8]|6[5-7])|66\\d|76[02-7])\\d{4}","\\d{10}"]
 ,[,,"8(?:00|44|55|66|77|88)[2-9]\\d{6}","\\d{10}"]
 ,[,,"900[2-9]\\d{6}","\\d{10}"]
 ,[,,"NA","NA"]
@@ -2687,7 +2689,7 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ]
 ,"KW":[,[,,"[12569]\\d{6,7}","\\d{7,8}"]
 ,[,,"(?:18\\d|2(?:[23]\\d{2}|4(?:[1-35-9]\\d|44)|5(?:0[034]|[2-46]\\d|5[1-3]|7[1-7])))\\d{4}","\\d{7,8}"]
-,[,,"(?:5(?:[05]\\d{2}|1[0-7]\\d|2(?:22|5[25]))|6(?:0[034679]\\d|5[015-9]\\d|6\\d{2}|7[067]\\d|9[0369]\\d)|9(?:0[09]\\d|22\\d|4[01479]\\d|55\\d|6[0679]\\d|[79]\\d{2}|8[057-9]\\d))\\d{4}","\\d{8}"]
+,[,,"(?:5(?:[05]\\d{2}|1[0-7]\\d|2(?:22|5[25])|66\\d)|6(?:0[034679]\\d|222|5[015-9]\\d|6\\d{2}|7[067]\\d|9[0369]\\d)|9(?:0[09]\\d|22\\d|4[01479]\\d|55\\d|6[0679]\\d|[79]\\d{2}|8[057-9]\\d))\\d{4}","\\d{8}"]
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
@@ -2695,7 +2697,7 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ,"KW",965,"00",,,,,,,,[[,"(\\d{4})(\\d{3,4})","$1 $2",["[16]|2(?:[0-35-9]|4[0-35-9])|9[024-9]|52[25]"]
 ]
-,[,"(\\d{3})(\\d{5})","$1 $2",["244|5[015]"]
+,[,"(\\d{3})(\\d{5})","$1 $2",["244|5(?:[015]|66)"]
 ]
 ]
 ,,[,,"NA","NA"]
@@ -2910,7 +2912,7 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,,,[,,"NA","NA"]
 ]
 ,"LV":[,[,,"[2689]\\d{7}","\\d{8}"]
-,[,,"6[3-8]\\d{6}","\\d{8}"]
+,[,,"6\\d{7}","\\d{8}"]
 ,[,,"2\\d{7}","\\d{8}"]
 ,[,,"80\\d{6}","\\d{8}"]
 ,[,,"90\\d{6}","\\d{8}"]
@@ -3880,16 +3882,20 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
 ,[,,"8700[0-4]\\d{4}","\\d{9}"]
-,"PY",595,"00","0",,,"0",,,,[[,"(\\d{2})(\\d{5,7})","$1 $2",["(?:[26]1|3[289]|4[124678]|7[123]|8[1236])"]
-,"($1)"]
+,"PY",595,"00","0",,,"0",,,,[[,"(\\d{2})(\\d{5})","$1 $2",["(?:[26]1|3[289]|4[124678]|7[123]|8[1236])"]
+,"(0$1)"]
+,[,"(\\d{2})(\\d{3})(\\d{3,4})","$1 $2 $3",["(?:[26]1|3[289]|4[124678]|7[123]|8[1236])"]
+,"(0$1)"]
 ,[,"(\\d{3})(\\d{3,6})","$1 $2",["[2-9]0"]
 ,"0$1"]
 ,[,"(\\d{3})(\\d{6})","$1 $2",["9[1-9]"]
 ,"0$1"]
 ,[,"(\\d{2})(\\d{3})(\\d{4})","$1 $2 $3",["8700"]
 ]
-,[,"(\\d{3})(\\d{4,6})","$1 $2",["[2-8][1-9]"]
-,"($1)"]
+,[,"(\\d{3})(\\d{4,5})","$1 $2",["[2-8][1-9]"]
+,"(0$1)"]
+,[,"(\\d{3})(\\d{3})(\\d{3})","$1 $2 $3",["[2-8][1-9]"]
+,"0$1"]
 ]
 ,,[,,"NA","NA"]
 ,,,[,,"NA","NA"]
@@ -4228,7 +4234,7 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ]
 ,"SK":[,[,,"(?:[2-68]\\d{5,8}|9\\d{6,8})","\\d{6,9}"]
 ,[,,"2(?:16\\d{3,4}|\\d{8})|[3-5](?:[1-8]16\\d{2,3}|\\d{8})","\\d{6,9}"]
-,[,,"9(?:0[1-8]|1[0-24-9]|4[0489]|50)\\d{6}","\\d{9}"]
+,[,,"9(?:0(?:[1-8]\\d|9[1-9])|(?:1[0-24-9]|4[0489]|50)\\d)\\d{5}","\\d{9}"]
 ,[,,"800\\d{6}","\\d{9}"]
 ,[,,"9(?:[78]\\d{7}|00\\d{6})","\\d{9}"]
 ,[,,"8[5-9]\\d{7}","\\d{9}"]
@@ -4296,7 +4302,7 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ]
 ,"SN":[,[,,"[3789]\\d{8}","\\d{9}"]
 ,[,,"3(?:0(?:1[0-2]|80)|282|3(?:8[1-9]|9[3-9])|611|90[1-5])\\d{5}","\\d{9}"]
-,[,,"7(?:[067]\\d|21|8[0-26]|90)\\d{6}","\\d{9}"]
+,[,,"7(?:[067]\\d|21|8[0-46]|90)\\d{6}","\\d{9}"]
 ,[,,"800\\d{6}","\\d{9}"]
 ,[,,"88[4689]\\d{6}","\\d{9}"]
 ,[,,"81[02468]\\d{6}","\\d{9}"]
@@ -4466,7 +4472,7 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ]
 ,"TC":[,[,,"[5689]\\d{9}","\\d{7}(?:\\d{3})?"]
 ,[,,"649(?:712|9(?:4\\d|50))\\d{4}","\\d{7}(?:\\d{3})?"]
-,[,,"649(?:2(?:3[129]|4[1-7])|3(?:3[1-389]|4[1-7])|4[34][1-3])\\d{4}","\\d{10}"]
+,[,,"649(?:2(?:3[129]|4[1-7])|3(?:3[1-389]|4[1-8])|4[34][1-3])\\d{4}","\\d{10}"]
 ,[,,"8(?:00|44|55|66|77|88)[2-9]\\d{6}","\\d{10}"]
 ,[,,"900[2-9]\\d{6}","\\d{10}"]
 ,[,,"NA","NA"]
@@ -4509,7 +4515,7 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ]
 ,"TH":[,[,,"[2-9]\\d{7,8}|1\\d{3}(?:\\d{5,6})?","\\d{4}|\\d{8,10}"]
 ,[,,"(?:2\\d|3[2-9]|4[2-5]|5[2-6]|7[3-7])\\d{6}","\\d{8}"]
-,[,,"(?:14|6[1-3]|[89]\\d)\\d{7}","\\d{9}"]
+,[,,"(?:14|6[1-4]|[89]\\d)\\d{7}","\\d{9}"]
 ,[,,"1800\\d{6}","\\d{10}"]
 ,[,,"1900\\d{6}","\\d{10}"]
 ,[,,"NA","NA"]
@@ -4529,7 +4535,7 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ]
 ,"TJ":[,[,,"[3-589]\\d{8}","\\d{3,9}"]
 ,[,,"(?:3(?:1[3-5]|2[245]|3[12]|4[24-7]|5[25]|72)|4(?:46|74|87))\\d{6}","\\d{3,9}"]
-,[,,"(?:41[18]|50[125]|88\\d|9[0-35-9]\\d)\\d{6}","\\d{9}"]
+,[,,"(?:41[18]|5(?:0[125]|5\\d)|88\\d|9[0-35-9]\\d)\\d{6}","\\d{9}"]
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
@@ -4703,7 +4709,7 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ]
 ,"TZ":[,[,,"\\d{9}","\\d{7,9}"]
 ,[,,"2[2-8]\\d{7}","\\d{7,9}"]
-,[,,"(?:6[25-8]|7[13-9])\\d{7}","\\d{9}"]
+,[,,"(?:6[125-9]|7[1-9])\\d{7}","\\d{9}"]
 ,[,,"80[08]\\d{6}","\\d{9}"]
 ,[,,"90\\d{7}","\\d{9}"]
 ,[,,"8(?:40|6[01])\\d{6}","\\d{9}"]
@@ -4762,8 +4768,8 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,,,[,,"NA","NA"]
 ]
 ,"US":[,[,,"[2-9]\\d{9}","\\d{7}(?:\\d{3})?"]
-,[,,"(?:2(?:0[1-35-9]|1[02-9]|2[04589]|3[149]|4[08]|5[1-46]|6[0279]|7[026]|8[13])|3(?:0[1-57-9]|1[02-9]|2[0135]|3[014679]|4[67]|5[12]|6[014]|8[056])|4(?:0[124-9]|1[02-579]|2[3-5]|3[0245]|4[0235]|58|69|7[0589]|8[04])|5(?:0[1-57-9]|1[0235-8]|20|3[0149]|4[01]|5[19]|6[1-37]|7[013-5]|8[056])|6(?:0[1-35-9]|1[024-9]|2[03689]|3[016]|4[16]|5[017]|6[0-279]|78|8[12])|7(?:0[1-46-8]|1[02-9]|2[0457]|3[1247]|4[037]|5[47]|6[02359]|7[02-59]|8[156])|8(?:0[1-68]|1[02-8]|28|3[0-25]|4[3578]|5[046-9]|6[02-5]|7[028])|9(?:0[1346-9]|1[02-9]|2[0589]|3[01678]|4[0179]|5[12469]|7[0-3589]|8[0459]))[2-9]\\d{6}","\\d{7}(?:\\d{3})?"]
-,[,,"(?:2(?:0[1-35-9]|1[02-9]|2[04589]|3[149]|4[08]|5[1-46]|6[0279]|7[026]|8[13])|3(?:0[1-57-9]|1[02-9]|2[0135]|3[014679]|4[67]|5[12]|6[014]|8[056])|4(?:0[124-9]|1[02-579]|2[3-5]|3[0245]|4[0235]|58|69|7[0589]|8[04])|5(?:0[1-57-9]|1[0235-8]|20|3[0149]|4[01]|5[19]|6[1-37]|7[013-5]|8[056])|6(?:0[1-35-9]|1[024-9]|2[03689]|3[016]|4[16]|5[017]|6[0-279]|78|8[12])|7(?:0[1-46-8]|1[02-9]|2[0457]|3[1247]|4[037]|5[47]|6[02359]|7[02-59]|8[156])|8(?:0[1-68]|1[02-8]|28|3[0-25]|4[3578]|5[046-9]|6[02-5]|7[028])|9(?:0[1346-9]|1[02-9]|2[0589]|3[01678]|4[0179]|5[12469]|7[0-3589]|8[0459]))[2-9]\\d{6}","\\d{7}(?:\\d{3})?"]
+,[,,"(?:2(?:0[1-35-9]|1[02-9]|2[04589]|3[149]|4[08]|5[1-46]|6[0279]|7[026]|8[13])|3(?:0[1-57-9]|1[02-9]|2[0135]|3[014679]|4[67]|5[12]|6[014]|8[056])|4(?:0[124-9]|1[02-579]|2[3-5]|3[0245]|4[0235]|58|69|7[0589]|8[04])|5(?:0[1-57-9]|1[0235-8]|20|3[0149]|4[01]|5[19]|6[1-37]|7[013-5]|8[056])|6(?:0[1-35-9]|1[024-9]|2[03689]|3[016]|4[16]|5[017]|6[0-279]|78|8[12])|7(?:0[1-46-8]|1[02-9]|2[0457]|3[1247]|4[037]|5[47]|6[02359]|7[02-59]|8[156])|8(?:0[1-68]|1[02-8]|28|3[0-25]|4[3578]|5[046-9]|6[02-5]|7[028])|9(?:0[1346-9]|1[02-9]|2[0589]|3[014678]|4[0179]|5[12469]|7[0-3589]|8[0459]))[2-9]\\d{6}","\\d{7}(?:\\d{3})?"]
+,[,,"(?:2(?:0[1-35-9]|1[02-9]|2[04589]|3[149]|4[08]|5[1-46]|6[0279]|7[026]|8[13])|3(?:0[1-57-9]|1[02-9]|2[0135]|3[014679]|4[67]|5[12]|6[014]|8[056])|4(?:0[124-9]|1[02-579]|2[3-5]|3[0245]|4[0235]|58|69|7[0589]|8[04])|5(?:0[1-57-9]|1[0235-8]|20|3[0149]|4[01]|5[19]|6[1-37]|7[013-5]|8[056])|6(?:0[1-35-9]|1[024-9]|2[03689]|3[016]|4[16]|5[017]|6[0-279]|78|8[12])|7(?:0[1-46-8]|1[02-9]|2[0457]|3[1247]|4[037]|5[47]|6[02359]|7[02-59]|8[156])|8(?:0[1-68]|1[02-8]|28|3[0-25]|4[3578]|5[046-9]|6[02-5]|7[028])|9(?:0[1346-9]|1[02-9]|2[0589]|3[014678]|4[0179]|5[12469]|7[0-3589]|8[0459]))[2-9]\\d{6}","\\d{7}(?:\\d{3})?"]
 ,[,,"8(?:00|44|55|66|77|88)[2-9]\\d{6}","\\d{10}"]
 ,[,,"900[2-9]\\d{6}","\\d{10}"]
 ,[,,"NA","NA"]

data/data/libphonenumber/resources/PhoneNumberAlternateFormats.xml

@@ -1636,6 +1636,22 @@
           </leadingDigits>
           <format>$1 $2 $3</format>
         </numberFormat>
+        <numberFormat pattern="(\d{2})(\d{6,7})">
+          <leadingDigits>
+            (?:
+              [26]1|
+              3[289]|
+              4[124678]|
+              7[123]|
+              8[1236]
+            )
+          </leadingDigits>
+          <format>$1 $2</format>
+        </numberFormat>
+        <numberFormat pattern="(\d{3})(\d{6})">
+          <leadingDigits>[2-8][1-9]</leadingDigits>
+          <format>$1 $2</format>
+        </numberFormat>
       </availableFormats>
     </territory>
 

data/data/libphonenumber/resources/PhoneNumberMetadata.xml

@@ -1932,6 +1932,8 @@
           </leadingDigits>
           <format>$1 $2 $3 $4</format>
         </numberFormat>
+        <!-- ITU uses XX XXX XXXX for mobile numbers, but numbers online typically
+             use XX XXX XX XX. -->
         <numberFormat pattern="(\d{2})(\d{3})(\d{2})(\d{2})" nationalPrefixFormattingRule="$NP$FG">
           <leadingDigits>[4-8]</leadingDigits>
           <format>$1 $2 $3 $4</format>
@@ -1946,10 +1948,13 @@
         <nationalNumberPattern>[1-9]\d{8}</nationalNumberPattern>
         <possibleNumberPattern>\d{7,9}</possibleNumberPattern>
       </generalDesc>
+      <!-- 12109 fixed line numbers are mentioned as "Information Operator Assistance"
+           by ITU. Added it to fixedline numbers as whole 12 range numbers are fixedline
+           numbers in Baku. -->
       <fixedLine>
         <nationalNumberPattern>
           (?:
-            1[28]\d|
+            1[28]\d{3}|
             2(?:
               02|
               1[24]|
@@ -1957,20 +1962,28 @@
               33|
               [45]2|
               6[23]
-            )|
-            365
-          )\d{6}
+            )\d{2}|
+            365(?:
+              [0-46-9]\d|
+              5[0-35-9]
+            )
+          )\d{4}
         </nationalNumberPattern>
         <exampleNumber>123123456</exampleNumber>
       </fixedLine>
       <mobile>
+        <!-- Prefix 36554 is added to mobile as per confirmation from Ministry of
+             Communications in Azerbaijan. -->
         <nationalNumberPattern>
           (?:
-            4[04]|
-            5[015]|
-            60|
-            7[07]
-          )\d{7}
+            36554|
+            (?:
+              4[04]|
+              5[015]|
+              60|
+              7[07]
+            )\d{3}
+          )\d{4}
         </nationalNumberPattern>
         <possibleNumberPattern>\d{9}</possibleNumberPattern>
         <exampleNumber>401234567</exampleNumber>
@@ -2188,8 +2201,10 @@
     </territory>
 
     <!-- Bangladesh -->
-    <territory id="BD" countryCode="880" internationalPrefix="00[12]?"
-               preferredInternationalPrefix="00"
+    <!-- As per official evidence, 001 and 002 can be used for International dialing covering toll
+         quality and non-toll quality services. But these are not in use according to our tests
+         (see b/29552679). -->
+    <territory id="BD" countryCode="880" internationalPrefix="00"
                nationalPrefix="0" nationalPrefixFormattingRule="$NP$FG">
       <references>
         <sourceUrl>http://www.itu.int/oth/T0202000012/en</sourceUrl>
@@ -2747,9 +2762,9 @@
         <!-- Formatting rules follow the conventions seen in web-search results. A space has been
              used to separate the area code from the rest of the number, based on sites like
              http://www.goldenpages.bg. -->
-        <numberFormat pattern="(2)(\d{5})">
-          <leadingDigits>29</leadingDigits>
-          <format>$1 $2</format>
+        <numberFormat pattern="(2)(\d)(\d{2})(\d{2})">
+          <leadingDigits>2</leadingDigits>
+          <format>$1 $2 $3 $4</format>
         </numberFormat>
         <numberFormat pattern="(2)(\d{3})(\d{3,4})">
           <leadingDigits>2</leadingDigits>
@@ -2804,13 +2819,10 @@
         <possibleNumberPattern>\d{5,9}</possibleNumberPattern>
       </generalDesc>
       <fixedLine>
-        <!-- 29xxxx numbers have been added because they can be found online, and are typically
-             used by taxi companies. -->
+        <!-- We found evidence at least for ranges 28 and 29 followed by 4 digits in 2016, although
+             the latest ITU doc doesn't mention that. -->
         <nationalNumberPattern>
-          2(?:
-            [0-8]\d{5,6}|
-            9\d{4,6}
-          )|
+          2\d{5,7}|
           (?:
             [36]\d|
             5[1-9]|
@@ -2918,13 +2930,14 @@
         <exampleNumber>17001234</exampleNumber>
       </fixedLine>
       <!-- 31 is assigned to Royal Court, as per documents on Bahrain's own telecom site, even
-           though it is omitted from the ITU document. -->
+           though it is omitted from the ITU document. Based on online evidences added prefix
+           354 to mobile. -->
       <mobile>
         <nationalNumberPattern>
           (?:
             3(?:
               [1-4679]\d|
-              5[013569]|
+              5[013-69]|
               8[0-47-9]
             )\d|
             6(?:
@@ -3993,8 +4006,8 @@
         <!-- Wikipedia and ITU seem out of date, but say that for a number in the format ZNY-XXXX
              Z represents the district code (or 6 for mobile), N the type of number and Y the first
              digit of the customer's number. Only N = 0 and 2 are supposedly in use, but we have
-             found many numbers starting with 732 online. No evidence has been found about the
-             category of 732 numbers. -->
+             found many numbers starting with 732 online. When emailed, Belize Telemedia Ltd
+             confirmed these numbers belong to the Landline Postpaid PSTN category. -->
         <nationalNumberPattern>
           (?:
             [23458][02]\d|
@@ -4518,7 +4531,8 @@
              (Moov) based on numbers found online. The prefix 56 was assigned to MTN in July 2013:
              http://www.atci.ci/images/stories/pdf/decisions-dg/decision_002.pdf
              The prefix 75 is from an open-source bug report.
-             50 has been removed since Warid seems to have stopped operation in Côte d'Ivoire. -->
+             50 has been removed since Warid seems to have stopped operation in Côte d'Ivoire.
+             Added mobile prefix 89 from user report and online evidence. -->
           <nationalNumberPattern>
           (?:
             0[1-9]|
@@ -4526,7 +4540,7 @@
             5[14-9]|
             6[015-79]|
             7[578]|
-            87
+            8[79]
           )\d{6}
         </nationalNumberPattern>
         <exampleNumber>01234567</exampleNumber>
@@ -5150,13 +5164,14 @@
         <exampleNumber>1012345678</exampleNumber>
       </fixedLine>
       <mobile>
-        <!-- 170, 176, 177 and 178 prefixes are introduced in early 2014 for 4G networks. -->
+        <!-- 170, 176, 177 and 178 prefixes are introduced in early 2014 for 4G networks.
+             171 is a valid mobile range as per online evidence. -->
         <nationalNumberPattern>
           1(?:
             [38]\d|
             4[57]|
             5[0-35-9]|
-            7[036-8]
+            7[0136-8]
           )\d{8}
         </nationalNumberPattern>
         <possibleNumberPattern>\d{11}</possibleNumberPattern>
@@ -9434,7 +9449,8 @@
     </territory>
 
     <!-- Hong Kong -->
-    <territory id="HK" countryCode="852" internationalPrefix="00" mobileNumberPortableRegion="true">
+    <territory id="HK" countryCode="852" internationalPrefix="00(?:[126-9]|30|5[09])?"
+               preferredInternationalPrefix="00" mobileNumberPortableRegion="true">
       <references>
         <sourceUrl>http://www.ofca.gov.hk/en/industry_focus/telecommunications/portability/index.html</sourceUrl>
       </references>
@@ -9542,8 +9558,8 @@
         <possibleNumberPattern>\d{8}</possibleNumberPattern>
       </generalDesc>
       <fixedLine>
-        <!-- Extra prefixes 227[01389], 228X, 2292, 260X and 263[04] were added from numbers
-             found online. -->
+        <!-- Extra prefixes 227[01389], 228X, 2292, 2407, 2516, 2564, 260X, 2617, 263[04] and 2780
+             were added from numbers found online and user reports. -->
         <nationalNumberPattern>
           2(?:
             2(?:
@@ -9557,19 +9573,22 @@
               9[012]
             )|
             4(?:
+              07|
               2[3-59]|
               3[13-689]|
               4[0-68]|
               5[1-35]
             )|
             5(?:
+              16|
               4[3-5]|
               5\d|
-              6[56]|
+              6[4-6]|
               74
             )|
             6(?:
               [056]\d|
+              17|
               3[04]|
               4[0-378]|
               [78][0-8]|
@@ -9578,7 +9597,7 @@
             7(?:
               6[46-9]|
               7[02-9]|
-              8[34]
+              8[034]
             )|
             8(?:
               79|
@@ -10571,8 +10590,8 @@
          - fixed line changes are notified on the http://www.bsnl.co.in website. Area codes can be
          verified here at http://dq.ndc.bsnl.co.in/bsnl-web/stdSearch.seam. -->
     <territory id="IN" countryCode="91" internationalPrefix="00" nationalPrefix="0"
-               nationalPrefixFormattingRule="$NP$FG" nationalPrefixOptionalWhenFormatting="true"
-               mobileNumberPortableRegion="true">
+               leadingZeroPossible="true" nationalPrefixFormattingRule="$NP$FG"
+               nationalPrefixOptionalWhenFormatting="true" mobileNumberPortableRegion="true">
       <references>
         <sourceUrl>http://www.itu.int/oth/T0202000063/en</sourceUrl>
         <sourceUrl>http://en.wikipedia.org/wiki/%2B91</sourceUrl>
@@ -10584,10 +10603,9 @@
         <numberFormat pattern="(\d{5})(\d{5})">
           <leadingDigits>
             7(?:
-              [02357]|
-              4[0-389]|
+              [023578]|
+              4[0-57-9]|
               6[0-35-9]|
-              8[0-79]|
               99
             )|
             8(?:
@@ -10605,11 +10623,11 @@
           </leadingDigits>
           <leadingDigits>
             7(?:
-              0|
+              [08]|
               2(?:
                 [0235679]|
                 [14][017-9]|
-                8[0-59]|
+                8[0-79]|
                 9[389]
               )|
               3(?:
@@ -10618,14 +10636,15 @@
                 2[015-8]|
                 3[17-9]|
                 4[017-9]|
-                9[01689]
+                9[015689]
               )|
               4(?:
-                0[1-9]|
+                [02][1-9]|
                 1[014-9]|
-                [29][89]|
-                39|
-                8[389]
+                3\d|
+                [47][017-9]|
+                5[059]|
+                [89]
               )|
               5(?:
                 [034678]|
@@ -10646,7 +10665,6 @@
                 [1-79]|
                 8[1-9]
               )|
-              8[0-79]|
               99[4-9]
             )|
             8(?:
@@ -10692,7 +10710,10 @@
               2(?:
                 [0235679]|
                 [14][017-9]|
-                8[0-59]|
+                8(?:
+                  [0-569]|
+                  78
+                )|
                 9[389]
               )|
               3(?:
@@ -10710,7 +10731,10 @@
                   [07-9]|
                   11
                 )|
-                9[01689]
+                9(?:
+                  [01689]|
+                  59
+                )
               )|
               4(?:
                 0[1-9]|
@@ -10718,9 +10742,38 @@
                   [015-9]|
                   4[08]
                 )|
-                [29][89]|
-                39|
-                8[389]
+                2(?:
+                  [1-7][089]|
+                  [89]
+                )|
+                3(?:
+                  [0-8][089]|
+                  9
+                )|
+                4(?:
+                  [089]|
+                  11|
+                  7[02-8]
+                )|
+                5(?:
+                  0[089]|
+                  [59]9
+                )|
+                7(?:
+                  0[3-9]|
+                  11|
+                  7[02-8]|
+                  [89]
+                )|
+                8(?:
+                  [0-24-7][089]|
+                  [389]
+                )|
+                9(?:
+                  [0-6][089]|
+                  7[08]|
+                  [89]
+                )
               )|
               5(?:
                 [034678]|
@@ -10741,7 +10794,10 @@
                 [1-79]|
                 8[1-9]
               )|
-              8[0-79]|
+              8(?:
+                [0-79]|
+                88[01]
+              )|
               99[4-9]
             )|
             8(?:
@@ -10909,6 +10965,10 @@
           </leadingDigits>
           <format>$1 $2 $3</format>
         </numberFormat>
+        <numberFormat pattern="(\d{2})(\d{3})(\d{4})(\d{3})">
+          <leadingDigits>008</leadingDigits>
+          <format>$1 $2 $3 $4</format>
+        </numberFormat>
         <numberFormat nationalPrefixFormattingRule="$FG"
           pattern="(1600)(\d{2})(\d{4})">
           <leadingDigits>160</leadingDigits>
@@ -10948,6 +11008,7 @@
       </availableFormats>
       <generalDesc>
         <nationalNumberPattern>
+          008\d{9}|
           1\d{7,12}|
           [2-9]\d{9,10}
         </nationalNumberPattern>
@@ -10955,6 +11016,7 @@
       </generalDesc>
       <noInternationalDialling>
         <nationalNumberPattern>
+          00800\d{7}|
           1(?:
             600\d{6}|
             8(?:
@@ -11158,26 +11220,32 @@
       <!-- http://en.wikipedia.org/wiki/Mobile_telephone_numbering_in_India -->
       <!-- The document titled "List of MSC codes" linked off
            http://www.dot.gov.in/access-services/national-numbering-plan-2003 was helpful but last
-           updated 2012 - more updates at http://www.dot.gov.in/access-services/allotment-msc-codes. -->
+           updated 2012 - more updates at http://www.dot.gov.in/access-services/allotment-msc-codes.
+           -->
       <mobile>
         <!-- A couple of additional prefixes found neither on the wikipedia page nor in the MSC
              codes list, 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. We go to a maximum depth of five where
              necessary to distinguish between mobile and fixed-line numbers. Extra prefixes added:
-             7601, 768[56], 7695, 8299, 8309. New prefixes were also added based on the document
-             provided from mobile carriers: https://github.com/googlei18n/libphonenumber/issues/260
-             and https://github.com/googlei18n/libphonenumber/pull/692/ -->
+             72878, 74599, 7601, 768[56], 7695, 8299, 8309. New prefixes were also added based on
+             the document provided from mobile carriers:
+             https://github.com/googlei18n/libphonenumber/issues/260 and
+             https://github.com/googlei18n/libphonenumber/pull/692/ -->
         <nationalNumberPattern>
           (?:
             7(?:
               0\d{3}|
               2(?:
-                [0235679]\d|
-                [14][017-9]|
-                8[0-59]|
-                9[389]
-              )\d|
+                [0235679]\d{2}|
+                [14][017-9]\d|
+                8(?:
+                  [0-59]\d|
+                  6[089]|
+                  78
+                )|
+                9[389]\d
+              )|
               3(?:
                 [05-8]\d{2}|
                 1(?:
@@ -11193,7 +11261,10 @@
                   [07-9]\d|
                   11
                 )|
-                9[01689]\d
+                9(?:
+                  [01689]\d|
+                  59
+                )
               )|
               4(?:
                 0[1-9]\d|
@@ -11201,9 +11272,38 @@
                   [015-9]\d|
                   4[08]
                 )|
-                [29][89]\d|
-                39\d|
-                8[389]\d
+                2(?:
+                  [1-7][089]|
+                  [89]\d
+                )|
+                3(?:
+                  [0-8][089]|
+                  9\d
+                )|
+                4(?:
+                  [089]\d|
+                  11|
+                  7[02-8]
+                )|
+                5(?:
+                  0[089]|
+                  [59]9
+                )|
+                7(?:
+                  0[3-9]|
+                  11|
+                  7[02-8]|
+                  [89]\d
+                )|
+                8(?:
+                  [0-24-7][089]|
+                  [389]\d
+                )|
+                9(?:
+                  [0-6][089]|
+                  7[08]|
+                  [89]\d
+                )
               )|
               5(?:
                 [034678]\d|
@@ -11224,7 +11324,10 @@
                 [1-79]\d|
                 8[1-9]
               )\d|
-              8[0-79]\d{2}|
+              8(?:
+                [0-79]\d{2}|
+                88[01]
+              )|
               99[4-9]\d
             )|
             8(?:
@@ -11265,7 +11368,7 @@
           )\d{5}
         </nationalNumberPattern>
         <possibleNumberPattern>\d{10}</possibleNumberPattern>
-        <exampleNumber>9123456789</exampleNumber>
+        <exampleNumber>9987654321</exampleNumber>
       </mobile>
       <tollFree>
         <!-- Information gathered from sites such as
@@ -11273,6 +11376,7 @@
              http://indmusings.blogspot.com/2008/09/free-help-line-numbersindia.html
              http://www.bsnl.co.in/service/telev.htm -->
         <nationalNumberPattern>
+          00800\d{7}|
           1(?:
             600\d{6}|
             80(?:
@@ -13749,7 +13853,7 @@
               6[5-7]
             )|
             66\d|
-            76[02-6]
+            76[02-7]
           )\d{4}
         </nationalNumberPattern>
         <possibleNumberPattern>\d{10}</possibleNumberPattern>
@@ -14138,7 +14242,10 @@
         <numberFormat pattern="(\d{3})(\d{5})">
           <leadingDigits>
             244|
-            5[015]
+            5(?:
+              [015]|
+              66
+            )
           </leadingDigits>
           <format>$1 $2</format>
         </numberFormat>
@@ -14178,10 +14285,12 @@
               2(?:
                 22|
                 5[25]
-              )
+              )|
+              66\d
             )|
             6(?:
               0[034679]\d|
+              222|
               5[015-9]\d|
               6\d{2}|
               7[067]\d|
@@ -15287,7 +15396,7 @@
         <possibleNumberPattern>\d{8}</possibleNumberPattern>
       </generalDesc>
       <fixedLine>
-        <nationalNumberPattern>6[3-8]\d{6}</nationalNumberPattern>
+        <nationalNumberPattern>6\d{7}</nationalNumberPattern>
         <exampleNumber>63123456</exampleNumber>
       </fixedLine>
       <mobile>
@@ -19768,9 +19877,10 @@
         <sourceUrl>http://www.itu.int/oth/T02020000A5/en</sourceUrl>
         <sourceUrl>http://www.copaco.com.py/portal/index.php/component/content/article/8-empresa/74-codigos-de-area.html</sourceUrl>
       </references>
+      <!-- Number formats of landline numbers are based on online references. -->
       <availableFormats>
-        <!-- CONATEL plan. -->
-        <numberFormat pattern="(\d{2})(\d{5,7})" nationalPrefixFormattingRule="($FG)">
+        <!-- CONATEL plan begin. -->
+        <numberFormat pattern="(\d{2})(\d{5})" nationalPrefixFormattingRule="($NP$FG)">
           <leadingDigits>
             (?:
               [26]1|
@@ -19782,6 +19892,19 @@
           </leadingDigits>
           <format>$1 $2</format>
         </numberFormat>
+        <numberFormat pattern="(\d{2})(\d{3})(\d{3,4})" nationalPrefixFormattingRule="($NP$FG)">
+          <leadingDigits>
+            (?:
+              [26]1|
+              3[289]|
+              4[124678]|
+              7[123]|
+              8[1236]
+            )
+          </leadingDigits>
+          <format>$1 $2 $3</format>
+        </numberFormat>
+        <!-- CONATEL plan end. -->
         <numberFormat pattern="(\d{3})(\d{3,6})" nationalPrefixFormattingRule="$NP$FG">
           <leadingDigits>[2-9]0</leadingDigits>
           <format>$1 $2</format>
@@ -19795,12 +19918,16 @@
           <leadingDigits>8700</leadingDigits>
           <format>$1 $2 $3</format>
         </numberFormat>
-        <!-- "Fall-back" rule for the rest of the fixed-line numbers that have 3-digit area codes.
+        <!-- "Fall-back" rules for the rest of the fixed-line numbers that have 3-digit area codes.
              -->
-        <numberFormat pattern="(\d{3})(\d{4,6})" nationalPrefixFormattingRule="($FG)">
+        <numberFormat pattern="(\d{3})(\d{4,5})" nationalPrefixFormattingRule="($NP$FG)">
           <leadingDigits>[2-8][1-9]</leadingDigits>
           <format>$1 $2</format>
         </numberFormat>
+        <numberFormat pattern="(\d{3})(\d{3})(\d{3})" nationalPrefixFormattingRule="$NP$FG">
+          <leadingDigits>[2-8][1-9]</leadingDigits>
+          <format>$1 $2 $3</format>
+        </numberFormat>
       </availableFormats>
       <generalDesc>
         <nationalNumberPattern>
@@ -21245,14 +21372,20 @@
       </fixedLine>
       <mobile>
         <!-- 948 isn't in the number pattern, but many examples using this have been found, so
-             deeming it valid for now. -->
+             deeming it valid for now. 909[1-9] is assigned to carrier Juro as per online
+             references found. -->
         <nationalNumberPattern>
           9(?:
-            0[1-8]|
-            1[0-24-9]|
-            4[0489]|
-            50
-          )\d{6}
+            0(?:
+              [1-8]\d|
+              9[1-9]
+            )|
+            (?:
+              1[0-24-9]|
+              4[0489]|
+              50
+            )\d
+          )\d{5}
         </nationalNumberPattern>
         <possibleNumberPattern>\d{9}</possibleNumberPattern>
         <exampleNumber>912123456</exampleNumber>
@@ -21449,7 +21582,7 @@
           7(?:
             [067]\d|
             21|
-            8[0-26]|
+            8[0-46]|
             90
           )\d{6}
         </nationalNumberPattern>
@@ -21979,7 +22112,7 @@
             )|
             3(?:
               3[1-389]|
-              4[1-7]
+              4[1-8]
             )|
             4[34][1-3]
           )\d{4}
@@ -22166,14 +22299,14 @@
         <exampleNumber>21234567</exampleNumber>
       </fixedLine>
       <mobile>
-        <!-- Numbers found online starting with 62. 14 and 63 are from an open-source bug report,
-             we couldn't find evidence of these specifically being in use but this article
-             http://www.prachachat.net/news_detail.php?newsid=1395732787&grpid=03&catid=06&subcatid=0600
-             talks about prefix 6 and 1 being cleared for mobile use. -->
+        <!-- Numbers found online starting with 62 and 64. 14 and 63 are from an open-source bug
+             report, we couldn't find evidence of these specifically being in use but this article
+             http://www.prachachat.net/news_detail.php?newsid=1395732787 talks about prefix 6 and 1
+             being cleared for mobile use. -->
         <nationalNumberPattern>
           (?:
             14|
-            6[1-3]|
+            6[1-4]|
             [89]\d
           )\d{7}
         </nationalNumberPattern>
@@ -22281,11 +22414,14 @@
       </fixedLine>
       <mobile>
         <!-- Adding 90 prefix as SMS messages could be successfully delivered to these mobile
-             numbers, and 50[12] for TCell from bug reports. -->
+             numbers, 50[12] for TCell and 55 for Megafon from bug reports. -->
         <nationalNumberPattern>
           (?:
             41[18]|
-            50[125]|
+            5(?:
+              0[125]|
+              5\d
+            )|
             88\d|
             9[0-35-9]\d
           )\d{6}
@@ -22918,8 +23054,8 @@
       <mobile>
         <nationalNumberPattern>
           (?:
-            6[25-8]|
-            7[13-9]
+            6[125-9]|
+            7[1-9]
           )\d{7}
         </nationalNumberPattern>
         <possibleNumberPattern>\d{9}</possibleNumberPattern>
@@ -23349,7 +23485,7 @@
               0[1346-9]|
               1[02-9]|
               2[0589]|
-              3[01678]|
+              3[014678]|
               4[0179]|
               5[12469]|
               7[0-3589]|
@@ -23357,7 +23493,7 @@
             )
           )[2-9]\d{6}
         </nationalNumberPattern>
-        <exampleNumber>2015555555</exampleNumber>
+        <exampleNumber>2015550123</exampleNumber>
       </fixedLine>
       <mobile>
         <nationalNumberPattern>
@@ -23441,7 +23577,7 @@
               0[1346-9]|
               1[02-9]|
               2[0589]|
-              3[01678]|
+              3[014678]|
               4[0179]|
               5[12469]|
               7[0-3589]|
@@ -23449,7 +23585,7 @@
             )
           )[2-9]\d{6}
         </nationalNumberPattern>
-        <exampleNumber>2015555555</exampleNumber>
+        <exampleNumber>2015550123</exampleNumber>
       </mobile>
       <tollFree>
         <nationalNumberPattern>