Java/JS/CPP: libphonenumber v5.3.2, metadata updates. Includes geocoding data for Belarus, with contributions from g1smd.

git-svn-id: http://libphonenumber.googlecode.com/svn/trunk/resources@556 ee073f10-1060-11df-b6a4-87a95322a99c

5 files changed, 814 insertions, 166 deletions

diff --git a/PhoneNumberMetaData.xml b/PhoneNumberMetaData.xml
index 3407143..40d805c 100644
--- a/PhoneNumberMetaData.xml
+++ b/PhoneNumberMetaData.xml
@@ -2049,22 +2049,53 @@
       <availableFormats>
         <numberFormat pattern="(2)(\d{7})">
           <leadingDigits>2</leadingDigits>
-          <format>$1 $2</format>
+          <format>$1-$2</format>
         </numberFormat>
         <numberFormat pattern="(\d{2})(\d{4,6})">
           <leadingDigits>[3-79]1</leadingDigits>
-          <format>$1 $2</format>
+          <format>$1-$2</format>
+        </numberFormat>
+        <!-- Mobile numbers, VOIP, and four-digit fixed-line area codes. -->
+        <numberFormat pattern="(\d{4})(\d{3,6})">
+          <leadingDigits>
+            1|
+            3(?:
+              0|
+              [2-58]2
+            )|
+            4(?:
+              0|
+              [25]2|
+              3[23]|
+              [4689][25]
+            )|
+            5(?:
+              [02-578]2|
+              6[25]
+            )|
+            6(?:
+              [0347-9]2|
+              [26][25]
+            )|
+            7[02-9]2|
+            8(?:
+              [023][23]|
+              [4-7]2
+            )|
+            9(?:
+              [02][23]|
+              [458]2|
+              6[016]
+            )
+          </leadingDigits>
+          <format>$1-$2</format>
         </numberFormat>
         <numberFormat pattern="(\d{3})(\d{3,7})">
           <leadingDigits>
             [3-79][2-9]|
             8
           </leadingDigits>
-          <format>$1 $2</format>
-        </numberFormat>
-        <numberFormat pattern="(\d{4})(\d{6})">
-          <leadingDigits>1</leadingDigits>
-          <format>$1 $2</format>
+          <format>$1-$2</format>
         </numberFormat>
       </availableFormats>
       <generalDesc>
@@ -2083,7 +2114,10 @@
              first by leading digit, then within by number of digits. Several Dhaka prefixes (02 731
              etc) are included despite not being mentioned on the wikipedia page or ITU doc due to
              online evidence. Another oddity is Chittagong - some numbers have a leading 2, others
-             do not - both are allowed for now. -->
+             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(?:
             7(?:
@@ -2115,74 +2149,223 @@
             )
           )\d{4}|
           3(?:
-            [6-8]1|
-            (?:
-              0[23]|
-              [25][12]|
-              82|
-              416
-            )\d|
-            (?:
-              31|
-              12?[5-7]
-            )\d{2}
+            12?[5-7]\d{2}|
+            0(?:
+              2(?:
+                [025-79]\d|
+                [348]\d{1,2}
+              )|
+              3(?:
+                [2-4]\d|
+                [56]\d?
+              )
+            )|
+            2(?:
+              1\d{2}|
+              2(?:
+                [12]\d|
+                [35]\d{1,2}|
+                4\d?
+              )
+            )|
+            3(?:
+              1\d{2}|
+              2(?:
+                [2356]\d|
+                4\d{1,2}
+              )
+            )|
+            4(?:
+              1\d{2}|
+              2(?:
+                2\d{1,2}|
+                [47]|
+                5\d{2}
+              )
+            )|
+            5(?:
+              1\d{2}|
+              29
+            )|
+            [67]1\d{2}|
+            8(?:
+              1\d{2}|
+              2(?:
+                2\d{2}|
+                3|
+                4\d
+              )
+            )|
           )\d{3}|
           4(?:
-            (?:
-              02|
-              [49]6|
-              [68]1
+            0(?:
+              2(?:
+                [09]\d|
+                7
+              )|
+              33\d{2}
             )|
-            (?:
-              0[13]|
-              21\d? |
-              [23]2|
-              [457][12]|
-              6[28]
-            )\d|
-            (?:
-              23|
-              [39]1
-            )\d{2}|
-            1\d{3}
+            1\d{3}|
+            2(?:
+              1\d{2}|
+              2(?:
+                [25]\d?|
+                [348]\d|
+                [67]\d{1,2}
+              )
+            )|
+            3(?:
+              1\d{2}(?:\d{2})?|
+              2(?:
+                [045]\d|
+                [236-9]\d{1,2}
+              )|
+              32\d{2}
+            )|
+            4(?:
+              [18]\d{2}|
+              2(?:
+                [2-46]\d{2}|
+                3
+              )|
+              5[25]\d{2}
+            )|
+            5(?:
+              1\d{2}|
+              2(?:
+                3\d|
+                5
+              )
+            )|
+            6(?:
+              [18]\d{2}|
+              2(?:
+                3(?:\d{2})?|
+                [46]\d{1,2}|
+                5\d{2}|
+                7\d
+              )|
+              5(?:
+                3\d?|
+                4\d|
+                [57]\d{1,2}|
+                6\d{2}|
+                8
+              )
+            )|
+            71\d{2}|
+            8(?:
+              [18]\d{2}|
+              23\d{2}|
+              54\d{2}
+            )|
+            9(?:
+              [18]\d{2}|
+              2[2-5]\d{2}|
+              53\d{1,2}
+            )
           )\d{3}|
           5(?:
-            (?:
-              [457-9]1|
-              62
+            02[03489]\d{2}|
+            1\d{2}|
+            2(?:
+              1\d{2}|
+              2(?:
+                2(?:\d{2})?|
+                [457]\d{2}
+              )
             )|
-            (?:
-              1\d? |
-              2[12]|
-              3[1-3]|
-              52
-            )\d|
-            61{2}
-          )|
+            3(?:
+              1\d{2}|
+              2(?:
+                [37](?:\d{2})?|
+                [569]\d{2}
+              )
+            )|
+            4(?:
+              1\d{2}|
+              2[46]\d{2}
+            )|
+            5(?:
+              1\d{2}|
+              26\d{1,2}
+            )|
+            6(?:
+              [18]\d{2}|
+              2|
+              53\d{2}
+            )|
+            7(?:
+              1|
+              24
+            )\d{2}|
+            8(?:
+              1|
+              26
+            )\d{2}|
+            91\d{2}
+          )\d{3}|
           6(?:
-            [45]1|
-            (?:
-              11|
-              2[15]|
-              [39]1
-            )\d|
-            (?:
-              [06-8]1|
-              62
-            )\d{2}
-          )|
-          7(?:
-            (?:
-              32|
-              91
+            0(?:
+              1\d{2}|
+              2(?:
+                3\d{2}|
+                4\d{1,2}
+              )
+            )|
+            2(?:
+              2[2-5]\d{2}|
+              5(?:
+                [3-5]\d{2}|
+                7
+              )|
+              8\d{2}
+            )|
+            3(?:
+              1|
+              2[3478]
+            )\d{2}|
+            4(?:
+              1|
+              2[34]
+            )\d{2}|
+            5(?:
+              1|
+              2[47]
+            )\d{2}|
+            6(?:
+              [18]\d{2}|
+              6(?:
+                2(?:
+                  2\d|
+                  [34]\d{2}
+                )|
+                5(?:
+                  [24]\d{2}|
+                  3\d|
+                  5\d{1,2}
+                )
+              )
+            )|
+            72[2-5]\d{2}|
+            8(?:
+              1\d{2}|
+              2[2-5]\d{2}
             )|
+            9(?:
+              1\d{2}|
+              2[2-6]\d{2}
+            )
+          )\d{3}|
+          7(?:
             (?:
               02|
-              31|
-              [67][12]
-            )\d|
-            [458]1\d{2}|
-            21\d{3}
+              [3-589]1|
+              6[12]|
+              72[24]
+            )\d{2}|
+            21\d{3}|
+            32
           )\d{3}|
           8(?:
             (?:
@@ -2238,6 +2421,17 @@
         <possibleNumberPattern>\d{10}</possibleNumberPattern>
         <exampleNumber>8001234567</exampleNumber>
       </tollFree>
+      <voip>
+        <nationalNumberPattern>
+          96(?:
+            0[49]|
+            1[0-4]|
+            6[69]
+          )\d{6}
+        </nationalNumberPattern>
+        <possibleNumberPattern>\d{10}</possibleNumberPattern>
+        <exampleNumber>9604123456</exampleNumber>
+      </voip>
       <shortCode>
         <nationalNumberPattern>
           1(?:
@@ -2344,10 +2538,12 @@
         <exampleNumber>12345678</exampleNumber>
       </fixedLine>
       <mobile>
+        <!-- Numbers beginning with 46 outside the ranges allocated by the plan have been included
+             since many were found online. -->
         <nationalNumberPattern>
           4(?:
             [679]\d|
-            8[3-9]
+            8[03-9]
           )\d{6}
         </nationalNumberPattern>
         <possibleNumberPattern>\d{9}</possibleNumberPattern>
@@ -3427,7 +3623,7 @@
     </territory>
 
     <!-- Belarus -->
-    <!-- http://eng.beltelecom.by/info/numbering/ -->
+    <!-- http://www.eng.beltelecom.by/en/subscribers/phone-codes -->
     <!-- Information on national prefix provided by a Belarussian person. -->
     <territory id="BY" countryCode="375" preferredInternationalPrefix="8~10"
                internationalPrefix="810" nationalPrefixForParsing="80?"
@@ -3479,7 +3675,7 @@
               5(?:
                 1[1-5]|
                 2\d|
-                6[1-4]|
+                6[2-4]|
                 9[1-7]
               )|
               6(?:
@@ -3632,18 +3828,19 @@
           (?:
             2(?:
               04|
-              26|
+              [23]6|
               [48]9|
               50
             )|
             3(?:
               06|
-              43
+              43|
+              65
             )|
             4(?:
               03|
               1[68]|
-              3[18]|
+              3[178]|
               5[06]
             )|
             5(?:
@@ -3655,6 +3852,7 @@
             6(?:
               0[04]|
               13|
+              39|
               47
             )|
             7(?:
@@ -3678,18 +3876,19 @@
           (?:
             2(?:
               04|
-              26|
+              [23]6|
               [48]9|
               50
             )|
             3(?:
               06|
-              43
+              43|
+              65
             )|
             4(?:
               03|
               1[68]|
-              3[18]|
+              3[178]|
               5[06]
             )|
             5(?:
@@ -3701,6 +3900,7 @@
             6(?:
               0[04]|
               13|
+              39|
               47
             )|
             7(?:
@@ -3798,7 +3998,7 @@
           1(?:
             80(?:
               0\d{2}
-            )? |
+            )?|
             3(?:
               00\d{2}
             )?
@@ -5197,7 +5397,7 @@
           1(?:
             80(?:
               0\d{2}
-            )? |
+            )?|
             3(?:
               00\d{2}
             )?
@@ -6437,14 +6637,14 @@
       <!-- The following sections are copied verbatim from Morocco to allow these non-geographical
            numbers to be recognized as available from within Western Sahara. -->
       <mobile>
-        <!-- Prefixes 60[1-5], 62[47-9], 63[04578] and 68[01] are from numbers found online,
+        <!-- Prefixes 60[1-5], 62[47-9], 63[04-8] and 68[01] are from numbers found online,
              bug-reports, and information provided directly by the carriers. -->
         <nationalNumberPattern>
           6(?:
             0[0-6]|
             [14-7]\d|
             2[2-46-9]|
-            3[034578]|
+            3[03-8]|
             8[01]|
             99
           )\d{6}
@@ -8797,10 +8997,9 @@
             )|
             5(?:
               1\d|
-              2[1-3]|
+              [239][1-4]|
               4[124]|
-              5[1-6]|
-              [39][1-4]
+              5[1-6]
             )|
             6(?:
               1\d|
@@ -9870,9 +10069,8 @@
     </territory>
 
     <!-- Ireland -->
-    <!-- http://www.comreg.ie/_fileupload/publications/ComReg0802.pdf -->
-    <!-- http://www.comreg.ie/_fileupload/publications/ComReg0435.pdf -->
-    <!-- http://www.comreg.ie/_fileupload/publications/ComReg03147.pdf -->
+    <!-- http://www.comreg.ie/licensing_and_services/numbering_plan_for_ireland.552.440.html -->
+    <!-- http://www.comreg.ie/_fileupload/publications/ComReg1119.pdf -->
     <territory id="IE" countryCode="353" internationalPrefix="00"
                nationalPrefix="0" nationalPrefixFormattingRule="($NP$FG)">
       <availableFormats>
@@ -9882,11 +10080,11 @@
         </numberFormat>
         <numberFormat pattern="(\d{2})(\d{5})">
           <leadingDigits>
-            2[2-9]|
-            4[347]|
-            5[2-58]|
-            6[2-47-9]|
-            9[3-9]
+            2[24-9]|
+            47|
+            58|
+            6[237-9]|
+            9[35-9]
           </leadingDigits>
           <format>$1 $2</format>
         </numberFormat>
@@ -9952,25 +10150,20 @@
       </noInternationalDialling>
       <fixedLine>
         <!-- We allow 6-7 digit subscriber numbers for the 021 area code since that seems to be
-             reflected by the numbers in the Yellow Pages. The 023, 043, 052 and 064 area codes also
-             may have 7 digit subscriber numbers, although limited to 5 in the plan. This was caused
-             by a numbering update in 2008 (http://www.wtng.info/wtng-353-ie.html has more details).
-             Other changes not in the plan include consolidating 0502, 0506 and 0509 into 057 and
-             054, 055 and 053 into 053, and making 044 be followed by 7 digits in some cases.
-             Another peculiarity is that 048 actually replaces 00 44 28 when Irish people dial,
-             allowing them to easily dial Northern Ireland. We support these numbers here, although
-             technically they are numbers for the UK. -->
+             reflected by the numbers in the Yellow Pages. Another peculiarity is that 048 actually
+             replaces 00 44 28 when Irish people dial, allowing them to easily dial Northern
+             Ireland. We support these numbers here, although technically they are numbers for the
+             UK. -->
         <nationalNumberPattern>
           1\d{7,8}|
           2(?:
             1\d{6,7}|
-            [24-9]\d{5}|
-            3\d{5,7}
+            3\d{7}|
+            [24-9]\d{5}
           )|
           4(?:
             0[24]\d{5}|
-            [1269]\d{7}|
-            [34]\d{5,7}|
+            [1-469]\d{7}|
             5\d{6}|
             7\d{5}|
             8[0-46-9]\d{7}
@@ -9978,21 +10171,19 @@
           5(?:
             0[45]\d{5}|
             1\d{6}|
-            2\d{5,7}|
-            [3679]\d{7}|
+            [23679]\d{7}|
             8\d{5}
           )|
           6(?:
             1\d{6}|
-            4\d{5,7}|
             [237-9]\d{5}|
-            [56]\d{7}
+            [4-6]\d{7}
           )|
           7[14]\d{7}|
           9(?:
             1\d{6}|
             [04]\d{7}|
-            [3-9]\d{5}
+            [35-9]\d{5}
           )
         </nationalNumberPattern>
         <possibleNumberPattern>\d{5,10}</possibleNumberPattern>
@@ -10002,10 +10193,10 @@
         <nationalNumberPattern>
           8(?:
             22\d{6}|
-            [35-9]\d{7,8}
+            [35-9]\d{7}
           )
         </nationalNumberPattern>
-        <possibleNumberPattern>\d{9,10}</possibleNumberPattern>
+        <possibleNumberPattern>\d{9}</possibleNumberPattern>
         <exampleNumber>850123456</exampleNumber>
       </mobile>
       <tollFree>
@@ -10016,9 +10207,8 @@
       <premiumRate>
         <nationalNumberPattern>
           15(?:
-            1[2-9]|
+            1[2-8]|
             [2-8]0|
-            59|
             9[089]
           )\d{6}
         </nationalNumberPattern>
@@ -10045,6 +10235,11 @@
         <possibleNumberPattern>\d{9}</possibleNumberPattern>
         <exampleNumber>818123456</exampleNumber>
       </uan>
+      <voicemail>
+        <nationalNumberPattern>8[35-9]\d{8}</nationalNumberPattern>
+        <possibleNumberPattern>\d{10}</possibleNumberPattern>
+        <exampleNumber>8501234567</exampleNumber>
+      </voicemail>
       <emergency>
         <nationalNumberPattern>
           112|
@@ -10355,7 +10550,7 @@
                4[0-389]|
                5[024-9]|
                6[0-35-9]|
-               7[03469]|
+               7[0346-9]|
                8[0-79]
              )|
              8(?:
@@ -10414,7 +10609,9 @@
                  3[5-9]|
                  42|
                  60|
-                 9[5-9]
+                 7[7-9]|
+                 8[1-9]|
+                 9[05-9]
                )|
                8(?:
                  [03][07-9]|
@@ -10835,8 +11032,8 @@
         <!-- 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: 822[1-689], 8299,
-             8309. -->
+             land-line or mobile, since the ranges overlap. Extra prefixes added: 777[7-9],
+             778[1-9], 7790, 822[1-689], 8299, 8309. -->
         <nationalNumberPattern>
           (?:
             7(?:
@@ -10878,9 +11075,12 @@
               )|
               7(?:
                 0[27-9]|
-                [39][5-9]|
+                3[5-9]|
                 42|
-                60
+                60|
+                7[7-9]|
+                8[1-9]|
+                9[05-9]
               )|
               8(?:
                 [03][07-9]|
@@ -11242,10 +11442,9 @@
         <nationalNumberPattern>
           (?:
             4(?:
-              1[0-245]|
+              [14][0-245]|
               2[0-7]|
               [37][0-8]|
-              4[0245]|
               5[0-3568]|
               6\d|
               8[0-36-8]
@@ -11257,7 +11456,7 @@
               3[013-7]|
               4[03-7]|
               7[0-2578]|
-              8[0-25-9]|
+              8[0-35-9]|
               9[013-689]
             )|
             87[23]
@@ -11281,7 +11480,8 @@
             )|
             7(?:
               5[057]|
-              7\d
+              7\d|
+              8[0-3]
             )|
             8(?:
               2[0-5]|
@@ -14530,7 +14730,6 @@
         <possibleNumberPattern>\d{7,9}</possibleNumberPattern>
       </generalDesc>
       <fixedLine>
-        <!-- Regular Cost services are included here as well. -->
         <nationalNumberPattern>
           (?:
             2(?:
@@ -14544,8 +14743,7 @@
               7[0135-7]|
               8[048]|
               9[0269]
-            )|
-            870
+            )
           )\d{4}
         </nationalNumberPattern>
         <possibleNumberPattern>\d{7}</possibleNumberPattern>
@@ -14558,8 +14756,7 @@
             6(?:
               [01][0-4]|
               2[016-9]|
-              88|
-              92
+              88
             )|
             710
           )\d{5}|
@@ -14570,7 +14767,6 @@
             [7-9]\d
           )\d{4}
         </nationalNumberPattern>
-        <possibleNumberPattern>\d{7,9}</possibleNumberPattern>
         <exampleNumber>661234567</exampleNumber>
       </mobile>
       <!-- The prefix 809 seems to be used for AT&T and Verizon access lines from Liechtenstein,
@@ -14588,7 +14784,7 @@
         <possibleNumberPattern>\d{7}</possibleNumberPattern>
         <exampleNumber>8002222</exampleNumber>
       </tollFree>
-      <sharedCost>
+      <premiumRate>
         <nationalNumberPattern>
           90(?:
             0(?:
@@ -14607,12 +14803,12 @@
         </nationalNumberPattern>
         <possibleNumberPattern>\d{7}</possibleNumberPattern>
         <exampleNumber>9002222</exampleNumber>
-      </sharedCost>
+      </premiumRate>
       <uan>
         <nationalNumberPattern>
           87(?:
-            0[1289]|
-            70
+            0[128]|
+            7[0-4]
           )\d{3}
         </nationalNumberPattern>
         <possibleNumberPattern>\d{7}</possibleNumberPattern>
@@ -14665,7 +14861,7 @@
             1[278]|
             44
           )
-          </nationalNumberPattern>
+        </nationalNumberPattern>
         <possibleNumberPattern>\d{3}</possibleNumberPattern>
         <exampleNumber>112</exampleNumber>
       </emergency>
@@ -15329,14 +15525,14 @@
       </fixedLine>
       <!-- Also duplicated in Western Sahara, please ensure you update both. -->
       <mobile>
-        <!-- Prefixes 60[1-5], 62[47-9], 63[04578] and 68[01] are from numbers found online,
+        <!-- Prefixes 60[1-5], 62[47-9], 63[04-8] and 68[01] are from numbers found online,
              bug-reports, and information provided directly by the carriers. -->
         <nationalNumberPattern>
           6(?:
             0[0-6]|
             [14-7]\d|
             2[2-46-9]|
-            3[034578]|
+            3[03-8]|
             8[01]|
             99
           )\d{6}
@@ -16684,7 +16880,8 @@
         <exampleNumber>2012345</exampleNumber>
       </fixedLine>
       <mobile>
-        <!--Adding 92 as SMS messages have been successfully sent to this prefix. -->
+        <!--Adding 92 as SMS messages have been successfully sent to this prefix. 820 has also been
+            added based on a report from Orange. -->
         <nationalNumberPattern>
           (?:
             25\d|
@@ -16693,7 +16890,10 @@
               9\d
             )|
             7\d{2}|
-            87[15-8]|
+            8(?:
+              20|
+              7[15-8]
+            )|
             9[1-8]\d
           )\d{4}
         </nationalNumberPattern>
@@ -19628,30 +19828,41 @@
         <nationalNumberPattern>
           9(?:
             [136]\d{2}|
-            2[124-79]\d|
-            4(?:
-              80|
-              9\d
-            )
+            2[0-79]\d|
+            480
           )\d{5}
         </nationalNumberPattern>
         <exampleNumber>912345678</exampleNumber>
       </mobile>
       <tollFree>
-        <nationalNumberPattern>
-          4\d{8}|
-          80[02]\d{6}
-        </nationalNumberPattern>
+        <nationalNumberPattern>80[02]\d{6}</nationalNumberPattern>
         <exampleNumber>800123456</exampleNumber>
       </tollFree>
       <premiumRate>
-        <nationalNumberPattern>71\d{7}</nationalNumberPattern>
-        <exampleNumber>712345678</exampleNumber>
+        <!-- Fixed maximum cost numbers: 761=0.60€, 761=1€, 762=2€. -->
+        <nationalNumberPattern>
+          76(?:
+            0[1-57]|
+            1[2-47]|
+            2[237]
+          )\d{5}
+        </nationalNumberPattern>
+        <exampleNumber>760123456</exampleNumber>
       </premiumRate>
       <sharedCost>
-        <nationalNumberPattern>808\d{6}</nationalNumberPattern>
+        <!-- 808 are priced as local calls, 809 are national calls. -->
+        <nationalNumberPattern>
+          80(?:
+            8\d|
+            9[1579]
+          )\d{5}
+        </nationalNumberPattern>
         <exampleNumber>808123456</exampleNumber>
       </sharedCost>
+      <personalNumber>
+        <nationalNumberPattern>884[128]\d{5}</nationalNumberPattern>
+        <exampleNumber>884123456</exampleNumber>
+      </personalNumber>
       <voip>
         <nationalNumberPattern>30\d{7}</nationalNumberPattern>
         <exampleNumber>301234567</exampleNumber>
@@ -19660,9 +19871,9 @@
         <nationalNumberPattern>
           70(?:
             7\d|
-            8[147]
+            8[17]
           )\d{5}
-          </nationalNumberPattern>
+        </nationalNumberPattern>
         <exampleNumber>707123456</exampleNumber>
       </uan>
       <emergency>
@@ -20784,7 +20995,7 @@
             (?:
               2[0-7]|
               4[0136-8]|
-              5[0-38]|
+              5[0138]|
               7[018]|
               8[01]|
               9[0-57]
@@ -20815,11 +21026,10 @@
           )|
           5(?:
             0[0-6]|
-            1[0-5]|
+            [15][0-5]|
             2[0-68]|
             3[0-4]|
             4\d|
-            5[0-5]|
             6[03-5]|
             7[013]|
             8[0-79]|
@@ -20845,11 +21055,9 @@
               1[0-68]|
               2\d|
               3[02-59]|
-              4[0-4]|
-              5[0-4]|
-              6[01]|
-              7[0135-8]|
-              8[01]
+              [45][0-4]|
+              [68][01]|
+              7[0135-8]
             )\d{5,6}
           )
         </nationalNumberPattern>
@@ -20857,10 +21065,15 @@
         <exampleNumber>8123456</exampleNumber>
       </fixedLine>
       <mobile>
-        <nationalNumberPattern>7[02-46]\d{7}</nationalNumberPattern>
+        <nationalNumberPattern>7[0236]\d{7}</nationalNumberPattern>
         <possibleNumberPattern>\d{9}</possibleNumberPattern>
         <exampleNumber>701234567</exampleNumber>
       </mobile>
+      <pager>
+        <nationalNumberPattern>74\d{7}</nationalNumberPattern>
+        <possibleNumberPattern>\d{9}</possibleNumberPattern>
+        <exampleNumber>741234567</exampleNumber>
+      </pager>
       <tollFree>
         <nationalNumberPattern>20\d{4,7}</nationalNumberPattern>
         <possibleNumberPattern>\d{6,9}</possibleNumberPattern>
@@ -20898,8 +21111,8 @@
     </territory>
 
     <!-- Singapore -->
-    <!-- http://www.ida.gov.sg/policies%20and%20regulation/20060508120124.aspx -->
-    <territory id="SG" countryCode="65" internationalPrefix="0[0-3][0-9]">
+    <!-- http://www.ida.gov.sg/Policies-and-Regulations/Industry-and-Licensees/Numbering/National-Numbering-Plan-and-Allocation-Process.aspx -->
+    <territory id="SG" countryCode="65" internationalPrefix="0[0-3]\d">
       <availableFormats>
         <numberFormat pattern="([3689]\d{3})(\d{4})">
           <leadingDigits>
@@ -20956,7 +21169,7 @@
         <exampleNumber>19001234567</exampleNumber>
       </premiumRate>
       <voip>
-        <nationalNumberPattern>3[0-2]\d{6}</nationalNumberPattern>
+        <nationalNumberPattern>3[12]\d{6}</nationalNumberPattern>
         <possibleNumberPattern>\d{8}</possibleNumberPattern>
         <exampleNumber>31234567</exampleNumber>
       </voip>
@@ -20972,19 +21185,18 @@
         <nationalNumberPattern>
           1(?:
             [0136]\d{2}|
-            41\d|
             [89](?:
               [1-9]\d|
               0[1-9]
             )|
             [57]\d{2,3})|
-          99[0-46-8]
+          99[0246-8]
         </nationalNumberPattern>
         <possibleNumberPattern>\d{3,5}</possibleNumberPattern>
         <exampleNumber>1312</exampleNumber>
       </shortCode>
       <emergency>
-        <nationalNumberPattern>99[59]</nationalNumberPattern>
+        <nationalNumberPattern>99[359]</nationalNumberPattern>
         <possibleNumberPattern>\d{3}</possibleNumberPattern>
         <exampleNumber>999</exampleNumber>
       </emergency>
@@ -22396,7 +22608,7 @@
         <exampleNumber>2112345</exampleNumber>
       </fixedLine>
       <mobile>
-        <nationalNumberPattern>7[78][1-9]\d{5}</nationalNumberPattern>
+        <nationalNumberPattern>7[78]\d{6}</nationalNumberPattern>
         <possibleNumberPattern>\d{8}</possibleNumberPattern>
         <exampleNumber>77212345</exampleNumber>
       </mobile>
diff --git a/geocoding/be/375.txt b/geocoding/be/375.txt
new file mode 100644
index 0000000..d0c50a1
--- /dev/null
+++ b/geocoding/be/375.txt
@@ -0,0 +1,145 @@
+# Copyright (C) 2013 Google Inc.
+
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+
+# http://www.apache.org/licenses/LICENSE-2.0
+
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# Generated from:
+# http://be.wikipedia.org/wiki/Тэлефонны_план_нумарацыі_Беларусі [414892]
+#
+# The prefix for Lida (Ліда) was corrected to 154 since this was changed
+# in 2011.
+# Baranovichi (Баранавічы) was expanded to the prefix 163, in accordance
+# with the English/Russian data. The Belarussian data also lists the 4 as
+# being only the first digit of subscriber numbers. A similar expansion was
+# performed for Pinsk (Пінск), Soligorsk (Салігорск), Molodechno
+# (Маладзечна), Borisov (Барысаў) and Orsha (Орша)
+
+3751511|Вялікая Бераставіца, Гродзенская вобласць
+3751512|Ваўкавыск
+3751513|Свіслач, Гродзенская вобласць
+3751514|Шчучын, Гродзенская вобласць
+3751515|Масты, Гродзенская вобласць
+375152|Гродна
+375154|Ліда
+3751562|Слонім
+3751563|Дзятлава, Гродзенская вобласць
+3751564|Зэльва, Гродзенская вобласць
+3751591|Астравец, Гродзенская вобласць
+3751592|Смаргонь
+3751593|Ашмяны
+3751594|Воранава, Гродзенская вобласць
+3751595|Іўе, Гродзенская вобласць
+3751596|Карэлічы, Гродзенская вобласць
+3751597|Навагрудак
+375162|Брэст
+375163|Баранавічы
+3751631|Камянец, Брэсцкая вобласць
+3751632|Пружаны, Брэсцкая вобласць
+3751633|Ляхавічы, Брэсцкая вобласць
+3751641|Жабінка, Брэсцкая вобласць
+3751642|Кобрын
+3751643|Бяроза, Брэсцкая вобласць
+3751644|Драгічын, Брэсцкая вобласць
+3751645|Івацэвічы, Брэсцкая вобласць
+3751646|Ганцавічы, Брэсцкая вобласць
+3751647|Лунінец, Брэсцкая вобласць
+375165|Пінск
+3751651|Маларыта, Брэсцкая вобласць
+3751652|Іванава, Брэсцкая вобласць
+3751655|Столін, Брэсцкая вобласць
+37517|Мінск
+3751713|Мар’іна Горка, Мінская вобласць
+3751714|Чэрвень
+3751715|Беразіно, Мінская вобласць
+3751716|Дзяржынск
+3751717|Стаўбцы
+3751718|Узда, Мінская вобласць
+3751719|Капыль, Мінская вобласць
+375174|Салігорск
+375176|Маладзечна
+375177|Барысаў
+3751770|Нясвіж
+3751771|Вілейка
+3751772|Валожын
+3751774|Лагойск
+3751775|Жодзіна
+3751776|Смалявічы
+3751792|Старыя Дарогі, Мінская вобласць
+3751793|Клецк, Мінская вобласць
+3751794|Любань, Мінская вобласць
+3751795|Слуцк
+3751796|Крупкі, Мінская вобласць
+3751797|Мядзел
+375212|Віцебск
+3752130|Шуміліна, Віцебская вобласць
+3752131|Бешанковічы, Віцебская вобласць
+3752132|Лепель
+3752133|Чашнікі, Віцебская вобласць
+3752135|Сянно, Віцебская вобласць
+3752136|Талачын
+3752137|Дуброўна, Віцебская вобласць
+3752138|Лёзна, Віцебская вобласць
+3752139|Гарадок, Віцебская вобласць
+375214|Полацк/Наваполацк
+3752151|Верхнядзвінск, Віцебская вобласць
+3752152|Міёры, Віцебская вобласць
+3752153|Браслаў
+3752154|Шаркоўшчына, Віцебская вобласць
+3752155|Паставы
+3752156|Глыбокае
+3752157|Докшыцы, Віцебская вобласць
+3752158|Ушачы, Віцебская вобласць
+3752159|Расоны, Віцебская вобласць
+375216|Орша
+375222|Магілёў
+3752230|Глуск, Магілёўская вобласць
+3752231|Быхаў, Магілёўская вобласць
+3752232|Бялынічы, Магілёўская вобласць
+3752233|Горкі, Магілёўская вобласць
+3752234|Круглае, Магілёўская вобласць
+3752235|Асіповічы
+3752236|Клічаў, Магілёўская вобласць
+3752237|Кіраўск, Магілёўская вобласць
+3752238|Краснаполле, Магілёўская вобласць
+3752239|Шклоў
+3752240|Мсціслаў
+3752241|Крычаў, Магілёўская вобласць
+3752242|Чавусы, Магілёўская вобласць
+3752243|Чэрыкаў, Магілёўская вобласць
+3752244|Клімавічы, Магілёўская вобласць
+3752245|Касцюковічы, Магілёўская вобласць
+3752246|Слаўгарад, Магілёўская вобласць
+3752247|Хоцімск, Магілёўская вобласць
+3752248|Дрыбін, Магілёўская вобласць
+375225|Бабруйск
+375232|Гомель
+3752330|Ветка, Гомельская вобласць
+3752332|Чачэрск, Гомельская вобласць
+3752333|Добруш, Гомельская вобласць
+3752334|Жлобін
+3752336|Буда-Кашалёва, Гомельская вобласць
+3752337|Карма, Гомельская вобласць
+3752339|Рагачоў
+3752340|Рэчыца
+3752342|Светлагорск
+3752344|Брагін, Гомельская вобласць
+3752345|Калінкавічы
+3752346|Хойнікі, Гомельская вобласць
+3752347|Лоеў, Гомельская вобласць
+3752350|Петрыкаў, Гомельская вобласць
+3752351|Мазыр
+3752353|Жыткавічы, Гомельская вобласць
+3752354|Ельск, Гомельская вобласць
+3752355|Нароўля, Гомельская вобласць
+3752356|Лельчыцы, Гомельская вобласць
+3752357|Акцябрскі, Гомельская вобласць
+375236|Мазыр
diff --git a/geocoding/en/1.txt b/geocoding/en/1.txt
index 9a17ba0..e0edd82 100644
--- a/geocoding/en/1.txt
+++ b/geocoding/en/1.txt
@@ -2424,6 +2424,7 @@
 1231947|Traverse City, MI
 1231995|Traverse City, MI
 1234|Ohio
+1236|British Columbia
 1239|Florida
 1239213|Naples, FL
 1239225|Fort Myers, FL
@@ -7646,6 +7647,7 @@
 1361992|Corpus Christi, TX
 1361993|Corpus Christi, TX
 1361994|Corpus Christi, TX
+1365|Ontario
 1385|Utah
 1386|Florida
 1386226|Daytona Beach, FL
@@ -10987,6 +10989,7 @@
 1435893|Richfield, UT
 1435896|Richfield, UT
 1435946|Garden City, UT
+1437|Ontario
 1438|Québec
 1440|Ohio
 1440204|Lorain, OH
@@ -18621,6 +18624,7 @@
 1636970|St. Peters, MO
 1636978|O'Fallon, MO
 1636980|O'Fallon, MO
+1639|Saskatchewan
 1641|Iowa
 1641209|Fairfield, IA
 1641227|Baxter, IA
diff --git a/geocoding/en/375.txt b/geocoding/en/375.txt
new file mode 100644
index 0000000..e0fcc66
--- /dev/null
+++ b/geocoding/en/375.txt
@@ -0,0 +1,143 @@
+# Copyright (C) 2013 Google Inc.
+
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+
+# http://www.apache.org/licenses/LICENSE-2.0
+
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# Generated from:
+# http://www.eng.beltelecom.by/info/num/ [2011-05-18]
+# http://en.wikipedia.org/wiki/+375 [441040280]
+# Berestovitsa was changed to Vyalikaya Byerastavitsa, following the name of
+# city according to Wikipedia, Kobrin was changed to Kobryn, Bobruysk was
+# changed to Babruysk, Logoysk to Lahoysk and Smolevichi to Smalyavichy.
+# Navapolatsk was added to the prefix 375214 as per the Russian and Belarussian
+# data.
+
+3751511|Vyalikaya Byerastavitsa, Grodno Region
+3751512|Volkovysk
+3751513|Svisloch, Grodno Region
+3751514|Shchuchin, Grodno Region
+3751515|Mosty, Grodno Region
+375152|Grodno
+375154|Lida
+3751562|Slonim
+3751563|Dyatlovo, Grodno Region
+3751564|Zelva, Grodno Region
+3751591|Ostrovets, Grodno Region
+3751592|Smorgon
+3751593|Oshmyany
+3751594|Voronovo, Grodno Region
+3751595|Ivye, Grodno Region
+3751596|Korelichi, Grodno Region
+3751597|Novogrudok
+375162|Brest
+375163|Baranovichi
+3751631|Kamenets, Brest Region
+3751632|Pruzhany, Brest Region
+3751633|Lyakhovichi, Brest Region
+3751641|Zhabinka, Brest Region
+3751642|Kobryn
+3751643|Bereza, Brest Region
+3751644|Drogichin, Brest Region
+3751645|Ivatsevichi, Brest Region
+3751646|Gantsevichi, Brest Region
+3751647|Luninets, Brest Region
+375165|Pinsk
+3751651|Malorita, Brest Region
+3751652|Ivanovo, Brest Region
+3751655|Stolin, Brest Region
+37517|Minsk
+3751713|Maryina Gorka, Minsk Region
+3751714|Cherven
+3751715|Berezino, Minsk Region
+3751716|Dzerzhinsk
+3751717|Stolbtsy
+3751718|Uzda, Minsk Region
+3751719|Kopyl, Minsk Region
+375174|Soligorsk
+375176|Molodechno
+375177|Borisov
+3751770|Nesvizh
+3751771|Vileyka
+3751772|Volozhin
+3751774|Lahoysk
+3751775|Zhodino
+3751776|Smalyavichy
+3751792|Starye Dorogi, Minsk Region
+3751793|Kletsk, Minsk Region
+3751794|Lyuban, Minsk Region
+3751795|Slutsk
+3751796|Krupki, Minsk Region
+3751797|Myadel
+375212|Vitebsk
+3752130|Shumilino, Vitebsk Region
+3752131|Beshenkovichi, Vitebsk Region
+3752132|Lepel
+3752133|Chashniki, Vitebsk Region
+3752135|Senno, Vitebsk Region
+3752136|Tolochin
+3752137|Dubrovno, Vitebsk Region
+3752138|Liozno, Vitebsk Region
+3752139|Gorodok, Vitebsk Region
+375214|Polotsk/Navapolatsk
+3752151|Verhnedvinsk, Vitebsk Region
+3752152|Miory, Vitebsk Region
+3752153|Braslav
+3752154|Sharkovshchina, Vitebsk Region
+3752155|Postavy
+3752156|Glubokoye
+3752157|Dokshitsy, Vitebsk Region
+3752158|Ushachi, Vitebsk Region
+3752159|Rossony, Vitebsk Region
+375216|Orsha
+375222|Mogilev
+3752230|Glusk, Mogilev Region
+3752231|Byhov, Mogilev Region
+3752232|Belynichi, Mogilev Region
+3752233|Gorki, Mogilev Region
+3752234|Krugloye, Mogilev Region
+3752235|Osipovichi
+3752236|Klichev, Mogilev Region
+3752237|Kirovsk, Mogilev Region
+3752238|Krasnopolye, Mogilev Region
+3752239|Shklov
+3752240|Mstislavl
+3752241|Krichev, Mogilev Region
+3752242|Chausy, Mogilev Region
+3752243|Cherikov, Mogilev Region
+3752244|Klimovichi, Mogilev Region
+3752245|Kostyukovichi, Mogilev Region
+3752246|Slavgorod, Mogilev Region
+3752247|Khotimsk, Mogilev Region
+3752248|Dribin, Mogilev Region
+375225|Babruysk
+375232|Gomel
+3752330|Vetka, Gomel Region
+3752332|Chechersk, Gomel Region
+3752333|Dobrush, Gomel Region
+3752334|Zhlobin
+3752336|Budo-Koshelevo, Gomel Region
+3752337|Korma, Gomel Region
+3752339|Rogachev
+3752340|Rechitsa
+3752342|Svetlogorsk
+3752344|Bragin, Gomel Region
+3752345|Kalinkovichi
+3752346|Khoiniki, Gomel Region
+3752347|Loyev, Gomel Region
+3752350|Petrikov, Gomel Region
+3752351|Mozyr
+3752353|Zhitkovichi, Gomel Region
+3752354|Yelsk, Gomel Region
+3752355|Narovlya, Gomel Region
+3752356|Lelchitsy, Gomel Region
+3752357|Oktyabrskiy, Gomel Region
+375236|Mozyr
diff --git a/geocoding/ru/375.txt b/geocoding/ru/375.txt
new file mode 100644
index 0000000..1df3ec5
--- /dev/null
+++ b/geocoding/ru/375.txt
@@ -0,0 +1,144 @@
+# Copyright (C) 2013 Google Inc.
+
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+
+# http://www.apache.org/licenses/LICENSE-2.0
+
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# Generated from:
+# http://www.beltelecom.by/info/citynumber/data/%C1/ [2011-05-18] (page no
+# longer accessible, and no replacement page can be found.)
+# http://ru.wikipedia.org/wiki/Телефонный_план_нумерации_Белоруссии [35201967]
+#
+# Марьина Горка/Пуховичи was shortened to Марьина Горка as per the
+# Belarussian and English versions, and Логойск/Плещеницы to Логойск.
+# Мядель/Нарочь as shorted to Мядель as well.
+# Provinces were added for smaller cities.
+
+3751511|Берестовица, Гродненская область
+3751512|Волковыск
+3751513|Свислочь, Гродненская область
+3751514|Щучин, Гродненская область
+3751515|Мосты, Гродненская область
+375152|Гродно
+375154|Лида
+3751562|Слоним
+3751563|Дятлово, Гродненская область
+3751564|Зельва, Гродненская область
+3751591|Островец, Гродненская область
+3751592|Сморгонь
+3751593|Ошмяны
+3751594|Вороново, Гродненская область
+3751595|Ивье, Гродненская область
+3751596|Кореличи, Гродненская область
+3751597|Новогрудок
+375162|Брест
+375163|Барановичи
+3751631|Каменец, Брестская область
+3751632|Пружаны, Брестская область
+3751633|Ляховичи, Брестская область
+3751641|Жабинка, Брестская область
+3751642|Кобрин
+3751643|Береза, Брестская область
+3751644|Дрогичин, Брестская область
+3751645|Ивацевичи, Брестская область
+3751646|Ганцевичи, Брестская область
+3751647|Лунинец, Брестская область
+375165|Пинск
+3751651|Малорита, Брестская область
+3751652|Иваново, Брестская область
+3751655|Столин, Брестская область
+37517|Минск
+3751713|Марьина Горка, Минская область
+3751714|Червень
+3751715|Березино, Минская область
+3751716|Дзержинск
+3751717|Столбцы
+3751718|Узда, Минская область
+3751719|Копыль, Минская область
+375174|Солигорск
+375176|Молодечно
+375177|Борисов
+3751770|Несвиж
+3751771|Вилейка
+3751772|Воложин
+3751774|Логойск
+3751775|Жодино
+3751776|Смолевичи
+3751792|Старые Дороги, Минская область
+3751793|Клецк, Минская область
+3751794|Любань, Минская область
+3751795|Слуцк
+3751796|Крупки, Минская область
+3751797|Мядель
+375212|Витебск
+3752130|Шумилино, Витебская область
+3752131|Бешенковичи, Витебская область
+3752132|Лепель
+3752133|Чашники, Витебская область
+3752135|Сенно, Витебская область
+3752136|Толочин
+3752137|Дубровно, Витебская область
+3752138|Лиозно, Витебская область
+3752139|Городок, Витебская область
+375214|Полоцк/Новополоцк
+3752151|Верхнедвинск, Витебская область
+3752152|Миоры, Витебская область
+3752153|Браслав
+3752154|Шарковщина, Витебская область
+3752155|Поставы
+3752156|Глубокое
+3752157|Докшицы, Витебская область
+3752158|Ушачи, Витебская область
+3752159|Россоны, Витебская область
+375216|Орша
+375222|Могилев
+3752230|Глуск, Могилевская область
+3752231|Быхов, Могилевская область
+3752232|Белыничи, Могилевская область
+3752233|Горки, Могилевская область
+3752234|Круглое, Могилевская область
+3752235|Осиповичи
+3752236|Кличев, Могилевская область
+3752237|Кировск, Могилевская область
+3752238|Краснополье, Могилевская область
+3752239|Шклов
+3752240|Мстиславль
+3752241|Кричев, Могилевская область
+3752242|Чаусы, Могилевская область
+3752243|Чериков, Могилевская область
+3752244|Климовичи, Могилевская область
+3752245|Костюковичи, Могилевская область
+3752246|Славгород, Могилевская область
+3752247|Хотимск, Могилевская область
+3752248|Дрибин, Могилевская область
+375225|Бобруйск
+375232|Гомель
+3752330|Ветка, Гомельская область
+3752332|Чечерск, Гомельская область
+3752333|Добруш, Гомельская область
+3752334|Жлобин
+3752336|Буда-Кошелево, Гомельская область
+3752337|Корма, Гомельская область
+3752339|Рогачев
+3752340|Речица
+3752342|Светлогорск
+3752344|Брагин, Гомельская область
+3752345|Калинковичи
+3752346|Хойники, Гомельская область
+3752347|Лоев, Гомельская область
+3752350|Петриков, Гомельская область
+3752351|Мозырь
+3752353|Житковичи, Гомельская область
+3752354|Ельск, Гомельская область
+3752355|Наровля, Гомельская область
+3752356|Лельчицы, Гомельская область
+3752357|Октябрьский, Гомельская область
+375236|Мозырь