From fb1d4f6eb3fb01da49518b1966380b4a805bd195 Mon Sep 17 00:00:00 2001
From: David Drysdale <drysdale@google.com>
Date: Fri, 17 May 2024 11:51:40 +0100
Subject: [PATCH] Merge metadata changes from upstream 8.13.37

Includes changes in resources/ up to and including
upstream commit 4324be43b4ca:
  "[maven-release-plugin] prepare release v8.13.37"
---
 resources/PhoneNumberMetadata.xml | 75 +++++++++++++++----------------
 resources/carrier/en/40.txt       |  1 +
 resources/carrier/en/44.txt       | 10 +++++
 resources/carrier/en/592.txt      |  7 ++-
 resources/carrier/en/61.txt       |  8 +---
 resources/geocoding/de/49.txt     |  5 +++
 resources/geocoding/en/49.txt     |  5 +++
 7 files changed, 65 insertions(+), 46 deletions(-)

diff --git a/resources/PhoneNumberMetadata.xml b/resources/PhoneNumberMetadata.xml
index d5a40e873..e85c35dbd 100644
--- a/resources/PhoneNumberMetadata.xml
+++ b/resources/PhoneNumberMetadata.xml
@@ -2537,17 +2537,14 @@
         <exampleNumber>412345678</exampleNumber>
         <nationalNumberPattern>
           4(?:
-            (?:
-              79|
-              94
-            )[01]|
-            83[0-389]
+            79[01]|
+            83[0-389]|
+            94[0-4]
           )\d{5}|
           4(?:
-            [0-3]\d|
+            [0-36]\d|
             4[047-9]|
             5[0-25-9]|
-            6[0-36-9]|
             7[02-8]|
             8[0-24-9]|
             9[0-37-9]
@@ -3467,9 +3464,9 @@
           )\d{4}|
           (?:
             2(?:
-              222|
-              [45]\d
-            )\d|
+              2\d|
+              [45]
+            )\d\d|
             3(?:
               1(?:
                 2[5-7]|
@@ -5609,17 +5606,14 @@
         <exampleNumber>412345678</exampleNumber>
         <nationalNumberPattern>
           4(?:
-            (?:
-              79|
-              94
-            )[01]|
-            83[0-389]
+            79[01]|
+            83[0-389]|
+            94[0-4]
           )\d{5}|
           4(?:
-            [0-3]\d|
+            [0-36]\d|
             4[047-9]|
             5[0-25-9]|
-            6[0-36-9]|
             7[02-8]|
             8[0-24-9]|
             9[0-37-9]
@@ -7879,17 +7873,14 @@
         <exampleNumber>412345678</exampleNumber>
         <nationalNumberPattern>
           4(?:
-            (?:
-              79|
-              94
-            )[01]|
-            83[0-389]
+            79[01]|
+            83[0-389]|
+            94[0-4]
           )\d{5}|
           4(?:
-            [0-3]\d|
+            [0-36]\d|
             4[047-9]|
             5[0-25-9]|
-            6[0-36-9]|
             7[02-8]|
             8[0-24-9]|
             9[0-37-9]
@@ -10348,12 +10339,12 @@
          as this breaks parsing (it treats all leading zeros as national prefixes. -->
     <!-- http://www.itu.int/oth/T020200004E/en -->
     <!-- http://www.arcep.ga -->
-    <territory id="GA" countryCode="241" internationalPrefix="00" nationalPrefix="0"
+    <territory id="GA" countryCode="241" internationalPrefix="00"
                nationalPrefixForParsing="0(11\d{6}|60\d{6}|61\d{6}|6[256]\d{6}|7[467]\d{6})"
                nationalPrefixTransformRule="$1">
       <availableFormats>
         <!-- If no leading zero was supplied, format with the national prefix. -->
-        <numberFormat pattern="(\d)(\d{2})(\d{2})(\d{2})" nationalPrefixFormattingRule="$NP$FG">
+        <numberFormat pattern="(\d)(\d{2})(\d{2})(\d{2})" nationalPrefixFormattingRule="0$FG">
           <leadingDigits>[2-7]</leadingDigits>
           <format>$1 $2 $3 $4</format>
         </numberFormat>
@@ -10363,8 +10354,11 @@
           <format>$1 $2 $3 $4</format>
         </numberFormat>
         <!-- Even in new way of dialling, 0 is mandatory when dialling domestically. -->
-        <numberFormat pattern="(\d{2})(\d{2})(\d{2})(\d{2})" nationalPrefixFormattingRule="$NP$FG">
-          <leadingDigits>[167]</leadingDigits>
+        <numberFormat pattern="(\d{2})(\d{2})(\d{2})(\d{2})" nationalPrefixFormattingRule="0$FG">
+          <leadingDigits>
+            11|
+            [67]
+          </leadingDigits>
           <format>$1 $2 $3 $4</format>
         </numberFormat>
       </availableFormats>
@@ -12425,10 +12419,9 @@
             510|
             6\d\d|
             7(?:
-              [01]\d|
-              2[0-256]|
-              3[0-2]|
-              49
+              [013]\d|
+              2[0-25-8]|
+              4[0-29]
             )
           )\d{4}
         </nationalNumberPattern>
@@ -22141,7 +22134,7 @@
           <leadingDigits>
             [089]|
             2[013]|
-            7[047]
+            7[0467]
           </leadingDigits>
           <format>$1 $2 $3 $4</format>
         </numberFormat>
@@ -22182,7 +22175,7 @@
         <nationalNumberPattern>
           (?:
             23|
-            7[047]|
+            7[0467]|
             [89]\d
           )\d{6}
         </nationalNumberPattern>
@@ -25017,7 +25010,7 @@
             399[0-3]|
             479[0-5]|
             76(?:
-              2[27]|
+              2[278]|
               3[0-37]
             )
           )\d{4}
@@ -25094,7 +25087,10 @@
         <possibleLengths national="9"/>
         <exampleNumber>712034567</exampleNumber>
         <nationalNumberPattern>
-          7020\d{5}|
+          (?:
+            630|
+            702
+          )0\d{5}|
           (?:
             6(?:
               [04]0|
@@ -29419,10 +29415,11 @@
     <!-- No tollFree or premiumRate information can be found. -->
     <!-- http://www.ttts.uz/eng/telephone_codes/codes_uzb_eng -->
     <!-- http://www.itu.int/oth/T02020000E1/en -->
-    <territory id="UZ" countryCode="998" preferredInternationalPrefix="8~10"
-               internationalPrefix="810" nationalPrefix="8">
+    <!-- The Trunk / National Prefix '0' or '8' is no longer used.  -->
+    <!-- The International Prefix / IDD is changed to '00' from '8~10' -->
+    <territory id="UZ" countryCode="998" internationalPrefix="00">
       <availableFormats>
-        <numberFormat pattern="(\d{2})(\d{3})(\d{2})(\d{2})" nationalPrefixFormattingRule="$NP $FG">
+        <numberFormat pattern="(\d{2})(\d{3})(\d{2})(\d{2})">
           <leadingDigits>[235-9]</leadingDigits>
           <format>$1 $2 $3 $4</format>
         </numberFormat>
diff --git a/resources/carrier/en/40.txt b/resources/carrier/en/40.txt
index a876c7a56..7945dbe92 100644
--- a/resources/carrier/en/40.txt
+++ b/resources/carrier/en/40.txt
@@ -14,6 +14,7 @@
 
 4060|Telekom
 4062|Vodafone
+4063|Digi Mobil
 4064|Orange
 407000|Enigma-System
 407013|Lycamobile
diff --git a/resources/carrier/en/44.txt b/resources/carrier/en/44.txt
index ec4a76be1..f951d107a 100644
--- a/resources/carrier/en/44.txt
+++ b/resources/carrier/en/44.txt
@@ -120,6 +120,13 @@
 447340|Vodafone
 447341|Vodafone
 447342|Vodafone
+447343|Lebara
+447349|Vodafone
+447350|Vodafone
+447351|Vodafone
+447352|Vodafone
+447353|Vodafone
+4473566|Wireless Logic
 447360|Three
 447361|Three
 447362|Three
@@ -135,7 +142,9 @@
 4473685|Sky
 4473686|Sky
 4473690|Telet Research
+4473691|Telet Research
 4473692|Sky
+4473697|Wave Mobile
 4473699|Anywhere Sim
 447375|EE
 447376|EE
@@ -198,6 +207,7 @@
 4474080|Truphone
 4474081|Truphone
 4474082|Truphone
+4474086|Truphone
 4474088|Truphone
 4474089|Truphone
 447409|Orange
diff --git a/resources/carrier/en/592.txt b/resources/carrier/en/592.txt
index 456e678be..b04822386 100644
--- a/resources/carrier/en/592.txt
+++ b/resources/carrier/en/592.txt
@@ -55,5 +55,10 @@
 592722|Digicel Guyana
 592725|GTT
 592726|GTT
+592727|GTT
+592728|GTT
 59273|E-Networks
-59274|GTT
+592740|E-Networks
+592741|E-Networks
+592742|E-Networks
+592749|GTT
diff --git a/resources/carrier/en/61.txt b/resources/carrier/en/61.txt
index 9e8fcbf78..32a918414 100644
--- a/resources/carrier/en/61.txt
+++ b/resources/carrier/en/61.txt
@@ -76,12 +76,8 @@
 61457|Telstra
 61458|Telstra
 61459|Telstra
-61460|Telstra
-61461|Telstra
-61462|Telstra
-61463|Telstra
+6146|Telstra
 61466|Optus
-61467|Telstra
 61468|Optus
 61469|Lycamobile
 614700|Lycamobile
@@ -91,7 +87,7 @@
 614704|Lycamobile
 614705|Lycamobile
 614706|Lycamobile
-614707|Lycamobile
+614707|Telstra
 61472|Telstra
 61473|Telstra
 61474|Telstra
diff --git a/resources/geocoding/de/49.txt b/resources/geocoding/de/49.txt
index 358c859a8..9095629c9 100644
--- a/resources/geocoding/de/49.txt
+++ b/resources/geocoding/de/49.txt
@@ -3258,6 +3258,11 @@
 496207|Wald-Michelbach
 496209|Mörlenbach
 49621|Mannheim
+496215|Ludwigshafen
+496216|Ludwigshafen
+4962195|Ludwigshafen
+4962196|Ludwigshafen
+4962199|Ludwigshafen
 496220|Wilhelmsfeld
 496221|Heidelberg
 496222|Wiesloch
diff --git a/resources/geocoding/en/49.txt b/resources/geocoding/en/49.txt
index fdce47d27..f99634a13 100644
--- a/resources/geocoding/en/49.txt
+++ b/resources/geocoding/en/49.txt
@@ -3257,6 +3257,11 @@
 496207|Wald-Michelbach
 496209|Mörlenbach
 49621|Mannheim
+496215|Ludwigshafen
+496216|Ludwigshafen
+4962195|Ludwigshafen
+4962196|Ludwigshafen
+4962199|Ludwigshafen
 496220|Wilhelmsfeld
 496221|Heidelberg
 496222|Wiesloch