Merge metadata changes from upstream 7.4.3

Includes changes in resources/ up to and including
upstream commit 1ea6dd934471
  "[maven-release-plugin] prepare release libphonenumber-7.4.3"

10 files changed, 576 insertions, 296 deletions

diff --git a/resources/PhoneNumberMetadata.xml b/resources/PhoneNumberMetadata.xml
index b3ab3f4f..685c74c4 100644
--- a/resources/PhoneNumberMetadata.xml
+++ b/resources/PhoneNumberMetadata.xml
@@ -3993,8 +3993,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|
@@ -9434,7 +9434,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,7 +9543,7 @@
         <possibleNumberPattern>\d{8}</possibleNumberPattern>
       </generalDesc>
       <fixedLine>
-        <!-- Extra prefixes 227[01389], 228X, 2292, 260X and 263[04] were added from numbers
+        <!-- Extra prefixes 227[01389], 228X, 2292, 260X, 2617 and 263[04] were added from numbers
              found online. -->
         <nationalNumberPattern>
           2(?:
@@ -9570,6 +9571,7 @@
             )|
             6(?:
               [056]\d|
+              17|
               3[04]|
               4[0-378]|
               [78][0-8]|
@@ -10585,7 +10587,7 @@
           <leadingDigits>
             7(?:
               [02357]|
-              4[0-389]|
+              4[0-37-9]|
               6[0-35-9]|
               8[0-79]|
               99
@@ -10609,7 +10611,7 @@
               2(?:
                 [0235679]|
                 [14][017-9]|
-                8[0-59]|
+                8[0-569]|
                 9[389]
               )|
               3(?:
@@ -10623,9 +10625,10 @@
               4(?:
                 0[1-9]|
                 1[014-9]|
-                [29][89]|
+                2[589]|
                 39|
-                8[389]
+                7[017-9]|
+                [89]
               )|
               5(?:
                 [034678]|
@@ -10692,7 +10695,7 @@
               2(?:
                 [0235679]|
                 [14][017-9]|
-                8[0-59]|
+                8[0-569]|
                 9[389]
               )|
               3(?:
@@ -10718,9 +10721,26 @@
                   [015-9]|
                   4[08]
                 )|
-                [29][89]|
+                2(?:
+                  58|
+                  [89]
+                )|
                 39|
-                8[389]
+                7(?:
+                  0[3-9]|
+                  11|
+                  7[02-8]|
+                  [89]
+                )|
+                8(?:
+                  [0-24-7][089]|
+                  [389]
+                )|
+                9(?:
+                  [0-6][089]|
+                  7[08]|
+                  [89]
+                )
               )|
               5(?:
                 [034678]|
@@ -11158,7 +11178,8 @@
       <!-- 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
@@ -11173,11 +11194,14 @@
             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]
+                )|
+                9[389]\d
+              )|
               3(?:
                 [05-8]\d{2}|
                 1(?:
@@ -11201,9 +11225,26 @@
                   [015-9]\d|
                   4[08]
                 )|
-                [29][89]\d|
+                2(?:
+                  58|
+                  [89]\d
+                )|
                 39\d|
-                8[389]\d
+                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|
@@ -13749,7 +13790,7 @@
               6[5-7]
             )|
             66\d|
-            76[02-6]
+            76[02-7]
           )\d{4}
         </nationalNumberPattern>
         <possibleNumberPattern>\d{10}</possibleNumberPattern>
@@ -14182,6 +14223,7 @@
             )|
             6(?:
               0[034679]\d|
+              222|
               5[015-9]\d|
               6\d{2}|
               7[067]\d|
@@ -21245,14 +21287,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 +21497,7 @@
           7(?:
             [067]\d|
             21|
-            8[0-26]|
+            8[0-46]|
             90
           )\d{6}
         </nationalNumberPattern>
@@ -22166,14 +22214,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>
@@ -22918,8 +22966,8 @@
       <mobile>
         <nationalNumberPattern>
           (?:
-            6[25-8]|
-            7[13-9]
+            6[125-9]|
+            7[1-9]
           )\d{7}
         </nationalNumberPattern>
         <possibleNumberPattern>\d{9}</possibleNumberPattern>
diff --git a/resources/ShortNumberMetadata.xml b/resources/ShortNumberMetadata.xml
index 81291791..0d9554e4 100644
--- a/resources/ShortNumberMetadata.xml
+++ b/resources/ShortNumberMetadata.xml
@@ -341,7 +341,7 @@
     <!-- http://en.wikipedia.org/wiki/Telephone_numbers_in_Argentina#Public_utility_numbers -->
     <territory id="AR">
       <generalDesc>
-        <nationalNumberPattern>[0189]\d{1,4}</nationalNumberPattern>
+        <nationalNumberPattern>[01389]\d{1,4}</nationalNumberPattern>
         <possibleNumberPattern>\d{2,5}</possibleNumberPattern>
       </generalDesc>
       <shortCode>
@@ -353,6 +353,7 @@
             2[15]|
             9
           )|
+          3372|
           89338|
           911
         </nationalNumberPattern>
@@ -371,10 +372,15 @@
         <possibleNumberPattern>\d{2,3}</possibleNumberPattern>
         <exampleNumber>111</exampleNumber>
       </tollFree>
+      <!-- 911 is only available in select cities. Since it's not available everywhere
+           and is location specific adding this number here. -->
       <carrierSpecific>
         <!-- https://support.twitter.com/articles/20170024 -->
-        <nationalNumberPattern>89338</nationalNumberPattern>
-        <possibleNumberPattern>\d{5}</possibleNumberPattern>
+        <nationalNumberPattern>
+          89338|
+          911
+        </nationalNumberPattern>
+        <possibleNumberPattern>\d{3,5}</possibleNumberPattern>
       </carrierSpecific>
       <emergency>
         <!-- http://en.wikipedia.org/wiki/Telephone_numbers_in_Argentina#Public_utility_numbers -->
@@ -393,8 +399,11 @@
       </expandedEmergency>
       <smsServices>
         <!-- https://support.twitter.com/articles/20170024 -->
-        <nationalNumberPattern>89338</nationalNumberPattern>
-        <possibleNumberPattern>\d{5}</possibleNumberPattern>
+        <nationalNumberPattern>
+          3372|
+          89338
+        </nationalNumberPattern>
+        <possibleNumberPattern>\d{4,5}</possibleNumberPattern>
       </smsServices>
     </territory>
 
@@ -7287,17 +7296,29 @@
     <!-- Norway -->
     <!-- Country calling code shared with Svalbard. -->
     <!-- http://www.npt.no/npt/numsys/E.164.pdf -->
+    <!-- http://www.nkom.no/npt/numsys/E.1643sifret_en.pdf -->
     <territory id="NO">
       <generalDesc>
         <nationalNumberPattern>1\d{2,5}</nationalNumberPattern>
         <possibleNumberPattern>\d{3,6}</possibleNumberPattern>
       </generalDesc>
       <shortCode>
+        <!-- 143 is assigned but not visible to end users, no other online evidence
+             found, hence not included -->
         <nationalNumberPattern>
-          11(?:
-             [023]|
-             6117
-            )
+          1(?:
+            1(?:
+              [0239]|
+              6117
+            )|
+            2[048]|
+            4(?:
+              12|
+              [59]
+            )|
+            7[57]|
+            90
+          )
         </nationalNumberPattern>
         <exampleNumber>112</exampleNumber>
       </shortCode>
@@ -7312,7 +7333,12 @@
         <exampleNumber>112</exampleNumber>
       </emergency>
       <expandedEmergency>
-        <nationalNumberPattern>116117</nationalNumberPattern>
+        <nationalNumberPattern>
+          1(?:
+            16117|
+            412
+          )
+        </nationalNumberPattern>
         <possibleNumberPattern>\d{6}</possibleNumberPattern>
         <exampleNumber>116117</exampleNumber>
       </expandedEmergency>
diff --git a/resources/carrier/en/255.txt b/resources/carrier/en/255.txt
index ed87124c..960d04e7 100644
--- a/resources/carrier/en/255.txt
+++ b/resources/carrier/en/255.txt
@@ -12,12 +12,14 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+25561|Dovetel
 25562|Viettel
 25565|tiGO
 25566|SMILE
 25567|tiGO
 25568|Airtel
 25571|tiGO
+25572|Mycel
 25573|Tanzania Telecom
 25574|Vodacom
 25575|Vodacom
diff --git a/resources/carrier/en/421.txt b/resources/carrier/en/421.txt
index 3ae0d77b..13466de5 100644
--- a/resources/carrier/en/421.txt
+++ b/resources/carrier/en/421.txt
@@ -20,6 +20,7 @@
 421906|Orange
 421907|Orange
 421908|Orange
+421909|Juro
 421910|Telekom
 421911|Telekom
 421912|Telekom
diff --git a/resources/carrier/en/66.txt b/resources/carrier/en/66.txt
index e1cf010b..f8c57783 100644
--- a/resources/carrier/en/66.txt
+++ b/resources/carrier/en/66.txt
@@ -15,6 +15,7 @@
 # http://en.wikipedia.org/wiki/+66
 
 6661|AIS
+6664|Penguin SIM
 66800|AIS
 66801|AIS
 66802|AIS
diff --git a/resources/carrier/en/91.txt b/resources/carrier/en/91.txt
index 82576c9b..e29f1c6a 100644
--- a/resources/carrier/en/91.txt
+++ b/resources/carrier/en/91.txt
@@ -63,49 +63,49 @@
 917048|Tata Docomo
 917049|Idea
 917050|Telewings
-917051|AirTel
+917051|Airtel
 917052|Idea
 917053|Aircel
-917054|AirTel
+917054|Airtel
 917055|Idea
 917056|Idea
 917057|Idea
 917058|Telewings
 917059|Dishnet
-917060|AirTel
+917060|Airtel
 917061|Reliance
 917062|Aircel
-917063|AirTel
+917063|Airtel
 917064|Vodafone
 917065|Idea
 917066|Vodafone
 917067|Reliance
 917068|Telewings
 917069|Vodafone
-917070|AirTel
+917070|Airtel
 917071|Dishnet
 917072|Vodafone
-917073|AirTel
+917073|Airtel
 917074|Idea
 917075|Telewings
 917076|Vodafone
-917077|AirTel
+917077|Airtel
 917078|Telewings
 917079|Idea
-917080|AirTel
+917080|Airtel
 917081|Vodafone
-917082|AirTel
+917082|Airtel
 917083|Idea
 917084|Idea
 917085|Hexacom
-917086|AirTel
-917087|AirTel
+917086|Airtel
+917087|Airtel
 917088|Idea
 917089|Idea
 917090|Idea
-917091|AirTel
+917091|Airtel
 917092|Idea
-917093|AirTel
+917093|Airtel
 917094|Vodafone
 917095|Idea
 917096|Idea
@@ -395,12 +395,93 @@
 917417|Tata Docomo
 917418|Tata Docomo
 917419|Reliance
+9174258|Hexacom
 917428|Reliance
 917429|Reliance
 917439|Reliance
+9174703|Airtel
+9174704|Airtel
+9174705|Airtel
+9174706|Airtel
+9174707|Airtel
+9174708|Airtel
+9174709|Airtel
+9174711|Airtel
+9174770|Airtel
+9174772|Airtel
+9174773|Airtel
+9174774|Airtel
+9174775|Airtel
+9174776|Airtel
+9174777|Airtel
+9174778|Airtel
+9174780|Airtel
+9174781|Airtel
+9174782|Airtel
+9174783|Airtel
+9174784|Vodafone
+9174785|Vodafone
+9174786|Vodafone
+9174787|Vodafone
+9174788|Vodafone
+9174789|Vodafone
+9174790|Vodafone
+9174791|Vodafone
+9174792|Vodafone
+9174793|Vodafone
+9174794|Telenor
+9174795|Telenor
+9174796|Telenor
+9174797|Telenor
+9174798|Telenor
+9174799|Telenor
+9174800|Telenor
+9174808|Telenor
+9174809|Telenor
+9174810|Telenor
+9174818|Airtel
+9174819|Airtel
+9174820|Airtel
+9174828|Airtel
+9174829|Airtel
 917483|Reliance
+9174840|Airtel
+9174848|Airtel
+9174849|Airtel
+9174850|Airtel
+9174858|Airtel
+9174859|Airtel
+9174860|Airtel
+9174868|Airtel
+9174869|Airtel
+9174870|Airtel
+9174878|Airtel
+9174879|Airtel
 917488|Reliance
 917489|Reliance
+9174900|Airtel
+9174908|Airtel
+9174909|Airtel
+9174910|Idea
+9174918|Idea
+9174919|Idea
+9174920|Idea
+9174928|Idea
+9174929|Idea
+9174930|Idea
+9174938|Idea
+9174939|Idea
+9174940|Idea
+9174948|Tata Docomo
+9174949|Tata Docomo
+9174950|Tata Docomo
+9174958|Tata Docomo
+9174959|Tata Docomo
+9174960|Tata Docomo
+9174968|Tata Docomo
+9174969|Tata Docomo
+9174970|Tata Docomo
+9174978|Tata Docomo
 917498|Reliance
 917499|Reliance
 917500|Idea
@@ -471,9 +552,9 @@
 917597|CellOne
 917598|CellOne
 917599|CellOne
-917600|AirTel
+917600|Airtel
 917601|Reliance
-917602|AirTel
+917602|Airtel
 917603|Reliance
 917604|Reliance
 917607|Airtel
@@ -542,9 +623,9 @@
 917697|Idea
 917698|Idea
 917699|Idea
-917702|AirTel
-917708|AirTel
-917709|AirTel
+917702|Airtel
+917708|Airtel
+917709|Airtel
 917710|Airtel
 917715|Airtel
 917718|Airtel
@@ -570,16 +651,16 @@
 917736|Tata Docomo
 917737|Tata Docomo
 9177380|Airtel
-917738|AirTel
+917738|Airtel
 9177390|Airtel
-917739|AirTel
+917739|Airtel
 9177408|Idea
 9177409|Idea
 9177410|Idea
 9177418|Idea
 9177419|Idea
 9177420|Hexacom
-917742|AirTel
+917742|Airtel
 9177438|Idea
 9177439|Idea
 9177440|Idea
@@ -612,7 +693,7 @@
 9177590|Airtel
 9177598|Airtel
 9177600|Airtel
-917760|AirTel
+917760|Airtel
 9177618|Airtel
 9177628|Airtel
 9177638|Airtel
@@ -750,7 +831,7 @@
 917866|Reliance
 917867|Vodafone
 917868|Vodafone
-917869|AirTel
+917869|Airtel
 917870|Telewings
 917871|Idea
 917872|Vodafone
@@ -763,12 +844,12 @@
 917879|Reliance
 917890|Idea
 917891|Idea
-917893|AirTel
-917894|AirTel
-917895|AirTel
-917896|AirTel
-917897|AirTel
-917898|AirTel
+917893|Airtel
+917894|Airtel
+917895|Airtel
+917896|Airtel
+917897|Airtel
+917898|Airtel
 917899|Airtel
 917994|Airtel
 917995|Airtel
@@ -781,9 +862,9 @@
 9180010|Vodafone
 918001|Vodafone
 9180020|Airtel
-918002|AirTel
+918002|Airtel
 9180030|Hexacom
-918003|AirTel
+918003|Airtel
 9180040|Cellone
 918004|CellOne
 9180050|Cellone
@@ -793,13 +874,13 @@
 9180070|Vodafone
 918007|Vodafone
 9180080|Airtel
-918008|AirTel
+918008|Airtel
 9180090|Airtel
-918009|AirTel
+918009|Airtel
 9180100|Reliance
 918010|Reliance
 9180110|Airtel
-918011|AirTel
+918011|Airtel
 9180120|Aircel
 918012|Aircel
 9180130|Dishnet
@@ -809,11 +890,11 @@
 9180150|Tata Docomo
 918015|Tata Docomo
 9180160|Airtel
-918016|AirTel
+918016|Airtel
 9180170|Vodafone
 918017|Vodafone
 9180180|Airtel
-918018|AirTel
+918018|Airtel
 9180190|Tata Docomo
 918019|Tata Docomo
 9180500|Tata Docomo
@@ -829,7 +910,7 @@
 9180550|Reliance
 918055|Reliance
 9180560|Airtel
-918056|AirTel
+918056|Airtel
 9180570|Idea
 918057|Idea
 9180580|Idea
@@ -844,9 +925,9 @@
 9180830|Dishnet
 918083|Aircel
 9180840|Airtel
-918084|AirTel
+918084|Airtel
 9180850|Airtel
-918085|AirTel
+918085|Airtel
 9180860|Vodafone
 918086|Vodafone
 9180870|Tata Docomo
@@ -886,11 +967,11 @@
 9181040|Sistema
 918104|Sistema
 9181050|Airtel
-918105|AirTel
+918105|Airtel
 9181060|Airtel
-918106|AirTel
+918106|Airtel
 9181070|Hexacom
-918107|AirTel
+918107|Airtel
 9181080|Idea
 918108|Idea
 9181090|Tata Docomo
@@ -907,7 +988,7 @@
 9181150|Telewings
 918115|UNITECH
 9181160|Airtel
-918116|AirTel
+918116|Airtel
 9181189|Hexacom
 9181198|Hexacom
 9181200|Idea
@@ -923,15 +1004,15 @@
 9181250|Tata Docomo
 918125|Tata Docomo
 9181260|Airtel
-918126|AirTel
+918126|Airtel
 9181270|Airtel
-918127|AirTel
+918127|Airtel
 9181280|Airtel
-918128|AirTel
+918128|Airtel
 9181290|Airtel
-918129|AirTel
+918129|Airtel
 9181300|Airtel
-918130|AirTel
+918130|Airtel
 9181310|Hexacom
 9181318|Hexacom
 9181328|Hexacom
@@ -957,7 +1038,7 @@
 9181450|Vodafone
 918145|Vodafone
 9181460|Airtel
-918146|AirTel
+918146|Airtel
 9181470|Tata Docomo
 918147|Tata Docomo
 9181480|Tata Docomo
@@ -994,7 +1075,7 @@
 9181700|Airtel
 9181708|Airtel
 9181710|Airtel
-918171|AirTel
+918171|Airtel
 9181720|Airtel
 9181728|Airtel
 9181738|Airtel
@@ -1007,7 +1088,7 @@
 9181770|Tata Docomo
 9181778|Telewings
 9181790|Airtel
-918179|AirTel
+918179|Airtel
 918180|Telewings
 918181|Dishnet
 9181820|Dishnet
@@ -1031,10 +1112,10 @@
 918194|Idea
 918195|Idea
 918196|Idea
-918197|AirTel
+918197|Airtel
 918198|Idea
 918199|Idea
-918220|AirTel
+918220|Airtel
 918221|Idea
 918222|Idea
 918223|Idea
@@ -1100,11 +1181,11 @@
 9182898|Cellone
 918290|Hexacom
 918291|UNITECH
-918292|AirTel
+918292|Airtel
 918293|Tata Docomo
-918294|AirTel
-918295|AirTel
-918296|Uninor
+918294|Airtel
+918295|Airtel
+918296|Airtel
 918297|Vodafone
 918298|Vodafone
 918300|CellOne
@@ -1134,7 +1215,7 @@
 918346|Idea
 918347|Idea
 918348|Vodafone
-918349|AirTel
+918349|Airtel
 918350|Idea
 918351|Idea
 918352|Idea
@@ -1149,7 +1230,7 @@
 918371|Vodafone
 918372|Vodafone
 918373|Vodafone
-918374|AirTel
+918374|Airtel
 918375|Vodafone
 918376|Vodafone
 918377|Vodafone
@@ -1174,7 +1255,7 @@
 918397|Vodafone
 918398|Vodafone
 918399|Vodafone
-918400|AirTel
+918400|Airtel
 918401|Telewings
 918402|Vodafone
 918403|Vodafone
@@ -1195,14 +1276,14 @@
 918417|Idea
 918418|Idea
 918419|Idea
-918420|AirTel
+918420|Airtel
 918421|Telewings
 918422|Idea
 918423|Telewings
 918424|Idea
 918425|Idea
 918426|Idea
-918427|AirTel
+918427|Airtel
 918428|Idea
 918429|Reliance
 918430|Reliance
@@ -1290,7 +1371,7 @@
 918508|Aircel
 918509|Reliance
 918510|Idea
-918511|AirTel
+918511|Airtel
 918512|Idea
 918513|Idea
 918514|Idea
@@ -1301,14 +1382,14 @@
 9185190|Vodafone
 9185198|Telewings
 918520|Telewings
-918521|AirTel
+918521|Airtel
 918522|Telewings
 918523|Telewings
 9185239|Vodafone
 918524|Vodafone
 918525|Vodafone
 918526|Aircel
-918527|AirTel
+918527|Airtel
 918528|Videocon
 918529|Videocon
 9185300|Videocon
@@ -1393,7 +1474,7 @@
 9185990|Vodafone
 9185998|Vodafone
 9185999|Dishnet
-918600|AirTel
+918600|Airtel
 918601|Vodafone
 918602|Tata Docomo
 918603|Tata Docomo
@@ -1434,9 +1515,9 @@
 918655|Tata Docomo
 918656|Dishnet
 918657|Reliance
-918658|AirTel
+918658|Airtel
 918659|Dishnet
-918670|AirTel
+918670|Airtel
 918671|Aircel
 918672|Aircel
 918673|Aircel
@@ -1524,10 +1605,10 @@
 9187530|Dishnet
 9187538|Dishnet
 9187539|Airtel
-918754|AirTel
-918755|AirTel
-918756|AirTel
-918757|AirTel
+918754|Airtel
+918755|Airtel
+918756|Airtel
+918757|Airtel
 918758|Vodafone
 918759|Dishnet
 918760|Aircel
@@ -1540,7 +1621,7 @@
 918767|Reliance
 918768|Vodafone
 918769|Hexacom
-918790|AirTel
+918790|Airtel
 918791|Tata Docomo
 918792|Tata Docomo
 918793|Tata Docomo
@@ -1550,7 +1631,7 @@
 918797|Tata Docomo
 918798|Reliance
 918799|Reliance
-918800|AirTel
+918800|Airtel
 918801|Aircel
 918802|Aircel
 918803|Aircel
@@ -1559,7 +1640,7 @@
 918806|Vodafone
 918807|Tata Docomo
 918808|Idea
-918809|AirTel
+918809|Airtel
 918810|Reliance
 918811|Airtel
 918812|Airtel
@@ -1578,8 +1659,8 @@
 9188239|Tata Docomo
 918824|Reliance
 918825|Videocon
-918826|AirTel
-918827|AirTel
+918826|Airtel
+918827|Airtel
 9188280|Airtel
 9188285|Idea
 9188286|Idea
@@ -1588,7 +1669,7 @@
 9188289|Idea
 918829|Tata Docomo
 918852|Tata Docomo
-918853|AirTel
+918853|Airtel
 918854|Tata Docomo
 918855|Telewings
 918856|Telewings
@@ -1596,7 +1677,7 @@
 918858|Telewings
 918859|Vodafone
 918860|Vodafone
-918861|AirTel
+918861|Airtel
 918862|Telewings
 918863|Telewings
 918864|Telewings
@@ -1605,7 +1686,7 @@
 918867|Tata Docomo
 918868|Telewings
 918869|Telewings
-918870|AirTel
+918870|Airtel
 918871|Tata Docomo
 918872|Idea
 918873|Idea
@@ -1629,7 +1710,7 @@
 918891|Tata Docomo
 918892|Aircel
 918893|Reliance
-918894|AirTel
+918894|Airtel
 918895|CellOne
 918896|Dishnet
 918897|Airtel
@@ -1677,7 +1758,7 @@
 918950|Tata Docomo
 918951|Tata Docomo
 918952|Aircel
-918953|AirTel
+918953|Airtel
 918954|Vodafone
 918955|Reliance
 918956|Reliance
@@ -1693,19 +1774,19 @@
 918964|Idea
 918965|Idea
 918966|Idea
-918967|AirTel
-918968|AirTel
-918969|AirTel
+918967|Airtel
+918968|Airtel
+918969|Airtel
 918970|Idea
-918971|AirTel
-918972|AirTel
+918971|Airtel
+918972|Airtel
 918973|Aircel
 918974|Hexacom
 918975|Idea
 918976|Tata Docomo
 918977|Tata Docomo
-918978|AirTel
-918979|AirTel
+918978|Airtel
+918979|Airtel
 918980|Vodafone
 918981|Tata Docomo
 918982|Tata Docomo
@@ -1716,15 +1797,15 @@
 918987|CellOne
 918988|CellOne
 918989|CellOne
-919000|AirTel
+919000|Airtel
 919001|Hexacom
-919002|AirTel
-919003|AirTel
-919004|AirTel
-919005|AirTel
-919006|AirTel
-919007|AirTel
-919008|AirTel
+919002|Airtel
+919003|Airtel
+919004|Airtel
+919005|Airtel
+919006|Airtel
+919007|Airtel
+919008|Airtel
 919009|Idea
 919010|Idea
 919011|Idea
@@ -1813,7 +1894,7 @@
 919093|Idea
 919094|Aircel
 919095|Aircel
-919096|AirTel
+919096|Airtel
 919097|Dishnet
 919098|Reliance
 919099|Vodafone
@@ -1879,8 +1960,8 @@
 919159|Vodafone
 919160|Vodafone
 919161|Vodafone
-919162|AirTel
-919163|AirTel
+919162|Airtel
+919163|Airtel
 919164|Idea
 919165|Idea
 919166|Hexacom
@@ -1894,9 +1975,9 @@
 919174|Idea
 919175|Telewings
 919176|Vodafone
-919177|AirTel
-919178|AirTel
-919179|AirTel
+919177|Airtel
+919178|Airtel
+919179|Airtel
 919180|Cellone
 919181|Cellone
 919182|Cellone
@@ -1915,8 +1996,8 @@
 919195|Cellone
 919196|Cellone
 919197|Cellone
-919198|AirTel
-919199|AirTel
+919198|Airtel
+919199|Airtel
 919200|Tata Docomo
 919201|Tata Docomo
 919202|Tata Docomo
@@ -2215,10 +2296,10 @@
 919497|CellOne
 919498|CellOne
 919499|CellOne
-919500|AirTel
-919501|AirTel
-919502|AirTel
-919503|AirTel
+919500|Airtel
+919501|Airtel
+919502|Airtel
+919503|Airtel
 919504|Dishnet
 919505|Idea
 919506|Idea
@@ -2259,7 +2340,7 @@
 919532|CellOne
 919533|Reliance
 919534|Vodafone
-919535|AirTel
+919535|Airtel
 919536|Vodafone
 919537|Vodafone
 919538|Vodafone
@@ -2270,34 +2351,34 @@
 919543|Reliance
 919544|Idea
 919545|Vodafone
-919546|AirTel
-919547|AirTel
+919546|Airtel
+919547|Airtel
 919548|Reliance
 919549|Vodafone
-919550|AirTel
+919550|Airtel
 919551|Aircel
 919552|Idea
 919553|Idea
 919554|Vodafone
 919555|Reliance
-919556|AirTel
-919557|AirTel
-919558|AirTel
-919559|AirTel
-919560|AirTel
-919561|AirTel
+919556|Airtel
+919557|Airtel
+919558|Airtel
+919559|Airtel
+919560|Airtel
+919561|Airtel
 919562|Idea
 919563|Dishnet
 919564|Vodafone
 919565|Vodafone
-919566|AirTel
-919567|AirTel
+919566|Airtel
+919567|Airtel
 919568|Idea
 919569|Reliance
 919570|Vodafone
-919571|AirTel
-919572|AirTel
-919573|AirTel
+919571|Airtel
+919572|Airtel
+919573|Airtel
 919574|Idea
 919575|Idea
 919576|Idea
@@ -2313,19 +2394,19 @@
 919586|Vodafone
 919587|Vodafone
 919588|ETISALAT
-919589|AirTel
+919589|Airtel
 919590|Reliance
-919591|AirTel
+919591|Airtel
 919592|Idea
 919593|Vodafone
 919594|Idea
 919595|Reliance
-919596|AirTel
-919597|AirTel
+919596|Airtel
+919597|Airtel
 919598|Idea
 919599|Etisalat DB(cheers)
-919600|AirTel
-919601|AirTel
+919600|Airtel
+919601|Airtel
 919602|Hexacom
 919603|Idea
 919604|Idea
@@ -2335,7 +2416,7 @@
 919608|Reliance
 919609|Vodafone
 919610|Vodafone
-919611|AirTel
+919611|Airtel
 919612|Hexacom
 919613|Aircel
 919614|Aircel
@@ -2344,20 +2425,20 @@
 919617|Idea
 919619|Vodafone
 919620|Vodafone
-919621|AirTel
-919622|AirTel
+919621|Airtel
+919622|Airtel
 919623|Idea
 919625|Reliance
 919626|Vodafone
 919627|Vodafone
 919628|Vodafone
-919629|AirTel
-919630|AirTel
-919631|AirTel
-919632|AirTel
-919633|AirTel
-919634|AirTel
-919635|AirTel
+919629|Airtel
+919630|Airtel
+919631|Airtel
+919632|Airtel
+919633|Airtel
+919634|Airtel
+919635|Airtel
 919637|Vodafone
 919639|Idea
 919640|Idea
@@ -2369,9 +2450,9 @@
 919647|Vodafone
 919648|Vodafone
 919649|Vodafone
-919650|AirTel
-919651|AirTel
-919652|AirTel
+919650|Airtel
+919651|Airtel
+919652|Airtel
 919653|Videocon
 919654|Vodafone
 919655|Vodafone
@@ -2380,14 +2461,14 @@
 919658|Dishnet
 919659|Aircel
 919660|Hexacom
-919661|AirTel
-919662|AirTel
-919663|AirTel
+919661|Airtel
+919662|Airtel
+919663|Airtel
 919664|Loop Mobile
-919665|AirTel
+919665|Airtel
 919666|Idea
 919667|Sistema
-919668|AirTel
+919668|Airtel
 919669|Idea
 919670|Vodafone
 919671|Vodafone
@@ -2395,17 +2476,17 @@
 919673|Vodafone
 919674|Vodafone
 919675|Vodafone
-919676|AirTel
-919677|AirTel
-919678|AirTel
-919679|AirTel
+919676|Airtel
+919677|Airtel
+919678|Airtel
+919679|Airtel
 919680|Hexacom
 919681|Reliance
 919682|Cellone
 919683|Cellone
 919684|Cellone
-919685|AirTel
-919686|AirTel
+919685|Airtel
+919686|Airtel
 919687|Vodafone
 919688|Aircel
 919689|Idea
@@ -2413,16 +2494,16 @@
 919692|Reliance
 919693|Reliance
 919694|Idea
-919695|AirTel
+919695|Airtel
 919696|Reliance
 919697|Dishnet
 919698|Aircel
 919699|Reliance
 919700|Aircel
-919701|AirTel
+919701|Airtel
 919702|Idea
 919703|Vodafone
-919704|AirTel
+919704|Airtel
 919705|Idea
 919706|Vodafone
 919707|Reliance
@@ -2435,21 +2516,21 @@
 919714|Idea
 919715|Aircel
 919716|Aircel
-919717|AirTel
+919717|Airtel
 919718|Idea
 919719|Vodafone
 919720|Vodafone
 919721|Vodafone
 919722|Aircel
 919723|Idea
-919724|AirTel
-919725|AirTel
+919724|Airtel
+919725|Airtel
 919726|Vodafone
 919727|Vodafone
 919728|Idea
-919729|AirTel
+919729|Airtel
 919730|Airtel
-919731|AirTel
+919731|Airtel
 919732|Vodafone
 919733|Vodafone
 919734|Vodafone
@@ -2458,46 +2539,46 @@
 919737|Idea
 919738|Aircel
 919739|Vodafone
-919740|AirTel
-919741|AirTel
+919740|Airtel
+919741|Airtel
 919742|Vodafone
 919743|Idea
 919744|Idea
 919745|Vodafone
-919746|AirTel
+919746|Airtel
 919747|Idea
-919748|AirTel
+919748|Airtel
 919749|Reliance
 919750|Aircel
 919751|Vodafone
-919752|AirTel
+919752|Airtel
 919753|Idea
 919754|Idea
-919755|AirTel
+919755|Airtel
 919756|Idea
 919757|MTNL
 919758|Vodafone
 919759|Vodafone
-919760|AirTel
+919760|Airtel
 919761|Vodafone
 919762|Aircel
 919763|Idea
 919764|Vodafone
 919765|Vodafone
-919766|AirTel
+919766|Airtel
 919767|Idea
 919768|Aircel
 919769|Vodafone
 919770|Reliance
-919771|AirTel
+919771|Airtel
 919772|Vodafone
 919773|Loop Mobile
 919774|Vodafone
 919775|Vodafone
 919776|Vodafone
-919777|AirTel
+919777|Airtel
 919778|Reliance
-919779|AirTel
+919779|Airtel
 919780|Vodafone
 919781|Idea
 919782|Aircel
@@ -2507,35 +2588,35 @@
 919786|Vodafone
 919787|Vodafone
 919788|Aircel
-919789|AirTel
-919790|AirTel
-919791|AirTel
+919789|Airtel
+919790|Airtel
+919791|Airtel
 919792|Vodafone
-919793|AirTel
-919794|AirTel
+919793|Airtel
+919794|Airtel
 919796|Vodafone
-919797|AirTel
+919797|Airtel
 919798|Reliance
 919799|Hexacom
-919800|AirTel
-919801|AirTel
+919800|Airtel
+919801|Airtel
 919802|Dishnet
 919803|Dishnet
 919804|Dishnet
-919805|AirTel
+919805|Airtel
 919806|Dishnet
 919807|Dishnet
 919808|Dishnet
 919809|Dishnet
-919810|AirTel
+919810|Airtel
 919811|Vodafone
 919812|Idea
 919813|Vodafone
 919814|Idea
-919815|AirTel
-919816|AirTel
+919815|Airtel
+919816|Airtel
 919817|Reliance
-919818|AirTel
+919818|Airtel
 919819|Vodafone
 919820|Vodafone
 919821|Loop Mobile
@@ -2548,7 +2629,7 @@
 919828|Vodafone
 919829|Hexacom
 919830|Vodafone
-919831|AirTel
+919831|Airtel
 919832|Reliance
 919833|Vodafone
 919835|Reliance
@@ -2556,16 +2637,16 @@
 919837|Idea
 919838|Vodafone
 919839|Vodafone
-919840|AirTel
+919840|Airtel
 919841|Aircel
 919842|Aircel
 919843|Vodafone
 919844|Idea
-919845|AirTel
+919845|Airtel
 919846|Vodafone
 919847|Idea
 919848|Idea
-919849|AirTel
+919849|Airtel
 919850|Idea
 919851|Dishnet
 919852|Dishnet
@@ -2576,27 +2657,27 @@
 919857|Dishnet
 919858|Dishnet
 919859|Dishnet
-919860|AirTel
+919860|Airtel
 919861|Reliance
 919862|Hexacom
 919863|Reliance
 919864|Reliance
 919865|Aircel
-919866|AirTel
-919867|AirTel
+919866|Airtel
+919867|Airtel
 919868|MTNL
 919869|MTNL
 919870|Loop Mobile
-919871|AirTel
-919872|AirTel
+919871|Airtel
+919872|Airtel
 919873|Vodafone
 919874|Vodafone
 919875|Sistema
-919876|AirTel
+919876|Airtel
 919877|Videocon
-919878|AirTel
+919878|Airtel
 919879|Vodafone
-919880|AirTel
+919880|Airtel
 919882|Idea
 919883|Reliance
 919884|Vodafone
@@ -2605,32 +2686,32 @@
 919887|Idea
 919888|Vodafone
 919889|Idea
-919890|AirTel
+919890|Airtel
 919891|Idea
-919892|AirTel
-919893|AirTel
-919894|AirTel
-919895|AirTel
-919896|AirTel
-919897|AirTel
-919898|AirTel
+919892|Airtel
+919893|Airtel
+919894|Airtel
+919895|Airtel
+919896|Airtel
+919897|Airtel
+919898|Airtel
 919899|Vodafone
-919900|AirTel
-919901|AirTel
-919902|AirTel
-919903|AirTel
+919900|Airtel
+919901|Airtel
+919902|Airtel
+919903|Airtel
 919904|Idea
 919905|Reliance
-919906|AirTel
+919906|Airtel
 919907|Reliance
-919908|AirTel
+919908|Airtel
 919909|Vodafone
-919910|AirTel
+919910|Airtel
 919911|Idea
 919912|Idea
 919913|Vodafone
 919914|Idea
-919915|AirTel
+919915|Airtel
 919916|Vodafone
 919917|Idea
 919918|Vodafone
@@ -2646,71 +2727,71 @@
 919928|Hexacom
 919929|Hexacom
 919930|Vodafone
-919931|AirTel
-919932|AirTel
-919933|AirTel
-919934|AirTel
-919935|AirTel
-919936|AirTel
-919937|AirTel
-919938|AirTel
-919939|AirTel
-919940|AirTel
+919931|Airtel
+919932|Airtel
+919933|Airtel
+919934|Airtel
+919935|Airtel
+919936|Airtel
+919937|Airtel
+919938|Airtel
+919939|Airtel
+919940|Airtel
 919941|Aircel
 919942|Aircel
 919943|Vodafone
-919944|AirTel
-919945|AirTel
+919944|Airtel
+919945|Airtel
 919946|Vodafone
 919947|Idea
 919948|Idea
-919949|AirTel
+919949|Airtel
 919950|Hexacom
 919951|Idea
-919952|AirTel
+919952|Airtel
 919953|Vodafone
-919954|AirTel
-919955|AirTel
-919956|AirTel
-919957|AirTel
-919958|AirTel
-919959|AirTel
-919960|AirTel
+919954|Airtel
+919955|Airtel
+919956|Airtel
+919957|Airtel
+919958|Airtel
+919959|Airtel
+919960|Airtel
 919961|Idea
 919962|Vodafone
-919963|AirTel
+919963|Airtel
 919964|Idea
 919965|Aircel
 919966|Vodafone
-919967|AirTel
+919967|Airtel
 919968|MTNL
 919969|MTNL
-919970|AirTel
-919971|AirTel
-919972|AirTel
-919973|AirTel
-919974|AirTel
-919975|AirTel
+919970|Airtel
+919971|Airtel
+919972|Airtel
+919973|Airtel
+919974|Airtel
+919975|Airtel
 919976|Aircel
 919977|Idea
 919978|Vodafone
 919979|Vodafone
-919980|AirTel
-919981|AirTel
+919980|Airtel
+919981|Airtel
 919982|Vodafone
 919983|Vodafone
 919984|Vodafone
 919985|Vodafone
 919986|Vodafone
-919987|AirTel
+919987|Airtel
 919988|Vodafone
-919989|AirTel
+919989|Airtel
 919990|Idea
 919991|Vodafone
 919992|Idea
-919993|AirTel
-919994|AirTel
-919995|AirTel
-919996|AirTel
-919997|AirTel
+919993|Airtel
+919994|Airtel
+919995|Airtel
+919996|Airtel
+919997|Airtel
 919999|Vodafone
diff --git a/resources/carrier/fa/93.txt b/resources/carrier/fa/93.txt
new file mode 100644
index 00000000..927c997f
--- /dev/null
+++ b/resources/carrier/fa/93.txt
@@ -0,0 +1,24 @@
+# Copyright (C) 2016 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.
+
+9370|افغان بی سیم
+937280|روشن
+93729|روشن
+93744|افغان تلکام
+93747|افغان تلکام
+9375|افغان تلکام
+9376|ام تی ان
+9377|ام تی ان
+9378|اتصالات
+9379|روشن
\ No newline at end of file
diff --git a/resources/carrier/fa/98.txt b/resources/carrier/fa/98.txt
new file mode 100644
index 00000000..4a90fea1
--- /dev/null
+++ b/resources/carrier/fa/98.txt
@@ -0,0 +1,30 @@
+# Copyright (C) 2016 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.
+
+# Prefixes from http://en.wikipedia.org/wiki/%2B98.
+
+9890|ایرانسل
+9891|همراه اول
+9892|رایتل
+98930|ایرانسل
+98931|اسپادان
+98932|تالیا
+98933|ایرانسل
+98934|کیش
+98935|ایرانسل
+98936|ایرانسل
+98937|ایرانسل
+98938|ایرانسل
+98939|ایرانسل
+98990|همراه اول
\ No newline at end of file
diff --git a/resources/geocoding/en/504.txt b/resources/geocoding/en/504.txt
new file mode 100644
index 00000000..a962f981
--- /dev/null
+++ b/resources/geocoding/en/504.txt
@@ -0,0 +1,15 @@
+# Copyright (C) 2011 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.
+
+5042617|Choloma, Cortés
diff --git a/resources/geocoding/en/93.txt b/resources/geocoding/en/93.txt
new file mode 100644
index 00000000..ac6d869b
--- /dev/null
+++ b/resources/geocoding/en/93.txt
@@ -0,0 +1,52 @@
+# Copyright (C) 2016 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.
+
+# Generated from:
+# https://www.itu.int/dms_pub/itu-t/oth/02/02/T02020000010002PDFE.pdf
+# Starting Page 2 [2008-08-28]
+
+9320|Kabul
+9321|Parwan
+9322|Kapisa
+9323|Bamian
+9324|Wardak
+9325|Logar
+9326|Dorkondi
+9327|Khost
+9328|Panjshar
+9330|Kandahar
+9331|Ghazni
+9332|Uruzgan
+9333|Zabol
+9334|Helmand
+9340|Heart
+9341|Badghis
+9342|Ghowr
+9343|Farah
+9344|Nimruz
+9350|Balkh
+9351|Kunduz
+9352|Badkhshan
+9353|Takhar
+9354|Jowzjan
+9355|Samangan
+9356|Sar-E Pol
+9357|Faryab
+9358|Baghlan
+9360|Nangarhar
+9361|Nurestan
+9362|Kunarha
+9363|Laghman
+9364|Paktia
+9365|Paktika
\ No newline at end of file