JS/CPP/JAVA: libphonenumber v5.9.4 metadata updates
Review URL: https://codereview.appspot.com/60870046

git-svn-id: http://libphonenumber.googlecode.com/svn/trunk/resources@648 ee073f10-1060-11df-b6a4-87a95322a99c
diff --git a/PhoneNumberMetadata.xml b/PhoneNumberMetadata.xml
index 288efb7..fbb080a 100644
--- a/PhoneNumberMetadata.xml
+++ b/PhoneNumberMetadata.xml
@@ -2416,9 +2416,9 @@
       <mobile>
         <nationalNumberPattern>
           6(?:
-            [0-24-68]\d|
+            [0-24-689]\d|
             3[0-7]|
-            70
+            7[0-2]
           )\d{5}|
           7\d{7}
         </nationalNumberPattern>
@@ -2708,11 +2708,11 @@
       <mobile>
         <!-- We have restricted the pattern here to the first two digits, as beyond this the data
              seems to be no longer accurate. The prefixes 9[46] have also been added, along with
-             6[67] (seemingly prefixes for Mobile MTN), and 64 for BeninCell. Glo Mobile has been
+             6[167] (seemingly prefixes for Mobile MTN), and 64 for BeninCell. Glo Mobile has been
              reported as having prefixes 68 and 9[89]. -->
         <nationalNumberPattern>
           (?:
-            6[46-8]|
+            6[146-8]|
             9[03-9]
           )\d{6}
         </nationalNumberPattern>
@@ -3298,12 +3298,12 @@
         <exampleNumber>2401234</exampleNumber>
       </fixedLine>
       <mobile>
-        <!-- 77[0146] has been added after numbers in use have been seen online. -->
+        <!-- 77[01467] has been added after numbers in use have been seen online. -->
         <nationalNumberPattern>
           7(?:
             [1-35]\d{6}|
             [46][0-7]\d{5}|
-            7[0146]\d{5}
+            7[01467]\d{5}
           )
         </nationalNumberPattern>
         <possibleNumberPattern>\d{8}</possibleNumberPattern>
@@ -4092,13 +4092,13 @@
       we strip here. National destinations may be dialled with a carrier if they are not local so
       we extract these carrier codes as well. -->
       <availableFormats>
-        <numberFormat pattern="(2)(\d{3,4})(\d{4})"
+        <numberFormat pattern="(\d)(\d{4})(\d{4})"
           nationalPrefixFormattingRule="($FG)"
           carrierCodeFormattingRule="$CC ($FG)">
           <leadingDigits>2</leadingDigits>
           <format>$1 $2 $3</format>
         </numberFormat>
-        <numberFormat pattern="(\d{2})(\d{2,3})(\d{4})"
+        <numberFormat pattern="(\d{2})(\d{3})(\d{4})"
           nationalPrefixFormattingRule="($FG)"
           carrierCodeFormattingRule="$CC ($FG)">
           <leadingDigits>
@@ -4108,6 +4108,13 @@
           </leadingDigits>
           <format>$1 $2 $3</format>
         </numberFormat>
+        <!-- 65 is the only remaining prefix using the old fixed-line format. -->
+        <numberFormat pattern="(\d{2})(\d{2})(\d{4})"
+          nationalPrefixFormattingRule="($FG)"
+          carrierCodeFormattingRule="$CC ($FG)">
+          <leadingDigits>65</leadingDigits>
+          <format>$1 $2 $3</format>
+        </numberFormat>
         <numberFormat pattern="(9)([5-9]\d{3})(\d{4})">
           <leadingDigits>9</leadingDigits>
           <format>$1 $2 $3</format>
@@ -4158,34 +4165,26 @@
         <exampleNumber>6001234567</exampleNumber>
       </noInternationalDialling>
       <fixedLine>
-        <!-- Nov 2012: The prefixing of '2' to all fixed line numbers, which is being rolled
-             out between October 2012 and June 2013 means that temporarily the regular
-             expressions for areas will get very messy as some adopt the leading '2' but
-             others do not. Eventually when the conversion is complete things should simplify
-             again. Note that area codes 32 or 41 were transitioned in 2007.
-             IMPORTANT: A literal reading of the transition rules suggest that all numbers get
-             a '2' prefix, but some numbers are already 7 digits long (but these always start
-             with a '2'). The prefixing seems almost certain to only apply to 6-digit numbers and
-             will unify all fixed line numbers to be 9 digits in total. The fact that the new seven
-             digit numbers currently only start with a '2' is likely to change in the future.
-             Note also that at some stage it is likely that Santiago numbers (area code '2') will
-             have a prefix of "2\d" and not "22" (it's like 10 2-digit area codes wrapped into one).
+        <!-- In mid-2013, Chile switched from 8 digits to 9 digits for fixed-line numbers, by
+             inserting a '2' after the area code (which are 2 digits, with the exception of '2').
+             As of Feb. 2014, all of the prefixes have been switched over to the new plan, except
+             for 65 (which according to the schedule should have been switched over by July 2013).
+             IMPORTANT: The fact that Santiago numbers have a prefix of "22", and that numbers in
+             other areas have '2' as their third digit, is likely to change in the future. At some
+             stage, Santiago numbers will probably switch to prefix "2\d", and the third digit in
+             other areas will probably be allowed to take on other values.
              See: http://www.gob.cl/especiales/informate-de-la-nueva-forma-de-marcar/
                   http://www.subtel.cl/index.php?option=com_content&view=article&id=3081:&catid=3:noticias
              -->
         <nationalNumberPattern>
           (?:
-            [23]2|
-            41|
-            58
+            22|
+            3[2-5]|
+            [47][1-35]|
+            5[1-3578]|
+            6[1347]
           )\d{7}|
-          (?:
-            3[3-5]|
-            4[235]|
-            5[1-357]|
-            6[13-57]|
-            7[1-35]
-          )\d{6,7}
+          65\d{6,7}
         </nationalNumberPattern>
         <!-- Area codes do not need to be dialled when dialling within the same area, so the
              smallest possible number is length 6. -->
@@ -4802,13 +4801,13 @@
         <nationalNumberPattern>
           5(?:
             0[0-4]|
-            7[01]
+            7[0-3]
           )\d{5}|
           6(?:
             [0-2]\d|
             30
           )\d{5}|
-          7[0-2]\d{6}|
+          7[0-3]\d{6}|
           8[3-9]\d{6}
         </nationalNumberPattern>
         <possibleNumberPattern>\d{8}</possibleNumberPattern>
@@ -5475,6 +5474,8 @@
         <!-- According to
              http://www.bundesnetzagentur.de/SharedDocs/Downloads/DE/BNetzA/Sachgebiete/Telekommunikation/Regulierung/Nummernverwaltung/Mobilfunkdienste/NummernplanMobileDienstepdf.pdf?__blob=publicationFile
              numbers beginning with 162, 163 and 17 can all be 10 or 11 digits long.
+             The ranges 15[056] have been removed from the ITU doc, but information found online
+             indicates that they may still be working.
              -->
         <nationalNumberPattern>
           1(?:
@@ -5836,7 +5837,8 @@
       </fixedLine>
       <mobile>
         <!-- Adding 65 and 78 from numbers found online. Also, prefix 670 is added since the carrier
-             Mobilis Algeria provided it, and 54 for Nedjma.-->
+             Mobilis Algeria provided it, and 54 for Nedjma. Prefixes 67[12] were also added for
+             Mobilis Algeria based on evidence found online. -->
         <nationalNumberPattern>
           (?:
             5[4-6]|
@@ -5844,7 +5846,7 @@
           )\d{7}|
           6(?:
             [569]\d|
-            70
+            7[0-2]
           )\d{6}
         </nationalNumberPattern>
         <possibleNumberPattern>\d{9}</possibleNumberPattern>
@@ -6860,9 +6862,10 @@
         <exampleNumber>123456789</exampleNumber>
       </fixedLine>
       <mobile>
+        <!-- Prefixes 7[0-24] were added based on numbers found online. -->
         <nationalNumberPattern>
           6\d{8}|
-          7[5-9]\d{7}
+          7[0-24-9]\d{7}
         </nationalNumberPattern>
         <exampleNumber>612345678</exampleNumber>
       </mobile>
@@ -7556,7 +7559,10 @@
               20|
               58
             )|
-            53[3-8]
+            5(?:
+              2[01]|
+              3[3-8]
+            )
           )\d{4}
         </nationalNumberPattern>
         <possibleNumberPattern>\d{10}</possibleNumberPattern>
@@ -9732,13 +9738,12 @@
                  9[7-9]
                )|
                6(?:
-                 0[027]|
+                 0[0-27]|
                  1[0-257-9]|
                  2[0-4]|
                  3[19]|
                  5[4589]|
-                 [679]|
-                 8[0-589]
+                 [6-9]
                )|
                7(?:
                  0[2-9]|
@@ -10165,9 +10170,9 @@
         <!-- A couple of additional prefixes found neither on the wikipedia page nor in the MSC
              codes list, are added because SMS messages have been successfully sent to these
              numbers. It seems almost impossible to know for some of these numbers whether they are
-             land-line or mobile, since the ranges overlap. Extra prefixes added: 76[89]5, 8299,
-             8309. New prefixes were also added based on the document provided from mobile carriers:
-             https://code.google.com/p/libphonenumber/issues/detail?id=260 -->
+             land-line or mobile, since the ranges overlap. Extra prefixes added: 7601, 768[567],
+             7695, 8299, 8309. New prefixes were also added based on the document provided from
+             mobile carriers: https://code.google.com/p/libphonenumber/issues/detail?id=260 -->
         <nationalNumberPattern>
           (?:
             7(?:
@@ -10197,13 +10202,12 @@
                 9[7-9]
               )|
               6(?:
-                0[027]|
+                0[0127]|
                 1[0-257-9]|
                 2[0-4]|
                 3[19]|
                 5[4589]|
-                [679]\d|
-                8[0-589]
+                [6-9]\d
               )|
               7(?:
                 0[2-9]|
@@ -11386,55 +11390,61 @@
           <leadingDigits>800</leadingDigits>
           <format>$1-$2-$3</format>
         </numberFormat>
-        <!-- National-only toll-free numbers (0077 and 0088) and VOIP numbers (0037) where the
-             leading "0" is considered the national prefix. -->
-        <numberFormat pattern="(\d{3})(\d{4})">
-          <leadingDigits>077</leadingDigits>
+        <!-- National-only toll-free numbers (0037, 0066, 0077 and 0088). -->
+        <numberFormat nationalPrefixFormattingRule="$FG" pattern="(\d{4})(\d{4})">
+          <leadingDigits>0077</leadingDigits>
           <format>$1-$2</format>
+          <intlFormat>NA</intlFormat>
         </numberFormat>
-        <numberFormat pattern="(\d{3})(\d{2})(\d{3,4})">
-          <leadingDigits>077</leadingDigits>
+        <numberFormat nationalPrefixFormattingRule="$FG" pattern="(\d{4})(\d{2})(\d{3,4})">
+          <leadingDigits>0077</leadingDigits>
           <format>$1-$2-$3</format>
+          <intlFormat>NA</intlFormat>
         </numberFormat>
-        <numberFormat pattern="(\d{3})(\d{2})(\d{4})">
-          <leadingDigits>088</leadingDigits>
+        <numberFormat nationalPrefixFormattingRule="$FG" pattern="(\d{4})(\d{2})(\d{4})">
+          <leadingDigits>0088</leadingDigits>
           <format>$1-$2-$3</format>
+          <intlFormat>NA</intlFormat>
         </numberFormat>
-        <numberFormat pattern="(\d{3})(\d{3})(\d{3,4})">
+        <numberFormat nationalPrefixFormattingRule="$FG" pattern="(\d{4})(\d{3})(\d{3,4})">
           <leadingDigits>
-            0(?:
-              37|
-              66
+            00(?:
+               37|
+               66
             )
           </leadingDigits>
           <format>$1-$2-$3</format>
+          <intlFormat>NA</intlFormat>
         </numberFormat>
-        <numberFormat pattern="(\d{3})(\d{4})(\d{4,5})">
+        <numberFormat nationalPrefixFormattingRule="$FG" pattern="(\d{4})(\d{4})(\d{4,5})">
           <leadingDigits>
-            0(?:
-              37|
-              66
+            00(?:
+               37|
+               66
             )
           </leadingDigits>
           <format>$1-$2-$3</format>
+          <intlFormat>NA</intlFormat>
         </numberFormat>
-        <numberFormat pattern="(\d{3})(\d{5})(\d{5,6})">
+        <numberFormat nationalPrefixFormattingRule="$FG" pattern="(\d{4})(\d{5})(\d{5,6})">
           <leadingDigits>
-            0(?:
-              37|
-              66
+            00(?:
+               37|
+               66
             )
           </leadingDigits>
           <format>$1-$2-$3</format>
+          <intlFormat>NA</intlFormat>
         </numberFormat>
-        <numberFormat pattern="(\d{3})(\d{6})(\d{6,7})">
+        <numberFormat nationalPrefixFormattingRule="$FG" pattern="(\d{4})(\d{6})(\d{6,7})">
           <leadingDigits>
-            0(?:
-              37|
-              66
+            00(?:
+               37|
+               66
             )
           </leadingDigits>
           <format>$1-$2-$3</format>
+          <intlFormat>NA</intlFormat>
         </numberFormat>
         <!-- Some leading digits are explicitly reserved for a particular purpose.
              We handle them first in this rule, and let the following rules ignore those exceptions.
@@ -12203,30 +12213,29 @@
       <generalDesc>
         <nationalNumberPattern>
           [1-9]\d{8,9}|
-          0(?:
-            [36]\d{7,14}|
-            7\d{5,7}|
-            8\d{7}
+          00(?:
+             [36]\d{7,14}|
+             7\d{5,7}|
+             8\d{7}
           )
         </nationalNumberPattern>
-        <possibleNumberPattern>\d{7,16}</possibleNumberPattern>
+        <possibleNumberPattern>\d{8,17}</possibleNumberPattern>
       </generalDesc>
       <noInternationalDialling>
         <!-- Toll-free numbers with a leading "00" cannot be dialled internationally. -->
         <nationalNumberPattern>
-          0(?:
-            37\d{6,13}|
-            66\d{6,13}|
-            777(?:
-              [01]\d{2}|
-              5\d{3}|
-              8\d{4}
-            )|
-            882[1245]\d{4}
+          00(?:
+             37\d{6,13}|
+             66\d{6,13}|
+             777(?:
+               [01]\d{2}|
+               5\d{3}|
+               8\d{4}
+             )|
+             882[1245]\d{4}
           )
         </nationalNumberPattern>
-        <possibleNumberPattern>\d{7,16}</possibleNumberPattern>
-        <exampleNumber>0777012</exampleNumber>
+        <exampleNumber>00777012</exampleNumber>
       </noInternationalDialling>
       <fixedLine>
         <nationalNumberPattern>
@@ -12302,18 +12311,17 @@
         <nationalNumberPattern>
           120\d{6}|
           800\d{7}|
-          0(?:
-            37\d{6,13}|
-            66\d{6,13}|
-            777(?:
-              [01]\d{2}|
-              5\d{3}|
-              8\d{4}
-            )|
-            882[1245]\d{4}
+          00(?:
+             37\d{6,13}|
+             66\d{6,13}|
+             777(?:
+               [01]\d{2}|
+               5\d{3}|
+               8\d{4}
+             )|
+             882[1245]\d{4}
           )
         </nationalNumberPattern>
-        <possibleNumberPattern>\d{7,16}</possibleNumberPattern>
         <exampleNumber>120123456</exampleNumber>
       </tollFree>
       <premiumRate>
@@ -14505,7 +14513,7 @@
             )|
             7(?:
               67|
-              7[47-9]|
+              7[457-9]|
               [89]\d
             )
           )\d{5}
@@ -16479,7 +16487,7 @@
           <leadingDigits>
             70|
             8[01]|
-            909
+            90[39]
           </leadingDigits>
           <format>$1 $2 $3</format>
         </numberFormat>
@@ -16538,7 +16546,7 @@
              from Etisalat, 814 MTN and 811 from Glo. Furthermore, the fixed-line prefixes owned by
              Starcomms have apparently, according to the company, been used for mobile numbers too,
              despite the ITU plan, so we list them here as well. 701 has been added for Airtel/Zain.
-             9091 has been added for Etisalat. -->
+             903 has been added for MTN and 909 has been added for Etisalat. -->
         <nationalNumberPattern>
           (?:
             1(?:
@@ -16621,7 +16629,7 @@
               0[2-9]|
               1\d
             )\d|
-            9091
+            90[39]\d
           )\d{6}
         </nationalNumberPattern>
         <possibleNumberPattern>\d{8,10}</possibleNumberPattern>
@@ -17066,7 +17074,7 @@
           <format>$1 $2 $3</format>
         </numberFormat>
         <!-- Paging numbers and some mobile numbers (Telecom/Vodafone/TelstraClear). -->
-        <numberFormat pattern="(\d{2})(\d{3})(\d{3,4})">
+        <numberFormat pattern="(\d{2})(\d{3})(\d{3,5})">
           <leadingDigits>
             2(?:
               1[1-9]|
@@ -17121,14 +17129,16 @@
         <exampleNumber>32345678</exampleNumber>
       </fixedLine>
       <mobile>
-        <!-- Includes mobile radio service numbers (e.g. TeamTalk). -->
+        <!-- Includes mobile radio service numbers (e.g. TeamTalk). The lengths of numbers with
+             prefix 21 are different from what's specified in the ITU doc, because of numbers found
+             online. -->
         <nationalNumberPattern>
           2(?:
             [028]\d{7,8}|
             1(?:
-              0\d{5,7}|
-              [12]\d{5,6}|
-              [3-9]\d{5}
+              [03]\d{5,7}|
+              [12457]\d{5,6}|
+              [689]\d{5}
             )|
             [79]\d{7}
           )
@@ -17949,12 +17959,11 @@
       </fixedLine>
       <mobile>
         <!-- Adding 311, 325 and 320 as SMSs have been successfully sent to these numbers and numbers
-             can be found online with these prefixes. -->
+             can be found online with these prefixes. Added 310 based on information from Zong. -->
         <nationalNumberPattern>
           3(?:
             0\d|
-            1[1-5]|
-            2[0-5]|
+            [12][0-5]|
             [34][1-7]|
             55|
             64
@@ -18069,7 +18078,7 @@
         <numberFormat pattern="(\d{3})(\d{3})(\d{3})">
           <leadingDigits>
             39|
-            5[013]|
+            5[0137]|
             6[0469]|
             7[02389]|
             8[08]
@@ -18118,7 +18127,7 @@
       <mobile>
         <nationalNumberPattern>
           (?:
-            5[013]|
+            5[0137]|
             6[069]|
             7[2389]|
             88
@@ -20450,6 +20459,8 @@
         <possibleNumberPattern>\d{6,9}</possibleNumberPattern>
       </generalDesc>
       <fixedLine>
+      <!-- Numbers with the 21 prefix are made optionally 1-digit longer based on numbers found on
+           the Internet. -->
         <nationalNumberPattern>
           (?:
             1(?:
@@ -20457,7 +20468,10 @@
               4\d|
               [2356]
             )|
-            2[1-35]|
+            2(?:
+              1\d?|
+              [235]
+            )|
             3(?:
               [13]\d|
               4
@@ -22043,7 +22057,7 @@
         <exampleNumber>21231234</exampleNumber>
       </fixedLine>
       <mobile>
-        <nationalNumberPattern>9[13-9]\d{6}</nationalNumberPattern>
+        <nationalNumberPattern>9[1-9]\d{6}</nationalNumberPattern>
         <possibleNumberPattern>\d{8}</possibleNumberPattern>
         <exampleNumber>94231234</exampleNumber>
       </mobile>
@@ -22946,7 +22960,7 @@
       <fixedLine>
         <nationalNumberPattern>
           (?:
-            2[2-9]\d|
+            2[02-9]\d|
             3(?:
               [5-7]\d|
               8[0-8]
@@ -23792,16 +23806,25 @@
       </voicemail>
     </territory>
 
-    <!-- http://www.itu.int/oth/T02020000F3/en -->
-    <!-- http://www.republicwireless.com/world-wi-fi-number -->
+    <!-- http://www.itu.int/oth/T02020000F3/en (Voxbone)
+         http://www.itu.int/oth/T02020000FB/en (bandwidth.com)
+         http://www.itu.int/oth/T02020000FC/en (SipMe) -->
     <territory id="001" countryCode="883">
       <availableFormats>
         <numberFormat pattern="(\d{3})(\d{3})(\d{3})">
+          <leadingDigits>510</leadingDigits>
           <format>$1 $2 $3</format>
         </numberFormat>
         <numberFormat pattern="(\d{3})(\d{3})(\d{3})(\d{3})">
+          <leadingDigits>510</leadingDigits>
           <format>$1 $2 $3 $4</format>
         </numberFormat>
+        <!-- When only 8 digits follow the "area code" formatting as XXXX XXXX
+             seems preferred (see Bandwidth.com and SipMe). -->
+        <numberFormat pattern="(\d{4})(\d{4})(\d{4})">
+          <leadingDigits>51[13]</leadingDigits>
+          <format>$1 $2 $3</format>
+        </numberFormat>
       </availableFormats>
       <generalDesc>
         <!-- Wikipedia also listed a few other +883 ranges, but no information on their lengths and
@@ -23822,7 +23845,7 @@
         <nationalNumberPattern>
           51(?:
             00\d{5}(?:\d{3})?|
-            10\d{8}
+            [13]0\d{8}
           )
         </nationalNumberPattern>
       </voip>
diff --git a/ShortNumberMetadata.xml b/ShortNumberMetadata.xml
index 83f150b..3453aa0 100644
--- a/ShortNumberMetadata.xml
+++ b/ShortNumberMetadata.xml
@@ -5205,27 +5205,91 @@
     </territory>
 
     <!-- Latvia -->
-    <!-- http://www.itu.int/oth/T0202000076/en -->
     <!-- http://en.wikipedia.org/wiki/+371 -->
     <territory id="LV">
       <generalDesc>
-        <nationalNumberPattern>[01]\d{1,2}</nationalNumberPattern>
-        <possibleNumberPattern>\d{2,3}</possibleNumberPattern>
+        <nationalNumberPattern>
+          0\d|
+          1\d{2,6}|
+          8\d{3,4}
+        </nationalNumberPattern>
+        <possibleNumberPattern>\d{2,6}</possibleNumberPattern>
       </generalDesc>
       <shortCode>
         <nationalNumberPattern>
-          0[123]|
-          112
+          0[1-4]|
+          1(?:
+            1(?:
+              [02-4]|
+              6(?:
+                000|
+                111
+              )|
+              8[0189]
+            )|
+            55|
+            655|
+            77
+          )|
+          821[57]4
         </nationalNumberPattern>
         <exampleNumber>112</exampleNumber>
       </shortCode>
+      <tollFree>
+        <!-- http://116000.lv/en/about -->
+        <nationalNumberPattern>116000</nationalNumberPattern>
+        <possibleNumberPattern>\d{6}</possibleNumberPattern>
+        <exampleNumber>116000</exampleNumber>
+      </tollFree>
+      <standardRate>
+        <!-- http://www.ldz.lv/?object_id=2568 - 0.177 LVL per minute. -->
+        <nationalNumberPattern>1181</nationalNumberPattern>
+        <possibleNumberPattern>\d{4}</possibleNumberPattern>
+        <exampleNumber>1181</exampleNumber>
+      </standardRate>
+      <premiumRate>
+        <nationalNumberPattern>
+          1180|
+          8(?:
+            2\d{3}|
+            [89]\d{2}
+          )
+        </nationalNumberPattern>
+        <possibleNumberPattern>\d{4,5}</possibleNumberPattern>
+      </premiumRate>
+      <carrierSpecific>
+        <nationalNumberPattern>16\d{2}</nationalNumberPattern>
+        <possibleNumberPattern>\d{4}</possibleNumberPattern>
+        <exampleNumber>1655</exampleNumber>
+      </carrierSpecific>
+      <carrierServices>
+        <nationalNumberPattern>
+          1(?:
+            6\d{2}|
+            77
+          )
+        </nationalNumberPattern>
+        <possibleNumberPattern>\d{3,4}</possibleNumberPattern>
+        <exampleNumber>177</exampleNumber>
+      </carrierServices>
+      <directoryServices>
+        <nationalNumberPattern>118\d</nationalNumberPattern>
+        <possibleNumberPattern>\d{4}</possibleNumberPattern>
+        <exampleNumber>1180</exampleNumber>
+      </directoryServices>
       <emergency>
         <nationalNumberPattern>
           0[123]|
-          112
+          11[023]
         </nationalNumberPattern>
+        <possibleNumberPattern>\d{2,3}</possibleNumberPattern>
         <exampleNumber>112</exampleNumber>
       </emergency>
+      <expandedEmergency>
+        <nationalNumberPattern>155</nationalNumberPattern>
+        <possibleNumberPattern>\d{3}</possibleNumberPattern>
+        <exampleNumber>155</exampleNumber>
+      </expandedEmergency>
     </territory>
 
     <!-- Libya (Soc. People’s Libyan Arab Jamahiriya) -->
@@ -5313,6 +5377,7 @@
         <possibleNumberPattern>\d{3,6}</possibleNumberPattern>
       </generalDesc>
       <shortCode>
+        <!-- http://www.idknet.com/mobile/sms/ -->
         <nationalNumberPattern>
           1(?:
             1(?:
@@ -5324,7 +5389,8 @@
                   23
                 )
               )|
-              8\d
+              8\d|
+              99
             )|
             4\d{3}|
             5[0-3]\d|
diff --git a/carrier/en/1.txt b/carrier/en/1.txt
index 6111017..3e1ac5c 100644
--- a/carrier/en/1.txt
+++ b/carrier/en/1.txt
@@ -42,6 +42,8 @@
 1441590|Digicel Bermuda
 1441599|Digicel Bermuda
 14417|Cellular One
+1473520|Affordable Island Communications
+1473521|Affordable Island Communications
 164923|C&W
 164924|C&W
 164933|DIGICEL
diff --git a/carrier/en/213.txt b/carrier/en/213.txt
index 1c2bb77..41ddf27 100644
--- a/carrier/en/213.txt
+++ b/carrier/en/213.txt
@@ -12,6 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+21354|Nedjma
 21355|Nedjma
 21356|Nedjma
 2136|Mobilis
diff --git a/carrier/en/226.txt b/carrier/en/226.txt
index dd1c5b9..55cb36b 100644
--- a/carrier/en/226.txt
+++ b/carrier/en/226.txt
@@ -21,8 +21,9 @@
 22664|Airtel
 22665|Airtel
 22666|Airtel
-226670|Airtel
+22667|Airtel
 22668|Telecel Faso
+22669|Telecel Faso
 22670|Telmob
 22671|Telmob
 22672|Telmob
diff --git a/carrier/en/229.txt b/carrier/en/229.txt
index e516c47..a9b7a6e 100644
--- a/carrier/en/229.txt
+++ b/carrier/en/229.txt
@@ -12,7 +12,10 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+22961|MTN
 22964|Moov
+22966|MTN
+22967|MTN
 22968|Glo
 22990|Libercom
 22993|BLK
diff --git a/carrier/en/234.txt b/carrier/en/234.txt
index 4607646..030ba9f 100644
--- a/carrier/en/234.txt
+++ b/carrier/en/234.txt
@@ -238,6 +238,7 @@
 2348885|Starcomms
 2348886|Starcomms
 2348887|Starcomms
-2349091|Etisalat
+234903|MTN
+234909|Etisalat
 234980|Starcomms
 234987|Starcomms
diff --git a/carrier/en/267.txt b/carrier/en/267.txt
index 45f7caa..62ab036 100644
--- a/carrier/en/267.txt
+++ b/carrier/en/267.txt
@@ -43,3 +43,4 @@
 267767|Mascom
 267769|Orange
 267776|Mascom
+267777|Mascom
diff --git a/carrier/en/373.txt b/carrier/en/373.txt
new file mode 100644
index 0000000..a03f5d7
--- /dev/null
+++ b/carrier/en/373.txt
@@ -0,0 +1,20 @@
+# Copyright (C) 2014 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.
+
+373562|IDC
+373774|IDC
+373775|IDC
+373777|IDC
+373778|IDC
+373779|IDC
diff --git a/carrier/en/389.txt b/carrier/en/389.txt
index 1a9c522..01f812f 100644
--- a/carrier/en/389.txt
+++ b/carrier/en/389.txt
@@ -12,14 +12,11 @@
 # 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
+3897421|Mobik Telekomunikacii
 38975|One
 38976|One
 38977|vip
diff --git a/carrier/en/48.txt b/carrier/en/48.txt
index 165bdd1..81c873b 100644
--- a/carrier/en/48.txt
+++ b/carrier/en/48.txt
@@ -19,6 +19,7 @@
 48532|T-Mobile
 48533|Play
 48535|Play
+4857|Play
 48600|T-Mobile
 48601|Plus
 48602|T-Mobile
diff --git a/carrier/en/49.txt b/carrier/en/49.txt
index e1facdc..361e6d5 100644
--- a/carrier/en/49.txt
+++ b/carrier/en/49.txt
@@ -12,9 +12,23 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+# O2 is run by Telefónica (the name listed in the ITU doc). The ITU doc also
+# lists Telekom Deutschland for T-Mobile, but these are the same company.
+
 49151|T-Mobile
 491520|Vodafone
-49156|Mobilcom
+491521|Vodafone/Lycamobile
+491522|Vodafone
+491523|Vodafone
+491525|Vodafone
+491529|Vodafone/Truphone
+491570|Eplus/Telogic
+491573|Eplus
+491575|Eplus
+491577|Eplus
+491578|Eplus
+491579|Eplus/Sipgate
+491590|O2
 49160|T-Mobile
 49162|Vodafone
 49163|Eplus
diff --git a/carrier/en/506.txt b/carrier/en/506.txt
index 17b0db5..9d28c59 100644
--- a/carrier/en/506.txt
+++ b/carrier/en/506.txt
@@ -12,6 +12,36 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+506570|OMV
+506571|OMV
+506572|OMV
+506573|OMV
+50670010|Claro
+50670011|Claro
+50670012|Claro
+50670013|Claro
+50670014|Claro
+5067002|Claro
+5067003|Claro
+5067004|Claro
+5067005|Claro
+5067006|Claro
+5067007|Claro
+5067008|Claro
+5067009|Claro
+506701|Claro
+506702|Claro
+506703|Claro
+506704|Claro
+506705|Claro
+506706|Claro
+506707|Claro
+506708|Claro
+506709|Claro
+50671|Claro
+50672|Claro
+5067300|Claro
+5067301|Claro
 50683|Kolbi ICE
 50688|Kolbi ICE
 50689|Kolbi ICE
diff --git a/carrier/en/598.txt b/carrier/en/598.txt
index 12a8216..6cf7ca0 100644
--- a/carrier/en/598.txt
+++ b/carrier/en/598.txt
@@ -12,6 +12,11 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+59891|Antel
+598920|Antel
+598921|Antel
+598922|Antel
+59893|Movistar
 59894|Movistar
 59895|Movistar
 59896|Claro
diff --git a/carrier/en/91.txt b/carrier/en/91.txt
index 856e6a9..59ea297 100644
--- a/carrier/en/91.txt
+++ b/carrier/en/91.txt
@@ -111,6 +111,7 @@
 917598|CellOne
 917599|CellOne
 917600|AirTel
+917601|Reliance
 917602|AirTel
 917607|AirTel
 917620|Reliance
@@ -125,6 +126,8 @@
 917676|Reliance
 917677|Reliance
 917679|Reliance
+917686|Aircel
+917687|Aircel
 917696|TATA DOCOMO
 917697|Idea Cellular Ltd
 917698|IDEA
diff --git a/carrier/en/92.txt b/carrier/en/92.txt
index 6c39559..1c9032b 100644
--- a/carrier/en/92.txt
+++ b/carrier/en/92.txt
@@ -21,6 +21,7 @@
 92306|Mobilink
 92307|Mobilink
 92308|Mobilink
+92310|Zong
 92311|Ufone
 92312|Ufone
 92313|Ufone