JAVA/JS/CPP:libphonenumber v7.0 last changes

git-svn-id: http://libphonenumber.googlecode.com/svn/trunk/resources@715 ee073f10-1060-11df-b6a4-87a95322a99c
diff --git a/PhoneNumberMetadata.xml b/PhoneNumberMetadata.xml
index b382f3d..e3b0b3c 100644
--- a/PhoneNumberMetadata.xml
+++ b/PhoneNumberMetadata.xml
@@ -852,7 +852,7 @@
             )
           </leadingDigits>
           <!-- We exclude here several 294X four-digit area codes: 2940, 2942, 2945, 2946 and 2948,
-               2983, and several 38[3578]X four-digit area codes. -->
+               298[23], and several 38[3578]X four-digit area codes. -->
           <leadingDigits>
             9(?:
               2(?:
@@ -864,7 +864,7 @@
                 9(?:
                   [179]|
                   4[13479]|
-                  8[0-24-9]
+                  8[014-9]
                 )
               )|
               3(?:
@@ -920,7 +920,8 @@
               8[013578]
             )
           </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,
+               298[23], and several 38[3578]X four-digit area codes. -->
           <leadingDigits>
             2(?:
               2[013]|
@@ -929,8 +930,9 @@
               6[01346]|
               80|
               9(?:
-                [17-9]|
-                4[13479]
+                [179]|
+                4[13479]|
+                8[014-9]
               )
             )|
             3(?:
@@ -1494,7 +1496,8 @@
       </fixedLine>
       <mobile>
         <!-- Includes MobileSat and Thuraya satellite services. According to the wikipedia page,
-             other ranges 14[1-3] are not currently used. -->
+             other ranges 14[1-3] are not currently used. Note CC and CX should be updated as well
+             if this pattern changes. -->
         <nationalNumberPattern>
           14(?:
             5\d|
@@ -1506,7 +1509,7 @@
             4[47-9]|
             5[0-25-9]|
             6[6-9]|
-            7[0457-9]|
+            7[03-9]|
             8[17-9]|
             9[017-9]
           )\d{6}
@@ -3854,14 +3857,19 @@
       <!-- Mobile, toll free, premium rate, personal number and VOIP copied from Australia. -->
       <mobile>
         <nationalNumberPattern>
+          14(?:
+            5\d|
+            71
+          )\d{5}|
           4(?:
             [0-2]\d|
             3[0-57-9]|
             4[47-9]|
-            5[0-37-9]|
+            5[0-25-9]|
             6[6-9]|
-            7[07-9]|
-            8[7-9]
+            7[03-9]|
+            8[17-9]|
+            9[017-9]
           )\d{6}
         </nationalNumberPattern>
         <possibleNumberPattern>\d{9}</possibleNumberPattern>
@@ -4157,6 +4165,7 @@
              successfully delivered. Supported by numbers found on the internet. The prefix 56 was
              assigned to MTN in July 2013:
              http://www.atci.ci/images/stories/pdf/decisions-dg/decision_002.pdf
+             The prefix 75 is from an open-source bug report.
              50 has been removed since Warid seems to have stopped operation in Côte d'Ivoire. -->
           <nationalNumberPattern>
           (?:
@@ -4164,7 +4173,7 @@
             4[0-24-9]|
             5[4-9]|
             6[015-79]|
-            77
+            7[57]
           )\d{6}
         </nationalNumberPattern>
         <exampleNumber>01234567</exampleNumber>
@@ -5239,14 +5248,19 @@
       <!-- Mobile, toll free, premium rate, personal number and VOIP copied from Australia. -->
       <mobile>
         <nationalNumberPattern>
+          14(?:
+            5\d|
+            71
+          )\d{5}|
           4(?:
             [0-2]\d|
             3[0-57-9]|
             4[47-9]|
-            5[0-37-9]|
+            5[0-25-9]|
             6[6-9]|
-            7[07-9]|
-            8[7-9]
+            7[03-9]|
+            8[17-9]|
+            9[017-9]
           )\d{6}
         </nationalNumberPattern>
         <possibleNumberPattern>\d{9}</possibleNumberPattern>
@@ -6098,7 +6112,7 @@
       </fixedLine>
       <mobile>
         <!-- Adding 65 and 78 from numbers found online. Also, prefix 670 is added since the carrier
-             Mobilis Algeria provided it, and 54 for Nedjma. Prefixes 67[1-3] were also added for
+             Mobilis Algeria provided it, and 54 for Nedjma. Prefixes 67[1-4] were also added for
              Mobilis Algeria based on evidence found online. -->
         <nationalNumberPattern>
           (?:
@@ -6107,7 +6121,7 @@
           )\d{7}|
           6(?:
             [569]\d|
-            7[0-3]
+            7[0-4]
           )\d{6}
         </nationalNumberPattern>
         <possibleNumberPattern>\d{9}</possibleNumberPattern>
@@ -6287,20 +6301,16 @@
         <exampleNumber>8002123</exampleNumber>
       </noInternationalDialling>
       <fixedLine>
-        <!-- Supporting eFax numbers here as well. -->
         <nationalNumberPattern>
           (?:
             3[23589]|
-            4(?:
-              0\d|
-              [3-8]
-            )|
+            4[3-8]|
             6\d|
             7[1-9]|
             88
           )\d{5}
         </nationalNumberPattern>
-        <possibleNumberPattern>\d{7,8}</possibleNumberPattern>
+        <possibleNumberPattern>\d{7}</possibleNumberPattern>
         <exampleNumber>3212345</exampleNumber>
       </fixedLine>
       <mobile>
@@ -6337,8 +6347,15 @@
         <exampleNumber>80012345</exampleNumber>
       </tollFree>
       <premiumRate>
-        <nationalNumberPattern>900\d{4}</nationalNumberPattern>
-        <possibleNumberPattern>\d{7}</possibleNumberPattern>
+        <!-- Supporting eFax numbers here as well. We aren't sure the exact cost, but have
+             had user reports that they are expensive to dial. -->
+        <nationalNumberPattern>
+          (?:
+            40\d{2}|
+            900
+          )\d{4}
+        </nationalNumberPattern>
+        <possibleNumberPattern>\d{7,8}</possibleNumberPattern>
         <exampleNumber>9001234</exampleNumber>
       </premiumRate>
       <personalNumber>
@@ -10077,7 +10094,7 @@
          <numberFormat pattern="(\d{5})(\d{5})">
            <leadingDigits>
              7(?:
-               0[2-8]|
+               0[2-9]|
                2[0579]|
                3[057-9]|
                4[0-389]|
@@ -10102,8 +10119,8 @@
              7(?:
                0(?:
                  2[2-9]|
-                 [3-7]|
-                 8[0-7]
+                 [3-8]|
+                 9[0-4]
                )|
                2(?:
                  0[04-9]|
@@ -10571,8 +10588,8 @@
             7(?:
               0(?:
                 2[2-9]|
-                [3-7]\d|
-                8[0-7]
+                [3-8]\d|
+                9[0-4]
               )|
               2(?:
                 0[04-9]|
@@ -13811,10 +13828,10 @@
         <exampleNumber>7123456789</exampleNumber>
       </fixedLine>
       <mobile>
-        <!-- Added 776, apparently assigned to Beeline, and 747 for Tele2. -->
+        <!-- Added 708 for Altel, 776 for Beeline, 747 for Tele2. -->
         <nationalNumberPattern>
           7(?:
-            0[01257]|
+            0[012578]|
             47|
             6[02-4]|
             7[15-8]|
@@ -14881,7 +14898,7 @@
       <availableFormats>
         <!-- Following formatting found online rather than in the ITU document example. -->
         <numberFormat pattern="(\d{2})(\d{2})(\d{2})(\d{2})" nationalPrefixFormattingRule="$FG">
-          <leadingDigits>[89]</leadingDigits>
+          <leadingDigits>9</leadingDigits>
           <format>$1 $2 $3 $4</format>
         </numberFormat>
         <numberFormat pattern="(\d{2})(\d{3})(\d{3})">
@@ -14892,6 +14909,10 @@
           <leadingDigits>6</leadingDigits>
           <format>$1 $2 $3 $4 $5</format>
         </numberFormat>
+        <numberFormat pattern="(\d{3})(\d{3})(\d{2})" nationalPrefixFormattingRule="$FG">
+          <leadingDigits>8</leadingDigits>
+          <format>$1 $2 $3</format>
+        </numberFormat>
       </availableFormats>
       <generalDesc>
         <nationalNumberPattern>[4689]\d{7,8}</nationalNumberPattern>
@@ -14903,7 +14924,10 @@
       </noInternationalDialling>
       <fixedLine>
         <!-- Restricted to this as no numbers with the prefix of 91, 95 or 96 have been found. -->
-        <nationalNumberPattern>9[2-47-9]\d{6}</nationalNumberPattern>
+        <nationalNumberPattern>
+          870\d{5}|
+          9[2-47-9]\d{6}
+        </nationalNumberPattern>
         <possibleNumberPattern>\d{8}</possibleNumberPattern>
         <exampleNumber>99123456</exampleNumber>
       </fixedLine>
@@ -14911,17 +14935,15 @@
         <!-- 4X mobile numbers are actually used by Kosovo. -->
         <nationalNumberPattern>
           6\d{8}|
-          4\d{7}
+          4(?:
+            4\d|
+            5[2-9]
+          )\d{5}
         </nationalNumberPattern>
         <exampleNumber>612345678</exampleNumber>
       </mobile>
       <tollFree>
-        <nationalNumberPattern>
-          (?:
-            8\d|
-            90
-          )\d{6}
-        </nationalNumberPattern>
+        <nationalNumberPattern>90\d{6}</nationalNumberPattern>
         <possibleNumberPattern>\d{8}</possibleNumberPattern>
         <exampleNumber>90123456</exampleNumber>
       </tollFree>
@@ -19753,9 +19775,10 @@
       <references>
         <sourceUrl>http://www.itu.int/oth/T02020000BF/en</sourceUrl>
       </references>
-      <!-- A single group is used to format 5-digit numbers. -->
+      <!-- A single group is used to format 5-digit numbers. This formatting pattern follows
+           the guidelines in the ITU document. -->
       <availableFormats>
-        <numberFormat pattern="(\d{3})(\d{4})">
+        <numberFormat pattern="(\d{2})(\d{5})">
           <leadingDigits>[7-9]</leadingDigits>
           <format>$1 $2</format>
         </numberFormat>
@@ -19785,7 +19808,7 @@
           7(?:
             [0146-8]\d|
             5[025-9]|
-            9[04]
+            9[0124]
           )\d{4}|
           8[4-8]\d{5}|
           9(?:
@@ -21561,10 +21584,10 @@
       </fixedLine>
       <mobile>
         <!-- Adding 90 prefix as SMS messages could be successfully delivered to these mobile
-             numbers, and 501 for TCell. -->
+             numbers, and 50[12] for TCell from bug reports. -->
         <nationalNumberPattern>
           (?:
-            50[15]|
+            50[125]|
             9[0-35-9]\d
           )\d{6}
         </nationalNumberPattern>
@@ -21979,26 +22002,22 @@
               2[1-5]
             )|
             6(?:
-              07|
-              1[4-6]|
+              0[79]|
+              1[02-9]|
               2[1-9]|
-              [3-6]\d|
-              7[0-79]|
-              9[0-8]
+              [3-69]\d|
+              7[0-79]
             )|
-            82[12]
+            82[124]
           )\d{4}
         </nationalNumberPattern>
         <exampleNumber>8682211234</exampleNumber>
       </fixedLine>
       <mobile>
-        <!-- Adding 48X & 70X from the IR21 published by TSTT. 288 seems to be used based on numbers
-             found online. -->
         <nationalNumberPattern>
           868(?:
             2(?:
-              8[5-9]|
-              9\d
+              [89]\d
             )|
             3(?:
               0[1-9]|
@@ -22012,8 +22031,9 @@
               8\d
             )|
             7(?:
+              0[1-9]|
               1[02-9]|
-              [02-9]\d
+              [2-9]\d
             )
           )\d{4}
         </nationalNumberPattern>
diff --git a/ShortNumberMetadata.xml b/ShortNumberMetadata.xml
index 5516801..49010ff 100644
--- a/ShortNumberMetadata.xml
+++ b/ShortNumberMetadata.xml
@@ -5450,6 +5450,7 @@
         <nationalNumberPattern>
           1(?:
             12|
+            41|
             [578]
           )
         </nationalNumberPattern>
diff --git a/carrier/en/1.txt b/carrier/en/1.txt
index 3db9ba3..46aaf16 100644
--- a/carrier/en/1.txt
+++ b/carrier/en/1.txt
@@ -388,10 +388,7 @@
 180997|Orange
 180998|Orange
 180999|Tricom
-1868285|Digicel
-1868286|Digicel
-1868287|Digicel
-1868289|Digicel
+186828|Digicel
 186829|Digicel
 18683|Digicel
 18684|bmobile
diff --git a/carrier/en/225.txt b/carrier/en/225.txt
index 56d662e..0fa7181 100644
--- a/carrier/en/225.txt
+++ b/carrier/en/225.txt
@@ -48,4 +48,5 @@
 22566|KoZ
 22567|KoZ
 22569|Aircom
+22575|MTN
 22577|Orange
diff --git a/carrier/en/61.txt b/carrier/en/61.txt
index 4e6155c..bf1c1d1 100644
--- a/carrier/en/61.txt
+++ b/carrier/en/61.txt
@@ -33,6 +33,10 @@
 61418|Telstra
 61419|Telstra
 61420|Vodafone
+6142000|Rail Corporation NSW
+6142001|Rail Corporation NSW
+6142002|Dialogue Communications
+6142010|Pivotel Satellite
 61421|Optus
 61422|Optus
 61423|Optus
@@ -68,8 +72,10 @@
 61468|Optus
 61469|Lycamobile
 61470|Lycamobile
+61473|Telstra
 61474|Telstra
 61475|Telstra
+61476|Telstra
 61477|Telstra
 61478|Optus
 614790|Optus
@@ -77,6 +83,8 @@
 61481|Optus
 61487|Telstra
 61488|Telstra
+614888|My Number
+6148984|Victorian Rail Track
 61490|Telstra
 61491|Telstra
 61497|Telstra
diff --git a/carrier/en/677.txt b/carrier/en/677.txt
index 1dc3e50..ef126a6 100644
--- a/carrier/en/677.txt
+++ b/carrier/en/677.txt
@@ -22,6 +22,8 @@
 67777|Solomon Telekom
 67778|Solomon Telekom
 677790|Solomon Telekom
+677791|Solomon Telekom
+677792|Solomon Telekom
 677794|Solomon Telekom
 67784|BMobile
 67785|BMobile
diff --git a/carrier/en/7.txt b/carrier/en/7.txt
index a342338..f7d9e46 100644
--- a/carrier/en/7.txt
+++ b/carrier/en/7.txt
@@ -15,6 +15,8 @@
 7701|Kcell
 7702|Kcell
 7705|Beeline
+7708|Altel
+7747|Tele2
 7771|Beeline
 7775|Kcell
 7776|Beeline
diff --git a/carrier/en/91.txt b/carrier/en/91.txt
index 9dfa3ed..d71576e 100644
--- a/carrier/en/91.txt
+++ b/carrier/en/91.txt
@@ -37,21 +37,28 @@
 917070|AirTel
 917071|Dishnet Wireless
 917072|Vodafone
-917073|Bharti Hexacom
+917073|AirTel
 917074|Idea
 917075|Telewings
 917076|Vodafone
 917077|AirTel
 917078|Telewings
 917079|Idea
-917080|Airtel
+917080|AirTel
 917081|Vodafone
-917082|Airtel
+917082|AirTel
 917083|Idea
 917084|Idea
-917085|Bharti Hexacom
-917086|Airtel
-917087|Airtel
+917085|AirTel
+917086|AirTel
+917087|AirTel
+917088|Idea
+917089|Idea
+917090|Idea
+917091|AirTel
+917092|Idea
+917093|AirTel
+917094|Vodafone
 917200|TATA DOCOMO
 917204|TATA DOCOMO
 917205|TATA DOCOMO
@@ -172,7 +179,7 @@
 917697|Idea
 917698|Idea
 917699|Idea
-917702|Airtel
+917702|AirTel
 917708|AirTel
 917709|AirTel
 917735|Reliance
@@ -215,7 +222,7 @@
 917879|Reliance
 917890|Idea
 917891|Idea
-917893|Airtel
+917893|AirTel
 917894|AirTel
 917895|AirTel
 917896|AirTel
@@ -230,7 +237,7 @@
 918005|CellOne
 918006|Vodafone IN
 918007|Vodafone IN
-918008|Airtel
+918008|AirTel
 918009|AirTel
 918010|Reliance
 918011|AirTel
@@ -278,7 +285,7 @@
 918103|Reliance
 918104|SISTEMA
 918105|AirTel
-918106|Airtel
+918106|AirTel
 918107|AirTel
 918108|Idea
 918109|TATA DOCOMO
@@ -306,7 +313,7 @@
 918148|TATA DOCOMO
 918149|TATA DOCOMO
 918171|AirTel
-918179|Airtel
+918179|AirTel
 918197|AirTel
 918220|AirTel
 918233|TATA DOCOMO
@@ -352,7 +359,7 @@
 918347|Idea
 918348|VODAFONE
 918349|AirTel
-918374|Airtel
+918374|AirTel
 918390|Vodafone IN
 918400|AirTel
 918401|Uninor
@@ -456,7 +463,7 @@
 918767|Reliance
 918768|VODAFONE
 918769|AirTel
-918790|Airtel
+918790|AirTel
 918791|TATA DOCOMO
 918792|TATA DOCOMO
 918793|TATA DOCOMO
@@ -520,7 +527,7 @@
 918894|AirTel
 918895|CellOne
 918896|Aircel
-918897|Airtel
+918897|AirTel
 918898|Aircel
 918899|Reliance
 918900|CellOne
@@ -583,11 +590,11 @@
 918971|AirTel
 918972|AirTel
 918973|Aircel
-918974|Airtel
+918974|AirTel
 918975|Idea
 918976|TATA DOCOMO
 918977|TATA DOCOMO
-918978|Airtel
+918978|AirTel
 918979|AirTel
 918980|Vodafone IN
 918981|TATA DOCOMO
@@ -599,7 +606,7 @@
 918987|CellOne
 918988|CellOne
 918989|CellOne
-919000|Airtel
+919000|AirTel
 919001|AirTel
 919002|AirTel
 919003|AirTel
@@ -773,7 +780,7 @@
 919174|UNITECH
 919175|Uninor
 919176|Vodafone IN
-919177|Airtel
+919177|AirTel
 919178|AirTel
 919179|AirTel
 919180|BSNL
@@ -1125,7 +1132,7 @@
 919499|CellOne
 919500|AirTel
 919501|AirTel
-919502|Airtel
+919502|AirTel
 919503|AirTel
 919504|Aircel
 919505|Idea
@@ -1191,7 +1198,7 @@
 919547|AirTel
 919548|Reliance
 919549|Vodafone IN
-919550|Airtel
+919550|AirTel
 919551|Aircel
 919552|Idea
 919553|Idea
@@ -1214,7 +1221,7 @@
 919570|Vodafone IN
 919571|AirTel
 919572|AirTel
-919573|Airtel
+919573|AirTel
 919574|Idea
 919575|Idea
 919576|Idea
@@ -1237,7 +1244,7 @@
 919593|VODAFONE
 919594|Idea
 919595|Reliance
-919596|Airtel
+919596|AirTel
 919597|AirTel
 919598|Idea
 919599|Etisalat DB(cheers)
@@ -1253,17 +1260,17 @@
 919609|VODAFONE
 919610|Vodafone IN
 919611|AirTel
-919612|Airtel
+919612|AirTel
 919613|Aircel
 919614|Aircel
 919615|Aircel
 919616|Idea
 919617|Idea
-919618|Airtel
+919618|AirTel
 919619|Vodafone IN
 919620|Vodafone IN
 919621|AirTel
-919622|Airtel
+919622|AirTel
 919623|Idea
 919624|Idea
 919625|Reliance
@@ -1291,7 +1298,7 @@
 919649|Vodafone IN
 919650|AirTel
 919651|AirTel
-919652|Airtel
+919652|AirTel
 919653|VIDEOCON
 919654|Vodafone IN
 919655|Vodafone IN
@@ -1315,7 +1322,7 @@
 919673|Vodafone IN
 919674|Vodafone IN
 919675|Vodafone IN
-919676|Airtel
+919676|AirTel
 919677|AirTel
 919678|AirTel
 919679|AirTel
@@ -1340,10 +1347,10 @@
 919698|Aircel
 919699|Reliance
 919700|Aircel
-919701|Airtel
+919701|AirTel
 919702|Idea
 919703|Vodafone IN
-919704|Airtel
+919704|AirTel
 919705|Idea
 919706|Vodafone IN
 919707|Reliance
@@ -1436,7 +1443,7 @@
 919794|AirTel
 919795|Idea
 919796|Vodafone IN
-919797|Airtel
+919797|AirTel
 919798|Reliance
 919799|AirTel
 919800|AirTel
@@ -1487,7 +1494,7 @@
 919846|Vodafone IN
 919847|Idea
 919848|Idea
-919849|Airtel
+919849|AirTel
 919850|Idea
 919851|Aircel
 919852|Aircel
@@ -1500,11 +1507,11 @@
 919859|Aircel
 919860|AirTel
 919861|Reliance
-919862|Airtel
+919862|AirTel
 919863|Reliance
 919864|Reliance
 919865|Aircel
-919866|Airtel
+919866|AirTel
 919867|AirTel
 919868|DOLPHIN
 919869|DOLPHIN
@@ -1544,9 +1551,9 @@
 919903|AirTel
 919904|Idea
 919905|Reliance
-919906|Airtel
+919906|AirTel
 919907|Reliance
-919908|Airtel
+919908|AirTel
 919909|Vodafone IN
 919910|AirTel
 919911|Idea
@@ -1587,7 +1594,7 @@
 919946|Vodafone IN
 919947|Idea
 919948|Idea
-919949|Airtel
+919949|AirTel
 919950|AirTel
 919951|Idea
 919952|AirTel
@@ -1597,11 +1604,11 @@
 919956|AirTel
 919957|AirTel
 919958|AirTel
-919959|Airtel
+919959|AirTel
 919960|AirTel
 919961|Idea
 919962|Vodafone IN
-919963|Airtel
+919963|AirTel
 919964|Idea
 919965|Aircel
 919966|Vodafone IN
@@ -1627,7 +1634,7 @@
 919986|Vodafone IN
 919987|AirTel
 919988|Vodafone IN
-919989|Airtel
+919989|AirTel
 919990|Idea
 919991|Vodafone IN
 919992|Idea
diff --git a/carrier/en/967.txt b/carrier/en/967.txt
index 7ce7754..555db7c 100644
--- a/carrier/en/967.txt
+++ b/carrier/en/967.txt
@@ -12,7 +12,10 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-96770|SabaFon
+# Source: ITU:
+# http://www.itu.int/dms_pub/itu-t/oth/02/02/T02020000E70002PDFE.pdf
+
+96770|Y
 96771|SabaFon
-96773|Spacetel Yemen
-96777|SabaFon
+96773|MTN
+96777|Yemen Mobile
diff --git a/carrier/en/992.txt b/carrier/en/992.txt
index 61d0642..184177c 100644
--- a/carrier/en/992.txt
+++ b/carrier/en/992.txt
@@ -12,6 +12,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+992501|Tcell
+992502|Tcell
 99290|Megafon
 992917|Tacom
 992918|Babilon-M
diff --git a/geocoding/en/34.txt b/geocoding/en/34.txt
index dd5e27d..16dccdb 100644
--- a/geocoding/en/34.txt
+++ b/geocoding/en/34.txt
@@ -16,32 +16,56 @@
 
 34810|Madrid
 34820|Ávila
+34821|Segovia
 34822|Tenerife
 34823|Salamanca
+34824|Badajoz
+34825|Toledo
+34826|Ciudad Real
 34827|Cáceres
+34828|Las Palmas
+34830|Barcelona
+34841|La Rioja
 34842|Cantabria
 34843|Guipúzcoa
+34845|Araba
 34847|Burgos
 34848|Navarre
+34849|Guadalajara
 34850|Almería
+34851|Málaga
 34853|Jaén
+34854|Seville
 34856|Cádiz
+34857|Cordova
+34858|Granada
 34859|Huelva
 34860|Valencia
+34864|Castellón
+34865|Alicante
+34867|Albacete
 34868|Murcia
 34869|Cuenca
+34871|Balearic Islands
 34872|Gerona
+34873|Lleida
 34874|Huesca
 34875|Soria
 34876|Zaragoza
+34877|Tarragona
 34878|Teruel
 34879|Palencia
 34880|Zamora
 34881|La Coruña
+34882|Lugo
+34883|Valladolid
 34884|Asturias
+34886|Pontevedra
+34887|León
 34888|Ourense
 3491|Madrid
 34920|Ávila
+34921|Segovia
 34922|Tenerife
 34923|Salamanca
 34924|Badajoz
@@ -54,7 +78,7 @@
 34942|Cantabria
 34943|Guipúzcoa
 34944|Vizcaya
-34945|Álava
+34945|Araba
 34946|Vizcaya
 34947|Burgos
 34948|Navarre
@@ -66,7 +90,7 @@
 34954|Seville
 34955|Seville
 34956|Cádiz
-34957|Córdoba
+34957|Cordova
 34958|Granada
 34959|Huelva
 34960|Valencia
@@ -81,7 +105,7 @@
 34969|Cuenca
 34971|Balearic Islands
 34972|Gerona
-34973|Lérida
+34973|Lleida
 34974|Huesca
 34975|Soria
 34976|Zaragoza
diff --git a/geocoding/en/54.txt b/geocoding/en/54.txt
index 89cc6fb..a66f96f 100644
--- a/geocoding/en/54.txt
+++ b/geocoding/en/54.txt
@@ -132,7 +132,11 @@
 54297|Comodoro Rivadavia, Escalante
 542972|San Martín de los Andes
 54298|General Roca, Río Negro
-542983|Tres Arroyos
+542982|Claromeco, Buenos Aires
+54298240|Orense, Buenos Aires
+54298242|Orense, Buenos Aires
+542982497|San Francisco de Bellocq, Buenos Aires
+542983|Tres Arroyos, Buenos Aires
 54299|Neuquén, Confluencia
 543327|López Camelo, Buenos Aires
 543329|Buenos Aires Province
diff --git a/geocoding/es/34.txt b/geocoding/es/34.txt
index c0adb96..91dfdd1 100644
--- a/geocoding/es/34.txt
+++ b/geocoding/es/34.txt
@@ -17,32 +17,56 @@
 
 34810|Madrid
 34820|Ávila
+34821|Segovia
 34822|Tenerife
 34823|Salamanca
+34824|Badajoz
+34825|Toledo
+34826|Ciudad Real
 34827|Cáceres
+34828|Las Palmas
+34830|Barcelona
+34841|La Rioja
 34842|Cantabria
 34843|Guipúzcoa
+34845|Álava
 34847|Burgos
 34848|Navarra
+34849|Guadalajara
 34850|Álmería
+34851|Málaga
 34853|Jaén
+34854|Sevilla
 34856|Cádiz
+34857|Córdoba
+34858|Granada
 34859|Huelva
 34860|Valencia
+34864|Castellón
+34865|Alicante
+34867|Albacete
 34868|Murcia
 34869|Cuenca
+34871|Baleares
 34872|Gerona
+34873|Lérida
 34874|Huesca
 34875|Soria
 34876|Zaragoza
+34877|Tarragona
 34878|Teruel
 34879|Palencia
 34880|Zamora
 34881|La Coruña
+34882|Lugo
+34883|Valladolid
 34884|Asturias
+34886|Pontevedra
+34887|León
 34888|Orense
 3491|Madrid
 34920|Ávila
+34921|Segovia
 34922|Tenerife
 34923|Salamanca
 34924|Badajoz
diff --git a/geocoding/es/54.txt b/geocoding/es/54.txt
index 4f67cba..b733146 100644
--- a/geocoding/es/54.txt
+++ b/geocoding/es/54.txt
@@ -134,7 +134,11 @@
 54297|Comodoro Rivadavia, Escalante
 542972|San Martín de los Andes
 54298|General Roca, Río Negro
-542983|Tres Arroyos
+542982|Claromeco, Buenos Aires
+54298240|Orense, Buenos Aires
+54298242|Orense, Buenos Aires
+542982497|San Francisco de Bellocq, Buenos Aires
+542983|Tres Arroyos, Buenos Aires
 54299|Neuquén, Confluencia
 543327|López Camelo, Buenos Aires
 543329|Buenos Aires