From 846d48c4e9cdd0d0e4fab2b263830634aa81b002 Mon Sep 17 00:00:00 2001
From: David Drysdale <drysdale@google.com>
Date: Sun, 6 Nov 2022 07:45:53 +0000
Subject: [PATCH] Generated files for metadata

---
 python/phonenumbers/carrierdata/data0.py   | 64 +++++++++++-----------
 python/phonenumbers/carrierdata/data1.py   | 22 ++++----
 python/phonenumbers/carrierdata/data2.py   | 14 +++++
 python/phonenumbers/data/region_883.py     |  8 +--
 python/phonenumbers/data/region_BW.py      |  2 +-
 python/phonenumbers/data/region_CI.py      |  2 +-
 python/phonenumbers/data/region_CN.py      | 12 ++--
 python/phonenumbers/data/region_CY.py      |  2 +-
 python/phonenumbers/data/region_HN.py      |  2 +-
 python/phonenumbers/data/region_MA.py      |  4 +-
 python/phonenumbers/data/region_MK.py      |  2 +-
 python/phonenumbers/data/region_MV.py      |  4 +-
 python/phonenumbers/data/region_OM.py      |  2 +-
 python/phonenumbers/geodata/data10.py      | 42 +++++++-------
 python/phonenumbers/geodata/data11.py      | 42 +++++++-------
 python/phonenumbers/geodata/data12.py      | 42 +++++++-------
 python/phonenumbers/geodata/data13.py      | 42 +++++++-------
 python/phonenumbers/geodata/data14.py      | 42 +++++++-------
 python/phonenumbers/geodata/data15.py      | 42 +++++++-------
 python/phonenumbers/geodata/data16.py      | 42 +++++++-------
 python/phonenumbers/geodata/data17.py      | 42 +++++++-------
 python/phonenumbers/geodata/data18.py      | 42 +++++++-------
 python/phonenumbers/geodata/data19.py      | 42 +++++++-------
 python/phonenumbers/geodata/data20.py      | 42 +++++++-------
 python/phonenumbers/geodata/data21.py      | 42 +++++++-------
 python/phonenumbers/geodata/data22.py      | 42 +++++++-------
 python/phonenumbers/geodata/data23.py      | 42 +++++++-------
 python/phonenumbers/geodata/data24.py      | 42 +++++++-------
 python/phonenumbers/geodata/data25.py      | 42 +++++++-------
 python/phonenumbers/geodata/data26.py      | 42 +++++++-------
 python/phonenumbers/geodata/data27.py      | 42 +++++++-------
 python/phonenumbers/geodata/data28.py      | 21 +++++++
 python/phonenumbers/geodata/data6.py       | 44 +++++++--------
 python/phonenumbers/geodata/data7.py       | 42 +++++++-------
 python/phonenumbers/geodata/data8.py       | 42 +++++++-------
 python/phonenumbers/geodata/data9.py       | 42 +++++++-------
 python/phonenumbers/shortdata/region_FI.py |  2 +-
 37 files changed, 562 insertions(+), 527 deletions(-)

diff --git a/python/phonenumbers/carrierdata/data0.py b/python/phonenumbers/carrierdata/data0.py
index d59ce155a..2c414a3f3 100644
--- a/python/phonenumbers/carrierdata/data0.py
+++ b/python/phonenumbers/carrierdata/data0.py
@@ -2652,6 +2652,7 @@
  '356988':{'en': 'GO Mobile'},
  '356989':{'en': 'epic'},
  '35699':{'en': 'epic'},
+ '35791':{'en': 'Cytamobile-Vodafone'},
  '35794':{'en': 'Lemontel'},
  '35795':{'en': 'PrimeTel'},
  '35796':{'en': 'MTN'},
@@ -2711,8 +2712,25 @@
  '35989':{'en': 'Telenor'},
  '359988':{'en': 'Bob'},
  '359989':{'en': 'A1'},
- '359996':{'en': 'Bulsatcom'},
- '359999':{'en': 'MAX'},
+ '3599960':{'en': 'A1'},
+ '3599961':{'en': 'A1'},
+ '3599962':{'en': 'A1'},
+ '3599964':{'en': 'Telenor'},
+ '3599965':{'en': 'Telenor'},
+ '3599966':{'en': 'Telenor'},
+ '3599967':{'en': 'Vivacom'},
+ '3599968':{'en': 'Vivacom'},
+ '3599969':{'en': 'Vivacom'},
+ '3599990':{'en': 'A1'},
+ '3599991':{'en': 'A1'},
+ '3599992':{'en': 'A1'},
+ '3599993':{'en': 'A1'},
+ '3599994':{'en': 'Telenor'},
+ '3599995':{'en': 'Telenor'},
+ '3599996':{'en': 'Vivacom'},
+ '3599997':{'en': 'Vivacom'},
+ '3599998':{'en': 'Vivacom'},
+ '3599999':{'en': 'Vivacom'},
  '3620':{'en': 'Yettel Hungary'},
  '3630':{'en': 'Magyar Telekom'},
  '36312000':{'en': 'Netfone Telecom'},
@@ -3233,34 +3251,19 @@
  '38765':{'en': 'm:tel'},
  '38766':{'en': 'm:tel'},
  '38767':{'en': 'm:tel'},
+ '3897':{'en': 'A1'},
  '38970':{'en': 'T-Mobile'},
  '38971':{'en': 'T-Mobile'},
  '38972':{'en': 'T-Mobile'},
- '389731':{'en': 'A1'},
- '389732':{'en': 'A1'},
- '389733':{'en': 'A1'},
- '389734':{'en': 'A1'},
- '389735':{'en': 'A1'},
  '3897370':{'en': 'T-Mobile'},
  '3897371':{'en': 'T-Mobile'},
- '3897375':{'en': 'A1'},
- '3897377':{'en': 'A1'},
- '3897378':{'en': 'A1'},
  '389742':{'en': 'T-Mobile'},
  '3897421':{'en': 'Mobik'},
  '389746':{'en': 'T-Mobile'},
  '3897470':{'en': 'T-Mobile'},
  '3897471':{'en': 'T-Mobile'},
  '3897474':{'en': 'T-Mobile'},
- '3897475':{'en': 'A1'},
- '3897477':{'en': 'A1'},
  '38974774':{'en': 'Telekabel'},
- '3897478':{'en': 'A1'},
- '38975':{'en': 'A1'},
- '38976':{'en': 'A1'},
- '38977':{'en': 'A1'},
- '38978':{'en': 'A1'},
- '38979':{'en': 'A1'},
  '3897970':{'en': 'T-Mobile'},
  '3897971':{'en': 'T-Mobile'},
  '39319':{'en': 'Intermatica'},
@@ -5602,7 +5605,12 @@
  '46726006':{'en': 'Telavox AB'},
  '46726008':{'en': 'Global Telefoni Sve'},
  '4672601':{'en': 'Telavox AB'},
+ '4672603':{'en': 'Tele2 Sverige'},
+ '4672604':{'en': 'Tele2 Sverige'},
+ '4672605':{'en': 'Tele2 Sverige'},
  '4672606':{'en': 'Tele2 Sverige'},
+ '4672607':{'en': 'Tele2 Sverige'},
+ '4672608':{'en': 'Tele2 Sverige'},
  '467261':{'en': 'GLOBETOUCH AB'},
  '467262':{'en': 'GLOBETOUCH AB'},
  '467263':{'en': 'GLOBETOUCH AB'},
@@ -5747,6 +5755,7 @@
  '46734527':{'en': 'Soatso AB'},
  '46734528':{'en': 'Soatso AB'},
  '46734529':{'en': 'Soatso AB'},
+ '4673453':{'en': 'TeliaSonera'},
  '4673454':{'en': 'Tele2 Sverige'},
  '4673455':{'en': 'Viatel Sweden'},
  '4673456':{'en': 'Svea Billing System'},
@@ -6309,6 +6318,7 @@
  '474898':{'en': 'telenor norge'},
  '474899':{'en': 'telia'},
  '47591':{'en': 'telenor norge'},
+ '47596':{'en': 'ice norge'},
  '4790':{'en': 'telenor norge'},
  '479042':{'en': 'svea billing services'},
  '479043':{'en': 'svea billing services'},
@@ -6404,9 +6414,9 @@
  '479441':{'en': 'telenor norge'},
  '479442':{'en': 'telia'},
  '479443':{'en': 'telia'},
- '479444':{'en': 'telenor norge'},
- '479445':{'en': 'telenor norge'},
- '479446':{'en': 'telenor norge'},
+ '479444':{'en': 'ice norge'},
+ '479445':{'en': 'ice norge'},
+ '479446':{'en': 'ice norge'},
  '479447':{'en': 'telia'},
  '479448':{'en': 'telia'},
  '479449':{'en': 'telia'},
@@ -6526,6 +6536,7 @@
  '482115':{'en': 'Plus'},
  '48212':{'en': 'Orange'},
  '48450':{'en': 'Play'},
+ '48454':{'en': 'Orange'},
  '484590':{'en': 'Play'},
  '4845910':{'en': 'Play'},
  '4845911':{'en': 'Play'},
@@ -10008,15 +10019,4 @@
  '553199890':{'en': 'TIM'},
  '553199901':{'en': 'Telemig Celular'},
  '553199902':{'en': 'Telemig Celular'},
- '553199903':{'en': 'Telemig Celular'},
- '553199904':{'en': 'Telemig Celular'},
- '553199905':{'en': 'Telemig Celular'},
- '553199906':{'en': 'Telemig Celular'},
- '553199907':{'en': 'Telemig Celular'},
- '553199908':{'en': 'Telemig Celular'},
- '553199909':{'en': 'Telemig Celular'},
- '553199911':{'en': 'Telemig Celular'},
- '553199912':{'en': 'Telemig Celular'},
- '553199913':{'en': 'Telemig Celular'},
- '553199914':{'en': 'Telemig Celular'},
 }
diff --git a/python/phonenumbers/carrierdata/data1.py b/python/phonenumbers/carrierdata/data1.py
index a80571747..f8373dfab 100644
--- a/python/phonenumbers/carrierdata/data1.py
+++ b/python/phonenumbers/carrierdata/data1.py
@@ -19,6 +19,17 @@
 # limitations under the License.
 
 data = {
+ '553199903':{'en': 'Telemig Celular'},
+ '553199904':{'en': 'Telemig Celular'},
+ '553199905':{'en': 'Telemig Celular'},
+ '553199906':{'en': 'Telemig Celular'},
+ '553199907':{'en': 'Telemig Celular'},
+ '553199908':{'en': 'Telemig Celular'},
+ '553199909':{'en': 'Telemig Celular'},
+ '553199911':{'en': 'Telemig Celular'},
+ '553199912':{'en': 'Telemig Celular'},
+ '553199913':{'en': 'Telemig Celular'},
+ '553199914':{'en': 'Telemig Celular'},
  '553199915':{'en': 'Telemig Celular'},
  '553199916':{'en': 'Telemig Celular'},
  '553199917':{'en': 'Telemig Celular'},
@@ -10008,15 +10019,4 @@
  '573134':{'en': 'Claro'},
  '573135':{'en': 'Claro'},
  '573136':{'en': 'Claro'},
- '573137':{'en': 'Claro'},
- '573138':{'en': 'Claro'},
- '573142':{'en': 'Claro'},
- '573143':{'en': 'Claro'},
- '573144':{'en': 'Claro'},
- '573145':{'en': 'Claro'},
- '573146':{'en': 'Claro'},
- '573147':{'en': 'Claro'},
- '573148':{'en': 'Claro'},
- '57315':{'en': 'Movistar'},
- '57316':{'en': 'Movistar'},
 }
diff --git a/python/phonenumbers/carrierdata/data2.py b/python/phonenumbers/carrierdata/data2.py
index 8fc318ce3..397a2515b 100644
--- a/python/phonenumbers/carrierdata/data2.py
+++ b/python/phonenumbers/carrierdata/data2.py
@@ -19,6 +19,17 @@
 # limitations under the License.
 
 data = {
+ '573137':{'en': 'Claro'},
+ '573138':{'en': 'Claro'},
+ '573142':{'en': 'Claro'},
+ '573143':{'en': 'Claro'},
+ '573144':{'en': 'Claro'},
+ '573145':{'en': 'Claro'},
+ '573146':{'en': 'Claro'},
+ '573147':{'en': 'Claro'},
+ '573148':{'en': 'Claro'},
+ '57315':{'en': 'Movistar'},
+ '57316':{'en': 'Movistar'},
  '57317':{'en': 'Movistar'},
  '57318':{'en': 'Movistar'},
  '573192':{'en': 'Movistar'},
@@ -2275,6 +2286,8 @@
  '79010134':{'en': 'Tele2', 'ru': 'Tele2'},
  '79010135':{'en': 'Tele2', 'ru': 'Tele2'},
  '79010136':{'en': 'Tele2', 'ru': 'Tele2'},
+ '79010138':{'en': 'Multiregional Transit Telecom (MTT)', 'ru': u('\u041e\u0410\u041e \u041c\u0422\u0422')},
+ '79010139':{'en': 'Multiregional Transit Telecom (MTT)', 'ru': u('\u041e\u0410\u041e \u041c\u0422\u0422')},
  '7901014':{'en': 'Tele2', 'ru': 'Tele2'},
  '7901015':{'en': 'Tele2', 'ru': 'Tele2'},
  '7901016':{'en': 'Tele2', 'ru': 'Tele2'},
@@ -7791,6 +7804,7 @@
  '95998':{'en': 'Ooredoo'},
  '9607':{'en': 'Dhiraagu'},
  '96091':{'en': 'Ooredoo'},
+ '96092':{'en': 'Ooredoo'},
  '96093':{'en': 'Ooredoo'},
  '96094':{'en': 'Ooredoo'},
  '96095':{'en': 'Ooredoo'},
diff --git a/python/phonenumbers/data/region_883.py b/python/phonenumbers/data/region_883.py
index 05194d0d3..7c9a0c17d 100644
--- a/python/phonenumbers/data/region_883.py
+++ b/python/phonenumbers/data/region_883.py
@@ -2,9 +2,9 @@
 from ..phonemetadata import NumberFormat, PhoneNumberDesc, PhoneMetadata
 
 PHONE_METADATA_883 = PhoneMetadata(id='001', country_code=883, international_prefix=None,
-    general_desc=PhoneNumberDesc(national_number_pattern='(?:210|370\\d\\d)\\d{7}|51\\d{7}(?:\\d{3})?', possible_length=(9, 10, 12)),
-    voip=PhoneNumberDesc(national_number_pattern='(?:210|(?:370[1-9]|51[013]0)\\d)\\d{7}|5100\\d{5}', example_number='510012345', possible_length=(9, 10, 12)),
+    general_desc=PhoneNumberDesc(national_number_pattern='2\\d{9}(?:\\d{2})?|51\\d{7}|(?:370|51\\d)\\d{9}', possible_length=(9, 10, 12)),
+    voip=PhoneNumberDesc(national_number_pattern='(?:2(?:00\\d\\d|10)|(?:370[1-9]|51[013]0)\\d)\\d{7}|5100\\d{5}', example_number='510012345', possible_length=(9, 10, 12)),
     number_format=[NumberFormat(pattern='(\\d{3})(\\d{3})(\\d{3})', format='\\1 \\2 \\3', leading_digits_pattern=['510']),
-        NumberFormat(pattern='(\\d{3})(\\d{3})(\\d{4})', format='\\1 \\2 \\3', leading_digits_pattern=['2']),
+        NumberFormat(pattern='(\\d{3})(\\d{3})(\\d{4})', format='\\1 \\2 \\3', leading_digits_pattern=['21']),
         NumberFormat(pattern='(\\d{4})(\\d{4})(\\d{4})', format='\\1 \\2 \\3', leading_digits_pattern=['51[13]']),
-        NumberFormat(pattern='(\\d{3})(\\d{3})(\\d{3})(\\d{3})', format='\\1 \\2 \\3 \\4', leading_digits_pattern=['[35]'])])
+        NumberFormat(pattern='(\\d{3})(\\d{3})(\\d{3})(\\d{3})', format='\\1 \\2 \\3 \\4', leading_digits_pattern=['[235]'])])
diff --git a/python/phonenumbers/data/region_BW.py b/python/phonenumbers/data/region_BW.py
index 402523bc5..02a4c0efe 100644
--- a/python/phonenumbers/data/region_BW.py
+++ b/python/phonenumbers/data/region_BW.py
@@ -4,7 +4,7 @@
 PHONE_METADATA_BW = PhoneMetadata(id='BW', country_code=267, international_prefix='00',
     general_desc=PhoneNumberDesc(national_number_pattern='(?:0800|(?:[37]|800)\\d)\\d{6}|(?:[2-6]\\d|90)\\d{5}', possible_length=(7, 8, 10)),
     fixed_line=PhoneNumberDesc(national_number_pattern='(?:2(?:4[0-48]|6[0-24]|9[0578])|3(?:1[0-35-9]|55|[69]\\d|7[013])|4(?:6[03]|7[1267]|9[0-5])|5(?:3[03489]|4[0489]|7[1-47]|88|9[0-49])|6(?:2[1-35]|5[149]|8[067]))\\d{4}', example_number='2401234', possible_length=(7,)),
-    mobile=PhoneNumberDesc(national_number_pattern='(?:321|7(?:[1-7]\\d|8[01]))\\d{5}', example_number='71123456', possible_length=(8,)),
+    mobile=PhoneNumberDesc(national_number_pattern='(?:321|7(?:[1-7]\\d|8[0-4]))\\d{5}', example_number='71123456', possible_length=(8,)),
     toll_free=PhoneNumberDesc(national_number_pattern='(?:0800|800\\d)\\d{6}', example_number='0800012345', possible_length=(10,)),
     premium_rate=PhoneNumberDesc(national_number_pattern='90\\d{5}', example_number='9012345', possible_length=(7,)),
     voip=PhoneNumberDesc(national_number_pattern='79(?:1(?:[01]\\d|2[0-7])|2[0-7]\\d)\\d{3}', example_number='79101234', possible_length=(8,)),
diff --git a/python/phonenumbers/data/region_CI.py b/python/phonenumbers/data/region_CI.py
index eb2a13695..f46417376 100644
--- a/python/phonenumbers/data/region_CI.py
+++ b/python/phonenumbers/data/region_CI.py
@@ -4,6 +4,6 @@
 PHONE_METADATA_CI = PhoneMetadata(id='CI', country_code=225, international_prefix='00',
     general_desc=PhoneNumberDesc(national_number_pattern='[02]\\d{9}', possible_length=(10,)),
     fixed_line=PhoneNumberDesc(national_number_pattern='2(?:[15]\\d{3}|7(?:2(?:0[23]|1[2357]|2[245]|3[45]|4[3-5])|3(?:06|1[69]|[2-6]7)))\\d{5}', example_number='2123456789', possible_length=(10,)),
-    mobile=PhoneNumberDesc(national_number_pattern='0704[0-7]\\d{5}|0(?:[15]\\d\\d|7(?:0[0-37-9]|[4-9][7-9]))\\d{6}', example_number='0123456789', possible_length=(10,)),
+    mobile=PhoneNumberDesc(national_number_pattern='0[157]\\d{8}', example_number='0123456789', possible_length=(10,)),
     number_format=[NumberFormat(pattern='(\\d{2})(\\d{2})(\\d)(\\d{5})', format='\\1 \\2 \\3 \\4', leading_digits_pattern=['2']),
         NumberFormat(pattern='(\\d{2})(\\d{2})(\\d{2})(\\d{4})', format='\\1 \\2 \\3 \\4', leading_digits_pattern=['0'])])
diff --git a/python/phonenumbers/data/region_CN.py b/python/phonenumbers/data/region_CN.py
index dbd8904da..e67963b31 100644
--- a/python/phonenumbers/data/region_CN.py
+++ b/python/phonenumbers/data/region_CN.py
@@ -7,17 +7,17 @@
     mobile=PhoneNumberDesc(national_number_pattern='1740[0-5]\\d{6}|1(?:[38]\\d|4[57]|[59][0-35-9]|6[25-7]|7[0-35-8])\\d{8}', example_number='13123456789', possible_length=(11,)),
     toll_free=PhoneNumberDesc(national_number_pattern='(?:(?:10|21)8|8)00\\d{7}', example_number='8001234567', possible_length=(10, 12)),
     premium_rate=PhoneNumberDesc(national_number_pattern='16[08]\\d{5}', example_number='16812345', possible_length=(8,)),
-    shared_cost=PhoneNumberDesc(national_number_pattern='400\\d{7}|950\\d{7,8}|(?:10|2[0-57-9]|3(?:[157]\\d|35|49|9[1-68])|4(?:[17]\\d|2[179]|[35][1-9]|6[47-9]|8[23])|5(?:[1357]\\d|2[37]|4[36]|6[1-46]|80|9[1-9])|6(?:3[1-5]|6[0238]|9[12])|7(?:01|[1579]\\d|2[248]|3[014-9]|4[3-6]|6[023689])|8(?:1[236-8]|2[5-7]|[37]\\d|5[14-9]|8[36-8]|9[1-8])|9(?:0[1-3689]|1[1-79]|[379]\\d|4[13]|5[1-5]))96\\d{3,4}', example_number='4001234567', possible_length=(7, 8, 9, 10, 11), possible_length_local_only=(5, 6)),
+    shared_cost=PhoneNumberDesc(national_number_pattern='10(?:10\\d{4}|96\\d{3,4})|400\\d{7}|950\\d{7,8}|(?:2[0-57-9]|3(?:[157]\\d|35|49|9[1-68])|4(?:[17]\\d|2[179]|[35][1-9]|6[47-9]|8[23])|5(?:[1357]\\d|2[37]|4[36]|6[1-46]|80|9[1-9])|6(?:3[1-5]|6[0238]|9[12])|7(?:01|[1579]\\d|2[248]|3[014-9]|4[3-6]|6[023689])|8(?:1[236-8]|2[5-7]|[37]\\d|5[14-9]|8[36-8]|9[1-8])|9(?:0[1-3689]|1[1-79]|[379]\\d|4[13]|5[1-5]))96\\d{3,4}', example_number='4001234567', possible_length=(7, 8, 9, 10, 11), possible_length_local_only=(5, 6)),
     no_international_dialling=PhoneNumberDesc(national_number_pattern='(?:(?:10|21)8|[48])00\\d{7}|950\\d{7,8}', possible_length=(10, 11, 12)),
     preferred_international_prefix='00',
     national_prefix='0',
     national_prefix_for_parsing='0|(1(?:[12]\\d|79)\\d\\d)',
-    number_format=[NumberFormat(pattern='(\\d{5,6})', format='\\1', leading_digits_pattern=['96']),
-        NumberFormat(pattern='(\\d{2})(\\d{5,6})', format='\\1 \\2', leading_digits_pattern=['(?:10|2[0-57-9])[19]', '(?:10|2[0-57-9])(?:10|9[56])', '(?:10|2[0-57-9])(?:100|9[56])'], national_prefix_formatting_rule='0\\1', domestic_carrier_code_formatting_rule='$CC \\1'),
-        NumberFormat(pattern='(\\d{3})(\\d{4})', format='\\1 \\2', leading_digits_pattern=['[1-9]', '1[1-9]|26|[3-9]|(?:10|2[0-57-9])(?:[0-8]|9[0-47-9])', '1[1-9]|26|[3-9]|(?:10|2[0-57-9])(?:[02-8]|1(?:0[1-9]|[1-9])|9[0-47-9])']),
+    number_format=[NumberFormat(pattern='(\\d{5,6})', format='\\1', leading_digits_pattern=['10|96']),
+        NumberFormat(pattern='(\\d{2})(\\d{5,6})', format='\\1 \\2', leading_digits_pattern=['(?:10|2[0-57-9])[19]', '(?:10|2[0-57-9])(?:10|9[56])', '10(?:10|9[56])|2[0-57-9](?:100|9[56])'], national_prefix_formatting_rule='0\\1', domestic_carrier_code_formatting_rule='$CC \\1'),
+        NumberFormat(pattern='(\\d{3})(\\d{4})', format='\\1 \\2', leading_digits_pattern=['[1-9]', '1[1-9]|26|[3-9]|(?:10|2[0-57-9])(?:[0-8]|9[0-47-9])', '1(?:0(?:[0-8]|9[0-47-9])|[1-9])|2(?:[0-57-9](?:[02-8]|1(?:0[1-9]|[1-9])|9[0-47-9])|6)|[3-9]']),
         NumberFormat(pattern='(\\d{4})(\\d{4})', format='\\1 \\2', leading_digits_pattern=['16[08]']),
         NumberFormat(pattern='(\\d{3})(\\d{5,6})', format='\\1 \\2', leading_digits_pattern=['3(?:[157]|35|49|9[1-68])|4(?:[17]|2[179]|6[47-9]|8[23])|5(?:[1357]|2[37]|4[36]|6[1-46]|80)|6(?:3[1-5]|6[0238]|9[12])|7(?:01|[1579]|2[248]|3[014-9]|4[3-6]|6[023689])|8(?:1[236-8]|2[5-7]|[37]|8[36-8]|9[1-8])|9(?:0[1-3689]|1[1-79]|[379]|4[13]|5[1-5])|(?:4[35]|59|85)[1-9]', '(?:3(?:[157]\\d|35|49|9[1-68])|4(?:[17]\\d|2[179]|[35][1-9]|6[47-9]|8[23])|5(?:[1357]\\d|2[37]|4[36]|6[1-46]|80|9[1-9])|6(?:3[1-5]|6[0238]|9[12])|7(?:01|[1579]\\d|2[248]|3[014-9]|4[3-6]|6[023689])|8(?:1[236-8]|2[5-7]|[37]\\d|5[1-9]|8[36-8]|9[1-8])|9(?:0[1-3689]|1[1-79]|[379]\\d|4[13]|5[1-5]))[19]', '85[23](?:10|95)|(?:3(?:[157]\\d|35|49|9[1-68])|4(?:[17]\\d|2[179]|[35][1-9]|6[47-9]|8[23])|5(?:[1357]\\d|2[37]|4[36]|6[1-46]|80|9[1-9])|6(?:3[1-5]|6[0238]|9[12])|7(?:01|[1579]\\d|2[248]|3[014-9]|4[3-6]|6[023689])|8(?:1[236-8]|2[5-7]|[37]\\d|5[14-9]|8[36-8]|9[1-8])|9(?:0[1-3689]|1[1-79]|[379]\\d|4[13]|5[1-5]))(?:10|9[56])', '85[23](?:100|95)|(?:3(?:[157]\\d|35|49|9[1-68])|4(?:[17]\\d|2[179]|[35][1-9]|6[47-9]|8[23])|5(?:[1357]\\d|2[37]|4[36]|6[1-46]|80|9[1-9])|6(?:3[1-5]|6[0238]|9[12])|7(?:01|[1579]\\d|2[248]|3[014-9]|4[3-6]|6[023689])|8(?:1[236-8]|2[5-7]|[37]\\d|5[14-9]|8[36-8]|9[1-8])|9(?:0[1-3689]|1[1-79]|[379]\\d|4[13]|5[1-5]))(?:100|9[56])'], national_prefix_formatting_rule='0\\1', domestic_carrier_code_formatting_rule='$CC \\1'),
-        NumberFormat(pattern='(\\d{4})(\\d{4})', format='\\1 \\2', leading_digits_pattern=['[1-9]', '1[1-9]|26|[3-9]|(?:10|2[0-57-9])(?:[0-8]|9[0-47-9])', '26|3(?:[0268]|9[079])|4(?:[049]|2[02-68]|[35]0|6[0-356]|8[014-9])|5(?:0|2[0-24-689]|4[0-2457-9]|6[057-9]|90)|6(?:[0-24578]|6[14-79]|9[03-9])|7(?:0[02-9]|2[0135-79]|3[23]|4[0-27-9]|6[1457]|8)|8(?:[046]|1[01459]|2[0-489]|50|8[0-2459]|9[09])|9(?:0[0457]|1[08]|[268]|4[024-9])|(?:34|85[23])[0-8]|(?:1|58)[1-9]|(?:63|95)[06-9]|(?:33|85[23]9)[0-46-9]|(?:10|2[0-57-9]|3(?:[157]\\d|35|49|9[1-68])|4(?:[17]\\d|2[179]|[35][1-9]|6[47-9]|8[23])|5(?:[1357]\\d|2[37]|4[36]|6[1-46]|80|9[1-9])|6(?:3[1-5]|6[0238]|9[12])|7(?:01|[1579]\\d|2[248]|3[014-9]|4[3-6]|6[023689])|8(?:1[236-8]|2[5-7]|[37]\\d|5[14-9]|8[36-8]|9[1-8])|9(?:0[1-3689]|1[1-79]|[379]\\d|4[13]|5[1-5]))(?:[0-8]|9[0-47-9])', '26|3(?:[0268]|3[0-46-9]|4[0-8]|9[079])|4(?:[049]|2[02-68]|[35]0|6[0-356]|8[014-9])|5(?:0|2[0-24-689]|4[0-2457-9]|6[057-9]|90)|6(?:[0-24578]|3[06-9]|6[14-79]|9[03-9])|7(?:0[02-9]|2[0135-79]|3[23]|4[0-27-9]|6[1457]|8)|8(?:[046]|1[01459]|2[0-489]|5(?:0|[23](?:[02-8]|1[1-9]|9[0-46-9]))|8[0-2459]|9[09])|9(?:0[0457]|1[08]|[268]|4[024-9]|5[06-9])|(?:1|58|85[23]10)[1-9]|(?:10|2[0-57-9])(?:[0-8]|9[0-47-9])|(?:3(?:[157]\\d|35|49|9[1-68])|4(?:[17]\\d|2[179]|[35][1-9]|6[47-9]|8[23])|5(?:[1357]\\d|2[37]|4[36]|6[1-46]|80|9[1-9])|6(?:3[1-5]|6[0238]|9[12])|7(?:01|[1579]\\d|2[248]|3[014-9]|4[3-6]|6[023689])|8(?:1[236-8]|2[5-7]|[37]\\d|5[14-9]|8[36-8]|9[1-8])|9(?:0[1-3689]|1[1-79]|[379]\\d|4[13]|5[1-5]))(?:[02-8]|1(?:0[1-9]|[1-9])|9[0-47-9])']),
+        NumberFormat(pattern='(\\d{4})(\\d{4})', format='\\1 \\2', leading_digits_pattern=['[1-9]', '1(?:0(?:[02-8]|1[1-9]|9[0-47-9])|[1-9])|2(?:[0-57-9](?:[0-8]|9[0-47-9])|6)|[3-9]', '1(?:0(?:[02-8]|1[1-9]|9[0-47-9])|[1-9])|26|3(?:[0268]|4[0-8]|9[079])|4(?:[049]|2[02-68]|[35]0|6[0-356]|8[014-9])|5(?:0|2[0-24-689]|4[0-2457-9]|6[057-9]|8[1-9]|90)|6(?:[0-24578]|3[06-9]|6[14-79]|9[03-9])|7(?:0[02-9]|2[0135-79]|3[23]|4[0-27-9]|6[1457]|8)|8(?:[046]|1[01459]|2[0-489]|5(?:0|[23][0-8])|8[0-2459]|9[09])|9(?:0[0457]|1[08]|[268]|4[024-9]|5[06-9])|(?:33|85[23]9)[0-46-9]|(?:2[0-57-9]|3(?:[157]\\d|35|49|9[1-68])|4(?:[17]\\d|2[179]|[35][1-9]|6[47-9]|8[23])|5(?:[1357]\\d|2[37]|4[36]|6[1-46]|80|9[1-9])|6(?:3[1-5]|6[0238]|9[12])|7(?:01|[1579]\\d|2[248]|3[014-9]|4[3-6]|6[023689])|8(?:1[236-8]|2[5-7]|[37]\\d|5[14-9]|8[36-8]|9[1-8])|9(?:0[1-3689]|1[1-79]|[379]\\d|4[13]|5[1-5]))(?:[0-8]|9[0-47-9])', '1(?:0[02-8]|[1-9])|2(?:[0-57-9][0-8]|6)|3(?:[0268]|3[0-46-9]|4[0-8]|9[079])|4(?:[049]|2[02-68]|[35]0|6[0-356]|8[014-9])|5(?:0|2[0-24-689]|4[0-2457-9]|6[057-9]|90)|6(?:[0-24578]|3[06-9]|6[14-79]|9[03-9])|7(?:0[02-9]|2[0135-79]|3[23]|4[0-27-9]|6[1457]|8)|8(?:[046]|1[01459]|2[0-489]|5(?:0|[23](?:[02-8]|1[1-9]|9[0-46-9]))|8[0-2459]|9[09])|9(?:0[0457]|1[08]|[268]|4[024-9]|5[06-9])|(?:10|2[0-57-9])9[0-47-9]|(?:101|58|85[23]10)[1-9]|(?:3(?:[157]\\d|35|49|9[1-68])|4(?:[17]\\d|2[179]|[35][1-9]|6[47-9]|8[23])|5(?:[1357]\\d|2[37]|4[36]|6[1-46]|80|9[1-9])|6(?:3[1-5]|6[0238]|9[12])|7(?:01|[1579]\\d|2[248]|3[014-9]|4[3-6]|6[023689])|8(?:1[236-8]|2[5-7]|[37]\\d|5[14-9]|8[36-8]|9[1-8])|9(?:0[1-3689]|1[1-79]|[379]\\d|4[13]|5[1-5]))(?:[02-8]|1(?:0[1-9]|[1-9])|9[0-47-9])']),
         NumberFormat(pattern='(\\d{3})(\\d{3})(\\d{4})', format='\\1 \\2 \\3', leading_digits_pattern=['(?:4|80)0']),
         NumberFormat(pattern='(\\d{2})(\\d{4})(\\d{4})', format='\\1 \\2 \\3', leading_digits_pattern=['10|2(?:[02-57-9]|1[1-9])', '10|2(?:[02-57-9]|1[1-9])', '10[0-79]|2(?:[02-57-9]|1[1-79])|(?:10|21)8(?:0[1-9]|[1-9])'], national_prefix_formatting_rule='0\\1', national_prefix_optional_when_formatting=True, domestic_carrier_code_formatting_rule='$CC \\1'),
         NumberFormat(pattern='(\\d{3})(\\d{3})(\\d{4})', format='\\1 \\2 \\3', leading_digits_pattern=['3(?:[3-59]|7[02-68])|4(?:[26-8]|3[3-9]|5[2-9])|5(?:3[03-9]|[468]|7[028]|9[2-46-9])|6|7(?:[0-247]|3[04-9]|5[0-4689]|6[2368])|8(?:[1-358]|9[1-7])|9(?:[013479]|5[1-5])|(?:[34]1|55|79|87)[02-9]'], national_prefix_formatting_rule='0\\1', national_prefix_optional_when_formatting=True, domestic_carrier_code_formatting_rule='$CC \\1'),
@@ -26,7 +26,7 @@
         NumberFormat(pattern='(\\d{3})(\\d{4})(\\d{4})', format='\\1 \\2 \\3', leading_digits_pattern=['[3-578]'], national_prefix_formatting_rule='0\\1', national_prefix_optional_when_formatting=True, domestic_carrier_code_formatting_rule='$CC \\1'),
         NumberFormat(pattern='(\\d{3})(\\d{4})(\\d{4})', format='\\1 \\2 \\3', leading_digits_pattern=['1[3-9]'], domestic_carrier_code_formatting_rule='$CC \\1'),
         NumberFormat(pattern='(\\d{2})(\\d{3})(\\d{3})(\\d{4})', format='\\1 \\2 \\3 \\4', leading_digits_pattern=['[12]'], national_prefix_formatting_rule='0\\1', national_prefix_optional_when_formatting=True)],
-    intl_number_format=[NumberFormat(pattern='(\\d{2})(\\d{5,6})', format='\\1 \\2', leading_digits_pattern=['(?:10|2[0-57-9])[19]', '(?:10|2[0-57-9])(?:10|9[56])', '(?:10|2[0-57-9])(?:100|9[56])']),
+    intl_number_format=[NumberFormat(pattern='(\\d{2})(\\d{5,6})', format='\\1 \\2', leading_digits_pattern=['(?:10|2[0-57-9])[19]', '(?:10|2[0-57-9])(?:10|9[56])', '10(?:10|9[56])|2[0-57-9](?:100|9[56])']),
         NumberFormat(pattern='(\\d{3})(\\d{5,6})', format='\\1 \\2', leading_digits_pattern=['3(?:[157]|35|49|9[1-68])|4(?:[17]|2[179]|6[47-9]|8[23])|5(?:[1357]|2[37]|4[36]|6[1-46]|80)|6(?:3[1-5]|6[0238]|9[12])|7(?:01|[1579]|2[248]|3[014-9]|4[3-6]|6[023689])|8(?:1[236-8]|2[5-7]|[37]|8[36-8]|9[1-8])|9(?:0[1-3689]|1[1-79]|[379]|4[13]|5[1-5])|(?:4[35]|59|85)[1-9]', '(?:3(?:[157]\\d|35|49|9[1-68])|4(?:[17]\\d|2[179]|[35][1-9]|6[47-9]|8[23])|5(?:[1357]\\d|2[37]|4[36]|6[1-46]|80|9[1-9])|6(?:3[1-5]|6[0238]|9[12])|7(?:01|[1579]\\d|2[248]|3[014-9]|4[3-6]|6[023689])|8(?:1[236-8]|2[5-7]|[37]\\d|5[1-9]|8[36-8]|9[1-8])|9(?:0[1-3689]|1[1-79]|[379]\\d|4[13]|5[1-5]))[19]', '85[23](?:10|95)|(?:3(?:[157]\\d|35|49|9[1-68])|4(?:[17]\\d|2[179]|[35][1-9]|6[47-9]|8[23])|5(?:[1357]\\d|2[37]|4[36]|6[1-46]|80|9[1-9])|6(?:3[1-5]|6[0238]|9[12])|7(?:01|[1579]\\d|2[248]|3[014-9]|4[3-6]|6[023689])|8(?:1[236-8]|2[5-7]|[37]\\d|5[14-9]|8[36-8]|9[1-8])|9(?:0[1-3689]|1[1-79]|[379]\\d|4[13]|5[1-5]))(?:10|9[56])', '85[23](?:100|95)|(?:3(?:[157]\\d|35|49|9[1-68])|4(?:[17]\\d|2[179]|[35][1-9]|6[47-9]|8[23])|5(?:[1357]\\d|2[37]|4[36]|6[1-46]|80|9[1-9])|6(?:3[1-5]|6[0238]|9[12])|7(?:01|[1579]\\d|2[248]|3[014-9]|4[3-6]|6[023689])|8(?:1[236-8]|2[5-7]|[37]\\d|5[14-9]|8[36-8]|9[1-8])|9(?:0[1-3689]|1[1-79]|[379]\\d|4[13]|5[1-5]))(?:100|9[56])']),
         NumberFormat(pattern='(\\d{3})(\\d{3})(\\d{4})', format='\\1 \\2 \\3', leading_digits_pattern=['(?:4|80)0']),
         NumberFormat(pattern='(\\d{2})(\\d{4})(\\d{4})', format='\\1 \\2 \\3', leading_digits_pattern=['10|2(?:[02-57-9]|1[1-9])', '10|2(?:[02-57-9]|1[1-9])', '10[0-79]|2(?:[02-57-9]|1[1-79])|(?:10|21)8(?:0[1-9]|[1-9])']),
diff --git a/python/phonenumbers/data/region_CY.py b/python/phonenumbers/data/region_CY.py
index 345fe05e7..0c7232435 100644
--- a/python/phonenumbers/data/region_CY.py
+++ b/python/phonenumbers/data/region_CY.py
@@ -4,7 +4,7 @@
 PHONE_METADATA_CY = PhoneMetadata(id='CY', country_code=357, international_prefix='00',
     general_desc=PhoneNumberDesc(national_number_pattern='(?:[279]\\d|[58]0)\\d{6}', possible_length=(8,)),
     fixed_line=PhoneNumberDesc(national_number_pattern='2[2-6]\\d{6}', example_number='22345678', possible_length=(8,)),
-    mobile=PhoneNumberDesc(national_number_pattern='9[4-79]\\d{6}', example_number='96123456', possible_length=(8,)),
+    mobile=PhoneNumberDesc(national_number_pattern='9(?:10|[4-79]\\d)\\d{5}', example_number='96123456', possible_length=(8,)),
     toll_free=PhoneNumberDesc(national_number_pattern='800\\d{5}', example_number='80001234', possible_length=(8,)),
     premium_rate=PhoneNumberDesc(national_number_pattern='90[09]\\d{5}', example_number='90012345', possible_length=(8,)),
     shared_cost=PhoneNumberDesc(national_number_pattern='80[1-9]\\d{5}', example_number='80112345', possible_length=(8,)),
diff --git a/python/phonenumbers/data/region_HN.py b/python/phonenumbers/data/region_HN.py
index fd632527b..de3b343d2 100644
--- a/python/phonenumbers/data/region_HN.py
+++ b/python/phonenumbers/data/region_HN.py
@@ -3,7 +3,7 @@
 
 PHONE_METADATA_HN = PhoneMetadata(id='HN', country_code=504, international_prefix='00',
     general_desc=PhoneNumberDesc(national_number_pattern='8\\d{10}|[237-9]\\d{7}', possible_length=(8, 11)),
-    fixed_line=PhoneNumberDesc(national_number_pattern='2(?:2(?:0[0-359]|1[1-367]|[23]\\d|4[03-6]|5[57]|6[245]|7[0135689]|8[01346-9]|9[0-2])|4(?:0[78]|2[3-59]|3[13-9]|4[0-68]|5[1-35])|5(?:0[7-9]|16|4[03-5]|5\\d|6[014-6]|7[04]|80)|6(?:[056]\\d|17|2[067]|3[04]|4[0-378]|[78][0-8]|9[01])|7(?:6[46-9]|7[02-9]|8[034]|91)|8(?:79|8[0-357-9]|9[1-57-9]))\\d{4}', example_number='22123456', possible_length=(8,)),
+    fixed_line=PhoneNumberDesc(national_number_pattern='2(?:2(?:0[0-59]|1[1-9]|[23]\\d|4[02-6]|5[57]|6[245]|7[0135689]|8[01346-9]|9[0-2])|4(?:0[578]|2[3-59]|3[13-9]|4[0-68]|5[1-3589])|5(?:0[2357-9]|1[1356]|4[03-5]|5\\d|6[014-69]|7[04]|80)|6(?:[056]\\d|17|2[067]|3[047]|4[0-378]|[78][0-8]|9[01])|7(?:0[5-79]|6[46-9]|7[02-9]|8[034]|91)|8(?:79|8[0-357-9]|9[1-57-9]))\\d{4}', example_number='22123456', possible_length=(8,)),
     mobile=PhoneNumberDesc(national_number_pattern='[37-9]\\d{7}', example_number='91234567', possible_length=(8,)),
     toll_free=PhoneNumberDesc(national_number_pattern='8002\\d{7}', example_number='80021234567', possible_length=(11,)),
     no_international_dialling=PhoneNumberDesc(national_number_pattern='8002\\d{7}', possible_length=(11,)),
diff --git a/python/phonenumbers/data/region_MA.py b/python/phonenumbers/data/region_MA.py
index 6fa1ad962..a7bad3500 100644
--- a/python/phonenumbers/data/region_MA.py
+++ b/python/phonenumbers/data/region_MA.py
@@ -3,14 +3,14 @@
 
 PHONE_METADATA_MA = PhoneMetadata(id='MA', country_code=212, international_prefix='00',
     general_desc=PhoneNumberDesc(national_number_pattern='[5-8]\\d{8}', possible_length=(9,)),
-    fixed_line=PhoneNumberDesc(national_number_pattern='5(?:29(?:[189][05]|2[29]|3[01])|389[05])\\d{4}|5(?:2(?:[0-25-7]\\d|3[1-578]|4[02-46-8]|8[0235-7]|90)|3(?:[0-47]\\d|5[02-9]|6[02-8]|8[08]|9[3-9])|(?:4[067]|5[03])\\d)\\d{5}', example_number='520123456', possible_length=(9,)),
+    fixed_line=PhoneNumberDesc(national_number_pattern='5293[01]\\d{4}|5(?:2(?:[0-25-7]\\d|3[1-578]|4[02-46-8]|8[0235-7]|9[0-289])|3(?:[0-47]\\d|5[02-9]|6[02-8]|8[0189]|9[3-9])|(?:4[067]|5[03])\\d)\\d{5}', example_number='520123456', possible_length=(9,)),
     mobile=PhoneNumberDesc(national_number_pattern='(?:6(?:[0-79]\\d|8[0-247-9])|7(?:[017]\\d|2[0-2]|6[0-8]|8[0-3]))\\d{6}', example_number='650123456', possible_length=(9,)),
     toll_free=PhoneNumberDesc(national_number_pattern='80\\d{7}', example_number='801234567', possible_length=(9,)),
     premium_rate=PhoneNumberDesc(national_number_pattern='89\\d{7}', example_number='891234567', possible_length=(9,)),
     voip=PhoneNumberDesc(national_number_pattern='592(?:4[0-2]|93)\\d{4}', example_number='592401234', possible_length=(9,)),
     national_prefix='0',
     national_prefix_for_parsing='0',
-    number_format=[NumberFormat(pattern='(\\d{5})(\\d{4})', format='\\1-\\2', leading_digits_pattern=['5(?:29|38)', '5(?:29[89]|389)', '5(?:29[89]|389)0'], national_prefix_formatting_rule='0\\1'),
+    number_format=[NumberFormat(pattern='(\\d{5})(\\d{4})', format='\\1-\\2', leading_digits_pattern=['5(?:29|38)', '5(?:29[1289]|389)', '529(?:1[1-46-9]|2[013-8]|90)|5(?:298|389)[0-46-9]'], national_prefix_formatting_rule='0\\1'),
         NumberFormat(pattern='(\\d{3})(\\d{2})(\\d{2})(\\d{2})', format='\\1 \\2 \\3 \\4', leading_digits_pattern=['5[45]'], national_prefix_formatting_rule='0\\1'),
         NumberFormat(pattern='(\\d{4})(\\d{5})', format='\\1-\\2', leading_digits_pattern=['5(?:2[2-489]|3[5-9]|9)|892', '5(?:2(?:[2-49]|8[235-9])|3[5-9]|9)|892'], national_prefix_formatting_rule='0\\1'),
         NumberFormat(pattern='(\\d{2})(\\d{7})', format='\\1-\\2', leading_digits_pattern=['8'], national_prefix_formatting_rule='0\\1'),
diff --git a/python/phonenumbers/data/region_MK.py b/python/phonenumbers/data/region_MK.py
index 4ed784fcd..2598cfbe4 100644
--- a/python/phonenumbers/data/region_MK.py
+++ b/python/phonenumbers/data/region_MK.py
@@ -4,7 +4,7 @@
 PHONE_METADATA_MK = PhoneMetadata(id='MK', country_code=389, international_prefix='00',
     general_desc=PhoneNumberDesc(national_number_pattern='[2-578]\\d{7}', possible_length=(8,), possible_length_local_only=(6, 7)),
     fixed_line=PhoneNumberDesc(national_number_pattern='(?:(?:2(?:62|77)0|3444)\\d|4[56]440)\\d{3}|(?:34|4[357])700\\d{3}|(?:2(?:[0-3]\\d|5[0-578]|6[01]|82)|3(?:1[3-68]|[23][2-68]|4[23568])|4(?:[23][2-68]|4[3-68]|5[2568]|6[25-8]|7[24-68]|8[4-68]))\\d{5}', example_number='22012345', possible_length=(8,), possible_length_local_only=(6, 7)),
-    mobile=PhoneNumberDesc(national_number_pattern='7(?:3555|4747|9(?:[019]77|42[0-4]))\\d{3}|7(?:[0-25-8]\\d\\d|3(?:[1-4]\\d|7[01578])|4(?:2\\d|60|7[01578])|9(?:[23]\\d|4[01]|7[015]))\\d{4}', example_number='72345678', possible_length=(8,)),
+    mobile=PhoneNumberDesc(national_number_pattern='7(?:3555|4747|9(?:[019]77|42[0-4]))\\d{3}|7(?:[0-25-8]\\d\\d|3(?:[1-48]\\d|7[01578])|4(?:2\\d|60|7[01578])|9(?:[23]\\d|4[01]|7[015]))\\d{4}', example_number='72345678', possible_length=(8,)),
     toll_free=PhoneNumberDesc(national_number_pattern='800\\d{5}', example_number='80012345', possible_length=(8,)),
     premium_rate=PhoneNumberDesc(national_number_pattern='5\\d{7}', example_number='50012345', possible_length=(8,)),
     shared_cost=PhoneNumberDesc(national_number_pattern='8(?:0[1-9]|[1-9]\\d)\\d{5}', example_number='80123456', possible_length=(8,)),
diff --git a/python/phonenumbers/data/region_MV.py b/python/phonenumbers/data/region_MV.py
index 4bf67c036..7d3a69efd 100644
--- a/python/phonenumbers/data/region_MV.py
+++ b/python/phonenumbers/data/region_MV.py
@@ -4,10 +4,10 @@
 PHONE_METADATA_MV = PhoneMetadata(id='MV', country_code=960, international_prefix='0(?:0|19)',
     general_desc=PhoneNumberDesc(national_number_pattern='(?:800|9[0-57-9]\\d)\\d{7}|[34679]\\d{6}', possible_length=(7, 10)),
     fixed_line=PhoneNumberDesc(national_number_pattern='(?:3(?:0[0-3]|3[0-59])|6(?:[58][024689]|6[024-68]|7[02468]))\\d{4}', example_number='6701234', possible_length=(7,)),
-    mobile=PhoneNumberDesc(national_number_pattern='46[46]\\d{4}|(?:7\\d|9[13-9])\\d{5}', example_number='7712345', possible_length=(7,)),
+    mobile=PhoneNumberDesc(national_number_pattern='46[46]\\d{4}|(?:7\\d|9[1-9])\\d{5}', example_number='7712345', possible_length=(7,)),
     toll_free=PhoneNumberDesc(national_number_pattern='800\\d{7}', example_number='8001234567', possible_length=(10,)),
     premium_rate=PhoneNumberDesc(national_number_pattern='900\\d{7}', example_number='9001234567', possible_length=(10,)),
     uan=PhoneNumberDesc(national_number_pattern='4(?:0[01]|50)\\d{4}', example_number='4001234', possible_length=(7,)),
     preferred_international_prefix='00',
-    number_format=[NumberFormat(pattern='(\\d{3})(\\d{4})', format='\\1-\\2', leading_digits_pattern=['[3467]|9[13-9]']),
+    number_format=[NumberFormat(pattern='(\\d{3})(\\d{4})', format='\\1-\\2', leading_digits_pattern=['[3467]|9[1-9]']),
         NumberFormat(pattern='(\\d{3})(\\d{3})(\\d{4})', format='\\1 \\2 \\3', leading_digits_pattern=['[89]'])])
diff --git a/python/phonenumbers/data/region_OM.py b/python/phonenumbers/data/region_OM.py
index d6a3bdabd..10b75fe49 100644
--- a/python/phonenumbers/data/region_OM.py
+++ b/python/phonenumbers/data/region_OM.py
@@ -4,7 +4,7 @@
 PHONE_METADATA_OM = PhoneMetadata(id='OM', country_code=968, international_prefix='00',
     general_desc=PhoneNumberDesc(national_number_pattern='(?:1505|[279]\\d{3}|500)\\d{4}|800\\d{5,6}', possible_length=(7, 8, 9)),
     fixed_line=PhoneNumberDesc(national_number_pattern='2[2-6]\\d{6}', example_number='23123456', possible_length=(8,)),
-    mobile=PhoneNumberDesc(national_number_pattern='1505\\d{4}|(?:7(?:[1289]\\d|7[0-4])|9(?:0[1-9]|[1-9]\\d))\\d{5}', example_number='92123456', possible_length=(8,)),
+    mobile=PhoneNumberDesc(national_number_pattern='1505\\d{4}|(?:7(?:[1289]\\d|7[0-5])|9(?:0[1-9]|[1-9]\\d))\\d{5}', example_number='92123456', possible_length=(8,)),
     toll_free=PhoneNumberDesc(national_number_pattern='8007\\d{4,5}|(?:500|800[05])\\d{4}', example_number='80071234', possible_length=(7, 8, 9)),
     premium_rate=PhoneNumberDesc(national_number_pattern='900\\d{5}', example_number='90012345', possible_length=(8,)),
     number_format=[NumberFormat(pattern='(\\d{3})(\\d{4,6})', format='\\1 \\2', leading_digits_pattern=['[58]']),
diff --git a/python/phonenumbers/geodata/data10.py b/python/phonenumbers/geodata/data10.py
index a93b364b4..867eca0b2 100644
--- a/python/phonenumbers/geodata/data10.py
+++ b/python/phonenumbers/geodata/data10.py
@@ -19,6 +19,27 @@
 # limitations under the License.
 
 data = {
+ '61348118':{'en': 'Tongala'},
+ '61348119':{'en': 'Undera'},
+ '6134812':{'en': 'Shepparton'},
+ '61348120':{'en': 'Wakool'},
+ '61348130':{'en': 'Shepparton'},
+ '61348131':{'en': 'Wanganella'},
+ '61348132':{'en': 'Yalca'},
+ '61348133':{'en': 'Tongala'},
+ '61348134':{'en': 'Tongala'},
+ '61348135':{'en': 'Tongala'},
+ '61348136':{'en': 'Tocumwal'},
+ '61348137':{'en': 'Tocumwal'},
+ '61348138':{'en': 'Tocumwal'},
+ '61348139':{'en': 'Berrigan'},
+ '61348140':{'en': 'Blighty'},
+ '61348141':{'en': 'Brassi'},
+ '61348142':{'en': 'Caldwell'},
+ '61348143':{'en': 'Cobram'},
+ '61348144':{'en': 'Conargo'},
+ '61348145':{'en': 'Cornalla'},
+ '61348146':{'en': 'Deniliquin'},
  '61348147':{'en': 'Dookie'},
  '61348148':{'en': 'Finley'},
  '61348149':{'en': 'Jerilderie'},
@@ -9998,25 +10019,4 @@
  '61391012':{'en': 'Melbourne'},
  '61391013':{'en': 'Melbourne'},
  '61391014':{'en': 'Melbourne'},
- '61391015':{'en': 'Melbourne'},
- '61391016':{'en': 'Melbourne'},
- '61391017':{'en': 'Melbourne'},
- '61391018':{'en': 'Melbourne'},
- '61391019':{'en': 'Melbourne'},
- '6139102':{'en': 'Melbourne'},
- '61391030':{'en': 'Melbourne'},
- '61391031':{'en': 'Melbourne'},
- '61391032':{'en': 'Melbourne'},
- '61391058':{'en': 'Melbourne'},
- '61391059':{'en': 'Melbourne'},
- '6139106':{'en': 'Melbourne'},
- '6139107':{'en': 'Melbourne'},
- '6139108':{'en': 'Melbourne'},
- '6139109':{'en': 'Melbourne'},
- '6139110':{'en': 'Melbourne'},
- '6139130':{'en': 'Melbourne'},
- '6139131':{'en': 'Melbourne'},
- '6139132':{'en': 'Melbourne'},
- '6139133':{'en': 'Melbourne'},
- '6139134':{'en': 'Melbourne'},
 }
diff --git a/python/phonenumbers/geodata/data11.py b/python/phonenumbers/geodata/data11.py
index 5866fa313..cd11887da 100644
--- a/python/phonenumbers/geodata/data11.py
+++ b/python/phonenumbers/geodata/data11.py
@@ -19,6 +19,27 @@
 # limitations under the License.
 
 data = {
+ '61391015':{'en': 'Melbourne'},
+ '61391016':{'en': 'Melbourne'},
+ '61391017':{'en': 'Melbourne'},
+ '61391018':{'en': 'Melbourne'},
+ '61391019':{'en': 'Melbourne'},
+ '6139102':{'en': 'Melbourne'},
+ '61391030':{'en': 'Melbourne'},
+ '61391031':{'en': 'Melbourne'},
+ '61391032':{'en': 'Melbourne'},
+ '61391058':{'en': 'Melbourne'},
+ '61391059':{'en': 'Melbourne'},
+ '6139106':{'en': 'Melbourne'},
+ '6139107':{'en': 'Melbourne'},
+ '6139108':{'en': 'Melbourne'},
+ '6139109':{'en': 'Melbourne'},
+ '6139110':{'en': 'Melbourne'},
+ '6139130':{'en': 'Melbourne'},
+ '6139131':{'en': 'Melbourne'},
+ '6139132':{'en': 'Melbourne'},
+ '6139133':{'en': 'Melbourne'},
+ '6139134':{'en': 'Melbourne'},
  '6139135':{'en': 'Melbourne'},
  '6139136':{'en': 'Melbourne'},
  '61391735':{'en': 'Melbourne'},
@@ -9998,25 +10019,4 @@
  '61749750':{'en': 'Benaraby'},
  '61749751':{'en': 'Mount Larcom'},
  '61749752':{'en': 'Gladstone'},
- '61749753':{'en': 'Mount Larcom'},
- '6174976':{'en': 'Gladstone'},
- '61749770':{'en': 'Cannon Valley'},
- '61749771':{'en': 'Yeppoon'},
- '61749772':{'en': 'Byfield'},
- '61749773':{'en': 'Byfield'},
- '61749774':{'en': 'Rockhampton'},
- '61749775':{'en': 'Mackay'},
- '61749776':{'en': 'Gladstone'},
- '61749777':{'en': 'Gladstone'},
- '61749778':{'en': 'Gladstone'},
- '61749779':{'en': 'Gladstone'},
- '6174980':{'en': 'Emerald'},
- '61749801':{'en': 'Blackwater'},
- '61749802':{'en': 'Clermont'},
- '61749805':{'en': 'Blackwater'},
- '61749810':{'en': 'Gemfields'},
- '61749811':{'en': 'Gemfields'},
- '61749812':{'en': 'Middlemount'},
- '61749813':{'en': 'Middlemount'},
- '61749814':{'en': 'Springsure'},
 }
diff --git a/python/phonenumbers/geodata/data12.py b/python/phonenumbers/geodata/data12.py
index b763a8fae..38294bc90 100644
--- a/python/phonenumbers/geodata/data12.py
+++ b/python/phonenumbers/geodata/data12.py
@@ -19,6 +19,27 @@
 # limitations under the License.
 
 data = {
+ '61749753':{'en': 'Mount Larcom'},
+ '6174976':{'en': 'Gladstone'},
+ '61749770':{'en': 'Cannon Valley'},
+ '61749771':{'en': 'Yeppoon'},
+ '61749772':{'en': 'Byfield'},
+ '61749773':{'en': 'Byfield'},
+ '61749774':{'en': 'Rockhampton'},
+ '61749775':{'en': 'Mackay'},
+ '61749776':{'en': 'Gladstone'},
+ '61749777':{'en': 'Gladstone'},
+ '61749778':{'en': 'Gladstone'},
+ '61749779':{'en': 'Gladstone'},
+ '6174980':{'en': 'Emerald'},
+ '61749801':{'en': 'Blackwater'},
+ '61749802':{'en': 'Clermont'},
+ '61749805':{'en': 'Blackwater'},
+ '61749810':{'en': 'Gemfields'},
+ '61749811':{'en': 'Gemfields'},
+ '61749812':{'en': 'Middlemount'},
+ '61749813':{'en': 'Middlemount'},
+ '61749814':{'en': 'Springsure'},
  '61749815':{'en': 'Springsure'},
  '61749816':{'en': 'Tieri'},
  '61749817':{'en': 'Tieri'},
@@ -9998,25 +10019,4 @@
  '618854910':{'en': 'Strathalbyn'},
  '618854911':{'en': 'Strathalbyn'},
  '618854912':{'en': 'Strathalbyn'},
- '618854913':{'en': 'Strathalbyn'},
- '618854916':{'en': 'Strathalbyn'},
- '618854917':{'en': 'Strathalbyn'},
- '618854918':{'en': 'Strathalbyn'},
- '618854919':{'en': 'Strathalbyn'},
- '618854920':{'en': 'Bow Hill'},
- '618854921':{'en': 'Bow Hill'},
- '618854922':{'en': 'Bow Hill'},
- '618854923':{'en': 'Bow Hill'},
- '618854924':{'en': 'Bow Hill'},
- '618854925':{'en': 'Bow Hill'},
- '618854926':{'en': 'Bow Hill'},
- '618854927':{'en': 'Bow Hill'},
- '618854928':{'en': 'Bow Hill'},
- '618854930':{'en': 'Bower'},
- '618854931':{'en': 'Bower'},
- '618854932':{'en': 'Bower'},
- '618854933':{'en': 'Bower'},
- '618854934':{'en': 'Bower'},
- '618854935':{'en': 'Bower'},
- '618854936':{'en': 'Bower'},
 }
diff --git a/python/phonenumbers/geodata/data13.py b/python/phonenumbers/geodata/data13.py
index d49544118..8931206bf 100644
--- a/python/phonenumbers/geodata/data13.py
+++ b/python/phonenumbers/geodata/data13.py
@@ -19,6 +19,27 @@
 # limitations under the License.
 
 data = {
+ '618854913':{'en': 'Strathalbyn'},
+ '618854916':{'en': 'Strathalbyn'},
+ '618854917':{'en': 'Strathalbyn'},
+ '618854918':{'en': 'Strathalbyn'},
+ '618854919':{'en': 'Strathalbyn'},
+ '618854920':{'en': 'Bow Hill'},
+ '618854921':{'en': 'Bow Hill'},
+ '618854922':{'en': 'Bow Hill'},
+ '618854923':{'en': 'Bow Hill'},
+ '618854924':{'en': 'Bow Hill'},
+ '618854925':{'en': 'Bow Hill'},
+ '618854926':{'en': 'Bow Hill'},
+ '618854927':{'en': 'Bow Hill'},
+ '618854928':{'en': 'Bow Hill'},
+ '618854930':{'en': 'Bower'},
+ '618854931':{'en': 'Bower'},
+ '618854932':{'en': 'Bower'},
+ '618854933':{'en': 'Bower'},
+ '618854934':{'en': 'Bower'},
+ '618854935':{'en': 'Bower'},
+ '618854936':{'en': 'Bower'},
  '618854937':{'en': 'Bower'},
  '618854938':{'en': 'Bower'},
  '618854940':{'en': 'Eudunda'},
@@ -9998,25 +10019,4 @@
  '618989368':{'en': 'Dongolocking'},
  '618989370':{'en': 'Dumbleyung'},
  '618989371':{'en': 'Dumbleyung'},
- '618989372':{'en': 'Dumbleyung'},
- '618989373':{'en': 'Dumbleyung'},
- '618989374':{'en': 'Dumbleyung'},
- '618989375':{'en': 'Dumbleyung'},
- '618989376':{'en': 'Dumbleyung'},
- '618989377':{'en': 'Dumbleyung'},
- '618989378':{'en': 'Dumbleyung'},
- '618989380':{'en': 'Holland Rocks'},
- '618989383':{'en': 'Holland Rocks'},
- '618989386':{'en': 'Holland Rocks'},
- '618989387':{'en': 'Holland Rocks'},
- '618989388':{'en': 'Holland Rocks'},
- '618989390':{'en': 'Jaloran'},
- '618989393':{'en': 'Jaloran'},
- '618989396':{'en': 'Jaloran'},
- '618989397':{'en': 'Jaloran'},
- '618989398':{'en': 'Jaloran'},
- '61898940':{'en': 'Kondinin'},
- '61898941':{'en': 'Kondinin'},
- '61898942':{'en': 'Mount Barker'},
- '61898943':{'en': 'Mount Barker'},
 }
diff --git a/python/phonenumbers/geodata/data14.py b/python/phonenumbers/geodata/data14.py
index 01bdc6b5d..75060d723 100644
--- a/python/phonenumbers/geodata/data14.py
+++ b/python/phonenumbers/geodata/data14.py
@@ -19,6 +19,27 @@
 # limitations under the License.
 
 data = {
+ '618989372':{'en': 'Dumbleyung'},
+ '618989373':{'en': 'Dumbleyung'},
+ '618989374':{'en': 'Dumbleyung'},
+ '618989375':{'en': 'Dumbleyung'},
+ '618989376':{'en': 'Dumbleyung'},
+ '618989377':{'en': 'Dumbleyung'},
+ '618989378':{'en': 'Dumbleyung'},
+ '618989380':{'en': 'Holland Rocks'},
+ '618989383':{'en': 'Holland Rocks'},
+ '618989386':{'en': 'Holland Rocks'},
+ '618989387':{'en': 'Holland Rocks'},
+ '618989388':{'en': 'Holland Rocks'},
+ '618989390':{'en': 'Jaloran'},
+ '618989393':{'en': 'Jaloran'},
+ '618989396':{'en': 'Jaloran'},
+ '618989397':{'en': 'Jaloran'},
+ '618989398':{'en': 'Jaloran'},
+ '61898940':{'en': 'Kondinin'},
+ '61898941':{'en': 'Kondinin'},
+ '61898942':{'en': 'Mount Barker'},
+ '61898943':{'en': 'Mount Barker'},
  '61898944':{'en': 'Porongurup'},
  '61898945':{'en': 'Porongurup'},
  '61898946':{'en': 'Boscabel'},
@@ -9998,25 +10019,4 @@
  '861306245':{'en': 'Longyan, Fujian', 'zh': u('\u798f\u5efa\u7701\u9f99\u5ca9\u5e02')},
  '861306246':{'en': 'Ningde, Fujian', 'zh': u('\u798f\u5efa\u7701\u5b81\u5fb7\u5e02')},
  '861306247':{'en': 'Nanping, Fujian', 'zh': u('\u798f\u5efa\u7701\u5357\u5e73\u5e02')},
- '861306248':{'en': 'Sanming, Fujian', 'zh': u('\u798f\u5efa\u7701\u4e09\u660e\u5e02')},
- '861306249':{'en': 'Sanming, Fujian', 'zh': u('\u798f\u5efa\u7701\u4e09\u660e\u5e02')},
- '86130625':{'en': 'Nanjing, Jiangsu', 'zh': u('\u6c5f\u82cf\u7701\u5357\u4eac\u5e02')},
- '86130626':{'en': 'Shanghai', 'zh': u('\u4e0a\u6d77\u5e02')},
- '86130627':{'en': 'Shanghai', 'zh': u('\u4e0a\u6d77\u5e02')},
- '86130628':{'en': 'Shanghai', 'zh': u('\u4e0a\u6d77\u5e02')},
- '861306290':{'en': 'Zhenjiang, Jiangsu', 'zh': u('\u6c5f\u82cf\u7701\u9547\u6c5f\u5e02')},
- '861306291':{'en': 'Zhenjiang, Jiangsu', 'zh': u('\u6c5f\u82cf\u7701\u9547\u6c5f\u5e02')},
- '861306292':{'en': 'Zhenjiang, Jiangsu', 'zh': u('\u6c5f\u82cf\u7701\u9547\u6c5f\u5e02')},
- '861306293':{'en': 'Zhenjiang, Jiangsu', 'zh': u('\u6c5f\u82cf\u7701\u9547\u6c5f\u5e02')},
- '861306294':{'en': 'Zhenjiang, Jiangsu', 'zh': u('\u6c5f\u82cf\u7701\u9547\u6c5f\u5e02')},
- '861306295':{'en': 'Taizhou, Jiangsu', 'zh': u('\u6c5f\u82cf\u7701\u6cf0\u5dde\u5e02')},
- '861306296':{'en': 'Taizhou, Jiangsu', 'zh': u('\u6c5f\u82cf\u7701\u6cf0\u5dde\u5e02')},
- '861306297':{'en': 'Taizhou, Jiangsu', 'zh': u('\u6c5f\u82cf\u7701\u6cf0\u5dde\u5e02')},
- '861306298':{'en': 'Taizhou, Jiangsu', 'zh': u('\u6c5f\u82cf\u7701\u6cf0\u5dde\u5e02')},
- '861306299':{'en': 'Taizhou, Jiangsu', 'zh': u('\u6c5f\u82cf\u7701\u6cf0\u5dde\u5e02')},
- '86130630':{'en': 'Xiamen, Fujian', 'zh': u('\u798f\u5efa\u7701\u53a6\u95e8\u5e02')},
- '861306300':{'en': 'Zhangzhou, Fujian', 'zh': u('\u798f\u5efa\u7701\u6f33\u5dde\u5e02')},
- '861306301':{'en': 'Zhangzhou, Fujian', 'zh': u('\u798f\u5efa\u7701\u6f33\u5dde\u5e02')},
- '861306302':{'en': 'Zhangzhou, Fujian', 'zh': u('\u798f\u5efa\u7701\u6f33\u5dde\u5e02')},
- '86130631':{'en': 'Zhangzhou, Fujian', 'zh': u('\u798f\u5efa\u7701\u6f33\u5dde\u5e02')},
 }
diff --git a/python/phonenumbers/geodata/data15.py b/python/phonenumbers/geodata/data15.py
index 01d6cf984..6d34f3f71 100644
--- a/python/phonenumbers/geodata/data15.py
+++ b/python/phonenumbers/geodata/data15.py
@@ -19,6 +19,27 @@
 # limitations under the License.
 
 data = {
+ '861306248':{'en': 'Sanming, Fujian', 'zh': u('\u798f\u5efa\u7701\u4e09\u660e\u5e02')},
+ '861306249':{'en': 'Sanming, Fujian', 'zh': u('\u798f\u5efa\u7701\u4e09\u660e\u5e02')},
+ '86130625':{'en': 'Nanjing, Jiangsu', 'zh': u('\u6c5f\u82cf\u7701\u5357\u4eac\u5e02')},
+ '86130626':{'en': 'Shanghai', 'zh': u('\u4e0a\u6d77\u5e02')},
+ '86130627':{'en': 'Shanghai', 'zh': u('\u4e0a\u6d77\u5e02')},
+ '86130628':{'en': 'Shanghai', 'zh': u('\u4e0a\u6d77\u5e02')},
+ '861306290':{'en': 'Zhenjiang, Jiangsu', 'zh': u('\u6c5f\u82cf\u7701\u9547\u6c5f\u5e02')},
+ '861306291':{'en': 'Zhenjiang, Jiangsu', 'zh': u('\u6c5f\u82cf\u7701\u9547\u6c5f\u5e02')},
+ '861306292':{'en': 'Zhenjiang, Jiangsu', 'zh': u('\u6c5f\u82cf\u7701\u9547\u6c5f\u5e02')},
+ '861306293':{'en': 'Zhenjiang, Jiangsu', 'zh': u('\u6c5f\u82cf\u7701\u9547\u6c5f\u5e02')},
+ '861306294':{'en': 'Zhenjiang, Jiangsu', 'zh': u('\u6c5f\u82cf\u7701\u9547\u6c5f\u5e02')},
+ '861306295':{'en': 'Taizhou, Jiangsu', 'zh': u('\u6c5f\u82cf\u7701\u6cf0\u5dde\u5e02')},
+ '861306296':{'en': 'Taizhou, Jiangsu', 'zh': u('\u6c5f\u82cf\u7701\u6cf0\u5dde\u5e02')},
+ '861306297':{'en': 'Taizhou, Jiangsu', 'zh': u('\u6c5f\u82cf\u7701\u6cf0\u5dde\u5e02')},
+ '861306298':{'en': 'Taizhou, Jiangsu', 'zh': u('\u6c5f\u82cf\u7701\u6cf0\u5dde\u5e02')},
+ '861306299':{'en': 'Taizhou, Jiangsu', 'zh': u('\u6c5f\u82cf\u7701\u6cf0\u5dde\u5e02')},
+ '86130630':{'en': 'Xiamen, Fujian', 'zh': u('\u798f\u5efa\u7701\u53a6\u95e8\u5e02')},
+ '861306300':{'en': 'Zhangzhou, Fujian', 'zh': u('\u798f\u5efa\u7701\u6f33\u5dde\u5e02')},
+ '861306301':{'en': 'Zhangzhou, Fujian', 'zh': u('\u798f\u5efa\u7701\u6f33\u5dde\u5e02')},
+ '861306302':{'en': 'Zhangzhou, Fujian', 'zh': u('\u798f\u5efa\u7701\u6f33\u5dde\u5e02')},
+ '86130631':{'en': 'Zhangzhou, Fujian', 'zh': u('\u798f\u5efa\u7701\u6f33\u5dde\u5e02')},
  '861306320':{'en': 'MaAnshan, Anhui', 'zh': u('\u5b89\u5fbd\u7701\u9a6c\u978d\u5c71\u5e02')},
  '861306321':{'en': 'Hefei, Anhui', 'zh': u('\u5b89\u5fbd\u7701\u5408\u80a5\u5e02')},
  '861306322':{'en': 'Huangshan, Anhui', 'zh': u('\u5b89\u5fbd\u7701\u9ec4\u5c71\u5e02')},
@@ -9998,25 +10019,4 @@
  '861323560':{'en': 'Jingzhou, Hubei', 'zh': u('\u6e56\u5317\u7701\u8346\u5dde\u5e02')},
  '861323561':{'en': 'Jingzhou, Hubei', 'zh': u('\u6e56\u5317\u7701\u8346\u5dde\u5e02')},
  '861323562':{'en': 'Yichang, Hubei', 'zh': u('\u6e56\u5317\u7701\u5b9c\u660c\u5e02')},
- '861323563':{'en': 'Yichang, Hubei', 'zh': u('\u6e56\u5317\u7701\u5b9c\u660c\u5e02')},
- '861323564':{'en': 'Jingmen, Hubei', 'zh': u('\u6e56\u5317\u7701\u8346\u95e8\u5e02')},
- '861323565':{'en': 'Shiyan, Hubei', 'zh': u('\u6e56\u5317\u7701\u5341\u5830\u5e02')},
- '861323566':{'en': 'Shiyan, Hubei', 'zh': u('\u6e56\u5317\u7701\u5341\u5830\u5e02')},
- '861323567':{'en': 'Shiyan, Hubei', 'zh': u('\u6e56\u5317\u7701\u5341\u5830\u5e02')},
- '861323568':{'en': 'Xiangfan, Hubei', 'zh': u('\u6e56\u5317\u7701\u8944\u6a0a\u5e02')},
- '861323569':{'en': 'Xiangfan, Hubei', 'zh': u('\u6e56\u5317\u7701\u8944\u6a0a\u5e02')},
- '861323570':{'en': 'Quzhou, Zhejiang', 'zh': u('\u6d59\u6c5f\u7701\u8862\u5dde\u5e02')},
- '861323571':{'en': 'Hangzhou, Zhejiang', 'zh': u('\u6d59\u6c5f\u7701\u676d\u5dde\u5e02')},
- '861323572':{'en': 'Huzhou, Zhejiang', 'zh': u('\u6d59\u6c5f\u7701\u6e56\u5dde\u5e02')},
- '861323573':{'en': 'Jiaxing, Zhejiang', 'zh': u('\u6d59\u6c5f\u7701\u5609\u5174\u5e02')},
- '861323574':{'en': 'Ningbo, Zhejiang', 'zh': u('\u6d59\u6c5f\u7701\u5b81\u6ce2\u5e02')},
- '861323575':{'en': 'Shaoxing, Zhejiang', 'zh': u('\u6d59\u6c5f\u7701\u7ecd\u5174\u5e02')},
- '861323576':{'en': 'Taizhou, Zhejiang', 'zh': u('\u6d59\u6c5f\u7701\u53f0\u5dde\u5e02')},
- '861323577':{'en': 'Wenzhou, Zhejiang', 'zh': u('\u6d59\u6c5f\u7701\u6e29\u5dde\u5e02')},
- '861323578':{'en': 'Lishui, Zhejiang', 'zh': u('\u6d59\u6c5f\u7701\u4e3d\u6c34\u5e02')},
- '861323579':{'en': 'Jinhua, Zhejiang', 'zh': u('\u6d59\u6c5f\u7701\u91d1\u534e\u5e02')},
- '861323580':{'en': 'Zhoushan, Zhejiang', 'zh': u('\u6d59\u6c5f\u7701\u821f\u5c71\u5e02')},
- '861323581':{'en': 'Hangzhou, Zhejiang', 'zh': u('\u6d59\u6c5f\u7701\u676d\u5dde\u5e02')},
- '861323582':{'en': 'Huzhou, Zhejiang', 'zh': u('\u6d59\u6c5f\u7701\u6e56\u5dde\u5e02')},
- '861323583':{'en': 'Jiaxing, Zhejiang', 'zh': u('\u6d59\u6c5f\u7701\u5609\u5174\u5e02')},
 }
diff --git a/python/phonenumbers/geodata/data16.py b/python/phonenumbers/geodata/data16.py
index 3ba18247a..f2b30fff5 100644
--- a/python/phonenumbers/geodata/data16.py
+++ b/python/phonenumbers/geodata/data16.py
@@ -19,6 +19,27 @@
 # limitations under the License.
 
 data = {
+ '861323563':{'en': 'Yichang, Hubei', 'zh': u('\u6e56\u5317\u7701\u5b9c\u660c\u5e02')},
+ '861323564':{'en': 'Jingmen, Hubei', 'zh': u('\u6e56\u5317\u7701\u8346\u95e8\u5e02')},
+ '861323565':{'en': 'Shiyan, Hubei', 'zh': u('\u6e56\u5317\u7701\u5341\u5830\u5e02')},
+ '861323566':{'en': 'Shiyan, Hubei', 'zh': u('\u6e56\u5317\u7701\u5341\u5830\u5e02')},
+ '861323567':{'en': 'Shiyan, Hubei', 'zh': u('\u6e56\u5317\u7701\u5341\u5830\u5e02')},
+ '861323568':{'en': 'Xiangfan, Hubei', 'zh': u('\u6e56\u5317\u7701\u8944\u6a0a\u5e02')},
+ '861323569':{'en': 'Xiangfan, Hubei', 'zh': u('\u6e56\u5317\u7701\u8944\u6a0a\u5e02')},
+ '861323570':{'en': 'Quzhou, Zhejiang', 'zh': u('\u6d59\u6c5f\u7701\u8862\u5dde\u5e02')},
+ '861323571':{'en': 'Hangzhou, Zhejiang', 'zh': u('\u6d59\u6c5f\u7701\u676d\u5dde\u5e02')},
+ '861323572':{'en': 'Huzhou, Zhejiang', 'zh': u('\u6d59\u6c5f\u7701\u6e56\u5dde\u5e02')},
+ '861323573':{'en': 'Jiaxing, Zhejiang', 'zh': u('\u6d59\u6c5f\u7701\u5609\u5174\u5e02')},
+ '861323574':{'en': 'Ningbo, Zhejiang', 'zh': u('\u6d59\u6c5f\u7701\u5b81\u6ce2\u5e02')},
+ '861323575':{'en': 'Shaoxing, Zhejiang', 'zh': u('\u6d59\u6c5f\u7701\u7ecd\u5174\u5e02')},
+ '861323576':{'en': 'Taizhou, Zhejiang', 'zh': u('\u6d59\u6c5f\u7701\u53f0\u5dde\u5e02')},
+ '861323577':{'en': 'Wenzhou, Zhejiang', 'zh': u('\u6d59\u6c5f\u7701\u6e29\u5dde\u5e02')},
+ '861323578':{'en': 'Lishui, Zhejiang', 'zh': u('\u6d59\u6c5f\u7701\u4e3d\u6c34\u5e02')},
+ '861323579':{'en': 'Jinhua, Zhejiang', 'zh': u('\u6d59\u6c5f\u7701\u91d1\u534e\u5e02')},
+ '861323580':{'en': 'Zhoushan, Zhejiang', 'zh': u('\u6d59\u6c5f\u7701\u821f\u5c71\u5e02')},
+ '861323581':{'en': 'Hangzhou, Zhejiang', 'zh': u('\u6d59\u6c5f\u7701\u676d\u5dde\u5e02')},
+ '861323582':{'en': 'Huzhou, Zhejiang', 'zh': u('\u6d59\u6c5f\u7701\u6e56\u5dde\u5e02')},
+ '861323583':{'en': 'Jiaxing, Zhejiang', 'zh': u('\u6d59\u6c5f\u7701\u5609\u5174\u5e02')},
  '861323584':{'en': 'Ningbo, Zhejiang', 'zh': u('\u6d59\u6c5f\u7701\u5b81\u6ce2\u5e02')},
  '861323585':{'en': 'Shaoxing, Zhejiang', 'zh': u('\u6d59\u6c5f\u7701\u7ecd\u5174\u5e02')},
  '861323586':{'en': 'Taizhou, Zhejiang', 'zh': u('\u6d59\u6c5f\u7701\u53f0\u5dde\u5e02')},
@@ -9998,25 +10019,4 @@
  '861339833':{'en': 'Dazhou, Sichuan', 'zh': u('\u56db\u5ddd\u7701\u8fbe\u5dde\u5e02')},
  '861339834':{'en': 'Dazhou, Sichuan', 'zh': u('\u56db\u5ddd\u7701\u8fbe\u5dde\u5e02')},
  '861339835':{'en': 'Mianyang, Sichuan', 'zh': u('\u56db\u5ddd\u7701\u7ef5\u9633\u5e02')},
- '861339836':{'en': 'Mianyang, Sichuan', 'zh': u('\u56db\u5ddd\u7701\u7ef5\u9633\u5e02')},
- '861339837':{'en': 'Mianyang, Sichuan', 'zh': u('\u56db\u5ddd\u7701\u7ef5\u9633\u5e02')},
- '861339838':{'en': 'Mianyang, Sichuan', 'zh': u('\u56db\u5ddd\u7701\u7ef5\u9633\u5e02')},
- '861339839':{'en': 'Mianyang, Sichuan', 'zh': u('\u56db\u5ddd\u7701\u7ef5\u9633\u5e02')},
- '861339840':{'en': 'YaAn, Sichuan', 'zh': u('\u56db\u5ddd\u7701\u96c5\u5b89\u5e02')},
- '861339841':{'en': 'Nanchong, Sichuan', 'zh': u('\u56db\u5ddd\u7701\u5357\u5145\u5e02')},
- '861339842':{'en': 'Nanchong, Sichuan', 'zh': u('\u56db\u5ddd\u7701\u5357\u5145\u5e02')},
- '861339843':{'en': 'GuangAn, Sichuan', 'zh': u('\u56db\u5ddd\u7701\u5e7f\u5b89\u5e02')},
- '861339844':{'en': 'Guangyuan, Sichuan', 'zh': u('\u56db\u5ddd\u7701\u5e7f\u5143\u5e02')},
- '861339845':{'en': 'Bazhong, Sichuan', 'zh': u('\u56db\u5ddd\u7701\u5df4\u4e2d\u5e02')},
- '861339846':{'en': 'Panzhihua, Sichuan', 'zh': u('\u56db\u5ddd\u7701\u6500\u679d\u82b1\u5e02')},
- '861339847':{'en': 'Liangshan, Sichuan', 'zh': u('\u56db\u5ddd\u7701\u51c9\u5c71\u5f5d\u65cf\u81ea\u6cbb\u5dde')},
- '861339848':{'en': 'Deyang, Sichuan', 'zh': u('\u56db\u5ddd\u7701\u5fb7\u9633\u5e02')},
- '861339849':{'en': 'Mianyang, Sichuan', 'zh': u('\u56db\u5ddd\u7701\u7ef5\u9633\u5e02')},
- '861339850':{'en': 'Guiyang, Guizhou', 'zh': u('\u8d35\u5dde\u7701\u8d35\u9633\u5e02')},
- '861339851':{'en': 'Guiyang, Guizhou', 'zh': u('\u8d35\u5dde\u7701\u8d35\u9633\u5e02')},
- '861339852':{'en': 'Zunyi, Guizhou', 'zh': u('\u8d35\u5dde\u7701\u9075\u4e49\u5e02')},
- '861339853':{'en': 'Anshun, Guizhou', 'zh': u('\u8d35\u5dde\u7701\u5b89\u987a\u5e02')},
- '861339854':{'en': 'Qiannan, Guizhou', 'zh': u('\u8d35\u5dde\u7701\u9ed4\u5357\u5e03\u4f9d\u65cf\u82d7\u65cf\u81ea\u6cbb\u5dde')},
- '861339855':{'en': 'Qiandongnan, Guizhou', 'zh': u('\u8d35\u5dde\u7701\u9ed4\u4e1c\u5357\u82d7\u65cf\u4f97\u65cf\u81ea\u6cbb\u5dde')},
- '861339856':{'en': 'Tongren, Guizhou', 'zh': u('\u8d35\u5dde\u7701\u94dc\u4ec1\u5730\u533a')},
 }
diff --git a/python/phonenumbers/geodata/data17.py b/python/phonenumbers/geodata/data17.py
index 6255c0425..e241dbfa3 100644
--- a/python/phonenumbers/geodata/data17.py
+++ b/python/phonenumbers/geodata/data17.py
@@ -19,6 +19,27 @@
 # limitations under the License.
 
 data = {
+ '861339836':{'en': 'Mianyang, Sichuan', 'zh': u('\u56db\u5ddd\u7701\u7ef5\u9633\u5e02')},
+ '861339837':{'en': 'Mianyang, Sichuan', 'zh': u('\u56db\u5ddd\u7701\u7ef5\u9633\u5e02')},
+ '861339838':{'en': 'Mianyang, Sichuan', 'zh': u('\u56db\u5ddd\u7701\u7ef5\u9633\u5e02')},
+ '861339839':{'en': 'Mianyang, Sichuan', 'zh': u('\u56db\u5ddd\u7701\u7ef5\u9633\u5e02')},
+ '861339840':{'en': 'YaAn, Sichuan', 'zh': u('\u56db\u5ddd\u7701\u96c5\u5b89\u5e02')},
+ '861339841':{'en': 'Nanchong, Sichuan', 'zh': u('\u56db\u5ddd\u7701\u5357\u5145\u5e02')},
+ '861339842':{'en': 'Nanchong, Sichuan', 'zh': u('\u56db\u5ddd\u7701\u5357\u5145\u5e02')},
+ '861339843':{'en': 'GuangAn, Sichuan', 'zh': u('\u56db\u5ddd\u7701\u5e7f\u5b89\u5e02')},
+ '861339844':{'en': 'Guangyuan, Sichuan', 'zh': u('\u56db\u5ddd\u7701\u5e7f\u5143\u5e02')},
+ '861339845':{'en': 'Bazhong, Sichuan', 'zh': u('\u56db\u5ddd\u7701\u5df4\u4e2d\u5e02')},
+ '861339846':{'en': 'Panzhihua, Sichuan', 'zh': u('\u56db\u5ddd\u7701\u6500\u679d\u82b1\u5e02')},
+ '861339847':{'en': 'Liangshan, Sichuan', 'zh': u('\u56db\u5ddd\u7701\u51c9\u5c71\u5f5d\u65cf\u81ea\u6cbb\u5dde')},
+ '861339848':{'en': 'Deyang, Sichuan', 'zh': u('\u56db\u5ddd\u7701\u5fb7\u9633\u5e02')},
+ '861339849':{'en': 'Mianyang, Sichuan', 'zh': u('\u56db\u5ddd\u7701\u7ef5\u9633\u5e02')},
+ '861339850':{'en': 'Guiyang, Guizhou', 'zh': u('\u8d35\u5dde\u7701\u8d35\u9633\u5e02')},
+ '861339851':{'en': 'Guiyang, Guizhou', 'zh': u('\u8d35\u5dde\u7701\u8d35\u9633\u5e02')},
+ '861339852':{'en': 'Zunyi, Guizhou', 'zh': u('\u8d35\u5dde\u7701\u9075\u4e49\u5e02')},
+ '861339853':{'en': 'Anshun, Guizhou', 'zh': u('\u8d35\u5dde\u7701\u5b89\u987a\u5e02')},
+ '861339854':{'en': 'Qiannan, Guizhou', 'zh': u('\u8d35\u5dde\u7701\u9ed4\u5357\u5e03\u4f9d\u65cf\u82d7\u65cf\u81ea\u6cbb\u5dde')},
+ '861339855':{'en': 'Qiandongnan, Guizhou', 'zh': u('\u8d35\u5dde\u7701\u9ed4\u4e1c\u5357\u82d7\u65cf\u4f97\u65cf\u81ea\u6cbb\u5dde')},
+ '861339856':{'en': 'Tongren, Guizhou', 'zh': u('\u8d35\u5dde\u7701\u94dc\u4ec1\u5730\u533a')},
  '861339857':{'en': 'Bijie, Guizhou', 'zh': u('\u8d35\u5dde\u7701\u6bd5\u8282\u5730\u533a')},
  '861339858':{'en': 'Liupanshui, Guizhou', 'zh': u('\u8d35\u5dde\u7701\u516d\u76d8\u6c34\u5e02')},
  '861339859':{'en': 'Qianxinan, Guizhou', 'zh': u('\u8d35\u5dde\u7701\u9ed4\u897f\u5357\u5e03\u4f9d\u65cf\u82d7\u65cf\u81ea\u6cbb\u5dde')},
@@ -9998,25 +10019,4 @@
  '861364770':{'en': 'Fangchenggang, Guangxi', 'zh': u('\u5e7f\u897f\u9632\u57ce\u6e2f\u5e02')},
  '861364771':{'en': 'Nanning, Guangxi', 'zh': u('\u5e7f\u897f\u5357\u5b81\u5e02')},
  '861364772':{'en': 'Liuzhou, Guangxi', 'zh': u('\u5e7f\u897f\u67f3\u5dde\u5e02')},
- '861364773':{'en': 'Guilin, Guangxi', 'zh': u('\u5e7f\u897f\u6842\u6797\u5e02')},
- '861364774':{'en': 'Wuzhou, Guangxi', 'zh': u('\u5e7f\u897f\u68a7\u5dde\u5e02')},
- '861364775':{'en': 'Yulin, Guangxi', 'zh': u('\u5e7f\u897f\u7389\u6797\u5e02')},
- '861364776':{'en': 'Baise, Guangxi', 'zh': u('\u5e7f\u897f\u767e\u8272\u5e02')},
- '861364777':{'en': 'Qinzhou, Guangxi', 'zh': u('\u5e7f\u897f\u94a6\u5dde\u5e02')},
- '861364778':{'en': 'Hechi, Guangxi', 'zh': u('\u5e7f\u897f\u6cb3\u6c60\u5e02')},
- '861364779':{'en': 'Beihai, Guangxi', 'zh': u('\u5e7f\u897f\u5317\u6d77\u5e02')},
- '861364780':{'en': 'Liuzhou, Guangxi', 'zh': u('\u5e7f\u897f\u67f3\u5dde\u5e02')},
- '861364781':{'en': 'Nanning, Guangxi', 'zh': u('\u5e7f\u897f\u5357\u5b81\u5e02')},
- '861364782':{'en': 'Liuzhou, Guangxi', 'zh': u('\u5e7f\u897f\u67f3\u5dde\u5e02')},
- '861364783':{'en': 'Guilin, Guangxi', 'zh': u('\u5e7f\u897f\u6842\u6797\u5e02')},
- '861364784':{'en': 'Wuzhou, Guangxi', 'zh': u('\u5e7f\u897f\u68a7\u5dde\u5e02')},
- '861364785':{'en': 'Yulin, Guangxi', 'zh': u('\u5e7f\u897f\u7389\u6797\u5e02')},
- '861364786':{'en': 'Guilin, Guangxi', 'zh': u('\u5e7f\u897f\u6842\u6797\u5e02')},
- '861364787':{'en': 'Nanning, Guangxi', 'zh': u('\u5e7f\u897f\u5357\u5b81\u5e02')},
- '861364788':{'en': 'Nanning, Guangxi', 'zh': u('\u5e7f\u897f\u5357\u5b81\u5e02')},
- '861364789':{'en': 'Beihai, Guangxi', 'zh': u('\u5e7f\u897f\u5317\u6d77\u5e02')},
- '861364790':{'en': 'Fuzhou, Jiangxi', 'zh': u('\u6c5f\u897f\u7701\u629a\u5dde\u5e02')},
- '861364791':{'en': 'Nanchang, Jiangxi', 'zh': u('\u6c5f\u897f\u7701\u5357\u660c\u5e02')},
- '861364792':{'en': 'Jiujiang, Jiangxi', 'zh': u('\u6c5f\u897f\u7701\u4e5d\u6c5f\u5e02')},
- '861364793':{'en': 'Shangrao, Jiangxi', 'zh': u('\u6c5f\u897f\u7701\u4e0a\u9976\u5e02')},
 }
diff --git a/python/phonenumbers/geodata/data18.py b/python/phonenumbers/geodata/data18.py
index f2e12f690..db0b8755e 100644
--- a/python/phonenumbers/geodata/data18.py
+++ b/python/phonenumbers/geodata/data18.py
@@ -19,6 +19,27 @@
 # limitations under the License.
 
 data = {
+ '861364773':{'en': 'Guilin, Guangxi', 'zh': u('\u5e7f\u897f\u6842\u6797\u5e02')},
+ '861364774':{'en': 'Wuzhou, Guangxi', 'zh': u('\u5e7f\u897f\u68a7\u5dde\u5e02')},
+ '861364775':{'en': 'Yulin, Guangxi', 'zh': u('\u5e7f\u897f\u7389\u6797\u5e02')},
+ '861364776':{'en': 'Baise, Guangxi', 'zh': u('\u5e7f\u897f\u767e\u8272\u5e02')},
+ '861364777':{'en': 'Qinzhou, Guangxi', 'zh': u('\u5e7f\u897f\u94a6\u5dde\u5e02')},
+ '861364778':{'en': 'Hechi, Guangxi', 'zh': u('\u5e7f\u897f\u6cb3\u6c60\u5e02')},
+ '861364779':{'en': 'Beihai, Guangxi', 'zh': u('\u5e7f\u897f\u5317\u6d77\u5e02')},
+ '861364780':{'en': 'Liuzhou, Guangxi', 'zh': u('\u5e7f\u897f\u67f3\u5dde\u5e02')},
+ '861364781':{'en': 'Nanning, Guangxi', 'zh': u('\u5e7f\u897f\u5357\u5b81\u5e02')},
+ '861364782':{'en': 'Liuzhou, Guangxi', 'zh': u('\u5e7f\u897f\u67f3\u5dde\u5e02')},
+ '861364783':{'en': 'Guilin, Guangxi', 'zh': u('\u5e7f\u897f\u6842\u6797\u5e02')},
+ '861364784':{'en': 'Wuzhou, Guangxi', 'zh': u('\u5e7f\u897f\u68a7\u5dde\u5e02')},
+ '861364785':{'en': 'Yulin, Guangxi', 'zh': u('\u5e7f\u897f\u7389\u6797\u5e02')},
+ '861364786':{'en': 'Guilin, Guangxi', 'zh': u('\u5e7f\u897f\u6842\u6797\u5e02')},
+ '861364787':{'en': 'Nanning, Guangxi', 'zh': u('\u5e7f\u897f\u5357\u5b81\u5e02')},
+ '861364788':{'en': 'Nanning, Guangxi', 'zh': u('\u5e7f\u897f\u5357\u5b81\u5e02')},
+ '861364789':{'en': 'Beihai, Guangxi', 'zh': u('\u5e7f\u897f\u5317\u6d77\u5e02')},
+ '861364790':{'en': 'Fuzhou, Jiangxi', 'zh': u('\u6c5f\u897f\u7701\u629a\u5dde\u5e02')},
+ '861364791':{'en': 'Nanchang, Jiangxi', 'zh': u('\u6c5f\u897f\u7701\u5357\u660c\u5e02')},
+ '861364792':{'en': 'Jiujiang, Jiangxi', 'zh': u('\u6c5f\u897f\u7701\u4e5d\u6c5f\u5e02')},
+ '861364793':{'en': 'Shangrao, Jiangxi', 'zh': u('\u6c5f\u897f\u7701\u4e0a\u9976\u5e02')},
  '861364794':{'en': 'Fuzhou, Jiangxi', 'zh': u('\u6c5f\u897f\u7701\u629a\u5dde\u5e02')},
  '861364795':{'en': 'Yichun, Jiangxi', 'zh': u('\u6c5f\u897f\u7701\u5b9c\u6625\u5e02')},
  '861364796':{'en': 'JiAn, Jiangxi', 'zh': u('\u6c5f\u897f\u7701\u5409\u5b89\u5e02')},
@@ -9998,25 +10019,4 @@
  '86139371':{'en': 'Zhengzhou, Henan', 'zh': u('\u6cb3\u5357\u7701\u90d1\u5dde\u5e02')},
  '86139372':{'en': 'Anyang, Henan', 'zh': u('\u6cb3\u5357\u7701\u5b89\u9633\u5e02')},
  '86139373':{'en': 'Xinxiang, Henan', 'zh': u('\u6cb3\u5357\u7701\u65b0\u4e61\u5e02')},
- '86139374':{'en': 'Xuchang, Henan', 'zh': u('\u6cb3\u5357\u7701\u8bb8\u660c\u5e02')},
- '86139375':{'en': 'Pingdingshan, Henan', 'zh': u('\u6cb3\u5357\u7701\u5e73\u9876\u5c71\u5e02')},
- '86139376':{'en': 'Xinyang, Henan', 'zh': u('\u6cb3\u5357\u7701\u4fe1\u9633\u5e02')},
- '86139377':{'en': 'Nanyang, Henan', 'zh': u('\u6cb3\u5357\u7701\u5357\u9633\u5e02')},
- '86139378':{'en': 'Kaifeng, Henan', 'zh': u('\u6cb3\u5357\u7701\u5f00\u5c01\u5e02')},
- '86139379':{'en': 'Luoyang, Henan', 'zh': u('\u6cb3\u5357\u7701\u6d1b\u9633\u5e02')},
- '86139380':{'en': 'Zhoukou, Henan', 'zh': u('\u6cb3\u5357\u7701\u5468\u53e3\u5e02')},
- '861393800':{'en': 'Hebi, Henan', 'zh': u('\u6cb3\u5357\u7701\u9e64\u58c1\u5e02')},
- '861393801':{'en': 'Luohe, Henan', 'zh': u('\u6cb3\u5357\u7701\u6f2f\u6cb3\u5e02')},
- '861393802':{'en': 'Luohe, Henan', 'zh': u('\u6cb3\u5357\u7701\u6f2f\u6cb3\u5e02')},
- '861393803':{'en': 'Luohe, Henan', 'zh': u('\u6cb3\u5357\u7701\u6f2f\u6cb3\u5e02')},
- '86139381':{'en': 'Jiaozuo, Henan', 'zh': u('\u6cb3\u5357\u7701\u7126\u4f5c\u5e02')},
- '861393810':{'en': 'Sanmenxia, Henan', 'zh': u('\u6cb3\u5357\u7701\u4e09\u95e8\u5ce1\u5e02')},
- '861393811':{'en': 'Sanmenxia, Henan', 'zh': u('\u6cb3\u5357\u7701\u4e09\u95e8\u5ce1\u5e02')},
- '861393812':{'en': 'Sanmenxia, Henan', 'zh': u('\u6cb3\u5357\u7701\u4e09\u95e8\u5ce1\u5e02')},
- '86139382':{'en': 'Zhengzhou, Henan', 'zh': u('\u6cb3\u5357\u7701\u90d1\u5dde\u5e02')},
- '86139383':{'en': 'Zhumadian, Henan', 'zh': u('\u6cb3\u5357\u7701\u9a7b\u9a6c\u5e97\u5e02')},
- '861393830':{'en': 'Puyang, Henan', 'zh': u('\u6cb3\u5357\u7701\u6fee\u9633\u5e02')},
- '861393831':{'en': 'Puyang, Henan', 'zh': u('\u6cb3\u5357\u7701\u6fee\u9633\u5e02')},
- '861393832':{'en': 'Puyang, Henan', 'zh': u('\u6cb3\u5357\u7701\u6fee\u9633\u5e02')},
- '861393833':{'en': 'Puyang, Henan', 'zh': u('\u6cb3\u5357\u7701\u6fee\u9633\u5e02')},
 }
diff --git a/python/phonenumbers/geodata/data19.py b/python/phonenumbers/geodata/data19.py
index 30f6d0371..6f3386530 100644
--- a/python/phonenumbers/geodata/data19.py
+++ b/python/phonenumbers/geodata/data19.py
@@ -19,6 +19,27 @@
 # limitations under the License.
 
 data = {
+ '86139374':{'en': 'Xuchang, Henan', 'zh': u('\u6cb3\u5357\u7701\u8bb8\u660c\u5e02')},
+ '86139375':{'en': 'Pingdingshan, Henan', 'zh': u('\u6cb3\u5357\u7701\u5e73\u9876\u5c71\u5e02')},
+ '86139376':{'en': 'Xinyang, Henan', 'zh': u('\u6cb3\u5357\u7701\u4fe1\u9633\u5e02')},
+ '86139377':{'en': 'Nanyang, Henan', 'zh': u('\u6cb3\u5357\u7701\u5357\u9633\u5e02')},
+ '86139378':{'en': 'Kaifeng, Henan', 'zh': u('\u6cb3\u5357\u7701\u5f00\u5c01\u5e02')},
+ '86139379':{'en': 'Luoyang, Henan', 'zh': u('\u6cb3\u5357\u7701\u6d1b\u9633\u5e02')},
+ '86139380':{'en': 'Zhoukou, Henan', 'zh': u('\u6cb3\u5357\u7701\u5468\u53e3\u5e02')},
+ '861393800':{'en': 'Hebi, Henan', 'zh': u('\u6cb3\u5357\u7701\u9e64\u58c1\u5e02')},
+ '861393801':{'en': 'Luohe, Henan', 'zh': u('\u6cb3\u5357\u7701\u6f2f\u6cb3\u5e02')},
+ '861393802':{'en': 'Luohe, Henan', 'zh': u('\u6cb3\u5357\u7701\u6f2f\u6cb3\u5e02')},
+ '861393803':{'en': 'Luohe, Henan', 'zh': u('\u6cb3\u5357\u7701\u6f2f\u6cb3\u5e02')},
+ '86139381':{'en': 'Jiaozuo, Henan', 'zh': u('\u6cb3\u5357\u7701\u7126\u4f5c\u5e02')},
+ '861393810':{'en': 'Sanmenxia, Henan', 'zh': u('\u6cb3\u5357\u7701\u4e09\u95e8\u5ce1\u5e02')},
+ '861393811':{'en': 'Sanmenxia, Henan', 'zh': u('\u6cb3\u5357\u7701\u4e09\u95e8\u5ce1\u5e02')},
+ '861393812':{'en': 'Sanmenxia, Henan', 'zh': u('\u6cb3\u5357\u7701\u4e09\u95e8\u5ce1\u5e02')},
+ '86139382':{'en': 'Zhengzhou, Henan', 'zh': u('\u6cb3\u5357\u7701\u90d1\u5dde\u5e02')},
+ '86139383':{'en': 'Zhumadian, Henan', 'zh': u('\u6cb3\u5357\u7701\u9a7b\u9a6c\u5e97\u5e02')},
+ '861393830':{'en': 'Puyang, Henan', 'zh': u('\u6cb3\u5357\u7701\u6fee\u9633\u5e02')},
+ '861393831':{'en': 'Puyang, Henan', 'zh': u('\u6cb3\u5357\u7701\u6fee\u9633\u5e02')},
+ '861393832':{'en': 'Puyang, Henan', 'zh': u('\u6cb3\u5357\u7701\u6fee\u9633\u5e02')},
+ '861393833':{'en': 'Puyang, Henan', 'zh': u('\u6cb3\u5357\u7701\u6fee\u9633\u5e02')},
  '86139384':{'en': 'Zhengzhou, Henan', 'zh': u('\u6cb3\u5357\u7701\u90d1\u5dde\u5e02')},
  '86139385':{'en': 'Zhengzhou, Henan', 'zh': u('\u6cb3\u5357\u7701\u90d1\u5dde\u5e02')},
  '861393860':{'en': 'Kaifeng, Henan', 'zh': u('\u6cb3\u5357\u7701\u5f00\u5c01\u5e02')},
@@ -9998,25 +10019,4 @@
  '861505596':{'en': 'LuAn, Anhui', 'zh': u('\u5b89\u5fbd\u7701\u516d\u5b89\u5e02')},
  '861505597':{'en': 'LuAn, Anhui', 'zh': u('\u5b89\u5fbd\u7701\u516d\u5b89\u5e02')},
  '861505598':{'en': 'Huangshan, Anhui', 'zh': u('\u5b89\u5fbd\u7701\u9ec4\u5c71\u5e02')},
- '861505599':{'en': 'Huangshan, Anhui', 'zh': u('\u5b89\u5fbd\u7701\u9ec4\u5c71\u5e02')},
- '86150560':{'en': 'Hefei, Anhui', 'zh': u('\u5b89\u5fbd\u7701\u5408\u80a5\u5e02')},
- '861505610':{'en': 'Chuzhou, Anhui', 'zh': u('\u5b89\u5fbd\u7701\u6ec1\u5dde\u5e02')},
- '861505611':{'en': 'Chuzhou, Anhui', 'zh': u('\u5b89\u5fbd\u7701\u6ec1\u5dde\u5e02')},
- '861505612':{'en': 'Chuzhou, Anhui', 'zh': u('\u5b89\u5fbd\u7701\u6ec1\u5dde\u5e02')},
- '861505613':{'en': 'Chuzhou, Anhui', 'zh': u('\u5b89\u5fbd\u7701\u6ec1\u5dde\u5e02')},
- '861505614':{'en': 'Chuzhou, Anhui', 'zh': u('\u5b89\u5fbd\u7701\u6ec1\u5dde\u5e02')},
- '861505615':{'en': 'Bengbu, Anhui', 'zh': u('\u5b89\u5fbd\u7701\u868c\u57e0\u5e02')},
- '861505616':{'en': 'Huaibei, Anhui', 'zh': u('\u5b89\u5fbd\u7701\u6dee\u5317\u5e02')},
- '861505617':{'en': 'Huaibei, Anhui', 'zh': u('\u5b89\u5fbd\u7701\u6dee\u5317\u5e02')},
- '861505618':{'en': 'Huaibei, Anhui', 'zh': u('\u5b89\u5fbd\u7701\u6dee\u5317\u5e02')},
- '861505619':{'en': 'Huaibei, Anhui', 'zh': u('\u5b89\u5fbd\u7701\u6dee\u5317\u5e02')},
- '861505620':{'en': 'Tongling, Anhui', 'zh': u('\u5b89\u5fbd\u7701\u94dc\u9675\u5e02')},
- '861505621':{'en': 'Tongling, Anhui', 'zh': u('\u5b89\u5fbd\u7701\u94dc\u9675\u5e02')},
- '861505622':{'en': 'Hefei, Anhui', 'zh': u('\u5b89\u5fbd\u7701\u5408\u80a5\u5e02')},
- '861505623':{'en': 'Hefei, Anhui', 'zh': u('\u5b89\u5fbd\u7701\u5408\u80a5\u5e02')},
- '861505624':{'en': 'Hefei, Anhui', 'zh': u('\u5b89\u5fbd\u7701\u5408\u80a5\u5e02')},
- '861505625':{'en': 'Hefei, Anhui', 'zh': u('\u5b89\u5fbd\u7701\u5408\u80a5\u5e02')},
- '861505626':{'en': 'Xuancheng, Anhui', 'zh': u('\u5b89\u5fbd\u7701\u5ba3\u57ce\u5e02')},
- '861505627':{'en': 'Xuancheng, Anhui', 'zh': u('\u5b89\u5fbd\u7701\u5ba3\u57ce\u5e02')},
- '861505628':{'en': 'Xuancheng, Anhui', 'zh': u('\u5b89\u5fbd\u7701\u5ba3\u57ce\u5e02')},
 }
diff --git a/python/phonenumbers/geodata/data20.py b/python/phonenumbers/geodata/data20.py
index 71deb885e..bf120882e 100644
--- a/python/phonenumbers/geodata/data20.py
+++ b/python/phonenumbers/geodata/data20.py
@@ -19,6 +19,27 @@
 # limitations under the License.
 
 data = {
+ '861505599':{'en': 'Huangshan, Anhui', 'zh': u('\u5b89\u5fbd\u7701\u9ec4\u5c71\u5e02')},
+ '86150560':{'en': 'Hefei, Anhui', 'zh': u('\u5b89\u5fbd\u7701\u5408\u80a5\u5e02')},
+ '861505610':{'en': 'Chuzhou, Anhui', 'zh': u('\u5b89\u5fbd\u7701\u6ec1\u5dde\u5e02')},
+ '861505611':{'en': 'Chuzhou, Anhui', 'zh': u('\u5b89\u5fbd\u7701\u6ec1\u5dde\u5e02')},
+ '861505612':{'en': 'Chuzhou, Anhui', 'zh': u('\u5b89\u5fbd\u7701\u6ec1\u5dde\u5e02')},
+ '861505613':{'en': 'Chuzhou, Anhui', 'zh': u('\u5b89\u5fbd\u7701\u6ec1\u5dde\u5e02')},
+ '861505614':{'en': 'Chuzhou, Anhui', 'zh': u('\u5b89\u5fbd\u7701\u6ec1\u5dde\u5e02')},
+ '861505615':{'en': 'Bengbu, Anhui', 'zh': u('\u5b89\u5fbd\u7701\u868c\u57e0\u5e02')},
+ '861505616':{'en': 'Huaibei, Anhui', 'zh': u('\u5b89\u5fbd\u7701\u6dee\u5317\u5e02')},
+ '861505617':{'en': 'Huaibei, Anhui', 'zh': u('\u5b89\u5fbd\u7701\u6dee\u5317\u5e02')},
+ '861505618':{'en': 'Huaibei, Anhui', 'zh': u('\u5b89\u5fbd\u7701\u6dee\u5317\u5e02')},
+ '861505619':{'en': 'Huaibei, Anhui', 'zh': u('\u5b89\u5fbd\u7701\u6dee\u5317\u5e02')},
+ '861505620':{'en': 'Tongling, Anhui', 'zh': u('\u5b89\u5fbd\u7701\u94dc\u9675\u5e02')},
+ '861505621':{'en': 'Tongling, Anhui', 'zh': u('\u5b89\u5fbd\u7701\u94dc\u9675\u5e02')},
+ '861505622':{'en': 'Hefei, Anhui', 'zh': u('\u5b89\u5fbd\u7701\u5408\u80a5\u5e02')},
+ '861505623':{'en': 'Hefei, Anhui', 'zh': u('\u5b89\u5fbd\u7701\u5408\u80a5\u5e02')},
+ '861505624':{'en': 'Hefei, Anhui', 'zh': u('\u5b89\u5fbd\u7701\u5408\u80a5\u5e02')},
+ '861505625':{'en': 'Hefei, Anhui', 'zh': u('\u5b89\u5fbd\u7701\u5408\u80a5\u5e02')},
+ '861505626':{'en': 'Xuancheng, Anhui', 'zh': u('\u5b89\u5fbd\u7701\u5ba3\u57ce\u5e02')},
+ '861505627':{'en': 'Xuancheng, Anhui', 'zh': u('\u5b89\u5fbd\u7701\u5ba3\u57ce\u5e02')},
+ '861505628':{'en': 'Xuancheng, Anhui', 'zh': u('\u5b89\u5fbd\u7701\u5ba3\u57ce\u5e02')},
  '861505629':{'en': 'Xuancheng, Anhui', 'zh': u('\u5b89\u5fbd\u7701\u5ba3\u57ce\u5e02')},
  '861505630':{'en': 'Xuancheng, Anhui', 'zh': u('\u5b89\u5fbd\u7701\u5ba3\u57ce\u5e02')},
  '861505631':{'en': 'Xuancheng, Anhui', 'zh': u('\u5b89\u5fbd\u7701\u5ba3\u57ce\u5e02')},
@@ -9998,25 +10019,4 @@
  '861533387':{'en': 'Zhoukou, Henan', 'zh': u('\u6cb3\u5357\u7701\u5468\u53e3\u5e02')},
  '861533388':{'en': 'Zhoukou, Henan', 'zh': u('\u6cb3\u5357\u7701\u5468\u53e3\u5e02')},
  '861533389':{'en': 'Zhoukou, Henan', 'zh': u('\u6cb3\u5357\u7701\u5468\u53e3\u5e02')},
- '861533390':{'en': 'Pingdingshan, Henan', 'zh': u('\u6cb3\u5357\u7701\u5e73\u9876\u5c71\u5e02')},
- '861533391':{'en': 'Jiaozuo, Henan', 'zh': u('\u6cb3\u5357\u7701\u7126\u4f5c\u5e02')},
- '861533392':{'en': 'Puyang, Henan', 'zh': u('\u6cb3\u5357\u7701\u6fee\u9633\u5e02')},
- '861533393':{'en': 'Puyang, Henan', 'zh': u('\u6cb3\u5357\u7701\u6fee\u9633\u5e02')},
- '861533394':{'en': 'Zhoukou, Henan', 'zh': u('\u6cb3\u5357\u7701\u5468\u53e3\u5e02')},
- '861533395':{'en': 'Luohe, Henan', 'zh': u('\u6cb3\u5357\u7701\u6f2f\u6cb3\u5e02')},
- '861533396':{'en': 'Zhumadian, Henan', 'zh': u('\u6cb3\u5357\u7701\u9a7b\u9a6c\u5e97\u5e02')},
- '861533397':{'en': 'Xinyang, Henan', 'zh': u('\u6cb3\u5357\u7701\u4fe1\u9633\u5e02')},
- '861533398':{'en': 'Sanmenxia, Henan', 'zh': u('\u6cb3\u5357\u7701\u4e09\u95e8\u5ce1\u5e02')},
- '861533399':{'en': 'Xuchang, Henan', 'zh': u('\u6cb3\u5357\u7701\u8bb8\u660c\u5e02')},
- '861533400':{'en': 'Enshi, Hubei', 'zh': u('\u6e56\u5317\u7701\u6069\u65bd\u571f\u5bb6\u65cf\u82d7\u65cf\u81ea\u6cbb\u5dde')},
- '861533401':{'en': 'Enshi, Hubei', 'zh': u('\u6e56\u5317\u7701\u6069\u65bd\u571f\u5bb6\u65cf\u82d7\u65cf\u81ea\u6cbb\u5dde')},
- '861533402':{'en': 'Jingmen, Hubei', 'zh': u('\u6e56\u5317\u7701\u8346\u95e8\u5e02')},
- '861533403':{'en': 'Jingmen, Hubei', 'zh': u('\u6e56\u5317\u7701\u8346\u95e8\u5e02')},
- '861533404':{'en': 'Yichang, Hubei', 'zh': u('\u6e56\u5317\u7701\u5b9c\u660c\u5e02')},
- '861533405':{'en': 'Yichang, Hubei', 'zh': u('\u6e56\u5317\u7701\u5b9c\u660c\u5e02')},
- '861533406':{'en': 'Yichang, Hubei', 'zh': u('\u6e56\u5317\u7701\u5b9c\u660c\u5e02')},
- '861533407':{'en': 'Xiaogan, Hubei', 'zh': u('\u6e56\u5317\u7701\u5b5d\u611f\u5e02')},
- '861533408':{'en': 'Xiaogan, Hubei', 'zh': u('\u6e56\u5317\u7701\u5b5d\u611f\u5e02')},
- '861533409':{'en': 'Xiaogan, Hubei', 'zh': u('\u6e56\u5317\u7701\u5b5d\u611f\u5e02')},
- '861533410':{'en': 'Suizhou, Hubei', 'zh': u('\u6e56\u5317\u7701\u968f\u5dde\u5e02')},
 }
diff --git a/python/phonenumbers/geodata/data21.py b/python/phonenumbers/geodata/data21.py
index 1c3eed8d6..fa703d8e5 100644
--- a/python/phonenumbers/geodata/data21.py
+++ b/python/phonenumbers/geodata/data21.py
@@ -19,6 +19,27 @@
 # limitations under the License.
 
 data = {
+ '861533390':{'en': 'Pingdingshan, Henan', 'zh': u('\u6cb3\u5357\u7701\u5e73\u9876\u5c71\u5e02')},
+ '861533391':{'en': 'Jiaozuo, Henan', 'zh': u('\u6cb3\u5357\u7701\u7126\u4f5c\u5e02')},
+ '861533392':{'en': 'Puyang, Henan', 'zh': u('\u6cb3\u5357\u7701\u6fee\u9633\u5e02')},
+ '861533393':{'en': 'Puyang, Henan', 'zh': u('\u6cb3\u5357\u7701\u6fee\u9633\u5e02')},
+ '861533394':{'en': 'Zhoukou, Henan', 'zh': u('\u6cb3\u5357\u7701\u5468\u53e3\u5e02')},
+ '861533395':{'en': 'Luohe, Henan', 'zh': u('\u6cb3\u5357\u7701\u6f2f\u6cb3\u5e02')},
+ '861533396':{'en': 'Zhumadian, Henan', 'zh': u('\u6cb3\u5357\u7701\u9a7b\u9a6c\u5e97\u5e02')},
+ '861533397':{'en': 'Xinyang, Henan', 'zh': u('\u6cb3\u5357\u7701\u4fe1\u9633\u5e02')},
+ '861533398':{'en': 'Sanmenxia, Henan', 'zh': u('\u6cb3\u5357\u7701\u4e09\u95e8\u5ce1\u5e02')},
+ '861533399':{'en': 'Xuchang, Henan', 'zh': u('\u6cb3\u5357\u7701\u8bb8\u660c\u5e02')},
+ '861533400':{'en': 'Enshi, Hubei', 'zh': u('\u6e56\u5317\u7701\u6069\u65bd\u571f\u5bb6\u65cf\u82d7\u65cf\u81ea\u6cbb\u5dde')},
+ '861533401':{'en': 'Enshi, Hubei', 'zh': u('\u6e56\u5317\u7701\u6069\u65bd\u571f\u5bb6\u65cf\u82d7\u65cf\u81ea\u6cbb\u5dde')},
+ '861533402':{'en': 'Jingmen, Hubei', 'zh': u('\u6e56\u5317\u7701\u8346\u95e8\u5e02')},
+ '861533403':{'en': 'Jingmen, Hubei', 'zh': u('\u6e56\u5317\u7701\u8346\u95e8\u5e02')},
+ '861533404':{'en': 'Yichang, Hubei', 'zh': u('\u6e56\u5317\u7701\u5b9c\u660c\u5e02')},
+ '861533405':{'en': 'Yichang, Hubei', 'zh': u('\u6e56\u5317\u7701\u5b9c\u660c\u5e02')},
+ '861533406':{'en': 'Yichang, Hubei', 'zh': u('\u6e56\u5317\u7701\u5b9c\u660c\u5e02')},
+ '861533407':{'en': 'Xiaogan, Hubei', 'zh': u('\u6e56\u5317\u7701\u5b5d\u611f\u5e02')},
+ '861533408':{'en': 'Xiaogan, Hubei', 'zh': u('\u6e56\u5317\u7701\u5b5d\u611f\u5e02')},
+ '861533409':{'en': 'Xiaogan, Hubei', 'zh': u('\u6e56\u5317\u7701\u5b5d\u611f\u5e02')},
+ '861533410':{'en': 'Suizhou, Hubei', 'zh': u('\u6e56\u5317\u7701\u968f\u5dde\u5e02')},
  '861533411':{'en': 'Suizhou, Hubei', 'zh': u('\u6e56\u5317\u7701\u968f\u5dde\u5e02')},
  '861533412':{'en': 'Huanggang, Hubei', 'zh': u('\u6e56\u5317\u7701\u9ec4\u5188\u5e02')},
  '861533413':{'en': 'Huanggang, Hubei', 'zh': u('\u6e56\u5317\u7701\u9ec4\u5188\u5e02')},
@@ -9998,25 +10019,4 @@
  '861566611':{'en': 'Weihai, Shandong', 'zh': u('\u5c71\u4e1c\u7701\u5a01\u6d77\u5e02')},
  '861566612':{'en': 'Binzhou, Shandong', 'zh': u('\u5c71\u4e1c\u7701\u6ee8\u5dde\u5e02')},
  '861566613':{'en': 'Qingdao, Shandong', 'zh': u('\u5c71\u4e1c\u7701\u9752\u5c9b\u5e02')},
- '861566614':{'en': 'Dezhou, Shandong', 'zh': u('\u5c71\u4e1c\u7701\u5fb7\u5dde\u5e02')},
- '861566615':{'en': 'Linyi, Shandong', 'zh': u('\u5c71\u4e1c\u7701\u4e34\u6c82\u5e02')},
- '861566616':{'en': 'Heze, Shandong', 'zh': u('\u5c71\u4e1c\u7701\u83cf\u6cfd\u5e02')},
- '861566617':{'en': 'Jining, Shandong', 'zh': u('\u5c71\u4e1c\u7701\u6d4e\u5b81\u5e02')},
- '861566618':{'en': 'Heze, Shandong', 'zh': u('\u5c71\u4e1c\u7701\u83cf\u6cfd\u5e02')},
- '861566619':{'en': 'Linyi, Shandong', 'zh': u('\u5c71\u4e1c\u7701\u4e34\u6c82\u5e02')},
- '861566620':{'en': 'Qingdao, Shandong', 'zh': u('\u5c71\u4e1c\u7701\u9752\u5c9b\u5e02')},
- '861566621':{'en': 'Dongying, Shandong', 'zh': u('\u5c71\u4e1c\u7701\u4e1c\u8425\u5e02')},
- '861566622':{'en': 'Qingdao, Shandong', 'zh': u('\u5c71\u4e1c\u7701\u9752\u5c9b\u5e02')},
- '861566623':{'en': 'Weifang, Shandong', 'zh': u('\u5c71\u4e1c\u7701\u6f4d\u574a\u5e02')},
- '861566624':{'en': 'Jining, Shandong', 'zh': u('\u5c71\u4e1c\u7701\u6d4e\u5b81\u5e02')},
- '861566625':{'en': 'TaiAn, Shandong', 'zh': u('\u5c71\u4e1c\u7701\u6cf0\u5b89\u5e02')},
- '861566626':{'en': 'Weihai, Shandong', 'zh': u('\u5c71\u4e1c\u7701\u5a01\u6d77\u5e02')},
- '861566627':{'en': 'Rizhao, Shandong', 'zh': u('\u5c71\u4e1c\u7701\u65e5\u7167\u5e02')},
- '861566628':{'en': 'Laiwu, Shandong', 'zh': u('\u5c71\u4e1c\u7701\u83b1\u829c\u5e02')},
- '861566629':{'en': 'Binzhou, Shandong', 'zh': u('\u5c71\u4e1c\u7701\u6ee8\u5dde\u5e02')},
- '861566630':{'en': 'Weihai, Shandong', 'zh': u('\u5c71\u4e1c\u7701\u5a01\u6d77\u5e02')},
- '861566631':{'en': 'Weihai, Shandong', 'zh': u('\u5c71\u4e1c\u7701\u5a01\u6d77\u5e02')},
- '861566632':{'en': 'Jinan, Shandong', 'zh': u('\u5c71\u4e1c\u7701\u6d4e\u5357\u5e02')},
- '861566633':{'en': 'Rizhao, Shandong', 'zh': u('\u5c71\u4e1c\u7701\u65e5\u7167\u5e02')},
- '861566634':{'en': 'Laiwu, Shandong', 'zh': u('\u5c71\u4e1c\u7701\u83b1\u829c\u5e02')},
 }
diff --git a/python/phonenumbers/geodata/data22.py b/python/phonenumbers/geodata/data22.py
index 5f7d787b9..a3c6e5347 100644
--- a/python/phonenumbers/geodata/data22.py
+++ b/python/phonenumbers/geodata/data22.py
@@ -19,6 +19,27 @@
 # limitations under the License.
 
 data = {
+ '861566614':{'en': 'Dezhou, Shandong', 'zh': u('\u5c71\u4e1c\u7701\u5fb7\u5dde\u5e02')},
+ '861566615':{'en': 'Linyi, Shandong', 'zh': u('\u5c71\u4e1c\u7701\u4e34\u6c82\u5e02')},
+ '861566616':{'en': 'Heze, Shandong', 'zh': u('\u5c71\u4e1c\u7701\u83cf\u6cfd\u5e02')},
+ '861566617':{'en': 'Jining, Shandong', 'zh': u('\u5c71\u4e1c\u7701\u6d4e\u5b81\u5e02')},
+ '861566618':{'en': 'Heze, Shandong', 'zh': u('\u5c71\u4e1c\u7701\u83cf\u6cfd\u5e02')},
+ '861566619':{'en': 'Linyi, Shandong', 'zh': u('\u5c71\u4e1c\u7701\u4e34\u6c82\u5e02')},
+ '861566620':{'en': 'Qingdao, Shandong', 'zh': u('\u5c71\u4e1c\u7701\u9752\u5c9b\u5e02')},
+ '861566621':{'en': 'Dongying, Shandong', 'zh': u('\u5c71\u4e1c\u7701\u4e1c\u8425\u5e02')},
+ '861566622':{'en': 'Qingdao, Shandong', 'zh': u('\u5c71\u4e1c\u7701\u9752\u5c9b\u5e02')},
+ '861566623':{'en': 'Weifang, Shandong', 'zh': u('\u5c71\u4e1c\u7701\u6f4d\u574a\u5e02')},
+ '861566624':{'en': 'Jining, Shandong', 'zh': u('\u5c71\u4e1c\u7701\u6d4e\u5b81\u5e02')},
+ '861566625':{'en': 'TaiAn, Shandong', 'zh': u('\u5c71\u4e1c\u7701\u6cf0\u5b89\u5e02')},
+ '861566626':{'en': 'Weihai, Shandong', 'zh': u('\u5c71\u4e1c\u7701\u5a01\u6d77\u5e02')},
+ '861566627':{'en': 'Rizhao, Shandong', 'zh': u('\u5c71\u4e1c\u7701\u65e5\u7167\u5e02')},
+ '861566628':{'en': 'Laiwu, Shandong', 'zh': u('\u5c71\u4e1c\u7701\u83b1\u829c\u5e02')},
+ '861566629':{'en': 'Binzhou, Shandong', 'zh': u('\u5c71\u4e1c\u7701\u6ee8\u5dde\u5e02')},
+ '861566630':{'en': 'Weihai, Shandong', 'zh': u('\u5c71\u4e1c\u7701\u5a01\u6d77\u5e02')},
+ '861566631':{'en': 'Weihai, Shandong', 'zh': u('\u5c71\u4e1c\u7701\u5a01\u6d77\u5e02')},
+ '861566632':{'en': 'Jinan, Shandong', 'zh': u('\u5c71\u4e1c\u7701\u6d4e\u5357\u5e02')},
+ '861566633':{'en': 'Rizhao, Shandong', 'zh': u('\u5c71\u4e1c\u7701\u65e5\u7167\u5e02')},
+ '861566634':{'en': 'Laiwu, Shandong', 'zh': u('\u5c71\u4e1c\u7701\u83b1\u829c\u5e02')},
  '861566635':{'en': 'Liaocheng, Shandong', 'zh': u('\u5c71\u4e1c\u7701\u804a\u57ce\u5e02')},
  '861566636':{'en': 'Zibo, Shandong', 'zh': u('\u5c71\u4e1c\u7701\u6dc4\u535a\u5e02')},
  '861566637':{'en': 'Zaozhuang, Shandong', 'zh': u('\u5c71\u4e1c\u7701\u67a3\u5e84\u5e02')},
@@ -9998,25 +10019,4 @@
  '86159365':{'en': 'Xinxiang, Henan', 'zh': u('\u6cb3\u5357\u7701\u65b0\u4e61\u5e02')},
  '861593660':{'en': 'Luohe, Henan', 'zh': u('\u6cb3\u5357\u7701\u6f2f\u6cb3\u5e02')},
  '861593661':{'en': 'Luohe, Henan', 'zh': u('\u6cb3\u5357\u7701\u6f2f\u6cb3\u5e02')},
- '861593662':{'en': 'Luohe, Henan', 'zh': u('\u6cb3\u5357\u7701\u6f2f\u6cb3\u5e02')},
- '861593663':{'en': 'Luohe, Henan', 'zh': u('\u6cb3\u5357\u7701\u6f2f\u6cb3\u5e02')},
- '861593664':{'en': 'Luohe, Henan', 'zh': u('\u6cb3\u5357\u7701\u6f2f\u6cb3\u5e02')},
- '861593665':{'en': 'Anyang, Henan', 'zh': u('\u6cb3\u5357\u7701\u5b89\u9633\u5e02')},
- '861593666':{'en': 'Anyang, Henan', 'zh': u('\u6cb3\u5357\u7701\u5b89\u9633\u5e02')},
- '861593667':{'en': 'Anyang, Henan', 'zh': u('\u6cb3\u5357\u7701\u5b89\u9633\u5e02')},
- '861593668':{'en': 'Anyang, Henan', 'zh': u('\u6cb3\u5357\u7701\u5b89\u9633\u5e02')},
- '861593669':{'en': 'Anyang, Henan', 'zh': u('\u6cb3\u5357\u7701\u5b89\u9633\u5e02')},
- '86159367':{'en': 'Puyang, Henan', 'zh': u('\u6cb3\u5357\u7701\u6fee\u9633\u5e02')},
- '861593680':{'en': 'Anyang, Henan', 'zh': u('\u6cb3\u5357\u7701\u5b89\u9633\u5e02')},
- '861593681':{'en': 'Anyang, Henan', 'zh': u('\u6cb3\u5357\u7701\u5b89\u9633\u5e02')},
- '861593682':{'en': 'Anyang, Henan', 'zh': u('\u6cb3\u5357\u7701\u5b89\u9633\u5e02')},
- '861593683':{'en': 'Anyang, Henan', 'zh': u('\u6cb3\u5357\u7701\u5b89\u9633\u5e02')},
- '861593684':{'en': 'Anyang, Henan', 'zh': u('\u6cb3\u5357\u7701\u5b89\u9633\u5e02')},
- '861593685':{'en': 'Sanmenxia, Henan', 'zh': u('\u6cb3\u5357\u7701\u4e09\u95e8\u5ce1\u5e02')},
- '861593686':{'en': 'Sanmenxia, Henan', 'zh': u('\u6cb3\u5357\u7701\u4e09\u95e8\u5ce1\u5e02')},
- '861593687':{'en': 'Sanmenxia, Henan', 'zh': u('\u6cb3\u5357\u7701\u4e09\u95e8\u5ce1\u5e02')},
- '861593688':{'en': 'Sanmenxia, Henan', 'zh': u('\u6cb3\u5357\u7701\u4e09\u95e8\u5ce1\u5e02')},
- '861593689':{'en': 'Sanmenxia, Henan', 'zh': u('\u6cb3\u5357\u7701\u4e09\u95e8\u5ce1\u5e02')},
- '86159369':{'en': 'Zhoukou, Henan', 'zh': u('\u6cb3\u5357\u7701\u5468\u53e3\u5e02')},
- '86159370':{'en': 'Shangqiu, Henan', 'zh': u('\u6cb3\u5357\u7701\u5546\u4e18\u5e02')},
 }
diff --git a/python/phonenumbers/geodata/data23.py b/python/phonenumbers/geodata/data23.py
index 8340578a4..2fa203c45 100644
--- a/python/phonenumbers/geodata/data23.py
+++ b/python/phonenumbers/geodata/data23.py
@@ -19,6 +19,27 @@
 # limitations under the License.
 
 data = {
+ '861593662':{'en': 'Luohe, Henan', 'zh': u('\u6cb3\u5357\u7701\u6f2f\u6cb3\u5e02')},
+ '861593663':{'en': 'Luohe, Henan', 'zh': u('\u6cb3\u5357\u7701\u6f2f\u6cb3\u5e02')},
+ '861593664':{'en': 'Luohe, Henan', 'zh': u('\u6cb3\u5357\u7701\u6f2f\u6cb3\u5e02')},
+ '861593665':{'en': 'Anyang, Henan', 'zh': u('\u6cb3\u5357\u7701\u5b89\u9633\u5e02')},
+ '861593666':{'en': 'Anyang, Henan', 'zh': u('\u6cb3\u5357\u7701\u5b89\u9633\u5e02')},
+ '861593667':{'en': 'Anyang, Henan', 'zh': u('\u6cb3\u5357\u7701\u5b89\u9633\u5e02')},
+ '861593668':{'en': 'Anyang, Henan', 'zh': u('\u6cb3\u5357\u7701\u5b89\u9633\u5e02')},
+ '861593669':{'en': 'Anyang, Henan', 'zh': u('\u6cb3\u5357\u7701\u5b89\u9633\u5e02')},
+ '86159367':{'en': 'Puyang, Henan', 'zh': u('\u6cb3\u5357\u7701\u6fee\u9633\u5e02')},
+ '861593680':{'en': 'Anyang, Henan', 'zh': u('\u6cb3\u5357\u7701\u5b89\u9633\u5e02')},
+ '861593681':{'en': 'Anyang, Henan', 'zh': u('\u6cb3\u5357\u7701\u5b89\u9633\u5e02')},
+ '861593682':{'en': 'Anyang, Henan', 'zh': u('\u6cb3\u5357\u7701\u5b89\u9633\u5e02')},
+ '861593683':{'en': 'Anyang, Henan', 'zh': u('\u6cb3\u5357\u7701\u5b89\u9633\u5e02')},
+ '861593684':{'en': 'Anyang, Henan', 'zh': u('\u6cb3\u5357\u7701\u5b89\u9633\u5e02')},
+ '861593685':{'en': 'Sanmenxia, Henan', 'zh': u('\u6cb3\u5357\u7701\u4e09\u95e8\u5ce1\u5e02')},
+ '861593686':{'en': 'Sanmenxia, Henan', 'zh': u('\u6cb3\u5357\u7701\u4e09\u95e8\u5ce1\u5e02')},
+ '861593687':{'en': 'Sanmenxia, Henan', 'zh': u('\u6cb3\u5357\u7701\u4e09\u95e8\u5ce1\u5e02')},
+ '861593688':{'en': 'Sanmenxia, Henan', 'zh': u('\u6cb3\u5357\u7701\u4e09\u95e8\u5ce1\u5e02')},
+ '861593689':{'en': 'Sanmenxia, Henan', 'zh': u('\u6cb3\u5357\u7701\u4e09\u95e8\u5ce1\u5e02')},
+ '86159369':{'en': 'Zhoukou, Henan', 'zh': u('\u6cb3\u5357\u7701\u5468\u53e3\u5e02')},
+ '86159370':{'en': 'Shangqiu, Henan', 'zh': u('\u6cb3\u5357\u7701\u5546\u4e18\u5e02')},
  '86159371':{'en': 'Zhengzhou, Henan', 'zh': u('\u6cb3\u5357\u7701\u90d1\u5dde\u5e02')},
  '86159372':{'en': 'Anyang, Henan', 'zh': u('\u6cb3\u5357\u7701\u5b89\u9633\u5e02')},
  '86159373':{'en': 'Xinxiang, Henan', 'zh': u('\u6cb3\u5357\u7701\u65b0\u4e61\u5e02')},
@@ -9998,25 +10019,4 @@
  '861781796':{'en': 'Zhanjiang, Guangdong', 'zh': u('\u5e7f\u4e1c\u7701\u6e5b\u6c5f\u5e02')},
  '861781797':{'en': 'Shaoguan, Guangdong', 'zh': u('\u5e7f\u4e1c\u7701\u97f6\u5173\u5e02')},
  '861781798':{'en': 'Heyuan, Guangdong', 'zh': u('\u5e7f\u4e1c\u7701\u6cb3\u6e90\u5e02')},
- '861781799':{'en': 'Maoming, Guangdong', 'zh': u('\u5e7f\u4e1c\u7701\u8302\u540d\u5e02')},
- '861782000':{'en': 'Maoming, Guangdong', 'zh': u('\u5e7f\u4e1c\u7701\u8302\u540d\u5e02')},
- '861782001':{'en': 'Foshan, Guangdong', 'zh': u('\u5e7f\u4e1c\u7701\u4f5b\u5c71\u5e02')},
- '861782002':{'en': 'Zhongshan, Guangdong', 'zh': u('\u5e7f\u4e1c\u7701\u4e2d\u5c71\u5e02')},
- '861782003':{'en': 'Zhanjiang, Guangdong', 'zh': u('\u5e7f\u4e1c\u7701\u6e5b\u6c5f\u5e02')},
- '861782004':{'en': 'Zhuhai, Guangdong', 'zh': u('\u5e7f\u4e1c\u7701\u73e0\u6d77\u5e02')},
- '861782005':{'en': 'Heyuan, Guangdong', 'zh': u('\u5e7f\u4e1c\u7701\u6cb3\u6e90\u5e02')},
- '861782006':{'en': 'Meizhou, Guangdong', 'zh': u('\u5e7f\u4e1c\u7701\u6885\u5dde\u5e02')},
- '861782007':{'en': 'Meizhou, Guangdong', 'zh': u('\u5e7f\u4e1c\u7701\u6885\u5dde\u5e02')},
- '861782008':{'en': 'Guangzhou, Guangdong', 'zh': u('\u5e7f\u4e1c\u7701\u5e7f\u5dde\u5e02')},
- '861782009':{'en': 'Yangjiang, Guangdong', 'zh': u('\u5e7f\u4e1c\u7701\u9633\u6c5f\u5e02')},
- '861782010':{'en': 'Foshan, Guangdong', 'zh': u('\u5e7f\u4e1c\u7701\u4f5b\u5c71\u5e02')},
- '861782011':{'en': 'Maoming, Guangdong', 'zh': u('\u5e7f\u4e1c\u7701\u8302\u540d\u5e02')},
- '861782012':{'en': 'Zhongshan, Guangdong', 'zh': u('\u5e7f\u4e1c\u7701\u4e2d\u5c71\u5e02')},
- '861782013':{'en': 'Zhaoqing, Guangdong', 'zh': u('\u5e7f\u4e1c\u7701\u8087\u5e86\u5e02')},
- '861782014':{'en': 'Zhanjiang, Guangdong', 'zh': u('\u5e7f\u4e1c\u7701\u6e5b\u6c5f\u5e02')},
- '861782015':{'en': 'Heyuan, Guangdong', 'zh': u('\u5e7f\u4e1c\u7701\u6cb3\u6e90\u5e02')},
- '861782016':{'en': 'Meizhou, Guangdong', 'zh': u('\u5e7f\u4e1c\u7701\u6885\u5dde\u5e02')},
- '861782017':{'en': 'Heyuan, Guangdong', 'zh': u('\u5e7f\u4e1c\u7701\u6cb3\u6e90\u5e02')},
- '861782018':{'en': 'Foshan, Guangdong', 'zh': u('\u5e7f\u4e1c\u7701\u4f5b\u5c71\u5e02')},
- '861782019':{'en': 'Maoming, Guangdong', 'zh': u('\u5e7f\u4e1c\u7701\u8302\u540d\u5e02')},
 }
diff --git a/python/phonenumbers/geodata/data24.py b/python/phonenumbers/geodata/data24.py
index 54c08760d..0a585ab55 100644
--- a/python/phonenumbers/geodata/data24.py
+++ b/python/phonenumbers/geodata/data24.py
@@ -19,6 +19,27 @@
 # limitations under the License.
 
 data = {
+ '861781799':{'en': 'Maoming, Guangdong', 'zh': u('\u5e7f\u4e1c\u7701\u8302\u540d\u5e02')},
+ '861782000':{'en': 'Maoming, Guangdong', 'zh': u('\u5e7f\u4e1c\u7701\u8302\u540d\u5e02')},
+ '861782001':{'en': 'Foshan, Guangdong', 'zh': u('\u5e7f\u4e1c\u7701\u4f5b\u5c71\u5e02')},
+ '861782002':{'en': 'Zhongshan, Guangdong', 'zh': u('\u5e7f\u4e1c\u7701\u4e2d\u5c71\u5e02')},
+ '861782003':{'en': 'Zhanjiang, Guangdong', 'zh': u('\u5e7f\u4e1c\u7701\u6e5b\u6c5f\u5e02')},
+ '861782004':{'en': 'Zhuhai, Guangdong', 'zh': u('\u5e7f\u4e1c\u7701\u73e0\u6d77\u5e02')},
+ '861782005':{'en': 'Heyuan, Guangdong', 'zh': u('\u5e7f\u4e1c\u7701\u6cb3\u6e90\u5e02')},
+ '861782006':{'en': 'Meizhou, Guangdong', 'zh': u('\u5e7f\u4e1c\u7701\u6885\u5dde\u5e02')},
+ '861782007':{'en': 'Meizhou, Guangdong', 'zh': u('\u5e7f\u4e1c\u7701\u6885\u5dde\u5e02')},
+ '861782008':{'en': 'Guangzhou, Guangdong', 'zh': u('\u5e7f\u4e1c\u7701\u5e7f\u5dde\u5e02')},
+ '861782009':{'en': 'Yangjiang, Guangdong', 'zh': u('\u5e7f\u4e1c\u7701\u9633\u6c5f\u5e02')},
+ '861782010':{'en': 'Foshan, Guangdong', 'zh': u('\u5e7f\u4e1c\u7701\u4f5b\u5c71\u5e02')},
+ '861782011':{'en': 'Maoming, Guangdong', 'zh': u('\u5e7f\u4e1c\u7701\u8302\u540d\u5e02')},
+ '861782012':{'en': 'Zhongshan, Guangdong', 'zh': u('\u5e7f\u4e1c\u7701\u4e2d\u5c71\u5e02')},
+ '861782013':{'en': 'Zhaoqing, Guangdong', 'zh': u('\u5e7f\u4e1c\u7701\u8087\u5e86\u5e02')},
+ '861782014':{'en': 'Zhanjiang, Guangdong', 'zh': u('\u5e7f\u4e1c\u7701\u6e5b\u6c5f\u5e02')},
+ '861782015':{'en': 'Heyuan, Guangdong', 'zh': u('\u5e7f\u4e1c\u7701\u6cb3\u6e90\u5e02')},
+ '861782016':{'en': 'Meizhou, Guangdong', 'zh': u('\u5e7f\u4e1c\u7701\u6885\u5dde\u5e02')},
+ '861782017':{'en': 'Heyuan, Guangdong', 'zh': u('\u5e7f\u4e1c\u7701\u6cb3\u6e90\u5e02')},
+ '861782018':{'en': 'Foshan, Guangdong', 'zh': u('\u5e7f\u4e1c\u7701\u4f5b\u5c71\u5e02')},
+ '861782019':{'en': 'Maoming, Guangdong', 'zh': u('\u5e7f\u4e1c\u7701\u8302\u540d\u5e02')},
  '861782020':{'en': 'Zhaoqing, Guangdong', 'zh': u('\u5e7f\u4e1c\u7701\u8087\u5e86\u5e02')},
  '861782021':{'en': 'Shenzhen, Guangdong', 'zh': u('\u5e7f\u4e1c\u7701\u6df1\u5733\u5e02')},
  '861782022':{'en': 'Heyuan, Guangdong', 'zh': u('\u5e7f\u4e1c\u7701\u6cb3\u6e90\u5e02')},
@@ -9998,25 +10019,4 @@
  '861819567':{'en': 'Yushu, Qinghai', 'zh': u('\u9752\u6d77\u7701\u7389\u6811\u85cf\u65cf\u81ea\u6cbb\u5dde')},
  '861819568':{'en': 'Hainan, Qinghai', 'zh': u('\u9752\u6d77\u7701\u6d77\u5357\u85cf\u65cf\u81ea\u6cbb\u5dde')},
  '861819569':{'en': 'Hainan, Qinghai', 'zh': u('\u9752\u6d77\u7701\u6d77\u5357\u85cf\u65cf\u81ea\u6cbb\u5dde')},
- '861819570':{'en': 'Haidong, Qinghai', 'zh': u('\u9752\u6d77\u7701\u6d77\u4e1c\u5730\u533a')},
- '861819571':{'en': 'Xining, Qinghai', 'zh': u('\u9752\u6d77\u7701\u897f\u5b81\u5e02')},
- '861819572':{'en': 'Haidong, Qinghai', 'zh': u('\u9752\u6d77\u7701\u6d77\u4e1c\u5730\u533a')},
- '861819573':{'en': 'Yushu, Qinghai', 'zh': u('\u9752\u6d77\u7701\u7389\u6811\u85cf\u65cf\u81ea\u6cbb\u5dde')},
- '861819574':{'en': 'Hainan, Qinghai', 'zh': u('\u9752\u6d77\u7701\u6d77\u5357\u85cf\u65cf\u81ea\u6cbb\u5dde')},
- '861819575':{'en': 'Yushu, Qinghai', 'zh': u('\u9752\u6d77\u7701\u7389\u6811\u85cf\u65cf\u81ea\u6cbb\u5dde')},
- '861819576':{'en': 'Yushu, Qinghai', 'zh': u('\u9752\u6d77\u7701\u7389\u6811\u85cf\u65cf\u81ea\u6cbb\u5dde')},
- '861819577':{'en': 'Haixi, Qinghai', 'zh': u('\u9752\u6d77\u7701\u6d77\u897f\u8499\u53e4\u65cf\u85cf\u65cf\u81ea\u6cbb\u5dde')},
- '861819578':{'en': 'Xining, Qinghai', 'zh': u('\u9752\u6d77\u7701\u897f\u5b81\u5e02')},
- '861819579':{'en': 'Haixi, Qinghai', 'zh': u('\u9752\u6d77\u7701\u6d77\u897f\u8499\u53e4\u65cf\u85cf\u65cf\u81ea\u6cbb\u5dde')},
- '86181958':{'en': 'Urumchi, Xinjiang', 'zh': u('\u65b0\u7586\u4e4c\u9c81\u6728\u9f50\u5e02')},
- '86181959':{'en': 'Urumchi, Xinjiang', 'zh': u('\u65b0\u7586\u4e4c\u9c81\u6728\u9f50\u5e02')},
- '86181960':{'en': 'Turpan, Xinjiang', 'zh': u('\u65b0\u7586\u5410\u9c81\u756a\u5730\u533a')},
- '861819600':{'en': 'Karamay, Xinjiang', 'zh': u('\u65b0\u7586\u514b\u62c9\u739b\u4f9d\u5e02')},
- '861819601':{'en': 'Karamay, Xinjiang', 'zh': u('\u65b0\u7586\u514b\u62c9\u739b\u4f9d\u5e02')},
- '861819602':{'en': 'Karamay, Xinjiang', 'zh': u('\u65b0\u7586\u514b\u62c9\u739b\u4f9d\u5e02')},
- '861819603':{'en': 'Karamay, Xinjiang', 'zh': u('\u65b0\u7586\u514b\u62c9\u739b\u4f9d\u5e02')},
- '86181961':{'en': 'Changji, Xinjiang', 'zh': u('\u65b0\u7586\u660c\u5409\u56de\u65cf\u81ea\u6cbb\u5dde')},
- '86181962':{'en': 'Bayingolin, Xinjiang', 'zh': u('\u65b0\u7586\u5df4\u97f3\u90ed\u695e\u8499\u53e4\u81ea\u6cbb\u5dde')},
- '86181963':{'en': 'Aksu, Xinjiang', 'zh': u('\u65b0\u7586\u963f\u514b\u82cf\u5730\u533a')},
- '86181964':{'en': 'Ili, Xinjiang', 'zh': u('\u65b0\u7586\u4f0a\u7281\u54c8\u8428\u514b\u81ea\u6cbb\u5dde')},
 }
diff --git a/python/phonenumbers/geodata/data25.py b/python/phonenumbers/geodata/data25.py
index 899d319a7..6fdbd792d 100644
--- a/python/phonenumbers/geodata/data25.py
+++ b/python/phonenumbers/geodata/data25.py
@@ -19,6 +19,27 @@
 # limitations under the License.
 
 data = {
+ '861819570':{'en': 'Haidong, Qinghai', 'zh': u('\u9752\u6d77\u7701\u6d77\u4e1c\u5730\u533a')},
+ '861819571':{'en': 'Xining, Qinghai', 'zh': u('\u9752\u6d77\u7701\u897f\u5b81\u5e02')},
+ '861819572':{'en': 'Haidong, Qinghai', 'zh': u('\u9752\u6d77\u7701\u6d77\u4e1c\u5730\u533a')},
+ '861819573':{'en': 'Yushu, Qinghai', 'zh': u('\u9752\u6d77\u7701\u7389\u6811\u85cf\u65cf\u81ea\u6cbb\u5dde')},
+ '861819574':{'en': 'Hainan, Qinghai', 'zh': u('\u9752\u6d77\u7701\u6d77\u5357\u85cf\u65cf\u81ea\u6cbb\u5dde')},
+ '861819575':{'en': 'Yushu, Qinghai', 'zh': u('\u9752\u6d77\u7701\u7389\u6811\u85cf\u65cf\u81ea\u6cbb\u5dde')},
+ '861819576':{'en': 'Yushu, Qinghai', 'zh': u('\u9752\u6d77\u7701\u7389\u6811\u85cf\u65cf\u81ea\u6cbb\u5dde')},
+ '861819577':{'en': 'Haixi, Qinghai', 'zh': u('\u9752\u6d77\u7701\u6d77\u897f\u8499\u53e4\u65cf\u85cf\u65cf\u81ea\u6cbb\u5dde')},
+ '861819578':{'en': 'Xining, Qinghai', 'zh': u('\u9752\u6d77\u7701\u897f\u5b81\u5e02')},
+ '861819579':{'en': 'Haixi, Qinghai', 'zh': u('\u9752\u6d77\u7701\u6d77\u897f\u8499\u53e4\u65cf\u85cf\u65cf\u81ea\u6cbb\u5dde')},
+ '86181958':{'en': 'Urumchi, Xinjiang', 'zh': u('\u65b0\u7586\u4e4c\u9c81\u6728\u9f50\u5e02')},
+ '86181959':{'en': 'Urumchi, Xinjiang', 'zh': u('\u65b0\u7586\u4e4c\u9c81\u6728\u9f50\u5e02')},
+ '86181960':{'en': 'Turpan, Xinjiang', 'zh': u('\u65b0\u7586\u5410\u9c81\u756a\u5730\u533a')},
+ '861819600':{'en': 'Karamay, Xinjiang', 'zh': u('\u65b0\u7586\u514b\u62c9\u739b\u4f9d\u5e02')},
+ '861819601':{'en': 'Karamay, Xinjiang', 'zh': u('\u65b0\u7586\u514b\u62c9\u739b\u4f9d\u5e02')},
+ '861819602':{'en': 'Karamay, Xinjiang', 'zh': u('\u65b0\u7586\u514b\u62c9\u739b\u4f9d\u5e02')},
+ '861819603':{'en': 'Karamay, Xinjiang', 'zh': u('\u65b0\u7586\u514b\u62c9\u739b\u4f9d\u5e02')},
+ '86181961':{'en': 'Changji, Xinjiang', 'zh': u('\u65b0\u7586\u660c\u5409\u56de\u65cf\u81ea\u6cbb\u5dde')},
+ '86181962':{'en': 'Bayingolin, Xinjiang', 'zh': u('\u65b0\u7586\u5df4\u97f3\u90ed\u695e\u8499\u53e4\u81ea\u6cbb\u5dde')},
+ '86181963':{'en': 'Aksu, Xinjiang', 'zh': u('\u65b0\u7586\u963f\u514b\u82cf\u5730\u533a')},
+ '86181964':{'en': 'Ili, Xinjiang', 'zh': u('\u65b0\u7586\u4f0a\u7281\u54c8\u8428\u514b\u81ea\u6cbb\u5dde')},
  '86181965':{'en': 'Wuhu, Anhui', 'zh': u('\u5b89\u5fbd\u7701\u829c\u6e56\u5e02')},
  '86181966':{'en': 'Bengbu, Anhui', 'zh': u('\u5b89\u5fbd\u7701\u868c\u57e0\u5e02')},
  '861819666':{'en': 'Wuhu, Anhui', 'zh': u('\u5b89\u5fbd\u7701\u829c\u6e56\u5e02')},
@@ -9998,25 +10019,4 @@
  '861853841':{'en': 'Zhengzhou, Henan', 'zh': u('\u6cb3\u5357\u7701\u90d1\u5dde\u5e02')},
  '861853842':{'en': 'Zhengzhou, Henan', 'zh': u('\u6cb3\u5357\u7701\u90d1\u5dde\u5e02')},
  '861853843':{'en': 'Zhengzhou, Henan', 'zh': u('\u6cb3\u5357\u7701\u90d1\u5dde\u5e02')},
- '861853844':{'en': 'Nanyang, Henan', 'zh': u('\u6cb3\u5357\u7701\u5357\u9633\u5e02')},
- '861853845':{'en': 'Nanyang, Henan', 'zh': u('\u6cb3\u5357\u7701\u5357\u9633\u5e02')},
- '861853846':{'en': 'Nanyang, Henan', 'zh': u('\u6cb3\u5357\u7701\u5357\u9633\u5e02')},
- '861853847':{'en': 'Luoyang, Henan', 'zh': u('\u6cb3\u5357\u7701\u6d1b\u9633\u5e02')},
- '861853848':{'en': 'Luoyang, Henan', 'zh': u('\u6cb3\u5357\u7701\u6d1b\u9633\u5e02')},
- '861853849':{'en': 'Xinyang, Henan', 'zh': u('\u6cb3\u5357\u7701\u4fe1\u9633\u5e02')},
- '86185385':{'en': 'Zhengzhou, Henan', 'zh': u('\u6cb3\u5357\u7701\u90d1\u5dde\u5e02')},
- '86185386':{'en': 'Zhoukou, Henan', 'zh': u('\u6cb3\u5357\u7701\u5468\u53e3\u5e02')},
- '861853869':{'en': 'Pingdingshan, Henan', 'zh': u('\u6cb3\u5357\u7701\u5e73\u9876\u5c71\u5e02')},
- '86185387':{'en': 'Zhengzhou, Henan', 'zh': u('\u6cb3\u5357\u7701\u90d1\u5dde\u5e02')},
- '86185388':{'en': 'Luoyang, Henan', 'zh': u('\u6cb3\u5357\u7701\u6d1b\u9633\u5e02')},
- '861853890':{'en': 'Jiaozuo, Henan', 'zh': u('\u6cb3\u5357\u7701\u7126\u4f5c\u5e02')},
- '861853891':{'en': 'Jiaozuo, Henan', 'zh': u('\u6cb3\u5357\u7701\u7126\u4f5c\u5e02')},
- '861853892':{'en': 'Zhengzhou, Henan', 'zh': u('\u6cb3\u5357\u7701\u90d1\u5dde\u5e02')},
- '861853893':{'en': 'Zhengzhou, Henan', 'zh': u('\u6cb3\u5357\u7701\u90d1\u5dde\u5e02')},
- '861853894':{'en': 'Zhengzhou, Henan', 'zh': u('\u6cb3\u5357\u7701\u90d1\u5dde\u5e02')},
- '861853895':{'en': 'Nanyang, Henan', 'zh': u('\u6cb3\u5357\u7701\u5357\u9633\u5e02')},
- '861853896':{'en': 'Nanyang, Henan', 'zh': u('\u6cb3\u5357\u7701\u5357\u9633\u5e02')},
- '861853897':{'en': 'Nanyang, Henan', 'zh': u('\u6cb3\u5357\u7701\u5357\u9633\u5e02')},
- '861853898':{'en': 'Nanyang, Henan', 'zh': u('\u6cb3\u5357\u7701\u5357\u9633\u5e02')},
- '861853899':{'en': 'Nanyang, Henan', 'zh': u('\u6cb3\u5357\u7701\u5357\u9633\u5e02')},
 }
diff --git a/python/phonenumbers/geodata/data26.py b/python/phonenumbers/geodata/data26.py
index 23f5bbf19..0f65ce45b 100644
--- a/python/phonenumbers/geodata/data26.py
+++ b/python/phonenumbers/geodata/data26.py
@@ -19,6 +19,27 @@
 # limitations under the License.
 
 data = {
+ '861853844':{'en': 'Nanyang, Henan', 'zh': u('\u6cb3\u5357\u7701\u5357\u9633\u5e02')},
+ '861853845':{'en': 'Nanyang, Henan', 'zh': u('\u6cb3\u5357\u7701\u5357\u9633\u5e02')},
+ '861853846':{'en': 'Nanyang, Henan', 'zh': u('\u6cb3\u5357\u7701\u5357\u9633\u5e02')},
+ '861853847':{'en': 'Luoyang, Henan', 'zh': u('\u6cb3\u5357\u7701\u6d1b\u9633\u5e02')},
+ '861853848':{'en': 'Luoyang, Henan', 'zh': u('\u6cb3\u5357\u7701\u6d1b\u9633\u5e02')},
+ '861853849':{'en': 'Xinyang, Henan', 'zh': u('\u6cb3\u5357\u7701\u4fe1\u9633\u5e02')},
+ '86185385':{'en': 'Zhengzhou, Henan', 'zh': u('\u6cb3\u5357\u7701\u90d1\u5dde\u5e02')},
+ '86185386':{'en': 'Zhoukou, Henan', 'zh': u('\u6cb3\u5357\u7701\u5468\u53e3\u5e02')},
+ '861853869':{'en': 'Pingdingshan, Henan', 'zh': u('\u6cb3\u5357\u7701\u5e73\u9876\u5c71\u5e02')},
+ '86185387':{'en': 'Zhengzhou, Henan', 'zh': u('\u6cb3\u5357\u7701\u90d1\u5dde\u5e02')},
+ '86185388':{'en': 'Luoyang, Henan', 'zh': u('\u6cb3\u5357\u7701\u6d1b\u9633\u5e02')},
+ '861853890':{'en': 'Jiaozuo, Henan', 'zh': u('\u6cb3\u5357\u7701\u7126\u4f5c\u5e02')},
+ '861853891':{'en': 'Jiaozuo, Henan', 'zh': u('\u6cb3\u5357\u7701\u7126\u4f5c\u5e02')},
+ '861853892':{'en': 'Zhengzhou, Henan', 'zh': u('\u6cb3\u5357\u7701\u90d1\u5dde\u5e02')},
+ '861853893':{'en': 'Zhengzhou, Henan', 'zh': u('\u6cb3\u5357\u7701\u90d1\u5dde\u5e02')},
+ '861853894':{'en': 'Zhengzhou, Henan', 'zh': u('\u6cb3\u5357\u7701\u90d1\u5dde\u5e02')},
+ '861853895':{'en': 'Nanyang, Henan', 'zh': u('\u6cb3\u5357\u7701\u5357\u9633\u5e02')},
+ '861853896':{'en': 'Nanyang, Henan', 'zh': u('\u6cb3\u5357\u7701\u5357\u9633\u5e02')},
+ '861853897':{'en': 'Nanyang, Henan', 'zh': u('\u6cb3\u5357\u7701\u5357\u9633\u5e02')},
+ '861853898':{'en': 'Nanyang, Henan', 'zh': u('\u6cb3\u5357\u7701\u5357\u9633\u5e02')},
+ '861853899':{'en': 'Nanyang, Henan', 'zh': u('\u6cb3\u5357\u7701\u5357\u9633\u5e02')},
  '86185390':{'en': 'Xuchang, Henan', 'zh': u('\u6cb3\u5357\u7701\u8bb8\u660c\u5e02')},
  '86185391':{'en': 'Jiaozuo, Henan', 'zh': u('\u6cb3\u5357\u7701\u7126\u4f5c\u5e02')},
  '86185392':{'en': 'Zhengzhou, Henan', 'zh': u('\u6cb3\u5357\u7701\u90d1\u5dde\u5e02')},
@@ -9998,25 +10019,4 @@
  '861881643':{'en': 'Jiujiang, Jiangxi', 'zh': u('\u6c5f\u897f\u7701\u4e5d\u6c5f\u5e02')},
  '86188165':{'en': 'Shanghai', 'zh': u('\u4e0a\u6d77\u5e02')},
  '86188166':{'en': 'Shanghai', 'zh': u('\u4e0a\u6d77\u5e02')},
- '861881670':{'en': 'Zhanjiang, Guangdong', 'zh': u('\u5e7f\u4e1c\u7701\u6e5b\u6c5f\u5e02')},
- '861881671':{'en': 'Maoming, Guangdong', 'zh': u('\u5e7f\u4e1c\u7701\u8302\u540d\u5e02')},
- '861881672':{'en': 'Meizhou, Guangdong', 'zh': u('\u5e7f\u4e1c\u7701\u6885\u5dde\u5e02')},
- '861881673':{'en': 'Jiangmen, Guangdong', 'zh': u('\u5e7f\u4e1c\u7701\u6c5f\u95e8\u5e02')},
- '861881674':{'en': 'Shenzhen, Guangdong', 'zh': u('\u5e7f\u4e1c\u7701\u6df1\u5733\u5e02')},
- '861881675':{'en': 'Dongguan, Guangdong', 'zh': u('\u5e7f\u4e1c\u7701\u4e1c\u839e\u5e02')},
- '861881676':{'en': 'Shenzhen, Guangdong', 'zh': u('\u5e7f\u4e1c\u7701\u6df1\u5733\u5e02')},
- '861881677':{'en': 'Huizhou, Guangdong', 'zh': u('\u5e7f\u4e1c\u7701\u60e0\u5dde\u5e02')},
- '861881678':{'en': 'Guangzhou, Guangdong', 'zh': u('\u5e7f\u4e1c\u7701\u5e7f\u5dde\u5e02')},
- '861881679':{'en': 'Guangzhou, Guangdong', 'zh': u('\u5e7f\u4e1c\u7701\u5e7f\u5dde\u5e02')},
- '861881680':{'en': 'Guangzhou, Guangdong', 'zh': u('\u5e7f\u4e1c\u7701\u5e7f\u5dde\u5e02')},
- '861881681':{'en': 'Dongguan, Guangdong', 'zh': u('\u5e7f\u4e1c\u7701\u4e1c\u839e\u5e02')},
- '861881682':{'en': 'Shenzhen, Guangdong', 'zh': u('\u5e7f\u4e1c\u7701\u6df1\u5733\u5e02')},
- '861881683':{'en': 'Guangzhou, Guangdong', 'zh': u('\u5e7f\u4e1c\u7701\u5e7f\u5dde\u5e02')},
- '861881684':{'en': 'Shantou, Guangdong', 'zh': u('\u5e7f\u4e1c\u7701\u6c55\u5934\u5e02')},
- '861881685':{'en': 'Shenzhen, Guangdong', 'zh': u('\u5e7f\u4e1c\u7701\u6df1\u5733\u5e02')},
- '861881686':{'en': 'Foshan, Guangdong', 'zh': u('\u5e7f\u4e1c\u7701\u4f5b\u5c71\u5e02')},
- '861881687':{'en': 'Zhongshan, Guangdong', 'zh': u('\u5e7f\u4e1c\u7701\u4e2d\u5c71\u5e02')},
- '861881688':{'en': 'Shenzhen, Guangdong', 'zh': u('\u5e7f\u4e1c\u7701\u6df1\u5733\u5e02')},
- '861881689':{'en': 'Guangzhou, Guangdong', 'zh': u('\u5e7f\u4e1c\u7701\u5e7f\u5dde\u5e02')},
- '86188169':{'en': 'Shanghai', 'zh': u('\u4e0a\u6d77\u5e02')},
 }
diff --git a/python/phonenumbers/geodata/data27.py b/python/phonenumbers/geodata/data27.py
index a2b30f7eb..957e1276f 100644
--- a/python/phonenumbers/geodata/data27.py
+++ b/python/phonenumbers/geodata/data27.py
@@ -19,6 +19,27 @@
 # limitations under the License.
 
 data = {
+ '861881670':{'en': 'Zhanjiang, Guangdong', 'zh': u('\u5e7f\u4e1c\u7701\u6e5b\u6c5f\u5e02')},
+ '861881671':{'en': 'Maoming, Guangdong', 'zh': u('\u5e7f\u4e1c\u7701\u8302\u540d\u5e02')},
+ '861881672':{'en': 'Meizhou, Guangdong', 'zh': u('\u5e7f\u4e1c\u7701\u6885\u5dde\u5e02')},
+ '861881673':{'en': 'Jiangmen, Guangdong', 'zh': u('\u5e7f\u4e1c\u7701\u6c5f\u95e8\u5e02')},
+ '861881674':{'en': 'Shenzhen, Guangdong', 'zh': u('\u5e7f\u4e1c\u7701\u6df1\u5733\u5e02')},
+ '861881675':{'en': 'Dongguan, Guangdong', 'zh': u('\u5e7f\u4e1c\u7701\u4e1c\u839e\u5e02')},
+ '861881676':{'en': 'Shenzhen, Guangdong', 'zh': u('\u5e7f\u4e1c\u7701\u6df1\u5733\u5e02')},
+ '861881677':{'en': 'Huizhou, Guangdong', 'zh': u('\u5e7f\u4e1c\u7701\u60e0\u5dde\u5e02')},
+ '861881678':{'en': 'Guangzhou, Guangdong', 'zh': u('\u5e7f\u4e1c\u7701\u5e7f\u5dde\u5e02')},
+ '861881679':{'en': 'Guangzhou, Guangdong', 'zh': u('\u5e7f\u4e1c\u7701\u5e7f\u5dde\u5e02')},
+ '861881680':{'en': 'Guangzhou, Guangdong', 'zh': u('\u5e7f\u4e1c\u7701\u5e7f\u5dde\u5e02')},
+ '861881681':{'en': 'Dongguan, Guangdong', 'zh': u('\u5e7f\u4e1c\u7701\u4e1c\u839e\u5e02')},
+ '861881682':{'en': 'Shenzhen, Guangdong', 'zh': u('\u5e7f\u4e1c\u7701\u6df1\u5733\u5e02')},
+ '861881683':{'en': 'Guangzhou, Guangdong', 'zh': u('\u5e7f\u4e1c\u7701\u5e7f\u5dde\u5e02')},
+ '861881684':{'en': 'Shantou, Guangdong', 'zh': u('\u5e7f\u4e1c\u7701\u6c55\u5934\u5e02')},
+ '861881685':{'en': 'Shenzhen, Guangdong', 'zh': u('\u5e7f\u4e1c\u7701\u6df1\u5733\u5e02')},
+ '861881686':{'en': 'Foshan, Guangdong', 'zh': u('\u5e7f\u4e1c\u7701\u4f5b\u5c71\u5e02')},
+ '861881687':{'en': 'Zhongshan, Guangdong', 'zh': u('\u5e7f\u4e1c\u7701\u4e2d\u5c71\u5e02')},
+ '861881688':{'en': 'Shenzhen, Guangdong', 'zh': u('\u5e7f\u4e1c\u7701\u6df1\u5733\u5e02')},
+ '861881689':{'en': 'Guangzhou, Guangdong', 'zh': u('\u5e7f\u4e1c\u7701\u5e7f\u5dde\u5e02')},
+ '86188169':{'en': 'Shanghai', 'zh': u('\u4e0a\u6d77\u5e02')},
  '8618817':{'en': 'Shanghai', 'zh': u('\u4e0a\u6d77\u5e02')},
  '861881700':{'en': 'Yueyang, Hunan', 'zh': u('\u6e56\u5357\u7701\u5cb3\u9633\u5e02')},
  '861881701':{'en': 'Yueyang, Hunan', 'zh': u('\u6e56\u5357\u7701\u5cb3\u9633\u5e02')},
@@ -9998,25 +10019,4 @@
  '9167613':{'en': 'Chhendipada, Odisha'},
  '9167614':{'en': 'Chhendipada, Odisha'},
  '9167615':{'en': 'Chhendipada, Odisha'},
- '9167616':{'en': 'Chhendipada, Odisha'},
- '9167617':{'en': 'Chhendipada, Odisha'},
- '9167622':{'en': 'Dhenkanal, Odisha'},
- '9167623':{'en': 'Dhenkanal, Odisha'},
- '9167624':{'en': 'Dhenkanal, Odisha'},
- '9167625':{'en': 'Dhenkanal, Odisha'},
- '9167626':{'en': 'Dhenkanal, Odisha'},
- '9167627':{'en': 'Dhenkanal, Odisha'},
- '9167632':{'en': 'Athmallik, Odisha'},
- '9167633':{'en': 'Athmallik, Odisha'},
- '9167634':{'en': 'Athmallik, Odisha'},
- '9167635':{'en': 'Athmallik, Odisha'},
- '9167636':{'en': 'Athmallik, Odisha'},
- '9167637':{'en': 'Athmallik, Odisha'},
- '9167642':{'en': 'Anugul, Odisha'},
- '9167643':{'en': 'Anugul, Odisha'},
- '9167644':{'en': 'Anugul, Odisha'},
- '9167645':{'en': 'Anugul, Odisha'},
- '9167646':{'en': 'Anugul, Odisha'},
- '9167647':{'en': 'Anugul, Odisha'},
- '9167652':{'en': 'Palla Hara, Odisha'},
 }
diff --git a/python/phonenumbers/geodata/data28.py b/python/phonenumbers/geodata/data28.py
index 8c355ad4f..fab2fc9ec 100644
--- a/python/phonenumbers/geodata/data28.py
+++ b/python/phonenumbers/geodata/data28.py
@@ -19,6 +19,27 @@
 # limitations under the License.
 
 data = {
+ '9167616':{'en': 'Chhendipada, Odisha'},
+ '9167617':{'en': 'Chhendipada, Odisha'},
+ '9167622':{'en': 'Dhenkanal, Odisha'},
+ '9167623':{'en': 'Dhenkanal, Odisha'},
+ '9167624':{'en': 'Dhenkanal, Odisha'},
+ '9167625':{'en': 'Dhenkanal, Odisha'},
+ '9167626':{'en': 'Dhenkanal, Odisha'},
+ '9167627':{'en': 'Dhenkanal, Odisha'},
+ '9167632':{'en': 'Athmallik, Odisha'},
+ '9167633':{'en': 'Athmallik, Odisha'},
+ '9167634':{'en': 'Athmallik, Odisha'},
+ '9167635':{'en': 'Athmallik, Odisha'},
+ '9167636':{'en': 'Athmallik, Odisha'},
+ '9167637':{'en': 'Athmallik, Odisha'},
+ '9167642':{'en': 'Anugul, Odisha'},
+ '9167643':{'en': 'Anugul, Odisha'},
+ '9167644':{'en': 'Anugul, Odisha'},
+ '9167645':{'en': 'Anugul, Odisha'},
+ '9167646':{'en': 'Anugul, Odisha'},
+ '9167647':{'en': 'Anugul, Odisha'},
+ '9167652':{'en': 'Palla Hara, Odisha'},
  '9167653':{'en': 'Palla Hara, Odisha'},
  '9167654':{'en': 'Palla Hara, Odisha'},
  '9167655':{'en': 'Palla Hara, Odisha'},
diff --git a/python/phonenumbers/geodata/data6.py b/python/phonenumbers/geodata/data6.py
index 0c2446dc7..017a5456a 100644
--- a/python/phonenumbers/geodata/data6.py
+++ b/python/phonenumbers/geodata/data6.py
@@ -2810,11 +2810,16 @@
  '5042201':{'en': 'Polo Paz'},
  '5042202':{'en': 'Tegucigalpa'},
  '5042203':{'en': 'Polo Paz'},
+ '5042204':{'en': 'Francisco Morazan'},
  '5042209':{'en': u('Res. Centro Am\u00e9rica, Tegucigalpa')},
  '5042211':{'en': 'El Picacho'},
  '5042212':{'en': 'Rdsi Tegucigalpa (Pri3)'},
  '5042213':{'en': u('Telef. Inal\u00e1mbrica Tegucig.')},
+ '5042214':{'en': 'Francisco Morazan'},
+ '5042215':{'en': 'Francisco Morazan'},
  '5042216':{'en': 'Rdsi Tegucigalpa (Pri3)'},
+ '5042218':{'en': 'Francisco Morazan'},
+ '5042219':{'en': 'Francisco Morazan'},
  '5042220':{'en': 'Principal'},
  '5042221':{'en': 'Almendros'},
  '5042222':{'en': 'Principal'},
@@ -2836,13 +2841,17 @@
  '5042238':{'en': 'Principal'},
  '5042239':{'en': 'Miraflores'},
  '5042240':{'en': 'Kennedy, Tegucigalpa'},
+ '5042242':{'en': 'Francisco Morazan'},
  '5042244':{'en': 'Tegucigalpa'},
  '5042245':{'en': 'La Vega, Tegucigalpa'},
  '5042246':{'en': 'La Vega, Tegucigalpa'},
  '5042255':{'en': 'El Hato'},
  '5042257':{'en': 'Prados Universitarios'},
+ '5042281':{'en': 'Francisco Morazan'},
+ '5042283':{'en': 'Francisco Morazan'},
  '5042290':{'en': 'Toncontin'},
  '5042291':{'en': 'Toncontin'},
+ '5042405':{'en': 'Atlantida'},
  '5042407':{'en': u('Roat\u00e1n, Bay Islands')},
  '5042423':{'en': 'La Ceiba'},
  '5042424':{'en': u('Sab\u00e1')},
@@ -2865,7 +2874,15 @@
  '5042452':{'en': 'Coyoles Central'},
  '5042453':{'en': 'Guanaja'},
  '5042455':{'en': 'French Harbour'},
- '504251':{'en': u('San Pedro Sula, Cort\u00e9s')},
+ '5042458':{'en': 'Atlantida'},
+ '5042459':{'en': 'Atlantida'},
+ '5042502':{'en': 'Cortes'},
+ '5042503':{'en': 'Cortes'},
+ '5042505':{'en': 'Cortes'},
+ '5042511':{'en': 'Cortes'},
+ '5042513':{'en': 'Cortes'},
+ '5042515':{'en': 'Cortes'},
+ '5042516':{'en': u('San Pedro Sula, Cort\u00e9s')},
  '5042540':{'en': u('San Pedro Sula, Cort\u00e9s')},
  '5042543':{'en': u('Inal\u00e1mbrica Sps')},
  '5042544':{'en': 'Rdsi San Pedro Sula'},
@@ -2883,8 +2900,11 @@
  '5042564':{'en': u('San Pedro Sula, Cort\u00e9s')},
  '5042565':{'en': u('Chamelec\u00f3n')},
  '5042566':{'en': 'Jardines Del Valle'},
+ '5042569':{'en': 'Cortes'},
+ '5042570':{'en': 'Cortes'},
  '5042574':{'en': u('B\u00fafalo')},
  '504261':{'en': u('Choloma, Cort\u00e9s')},
+ '5042637':{'en': 'Santa Barbra'},
  '5042640':{'en': 'C. Comunitarios'},
  '5042641':{'en': 'C. Comunitarios'},
  '5042642':{'en': 'C. Comunitarios'},
@@ -2911,6 +2931,7 @@
  '504268':{'en': 'La Lima'},
  '5042690':{'en': 'El Negrito'},
  '5042691':{'en': u('Moraz\u00e1n')},
+ '504270':{'en': 'Olancho'},
  '5042764':{'en': 'Amarat/Marcala'},
  '5042766':{'en': u('Valle De \u00c1ngeles')},
  '5042767':{'en': 'Ojojona'},
@@ -9998,25 +10019,4 @@
  '55493382':{'en': u('Xanxer\u00ea - SC'), 'pt': u('Xanxer\u00ea - SC')},
  '55493424':{'en': 'Bom Jesus - SC', 'pt': 'Bom Jesus - SC'},
  '55493425':{'en': u('Conc\u00f3rdia - SC'), 'pt': u('Conc\u00f3rdia - SC')},
- '55493431':{'en': u('Xanxer\u00ea - SC'), 'pt': u('Xanxer\u00ea - SC')},
- '55493432':{'en': 'Irani - SC', 'pt': 'Irani - SC'},
- '55493433':{'en': u('Xanxer\u00ea - SC'), 'pt': u('Xanxer\u00ea - SC')},
- '55493434':{'en': u('Varge\u00e3o - SC'), 'pt': u('Varge\u00e3o - SC')},
- '55493435':{'en': 'Ponte Serrada - SC', 'pt': 'Ponte Serrada - SC'},
- '55493436':{'en': 'Faxinal dos Guedes - SC', 'pt': 'Faxinal dos Guedes - SC'},
- '55493437':{'en': 'Passos Maia - SC', 'pt': 'Passos Maia - SC'},
- '55493438':{'en': 'Ipumirim - SC', 'pt': 'Ipumirim - SC'},
- '55493439':{'en': 'Linha Planalto - SC', 'pt': 'Linha Planalto - SC'},
- '55493441':{'en': u('Conc\u00f3rdia - SC'), 'pt': u('Conc\u00f3rdia - SC')},
- '55493442':{'en': u('Conc\u00f3rdia - SC'), 'pt': u('Conc\u00f3rdia - SC')},
- '55493443':{'en': u('S\u00e3o Domingos - SC'), 'pt': u('S\u00e3o Domingos - SC')},
- '55493444':{'en': u('Conc\u00f3rdia - SC'), 'pt': u('Conc\u00f3rdia - SC')},
- '55493445':{'en': 'Abelardo Luz - SC', 'pt': 'Abelardo Luz - SC'},
- '55493446':{'en': u('Lind\u00f3ia do Sul - SC'), 'pt': u('Lind\u00f3ia do Sul - SC')},
- '55493447':{'en': 'Ouro Verde - SC', 'pt': 'Ouro Verde - SC'},
- '55493448':{'en': u('Arabut\u00e3 - SC'), 'pt': u('Arabut\u00e3 - SC')},
- '55493449':{'en': u('Ipua\u00e7u - SC'), 'pt': u('Ipua\u00e7u - SC')},
- '55493451':{'en': 'Paial - SC', 'pt': 'Paial - SC'},
- '55493452':{'en': 'Seara - SC', 'pt': 'Seara - SC'},
- '55493453':{'en': 'Peritiba - SC', 'pt': 'Peritiba - SC'},
 }
diff --git a/python/phonenumbers/geodata/data7.py b/python/phonenumbers/geodata/data7.py
index 14ee028e5..c7aedc65b 100644
--- a/python/phonenumbers/geodata/data7.py
+++ b/python/phonenumbers/geodata/data7.py
@@ -19,6 +19,27 @@
 # limitations under the License.
 
 data = {
+ '55493431':{'en': u('Xanxer\u00ea - SC'), 'pt': u('Xanxer\u00ea - SC')},
+ '55493432':{'en': 'Irani - SC', 'pt': 'Irani - SC'},
+ '55493433':{'en': u('Xanxer\u00ea - SC'), 'pt': u('Xanxer\u00ea - SC')},
+ '55493434':{'en': u('Varge\u00e3o - SC'), 'pt': u('Varge\u00e3o - SC')},
+ '55493435':{'en': 'Ponte Serrada - SC', 'pt': 'Ponte Serrada - SC'},
+ '55493436':{'en': 'Faxinal dos Guedes - SC', 'pt': 'Faxinal dos Guedes - SC'},
+ '55493437':{'en': 'Passos Maia - SC', 'pt': 'Passos Maia - SC'},
+ '55493438':{'en': 'Ipumirim - SC', 'pt': 'Ipumirim - SC'},
+ '55493439':{'en': 'Linha Planalto - SC', 'pt': 'Linha Planalto - SC'},
+ '55493441':{'en': u('Conc\u00f3rdia - SC'), 'pt': u('Conc\u00f3rdia - SC')},
+ '55493442':{'en': u('Conc\u00f3rdia - SC'), 'pt': u('Conc\u00f3rdia - SC')},
+ '55493443':{'en': u('S\u00e3o Domingos - SC'), 'pt': u('S\u00e3o Domingos - SC')},
+ '55493444':{'en': u('Conc\u00f3rdia - SC'), 'pt': u('Conc\u00f3rdia - SC')},
+ '55493445':{'en': 'Abelardo Luz - SC', 'pt': 'Abelardo Luz - SC'},
+ '55493446':{'en': u('Lind\u00f3ia do Sul - SC'), 'pt': u('Lind\u00f3ia do Sul - SC')},
+ '55493447':{'en': 'Ouro Verde - SC', 'pt': 'Ouro Verde - SC'},
+ '55493448':{'en': u('Arabut\u00e3 - SC'), 'pt': u('Arabut\u00e3 - SC')},
+ '55493449':{'en': u('Ipua\u00e7u - SC'), 'pt': u('Ipua\u00e7u - SC')},
+ '55493451':{'en': 'Paial - SC', 'pt': 'Paial - SC'},
+ '55493452':{'en': 'Seara - SC', 'pt': 'Seara - SC'},
+ '55493453':{'en': 'Peritiba - SC', 'pt': 'Peritiba - SC'},
  '55493454':{'en': 'Xavantina - SC', 'pt': 'Xavantina - SC'},
  '55493455':{'en': 'Alto Bela Vista - SC', 'pt': 'Alto Bela Vista - SC'},
  '55493456':{'en': 'Campina da Alegria - SC', 'pt': 'Campina da Alegria - SC'},
@@ -9998,25 +10019,4 @@
  '609738':{'en': 'Kota Bharu'},
  '60974':{'en': 'Kota Bharu'},
  '609750':{'en': 'Kota Bharu'},
- '609751':{'en': 'Kota Bharu'},
- '609752':{'en': 'Pasir Putih'},
- '609753':{'en': 'Bachok'},
- '609754':{'en': 'Bachok'},
- '609755':{'en': 'Kota Bharu'},
- '609758':{'en': 'Pasir Putih'},
- '609759':{'en': 'Pasirputih'},
- '609760':{'en': 'Bachok'},
- '609762':{'en': 'Pasir Putih'},
- '609764':{'en': 'Bachok'},
- '609765':{'en': 'Bachok'},
- '609766':{'en': 'Bachok'},
- '609767':{'en': 'Bachok'},
- '609768':{'en': 'Bachok'},
- '609769':{'en': 'Bachok'},
- '609770':{'en': 'Bachok'},
- '609771':{'en': 'Kota Bharu'},
- '609772':{'en': 'Kok Lanas'},
- '609773':{'en': 'Kota Bharu'},
- '609774':{'en': 'Kota Bharu'},
- '609775':{'en': 'Kota Bharu'},
 }
diff --git a/python/phonenumbers/geodata/data8.py b/python/phonenumbers/geodata/data8.py
index 8343f15f8..be9185663 100644
--- a/python/phonenumbers/geodata/data8.py
+++ b/python/phonenumbers/geodata/data8.py
@@ -19,6 +19,27 @@
 # limitations under the License.
 
 data = {
+ '609751':{'en': 'Kota Bharu'},
+ '609752':{'en': 'Pasir Putih'},
+ '609753':{'en': 'Bachok'},
+ '609754':{'en': 'Bachok'},
+ '609755':{'en': 'Kota Bharu'},
+ '609758':{'en': 'Pasir Putih'},
+ '609759':{'en': 'Pasirputih'},
+ '609760':{'en': 'Bachok'},
+ '609762':{'en': 'Pasir Putih'},
+ '609764':{'en': 'Bachok'},
+ '609765':{'en': 'Bachok'},
+ '609766':{'en': 'Bachok'},
+ '609767':{'en': 'Bachok'},
+ '609768':{'en': 'Bachok'},
+ '609769':{'en': 'Bachok'},
+ '609770':{'en': 'Bachok'},
+ '609771':{'en': 'Kota Bharu'},
+ '609772':{'en': 'Kok Lanas'},
+ '609773':{'en': 'Kota Bharu'},
+ '609774':{'en': 'Kota Bharu'},
+ '609775':{'en': 'Kota Bharu'},
  '609776':{'en': 'Bachok'},
  '609778':{'en': 'Bachok'},
  '609779':{'en': 'Bachok'},
@@ -9998,25 +10019,4 @@
  '612630794':{'en': 'Burraga'},
  '612630795':{'en': 'Burraga'},
  '612630796':{'en': 'Limekilns'},
- '612630797':{'en': 'Burraga'},
- '612630798':{'en': 'Burraga'},
- '612630799':{'en': 'Burraga'},
- '61263080':{'en': 'Gingkin'},
- '61263081':{'en': 'Gingkin'},
- '61263082':{'en': 'Gingkin'},
- '61263083':{'en': 'Glen Davis'},
- '61263084':{'en': 'Glen Davis'},
- '61263085':{'en': 'Glen Davis'},
- '61263086':{'en': 'Gooloogong'},
- '61263087':{'en': 'Gooloogong'},
- '61263088':{'en': 'Gooloogong'},
- '612630890':{'en': 'Oberon'},
- '612630891':{'en': 'Oberon'},
- '612630892':{'en': 'Oberon'},
- '612630893':{'en': 'Oberon'},
- '612630894':{'en': 'Burraga'},
- '612630895':{'en': 'Burraga'},
- '612630896':{'en': 'Oberon'},
- '612630897':{'en': 'Burraga'},
- '612630898':{'en': 'Burraga'},
 }
diff --git a/python/phonenumbers/geodata/data9.py b/python/phonenumbers/geodata/data9.py
index c3dc5a0b8..3b8384f40 100644
--- a/python/phonenumbers/geodata/data9.py
+++ b/python/phonenumbers/geodata/data9.py
@@ -19,6 +19,27 @@
 # limitations under the License.
 
 data = {
+ '612630797':{'en': 'Burraga'},
+ '612630798':{'en': 'Burraga'},
+ '612630799':{'en': 'Burraga'},
+ '61263080':{'en': 'Gingkin'},
+ '61263081':{'en': 'Gingkin'},
+ '61263082':{'en': 'Gingkin'},
+ '61263083':{'en': 'Glen Davis'},
+ '61263084':{'en': 'Glen Davis'},
+ '61263085':{'en': 'Glen Davis'},
+ '61263086':{'en': 'Gooloogong'},
+ '61263087':{'en': 'Gooloogong'},
+ '61263088':{'en': 'Gooloogong'},
+ '612630890':{'en': 'Oberon'},
+ '612630891':{'en': 'Oberon'},
+ '612630892':{'en': 'Oberon'},
+ '612630893':{'en': 'Oberon'},
+ '612630894':{'en': 'Burraga'},
+ '612630895':{'en': 'Burraga'},
+ '612630896':{'en': 'Oberon'},
+ '612630897':{'en': 'Burraga'},
+ '612630898':{'en': 'Burraga'},
  '612630899':{'en': 'Burraga'},
  '61263090':{'en': 'Greenethorpe'},
  '61263091':{'en': 'Greenethorpe'},
@@ -9998,25 +10019,4 @@
  '61348115':{'en': 'Shepparton'},
  '61348116':{'en': 'Tatura'},
  '61348117':{'en': 'Tocumwal'},
- '61348118':{'en': 'Tongala'},
- '61348119':{'en': 'Undera'},
- '6134812':{'en': 'Shepparton'},
- '61348120':{'en': 'Wakool'},
- '61348130':{'en': 'Shepparton'},
- '61348131':{'en': 'Wanganella'},
- '61348132':{'en': 'Yalca'},
- '61348133':{'en': 'Tongala'},
- '61348134':{'en': 'Tongala'},
- '61348135':{'en': 'Tongala'},
- '61348136':{'en': 'Tocumwal'},
- '61348137':{'en': 'Tocumwal'},
- '61348138':{'en': 'Tocumwal'},
- '61348139':{'en': 'Berrigan'},
- '61348140':{'en': 'Blighty'},
- '61348141':{'en': 'Brassi'},
- '61348142':{'en': 'Caldwell'},
- '61348143':{'en': 'Cobram'},
- '61348144':{'en': 'Conargo'},
- '61348145':{'en': 'Cornalla'},
- '61348146':{'en': 'Deniliquin'},
 }
diff --git a/python/phonenumbers/shortdata/region_FI.py b/python/phonenumbers/shortdata/region_FI.py
index 6e9894334..46de3462d 100644
--- a/python/phonenumbers/shortdata/region_FI.py
+++ b/python/phonenumbers/shortdata/region_FI.py
@@ -5,5 +5,5 @@
     general_desc=PhoneNumberDesc(national_number_pattern='[17]\\d\\d(?:\\d{2,3})?', possible_length=(3, 5, 6)),
     toll_free=PhoneNumberDesc(national_number_pattern='11(?:2|6\\d{3})', example_number='112', possible_length=(3, 6)),
     emergency=PhoneNumberDesc(national_number_pattern='112', example_number='112', possible_length=(3,)),
-    short_code=PhoneNumberDesc(national_number_pattern='11(?:2|6(?:00[06]|11[17]))|75[12]\\d\\d', example_number='112', possible_length=(3, 5, 6)),
+    short_code=PhoneNumberDesc(national_number_pattern='11(?:2|6(?:00[06]|1(?:1[17]|23)))|75[12]\\d\\d', example_number='112', possible_length=(3, 5, 6)),
     short_data=True)