JAVA/JS/CPP: Libphonenumber v5.9, code & metadata changes.

git-svn-id: http://libphonenumber.googlecode.com/svn/trunk/resources@622 ee073f10-1060-11df-b6a4-87a95322a99c
diff --git a/PhoneNumberAlternateFormats.xml b/PhoneNumberAlternateFormats.xml
index 9f47a2d..64b87f4 100644
--- a/PhoneNumberAlternateFormats.xml
+++ b/PhoneNumberAlternateFormats.xml
@@ -181,16 +181,6 @@
       </availableFormats>
     </territory>
 
-    <!-- Belarus (BY) -->
-    <territory countryCode="375">
-      <availableFormats>
-        <numberFormat pattern="(\d{2})(\d{3})(\d{2})(\d{2})">
-          <leadingDigits>[1-4]</leadingDigits>
-          <format>$1 $2 $3 $4</format>
-        </numberFormat>
-      </availableFormats>
-    </territory>
-
     <!-- Germany (DE) -->
     <territory countryCode="49">
       <availableFormats>
diff --git a/PhoneNumberMetadata.xml b/PhoneNumberMetadata.xml
index 652cdca..9d6d414 100644
--- a/PhoneNumberMetadata.xml
+++ b/PhoneNumberMetadata.xml
@@ -1461,10 +1461,11 @@
             [0-2]\d|
             3[0-57-9]|
             4[47-9]|
-            5[0-35-9]|
+            5[0-25-9]|
             6[6-9]|
-            [79][07-9]|
-            8[17-9]
+            7[0457-9]|
+            8[17-9]|
+            9[07-9]
           )\d{6}
         </nationalNumberPattern>
         <possibleNumberPattern>\d{9}</possibleNumberPattern>
@@ -2947,7 +2948,7 @@
         <nationalNumberPattern>
           (?:
             318[023]|
-            416[0239]|
+            416[023]|
             7(?:
               1[578]|
               50
@@ -2959,13 +2960,14 @@
       <mobile>
         <nationalNumberPattern>
           (?:
-            318[1456]|
-            416[15-8]|
+            318[14-68]|
+            416[15-9]|
             7(?:
               0[01]|
+              7[07]|
               [89]\d
             )\d
-          )\d{3}|
+          )\d{3}
         </nationalNumberPattern>
         <exampleNumber>3181234</exampleNumber>
       </mobile>
@@ -3353,9 +3355,93 @@
                nationalPrefix="8" mobileNumberPortableRegion="true">
       <availableFormats>
         <numberFormat nationalPrefixFormattingRule="$NP 0$FG"
-          pattern="([1-4]\d)(\d{3})(\d{4})">
-          <leadingDigits>[1-4]</leadingDigits>
-          <format>$1 $2 $3</format>
+          pattern="(\d{2})(\d{3})(\d{2})(\d{2})">
+          <leadingDigits>
+            17[0-3589]|
+            2[4-9]|
+            [34]
+          </leadingDigits>
+          <leadingDigits>
+            17(?:
+              [02358]|
+              1[0-2]|
+              9[0189]
+            )|
+            2[4-9]|
+            [34]
+          </leadingDigits>
+          <format>$1 $2-$3-$4</format>
+        </numberFormat>
+        <numberFormat nationalPrefixFormattingRule="$NP 0$FG"
+          pattern="(\d{3})(\d{2})(\d{2})(\d{2})">
+          <leadingDigits>
+            1(?:
+              5[24]|
+              6[235]|
+              7[467]
+            )|
+            2(?:
+              1[246]|
+              2[25]|
+              3[26]
+            )
+          </leadingDigits>
+          <leadingDigits>
+            1(?:
+              5[24]|
+              6(?:
+                2|
+                3[04-9]|
+                5[0346-9]
+              )|
+              7(?:
+                [46]|
+                7[37-9]
+              )
+            )|
+            2(?:
+              1[246]|
+              2[25]|
+              3[26]
+            )
+          </leadingDigits>
+          <format>$1 $2-$3-$4</format>
+        </numberFormat>
+        <numberFormat nationalPrefixFormattingRule="$NP 0$FG"
+          pattern="(\d{4})(\d{2})(\d{3})">
+          <leadingDigits>
+            1(?:
+              5[169]|
+              6[3-5]|
+              7[179]
+            )|
+            2(?:
+              1[35]|
+              2[34]|
+              3[3-5]
+            )
+          </leadingDigits>
+          <leadingDigits>
+            1(?:
+              5[169]|
+              6(?:
+                3[1-3]|
+                4|
+                5[125]
+              )|
+              7(?:
+                1[3-9]|
+                7[0-24-6]|
+                9[2-7]
+              )
+            )|
+            2(?:
+              1[35]|
+              2[34]|
+              3[3-5]
+            )
+          </leadingDigits>
+          <format>$1 $2-$3</format>
         </numberFormat>
         <numberFormat nationalPrefixFormattingRule="$NP $FG"
           pattern="([89]\d{2})(\d{3})(\d{4})">
@@ -3383,8 +3469,8 @@
       <noInternationalDialling>
         <nationalNumberPattern>
           8(?:
-            [01]|
-            20
+            [013]|
+            [12]0
           )\d{8}|
           902\d{7}
         </nationalNumberPattern>
@@ -3397,7 +3483,7 @@
             1(?:
               5(?:
                 1[1-5]|
-                2\d|
+                [24]\d|
                 6[2-4]|
                 9[1-7]
               )|
@@ -3418,10 +3504,10 @@
                 4[0-8]
               )|
               3(?:
-                2\d|
+                [26]\d|
                 3[02-79]|
                 4[024-7]|
-                5[0-7]
+                5[03-7]
               )
             )
           )\d{5}
@@ -3939,7 +4025,7 @@
         </numberFormat>
       </availableFormats>
       <generalDesc>
-        <nationalNumberPattern>[02-6]\d{7}</nationalNumberPattern>
+        <nationalNumberPattern>[02-7]\d{7}</nationalNumberPattern>
         <possibleNumberPattern>\d{8}</possibleNumberPattern>
       </generalDesc>
       <fixedLine>
@@ -3964,13 +4050,17 @@
       </fixedLine>
       <mobile>
         <!-- Added the prefixes 4[0-2] (Moov), 5[5-9] & 6[15] because SMS messages have been
-             successfully delivered. Supported by numbers found on the internet. -->
-        <nationalNumberPattern>
+             successfully delivered. Supported by numbers found on the internet. The prefix 56 was
+             assigned to MTN in July 2013:
+             http://www.atci.ci/images/stories/pdf/decisions-dg/decision_002.pdf
+             50 has been removed since Warid seems to have stopped operation in Côte d'Ivoire. -->
+          <nationalNumberPattern>
           (?:
             0[1-9]|
             4[0-24-9]|
-            5[05-9]|
-            6[015679]
+            5[5-9]|
+            6[015-79]|
+            77
           )\d{6}
         </nationalNumberPattern>
         <exampleNumber>01234567</exampleNumber>
@@ -4704,12 +4794,11 @@
         <exampleNumber>12345678</exampleNumber>
       </fixedLine>
       <mobile>
-        <!-- Virgin Mobile Colombia have reported that they are now using the 319 prefix. -->
         <nationalNumberPattern>
           3(?:
-            0[0-24]|
+            0[0-5]|
             1\d|
-            2[01]
+            [25][01]
           )\d{7}
         </nationalNumberPattern>
         <possibleNumberPattern>\d{10}</possibleNumberPattern>
@@ -4918,10 +5007,11 @@
             [48]\d{2}|
             50\d|
             7(?:
-              2[0-2]|
+              2[0-24]|
               [34]\d|
               6[35-7]|
-              77
+              77|
+              8[7-9]
             )
           )\d{4}
         </nationalNumberPattern>
@@ -4935,7 +5025,7 @@
               3[01]
             )|
             6(?:
-              [1679]\d|
+              [16-9]\d|
               3[01]
             )
           )\d{4}
@@ -8052,15 +8142,9 @@
         <exampleNumber>30241234</exampleNumber>
       </fixedLine>
       <mobile>
-        <!-- Limited to the new 9-digit mobile ranges, which came into effect March 29th 2013. -->
-        <nationalNumberPattern>
-          6(?:
-            [03]1|
-            2[128]|
-            5[57]|
-            6[2469]
-          )\d{6}
-        </nationalNumberPattern>
+        <!-- Prefixes here match those assigned to carriers, as per the ITU communication Jan 23rd
+             2013. -->
+        <nationalNumberPattern>6[02356]\d{7}</nationalNumberPattern>
         <possibleNumberPattern>\d{9}</possibleNumberPattern>
         <exampleNumber>601123456</exampleNumber>
       </mobile>
@@ -8681,7 +8765,7 @@
         <possibleNumberPattern>\d{8}</possibleNumberPattern>
       </generalDesc>
       <fixedLine>
-        <!-- Extra prefixes 227[01389], 228X and 2292 were added from numbers found online. -->
+        <!-- Extra prefixes 227[01389], 228X, 2292 & 260X were added from numbers found online. -->
         <nationalNumberPattern>
           2(?:
             2(?:
@@ -8707,8 +8791,8 @@
               74
             )|
             6(?:
+              [056]\d|
               4[0-378]|
-              [56]\d|
               [78][0-8]|
               9[01]
             )|
@@ -9647,9 +9731,8 @@
                2[0579]|
                3[057-9]|
                4[0-389]|
-               5[024-9]|
                6[0-35-9]|
-               7|
+               [57]|
                8[0-79]
              )|
              8(?:
@@ -9658,7 +9741,7 @@
                2[2356-9]|
                3[0-57-9]|
                [45]|
-               6[0245789]|
+               6[02457-9]|
                7[1-69]|
                8[0124-9]|
                9[02-9]
@@ -9687,21 +9770,20 @@
                  8[389]
                )|
                5(?:
-                 0|
-                 [47]9|
-                 [25]0|
-                 6[6-9]|
-                 [89][7-9]
+                 [034678]|
+                 2[03-9]|
+                 5[017-9]|
+                 9[7-9]
                )|
                6(?:
                  0[027]|
-                 12|
-                 20|
+                 1[0-257-9]|
+                 2[0-4]|
                  3[19]|
-                 5[45]|
-                 6[5-9]|
-                 7[679]|
-                 9[1-46-9]
+                 5[4589]|
+                 [67]|
+                 8[0-489]|
+                 9[0-46-9]
                )|
                7(?:
                  0[2-9]|
@@ -10149,21 +10231,20 @@
                 8[389]
               )|
               5(?:
-                0\d|
-                [47]9|
-                [25]0|
-                6[6-9]|
-                [89][7-9]
+                [034678]\d|
+                2[03-9]|
+                5[017-9]|
+                9[7-9]
               )|
               6(?:
                 0[027]|
-                12|
-                20|
+                1[0-257-9]|
+                2[0-4]|
                 3[19]|
-                5[45]|
-                6[5-9]|
-                7[679]|
-                9[1-46-9]
+                5[4589]|
+                [67]\d|
+                8[0-489]|
+                9[0-46-9]
               )|
               7(?:
                 0[2-9]|
@@ -11191,7 +11272,8 @@
                 3[0-57-8]|
                 4[24-7]|
                 5[0-24-8]|
-                [6-9][02]
+                [6-8][02]|
+                9[0-2]
               )|
               7(?:
                 0[1-79]|
@@ -11207,11 +11289,13 @@
               1[1-35-7]|
               2[024-7]|
               3\d|
-              [457][02]|
+              4[0-2]|
+              [57][02]|
               60
             )|
             53(?:
-              [013][02]|
+              0[0-2]|
+              [13][02]|
               2[0-59]|
               49|
               5[0-35-9]|
@@ -11260,8 +11344,8 @@
           7(?:
             55|
             7[25-9]|
-            8[5-9]|
-            9[05-9]
+            8[05-9]|
+            9[015-9]
           )\d{6}
         </nationalNumberPattern>
         <possibleNumberPattern>\d{9}</possibleNumberPattern>
@@ -12577,15 +12661,17 @@
     <!-- Kiribati -->
     <!-- http://www.itu.int/oth/T0202000071/en -->
     <!-- We include the national prefix for parsing here just in case numbers can be dialled with a
-         leading 0 - the main ITU document says this is not the case and no numbers online have been
-         found formatted this way, but Kiribati's own document lists it as a national dialling
-         prefix. -->
+         leading 0 - no numbers online have been found formatted this way, but the ITU document
+         lists it as a national dialling prefix. -->
     <territory id="KI" countryCode="686" internationalPrefix="00"
                nationalPrefixForParsing="0">
       <!-- Numbers should be formatted as a block." -->
       <generalDesc>
-        <nationalNumberPattern>[2-689]\d{4}</nationalNumberPattern>
-        <possibleNumberPattern>\d{5}</possibleNumberPattern>
+        <nationalNumberPattern>
+          [2-689]\d{4}|
+          7\d{7}
+        </nationalNumberPattern>
+        <possibleNumberPattern>\d{5,8}</possibleNumberPattern>
       </generalDesc>
       <fixedLine>
         <nationalNumberPattern>
@@ -12595,12 +12681,14 @@
             8[1-5]
           )\d{3}
         </nationalNumberPattern>
+        <possibleNumberPattern>\d{5}</possibleNumberPattern>
         <exampleNumber>31234</exampleNumber>
       </fixedLine>
       <mobile>
         <!-- Exclude 99[2349] from mobile since these are emergency numbers. -->
         <nationalNumberPattern>
           6\d{4}|
+          7\d{7}|
           9(?:
             [0-8]\d|
             9[015-8]
@@ -13046,7 +13134,7 @@
         <nationalNumberPattern>
           (?:
             5(?:
-              1[0-35]|
+              1[0-5]|
               [05]\d
             )|
             6(?:
@@ -13061,7 +13149,7 @@
               4[049]|
               6[069]|
               [79]\d|
-              88
+              8[08]
             )
           )\d{5}
         </nationalNumberPattern>
@@ -14667,14 +14755,9 @@
       <mobile>
         <!-- The numbering plan suggests the third digit, Z, should be 24-9, but this is not borne
              out by reality. -->
-        <nationalNumberPattern>
-          3(?:
-            [02-4]\d|
-            90
-          )\d{6}
-        </nationalNumberPattern>
+        <nationalNumberPattern>3[2-49]\d{7}</nationalNumberPattern>
         <possibleNumberPattern>\d{9}</possibleNumberPattern>
-        <exampleNumber>301234567</exampleNumber>
+        <exampleNumber>321234567</exampleNumber>
       </mobile>
       <!-- Putting VSAT numbers here. -->
       <voip>
@@ -14777,9 +14860,11 @@
       <mobile>
         <nationalNumberPattern>
           7(?:
-            [0-25-8]\d|
-            33
-          )\d{5}</nationalNumberPattern>
+            [0-25-8]\d{2}|
+            32\d|
+            421
+          )\d{4}
+        </nationalNumberPattern>
         <exampleNumber>72345678</exampleNumber>
       </mobile>
       <tollFree>
@@ -14902,7 +14987,8 @@
         <numberFormat pattern="(9)(\d{3})(\d{4,5})">
           <leadingDigits>
             9(?:
-              [235-9]|
+              2[0-4]|
+              [35-9]|
               4[13789]
             )
           </leadingDigits>
@@ -14912,13 +14998,19 @@
           <leadingDigits>94[0245]</leadingDigits>
           <format>$1 $2 $3</format>
         </numberFormat>
+        <!-- Following majority of numbers found online. -->
+        <numberFormat pattern="(9)(\d{3})(\d{3})(\d{3})">
+          <leadingDigits>925</leadingDigits>
+          <format>$1 $2 $3 $4</format>
+        </numberFormat>
       </availableFormats>
       <generalDesc>
         <nationalNumberPattern>
           [14578]\d{5,7}|
           [26]\d{5,8}|
           9(?:
-            [258]|
+            2\d{0,2}|
+            [58]|
             3\d|
             4\d{1,2}|
             [679]\d?
@@ -15008,7 +15100,10 @@
         <nationalNumberPattern>
           17[01]\d{4}|
           9(?:
-            2[0-4]|
+            2(?:
+              [0-4]|
+              5\d{2}
+            )|
             3[136]\d|
             4(?:
               0[0-4]\d|
@@ -16123,8 +16218,8 @@
                 7\d?
               )|
               3(?:
-                2\d|
-                3[378]
+                [01378]|
+                2\d
               )|
               4[01]|
               69|
@@ -16132,7 +16227,6 @@
             )|
             2(?:
               17|
-              25|
               5(?:
                 [0-36-8]|
                 4\d?
@@ -17878,8 +17972,7 @@
             0\d|
             1[1-5]|
             2[0-5]|
-            3[1-6]|
-            4[1-7]|
+            [34][1-7]|
             55|
             64
           )\d{7}
@@ -20510,7 +20603,7 @@
               3[1-389]|
               4[1-7]
             )|
-            4[34][12]
+            4[34][1-3]
           )\d{4}
         </nationalNumberPattern>
         <possibleNumberPattern>\d{10}</possibleNumberPattern>
@@ -20939,8 +21032,9 @@
         <!-- According to feedback from users, the carrier Altyn Asyr is the only one currently
              operating, with the numbers 6[3-5]\d{6}. MTS used to operate the ranges 6[6-8] but this
              has been suspended. It is unclear whether it will resume. We support both ranges in the
-             meantime. -->
-        <nationalNumberPattern>6[3-8]\d{6}</nationalNumberPattern>
+             meantime. The range 62 seems also now to be in use, according to numbers found online.
+             -->
+        <nationalNumberPattern>6[2-8]\d{6}</nationalNumberPattern>
         <exampleNumber>66123456</exampleNumber>
       </mobile>
       <!-- No tollFree or premiumRate information can be found. -->
@@ -21622,7 +21716,7 @@
             )|
             3[23]\d|
             5[0-4]\d|
-            60\d|
+            6[03]\d|
             8[0-2]\d
           )\d{4}|
           [34]\d{8}
diff --git a/PhoneNumberMetadataForTesting.xml b/PhoneNumberMetadataForTesting.xml
index 04d5729..b458cbb 100644
--- a/PhoneNumberMetadataForTesting.xml
+++ b/PhoneNumberMetadataForTesting.xml
@@ -119,6 +119,7 @@
     </territory>
 
     <!-- Australia -->
+    <!-- Country calling code shared with Cocos Islands (CC) and Christmas Islands (CX) -->
     <territory id="AU" countryCode="61" internationalPrefix="001[12]"
                nationalPrefix="0" preferredInternationalPrefix="0011"
                nationalPrefixFormattingRule="$NP$FG">
@@ -187,7 +188,8 @@
 
     <!-- Belarus -->
     <!-- This country has been coopted to test the case of a national prefix formatting rule with a
-         space in it. -->
+         space in it and the case where a number happens to begin with the national prefix, but
+         would become too short if the prefix is stripped. -->
     <territory id="BY" countryCode="375" internationalPrefix="810" nationalPrefix="8"
                nationalPrefixForParsing="80?|99999" nationalPrefixFormattingRule="$NP $FG">
       <availableFormats>
@@ -218,10 +220,18 @@
       </fixedLine>
     </territory>
 
-    <!-- France -->
+    <!-- Cocos Islands -->
+    <!-- Country calling code shared with Australia. -->
     <!-- This country is used to test ShortNumberInfo, so at least the country calling code must be
          recognised by the library. -->
-    <territory id="FR" countryCode="33">
+    <territory id="CC" countryCode="61">
+    </territory>
+
+    <!-- Christmas Islands -->
+    <!-- Country calling code shared with Australia. -->
+    <!-- This country is used to test ShortNumberInfo, so at least the country calling code must be
+         recognised by the library. -->
+    <territory id="CX" countryCode="61">
     </territory>
 
     <!-- Germany -->
@@ -280,6 +290,23 @@
       </premiumRate>
     </territory>
 
+    <!-- France -->
+    <territory id="FR" countryCode="33" nationalPrefix="0" nationalPrefixFormattingRule="$NP$FG">
+      <availableFormats>
+        <!-- We use this to test the phone number matcher. For our test-case, the formatting
+             pattern must have as the first group a sub-part of the country calling code,
+             and have a national prefix. This corresponds to the test number +33 3 34 2312. -->
+        <numberFormat pattern="(\d)(\d{2})(\d{2})(\d{2})">
+          <leadingDigits>3</leadingDigits>
+          <format>$1 $2 $3 $4</format>
+        </numberFormat>
+      </availableFormats>
+      <generalDesc>
+        <nationalNumberPattern>3\d{6}</nationalNumberPattern>
+        <possibleNumberPattern>\d{7}</possibleNumberPattern>
+      </generalDesc>
+    </territory>
+
     <!-- United Kingdom -->
     <territory id="GB" countryCode="44" internationalPrefix="00"
                nationalPrefix="0" nationalPrefixFormattingRule="($NP$FG)"
@@ -313,6 +340,10 @@
         <nationalNumberPattern>7[1-57-9]\d{8}</nationalNumberPattern>
         <possibleNumberPattern>\d{10}</possibleNumberPattern>
       </mobile>
+      <pager>
+        <nationalNumberPattern>76\d{8}</nationalNumberPattern>
+        <possibleNumberPattern>\d{10}</possibleNumberPattern>
+      </pager>
       <tollFree>
         <nationalNumberPattern>80\d{8}</nationalNumberPattern>
         <possibleNumberPattern>\d{10}</possibleNumberPattern>
@@ -341,6 +372,19 @@
     <territory id="GG" countryCode="44">
     </territory>
 
+    <!-- Hungary -->
+    <!-- This country has special logic in formatNumberForMobileDialing which must be tested. -->
+    <territory id="HU" countryCode="36" nationalPrefix="06">
+      <generalDesc>
+        <nationalNumberPattern>30\d{7}</nationalNumberPattern>
+        <possibleNumberPattern>\d{9}</possibleNumberPattern>
+      </generalDesc>
+      <mobile>
+        <nationalNumberPattern>30\d{7}</nationalNumberPattern>
+        <possibleNumberPattern>\d{9}</possibleNumberPattern>
+      </mobile>
+    </territory>
+
     <!-- Italy -->
     <!-- http://en.wikipedia.org/wiki/%2B39 -->
     <territory id="IT" countryCode="39" internationalPrefix="00" leadingZeroPossible="true">
diff --git a/ShortNumberMetadata.xml b/ShortNumberMetadata.xml
index 869282a..b60f4e6 100644
--- a/ShortNumberMetadata.xml
+++ b/ShortNumberMetadata.xml
@@ -137,18 +137,24 @@
     <!-- http://www.itu.int/oth/T0202000001/en -->
     <territory id="AF">
       <generalDesc>
-        <nationalNumberPattern>1\d{2}</nationalNumberPattern>
-        <possibleNumberPattern>\d{3}</possibleNumberPattern>
+        <nationalNumberPattern>[14]\d{2,4}</nationalNumberPattern>
+        <possibleNumberPattern>\d{3,5}</possibleNumberPattern>
       </generalDesc>
       <shortCode>
         <nationalNumberPattern>
           1(?:
             02|
             19
-          )
+          )|
+          40404
         </nationalNumberPattern>
         <exampleNumber>119</exampleNumber>
       </shortCode>
+      <carrierSpecific>
+        <!-- https://support.twitter.com/articles/20170024 -->
+        <nationalNumberPattern>40404</nationalNumberPattern>
+        <possibleNumberPattern>\d{5}</possibleNumberPattern>
+      </carrierSpecific>
       <emergency>
         <nationalNumberPattern>
           1(?:
@@ -158,17 +164,23 @@
         </nationalNumberPattern>
         <exampleNumber>119</exampleNumber>
       </emergency>
+      <smsServices>
+        <!-- https://support.twitter.com/articles/20170024 -->
+        <nationalNumberPattern>40404</nationalNumberPattern>
+        <possibleNumberPattern>\d{5}</possibleNumberPattern>
+      </smsServices>
     </territory>
 
     <!-- Antigua and Barbuda -->
     <!-- http://www.itu.int/oth/T0202000008/en -->
     <territory id="AG">
       <generalDesc>
-        <nationalNumberPattern>9\d{2}</nationalNumberPattern>
+        <nationalNumberPattern>[19]\d{2}</nationalNumberPattern>
         <possibleNumberPattern>\d{3}</possibleNumberPattern>
       </generalDesc>
       <shortCode>
         <nationalNumberPattern>
+          176|
           9(?:
             11|
             99
@@ -176,6 +188,11 @@
         </nationalNumberPattern>
         <exampleNumber>911</exampleNumber>
       </shortCode>
+      <carrierSpecific>
+        <!-- https://support.twitter.com/articles/20170024 -->
+        <nationalNumberPattern>176</nationalNumberPattern>
+        <possibleNumberPattern>\d{3}</possibleNumberPattern>
+      </carrierSpecific>
       <emergency>
         <!-- http://barbados.usembassy.gov/emergency-antigua_barbuda.html -->
         <nationalNumberPattern>
@@ -186,24 +203,39 @@
         </nationalNumberPattern>
         <exampleNumber>911</exampleNumber>
       </emergency>
+      <smsServices>
+        <!-- https://support.twitter.com/articles/20170024 -->
+        <nationalNumberPattern>176</nationalNumberPattern>
+        <possibleNumberPattern>\d{3}</possibleNumberPattern>
+      </smsServices>
     </territory>
 
     <!-- Anguilla -->
     <!-- http://www.itu.int/oth/T0202000007/en -->
     <territory id="AI">
       <generalDesc>
-        <nationalNumberPattern>9\d{2}</nationalNumberPattern>
+        <nationalNumberPattern>[19]\d{2}</nationalNumberPattern>
         <possibleNumberPattern>\d{3}</possibleNumberPattern>
       </generalDesc>
       <shortCode>
         <nationalNumberPattern>911</nationalNumberPattern>
         <exampleNumber>911</exampleNumber>
       </shortCode>
+      <carrierSpecific>
+        <!-- https://support.twitter.com/articles/20170024 -->
+        <nationalNumberPattern>176</nationalNumberPattern>
+        <possibleNumberPattern>\d{3}</possibleNumberPattern>
+      </carrierSpecific>
       <emergency>
         <!-- http://barbados.usembassy.gov/emergency-anguilla.html -->
         <nationalNumberPattern>911</nationalNumberPattern>
         <exampleNumber>911</exampleNumber>
       </emergency>
+      <smsServices>
+        <!-- https://support.twitter.com/articles/20170024 -->
+        <nationalNumberPattern>176</nationalNumberPattern>
+        <possibleNumberPattern>\d{3}</possibleNumberPattern>
+      </smsServices>
     </territory>
 
     <!-- Albania -->
@@ -227,23 +259,32 @@
     <!-- http://www.itu.int/oth/T020200000A/en -->
     <territory id="AM">
       <generalDesc>
-        <nationalNumberPattern>[18]\d{2,3}</nationalNumberPattern>
-        <possibleNumberPattern>\d{3,4}</possibleNumberPattern>
+        <nationalNumberPattern>[148]\d{2,4}</nationalNumberPattern>
+        <possibleNumberPattern>\d{3,5}</possibleNumberPattern>
       </generalDesc>
       <shortCode>
         <nationalNumberPattern>
-          (?:
-            1|
-            8[1-7]
-          )\d{2}
+          1\d{2}|
+          40404|
+          8[1-7]\d{2}
         </nationalNumberPattern>
         <exampleNumber>8711</exampleNumber>
       </shortCode>
+      <carrierSpecific>
+        <!-- https://support.twitter.com/articles/20170024 -->
+        <nationalNumberPattern>40404</nationalNumberPattern>
+        <possibleNumberPattern>\d{5}</possibleNumberPattern>
+      </carrierSpecific>
       <emergency>
         <nationalNumberPattern>10[123]</nationalNumberPattern>
         <possibleNumberPattern>\d{3}</possibleNumberPattern>
         <exampleNumber>102</exampleNumber>
       </emergency>
+      <smsServices>
+        <!-- https://support.twitter.com/articles/20170024 -->
+        <nationalNumberPattern>40404</nationalNumberPattern>
+        <possibleNumberPattern>\d{5}</possibleNumberPattern>
+      </smsServices>
     </territory>
 
     <!-- Angola -->
@@ -269,8 +310,8 @@
     <!-- http://en.wikipedia.org/wiki/Telephone_numbers_in_Argentina#Public_utility_numbers -->
     <territory id="AR">
       <generalDesc>
-        <nationalNumberPattern>[019]\d{1,2}</nationalNumberPattern>
-        <possibleNumberPattern>\d{2,3}</possibleNumberPattern>
+        <nationalNumberPattern>[0189]\d{1,4}</nationalNumberPattern>
+        <possibleNumberPattern>\d{2,5}</possibleNumberPattern>
       </generalDesc>
       <shortCode>
         <nationalNumberPattern>
@@ -281,6 +322,7 @@
             2[15]|
             9
           )|
+          89338|
           911
         </nationalNumberPattern>
         <exampleNumber>121</exampleNumber>
@@ -308,6 +350,11 @@
         <possibleNumberPattern>\d{3}</possibleNumberPattern>
         <exampleNumber>112</exampleNumber>
       </carrierServices>
+      <carrierSpecific>
+        <!-- https://support.twitter.com/articles/20170024 -->
+        <nationalNumberPattern>89338</nationalNumberPattern>
+        <possibleNumberPattern>\d{5}</possibleNumberPattern>
+      </carrierSpecific>
       <directoryServices>
         <nationalNumberPattern>110</nationalNumberPattern>
         <possibleNumberPattern>\d{3}</possibleNumberPattern>
@@ -328,17 +375,25 @@
         <possibleNumberPattern>\d{3}</possibleNumberPattern>
         <exampleNumber>103</exampleNumber>
       </expandedEmergency>
+      <smsServices>
+        <!-- https://support.twitter.com/articles/20170024 -->
+        <nationalNumberPattern>89338</nationalNumberPattern>
+        <possibleNumberPattern>\d{5}</possibleNumberPattern>
+      </smsServices>
     </territory>
 
     <!-- American Samoa -->
     <!-- http://www.itu.int/oth/T0202000004/en -->
     <territory id="AS">
       <generalDesc>
-        <nationalNumberPattern>9\d{2}</nationalNumberPattern>
-        <possibleNumberPattern>\d{3}</possibleNumberPattern>
+        <nationalNumberPattern>[49]\d{2,4}</nationalNumberPattern>
+        <possibleNumberPattern>\d{3,5}</possibleNumberPattern>
       </generalDesc>
       <shortCode>
-        <nationalNumberPattern>911</nationalNumberPattern>
+        <nationalNumberPattern>
+          40404|
+          911
+        </nationalNumberPattern>
         <exampleNumber>911</exampleNumber>
       </shortCode>
       <emergency>
@@ -346,8 +401,14 @@
              http://www.airportairport.com/American-Samoa.html
              http://www.frommers.com/destinations/americansamoa/3038020157.html -->
         <nationalNumberPattern>911</nationalNumberPattern>
+        <possibleNumberPattern>\d{3}</possibleNumberPattern>
         <exampleNumber>911</exampleNumber>
       </emergency>
+      <smsServices>
+        <!-- https://support.twitter.com/articles/20170024 -->
+        <nationalNumberPattern>40404</nationalNumberPattern>
+        <possibleNumberPattern>\d{5}</possibleNumberPattern>
+      </smsServices>
     </territory>
 
     <!-- Austria -->
@@ -518,11 +579,19 @@
       </generalDesc>
       <shortCode>
         <nationalNumberPattern>
-          100|
+          1(?:
+            00|
+            76
+          )|
           911
         </nationalNumberPattern>
         <exampleNumber>911</exampleNumber>
       </shortCode>
+      <carrierSpecific>
+        <!-- https://support.twitter.com/articles/20170024 -->
+        <nationalNumberPattern>176</nationalNumberPattern>
+        <possibleNumberPattern>\d{3}</possibleNumberPattern>
+      </carrierSpecific>
       <emergency>
         <!-- http://www.yellowpages-aruba.com/home/emergency-numbers -->
         <nationalNumberPattern>
@@ -531,6 +600,11 @@
         </nationalNumberPattern>
         <exampleNumber>911</exampleNumber>
       </emergency>
+      <smsServices>
+        <!-- https://support.twitter.com/articles/20170024 -->
+        <nationalNumberPattern>176</nationalNumberPattern>
+        <possibleNumberPattern>\d{3}</possibleNumberPattern>
+      </smsServices>
     </territory>
 
     <!-- Åland Islands. -->
@@ -555,18 +629,28 @@
     <!-- http://www.itu.int/oth/T020200000F/en -->
     <territory id="AZ">
       <generalDesc>
-        <nationalNumberPattern>1\d{2}</nationalNumberPattern>
-        <possibleNumberPattern>\d{3}</possibleNumberPattern>
+        <nationalNumberPattern>[148]\d{2,3}</nationalNumberPattern>
+        <possibleNumberPattern>\d{3,4}</possibleNumberPattern>
       </generalDesc>
       <shortCode>
         <nationalNumberPattern>
           1(?:
             0[123]|
             12
-          )
+          )|
+          4040|
+          8800
         </nationalNumberPattern>
         <exampleNumber>101</exampleNumber>
       </shortCode>
+      <carrierSpecific>
+        <!-- https://support.twitter.com/articles/20170024 -->
+        <nationalNumberPattern>
+          4040|
+          8800
+        </nationalNumberPattern>
+        <possibleNumberPattern>\d{4}</possibleNumberPattern>
+      </carrierSpecific>
       <emergency>
         <!-- http://travel.state.gov/travel/cis_pa_tw/cis/cis_978.html
              http://wikitravel.org/en/Azerbaijan#Emergency_contact_numbers -->
@@ -576,8 +660,17 @@
             12
           )
         </nationalNumberPattern>
+        <possibleNumberPattern>\d{3}</possibleNumberPattern>
         <exampleNumber>101</exampleNumber>
       </emergency>
+      <smsServices>
+        <!-- https://support.twitter.com/articles/20170024 -->
+        <nationalNumberPattern>
+          4040|
+          8800
+        </nationalNumberPattern>
+        <possibleNumberPattern>\d{4}</possibleNumberPattern>
+      </smsServices>
     </territory>
 
     <!-- Bosnia and Herzegovina -->
@@ -652,10 +745,18 @@
             )|
             5[2-9]
           )|
-          999
+          9(?:
+            594|
+            99
+          )
         </nationalNumberPattern>
         <exampleNumber>103</exampleNumber>
       </shortCode>
+      <carrierSpecific>
+        <!-- https://support.twitter.com/articles/20170024 -->
+        <nationalNumberPattern>9594</nationalNumberPattern>
+        <possibleNumberPattern>\d{4}</possibleNumberPattern>
+      </carrierSpecific>
       <emergency>
         <nationalNumberPattern>
           10[0-2]|
@@ -664,6 +765,11 @@
         <possibleNumberPattern>\d{3}</possibleNumberPattern>
         <exampleNumber>999</exampleNumber>
       </emergency>
+      <smsServices>
+        <!-- https://support.twitter.com/articles/20170024 -->
+        <nationalNumberPattern>9594</nationalNumberPattern>
+        <possibleNumberPattern>\d{4}</possibleNumberPattern>
+      </smsServices>
     </territory>
 
     <!-- Belgium -->
@@ -862,33 +968,107 @@
     <!-- http://www.itu.int/oth/T0202000011/en -->
     <territory id="BH">
       <generalDesc>
-        <nationalNumberPattern>9\d{2}</nationalNumberPattern>
-        <possibleNumberPattern>\d{3}</possibleNumberPattern>
+        <nationalNumberPattern>[89]\d{2,4}</nationalNumberPattern>
+        <possibleNumberPattern>\d{3,5}</possibleNumberPattern>
       </generalDesc>
       <shortCode>
-        <nationalNumberPattern>999</nationalNumberPattern>
+        <nationalNumberPattern>
+          88000|
+          9(?:
+            8555|
+            99
+          )
+        </nationalNumberPattern>
         <exampleNumber>999</exampleNumber>
       </shortCode>
+      <carrierSpecific>
+        <!-- https://support.twitter.com/articles/20170024 -->
+        <nationalNumberPattern>
+          88000|
+          98555
+        </nationalNumberPattern>
+        <possibleNumberPattern>\d{5}</possibleNumberPattern>
+      </carrierSpecific>
       <emergency>
         <nationalNumberPattern>999</nationalNumberPattern>
+        <possibleNumberPattern>\d{3}</possibleNumberPattern>
         <exampleNumber>999</exampleNumber>
       </emergency>
+      <smsServices>
+        <!-- https://support.twitter.com/articles/20170024 -->
+        <nationalNumberPattern>
+          88000|
+          98555
+        </nationalNumberPattern>
+        <possibleNumberPattern>\d{5}</possibleNumberPattern>
+      </smsServices>
     </territory>
 
     <!-- Burundi -->
     <!-- http://www.itu.int/oth/T0202000022/en -->
     <territory id="BI">
       <generalDesc>
-        <nationalNumberPattern>1\d{2}</nationalNumberPattern>
+        <nationalNumberPattern>[16-9]\d{2}</nationalNumberPattern>
         <possibleNumberPattern>\d{3}</possibleNumberPattern>
       </generalDesc>
       <shortCode>
-        <nationalNumberPattern>11[78]</nationalNumberPattern>
+        <nationalNumberPattern>
+          1(?:
+            1\d|
+            5[3-6]|
+            6[01]
+          )|
+          611|
+          7(?:
+            10|
+            77
+          )|
+          8[28]8|
+          900
+        </nationalNumberPattern>
         <exampleNumber>117</exampleNumber>
       </shortCode>
+      <tollFree>
+        <!-- Leo call centre (marked as free on their website) -->
+        <nationalNumberPattern>611</nationalNumberPattern>
+        <possibleNumberPattern>\d{3}</possibleNumberPattern>
+        <exampleNumber>611</exampleNumber>
+      </tollFree>
+      <carrierSpecific>
+        <nationalNumberPattern>
+          611|
+          7(?:
+            10|
+            77
+          )|
+          888|
+          900
+        </nationalNumberPattern>
+        <exampleNumber>611</exampleNumber>
+      </carrierSpecific>
+      <carrierServices>
+        <!-- http://www.leo.bi and http://www.lacellsu.com/fr and http://www.tempo.bi/ -->
+        <nationalNumberPattern>
+          611|
+          7(?:
+            10|
+            77
+          )|
+          8[28]8|
+          900
+        </nationalNumberPattern>
+        <exampleNumber>888</exampleNumber>
+      </carrierServices>
+      <smsServices>
+        <!-- 900 is used by Leo to buy a certain package, 710 by Tempo. -->
+        <nationalNumberPattern>
+          710|
+          900
+        </nationalNumberPattern>
+        <exampleNumber>900</exampleNumber>
+      </smsServices>
       <emergency>
-        <!-- http://www.diplomatie.gouv.fr/fr/conseils-aux-voyageurs_909/conseils-par-pays_12191/burundi_12220/index.html -->
-        <nationalNumberPattern>11[78]</nationalNumberPattern>
+        <nationalNumberPattern>11[237]</nationalNumberPattern>
         <exampleNumber>117</exampleNumber>
       </emergency>
     </territory>
@@ -932,18 +1112,29 @@
     <!-- http://www.itu.int/oth/T0202000018/en -->
     <territory id="BM">
       <generalDesc>
-        <nationalNumberPattern>9\d{2}</nationalNumberPattern>
+        <nationalNumberPattern>[19]\d{2}</nationalNumberPattern>
         <possibleNumberPattern>\d{3}</possibleNumberPattern>
       </generalDesc>
       <shortCode>
-        <nationalNumberPattern>911</nationalNumberPattern>
+        <nationalNumberPattern>
+          176|
+          911
+        </nationalNumberPattern>
         <exampleNumber>911</exampleNumber>
       </shortCode>
+      <carrierSpecific>
+        <!-- https://support.twitter.com/articles/20170024 -->
+        <nationalNumberPattern>176</nationalNumberPattern>
+      </carrierSpecific>
       <emergency>
         <!-- http://travel.state.gov/travel/cis_pa_tw/cis/cis_1067.html -->
         <nationalNumberPattern>911</nationalNumberPattern>
         <exampleNumber>911</exampleNumber>
       </emergency>
+      <smsServices>
+        <!-- https://support.twitter.com/articles/20170024 -->
+        <nationalNumberPattern>176</nationalNumberPattern>
+      </smsServices>
     </territory>
 
     <!-- Brunei Darussalam -->
@@ -969,8 +1160,8 @@
     <!-- http://www.bolivia.com/Servicios/Plandenumeracion.pdf -->
     <territory id="BO">
       <generalDesc>
-        <nationalNumberPattern>1\d{2}</nationalNumberPattern>
-        <possibleNumberPattern>\d{3}</possibleNumberPattern>
+        <nationalNumberPattern>[14]\d{2,4}</nationalNumberPattern>
+        <possibleNumberPattern>\d{3,5}</possibleNumberPattern>
       </generalDesc>
       <shortCode>
         <nationalNumberPattern>11[089]</nationalNumberPattern>
@@ -978,8 +1169,14 @@
       </shortCode>
       <emergency>
         <nationalNumberPattern>11[089]</nationalNumberPattern>
+        <possibleNumberPattern>\d{3}</possibleNumberPattern>
         <exampleNumber>110</exampleNumber>
       </emergency>
+      <smsServices>
+        <!-- https://support.twitter.com/articles/20170024 -->
+        <nationalNumberPattern>40404</nationalNumberPattern>
+        <possibleNumberPattern>\d{5}</possibleNumberPattern>
+      </smsServices>
     </territory>
 
     <!-- Bonaire, Sint Eustatius and Saba -->
@@ -991,11 +1188,19 @@
       </generalDesc>
       <shortCode>
         <nationalNumberPattern>
-          112|
+          1(?:
+            12|
+            76
+          )|
           911
         </nationalNumberPattern>
         <exampleNumber>112</exampleNumber>
       </shortCode>
+      <carrierSpecific>
+        <!-- https://support.twitter.com/articles/20170024 -->
+        <nationalNumberPattern>176</nationalNumberPattern>
+        <possibleNumberPattern>\d{3}</possibleNumberPattern>
+      </carrierSpecific>
       <emergency>
         <!-- http://www.rijksdienstcn.com/index.php?view=pagina&id=126&set_language=EN -->
         <nationalNumberPattern>
@@ -1004,6 +1209,11 @@
         </nationalNumberPattern>
         <exampleNumber>112</exampleNumber>
       </emergency>
+      <smsServices>
+        <!-- https://support.twitter.com/articles/20170024 -->
+        <nationalNumberPattern>176</nationalNumberPattern>
+        <possibleNumberPattern>\d{3}</possibleNumberPattern>
+      </smsServices>
     </territory>
 
     <!-- Brazil -->
@@ -1139,38 +1349,61 @@
     <!-- http://www.itu.int/oth/T0202000019/en -->
     <territory id="BT">
       <generalDesc>
-        <nationalNumberPattern>1\d{2}</nationalNumberPattern>
-        <possibleNumberPattern>\d{3}</possibleNumberPattern>
+        <nationalNumberPattern>[14]\d{2,4}</nationalNumberPattern>
+        <possibleNumberPattern>\d{3,5}</possibleNumberPattern>
       </generalDesc>
       <shortCode>
-        <nationalNumberPattern>11[023]</nationalNumberPattern>
+        <nationalNumberPattern>
+          11[023]|
+          40404
+        </nationalNumberPattern>
         <exampleNumber>113</exampleNumber>
       </shortCode>
       <emergency>
         <!-- http://www.rbp.gov.bt/requestpolice.php -->
         <!-- http://www.jdwnrh.gov.bt/sfo2011/?page_id=51 -->
         <nationalNumberPattern>11[023]</nationalNumberPattern>
+        <possibleNumberPattern>\d{3}</possibleNumberPattern>
         <exampleNumber>113</exampleNumber>
       </emergency>
+      <smsServices>
+        <!-- https://support.twitter.com/articles/20170024 -->
+        <nationalNumberPattern>40404</nationalNumberPattern>
+        <possibleNumberPattern>\d{5}</possibleNumberPattern>
+      </smsServices>
     </territory>
 
     <!-- Botswana -->
     <!-- http://www.itu.int/oth/T020200001C/en -->
     <territory id="BW">
       <generalDesc>
-        <nationalNumberPattern>9\d{2}</nationalNumberPattern>
-        <possibleNumberPattern>\d{3}</possibleNumberPattern>
+        <nationalNumberPattern>[19]\d{2,4}</nationalNumberPattern>
+        <possibleNumberPattern>\d{3,5}</possibleNumberPattern>
       </generalDesc>
       <shortCode>
-        <nationalNumberPattern>99[789]</nationalNumberPattern>
+        <nationalNumberPattern>
+          13123|
+          99[789]
+        </nationalNumberPattern>
         <exampleNumber>999</exampleNumber>
       </shortCode>
+      <carrierSpecific>
+        <!-- https://support.twitter.com/articles/20170024 -->
+        <nationalNumberPattern>13123</nationalNumberPattern>
+        <possibleNumberPattern>\d{5}</possibleNumberPattern>
+      </carrierSpecific>
       <emergency>
         <!-- http://www.gov.bw/en/Ministries%2D%2DAuthorities/Ministries/State-President/Botswana-Police-Service-/About-the-BPS/Toll-Free-Numbers/ -->
         <!-- http://travel.state.gov/travel/cis_pa_tw/cis/cis_1071.html -->
         <nationalNumberPattern>99[789]</nationalNumberPattern>
+        <possibleNumberPattern>\d{3}</possibleNumberPattern>
         <exampleNumber>999</exampleNumber>
       </emergency>
+      <smsServices>
+        <!-- https://support.twitter.com/articles/20170024 -->
+        <nationalNumberPattern>13123</nationalNumberPattern>
+        <possibleNumberPattern>\d{5}</possibleNumberPattern>
+      </smsServices>
     </territory>
 
     <!-- Belarus -->
@@ -1181,14 +1414,25 @@
         <possibleNumberPattern>\d{3}</possibleNumberPattern>
       </generalDesc>
       <shortCode>
+        <!-- Wikipedia notes not all numbers are active everywhere. -->
         <nationalNumberPattern>
           1(?:
-            0[123]|
-            12
+            0[1-79]|
+            1[246]|
+            35|
+            5[1235]|
+            6[89]|
+            7[5-7]|
+            8[58]|
+            9[1-7]
           )
         </nationalNumberPattern>
         <exampleNumber>112</exampleNumber>
       </shortCode>
+      <directoryServices>
+        <nationalNumberPattern>109</nationalNumberPattern>
+        <exampleNumber>109</exampleNumber>
+      </directoryServices>
       <emergency>
         <nationalNumberPattern>
           1(?:
@@ -1232,12 +1476,13 @@
     <!-- http://www.cnac.ca/canadian_dial_plan/canadian_dial_plan.htm -->
     <territory id="CA">
       <generalDesc>
-        <nationalNumberPattern>[19]\d{2}</nationalNumberPattern>
-        <possibleNumberPattern>\d{3}</possibleNumberPattern>
+        <nationalNumberPattern>[129]\d{2,4}</nationalNumberPattern>
+        <possibleNumberPattern>\d{3,5}</possibleNumberPattern>
       </generalDesc>
       <shortCode>
         <nationalNumberPattern>
           112|
+          21212|
           911
         </nationalNumberPattern>
         <exampleNumber>911</exampleNumber>
@@ -1247,8 +1492,14 @@
           112|
           911
         </nationalNumberPattern>
+        <possibleNumberPattern>\d{3}</possibleNumberPattern>
         <exampleNumber>911</exampleNumber>
       </emergency>
+      <smsServices>
+        <!-- https://support.twitter.com/articles/20170024 -->
+        <nationalNumberPattern>21212</nationalNumberPattern>
+        <possibleNumberPattern>\d{5}</possibleNumberPattern>
+      </smsServices>
     </territory>
 
     <!-- Cocos Islands -->
@@ -1277,8 +1528,26 @@
     </territory>
 
     <!-- Congo, Dem. Rep. of the (formerly Zaire) -->
-    <!-- id="CD" -->
-    <!-- No national emergency numbers were located for Congo. -->
+    <territory id="CD">
+      <generalDesc>
+        <nationalNumberPattern>4\d{4}</nationalNumberPattern>
+        <possibleNumberPattern>\d{5}</possibleNumberPattern>
+      </generalDesc>
+      <shortCode>
+        <nationalNumberPattern>40404</nationalNumberPattern>
+        <possibleNumberPattern>\d{5}</possibleNumberPattern>
+        <exampleNumber>40404</exampleNumber>
+      </shortCode>
+      <!-- No national emergency numbers were located for Congo. -->
+      <carrierSpecific>
+        <!-- https://support.twitter.com/articles/20170024 -->
+        <nationalNumberPattern>40404</nationalNumberPattern>
+      </carrierSpecific>
+      <smsServices>
+        <!-- https://support.twitter.com/articles/20170024 -->
+        <nationalNumberPattern>40404</nationalNumberPattern>
+      </smsServices>
+    </territory>
 
     <!-- Central African Republic -->
     <!-- id="CF" -->
@@ -1337,7 +1606,8 @@
           1(?:
             16\d{3}|
             47
-          )
+          )|
+          5200
         </nationalNumberPattern>
         <possibleNumberPattern>\d{3,6}</possibleNumberPattern>
         <exampleNumber>116000</exampleNumber>
@@ -1373,6 +1643,17 @@
         <possibleNumberPattern>\d{3,5}</possibleNumberPattern>
         <exampleNumber>543</exampleNumber>
       </premiumRate>
+      <carrierSpecific>
+        <!-- 5200, 535 are both used by Orange for SMSs. -->
+        <nationalNumberPattern>
+          5(?:
+            200|
+            35
+          )
+        </nationalNumberPattern>
+        <possibleNumberPattern>\d{3,4}</possibleNumberPattern>
+        <exampleNumber>535</exampleNumber>
+      </carrierSpecific>
       <directoryServices>
         <nationalNumberPattern>18\d{2}</nationalNumberPattern>
         <possibleNumberPattern>\d{4}</possibleNumberPattern>
@@ -1418,18 +1699,24 @@
     <!-- http://www.itu.int/oth/T0202000031/en -->
     <territory id="CI">
       <generalDesc>
-        <nationalNumberPattern>1\d{2}</nationalNumberPattern>
-        <possibleNumberPattern>\d{3}</possibleNumberPattern>
+        <nationalNumberPattern>[14]\d{2,3}</nationalNumberPattern>
+        <possibleNumberPattern>\d{3,4}</possibleNumberPattern>
       </generalDesc>
       <shortCode>
         <nationalNumberPattern>
           1(?:
             1[01]|
             [78]0
-          )
+          )|
+          4443
         </nationalNumberPattern>
         <exampleNumber>110</exampleNumber>
       </shortCode>
+      <carrierSpecific>
+        <!-- https://support.twitter.com/articles/20170024 -->
+        <nationalNumberPattern>4443</nationalNumberPattern>
+        <possibleNumberPattern>\d{4}</possibleNumberPattern>
+      </carrierSpecific>
       <emergency>
         <!-- http://studentsabroad.state.gov/content/pdfs/911_ABROAD.pdf -->
         <nationalNumberPattern>
@@ -1438,8 +1725,14 @@
             [78]0
           )
         </nationalNumberPattern>
+        <possibleNumberPattern>\d{3}</possibleNumberPattern>
         <exampleNumber>110</exampleNumber>
       </emergency>
+      <smsServices>
+        <!-- https://support.twitter.com/articles/20170024 -->
+        <nationalNumberPattern>4443</nationalNumberPattern>
+        <possibleNumberPattern>\d{4}</possibleNumberPattern>
+      </smsServices>
     </territory>
 
     <!-- Cook Islands -->
@@ -1735,19 +2028,32 @@
     <!-- http://www.itu.int/oth/T0202000024/en -->
     <territory id="CM">
       <generalDesc>
-        <nationalNumberPattern>1\d{1,2}</nationalNumberPattern>
-        <possibleNumberPattern>\d{2,3}</possibleNumberPattern>
+        <nationalNumberPattern>[18]\d{1,3}</nationalNumberPattern>
+        <possibleNumberPattern>\d{2,4}</possibleNumberPattern>
       </generalDesc>
       <shortCode>
-        <nationalNumberPattern>1?1[37]</nationalNumberPattern>
+        <nationalNumberPattern>
+          1?1[37]|
+          8711
+        </nationalNumberPattern>
         <exampleNumber>113</exampleNumber>
       </shortCode>
+      <carrierSpecific>
+        <!-- https://support.twitter.com/articles/20170024 -->
+        <nationalNumberPattern>8711</nationalNumberPattern>
+        <possibleNumberPattern>\d{4}</possibleNumberPattern>
+      </carrierSpecific>
       <emergency>
         <!-- http://www.diplomatie.gouv.fr/fr/conseils-aux-voyageurs_909/conseils-par-pays_12191/cameroun_12221/index.html -->
         <!-- Numbers must be prefixed with a 1 when dialled from a mobile. -->
         <nationalNumberPattern>1?1[37]</nationalNumberPattern>
         <exampleNumber>113</exampleNumber>
       </emergency>
+      <smsServices>
+        <!-- https://support.twitter.com/articles/20170024 -->
+        <nationalNumberPattern>8711</nationalNumberPattern>
+        <possibleNumberPattern>\d{4}</possibleNumberPattern>
+      </smsServices>
     </territory>
 
     <!-- China -->
@@ -1809,8 +2115,8 @@
          -->
     <territory id="CO">
       <generalDesc>
-        <nationalNumberPattern>1\d{2}</nationalNumberPattern>
-        <possibleNumberPattern>\d{3}</possibleNumberPattern>
+        <nationalNumberPattern>[148]\d{2,4}</nationalNumberPattern>
+        <possibleNumberPattern>\d{3,5}</possibleNumberPattern>
       </generalDesc>
       <shortCode>
         <nationalNumberPattern>
@@ -1823,10 +2129,22 @@
             5[36]|
             6[45]|
             95
-          )
+          )|
+          40404|
+          85432
         </nationalNumberPattern>
         <exampleNumber>112</exampleNumber>
       </shortCode>
+      <carrierSpecific>
+        <!-- https://support.twitter.com/articles/20170024 -->
+        <!-- 85432 is used for customer complaints - found on mobile websites - and will go to your
+             carrier specifically. -->
+        <nationalNumberPattern>
+          40404|
+          85432
+        </nationalNumberPattern>
+        <possibleNumberPattern>\d{5}</possibleNumberPattern>
+      </carrierSpecific>
       <emergency>
         <!-- Police, medical and fire plus general emergency numbers (112,123). -->
         <nationalNumberPattern>
@@ -1837,6 +2155,7 @@
             56
           )
         </nationalNumberPattern>
+        <possibleNumberPattern>\d{3}</possibleNumberPattern>
         <exampleNumber>112</exampleNumber>
       </emergency>
       <expandedEmergency>
@@ -1851,6 +2170,14 @@
         </nationalNumberPattern>
         <exampleNumber>127</exampleNumber>
       </expandedEmergency>
+      <smsServices>
+        <!-- https://support.twitter.com/articles/20170024 -->
+        <nationalNumberPattern>
+          40404|
+          85432
+        </nationalNumberPattern>
+        <possibleNumberPattern>\d{5}</possibleNumberPattern>
+      </smsServices>
     </territory>
 
     <!-- Costa Rica -->
@@ -1970,11 +2297,19 @@
       </generalDesc>
       <shortCode>
         <nationalNumberPattern>
-          112|
+          1(?:
+            12|
+            76
+          )|
           911
         </nationalNumberPattern>
         <exampleNumber>112</exampleNumber>
       </shortCode>
+      <carrierSpecific>
+        <!-- https://support.twitter.com/articles/20170024 -->
+        <nationalNumberPattern>176</nationalNumberPattern>
+        <possibleNumberPattern>\d{3}</possibleNumberPattern>
+      </carrierSpecific>
       <emergency>
         <!-- http://www.rijksdienstcn.com/index.php?view=pagina&id=126&set_language=EN -->
         <nationalNumberPattern>
@@ -1983,6 +2318,11 @@
         </nationalNumberPattern>
         <exampleNumber>112</exampleNumber>
       </emergency>
+      <smsServices>
+        <!-- https://support.twitter.com/articles/20170024 -->
+        <nationalNumberPattern>176</nationalNumberPattern>
+        <possibleNumberPattern>\d{3}</possibleNumberPattern>
+      </smsServices>
     </territory>
 
     <!-- Christmas Islands -->
@@ -2186,17 +2526,31 @@
     <!-- www.arpt.dz -->
     <territory id="DZ">
       <generalDesc>
-        <nationalNumberPattern>1\d</nationalNumberPattern>
-        <possibleNumberPattern>\d{2}</possibleNumberPattern>
+        <nationalNumberPattern>[17]\d{1,2}</nationalNumberPattern>
+        <possibleNumberPattern>\d{2,3}</possibleNumberPattern>
       </generalDesc>
       <shortCode>
-        <nationalNumberPattern>1[47]</nationalNumberPattern>
+        <nationalNumberPattern>
+          1[47]|
+          730
+        </nationalNumberPattern>
         <exampleNumber>17</exampleNumber>
       </shortCode>
+      <carrierSpecific>
+        <!-- https://support.twitter.com/articles/20170024 -->
+        <nationalNumberPattern>730</nationalNumberPattern>
+        <possibleNumberPattern>\d{3}</possibleNumberPattern>
+      </carrierSpecific>
       <emergency>
         <nationalNumberPattern>1[47]</nationalNumberPattern>
+        <possibleNumberPattern>\d{2}</possibleNumberPattern>
         <exampleNumber>17</exampleNumber>
       </emergency>
+      <smsServices>
+        <!-- https://support.twitter.com/articles/20170024 -->
+        <nationalNumberPattern>730</nationalNumberPattern>
+        <possibleNumberPattern>\d{3}</possibleNumberPattern>
+      </smsServices>
     </territory>
 
     <!-- Ecuador -->
@@ -2545,8 +2899,8 @@
     <!-- www.tfl.com.fj -->
     <territory id="FJ">
       <generalDesc>
-        <nationalNumberPattern>[0-579]\d{1,2}</nationalNumberPattern>
-        <possibleNumberPattern>\d{2,3}</possibleNumberPattern>
+        <nationalNumberPattern>[0-579]\d{1,4}</nationalNumberPattern>
+        <possibleNumberPattern>\d{2,5}</possibleNumberPattern>
       </generalDesc>
       <shortCode>
         <!-- From the Emergency Numbers page on the Telecom Fiji website:
@@ -2562,7 +2916,11 @@
           )|
           2[289]|
           30|
-          [45]4|
+          4(?:
+            0404|
+            4
+          )|
+          54|
           75|
           91[137]
         </nationalNumberPattern>
@@ -2573,6 +2931,11 @@
         <possibleNumberPattern>\d{3}</possibleNumberPattern>
         <exampleNumber>911</exampleNumber>
       </emergency>
+      <smsServices>
+        <!-- https://support.twitter.com/articles/20170024 -->
+        <nationalNumberPattern>40404</nationalNumberPattern>
+        <possibleNumberPattern>\d{5}</possibleNumberPattern>
+      </smsServices>
     </territory>
 
     <!-- Falkland Islands (Malvinas) -->
@@ -2910,9 +3273,13 @@
     <!-- http://www.itu.int/oth/T0202000057/en -->
     <territory id="GD">
       <generalDesc>
-        <nationalNumberPattern>9\d{2}</nationalNumberPattern>
+        <nationalNumberPattern>[19]\d{2}</nationalNumberPattern>
         <possibleNumberPattern>\d{3}</possibleNumberPattern>
       </generalDesc>
+      <carrierSpecific>
+        <!-- https://support.twitter.com/articles/20170024 -->
+        <nationalNumberPattern>176</nationalNumberPattern>
+      </carrierSpecific>
       <shortCode>
         <nationalNumberPattern>911</nationalNumberPattern>
         <exampleNumber>911</exampleNumber>
@@ -2922,6 +3289,10 @@
         <nationalNumberPattern>911</nationalNumberPattern>
         <exampleNumber>911</exampleNumber>
       </emergency>
+      <smsServices>
+        <!-- https://support.twitter.com/articles/20170024 -->
+        <nationalNumberPattern>176</nationalNumberPattern>
+      </smsServices>
     </territory>
 
     <!-- Georgia -->
@@ -2929,8 +3300,8 @@
     <!-- http://en.wikipedia.org/wiki/Telephone_numbers_in_Georgia. -->
     <territory id="GE">
       <generalDesc>
-        <nationalNumberPattern>[01]\d{2}</nationalNumberPattern>
-        <possibleNumberPattern>\d{3}</possibleNumberPattern>
+        <nationalNumberPattern>[041]\d{2,4}</nationalNumberPattern>
+        <possibleNumberPattern>\d{3,5}</possibleNumberPattern>
       </generalDesc>
       <shortCode>
         <nationalNumberPattern>
@@ -2942,10 +3313,16 @@
           1(?:
             1[123]|
             22
-          )
+          )|
+          40404
         </nationalNumberPattern>
         <exampleNumber>112</exampleNumber>
       </shortCode>
+      <carrierSpecific>
+        <!-- https://support.twitter.com/articles/20170024 -->
+        <nationalNumberPattern>40404</nationalNumberPattern>
+        <possibleNumberPattern>\d{5}</possibleNumberPattern>
+      </carrierSpecific>
       <emergency>
         <!-- According to Wikipedia, 011, 022 and 033 will be replaced by 111, 122, 113 and 114 in
              2011. We are not sure if that has happened, so we support both versions for now. -->
@@ -2960,8 +3337,14 @@
             22
           )
         </nationalNumberPattern>
+        <possibleNumberPattern>\d{3}</possibleNumberPattern>
         <exampleNumber>112</exampleNumber>
       </emergency>
+      <smsServices>
+        <!-- https://support.twitter.com/articles/20170024 -->
+        <nationalNumberPattern>40404</nationalNumberPattern>
+        <possibleNumberPattern>\d{5}</possibleNumberPattern>
+      </smsServices>
     </territory>
 
     <!-- French Guiana (French Dept. of) -->
@@ -3030,12 +3413,13 @@
     <!-- http://www.nca.org.gh/index.php?option=com_content&view=article&id=90&Itemid=65 -->
     <territory id="GH">
       <generalDesc>
-        <nationalNumberPattern>[1589]\d{2,3}</nationalNumberPattern>
-        <possibleNumberPattern>\d{3,4}</possibleNumberPattern>
+        <nationalNumberPattern>[14589]\d{2,4}</nationalNumberPattern>
+        <possibleNumberPattern>\d{3,5}</possibleNumberPattern>
       </generalDesc>
       <shortCode>
         <nationalNumberPattern>
           19[123]|
+          40404|
           (?:
             54|
             83
@@ -3045,14 +3429,16 @@
         <exampleNumber>999</exampleNumber>
       </shortCode>
       <carrierSpecific>
+        <!-- https://support.twitter.com/articles/20170024 -->
         <!-- https://support.google.com/plus/answer/1304917 -->
         <nationalNumberPattern>
+          40404|
           (?:
             54|
             83
           )00
         </nationalNumberPattern>
-        <possibleNumberPattern>\d{4}</possibleNumberPattern>
+        <possibleNumberPattern>\d{4,5}</possibleNumberPattern>
         <exampleNumber>5400</exampleNumber>
       </carrierSpecific>
       <emergency>
@@ -3064,14 +3450,15 @@
         <exampleNumber>999</exampleNumber>
       </emergency>
       <smsServices>
-        <!-- https://support.google.com/plus/answer/1304917 -->
+        <!-- https://support.twitter.com/articles/20170024 -->
         <nationalNumberPattern>
+          40404|
           (?:
             54|
             83
           )00
         </nationalNumberPattern>
-        <possibleNumberPattern>\d{4}</possibleNumberPattern>
+        <possibleNumberPattern>\d{4,5}</possibleNumberPattern>
         <exampleNumber>5400</exampleNumber>
       </smsServices>
     </territory>
@@ -3234,8 +3621,25 @@
     </territory>
 
     <!-- Guinea -->
-    <!-- id="GN" -->
-    <!-- No national emergency numbers were located for Guinea. -->
+    <territory id="GN">
+      <generalDesc>
+        <nationalNumberPattern>4\d{4}</nationalNumberPattern>
+        <possibleNumberPattern>\d{5}</possibleNumberPattern>
+      </generalDesc>
+      <shortCode>
+        <nationalNumberPattern>40404</nationalNumberPattern>
+        <exampleNumber>40404</exampleNumber>
+      </shortCode>
+      <carrierSpecific>
+        <!-- https://support.twitter.com/articles/20170024 -->
+        <nationalNumberPattern>40404</nationalNumberPattern>
+      </carrierSpecific>
+      <!-- No national emergency numbers were located for Guinea. -->
+      <smsServices>
+        <!-- https://support.twitter.com/articles/20170024 -->
+        <nationalNumberPattern>40404</nationalNumberPattern>
+      </smsServices>
+    </territory>
 
     <!-- Guadeloupe -->
     <!-- http://www.itu.int/oth/T0202000058/en -->
@@ -3297,8 +3701,8 @@
     <!-- http://en.wikipedia.org/wiki/Telephone_numbers_in_Guatemala -->
     <territory id="GT">
       <generalDesc>
-        <nationalNumberPattern>1\d{2,3}</nationalNumberPattern>
-        <possibleNumberPattern>\d{3,4}</possibleNumberPattern>
+        <nationalNumberPattern>[14]\d{2,4}</nationalNumberPattern>
+        <possibleNumberPattern>\d{3,5}</possibleNumberPattern>
       </generalDesc>
       <shortCode>
         <nationalNumberPattern>
@@ -3306,10 +3710,16 @@
             10|
             2\d|
             [57]\d{2}
-          )
+          )|
+          40404
         </nationalNumberPattern>
         <exampleNumber>123</exampleNumber>
       </shortCode>
+      <carrierSpecific>
+        <!-- https://support.twitter.com/articles/20170024 -->
+        <nationalNumberPattern>40404</nationalNumberPattern>
+        <possibleNumberPattern>\d{5}</possibleNumberPattern>
+      </carrierSpecific>
       <emergency>
         <nationalNumberPattern>
           1(?:
@@ -3320,6 +3730,11 @@
         <possibleNumberPattern>\d{3}</possibleNumberPattern>
         <exampleNumber>110</exampleNumber>
       </emergency>
+      <smsServices>
+        <!-- https://support.twitter.com/articles/20170024 -->
+        <nationalNumberPattern>40404</nationalNumberPattern>
+        <possibleNumberPattern>\d{5}</possibleNumberPattern>
+      </smsServices>
     </territory>
 
     <!-- Guam -->
@@ -3362,7 +3777,7 @@
     <!-- http://www.itu.int/oth/T020200005D/en -->
     <territory id="GY">
       <generalDesc>
-        <nationalNumberPattern>[09]\d{2,3}</nationalNumberPattern>
+        <nationalNumberPattern>[019]\d{2,3}</nationalNumberPattern>
         <possibleNumberPattern>\d{3,4}</possibleNumberPattern>
       </generalDesc>
       <shortCode>
@@ -3378,15 +3793,26 @@
               [2-47]
             )
           )|
+          1443|
           91[123]
        </nationalNumberPattern>
         <exampleNumber>0801</exampleNumber>
       </shortCode>
+      <carrierSpecific>
+        <!-- https://support.twitter.com/articles/20170024 -->
+        <nationalNumberPattern>1443</nationalNumberPattern>
+        <possibleNumberPattern>\d{4}</possibleNumberPattern>
+      </carrierSpecific>
       <emergency>
         <nationalNumberPattern>91[123]</nationalNumberPattern>
         <possibleNumberPattern>\d{3}</possibleNumberPattern>
         <exampleNumber>911</exampleNumber>
       </emergency>
+      <smsServices>
+        <!-- https://support.twitter.com/articles/20170024 -->
+        <nationalNumberPattern>1443</nationalNumberPattern>
+        <possibleNumberPattern>\d{4}</possibleNumberPattern>
+      </smsServices>
     </territory>
 
     <!-- Hong Kong -->
@@ -3416,17 +3842,31 @@
     <!-- http://www.itu.int/oth/T020200005F/en -->
     <territory id="HN">
       <generalDesc>
-        <nationalNumberPattern>1\d{2}</nationalNumberPattern>
-        <possibleNumberPattern>\d{3}</possibleNumberPattern>
+        <nationalNumberPattern>[14]\d{2,4}</nationalNumberPattern>
+        <possibleNumberPattern>\d{3,5}</possibleNumberPattern>
       </generalDesc>
       <shortCode>
-        <nationalNumberPattern>199</nationalNumberPattern>
+        <nationalNumberPattern>
+          199|
+          40404
+        </nationalNumberPattern>
         <exampleNumber>199</exampleNumber>
       </shortCode>
+      <carrierSpecific>
+        <!-- https://support.twitter.com/articles/20170024 -->
+        <nationalNumberPattern>40404</nationalNumberPattern>
+        <possibleNumberPattern>\d{5}</possibleNumberPattern>
+      </carrierSpecific>
       <emergency>
         <nationalNumberPattern>199</nationalNumberPattern>
+        <possibleNumberPattern>\d{3}</possibleNumberPattern>
         <exampleNumber>199</exampleNumber>
       </emergency>
+      <smsServices>
+        <!-- https://support.twitter.com/articles/20170024 -->
+        <nationalNumberPattern>40404</nationalNumberPattern>
+        <possibleNumberPattern>\d{5}</possibleNumberPattern>
+      </smsServices>
     </territory>
 
     <!-- Croatia -->
@@ -3463,18 +3903,32 @@
     <!-- http://www.itu.int/oth/T020200005E/en -->
     <territory id="HT">
       <generalDesc>
-        <nationalNumberPattern>1\d{2}</nationalNumberPattern>
-        <possibleNumberPattern>\d{3}</possibleNumberPattern>
+        <nationalNumberPattern>[14]\d{2,4}</nationalNumberPattern>
+        <possibleNumberPattern>\d{3,5}</possibleNumberPattern>
       </generalDesc>
       <shortCode>
-        <nationalNumberPattern>11[48]</nationalNumberPattern>
+        <nationalNumberPattern>
+          11[48]|
+          40404
+        </nationalNumberPattern>
         <exampleNumber>114</exampleNumber>
       </shortCode>
+      <carrierSpecific>
+        <!-- https://support.twitter.com/articles/20170024 -->
+        <nationalNumberPattern>40404</nationalNumberPattern>
+        <possibleNumberPattern>\d{5}</possibleNumberPattern>
+      </carrierSpecific>
       <emergency>
         <!-- http://studentsabroad.state.gov/content/pdfs/911_ABROAD.pdf -->
         <nationalNumberPattern>11[48]</nationalNumberPattern>
+        <possibleNumberPattern>\d{3}</possibleNumberPattern>
         <exampleNumber>118</exampleNumber>
       </emergency>
+      <smsServices>
+        <!-- https://support.twitter.com/articles/20170024 -->
+        <nationalNumberPattern>40404</nationalNumberPattern>
+        <possibleNumberPattern>\d{5}</possibleNumberPattern>
+      </smsServices>
     </territory>
 
     <!-- Hungary -->
@@ -3508,19 +3962,24 @@
     <!-- http://en.wikipedia.org/wiki/%2B62 -->
     <territory id="ID">
       <generalDesc>
-        <nationalNumberPattern>[17]\d{2,4}</nationalNumberPattern>
+        <nationalNumberPattern>[178]\d{2,4}</nationalNumberPattern>
         <possibleNumberPattern>\d{3,5}</possibleNumberPattern>
       </generalDesc>
       <shortCode>
         <nationalNumberPattern>
           11[02389]|
-          71400
+          71400|
+          89887
         </nationalNumberPattern>
         <exampleNumber>112</exampleNumber>
       </shortCode>
       <carrierSpecific>
         <!-- https://support.google.com/plus/answer/1304917 -->
-        <nationalNumberPattern>71400</nationalNumberPattern>
+        <!-- https://support.twitter.com/articles/20170024 -->
+        <nationalNumberPattern>
+          71400|
+          89887
+        </nationalNumberPattern>
         <possibleNumberPattern>\d{5}</possibleNumberPattern>
         <exampleNumber>71400</exampleNumber>
       </carrierSpecific>
@@ -3540,23 +3999,35 @@
     <!-- Ireland -->
     <territory id="IE">
       <generalDesc>
-        <nationalNumberPattern>[19]\d{2}</nationalNumberPattern>
-        <possibleNumberPattern>\d{3}</possibleNumberPattern>
+        <nationalNumberPattern>[159]\d{2,4}</nationalNumberPattern>
+        <possibleNumberPattern>\d{3,5}</possibleNumberPattern>
       </generalDesc>
       <shortCode>
         <nationalNumberPattern>
           112|
+          51210|
           999
         </nationalNumberPattern>
         <exampleNumber>112</exampleNumber>
       </shortCode>
+      <carrierSpecific>
+        <!-- https://support.twitter.com/articles/20170024 -->
+        <nationalNumberPattern>51210</nationalNumberPattern>
+        <possibleNumberPattern>\d{5}</possibleNumberPattern>
+      </carrierSpecific>
       <emergency>
         <nationalNumberPattern>
           112|
           999
         </nationalNumberPattern>
+        <possibleNumberPattern>\d{3}</possibleNumberPattern>
         <exampleNumber>112</exampleNumber>
       </emergency>
+      <smsServices>
+        <!-- https://support.twitter.com/articles/20170024 -->
+        <nationalNumberPattern>51210</nationalNumberPattern>
+        <possibleNumberPattern>\d{5}</possibleNumberPattern>
+      </smsServices>
     </territory>
 
     <!-- Israel -->
@@ -3612,12 +4083,16 @@
     <!-- http://en.wikipedia.org/wiki/Telephone_numbers_in_the_United_Kingdom -->
     <territory id="IM">
       <generalDesc>
-        <nationalNumberPattern>[19]\d{2,5}</nationalNumberPattern>
+        <nationalNumberPattern>[189]\d{2,5}</nationalNumberPattern>
         <possibleNumberPattern>\d{3,6}</possibleNumberPattern>
       </generalDesc>
       <shortCode>
         <nationalNumberPattern>
           1\d{2}(?:\d{3})?|
+          8(?:
+            6444|
+            9887
+          )|
           999
         </nationalNumberPattern>
         <exampleNumber>150</exampleNumber>
@@ -3628,6 +4103,16 @@
         <possibleNumberPattern>\d{3}</possibleNumberPattern>
         <exampleNumber>999</exampleNumber>
       </emergency>
+      <smsServices>
+        <!-- https://support.twitter.com/articles/20170024 -->
+        <nationalNumberPattern>
+          8(?:
+            6444|
+            9887
+          )
+        </nationalNumberPattern>
+        <possibleNumberPattern>\d{5}</possibleNumberPattern>
+      </smsServices>
     </territory>
 
     <!-- India -->
@@ -3635,8 +4120,8 @@
     <!-- http://en.wikipedia.org/wiki/%2B91 -->
     <territory id="IN">
       <generalDesc>
-        <nationalNumberPattern>[12]\d{2,3}</nationalNumberPattern>
-        <possibleNumberPattern>\d{3,4}</possibleNumberPattern>
+        <nationalNumberPattern>[125]\d{2,4}</nationalNumberPattern>
+        <possibleNumberPattern>\d{3,5}</possibleNumberPattern>
       </generalDesc>
       <shortCode>
         <nationalNumberPattern>
@@ -3645,10 +4130,16 @@
             12|
             298
           )|
-          2611
+          2611|
+          53000
         </nationalNumberPattern>
         <exampleNumber>108</exampleNumber>
       </shortCode>
+      <carrierSpecific>
+        <!-- https://support.twitter.com/articles/20170024 -->
+        <nationalNumberPattern>53000</nationalNumberPattern>
+        <possibleNumberPattern>\d{5}</possibleNumberPattern>
+      </carrierSpecific>
       <emergency>
         <nationalNumberPattern>
           1(?:
@@ -3658,6 +4149,7 @@
           )|
           2611
         </nationalNumberPattern>
+        <possibleNumberPattern>\d{3,4}</possibleNumberPattern>
         <exampleNumber>108</exampleNumber>
       </emergency>
     </territory>
@@ -3669,8 +4161,8 @@
     <!-- Iraq -->
     <territory id="IQ">
       <generalDesc>
-        <nationalNumberPattern>1\d{2}</nationalNumberPattern>
-        <possibleNumberPattern>\d{3}</possibleNumberPattern>
+        <nationalNumberPattern>[1479]\d{2,4}</nationalNumberPattern>
+        <possibleNumberPattern>\d{3,5}</possibleNumberPattern>
       </generalDesc>
       <shortCode>
         <nationalNumberPattern>
@@ -3678,10 +4170,21 @@
             0[04]|
             15|
             22
-          )
+          )|
+          4432|
+          71117|
+          9988
         </nationalNumberPattern>
-        <exampleNumber>122</exampleNumber>
+        <exampleNumber>4432</exampleNumber>
       </shortCode>
+      <carrierSpecific>
+        <!-- https://support.twitter.com/articles/20170024 -->
+        <nationalNumberPattern>
+          4432|
+          71117|
+          9988
+        </nationalNumberPattern>
+      </carrierSpecific>
       <emergency>
         <!-- http://www.itu.int/net/itu-t/inrdb/e129_important_numbers.aspx?country=112 -->
         <nationalNumberPattern>
@@ -3691,8 +4194,17 @@
             22
           )
         </nationalNumberPattern>
+        <possibleNumberPattern>\d{3}</possibleNumberPattern>
         <exampleNumber>122</exampleNumber>
       </emergency>
+      <smsServices>
+        <!-- https://support.twitter.com/articles/20170024 -->
+        <nationalNumberPattern>
+          4432|
+          71117|
+          9988
+        </nationalNumberPattern>
+      </smsServices>
     </territory>
 
     <!-- Iran, Islamic Republic of -->
@@ -3934,19 +4446,24 @@
     <!-- http://www.itu.int/oth/T020200006C/en -->
     <territory id="JM">
       <generalDesc>
-        <nationalNumberPattern>
-          11\d{2}|
-          911
-        </nationalNumberPattern>
+        <nationalNumberPattern>[19]\d{2}</nationalNumberPattern>
         <possibleNumberPattern>\d{3}</possibleNumberPattern>
       </generalDesc>
       <shortCode>
         <nationalNumberPattern>
-          11[029]|
+          1(?:
+            1[029]|
+            76
+          )|
           911
         </nationalNumberPattern>
         <exampleNumber>911</exampleNumber>
       </shortCode>
+      <carrierSpecific>
+        <!-- https://support.twitter.com/articles/20170024 -->
+        <nationalNumberPattern>176</nationalNumberPattern>
+        <possibleNumberPattern>\d{3}</possibleNumberPattern>
+      </carrierSpecific>
       <emergency>
         <!-- http://www.itu.int/net/itu-t/inrdb/e129_important_numbers.aspx?country=116 -->
         <nationalNumberPattern>
@@ -3955,6 +4472,11 @@
         </nationalNumberPattern>
         <exampleNumber>112</exampleNumber>
       </emergency>
+      <smsServices>
+        <!-- https://support.twitter.com/articles/20170024 -->
+        <nationalNumberPattern>176</nationalNumberPattern>
+        <possibleNumberPattern>\d{3}</possibleNumberPattern>
+      </smsServices>
     </territory>
 
     <!-- Jordan -->
@@ -3963,8 +4485,8 @@
     <!-- http://en.wikipedia.org/wiki/%2B962 -->
     <territory id="JO">
       <generalDesc>
-        <nationalNumberPattern>[19]\d{2}</nationalNumberPattern>
-        <possibleNumberPattern>\d{3}</possibleNumberPattern>
+        <nationalNumberPattern>[19]\d{2,4}</nationalNumberPattern>
+        <possibleNumberPattern>\d{3,5}</possibleNumberPattern>
       </generalDesc>
       <shortCode>
         <nationalNumberPattern>
@@ -3973,20 +4495,50 @@
             1[0-2]|
             9[0-24-79]
           )|
-          911
+          9(?:
+            0903|
+            11|
+            8788
+          )
         </nationalNumberPattern>
         <exampleNumber>111</exampleNumber>
       </shortCode>
+      <carrierSpecific>
+        <!-- https://support.twitter.com/articles/20170024 -->
+        <nationalNumberPattern>
+          9(?:
+            0903|
+            8788
+          )
+          </nationalNumberPattern>
+        <possibleNumberPattern>\d{5}</possibleNumberPattern>
+      </carrierSpecific>
       <emergency>
+        <!-- 192 is only available in Amman, 197 in the suburbs. -->
         <nationalNumberPattern>
           1(?:
             12|
-            91
+            9[127]
           )|
           911
         </nationalNumberPattern>
+        <possibleNumberPattern>\d{3}</possibleNumberPattern>
         <exampleNumber>112</exampleNumber>
       </emergency>
+      <expandedEmergency>
+        <nationalNumberPattern>190</nationalNumberPattern>
+        <possibleNumberPattern>\d{3}</possibleNumberPattern>
+      </expandedEmergency>
+      <smsServices>
+        <!-- https://support.twitter.com/articles/20170024 -->
+        <nationalNumberPattern>
+          9(?:
+            0903|
+            8788
+          )
+          </nationalNumberPattern>
+        <possibleNumberPattern>\d{5}</possibleNumberPattern>
+      </smsServices>
     </territory>
 
     <!-- Japan -->
@@ -4012,7 +4564,7 @@
     <!-- http://en.wikipedia.org/wiki/+254 -->
     <territory id="KE">
       <generalDesc>
-        <nationalNumberPattern>[19]\d{2,4}</nationalNumberPattern>
+        <nationalNumberPattern>[1489]\d{2,4}</nationalNumberPattern>
         <possibleNumberPattern>\d{3,5}</possibleNumberPattern>
       </generalDesc>
       <shortCode>
@@ -4030,15 +4582,21 @@
             2[13]|
             3[01]
           )|
+          40404|
+          8988|
           999
         </nationalNumberPattern>
         <exampleNumber>116</exampleNumber>
       </shortCode>
       <carrierSpecific>
         <!-- https://support.google.com/plus/answer/1304917 -->
-        <nationalNumberPattern>10400</nationalNumberPattern>
-        <possibleNumberPattern>\d{5}</possibleNumberPattern>
-        <exampleNumber>10400</exampleNumber>
+        <!-- https://support.twitter.com/articles/20170024 -->
+        <nationalNumberPattern>
+          10400|
+          40404|
+          8988
+        </nationalNumberPattern>
+        <possibleNumberPattern>\d{4,5}</possibleNumberPattern>
       </carrierSpecific>
       <emergency>
         <!-- http://www.kenyapolice.go.ke/report_a_crime.asp -->
@@ -4050,10 +4608,13 @@
         <exampleNumber>999</exampleNumber>
       </emergency>
       <smsServices>
-        <!-- https://support.google.com/plus/answer/1304917 -->
-        <nationalNumberPattern>10400</nationalNumberPattern>
-        <possibleNumberPattern>\d{5}</possibleNumberPattern>
-        <exampleNumber>10400</exampleNumber>
+        <!-- https://support.twitter.com/articles/20170024 -->
+        <nationalNumberPattern>
+          10400|
+          40404|
+          8988
+        </nationalNumberPattern>
+        <possibleNumberPattern>\d{4,5}</possibleNumberPattern>
       </smsServices>
     </territory>
 
@@ -4061,17 +4622,31 @@
     <!-- http://www.itu.int/oth/T0202000074/en -->
     <territory id="KG">
       <generalDesc>
-        <nationalNumberPattern>1\d{2}</nationalNumberPattern>
-        <possibleNumberPattern>\d{3}</possibleNumberPattern>
+        <nationalNumberPattern>[14]\d{2,3}</nationalNumberPattern>
+        <possibleNumberPattern>\d{3,4}</possibleNumberPattern>
       </generalDesc>
       <shortCode>
-        <nationalNumberPattern>10[123]</nationalNumberPattern>
+        <nationalNumberPattern>
+          10[123]|
+          4040
+        </nationalNumberPattern>
         <exampleNumber>101</exampleNumber>
       </shortCode>
+      <carrierSpecific>
+        <!-- https://support.twitter.com/articles/20170024 -->
+        <nationalNumberPattern>4040</nationalNumberPattern>
+        <possibleNumberPattern>\d{4}</possibleNumberPattern>
+      </carrierSpecific>
       <emergency>
         <nationalNumberPattern>10[123]</nationalNumberPattern>
+        <possibleNumberPattern>\d{3}</possibleNumberPattern>
         <exampleNumber>101</exampleNumber>
       </emergency>
+      <smsServices>
+        <!-- https://support.twitter.com/articles/20170024 -->
+        <nationalNumberPattern>4040</nationalNumberPattern>
+        <possibleNumberPattern>\d{4}</possibleNumberPattern>
+      </smsServices>
     </territory>
 
     <!-- Cambodia -->
@@ -4079,28 +4654,43 @@
     <!-- http://en.wikipedia.org/wiki/+855 -->
     <territory id="KH">
       <generalDesc>
-        <nationalNumberPattern>[16]\d{2}</nationalNumberPattern>
-        <possibleNumberPattern>\d{3}</possibleNumberPattern>
+        <nationalNumberPattern>[146]\d{2,4}</nationalNumberPattern>
+        <possibleNumberPattern>\d{3,5}</possibleNumberPattern>
       </generalDesc>
       <shortCode>
         <nationalNumberPattern>
           11[789]|
+          40404|
           666
         </nationalNumberPattern>
         <exampleNumber>117</exampleNumber>
       </shortCode>
+      <carrierSpecific>
+        <!-- https://support.twitter.com/articles/20170024 -->
+        <nationalNumberPattern>40404</nationalNumberPattern>
+        <possibleNumberPattern>\d{5}</possibleNumberPattern>
+      </carrierSpecific>
       <emergency>
         <!-- http://www.phnompenh.gov.kh/phnom-penh-city-emergency-numbers-24-hrs-169.html -->
         <nationalNumberPattern>
           11[789]|
           666
         </nationalNumberPattern>
+        <possibleNumberPattern>\d{3}</possibleNumberPattern>
         <exampleNumber>117</exampleNumber>
       </emergency>
+      <smsServices>
+        <!-- https://support.twitter.com/articles/20170024 -->
+        <nationalNumberPattern>40404</nationalNumberPattern>
+        <possibleNumberPattern>\d{5}</possibleNumberPattern>
+      </smsServices>
     </territory>
 
     <!-- Kiribati -->
-    <!-- http://www.itu.int/oth/T0202000071/en -->
+    <!-- http://www.itu.int/oth/T0202000071/en - these conflict with those
+         registered at
+         http://www.itu.int/net/itu-t/inrdb/e129_important_numbers.aspx?country=123&pg_size=50 but
+         were updated later. -->
     <territory id="KI">
       <generalDesc>
         <nationalNumberPattern>[19]\d{2,3}</nationalNumberPattern>
@@ -4116,6 +4706,17 @@
         </nationalNumberPattern>
         <exampleNumber>100</exampleNumber>
       </shortCode>
+      <standardRate>
+        <!-- http://www.tskl.net.ki/910_operator.php - charged at $0.20 per call. -->
+        <nationalNumberPattern>103</nationalNumberPattern>
+        <possibleNumberPattern>\d{3}</possibleNumberPattern>
+        <exampleNumber>103</exampleNumber>
+      </standardRate>
+      <directoryServices>
+        <nationalNumberPattern>103</nationalNumberPattern>
+        <possibleNumberPattern>\d{3}</possibleNumberPattern>
+        <exampleNumber>103</exampleNumber>
+      </directoryServices>
       <emergency>
         <!-- www.tskl.net.ki/directory.pdf -->
         <nationalNumberPattern>99[2349]</nationalNumberPattern>
@@ -4200,15 +4801,24 @@
     <!-- http://www.itu.int/oth/T0202000073/en -->
     <territory id="KW">
       <generalDesc>
-        <nationalNumberPattern>1\d{2}</nationalNumberPattern>
-        <possibleNumberPattern>\d{3}</possibleNumberPattern>
+        <nationalNumberPattern>[18]\d{2,4}</nationalNumberPattern>
+        <possibleNumberPattern>\d{3,5}</possibleNumberPattern>
       </generalDesc>
       <shortCode>
-        <nationalNumberPattern>1\d{2}</nationalNumberPattern>
+        <nationalNumberPattern>
+          1\d{2}|
+          89887
+        </nationalNumberPattern>
         <exampleNumber>177</exampleNumber>
       </shortCode>
+      <carrierSpecific>
+        <!-- https://support.twitter.com/articles/20170024 -->
+        <nationalNumberPattern>89887</nationalNumberPattern>
+        <possibleNumberPattern>\d{5}</possibleNumberPattern>
+      </carrierSpecific>
       <emergency>
         <nationalNumberPattern>112</nationalNumberPattern>
+        <possibleNumberPattern>\d{3}</possibleNumberPattern>
         <exampleNumber>112</exampleNumber>
       </emergency>
     </territory>
@@ -4234,7 +4844,7 @@
     <!-- http://www.itu.int/oth/T020200006F/en -->
     <territory id="KZ">
       <generalDesc>
-        <nationalNumberPattern>[13]\d{2,4}</nationalNumberPattern>
+        <nationalNumberPattern>[134]\d{2,4}</nationalNumberPattern>
         <possibleNumberPattern>\d{3,5}</possibleNumberPattern>
       </generalDesc>
       <shortCode>
@@ -4243,14 +4853,19 @@
             0[123]|
             12
           )|
-          30400
+          30400|
+          4040
         </nationalNumberPattern>
         <exampleNumber>112</exampleNumber>
       </shortCode>
       <carrierSpecific>
         <!-- https://support.google.com/plus/answer/1304917 -->
-        <nationalNumberPattern>30400</nationalNumberPattern>
-        <possibleNumberPattern>\d{5}</possibleNumberPattern>
+        <!-- https://support.twitter.com/articles/20170024 -->
+        <nationalNumberPattern>
+          30400|
+          4040
+        </nationalNumberPattern>
+        <possibleNumberPattern>\d{4,5}</possibleNumberPattern>
         <exampleNumber>30400</exampleNumber>
       </carrierSpecific>
       <emergency>
@@ -4265,8 +4880,12 @@
       </emergency>
       <smsServices>
         <!-- https://support.google.com/plus/answer/1304917 -->
-        <nationalNumberPattern>30400</nationalNumberPattern>
-        <possibleNumberPattern>\d{5}</possibleNumberPattern>
+        <!-- https://support.twitter.com/articles/20170024 -->
+        <nationalNumberPattern>
+          30400|
+          4040
+        </nationalNumberPattern>
+        <possibleNumberPattern>\d{4,5}</possibleNumberPattern>
         <exampleNumber>30400</exampleNumber>
       </smsServices>
     </territory>
@@ -4420,20 +5039,31 @@
     <!-- http://www.itu.int/oth/T0202000079/en -->
     <territory id="LR">
       <generalDesc>
-        <nationalNumberPattern>[389]\d{2,3}</nationalNumberPattern>
+        <nationalNumberPattern>[3489]\d{2,3}</nationalNumberPattern>
         <possibleNumberPattern>\d{3,4}</possibleNumberPattern>
       </generalDesc>
       <shortCode>
         <nationalNumberPattern>
           355|
-          8400|
+          4040|
+          8(?:
+            400|
+            933
+          )|
           911
         </nationalNumberPattern>
         <exampleNumber>911</exampleNumber>
       </shortCode>
       <carrierSpecific>
         <!-- https://support.google.com/plus/answer/1304917 -->
-        <nationalNumberPattern>8400</nationalNumberPattern>
+        <!-- https://support.twitter.com/articles/20170024 -->
+        <nationalNumberPattern>
+          4040|
+          8(?:
+            400|
+            933
+          )
+        </nationalNumberPattern>
         <possibleNumberPattern>\d{4}</possibleNumberPattern>
         <exampleNumber>8400</exampleNumber>
       </carrierSpecific>
@@ -4447,8 +5077,14 @@
         <exampleNumber>911</exampleNumber>
       </emergency>
       <smsServices>
-        <!-- https://support.google.com/plus/answer/1304917 -->
-        <nationalNumberPattern>8400</nationalNumberPattern>
+        <!-- https://support.twitter.com/articles/20170024 -->
+        <nationalNumberPattern>
+          4040|
+          8?(:
+            400|
+            933
+          )
+        </nationalNumberPattern>
         <possibleNumberPattern>\d{4}</possibleNumberPattern>
         <exampleNumber>8400</exampleNumber>
       </smsServices>
@@ -6701,17 +7337,31 @@
     <!-- http://www.itu.int/oth/T020200003F/en -->
     <territory id="SV">
       <generalDesc>
-        <nationalNumberPattern>9\d{2}</nationalNumberPattern>
-        <possibleNumberPattern>\d{3}</possibleNumberPattern>
+        <nationalNumberPattern>[49]\d{2,4}</nationalNumberPattern>
+        <possibleNumberPattern>\d{3,5}</possibleNumberPattern>
       </generalDesc>
       <shortCode>
-        <nationalNumberPattern>911</nationalNumberPattern>
+        <nationalNumberPattern>
+          40404|
+          911
+        </nationalNumberPattern>
         <exampleNumber>911</exampleNumber>
       </shortCode>
+      <carrierSpecific>
+        <!-- https://support.twitter.com/articles/20170024 -->
+        <nationalNumberPattern>40404</nationalNumberPattern>
+        <possibleNumberPattern>\d{5}</possibleNumberPattern>
+      </carrierSpecific>
       <emergency>
         <nationalNumberPattern>911</nationalNumberPattern>
+        <possibleNumberPattern>\d{3}</possibleNumberPattern>
         <exampleNumber>911</exampleNumber>
       </emergency>
+      <smsServices>
+        <!-- https://support.twitter.com/articles/20170024 -->
+        <nationalNumberPattern>40404</nationalNumberPattern>
+        <possibleNumberPattern>\d{5}</possibleNumberPattern>
+      </smsServices>
     </territory>
 
     <!-- Sint Maarten -->
diff --git a/carrier/ar/965.txt b/carrier/ar/965.txt
new file mode 100644
index 0000000..c70da8f
--- /dev/null
+++ b/carrier/ar/965.txt
@@ -0,0 +1,17 @@
+# Copyright (C) 2013 The Libphonenumber Authors
+
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+
+# http://www.apache.org/licenses/LICENSE-2.0
+
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+9655|فيفا
+9656|الوطنية
+9659|زين
diff --git a/carrier/be/375.txt b/carrier/be/375.txt
new file mode 100644
index 0000000..c706d40
--- /dev/null
+++ b/carrier/be/375.txt
@@ -0,0 +1,28 @@
+# Copyright (C) 2013 The Libphonenumber Authors
+
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+
+# http://www.apache.org/licenses/LICENSE-2.0
+
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# http://be.wikipedia.org/wiki/%D0%A2%D1%8D%D0%BB%D0%B5%D1%84%D0%BE%D0%BD%D0%BD%D1%8B_%D0%BF%D0%BB%D0%B0%D0%BD_%D0%BD%D1%83%D0%BC%D0%B0%D1%80%D0%B0%D1%86%D1%8B%D1%96_%D0%91%D0%B5%D0%BB%D0%B0%D1%80%D1%83%D1%81%D1%96
+
+37525|БеСТ
+375291|Velcom
+375292|МТС
+375293|Velcom
+375294|БелСел
+375295|МТС
+375296|Velcom
+375297|МТС
+375298|МТС
+375299|Velcom
+37533|МТС
+37544|Velcom
diff --git a/carrier/en/225.txt b/carrier/en/225.txt
index a679dd8..2aa7110 100644
--- a/carrier/en/225.txt
+++ b/carrier/en/225.txt
@@ -12,7 +12,11 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-# Source: Prefixes 60, 66 and 67 from Wikipedia, 69 from ITU.
+# Source: Prefixes 60, 66, 67, 69 & 77 from ITU, 56 from www.atci.ci.
+# 61 came from an open-source bug report, and 65 is on Comium's own website.
+# Atlantic Telecom is listed in the ITU doc, but Moov is the name of their
+# mobile phone operator company. Similarly, KoZ is the brand name for Comium and
+# GreenN for Oricel. Aircomm appears to be a typo for Aircom.
 
 22501|Moov
 22502|Moov
@@ -33,11 +37,14 @@
 22548|Orange
 22549|Orange
 22555|MTN
+22556|MTN
 22557|Orange
 22558|Orange
 22559|Orange
 22560|GreenN
 22561|GreenN
+22565|KoZ
 22566|KoZ
 22567|KoZ
 22569|Aircom
+22577|Orange
diff --git a/carrier/en/256.txt b/carrier/en/256.txt
index 8d7f92e..4e2bc1a 100644
--- a/carrier/en/256.txt
+++ b/carrier/en/256.txt
@@ -12,9 +12,13 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-25639|MTN
+25670|Warid
 25671|UTL
+256720|Smile
+256730|K2
+25674|Sure Telecom
 25675|Airtel
+25676|i-Tel
 25677|MTN
 25678|MTN
 25679|Orange
diff --git a/carrier/en/257.txt b/carrier/en/257.txt
index ff2a8d3..730f18d 100644
--- a/carrier/en/257.txt
+++ b/carrier/en/257.txt
@@ -12,10 +12,13 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+# Leo is the brand name for Ucom in the ITU doc & Smart Mobile for LA Cell.
+# Tempo is the brand name for Africell.
+
 25729|Leo
 25771|Leo
 25775|Smart Mobile
-25776|Spacetel
+25776|Econet
 25777|Onatel
 25778|Tempo
 25779|Leo
diff --git a/carrier/en/261.txt b/carrier/en/261.txt
index 90d8f15..358081b 100644
--- a/carrier/en/261.txt
+++ b/carrier/en/261.txt
@@ -15,3 +15,4 @@
 26132|Orange
 26133|Airtel
 26134|Telma
+26139|Blueline
diff --git a/carrier/en/375.txt b/carrier/en/375.txt
index 19046c9..0d8b7e8 100644
--- a/carrier/en/375.txt
+++ b/carrier/en/375.txt
@@ -12,16 +12,17 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-375259|life:)
-375291|velcom
+# Diallog operates as Belcel.
+
+37525|life:)
+375291|Velcom
 375292|MTS
-375293|velcom
+375293|Velcom
+375294|Belcel
 375295|MTS
-375296|velcom
+375296|Velcom
 375297|MTS
 375298|MTS
-375299|velcom
-375336|MTS
-375444|velcom
-375445|velcom
-375447|velcom
+375299|Velcom
+37533|MTS
+37544|Velcom
diff --git a/carrier/en/389.txt b/carrier/en/389.txt
new file mode 100644
index 0000000..1a9c522
--- /dev/null
+++ b/carrier/en/389.txt
@@ -0,0 +1,26 @@
+# Copyright (C) 2013 The Libphonenumber Authors
+
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+
+# http://www.apache.org/licenses/LICENSE-2.0
+
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# The name of the company to which prefix 7421 is assigned is listed as MVNO
+# MOBIK TELEKOMUNIKACII in the ITU document - we are not sure what company this
+# is so have omitted it for now.
+
+38970|T-Mobile
+38971|T-Mobile
+38972|T-Mobile
+389732|Albafone
+38975|One
+38976|One
+38977|vip
+38978|vip
diff --git a/carrier/en/57.txt b/carrier/en/57.txt
index 377ec45..e29eb72 100644
--- a/carrier/en/57.txt
+++ b/carrier/en/57.txt
@@ -12,14 +12,23 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-5730|Tigo
+57300|Tigo
+57301|Tigo
+57302|Tigo
+57303|Uff!
+57304|Une
+57305|Movil Exito
 57310|Claro
 57311|Claro
 57312|Claro
 57313|Claro
 57314|Claro
-57315|movistar
-57316|movistar
-57317|movistar
-57318|movistar
-5732|Claro
+57315|Movistar
+57316|Movistar
+57317|Movistar
+57318|Movistar
+57319|Virgin Mobile
+57320|Claro
+57321|Claro
+57350|Avantel
+57351|Avantel
diff --git a/carrier/en/599.txt b/carrier/en/599.txt
new file mode 100644
index 0000000..34a9e2b
--- /dev/null
+++ b/carrier/en/599.txt
@@ -0,0 +1,47 @@
+# Copyright (C) 2013 The Libphonenumber Authors
+
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+
+# http://www.apache.org/licenses/LICENSE-2.0
+
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# Antillano Por, in the document, should be Antilliano Por, and seems to be
+# operating as Digicel, based on news articles.
+# d.b.a stands for "doing business as".
+# Setel became UTS in 1999, and their mobile brand is Chippie.
+
+599700|Digicel
+599701|Digicel
+599770|Telbo N.V.
+599777|Telbo N.V.
+59978|Digicel
+59979|PCS
+5994161|Satel
+5994165|WIC
+5994166|WIC
+5994167|WIC
+5994168|WIC
+5994169|Satel
+5993181|Eutel/Radcomm
+5993184|Eutel/Radcomm
+5993185|Eutel/Radcomm
+5993186|Eutel/Telcell
+5993188|Eutel N.V.
+599951|Chippie
+599952|Chippie
+599953|Chippie
+599954|Chippie
+599956|Chippie
+599961|CSC
+599963|GSM Caribbean
+599966|Digicel
+599967|Digicel
+599968|Digicel
+599969|Digicel
diff --git a/carrier/en/61.txt b/carrier/en/61.txt
index b02edc5..122bebf 100644
--- a/carrier/en/61.txt
+++ b/carrier/en/61.txt
@@ -37,45 +37,47 @@
 61422|Optus
 61423|Optus
 61424|Vodafone
+61425|Vodafone
 61426|Vodafone
 61427|Telstra
 61428|Telstra
 61429|Telstra
-61430|3
+61430|Vodafone
 61431|Optus
 61432|Optus
-61433|3
+61433|Vodafone
 61434|Optus
-61436|Vodafone
+61435|Optus
 61437|Telstra
 61438|Telstra
 61439|Telstra
+614444|Telstra
 61447|Telstra
 61448|Telstra
 61449|Vodafone
 61450|Vodafone
 61451|Vodafone
+61452|Vodafone
+61455|Telstra
+61456|Telstra
 61457|Telstra
 61458|Telstra
-614590|Telstra
-614591|Telstra
-614592|Telstra
-61462|Telstra
-614660|Optus
-614661|Optus
-614662|Optus
-614663|Optus
-614664|Optus
-614665|Optus
-614666|Optus
-614671|Optus
-614685|Optus
-614686|Optus
-614687|Optus
-614688|Optus
-614689|Optus
-61469|Telstra
-61483|Optus
-61485|Telstra
+61459|Telstra
+61466|Optus
+61467|Telstra
+61468|Optus
+61469|Lycamobile
+61470|Lycamobile
+61474|Telstra
+61475|Telstra
+61477|Telstra
+61478|Optus
+614790|Optus
+614791|Optus
+61481|Optus
+61487|Telstra
 61488|Telstra
-61489|Telstra
+61490|Telstra
+61497|Telstra
+61498|Telstra
+61499|Telstra
diff --git a/carrier/en/686.txt b/carrier/en/686.txt
index 32dd9cf..5b1c790 100644
--- a/carrier/en/686.txt
+++ b/carrier/en/686.txt
@@ -12,5 +12,9 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-6866|Kiribati - Frigate Net
-6869|Kiribati - Frigate Net
+# According to Wikipedia, the only carrier is TSKL (Telecom Services Kiribati Limited)
+# http://en.wikipedia.org/wiki/TSKL
+
+6866|TSKL
+6867|TSKL
+6869|TSKL
diff --git a/carrier/en/92.txt b/carrier/en/92.txt
index c796104..6c39559 100644
--- a/carrier/en/92.txt
+++ b/carrier/en/92.txt
@@ -33,6 +33,7 @@
 92334|Ufone
 92335|Ufone
 92336|Ufone
+92337|Ufone
 92341|Telenor
 92342|Telenor
 92343|Telenor
diff --git a/carrier/en/962.txt b/carrier/en/962.txt
index 0dd6a5e..2470e4e 100644
--- a/carrier/en/962.txt
+++ b/carrier/en/962.txt
@@ -15,4 +15,4 @@
 96274|XPress JO
 96277|Orange
 96278|Umniah
-96279|zain JO
+96279|Zain JO
diff --git a/carrier/en/965.txt b/carrier/en/965.txt
index 8107f18..c97bd8f 100644
--- a/carrier/en/965.txt
+++ b/carrier/en/965.txt
@@ -12,26 +12,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-965500|Viva
-965501|Wataniya
-965502|Wataniya
-965505|Viva
-965506|Wataniya
-965507|Wataniya
-965508|Wataniya
-965509|Wataniya
-96551|Wataniya
-96555|Viva
-96557|Wataniya
-96558|Wataniya
-96559|Wataniya
-96560|Wataniya
-96565|Wataniya
-96566|Wataniya
-96567|Wataniya
-96570|Wataniya
-96577|Wataniya
-96590|zain KW
-96594|zain KW
-96597|zain KW
-96599|zain KW
+9655|VIVA
+9656|Wataniya
+9659|Zain
diff --git a/carrier/ru/375.txt b/carrier/ru/375.txt
new file mode 100644
index 0000000..c0e7da3
--- /dev/null
+++ b/carrier/ru/375.txt
@@ -0,0 +1,28 @@
+# Copyright (C) 2013 The Libphonenumber Authors
+
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+
+# http://www.apache.org/licenses/LICENSE-2.0
+
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# http://ru.wikipedia.org/wiki/%D0%A2%D0%B5%D0%BB%D0%B5%D1%84%D0%BE%D0%BD%D0%BD%D1%8B%D0%B9_%D0%BF%D0%BB%D0%B0%D0%BD_%D0%BD%D1%83%D0%BC%D0%B5%D1%80%D0%B0%D1%86%D0%B8%D0%B8_%D0%91%D0%B5%D0%BB%D0%BE%D1%80%D1%83%D1%81%D1%81%D0%B8%D0%B8
+
+37525|life:)
+375291|Velcom
+375292|МТС
+375293|Velcom
+375294|БелСел
+375295|МТС
+375296|Velcom
+375297|МТС
+375298|МТС
+375299|Velcom
+37533|МТС
+37544|Velcom
diff --git a/geocoding/be/375.txt b/geocoding/be/375.txt
index d0c50a1..2e25309 100644
--- a/geocoding/be/375.txt
+++ b/geocoding/be/375.txt
@@ -136,7 +136,6 @@
 3752346|Хойнікі, Гомельская вобласць
 3752347|Лоеў, Гомельская вобласць
 3752350|Петрыкаў, Гомельская вобласць
-3752351|Мазыр
 3752353|Жыткавічы, Гомельская вобласць
 3752354|Ельск, Гомельская вобласць
 3752355|Нароўля, Гомельская вобласць
diff --git a/geocoding/en/257.txt b/geocoding/en/257.txt
new file mode 100644
index 0000000..f7f189f
--- /dev/null
+++ b/geocoding/en/257.txt
@@ -0,0 +1,28 @@
+# Copyright (C) 2013 The Libphonenumber Authors
+
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+
+# http://www.apache.org/licenses/LICENSE-2.0
+
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# Generated from:
+# http://www.itu.int/dms_pub/itu-t/oth/02/02/T02020000220001PDFE.pdf
+
+2572220|Bujumbura
+2572221|Bujumbura
+2572222|Bujumbura
+2572223|Bujumbura
+2572224|Bujumbura
+2572225|Bujumbura
+2572226|West zone
+2572227|Rural areas
+2572230|North zone
+2572240|Central east zone
+2572250|South zone
diff --git a/geocoding/en/264.txt b/geocoding/en/264.txt
index ee8f7b8..7aebdb3 100644
--- a/geocoding/en/264.txt
+++ b/geocoding/en/264.txt
@@ -13,25 +13,1034 @@
 # limitations under the License.
 
 # Generated from:
-# http://en.wikipedia.org/wiki/+264 [429639059]
+# ITU - http://www.itu.int/dms_pub/itu-t/oth/02/02/T02020000930001PDFE.pdf
+# Typo corrected: Wilhelmstal.
 
 26461|Windhoek
-264621|Okahandja
-264626|Windhoek International Airport
-264627|Rehoboth
-264629|Uis
-264631|Keetmanshoop
-2646331|Lüderitz
-2646332|Oranjemund
-2646342|Karasburg
-26464|Swakopmund, Walvis Bay
-264651|Otjiwarongo
-2646542|Outjo
-264661|Mariental
-264671|Tsumeb
-264672|Kombat
-2646731|Grootfontein
-2646752|Oshakati
-2646762|Ondangwa
-264681|Gobabis
-264683|Witvlei
+264621730|Babi-Babi
+264621732|Buitepos
+264621734|Drimiopsis
+264621735|Eland
+264621737|Friedental
+264621738|Gobabis
+264621739|Gobabis
+264621740|Gobabis
+264621741|Groot–Aub
+264621743|Hochland
+264621746|Many Hills
+264621747|Namib Grens
+264621748|Nina
+264621750|Okahandja
+264621751|Okahandja
+264621752|Okahandja
+264621754|Ombotozu
+264621755|Omitara
+264621756|Otjihase
+264621759|Otjozondu
+264621760|Plessisplaas
+264621761|Rehoboth
+264621762|Rehoboth
+264621763|Rehoboth
+264621766|Sandveld
+264621767|Seeis
+264621768|Spatzenfeld
+264621769|Steinhausen
+264621770|Summerdown
+264621771|Hosea Kutako INT Airport
+264621772|Witvlei
+26462500|Okahandja
+26462501|Okahandja
+26462502|Okahandja
+26462503|Okahandja/Ovitoto/Wilhelmstal
+26462504|Okahandja
+26462505|Okahandja
+264625180|Otjozondu
+264625181|Otjozondu
+264625183|Ombotozu
+264625184|Ombotozu
+26462519|Okandjatu
+26462522|Rehoboth
+26462523|Rehoboth
+26462524|Rehoboth
+26462525|Rehoboth
+264625390|Klein Aub
+264625391|Klein Aub
+264625392|Rietoog
+264625393|Rietoog
+26462540|Neudamm/Hosea Kutako INT Airport
+264625410|Otjihase
+264625411|Otjihase
+264625420|Groot–Aub
+264625421|Groot–Aub
+264625430|Hosea Kutako INT Airport
+264625434|Hosea Kutako INT Airport
+264625435|Hosea Kutako INT Airport
+26462549|Hochfeld
+264625600|Seeis
+264625601|Seeis
+264625602|Omitara
+264625603|Omitara
+264625604|Buitepos
+264625605|Otjiwa
+264625606|Otjiwa
+264625607|Otjiwa
+264625608|Otjiwa
+264625609|Otjiwa
+264625610|Otjiwa
+264625611|Otjiwa
+264625612|Otjiwa
+264625613|Otjiwa
+264625614|Steinhausen
+264625615|Steinhausen
+264625616|Summerdown
+264625617|Summerdown
+264625618|Summerdown
+26462562|Gobabis
+26462563|Gobabis
+26462564|Gobabis
+26462565|Gobabis
+26462566|Gobabis
+264625672|Epukiro
+264625673|Epukiro
+264625674|Epukiro
+264625675|Otjinene
+264625676|Otjinene
+264625677|Otjinene
+264625678|Otjinene
+264625679|Otjinene
+264625680|Drimiopsis
+264625681|Drimiopsis
+264625682|Plessisplaas
+264625683|Plessisplaas
+264625684|Sandveld
+264625685|Sandveld
+264625686|Epukiro
+264625687|Epukiro
+264625688|Epukiro
+264625689|Babi-Babi
+264625690|Babi-Babi
+264625691|Leonardville
+264625692|Leonardville
+264625693|Leonardville
+264625694|Leonardville
+264625695|Leonardville
+264625696|Leonardville
+264625697|Blumfelde
+264625698|Blumfelde
+264625700|Witvlei
+264625701|Witvlei
+264625702|Witvlei
+264625703|Witvlei
+264625704|Witvlei
+264625709|Witvlei
+264625715|Eland
+264625716|Eland
+264625717|Spatzenfeld
+264625718|Spatzenfeld
+264625720|Namib Grens
+264625721|Friedental
+264625722|Hochland
+264625723|Many Hills
+264625731|Nina
+264625733|Nouas
+26462573|Dordabis
+26462577|Gobabis
+264625800|Epukiro
+264625801|Epukiro
+264625802|Epukiro
+264625803|Epukiro
+264625804|Eland
+264625805|Drimiopsis
+264625806|Summerdown
+264625807|Plessisplaas
+264625808|Otjinene
+264625809|Otjiwa
+264625810|Leonardville
+264625811|Leonardville
+264625812|Blumfelde
+264625813|Blumfelde
+264625814|Nouas
+264625815|Nouas
+264625816|Nina
+264625817|Nina
+264625818|Dordabis
+264625819|Dordabis
+26462692|Central
+264627024|Hosea Kutako INT Airport
+264627025|Hosea Kutako INT Airport
+264631701|Aminuis
+264631702|Aminuis
+264631703|Aranos
+264631704|Ariamsvlei
+264631706|Asab
+264631709|Bethanie
+264631710|Bethanie
+264631711|Bralano
+264631712|Bulwana
+264631713|Dawiab
+264631714|Deurstamp
+264631715|Feldschuhorn
+264631717|Gibeon
+264631718|Goageb
+264631719|Gochas
+264631720|Grenslyn
+264631722|Guibis
+264631723|Hamab
+264631724|Helmeringhausen
+264631725|Hoachanas
+264631727|Kalahariplaas
+264631728|Kalkrand
+264631729|Kalkrand
+264631730|Karasburg
+264631731|Karasburg
+264631732|Karasburg
+264631733|Karasburg
+264631734|Karasburg
+264631735|Keetmanshoop
+264631736|Keetmanshoop
+264631737|Keetmanshoop
+264631738|Keetmanshoop
+264631739|Keetmanshoop
+264631740|Klein Karas
+264631743|Lorelei
+264631744|Luderitz
+264631745|Luderitz
+264631746|Luderitz
+264631747|Luderitz
+264631748|Luderitz
+264631749|Maltahohe
+264631750|Maltahohe
+264631751|Mariental
+264631752|Mariental
+264631753|Mariental
+264631754|Mariental
+264631755|Mariental
+264631759|Noordoewer
+264631760|Noordoewer
+264631762|Oamseb
+264631763|Oranjemund
+264631764|Oranjemund
+264631765|Oranjemund
+264631766|Oranjemund
+264631767|Oranjemund
+264631769|Rosh Pinah
+264631770|Rosh Pinah
+264631771|Schilp
+264631772|Seeheim
+264631774|Stampriet
+264631775|Stinkdoring
+264631776|Tses
+264631777|Tsumispark
+264631778|Uhabis
+264631779|Warmbad
+26463200|Luderitz
+26463201|Luderitz
+26463202|Luderitz
+26463203|Luderitz
+26463204|Luderitz
+26463207|Luderitz
+26463210|Luderitz
+26463220|Keetmanshoop
+26463221|Keetmanshoop
+26463222|Keetmanshoop
+26463223|Keetmanshoop
+26463224|Keetmanshoop
+264632260|Keetmanshoop
+264632261|Keetmanshoop
+264632264|Deurstamp
+264632267|Feldschuhorn
+26463227|Keetmanshoop
+26463228|Keetmanshoop
+26463229|Keetmanshoop
+264632300|Oranjemund
+264632307|Oranjemund
+264632308|Oranjemund
+264632309|Oranjemund
+26463232|Oranjemund
+26463233|Oranjemund
+26463234|Oranjemund
+26463235|Oranjemund
+26463236|Oranjemund
+26463237|Oranjemund
+264632380|Oranjemund
+264632381|Oranjemund
+264632382|Luderitz
+264632383|Luderitz
+264632384|Oranjemund
+264632385|Oranjemund
+264632386|Oranjemund
+264632387|Oranjemund
+264632389|Luderitz - Elizabeth Bay
+26463239|Oranjemund
+264632403|Mariental
+264632404|Mariental
+264632405|Mariental
+264632406|Mariental
+264632407|Mariental
+264632408|Mariental
+264632409|Mariental
+26463241|Mariental
+26463242|Mariental
+26463243|Mariental
+26463244|Mariental
+26463246|Mariental
+26463247|Mariental
+26463248|Mariental
+264632492|Mariental
+264632500|Gochas
+264632501|Gochas
+264632502|Gochas
+264632505|Seeheim
+264632507|Narubis
+26463251|Gibeon
+264632520|Grenslyn
+264632522|Asab
+264632523|Asab
+264632524|Bulwana
+26463257|Tses
+264632580|Aus
+264632581|Aus
+264632583|Guibis
+264632589|Aus
+26463260|Stampriet
+264632610|Oamseb
+264632611|Oamseb
+26463262|Grunau
+26463264|Kalkrand
+264632650|Schilp
+264632651|Schilp
+264632653|Hoachanas
+264632654|Hoachanas
+264632655|Tsumispark
+264632656|Tsumispark
+264632657|Tsumispark
+264632660|Klein Karas
+264632690|Warmbad
+264632691|Warmbad
+264632693|Hamab
+264632696|Stinkdoring
+264632699|Uhabis
+26463270|Karasburg
+264632711|Karasburg
+264632712|Karasburg
+264632714|Karasburg
+264632718|Karasburg
+264632719|Karasburg
+26463272|Aranos
+264632730|Aminuis
+264632731|Aminuis
+264632732|Aminuis
+264632733|Aminuis
+26463274|Rosh Pinah
+264632750|Kalahariplaas
+264632752|Bralano
+264632753|Bralano
+264632754|Bralano
+264632768|Aranos
+264632769|Aranos
+264632800|Ariamsvlei
+264632801|Ariamsvlei
+264632803|Dawiab
+264632805|Aroab
+264632806|Aroab
+264632807|Aroab
+264632808|Kais
+264632809|Ariamsvlei
+264632810|Köes
+264632811|Gaibis
+264632812|Deurstamp
+264632830|Bethanie
+264632831|Bethanie
+264632833|Helmeringhausen
+264632835|Goageb
+264632837|Lorelei
+264632839|Bethanie
+264632849|Bethanie
+264632900|Rosh Pinah
+264632901|Rosh Pinah
+264632902|Rosh Pinah
+26463293|Maltahohe/Solitaire
+264632942|Kumakams
+264632950|Namgorab
+26463297|Noordoewer
+26463345|Mariental
+26463626|Helmeringhausen
+26463693|South
+264637034|Keetmanshoop
+264637035|Luderitz
+264637100|Keetmanshoop
+264637130|Keetmanshoop
+264637180|Keetmanshoop
+264637181|Keetmanshoop
+264637182|Keetmanshoop
+264637183|Keetmanshoop
+264637184|Keetmanshoop
+264637185|Keetmanshoop
+264637190|Keetmanshoop
+264637191|Keetmanshoop
+264637192|Keetmanshoop
+26463811|Keetmanshoop
+264641700|Arandis
+264641701|Arandis
+264641702|Henties Bay
+264641703|Henties Bay
+264641704|Henties Bay
+264641705|Henties Bay
+264641706|Henties Bay
+264641707|Karibib
+264641708|Karibib
+264641709|Langstrand
+264641710|Langstrand
+264641711|Langstrand
+264641712|Leoburn
+264641713|Omaruru
+264641714|Omaruru
+264641715|Omaruru
+264641716|Omaruru
+264641717|Omaruru
+264641718|Omaruru
+264641721|Rössing Mine
+264641722|Rössing Mine
+264641723|Swakopmund
+264641724|Swakopmund
+264641725|Swakopmund
+264641726|Swakopmund
+264641727|Swakopmund
+264641728|Swakopmund
+264641729|Swakopmund
+26464173|Swakopmund
+264641741|Swakopmund
+264641742|Swakopmund
+264641743|Tsaobis
+264641746|Usakos
+264641747|Usakos
+264641748|Usakos
+264641749|Usakos
+26464175|Walvis Bay
+26464176|Walvis Bay
+2646420|Walvis Bay
+26464210|Walvis Bay
+264642110|Langstrand
+264642111|Langstrand
+264642112|Langstrand
+264642118|Walvis Bay
+264642119|Walvis Bay
+26464219|Walvis Bay
+26464220|Walvis Bay
+26464221|Walvis Bay
+26464270|Walvis Bay
+26464271|Walvis Bay
+26464272|Walvis Bay
+26464273|Walvis Bay
+26464274|Walvis Bay
+26464275|Walvis Bay
+26464276|Walvis Bay
+26464400|Swakopmund
+26464401|Swakopmund
+26464402|Swakopmund
+26464403|Swakopmund
+26464404|Swakopmund
+26464405|Swakopmund
+26464406|Swakopmund
+26464407|Swakopmund
+2646441|Swakopmund
+26464461|Swakopmund
+26464462|Swakopmund
+26464463|Swakopmund
+26464464|Swakopmund
+264644650|Swakopmund
+26464500|Henties Bay
+26464501|Henties Bay
+26464502|Henties Bay
+26464504|Uis
+26464510|Arandis
+26464511|Arandis
+26464512|Arandis
+26464520|Rössing Mine
+264645212|Rössing Mine
+264645213|Rössing Mine
+264645214|Rössing Mine
+264645219|Rössing Mine
+264645220|Rössing Mine
+264645221|Rössing Mine
+26464530|Usakos
+264645315|Usakos
+264645316|Usakos
+264645317|Usakos
+264645318|Usakos
+264645319|Usakos
+264645508|Tsaobis/Karibib
+26464550|Karibib
+26464551|Otjimbingwe
+264645520|Karibib
+264645521|Karibib
+264645537|Karibib
+264645539|Karibib
+26464570|Omaruru
+264645710|Omaruru
+264645711|Omaruru
+264645712|Omaruru
+264645713|Omaruru
+264645714|Omaruru
+26464572|Omaruru
+26464573|Omaruru
+26464694|Central
+264647026|Walvis Bay
+264647027|Walvis Bay
+264647028|Swakopmund
+264647100|Walvis Bay
+264647130|Walvis Bay
+264647162|Swakopmund
+264647165|Walvis Bay
+264647172|Swakopmund
+264651701|Anamulenge
+264651702|Blue Sodalite Mine
+264651703|Edundja
+264651704|Edundja
+264651705|Eenhana
+264651706|Eenhana
+264651707|Ehomba
+264651708|Elim
+264651709|Elim
+264651710|Endola
+264651711|Etanga
+264651712|Etunda
+264651713|Etunda
+264651714|Haiyandja
+264651715|Kaoko Otavi
+264651716|Kunene River Lodge
+264651717|Mahenene
+264651719|Ombombo
+264651720|Odibo
+264651721|Ogongo
+264651722|Ohandungu
+264651723|Ohangwena
+264651724|Ohangwena
+264651725|Ohangwena
+264651726|Ohangwena
+264651727|Okahao
+264651728|Okalongo
+264651729|Okangwati
+264651730|Okatope
+264651731|Okorosave
+264651732|Oluno
+264651733|Oluno
+264651734|Oluno
+264651735|Omafu
+264651736|Ombalantu
+264651737|Ombalantu
+264651738|Ombalantu
+264651739|Omungwelume
+264651740|Omutsewonime
+264651741|Onandjokwe
+264651742|Onathinge
+264651743|Ondangwa
+264651744|Ondangwa
+264651745|Ondangwa
+264651746|Ondangwa
+264651747|Ondangwa
+264651748|Ondobe
+264651749|Onuno
+264651751|Onesi
+264651752|Ongenga
+264651753|Ongha
+264651754|Ongha
+264651756|Ongwediva
+264651757|Ongwediva
+264651759|Ondundu
+264651760|Opuwo
+264651761|Opuwo
+264651762|Orumana
+264651763|Oshakati
+264651764|Oshakati
+264651765|Oshakati
+264651766|Oshakati
+264651767|Oshakati
+264651768|Oshifo
+264651769|Oshigambo
+264651770|Oshikango
+264651771|Oshikuku
+264651772|Oshitayi
+264651773|Otjondeka
+264651774|Otwani
+264651775|Panosa
+264651776|Ruacana
+264651777|Ruacana
+264651778|Sesfontein
+264651781|Tsandi
+264651782|Tsandi
+264651783|Warmquelle
+26465200|Ombalantu
+26465201|Oshakati
+26465202|Oshakati
+26465203|Oshakati
+26465204|Oshakati
+26465205|Oshakati
+26465206|Oshakati
+26465207|Oshakati
+26465208|Oshakati
+26465209|Oshakati
+26465220|Oshakati
+26465221|Oshakati
+26465222|Oshakati
+26465223|Oshakati
+26465224|Oshakati
+26465225|Oshakati
+26465226|Oshakati
+26465227|Oshakati
+264652290|Oshakati
+26465230|Ongwediva
+26465231|Ongwediva
+264652320|Ongwediva
+264652321|Ongwediva
+264652324|Ongwediva
+264652325|Ongwediva
+264652327|Ongwediva
+264652328|Ongwediva
+264652329|Ongwediva
+26465233|Ongwediva
+26465234|Ongwediva
+26465240|Ondangwa
+26465241|Ondangwa
+26465242|Ondangwa
+26465243|Ondangwa
+264652440|Omuthiya
+264652441|Omuthiya
+264652446|Omuthiya
+264652447|Omuthiya
+264652448|Omuthiya
+264652449|Omuthiya
+264652450|Oshitayi
+264652451|Oshitayi
+264652452|Haiyandja
+264652453|Haiyandja
+264652454|Ongha
+264652455|Ongha
+264652456|Oluno
+264652457|Oluno
+264652458|Oluno
+264652459|Oluno
+264652460|Oluno
+264652461|Oluno
+264652462|Oluno
+264652463|Oluno
+264652464|Oluno
+264652481|Onandjokwe
+264652482|Onandjokwe
+264652483|Onandjokwe
+264652488|Onathinge
+264652489|Onathinge
+264652490|Onathinge
+264652491|Onathinge
+264652492|Onathinge
+264652493|Onathinge
+264652494|Onathinge
+264652503|Anamulenge
+264652504|Anamulenge
+264652507|Ombalantu
+264652508|Ombalantu
+264652509|Ombalantu
+26465251|Ombalantu
+264652520|Okahao
+264652521|Okahao
+264652522|Okahao
+264652523|Okahao
+264652524|Okahao
+264652525|Okahao
+264652526|Okahao
+264652531|Okahao
+264652532|Okahao
+264652535|Okalongo
+264652536|Okalongo
+264652537|Okalongo
+264652545|Oshikuku
+264652546|Oshikuku
+264652547|Oshikuku
+264652560|Etilyasa
+264652562|Onaanda
+264652565|Elim
+264652566|Elim
+264652567|Elim
+264652570|Ogongo
+264652571|Ogongo
+264652572|Ogongo
+264652580|Tsandi
+264652581|Tsandi
+264652582|Tsandi
+264652587|Onesi
+264652588|Onesi
+264652589|Onesi
+264652590|Mahenene
+264652591|Mahenene
+264652595|Etunda
+264652596|Etunda
+264652598|Eunda
+264652600|Ohangwena
+264652601|Ohangwena
+264652620|Onuno
+264652621|Onuno
+264652622|Okatope
+264652623|Okatope
+264652624|Ondobe
+264652625|Ondobe
+264652628|Ongha
+264652629|Ongha
+264652630|Eenhana
+264652631|Eenhana
+264652632|Eenhana
+264652633|Eenhana
+264652634|Eenhana
+264652635|Eenhana
+264652636|Eenhana
+264652640|Eenhana
+264652641|Eenhana
+264652642|Eenhana
+264652643|Eenhana
+264652644|Oshigambo
+264652645|Oshigambo
+264652646|Oshikango
+264652647|Oshikango
+264652648|Oshikango
+264652649|Oshikango
+264652650|Oshikango
+264652651|Oshikango
+264652652|Oshikango
+264652653|Oshikango
+264652654|Oshikango
+264652655|Oshikango
+264652657|Oshikango
+264652663|Oshikango
+264652664|Oshikango
+264652665|Oshikango
+264652666|Omafu
+264652667|Omafu
+264652675|Omafu
+264652676|Odibo
+264652677|Odibo
+264652681|Edundja
+264652682|Edundja
+264652683|Ongenga
+264652688|Endola
+264652689|Endola
+264652690|Omungwelume
+264652691|Omungwelume
+264652692|Omungwelume
+264652700|Ruacana
+264652701|Ruacana
+264652702|Ruacana
+264652710|Etoto
+264652714|Ruacana
+264652715|Ruacana
+264652716|Ruacana
+264652717|Ruacana
+264652718|Ruacana
+264652719|Ruacana
+264652720|Oshifo
+264652721|Oshifo
+264652725|Oshifo
+264652728|Opuwo
+264652729|Opuwo
+264652730|Opuwo
+264652731|Opuwo
+264652732|Opuwo
+264652733|Opuwo
+264652734|Opuwo
+264652735|Opuwo
+264652737|Opuwo
+264652738|Opuwo
+264652739|Opuwo
+26465273|Otjerunda
+264652740|Ehomba
+264652741|Sodalite
+264652742|Panosa
+264652743|Kunene River Lodge
+264652744|Etanga
+264652745|Okangwati
+264652746|Ohandungu
+264652747|Kaoko Otavi
+264652748|Okorosave
+264652749|Orumana
+264652750|Otwani
+264652751|Otjondeka
+264652752|Ombombo
+264652753|Warmquelle
+264652755|Sesfontein
+264652762|Kowares
+264652764|Otjitjekwa
+264652766|Oruvandjai
+264652800|Ondangwa
+264652801|Ondangwa
+264652822|Ondangwa
+264652850|Omutsewonime
+264652853|Okashana
+264652856|Onyaanya
+264652860|Okapuku
+264652863|Onankali
+264652866|Okatope
+264652870|Oniingo
+264652880|Omundaungilo
+264652882|Oshuli
+264652884|Okongo
+264652885|Okongo
+264652886|Ekoka
+264652888|Epembe
+264652890|Okankolo
+264652892|Omuntele
+264652894|Oshikunde
+264652896|Onyuulaye
+26465290|Eenhana
+26465695|North
+264657031|Ondangwa
+264657032|Oshakati
+264657100|Oshakati
+264657130|Oshakati
+264657142|Oshakati
+264657145|Oshakati
+264657152|Oshakati
+264657165|Oshakati
+264661701|Bagani
+264661702|Bagani
+264661703|Bukalo
+264661704|Bunia
+264661705|Hakasembe
+264661706|K. Murangi
+264661707|Kahenge
+264661708|Katima-Mulilo
+264661709|Katima-Mulilo
+264661710|Katima-Mulilo
+264661711|Kongola
+264661712|Mpacha
+264661713|Marangi
+264661714|Mashare
+264661715|Matava
+264661716|Muveke
+264661717|Nkurenkuru
+264661718|Nakayale/Nkurenkuru
+264661719|Nzinze
+264661720|Omega
+264661721|Rundu
+264661722|Rundu
+264661723|Rundu
+264661724|Rundu
+264661725|Rupara
+264661726|Ruuga
+264661727|Sikono
+264661728|Nyangana
+264662500|Nakayale/Omega
+264662501|Nakayale
+264662502|Mpacha/Ngoma
+264662504|Kongola
+264662506|Ngoma
+264662508|Ngoma
+26466251|Katima-Mulilo
+26466252|Katima-Mulilo
+26466253|Katima-Mulilo
+26466254|Katima-Mulilo
+26466255|Rundu
+26466256|Rundu
+264662570|Sikono
+264662571|Ruuga
+264662572|Hakasembe
+264662573|Bunia
+264662574|Matava
+264662575|Nzinze
+264662576|Rupara
+264662577|Muveke
+264662578|Marangi
+264662579|Kahenge
+264662580|Nkurenkuru
+264662581|Nkurenkuru
+264662582|Nyangana
+264662586|Mashare
+264662587|Mashare
+264662588|Nyangana
+264662589|Rundu
+264662590|Bagani
+264662591|Bagani
+264662592|Bagani
+264662593|Bagani
+264662596|Sambyu
+264662597|Sambyu
+264662599|Muhembo
+264662600|Mpungu
+26466261|Katima-Mulilo
+264662627|Katima-Mulilo
+264662640|Nyangana
+26466265|Rundu
+26466266|Rundu
+264662670|Rundu
+264662671|Rundu
+264662672|Rundu
+264662673|Rundu
+264662674|Rundu
+26466269|Rundu
+26466381|Maltahohe
+26466385|Namgorab
+26466423|Kalahariplaas
+26466696|North East
+264667030|Rundu
+264667143|Rundu
+264667145|Katima-Mulilo
+264667153|Rundu
+264671700|Andara
+264671740|Abenab
+264671741|Anker
+264671742|Sorris-Sorris
+264671743|Biermanskool
+264671745|Halali
+264671746|Horabe
+264671747|Kalkfeld
+264671748|Kamanjab
+264671749|Khorixas
+264671751|Khorixas
+264671753|Kombat
+264671754|Lindequest
+264671756|Maroelaboom
+264671757|Etosha Rurtel
+264671759|Okakarara
+264671760|Okakarara
+264671762|Okaputa
+264671763|Okaukuejo
+264671764|Okorusu
+264671765|Omatjene
+264671766|Etosha Rurtel
+264671767|Etosha Rurtel
+264671768|Etosha Rurtel
+264671770|Otavi
+264671771|Otavi
+264671773|Otjiwarongo
+264671774|Otjiwarongo
+264671775|Otjiwarongo
+264671776|Otjiwarongo
+264671777|Otjiwarongo
+264671778|Outjo
+264671779|Outjo
+264671782|Toshari
+264671783|Tsumeb
+264671784|Tsumeb
+264671785|Tsumeb
+264671786|Tsumeb
+264671787|Tsumeb
+264671789|Uchab
+264671790|Uib
+264671791|Waterberg Plateau Park
+264671792|Waterberg Plateau Park
+264671793|Waterberg Plateau Park
+264671794|Epupa
+264671797|Grootfontein
+264671798|Grootfontein
+264671799|Grootfontein
+26467220|Tsumeb
+26467221|Tsumeb
+26467222|Tsumeb
+26467223|Tsumeb
+26467224|Tsumeb
+264672290|Etosha Rurtel
+264672291|Etosha Rurtel
+264672292|Etosha Rurtel/Lindequest
+264672293|Etosha Rurtel/Namutoni
+264672294|Etosha Rurtel/Halali
+264672295|Etosha Rurtel/Ombika
+264672296|Etosha Rurtel/Ongava
+264672297|Etosha Rurtel
+264672298|Etosha Rurtel/Okaukuejo
+26467229|Mokuti
+26467230|Oshivello
+264672310|Kombat
+264672311|Kombat
+264672312|Kombat
+264672315|Rietfontein
+264672316|Rietfontein
+264672320|Abenab
+264672323|Horabe
+264672326|Maroelaboom
+264672327|Maroelaboom
+264672329|Coblenz
+26467234|Otavi
+264672350|Uib
+264672357|Otavi
+264672358|Otavi
+264672359|Otavi
+26467240|Grootfontein
+26467241|Grootfontein
+26467242|Grootfontein
+26467243|Grootfontein
+264672440|Tsumkwe
+264672441|Tsumkwe
+264672450|Mangetti duin
+264672455|Gam
+26467248|Grootfontein
+264672491|Grootfontein
+264672492|Grootfontein
+264672493|Grootfontein
+264672494|Grootfontein
+264672583|Andara
+264672584|Andara
+264672615|Uchab
+264672616|Uchab
+264672617|Uchab
+264672900|Kalkfeld
+264672901|Kalkfeld
+264672902|Kalkfeld
+264672903|Epupa
+264672982|Tsumeb
+26467300|Otjiwarongo
+26467301|Otjiwarongo
+26467302|Otjiwarongo
+26467303|Otjiwarongo
+26467304|Otjiwarongo
+264673050|Waterberg Plateau Park
+264673051|Waterberg Plateau Park
+264673052|Otjiwarongo
+264673053|Otjiwarongo
+264673054|Okorusu
+264673055|Okorusu
+264673060|Otjiwarongo
+264673061|Otjiwarongo
+264673062|Klein Waterberg
+264673063|Klein Waterberg
+264673064|Klein Waterberg
+264673065|Klein Waterberg
+264673066|Klein Waterberg
+264673067|Klein Waterberg
+264673068|Omatjene
+26467307|Otjiwarongo
+26467308|Otjiwarongo
+264673090|Okaputa
+264673091|Okaputa
+26467312|Outjo
+26467313|Outjo
+264673167|Okakarara
+264673168|Okakarara
+264673169|Okakarara
+26467317|Okakarara
+264673180|Okamatapati
+264673181|Okamatapati
+26467330|Kamanjab
+26467331|Kamanjab/Khorixas
+264673320|Khorixas
+264673321|Khorixas
+264673322|Sorris-Sorris
+264673323|Sorris-Sorris
+264673324|Sorris-Sorris
+264673325|Sorris-Sorris
+26467332|Kamanjab
+264673330|Anker
+264673332|Biermanskool
+264673333|Biermanskool
+264673334|Toshari
+264673335|Toshari
+26467333|Kamanjab
+26467334|Kamanjab
+26467335|Kamanjab/Khorixas
+26467697|North
+264677029|Grootfontein
+264677140|Grootfontein
+264677141|Grootfontein
+264677145|Grootfontein
+264677150|Grootfontein
+264677151|Grootfontein
+264677163|Otjiwarongo
+264677165|Anker/Braunfels/Fransfontein
+264677166|Kamanjab/Otavi
+264677173|Otjiwarongo
diff --git a/geocoding/en/375.txt b/geocoding/en/375.txt
index e0fcc66..3be3f2b 100644
--- a/geocoding/en/375.txt
+++ b/geocoding/en/375.txt
@@ -134,7 +134,6 @@
 3752346|Khoiniki, Gomel Region
 3752347|Loyev, Gomel Region
 3752350|Petrikov, Gomel Region
-3752351|Mozyr
 3752353|Zhitkovichi, Gomel Region
 3752354|Yelsk, Gomel Region
 3752355|Narovlya, Gomel Region
diff --git a/geocoding/en/389.txt b/geocoding/en/389.txt
new file mode 100644
index 0000000..be7d5ed
--- /dev/null
+++ b/geocoding/en/389.txt
@@ -0,0 +1,28 @@
+# Copyright (C) 2013 The Libphonenumber Authors
+
+# Licensed under the Apache License/Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+
+# http://www.apache.org/licenses/LICENSE-2.0
+
+# Unless required by applicable law or agreed to in writing/software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND/either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# http://www.itu.int/dms_pub/itu-t/oth/02/02/T02020000CE0001PDFE.pdf
+
+3892|Skopje
+38931|Kumanovo/Kriva Palanka/Kratovo
+38932|Stip/Probistip/Sveti Nikole/Radovis
+38933|Kocani/Berovo/Delcevo/Vinica
+38934|Gevgelija/Valandovo/Strumica/Dojran
+38942|Gostivar
+38943|Veles/Kavadarci/Negotino
+38944|Tetovo
+38945|Kicevo/Makedonski Brod
+38946|Ohrid/Struga/Debar
+38947|Bitola/Demir Hisar/Resen
+38948|Prilep/Krusevo
diff --git a/geocoding/en/599.txt b/geocoding/en/599.txt
new file mode 100644
index 0000000..5bd46ed
--- /dev/null
+++ b/geocoding/en/599.txt
@@ -0,0 +1,22 @@
+# Copyright (C) 2013 The Libphonenumber Authors
+
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+
+# http://www.apache.org/licenses/LICENSE-2.0
+
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# Generated from http://www.itu.int/dms_pub/itu-t/oth/02/02/T02020000F80001PDFE.pdf
+
+599318|St. Eustatius
+599416|Saba
+599715|Bonaire
+599717|Bonaire
+599718|Bonaire
+599750|Bonaire
diff --git a/geocoding/en/686.txt b/geocoding/en/686.txt
new file mode 100644
index 0000000..4544699
--- /dev/null
+++ b/geocoding/en/686.txt
@@ -0,0 +1,50 @@
+# Copyright (C) 2013 The Libphonenumber Authors
+
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+
+# http://www.apache.org/licenses/LICENSE-2.0
+
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# Generated from: http://www.itu.int/dms_pub/itu-t/oth/02/02/T02020000710001PDFE.pdf
+
+68621|Bairiki
+68622|Bairiki
+68623|Bairiki
+68624|Bairiki
+68625|Betio
+68626|Betio
+68627|Tarawa
+68628|Bikenibeu
+68629|Bikenibeu
+68630|Tarawa
+68631|Abaokoro
+68632|Abaokoro
+68633|Abaiang
+68634|Marakei
+68635|Butaritari
+68636|Makin
+68637|Banaba
+68638|Maiana
+68639|Kuria
+68640|Aranuka
+68641|Abemama
+68642|Nonouti
+68643|Tabiteuea North
+68644|Tabiteuea South
+68645|Onotoa
+68646|Beru
+68647|Nikunau
+68648|Tamana
+68649|Arorae
+68681|Kiritimati
+68682|Kiritimati
+68683|Fanning
+68684|Washington
+68685|Kanton
diff --git a/geocoding/en/962.txt b/geocoding/en/962.txt
new file mode 100644
index 0000000..2d2cc84
--- /dev/null
+++ b/geocoding/en/962.txt
@@ -0,0 +1,32 @@
+# Copyright (C) 2013 The Libphonenumber Authors
+
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+
+# http://www.apache.org/licenses/LICENSE-2.0
+
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# Generated from:
+# http://www.itu.int/dms_pub/itu-t/oth/02/02/T020200006E0001PDFE.pdf
+# It seems that the first 3 digits of the national significant number indicate
+# the location. The association of 6 with Amman comes from Wikipedia.
+
+962266|Mafraq
+962267|Jarash
+962268|Ajloun
+962269|Irbid
+9623222|Tafileh
+962324|Aqaba
+962325|Maan
+9623260|Tafileh
+962327|Karak
+962530|Zarqa
+962531|Madaba
+962533|Balqa
+9626|Amman
diff --git a/geocoding/ru/375.txt b/geocoding/ru/375.txt
index 1df3ec5..a3bd89f 100644
--- a/geocoding/ru/375.txt
+++ b/geocoding/ru/375.txt
@@ -135,7 +135,6 @@
 3752346|Хойники, Гомельская область
 3752347|Лоев, Гомельская область
 3752350|Петриков, Гомельская область
-3752351|Мозырь
 3752353|Житковичи, Гомельская область
 3752354|Ельск, Гомельская область
 3752355|Наровля, Гомельская область
diff --git a/phonenumber.proto b/phonenumber.proto
index 8f01591..1068343 100644
--- a/phonenumber.proto
+++ b/phonenumber.proto
@@ -29,13 +29,13 @@
 // (ITU). Fox 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 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 Area Code, the National (significant) Number contains the
-// area code. It contains a maximum number of digits which equal to 15 - n, where n is the number of
-// digits of the country code. Take note that National (significant) Number does not contain
-// National(trunk) prefix. Obviously, as a uint64, it will never contain any formatting (hypens,
-// spaces, parentheses), nor any alphanumeric spellings.
+// 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 Area Code, the National (significant)
+// Number contains the area code. It contains a maximum number of digits which equal to 15 - n,
+// where n is the number of digits of the country code. Take note that National (significant) Number
+// does not contain National(trunk) prefix. Obviously, as a uint64, it will never contain any
+// formatting (hypens, 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
@@ -44,19 +44,21 @@
 // as there is no standard defined). However, only ASCII digits should be stored here.
   optional string extension = 3;
 
-// In some countries, the national (significant) number starts with a "0" without this being a
-// national prefix or trunk code of some kind. For example, the leading zero in the national
+// 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.
 //
-// This field can be safely ignored (there is no need to set it) for most countries. Some limited
-// amount of countries behave like Italy - for these cases, if the leading zero of a number would be
-// retained even when dialling internationally, set this flag to true.
+// 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 this field set if necessary automatically.
+// 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
@@ -71,21 +73,21 @@
 // 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 (0)1 42 68 53 00".
+    // 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 (0)1 42 68 53 00", as it is dialled from US.
+    // 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 (0)1 42 68 53 00" when defaultCountry is supplied as France.
+    // 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 "(0)1 42 68 53 00", when defaultCountry is supplied as France.
+    // parsing the French number "01 42 68 53 00", when defaultCountry is supplied as France.
     FROM_DEFAULT_COUNTRY = 20;
   }