From 0949de6190dd134c5bce239add6ad469086854cf Mon Sep 17 00:00:00 2001
From: David Drysdale <drysdale@google.com>
Date: Tue, 4 Jun 2024 21:13:20 +0100
Subject: [PATCH] Merge metadata changes from upstream 8.13.38

Includes changes in resources/ up to and including
upstream commit 8c862eca9194:
  "[maven-release-plugin] prepare release v8.13.38"
---
 resources/PhoneNumberMetadata.xml | 138 ++++--------------------------
 resources/carrier/en/244.txt      |   1 +
 resources/carrier/en/40.txt       |  10 ++-
 resources/carrier/en/44.txt       |   8 +-
 resources/carrier/en/46.txt       |  17 ++++
 resources/carrier/en/592.txt      |   1 +
 resources/carrier/en/691.txt      |  19 ++--
 resources/timezones/map_data.txt  |  49 +----------
 8 files changed, 58 insertions(+), 185 deletions(-)

diff --git a/resources/PhoneNumberMetadata.xml b/resources/PhoneNumberMetadata.xml
index e85c35dbd..b62ef31e1 100644
--- a/resources/PhoneNumberMetadata.xml
+++ b/resources/PhoneNumberMetadata.xml
@@ -796,7 +796,7 @@
       <mobile>
         <possibleLengths national="9"/>
         <exampleNumber>923123456</exampleNumber>
-        <nationalNumberPattern>9[1-59]\d{7}</nationalNumberPattern>
+        <nationalNumberPattern>9[1-579]\d{7}</nationalNumberPattern>
       </mobile>
     </territory>
 
@@ -10560,7 +10560,7 @@
               1(?:
                 3(?:
                   [0-58]\d\d|
-                  73[0235]
+                  73[0-35]
                 )|
                 4(?:
                   (?:
@@ -10594,7 +10594,7 @@
                   )\d|
                   1(?:
                     [0-7]\d|
-                    8[0-2]
+                    8[0-3]
                   )
                 )|
                 (?:
@@ -12421,7 +12421,8 @@
             7(?:
               [013]\d|
               2[0-25-8]|
-              4[0-29]
+              4[0-29]|
+              5[1-9]
             )
           )\d{4}
         </nationalNumberPattern>
@@ -12511,7 +12512,7 @@
               8(?:
                 4[0-8]|
                 [59]\d|
-                6[01]
+                6[0-2]
               )
             )|
             58(?:
@@ -21322,13 +21323,10 @@
     <!-- http://en.wikipedia.org/wiki/%2B52 -->
     <!-- http://en.wikipedia.org/wiki/Premium-rate_telephone_number#Mexico -->
     <!-- http://en.wikipedia.org/wiki/Toll-free_telephone_number -->
-    <!-- When a number starts with 01 or 02, we remove the prefixes; when a number starts with 044
-         or 045 followed by 10 digits, we replace the prefixes with 1. This way all the mobile
-         numbers, regardless of whether they are written in international format (leading 1) or
-         national format (leading 044/045), will be parsed into the same form. -->
+    <!-- Dialling tokens 01, 02, 044, 045 and 1 are removed as they are no longer valid since
+         August 2019. -->
     <territory id="MX" countryCode="52" preferredInternationalPrefix="00"
-               internationalPrefix="0[09]" nationalPrefix="01"
-               nationalPrefixForParsing="0(?:[12]|4[45])|1" mobileNumberPortableRegion="true">
+               internationalPrefix="0[09]" mobileNumberPortableRegion="true">
       <availableFormats>
         <!-- 5-digit shortcodes (very rare). -->
         <numberFormat pattern="(\d{5})">
@@ -21336,8 +21334,8 @@
           <format>$1</format>
           <intlFormat>NA</intlFormat>
         </numberFormat>
-        <!-- Fixed line (2-digit area codes). -->
-        <numberFormat pattern="(\d{2})(\d{4})(\d{4})" nationalPrefixOptionalWhenFormatting="true">
+        <!-- Fixed line (2-digit area codes) and Mobile. -->
+        <numberFormat pattern="(\d{2})(\d{4})(\d{4})">
           <leadingDigits>
             33|
             5[56]|
@@ -21345,56 +21343,14 @@
           </leadingDigits>
           <format>$1 $2 $3</format>
         </numberFormat>
-        <!-- Fixed line (3-digit area codes) and other non-mobile numbers. -->
-        <numberFormat pattern="(\d{3})(\d{3})(\d{4})" nationalPrefixOptionalWhenFormatting="true">
+        <!-- Fixed line (3-digit area codes), Mobile and all other non geographic numbers. -->
+        <numberFormat pattern="(\d{3})(\d{3})(\d{4})">
           <leadingDigits>[2-9]</leadingDigits>
           <format>$1 $2 $3</format>
         </numberFormat>
-        <!-- Mobile version of fixed line 2-digit area codes and removing former mobile token 1. -->
-        <numberFormat pattern="(\d)(\d{2})(\d{4})(\d{4})"
-                      nationalPrefixOptionalWhenFormatting="true">
-          <leadingDigits>
-            1(?:
-              33|
-              5[56]|
-              81
-            )
-          </leadingDigits>
-          <format>$2 $3 $4</format>
-        </numberFormat>
-        <!-- Mobile version of fixed line 3-digit area codes and removing former mobile token 1. -->
-        <numberFormat pattern="(\d)(\d{3})(\d{3})(\d{4})"
-                      nationalPrefixOptionalWhenFormatting="true">
-          <leadingDigits>1</leadingDigits>
-          <format>$2 $3 $4</format>
-        </numberFormat>
       </availableFormats>
       <generalDesc>
-        <nationalNumberPattern>
-          1(?:
-            (?:
-              22|
-              44|
-              7[27]|
-              87|
-              9[69]
-            )[1-9]|
-            65[0-689]
-          )\d{7}|
-          (?:
-            1(?:
-              [01]\d|
-              2[13-9]|
-              [35][1-9]|
-              4[0-35-9]|
-              6[0-46-9]|
-              7[013-689]|
-              8[1-69]|
-              9[1-578]
-            )|
-            [2-9]\d
-          )\d{8}
-        </nationalNumberPattern>
+        <nationalNumberPattern>[2-9]\d{9}</nationalNumberPattern>
       </generalDesc>
       <!-- http://en.wikipedia.org/wiki/Area_codes_in_Mexico_by_code -->
       <!-- Also covering fixed satellite service numbers (prefixes: 200 and 201). -->
@@ -21473,73 +21429,11 @@
       <!-- Fixed satellite service numbers are not included here, although many other prefixes from
            the fixedLine pattern are. -->
       <mobile>
-        <possibleLengths national="10,11" localOnly="7,8"/>
-        <exampleNumber>12221234567</exampleNumber>
+        <possibleLengths national="10" localOnly="7,8"/>
+        <exampleNumber>2221234567</exampleNumber>
         <nationalNumberPattern>
           657[12]\d{6}|
           (?:
-            1(?:
-              2(?:
-                2[1-9]|
-                3[1-35-8]|
-                4[13-9]|
-                7[1-689]|
-                8[1-578]|
-                9[467]
-              )|
-              3(?:
-                1[1-79]|
-                [2458][1-9]|
-                3\d|
-                7[1-8]|
-                9[1-5]
-              )|
-              4(?:
-                1[1-57-9]|
-                [24-7][1-9]|
-                3[1-8]|
-                8[1-35-9]|
-                9[2-689]
-              )|
-              5(?:
-                [56]\d|
-                88|
-                9[1-79]
-              )|
-              6(?:
-                1[2-68]|
-                [2-4][1-9]|
-                5[1-3689]|
-                6[1-57-9]|
-                7[1-7]|
-                8[67]|
-                9[4-8]
-              )|
-              7(?:
-                [1-467][1-9]|
-                5[13-9]|
-                8[1-69]|
-                9[17]
-              )|
-              8(?:
-                1\d|
-                2[13-689]|
-                3[1-6]|
-                4[124-6]|
-                6[1246-9]|
-                7[1-378]|
-                9[12479]
-              )|
-              9(?:
-                1[346-9]|
-                2[1-4]|
-                3[2-46-8]|
-                5[1348]|
-                [69][1-9]|
-                7[12]|
-                8[1-8]
-              )
-            )|
             2(?:
               2\d|
               3[1-35-8]|
diff --git a/resources/carrier/en/244.txt b/resources/carrier/en/244.txt
index 22dac77a2..9918cef28 100644
--- a/resources/carrier/en/244.txt
+++ b/resources/carrier/en/244.txt
@@ -17,4 +17,5 @@
 24493|UNITEL
 24494|UNITEL
 24495|Africell
+24497|UNITEL
 24499|Movicel
diff --git a/resources/carrier/en/40.txt b/resources/carrier/en/40.txt
index 7945dbe92..87b87bfa5 100644
--- a/resources/carrier/en/40.txt
+++ b/resources/carrier/en/40.txt
@@ -26,7 +26,7 @@
 407019|Lycamobile
 40702|Lycamobile
 40705|Iristel
-40711|Telekom
+40711|Orange
 40712|Orange
 40713|Orange
 4072|Vodafone
@@ -42,5 +42,11 @@
 40775|Digi Mobil
 40776|Digi Mobil
 40777|Digi Mobil
-4078|Telekom
+40780|Telekom
+40783|Orange
+40784|Telekom
+40785|Telekom
+40786|Telekom
+40787|Orange
+40788|Telekom
 4079|Vodafone
diff --git a/resources/carrier/en/44.txt b/resources/carrier/en/44.txt
index f951d107a..0396651bc 100644
--- a/resources/carrier/en/44.txt
+++ b/resources/carrier/en/44.txt
@@ -199,7 +199,7 @@
 4474061|Cheers
 4474062|Cheers
 4474065|Telecom2
-4474066|24 Seven
+4474066|Sure
 4474067|TGL
 4474068|08Direct
 4474069|CardBoardFish
@@ -674,7 +674,7 @@
 4478928|O2
 4478929|O2
 4478930|Magrathea
-4478931|24 Seven
+4478931|Sure
 4478932|O2
 4478933|Yim Siam
 4478934|O2
@@ -702,9 +702,9 @@
 447910|EE
 4479110|Marathon Telecom
 4479111|JT
-4479112|24 Seven
+4479112|Sure
 4479117|JT
-4479118|24 Seven
+4479118|Sure
 447912|O2
 447913|EE
 447914|EE
diff --git a/resources/carrier/en/46.txt b/resources/carrier/en/46.txt
index 314f8d822..72cb3e0f5 100644
--- a/resources/carrier/en/46.txt
+++ b/resources/carrier/en/46.txt
@@ -1,3 +1,17 @@
+# Copyright (C) 2019 The Libphonenumber Authors
+
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+
+# http://www.apache.org/licenses/LICENSE-2.0
+
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
 46700|Tele2 Sverige
 467010|SPINBOX AB
 467011|Telenor Sverige
@@ -157,6 +171,8 @@
 46720902|Telavox AB
 46720908|Telavox AB
 4672092|Telavox AB
+46720995|Telavox AB
+46720996|Telavox AB
 46720999|MOBIWEB LTD
 467210|SVENSK KONSUMENTMOBI
 467211|SVENSK KONSUMENTMOBI
@@ -269,6 +285,7 @@
 46726428|Global Telefoni Sve
 46726429|Global Telefoni Sve
 4672644|Telenor Sverige
+4672648|Telavox AB
 467265|TeliaSonera
 4672660|Telenor Sverige
 4672666|Telenor Sverige
diff --git a/resources/carrier/en/592.txt b/resources/carrier/en/592.txt
index b04822386..824290202 100644
--- a/resources/carrier/en/592.txt
+++ b/resources/carrier/en/592.txt
@@ -62,3 +62,4 @@
 592741|E-Networks
 592742|E-Networks
 592749|GTT
+59275|GTT
diff --git a/resources/carrier/en/691.txt b/resources/carrier/en/691.txt
index 13e1b4e2c..13851b238 100644
--- a/resources/carrier/en/691.txt
+++ b/resources/carrier/en/691.txt
@@ -12,17 +12,14 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+69132|FSMTC
+69133|FSMTC
+69135|FSMTC
+69137|FSMTC
 6918|FSMTC
-691920|FSMTC
-691921|FSMTC
-691922|FSMTC
-691923|FSMTC
-691924|FSMTC
-691925|FSMTC
-691926|FSMTC
-691930|FSMTC
-691931|FSMTC
-691932|FSMTC
-691933|FSMTC
+69192|FSMTC
+69193|FSMTC
+69194|FSMTC
 69195|FSMTC
+69196|BOOM!
 69197|FSMTC
diff --git a/resources/timezones/map_data.txt b/resources/timezones/map_data.txt
index 1907cd3d2..37a68c211 100644
--- a/resources/timezones/map_data.txt
+++ b/resources/timezones/map_data.txt
@@ -2158,7 +2158,8 @@
 3518|Atlantic/Azores&Europe/Lisbon
 3519|Atlantic/Azores&Europe/Lisbon
 352|Europe/Luxembourg
-353|Europe/Dublin
+353|Europe/Guernsey&Europe/Isle_of_Man&Europe/London
+353539253|Europe/Guernsey&Europe/Isle_of_Man&Europe/London
 354|Atlantic/Reykjavik
 355|Europe/Tirane
 356|Europe/Malta
@@ -2187,7 +2188,7 @@
 370|Europe/Bucharest
 371|Europe/Bucharest
 372|Europe/Bucharest
-373|Europe/Bucharest
+373|Europe/Chisinau
 374|Asia/Yerevan
 375|Europe/Moscow
 376|Europe/Andorra
@@ -2277,50 +2278,6 @@
 509|America/Port-au-Prince
 51|America/Lima
 52|America/Hermosillo&America/Mazatlan&America/Mexico_City&America/New_York&America/Tijuana
-521|America/Mexico_City
-521311|America/Mazatlan
-521319|America/Mazatlan
-521323|America/Mazatlan
-521324|America/Mazatlan
-521325|America/Mazatlan
-521327|America/Mazatlan
-521389|America/Mazatlan
-521612|America/Mazatlan
-521613|America/Mazatlan
-521614|America/Mazatlan
-521615|America/Mazatlan
-521616|America/Tijuana
-52162|America/Mazatlan
-521626|America/Hermosillo&America/Tijuana
-52163|America/Mazatlan
-521636|America/Hermosillo&America/Mazatlan
-52164|America/Mazatlan
-521646|America/Tijuana
-521647|America/Mazatlan&America/Tijuana
-521651|America/Mazatlan
-521652|America/Mazatlan
-521653|America/Mazatlan
-521656|America/Hermosillo
-521658|America/Tijuana
-521659|America/Mazatlan
-521661|America/Tijuana
-521662|America/Mazatlan
-521663|America/Mazatlan
-521664|America/Tijuana
-521665|America/Tijuana
-521667|America/Mazatlan
-521668|America/Mazatlan
-521669|America/Mazatlan
-521672|America/Mazatlan
-521673|America/Mazatlan
-521686|America/Tijuana
-521687|America/Mazatlan
-52169|America/Mazatlan
-521877|America/Mexico_City&America/Tijuana
-521983|America/New_York
-521984|America/New_York
-521987|America/New_York
-521998|America/New_York
 522|America/Mexico_City
 52200|America/Mexico_City&America/Tijuana
 52201|America/Mexico_City&America/New_York