Review URL: https://codereview.appspot.com/6349078

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

5 files changed, 454 insertions, 285 deletions

diff --git a/PhoneNumberMetaData.xml b/PhoneNumberMetaData.xml
index 47b9d4e..fee6212 100644
--- a/PhoneNumberMetaData.xml
+++ b/PhoneNumberMetaData.xml
@@ -768,10 +768,11 @@
 
     <!-- Argentina -->
     <!-- http://www.itu.int/oth/T0202000009/en -->
-    <!-- http://www.cnc.gov.ar/infotecnica/numeracion/Index.asp -->
+    <!-- http://www.cnc.gov.ar/infotecnica/numeracion/Index.asp - click on Indicativos Interurbanos.
+         -->
     <territory id="AR" countryCode="54" internationalPrefix="00"
         nationalPrefix="0" nationalPrefixForParsing="
-          0(?:
+          0?(?:
             (11|
              2(?:
                2(?:
@@ -783,16 +784,16 @@
                  6[124-8]|
                  7[1-4]|
                  8[13-6]|
-                 9[1-367]
+                 9[1267]
                )|
                3(?:
-                 [06]2?|
+                 02?|
                  1[467]|
-                 2[02-6]|
+                 2[03-6]|
                  3[13-8]|
                  [49][2-6]|
                  5[2-8]|
-                 7
+                 [67]
                )|
                4(?:
                  7[3-578]|
@@ -829,9 +830,9 @@
                 3[5-8]?|
                 4[24-7]|
                 5[4-68]?|
-                6\d|
+                6[02-9]|
                 7[126]|
-                8[237-9]?|
+                8[2379]?|
                 9[1-36-8]
               )|
               5(?:
@@ -845,7 +846,7 @@
               )|
               6[24]|
               7(?:
-                1[15-8]|
+                1[1568]|
                 2[15]|
                 3[145]|
                 4[13]|
@@ -856,8 +857,8 @@
               )|
               8(?:
                 [01]|
-                2[125-7]|
-                3[23578]?|
+                2[15-7]|
+                3[2578]?|
                 4[13-6]|
                 5[4-8]?|
                 6[1-357-9]|
@@ -908,7 +909,8 @@
               )
             )
           </leadingDigits>
-          <!-- Several 294X four-digit area codes exist: 2940, 2942, 2945, 2946 and 2948. -->
+          <!-- We exclude here several 294X four-digit area codes: 2940, 2942, 2945, 2946 and 2948 -
+               and several 38[3578]X four-digit area codes. -->
           <leadingDigits>
             9(?:
               2(?:
@@ -927,15 +929,16 @@
                 4[12358]|
                 5(?:
                   [18]|
-                  3[0-689]
+                  3[014-689]
                 )|
                 6[24]|
                 7[069]|
                 8(?:
-                  [015]|
-                  3[0-2479]|
-                  7[0-24-9]|
-                  8[0-79]
+                  [01]|
+                  3[013469]|
+                  5[0-39]|
+                  7[0-2459]|
+                  8[0-49]
                 )
               )
             )
@@ -1022,10 +1025,11 @@
               6[24]|
               7[069]|
               8(?:
-                [015]|
-                3[0-2479]|
-                7[0-24-9]|
-                8[0-79]
+                [01]|
+                3[013469]|
+                5[0-39]|
+                7[0-2459]|
+                8[0-49]
               )
             )
           </leadingDigits>
@@ -1073,17 +1077,18 @@
           (?:
             2(?:
               2(?:
-                [0139]\d|
+                [013]\d|
                 2[13-79]|
                 4[1-6]|
                 5[2457]|
                 6[124-8]|
                 7[1-4]|
-                8[13-6]
+                8[13-6]|
+                9[1267]
               )|
               3(?:
                 1[467]|
-                2[02-6]|
+                2[03-6]|
                 3[13-8]|
                 [49][2-6]|
                 5[2-8]|
@@ -1115,8 +1120,9 @@
               4(?:
                 [78]\d|
                 0[0124-9]|
-                [1-356]\d|
+                [1-35]\d|
                 4[24-7]|
+                6[02-9]|
                 9[123678]
               )|
               5(?:
@@ -1128,7 +1134,8 @@
               )|
               6[24]\d|
               7(?:
-                [01469]\d|
+                [0469]\d|
+                1[1568]|
                 2[013-9]|
                 3[145]|
                 5[14-8]|
@@ -1136,7 +1143,8 @@
                 8[0-24-9]
               )|
               8(?:
-                [0-3578]\d|
+                [013578]\d|
+                2[15-7]|
                 4[13-6]|
                 6[1-357-9]|
                 9[124]
@@ -1927,18 +1935,31 @@
     </territory>
 
     <!-- Bosnia and Herzegovina -->
-    <!-- http://www.cra.ba/en/telecom/numbering/ -->
+    <!-- http://www.rak.ba/eng/index.php?uid=1272016657 (accessible from
+         http://www.cra.ba/en/telecom/numbering/) -->
     <!-- http://en.wikipedia.org/wiki/+387 -->
     <territory id="BA" countryCode="387" internationalPrefix="00"
                nationalPrefix="0" nationalPrefixFormattingRule="$NP$FG">
       <availableFormats>
-        <numberFormat pattern="([3-689]\d)(\d{3})(\d{3})">
+        <numberFormat pattern="(\d{2})(\d{3})(\d{3})">
+          <leadingDigits>[3-5]</leadingDigits>
           <format>$1 $2-$3</format>
         </numberFormat>
+        <numberFormat pattern="(\d{2})(\d{3})(\d{3})">
+          <leadingDigits>
+            6[1-356]|
+            [7-9]
+          </leadingDigits>
+          <format>$1 $2 $3</format>
+        </numberFormat>
+        <numberFormat pattern="(\d{2})(\d{2})(\d{2})(\d{3})">
+          <leadingDigits>6[047]</leadingDigits>
+          <format>$1 $2 $3 $4</format>
+        </numberFormat>
       </availableFormats>
       <generalDesc>
-        <nationalNumberPattern>[3-689]\d{7}</nationalNumberPattern>
-        <possibleNumberPattern>\d{6,8}</possibleNumberPattern>
+        <nationalNumberPattern>[3-9]\d{7,8}</nationalNumberPattern>
+        <possibleNumberPattern>\d{6,9}</possibleNumberPattern>
       </generalDesc>
       <fixedLine>
         <nationalNumberPattern>
@@ -1947,11 +1968,19 @@
             49
           )\d{6}
         </nationalNumberPattern>
+        <possibleNumberPattern>\d{6,8}</possibleNumberPattern>
         <exampleNumber>30123456</exampleNumber>
       </fixedLine>
       <mobile>
-        <nationalNumberPattern>6[1-356]\d{6}</nationalNumberPattern>
-        <possibleNumberPattern>\d{8}</possibleNumberPattern>
+        <nationalNumberPattern>
+          6(?:
+            03|
+            44|
+            71|
+            [1-356]
+          )\d{6}
+        </nationalNumberPattern>
+        <possibleNumberPattern>\d{8,9}</possibleNumberPattern>
         <exampleNumber>61123456</exampleNumber>
       </mobile>
       <tollFree>
@@ -1967,14 +1996,15 @@
       <sharedCost>
         <!-- Using this category to model national tariff numbers - these are under Shared Cost in
              the plan. -->
-        <nationalNumberPattern>82\d{6}</nationalNumberPattern>
+        <nationalNumberPattern>8[12]\d{6}</nationalNumberPattern>
         <possibleNumberPattern>\d{8}</possibleNumberPattern>
         <exampleNumber>82123456</exampleNumber>
       </sharedCost>
       <uan>
-        <nationalNumberPattern>81\d{6}</nationalNumberPattern>
+        <!-- Using this to classify nomad numbers. -->
+        <nationalNumberPattern>70[23]\d{5}</nationalNumberPattern>
         <possibleNumberPattern>\d{8}</possibleNumberPattern>
-        <exampleNumber>81123456</exampleNumber>
+        <exampleNumber>70223456</exampleNumber>
       </uan>
       <emergency>
         <nationalNumberPattern>12[234]</nationalNumberPattern>
@@ -2395,6 +2425,7 @@
 
     <!-- Burkina Faso -->
     <!-- http://www.itu.int/oth/T0202000021/en -->
+    <!-- http://www.onatel.bf/onatelsa/plandenumerotation_burkina.pdf -->
     <territory id="BF" countryCode="226" internationalPrefix="00">
       <availableFormats>
         <!-- The national numbering plan from ITU suggests grouping of 2, 2 and 4, but we have
@@ -2408,7 +2439,9 @@
         <possibleNumberPattern>\d{8}</possibleNumberPattern>
       </generalDesc>
       <fixedLine>
-        <!-- 50 48 and 50 49 exist as well. -->
+        <!-- The prefix 50 48 has been added based on numbers found online, while 40 49 has been
+             deleted since we haven't found any numbers with this prefix and it is not mentioned in
+             the onatel document. -->
         <nationalNumberPattern>
           (?:
             20(?:
@@ -2417,8 +2450,8 @@
               9[016-9]
             )|
             40(?:
-              4[569]|
-              55|
+              4[56]|
+              5[4-6]|
               7[0179]
             )|
             50[34]\d
@@ -4753,7 +4786,7 @@
             7[01]
           )\d{5}|
           [67][01]\d{6}|
-          8[35-9]\d{6}
+          8[3-9]\d{6}
         </nationalNumberPattern>
         <possibleNumberPattern>\d{8}</possibleNumberPattern>
         <exampleNumber>83123456</exampleNumber>
@@ -4785,7 +4818,8 @@
               5\d{5}|
               70[01]\d{3}
             )|
-            1[01]\d{5}
+            1[01]\d{5}|
+            400\d{4}
           )|
           5100\d{4}
         </nationalNumberPattern>
@@ -5480,7 +5514,8 @@
             [0-8]\d{4,12}|
             9(?:
               4[1-8]|
-              [0-35-7]\d
+              6[1-8]\d?|
+              [0-357]\d
             )\d{2,7}
           )
         </nationalNumberPattern>
@@ -5961,7 +5996,8 @@
 
     <!-- Ecuador -->
     <!-- http://en.wikipedia.org/wiki/+593 -->
-    <!-- http://www.conatel.gov.ec -->
+    <!-- http://www.conatel.gob.ec/site_conatel/index.php?option=com_content&view=category&layout=blog&id=52&Itemid=153
+         -->
     <!-- http://www.itu.int/oth/T020200003D/en -->
     <!-- A new plan has been prepared, but no implementation date has yet been stated. -->
     <territory id="EC" countryCode="593" internationalPrefix="00"
@@ -5969,8 +6005,8 @@
       <availableFormats>
         <numberFormat pattern="(\d)(\d{3})(\d{4})">
           <leadingDigits>
-            [2-57]|
-            6[2-7]
+            [247]|
+            [356][2-8]
           </leadingDigits>
           <format>$1 $2-$3</format>
           <intlFormat>$1-$2-$3</intlFormat>
@@ -5978,7 +6014,7 @@
         <numberFormat pattern="(\d{2})(\d{3})(\d{3})"
           nationalPrefixFormattingRule="$NP$FG">
           <leadingDigits>
-            69|
+            [356]9|
             [89]
           </leadingDigits>
           <format>$1 $2 $3</format>
@@ -6001,7 +6037,7 @@
       <mobile>
         <nationalNumberPattern>
           (?:
-            69|
+            [356]9|
             [89]\d
           )\d{6}
         </nationalNumberPattern>
@@ -6013,6 +6049,11 @@
         <possibleNumberPattern>\d{10,11}</possibleNumberPattern>
         <exampleNumber>18001234567</exampleNumber>
       </tollFree>
+      <voip>
+        <nationalNumberPattern>[2-7]890\d{4}</nationalNumberPattern>
+        <possibleNumberPattern>\d{8}</possibleNumberPattern>
+        <exampleNumber>28901234</exampleNumber>
+      </voip>
       <emergency>
         <nationalNumberPattern>
           1(?:
@@ -6454,11 +6495,12 @@
         <exampleNumber>511234567</exampleNumber>
       </uan>
       <emergency>
+        <!-- We include the Civil Guard here since it seems to perform similar duties as the police
+             force. -->
         <nationalNumberPattern>
           0(?:
-            61|
-            8[05]|
-            9[12]
+            [69][12]|
+            8[05]
           )|
           112
         </nationalNumberPattern>
@@ -13851,8 +13893,7 @@
     <!-- Kazakhstan -->
     <!-- http://www.itu.int/oth/T020200006F/en -->
     <territory id="KZ" countryCode="7" preferredInternationalPrefix="8~10"
-               internationalPrefix="810" nationalPrefix="8"
-               nationalPrefixFormattingRule="$NP$FG">
+               internationalPrefix="810" nationalPrefix="8">
        <!-- Formatting rules obtained from Russia. -->
       <generalDesc>
         <nationalNumberPattern>
@@ -15604,24 +15645,22 @@
         <possibleNumberPattern>\d{8}</possibleNumberPattern>
       </generalDesc>
       <fixedLine>
-        <!-- Extra prefix 02 60 added from numbers found online. -->
         <nationalNumberPattern>
           (?:
             2(?:
               [23]\d|
-              5[125]|
+              5[124578]|
               6[01]
             )|
             3(?:
               1[3-6]|
-              2[2-6]|
-              3[2-5]|
-              4[235]
+              [23][2-6]|
+              4[2356]
             )|
             4(?:
               [23][2-6]|
               4[3-6]|
-              5[25]|
+              5[256]|
               6[25-8]|
               7[24-6]|
               8[4-6]
@@ -17168,30 +17207,32 @@
       <mobile>
         <nationalNumberPattern>
           (?:
-            7[3-9]|
+            [79]\d|
             8[0-79]|
-            9\d
           )\d{4}
         </nationalNumberPattern>
         <exampleNumber>751234</exampleNumber>
       </mobile>
+      <!-- Listed as "voice services", from what we've seen they seem to cost extra. -->
+      <premiumRate>
+        <nationalNumberPattern>36\d{4}</nationalNumberPattern>
+        <exampleNumber>366711</exampleNumber>
+      </premiumRate>
       <shortCode>
         <!-- OPT: Office des Postes et Télécommunications de Nouvelle Calédonie -->
         <nationalNumberPattern>
-          1(?:
-            0(?:
-              0[06]|
-              1[02-46]|
-              20|
-              3[0125]|
-              42|
-              5[058]|
-              77
-            )
+          10(?:
+            0[06]|
+            1[02-46]|
+            20|
+            3[0125]|
+            42|
+            5[058]|
+            77
           )
         </nationalNumberPattern>
-        <possibleNumberPattern>\d{2,4}</possibleNumberPattern>
-        <exampleNumber>15</exampleNumber>
+        <possibleNumberPattern>\d{4}</possibleNumberPattern>
+        <exampleNumber>1000</exampleNumber>
       </shortCode>
       <!-- http://www.routard.com/guide/nouvelle_caledonie/2343/vie_pratique.htm -->
       <emergency>
@@ -17365,10 +17406,11 @@
           [12]\d{6,7}|
           9\d{7}|
           (?:
+            3\d|
             4[023568]|
             5[02368]|
             6[02-469]|
-            7[569]|
+            7[4-69]|
             8[2-9]
           )\d{6}|
           (?:
@@ -17386,9 +17428,82 @@
         <exampleNumber>12345678</exampleNumber>
       </fixedLine>
       <mobile>
-        <!-- More 81X prefixes have been added based on online numbers. -->
+        <!-- More 81X prefixes have been added based on online numbers. Furthermore, the prefixes
+             owned by Starcomms have apparently, according to the company, been used for both
+             fixed-line and mobile numbers, despite the ITU plan, so we list them here as well. -->
         <nationalNumberPattern>
           (?:
+            1(?:
+              7[34]\d|
+              8(?:
+                04|
+                [124579]\d|
+                8[0-3]
+              )|
+              95\d
+            )|
+            287[0-7]|
+            3(?:
+              18[1-8]|
+              88[0-7]|
+              9(?:
+                8[5-9]|
+                6[1-5]
+              )|
+            )|
+            4(?:
+              28[0-2]|
+              6(?:
+                7[1-9]|
+                8[02-47]
+              )|
+              88[0-2]
+            )|
+            5(?:
+              2(?:
+                7[7-9]|
+                8\d
+              )|
+              38[1-79]|
+              48[0-7]|
+              68[4-7]
+            )|
+            6(?:
+              2(?:
+                7[7-9]|
+                8\d
+              )|
+              4(?:
+                3[7-9]|
+                [68][129]|
+                7[04-69]|
+                9[1-8]
+              )|
+              58[0-2]|
+              98[7-9]
+            )|
+            7(?:
+              38[0-7]|
+              69[1-8]|
+              78[2-4]
+            )|
+            8(?:
+              28[3-9]|
+              38[0-2]|
+              4(?:
+                2[12]|
+                3[147-9]|
+                5[346]|
+                7[4-9]|
+                8[014-689]
+              )|
+              58[1-8]|
+              78[2-9]|
+              88[5-7]
+            )|
+            98[07]\d
+          )\d{4}|
+          (?:
             70(?:
               [3-9]\d|
               2[1-9]
@@ -17399,7 +17514,7 @@
             )\d
           )\d{6}
         </nationalNumberPattern>
-        <possibleNumberPattern>\d{10}</possibleNumberPattern>
+        <possibleNumberPattern>\d{8,10}</possibleNumberPattern>
         <exampleNumber>8021234567</exampleNumber>
       </mobile>
       <!-- Info on these numbers from http://www.alphatechnologieslimited.com. -->
@@ -18301,12 +18416,7 @@
         <possibleNumberPattern>\d{6}</possibleNumberPattern>
       </generalDesc>
       <noInternationalDialling>
-        <nationalNumberPattern>
-          (?:
-            36|
-            44
-          )\d{4}
-        </nationalNumberPattern>
+        <nationalNumberPattern>44\d{4}</nationalNumberPattern>
         <exampleNumber>441234</exampleNumber>
       </noInternationalDialling>
       <fixedLine>
@@ -18314,7 +18424,6 @@
              specific to exclude Mobile MSRN. -->
         <nationalNumberPattern>
           (?:
-            36\d|
             4(?:
               [02-9]\d|
               1[02-9]
@@ -18327,10 +18436,10 @@
       <mobile>
         <nationalNumberPattern>
           (?:
-            [27]\d{3}|
-            3[0-59]\d{2}|
-            411[3-6]
-          )\d{2}
+            [27]\d{2}|
+            3[0-59]\d|
+            411
+          )\d{3}
         </nationalNumberPattern>
         <exampleNumber>212345</exampleNumber>
       </mobile>
@@ -20104,7 +20213,7 @@
           7(?:
             4\d|
             5[025-8]|
-            6[0-4]
+            6[0-6]
           )\d{4}|
           8[4-8]\d{5}
         </nationalNumberPattern>
@@ -23136,7 +23245,7 @@
     <!-- http://www.itu.int/oth/T02020000E1/en -->
     <territory id="UZ" countryCode="998" preferredInternationalPrefix="8~10"
                internationalPrefix="810" nationalPrefix="8"
-               nationalPrefixFormattingRule="$NP$FG">
+               nationalPrefixFormattingRule="$NP $FG">
       <availableFormats>
         <numberFormat pattern="([679]\d)(\d{3})(\d{2})(\d{2})">
           <format>$1 $2 $3 $4</format>
@@ -24924,7 +25033,7 @@
       <generalDesc>
         <nationalNumberPattern>[13]\d{6,11}</nationalNumberPattern>
         <possibleNumberPattern>\d{7,12}</possibleNumberPattern>
-        <exampleNumber>32123456</exampleNumber>
+        <exampleNumber>3451234567</exampleNumber>
       </generalDesc>
       <fixedLine>
         <nationalNumberPattern>NA</nationalNumberPattern>
diff --git a/geocoding/en/234.txt b/geocoding/en/234.txt
new file mode 100644
index 0000000..8911e68
--- /dev/null
+++ b/geocoding/en/234.txt
@@ -0,0 +1,79 @@
+# Copyright (C) 2012 The Libphonenumber Authors
+
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+
+# http://www.apache.org/licenses/LICENSE-2.0
+
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# Generated from:
+# http://www.itu.int/oth/T020200009C/en [20120625]
+# http://en.wikipedia.org/wiki/+234 [482684298]
+#
+# Note that the prefix for Pank Shin is more specific, so we don't classify
+# all mobile numbers as belonging to this locality.
+
+2341|Lagos
+2342|Ibadan
+23430|Ado Ekiti
+23431|Ilorin
+23433|New Bussa
+23434|Akura
+23435|Oshogbo
+23436|Ile Ife
+23437|Ijebu Ode
+23438|Oyo
+23439|Abeokuta
+23441|Wukari
+23442|Enugu
+23443|Abakaliki
+23444|Makurdi
+23445|Ogoja
+23446|Onitsha
+23447|Lafia
+23448|Awka
+23450|Ikare
+23451|Owo
+23452|Benin
+23453|Warri
+23454|Sapele
+23455|Agbor
+23456|Asaba
+23457|Auchi
+23458|Lokoja
+23459|Okitipupa
+23460|Sokobo
+23461|Kafanchau
+23462|Kaduna
+23463|Gusau
+23464|Kano
+23465|Katsina
+23466|Minna
+23467|Kontagora
+23468|Birnin-Kebbi
+23469|Zaria
+2347020|Pank Shin
+23471|Azare
+23472|Gombe
+23473|Jos
+23474|Damaturu
+23475|Yola
+23476|Maiduguri
+23477|Bauchi
+23478|Hadejia
+23479|Jalingo
+23482|Aba
+23483|Owerri
+23484|Port Harcourt
+23485|Uyo
+23486|Ahoada
+23487|Calabar
+23488|Umuahia
+23489|Yenegoa
+2349|Abuja
diff --git a/geocoding/en/54.txt b/geocoding/en/54.txt
index b5f8c63..89cc6fb 100644
--- a/geocoding/en/54.txt
+++ b/geocoding/en/54.txt
@@ -13,6 +13,8 @@
 # limitations under the License.
 
 # Translated from es/54.txt using Freebase and Wikipedia.
+# Some manual edits were made after the file was generated, according to the
+# ITU file published 2011-12-16 here: http://www.itu.int/oth/T0202000009/en
 
 5411|Buenos Aires
 54220|Merlo
@@ -49,7 +51,6 @@
 542286|General Lamadrid, Buenos Aires
 542291|Miramar, Buenos Aires
 542292|Buenos Aires Province
-542293|Tandil, Buenos Aires
 542296|Ayacucho, Buenos Aires
 542297|Buenos Aires Province
 54230|Pilar, Buenos Aires
@@ -58,7 +59,6 @@
 542316|Daireaux, Buenos Aires
 542317|9 de Julio, Buenos Aires
 542320|José C. Paz
-542322|Pilar, Buenos Aires
 542323|Luján
 542324|Mercedes
 542325|San Andrés de Giles/Azcuénaga
@@ -94,9 +94,7 @@
 54260|San Rafael
 54261|Mendoza, Capital
 542622|Tunuyán, Mendoza
-542623|San Martin
 542625|General Alvear, Mendoza
-542627|San Rafael
 54263|San Martin
 54264|San Juan, Capital
 542646|Valle Fértil
@@ -122,7 +120,6 @@
 54294|San Carlos de Bariloche, Río Negro
 542940|Ingeniero Jacobacci, Río Negro
 542942|Zapala
-542944|San Carlos de Bariloche, Río Negro
 542945|Esquel, Futaleufú
 542946|Choele Choel, Río Negro
 542948|Chos Malal, Neuquén
@@ -161,7 +158,6 @@
 543447|Colón
 54345|Concordia, Entre Ríos
 543460|Santa Teresa, Santa Fe
-543461|San Nicolás, Buenos Aires
 543462|Venado Tuerto, General López
 543463|Canals, Córdoba
 543464|Casilda, Santa Fe
@@ -203,12 +199,9 @@
 54362|Resistencia, San Fernando
 54364|Presidencia Roque Sáenz Pena, Chaco
 54370|Formosa
-543717|Formosa
 543718|Clorinda, Formosa
-543722|Resistencia, San Fernando
 543725|Chaco
 543731|Charata, Chacabuco
-543732|Presidencia Roque Sáenz Pena, Chaco
 543734|Machagai, Chaco
 543735|Villa Angela, Mayor Luis Fonta
 543743|Puerto Rico, Misiones
@@ -224,14 +217,11 @@
 543774|Curuzú Cuatiá, Corrientes
 543775|Monte Caseros, Corrientes
 543777|Goya, Corrientes
-543783|Corrientes, Capital
 54379|Corrientes, Capital
 54380|La Rioja
 54381|San Miguel de Tucumán, Capital
-543822|La Rioja
 543825|Chilecito, La Rioja
 54383|Catamarca
-543833|San Fernando del Valle de Catamarca, Catamarca
 543835|Andalgalá, Catamarca
 543844|Añatuya, Santiago del Estero
 54385|Santiago del Estero, Capital
diff --git a/geocoding/en/81.txt b/geocoding/en/81.txt
index e57cd6d..e387d7d 100644
--- a/geocoding/en/81.txt
+++ b/geocoding/en/81.txt
@@ -14,6 +14,7 @@
 
 # Generated from:
 # ja/81.txt and translated with Freebase.
+# Some manual edits were made after the file was generated.
 
 8111|Sapporo, Hokkaido
 811232|Chitose, Hokkaido
@@ -50,10 +51,10 @@
 811363|Kutchan, Hokkaido
 811364|Kutchan, Hokkaido
 811365|Kutchan, Hokkaido
-811366|Rusutsu, Hokkaido
-811367|Rusutsu, Hokkaido
+811366|Suttsu, Hokkaido
+811367|Suttsu, Hokkaido
 811372|Shikabe, Hokkaido
-811374|Aomori, Aomori
+811374|Mori, Hokkaido
 811375|Yakumo, Hokkaido
 811376|Yakumo, Hokkaido
 811377|Yakumo, Hokkaido
@@ -123,8 +124,8 @@
 811583|Monbetsu, Hokkaido
 811584|Engaru, Hokkaido
 811585|Engaru, Hokkaido
-811586|
-811587|
+811586|Nakayubetsu, Hokkaido
+811587|Nakayubetsu, Hokkaido
 811588|Okoppe, Hokkaido
 811589|Okoppe, Hokkaido
 81162|Wakkanai, Hokkaido
@@ -170,7 +171,7 @@
 81179|Sannohe, Aomori
 81182|Yokote, Akita
 81183|Yuzawa, Akita
-81184|Honjo, Akita
+81184|Yurihonjo, Akita
 811852|Oga, Akita
 811853|Oga, Akita
 811854|Oga, Akita
@@ -230,7 +231,7 @@
 811986|Tono, Iwate
 811987|Tono, Iwate
 81199|Morioka, Iwate
-81220|Ohasama, Iwate
+81220|
 81222|Sendai, Miyagi
 812230|Sendai, Miyagi
 812232|Iwanuma, Miyagi
@@ -241,9 +242,9 @@
 812237|Sendai, Miyagi
 812238|Sendai, Miyagi
 812239|Sendai, Miyagi
-812242|Shiroishi, Saga
-812243|Shiroishi, Saga
-812244|Shiroishi, Saga
+812242|Shiroishi, Miyagi
+812243|Shiroishi, Miyagi
+812244|Shiroishi, Miyagi
 812245|Ogawara, Miyagi
 812246|Ogawara, Miyagi
 812247|Ogawara, Miyagi
@@ -252,15 +253,15 @@
 81226|Kesennuma, Miyagi
 81227|Sendai, Miyagi
 81228|
-81229|Kakogawa, Hyogo
+81229|
 81233|Shinjo, Yamagata
 81234|Sakata, Yamagata
 81235|Tsuruoka, Yamagata
 81236|Yamagata, Yamagata
-812372|Yamate, Okayama
-812373|Yamate, Okayama
-812374|Yamate, Okayama
-812375|Yamate, Okayama
+812372|Murayama, Yamagata
+812373|Murayama, Yamagata
+812374|Murayama, Yamagata
+812375|Murayama, Yamagata
 812376|Sagae, Yamagata
 812377|Sagae, Yamagata
 812378|Sagae, Yamagata
@@ -277,22 +278,22 @@
 812413|Kitakata, Fukushima
 812414|Yanaizu, Fukushima
 812415|Yanaizu, Fukushima
-812416|Etajima, Hiroshima
+812416|Tajima, Fukushima
 812417|
 812418|
-8124190|Etajima, Hiroshima
-8124191|Etajima, Hiroshima
-8124192|Etajima, Hiroshima
-8124193|Etajima, Hiroshima
-8124194|Etajima, Hiroshima
-8124195|Etajima, Hiroshima
+8124190|Tajima, Fukushima
+8124191|Tajima, Fukushima
+8124192|Tajima, Fukushima
+8124193|Tajima, Fukushima
+8124194|Tajima, Fukushima
+8124195|Tajima, Fukushima
 8124196|Yanaizu, Fukushima
 8124197|Yanaizu, Fukushima
-8124198|Etajima, Hiroshima
-8124199|Etajima, Hiroshima
+8124198|Tajima, Fukushima
+8124199|Tajima, Fukushima
 81242|Aizuwakamatsu, Fukushima
 81243|Nihonmatsu, Fukushima
-81244|Nishihara, Okinawa
+81244|Hobara, Fukushima
 81245|Fukushima, Fukushima
 81246|Iwaki, Fukushima
 812472|Ishikawa, Fukushima
@@ -317,20 +318,20 @@
 812542|Shibata, Niigata
 812543|Shibata, Niigata
 812544|Shibata, Niigata
-812545|Ueno, Gunma
-812546|Ueno, Gunma
-812547|Ueno, Gunma
-8125480|Ueno, Gunma
-8125481|Ueno, Gunma
-8125482|Ueno, Gunma
-8125483|Ueno, Gunma
-8125484|Ueno, Gunma
-8125485|Nakatsugawa, Gifu
-8125486|Nakatsugawa, Gifu
-8125487|Nakatsugawa, Gifu
-8125488|Nakatsugawa, Gifu
-8125489|Nakatsugawa, Gifu
-812549|Nakatsugawa, Gifu
+812545|Murakami, Niigata
+812546|Murakami, Niigata
+812547|Murakami, Niigata
+8125480|Murakami, Niigata
+8125481|Murakami, Niigata
+8125482|Murakami, Niigata
+8125483|Murakami, Niigata
+8125484|Murakami, Niigata
+8125485|Tsugawa, Niigata
+8125486|Tsugawa, Niigata
+8125487|Tsugawa, Niigata
+8125488|Tsugawa, Niigata
+8125489|Tsugawa, Niigata
+812549|Tsugawa, Niigata
 812550|Yasuzuka, Niigata
 812551|Joetsu, Niigata
 812552|Joetsu, Niigata
@@ -347,9 +348,9 @@
 812564|Sanjo, Niigata
 812565|Sanjo, Niigata
 812566|Sanjo, Niigata
-812567|Ishinomaki, Miyagi
-812568|Ishinomaki, Miyagi
-812569|Ishinomaki, Miyagi
+812567|
+812568|
+812569|
 812570|
 812571|Muika, Niigata
 812572|Kashiwazaki, Niigata
@@ -371,23 +372,23 @@
 812589|Nagaoka, Niigata
 81259|Sado, Niigata
 81260|Anan, Nagano
-812612|Daisen, Tottori
-812613|Daisen, Tottori
-812614|Daisen, Tottori
-812615|Daisen, Tottori
-812616|Daisen, Tottori
-8126170|Daisen, Tottori
-8126171|Daisen, Tottori
-8126172|Daisen, Tottori
-8126173|Daisen, Tottori
-8126174|Daisen, Tottori
-8126175|Daisen, Tottori
-8126176|Daisen, Tottori
-8126177|Nagano, Nagano
-8126178|Daisen, Tottori
-8126179|Daisen, Tottori
-812618|Daisen, Tottori
-812619|Daisen, Tottori
+812612|Omachi, Nagano
+812613|Omachi, Nagano
+812614|Omachi, Nagano
+812615|Omachi, Nagano
+812616|Omachi, Nagano
+8126170|Omachi, Nagano
+8126171|Omachi, Nagano
+8126172|Omachi, Nagano
+8126173|Omachi, Nagano
+8126174|Omachi, Nagano
+8126175|Omachi, Nagano
+8126176|Omachi, Nagano
+8126177|
+8126178|Omachi, Nagano
+8126179|Omachi, Nagano
+812618|Omachi, Nagano
+812619|Omachi, Nagano
 81262|Nagano, Nagano
 81263|Matsumoto, Nagano
 812640|Nagano, Nagano
@@ -416,11 +417,11 @@
 812677|Saku, Nagano
 812678|Saku, Nagano
 812679|Saku, Nagano
-81268|Asahikawa, Hokkaido
-812692|Nakano, Tokyo
-812693|Nakano, Tokyo
-812694|Nakano, Tokyo
-812695|Nakano, Tokyo
+81268|Ueda, Nagano
+812692|Nakano, Nagano
+812693|Nakano, Nagano
+812694|Nakano, Nagano
+812695|Nakano, Nagano
 812696|Iiyama, Nagano
 812697|Iiyama, Nagano
 812698|Iiyama, Nagano
@@ -431,18 +432,18 @@
 812743|Fujioka, Gunma
 812744|Fujioka, Gunma
 812745|Fujioka, Gunma
-812746|Tomioka, Fukushima
-812747|Tomioka, Fukushima
-812748|Tomioka, Fukushima
+812746|Tomioka, Gunma
+812747|Tomioka, Gunma
+812748|Tomioka, Gunma
 81276|Ota, Gunma
 81277|Kiryu, Gunma
 812780|Maebashi, Gunma
-812782|Numata, Hokkaido
-812783|Numata, Hokkaido
-812784|Numata, Hokkaido
-812785|Numata, Hokkaido
-812786|Numata, Hokkaido
-812787|Numata, Hokkaido
+812782|Numata, Gunma
+812783|Numata, Gunma
+812784|Numata, Gunma
+812785|Numata, Gunma
+812786|Numata, Gunma
+812787|Numata, Gunma
 812788|Maebashi, Gunma
 812789|Maebashi, Gunma
 812792|Shibukawa, Gunma
@@ -466,14 +467,14 @@
 812838|Sano, Tochigi
 812839|Sano, Tochigi
 81284|Ashikaga, Tochigi
-812852|Oyama, Shizuoka
-812853|Oyama, Shizuoka
-812854|Oyama, Shizuoka
-812855|Oyama, Shizuoka
+812852|Oyama, Tochigi
+812853|Oyama, Tochigi
+812854|Oyama, Tochigi
+812855|Oyama, Tochigi
 812856|Mooka, Tochigi
 812857|Mooka, Tochigi
 812858|Mooka, Tochigi
-812859|Oyama, Shizuoka
+812859|Oyama, Tochigi
 81286|Utsunomiya, Tochigi
 812872|Otawara, Tochigi
 812873|Otawara, Tochigi
@@ -481,17 +482,17 @@
 812875|Otawara, Tochigi
 812876|Kuroiso, Tochigi
 812877|Kuroiso, Tochigi
-812878|
-8128790|
-8128791|
-8128792|
-8128793|
-8128794|
-8128795|
-8128796|
-8128797|
+812878|Nasukarasuyama, Tochigi
+8128790|Nasukarasuyama, Tochigi
+8128791|Nasukarasuyama, Tochigi
+8128792|Nasukarasuyama, Tochigi
+8128793|Nasukarasuyama, Tochigi
+8128794|Nasukarasuyama, Tochigi
+8128795|Nasukarasuyama, Tochigi
+8128796|Nasukarasuyama, Tochigi
+8128797|Nasukarasuyama, Tochigi
 8128798|Otawara, Tochigi
-8128799|
+8128799|Nasukarasuyama, Tochigi
 81288|Imabari, Ehime
 812890|Utsunomiya, Tochigi
 812892|Utsunomiya, Tochigi
@@ -526,10 +527,10 @@
 812965|Shimodate, Ibaraki
 812967|Kasama, Ibaraki
 812968|Kasama, Ibaraki
-812972|Shimizu, Hokkaido
-812973|Shimizu, Hokkaido
-812974|Shimizu, Hokkaido
-812975|Shimizu, Hokkaido
+812972|
+812973|
+812974|
+812975|
 812976|
 812977|
 812978|
@@ -543,7 +544,7 @@
 812997|Itako, Ibaraki
 812998|Itako, Ibaraki
 812999|Itako, Ibaraki
-813|
+813|Tokyo
 81420|Tokorozawa, Saitama
 814220|Kokubunji, Tokyo
 814222|
@@ -591,7 +592,7 @@
 81432|Chiba, Chiba
 81433|Chiba, Chiba
 81434|Chiba, Chiba
-81436|Odawara, Kanagawa
+81436|Ichihara, Chiba
 81438|Kisarazu, Chiba
 81439|Kisarazu, Chiba
 8144|Kawasaki, Kanagawa
@@ -610,12 +611,12 @@
 814703|Tateyama, Chiba
 814704|Tateyama, Chiba
 814705|Tateyama, Chiba
-814706|Ogawara, Miyagi
-814707|Ogawara, Miyagi
-814708|Ogawara, Miyagi
+814706|
+814707|
+814708|
 814709|Kamogawa, Chiba
 81471|Kashiwa, Chiba
-81473|Kyoto, Kyoto
+81473|Ichikawa, Chiba
 81474|Funabashi, Chiba
 814752|Mobara, Chiba
 814753|Mobara, Chiba
@@ -625,9 +626,9 @@
 814757|Togane, Chiba
 814758|Togane, Chiba
 81476|Narita, Chiba
-814770|Kyoto, Kyoto
-814771|Kyoto, Kyoto
-814772|Kyoto, Kyoto
+814770|Ichikawa, Chiba
+814771|Ichikawa, Chiba
+814772|Ichikawa, Chiba
 814775|Funabashi, Chiba
 814776|Funabashi, Chiba
 814777|Funabashi, Chiba
@@ -649,15 +650,15 @@
 814797|Yokaichiba, Chiba
 814798|Yokaichiba, Chiba
 81480|Kuki, Saitama
-81482|Kawaguchi, Niigata
-81484|Kawaguchi, Niigata
+81482|Kawaguchi, Saitama
+81484|Kawaguchi, Saitama
 81485|Kumagaya, Saitama
 81486|Urawa, Saitama
 81487|Urawa, Saitama
 81488|Urawa, Saitama
 81489|Soka, Saitama
-81492|Kawagoe, Mie
-81493|
+81492|Kawagoe, Saitama
+81493|Higashimatsuyama, Saitama
 81494|Chichibu, Saitama
 81495|Honjo, Saitama
 814992|
@@ -665,7 +666,7 @@
 814996|
 814998|Ogasawara, Tokyo
 8152|Nagoya, Aichi
-81531|Odawara, Kanagawa
+81531|Tahara, Aichi
 81532|Toyohashi, Aichi
 81533|Toyohashi, Aichi
 81534|Hamamatsu, Shizuoka
@@ -681,10 +682,10 @@
 815393|Hamamatsu, Shizuoka
 815394|Hamamatsu, Shizuoka
 815395|Hamamatsu, Shizuoka
-8153960|Tenryu Ward, Hamamatsu
-8153961|Tenryu Ward, Hamamatsu
-8153962|Tenryu Ward, Hamamatsu
-8153963|Tenryu Ward, Hamamatsu
+8153960|
+8153961|
+8153962|
+8153963|
 8153964|Hamamatsu, Shizuoka
 8153965|Hamamatsu, Shizuoka
 8153966|Hamamatsu, Shizuoka
@@ -695,27 +696,27 @@
 8153971|Hamamatsu, Shizuoka
 8153972|Hamamatsu, Shizuoka
 8153973|Hamamatsu, Shizuoka
-8153974|Tenryu Ward, Hamamatsu
+8153974|
 8153975|Hamamatsu, Shizuoka
 8153976|Hamamatsu, Shizuoka
-8153977|Tenryu Ward, Hamamatsu
+8153977|
 8153978|Hamamatsu, Shizuoka
 8153979|Hamamatsu, Shizuoka
 815398|Hamamatsu, Shizuoka
-815399|Tenryu Ward, Hamamatsu
-81542|Mori, Shizuoka
-81543|Mori, Shizuoka
+815399|
+81542|Shizuoka, Shizuoka
+81543|Shizuoka, Shizuoka
 81544|Fujinomiya, Shizuoka
 81545|Fuji, Shizuoka
-81546|Mori, Shizuoka
-81547|Etajima, Hiroshima
+81546|Shizuoka, Shizuoka
+81547|Shimada, Shizuoka
 81548|Haibara, Shizuoka
-81549|Mori, Shizuoka
+81549|Shizuoka, Shizuoka
 81550|Gotenba, Shizuoka
 81551|Nirasaki, Yamanashi
 81552|Kofu, Yamanashi
-81553|Nanbu, Yamanashi
-81554|Otsuki, Kochi
+81553|Yamanashi, Yamanashi
+81554|Otsuki, Yamanashi
 81555|Fujiyoshida, Yamanashi
 815562|
 815563|
@@ -723,11 +724,11 @@
 815565|
 815566|Minobu, Yamanashi
 81557|Ito, Shizuoka
-815582|Shimoda, Aomori
-815583|Shimoda, Aomori
-815584|Shimoda, Aomori
-815585|Shimoda, Aomori
-815586|Shimoda, Aomori
+815582|Shimoda, Shizuoka
+815583|Shimoda, Shizuoka
+815584|Shimoda, Shizuoka
+815585|Shimoda, Shizuoka
+815586|Shimoda, Shizuoka
 815587|
 815588|
 815589|
@@ -756,10 +757,10 @@
 815746|Minokamo, Gifu
 815747|
 815748|
-815752|Shimonoseki, Yamaguchi
-815753|Shimonoseki, Yamaguchi
-815754|Shimonoseki, Yamaguchi
-815755|Shimonoseki, Yamaguchi
+815752|Sekigahara, Gifu
+815753|Sekigahara, Gifu
+815754|Sekigahara, Gifu
+815755|Sekigahara, Gifu
 815756|
 815757|
 815758|
@@ -778,27 +779,27 @@
 81583|Gifu, Gifu
 81584|Ogaki, Gifu
 81585|Ibigawa, Gifu
-81586|Ichinomiya, Chiba
-81587|Ichinomiya, Chiba
-81591|
-81592|
+81586|Ichinomiya, Aichi
+81587|Ichinomiya, Aichi
+81591|Tsu, Mie
+81592|Tsu, Mie
 81593|Yokkaichi, Mie
 81594|Kuwana, Mie
-815952|Asahikawa, Hokkaido
-815953|Asahikawa, Hokkaido
-815954|Asahikawa, Hokkaido
-815955|Asahikawa, Hokkaido
-815956|Asahikawa, Hokkaido
-815957|Asahikawa, Hokkaido
+815952|
+815953|
+815954|
+815955|
+815956|
+815957|
 815958|Kameyama, Mie
 815959|Kameyama, Mie
 81596|Ise, Mie
 815972|Owase, Mie
 815973|Owase, Mie
 815974|Owase, Mie
-815977|Kumano, Hiroshima
-815978|Kumano, Hiroshima
-815979|Kumano, Hiroshima
+815977|Kumano, Mie
+815978|Kumano, Mie
+815979|Kumano, Mie
 815982|Matsusaka, Mie
 815983|Matsusaka, Mie
 815984|Matsusaka, Mie
@@ -813,7 +814,7 @@
 815996|Ago, Mie
 815997|Ago, Mie
 815998|Ago, Mie
-815999|
+815999| Tsu, Mie
 816|Osaka, Osaka
 81721|Tondabayashi, Osaka
 81722|Sakai, Osaka
@@ -833,7 +834,7 @@
 81727|Ikeda, Osaka
 81728|Neyagawa, Osaka
 81729|Yao, Osaka
-81734|Misato, Wakayama
+81734|Wakayama, Wakayama
 817352|Shingu, Fukuoka
 817353|Shingu, Fukuoka
 817354|Shingu, Fukuoka
@@ -886,7 +887,7 @@
 817496|Nagahama, Shiga
 817497|Nagahama, Shiga
 817498|Nagahama, Shiga
-8175|
+8175|Kyoto, Kyoto
 817612|Komatsu, Ishikawa
 817613|Komatsu, Ishikawa
 817614|Komatsu, Ishikawa
@@ -944,12 +945,12 @@
 81775|Otsu, Shiga
 81776|Fukui, Fukui
 81778|Takefu, Fukui
-81779|Ono, Fukui
+81779|Ono, Gifu
 8178|Kobe, Hyogo
-817902|Kawasaki, Fukuoka
-817903|Kawasaki, Fukuoka
-817904|Kawasaki, Fukuoka
-817905|Kawasaki, Fukuoka
+817902|Fukusaki, Hyogo
+817903|Fukusaki, Hyogo
+817904|Fukusaki, Hyogo
+817905|Fukusaki, Hyogo
 817906|
 817907|
 817908|
@@ -965,19 +966,19 @@
 817943|Kakogawa, Hyogo
 817944|Kakogawa, Hyogo
 817945|Kakogawa, Hyogo
-817946|Miki, Kagawa
-817947|Miki, Kagawa
-817948|Miki, Kagawa
+817946|Miki, Hyogo
+817947|Miki, Hyogo
+817948|Miki, Hyogo
 817949|Kakogawa, Hyogo
-817950|Omuta, Fukuoka
+817950|Sanda, Hyogo
 817952|Nishiwaki, Hyogo
 817953|Nishiwaki, Hyogo
 817954|Nishiwaki, Hyogo
-817955|Omuta, Fukuoka
-817956|Omuta, Fukuoka
+817955|Sanda, Hyogo
+817956|Sanda, Hyogo
 817957|
 817958|
-817959|Omuta, Fukuoka
+817959|Sanda, Hyogo
 817960|
 817962|Toyooka, Hyogo
 817963|Toyooka, Hyogo
@@ -1019,9 +1020,9 @@
 818263|Kake, Hiroshima
 818264|
 818265|
-818266|Chiyoda, Tokyo
-818267|Chiyoda, Tokyo
-818268|Chiyoda, Tokyo
+818266|
+818267|
+818268|
 81827|Iwakuni, Yamaguchi
 81828|Hiroshima, Hiroshima
 818290|Hiroshima, Hiroshima
@@ -1273,9 +1274,9 @@
 818836|Mima, Tokushima
 818837|
 818838|
-818842|Anan, Nagano
-818843|Anan, Nagano
-818844|Anan, Nagano
+818842|Anan, Tokushima
+818843|Anan, Tokushima
+818844|Anan, Tokushima
 818845|
 818846|
 818847|
@@ -1362,7 +1363,7 @@
 819438|Tanushimaru, Fukuoka
 81944|Setaka, Fukuoka
 81946|Amagi, Fukuoka
-81947|Asahikawa, Hokkaido
+81947|Tagawa, Fukuoka
 81948|Iizuka, Fukuoka
 81949|Nogata, Fukuoka
 81950|Hirado, Nagasaki
@@ -1370,8 +1371,8 @@
 819542|Takeo, Saga
 819543|Takeo, Saga
 819544|Takeo, Saga
-819546|Kagoshima, Kagoshima
-819547|Kagoshima, Kagoshima
+819546|Kashima, Saga
+819547|Kashima, Saga
 819552|Imari, Saga
 819553|Imari, Saga
 819554|Imari, Saga
@@ -1390,8 +1391,8 @@
 81958|Nagasaki, Nagasaki
 819592|Oseto, Nagasaki
 819593|Oseto, Nagasaki
-819594|Aridagawa, Wakayama
-819595|Aridagawa, Wakayama
+819594|
+819595|
 819596|Fukue, Nagasaki
 819597|Fukue, Nagasaki
 819598|Fukue, Nagasaki
@@ -1412,8 +1413,8 @@
 819674|
 819675|
 819676|Takamori, Kumamoto
-819677|Oyabe, Toyama
-819678|Oyabe, Toyama
+819677|
+819678|
 819679|Takamori, Kumamoto
 819682|Yamaga, Kumamoto
 819683|Yamaga, Kumamoto
@@ -1451,7 +1452,7 @@
 819787|Kunisaki, Oita
 819788|Kunisaki, Oita
 819789|Kitsuki, Oita
-81979|Nakatsugawa, Gifu
+81979|Nakatsu, Oita
 819802|Minamidaito, Okinawa
 819803|Nago, Okinawa
 819804|Nago, Okinawa
@@ -1481,7 +1482,7 @@
 81984|Kobayashi, Miyazaki
 81985|Miyazaki, Miyazaki
 81986|Miyakonojo, Miyazaki
-81987|Nichinan, Tottori
+81987|Nichinan, Miyazaki
 81988|Naha, Okinawa
 81989|Naha, Okinawa
 819912|
diff --git a/geocoding/es/54.txt b/geocoding/es/54.txt
index a9a3818..4f67cba 100644
--- a/geocoding/es/54.txt
+++ b/geocoding/es/54.txt
@@ -15,6 +15,8 @@
 # Generated from:
 # http://www.cnc.gov.ar/infotecnica/numeracion/indicativosinter.asp (2011-07-11)
 # http://en.wikipedia.org/wiki/+54 [431727225]
+# Some manual edits were made after the file was generated, according to the
+# ITU file published 2011-12-16 here: http://www.itu.int/oth/T0202000009/en
 
 5411|Ciudad Autónoma de Buenos Aires
 54220|Merlo
@@ -51,7 +53,6 @@
 542286|General Lamadrid, Buenos Aires
 542291|Miramar, Buenos Aires
 542292|Buenos Aires
-542293|Tandil, Buenos Aires
 542296|Ayacucho, Buenos Aires
 542297|Buenos Aires
 54230|Pilar, Buenos Aires
@@ -60,7 +61,6 @@
 542316|Daireaux, Buenos Aires
 542317|9 de Julio, Buenos Aires
 542320|José C. Paz
-542322|Pilar, Buenos Aires
 542323|Luján
 542324|Mercedes
 542325|San Andrés de Giles/Azcuénaga
@@ -96,9 +96,7 @@
 54260|San Rafael
 54261|Mendoza, Capital
 542622|Tunuyán, Mendoza
-542623|San Martin
 542625|General Alvear, Mendoza
-542627|San Rafael
 54263|San Martin
 54264|San Juan, Capital
 542646|Valle Fértil
@@ -124,7 +122,6 @@
 54294|San Carlos de Bariloche, Río Negro
 542940|Ingeniero Jacobacci, Río Negro
 542942|Zapala
-542944|San Carlos de Bariloche, Río Negro
 542945|Esquel, Futaleufú
 542946|Choele Choel, Río Negro
 542948|Chos Malal, Neuquén
@@ -163,7 +160,6 @@
 543447|Colón
 54345|Concordia, Entre Ríos
 543460|Santa Teresa, Santa Fe
-543461|San Nicolás de Los Arroyos, San Nicolás
 543462|Venado Tuerto, General López
 543463|Canals, Córdoba
 543464|Casilda, Santa Fe
@@ -205,12 +201,9 @@
 54362|Resistencia, San Fernando
 54364|Presidencia Roque Sáenz Pena, Chaco
 54370|Formosa
-543717|Formosa
 543718|Clorinda, Formosa
-543722|Resistencia, San Fernando
 543725|Chaco
 543731|Charata, Chacabuco
-543732|Presidencia Roque Sáenz Pena, Chaco
 543734|Machagai, Chaco
 543735|Villa Angela, Mayor Luis Fonta
 543743|Puerto Rico, Misiones
@@ -226,14 +219,11 @@
 543774|Curuzú Cuatiá, Corrientes
 543775|Monte Caseros, Corrientes
 543777|Goya, Corrientes
-543783|Corrientes, Capital
 54379|Corrientes, Capital
 54380|La Rioja
 54381|San Miguel de Tucumán, Capital
-543822|La Rioja
 543825|Chilecito, La Rioja
 54383|Catamarca
-543833|San Fernando del Valle de Catamarca, Catamarca
 543835|Andalgalá, Catamarca
 543844|Añatuya, Santiago del Estero
 54385|Santiago del Estero, Capital