Merge metadata changes from upstream 7.6.0

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

14 files changed, 895 insertions, 48 deletions

diff --git a/resources/PhoneNumberMetadata.xml b/resources/PhoneNumberMetadata.xml
index b81ce799..a25463a8 100644
--- a/resources/PhoneNumberMetadata.xml
+++ b/resources/PhoneNumberMetadata.xml
@@ -6932,7 +6932,7 @@
       <!-- Uses MA formatting rules and shares general description
            (non-geographical numbers for Morocco are still valid). -->
       <generalDesc>
-        <nationalNumberPattern>[5689]\d{8}</nationalNumberPattern>
+        <nationalNumberPattern>[5-9]\d{8}</nationalNumberPattern>
         <!-- Closed numbering plan. -->
         <possibleNumberPattern>\d{9}</possibleNumberPattern>
       </generalDesc>
@@ -6944,10 +6944,15 @@
            numbers to be recognized as available from within Western Sahara. -->
       <mobile>
         <nationalNumberPattern>
-          6(?:
-            0[0-8]|
-            [12-79]\d|
-            8[017]
+          (?:
+            6(?:
+              [0-79]\d|
+              8[0-247-9]
+            )|
+            7(?:
+              [07][07]|
+              6[12]
+            )
           )\d{6}
         </nationalNumberPattern>
         <exampleNumber>650123456</exampleNumber>
@@ -6960,6 +6965,12 @@
         <nationalNumberPattern>89\d{7}</nationalNumberPattern>
         <exampleNumber>891234567</exampleNumber>
       </premiumRate>
+      <voip>
+        <!-- Putting VSAT numbers here. -->
+        <nationalNumberPattern>5924[01]\d{4}</nationalNumberPattern>
+        <possibleNumberPattern>\d{9}</possibleNumberPattern>
+        <exampleNumber>592401234</exampleNumber>
+      </voip>
     </territory>
 
     <!-- Eritrea -->
@@ -7245,10 +7256,10 @@
         <!-- The data here is not regularly updated by the Ethiopian authorities, and many more
              numbers are visible online than are reported in the ITU document. This pattern is
              therefore somewhat more relaxed than in the ITU document. According to the ETC,
-             95[89] is assigned to some CDMA providers. Prefix 9[46] added after a user report.-->
+             95[89] is assigned to some CDMA providers. Prefix 9[468] added after a user report.-->
         <nationalNumberPattern>
           9(?:
-            [1-46]\d|
+            [1-468]\d|
             5[89]
           )\d{6}
         </nationalNumberPattern>
@@ -12215,14 +12226,16 @@
       <mobile>
         <!-- Adding 27, 28, 299, 31, 508, 527 and 566 as extra prefixes, as they have been found to
              be valid by sending SMSs and looking at online number lookup sites. Also added 50[3-79]
-             as we have found information online that the 50[3-9] range has been assigned to Digicel.
-
-             Numbers have been found online for the following ranges 26x, 29x, 53x, 54x, 55x, 56x.
-             Most have mobile numbers online so we have put them under mobile but is possible
-             they are a mixture of fixed line and mobile. -->
+             as we have found information online that the 50[3-9] range has been assigned to
+             Digicel. Numbers have been found online for the following ranges 258, 26x, 29x, 53x,
+             54x, 55x, 56x. Most have mobile numbers online so we have put them under mobile but is
+             possible they are a mixture of fixed line and mobile. -->
         <nationalNumberPattern>
           876(?:
-            2[16-9]\d|
+            2(?:
+              [16-9]\d|
+              58
+            )|
             [348]\d{2}|
             5(?:
               0[3-9]|
@@ -15467,15 +15480,16 @@
       <references>
         <sourceUrl>http://www.itu.int/oth/T0202000090/en</sourceUrl>
         <sourceUrl>http://en.wikipedia.org/wiki/+212</sourceUrl>
+        <sourceUrl>https://www.anrt.ma/sites/default/files/blocs_de_numeros_par_operateur_juillet_2016.pdf</sourceUrl>
       </references>
       <availableFormats>
-        <numberFormat pattern="([56]\d{2})(\d{6})">
+        <numberFormat pattern="([5-7]\d{2})(\d{6})">
           <leadingDigits>
             5(?:
               2[015-7]|
               3[0-4]
             )|
-            6
+            [67]
           </leadingDigits>
           <format>$1-$2</format>
         </numberFormat>
@@ -15483,7 +15497,8 @@
           <leadingDigits>
             5(?:
               2[2-489]|
-              3[5-9]
+              3[5-9]|
+              92
             )|
             892
           </leadingDigits>
@@ -15496,7 +15511,8 @@
               3(?:
                 [5-79]|
                 80
-              )
+              )|
+              924
             )|
             892
           </leadingDigits>
@@ -15517,6 +15533,16 @@
           </leadingDigits>
           <format>$1-$2</format>
         </numberFormat>
+        <!-- This format is added based on online references found. -->
+        <numberFormat pattern="([5]\d{2})(\d{2})(\d{2})(\d{2})">
+          <leadingDigits>
+            5(?:
+              4[067]|
+              5[03]
+            )
+          </leadingDigits>
+          <format>$1 $2 $3 $4</format>
+        </numberFormat>
         <numberFormat pattern="(8[09])(\d{7})">
           <leadingDigits>
             8(?:
@@ -15528,7 +15554,7 @@
         </numberFormat>
       </availableFormats>
       <generalDesc>
-        <nationalNumberPattern>[5689]\d{8}</nationalNumberPattern>
+        <nationalNumberPattern>[5-9]\d{8}</nationalNumberPattern>
         <!-- Closed numbering plan. -->
         <possibleNumberPattern>\d{9}</possibleNumberPattern>
       </generalDesc>
@@ -15559,21 +15585,27 @@
                 0\d|
                 [89]0
               )
-            )
+            )|
+            (?:
+              4[067]|
+              5[03]
+            )\d{2}
           )\d{4}
         </nationalNumberPattern>
         <exampleNumber>520123456</exampleNumber>
       </fixedLine>
       <!-- Also duplicated in Western Sahara, please ensure you update both. -->
       <mobile>
-        <!-- http://www.anrt.ma/sites/default/files/Blocs_de_numeros_par_operateur.pdf
-             Prefixes 69[0136] added based on numbers found online. -->
-        <!-- Added prefix 982 as per IR21 from the carrier. -->
         <nationalNumberPattern>
-          6(?:
-            0[0-8]|
-            [12-79]\d|
-            8[017]
+          (?:
+            6(?:
+              [0-79]\d|
+              8[0-247-9]
+            )|
+            7(?:
+              [07][07]|
+              6[12]
+            )
           )\d{6}
         </nationalNumberPattern>
         <exampleNumber>650123456</exampleNumber>
@@ -15586,6 +15618,12 @@
         <nationalNumberPattern>89\d{7}</nationalNumberPattern>
         <exampleNumber>891234567</exampleNumber>
       </premiumRate>
+      <voip>
+        <!-- Putting VSAT numbers here. -->
+        <nationalNumberPattern>5924[01]\d{4}</nationalNumberPattern>
+        <possibleNumberPattern>\d{9}</possibleNumberPattern>
+        <exampleNumber>592401234</exampleNumber>
+      </voip>
     </territory>
 
     <!-- Monaco -->
@@ -21374,7 +21412,7 @@
       <mobile>
         <!-- 948 isn't in the number pattern, but many examples using this have been found, so
              deeming it valid for now. 909[1-9] is assigned to carrier Juro as per online
-             references found. -->
+             references found. 945 is assigned to Orange as per its carrier doc.-->
         <nationalNumberPattern>
           9(?:
             0(?:
@@ -21383,7 +21421,7 @@
             )|
             (?:
               1[0-24-9]|
-              4[0489]|
+              4[04589]|
               50
             )\d
           )\d{5}
@@ -21542,7 +21580,7 @@
     <territory id="SN" countryCode="221" internationalPrefix="00">
       <references>
         <sourceUrl>http://www.itu.int/oth/T02020000B8/en</sourceUrl>
-        <sourceUrl>http://www.artpsenegal.net</sourceUrl>
+        <sourceUrl>http://www.artpsenegal.net/index.php?option=com_content&amp;view=article&amp;id=50</sourceUrl>
       </references>
       <availableFormats>
         <!-- Using yellow pages and online telecom company formatting, rather than that implied in
@@ -21581,9 +21619,8 @@
       <mobile>
         <nationalNumberPattern>
           7(?:
-            [067]\d|
+            [06-8]\d|
             21|
-            8[0-46]|
             90
           )\d{6}
         </nationalNumberPattern>
@@ -22013,8 +22050,8 @@
         <nationalNumberPattern>
           9(?:
             22|
-            [35][0-8]|
-            4\d|
+            3[0-8]|
+            [45]\d|
             6[024-9]|
             88|
             9[0-489]
@@ -25052,12 +25089,12 @@
         <!-- Adding extra prefixes 50 and 6[1-57-9] since SMS messages have been successfully
              delivered to these numbers, and numbers like this can be found on the Internet. Adding
              prefix 960 based on information received from MTN Zambia. The 97 range has been
-             expanded based on their IR21 document, which states the range 97[1-9] is used. -->
+             expanded based on their IR21 document, which states the range 97[1-9] is used.
+             Added 95[3489] and 970 prefixes based on numbers found online. -->
         <nationalNumberPattern>
           9(?:
-            5[05]|
-            6\d|
-            7[1-9]
+            5[034589]|
+            [67]\d
           )\d{6}
         </nationalNumberPattern>
         <exampleNumber>955123456</exampleNumber>
diff --git a/resources/PhoneNumberMetadataForTesting.xml b/resources/PhoneNumberMetadataForTesting.xml
index 085e00a9..152eb445 100644
--- a/resources/PhoneNumberMetadataForTesting.xml
+++ b/resources/PhoneNumberMetadataForTesting.xml
@@ -236,8 +236,9 @@
     </territory>
 
     <!-- China -->
-    <!-- Used to test as-you-type-formatter with complicated number format patterns. -->
-    <territory id="CN" countryCode="86">
+    <!-- Used to test as-you-type-formatter with complicated number format patterns. Also used to
+         test that not all geographical mobile numbers have an area code. -->
+    <territory id="CN" countryCode="86" nationalPrefix="0">
       <availableFormats>
         <numberFormat nationalPrefixFormattingRule="$NP$FG" pattern="(\d{3})(\d{5,6})"
                       carrierCodeFormattingRule="$CC $FG">
@@ -251,7 +252,37 @@
           </leadingDigits>
           <format>$1 $2</format>
         </numberFormat>
+        <!-- Note that mobile numbers do not get formatted with the national prefix. -->
+        <numberFormat nationalPrefixFormattingRule="$FG" pattern="(\d{3})(\d{8})">
+          <leadingDigits>1</leadingDigits>
+          <format>$1 $2</format>
+        </numberFormat>
       </availableFormats>
+      <generalDesc>
+        <nationalNumberPattern>
+          [1-7]\d{6,11}|
+          8[0-357-9]\d{6,9}|
+          9\d{7,10}
+        </nationalNumberPattern>
+        <possibleNumberPattern>\d{4,12}</possibleNumberPattern>
+      </generalDesc>
+      <fixedLine>
+        <nationalNumberPattern>[2-9]\d{10}</nationalNumberPattern>
+        <possibleNumberPattern>\d{11}</possibleNumberPattern>
+        <exampleNumber>91234567</exampleNumber>
+      </fixedLine>
+      <mobile>
+        <nationalNumberPattern>
+          1(?:
+            [38]\d|
+            4[57]|
+            5[0-35-9]|
+            7[0136-8]
+          )\d{8}
+        </nationalNumberPattern>
+        <possibleNumberPattern>\d{11}</possibleNumberPattern>
+        <exampleNumber>13123456789</exampleNumber>
+      </mobile>
     </territory>
 
     <!-- Christmas Islands -->
diff --git a/resources/ShortNumberMetadata.xml b/resources/ShortNumberMetadata.xml
index bd58fc69..7542a677 100644
--- a/resources/ShortNumberMetadata.xml
+++ b/resources/ShortNumberMetadata.xml
@@ -9732,7 +9732,7 @@
          information. -->
     <territory id="ZA">
       <generalDesc>
-        <nationalNumberPattern>[14]\d{2,4}</nationalNumberPattern>
+        <nationalNumberPattern>[134]\d{2,4}</nationalNumberPattern>
         <possibleNumberPattern>\d{3,5}</possibleNumberPattern>
       </generalDesc>
       <shortCode>
@@ -9744,12 +9744,16 @@
             )|
             12
           )|
+          37567|
           47751
         </nationalNumberPattern>
         <exampleNumber>10111</exampleNumber>
       </shortCode>
       <standardRate>
-        <nationalNumberPattern>47751</nationalNumberPattern>
+        <nationalNumberPattern>
+          37567|
+          47751
+        </nationalNumberPattern>
         <possibleNumberPattern>\d{5}</possibleNumberPattern>
         <exampleNumber>47751</exampleNumber>
       </standardRate>
@@ -9766,8 +9770,11 @@
         <exampleNumber>10111</exampleNumber>
       </emergency>
       <smsServices>
-        <!-- Added SMS service short code 47751 as per online evidences found. -->
-        <nationalNumberPattern>47751</nationalNumberPattern>
+        <!-- Added SMS service short code 37567 and 47751 as per online evidences found. -->
+        <nationalNumberPattern>
+          37567|
+          47751
+        </nationalNumberPattern>
         <possibleNumberPattern>\d{5}</possibleNumberPattern>
         <exampleNumber>47751</exampleNumber>
       </smsServices>
diff --git a/resources/carrier/en/212.txt b/resources/carrier/en/212.txt
index 03568629..4a25ef6b 100644
--- a/resources/carrier/en/212.txt
+++ b/resources/carrier/en/212.txt
@@ -27,6 +27,7 @@
 212606|Inwi
 212607|Inwi
 212608|Inwi
+212609|Inwi
 212610|Maroc Telecom
 212611|Maroc Telecom
 212612|Méditel
@@ -99,13 +100,25 @@
 212679|Méditel
 212680|Inwi
 212681|Inwi
+212682|Maroc Telecom
+212684|Méditel
 212687|Inwi
+212688|Méditel
+212689|Maroc Telecom
 212690|Inwi
-212691|Inwi
-212692|GlobalStar
+212691|Méditel
+2126921|Al Hourria Telecom
+2126922|Al Hourria Telecom
+212693|Méditel
 212694|Méditel
 212695|Inwi
-212696|Inwi
+212696|Maroc Telecom
 212697|Maroc Telecom
 212698|Inwi
 212699|Inwi
+212700|Inwi
+212707|Inwi
+212761|Maroc Telecom
+212762|Maroc Telecom
+212770|Méditel
+212777|Méditel
diff --git a/resources/carrier/en/251.txt b/resources/carrier/en/251.txt
index 2b232787..b6dcc37f 100644
--- a/resources/carrier/en/251.txt
+++ b/resources/carrier/en/251.txt
@@ -18,3 +18,4 @@
 25194|Ethio Telecom
 25195|Ethio Telecom
 25196|Ethio Telecom
+25198|Ethio Telecom
diff --git a/resources/carrier/en/421.txt b/resources/carrier/en/421.txt
index 13466de5..c43e230e 100644
--- a/resources/carrier/en/421.txt
+++ b/resources/carrier/en/421.txt
@@ -32,6 +32,7 @@
 421919|Orange
 421940|O2
 421944|O2
+421945|Orange
 421948|O2
 421949|O2
 421950|4ka of SWAN
diff --git a/resources/carrier/en/86.txt b/resources/carrier/en/86.txt
index b923f5a6..7fba4b26 100644
--- a/resources/carrier/en/86.txt
+++ b/resources/carrier/en/86.txt
@@ -19,7 +19,15 @@
 86131|China Unicom
 86132|China Unicom
 86133|China Telecom
-86134|China Mobile
+861340|China Mobile
+861341|China Mobile
+861342|China Mobile
+861343|China Mobile
+861344|China Mobile
+861345|China Mobile
+861346|China Mobile
+861347|China Mobile
+861348|China Mobile
 86135|China Mobile
 86136|China Mobile
 86137|China Mobile
@@ -36,6 +44,10 @@
 86157|China Mobile
 86158|China Mobile
 86159|China Mobile
+861703|China Mobile
+861705|China Mobile
+861706|China Mobile
+86172|China Mobile
 86173|China Telecom
 86176|China Unicom
 86177|China Telecom
diff --git a/resources/carrier/en/963.txt b/resources/carrier/en/963.txt
new file mode 100644
index 00000000..9ccc5bdb
--- /dev/null
+++ b/resources/carrier/en/963.txt
@@ -0,0 +1,50 @@
+# 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.
+
+# Taken from https://en.wikipedia.org/wiki/Telephone_numbers_in_Syria
+
+963922|Syriatel
+963930|Syriatel
+963931|Syriatel
+963932|Syriatel
+963933|Syriatel
+963934|Syriatel
+963935|Syriatel
+963936|Syriatel
+963937|Syriatel
+963938|Syriatel
+96394|MTN
+963950|MTN
+963952|MTN
+963954|MTN
+963955|MTN
+963956|MTN
+963957|MTN
+963958|MTN
+963959|MTN
+963962|MTN
+963964|MTN
+963965|MTN
+963966|MTN
+963967|MTN
+963968|MTN
+963969|MTN
+963988|Syriatel
+963990|Syriatel
+963991|Syriatel
+963992|Syriatel
+963993|Syriatel
+963994|Syriatel
+963998|Syriatel
+963999|Syriatel
diff --git a/resources/carrier/zh/852.txt b/resources/carrier/zh/852.txt
new file mode 100644
index 00000000..e04372ef
--- /dev/null
+++ b/resources/carrier/zh/852.txt
@@ -0,0 +1,283 @@
+# 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.
+
+# Translations of en/852.txt from each carrier's wikipedia page and in
+# some cases the carrier's own home page.
+
+852510|中国移动
+852511|新移动通讯
+852512|中国移动
+852513|中国移动
+852514|香港移动通讯
+8525149|Truphone
+852516|中国移动
+852517|中国移动
+852518|香港移动通讯
+852519|3
+852521|1O1O / One2Free
+8525230|香港移动通讯
+8525231|香港移动通讯
+8525232|香港移动通讯
+8525233|香港移动通讯
+852524|1O1O / One2Free
+852526|中国移动
+852530|中国移动
+852531|中国移动
+852532|香港移动通讯
+852533|3
+852534|中国移动
+852536|香港移动通讯
+852537|中国移动
+852538|中国联通
+852539|中国移动
+852540|新移动通讯
+852541|香港移动通讯
+852542|中国移动
+852543|1O1O / One2Free
+852544|中国移动
+852546|3
+852547|1O1O / One2Free
+852548|中国移动
+852549|中国移动
+852550|数码通
+852551|中国移动
+852552|1O1O / One2Free
+852553|中国移动
+8525540|新移动通讯
+8525541|新移动通讯
+8525542|新移动通讯
+8525543|新移动通讯
+8525544|新移动通讯
+8525545|新移动通讯
+8525546|新移动通讯
+8525547|新移动通讯
+8525548|新移动通讯
+852556|3
+852557|中国移动
+852558|香港移动通讯
+852559|数码通
+852560|中国移动
+852561|中国移动
+852562|中国移动
+852563|3
+852564|中国移动
+852566|3
+852568|1O1O / One2Free
+852569|3
+8525900|香港移动通讯
+8525901|香港移动通讯
+8525902|香港移动通讯
+8525903|香港移动通讯
+8525904|香港移动通讯
+8525905|香港移动通讯
+852591|1O1O / One2Free
+852592|1O1O / One2Free
+852593|中国移动
+852594|香港移动通讯
+852596|3
+852597|3
+852598|中国移动
+852599|1O1O / One2Free
+852601|数码通
+852602|1O1O / One2Free
+852603|1O1O / One2Free
+852604|3
+852605|1O1O / One2Free
+852606|中国移动
+852607|3
+852608|3
+852609|中国移动
+852610|3
+852611|数码通
+852612|香港移动通讯
+852613|1O1O / One2Free
+852614|1O1O / One2Free
+852615|中国移动
+852616|1O1O / One2Free
+852617|1O1O / One2Free
+852618|香港移动通讯
+852619|3
+852620|3
+852621|中国移动
+852622|中国移动
+852623|中国移动
+852624|润迅通信
+852625|香港移动通讯
+852627|3
+852628|1O1O / One2Free
+852629|1O1O / One2Free
+852630|香港移动通讯
+852631|3
+852632|数码通
+852633|3
+852634|3
+852635|中国移动
+852637|1O1O / One2Free
+852638|香港移动通讯
+852639|1O1O / One2Free
+852640|3
+852641|1O1O / One2Free
+852642|1O1O / One2Free
+852643|中国移动
+852644|香港移动通讯
+8526450|中信国际电讯
+85264510|中信国际电讯
+85264511|中信国际电讯
+8526452|中信国际电讯
+85264535|中信国际电讯
+85264536|中信国际电讯
+85264537|中信国际电讯
+85264538|中信国际电讯
+85264539|中信国际电讯
+8526454|中信国际电讯
+8526455|中信国际电讯
+8526456|中信国际电讯
+8526457|中信国际电讯
+8526458|中信国际电讯
+8526459|中信国际电讯
+852646|数码通
+852647|3
+852648|中国移动
+852649|香港移动通讯
+852650|3
+852651|中港通
+852652|中国联通
+852653|1O1O / One2Free
+852654|1O1O / One2Free
+852655|中国联通
+852656|中国联通
+852657|中国移动
+852658|中国移动
+852659|1O1O / One2Free
+852660|香港移动通讯
+852661|中国联通
+852662|香港移动通讯
+852663|中国联通
+852664|中国移动
+852665|1O1O / One2Free
+852667|中国移动
+852668|3
+852669|香港移动通讯
+852670|中国移动
+852671|1O1O / One2Free
+852672|中国联通
+852673|中国移动
+852674|中国移动
+852675|1O1O / One2Free
+852676|中国移动
+852677|1O1O / One2Free
+852679|3
+852680|香港移动通讯
+852681|中国联通
+852682|1O1O / One2Free
+852683|润迅通信
+852684|中国移动
+852685|中国移动
+852687|中国移动
+852688|中国联通
+852689|1O1O / One2Free
+852690|3
+852691|中国移动
+852692|香港移动通讯
+852693|中国移动
+852694|中国移动
+852695|中国移动
+852696|润迅通信
+852697|1O1O / One2Free
+852698|润迅通信
+852699|中国移动
+852901|数码通
+852902|1O1O / One2Free
+852903|1O1O / One2Free
+852904|3
+852905|润迅通信
+852906|中国移动
+852907|香港移动通讯
+852908|1O1O / One2Free
+852909|1O1O / One2Free
+852910|1O1O / One2Free
+852912|3
+852913|数码通
+852914|中国移动
+852915|1O1O / One2Free
+852916|数码通
+852917|数码通
+852918|1O1O / One2Free
+852919|1O1O / One2Free
+852920|中国移动
+852921|1O1O / One2Free
+852922|数码通
+852923|香港移动通讯
+852924|数码通
+852925|1O1O / One2Free
+852926|1O1O / One2Free
+852927|香港移动通讯
+852928|3
+852930|1O1O / One2Free
+852931|数码通
+852932|3
+852933|1O1O / One2Free
+852934|中国移动
+852935|3
+852936|3
+852937|3
+852938|数码通
+852940|1O1O / One2Free
+852941|3
+852942|3
+852943|数码通
+852944|数码通
+852945|数码通
+852946|1O1O / One2Free
+852947|3
+852948|3
+852949|3
+852950|3
+852951|中国移动
+852952|香港移动通讯
+852953|1O1O / One2Free
+852954|数码通
+852955|1O1O / One2Free
+852956|中国联通
+852957|3
+852958|中国移动
+852960|中国移动
+852961|1O1O / One2Free
+852962|1O1O / One2Free
+852963|3
+852964|香港移动通讯
+852965|1O1O / One2Free
+852966|数码通
+852967|3
+852968|数码通
+852969|中港通
+852970|3
+852971|中国移动
+852972|数码通
+852973|数码通
+852974|3
+852975|3
+852976|1O1O / One2Free
+852977|香港移动通讯
+852978|1O1O / One2Free
+852979|中国移动
+852980|香港移动通讯
+852981|3
+852982|3
+852983|3
+852984|数码通
+852985|数码通
+852986|数码通
+852987|1O1O / One2Free
+852988|1O1O / One2Free
diff --git a/resources/carrier/zh/86.txt b/resources/carrier/zh/86.txt
new file mode 100644
index 00000000..1fb59479
--- /dev/null
+++ b/resources/carrier/zh/86.txt
@@ -0,0 +1,64 @@
+# 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.
+
+# Translations of en/86.txt from each carrier's wikipedia page and in
+# some cases the carrier's own home page.
+
+86130|中国联通
+86131|中国联通
+86132|中国联通
+86133|中国电信
+861340|中国移动
+861341|中国移动
+861342|中国移动
+861343|中国移动
+861344|中国移动
+861345|中国移动
+861346|中国移动
+861347|中国移动
+861348|中国移动
+86135|中国移动
+86136|中国移动
+86137|中国移动
+86138|中国移动
+86139|中国移动
+86145|中国联通
+86147|中国移动
+86150|中国移动
+86151|中国移动
+86152|中国移动
+86153|中国电信
+86155|中国联通
+86156|中国联通
+86157|中国移动
+86158|中国移动
+86159|中国移动
+861703|中国移动
+861705|中国移动
+861706|中国移动
+86172|中国移动
+86173|中国电信
+86176|中国联通
+86177|中国电信
+86178|中国移动
+86180|中国电信
+86181|中国电信
+86182|中国移动
+86183|中国移动
+86184|中国移动
+86185|中国联通
+86186|中国联通
+86187|中国移动
+86188|中国移动
+86189|中国电信
diff --git a/resources/carrier/zh_Hant/852.txt b/resources/carrier/zh_Hant/852.txt
new file mode 100644
index 00000000..55c7a77c
--- /dev/null
+++ b/resources/carrier/zh_Hant/852.txt
@@ -0,0 +1,283 @@
+# 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.
+
+# Translations of en/852.txt from each carrier's wikipedia page and in
+# some cases the carrier's own home page.
+
+852510|中國移動
+852511|新移動通訊
+852512|中國移動
+852513|中國移動
+852514|香港移動通訊
+8525149|Truphone
+852516|中國移動
+852517|中國移動
+852518|香港移動通訊
+852519|3
+852521|1O1O / One2Free
+8525230|香港移動通訊
+8525231|香港移動通訊
+8525232|香港移動通訊
+8525233|香港移動通訊
+852524|1O1O / One2Free
+852526|中國移動
+852530|中國移動
+852531|中國移動
+852532|香港移動通訊
+852533|3
+852534|中國移動
+852536|香港移動通訊
+852537|中國移動
+852538|中國聯通
+852539|中國移動
+852540|新移動通訊
+852541|香港移動通訊
+852542|中國移動
+852543|1O1O / One2Free
+852544|中國移動
+852546|3
+852547|1O1O / One2Free
+852548|中國移動
+852549|中國移動
+852550|數碼通
+852551|中國移動
+852552|1O1O / One2Free
+852553|中國移動
+8525540|新移動通訊
+8525541|新移動通訊
+8525542|新移動通訊
+8525543|新移動通訊
+8525544|新移動通訊
+8525545|新移動通訊
+8525546|新移動通訊
+8525547|新移動通訊
+8525548|新移動通訊
+852556|3
+852557|中國移動
+852558|香港移動通訊
+852559|數碼通
+852560|中國移動
+852561|中國移動
+852562|中國移動
+852563|3
+852564|中國移動
+852566|3
+852568|1O1O / One2Free
+852569|3
+8525900|香港移動通訊
+8525901|香港移動通訊
+8525902|香港移動通訊
+8525903|香港移動通訊
+8525904|香港移動通訊
+8525905|香港移動通訊
+852591|1O1O / One2Free
+852592|1O1O / One2Free
+852593|中國移動
+852594|香港移動通訊
+852596|3
+852597|3
+852598|中國移動
+852599|1O1O / One2Free
+852601|數碼通
+852602|1O1O / One2Free
+852603|1O1O / One2Free
+852604|3
+852605|1O1O / One2Free
+852606|中國移動
+852607|3
+852608|3
+852609|中國移動
+852610|3
+852611|數碼通
+852612|香港移動通訊
+852613|1O1O / One2Free
+852614|1O1O / One2Free
+852615|中國移動
+852616|1O1O / One2Free
+852617|1O1O / One2Free
+852618|香港移動通訊
+852619|3
+852620|3
+852621|中國移動
+852622|中國移動
+852623|中國移動
+852624|潤迅通信
+852625|香港移動通訊
+852627|3
+852628|1O1O / One2Free
+852629|1O1O / One2Free
+852630|香港移動通訊
+852631|3
+852632|數碼通
+852633|3
+852634|3
+852635|中國移動
+852637|1O1O / One2Free
+852638|香港移動通訊
+852639|1O1O / One2Free
+852640|3
+852641|1O1O / One2Free
+852642|1O1O / One2Free
+852643|中國移動
+852644|香港移動通訊
+8526450|中信國際電訊
+85264510|中信國際電訊
+85264511|中信國際電訊
+8526452|中信國際電訊
+85264535|中信國際電訊
+85264536|中信國際電訊
+85264537|中信國際電訊
+85264538|中信國際電訊
+85264539|中信國際電訊
+8526454|中信國際電訊
+8526455|中信國際電訊
+8526456|中信國際電訊
+8526457|中信國際電訊
+8526458|中信國際電訊
+8526459|中信國際電訊
+852646|數碼通
+852647|3
+852648|中國移動
+852649|香港移動通訊
+852650|3
+852651|中港通
+852652|中國聯通
+852653|1O1O / One2Free
+852654|1O1O / One2Free
+852655|中國聯通
+852656|中國聯通
+852657|中國移動
+852658|中國移動
+852659|1O1O / One2Free
+852660|香港移動通訊
+852661|中國聯通
+852662|香港移動通訊
+852663|中國聯通
+852664|中國移動
+852665|1O1O / One2Free
+852667|中國移動
+852668|3
+852669|香港移動通訊
+852670|中國移動
+852671|1O1O / One2Free
+852672|中國聯通
+852673|中國移動
+852674|中國移動
+852675|1O1O / One2Free
+852676|中國移動
+852677|1O1O / One2Free
+852679|3
+852680|香港移動通訊
+852681|中國聯通
+852682|1O1O / One2Free
+852683|潤迅通信
+852684|中國移動
+852685|中國移動
+852687|中國移動
+852688|中國聯通
+852689|1O1O / One2Free
+852690|3
+852691|中國移動
+852692|香港移動通訊
+852693|中國移動
+852694|中國移動
+852695|中國移動
+852696|潤迅通信
+852697|1O1O / One2Free
+852698|潤迅通信
+852699|中國移動
+852901|數碼通
+852902|1O1O / One2Free
+852903|1O1O / One2Free
+852904|3
+852905|潤迅通信
+852906|中國移動
+852907|香港移動通訊
+852908|1O1O / One2Free
+852909|1O1O / One2Free
+852910|1O1O / One2Free
+852912|3
+852913|數碼通
+852914|中國移動
+852915|1O1O / One2Free
+852916|數碼通
+852917|數碼通
+852918|1O1O / One2Free
+852919|1O1O / One2Free
+852920|中國移動
+852921|1O1O / One2Free
+852922|數碼通
+852923|香港移動通訊
+852924|數碼通
+852925|1O1O / One2Free
+852926|1O1O / One2Free
+852927|香港移動通訊
+852928|3
+852930|1O1O / One2Free
+852931|數碼通
+852932|3
+852933|1O1O / One2Free
+852934|中國移動
+852935|3
+852936|3
+852937|3
+852938|數碼通
+852940|1O1O / One2Free
+852941|3
+852942|3
+852943|數碼通
+852944|數碼通
+852945|數碼通
+852946|1O1O / One2Free
+852947|3
+852948|3
+852949|3
+852950|3
+852951|中國移動
+852952|香港移動通訊
+852953|1O1O / One2Free
+852954|數碼通
+852955|1O1O / One2Free
+852956|中國聯通
+852957|3
+852958|中國移動
+852960|中國移動
+852961|1O1O / One2Free
+852962|1O1O / One2Free
+852963|3
+852964|香港移動通訊
+852965|1O1O / One2Free
+852966|數碼通
+852967|3
+852968|數碼通
+852969|中港通
+852970|3
+852971|中國移動
+852972|數碼通
+852973|數碼通
+852974|3
+852975|3
+852976|1O1O / One2Free
+852977|香港移動通訊
+852978|1O1O / One2Free
+852979|中國移動
+852980|香港移動通訊
+852981|3
+852982|3
+852983|3
+852984|數碼通
+852985|數碼通
+852986|數碼通
+852987|1O1O / One2Free
+852988|1O1O / One2Free
diff --git a/resources/carrier/zh_Hant/86.txt b/resources/carrier/zh_Hant/86.txt
new file mode 100644
index 00000000..1cfa42f7
--- /dev/null
+++ b/resources/carrier/zh_Hant/86.txt
@@ -0,0 +1,64 @@
+# 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.
+
+# Translations of en/86.txt from each carrier's wikipedia page and in
+# some cases the carrier's own home page.
+
+86130|中國聯通
+86131|中國聯通
+86132|中國聯通
+86133|中國電信
+861340|中國移動
+861341|中國移動
+861342|中國移動
+861343|中國移動
+861344|中國移動
+861345|中國移動
+861346|中國移動
+861347|中國移動
+861348|中國移動
+86135|中國移動
+86136|中國移動
+86137|中國移動
+86138|中國移動
+86139|中國移動
+86145|中國聯通
+86147|中國移動
+86150|中國移動
+86151|中國移動
+86152|中國移動
+86153|中國電信
+86155|中國聯通
+86156|中國聯通
+86157|中國移動
+86158|中國移動
+86159|中國移動
+861703|中國移動
+861705|中國移動
+861706|中國移動
+86172|中國移動
+86173|中國電信
+86176|中國聯通
+86177|中國電信
+86178|中國移動
+86180|中國電信
+86181|中國電信
+86182|中國移動
+86183|中國移動
+86184|中國移動
+86185|中國聯通
+86186|中國聯通
+86187|中國移動
+86188|中國移動
+86189|中國電信
diff --git a/resources/geocoding/en/212.txt b/resources/geocoding/en/212.txt
index 85a1d31e..44c046d0 100644
--- a/resources/geocoding/en/212.txt
+++ b/resources/geocoding/en/212.txt
@@ -50,7 +50,7 @@
 21252980|Marrakech area
 21252990|Agadir area
 212530|Rabat/Kènitra
-212531|Tangier/Al Hoceima/Larache/Tètouan
+212531|Tangier/Al Hoceima/Larache/Tètouan/Chefchaouen
 212532|Fès/Errachidia/Meknès/Nador/Oujda/Taza
 2125352|Taza
 2125353|Midelt
diff --git a/resources/test/geocoding/en/82.txt b/resources/test/geocoding/en/82.txt
index e452e450..63de7d32 100644
--- a/resources/test/geocoding/en/82.txt
+++ b/resources/test/geocoding/en/82.txt
@@ -12,6 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+8210|Mobile prefix, should not be geocoded.
 822|Seoul
 8231|Gyeonggi
 8232|Incheon