Merge metadata changes from upstream 8.5.1

Includes changes in resources/ up to and including
upstream commit b258c8aa517e:
  "[maven-release-plugin] prepare release v8.5.1"

14 files changed, 581 insertions, 151 deletions

diff --git a/resources/PhoneNumberMetadata.xml b/resources/PhoneNumberMetadata.xml
index 2eac5dfb..10bb5e3c 100644
--- a/resources/PhoneNumberMetadata.xml
+++ b/resources/PhoneNumberMetadata.xml
@@ -2148,11 +2148,14 @@
       <mobile>
         <nationalNumberPattern>
           6(?:
-            03|
-            44|
-            71|
-            [1-356]
-          )\d{6}
+            0(?:
+              3\d|
+              40
+            )|
+            [1-356]\d|
+            44[0-6]|
+            71[137]
+          )\d{5}
         </nationalNumberPattern>
         <possibleLengths national="8,9"/>
         <exampleNumber>61123456</exampleNumber>
@@ -3237,15 +3240,16 @@
         <!-- Any ranges assigned from
              http://www.arcep.fr/index.php?id=interactivenumeros have been listed as belonging to
              Guadeloupe, St Martin and St Barthélemy, since we can't reliably distinguish between
-             them. -->
+             them. Prefixes assigned to Guadeloupe Téléphone Mobile have been removed since the
+             operator is no longer functioning. -->
         <nationalNumberPattern>
           690(?:
-            0[0-7]|
+            0[05-9]|
             [1-9]\d
           )\d{4}
         </nationalNumberPattern>
         <possibleLengths national="9"/>
-        <exampleNumber>690301234</exampleNumber>
+        <exampleNumber>690001234</exampleNumber>
       </mobile>
     </territory>
 
@@ -5616,7 +5620,7 @@
       </premiumRate>
       <voip>
         <!-- Including trunking service numbers starting with 5100. -->
-        <!-- Prefixes for VOIP simplified from wikipidea 4xxx xxxx -->
+        <!-- Prefixes for VOIP simplified from wikipedia 4xxx xxxx -->
         <!-- Prefix 210x xxxx present before, taken from ITU doc -->
         <nationalNumberPattern>
           210[0-6]\d{4}|
@@ -8208,17 +8212,15 @@
             9[0-2]
           )\d{7}|
           1(?:
-            (?:
-              1(?:
-                3[0-48]|
-                [46][0-4]|
-                5[0-26-9]|
-                [78][0-49]
-              )|
-              21[0-7]|
-              31[0-8]|
-              [4-69]1\d
-            )
+            1(?:
+              3[0-48]|
+              [46][0-4]|
+              5[0-26-9]|
+              [78][0-49]
+            )|
+            21[0-7]|
+            31[0-8]|
+            [4-69]1\d
           )\d{6}|
           1(?:
             2(?:
@@ -8787,12 +8789,13 @@
         <exampleNumber>594101234</exampleNumber>
       </fixedLine>
       <mobile>
+        <!-- Prefixes from arcep, excluding the prefixes assigned to Guyane Téléphone Mobile since
+             the operator is no longer functioning. -->
         <nationalNumberPattern>
           694(?:
-            [04][0-7]|
-            1[0-5]|
-            3[018]|
-            [29]\d
+            [0249]\d|
+            1[2-9]|
+            3[0-48]
           )\d{4}
         </nationalNumberPattern>
         <possibleLengths national="9"/>
@@ -9244,18 +9247,18 @@
         <exampleNumber>590201234</exampleNumber>
       </fixedLine>
       <mobile>
-        <!-- Any ranges assigned from
-             http://www.arcep.fr/index.php?id=interactivenumeros have been listed as belonging to
-             Guadeloupe, St Martin and St Barthélemy, since we can't reliably distinguish between
-             them. -->
+        <!-- Any ranges assigned from http://www.arcep.fr/index.php?id=interactivenumeros have been
+             listed as belonging to Guadeloupe, St Martin and St Barthélemy, since we can't reliably
+             distinguish between them. Prefixes assigned to Guadeloupe Téléphone Mobile have been
+             removed since the operator is no longer functioning. -->
         <nationalNumberPattern>
           690(?:
-            0[0-7]|
+            0[05-9]|
             [1-9]\d
           )\d{4}
         </nationalNumberPattern>
         <possibleLengths national="9"/>
-        <exampleNumber>690301234</exampleNumber>
+        <exampleNumber>690001234</exampleNumber>
       </mobile>
     </territory>
 
@@ -9517,7 +9520,7 @@
             4(?:
               56|
               7[1-9]|
-              8[236-9]
+              8[0236-9]
             )|
             5(?:
               55|
@@ -9569,7 +9572,7 @@
             4(?:
               56|
               7[1-9]|
-              8[236-9]
+              8[0236-9]
             )|
             5(?:
               55|
@@ -14780,7 +14783,7 @@
             244|
             5(?:
               [015]|
-              66
+              6[56]
             )
           </leadingDigits>
           <format>$1 $2</format>
@@ -14821,7 +14824,7 @@
                 22|
                 5[25]
               )|
-              66\d
+              6[56]\d
             )|
             6(?:
               0[034679]\d|
@@ -16413,15 +16416,16 @@
         <!-- Any ranges assigned from
              http://www.arcep.fr/index.php?id=interactivenumeros have been listed as belonging to
              Guadeloupe, St Martin and St Barthélemy, since we can't reliably distinguish between
-             them. -->
+             them. Prefixes assigned to Guadeloupe Téléphone Mobile have been removed since the
+             operator is no longer functioning. -->
         <nationalNumberPattern>
           690(?:
-            0[0-7]|
+            0[05-9]|
             [1-9]\d
           )\d{4}
         </nationalNumberPattern>
         <possibleLengths national="9"/>
-        <exampleNumber>690301234</exampleNumber>
+        <exampleNumber>690001234</exampleNumber>
       </mobile>
     </territory>
 
@@ -19448,7 +19452,8 @@
     </territory>
 
     <!-- Papua New Guinea -->
-    <territory id="PG" countryCode="675" internationalPrefix="00">
+    <territory id="PG" countryCode="675" internationalPrefix="140[1-3]|00"
+        preferredInternationalPrefix="00">
       <references>
         <sourceUrl>http://www.itu.int/oth/T02020000A4/en</sourceUrl>
         <sourceUrl>http://en.wikipedia.org/wiki/%2B675</sourceUrl>
@@ -19492,21 +19497,14 @@
         <exampleNumber>3123456</exampleNumber>
       </fixedLine>
       <mobile>
-        <!-- Mobile number patterns from the numbering plan are included here, as well as 68X from
-             Wikipedia.
-             As per ITU doc, prefix 20150 will expire at the end of 2015. -->
         <nationalNumberPattern>
-          (?:
-            20150|
-            68\d{2}|
-            7(?:
-              [0-689]\d|
-              75
-            )\d{2}
-          )\d{3}
+          7(?:
+            [0-689]\d|
+            75
+          )\d{5}
         </nationalNumberPattern>
-        <possibleLengths national="7,8"/>
-        <exampleNumber>6812345</exampleNumber>
+        <possibleLengths national="8"/>
+        <exampleNumber>70123456</exampleNumber>
       </mobile>
       <tollFree>
         <nationalNumberPattern>180\d{4}</nationalNumberPattern>
@@ -19516,7 +19514,12 @@
       <voip>
         <!-- Including all satellite numbers from the ITU doc here, as we found working numbers
              online. -->
-        <nationalNumberPattern>27[568]\d{4}</nationalNumberPattern>
+        <nationalNumberPattern>
+          2(?:
+            0[0-47]|
+            7[568]
+          )\d{4}
+        </nationalNumberPattern>
         <possibleLengths national="7"/>
         <exampleNumber>2751234</exampleNumber>
       </voip>
@@ -20015,6 +20018,20 @@
         <sourceUrl>http://www.sgwp.wp.mil.pl/pl/1_1225.html</sourceUrl>
       </references>
       <availableFormats>
+        <!-- We are formatting 70 numbers as per mobile numbers, based on information from some
+             Poles that this is more usual. -->
+        <numberFormat pattern="(\d{3})(\d{3})(\d{3})">
+          <leadingDigits>
+            26|
+            39|
+            45|
+            5[0137]|
+            6[0469]|
+            7[02389]|
+            8[08]
+          </leadingDigits>
+          <format>$1 $2 $3</format>
+        </numberFormat>
         <numberFormat pattern="(\d{2})(\d{3})(\d{2})(\d{2})">
           <leadingDigits>
             [14]|
@@ -20032,19 +20049,6 @@
           <leadingDigits>[12]2</leadingDigits>
           <format>$1 $2 $3</format>
         </numberFormat>
-        <!-- We are formatting 70 numbers as per mobile numbers, based on information from some
-             Poles that this is more usual. -->
-        <numberFormat pattern="(\d{3})(\d{3})(\d{3})">
-          <leadingDigits>
-            26|
-            39|
-            5[0137]|
-            6[0469]|
-            7[02389]|
-            8[08]
-          </leadingDigits>
-          <format>$1 $2 $3</format>
-        </numberFormat>
         <!-- Additional patterns for shorter pager numbers. -->
         <numberFormat pattern="(\d{3})(\d{2})(\d{2,3})">
           <leadingDigits>64</leadingDigits>
@@ -20087,6 +20091,7 @@
       <mobile>
         <nationalNumberPattern>
           (?:
+            45|
             5[0137]|
             6[069]|
             7[2389]|
@@ -20660,9 +20665,10 @@
          used by both of them. -->
     <territory id="RE" countryCode="262" internationalPrefix="00"
                nationalPrefix="0" nationalPrefixFormattingRule="$NP$FG"
-               leadingDigits="262|6[49]|8" mainCountryForCode="true" >
+               leadingDigits="262|69|8" mainCountryForCode="true" >
       <references>
         <sourceUrl>http://www.itu.int/oth/T020200004B/en</sourceUrl>
+        <sourceUrl>http://www.arcep.fr/index.php?id=2137&amp;bloc=0596&amp;CMD=RESULTS_NUMEROTATION</sourceUrl>
       </references>
       <availableFormats>
         <numberFormat pattern="([268]\d{2})(\d{2})(\d{2})(\d{2})">
@@ -20679,7 +20685,23 @@
         <exampleNumber>262161234</exampleNumber>
       </fixedLine>
       <mobile>
-        <nationalNumberPattern>69[23]\d{6}</nationalNumberPattern>
+        <nationalNumberPattern>
+          69(?:
+            2\d{2}|
+            3(?:
+              0[0-46]|
+              1[013]|
+              2[0-2]|
+              3[039]|
+              4[0-7]|
+              5[05]|
+              6[06]|
+              7[07]|
+              8[0-38]|
+              9[0-479]
+            )
+          )\d{4}
+        </nationalNumberPattern>
         <possibleLengths national="9"/>
         <exampleNumber>692123456</exampleNumber>
       </mobile>
@@ -25325,7 +25347,7 @@
               1[0-689]|
               2[0-25-9]|
               3[2-9]|
-              [48]\d|
+              [48][02-9]|
               5[124-9]?|
               6[0-39]?|
               7[0-7]?|
@@ -25619,6 +25641,7 @@
         <!-- Verifies the fixed-line prefixes, but the mobile prefixes listed here seem out of date.
              -->
         <sourceUrl>http://www.comores-online.com/mwezinet/internet/262</sourceUrl>
+        <sourceUrl>http://www.arcep.fr/index.php?id=2137&amp;bloc=0596&amp;CMD=RESULTS_NUMEROTATION</sourceUrl>
       </references>
       <!-- Formatting as per La Réunion. -->
       <generalDesc>
@@ -25635,9 +25658,19 @@
         <exampleNumber>269601234</exampleNumber>
       </fixedLine>
       <mobile>
-        <nationalNumberPattern>639\d{6}</nationalNumberPattern>
+        <nationalNumberPattern>
+          639(?:
+            0[0-79]|
+            1[019]|
+            [26]\d|
+            3[09]|
+            [45]0|
+            7[06]|
+            9[04-79]
+          )\d{4}
+        </nationalNumberPattern>
         <possibleLengths national="9"/>
-        <exampleNumber>639123456</exampleNumber>
+        <exampleNumber>639012345</exampleNumber>
       </mobile>
       <!-- Same as in France. -->
       <tollFree>
@@ -25858,7 +25891,8 @@
             2(?:
               1[39]|
               2[0157]|
-              6[14]|
+              31|
+              [56][14]|
               7[35]|
               84
             )|
@@ -25870,10 +25904,10 @@
         <numberFormat pattern="([1-356]\d)(\d{3,5})">
           <leadingDigits>
             1[3-9]|
-            2[0569]|
+            2[02569]|
             3[0-69]|
             5[05689]|
-            6[0-46-9]
+            6\d
           </leadingDigits>
           <format>$1 $2</format>
         </numberFormat>
@@ -25914,7 +25948,7 @@
              variable in length and the possible prefixes clash with the country code. -->
         <nationalNumberPattern>
           2(?:
-            [012457-9]\d{3,8}|
+            [0-2457-9]\d{3,8}|
             6(?:
                [14]\d{7}|
                \d{4}
@@ -25966,9 +26000,10 @@
             5[15][78]|
             6(?:
                28\d{2}|
-               [36]7|
+               37|
+               6[78]|
                75\d|
-               [69]8|
+               98|
                8(?:
                   7\d|
                   8
@@ -25979,7 +26014,8 @@
             2(?:
                1[39]|
                2[0157]|
-               6[14]|
+               31|
+               [56][14]|
                7[35]|
                84
             )|
@@ -25988,11 +26024,14 @@
           (?:
             1(?:
                3\d{2}|
-               9\d|
-               [4-8]
+               [4-8]|
+               9\d
+
             )|
             2(?:
                0\d{2}|
+               12|
+               292|
                [569]\d
             )|
             3(?:
@@ -26001,6 +26040,9 @@
             )|
             5(?:
                0|
+               1[2-4]|
+               26|
+               [37]2|
                5\d{2}|
                [689]\d
             )|
@@ -26019,9 +26061,10 @@
            (?:
              25|
              54
-           )83|
-           2582\d
-         )\d{3}|
+           )83\d|
+           2582\d{2}|
+           65[2-8]
+         )\d{2}|
          (?:
            4\d{6,7}|
            9[2-9]\d{4,5}
diff --git a/resources/ShortNumberMetadata.xml b/resources/ShortNumberMetadata.xml
index 10d6ccd2..d41ebaff 100644
--- a/resources/ShortNumberMetadata.xml
+++ b/resources/ShortNumberMetadata.xml
@@ -5393,30 +5393,110 @@
 
     <!-- Iran, Islamic Republic of -->
     <!-- http://www.itu.int/oth/T0202000066/en -->
+    <!-- https://www.itu.int/net/itu-t/inrdb/e129_important_numbers.aspx?country=111 -->
+    <!-- http://118.tct.ir/necnum.htm -->
     <territory id="IR">
       <generalDesc>
-        <nationalNumberPattern>1\d{2}</nationalNumberPattern>
+        <nationalNumberPattern>[129]\d{2,4}</nationalNumberPattern>
       </generalDesc>
       <shortCode>
         <nationalNumberPattern>
           1(?:
-            1[025]|
-            25
+            1[0-68]|
+            2[0-59]|
+            3[346-8]|
+            4(?:
+              [0147]|
+              [289]0
+            )|
+            5(?:
+              0[14]|
+              1[02479]|
+              2[0-3]|
+              39|
+              [49]0|
+              65
+            )|
+            6(?:
+              [16]6|
+              [27]|
+              90
+            )|
+            8(?:
+              03|
+              1[18]|
+              22|
+              3[37]|
+              4[28]|
+              88|
+              99
+            )|
+            9[0-579]
+          )|
+          20(?:
+            00|
+            1(?:
+              [038]|
+              1[079]|
+              26|
+              9[69]
+            )|
+            2[01]|
+            90
+          )|
+          9(?:
+            11|
+            6(?:
+              0[12]|
+              2[16-8]|
+              3(?:
+                08|
+                [14]5|
+                [23]|
+                66
+              )|
+              4(?:
+                0|
+                80
+              )|
+              5[01]|
+              6[89]|
+              86|
+              9[19]
+            )
           )
         </nationalNumberPattern>
-        <possibleLengths national="3"/>
+        <possibleLengths national="[3-5]"/>
         <exampleNumber>112</exampleNumber>
       </shortCode>
+      <tollFree>
+        <!-- 11X, 12X and 19X are toll-free as these are public and government services. -->
+        <nationalNumberPattern>1[129]\d</nationalNumberPattern>
+        <possibleLengths national="3"/>
+        <exampleNumber>123</exampleNumber>
+      </tollFree>
       <emergency>
         <nationalNumberPattern>
           1(?:
             1[025]|
             25
-          )
+          )|
+          911
         </nationalNumberPattern>
         <possibleLengths national="3"/>
         <exampleNumber>112</exampleNumber>
       </emergency>
+      <expandedEmergency>
+        <nationalNumberPattern>
+          1(?:
+            16|
+            2[03]|
+            47
+          )
+        </nationalNumberPattern>
+        <possibleLengths national="3"/>
+        <exampleNumber>116</exampleNumber>
+      </expandedEmergency>
     </territory>
 
     <!-- Iceland -->
@@ -8287,20 +8367,35 @@
     <!-- http://en.wikipedia.org/wiki/%2B675 -->
     <territory id="PG">
       <generalDesc>
-        <nationalNumberPattern>0\d{2}</nationalNumberPattern>
+        <nationalNumberPattern>
+          0\d{2}|
+          1\d{2,6}
+        </nationalNumberPattern>
       </generalDesc>
       <shortCode>
-        <nationalNumberPattern>000</nationalNumberPattern>
-        <possibleLengths national="3"/>
+        <nationalNumberPattern>
+          000|
+          1(?:
+            1[01]|
+            5\d{2}|
+            6\d{2,5}
+          )
+        </nationalNumberPattern>
+        <possibleLengths national="[3-7]"/>
         <exampleNumber>000</exampleNumber>
       </shortCode>
       <emergency>
         <!-- http://www.pngbd.com/emergency.php has been used, excluding fixed-line phone-numbers.
              -->
-        <nationalNumberPattern>000</nationalNumberPattern>
+        <nationalNumberPattern>000|11[01]</nationalNumberPattern>
         <possibleLengths national="3"/>
         <exampleNumber>000</exampleNumber>
       </emergency>
+      <smsServices>
+        <nationalNumberPattern>16\d{2,5}</nationalNumberPattern>
+        <possibleLengths national="[4-7]"/>
+        <exampleNumber>1612</exampleNumber>
+      </smsServices>
     </territory>
 
     <!-- Philippines -->
diff --git a/resources/carrier/en/1.txt b/resources/carrier/en/1.txt
index 393bec74..27e23a12 100644
--- a/resources/carrier/en/1.txt
+++ b/resources/carrier/en/1.txt
@@ -12,6 +12,24 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+# Sources:
+# American Samoa: http://www.itu.int/oth/T0202000004/en
+# Bahamas: http://www.itu.int/oth/T0202000010/en
+# Barbados: http://www.itu.int/oth/T0202000013/en
+# Bermuda: http://www.itu.int/oth/T0202000018/en
+# British Virgin Islands: http://www.itu.int/oth/T020200001E/en
+# Dominica: http://www.itu.int/oth/T020200003B/en
+# Dominican Rep.: http://www.itu.int/oth/T020200003C/en
+# Grenada: http://www.itu.int/oth/T0202000057/en
+# Guam: Carrier IR21 docs
+# Jamaica: http://www.itu.int/oth/T020200006C/en
+# Puerto Rico: http://www.itu.int/oth/T02020000AA/en
+# Saint Kitts & Nevis: https://www.itu.int/oth/T02020000B0/en
+# Saint Lucia: http://www.itu.int/oth/T02020000B1/en
+# Saint Vincent & the Grenadines: http://www.itu.int/oth/T02020000B3/en
+# Trinidad & Tobago: http://www.itu.int/oth/T02020000D4/en
+# Turks & Caicos: http://www.itu.int/oth/T02020000D8/en
+
 124235|BaTelCo
 124245|BaTelCo
 124255|BaTelCo
@@ -96,10 +114,18 @@
 164933|DIGICEL
 164934|DIGICEL
 164943|Islandcom
+1671480|GTA
+1671482|GTA
+1671483|GTA
+1671486|GTA
+1671487|GTA
+1671488|GTA
+1671489|GTA
 1671747|PTI PACIFICA
 1671838|i CAN_GSM
 1671848|i CAN_GSM
 1671858|i CAN_GSM
+1671864|GTA
 1671868|Choice Phone
 1671878|Choice Phone
 1671888|Choice Phone
diff --git a/resources/carrier/en/262.txt b/resources/carrier/en/262.txt
new file mode 100644
index 00000000..af9c7321
--- /dev/null
+++ b/resources/carrier/en/262.txt
@@ -0,0 +1,122 @@
+# Copyright (C) 2017 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.
+
+# Source: http://www.arcep.fr/index.php?id=interactivenumeros&no_cache=1
+
+26263900|Orange
+26263901|Orange
+26263902|Orange
+26263903|Only
+26263904|Only
+26263905|Only
+26263906|Only
+26263907|Only
+26263909|SFR
+26263910|SFR
+26263911|SFR
+26263919|Only
+2626392|SFR
+26263926|Only
+26263930|BJT
+26263939|Only
+26263940|SFR
+26263950|BJT
+26263960|Orange
+26263961|Orange
+26263962|Orange
+26263963|Orange
+26263964|Orange
+26263965|SFR
+26263966|SFR
+26263967|SFR
+26263968|SFR
+26263969|SFR
+26263970|BJT
+26263976|Orange
+26263990|BJT
+26263994|Only
+26263995|Only
+26263996|Only
+26263997|Only
+26263999|Orange
+2626920|Orange
+26269206|SFR
+2626921|SFR
+2626922|Orange
+2626923|Orange
+26269240|Orange
+26269241|Orange
+26269242|Orange
+26269243|Orange
+26269244|Orange
+26269245|SFR
+26269246|SFR
+26269247|SFR
+26269248|SFR
+26269249|SFR
+2626925|SFR
+2626926|SFR
+2626927|SFR
+2626928|SFR
+26269290|SFR
+26269291|SFR
+26269292|Only
+26269293|Only
+26269294|Only
+26269295|SFR
+26269296|SFR
+26269297|SFR
+26269298|SFR
+26269299|SFR
+26269300|Orange
+26269301|SFR
+26269302|SFR
+26269303|SFR
+26269304|SFR
+26269306|Orange
+26269310|SFR
+26269311|Orange
+26269313|SFR
+26269320|SFR
+26269321|Orange
+26269322|Orange
+26269330|Only
+26269333|Orange
+26269339|Orange
+26269340|Only
+26269341|Only
+26269342|Only
+26269343|Only
+26269344|Only
+26269345|Only
+26269346|Only
+26269347|Only
+26269350|Only
+26269355|Orange
+26269360|Only
+26269366|Orange
+26269370|Only
+26269377|Orange
+26269380|Only
+26269381|Only
+26269382|Only
+26269383|Only
+26269388|Orange
+26269390|Orange
+26269391|Orange
+26269392|Orange
+26269393|Orange
+26269394|SFR
+26269397|SFR
+26269399|Orange
diff --git a/resources/carrier/en/387.txt b/resources/carrier/en/387.txt
index 87f846ed..662bcc09 100644
--- a/resources/carrier/en/387.txt
+++ b/resources/carrier/en/387.txt
@@ -16,5 +16,15 @@
 38761|BH Mobile
 38762|BH Mobile
 38763|HT-ERONET
+3876440|HT-ERONET
+3876441|HT-ERONET
+3876442|HT-ERONET
+3876443|HT-ERONET
+3876444|HT-ERONET
+3876445|HT-ERONET
+3876446|HT-ERONET
 38765|m:tel
 38766|m:tel
+3876711|m:tel
+3876713|m:tel
+3876717|m:tel
diff --git a/resources/carrier/en/48.txt b/resources/carrier/en/48.txt
index 81c873b6..83d4683e 100644
--- a/resources/carrier/en/48.txt
+++ b/resources/carrier/en/48.txt
@@ -12,6 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+48450|Play
 4850|Orange
 4851|Orange
 48530|Play
diff --git a/resources/carrier/en/590.txt b/resources/carrier/en/590.txt
new file mode 100644
index 00000000..b0eee0cb
--- /dev/null
+++ b/resources/carrier/en/590.txt
@@ -0,0 +1,63 @@
+# Copyright (C) 2017 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.
+
+# Source: http://www.arcep.fr/index.php?id=interactivenumeros&no_cache=1
+
+# Ranges that are assigned to Outremer Telecom are mentioned as "SFR/Rife" as
+# there is no information on which Outremer Telecom brand the ranges are
+# assigned to. http://www.outremer-telecom.fr/fr/activites-et-services
+
+59069000|SFR/Rife
+59069005|SFR/Rife
+59069006|Digicel
+59069007|Digicel
+59069008|Digicel
+59069009|Digicel
+5906901|Digicel
+59069010|UTS
+59069020|Digicel
+59069021|Digicel
+59069022|Dauphin Telecom
+59069023|Digicel
+59069024|Digicel
+59069025|Digicel
+59069026|Orange
+59069027|Orange
+59069028|Orange
+59069029|Orange
+5906903|Orange
+59069036|Digicel
+59069040|Orange
+59069041|Orange
+59069042|Digicel
+59069043|Digicel
+59069044|Digicel
+59069045|Digicel
+59069046|Digicel
+59069047|Orange
+59069048|Orange
+59069049|Orange
+5906905|Orange
+5906906|Orange
+59069066|Dauphin Telecom
+59069069|Digicel
+5906907|Orange
+59069077|Dauphin Telecom
+59069078|SFR/Rife
+59069079|SFR/Rife
+5906908|Digicel
+59069087|UTS
+59069088|Dauphin Telecom
+59069089|SFR/Rife
+5906909|SFR/Rife
diff --git a/resources/carrier/en/594.txt b/resources/carrier/en/594.txt
new file mode 100644
index 00000000..19b39617
--- /dev/null
+++ b/resources/carrier/en/594.txt
@@ -0,0 +1,40 @@
+# Copyright (C) 2017 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.
+
+# Source: http://www.arcep.fr/index.php?id=interactivenumeros&no_cache=1
+# Search using prefix 0694X. Ex: 06945
+
+# Ranges that are assigned to Outremer Telecom are mentioned as "SFR".
+# http://www.outremer-telecom.fr/fr/activites-et-services
+
+5946940|SFR
+59469408|Digicel
+59469409|Digicel
+59469412|Digicel
+59469413|Digicel
+59469414|Digicel
+59469415|Digicel
+59469416|Digicel
+59469417|SFR
+59469418|SFR
+59469419|SFR
+5946942|Orange
+59469430|Orange
+59469431|Orange
+59469432|Orange
+59469433|Orange
+59469434|Orange
+59469438|Orange
+5946944|Orange
+5946949|Digicel
diff --git a/resources/carrier/en/675.txt b/resources/carrier/en/675.txt
index 33d6ba8e..1755bfcb 100644
--- a/resources/carrier/en/675.txt
+++ b/resources/carrier/en/675.txt
@@ -16,8 +16,9 @@
 # bmobile changed its name in 2009 to bemobile, which is the name used in the
 # ITU document, but most online sources including the company's own web site
 # still refer to bmobile.
+# The ITU document also refers to Telikom as trading under Citifon, but it seems
+# to use Telikom Mobile at least on the internet.
 
-67520150|bmobile/Telikom
 67570|Digicel
 67571|Digicel
 67572|Digicel
diff --git a/resources/geocoding/en/263.txt b/resources/geocoding/en/263.txt
index d2966dfe..08d470ac 100644
--- a/resources/geocoding/en/263.txt
+++ b/resources/geocoding/en/263.txt
@@ -36,11 +36,15 @@
 263225|Rusape
 263227|Chipinge
 263228|Hauna
+263229|Bulawayo
+2632312|Chiredzi
+2632512|Zvishavane
 263248|Birchenough Bridge
 26324|Chipangayi
 2632582|Headlands
 2632583|Nyazura
 26325|Rusape
+2632542|Gweru
 263261|Kariba
 263264|Karoi
 26326|Chimanimani
diff --git a/resources/geocoding/en/675.txt b/resources/geocoding/en/675.txt
index aca1bb0a..67bacde5 100644
--- a/resources/geocoding/en/675.txt
+++ b/resources/geocoding/en/675.txt
@@ -12,8 +12,17 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-# http://nicta.gov.pg/component/simplefilemanager/?task=download&amp;id=233
-# TODO: Add complete geocoding details from above official doc.
+# Prefixes from National Numbering Plan for Papua New Guinea, found at
+# http://nicta.gov.pg, 2016 numbering scheme (page 21)
 
+# Note NCD refers to the national capital district (containing Port Moresby)
 
+6753|NCD
+67542|Madang
+67545|Sepik
 67547|Morobe
+67553|Highlands
+67554|Highlands
+67562|Oro
+67564|MP/Gulf/Tabubil/Kiunga
+6759|Islands
diff --git a/resources/geocoding/en/84.txt b/resources/geocoding/en/84.txt
index 6ce1c32c..724c258f 100644
--- a/resources/geocoding/en/84.txt
+++ b/resources/geocoding/en/84.txt
@@ -49,7 +49,6 @@
 84239|Ha Tinh province
 8424|Ha Noi City
 84240|Bac Giang province
-84241|Bac Ninh province
 8425|Lang Son province
 84251|Dong Nai province
 84252|Binh Thuan province
@@ -76,7 +75,6 @@
 84277|Dong Thap province
 8428|Ho Chi Minh City
 84280|Thai Nguyen province
-84281|Bac Kan province
 84290|Ca Mau province
 84291|Bac Lieu province
 84292|Can Tho City
diff --git a/resources/geocoding/vi/84.txt b/resources/geocoding/vi/84.txt
index 2585213c..20134b1c 100644
--- a/resources/geocoding/vi/84.txt
+++ b/resources/geocoding/vi/84.txt
@@ -53,7 +53,6 @@
 84239|Hà Tĩnh
 8424|Thủ đô Hà Nội
 84240|Bắc Giang
-84241|Bắc Ninh
 8425|Lạng Sơn
 84251|Đồng Nai
 84252|Bình Thuận
@@ -80,7 +79,6 @@
 84277|Đồng Tháp
 8428|Thành phố Hồ Chí Minh
 84280|Thái Nguyên
-84281|Bắc Kạn
 8429|Yên Bái
 84290|Cà Mau
 84291|Bạc Liêu
diff --git a/resources/phonenumber.proto b/resources/phonenumber.proto
index 12c90620..1c168c75 100644
--- a/resources/phonenumber.proto
+++ b/resources/phonenumber.proto
@@ -25,86 +25,106 @@ option optimize_for = LITE_RUNTIME;
 package i18n.phonenumbers;
 
 message PhoneNumber {
-// The country calling code for this number, as defined by the International Telecommunication Union
-// (ITU). For example, this would be 1 for NANPA countries, and 33 for France.
+  // The country calling code for this number, as defined by the International
+  // Telecommunication Union (ITU). For example, this would be 1 for NANPA
+  // countries, and 33 for France.
   required int32 country_code = 1;
 
-// National (significant) Number is defined in International Telecommunication Union (ITU)
-// Recommendation E.164. It is a language/country-neutral representation of a phone number at a
-// country level. For countries which have the concept of an "area code" or "national destination
-// code", this is included in the National (significant) Number. Although the ITU says the maximum
-// length should be 15, we have found longer numbers in some countries e.g. Germany.
-// Note that the National (significant) Number does not contain the National(trunk) prefix.
-// Obviously, as a uint64, it will never contain any formatting (hyphens, spaces, parentheses), nor
-// any alphanumeric spellings.
+  // The National (significant) Number, as defined in International
+  // Telecommunication Union (ITU) Recommendation E.164, without any leading
+  // zero. The leading-zero is stored separately if required, since this is an
+  // uint64 and hence cannot store such information. Do not use this field
+  // directly: if you want the national significant number, call the
+  // getNationalSignificantNumber method of PhoneNumberUtil.
+  //
+  // For countries which have the concept of an "area code" or "national
+  // destination code", this is included in the National (significant) Number.
+  // Although the ITU says the maximum length should be 15, we have found longer
+  // numbers in some countries e.g. Germany.
+  // Note that the National (significant) Number does not contain the National
+  // (trunk) prefix. Obviously, as a uint64, it will never contain any
+  // formatting (hyphens, spaces, parentheses), nor any alphanumeric spellings.
   required uint64 national_number = 2;
 
-// Extension is not standardized in ITU recommendations, except for being defined as a series of
-// numbers with a maximum length of 40 digits. It is defined as a string here to accommodate for the
-// possible use of a leading zero in the extension (organizations have complete freedom to do so,
-// as there is no standard defined). However, only ASCII digits should be stored here.
+  // Extension is not standardized in ITU recommendations, except for being
+  // defined as a series of numbers with a maximum length of 40 digits. It is
+  // defined as a string here to accommodate for the possible use of a leading
+  // zero in the extension (organizations have complete freedom to do so, as
+  // there is no standard defined). Other than digits, some other dialling
+  // characters such as "," (indicating a wait) may be stored here.
   optional string extension = 3;
 
-// In some countries, the national (significant) number starts with one or more "0"s without this
-// being a national prefix or trunk code of some kind. For example, the leading zero in the national
-// (significant) number of an Italian phone number indicates the number is a fixed-line number.
-// There have been plans to migrate fixed-line numbers to start with the digit two since December
-// 2000, but it has not happened yet. See http://en.wikipedia.org/wiki/%2B39 for more details.
-//
-// These fields can be safely ignored (there is no need to set them) for most countries. Some
-// limited number of countries behave like Italy - for these cases, if the leading zero(s) of a
-// number would be retained even when dialling internationally, set this flag to true, and also
-// set the number of leading zeros.
-//
-// Clients who use the parsing functionality of the i18n phone number libraries
-// will have these fields set if necessary automatically.
+  // In some countries, the national (significant) number starts with one or
+  // more "0"s without this being a national prefix or trunk code of some kind.
+  // For example, the leading zero in the national (significant) number of an
+  // Italian phone number indicates the number is a fixed-line number.  There
+  // have been plans to migrate fixed-line numbers to start with the digit two
+  // since December 2000, but it has not happened yet. See
+  // http://en.wikipedia.org/wiki/%2B39 for more details.
+  //
+  // These fields can be safely ignored (there is no need to set them) for most
+  // countries. Some limited number of countries behave like Italy - for these
+  // cases, if the leading zero(s) of a number would be retained even when
+  // dialling internationally, set this flag to true, and also set the number of
+  // leading zeros.
+  //
+  // Clients who use the parsing or conversion functionality of the i18n phone
+  // number libraries will have these fields set if necessary automatically.
   optional bool italian_leading_zero = 4;
   optional int32 number_of_leading_zeros = 8 [ default = 1 ];
 
-// The next few fields are non-essential fields for a phone number. They retain extra information
-// about the form the phone number was in when it was provided to us to parse. They can be safely
-// ignored by most clients.
+  // The next few fields are non-essential fields for a phone number. They
+  // retain extra information about the form the phone number was in when it was
+  // provided to us to parse. They can be safely ignored by most clients. To
+  // populate them, call parseAndKeepRawInput on PhoneNumberUtil.
 
-// This field is used to store the raw input string containing phone numbers before it was
-// canonicalized by the library. For example, it could be used to store alphanumerical numbers
-// such as "1-800-GOOG-411".
+  // This field is used to store the raw input string containing phone numbers
+  // before it was canonicalized by the library. For example, it could be used
+  // to store alphanumerical numbers such as "1-800-GOOG-411".
   optional string raw_input = 5;
 
-// The source from which the country_code is derived. This is not set in the general parsing method,
-// but in the method that parses and keeps raw_input. New fields could be added upon request.
+  // The source from which the country_code is derived. This is not set in the
+  // general parsing method, but in the method that parses and keeps raw_input.
+  // New fields could be added upon request.
   enum CountryCodeSource {
-    // The country_code is derived based on a phone number with a leading "+", e.g. the French
-    // number "+33 1 42 68 53 00".
+    // The country_code is derived based on a phone number with a leading "+",
+    // e.g. the French number "+33 1 42 68 53 00".
     FROM_NUMBER_WITH_PLUS_SIGN = 1;
 
-    // The country_code is derived based on a phone number with a leading IDD, e.g. the French
-    // number "011 33 1 42 68 53 00", as it is dialled from US.
+    // The country_code is derived based on a phone number with a leading IDD,
+    // e.g. the French number "011 33 1 42 68 53 00", as it is dialled from US.
     FROM_NUMBER_WITH_IDD = 5;
 
-    // The country_code is derived based on a phone number without a leading "+", e.g. the French
-    // number "33 1 42 68 53 00" when defaultCountry is supplied as France.
+    // The country_code is derived based on a phone number without a leading
+    // "+", e.g. the French number "33 1 42 68 53 00" when defaultCountry is
+    // supplied as France.
     FROM_NUMBER_WITHOUT_PLUS_SIGN = 10;
 
-    // The country_code is derived NOT based on the phone number itself, but from the defaultCountry
-    // parameter provided in the parsing function by the clients. This happens mostly for numbers
-    // written in the national format (without country code). For example, this would be set when
-    // parsing the French number "01 42 68 53 00", when defaultCountry is supplied as France.
+    // The country_code is derived NOT based on the phone number itself, but
+    // from the defaultCountry parameter provided in the parsing function by the
+    // clients. This happens mostly for numbers written in the national format
+    // (without country code). For example, this would be set when parsing the
+    // French number "01 42 68 53 00", when defaultCountry is supplied as
+    // France.
     FROM_DEFAULT_COUNTRY = 20;
   }
 
-// The source from which the country_code is derived.
+  // The source from which the country_code is derived.
   optional CountryCodeSource country_code_source = 6;
 
-// The carrier selection code that is preferred when calling this phone number domestically. This
-// also includes codes that need to be dialed in some countries when calling from landlines to
-// mobiles or vice versa. For example, in Columbia, a "3" needs to be dialed before the phone number
-// itself when calling from a mobile phone to a domestic landline phone and vice versa.
-//
-// Note this is the "preferred" code, which means other codes may work as well.
+  // The carrier selection code that is preferred when calling this phone number
+  // domestically. This also includes codes that need to be dialed in some
+  // countries when calling from landlines to mobiles or vice versa. For
+  // example, in Columbia, a "3" needs to be dialed before the phone number
+  // itself when calling from a mobile phone to a domestic landline phone and
+  // vice versa.
+  //
+  // Note this is the "preferred" code, which means other codes may work as
+  // well.
   optional string preferred_domestic_carrier_code = 7;
 }
 
-// Examples
+// Examples:
 //
 // Google MTV, +1 650-253-0000, (650) 253-0000
 // country_code: 1