phonelib 0.5.4 → 0.5.5

data/data/libphonenumber/resources/PhoneNumberMetadata.xml

@@ -1375,6 +1375,10 @@
         <sourceUrl>http://www.rtr.at/en/tk/E129</sourceUrl>
       </references>
       <availableFormats>
+        <numberFormat pattern="(116\d{3})" nationalPrefixFormattingRule="$FG">
+          <leadingDigits>116</leadingDigits>
+          <format>$1</format>
+        </numberFormat>
         <numberFormat pattern="(1)(\d{3,12})">
           <leadingDigits>1</leadingDigits>
           <format>$1 $2</format>
@@ -1400,12 +1404,10 @@
             51|
             732|
             6(?:
-              44|
               5[0-3579]|
               [6-9]
             )|
             7(?:
-              1|
               [28]0
             )|
             [89]
@@ -1423,7 +1425,7 @@
             5[2-6]|
             6(?:
               [12]|
-              4[1-35-9]|
+              4[1-9]|
               5[468]
             )|
             7(?:
@@ -1503,24 +1505,22 @@
       <mobile>
         <nationalNumberPattern>
           6(?:
-            44|
             5[0-3579]|
             6[013-9]|
             [7-9]\d
           )\d{4,10}
         </nationalNumberPattern>
         <possibleNumberPattern>\d{7,13}</possibleNumberPattern>
-        <exampleNumber>644123456</exampleNumber>
+        <exampleNumber>664123456</exampleNumber>
       </mobile>
       <tollFree>
-        <nationalNumberPattern>80[02]\d{6,10}</nationalNumberPattern>
+        <nationalNumberPattern>800\d{6,10}</nationalNumberPattern>
         <possibleNumberPattern>\d{9,13}</possibleNumberPattern>
         <exampleNumber>800123456</exampleNumber>
       </tollFree>
       <premiumRate>
         <nationalNumberPattern>
           (?:
-            711|
             9(?:
               0[01]|
               3[019]
@@ -1673,7 +1673,7 @@
       <mobile>
         <!-- Includes MobileSat and Thuraya satellite services. According to the wikipedia page,
              other ranges 14[1-3] are not currently used. Note CC and CX should be updated as well
-             if this pattern changes. -->
+             if this pattern changes. Prefix 472 is added based on user report. -->
         <nationalNumberPattern>
           14(?:
             5\d|
@@ -1685,7 +1685,7 @@
             4[47-9]|
             5[0-25-9]|
             6[6-9]|
-            7[03-9]|
+            7[02-9]|
             8[147-9]|
             9[017-9]
           )\d{6}
@@ -2183,7 +2183,7 @@
         <sourceUrl>http://www.btrc.gov.bd/sites/default/files/national_numbering_plan_2005_0.pdf</sourceUrl>
       </references>
       <availableFormats>
-        <numberFormat pattern="(2)(\d{7})">
+        <numberFormat pattern="(2)(\d{7,8})">
           <leadingDigits>2</leadingDigits>
           <format>$1-$2</format>
         </numberFormat>
@@ -2247,15 +2247,16 @@
       <fixedLine>
         <!-- There was a plan to move to 10 digit fixed-line numbers, but this does not seem to have
              been realised, judging by online numbers and wikipedia. These patterns are grouped
-             first by leading digit, then within by number of digits. Several Dhaka prefixes (02 731,
-             02 910, etc.) are included despite not being mentioned on Wikipedia / ITU due to
-             online evidence. Another oddity is Chittagong - some numbers have a leading 2, others
-             do not - both are allowed for now. For some area codes, the subscriber number length
-             described in our source documentation doesn't match numbers online (e.g. 05222) so we
-             allow both for now. (This applies to 0431, 04329, 04623, 05327 as well). We have
+             first by leading digit, then within by number of digits. Several Dhaka prefixes(02 731,
+             02 890, 02 910, 02 550 etc.) are included despite not being mentioned on Wikipedia /
+             ITU due to online evidence. Another oddity is Chittagong - some numbers have a leading
+             2, others do not - both are allowed for now. For some area codes, the subscriber number
+             length described in our source documentation doesn't match numbers online (e.g. 05222)
+             so we allow both for now. (This applies to 0431, 04329, 04623, 05327 as well). We have
              also added 04452 and 04923 from numbers found online. -->
         <nationalNumberPattern>
           2(?:
+            550\d|
             7(?:
               1[0-267]|
               2[0-289]|
@@ -2271,7 +2272,8 @@
               2[0157-9]|
               6[1-35]|
               7[1-5]|
-              8[1-8]
+              8[1-8]|
+              90
             )|
             9(?:
               0[0-2]|
@@ -2964,23 +2966,25 @@
         <possibleNumberPattern>\d{8}</possibleNumberPattern>
       </generalDesc>
       <fixedLine>
-        <nationalNumberPattern>
-          22(?:
-            2[0-7]|
-            [3-5]0
-          )\d{4}
-        </nationalNumberPattern>
+        <!-- ITU update 17.IV.2015 assigns 22X completely to Onatel fixed line. Earlier  ITU
+             updates (11.IX.2013) were more detailed in that range and only half of it was
+             assigned. Erring on the side of ITU and lenience for now, but we may have to make the
+             range stricter again. -->
+        <nationalNumberPattern>22\d{6}</nationalNumberPattern>
         <exampleNumber>22201234</exampleNumber>
       </fixedLine>
       <mobile>
         <!-- Extra online mobile number prefixes found: 74.
              The 29 prefix is listed as a mobile prefix, but many people list it as their fixed home
              number. We will keep it as mobile for now, but it may actually be a prefix for fixed
-             satellite phones. -->
+             satellite phones.
+             78 is officially not in operation (since 17.IX.2015 (cl/106680153). Remove after about
+             a year and verifying it's not working / used anymore. -->
         <nationalNumberPattern>
           (?:
-            [26]9|
-            7[14-9]
+            29|
+            6[189]|
+            7[124-9]
           )\d{6}
         </nationalNumberPattern>
         <exampleNumber>79561234</exampleNumber>
@@ -3296,9 +3300,9 @@
 
     <!-- Brazil -->
     <territory id="BR" countryCode="55"
-               internationalPrefix="00(?:1[45]|2[135]|31|4[13])"
+               internationalPrefix="00(?:1[245]|2[1-35]|31|4[13]|[56]5|99)"
                nationalPrefix="0"
-               nationalPrefixForParsing="0(?:(1[245]|2[135]|31|4[13])(\d{10,11}))?"
+               nationalPrefixForParsing="0(?:(1[245]|2[1-35]|31|4[13]|[56]5|99)(\d{10,11}))?"
                nationalPrefixTransformRule="$2" mobileNumberPortableRegion="true">
       <references>
         <sourceUrl>http://en.wikipedia.org/wiki/%2B55</sourceUrl>
@@ -3357,8 +3361,16 @@
           <leadingDigits>[1-9][1-9]</leadingDigits>
           <format>$1 $2-$3</format>
         </numberFormat>
-        <numberFormat pattern="([34]00\d)(\d{4})">
-          <leadingDigits>[34]00</leadingDigits>
+        <numberFormat pattern="(\d{4})(\d{4})">
+          <leadingDigits>
+            (?:
+             300|
+             40(?:
+                0|
+                20
+             )
+            )
+          </leadingDigits>
           <format>$1-$2</format>
         </numberFormat>
         <numberFormat nationalPrefixFormattingRule="$NP$FG"
@@ -3375,7 +3387,15 @@
         <possibleNumberPattern>\d{8,11}</possibleNumberPattern>
       </generalDesc>
       <noInternationalDialling>
-        <nationalNumberPattern>[34]00\d{5}</nationalNumberPattern>
+        <nationalNumberPattern>
+          (?:
+           300\d|
+           40(?:
+              0\d|
+              20
+           )
+          )\d{4}
+        </nationalNumberPattern>
         <possibleNumberPattern>\d{8}</possibleNumberPattern>
         <exampleNumber>40041234</exampleNumber>
       </noInternationalDialling>
@@ -3432,7 +3452,15 @@
         <exampleNumber>300123456</exampleNumber>
       </premiumRate>
       <sharedCost>
-        <nationalNumberPattern>[34]00\d{5}</nationalNumberPattern>
+        <nationalNumberPattern>
+          (?:
+           300\d|
+           40(?:
+              0\d|
+              20
+           )
+          )\d{4}
+        </nationalNumberPattern>
         <possibleNumberPattern>\d{8}</possibleNumberPattern>
         <exampleNumber>40041234</exampleNumber>
       </sharedCost>
@@ -3552,7 +3580,7 @@
       <availableFormats>
         <!-- Format is from
              http://www.tourism.gov.bt/tour-operators/bhutan-abbot-tours-and-travels.html -->
-        <numberFormat pattern="([17]7)(\d{2})(\d{2})(\d{2})">
+        <numberFormat pattern="(\d{2})(\d{2})(\d{2})(\d{2})">
           <leadingDigits>
             1|
             77
@@ -3586,13 +3614,19 @@
         <exampleNumber>2345678</exampleNumber>
       </fixedLine>
       <mobile>
-        <!-- The 77 prefix is not yet in the ITU document but numbers online indicate this prefix
-             is in use. -->
-        <nationalNumberPattern>[17]7\d{6}</nationalNumberPattern>
+        <nationalNumberPattern>
+          (?:
+            1[67]|
+            77
+          )\d{6}
+        </nationalNumberPattern>
         <possibleNumberPattern>\d{8}</possibleNumberPattern>
         <exampleNumber>17123456</exampleNumber>
       </mobile>
-      <!-- No information on other types of phone numbers for Bhutan has been found. -->
+      <!-- Universal personal telecommunication prefixes 700 and 878 are not
+           added as there is no information on length of numbers. -->
+      <!-- Pager service prefix 91 is not added as there is no information on
+           length of numbers. -->
     </territory>
 
     <!-- Botswana -->
@@ -4138,8 +4172,8 @@
             4[47-9]|
             5[0-25-9]|
             6[6-9]|
-            7[03-9]|
-            8[17-9]|
+            7[02-9]|
+            8[147-9]|
             9[017-9]
           )\d{6}
         </nationalNumberPattern>
@@ -4148,16 +4182,12 @@
       </mobile>
       <tollFree>
         <nationalNumberPattern>
-          1(?:
-            80(?:
-              0\d{2}
-            )?|
-            3(?:
-              00\d{2}
-            )?
-          )\d{4}
+          180(?:
+            0\d{3}|
+            2
+          )\d{3}
         </nationalNumberPattern>
-        <possibleNumberPattern>\d{6,10}</possibleNumberPattern>
+        <possibleNumberPattern>\d{7,10}</possibleNumberPattern>
         <exampleNumber>1800123456</exampleNumber>
       </tollFree>
       <premiumRate>
@@ -4165,6 +4195,18 @@
         <possibleNumberPattern>\d{10}</possibleNumberPattern>
         <exampleNumber>1900123456</exampleNumber>
       </premiumRate>
+      <sharedCost>
+      <!-- Local-rate (SmartNumbers) are put here because they are a reverse-charge network,
+           although they charge a small local call connect fee (around 25c). These start with 13
+           or 1300. -->
+        <nationalNumberPattern>
+          13(?:
+            00\d{2}
+          )?\d{4}
+        </nationalNumberPattern>
+        <possibleNumberPattern>\d{6,10}</possibleNumberPattern>
+        <exampleNumber>1300123456</exampleNumber>
+      </sharedCost>
       <personalNumber>
         <nationalNumberPattern>500\d{6}</nationalNumberPattern>
         <possibleNumberPattern>\d{9}</possibleNumberPattern>
@@ -5305,12 +5347,10 @@
             0[01]|
             7[0-3]
           )\d{5}|
-          6(?:
-            [0-2]\d|
-            30
-          )\d{5}|
-          7[0-3]\d{6}|
-          8[3-9]\d{6}
+          (?:
+            [67][0-3]|
+            8[3-9]
+          )\d{6}
         </nationalNumberPattern>
         <possibleNumberPattern>\d{8}</possibleNumberPattern>
         <exampleNumber>83123456</exampleNumber>
@@ -5470,11 +5510,11 @@
         <nationalNumberPattern>
           9(?:
             5(?:
-              [1246]\d|
+              [12467]\d|
               3[01]
             )|
             6(?:
-              [16-9]\d|
+              [15-9]\d|
               3[01]
             )
           )\d{4}
@@ -5488,14 +5528,9 @@
       <sharedCost>
         <!-- Value-added services are lumped together under shared cost, since we are not sure
              exactly what they are. -->
-        <nationalNumberPattern>
-          (?:
-            10|
-            69
-          )\d{5}
-        </nationalNumberPattern>
+        <nationalNumberPattern>60[0-2]\d{4}</nationalNumberPattern>
         <possibleNumberPattern>\d{7}</possibleNumberPattern>
-        <exampleNumber>1011234</exampleNumber>
+        <exampleNumber>6001234</exampleNumber>
       </sharedCost>
     </territory>
 
@@ -5533,8 +5568,8 @@
             4[47-9]|
             5[0-25-9]|
             6[6-9]|
-            7[03-9]|
-            8[17-9]|
+            7[02-9]|
+            8[147-9]|
             9[017-9]
           )\d{6}
         </nationalNumberPattern>
@@ -5543,16 +5578,12 @@
       </mobile>
       <tollFree>
         <nationalNumberPattern>
-          1(?:
-            80(?:
-              0\d{2}
-            )?|
-            3(?:
-              00\d{2}
-            )?
-          )\d{4}
+          180(?:
+            0\d{3}|
+            2
+          )\d{3}
         </nationalNumberPattern>
-        <possibleNumberPattern>\d{6,10}</possibleNumberPattern>
+        <possibleNumberPattern>\d{7,10}</possibleNumberPattern>
         <exampleNumber>1800123456</exampleNumber>
       </tollFree>
       <premiumRate>
@@ -5560,6 +5591,18 @@
         <possibleNumberPattern>\d{10}</possibleNumberPattern>
         <exampleNumber>1900123456</exampleNumber>
       </premiumRate>
+      <sharedCost>
+      <!-- Local-rate (SmartNumbers) are put here because they are a reverse-charge network,
+           although they charge a small local call connect fee (around 25c). These start with 13
+           or 1300. -->
+        <nationalNumberPattern>
+          13(?:
+            00\d{2}
+          )?\d{4}
+        </nationalNumberPattern>
+        <possibleNumberPattern>\d{6,10}</possibleNumberPattern>
+        <exampleNumber>1300123456</exampleNumber>
+      </sharedCost>
       <personalNumber>
         <nationalNumberPattern>500\d{6}</nationalNumberPattern>
         <possibleNumberPattern>\d{9}</possibleNumberPattern>
@@ -5593,7 +5636,7 @@
       </fixedLine>
       <mobile>
         <!-- Includes paging numbers (they are mixed into the same block). -->
-        <nationalNumberPattern>9[5-79]\d{6}</nationalNumberPattern>
+        <nationalNumberPattern>9[4-79]\d{6}</nationalNumberPattern>
         <exampleNumber>96123456</exampleNumber>
       </mobile>
       <tollFree>
@@ -7105,11 +7148,12 @@
       <mobile>
         <!-- The data here is not regularly updated by the Ethiopian authorities, and many more
              numbers are visible online than are reported in the ITU document. This pattern is
-             therefore somewhat more relaxed than in the ITU document. According to the ETC, the
-             prefix 93 is assigned to Addis Ababa Mobile and 95[89] to some CDMA providers. -->
+             therefore somewhat more relaxed than in the ITU document. According to the ETC,
+             95[89] is assigned to some CDMA providers. Prefix 94 added after a user report.-->
         <nationalNumberPattern>
           9(?:
             [1-3]\d|
+            4[02467]|
             5[89]
           )\d{6}
         </nationalNumberPattern>
@@ -7136,6 +7180,10 @@
           </leadingDigits>
           <format>$1 $2</format>
         </numberFormat>
+        <numberFormat pattern="(116\d{3})" nationalPrefixFormattingRule="$FG">
+          <leadingDigits>116</leadingDigits>
+          <format>$1</format>
+        </numberFormat>
         <numberFormat pattern="(\d{2})(\d{4,10})">
           <leadingDigits>
             [14]|
@@ -9411,7 +9459,7 @@
         <possibleNumberPattern>\d{8}</possibleNumberPattern>
       </generalDesc>
       <fixedLine>
-        <!-- Extra prefixes 227[01389], 228X, 2292, 260X and 2634 were added from numbers
+        <!-- Extra prefixes 227[01389], 228X, 2292, 260X and 263[04] were added from numbers
              found online. -->
         <nationalNumberPattern>
           2(?:
@@ -9439,7 +9487,7 @@
             )|
             6(?:
               [056]\d|
-              34|
+              3[04]|
               4[0-378]|
               [78][0-8]|
               9[01]
@@ -9757,8 +9805,12 @@
           <leadingDigits>8[1-35-9]</leadingDigits>
           <format>$1-$2-$3</format>
         </numberFormat>
+        <numberFormat pattern="(1)(500)(\d{3})" nationalPrefixFormattingRule="$FG">
+          <leadingDigits>15</leadingDigits>
+          <format>$1 $2 $3</format>
+        </numberFormat>
         <numberFormat pattern="(177)(\d{6,8})">
-          <leadingDigits>1</leadingDigits>
+          <leadingDigits>17</leadingDigits>
           <format>$1 $2</format>
         </numberFormat>
         <!-- http://en.wikipedia.org/wiki/Toll-free_telephone_number, and examples on the web show
@@ -9767,6 +9819,10 @@
           <leadingDigits>800</leadingDigits>
           <format>$1 $2</format>
         </numberFormat>
+        <numberFormat pattern="(804)(\d{3})(\d{4})">
+          <leadingDigits>804</leadingDigits>
+          <format>$1 $2 $3</format>
+        </numberFormat>
         <numberFormat pattern="(80\d)(\d)(\d{3})(\d{3})">
           <leadingDigits>80[79]</leadingDigits>
           <format>$1 $2 $3 $4</format>
@@ -9781,6 +9837,11 @@
         </nationalNumberPattern>
         <possibleNumberPattern>\d{5,12}</possibleNumberPattern>
       </generalDesc>
+      <noInternationalDialling>
+        <nationalNumberPattern>8071\d{6}</nationalNumberPattern>
+        <possibleNumberPattern>\d{10}</possibleNumberPattern>
+        <exampleNumber>8071123456</exampleNumber>
+      </noInternationalDialling>
       <fixedLine>
         <!-- Area codes taken from wikipedia, with missing ones added from
              http://www.telkom.co.id/customer-services/area-and-country-code/?type=area.
@@ -9958,22 +10019,25 @@
         <possibleNumberPattern>\d{8,11}</possibleNumberPattern>
         <exampleNumber>8001234567</exampleNumber>
       </tollFree>
-      <uan>
-        <nationalNumberPattern>8071\d{6}</nationalNumberPattern>
-        <possibleNumberPattern>\d{10}</possibleNumberPattern>
-        <exampleNumber>8071123456</exampleNumber>
-      </uan>
-      <noInternationalDialling>
-        <nationalNumberPattern>8071\d{6}</nationalNumberPattern>
-        <possibleNumberPattern>\d{10}</possibleNumberPattern>
-        <exampleNumber>8071123456</exampleNumber>
-      </noInternationalDialling>
       <!-- The information below is provided by an Indonesian -->
       <premiumRate>
         <nationalNumberPattern>809\d{7}</nationalNumberPattern>
         <possibleNumberPattern>\d{10}</possibleNumberPattern>
         <exampleNumber>8091234567</exampleNumber>
       </premiumRate>
+      <sharedCost>
+        <nationalNumberPattern>804\d{7}</nationalNumberPattern>
+        <possibleNumberPattern>\d{10}</possibleNumberPattern>
+        <exampleNumber>8041234567</exampleNumber>
+      </sharedCost>
+      <uan>
+        <nationalNumberPattern>
+          1500\d{3}|
+          8071\d{6}
+        </nationalNumberPattern>
+        <possibleNumberPattern>\d{7,10}</possibleNumberPattern>
+        <exampleNumber>8071123456</exampleNumber>
+      </uan>
     </territory>
 
     <!-- Ireland -->
@@ -10235,7 +10299,7 @@
             5(?:
               01|
               2[23]|
-              3[34]|
+              3[2-4]|
               4[45]|
               5[5689]|
               6[67]|
@@ -10306,7 +10370,7 @@
               77|
               81
             )|
-            99\d
+            9[29]\d
           )\d{5}
         </nationalNumberPattern>
         <possibleNumberPattern>\d{9}</possibleNumberPattern>
@@ -11072,6 +11136,7 @@
     <territory id="IQ" countryCode="964" internationalPrefix="00"
                nationalPrefix="0" nationalPrefixFormattingRule="$NP$FG">
       <references>
+        <sourceUrl>https://www.itu.int/oth/T0202000067/en</sourceUrl>
         <sourceUrl>http://en.wikipedia.org/wiki/%2B964</sourceUrl>
         <sourceUrl>http://wtng.info/wtng-964-ik.html</sourceUrl>
       </references>
@@ -11249,10 +11314,14 @@
     </territory>
 
     <!-- Iceland -->
-    <territory id="IS" countryCode="354" internationalPrefix="00" mobileNumberPortableRegion="true">
+    <!-- As per new update from Iceland added carrier selection codes as international
+         prefixes. -->
+    <territory id="IS" countryCode="354" internationalPrefix="1(?:0(?:01|10|20)|100)|00"
+               preferredInternationalPrefix="00" mobileNumberPortableRegion="true">
       <references>
         <sourceUrl>http://www.pta.is/default.aspx?cat_id=85</sourceUrl>
         <sourceUrl>http://www.pfs.is/default.aspx?cat_id=14&amp;module_id=210&amp;element_id=4</sourceUrl>
+        <sourceUrl>http://www.pfs.is/english/telecom-affairs/numbering/</sourceUrl>
       </references>
       <availableFormats>
         <numberFormat pattern="(\d{3})(\d{4})">
@@ -11280,7 +11349,7 @@
               2[0-7]|
               [37][0-8]|
               4[0-245]|
-              5[0-3568]|
+              5[0-68]|
               6\d|
               8[0-36-8]
             )|
@@ -11288,7 +11357,7 @@
               05|
               [156]\d|
               2[02578]|
-              3[013-7]|
+              3[013-79]|
               4[03-7]|
               7[0-2578]|
               8[0-35-9]|
@@ -11307,19 +11376,20 @@
           (?:
             6(?:
               1[1-8]|
+              2[056]|
               3[089]|
               4[0167]|
-              5[019]|
+              5[0159]|
               [67][0-69]|
               9\d
             )|
             7(?:
               5[057]|
-              7\d|
-              8[0-36-8]
+              6[0-2]|
+              [78]\d
             )|
             8(?:
-              2[0-5]|
+              2[0-59]|
               3[0-4]|
               [469]\d|
               5[1-9]
@@ -11350,17 +11420,25 @@
         <nationalNumberPattern>
           (?:
             6(?:
-              2[0-8]|
+              2[1-478]|
               49|
               8\d
             )|
-            87[0189]|
+            8(?:
+              7[0189]|
+              80
+            )|
             95[48]
           )\d{4}
         </nationalNumberPattern>
         <possibleNumberPattern>\d{7}</possibleNumberPattern>
-        <exampleNumber>6201234</exampleNumber>
+        <exampleNumber>6211234</exampleNumber>
       </voicemail>
+      <uan>
+        <nationalNumberPattern>809\d{4}</nationalNumberPattern>
+        <possibleNumberPattern>\d{7}</possibleNumberPattern>
+        <exampleNumber>8091234</exampleNumber>
+      </uan>
     </territory>
 
     <!-- Italy -->
@@ -13371,15 +13449,7 @@
         <exampleNumber>31234</exampleNumber>
       </fixedLine>
       <mobile>
-        <!-- North Tarawa is listed as 720XXXXX-729XXXXX but considering that this deviates from the
-             pattern followed by every other place, we are assuming 731XXXXX-732XXXXX for now. -->
-        <nationalNumberPattern>
-          7(?:
-            [24]\d|
-            3[1-9]|
-            8[0-5]
-          )\d{5}
-        </nationalNumberPattern>
+        <nationalNumberPattern>7\d{7}</nationalNumberPattern>
         <possibleNumberPattern>\d{8}</possibleNumberPattern>
         <exampleNumber>72012345</exampleNumber>
       </mobile>
@@ -13621,21 +13691,23 @@
         <numberFormat pattern="(\d{2})(\d{3,4})(\d{4})">
           <leadingDigits>
             1(?:
-              [169][2-8]|
-              [78]|
-              5[1-4]
+              [01]|
+              5[1-4]|
+              6[2-8]|
+              [7-9]
             )|
             [68]0|
             [3-6][1-9][1-9]
           </leadingDigits>
           <leadingDigits>
             1(?:
-              [169][2-8]|
-              [78]|
+              [01]|
               5(?:
                 [1-3]|
                 4[56]
-              )
+              )|
+              6[2-8]|
+              [7-9]
             )|
             [68]0|
             [3-6][1-9][1-9]
@@ -15739,7 +15811,7 @@
         <numberFormat pattern="(\d)(\d{3})(\d{3,4})">
           <leadingDigits>
             1|
-            2[45]
+            2[245]
           </leadingDigits>
           <format>$1 $2 $3</format>
         </numberFormat>
@@ -15818,7 +15890,11 @@
             [89][0-6]\d
           )\d{4}|
           2(?:
-            [236-9]\d{4}|
+            2(?:
+              000\d{3}|
+              \d{4}
+            )|
+            3\d{4}|
             4(?:
               0\d{5}|
               \d{4}
@@ -15826,7 +15902,8 @@
             5(?:
               1\d{3,6}|
               [02-9]\d{3,5}
-            )
+            )|
+            [6-9]\d{4}
           )|
           4(?:
             2[245-8]|
@@ -15873,15 +15950,22 @@
           )\d{4}|
           8(?:
             1(?:
-              2\d?|
-              [3-689]
-            )|
-            2[2-8]|
-            3[24]|
-            4[24-7]|
-            5[245]|
-            6[23]
-          )\d{4}
+              2\d{1,2}|
+              [3-689]\d
+            )|
+            2(?:
+              2\d|
+              3(?:
+                \d|
+                20
+              )|
+              [4-8]\d
+            )|
+            3[24]\d|
+            4[24-7]\d|
+            5[245]\d|
+            6[23]\d
+          )\d{3}
         </nationalNumberPattern>
         <possibleNumberPattern>\d{5,9}</possibleNumberPattern>
         <exampleNumber>1234567</exampleNumber>
@@ -16013,13 +16097,15 @@
         </nationalNumberPattern>
         <exampleNumber>50123456</exampleNumber>
       </fixedLine>
-      <!-- Added prefix 80 as per IR21 from carrier. -->
       <mobile>
         <nationalNumberPattern>
           (?:
-            8[0689]|
-            9[013-9]
-          )\d{6}
+            8(?:
+              [05689]\d|
+              3[01]
+            )|
+            9[013-9]\d
+          )\d{5}
         </nationalNumberPattern>
         <possibleNumberPattern>\d{8}</possibleNumberPattern>
         <exampleNumber>88123456</exampleNumber>
@@ -16038,6 +16124,7 @@
     <territory id="MO" countryCode="853" internationalPrefix="00">
       <references>
         <sourceUrl>http://www.itu.int/oth/T020200007E/en</sourceUrl>
+        <sourceUrl>http://www.dsrt.gov.mo/web/en/generalinfo/allocatednum</sourceUrl>
       </references>
       <availableFormats>
         <numberFormat pattern="([268]\d{3})(\d{4})">
@@ -16060,7 +16147,12 @@
       <mobile>
         <!-- The 6[23] prefixes are added as SMS messages have been successfully delivered to these
              numbers, and they are also widely present on the Internet. -->
-        <nationalNumberPattern>6[236]\d{6}</nationalNumberPattern>
+        <nationalNumberPattern>
+          6(?:
+            [2356]\d|
+            8[18]
+          )\d{5}
+        </nationalNumberPattern>
         <exampleNumber>66123456</exampleNumber>
       </mobile>
       <!-- No tollFree or premiumRate information can be found. -->
@@ -17812,7 +17904,7 @@
           </leadingDigits>
           <format>$1-$2</format>
         </numberFormat>
-        <numberFormat pattern="(9\d{2})(\d{7})">
+        <numberFormat pattern="(9\d{2})(\d{7})" nationalPrefixFormattingRule="$FG">
           <leadingDigits>
             9(?:
               6[013]|
@@ -19902,6 +19994,7 @@
               0[12]|
               4[1-35-79]|
               5[1-3]|
+              65|
               8[1-58]|
               9[0145]
             )|
@@ -19919,7 +20012,7 @@
               3[13-6]|
               4[0-8]|
               5[15]|
-              6[1-35-7]|
+              6[1-35-79]|
               7[1-37-9]
             )
           )\d{7}
@@ -20666,7 +20759,7 @@
           pattern="(\d)(\d{3})(\d{2})(\d{2})">
           <leadingDigits>
             [12]|
-            3[4-8]|
+            3[24-8]|
             4[24-8]|
             5[2-8]|
             7[3-8]
@@ -20702,11 +20795,12 @@
         <possibleNumberPattern>\d{5,8}</possibleNumberPattern>
       </generalDesc>
       <fixedLine>
+        <!-- Prefix 32 added after a user report.-->
         <nationalNumberPattern>
           (?:
             1\d|
             [25][2-8]|
-            3[4-8]|
+            3[24-8]|
             4[24-8]|
             7[3-8]
           )\d{6}
@@ -20856,14 +20950,24 @@
           <leadingDigits>[689]</leadingDigits>
           <format>$1 $2 $3</format>
         </numberFormat>
+        <numberFormat pattern="(9090)(\d{3})">
+          <leadingDigits>9090</leadingDigits>
+          <format>$1 $2</format>
+        </numberFormat>
       </availableFormats>
       <generalDesc>
-        <nationalNumberPattern>[2-689]\d{8}</nationalNumberPattern>
-        <possibleNumberPattern>\d{9}</possibleNumberPattern>
+        <nationalNumberPattern>
+          (?:
+           [2-68]\d{8}|
+           9\d{6,8}
+          )
+        </nationalNumberPattern>
+        <possibleNumberPattern>\d{7,9}</possibleNumberPattern>
       </generalDesc>
       <noInternationalDialling>
         <nationalNumberPattern>
           (?:
+            602|
             8(?:
               00|
               [5-9]\d
@@ -20872,13 +20976,15 @@
               00|
               [78]\d
             )
-          )\d{6}
+          )\d{6}|
+          9090\d{3}
         </nationalNumberPattern>
-        <possibleNumberPattern>\d{9}</possibleNumberPattern>
+        <possibleNumberPattern>\d{7,9}</possibleNumberPattern>
         <exampleNumber>800123456</exampleNumber>
       </noInternationalDialling>
       <fixedLine>
         <nationalNumberPattern>[2-5]\d{8}</nationalNumberPattern>
+        <possibleNumberPattern>\d{9}</possibleNumberPattern>
         <exampleNumber>212345678</exampleNumber>
       </fixedLine>
       <mobile>
@@ -20888,13 +20994,21 @@
           9(?:
             0[1-8]|
             1[0-24-9]|
-            4[0489]
+            4[0489]|
+            50
           )\d{6}
         </nationalNumberPattern>
+        <possibleNumberPattern>\d{9}</possibleNumberPattern>
         <exampleNumber>912123456</exampleNumber>
       </mobile>
+      <pager>
+        <nationalNumberPattern>9090\d{3}</nationalNumberPattern>
+        <possibleNumberPattern>\d{7}</possibleNumberPattern>
+        <exampleNumber>9090123</exampleNumber>
+      </pager>
       <tollFree>
         <nationalNumberPattern>800\d{6}</nationalNumberPattern>
+        <possibleNumberPattern>\d{9}</possibleNumberPattern>
         <exampleNumber>800123456</exampleNumber>
       </tollFree>
       <premiumRate>
@@ -20904,19 +21018,23 @@
             00\d{6}
           )
         </nationalNumberPattern>
+        <possibleNumberPattern>\d{9}</possibleNumberPattern>
         <exampleNumber>900123456</exampleNumber>
       </premiumRate>
       <sharedCost>
         <nationalNumberPattern>8[5-9]\d{7}</nationalNumberPattern>
+        <possibleNumberPattern>\d{9}</possibleNumberPattern>
         <exampleNumber>850123456</exampleNumber>
       </sharedCost>
       <voip>
         <nationalNumberPattern>
           6(?:
+            02|
             5[0-4]|
             9[0-6]
           )\d{6}
         </nationalNumberPattern>
+        <possibleNumberPattern>\d{9}</possibleNumberPattern>
         <exampleNumber>690123456</exampleNumber>
       </voip>
       <uan>
@@ -22093,22 +22211,22 @@
         <possibleNumberPattern>\d{8}</possibleNumberPattern>
       </generalDesc>
       <fixedLine>
-        <!-- 3[012] numbers are no longer listed in the ITU doc, but we support them based on
-             online searches. -->
         <nationalNumberPattern>
-          3[012]\d{6}|
+          3(?:
+            [012]\d|
+            6[0-4]|
+            91
+          )\d{5}|
           7\d{7}|
           81200\d{3}
         </nationalNumberPattern>
         <exampleNumber>71234567</exampleNumber>
       </fixedLine>
       <mobile>
-        <!-- Numbers starting with 5 are no longer listed in the ITU doc, but we support them based
-             on online searches and Wikipedia. -->
         <nationalNumberPattern>
           (?:
             [259]\d|
-            4[0-24]
+            4[0-6]
           )\d{6}
         </nationalNumberPattern>
         <exampleNumber>20123456</exampleNumber>
@@ -22411,8 +22529,8 @@
       </references>
       <!-- Numbers are formatted as a block. -->
       <generalDesc>
-        <nationalNumberPattern>[29]\d{4,5}</nationalNumberPattern>
-        <possibleNumberPattern>\d{5,6}</possibleNumberPattern>
+        <nationalNumberPattern>[279]\d{4,6}</nationalNumberPattern>
+        <possibleNumberPattern>\d{5,7}</possibleNumberPattern>
       </generalDesc>
       <fixedLine>
         <nationalNumberPattern>2[02-9]\d{3}</nationalNumberPattern>
@@ -22423,8 +22541,13 @@
         <!-- Some numbers online can be found that are 5-digits long, and start with 90 or 91. We
              don't know if these are valid or not - the ITU document excludes them - so are not
              covering these for now. -->
-        <nationalNumberPattern>90\d{4}</nationalNumberPattern>
-        <possibleNumberPattern>\d{6}</possibleNumberPattern>
+        <nationalNumberPattern>
+          (?:
+            70\d|
+            90
+          )\d{4}
+        </nationalNumberPattern>
+        <possibleNumberPattern>\d{6,7}</possibleNumberPattern>
         <exampleNumber>901234</exampleNumber>
       </mobile>
     </territory>
@@ -23658,7 +23781,7 @@
               3[0-4]|
               5[45]|
               89|
-              9[0-5]
+              9[0-58]
             )|
             5(?:
               2[6-9]|
@@ -23800,12 +23923,15 @@
       <mobile>
         <!-- No data on central office codes can be found on the nanpa.com website. The codes
              34[0-367], 446 and 54[57] have been added from numbers found in the white pages. -->
+        <!-- Prefix 394 has been found online and is treated as mobile as all mobile ranges
+             start with prefix 3 and there is no evidence suggesting otherwise. -->
         <nationalNumberPattern>
           284(?:
             (?:
               3(?:
                 0[0-3]|
-                4[0-367]
+                4[0-367]|
+                94
               )|
               4(?:
                 4[0-6]|
@@ -24198,7 +24324,7 @@
         </numberFormat>
       </availableFormats>
       <generalDesc>
-        <nationalNumberPattern>[5-7]\d{5}</nationalNumberPattern>
+        <nationalNumberPattern>[4-8]\d{5}</nationalNumberPattern>
         <possibleNumberPattern>\d{6}</possibleNumberPattern>
       </generalDesc>
       <fixedLine>
@@ -24218,11 +24344,16 @@
           (?:
             50|
             68|
-            72
+            72|
+            8[23]
           )\d{4}
         </nationalNumberPattern>
         <exampleNumber>501234</exampleNumber>
       </mobile>
+      <voicemail>
+        <nationalNumberPattern>[48]0\d{4}</nationalNumberPattern>
+        <exampleNumber>401234</exampleNumber>
+      </voicemail>
     </territory>
 
     <!-- Samoa -->