JAVA/CPP/JS: libphonenumber 5.4.1

13 years ago · b1427e012a
--- a/cpp/src/phonenumbers/metadata.cc
+++ b/cpp/src/phonenumbers/metadata.cc
--- a/debian/changelog
+++ b/debian/changelog
@ -1,3 +1,14 @@
 libphonenumber (5.4.1) precise; urgency=low

  * Metadata changes:
    - Updated metadata for region code(s): BF, BH, CR, EC, IR, MG, PF,
    TD, TN
    - New geocoding data for country calling code(s): 374 (am, ru)
    - Updated geocoding data for country calling code(s):
    98 (en, fa), 358 (en, se), 374 (en)

 -- Shaopeng Jia <shaopengjia@google.com>  Mon, 25 Mar 2013 13:42:45 +0100

 libphonenumber (5.4) precise; urgency=low

  * Code changes:
--- a/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/358_en
+++ b/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/358_en
--- a/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/358_se
+++ b/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/358_se
--- a/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/374_am
+++ b/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/374_am
--- a/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/374_en
+++ b/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/374_en
--- a/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/374_ru
+++ b/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/374_ru
--- a/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/98_en
+++ b/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/98_en
--- a/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/98_fa
+++ b/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/98_fa
--- a/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/config
+++ b/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/config
--- a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BF
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BF
--- a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BH
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BH
--- a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CR
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CR
--- a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_EC
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_EC
--- a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_IR
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_IR
--- a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MG
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MG
--- a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PF
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PF
--- a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TD
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TD
--- a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TN
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TN
--- a/java/release_notes.txt
+++ b/java/release_notes.txt
@ -1,3 +1,10 @@
 Mar 25, 2013: libphonenumber-5.4.1
 * Metadata changes:
 - Updated metadata for region code(s): BF, BH, CR, EC, IR, MG, PF, TD, TN
 - New geocoding data for country calling code(s): 374 (am, ru)
 - Updated geocoding data for country calling code(s):
   98 (en, fa), 358 (en, se), 374 (en)

 Mar 07, 2013: libphonenumber-5.4
 * Code changes:
 - Switch formatNumberForMobileDialing to prefer national format to international format when the
--- a/javascript/i18n/phonenumbers/metadata.js
+++ b/javascript/i18n/phonenumbers/metadata.js
@ -673,7 +673,7 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ]
 ,"BF":[,[,,"[24-7]\\d{7}","\\d{8}"]
 ,[,,"(?:20(?:49|5[23]|9[016-9])|40(?:4[56]|5[4-6]|7[0179])|50[34]\\d)\\d{4}","\\d{8}",,,"20491234"]
 ,[,,"(?:6(?:[056]\\d|1[0-367]|8[0-3]|90)|7(?:[02-68]\\d|1[0-4689]|7[0-69]|9[0-689]))\\d{5}","\\d{8}",,,"70123456"]
 ,[,,"(?:6(?:[056]\\d|1[0-36-9]|8[0-3]|90)|7(?:[02-68]\\d|1[0-4689]|7[0-69]|9[0-689]))\\d{5}","\\d{8}",,,"70123456"]
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
@ -718,7 +718,7 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ]
 ,"BH":[,[,,"[136-9]\\d{7}","\\d{8}"]
 ,[,,"(?:1(?:3[3-6]|6[0156]|7\\d)\\d|6(?:1[16]\\d|6(?:0\\d|3[12]|44)|9(?:69|9[6-9]))|77\\d{2})\\d{4}","\\d{8}",,,"17001234"]
 ,[,,"(?:3(?:[23469]\\d|5[35]|77|8[348])\\d|6(?:1[16]\\d|6(?:[06]\\d|3[03-9]|44)|9(?:69|9[6-9]))|77\\d{2})\\d{4}","\\d{8}",,,"36001234"]
 ,[,,"(?:3(?:[23469]\\d|5[35]|77|8[348])\\d|6(?:1[16]\\d|3(?:00|33|6[16])|6(?:[069]\\d|3[03-9]|44)|9(?:69|9[6-9]))|77\\d{2})\\d{4}","\\d{8}",,,"36001234"]
 ,[,,"80\\d{6}","\\d{8}",,,"80123456"]
 ,[,,"(?:87|9[014578])\\d{6}","\\d{8}",,,"90123456"]
 ,[,,"84\\d{6}","\\d{8}",,,"84123456"]
@ -1247,7 +1247,7 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"90[059]\\d{7}","\\d{10}",,,"9001234567"]
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
 ,[,,"210[0-6]\\d{4}|4(?:0(?:[04]0\\d{4}|10[0-3]\\d{3}|2(?:00\\d|900)\\d{2}|3[01]\\d{4}|5\\d{5}|70[01]\\d{3})|1[01]\\d{5}|400\\d{4})|5100\\d{4}","\\d{8}",,,"40001234"]
 ,[,,"210[0-6]\\d{4}|4(?:0(?:[04]0\\d{4}|10[0-3]\\d{3}|2(?:00\\d|900)\\d{2}|3[01]\\d{4}|5\\d{5}|70[01]\\d{3})|1[01]\\d{5}|400\\d{4}|70[0-2]\\d{4})|5100\\d{4}","\\d{8}",,,"40001234"]
 ,"CR",506,"00",,,,"(19(?:0[0-2468]|19|66|77))",,,,[[,"(\\d{4})(\\d{4})","$1 $2",["[24-7]|8[3-9]"]
 ,"","$CC $1",0]
 ,[,"(\\d{3})(\\d{3})(\\d{4})","$1-$2-$3",["[89]0"]
@ -1490,7 +1490,7 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ]
 ,"EC":[,[,,"1\\d{9,10}|[2-8]\\d{7}|9\\d{8}","\\d{7,11}"]
 ,[,,"[2-7][2-7]\\d{6}","\\d{7,8}",,,"22123456"]
 ,[,,"9(?:[2-7]9|[89]\\d)\\d{6}","\\d{9}",,,"991234567"]
 ,[,,"9(?:39|[4-6][89]|7[7-9]|[89]\\d)\\d{6}","\\d{9}",,,"991234567"]
 ,[,,"1800\\d{6,7}","\\d{10,11}",,,"18001234567"]
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
@ -2337,14 +2337,14 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,,[,,"NA","NA"]
 ,[,,"NA","NA"]
 ]
 ,"IR":[,[,,"[2-6]\\d{4,9}|9(?:[1-4]\\d{8}|9\\d{2,8})|[178]\\d{9}","\\d{4,10}"]
 ,[,,"2(?:1[2-9]\\d{2,7}|51\\d{3,7})|(?:241|3(?:11|51)|441|5[14]1)\\d{4,7}|(?:3(?:34|41)|6(?:11|52))\\d{6,7}|(?:1(?:[134589][12]|[27][1-4])|2(?:2[189]|[389][12]|42|5[256]|6[1-59]|7[34])|3(?:12|2[1-4]|3[125]|4[24-9]|5[23]|[6-9][12])|4(?:[135-9][12]|2[1-467]|4[2-4])|5(?:12|2[89]|3[1-5]|4[2-8]|[5-7][12]|8[1245])|6(?:12|[347-9][12]|51|6[1-6])|7(?:[13589][12]|2[1289]|4[1-4]|6[1-6]|7[1-3])|8(?:[145][12]|3[124578]|6[1256]|7[1245]))\\d{7}","\\d{5,10}",,,"2123456789"]
 ,[,,"9(?:1(?:[039]\\d|[16][1-35-9]|2[1-8]|4[013-9]|[57][1-9]|8[13-9])|2[01]\\d|3(?:[035-9]\\d|13|2[1-579]|47))\\d{6}","\\d{10}",,,"9123456789"]
 ,"IR":[,[,,"[14-8]\\d{6,9}|[23]\\d{5,9}|9(?:[1-4]\\d{8}|9\\d{2,8})","\\d{4,10}"]
 ,[,,"(?:[145](?:1[1-9]|[2-9]\\d)\\d{0,3}|[23][1-9]\\d{0,4}|6[1-9]\\d{1,4}|[78]\\d{2,5})\\d{4}","\\d{6,10}",,,"2123456789"]
 ,[,,"9[1-3]\\d{8}","\\d{10}",,,"9123456789"]
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
 ,[,,"993[12]\\d{6}","\\d{10}",,,"9932123456"]
 ,[,,"(?:[2-6]0\\d|993)\\d{7}","\\d{10}",,,"9932123456"]
 ,"IR",98,"00","0",,,"0",,,,[[,"(21)(\\d{3,5})","$1 $2",["21"]
 ,"0$1","",0]
 ,[,"(21)(\\d{3})(\\d{3,4})","$1 $2 $3",["21"]
@ -2354,7 +2354,7 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,"(\\d{3})(\\d{3})(\\d{3,4})","$1 $2 $3",["[13-9]|2[02-9]"]
 ,"0$1","",0]
 ]
 ,,[,,"943[24678]\\d{6}","\\d{10}",,,"9432123456"]
 ,,[,,"943\\d{7}","\\d{10}",,,"9432123456"]
 ,,,[,,"NA","NA"]
 ,[,,"9990\\d{0,6}","\\d{4,10}",,,"9990123456"]
 ,,[,,"1(?:1[025]|25)","\\d{3}",,,"112"]
@ -3029,7 +3029,7 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ]
 ,"MG":[,[,,"[23]\\d{8}","\\d{7,9}"]
 ,[,,"2(?:0(?:(?:2\\d|4[47]|5[3467]|6[279]|8[268]|9[245])\\d|7(?:2[29]|[35]\\d))|210\\d)\\d{4}","\\d{7,9}",,,"202123456"]
 ,[,,"3[02-4]\\d{7}","\\d{9}",,,"301234567"]
 ,[,,"3(?:[02-4]\\d|90)\\d{6}","\\d{9}",,,"301234567"]
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
@ -3697,15 +3697,17 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,,[,,"1(?:05|1[67])","\\d{3}",,,"105"]
 ,[,,"NA","NA"]
 ]
 ,"PF":[,[,,"[2-9]\\d{5}","\\d{6}"]
 ,"PF":[,[,,"[2-79]\\d{5}|8\\d{5,7}","\\d{6}(?:\\d{2})?"]
 ,[,,"(?:4(?:[02-9]\\d|1[02-9])|[5689]\\d{2})\\d{3}","\\d{6}",,,"401234"]
 ,[,,"(?:[27]\\d{2}|3[0-79]\\d|411)\\d{3}","\\d{6}",,,"212345"]
 ,[,,"(?:[27]\\d{2}|3[0-79]\\d|411|89\\d{3})\\d{3}","\\d{6}(?:\\d{2})?",,,"212345"]
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
 ,"PF",689,"00",,,,,,,,[[,"(\\d{2})(\\d{2})(\\d{2})","$1 $2 $3",,"","",0]
 ,"PF",689,"00",,,,,,,,[[,"(\\d{2})(\\d{2})(\\d{2})(\\d{2})","$1 $2 $3 $4",["89"]
 ,"","",0]
 ,[,"(\\d{2})(\\d{2})(\\d{2})","$1 $2 $3",,"","",0]
 ]
 ,,[,,"NA","NA"]
 ,,,[,,"44\\d{4}","\\d{6}",,,"441234"]
@ -4500,7 +4502,7 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ]
 ,"TD":[,[,,"[2679]\\d{7}","\\d{8}"]
 ,[,,"22(?:[3789]0|5[0-5]|6[89])\\d{4}","\\d{8}",,,"22501234"]
 ,[,,"(?:6[36]\\d|77\\d|9(?:5[0-4]|9\\d))\\d{5}","\\d{8}",,,"63012345"]
 ,[,,"(?:6[02368]\\d|77\\d|9(?:5[0-4]|9\\d))\\d{5}","\\d{8}",,,"63012345"]
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
@ -4629,10 +4631,10 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ]
 ,"TN":[,[,,"[2-57-9]\\d{7}","\\d{8}"]
 ,[,,"(?:3[012]|7\\d)\\d{6}","\\d{8}",,,"71234567"]
 ,[,,"(?:3[012]|7\\d|81)\\d{6}","\\d{8}",,,"71234567"]
 ,[,,"(?:[259]\\d|4[0-2])\\d{6}","\\d{8}",,,"20123456"]
 ,[,,"NA","NA"]
 ,[,,"8[0128]\\d{6}","\\d{8}",,,"80123456"]
 ,[,,"8[028]\\d{6}","\\d{8}",,,"80123456"]
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
--- a/javascript/i18n/phonenumbers/metadatalite.js
+++ b/javascript/i18n/phonenumbers/metadatalite.js
@ -673,7 +673,7 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ]
 ,"BF":[,[,,"[24-7]\\d{7}","\\d{8}"]
 ,[,,"(?:20(?:49|5[23]|9[016-9])|40(?:4[56]|5[4-6]|7[0179])|50[34]\\d)\\d{4}","\\d{8}"]
 ,[,,"(?:6(?:[056]\\d|1[0-367]|8[0-3]|90)|7(?:[02-68]\\d|1[0-4689]|7[0-69]|9[0-689]))\\d{5}","\\d{8}"]
 ,[,,"(?:6(?:[056]\\d|1[0-36-9]|8[0-3]|90)|7(?:[02-68]\\d|1[0-4689]|7[0-69]|9[0-689]))\\d{5}","\\d{8}"]
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
@ -718,7 +718,7 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ]
 ,"BH":[,[,,"[136-9]\\d{7}","\\d{8}"]
 ,[,,"(?:1(?:3[3-6]|6[0156]|7\\d)\\d|6(?:1[16]\\d|6(?:0\\d|3[12]|44)|9(?:69|9[6-9]))|77\\d{2})\\d{4}","\\d{8}"]
 ,[,,"(?:3(?:[23469]\\d|5[35]|77|8[348])\\d|6(?:1[16]\\d|6(?:[06]\\d|3[03-9]|44)|9(?:69|9[6-9]))|77\\d{2})\\d{4}","\\d{8}"]
 ,[,,"(?:3(?:[23469]\\d|5[35]|77|8[348])\\d|6(?:1[16]\\d|3(?:00|33|6[16])|6(?:[069]\\d|3[03-9]|44)|9(?:69|9[6-9]))|77\\d{2})\\d{4}","\\d{8}"]
 ,[,,"80\\d{6}","\\d{8}"]
 ,[,,"(?:87|9[014578])\\d{6}","\\d{8}"]
 ,[,,"84\\d{6}","\\d{8}"]
@ -1247,7 +1247,7 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"90[059]\\d{7}","\\d{10}"]
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
 ,[,,"210[0-6]\\d{4}|4(?:0(?:[04]0\\d{4}|10[0-3]\\d{3}|2(?:00\\d|900)\\d{2}|3[01]\\d{4}|5\\d{5}|70[01]\\d{3})|1[01]\\d{5}|400\\d{4})|5100\\d{4}","\\d{8}"]
 ,[,,"210[0-6]\\d{4}|4(?:0(?:[04]0\\d{4}|10[0-3]\\d{3}|2(?:00\\d|900)\\d{2}|3[01]\\d{4}|5\\d{5}|70[01]\\d{3})|1[01]\\d{5}|400\\d{4}|70[0-2]\\d{4})|5100\\d{4}","\\d{8}"]
 ,"CR",506,"00",,,,"(19(?:0[0-2468]|19|66|77))",,,,[[,"(\\d{4})(\\d{4})","$1 $2",["[24-7]|8[3-9]"]
 ,"","$CC $1",0]
 ,[,"(\\d{3})(\\d{3})(\\d{4})","$1-$2-$3",["[89]0"]
@ -1490,7 +1490,7 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ]
 ,"EC":[,[,,"1\\d{9,10}|[2-8]\\d{7}|9\\d{8}","\\d{7,11}"]
 ,[,,"[2-7][2-7]\\d{6}","\\d{7,8}"]
 ,[,,"9(?:[2-7]9|[89]\\d)\\d{6}","\\d{9}"]
 ,[,,"9(?:39|[4-6][89]|7[7-9]|[89]\\d)\\d{6}","\\d{9}"]
 ,[,,"1800\\d{6,7}","\\d{10,11}"]
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
@ -2337,14 +2337,14 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,,[,,"NA","NA"]
 ,[,,"NA","NA"]
 ]
 ,"IR":[,[,,"[2-6]\\d{4,9}|9(?:[1-4]\\d{8}|9\\d{2,8})|[178]\\d{9}","\\d{4,10}"]
 ,[,,"2(?:1[2-9]\\d{2,7}|51\\d{3,7})|(?:241|3(?:11|51)|441|5[14]1)\\d{4,7}|(?:3(?:34|41)|6(?:11|52))\\d{6,7}|(?:1(?:[134589][12]|[27][1-4])|2(?:2[189]|[389][12]|42|5[256]|6[1-59]|7[34])|3(?:12|2[1-4]|3[125]|4[24-9]|5[23]|[6-9][12])|4(?:[135-9][12]|2[1-467]|4[2-4])|5(?:12|2[89]|3[1-5]|4[2-8]|[5-7][12]|8[1245])|6(?:12|[347-9][12]|51|6[1-6])|7(?:[13589][12]|2[1289]|4[1-4]|6[1-6]|7[1-3])|8(?:[145][12]|3[124578]|6[1256]|7[1245]))\\d{7}","\\d{5,10}"]
 ,[,,"9(?:1(?:[039]\\d|[16][1-35-9]|2[1-8]|4[013-9]|[57][1-9]|8[13-9])|2[01]\\d|3(?:[035-9]\\d|13|2[1-579]|47))\\d{6}","\\d{10}"]
 ,"IR":[,[,,"[14-8]\\d{6,9}|[23]\\d{5,9}|9(?:[1-4]\\d{8}|9\\d{2,8})","\\d{4,10}"]
 ,[,,"(?:[145](?:1[1-9]|[2-9]\\d)\\d{0,3}|[23][1-9]\\d{0,4}|6[1-9]\\d{1,4}|[78]\\d{2,5})\\d{4}","\\d{6,10}"]
 ,[,,"9[1-3]\\d{8}","\\d{10}"]
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
 ,[,,"993[12]\\d{6}","\\d{10}"]
 ,[,,"(?:[2-6]0\\d|993)\\d{7}","\\d{10}"]
 ,"IR",98,"00","0",,,"0",,,,[[,"(21)(\\d{3,5})","$1 $2",["21"]
 ,"0$1","",0]
 ,[,"(21)(\\d{3})(\\d{3,4})","$1 $2 $3",["21"]
@ -2354,7 +2354,7 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,"(\\d{3})(\\d{3})(\\d{3,4})","$1 $2 $3",["[13-9]|2[02-9]"]
 ,"0$1","",0]
 ]
 ,,[,,"943[24678]\\d{6}","\\d{10}"]
 ,,[,,"943\\d{7}","\\d{10}"]
 ,,,[,,"NA","NA"]
 ,[,,"9990\\d{0,6}","\\d{4,10}"]
 ,,[,,"1(?:1[025]|25)","\\d{3}"]
@ -3029,7 +3029,7 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ]
 ,"MG":[,[,,"[23]\\d{8}","\\d{7,9}"]
 ,[,,"2(?:0(?:(?:2\\d|4[47]|5[3467]|6[279]|8[268]|9[245])\\d|7(?:2[29]|[35]\\d))|210\\d)\\d{4}","\\d{7,9}"]
 ,[,,"3[02-4]\\d{7}","\\d{9}"]
 ,[,,"3(?:[02-4]\\d|90)\\d{6}","\\d{9}"]
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
@ -3697,15 +3697,17 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,,[,,"1(?:05|1[67])","\\d{3}"]
 ,[,,"NA","NA"]
 ]
 ,"PF":[,[,,"[2-9]\\d{5}","\\d{6}"]
 ,"PF":[,[,,"[2-79]\\d{5}|8\\d{5,7}","\\d{6}(?:\\d{2})?"]
 ,[,,"(?:4(?:[02-9]\\d|1[02-9])|[5689]\\d{2})\\d{3}","\\d{6}"]
 ,[,,"(?:[27]\\d{2}|3[0-79]\\d|411)\\d{3}","\\d{6}"]
 ,[,,"(?:[27]\\d{2}|3[0-79]\\d|411|89\\d{3})\\d{3}","\\d{6}(?:\\d{2})?"]
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
 ,"PF",689,"00",,,,,,,,[[,"(\\d{2})(\\d{2})(\\d{2})","$1 $2 $3",,"","",0]
 ,"PF",689,"00",,,,,,,,[[,"(\\d{2})(\\d{2})(\\d{2})(\\d{2})","$1 $2 $3 $4",["89"]
 ,"","",0]
 ,[,"(\\d{2})(\\d{2})(\\d{2})","$1 $2 $3",,"","",0]
 ]
 ,,[,,"NA","NA"]
 ,,,[,,"44\\d{4}","\\d{6}"]
@ -4500,7 +4502,7 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ]
 ,"TD":[,[,,"[2679]\\d{7}","\\d{8}"]
 ,[,,"22(?:[3789]0|5[0-5]|6[89])\\d{4}","\\d{8}"]
 ,[,,"(?:6[36]\\d|77\\d|9(?:5[0-4]|9\\d))\\d{5}","\\d{8}"]
 ,[,,"(?:6[02368]\\d|77\\d|9(?:5[0-4]|9\\d))\\d{5}","\\d{8}"]
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
@ -4629,10 +4631,10 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ]
 ,"TN":[,[,,"[2-57-9]\\d{7}","\\d{8}"]
 ,[,,"(?:3[012]|7\\d)\\d{6}","\\d{8}"]
 ,[,,"(?:3[012]|7\\d|81)\\d{6}","\\d{8}"]
 ,[,,"(?:[259]\\d|4[0-2])\\d{6}","\\d{8}"]
 ,[,,"NA","NA"]
 ,[,,"8[0128]\\d{6}","\\d{8}"]
 ,[,,"8[028]\\d{6}","\\d{8}"]
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
--- a/resources/PhoneNumberMetaData.xml
+++ b/resources/PhoneNumberMetaData.xml
@ -631,9 +631,7 @@
        <exampleNumber>10123456</exampleNumber>
      </fixedLine>
      <mobile>
        <!-- Adding 55 from online numbers found and SMSs received from numbers with this prefix. It
             seems to be used by Orange Armenia. Part of the range 97 is used by Nagorno-Karabakh
             Republic. -->
        <!-- Part of the range 97 is used by Nagorno-Karabakh Republic. -->
        <nationalNumberPattern>
          (?:
            55|
@ -2628,7 +2626,7 @@
          (?:
            6(?:
              [056]\d|
              1[0-367]|
              1[0-36-9]|
              8[0-3]|
              90
            )|
@ -2832,8 +2830,13 @@
            )\d|
            6(?:
              1[16]\d|
              3(?:
                00|
                33|
                6[16]
              )|
              6(?:
                [06]\d|
                [069]\d|
                3[03-9]|
                44
              )|
@ -5072,7 +5075,8 @@
              70[01]\d{3}
            )|
            1[01]\d{5}|
            400\d{4}
            400\d{4}|
            70[0-2]\d{4}
          )|
          5100\d{4}
        </nationalNumberPattern>
@ -5092,7 +5096,7 @@
              1[0-35-9]|
              37|
              [46]6|
              75|
              7[57]|
              8[79]|
              9[0-379]
            )|
@ -5114,7 +5118,8 @@
              1[789]|
              2[02]|
              [67]7
            )
            )|
            975
          )
        </nationalNumberPattern>
        <possibleNumberPattern>\d{4}</possibleNumberPattern>
@ -6310,7 +6315,9 @@
      <mobile>
        <nationalNumberPattern>
          9(?:
            [2-7]9|
            39|
            [4-6][89]|
            7[7-9]|
            [89]\d
          )\d{6}
        </nationalNumberPattern>
@ -11291,132 +11298,51 @@
      </availableFormats>
      <generalDesc>
        <nationalNumberPattern>
          [2-6]\d{4,9}|
          [14-8]\d{6,9}|
          [23]\d{5,9}|
          9(?:
            [1-4]\d{8}|
            9\d{2,8}
          )|
          [178]\d{9}
          )
        </nationalNumberPattern>
        <possibleNumberPattern>\d{4,10}</possibleNumberPattern>
      </generalDesc>
      <fixedLine>
        <!-- The patterns here are organized such that numbers with variable lengths come first,
             followed by numbers that are 10 digits long. -->
        <nationalNumberPattern>
          2(?:
            1[2-9]\d{2,7}|
            51\d{3,7}
          )|
          (?:
            241|
            3(?:
              11|
              51
            )|
            441|
            5[14]1
          )\d{4,7}|
          (?:
            3(?:
              34|
              41
            )|
            6(?:
              11|
              52
            )
          )\d{6,7}|
          (?:
            1(?:
              [134589][12]|
              [27][1-4]
            )|
            2(?:
              2[189]|
              [389][12]|
              42|
              5[256]|
              6[1-59]|
              7[34]
            )|
            3(?:
              12|
              2[1-4]|
              3[125]|
              4[24-9]|
              5[23]|
              [6-9][12]
            )|
            4(?:
              [135-9][12]|
              2[1-467]|
              4[2-4]
            )|
            5(?:
              12|
              2[89]|
              3[1-5]|
              4[2-8]|
              [5-7][12]|
              8[1245]
            )|
            6(?:
              12|
              [347-9][12]|
              51|
              6[1-6]
            )|
            7(?:
              [13589][12]|
              2[1289]|
              4[1-4]|
              6[1-6]|
              7[1-3]
            )|
            8(?:
              [145][12]|
              3[124578]|
              6[1256]|
              7[1245]
            )
          )\d{7}
            [145](?:
              1[1-9]|
              [2-9]\d
            )\d{0,3}|
            [23][1-9]\d{0,4}|
            6[1-9]\d{1,4}|
            [78]\d{2,5}
          )\d{4}
        </nationalNumberPattern>
        <possibleNumberPattern>\d{5,10}</possibleNumberPattern>
        <possibleNumberPattern>\d{6,10}</possibleNumberPattern>
        <exampleNumber>2123456789</exampleNumber>
      </fixedLine>
      <mobile>
        <nationalNumberPattern>
          9(?:
            1(?:
              [039]\d|
              [16][1-35-9]|
              2[1-8]|
              4[013-9]|
              [57][1-9]|
              8[13-9]
            )|
            2[01]\d|
            3(?:
              [035-9]\d|
              13|
              2[1-579]|
              47
            )
          )\d{6}
          9[1-3]\d{8}
        </nationalNumberPattern>
        <possibleNumberPattern>\d{10}</possibleNumberPattern>
        <exampleNumber>9123456789</exampleNumber>
      </mobile>
      <pager>
        <nationalNumberPattern>943[24678]\d{6}</nationalNumberPattern>
        <nationalNumberPattern>943\d{7}</nationalNumberPattern>
        <possibleNumberPattern>\d{10}</possibleNumberPattern>
        <exampleNumber>9432123456</exampleNumber>
      </pager>
      <!-- No tollFree or premiumRate information can be found. -->
      <voip>
        <!-- Includes VSAT and Boomehen Satellite numbers. -->
        <nationalNumberPattern>993[12]\d{6}</nationalNumberPattern>
        <nationalNumberPattern>
          (?:
            [2-6]0\d|
            993
          )\d{7}
        </nationalNumberPattern>
        <possibleNumberPattern>\d{10}</possibleNumberPattern>
        <exampleNumber>9932123456</exampleNumber>
      </voip>
@ -15964,7 +15890,12 @@
      <mobile>
        <!-- The numbering plan suggests the third digit, Z, should be 24-9, but this is not borne
             out by reality. -->
        <nationalNumberPattern>3[02-4]\d{7}</nationalNumberPattern>
        <nationalNumberPattern>
          3(?:
            [02-4]\d|
            90
          )\d{6}
        </nationalNumberPattern>
        <possibleNumberPattern>\d{9}</possibleNumberPattern>
        <exampleNumber>301234567</exampleNumber>
      </mobile>
@ -17507,9 +17438,9 @@
           a 9 are premium rate, but no online examples can be found of any of these so they are
           omitted for the time-being. -->
      <shortCode>
        <nationalNumberPattern>1[0234]\d</nationalNumberPattern>
        <possibleNumberPattern>\d{3}</possibleNumberPattern>
        <exampleNumber>101</exampleNumber>
        <nationalNumberPattern>1[02-5]\d{2}</nationalNumberPattern>
        <possibleNumberPattern>\d{4}</possibleNumberPattern>
        <exampleNumber>1011</exampleNumber>
      </shortCode>
      <emergency>
        <!-- 11X is national, 19X is for Maputo. -->
@ -18924,16 +18855,24 @@
    <!-- http://www.itu.int/oth/T020200004D/en -->
    <territory id="PF" countryCode="689" internationalPrefix="00">
      <availableFormats>
        <numberFormat pattern="(\d{2})(\d{2})(\d{2})(\d{2})">
          <leadingDigits>89</leadingDigits>
          <format>$1 $2 $3 $4</format>
        </numberFormat>
        <numberFormat pattern="(\d{2})(\d{2})(\d{2})">
          <format>$1 $2 $3</format>
        </numberFormat>
      </availableFormats>
      <generalDesc>
        <nationalNumberPattern>[2-9]\d{5}</nationalNumberPattern>
        <possibleNumberPattern>\d{6}</possibleNumberPattern>
        <nationalNumberPattern>
          [2-79]\d{5}|
          8\d{5,7}
        </nationalNumberPattern>
        <possibleNumberPattern>\d{6}(?:\d{2})?</possibleNumberPattern>
      </generalDesc>
      <noInternationalDialling>
        <nationalNumberPattern>44\d{4}</nationalNumberPattern>
        <possibleNumberPattern>\d{6}</possibleNumberPattern>
        <exampleNumber>441234</exampleNumber>
      </noInternationalDialling>
      <fixedLine>
@ -18948,6 +18887,7 @@
            [5689]\d{2}
          )\d{3}
        </nationalNumberPattern>
        <possibleNumberPattern>\d{6}</possibleNumberPattern>
        <exampleNumber>401234</exampleNumber>
      </fixedLine>
      <mobile>
@ -18955,7 +18895,8 @@
          (?:
            [27]\d{2}|
            3[0-79]\d|
            411
            411|
            89\d{3}
          )\d{3}
        </nationalNumberPattern>
        <exampleNumber>212345</exampleNumber>
@ -22328,10 +22269,10 @@
      <mobile>
        <!-- Sotel Tchad "SALAM" (77 XX XX XX) is classified as a fixed operator in the plan, but it
             also says numbers starting with 7 are mobile numbers. Putting under mobile for now.
             Also adding 63[5-9] from evidence of successful SMS delivery. -->
             Also adding 6[028] and 63[5-9] which are operated by Airtel. -->
        <nationalNumberPattern>
          (?:
            6[36]\d|
            6[02368]\d|
            77\d|
            9(?:
              5[0-4]|
@ -22769,10 +22710,14 @@
        <possibleNumberPattern>\d{8}</possibleNumberPattern>
      </generalDesc>
      <fixedLine>
        <!-- We support the whole 81 prefix here instead of just 81200 as
             indicated in the ITU doc, as more real phone numbers have been
             found online. -->
        <nationalNumberPattern>
          (?:
            3[012]|
            7\d
            7\d|
            81
          )\d{6}
        </nationalNumberPattern>
        <exampleNumber>71234567</exampleNumber>
@ -22789,7 +22734,7 @@
      <!-- These are listed as 'value added services' - pending further information, we add them
           here for now. -->
      <premiumRate>
        <nationalNumberPattern>8[0128]\d{6}</nationalNumberPattern>
        <nationalNumberPattern>8[028]\d{6}</nationalNumberPattern>
        <exampleNumber>80123456</exampleNumber>
      </premiumRate>
      <emergency>
--- a/resources/geocoding/am/374.txt
+++ b/resources/geocoding/am/374.txt
@ -0,0 +1,176 @@
 # Copyright (C) 2013 The Libphonenumber Authors

 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at

 # http://www.apache.org/licenses/LICENSE-2.0

 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.

 # Manually translated from en/374.txt.

 37410|Երևան/Ջրվեժ
 374222|Աբովյան/Ակունք/Բյուրեղավան/Նոր Գյուղ/Վերին Պտղնի
 3742227|Գառնի
 3742229|Զովք
 37422290|Մայակովսկի
 37422291|Բալահովիտ/Կամարիս
 37422293|Արամուս
 37422294|Արզնի
 37422296|Պտղնի
 37422297|Գեղաշեն
 37422298|Առինջ
 37422299|Կոտայք
 374223|Հանքավան/Հրազդան/Ծաղկաձոր
 37422391|Լեռնանիստ
 37422393|Մեղրաձոր
 37422394|Փյունիք
 37422397|Սոլակ
 37422398|Բջնի
 374224|Քանաքեռավան/Նոր Գեղի/Նոր Հաճըն/Եղվարդ
 37422452|Զովունի
 37422453|Պռոշյան
 37422454|Արգել
 374226|Չարենցավան
 37422672|Արզական
 37422675|Ալապարս/Վարդանավանք
 374231|Վաղարշապատ/Մուսալեռ/Փարաքար/Զվարթնոց
 37423190|Բաղրամյան
 37423191|Վաչե
 37423195|Նորակերտ
 37423198|Ջրառատ
 37423199|Խորոնք
 374232|Աշտարակ/Աղձք/Կարբի/Օշական
 37423290|Օհանավան
 37423294|Բյուրական
 374233|Բաղրամյան/Լեռնագոգ
 37423374|Մյասնիկյան
 37423375|Քարակերտ
 37423376|Դալարիկ
 374234|Վեդի/Ոսկետափ/Արարատ
 37423481|Այգավան
 37423486|Ուրցաձոր
 37423492|Մարտիրոսյան
 37423497|Փոքր Վեդի
 37423498|Տափերական
 374235|Արտաշատ/Այգեզարդ/Դալար/Քաղցրաշեն/Մխչյան/Շահումյան
 37423572|Արևշատ
 3742359|Նորաշեն
 374236|Այնթապ/Մասիս/Նոր Խարբերդ/Նորաբաց
 3742363|Այնթապ
 37423699|Դաշտավան
 374237|Արաքս/Արմավիր/Հոկտեմբեր/Լենուղի/Մեծամոր/Զարթոնք
 3742377|Մրգաշատ
 37423779|Բամբակաշատ
 3742379|Նալբանդյան
 37423794|Մարգարա
 37423796|Տանձուտ
 37423798|Շենավան
 374238|Արարատ/Ավշար/Սուրենավան/Երասխ
 374242|Մարալիկ/Սառնաղբյուր
 37424293|Շիրակավան
 37424297|Անի Կայարան
 37424300|Ախուրյան/Առափի/Կամո/Մուսայելյան
 374244|Արթիկ/Պեմզաշեն
 37424492|Փանիկ
 37424495|Արևշատ
 37424496|Մեծ Մանթաշ
 374245|Աշոցք
 374246|Ամասիա
 374249|Թալին
 37424973|Կաթնաղբյուր
 3742499|Արագածավան
 37424996|Ներքին Բազմաբերդ
 37424997|Մաստարա
 374252|Ապարան
 37425251|Քուչակ
 37425295|Արտավան
 374253|Ալավերդի/Օձուն/Ծաղկաշատ/Թումանյան
 37425352|Ախթալա
 37425353|Շնող
 37425356|Ճոճկան
 37425357|Թումանյան
 374254|Տաշիր
 3742549|Մեծավան
 374255|Սպիտակ
 374256|Ստեփանավան/Բովաձոր
 37425691|Կուրթան
 37425694|Ագարակ
 37425695|Լեջան
 374257|Արագած
 3742570|Ծաղկահովիտ
 374261|Սևան
 374262|Մարտունի
 3742625|Վարդենիկ
 37426272|Լիճք
 37426299|Երանոս
 374263|Իջևան/Ազատամուտ/Գետահովիտ/Ենոքավան
 37426374|Այգեհովիտ
 37426392|Աչաջուր
 37426397|Ազատամուտ
 374264|Գավառ/Սարուխան
 374265|Ճամբարակ
 37426596|Վահան
 374266|Բերդավան/Կողբ/Նոյեմբերյան
 3742665|Կողբ
 3742667|Բերդավան
 37426692|Արճիս
 37426693|Բաղանիս
 37426695|Զորական
 37426696|Ոսկեպար
 37426699|Կոթի
 374267|Այգեպար/Բերդ
 3742675|Արծվաբերդ
 37426791|Նավուր
 37426794|Թովուզ
 37426796|Մոսեսգեղ
 37426797|Նորաշեն
 3742680|Դիլիջան
 374269|Վարդենիս
 374281|Գետափ/Սալլի/Եղեգնաձոր
 37428151|Խաչիկ
 37428191|Արփի
 37428193|Աղավնաձոր
 37428194|Արենի
 37428195|Մալիշկա
 37428197|Ելփին
 37428198|Ռինդ
 37428199|Շատին
 374282|Վայք
 3742830|Սիսիան
 37428375|Թասիկ
 37428396|Անգեղակոթ
 374284|Գորիս/Վերիշեն
 37428427|Վերիշեն
 37428491|Հարժիս
 37428494|Խնձորեսկ
 37428495|Շինուհայր
 37428499|Կոռնիձոր
 374285|Դավիթ Բեկ/Քաջարան/Կապան
 374286|Մեղրի/Ագարակ
 37428695|Շվանիձոր
 374287|Ջերմուկ
 37428794|Գնդեվազ
 374312|Գյումրի/Ախուրյան
 374322|Վանաձոր/Գուգարք
 37432293|Փամբակ
 37432294|Լեռնապատ
 37432295|Եղեգնուտ
 37432296|Մարգահովիտ
 37432297|Ձորագետ
 37432298|Լերմոնտովո
 37432299|Վահագնի
 37447|Լեռնային-Ղարաբաղ
 374471|Ստեփանակերտ
 374474|Մարտակերտ
 374475|Հարդրութ
 374476|Ասկերան
 374477|Շուշի
 37447732|Բերձոր/Քաշաթաղի շրջան
 374478|Մարտունի
 374479|Ստեփանակերտ
--- a/resources/geocoding/en/358.txt
+++ b/resources/geocoding/en/358.txt
@ -14,6 +14,7 @@

 # Generated from:
 # http://en.wikipedia.org/wiki/+358 [437010438]
 # Expanded 3585 prefix to exclude mobile.

 35813|North Karelia
 35814|Central Finland
@ -24,7 +25,14 @@
 35819|Nylandia
 3582|Turku/Pori
 3583|Tavastia
 3585|Kymi
 35851|Kymi
 35852|Kymi
 35853|Kymi
 35854|Kymi
 35855|Kymi
 35856|Kymi
 35857|Kymi
 35858|Kymi
 3586|Vaasa
 3588|Oulu
 3589|Helsinki
--- a/resources/geocoding/en/374.txt
+++ b/resources/geocoding/en/374.txt
@ -16,10 +16,14 @@
 # http://en.wikipedia.org/wiki/+374 [440755811]
 # http://www.spyur.am/en/armenia (2011-07-28)
 # http://www.phonebookoftheworld.com/phonebookofarmenia.htm (2011-07-28)
 # with some translation for a small number of entries.
 # http://www.itu.int/oth/T020200000A/en (2013-03-06)
 # http://phone.beeline.am/ru/main/codes.wbp (2013-03-06)
 # with some translation for a small number of entries, and to fix the
 # spelling to be consistent.

 37410|Yerevan/Jrvezh
 374222|Abovyan/Akunk/Byureghavan/Nor Gyugh/Verin Ptghni
 3742227|Garni
 3742229|Zovk
 37422290|Mayakovsky
 37422291|Balahovit/Kamaris
@ -27,6 +31,7 @@
 37422294|Arzni
 37422296|Ptghni
 37422297|Geghashen
 37422298|Arinj
 37422299|Kotayk
 374223|Hankavan/Hrazdan/Tsakhkadzor
 37422391|Lernanist
@ -42,23 +47,39 @@
 37422672|Arzakan
 37422675|Alapars/Vardanavank
 374231|Echmiadzin/Musaler/Parakar/Zvartnots
 37423190|Baghramian
 37423190|Baghramyan
 37423191|Vache
 37423195|Norakert
 37423198|Jrarat
 37423199|Khoronk
 374232|Aghdzq/Ashtarak/Karbi/Oshakan
 37423290|Ohanavan
 37423294|Byurakan
 374233|Baghramyan/Lernagog
 37423374|Myasnikyan
 37423375|Karakert
 37423376|Dalarik
 374234|Vedi/Vosketap
 374234|Vedi/Vosketap/Ararat
 37423481|Aygavan
 37423486|Urtsadzor
 37423492|Martirosyan
 37423497|Pokr Vedi
 37423498|Taperakan
 374235|Artashat/Aygezard/Dalar/Kaghtsrashen/Mkhchyan/Shahumyan
 37423572|Arevshat
 3742359|Norashen
 374236|Ayntap/Masis/Nor Kharberd/Norabats
 3742363|Aintab
 37423699|Dashtavan
 374237|Araks/Armavir/Hoktember/Lenughi/Metsamor/Zartonk
 3742377|Mrgashat
 37423779|Bambakashat
 3742379|Nalbandian
 37423794|Margara
 37423796|Tandzut
 37423798|Shenavan
 374238|Ararat/Avshar/Surenavan/Yeraskh
 374242|Maralik
 37424291|Sarnakhbyur
 374242|Maralik/Sarnaghbyur
 37424293|Shirakavan
 37424297|Ani Kayaran
 37424300|Akhuryan/Arapi/Kamo/Musayelyan
@ -66,24 +87,56 @@
 37424492|Panik
 37424495|Arevshat
 37424496|Mets Mantash
 374245|Ashotsk
 374246|Amasia
 3742490|Talin
 374245|Ashotsk region
 374246|Amasia region
 374249|Talin
 37424973|Katnaghbyur
 3742499|Aragatsavan
 37424996|Nerkin Bazmaberd
 37424997|Mastara
 374252|Aparan
 37425251|Kuchak
 37425295|Artavan
 374253|Alaverdi/Odzun/Tsaghkashat/Tumanyan
 37425352|Akhtala
 37425353|Shnogh
 37425356|Chochkan
 37425357|Tumanyan
 374254|Tashir
 374255|Spitak
 3742549|Metsavan
 374255|Spitak region
 374256|Bovadzor/Stepanavan
 37425691|Kurtan
 37425694|Agarak
 3742570|Tsakhkahovit
 37425695|Lejan
 374257|Aragats
 3742570|Tsakhkahovit region
 374261|Sevan
 374262|Martuni
 3742625|Vardenik
 37426272|Lichk
 37426299|Eranos
 374263|Azatamut/Getahovit/Ijevan/Yenokavan
 37426374|Aygehovit
 37426392|Achajur
 37426397|Azatamut
 374264|Gavar/Sarukhan
 374265|Tchambarak
 37426596|Vahan
 374266|Berdavan/Koghb/Noyemberyan
 3742665|Koghb
 3742667|Berdavan
 37426692|Archis
 37426693|Baghanis
 37426695|Zorakan
 37426696|Voskepar
 37426699|Koti
 374267|Aygepar/Berd
 3742675|Artsvaberd
 37426791|Navur
 37426794|Tovuz
 37426796|Mosesgegh
 37426797|Norashen
 3742680|Dilijan
 374269|Vardenis
 374281|Getap/Salli/Yeghegnadzor
@ -95,17 +148,23 @@
 37428197|Yelpin
 37428198|Rind
 37428199|Shatin
 374282|Vayk
 374282|Vayk region
 3742830|Sisian
 37428375|Tasik
 37428396|Angehakot
 374284|Goris/Verishen
 37428427|Verishen
 37428491|Harzhis
 37428494|Khndzoresk
 37428495|Shinuhayr
 37428499|Kornidzor
 374285|Davit Bek/Kajaran/Kapan
 374286|Agarak
 3742860|Meghri
 374287|Jermuk/Gyumri
 374312|Azatan/Gyumri/Hatsik
 374322|Vanadzor
 374286|Meghri/Agarak
 37428695|Shvanidzor
 374287|Jermuk
 37428794|Gndevaz
 374312|Gyumri/Akhuryan region
 374322|Vanadzor/Gugark region
 37432293|Pambak
 37432294|Lernapat
 37432295|Yeghegnut
--- a/resources/geocoding/en/98.txt
+++ b/resources/geocoding/en/98.txt
@ -37,14 +37,7 @@
 98182|Bandar Anzali suburbs
 98191|Chalus
 98192|Chalus suburbs
 98212|Tehran
 98213|Tehran
 98214|Tehran
 98215|Tehran
 98216|Tehran
 98217|Tehran
 98218|Tehran
 98219|Tehran
 9821|Tehran
 98221|Tehran suburbs
 98228|Eslamshahr
 98229|Eslamshahr suburbs
--- a/resources/geocoding/fa/98.txt
+++ b/resources/geocoding/fa/98.txt
@ -35,14 +35,7 @@
 98182|حومهٔ بندر انزلی
 98191|چالوس
 98192|حومهٔ چالوس
 98212|تهران
 98213|تهران
 98214|تهران
 98215|تهران
 98216|تهران
 98217|تهران
 98218|تهران
 98219|تهران
 9821|تهران
 98221|حومهٔ تهران
 98228|اسلامشهر
 98229|حومهٔ اسلامشهر
--- a/resources/geocoding/fi/358.txt
+++ b/resources/geocoding/fi/358.txt
@ -15,6 +15,7 @@
 # Generated from:
 # http://www.ficora.fi/attachments/suomial/5ssVLe7t3/Kansallinen_numerointisuunnitelma_1_10_2010.pdf [2010-10-01]
 # http://en.wikipedia.org/wiki/+358 [437010438]
 # Expanded 3585 prefix to exclude mobile.

 35813|Pohjois-Karjala
 35814|Keski-Suomi
@ -25,7 +26,14 @@
 35819|Uusimaa
 3582|Turku/Pori
 3583|Häme
 3585|Kymi
 35851|Kymi
 35852|Kymi
 35853|Kymi
 35854|Kymi
 35855|Kymi
 35856|Kymi
 35857|Kymi
 35858|Kymi
 3586|Vaasa
 3588|Oulu
 3589|Helsinki
--- a/resources/geocoding/ru/374.txt
+++ b/resources/geocoding/ru/374.txt
@ -0,0 +1,176 @@
 # Copyright (C) 2013 The Libphonenumber Authors

 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at

 # http://www.apache.org/licenses/LICENSE-2.0

 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.

 # Translated manually from en/374.txt.

 37410|Ереван/Джрвеж
 374222|Абовян/Акунк/Бюрегаван/Нор Гюх/Верин Птхни
 3742227|Гарни
 3742229|Зовк
 37422290|Маяковский
 37422291|Балаовит/Камарис
 37422293|Арамус
 37422294|Арзни
 37422296|Птхни
 37422297|Гехашен
 37422298|Ариндж
 37422299|Котайк
 374223|Анкаван/Раздан/Цахкадзор
 37422391|Лернанист
 37422393|Мехрадзор
 37422394|Пюник
 37422397|Солак
 37422398|Бжни
 374224|Канакераван/Нор Гехи/Нор Ачн/Егвард
 37422452|Зовуни
 37422453|Прошян
 37422454|Аргел
 374226|Чаренцаван
 37422672|Арзакан
 37422675|Алапарс/Варданаванк
 374231|Эчмиадзин/Мусалер/Паракяр/Звартноц
 37423190|Баграмян
 37423191|Ваче
 37423195|Норакерт
 37423198|Джрарат
 37423199|Хоронк
 374232|Аштарак/Ахцк/Карби/Ошакан
 37423290|Оганаван
 37423294|Бюракан
 374233|Баграмян/Лернагог
 37423374|Мясникян
 37423375|Каракерт
 37423376|Даларик
 374234|Веди/Воскетап/Арарат
 37423481|Айгаван
 37423486|Урцадзор
 37423492|Мартиросян
 37423497|Покр Веди
 37423498|Таперакан
 374235|Арташат/Айгезард/Далар/Кахцрашен/Мхчян/Шаумян
 37423572|Аревшат
 3742359|Норашен
 374236|Масис/Нор Харберд/Норабац
 3742363|Айнтап
 37423699|Даштаван
 374237|Аракс/Армавир/Октембер/Ленухи/Мецамор/Зартонк
 3742377|Мргашат
 37423779|Бамбакашат
 3742379|Налбандян
 37423794|Маргара
 37423796|Тандзут
 37423798|Шенаван
 374238|Арарат/Авшар/Суренаван/Ерасх
 374242|Маралик/Сарнахбюр
 37424293|Ширакаван
 37424297|Ани Каяран
 37424300|Ахурян/Арапи/Камо/Мусаелян
 374244|Артик/Пемзашен
 37424492|Паник
 37424495|Аревшат
 37424496|Мец Манташ
 374245|Ашоцк
 374246|Амасия
 374249|Талин
 37424973|Катнахбюр
 3742499|Арагацаван
 37424996|Неркин Базмаберд
 37424997|Мастара
 374252|Апаран
 37425251|Кучак
 37425295|Артаван
 374253|Алаверди/Одзун/Цахкашат/Туманян
 37425352|Ахтала
 37425353|Шнох
 37425356|Чочкан
 37425357|Туманян
 374254|Ташир
 3742549|Мецаван
 374255|Спитак
 374256|Степанаван/Бовадзор
 37425691|Куртан
 37425694|Агарак
 37425695|Лежан
 374257|Арагац
 3742570|Цахкаховит
 374261|Севан
 374262|Мартуни
 3742625|Варденик
 37426272|Личк
 37426299|Еранос
 374263|Азатамут/Гетаховит/Иджеван/Енокаван
 37426374|Айгеховит
 37426392|Ачаджур
 37426397|Азатамут
 374264|Гавар/Сарухан
 374265|Чамбарак
 37426596|Ваан
 374266|Бердаван/Кохб/Ноемберян
 3742665|Кохб
 3742667|Бердаван
 37426692|Арчис
 37426693|Баганис
 37426695|Зоракан
 37426696|Воскепар
 37426699|Кочи
 374267|Айгепар/Берд
 3742675|Арцваберд
 37426791|Навур
 37426794|Товуз
 37426796|Мосесгех
 37426797|Норашен
 3742680|Дилижан
 374269|Варденис
 374281|Гетап/Салли/Ехегнадзор
 37428151|Хачик
 37428191|Арпи
 37428193|Агавнадзор
 37428194|Арени
 37428195|Малишка
 37428197|Елпин
 37428198|Ринд
 37428199|Шатин
 374282|Вайк
 3742830|Сисиан
 37428375|Тасик
 37428396|Ангехакот
 374284|Горис/Веришен
 37428427|Веришен
 37428491|Аржис
 37428494|Хндзореск
 37428495|Шинуайр
 37428499|Корнидзор
 374285|Давит Бек/Каджаран/Капан
 374286|Мегри/Агарак
 37428695|Шванидзор
 374287|Джермук
 37428794|Гндеваз
 374312|Гюмри/Ахурян
 374322|Ванадзор/Гугарк
 37432293|Памбак
 37432294|Лернапат
 37432295|Ехегнут
 37432296|Маргаовит
 37432297|Дзорагет
 37432298|Лермонтово
 37432299|Ваагни
 37447|Нагорный Карабах
 374471|Степанакерт
 374474|Мартакерт
 374475|Гадрут
 374476|Аскеран
 374477|Шуши
 37447732|Бердзор/Кашатах
 374478|Мартуни
 374479|Степанакерт
--- a/resources/geocoding/se/358.txt
+++ b/resources/geocoding/se/358.txt
@ -14,6 +14,7 @@

 # Generated from:
 # http://en.wikipedia.org/wiki/+358 [437010438]
 # Expanded 3585 prefix to exclude mobile.

 35813|Norra Karelen
 35814|Mellersta Finland
@ -24,7 +25,14 @@
 35819|Nyland
 3582|Åbo/Björneborg
 3583|Tavastland
 3585|Kymmene
 35851|Kymmene
 35852|Kymmene
 35853|Kymmene
 35854|Kymmene
 35855|Kymmene
 35856|Kymmene
 35857|Kymmene
 35858|Kymmene
 3586|Vasa
 3588|Uleåborg
 3589|Helsingfors