Merge metadata changes from upstream 8.13.32

Includes changes in resources/ up to and including upstream commit 7afd7ce8d72b: "[maven-release-plugin] prepare release v8.13.32"
daviddrysdale · Mar 13, 2024 · e9e5bd9 · e9e5bd9
1 parent 95d5229
commit e9e5bd9
Show file tree

Hide file tree

Showing 8 changed files with 103 additions and 29 deletions.
diff --git a/resources/PhoneNumberMetadata.xml b/resources/PhoneNumberMetadata.xml
@@ -6327,6 +6327,38 @@
                internationalPrefix="00|1(?:[12]\d|79)\d\d00" nationalPrefix="0"
                nationalPrefixForParsing="(1(?:[12]\d|79)\d\d)|0">
       <availableFormats>
+        <!-- 5-6 digit short number -->
+        <numberFormat pattern="(\d{5,6})">
+          <leadingDigits>
+            1(?:
+              00|
+              2[13]
+            )|
+            95
+          </leadingDigits>
+          <leadingDigits>
+            1(?:
+              00|
+              2(?:
+                11|
+                39
+              )
+            )|
+            95
+          </leadingDigits>
+          <leadingDigits>
+            1(?:
+              00|
+              2(?:
+                110|
+                395
+              )
+            )|
+            95
+          </leadingDigits>
+          <format>$1</format>
+          <intlFormat>NA</intlFormat>
+        </numberFormat>
         <numberFormat pattern="(\d{5,6})">
           <leadingDigits>
             10|
@@ -10497,9 +10529,11 @@
                   73[0235]
                 )|
                 4(?:
-                  [0-5]\d\d|
-                  69[7-9]|
-                  70[0-79]
+                  (?:
+                    [0-5]\d|
+                    70
+                  )\d|
+                  69[7-9]
                 )|
                 (?:
                   (?:
@@ -19340,7 +19374,7 @@
         <exampleNumber>612345678</exampleNumber>
         <nationalNumberPattern>
           4(?:
-            [46]\d|
+            [469]\d|
             5[1-9]
           )\d{5}|
           (?:
@@ -28961,7 +28995,7 @@
             472[24]|
             505[2-57-9]|
             7306|
-            983[237-9]
+            983[2-47-9]
           )\d{6}|
           (?:
             2(?:
@@ -29067,7 +29101,7 @@
             472[24]|
             505[2-57-9]|
             7306|
-            983[237-9]
+            983[2-47-9]
           )\d{6}|
           (?:
             2(?:
@@ -30645,28 +30679,39 @@
           <format>$1 $2 $3</format>
         </numberFormat>
         <numberFormat pattern="(\d{3})(\d{3})(\d{3})" nationalPrefixFormattingRule="$NP$FG">
-          <leadingDigits>[23]</leadingDigits>
+          <leadingDigits>
+            2|
+            39
+          </leadingDigits>
           <format>$1 $2 $3</format>
         </numberFormat>
+        <numberFormat pattern="(\d{2})(\d{7,10})" nationalPrefixFormattingRule="$NP$FG">
+          <leadingDigits>3</leadingDigits>
+          <format>$1 $2</format>
+        </numberFormat>
       </availableFormats>
       <generalDesc>
         <nationalNumberPattern>
-          [23]\d{7,8}|
+          2\d{7,8}|
+          3\d{7,11}|
           (?:
             4\d\d|
             [89]00
           )\d{5}
         </nationalNumberPattern>
       </generalDesc>
       <fixedLine>
-        <possibleLengths national="8,9"/>
+        <possibleLengths national="[8-12]"/>
         <exampleNumber>28012345</exampleNumber>
         <nationalNumberPattern>
+          38\d{6,10}|
           (?:
             2[89]|
             39
-          )0\d{6}|
-          [23][89]\d{6}
+          )(?:
+            0\d{5,6}|
+            [1-9]\d{5}
+          )
         </nationalNumberPattern>
       </fixedLine>
       <mobile>

diff --git a/resources/ShortNumberMetadata.xml b/resources/ShortNumberMetadata.xml
@@ -2995,18 +2995,25 @@
           1(?:
             00\d\d|
             1[029]|
-            20
+            2(?:
+              [02]|
+              110|
+              395
+            )
           )|
           95\d{3,4}
         </nationalNumberPattern>
       </shortCode>
       <tollFree>
-        <possibleLengths national="3"/>
+        <possibleLengths national="3,5"/>
         <exampleNumber>110</exampleNumber>
         <nationalNumberPattern>
           1(?:
             1[09]|
-            20
+            2(?:
+              [02]|
+              [13]\d\d
+            )
           )
         </nationalNumberPattern>
       </tollFree>
@@ -3038,6 +3045,21 @@
           )
         </nationalNumberPattern>
       </emergency>
+      <expandedEmergency>
+        <possibleLengths national="3,5"/>
+        <exampleNumber>122</exampleNumber>
+        <nationalNumberPattern>
+          12(?:
+            [13]\d\d|
+            2
+          )
+        </nationalNumberPattern>
+      </expandedEmergency>
+      <smsServices>
+        <possibleLengths national="5"/>
+        <exampleNumber>12100</exampleNumber>
+        <nationalNumberPattern>121\d\d</nationalNumberPattern>
+      </smsServices>
     </territory>
 
     <!-- Colombia (CO) -->
@@ -4296,7 +4318,7 @@
         <nationalNumberPattern>
           1(?:
             2[23]|
-            [69]\d{3}|
+            [679]\d{3}|
             80
           )|
           34400
@@ -8325,7 +8347,7 @@
     <!-- http://www.itu.int/oth/T020200006F/en -->
     <territory id="KZ">
       <generalDesc>
-        <nationalNumberPattern>[134]\d{2,4}</nationalNumberPattern>
+        <nationalNumberPattern>[1-4]\d{2,4}</nationalNumberPattern>
       </generalDesc>
       <shortCode>
         <possibleLengths national="[3-5]"/>
@@ -8335,20 +8357,22 @@
             0[1-4]|
             12
           )|
+          2121|
           (?:
             3040|
             404
           )0
         </nationalNumberPattern>
       </shortCode>
       <tollFree>
-        <possibleLengths national="3"/>
+        <possibleLengths national="3,4"/>
         <exampleNumber>101</exampleNumber>
         <nationalNumberPattern>
           1(?:
             0[1-3]|
             12
-          )
+          )|
+          212\d
         </nationalNumberPattern>
       </tollFree>
       <!-- https://support.google.com/plus/answer/1304917 -->

diff --git a/resources/carrier/en/230.txt b/resources/carrier/en/230.txt
@@ -24,6 +24,7 @@
 23055|Emtel
 230550|Cellplus
 230552|MTML
+230553|Cellplus
 23057|Cellplus
 230571|Emtel
 230572|Emtel

diff --git a/resources/carrier/en/374.txt b/resources/carrier/en/374.txt
@@ -15,18 +15,19 @@
 # Data from Wikipedia:
 # http://en.wikipedia.org/wiki/Telephone_numbers_in_Armenia#Mobile_network_codes
 
-37433|Beeline
+37433|Team Telecom Armenia
 37441|Ucom
-37443|Beeline
+37443|Team Telecom Armenia
 37444|Ucom
 37449|VivaCell-MTS
 3745|Ucom
 3747|VivaCell-MTS
 37488|VivaCell-MTS
-37491|Beeline
+37491|Team Telecom Armenia
 37493|VivaCell-MTS
 37494|VivaCell-MTS
 37495|Ucom
-37496|Beeline
+37496|Team Telecom Armenia
+37497|Team Telecom Armenia
 37498|VivaCell-MTS
-37499|Beeline
+37499|Team Telecom Armenia
diff --git a/resources/carrier/en/51.txt b/resources/carrier/en/51.txt
@@ -40,6 +40,7 @@
 5191926|Claro
 5191927|Claro
 519198|Entel
+519199|Intermax
 5192|Claro
 51920|Movistar
 51922|Entel

diff --git a/resources/carrier/ru/374.txt b/resources/carrier/ru/374.txt
@@ -14,18 +14,19 @@
 
 # Translated manually from en/374.txt.
 
-37433|Билайн
+37433|Team Telecom Armenia
 37441|Юком
-37443|Билайн
+37443|Team Telecom Armenia
 37444|Юком
 37449|ВиваСелл-МТС
 3745|Юком
 3747|ВиваСелл-МТС
 37488|ВиваСелл-МТС
-37491|Билайн
+37491|Team Telecom Armenia
 37493|ВиваСелл-МТС
 37494|ВиваСелл-МТС
 37495|Юком
-37496|Билайн
+37496|Team Telecom Armenia
+37497|Team Telecom Armenia
 37498|ВиваСелл-МТС
-37499|Билайн
+37499|Team Telecom Armenia
diff --git a/resources/geocoding/en/44.txt b/resources/geocoding/en/44.txt
@@ -31,6 +31,7 @@
 44114704|Sheffield
 44114705|Sheffield
 44114707|Sheffield
+44114708|Sheffield
 44114709|Sheffield
 44115|Nottingham
 44116|Leicester

diff --git a/resources/timezones/map_data.txt b/resources/timezones/map_data.txt
@@ -3240,7 +3240,7 @@
 79|Europe/Moscow
 81|Asia/Tokyo
 82|Asia/Seoul
-84|Asia/Bangkok
+84|Asia/Ho_Chi_Minh
 850|Asia/Seoul
 852|Asia/Hong_Kong
 853|Asia/Shanghai
-Original file line number
+Diff line change
@@ Expand Up / @@ -24,6 +24,7 @@ @@
 |Emtel
 |Cellplus
 |MTML
+|Cellplus
 |Cellplus
 |Emtel
 |Emtel
@@ Expand Down @@