phonelib 0.4.7 → 0.4.8

data/data/libphonenumber/resources/PhoneNumberMetadata.xml

@@ -97,25 +97,30 @@
       </references>
       <!-- Formatted as a block. -->
       <generalDesc>
-        <nationalNumberPattern>[2-7]\d{3,5}</nationalNumberPattern>
-        <possibleNumberPattern>\d{4,6}</possibleNumberPattern>
+        <nationalNumberPattern>
+          [46]\d{4}|
+          [01589]\d{5}
+        </nationalNumberPattern>
+        <possibleNumberPattern>\d{5,6}</possibleNumberPattern>
       </generalDesc>
       <fixedLine>
         <nationalNumberPattern>
-          (?:
-            [267]\d|
-            3[0-5]|
-            4[4-69]
-          )\d{2}
+          6[2-467]\d{3}
         </nationalNumberPattern>
-        <possibleNumberPattern>\d{4}</possibleNumberPattern>
-        <exampleNumber>6889</exampleNumber>
+        <possibleNumberPattern>\d{5}</possibleNumberPattern>
+        <exampleNumber>62889</exampleNumber>
       </fixedLine>
       <mobile>
-        <nationalNumberPattern>5\d{5}</nationalNumberPattern>
-        <possibleNumberPattern>\d{6}</possibleNumberPattern>
-        <exampleNumber>501234</exampleNumber>
+        <!-- Note prefix 4 is reserved for mobile use , not currently in use -->
+        <nationalNumberPattern>4\d{4}</nationalNumberPattern>
+        <possibleNumberPattern>\d{5}</possibleNumberPattern>
+        <exampleNumber>40123</exampleNumber>
       </mobile>
+      <uan>
+        <nationalNumberPattern>[01589]\d{5}</nationalNumberPattern>
+        <possibleNumberPattern>\d{6}</possibleNumberPattern>
+        <exampleNumber>542011</exampleNumber>
+      </uan>
     </territory>
 
     <!-- Andorra -->
@@ -251,7 +256,7 @@
             [2-7]
           </leadingDigits>
           <format>$1 $2 $3</format>
-         </numberFormat>
+        </numberFormat>
       </availableFormats>
       <generalDesc>
         <nationalNumberPattern>[2-7]\d{8}</nationalNumberPattern>
@@ -681,105 +686,105 @@
          the latter two cases we just strip the 0 or 15 as appropriate and leave the number as is.)
          -->
     <territory id="AR" countryCode="54" internationalPrefix="00" nationalPrefix="0"
-       nationalPrefixForParsing="
-         0?(?:(
-            11|
-            2(?:
-              2(?:
-                02?|
-                [13]|
-                2[13-79]|
-                4[1-6]|
-                5[2457]|
-                6[124-8]|
-                7[1-4]|
-                8[13-6]|
-                9[1267]
-              )|
-              3(?:
-                02?|
-                1[467]|
-                2[03-6]|
-                3[13-8]|
-                [49][2-6]|
-                5[2-8]|
-                [67]
-              )|
-              4(?:
-                7[3-578]|
-                9
-              )|
-              6(?:
-                [0136]|
-                2[24-6]|
-                4[6-8]?|
-                5[15-8]
-              )|
-              80|
-              9(?:
-                0[1-3]|
-                [19]|
-                2\d|
-                3[1-6]|
-                4[02568]?|
-                5[2-4]|
-                6[2-46]|
-                72?|
-                8[23]?
-              )
-           )|
-           3(?:
-             3(?:
-               2[79]|
-               6|
-               8[2578]
-             )|
-             4(?:
-               0[0-24-9]|
-               [12]|
-               3[5-8]?|
-               4[24-7]|
-               5[4-68]?|
-               6[02-9]|
-               7[126]|
-               8[2379]?|
-               9[1-36-8]
-             )|
-             5(?:
-               1|
-               2[1245]|
-               3[237]?|
-               4[1-46-9]|
-               6[2-4]|
-               7[1-6]|
-               8[2-5]?
-             )|
-             6[24]|
-             7(?:
-               [069]|
-               1[1568]|
-               2[15]|
-               3[145]|
-               4[13]|
-               5[14-8]|
-               7[2-57]|
-               8[126]
-             )|
-             8(?:
-               [01]|
-               2[15-7]|
-               3[2578]?|
-               4[13-6]|
-               5[4-8]?|
-               6[1-357-9]|
-               7[36-8]?|
-               8[5-8]?|
-               9[124]
-             )
-           )
-         )?15)?"
-       nationalPrefixTransformRule="9$1" nationalPrefixFormattingRule="$NP$FG"
-       mobileNumberPortableRegion="true">
+               nationalPrefixForParsing="
+                 0?(?:(
+                   11|
+                   2(?:
+                     2(?:
+                       02?|
+                       [13]|
+                       2[13-79]|
+                       4[1-6]|
+                       5[2457]|
+                       6[124-8]|
+                       7[1-4]|
+                       8[13-6]|
+                       9[1267]
+                     )|
+                     3(?:
+                       02?|
+                       1[467]|
+                       2[03-6]|
+                       3[13-8]|
+                       [49][2-6]|
+                       5[2-8]|
+                       [67]
+                     )|
+                     4(?:
+                       7[3-578]|
+                       9
+                     )|
+                     6(?:
+                       [0136]|
+                       2[24-6]|
+                       4[6-8]?|
+                       5[15-8]
+                     )|
+                     80|
+                     9(?:
+                       0[1-3]|
+                       [19]|
+                       2\d|
+                       3[1-6]|
+                       4[02568]?|
+                       5[2-4]|
+                       6[2-46]|
+                       72?|
+                       8[23]?
+                     )
+                   )|
+                   3(?:
+                     3(?:
+                       2[79]|
+                       6|
+                       8[2578]
+                     )|
+                     4(?:
+                       0[0-24-9]|
+                       [12]|
+                       3[5-8]?|
+                       4[24-7]|
+                       5[4-68]?|
+                       6[02-9]|
+                       7[126]|
+                       8[2379]?|
+                       9[1-36-8]
+                     )|
+                     5(?:
+                       1|
+                       2[1245]|
+                       3[237]?|
+                       4[1-46-9]|
+                       6[2-4]|
+                       7[1-6]|
+                       8[2-5]?
+                     )|
+                     6[24]|
+                     7(?:
+                       [069]|
+                       1[1568]|
+                       2[15]|
+                       3[145]|
+                       4[13]|
+                       5[14-8]|
+                       7[2-57]|
+                       8[126]
+                     )|
+                     8(?:
+                       [01]|
+                       2[15-7]|
+                       3[2578]?|
+                       4[13-6]|
+                       5[4-8]?|
+                       6[1-357-9]|
+                       7[36-8]?|
+                       8[5-8]?|
+                       9[124]
+                     )
+                   )
+                 )?15)?"
+               nationalPrefixTransformRule="9$1" nationalPrefixFormattingRule="$NP$FG"
+               mobileNumberPortableRegion="true">
       <references>
         <sourceUrl>http://www.itu.int/oth/T0202000009/en</sourceUrl>
         <!-- On the following link, click on Indicativos Interurbanos to access detailed
@@ -2520,23 +2525,23 @@
         </numberFormat>
       </availableFormats>
       <generalDesc>
-        <nationalNumberPattern>[24-7]\d{7}</nationalNumberPattern>
+        <nationalNumberPattern>[267]\d{7}</nationalNumberPattern>
         <possibleNumberPattern>\d{8}</possibleNumberPattern>
       </generalDesc>
       <fixedLine>
         <nationalNumberPattern>
-          (?:
-            20(?:
+          2(?:
+            0(?:
               49|
               5[23]|
               9[016-9]
             )|
-            40(?:
+            4(?:
               4[569]|
               5[4-6]|
               7[0179]
             )|
-            50(?:
+            5(?:
               [34]\d|
               50
             )
@@ -2593,6 +2598,10 @@
           <leadingDigits>[78]00</leadingDigits>
           <format>$1 $2 $3</format>
         </numberFormat>
+        <numberFormat pattern="(\d{3})(\d{3})(\d{3})">
+          <leadingDigits>999</leadingDigits>
+          <format>$1 $2 $3</format>
+        </numberFormat>
         <numberFormat pattern="(\d{2})(\d{3})(\d{2,3})">
           <leadingDigits>
             [356]|
@@ -2647,12 +2656,16 @@
         <possibleNumberPattern>\d{5,8}</possibleNumberPattern>
         <exampleNumber>2123456</exampleNumber>
       </fixedLine>
+      <!-- 999-xxx-xxx numbers have been added based on information received from MAX telecom. -->
       <mobile>
         <nationalNumberPattern>
           (?:
-            8[7-9]|
-            98
-          )\d{7}|
+            8[7-9]\d|
+            9(?:
+              8\d|
+              99
+            )
+          )\d{6}|
           4(?:
             3[0789]|
             8\d
@@ -3296,7 +3309,10 @@
               8[78]|
               9[89]
             )|
-            702
+            7(?:
+              02|
+              88
+            )
           )\d{4}
         </nationalNumberPattern>
         <exampleNumber>2423456789</exampleNumber>
@@ -3479,11 +3495,12 @@
         <exampleNumber>2401234</exampleNumber>
       </fixedLine>
       <mobile>
+      <!-- Added prefixes 748, 749, 778 after getting confirmation from the carriers who
+           own them. -->
         <nationalNumberPattern>
           7(?:
-            [1-356]\d|
-            4[0-7]|
-            7[014-7]
+            [1-6]\d|
+            7[014-8]
           )\d{5}
         </nationalNumberPattern>
         <possibleNumberPattern>\d{8}</possibleNumberPattern>
@@ -4107,10 +4124,11 @@
         <exampleNumber>061234567</exampleNumber>
       </mobile>
       <!-- Referred to as a "Green number" in the telephone plan. -->
-      <tollFree>
+      <premiumRate>
+        <!-- Using this to represent Value Added Service in the plan. -->
         <nationalNumberPattern>800\d{6}</nationalNumberPattern>
         <exampleNumber>800123456</exampleNumber>
-      </tollFree>
+      </premiumRate>
     </territory>
 
     <!-- Switzerland -->
@@ -4316,7 +4334,7 @@
         <numberFormat pattern="(\d)(\d{4})(\d{4})"
           nationalPrefixFormattingRule="($FG)"
           carrierCodeFormattingRule="$CC ($FG)">
-          <leadingDigits>22</leadingDigits>
+          <leadingDigits>2[23]</leadingDigits>
           <format>$1 $2 $3</format>
         </numberFormat>
         <numberFormat pattern="(\d{2})(\d{3})(\d{4})"
@@ -4398,6 +4416,10 @@
         <nationalNumberPattern>
           2(?:
             2\d{7}|
+            3(?:
+              20|
+              22
+            )\d{5}|
             1962\d{4}
           )|
           (?:
@@ -4455,9 +4477,9 @@
           <leadingDigits>[26]</leadingDigits>
           <format>$1 $2 $3 $4 $5</format>
         </numberFormat>
-        <numberFormat pattern="([2357-9]\d)(\d{2})(\d{2})(\d{2})">
+        <numberFormat pattern="(\d{2})(\d{2})(\d{2})(\d{2})">
           <leadingDigits>
-            [23579]|
+            [23]|
             88
           </leadingDigits>
           <format>$1 $2 $3 $4</format>
@@ -4468,11 +4490,10 @@
         </numberFormat>
       </availableFormats>
       <generalDesc>
-        <nationalNumberPattern>[235-9]\d{7,8}</nationalNumberPattern>
+        <nationalNumberPattern>[2368]\d{7,8}</nationalNumberPattern>
         <possibleNumberPattern>\d{8,9}</possibleNumberPattern>
       </generalDesc>
       <fixedLine>
-        <!-- Temporarily allow both old (22|33) and new 2(22|33) format. -->
         <!-- CDMA numbers are described in a subcategory to fixed line numbers in the ITU update
              document, so those prefixes are added to fixed line (24[23]). -->
         <nationalNumberPattern>
@@ -4480,20 +4501,15 @@
              22|
              33|
              4[23]
-          )\d{6}|
-          (?:
-            22|
-            33
           )\d{6}
         </nationalNumberPattern>
+        <possibleNumberPattern>\d{9}</possibleNumberPattern>
         <exampleNumber>222123456</exampleNumber>
       </fixedLine>
       <mobile>
-        <!-- Temporarily allow both old [579]\d{7} and new 6[5-79]\d{7} format. -->
-        <nationalNumberPattern>
-          6[5-79]\d{7}|
-          [579]\d{7}
-        </nationalNumberPattern>
+        <!-- 68 was added based on info found online. -->
+        <nationalNumberPattern>6[5-9]\d{7}</nationalNumberPattern>
+        <possibleNumberPattern>\d{9}</possibleNumberPattern>
         <exampleNumber>671234567</exampleNumber>
       </mobile>
       <tollFree>
@@ -5554,6 +5570,14 @@
           <leadingDigits>1[67]</leadingDigits>
           <format>$1 $2</format>
         </numberFormat>
+        <!-- Some non-geographical German numbers (carrier services etc..) have a 5 digit NSN and
+             need to be formatted with 5 leading digits (as opposed to the 4.7 format below).
+             These are all in the ranges 150, 155, 156 and 158 and as there is no overlap with
+             other number formats in those ranges, we only need to test the first 3 digits. -->
+        <numberFormat pattern="(15\d{3})(\d{6})">
+          <leadingDigits>15[0568]</leadingDigits>
+          <format>$1 $2</format>
+        </numberFormat>
         <numberFormat pattern="(1\d{3})(\d{7})">
           <leadingDigits>15</leadingDigits>
           <format>$1 $2</format>
@@ -5807,7 +5831,7 @@
              -->
         <nationalNumberPattern>
           1(?:
-            5[0-2579]\d{8}|
+            5[0-25-9]\d{8}|
             6[023]\d{7,8}|
             7(?:
               [0-57-9]\d?|
@@ -6150,7 +6174,7 @@
         <possibleNumberPattern>\d{10}</possibleNumberPattern>
         <exampleNumber>5002345678</exampleNumber>
       </personalNumber>
-   </territory>
+    </territory>
 
     <!-- Algeria -->
     <territory id="DZ" countryCode="213" internationalPrefix="00"
@@ -6199,7 +6223,9 @@
       <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. Prefixes 67[1-4] were also added for
-             Mobilis Algeria based on evidence found online. -->
+             Mobilis Algeria based on evidence found online. Added new ranges 675 and 676 as
+             per IR21 received.
+             -->
         <nationalNumberPattern>
           (?:
             5[4-6]|
@@ -6207,7 +6233,7 @@
           )\d{7}|
           6(?:
             [569]\d|
-            7[0-4]
+            7[0-6]
           )\d{6}
         </nationalNumberPattern>
         <possibleNumberPattern>\d{9}</possibleNumberPattern>
@@ -6236,7 +6262,7 @@
         <possibleNumberPattern>\d{9}</possibleNumberPattern>
         <exampleNumber>983123456</exampleNumber>
       </voip>
-   </territory>
+    </territory>
 
     <!-- Ecuador -->
     <territory id="EC" countryCode="593" internationalPrefix="00"
@@ -6473,33 +6499,33 @@
     <territory id="EG" countryCode="20" internationalPrefix="00"
                nationalPrefix="0" nationalPrefixFormattingRule="$NP$FG"
                mobileNumberPortableRegion="true">
-       <references>
-         <sourceUrl>http://www.itu.int/oth/T020200003E/en</sourceUrl>
-       </references>
-       <availableFormats>
-         <!-- Note that no explicit formatting rule is here for 5-digit numbers starting with a 16
-              or 19. These are formatted without national prefix, as a block, so do not need to be
-              listed here. -->
-         <numberFormat pattern="(\d)(\d{7,8})">
-           <leadingDigits>[23]</leadingDigits>
-           <format>$1 $2</format>
-         </numberFormat>
-         <numberFormat pattern="(\d{3})(\d{3})(\d{4})">
-           <leadingDigits>
-             1[012]|
-             [89]00
-           </leadingDigits>
-           <format>$1 $2 $3</format>
-         </numberFormat>
-         <numberFormat pattern="(\d{2})(\d{6,7})">
-           <leadingDigits>
-             1[35]|
-             [4-6]|
-             [89][2-9]
-           </leadingDigits>
-           <format>$1 $2</format>
-         </numberFormat>
-       </availableFormats>
+      <references>
+        <sourceUrl>http://www.itu.int/oth/T020200003E/en</sourceUrl>
+      </references>
+      <availableFormats>
+        <!-- Note that no explicit formatting rule is here for 5-digit numbers starting with a 16
+             or 19. These are formatted without national prefix, as a block, so do not need to be
+             listed here. -->
+        <numberFormat pattern="(\d)(\d{7,8})">
+          <leadingDigits>[23]</leadingDigits>
+          <format>$1 $2</format>
+        </numberFormat>
+        <numberFormat pattern="(\d{3})(\d{3})(\d{4})">
+          <leadingDigits>
+            1[012]|
+            [89]00
+          </leadingDigits>
+          <format>$1 $2 $3</format>
+        </numberFormat>
+        <numberFormat pattern="(\d{2})(\d{6,7})">
+          <leadingDigits>
+            1[35]|
+            [4-6]|
+            [89][2-9]
+          </leadingDigits>
+          <format>$1 $2</format>
+        </numberFormat>
+      </availableFormats>
       <generalDesc>
         <nationalNumberPattern>
           1\d{4,9}|
@@ -7138,8 +7164,8 @@
       </generalDesc>
       <fixedLine>
         <nationalNumberPattern>
-            3[2357]0[1-9]\d{3}|
-            9[2-6]\d{5}
+          3[2357]0[1-9]\d{3}|
+          9[2-6]\d{5}
         </nationalNumberPattern>
         <exampleNumber>3201234</exampleNumber>
       </fixedLine>
@@ -7252,7 +7278,10 @@
       <mobile>
         <nationalNumberPattern>
           6\d{8}|
-          7[5-9]\d{7}
+          7(?:
+            00\d{6}|
+            [3-9]\d{7}
+          )
         </nationalNumberPattern>
         <exampleNumber>612345678</exampleNumber>
       </mobile>
@@ -7299,7 +7328,7 @@
         <!-- This already has a leading zero so we format is "as is". -->
         <numberFormat pattern="(\d{2})(\d{2})(\d{2})(\d{2})">
           <leadingDigits>0</leadingDigits>
-         <format>$1 $2 $3 $4</format>
+          <format>$1 $2 $3 $4</format>
         </numberFormat>
       </availableFormats>
       <generalDesc>
@@ -9049,10 +9078,10 @@
         </nationalNumberPattern>
         <exampleNumber>2201234</exampleNumber>
       </fixedLine>
+      <!-- Although the ITU document would allow for a stricter pattern, the country has a track
+           record of underreporting valid mobile ranges and 6XXXXXX is almost fully assigned.
+           A more lenient pattern is better here. -->
       <mobile>
-        <!-- The ITU document only describes a few ranges for mobile numbers but there is evidence
-             that SMS messages have been succesfully sent to numbers in the entire range prefixed
-             with 6. -->
         <nationalNumberPattern>6\d{6}</nationalNumberPattern>
         <exampleNumber>6091234</exampleNumber>
       </mobile>
@@ -9159,7 +9188,7 @@
         <possibleNumberPattern>\d{8}</possibleNumberPattern>
         <exampleNumber>81123456</exampleNumber>
       </personalNumber>
-   </territory>
+    </territory>
 
     <!-- Honduras -->
     <!-- It seems there is no longer a trunk prefix in use, based on websites like
@@ -9170,16 +9199,17 @@
         <sourceUrl>http://www.itu.int/oth/T020200005F/en</sourceUrl>
       </references>
       <availableFormats>
-       <numberFormat pattern="(\d{4})(\d{4})">
-         <format>$1-$2</format>
-       </numberFormat>
+        <numberFormat pattern="(\d{4})(\d{4})">
+          <format>$1-$2</format>
+        </numberFormat>
       </availableFormats>
       <generalDesc>
         <nationalNumberPattern>[237-9]\d{7}</nationalNumberPattern>
         <possibleNumberPattern>\d{8}</possibleNumberPattern>
       </generalDesc>
       <fixedLine>
-        <!-- Extra prefixes 227[01389], 228X, 2292 & 260X were added from numbers found online. -->
+        <!-- Extra prefixes 227[01389], 228X, 2292, 260X and 2634 were added from numbers
+             found online. -->
         <nationalNumberPattern>
           2(?:
             2(?:
@@ -9206,6 +9236,7 @@
             )|
             6(?:
               [056]\d|
+              34|
               4[0-378]|
               [78][0-8]|
               9[01]
@@ -9242,20 +9273,20 @@
         <!-- The plan says 1 XXX XXXX but the government and local telecom websites are formatted 1
              XXXX XXX, so we prefer that formatting here. These same sources prefer XXX XXX to XX
              XXXX as well. -->
-       <numberFormat pattern="(1)(\d{4})(\d{3})">
-         <leadingDigits>1</leadingDigits>
-         <format>$1 $2 $3</format>
-       </numberFormat>
-       <numberFormat pattern="(6[09])(\d{4})(\d{3})">
-         <leadingDigits>6[09]</leadingDigits>
-         <format>$1 $2 $3</format>
-       </numberFormat>
-       <numberFormat pattern="(62)(\d{3})(\d{3,4})">
-         <leadingDigits>62</leadingDigits>
-         <format>$1 $2 $3</format>
-       </numberFormat>
-       <numberFormat pattern="([2-5]\d)(\d{3})(\d{3})">
-         <leadingDigits>[2-5]</leadingDigits>
+        <numberFormat pattern="(1)(\d{4})(\d{3})">
+          <leadingDigits>1</leadingDigits>
+          <format>$1 $2 $3</format>
+        </numberFormat>
+        <numberFormat pattern="(6[09])(\d{4})(\d{3})">
+          <leadingDigits>6[09]</leadingDigits>
+          <format>$1 $2 $3</format>
+        </numberFormat>
+        <numberFormat pattern="([67]2)(\d{3})(\d{3,4})">
+          <leadingDigits>[67]2</leadingDigits>
+          <format>$1 $2 $3</format>
+        </numberFormat>
+        <numberFormat pattern="([2-5]\d)(\d{3})(\d{3,4})">
+          <leadingDigits>[2-5]</leadingDigits>
           <format>$1 $2 $3</format>
         </numberFormat>
         <numberFormat pattern="(9\d)(\d{3})(\d{3,4})">
@@ -9272,14 +9303,14 @@
         </numberFormat>
         <numberFormat pattern="(\d{2})(\d{2})(\d{2,3})">
           <leadingDigits>
-            6[145]|
+            6[0145]|
             7
           </leadingDigits>
           <format>$1 $2 $3</format>
         </numberFormat>
         <numberFormat pattern="(\d{2})(\d{3,4})(\d{3})">
           <leadingDigits>
-            6[145]|
+            6[0145]|
             7
           </leadingDigits>
           <format>$1 $2 $3</format>
@@ -9301,27 +9332,32 @@
         <possibleNumberPattern>\d{6,12}</possibleNumberPattern>
       </generalDesc>
       <fixedLine>
-        <nationalNumberPattern>
+       <nationalNumberPattern>
           1\d{7}|
           (?:
             2[0-3]|
             3[1-5]|
             4[02-47-9]|
             5[1-3]
-          )\d{6}
+          )\d{6,7}
         </nationalNumberPattern>
-        <possibleNumberPattern>\d{6,8}</possibleNumberPattern>
+        <possibleNumberPattern>\d{6,9}</possibleNumberPattern>
         <exampleNumber>12345678</exampleNumber>
       </fixedLine>
       <uan>
-        <!-- ITU numbering plan doesn't specify the length of the numbers with prefix 62, but there
-             are numbers on the internet with 6 or 7 digits after the prefix. -->
-        <nationalNumberPattern>62\d{6,7}</nationalNumberPattern>
+        <!-- ITU numbering specifies the length of the numbers with prefix 62 as 8, but there
+             are numbers on the internet with 7 digits after the prefix too. -->
+        <nationalNumberPattern>[76]2\d{6,7}</nationalNumberPattern>
         <possibleNumberPattern>\d{8,9}</possibleNumberPattern>
         <exampleNumber>62123456</exampleNumber>
       </uan>
       <mobile>
-        <nationalNumberPattern>9[1257-9]\d{6,10}</nationalNumberPattern>
+        <nationalNumberPattern>
+          9(?:
+            [1-9]\d{6,10}|
+            01\d{6,9}
+           )
+        </nationalNumberPattern>
         <possibleNumberPattern>\d{8,12}</possibleNumberPattern>
         <exampleNumber>912345678</exampleNumber>
       </mobile>
@@ -9331,14 +9367,11 @@
         <exampleNumber>8001234567</exampleNumber>
       </tollFree>
       <premiumRate>
-        <!-- The prefixes 060, 061, 064, 065 and 069 are named as premium rate numbers by
-             http://www.vipnet.hr/en/poslovni-korisnici/telefon-internet/vip-adsl-usluga#panel_4.
-             -->
+        <!-- The prefixes 060, 061, 064, 065 and 069 are named as premium rate numbers by http://www.vipnet.hr/en/poslovni-korisnici/telefon-internet/vip-adsl-usluga#panel_4.-->
         <nationalNumberPattern>
-          6(?:
-            [09]\d{7}|
-            [145]\d{4,7}
-          )
+        6(?:
+          [01459]\d{4,7}
+         )
         </nationalNumberPattern>
         <possibleNumberPattern>\d{6,9}</possibleNumberPattern>
         <exampleNumber>611234</exampleNumber>
@@ -9986,7 +10019,7 @@
              added 5570 and 5571 prefixes based on confirmation from the carrier. -->
         <nationalNumberPattern>
           5(?:
-            [02347-9]\d{2}|
+            [02-47-9]\d{2}|
             5(?:
               01|
               2[23]|
@@ -9995,7 +10028,7 @@
               5[5689]|
               6[67]|
               7[0178]|
-              [89][7-9]
+              [89][6-9]
             )|
             6[2-9]\d
           )\d{5}
@@ -10015,10 +10048,10 @@
         <exampleNumber>1800123456</exampleNumber>
       </tollFree>
       <premiumRate>
-          <!-- Peculiarly, one source states that 1956 and 1957 are the new premium rate prefixes.
-               However, no online numbers starting with these prefixes can be found, and this data
-               is not found in any other source. -->
-          <!-- 1200 and 1212 numbers are for televoting. -->
+        <!-- Peculiarly, one source states that 1956 and 1957 are the new premium rate prefixes.
+             However, no online numbers starting with these prefixes can be found, and this data
+             is not found in any other source. -->
+        <!-- 1200 and 1212 numbers are for televoting. -->
         <nationalNumberPattern>
           1(?:
             212|
@@ -10045,20 +10078,23 @@
              Dialing) numbers, that most people forward to VoIP numbers. -->
         <nationalNumberPattern>
           7(?:
+            18\d|
             2[23]\d|
             3[237]\d|
             47\d|
             6(?:
               5\d|
-              8[068]
+              8[0168]
             )|
             7\d{2}|
             8(?:
+              2\d|
               33|
               55|
               77|
               81
-            )
+            )|
+            99\d
           )\d{5}
         </nationalNumberPattern>
         <possibleNumberPattern>\d{9}</possibleNumberPattern>
@@ -10159,303 +10195,306 @@
               5624\d
             )|
             7(?:
-              0624\d|
-              2299\d
+              0624\d|
+              2299\d
+            )
+          )\d{3}|
+          55\d{8}
+        </nationalNumberPattern>
+        <possibleNumberPattern>\d{10}</possibleNumberPattern>
+        <exampleNumber>5512345678</exampleNumber>
+      </uan>
+    </territory>
+
+    <!-- India -->
+    <!-- Note that several changes in area codes have occurred since the numbering plan was released
+         - fixed line changes are notified on the http://www.bsnl.co.in website. Area codes can be
+         verified here at http://dq.ndc.bsnl.co.in/bsnl-web/stdSearch.seam. -->
+    <territory id="IN" countryCode="91" internationalPrefix="00" nationalPrefix="0"
+               nationalPrefixFormattingRule="$NP$FG" nationalPrefixOptionalWhenFormatting="true"
+               mobileNumberPortableRegion="true">
+      <references>
+        <sourceUrl>http://www.itu.int/oth/T0202000063/en</sourceUrl>
+        <sourceUrl>http://en.wikipedia.org/wiki/%2B91</sourceUrl>
+        <sourceUrl>http://www.coai.in/msccodes.php</sourceUrl>
+      </references>
+      <availableFormats>
+        <!-- Mobile numbers. -->
+        <numberFormat pattern="(\d{5})(\d{5})">
+          <leadingDigits>
+            7(?:
+              0[2-9]|
+              2[012579]|
+              3[057-9]|
+              4[0-389]|
+              6[0-35-9]|
+              [57]|
+              8[0-79]
+            )|
+            8(?:
+              0[015689]|
+              1[0-57-9]|
+              2[2356-9]|
+              3[0-57-9]|
+              [45]|
+              6[02457-9]|
+              7[1-69]|
+              8[0124-9]|
+              9[02-9]
+            )|
+            9
+          </leadingDigits>
+          <leadingDigits>
+            7(?:
+              0(?:
+                2[2-9]|
+                [3-8]|
+                9[0-8]
+              )|
+              2(?:
+                0[024-9]|
+                19|
+                2[012]|
+                5[09]|
+                7[5-8]|
+                9[389]
+              )|
+              3(?:
+                0[1-9]|
+                [58]|
+                7[3679]|
+                9[689]
+              )|
+              4(?:
+                0[1-9]|
+                1[15-9]|
+                [29][89]|
+                39|
+                8[389]
+              )|
+              5(?:
+                [034678]|
+                2[03-9]|
+                5[017-9]|
+                9[7-9]
+              )|
+              6(?:
+                0[0-27]|
+                1[0-257-9]|
+                2[0-4]|
+                3[19]|
+                5[4589]|
+                [6-9]
+              )|
+              7(?:
+                0[2-9]|
+                [1-79]|
+                8[1-9]
+              )|
+              8(?:
+                [0-7]|
+                9[013-9]
+              )
+            )|
+            8(?:
+              0(?:
+                [01589]|
+                6[67]
+              )|
+              1(?:
+                [02-589]|
+                1[0135-9]|
+                7[0-79]
+              )|
+              2(?:
+                [236-9]|
+                5[1-9]
+              )|
+              3(?:
+                [0357-9]|
+                4[1-9]
+              )|
+              [45]|
+              6[02457-9]|
+              7[1-69]|
+              8(?:
+                [0-26-9]|
+                44|
+                5[2-9]
+              )|
+              9(?:
+                [035-9]|
+                2[2-9]|
+                4[0-8]
+              )
+            )|
+            9
+          </leadingDigits>
+          <format>$1 $2</format>
+        </numberFormat>
+        <!-- 2 digits area code -->
+        <numberFormat pattern="(\d{2})(\d{4})(\d{4})">
+          <leadingDigits>
+            11|
+            2[02]|
+            33|
+            4[04]|
+            79|
+            80[2-46]
+          </leadingDigits>
+          <format>$1 $2 $3</format>
+        </numberFormat>
+        <!-- 3 digit area codes that don't clash with mobile patterns. -->
+        <numberFormat pattern="(\d{3})(\d{3})(\d{4})">
+          <leadingDigits>
+            1(?:
+              2[0-249]|
+              3[0-25]|
+              4[145]|
+              [569][14]|
+              7[1257]|
+              8[1346]|
+              [68][1-9]
+            )|
+            2(?:
+              1[257]|
+              3[013]|
+              4[01]|
+              5[0137]|
+              6[0158]|
+              78|
+              8[1568]|
+              9[14]
+            )|
+            3(?:
+              26|
+              4[1-3]|
+              5[34]|
+              6[01489]|
+              7[02-46]|
+              8[159]
+            )|
+            4(?:
+              1[36]|
+              2[1-47]|
+              3[15]|
+              5[12]|
+              6[0-26-9]|
+              7[0-24-9]|
+              8[013-57]|
+              9[014-7]
+            )|
+            5(?:
+              1[025]|
+              [36][25]|
+              22|
+              4[28]|
+              5[12]|
+              [78]1|
+              9[15]
+            )|
+            6(?:
+              12|
+              [2345]1|
+              57|
+              6[13]|
+              7[14]|
+              80
+            )
+          </leadingDigits>
+          <format>$1 $2 $3</format>
+        </numberFormat>
+        <!-- Three-digit area codes that potentially overlap with mobile. -->
+        <numberFormat pattern="(\d{3})(\d{3})(\d{4})">
+          <leadingDigits>
+            7(?:
+              12|
+              2[14]|
+              3[134]|
+              4[47]|
+              5[15]|
+              [67]1|
+              88
             )
-          )\d{3}|
-          55\d{8}
-        </nationalNumberPattern>
-        <possibleNumberPattern>\d{10}</possibleNumberPattern>
-        <exampleNumber>5512345678</exampleNumber>
-      </uan>
-    </territory>
-
-    <!-- India -->
-    <!-- Note that several changes in area codes have occurred since the numbering plan was released
-         - fixed line changes are notified on the http://www.bsnl.co.in website. Area codes can be
-         verified here at http://dq.ndc.bsnl.co.in/bsnl-web/stdSearch.seam. -->
-    <territory id="IN" countryCode="91" internationalPrefix="00" nationalPrefix="0"
-               nationalPrefixFormattingRule="$NP$FG" nationalPrefixOptionalWhenFormatting="true"
-               mobileNumberPortableRegion="true">
-      <references>
-        <sourceUrl>http://www.itu.int/oth/T0202000063/en</sourceUrl>
-        <sourceUrl>http://en.wikipedia.org/wiki/%2B91</sourceUrl>
-        <sourceUrl>http://www.coai.in/msccodes.php</sourceUrl>
-      </references>
-       <availableFormats>
-         <!-- Mobile numbers. -->
-         <numberFormat pattern="(\d{5})(\d{5})">
-           <leadingDigits>
-             7(?:
-               0[2-9]|
-               2[0579]|
-               3[057-9]|
-               4[0-389]|
-               6[0-35-9]|
-               [57]|
-               8[0-79]
-             )|
-             8(?:
-               0[015689]|
-               1[0-57-9]|
-               2[2356-9]|
-               3[0-57-9]|
-               [45]|
-               6[02457-9]|
-               7[1-69]|
-               8[0124-9]|
-               9[02-9]
-             )|
-             9
-           </leadingDigits>
-           <leadingDigits>
-             7(?:
-               0(?:
-                 2[2-9]|
-                 [3-8]|
-                 9[0-8]
-               )|
-               2(?:
-                 0[04-9]|
-                 5[09]|
-                 7[5-8]|
-                 9[389]
-               )|
-               3(?:
-                 0[1-9]|
-                 [58]|
-                 7[3679]|
-                 9[689]
-               )|
-               4(?:
-                 0[1-9]|
-                 1[15-9]|
-                 [29][89]|
-                 39|
-                 8[389]
-               )|
-               5(?:
-                 [034678]|
-                 2[03-9]|
-                 5[017-9]|
-                 9[7-9]
-               )|
-               6(?:
-                 0[0-27]|
-                 1[0-257-9]|
-                 2[0-4]|
-                 3[19]|
-                 5[4589]|
-                 [6-9]
-               )|
-               7(?:
-                 0[2-9]|
-                 [1-79]|
-                 8[1-9]
-               )|
-               8(?:
-                 [0-7]|
-                 9[013-9]
-               )
-             )|
-             8(?:
-               0(?:
-                 [01589]|
-                 6[67]
-               )|
-               1(?:
-                 [02-589]|
-                 1[0135-9]|
-                 7[0-79]
-               )|
-               2(?:
-                 [236-9]|
-                 5[1-9]
-               )|
-               3(?:
-                 [0357-9]|
-                 4[1-9]
-               )|
-               [45]|
-               6[02457-9]|
-               7[1-69]|
-               8(?:
-                 [0-26-9]|
-                 44|
-                 5[2-9]
-               )|
-               9(?:
-                 [035-9]|
-                 2[2-9]|
-                 4[0-8]
-               )
-             )|
-             9
-           </leadingDigits>
-           <format>$1 $2</format>
-         </numberFormat>
-         <!-- 2 digits area code -->
-         <numberFormat pattern="(\d{2})(\d{4})(\d{4})">
-           <leadingDigits>
-             11|
-             2[02]|
-             33|
-             4[04]|
-             79|
-             80[2-46]
-           </leadingDigits>
-           <format>$1 $2 $3</format>
-         </numberFormat>
-         <!-- 3 digit area codes that don't clash with mobile patterns. -->
-         <numberFormat pattern="(\d{3})(\d{3})(\d{4})">
-           <leadingDigits>
-             1(?:
-               2[0-249]|
-               3[0-25]|
-               4[145]|
-               [569][14]|
-               7[1257]|
-               8[1346]|
-               [68][1-9]
-             )|
-             2(?:
-               1[257]|
-               3[013]|
-               4[01]|
-               5[0137]|
-               6[0158]|
-               78|
-               8[1568]|
-               9[14]
-             )|
-             3(?:
-               26|
-               4[1-3]|
-               5[34]|
-               6[01489]|
-               7[02-46]|
-               8[159]
-             )|
-             4(?:
-               1[36]|
-               2[1-47]|
-               3[15]|
-               5[12]|
-               6[0-26-9]|
-               7[0-24-9]|
-               8[013-57]|
-               9[014-7]
-             )|
-             5(?:
-               [136][25]|
-               22|
-               4[28]|
-               5[12]|
-               [78]1|
-               9[15]
-             )|
-             6(?:
-               12|
-               [2345]1|
-               57|
-               6[13]|
-               7[14]|
-               80
-             )
-           </leadingDigits>
-           <format>$1 $2 $3</format>
-         </numberFormat>
-         <!-- Three-digit area codes that potentially overlap with mobile. -->
-         <numberFormat pattern="(\d{3})(\d{3})(\d{4})">
-           <leadingDigits>
-             7(?:
-               12|
-               2[14]|
-               3[134]|
-               4[47]|
-               5[15]|
-               [67]1|
-               88
-             )
-           </leadingDigits>
-           <leadingDigits>
-             7(?:
-               12|
-               2[14]|
-               3[134]|
-               4[47]|
-               5(?:
-                 1|
-                 5[2-6]
-               )|
-               [67]1|
-               88
-             )
-           </leadingDigits>
-           <format>$1 $2 $3</format>
-         </numberFormat>
-         <numberFormat pattern="(\d{3})(\d{3})(\d{4})">
-           <leadingDigits>
-             8(?:
-               16|
-               2[014]|
-               3[126]|
-               6[136]|
-               7[078]|
-               8[34]|
-               91
-             )
-           </leadingDigits>
-           <format>$1 $2 $3</format>
-         </numberFormat>
-         <!-- 4 digits area code -->
-         <!-- Fallback for fixed-line numbers. -->
-         <numberFormat pattern="(\d{4})(\d{3})(\d{3})">
-           <leadingDigits>
-             1(?:
-               [23579]|
-               [468][1-9]
-             )|
-             [2-8]
-           </leadingDigits>
-           <format>$1 $2 $3</format>
-         </numberFormat>
-         <numberFormat nationalPrefixFormattingRule="$FG"
-           pattern="(1600)(\d{2})(\d{4})">
-           <leadingDigits>160</leadingDigits>
-           <leadingDigits>1600</leadingDigits>
-           <format>$1 $2 $3</format>
-         </numberFormat>
-         <numberFormat nationalPrefixFormattingRule="$FG"
-           pattern="(1800)(\d{4,5})">
-           <leadingDigits>180</leadingDigits>
-           <leadingDigits>1800</leadingDigits>
-           <format>$1 $2</format>
-         </numberFormat>
-         <numberFormat nationalPrefixFormattingRule="$FG"
-           pattern="(18[06]0)(\d{2,4})(\d{4})">
-           <leadingDigits>18[06]</leadingDigits>
-           <leadingDigits>18[06]0</leadingDigits>
-           <format>$1 $2 $3</format>
-         </numberFormat>
-         <numberFormat nationalPrefixFormattingRule="$FG"
-           pattern="(140)(\d{3})(\d{4})">
-           <leadingDigits>140</leadingDigits>
-           <format>$1 $2 $3</format>
-         </numberFormat>
-         <!-- Televoting numbers. Formatting information is from
-              http://www.bsnl.co.in/service/telev.htm -->
-         <numberFormat nationalPrefixFormattingRule="$FG"
-           pattern="(\d{4})(\d{3})(\d{3})(\d{3})">
-           <leadingDigits>18[06]</leadingDigits>
-           <leadingDigits>
-             18(?:
-               0[03]|
-               6[12]
-             )
-           </leadingDigits>
-           <format>$1 $2 $3 $4</format>
-         </numberFormat>
+          </leadingDigits>
+          <leadingDigits>
+            7(?:
+              12|
+              2[14]|
+              3[134]|
+              4[47]|
+              5(?:
+                1|
+                5[2-6]
+              )|
+              [67]1|
+              88
+            )
+          </leadingDigits>
+          <format>$1 $2 $3</format>
+        </numberFormat>
+        <numberFormat pattern="(\d{3})(\d{3})(\d{4})">
+          <leadingDigits>
+            8(?:
+              16|
+              2[014]|
+              3[126]|
+              6[136]|
+              7[078]|
+              8[34]|
+              91
+            )
+          </leadingDigits>
+          <format>$1 $2 $3</format>
+        </numberFormat>
+        <!-- 4 digits area code -->
+        <!-- Fallback for fixed-line numbers. -->
+        <numberFormat pattern="(\d{4})(\d{3})(\d{3})">
+          <leadingDigits>
+            1(?:
+              [23579]|
+              [468][1-9]
+            )|
+            [2-8]
+          </leadingDigits>
+          <format>$1 $2 $3</format>
+        </numberFormat>
+        <numberFormat nationalPrefixFormattingRule="$FG"
+          pattern="(1600)(\d{2})(\d{4})">
+          <leadingDigits>160</leadingDigits>
+          <leadingDigits>1600</leadingDigits>
+          <format>$1 $2 $3</format>
+        </numberFormat>
+        <numberFormat nationalPrefixFormattingRule="$FG"
+          pattern="(1800)(\d{4,5})">
+          <leadingDigits>180</leadingDigits>
+          <leadingDigits>1800</leadingDigits>
+          <format>$1 $2</format>
+        </numberFormat>
+        <numberFormat nationalPrefixFormattingRule="$FG"
+          pattern="(18[06]0)(\d{2,4})(\d{4})">
+          <leadingDigits>18[06]</leadingDigits>
+          <leadingDigits>18[06]0</leadingDigits>
+          <format>$1 $2 $3</format>
+        </numberFormat>
+        <numberFormat nationalPrefixFormattingRule="$FG"
+          pattern="(140)(\d{3})(\d{4})">
+          <leadingDigits>140</leadingDigits>
+          <format>$1 $2 $3</format>
+        </numberFormat>
+        <!-- Televoting numbers. Formatting information is from
+             http://www.bsnl.co.in/service/telev.htm -->
+        <numberFormat nationalPrefixFormattingRule="$FG"
+          pattern="(\d{4})(\d{3})(\d{3})(\d{3})">
+          <leadingDigits>18[06]</leadingDigits>
+          <leadingDigits>
+            18(?:
+              0[03]|
+              6[12]
+            )
+          </leadingDigits>
+          <format>$1 $2 $3 $4</format>
+        </numberFormat>
       </availableFormats>
       <generalDesc>
         <nationalNumberPattern>
@@ -10539,7 +10578,8 @@
               9[014-7]
             )|
             5(?:
-              [136][25]|
+              1[025]|
+              [36][25]|
               22|
               4[28]|
               5[12]|
@@ -10673,9 +10713,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: 7601, 768[567],
-             7695, 8299, 8309. New prefixes were also added based on the document provided from
-             mobile carriers: https://github.com/googlei18n/libphonenumber/issues/260 -->
+             land-line or mobile, since the ranges overlap. Extra prefixes added: 7202, 7601,
+             768[567], 7695, 8299, 8309. New prefixes were also added based on the document
+             provided from mobile carriers: https://github.com/googlei18n/libphonenumber/issues/260 -->
         <nationalNumberPattern>
           (?:
             7(?:
@@ -10685,7 +10725,9 @@
                 9[0-8]
               )|
               2(?:
-                0[04-9]|
+                0[024-9]|
+                19|
+                2[012]|
                 5[09]|
                 7[5-8]|
                 9[389]
@@ -11123,14 +11165,15 @@
     </territory>
 
     <!-- Italy -->
+    <!-- Metadata shared with Vatican City (VA) -->
     <territory id="IT" countryCode="39" internationalPrefix="00" leadingZeroPossible="true"
-               mobileNumberPortableRegion="true">
+               mobileNumberPortableRegion="true" mainCountryForCode="true">
       <references>
         <sourceUrl>http://en.wikipedia.org/wiki/%2B39</sourceUrl>
       </references>
       <availableFormats>
         <!-- The leading zero for fixed numbers will be prepended before the matching of these
-             regular expressions. -->
+             regular expressions.-->
         <numberFormat pattern="(\d{2})(\d{3,4})(\d{4})">
           <leadingDigits>
             0[26]|
@@ -11773,7 +11816,7 @@
         <nationalNumberPattern>
           7(?:
             55|
-            7[25-9]|
+            7[025-9]|
             8[05-9]|
             9[0-25-9]
           )\d{6}
@@ -12745,7 +12788,7 @@
       <mobile>
         <nationalNumberPattern>[7-9]0[1-9]\d{7}</nationalNumberPattern>
         <possibleNumberPattern>\d{10}</possibleNumberPattern>
-        <exampleNumber>7012345678</exampleNumber>
+        <exampleNumber>9012345678</exampleNumber>
       </mobile>
       <pager>
         <nationalNumberPattern>20\d{8}</nationalNumberPattern>
@@ -13628,11 +13671,11 @@
             9(?:
               0[09]|
               22|
-              4[049]|
+              4[01479]|
               55|
-              6[069]|
+              6[0679]|
               [79]\d|
-              8[07-9]
+              8[057-9]
             )
           )\d{5}
         </nationalNumberPattern>
@@ -13704,7 +13747,7 @@
             )|
             9(?:
               1[67]|
-              2[3-9]|
+              2[2-9]|
               3[689]
             )
           )\d{4}
@@ -13761,7 +13804,7 @@
       <references>
         <sourceUrl>http://www.itu.int/oth/T020200006F/en</sourceUrl>
       </references>
-       <!-- Formatting rules obtained from Russia. -->
+      <!-- Formatting rules obtained from Russia. -->
       <generalDesc>
         <!-- We make this as specific as possible to overlap as little as possible with Russia, so
              determining the country is faster. -->
@@ -13987,11 +14030,13 @@
           <leadingDigits>
             [13-6]|
             7(?:
-              [2-579]|
+              [2-57]|
               62|
-              8[0-7]
+              8[0-7]|
+              9[04-9]
             )|
-            [89][2-9]
+            8[02-9]|
+            9
             </leadingDigits>
           <format>$1 $2 $3</format>
         </numberFormat>
@@ -13999,9 +14044,10 @@
           <leadingDigits>
             [89][01]|
             7(?:
-              [019]|
+              [01]|
               6[013-9]|
-              8[89]
+              8[89]|
+              9[1-3]
             )
           </leadingDigits>
           <format>$1 $2 $3</format>
@@ -14012,18 +14058,17 @@
         <possibleNumberPattern>\d{7,8}</possibleNumberPattern>
       </generalDesc>
       <fixedLine>
-        <!-- The ITU document from October 2012 seems to have accidentally dropped the 79 prefix for
-             fixed-line numbers, which had been in the version from July 2012. We consider these
-             valid since we successfully dialed such a number in July 2014. -->
         <nationalNumberPattern>
           (?:
             [14-6]\d{2}|
             7(?:
-              [2-579]\d|
+              [2-57]\d|
               62|
-              8[0-7]
+              8[0-7]|
+              9[04-9]
             )|
-            [89][2-9]\d
+            8[02-9]\d|
+            9\d{2}
           )\d{4}
         </nationalNumberPattern>
         <possibleNumberPattern>\d{7}</possibleNumberPattern>
@@ -14036,10 +14081,12 @@
           (?:
             3\d|
             7(?:
-              [019]\d|
+              [01]\d|
               6[013-9]|
-              8[89]
-            )
+              8[89]|
+              9[1-3]
+            )|
+            81\d
           )\d{5}
         </nationalNumberPattern>
         <possibleNumberPattern>\d{7,8}</possibleNumberPattern>
@@ -14051,7 +14098,7 @@
         <exampleNumber>90123456</exampleNumber>
       </premiumRate>
       <sharedCost>
-        <nationalNumberPattern>8[01]\d{6}</nationalNumberPattern>
+        <nationalNumberPattern>80\d{6}</nationalNumberPattern>
         <possibleNumberPattern>\d{8}</possibleNumberPattern>
         <exampleNumber>80123456</exampleNumber>
       </sharedCost>
@@ -14153,9 +14200,9 @@
         <!-- Some different patterns for tollfree and shared cost numbers may be found by searching
              for "Mehrwertnummer" at http://www.telecom.li. -->
         <!-- Number format for National mobile services ,  Fixed line , Toll Free , uan and Premium rate services -->
-        <numberFormat pattern="(\d{3})(\d{4})">
+        <numberFormat pattern="(\d{3})(\d{2})(\d{2})">
           <leadingDigits>[23789]</leadingDigits>
-          <format>$1 $2</format>
+          <format>$1 $2 $3</format>
         </numberFormat>
         <!-- Number format for International mobile services -->
         <numberFormat pattern="(\d{3})(\d{3})(\d{3})">
@@ -14868,11 +14915,12 @@
       <mobile>
         <!-- http://www.anrt.ma/sites/default/files/Blocs_de_numeros_par_operateur.pdf
              Prefixes 69[0136] added based on numbers found online. -->
+        <!-- Added prefix 982 as per IR21 from the carrier. -->
         <nationalNumberPattern>
           6(?:
             0[0-8]|
             [12-79]\d|
-            8[01]
+            8[017]
           )\d{6}
         </nationalNumberPattern>
         <exampleNumber>650123456</exampleNumber>
@@ -15073,7 +15121,7 @@
         <sourceUrl>http://www.ekip.me/numeracija/dodijeljena.php</sourceUrl>
       </references>
       <availableFormats>
-         <numberFormat pattern="(\d{2})(\d{3})(\d{3})">
+        <numberFormat pattern="(\d{2})(\d{3})(\d{3})">
           <leadingDigits>[2-57-9]|6[036-9]</leadingDigits>
           <leadingDigits>
             [2-57-9]|
@@ -15454,7 +15502,7 @@
         <nationalNumberPattern>800\d{5}</nationalNumberPattern>
         <exampleNumber>80012345</exampleNumber>
       </tollFree>
-   </territory>
+    </territory>
 
     <!-- Myanmar -->
     <territory id="MM" countryCode="95" internationalPrefix="00" nationalPrefix="0"
@@ -17005,7 +17053,7 @@
       </references>
       <availableFormats>
         <numberFormat pattern="(\d{2})(\d{4})">
-           <leadingDigits>1</leadingDigits>
+          <leadingDigits>1</leadingDigits>
           <format>$1 $2</format>
         </numberFormat>
         <numberFormat pattern="(\d)(\d{5})">
@@ -17569,12 +17617,13 @@
         <possibleNumberPattern>\d{6,8}</possibleNumberPattern>
         <exampleNumber>14567890</exampleNumber>
       </fixedLine>
+      <!-- Added prefix 982 per IR21 from the carrier. -->
       <mobile>
         <nationalNumberPattern>
           9(?:
             6[013]|
             7[245]|
-            8[01456]
+            8[0-24-6]
           )\d{7}
         </nationalNumberPattern>
         <possibleNumberPattern>\d{10}</possibleNumberPattern>
@@ -18693,7 +18742,7 @@
              Poles that this is more usual. -->
         <numberFormat pattern="(\d{3})(\d{3})(\d{3})">
           <leadingDigits>
-            261|
+            26|
             39|
             5[0137]|
             6[0469]|
@@ -18722,13 +18771,13 @@
       </generalDesc>
       <fixedLine>
         <!-- The plan says all geographical numbers are 9 digits; but in at least Warsaw (22) and
-             Krakow (12) we have found internationally diallable numbers that are 7 digits instead,
-             so we support those too. Numbers which start with 261 are allocated for the militrary,
-             see: http://www.sgwp.wp.mil.pl/pl/1_1225.html. -->
+             Krakow (12) we have found internationally diallable numbers that are 7
+             digits instead, so we support those numbers too. Numbers which start with
+             26 are allocated for the militrary, see: http://www.sgwp.wp.mil.pl/pl/1_1225.html. -->
         <nationalNumberPattern>
           (?:
             1[2-8]|
-            2[2-59]|
+            2[2-69]|
             3[2-4]|
             4[1-468]|
             5[24-689]|
@@ -18737,8 +18786,7 @@
             8[1-79]|
             9[145]
           )\d{7}|
-          [12]2\d{5}|
-          261\d{6}
+          [12]2\d{5}
         </nationalNumberPattern>
         <exampleNumber>123456789</exampleNumber>
       </fixedLine>
@@ -19816,7 +19864,7 @@
           (?:
             1[4-79]|
             [23]\d|
-            4[01]|
+            4[0-2]|
             5[03]|
             6[0-37]
           )\d{3}
@@ -19936,7 +19984,7 @@
       </fixedLine>
       <mobile>
         <!-- Adding 90X as online numbers have been found with this prefix. -->
-        <nationalNumberPattern>9[012569]\d{7}</nationalNumberPattern>
+        <nationalNumberPattern>9[0-3569]\d{7}</nationalNumberPattern>
         <exampleNumber>911231234</exampleNumber>
       </mobile>
     </territory>
@@ -20315,40 +20363,36 @@
         <sourceUrl>http://www.itu.int/oth/T02020000AF/en</sourceUrl>
       </references>
       <!-- Numbers are formatted as a block. -->
+      <!-- There is a bug in library so we are keeping possible number pattern as \d{4,5}
+           as this is also used to test Tristan da Cuna numbers -->
       <generalDesc>
-        <nationalNumberPattern>[2-79]\d{3,4}</nationalNumberPattern>
+        <nationalNumberPattern>[256]\d{4}</nationalNumberPattern>
         <possibleNumberPattern>\d{4,5}</possibleNumberPattern>
       </generalDesc>
       <fixedLine>
-        <!-- St Helena is changing to 5 digits on October 1. 2013 -> we support both patterns here.
-             The new pattern is first, followed by the old (hence the repetition of the leading 2).
-             -->
+        <!-- St Helena has changed to 5 digits on October 1. 2013 -->
         <nationalNumberPattern>
           2(?:
             [0-57-9]\d|
             6[4-9]
-          )\d{2}|
-          (?:
-            [2-46]\d|
-            7[01]
           )\d{2}
         </nationalNumberPattern>
+        <possibleNumberPattern>\d{5}</possibleNumberPattern>
         <!-- Using St Helena Tourism as the example number. -->
-        <exampleNumber>2158</exampleNumber>
+        <exampleNumber>22158</exampleNumber>
       </fixedLine>
       <mobile>
-        <nationalNumberPattern>NA</nationalNumberPattern>
-        <possibleNumberPattern>NA</possibleNumberPattern>
+        <!-- Effective 1st August 2015 -->
+        <nationalNumberPattern>[56]\d{4}</nationalNumberPattern>
+        <possibleNumberPattern>\d{5}</possibleNumberPattern>
       </mobile>
-      <premiumRate>
-        <nationalNumberPattern>
-          (?:
-            [59]\d|
-            7[2-9]
-          )\d{2}
-        </nationalNumberPattern>
-        <exampleNumber>5012</exampleNumber>
-      </premiumRate>
+      <!-- The ITU doc reserves prefixes 260 and 261 for Information Service and prefix 263 for
+           Flexible access. We do not support these prefixes as we do not have any information
+           about their usage. -->
+      <voip>
+        <nationalNumberPattern>262\d{2}</nationalNumberPattern>
+        <possibleNumberPattern>\d{5}</possibleNumberPattern>
+      </voip>
     </territory>
 
     <!-- Slovenia -->
@@ -20636,7 +20680,7 @@
         </numberFormat>
       </availableFormats>
       <generalDesc>
-        <nationalNumberPattern>[2-57-9]\d{7}</nationalNumberPattern>
+        <nationalNumberPattern>[2-9]\d{7}</nationalNumberPattern>
         <possibleNumberPattern>\d{6,8}</possibleNumberPattern>
       </generalDesc>
       <fixedLine>
@@ -20647,9 +20691,10 @@
         <nationalNumberPattern>
           (?:
             2[15]|
-            3[034]|
+            3[03-5]|
             4[04]|
             5[05]|
+            66|
             7[6-9]|
             88|
             99
@@ -21777,8 +21822,10 @@
              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. The range 62 seems also now to be in use, according to numbers found online.
+             MTS Turkmenistan have recently launched there NDC(69). So added range 69 after getting
+             confirmation from the carriers who own them.
              -->
-        <nationalNumberPattern>6[2-8]\d{6}</nationalNumberPattern>
+        <nationalNumberPattern>6[2-9]\d{6}</nationalNumberPattern>
         <exampleNumber>66123456</exampleNumber>
       </mobile>
       <!-- No tollFree or premiumRate information can be found. -->
@@ -22034,7 +22081,7 @@
             )|
             6(?:
               0[79]|
-              1[02-9]|
+              1[02-8]|
               2[1-9]|
               [3-69]\d|
               7[0-79]
@@ -22048,7 +22095,7 @@
         <nationalNumberPattern>
           868(?:
             2(?:
-              [89]\d
+              [789]\d
             )|
             3(?:
               0[1-9]|
@@ -22090,6 +22137,10 @@
         <possibleNumberPattern>\d{10}</possibleNumberPattern>
         <exampleNumber>9002345678</exampleNumber>
       </premiumRate>
+      <voicemail>
+        <nationalNumberPattern>868619\d{4}</nationalNumberPattern>
+        <possibleNumberPattern>\d{10}</possibleNumberPattern>
+      </voicemail>
       <personalNumber>
         <!-- http://www.nanpa.com/pdf/PL_466.pdf -->
         <nationalNumberPattern>
@@ -22276,7 +22327,7 @@
              area code - http://www.ua.all-biz.info/guide/phonecodes is useful but not error-free.
              Have used local yellow pages guidelines, Google searches and regression tests to
              reverse-engineer these rules as well as bugs. -->
-        <numberFormat pattern="([3-689]\d)(\d{3})(\d{4})">
+        <numberFormat pattern="([3-9]\d)(\d{3})(\d{4})">
           <leadingDigits>
             [38]9|
             4(?:
@@ -22289,6 +22340,7 @@
               7[37]
             )|
             6[36-8]|
+            73|
             9[1-9]
           </leadingDigits>
           <leadingDigits>
@@ -22306,6 +22358,7 @@
               7[37]
             )|
             6[36-8]|
+            73|
             9[1-9]
           </leadingDigits>
           <format>$1 $2 $3</format>
@@ -22409,7 +22462,7 @@
         </numberFormat>
       </availableFormats>
       <generalDesc>
-        <nationalNumberPattern>[3-689]\d{8}</nationalNumberPattern>
+        <nationalNumberPattern>[3-9]\d{8}</nationalNumberPattern>
         <possibleNumberPattern>\d{5,9}</possibleNumberPattern>
       </generalDesc>
       <fixedLine>
@@ -22429,6 +22482,7 @@
             39|
             50|
             6[36-8]|
+            73|
             9[1-9]
           )\d{7}
         </nationalNumberPattern>
@@ -22846,7 +22900,7 @@
         <possibleNumberPattern>\d{7}</possibleNumberPattern>
         <exampleNumber>9001234</exampleNumber>
       </premiumRate>
-     </territory>
+    </territory>
 
     <!-- Uzbekistan -->
     <territory id="UZ" countryCode="998" preferredInternationalPrefix="8~10"
@@ -23195,32 +23249,122 @@
     </territory>
 
     <!-- Vatican City -->
-    <!-- Note that numbers here are also accessible via Italy (+39 and prefix of 06 698) but can
-         also be dialled with the Vatican City country code. -->
-    <territory id="VA" countryCode="379" internationalPrefix="00" leadingZeroPossible="true">
+    <!-- Metadata shared with Italy(IT) -->
+    <!-- Vatican City is assigned country code 379. However, Vatican City is still reached
+         via the Italian numbering plan. Telephone numbers in Vatican City are integrated into
+         the Italian telephone numbering plan. Telephone numbers in the Vatican City are similar
+         to telephone numbers in Rome, with "698" following the "06" for Rome.
+         A Vatican telephone number is in the form of 06 698x xxxx. -->
+    <territory id="VA" countryCode="39" internationalPrefix="00"  leadingZeroPossible="true"
+               mobileNumberPortableRegion="true">
       <references>
         <sourceUrl>http://en.wikipedia.org/wiki/Telephone_numbers_in_Vatican_City</sourceUrl>
       </references>
-      <availableFormats>
-        <numberFormat pattern="(06)(\d{4})(\d{4})">
-          <format>$1 $2 $3</format>
-        </numberFormat>
-      </availableFormats>
       <generalDesc>
-        <nationalNumberPattern>06\d{8}</nationalNumberPattern>
-        <possibleNumberPattern>\d{10}</possibleNumberPattern>
+        <nationalNumberPattern>
+          (?:
+           0(?:
+             878\d{5}|
+             6698\d{5}
+           )|
+           [1589]\d{5,10}|
+           3(?:
+             [12457-9]\d{8}|
+             [36]\d{7,9}
+           )
+          )
+        </nationalNumberPattern>
+        <possibleNumberPattern>\d{6,11}</possibleNumberPattern>
       </generalDesc>
+      <noInternationalDialling>
+        <nationalNumberPattern>848\d{6}</nationalNumberPattern>
+        <possibleNumberPattern>\d{9}</possibleNumberPattern>
+        <exampleNumber>848123456</exampleNumber>
+      </noInternationalDialling>
       <fixedLine>
         <nationalNumberPattern>06698\d{5}</nationalNumberPattern>
+        <possibleNumberPattern>\d{10}</possibleNumberPattern>
         <exampleNumber>0669812345</exampleNumber>
       </fixedLine>
+      <!-- Mobile, toll free, premium rate, shared cost, personal number and VOIP copied from Italy.
+       -->
+
       <mobile>
-        <!-- We have no information on mobile numbers from the Vatican. It is probable that they use
-             Italian mobile contracts. -->
-        <nationalNumberPattern>NA</nationalNumberPattern>
-        <possibleNumberPattern>NA</possibleNumberPattern>
+        <!-- According to wikipedia, TIM mobile numbers can be 9 digits long, but all others are 10
+             digits long. However, a user reported the existence of new 11 digit long numbers for
+             TIM with the prefix 33X, so this is supported also. -->
+        <nationalNumberPattern>
+          3(?:
+            [12457-9]\d{8}|
+            6\d{7,8}|
+            3\d{7,9}
+          )
+        </nationalNumberPattern>
+        <possibleNumberPattern>\d{9,11}</possibleNumberPattern>
+        <exampleNumber>3123456789</exampleNumber>
       </mobile>
-      <!-- No information exists about other types of numbers. -->
+      <tollFree>
+        <nationalNumberPattern>
+          80(?:
+            0\d{6}|
+            3\d{3}
+          )
+        </nationalNumberPattern>
+        <possibleNumberPattern>\d{6,9}</possibleNumberPattern>
+        <exampleNumber>800123456</exampleNumber>
+      </tollFree>
+      <premiumRate>
+        <!-- Adding 0878 numbers, as per
+             http://www.aduc.it/notizia/polizia+mette+allerta+sul+numero+0878_73136.php. Other
+             premium prefixes are mentioned here:
+             http://www.dirittodellinformatica.it/news/telefonia/agcom-blocco-permanente-prefissi-144-166-892-899-20080520241.html -->
+        <nationalNumberPattern>
+          0878\d{5}|
+          1(?:
+            44|
+            6[346]
+          )\d{6}|
+          89(?:
+            2\d{3}|
+            4(?:
+              [0-4]\d{2}|
+              [5-9]\d{4}
+            )|
+            5(?:
+              [0-4]\d{2}|
+              [5-9]\d{6}
+            )|
+            9\d{6}
+          )
+        </nationalNumberPattern>
+        <possibleNumberPattern>\d{6,10}</possibleNumberPattern>
+        <exampleNumber>899123456</exampleNumber>
+      </premiumRate>
+      <sharedCost>
+        <nationalNumberPattern>
+          84(?:
+            [08]\d{6}|
+            [17]\d{3}
+          )
+        </nationalNumberPattern>
+        <possibleNumberPattern>\d{6,9}</possibleNumberPattern>
+        <exampleNumber>848123456</exampleNumber>
+      </sharedCost>
+      <personalNumber>
+        <nationalNumberPattern>
+          1(?:
+            78\d|
+            99
+          )\d{6}
+        </nationalNumberPattern>
+        <possibleNumberPattern>\d{9,10}</possibleNumberPattern>
+        <exampleNumber>1781234567</exampleNumber>
+      </personalNumber>
+      <voip>
+        <nationalNumberPattern>55\d{8}</nationalNumberPattern>
+        <possibleNumberPattern>\d{10}</possibleNumberPattern>
+        <exampleNumber>5512345678</exampleNumber>
+      </voip>
     </territory>
 
     <!-- Saint Vincent and the Grenadines -->